Revert "Pin build to a stable git commit."

This reverts commit 192dfe256ad1c946fa7b5f7ae200eb233adc6ae7.

1 files changed, 22 insertions, 31 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 643c286c8c48..700246f59a12 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,38 @@
 # Maintainer: xiretza <xiretza+aur@gmail.com>
-# Maintainer: Rod Kay <rodakay5 at gmail dot com>
+# Maintainer: Rod Kay <charlie5 on #ada at freenode.net>
 
 pkgname=gnatcoll-core
-pkgver=r3152.7be06227
-pkgrel=1
-pkgdesc='Ada Gnat components collection - Core packages.'
+epoch=1
+pkgver=21.0.0
+pkgrel=2
+
+pkgdesc='Gnat components collection - Core packages.'
 url='https://github.com/AdaCore/gnatcoll-core/'
 arch=('i686' 'x86_64')
-license=('GPL3' 'custom')
+license=('GPL')
+
 depends=('libgpr')
-makedepends=('git' 'gcc-ada' 'gprbuild' 'texlive-bin')
-source=('git+https://github.com/AdaCore/gnatcoll-core.git#commit=7be06227856aac9ec3aade5a412ade84a1b41469')
-sha1sums=('SKIP')
-
-pkgver() {
-    cd "$srcdir/$pkgname"
-    printf "r%s.%s"                        \
-           "$(git rev-list  --count HEAD)" \
-           "$(git rev-parse --short HEAD)"
-}
+makedepends=('gprbuild')
+
+provides=('gnatcoll-core')
+conflicts=('gnatcoll' 'gnatcoll-core-git')
+
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
+sha256sums=('daa9b3d5fc5d90b015ece1b48d54192bd06a71fec64bdfc242066f2598c30ff5')
 
-build() {
-    cd "$srcdir/$pkgname"
+build()
+{
+    cd "$srcdir/$pkgname-$pkgver"
 
     make setup BUILD=PROD prefix=/usr
-    make GPRBUILD_OPTIONS="-R"
-    make -C docs html latexpdf
+    make -j1 GPRBUILD_OPTIONS="-R -cargs $CFLAGS -largs $LDFLAGS -gargs"
 }
 
-package() {
-    cd "$srcdir/$pkgname"
+package()
+{
+    cd "$srcdir/$pkgname-$pkgver"
 
     # Make one install at a time to avoid GPRinstall reading/writing to
     # the same installed project files at the same time.
     make prefix="$pkgdir/usr" install -j1
-    
-    # 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"
 }