Merge updates from master

7 files changed, 19 insertions, 81 deletions

diff --git a/dev-ada/asis/asis-2016.ebuild b/dev-ada/asis/asis-2016.ebuild
index 70735545b32d..99754dfea3c1 100644
--- a/dev-ada/asis/asis-2016.ebuild
+++ b/dev-ada/asis/asis-2016.ebuild
@@ -16,13 +16,11 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+gnat_2016 gnat_2017"
 
-DEPEND="dev-ada/gnat_util[gnat_2016=,gnat_2017=]
-	dev-ada/gnatcoll[gnat_2016=,gnat_2017=,projects,shared]
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]
-	dev-ada/xmlada[gnat_2016=,gnat_2017=]
-	gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
-RDEPEND="${RDEPEND}"
+RDEPEND="dev-ada/gnat_util[gnat_2016=,gnat_2017=]
+	dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,shared]"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
+
 REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
 
 S="${WORKDIR}"/${MYP}
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
index 79729c228420..000000000000
--- 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 8c6d81608c04..5d7f13c2235f 100644
--- 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
diff --git a/dev-ada/gnatcoll-core/files/gnatcoll-core-2018-gentoo.patch b/dev-ada/gnatcoll-core/files/gnatcoll-core-2018-gentoo.patch
index cedf710c0363..dcbe89df7837 100644
--- a/dev-ada/gnatcoll-core/files/gnatcoll-core-2018-gentoo.patch
+++ b/dev-ada/gnatcoll-core/files/gnatcoll-core-2018-gentoo.patch
@@ -1,13 +1,3 @@
---- a/gnatcoll.gpr	2018-06-12 21:37:42.664733336 +0200
-+++ b/gnatcoll.gpr	2018-06-12 21:38:07.965360000 +0200
-@@ -115,6 +115,7 @@
- 
-       for Switches ("gnatcoll_support.c") use
-          Compiler'Switches ("C") & Extra_Switches;
-+      for Driver ("C") use External ("GCC", "gcc");
- 
-    end Compiler;
- 
 --- a/src/gnatcoll-projects.ads.old	2017-11-25 14:50:06.919939453 +0100
 +++ b/src/gnatcoll-projects.ads	2017-11-25 14:50:38.932387204 +0100
 @@ -1917,7 +1917,8 @@
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild
index 88fa2a1f45ac..37d1058f21c9 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-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
@@ -13,7 +13,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a99
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic"
 
 RDEPEND="
@@ -23,14 +23,14 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
 
-REQUIRED_USE="!gnat_2016"
-
 S="${WORKDIR}"/${MYP}-src
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {
-	if use gnat_2017; then
+	if use gnat_2016; then
+		GCC_PV=4.9.4
+	elif use gnat_2017; then
 		GCC_PV=6.3.0
 	else
 		GCC_PV=7.3.1
@@ -48,7 +48,7 @@ src_configure() {
 
 src_compile() {
 	build () {
-		GCC=${CHOST}-gcc-${GCC_PV} gprbuild -p -m -j$(makeopts_jobs) \
+		gprbuild -p -m -j$(makeopts_jobs) \
 			-XBUILD=PROD -v -XGNATCOLL_VERSION=${PV} \
 			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$* -XGPR_BUILD=$1 \
 			gnatcoll.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
diff --git a/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch b/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch
index e6d5119aed4e..9d95a9bfc1c4 100644
--- a/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch
+++ b/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch
@@ -9,13 +9,3 @@
  
     Thread_Lib := ();
  
---- a/postgres/gnatcoll_postgres.gpr	2018-06-24 16:39:56.345322365 +0200
-+++ b/postgres/gnatcoll_postgres.gpr	2018-06-24 16:40:30.737772583 +0200
-@@ -81,6 +81,7 @@
-             for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ");
-             for Switches ("C") use ("-O2", "-Wunreachable-code") & PQP_Flag;
-       end case;
-+      for Driver ("C") use External ("GCC", "gcc");
-    end Compiler;
- 
-    package Binder is
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
index 48085f332679..b954b8f73271 100644
--- a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
+++ b/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
@@ -29,8 +29,7 @@ RDEPEND="dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=]
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
 
-REQUIRED_USE="!gnat_2016
-	gnatinspect? ( xref )
+REQUIRED_USE="gnatinspect? ( xref )
 	xref? ( sqlite )
 	sqlite? ( sql )
 	gnatcoll_db2ada? ( sql )"
@@ -40,10 +39,8 @@ S="${WORKDIR}"/${MYP}-src
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_compile() {
-	GCC_PV=7.3.1
 	build () {
-		GCC=${CHOST}-gcc-${GCC_PV} \
-			GPR_PROJECT_PATH="${S}/sql":"${S}/sqlite":"${S}/xref" \
+		GPR_PROJECT_PATH="${S}/sql":"${S}/sqlite":"${S}/xref" \
 			gprbuild -p -m -v -j$(makeopts_jobs) -XGNATCOLL_SQLITE=external \
 			-XGNATCOLL_VERSION=2018 \
 			-XBUILD=PROD -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 -XGPR_BUILD=$2 \