Update to 21.0.0

2 files changed, 34 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index af1d8ea40130..9eaee3a57e83 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,22 @@
 pkgbase = gprbuild
 	pkgdesc = Builder for multi-language systems
-	pkgver = 2020
-	pkgrel = 6
+	pkgver = 21.0.0
+	pkgrel = 1
+	epoch = 1
 	url = https://github.com/AdaCore/gprbuild/
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = gprbuild-bootstrap
 	makedepends = xmlada
-	source = gprbuild-2020-20200429-19BD2-src.tar.gz::https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=gprbuild-2020-20200429-19BD2-src.tar.gz
+	source = gprbuild-21.0.0.tar.gz::https://github.com/AdaCore/gprbuild//archive/v21.0.0.tar.gz
+	source = gprconfig_kb-21.0.0.tar.gz::https://github.com/AdaCore/gprconfig_kb/archive/v21.0.0.tar.gz
 	source = relocatable-build.patch
 	source = always-use-host-gprinstall.patch
-	sha1sums = 408ec35c3bb86bd227db3da55d3e1e0c572a56e3
-	sha1sums = 91b20bde99cf02410cdb2b74aa1adb014458a9b3
-	sha1sums = 66792ebc73aff76a368bd902adc6a6f181d1d878
+	sha256sums = 54b7d1a3298160109aaee4d8c263c1ab3ab4abae75d354f3e90a4c51639167a2
+	sha256sums = 2aec26afad5bb1a4685d9c041c9c797ff5beda211a5e81f2a97452d2ceabc557
+	sha256sums = d6479e03e6b6cfb09c133d94e3c47ea5d5e5e756b95554ab3106a679c3d57de4
+	sha256sums = 3fe0fd1df3156c9a8488d98ee6e7e822ae904ce410838661c8fc14c29abe2620
 
 pkgname = libgpr
 	pkgdesc = Ada library to handle GPRbuild project files
diff --git a/PKGBUILD b/PKGBUILD
index d9cbf887ee1c..93ed847ddc63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,41 +5,47 @@
 
 pkgbase=gprbuild
 pkgname=(libgpr gprbuild)
-_upstream_ver=2020-20200429-19BD2
-pkgver=2020
-pkgrel=6
+epoch=1
+pkgver=21.0.0
+pkgrel=1
 pkgdesc="Builder for multi-language systems"
 arch=('i686' 'x86_64')
 url="https://github.com/AdaCore/gprbuild/"
 license=('GPL3')
 makedepends=('gprbuild-bootstrap' 'xmlada')
 
-_checksum=408ec35c3bb86bd227db3da55d3e1e0c572a56e3
-source=("${pkgbase}-${_upstream_ver}-src.tar.gz::https://community.download.adacore.com/v1/${_checksum}?filename=${pkgbase}-${_upstream_ver}-src.tar.gz"
-        'relocatable-build.patch'
-        'always-use-host-gprinstall.patch')
-sha1sums=("$_checksum"
-          '91b20bde99cf02410cdb2b74aa1adb014458a9b3'
-          '66792ebc73aff76a368bd902adc6a6f181d1d878')
+source=(
+	"$pkgbase-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+	"gprconfig_kb-$pkgver.tar.gz::https://github.com/AdaCore/gprconfig_kb/archive/v$pkgver.tar.gz"
+    'relocatable-build.patch'
+    'always-use-host-gprinstall.patch'
+)
+sha256sums=('54b7d1a3298160109aaee4d8c263c1ab3ab4abae75d354f3e90a4c51639167a2'
+            '2aec26afad5bb1a4685d9c041c9c797ff5beda211a5e81f2a97452d2ceabc557'
+            'd6479e03e6b6cfb09c133d94e3c47ea5d5e5e756b95554ab3106a679c3d57de4'
+            '3fe0fd1df3156c9a8488d98ee6e7e822ae904ce410838661c8fc14c29abe2620')
 
 prepare() {
-    cd "$srcdir/$pkgbase-$_upstream_ver-src"
+    cd "$srcdir/$pkgbase-$pkgver"
 
     patch -Np1 -i "$srcdir/relocatable-build.patch"
     # By default, it tries to use the freshly-built gprinstall to install gprbuild, but that requires libgpr,
     # which can't be installed yet. Simply fall back to gprinstall from gprbuild-bootstrap
     patch -Np1 -i "$srcdir/always-use-host-gprinstall.patch"
 
+    ln -sfT "$srcdir/gprconfig_kb-$pkgver/db/" "share/gprconfig"
+
     # GPRbuild hard-codes references to /usr/libexec, but ArchLinux packages
     # must use /usr/lib instead.
     sed -i 's/libexec/lib/g' doinstall gprbuild.gpr \
-        share/gprconfig/compilers.xml \
-        share/gprconfig/linker.xml \
-        share/gprconfig/gnat.xml
+        "$srcdir/gprconfig_kb-$pkgver/db/compilers.xml" \
+        "$srcdir/gprconfig_kb-$pkgver/db/linker.xml" \
+        "$srcdir/gprconfig_kb-$pkgver/db/gnat.xml"
+
 }
 
 build() {
-    cd "$srcdir/$pkgbase-$_upstream_ver-src"
+    cd "$srcdir/$pkgbase-$pkgver"
 
     export OS=UNIX
     GPRBUILD_OPTIONS="-R -cargs $CFLAGS -largs $LDFLAGS -gargs"
@@ -56,7 +62,7 @@ package_libgpr() {
     # both provide /usr/lib/libgpr.so
     conflicts=('grpc')
 
-    cd "$srcdir/$pkgbase-$_upstream_ver-src"
+    cd "$srcdir/$pkgbase-$pkgver"
 
     make prefix="$pkgdir/usr" libgpr.install
 }
@@ -65,10 +71,12 @@ package_gprbuild() {
     provides=('gprbuild-bootstrap')
     conflicts=('gprbuild-bootstrap')
     depends=('libgpr' 'xmlada')
-    cd "$srcdir/$pkgbase-$_upstream_ver-src"
+    cd "$srcdir/$pkgbase-$pkgver"
 
     make prefix="$pkgdir/usr" install
 
     # We don't need to distribute the installation script
     rm -f -- "$pkgdir/usr/doinstall"
 }
+
+# vim: set et ts=4: