dev-ada/gnatcoll-bindings: Stabilize

Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

diff --git a/dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-2018-gentoo.patch b/dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-2018-gentoo.patch
deleted file mode 100644 (file)
index 79729c2..0000000
--- a/dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-2018-gentoo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/gmp/gnatcoll_gmp.gpr     2018-06-18 21:48:15.289991113 +0200
-+++ b/gmp/gnatcoll_gmp.gpr     2018-06-18 21:48:46.869507399 +0200
-@@ -65,7 +65,7 @@
-             for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ");
-             for Switches ("C") use ("-O2", "-Wunreachable-code");
-       end case;
--
-+      for Driver ("C") use External ("GCC", "gcc");
-    end Compiler;
- 
-    package Binder is
---- a/iconv/gnatcoll_iconv.gpr 2018-10-10 08:24:48.654714484 +0200
-+++ b/iconv/gnatcoll_iconv.gpr 2018-10-10 08:24:16.926237733 +0200
-@@ -70,7 +70,7 @@
-             for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ");
-             for Switches ("C") use ("-O2", "-Wunreachable-code");
-       end case;
--
-+      for Driver ("C") use External ("GCC", "gcc");
-    end Compiler;
- 
-    package Binder is
---- a/python/gnatcoll_python.gpr       2018-10-10 08:28:04.700481915 +0200
-+++ b/python/gnatcoll_python.gpr       2018-10-10 08:27:33.880990030 +0200
-@@ -75,6 +75,7 @@
-             for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ");
-             for Switches ("C") use ("-O2", "-Wunreachable-code") & Split(Python_CFLAGS, " ");
-       end case;
-+      for Driver ("C") use External ("GCC", "gcc");
-    end Compiler;
- 
-    package Binder is

diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild
index 8c6d81608c047c05038b0d70ac20dbb912875a43..5d7f13c2235fb3f6e3b26fc639e759bb0f9138e9 100644 (file)
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0ce9cfc7a4475261f97ca5
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 gmp iconv python readline +shared
        static-libs static-pic syslog"
 
@@ -26,20 +26,14 @@ RDEPEND="python? ( ${PYTHON_DEPS} )
 DEPEND="${RDEPEND}
        dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) !gnat_2016"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}"/${MYP}-src
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
 src_compile() {
-       if use gnat_2017; then
-               GCC_VER=6.3.0
-       else
-               GCC_VER=7.3.1
-       fi
        build () {
-               GCC=${CHOST}-gcc-${GCC_VER} gprbuild -j$(makeopts_jobs) -m -p -v \
+               gprbuild -j$(makeopts_jobs) -m -p -v \
+                       -XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
                        -XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
                        -XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
                        -XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
@@ -61,6 +55,7 @@ src_compile() {
 src_install() {
        build () {
                gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
+                       -XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
                        -XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
        }
        for kind in shared static-libs static-pic ; do