Update to version '23.0.0'.

3 files changed, 15 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82eeefbaade8..04d038af2368 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,14 @@
 pkgbase = libvss
 	pkgdesc = A high level string and text processing library for Ada.
-	pkgver = 22.0.0
-	pkgrel = 3
+	pkgver = 23.0.0
+	pkgrel = 1
 	epoch = 1
 	url = https://github.com/AdaCore/VSS
 	arch = i686
 	arch = x86_64
-	license = GPL3
-	license = custom
+	license = Apache
 	makedepends = gprbuild
-	source = https://github.com/AdaCore/VSS/archive/refs/tags/v22.0.0.tar.gz
-	source = patch-Makefile
-	sha256sums = eddccea4b109ce67f13c92937e59e5ae00a93244c8c05b1234c7b6413451f24e
-	sha256sums = a6f9feb705fe503021497eb4b453650312e89f50580a55e986c1642da7a05381
+	source = libvss-23.0.0.tar.gz::https://github.com/AdaCore/VSS/archive/v23.0.0.tar.gz
+	sha256sums = 94f782d629c2817ae3755461fa8f813a00c8576e91388606bc772ff708efec28
 
 pkgname = libvss
diff --git a/PKGBUILD b/PKGBUILD
index fc9c9204e39d..08f3517779de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,52 +2,34 @@
 
 pkgname=libvss
 epoch=1
-pkgver=22.0.0
-pkgrel=3
+pkgver=23.0.0
+pkgrel=1
 
 pkgdesc="A high level string and text processing library for Ada."
 url="https://github.com/AdaCore/VSS"
 
 arch=('i686' 'x86_64')
-license=('GPL3' 'custom')
+license=('Apache')
 
 makedepends=('gprbuild')
          
-source=("https://github.com/AdaCore/VSS/archive/refs/tags/v22.0.0.tar.gz"
-        "patch-Makefile")
-sha256sums=(eddccea4b109ce67f13c92937e59e5ae00a93244c8c05b1234c7b6413451f24e
-            a6f9feb705fe503021497eb4b453650312e89f50580a55e986c1642da7a05381)
-
-prepare()
-{
-  cd "$srcdir/VSS-22.0.0"
-
-  patch -p0 -i ../patch-Makefile
-  mv source/regexp/vss-regular_expressions-utilities.ads source/regexp/vss-regular_expressions-utilities.ads-orig
-}
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
+sha256sums=(94f782d629c2817ae3755461fa8f813a00c8576e91388606bc772ff708efec28)
 
 build()
 {
-   cd "$srcdir/VSS-22.0.0"
+   cd "$srcdir/VSS-$pkgver"
    make all
 }
 
 package()
 {
-   cd "$srcdir/VSS-22.0.0"
+   cd "$srcdir/VSS-$pkgver"
 
-   gprinstall -p --prefix="$pkgdir/usr" gnat/vss_json.gpr
-   gprinstall -p --prefix="$pkgdir/usr" gnat/vss_text.gpr
-   gprinstall -p --prefix="$pkgdir/usr" gnat/vss_gnat.gpr
-   gprinstall -p --prefix="$pkgdir/usr" gnat/vss_regexp.gpr
+   make DESTDIR=$pkgdir install
 
    # Install the license.
    install -D -m644     \
-      "COPYING3"        \
-      "$pkgdir/usr/share/licenses/$pkgname/COPYING3"
-
-   # Install the custom license.
-   install -D -m644     \
-      "COPYING.RUNTIME" \
-      "$pkgdir/usr/share/licenses/$pkgname/COPYING.RUNTIME"
+      "LICENSE"         \
+      "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/patch-Makefile b/patch-Makefile
deleted file mode 100644
index fa8e8a4523e0..000000000000
--- a/patch-Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile-orig	2022-08-03 15:40:46.109985000 +1000
-+++ Makefile	2022-08-03 15:41:41.438289698 +1000
-@@ -1,5 +1,5 @@
- # Build mode (dev or prod)
--BUILD_MODE=dev
-+BUILD_MODE=prod
- 
- GPRBUILD_FLAGS = -p -j0
- PREFIX                 ?= /usr
-@@ -18,8 +18,9 @@
- 
- 
- all:
--	gprbuild $(GPRBUILD_FLAGS) gnat/vss_text.gpr -XVSS_BUILD_MODE=$(BUILD_MODE) -cargs $(ADAFLAGS)
--	gprbuild $(GPRBUILD_FLAGS) gnat/vss_json.gpr -XVSS_BUILD_MODE=$(BUILD_MODE) -cargs $(ADAFLAGS)
-+	gprbuild $(GPRBUILD_FLAGS) gnat/vss_text.gpr   -XVSS_BUILD_MODE=$(BUILD_MODE) -cargs $(ADAFLAGS)
-+	gprbuild $(GPRBUILD_FLAGS) gnat/vss_json.gpr   -XVSS_BUILD_MODE=$(BUILD_MODE) -cargs $(ADAFLAGS)
-+	gprbuild $(GPRBUILD_FLAGS) gnat/vss_regexp.gpr -XVSS_BUILD_MODE=$(BUILD_MODE) -cargs $(ADAFLAGS)
- 
- generate:
- 	gprbuild $(GPRBUILD_FLAGS) gnat/tools/gen_ucd.gpr
-@@ -105,3 +106,4 @@
- 	gprinstall $(GPRINSTALL_FLAGS)/gnat -p -P gnat/vss_gnat.gpr
- 	gprinstall $(GPRINSTALL_FLAGS)/text -p -P gnat/vss_text.gpr
- 	gprinstall $(GPRINSTALL_FLAGS)/json -p -P gnat/vss_json.gpr
-+	gprinstall $(GPRINSTALL_FLAGS)/json -p -P gnat/vss_regexp.gpr