Update to version '22.0.0'.

2 files changed, 29 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b615e3996987..c22770ad9790 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnatcoll-bindings
 	pkgdesc = GNAT Components Collection - Language and library bindings
-	pkgver = 21.0.0
-	pkgrel = 7
+	pkgver = 22.0.0
+	pkgrel = 1
 	epoch = 1
 	url = https://github.com/AdaCore/gnatcoll-bindings/
 	arch = i686
@@ -13,8 +13,8 @@ pkgbase = gnatcoll-bindings
 	makedepends = gnatcoll-core
 	makedepends = libiconv
 	makedepends = syslog-ng
-	source = gnatcoll-bindings-2021-20210518-19B15-src.tar.gz::https://community.download.adacore.com/v1/d93655ced17f15c5f376b6861825df3f9c183980?filename=gnatcoll-bindings-2021-20210518-19B15-src.tar.gz
-	sha1sums = d93655ced17f15c5f376b6861825df3f9c183980
+	source = https://github.com/AdaCore/gnatcoll-bindings/archive/refs/tags/v22.0.0.tar.gz
+	sha1sums = d1d3b80331dd097bb4e07289d53cd33fad247794
 
 pkgname = gnatcoll-python2
 	pkgdesc = GNAT Components Collection - Interface to the python 2 interpreter.
diff --git a/PKGBUILD b/PKGBUILD
index 74820df0d564..3e75c5e1ab0e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,9 @@
 pkgbase=gnatcoll-bindings
 pkgname=(gnatcoll-python2 gnatcoll-readline gnatcoll-iconv  gnatcoll-gmp 
          gnatcoll-lzma    gnatcoll-omp      gnatcoll-syslog gnatcoll-zlib)
-_upstream_ver=2021-20210518-19B15
 epoch=1
-pkgver=21.0.0
-pkgrel=7
+pkgver=22.0.0
+pkgrel=1
 
 pkgdesc='GNAT Components Collection - Language and library bindings'
 url='https://github.com/AdaCore/gnatcoll-bindings/'
@@ -16,9 +15,11 @@ license=('GPL3' 'custom')
 
 makedepends=('python2' 'gprbuild' 'gnatcoll-core' 'libiconv' 'syslog-ng')
 
-_checksum=d93655ced17f15c5f376b6861825df3f9c183980
-source=("${pkgbase}-${_upstream_ver}-src.tar.gz::https://community.download.adacore.com/v1/${_checksum}?filename=${pkgbase}-${_upstream_ver}-src.tar.gz")
-sha1sums=("$_checksum")
+source=("https://github.com/AdaCore/gnatcoll-bindings/archive/refs/tags/v22.0.0.tar.gz")
+sha1sums=("d1d3b80331dd097bb4e07289d53cd33fad247794")
+
+_source_dir="gnatcoll-bindings-22.0.0"
+
 
 build()
 {
@@ -28,35 +29,35 @@ build()
 
    _gpr_opts="-R -cargs $ADA_FLAGS -fPIC -largs $LDFLAGS"
 
-    cd "$srcdir/$pkgbase-$_upstream_ver-src/python"
+    cd "$srcdir/$_source_dir/python"
     # --gpr-opts reads all remaining arguments, so no quotes
     python2 setup.py build --prefix=/usr --gpr-opts $_gpr_opts
 
-    cd "$srcdir/$pkgbase-$_upstream_ver-src/readline"
+    cd "$srcdir/$_source_dir/readline"
     python2 setup.py build --prefix=/usr --accept-gpl --gpr-opts $_gpr_opts
 
-    cd "$srcdir/$pkgbase-$_upstream_ver-src/iconv"
+    cd "$srcdir/$_source_dir/iconv"
     python2 setup.py build --prefix=/usr --gpr-opts $_gpr_opts
 
-    cd "$srcdir/$pkgbase-$_upstream_ver-src/gmp"
+    cd "$srcdir/$_source_dir/gmp"
     python2 setup.py build --prefix=/usr --gpr-opts $_gpr_opts
 
-    cd "$srcdir/$pkgbase-$_upstream_ver-src/lzma"
+    cd "$srcdir/$_source_dir/lzma"
     python2 setup.py build --prefix=/usr --gpr-opts $_gpr_opts
 
-    cd "$srcdir/$pkgbase-$_upstream_ver-src/omp"
+    cd "$srcdir/$_source_dir/omp"
     python2 setup.py build --prefix=/usr --gpr-opts $_gpr_opts
 
-    cd "$srcdir/$pkgbase-$_upstream_ver-src/syslog"
+    cd "$srcdir/$_source_dir/syslog"
     python2 setup.py build --prefix=/usr --gpr-opts $_gpr_opts
 
-    cd "$srcdir/$pkgbase-$_upstream_ver-src/zlib"
+    cd "$srcdir/$_source_dir/zlib"
     python2 setup.py build --prefix=/usr --gpr-opts $_gpr_opts
 }
 
 _install_license()
 {
-    cd "$srcdir/$pkgbase-$_upstream_ver-src"
+    cd "$srcdir/$_source_dir"
 
     # Install the license.
     install -D -m644     \
@@ -76,9 +77,9 @@ package_gnatcoll-python2()
     provides=('gnatcoll-python')
     replaces=('gnatcoll-python')
 
-    cd "$srcdir/$pkgbase-$_upstream_ver-src/python"
+    cd "$srcdir/$_source_dir/python"
 
-    GNATCOLL_VERSION=2021    \
+    GNATCOLL_VERSION=0.0     \
     LIBRARY_TYPE=relocatable \
     gprinstall -P gnatcoll_python -p --prefix=$pkgdir/usr
 
@@ -90,7 +91,7 @@ package_gnatcoll-readline()
     pkgdesc='GNAT Components Collection - Bindings to readline'
     depends=('readline' 'gnatcoll-core')
 
-    cd "$srcdir/$pkgbase-$_upstream_ver-src/readline"
+    cd "$srcdir/$_source_dir/readline"
     python2 setup.py install --prefix="$pkgdir/usr"
 
     _install_license    
@@ -101,7 +102,7 @@ package_gnatcoll-iconv()
     pkgdesc='GNAT Components Collection - Bindings to Libiconv'
     depends=('libiconv' 'gnatcoll-core')
 
-    cd "$srcdir/$pkgbase-$_upstream_ver-src/iconv"
+    cd "$srcdir/$_source_dir/iconv"
     python2 setup.py install --prefix="$pkgdir/usr"
 
     _install_license    
@@ -112,7 +113,7 @@ package_gnatcoll-gmp()
     pkgdesc='GNAT Components Collection - Bindings to GMP'
     depends=('gmp' 'gnatcoll-core')
 
-    cd "$srcdir/$pkgbase-$_upstream_ver-src/gmp"
+    cd "$srcdir/$_source_dir/gmp"
     python2 setup.py install --prefix="$pkgdir/usr"
 
     _install_license    
@@ -123,7 +124,7 @@ package_gnatcoll-lzma()
     pkgdesc='GNAT Components Collection - Bindings to LZMA'
     depends=('xz' 'gnatcoll-core')
 
-    cd "$srcdir/$pkgbase-$_upstream_ver-src/lzma"
+    cd "$srcdir/$_source_dir/lzma"
     python2 setup.py install --prefix="$pkgdir/usr"
 
     _install_license    
@@ -134,7 +135,7 @@ package_gnatcoll-omp()
     pkgdesc='GNAT Components Collection - Bindings to OpenMP'
     depends=('gnatcoll-core')
 
-    cd "$srcdir/$pkgbase-$_upstream_ver-src/omp"
+    cd "$srcdir/$_source_dir/omp"
     python2 setup.py install --prefix="$pkgdir/usr"
 
     _install_license    
@@ -145,7 +146,7 @@ package_gnatcoll-syslog()
     pkgdesc='GNAT Components Collection - Bindings to the Syslog the system logger on Unix systems.'
     depends=('syslog-ng' 'gnatcoll-core')
 
-    cd "$srcdir/$pkgbase-$_upstream_ver-src/syslog"
+    cd "$srcdir/$_source_dir/syslog"
     python2 setup.py install --prefix="$pkgdir/usr"
 
     _install_license    
@@ -156,7 +157,7 @@ package_gnatcoll-zlib()
     pkgdesc='GNAT Components Collection - Bindings to Zlib.'
     depends=('zlib' 'gnatcoll-core')
 
-    cd "$srcdir/$pkgbase-$_upstream_ver-src/zlib"
+    cd "$srcdir/$_source_dir/zlib"
     python2 setup.py install --prefix="$pkgdir/usr"
 
     _install_license