Update to 2018 version.

3 files changed, 20 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b636821e128d..f0cc05c2451d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,16 @@
-# Generated by mksrcinfo v8
-# Sat Jul 15 08:44:14 UTC 2017
 pkgbase = gnat_util
-	pkgdesc = Provides internal GNAT compiler components in a library which is used by (at least) ASIS and GNATColl.
-	pkgver = 2017
-	pkgrel = 2
-	url = http://sourceforge.net/projects/gnatutil
+	pkgdesc = Internal GNAT compiler components used by (at least) ASIS.
+	pkgver = 2018
+	pkgrel = 1
+	url = https://libre.adacore.com/
 	arch = i686
 	arch = x86_64
 	license = GPL V3.0 without any Runtime Exception
-	makedepends = gcc-ada
-	makedepends = gprbuild
-	depends = gcc-ada
-	options = !emptydirs
-	source = http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037
-	source = targparm.adb-patch
-	sha1sums = 00a231b45e25ea524a144111a524262184ceb876
-	sha1sums = fb3d1496b5ea382b6272355a97a31485f1272c36
+	makedepends = gprbuild>=2018
+	depends = gcc-ada>=8.2.1
+	depends = gcc-ada<9.0.0
+	source = http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a6b
+	sha1sums = 462a1304d1ed1ee5a37bfc6e956fa8b07896b715
 
 pkgname = gnat_util
 
diff --git a/PKGBUILD b/PKGBUILD
index a5799652d7f0..90b6612bfac7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,33 @@
-# Contributor: Rod Kay               <charlie5 on #ada at freenode.net>
+# Maintainer:  Rod Kay               <charlie5 on #ada at freenode.net>
 # Contributor: Pierre-Marie de Rodat <pmderodat@kawie.fr>
 
 pkgname=gnat_util
-pkgver=2017
-pkgrel=2
-pkgdesc="Provides internal GNAT compiler components in a library which is used by (at least) ASIS and GNATColl."
-
-options=('!emptydirs')
+pkgver=2018
+pkgrel=1
+pkgdesc="Internal GNAT compiler components used by (at least) ASIS."
 
 arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/gnatutil"
+url="https://libre.adacore.com/"
 license=('GPL V3.0 without any Runtime Exception')
 
-depends=('gcc-ada')
-makedepends=('gcc-ada' 'gprbuild')
-
-
-source=('http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037'
-        'targparm.adb-patch')
-sha1sums=('00a231b45e25ea524a144111a524262184ceb876'
-          'fb3d1496b5ea382b6272355a97a31485f1272c36')
+depends=('gcc-ada>=8.2.1' 'gcc-ada<9.0.0')
+makedepends=('gprbuild>=2018')
 
+source=('http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a6b')
+sha1sums=('462a1304d1ed1ee5a37bfc6e956fa8b07896b715')
 
 _pkg_src_dir="$pkgname-gpl-$pkgver-src"
-#_make_flags='ENABLE_SHARED=yes'
-
-
-
-prepare()
-{
-  cd "$srcdir/$_pkg_src_dir" 
-
-  patch -p0 -i ../targparm.adb-patch
-}
-
 
 
 build()
 {
   cd "$srcdir/$_pkg_src_dir"
-  make
-#  make $_make_flags
+  make 'ENABLE_SHARED=yes'
 }
 
 
 package()
 {
   cd "$srcdir/$_pkg_src_dir"
-  make prefix="$pkgdir/usr" install
-#  make prefix="$pkgdir/usr" $_make_flags install
+  make 'ENABLE_SHARED=yes' prefix="$pkgdir/usr" install
 }
diff --git a/targparm.adb-patch b/targparm.adb-patch
deleted file mode 100644
index a711663653c3..000000000000
--- a/targparm.adb-patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- targparm.adb	2017-07-15 18:26:03.805807859 +1000
-+++ targparm.adb-new	2017-07-15 18:26:28.822474526 +1000
-@@ -339,10 +339,11 @@
-          --  Test for pragma Profile (GNAT_Ravenscar_EDF);
- 
-          elsif Looking_At_Skip ("pragma Profile (GNAT_Ravenscar_EDF);") then
--            Set_Profile_Restrictions (GNAT_Ravenscar_EDF);
--            Opt.Task_Dispatching_Policy := 'E';
--            Opt.Locking_Policy          := 'C';
--            goto Line_Loop_Continue;
-+            raise Program_Error with "pragma Profile (GNAT_Ravenscar_EDF) is not yet implemented";
-+--            Set_Profile_Restrictions (GNAT_Ravenscar_EDF);
-+--            Opt.Task_Dispatching_Policy := 'E';
-+--            Opt.Locking_Policy          := 'C';
-+--            goto Line_Loop_Continue;
- 
-          --  Test for pragma Profile (Restricted);
-