51 files changed, 244 insertions, 1265 deletions
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 294dce84c352..e36070b0f13f 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
index f68b35ec3341..5e0d709659a6 100644
--- a/dev-ada/asis/Manifest
+++ b/dev-ada/asis/Manifest
@@ -1,9 +1,9 @@
-AUX asis-2016-gentoo.patch 1535 BLAKE2B 726f03a935c9cf26f5fc405ff6d3c18d01405d5b6a61589a45d6cd8f1134646c9e8e57d496428d8e0c9ce613f1756d8bd027e16ab727d605db99ab4301f73da3 SHA512 7b78b1dc4824242c10f409ab4874c11f8dfcc977d31e1bd63e96915e3f8477efa737e35b6d3c1076f920155b89f51572528e1d309fcf450bdc3353ec32dd6bc2
+AUX asis-2016-gentoo.patch 1487 BLAKE2B 859aebba0bfe56ab846f82f2f75cb04c6b5edf25cd25175272f6da5e65356a8f82b205940e43b64832e25789c71a19ac0861d20fc44106bb06f1e05ec8d63f95 SHA512 93142623810c5a31e3d4d792144c2f352b4238a6fa96eec71489453bf6e9cfa084c0e3ec4d4e6bf37df09229f2f8045c82a4797a11555ef378774d0d2748a540
 AUX asis-2017-gentoo.patch 2030 BLAKE2B 261d2e32b818f17ea4ea51047cf71b73f89d918094397702d6b7f9eaa9e2edb39d754d12beb23b2b6b0a55012773767915c2dc3bd69db850558c8c3afbe44dd5 SHA512 9697264392827254fc23993979ddb1cef8276e8f699f776f85a4ce09fcaf2e87b68e4187622fc16c809d71e7e360626c72f5d5f7be33c72a9544996cbf1321f9
 DIST asis-gpl-2016-src.tar.gz 5240554 BLAKE2B b95be816f5f52ac2b29814c09166774884dc166df6e08b26769c9502443f9797c42a1f9b6168336636add6515b748b3ef4b38c6a1dc6f49c1afb9ecec8e50c50 SHA512 439195d4cb5d58328dcc8c815cb6a32c5f8ed1d6581246dfa5dcca7c212ffad38dd63df25e490c4ac628eaf8c8e6d286f8ea036b7f39499704565b60c1bba8ee
 DIST asis-gpl-2017-src.tar.gz 5909758 BLAKE2B 93b2f87c6945b27cff90cb3e227d6e6ae061dc6fc693ee8960cd9b4abf68cc398f6b6d7dba864399c8e007aee2a91789614b7d2bf146645a5d983f20c1ccbc64 SHA512 dee6b8e0851a4b3181d50256697865f7a6a613eef7b59e43cb1a0b066e794d927db9f60df33f7e1af343d41801a6b66feb1f7a963523b2442c85ca506d7e112f
 DIST asis-gpl-2018-src.tar.gz 5983604 BLAKE2B d91e3ff5cb95ec5b69121ed09e73f7bff234147b809353577315cd25cae0069ec5ebfc221a9798341b2a33bde316d74c4ce47c7ace580fe4d867e47032e207f2 SHA512 e00750adf17df8d534f0e561d129002d8b3c9efd6ba9c8d6768840d1399933271d748bafb7358a45d0a520620a335e669a6c2770ed89660bb319b609961a433a
-EBUILD asis-2016.ebuild 1175 BLAKE2B c896467c59d095c44b4f7bc83df71be00c5f416e707f08e688cd6770e53767710c456b1fcb75efff4192c52767c6238431e48c207c7ca5e8d19893a19a7dbd2f SHA512 46f43724b8b648f3a5a7d921209a08c59d3a4bdae75b1b4966dfdab8bdfe14cbdde01c2d1cba5e1a91d739a39838931d7ae17e4be486f2e281521cb70023c995
+EBUILD asis-2016.ebuild 1253 BLAKE2B 63b307cfa6f24c397538b3a2d9f301e922fcd2062a705f9fa00cb9be8e7f96a54d0a620438da7e15ce6b8acdb9fcfe98fc3477b6df39bfab0724765a1977d875 SHA512 b0ab62fda3dcdaba5d0c87893fedf8659d64c1a441a52e5859b3686a05beaa1a50de1916e3529f92ac0b301e83e85f10256ee42295b6d8823061d3ec31d89f7d
 EBUILD asis-2017.ebuild 1066 BLAKE2B dcca612165bfaa48d636e34606fb4f03eac1cf6fa5651458af91a923317090e5101911af771b82756eb6b0baf0bd6258b0d0c1a212f050f8294eaa8c92b61395 SHA512 6e1c71b2cbefa467fe434dbad8b600244adf6cda2f7cd40ab8497d093e483684591bdf571e6ad03019b90bc40494b7c7ec0b96b2540dc3f23dd3af8a69daeeef
 EBUILD asis-2018.ebuild 1094 BLAKE2B 8f7ad8347e9587d430565d39e6764bc4f1f8a4ca17df6278d9b1e2e798e30220b6b8446a76263d76f17ad64d0193459c63c646c70f0e9e23a92777bd44663a96 SHA512 4815766b0b98af239be713dfb3a97a4c2ece83a5e66ca50ce2c66d1ca9732e26ae112b514c660d268b6b1c641fe9a2f4cfabb322a8290e4cbd6c6a0fb8e067e9
 MISC metadata.xml 758 BLAKE2B aebcdb7e9be0cccf7350d68082d2461ec6a28c94df18dd936f689a3cf02a0139b96c0208fb7e8ff677ff0cb977199f8b4ef097faf6b3376624c4bf220845f216 SHA512 b673b7f404971e44cd09f746338dc2cd655b4b5cd0ced7a742e6986a8d454b4c2738a7576dd5b1ebe5fbea4ff073de60a1fbaf8dddac90e54981159affa0fb07
diff --git a/dev-ada/asis/asis-2016.ebuild b/dev-ada/asis/asis-2016.ebuild
index c83e81adbdf7..70735545b32d 100644
--- a/dev-ada/asis/asis-2016.ebuild
+++ b/dev-ada/asis/asis-2016.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
@@ -30,9 +30,11 @@ S="${WORKDIR}"/${MYP}
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_compile() {
-	emake PROCESSORS=$(makeopts_jobs)
+	emake PROCESSORS=$(makeopts_jobs) \
+		GPRBUILD_FLAGS="-vl"
 	emake tools PROCESSORS=$(makeopts_jobs) \
 		GPRBUILD_FLAGS="-vl \
+		-XGPR_BUILD=relocatable \
 		-XLIBRARY_TYPE=relocatable \
 		-XXMLADA_BUILD=relocatable"
 }
@@ -41,6 +43,7 @@ src_install() {
 	emake prefix="${D}"/usr install
 	emake prefix="${D}"/usr install-tools \
 		GPRINSTALL="gprinstall \
+		-XGPR_BUILD=relocatable \
 		-XLIBRARY_TYPE=relocatable \
 		-XXMLADA_BUILD=relocatable"
 }
diff --git a/dev-ada/asis/files/asis-2016-gentoo.patch b/dev-ada/asis/files/asis-2016-gentoo.patch
index c5ffda3628b9..11a83e0fda9f 100644
--- a/dev-ada/asis/files/asis-2016-gentoo.patch
+++ b/dev-ada/asis/files/asis-2016-gentoo.patch
@@ -1,6 +1,6 @@
---- asis-gpl-2015-src/Makefile.old	2017-01-03 13:59:38.106788092 +0000
-+++ asis-gpl-2015-src/Makefile	2017-01-03 14:01:43.735605615 +0000
-@@ -10,15 +10,18 @@
+--- a/Makefile	2017-01-03 13:59:38.106788092 +0000
++++ b/Makefile	2017-01-03 14:01:43.735605615 +0000
+@@ -10,15 +10,19 @@
  # ==================================================== build
  
  all:
@@ -19,13 +19,14 @@
  
  setup:
 -	$(GPRBUILD) -p  -XBLD=$(BLD) tools/tool_utils/generate_factory.gpr
-+	$(GPRBUILD) -p -j$(PROCESSORS) -XBLD=$(BLD) tools/tool_utils/generate_factory.gpr \
++	$(GPRBUILD) -p -j$(PROCESSORS) -XBLD=$(BLD) \
++	  $(GPRBUILD_FLAGS) tools/tool_utils/generate_factory.gpr \
 +	  -cargs $(ADAFLAGS)
  	rm -rf tools/tool_utils/ada_trees-factory.ads tools/tool_utils/ada_trees-factory.adb
  	rm -rf tools/gnat2xml/ada_trees-factory.ads tools/gnat2xml/ada_trees-factory.adb
  	cd tools/tool_utils ; ./ada_trees-generate_factory$(exe_ext)
---- asis-gpl-2016-src/Makefile.stub.old	2017-04-06 21:16:41.802376709 +0200
-+++ asis-gpl-2016-src/Makefile.stub	2017-04-06 21:17:01.627023825 +0200
+--- a/Makefile.stub	2017-04-06 21:16:41.802376709 +0200
++++ b/Makefile.stub	2017-04-06 21:17:01.627023825 +0200
 @@ -3,7 +3,6 @@
  
  # Where Asis library should be installed
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index 013e63f258a6..6134b86460c5 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -1,6 +1,4 @@
 AUX aunit-2016-gentoo.patch 374 BLAKE2B 00d34a835afdc4a1a80f8c4dad23ae4a30a89eb801c3aeb8177a4d0cb838b3edf0c8463c774da212a9be56378f493ddd41aa4a26d976a38f1800999903dd2263 SHA512 0ea27e0d8783788c83a3916071ea0dd5361f21a4fc67727b735986dfc624c9f1bd6aa471229c389f5453001577ca1eec0ecdd0865952a0aa5fe1453787dac33b
-DIST aunit-gpl-2017-src.tar.gz 638311 BLAKE2B aa551202677983451d1c8c9f248d85d58f6de442797ee5a3c14d418de1cd8e9a58a82ee7b8bb5b64da924265ef26c64b5d69e86f0103f0721b2c6e007896f6bb SHA512 8aad7acc472af127d7c140fb80bd8f1e26866daba2817a436851704bb9048c8347284c5cf2dd05c0c65590cf05ff01d035c3612a698d19607347e961174b3ab4
 DIST aunit-gpl-2018-src.tar.gz 639544 BLAKE2B a7d7469b0ec4951517b113a794dca4399a27d6d5d848194fc5bfa7728a5cd04644e4b5f1247eb3cfbab64c0294502ac70cdd6e7052cd60b788c7892eddb4294e SHA512 3409b490978e9160e3ec2d9214d50f846c4c38f7a728cd4ff306d6454d1e0944023342f17a580b0449cb528f42d3c608adec58b61318284237d02b7f77498513
-EBUILD aunit-2017.ebuild 1040 BLAKE2B d90758ca89ce116afcbb613e9496a8c71c736600ae69ee2d9505b9b6b922906ac37300449d406c4062340706ea4064e2198a4dc2c5a3de6339daeba00eb1ae8b SHA512 fbf380c4ede428883249f7661f515b1a91cdb0b828aba2be1a46be443d81134b242375aaf4e3f128fb5c1b41505149a229c16b1b7d5bc0bc627c51775aba0604
-EBUILD aunit-2018.ebuild 1161 BLAKE2B f0a0327a39e7f553a388cbcfaf8b51a6f34486d151e3ed5b21a819627353563b3199b6321aac7253a196ec9dd7537fa7f8fab7b24e7fc0392fabe4aefbc3d7cf SHA512 db296d515a5457449c0a3da7864458993d451532b330c2d0da06d84affcb6f844d0c1a1c1fa0e106ccb424c6e75c83eb0ce2d1817292c903e175c68d5fe182da
+EBUILD aunit-2018.ebuild 1156 BLAKE2B b432e80cad038926b2bfa98840e66b97de0e0403c4723340c85634152a99032bcfcdfe3751fceba7e173975f21db836ea89e189221bed59909cf58ac03e006a9 SHA512 82309c188fa9fce5f3f4a4fc12af988a589eb7adcf8a0311f4713990819bc82974cfeb382d099b0e29b02d1de7de72492affab7312be958dffc79b3903f09299
 MISC metadata.xml 1003 BLAKE2B 3e0c97d5fd20eca517240a72cc7164e48f6e89db9a3ee313e1493c5f613857fd5c118b6d588266fa59dc6fc66a6da88487367526082462e3dbebc1e41379af78 SHA512 f3b1d914eaa4d7d0aa2143ef00c9d42f6dd86dc5e913fbce014c36fec8b26c65127dbe7f10661759256899596b79d7aba49315f01e1176f9d0b97c8f4fe04dc4
diff --git a/dev-ada/aunit/aunit-2017.ebuild b/dev-ada/aunit/aunit-2017.ebuild
deleted file mode 100644
index b56e55701892..000000000000
--- a/dev-ada/aunit/aunit-2017.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multiprocessing
-
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="Ada unit testing framework"
-HOMEPAGE="http://libre.adacore.com/tools/aunit/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed000
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 +gnat_2017"
-
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
-
-src_compile() {
-	emake GPRBUILD="gprbuild -j$(makeopts_jobs)"
-}
-
-src_install() {
-	emake INSTALL="${D}"usr install
-	einstalldocs
-	mv "${D}"usr/share/doc/${PN}/* "${D}"usr/share/doc/${PF}/ || die
-	rmdir "${D}"usr/share/doc/${PN} || die
-	mv "${D}"usr/share/examples/${PN} "${D}"usr/share/doc/${PF}/examples || die
-	rmdir "${D}"usr/share/examples || die
-}
diff --git a/dev-ada/aunit/aunit-2018.ebuild b/dev-ada/aunit/aunit-2018.ebuild
index 48583df18f6f..ccb8643f3730 100644
--- a/dev-ada/aunit/aunit-2018.ebuild
+++ b/dev-ada/aunit/aunit-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
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27ab3
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 5301f800cfe9..dad8163cca98 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,6 +1,6 @@
-AUX aws-2016-gentoo.patch 1510 BLAKE2B 86cbe9166f800a1b8a3a7d388ff256c17527c85665ad0dd32408d180de59357b5f9a593d7e3ebb3bc511a0a234b2549f7e2e090cdc85e1ed98547cad1d3b5f02 SHA512 29f121d22f1dd21a1228a96c15ba28a61da1e07bdb57ae5f0ba2babb2c8d0b38bab21edeb44fb8480fcb4c9bdf55b1f20f7d6b3668943a1814a5564dd168c92d
+AUX aws-2016-gentoo.patch 1255 BLAKE2B a2b2d944a131d83b789fe91a1b31b062f039b2f6bafa870d524aefbdb59146a26ad5e7cc39222318aaa8ae9ccca663bead98e198aef845ce86d3195568a15d33 SHA512 53b4156f9c025969a8e2f603e1672949f7f2dd58a4c3d1a4ee8b17094a399bb207b6a242419ddd5e5a7e151ea3a72baee1c67f132aafb260ab5f89d8d12ad377
 DIST aws-gpl-2017-src.tar.gz 12298806 BLAKE2B 9c45d77dd44da11efe99c6e3128fc5920b39eaaf620e266b2dab394866c2d6a3cd1abe4eb01d9024960ef9046662c0df690f72c687fbe0a64b1021ed9c383828 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35
 DIST aws-gpl-2018-src.tar.gz 4193276 BLAKE2B 31fa99fc3324f2514799a33cbd282f68a26d133da14ee2a70d3f5091c3670e82a7b77f9f941e593e914a755dd54d5a1e352d201a9dc097991b7bd50aa9f54b3b SHA512 62b85f70dd722148bbf3ad85bfd6cde2d0ab1d8029f673eb7ee42b0890c3dbf0f023c321e96eca99ccd2f0b235347ab577cfb558e7d81993d166683ec815dbe4
-EBUILD aws-2017.ebuild 1083 BLAKE2B 83cc71d74f7a173f693d1ceef8ebfc53a233aa3f989965c6b01e69bd1818a93bf321fa324573fcaa68f671b87dd82ba669b4d796d5cae660d2dbc574e0d4e003 SHA512 4a6f7bb017bb860670066b7b5fe3a1e9d10d32a802a391b3d2df52197ae1918ac38b8c942c5433644e87f28ceccdcb0615f9f91d2fe528e14e5357952ef183e8
-EBUILD aws-2018.ebuild 1099 BLAKE2B 31da549c4ba92efb6f94be64fe23697136cefc6ee5b1151259089a0b558ef9ebe4c4a13b4bf795a50f6a024eaf512fe3e7d51f7ee4b016d5f12d7f7e0dec6ae5 SHA512 bfc7b14cc468476c9cf9dd653f1b7942f54cdf6bd6b244f4f0bb7586e158561a34254a5fe9a3f8fd442baa34535d8ee6f53e3699f6eb9804b242981d1641c75f
+EBUILD aws-2017.ebuild 1025 BLAKE2B f7b86bf4a470b5376061b4ce47263889f66d68cde383136312d979959d9c1f59e96d8367d242e44ec750bf6e006d7144f1fb337bbdcac6f95f2a42b82b3e0756 SHA512 23a477b56590afe16de4fc6707fc776daf431a0f576d002bbf0ab5305694b2d0f701bb5d4c85ca622bb4b13f3f3c7c7760820457688b5ee6bb78984558a68df5
+EBUILD aws-2018.ebuild 1000 BLAKE2B a98819d89f3a2c0c55fa5c812f62e15b269a81aa3e5398ce6a7fc8547b8b45adc4d8944f178cbebbfa9f52c22367acd24c2b819a7cd4c5a21ce4081f4300eb39 SHA512 fc3786e85ffb6748cae332ca9411a04f7c1a24649d91f37444af18be2de8378783f89994cebacf035e903e33a1b607f51f0080d521fc2137884f0289bf8a00ff
 MISC metadata.xml 910 BLAKE2B 32c65b10f1286c68aaf8c4eb5d5078dca8b09a451ec02d1a845282124b71cac7363e8f068910fe6908befcf49d9e476f30f53b78bd66d6269cb7cb38f5d69597 SHA512 e3b9b10331c66b3e3ce4bb0b74a1c426656d33ffb37936a433fad3f7fc2e64de233c7d18158c5eea409d406ebe1edcf77135e7b490bec40387adc8b0928cad5a
diff --git a/dev-ada/aws/aws-2017.ebuild b/dev-ada/aws/aws-2017.ebuild
index 77fbba8c7964..081d598a0027 100644
--- a/dev-ada/aws/aws-2017.ebuild
+++ b/dev-ada/aws/aws-2017.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
@@ -29,16 +29,12 @@ S="${WORKDIR}"/${MY_P}
 PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
 
 src_configure() {
-	emake -j1 setup prefix=/usr
+	emake -j1 setup prefix=/usr \
+		GPRBUILD="/usr/bin/gprbuild -v"
 }
 
 src_compile() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	else
-		GCC_PV=6.3.0
-	fi
-	emake GCC=${CHOST}-gcc-${GCC_PV} \
+	emake \
 		PROCESSORS=$(makeopts_jobs) \
 		DEBUG=true \
 		GPRBUILD="/usr/bin/gprbuild -v"
diff --git a/dev-ada/aws/aws-2018.ebuild b/dev-ada/aws/aws-2018.ebuild
index 4222e66bbdd8..f18391af4105 100644
--- a/dev-ada/aws/aws-2018.ebuild
+++ b/dev-ada/aws/aws-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
@@ -28,18 +28,12 @@ S="${WORKDIR}"/${MY_P}
 PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
 
 src_configure() {
-	emake -j1 setup prefix=/usr ENABLE_SHARED=true
+	emake -j1 setup prefix=/usr ENABLE_SHARED=true \
+		GPRBUILD="/usr/bin/gprbuild -v"
 }
 
 src_compile() {
-	if use gnat_2018; then
-		GCC_PV=7.3.1
-	elif use gnat_2017; then
-		GCC_PV=6.3.0
-	else
-		GCC_PV=4.9.4
-	fi
-	emake GCC=${CHOST}-gcc-${GCC_PV} \
+	emake \
 		PROCESSORS=$(makeopts_jobs) \
 		GPRBUILD="/usr/bin/gprbuild -v"
 }
diff --git a/dev-ada/aws/files/aws-2016-gentoo.patch b/dev-ada/aws/files/aws-2016-gentoo.patch
index b33073afa443..8894e014e333 100644
--- a/dev-ada/aws/files/aws-2016-gentoo.patch
+++ b/dev-ada/aws/files/aws-2016-gentoo.patch
@@ -1,13 +1,5 @@
---- aws-gpl-2016-src/shared.gpr.old	2017-01-30 20:00:39.022743691 +0100
-+++ aws-gpl-2016-src/shared.gpr	2017-01-30 20:01:20.524985069 +0100
-@@ -130,6 +130,7 @@
-    package Compiler is
- 
-       for Driver ("Makefile") use "";
-+      for Driver ("C") use External ("GCC", "gcc");
- 
-       case Build is
-          when "Debug" =>
+--- a/shared.gpr	2017-01-30 20:00:39.022743691 +0100
++++ b/shared.gpr	2017-01-30 20:01:20.524985069 +0100
 @@ -151,11 +151,11 @@
        end case;
  
@@ -23,8 +15,8 @@
        --  Disable validity check on this unit to work-around N728-028
  
        --  ADAFLAGS and CFLAGS should come last so that command line
---- aws-gpl-2016-src/include/include.gpr.old	2017-02-17 22:09:14.361695926 +0100
-+++ aws-gpl-2016-src/include/include.gpr	2017-02-17 22:11:36.497215517 +0100
+--- a/include/include.gpr	2017-02-17 22:09:14.361695926 +0100
++++ b/include/include.gpr	2017-02-17 22:11:36.497215517 +0100
 @@ -54,7 +54,7 @@
  
           when "Release" =>
diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest
index 829505901c9a..11bd5f56b0ce 100644
--- a/dev-ada/gnatcoll/Manifest
+++ b/dev-ada/gnatcoll/Manifest
@@ -1,7 +1,4 @@
-AUX gnatcoll-2016-gentoo.patch 14137 BLAKE2B 9e3c7086a4ecce79dbb7d2c21f5d97b46bf30c7665b416c0266ed59610886192b2931dde20b3ed605bdcfd5587125755acc229a1739ace97e1a6138a9a30710c SHA512 641da348023eedb141e555148056e591af09ef31954178c128a4627bff80777e3e274663bdc4ea712afc10cd902efb186a0bba9b03b7f67f6655944af83ff8d0
-AUX gnatcoll-2017-gentoo.patch 10577 BLAKE2B 02d129052b0b10429ce8e003b0a0759a547884f92d67b0018170f8d2e8719cf22da1f277f9568673006e8f7abdb4759ec37626e3b4260d343f5560e479f0c729 SHA512 bf61075b9ce327b37d01f36d8fcb38f6f2e197167abb02a1dee9a96d456a710c986ed079a40e07edceb280281f8c8465315f09e5a0e3b880f3db44371ae3efef
-DIST gnatcoll-gpl-2016-src.tar.gz 5687584 BLAKE2B 0ff5489f3e02ceeb44292f0d13907959884a55ec8f00fcadb21ee4e8a07f863a3bae3c7ae18d3fc669895a76b5f8f495699d31af71940a5abd32b156ad5fe247 SHA512 8cf06e7c5d58d3b159855534791e7969882e04856ba9d03982a63dcfc630f5b5910c6cad57fec9b00c3d04008b0cb0a1fb238e349766348fa4548868238ede8a
+AUX gnatcoll-2017-gentoo.patch 5731 BLAKE2B 392f9cd7f76b835c03646a52eb651bad4094f7ebb51f36a1168ce36b5ab9ff29f287437aa9fd9f2f1a5351f4ee04dbd3a21ea096f0e918d1c61b5822c14c552c SHA512 d15a05823419e763e96cc8d8c8202cac30511d555413fa9b45a79275b5325dda53271b7dbb2cc3a7d1583269b32738a82f3adcb0282bdee4588247c9e8b32e12
 DIST gnatcoll-gpl-2017-src.tar.gz 5785988 BLAKE2B 828aff797f7d992bf3f5dda7f8ce8a79e97ecd98253a657fb6e79a2fd08aac97e19cb421f47010f8c1f26442a013b9126ab3a95353d9ce0f29d071601e9dfe2f SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363
-EBUILD gnatcoll-2016.ebuild 3054 BLAKE2B 7a0bbdff620eba5c2fa4d5741bc16af0e0a041350480740f6c3f3950f853f62ccf1373c11c98d21a290fbcb6b767713fbcb360ec8f59cdb634d1b791f8644284 SHA512 0d86e9b77320282b2c3044bda968465abc1157e114c113ae891776aa0f480c62158f2d7ad94cee2b77b570a4c89440d5b7863c18403886b9b509d88d80652f25
-EBUILD gnatcoll-2017.ebuild 3182 BLAKE2B 7bed5c75933d402a26f62f83922df50ab786980ce80059abf833f0ceab9f9e421c257a84ef5f9c5cafc506b22e7c29d2f158d20c1653e3c72a1286668025cec4 SHA512 a1a8fb749a8df6276b33c19063ea9e5d59543e8abf1fea7ec32725ba00166aed1d11ddb77b9d5322a05da6522c45cba6730602b1902c5ebdf79cd05467c6e682
+EBUILD gnatcoll-2017.ebuild 3176 BLAKE2B b271efb01c404f10f97b247300d1157fc873ac60cd6abe335fb68c84de60bc16cf433da1b73a21cb1462d2219b550acf0e1e1282e749f4f3e6f7171f63fa0d44 SHA512 8a4a005d7bb43b15873744a2de1b19dbb6e318d257fab99429e36f181337b3bf9ab73f0e0b29d331a099549d50fc9e38f7192ecbd9338f85cc0af7230f1947da
 MISC metadata.xml 1362 BLAKE2B 0660675cc1821ffb20a9a80bce768db18252bf049f6f52cf3389a7681cc4a31b040350008e6477a2259c8faba5689525586cd35cdf4bcb9df298941021c5a0bd SHA512 64620ff6da6c812968ac057a3724b9733d4d14e1cacd654bf750efe33f64910ae74da07bbca0d6996f58405c083636e574f1b93958d0fe4447e1896ded2b3940
diff --git a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
deleted file mode 100644
index 1a1d4d14eec2..000000000000
--- a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
+++ /dev/null
@@ -1,333 +0,0 @@
---- gnatcoll-gpl-2016-src/Makefile.old	2017-01-20 19:39:07.131398270 +0100
-+++ gnatcoll-gpl-2016-src/Makefile	2017-01-20 19:42:30.088728844 +0100
-@@ -34,19 +36,19 @@
- 	@${RM} src/gnatcoll-atomic.adb
- 
- 	@echo "====== Building $(@F) libraries ======"
--	${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full
-+	${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full -cargs ${ADAFLAGS}
- 
- 	@# Need to build libgnatcoll_gtk separately, because its project files
- 	@# requires gtkada.gpr, which might not exist on the machine.
- ifeq (${WITH_GTK},yes)
--	${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk
-+	${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk -cargs ${ADAFLAGS}
- endif
- 
- 	@# Build the tools (the list is the project\'s Main attribute)
- 	@# They are not build as part of the above because only the Main from
- 	@# gnatcoll_full.gpr are build. We could use aggregate projects to
- 	@# speed things up.
--	${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools
-+	${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools -cargs ${ADAFLAGS}
- 
- #######################################################################
- #  install
---- gnatcoll-gpl-2015-src/src/gnatcoll_gmp.gpr.in.old	2017-01-07 08:52:14.921110195 +0100
-+++ gnatcoll-gpl-2015-src/src/gnatcoll_gmp.gpr.in	2017-01-07 08:55:35.718946607 +0100
-@@ -24,6 +24,7 @@
- 
-    package Compiler is
-       for Switches ("Ada") use Gnatcoll_Shared.Compiler'Switches ("Ada");
-+      for Driver ("C") use External ("CC", "gcc");
-       for Switches ("C") use Gnatcoll_Shared.Compiler'Switches ("C")
-         & (@GMP_CFLAGS_GPR@);
-    end Compiler;
---- gnatcoll-gpl-2015-src/src/gnatcoll_iconv.gpr.old	2017-01-07 08:58:01.361112843 +0100
-+++ gnatcoll-gpl-2015-src/src/gnatcoll_iconv.gpr	2017-01-07 08:58:23.653687385 +0100
-@@ -26,6 +26,7 @@
- 
-    package Compiler is
-       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
-+      for Driver ("C") use External ("CC", "gcc");
-       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C")
-           & GnatColl_Shared.Iconv_Include;
-    end Compiler;
---- gnatcoll-gpl-2015-src/src/gnatcoll_sqlite.gpr.old	2017-01-07 09:00:17.146448202 +0100
-+++ gnatcoll-gpl-2015-src/src/gnatcoll_sqlite.gpr	2017-01-07 09:00:44.884885281 +0100
-@@ -60,8 +60,9 @@
- 
-                   --  force full optimization for sqlite, we do not debug it
-                   --  in any case.
--                  "-O3") & Gnatcoll_Shared.Sqlite_Switches;
-+                  "-O3", "-fPIC") & Gnatcoll_Shared.Sqlite_Switches;
-       end case;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
-    package Linker is
---- gnatcoll-gpl-2015-src/src/gnatcoll_postgres.gpr.old	2017-01-07 09:05:09.177756146 +0100
-+++ gnatcoll-gpl-2015-src/src/gnatcoll_postgres.gpr	2017-01-07 09:05:34.282279733 +0100
-@@ -38,6 +38,7 @@
-            for Switches ("C") use
-               GnatColl_Shared.Compiler'Switches ("C");
-       end case;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
-    package Linker is
---- gnatcoll-gpl-2015-src/src/gnatcoll_python.gpr.in.old	2017-01-07 09:12:30.490399897 +0100
-+++ gnatcoll-gpl-2015-src/src/gnatcoll_python.gpr.in	2017-01-07 09:12:53.111976591 +0100
-@@ -30,7 +30,8 @@
-         GnatColl_Shared.Compiler'Switches ("Ada");
- 
-       for Switches ("C") use
--        ("-g", "-O2") & GnatColl_Shared.Python_Cflags;
-+        ("-g", "-O2", "-fPIC") & GnatColl_Shared.Python_Cflags;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
-    package Linker is
---- gnatcoll-gpl-2016-src/gnatcoll_shared.gpr.in.old	2017-01-20 19:50:03.222808656 +0100
-+++ gnatcoll-gpl-2016-src/gnatcoll_shared.gpr.in	2017-01-20 19:50:28.200399274 +0100
-@@ -13,7 +13,7 @@
- 
-    type Yes_No is ("yes", "no");
-    Gtk    : Yes_No := External ("GTK", "@WITH_GTK@");
--   Python : Yes_No := External ("PYTHON", "@WITH_PYTHON@");
-+   Python : Yes_No := "@WITH_PYTHON@";
-    Syslog : Yes_No := External ("SYSLOG", "@WITH_SYSLOG@");
-    Postgres : Yes_No := External ("POSTGRES", "@WITH_POSTGRES@");
-    type Sqlite_Inclusion is ("yes", "no", "embedded");
-@@ -67,7 +67,7 @@
- 
-          when "Production" =>
-             for Switches ("Ada") use ("-O2", "-gnatn", "-gnatws");
--            for Switches ("C") use ("-O2", "-Wunreachable-code");
-+            for Switches ("C") use ("-O2", "-Wunreachable-code", "-fPIC");
-       end case;
- 
-       case Syslog is
---- gnatcoll-gpl-2016-src/src/gnatcoll_gtk.gpr.in.old	2017-01-20 19:53:16.647607400 +0100
-+++ gnatcoll-gpl-2016-src/src/gnatcoll_gtk.gpr.in	2017-01-20 19:53:57.302925708 +0100
-@@ -63,11 +63,12 @@
-       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
- 
-       for Switches ("C") use
--        ("-g", "-O2")
-+        ("-g", "-O2", "-fPIC")
-         & GnatColl_Shared.Python_Cflags
-         & GnatColl_Shared.Pygtk_Include
-         & GnatColl_Shared.PyGobject_Include
-         & Gtk_Include;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
-    package Linker is
---- gnatcoll-gpl-2016-src/src/gnatcoll__libgpr.gpr.old	2017-02-04 15:56:11.685079607 +0100
-+++ gnatcoll-gpl-2016-src/src/gnatcoll__libgpr.gpr	2017-02-04 15:57:00.383221978 +0100
-@@ -49,6 +49,8 @@
-    package Builder renames GnatColl_Shared.Builder;
- 
-    package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+
-       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
-       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C");
-       for Switches ("sinfo.adb") use Compiler'Switches ("Ada") & ("-gnatg");
---- gnatcoll-gpl-2016-src/src/gnatcoll__nogpr.gpr.old	2017-02-04 15:58:41.008450044 +0100
-+++ gnatcoll-gpl-2016-src/src/gnatcoll__nogpr.gpr	2017-02-04 15:59:02.815066080 +0100
-@@ -64,6 +64,7 @@
-       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
-       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C");
-       for Switches ("sinfo.adb") use Compiler'Switches ("Ada") & ("-gnatg");
-+      for Driver ("C") use External ("CC", "gcc");
- 
-       case GnatColl_Shared.Atomics is
-          when "intrinsic" =>
---- gnatcoll-gpl-2016-src/aclocal.m4.old	2017-04-06 08:25:14.796699365 +0200
-+++ gnatcoll-gpl-2016-src/aclocal.m4	2017-04-06 08:25:36.622318016 +0200
-@@ -45,7 +45,7 @@
-    cat > conftest.ada <<EOF
- [$3]
- EOF
--   if AC_TRY_COMMAND([gnatchop -q conftest.ada && $1 $2 >/dev/null 2>conftest.out])
-+   if AC_TRY_COMMAND([${GNATCHOP} -q conftest.ada && $1 $2 >/dev/null 2>conftest.out])
-    then
-       : Success
-       $4
-@@ -68,7 +68,7 @@
- AC_DEFUN(AM_HAS_INTRINSIC_SYNC_COUNTERS,
- [
-   AC_MSG_CHECKING([whether platform supports atomic inc/dec])
--  AM_TRY_ADA([gnatmake], [check.adb],
-+  AM_TRY_ADA([${GNATMAKE}], [check.adb],
- [
- with Interfaces; use Interfaces;
- procedure Check is
---- gnatcoll-gpl-2016-src/testsuite/json/__init__.py.old	2017-04-24 17:52:34.158513249 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/json/__init__.py	2017-04-24 17:52:52.636207017 +0200
-@@ -21,7 +21,7 @@
-     @requires_not_aix    # Storage_Error on that machine
-     @chdir("MB28-001")
-     def test_MB28_001(self):
--        self.runexec(["python", "make_json.py"])
-+        self.runexec(["python2.7", "make_json.py"])
-         self.gprbuild()
-         self.runexec("json_stack_test", "test.out")
- 
---- gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c1/c.gpr.old	2017-04-24 18:00:21.652975475 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c1/c.gpr	2017-04-24 18:01:23.035983670 +0200
-@@ -15,6 +15,7 @@
-       for Default_Switches ("ada") use
-         ("-g", "-gnatQ", "-O1", "-gnatf", "-gnato", "-gnatwa.Xe", "-gnaty");
-       for Switches ("c") use ("-fdump-xref");
-+      for Driver ("c") use External ("CC", "gcc");
-    end Compiler;
- 
- end c;
---- gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c2/c.gpr.old	2017-04-24 18:01:28.394896928 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c2/c.gpr	2017-04-24 18:01:44.343638682 +0200
-@@ -15,6 +15,7 @@
-       for Default_Switches ("ada") use
-         ("-g", "-gnatQ", "-O1", "-gnatf", "-gnato", "-gnatwa.Xe", "-gnaty");
-       for Switches ("C") use ("-fdump-xref");
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
- end c;
---- gnatcoll-gpl-2016-src/testsuite/projects/__init__.py.old	2017-04-24 19:10:30.465246199 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/projects/__init__.py	2017-04-24 19:10:42.768035080 +0200
-@@ -105,25 +105,6 @@
-         self.gprbuild("default.gpr")
-         self.runexec("main", "")
- 
--    @support.requires_not_windows
--    @chdir("N918-040")
--    def test_bareboard(self):
--        self.create_fake_bb_compiler('install', 'arm-eabi', '6.1.0w', '3.4.6')
--
--        # Make sure auto.cgpr is not deleted on exit
--        try:
--            os.unlink('auto.cgpr')
--        except:
--            pass
--        self.gprbuild('main_prj', switches=['--autoconf=auto.cgpr'])
--        m = re.search('for Target use "(.*?)"', open('auto.cgpr').read())
--        target = m.group(1)
--
--        def customFilter(actual):
--            return actual.replace(target, "<native>")
--
--        self.runexec(['sh', 'test.sh'], 'test.out', customFilter=customFilter)
--
-     @chdir("NB12-045")
-     def test_NB12_045(self):
-         # Test registering attribute in unknown package
---- gnatcoll-gpl-2016-src/testsuite/xref/tabs/default.gpr.old	2017-04-24 20:01:55.535913959 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/tabs/default.gpr	2017-04-24 20:02:51.740950192 +0200
-@@ -1,3 +1,6 @@
- project Default is
-    for Languages use ("Ada", "C");
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/doc1/dummy.gpr.old	2017-04-24 20:04:12.012574064 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/doc1/dummy.gpr	2017-04-24 20:04:54.025853974 +0200
-@@ -6,4 +6,7 @@
-       for Body_Suffix ("c++") use ".cc";
-    end Naming;
- 
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Dummy;
---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref3/default.gpr.old	2017-04-24 20:08:06.018564544 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref3/default.gpr	2017-04-24 20:08:53.682748215 +0200
-@@ -1,3 +1,7 @@
- project Default is
-    for Languages use ("C");
-+
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref2/default.gpr.old	2017-04-24 20:10:00.146610101 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref2/default.gpr	2017-04-24 20:10:40.512919251 +0200
-@@ -1,3 +1,7 @@
- project Default is
-    for Languages use ("C");
-+
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end COmpiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref1/default.gpr.old	2017-04-24 20:13:28.543059408 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref1/default.gpr	2017-04-24 20:14:05.513430176 +0200
-@@ -1,3 +1,7 @@
- project Default is
-    for Languages use ("C");
-+
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_expr1/default.gpr.old	2017-04-24 20:15:26.420053157 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_expr1/default.gpr	2017-04-24 20:16:12.695265558 +0200
-@@ -1,3 +1,6 @@
- project Default is
-    for Languages use ("C");
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_enum/dummy.gpr.old	2017-04-24 20:16:53.562570024 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_enum/dummy.gpr	2017-04-24 20:17:32.086914323 +0200
-@@ -4,4 +4,7 @@
-       for Spec_Suffix ("c++") use ".h";
-       for Body_Suffix ("c++") use ".cc";
-    end Naming;
-+   package Compiler is
-+      for Driver ("c") use External ("CC", "gcc");
-+   end Compiler;
- end Dummy;
---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_dbi_error/dummy.gpr.old	2017-04-24 20:18:03.688376474 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_dbi_error/dummy.gpr	2017-04-24 20:18:52.761541251 +0200
-@@ -1,3 +1,6 @@
- project Dummy is
-    for Languages use ("c");
-+   package Compiler is
-+      for Driver ("c") use External ("CC", "gcc");
-+   end Compiler;
- end Dummy;
---- gnatcoll-gpl-2016-src/testsuite/xref/L821-017-import/default.gpr.old	2017-04-24 20:19:40.401730504 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/L821-017-import/default.gpr	2017-04-24 20:22:52.303465944 +0200
-@@ -4,5 +4,6 @@
-    package Compiler is
-       for Switches ("C") use ("-fsyntax-only", "-fdump-xref");
-       for Switches ("C++") use ("-fsyntax-only", "-fdump-xref");
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/E224-007-change_obj_dir-c/default.gpr.old	2017-04-24 20:31:02.679123516 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/E224-007-change_obj_dir-c/default.gpr	2017-04-24 20:31:42.515445784 +0200
-@@ -8,4 +8,7 @@
-       when "release"  => for Object_Dir use "obj1";
-       when "debug"    => for Object_Dir use "obj2";
-    end case;
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/I401-027/default.gpr.old	2017-04-24 20:32:45.175379776 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/I401-027/default.gpr	2017-04-24 20:33:16.130853112 +0200
-@@ -7,6 +7,7 @@
-    package Compiler is
- 	   for Default_Switches ("Ada") use ("-gnatws");
- 	   for Default_Switches ("C") use ("-fdump-xref");
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
- end Default;
---- gnatcoll-gpl-2016-src/src/tools/gnatcoll_db2ada.adb.old	2017-04-24 21:36:09.193973179 +0200
-+++ gnatcoll-gpl-2016-src/src/tools/gnatcoll_db2ada.adb	2017-04-24 21:36:16.029858932 +0200
-@@ -211,7 +211,7 @@
- 
-       declare
-          Output : constant String := Get_Command_Output
--           (Command     => "python",
-+           (Command     => "python2.7",
-             Arguments   => Args,
-             Input       => "",
-             Status      => Status'Access,
diff --git a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
index ecec0b784589..36da82626f4c 100644
--- a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
+++ b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
@@ -1,63 +1,45 @@
---- gnatcoll-gpl-2016-src/Makefile.old	2017-01-20 19:39:07.131398270 +0100
-+++ gnatcoll-gpl-2016-src/Makefile	2017-01-20 19:42:30.088728844 +0100
-@@ -49,12 +49,12 @@
+--- a/Makefile	2017-01-20 19:39:07.131398270 +0100
++++ b/Makefile	2017-01-20 19:42:30.088728844 +0100
+@@ -43,18 +43,18 @@
+ 
+ # Build either type of library. The argument (%) is the type of library to build
+ 
+-GPRBLD_OPTS=-p -m -j${PROCESSORS} -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build} -XXMLADA_BUILD=$(@F)
++GPRBLD_OPTS=-p -m -j${PROCESSORS} -XGPR_BUILD=$(@F) -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build} -XXMLADA_BUILD=$(@F)
+ 
+ build_library_type/%: generate_sources
  	@${RM} src/gnatcoll-atomic.adb
  
  	@echo "====== Building $(@F) libraries ======"
 -	${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full
-+	${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full -cargs ${ADAFLAGS}
++	${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full -v -cargs ${ADAFLAGS}
  
  	@# Need to build libgnatcoll_gtk separately, because its project files
  	@# requires gtkada.gpr, which might not exist on the machine.
  ifeq (${WITH_GTK},yes)
 -	${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk
-+	${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk -cargs ${ADAFLAGS}
++	${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk -v -cargs ${ADAFLAGS}
  endif
  
  build_tools/%: build_library_type/%
-@@ -63,7 +63,7 @@
+@@ -63,13 +63,14 @@
  	@# They are not build as part of the above because only the Main from
  	@# gnatcoll_full.gpr are build. We could use aggregate projects to
  	@# speed things up.
 -	${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools
-+	${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools -cargs ${ADAFLAGS}
++	${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools -v -cargs ${ADAFLAGS}
  
  #######################################################################
  #  install
---- gnatcoll-gpl-2015-src/src/gnatcoll_iconv.gpr.old	2017-01-07 08:58:01.361112843 +0100
-+++ gnatcoll-gpl-2015-src/src/gnatcoll_iconv.gpr	2017-01-07 08:58:23.653687385 +0100
-@@ -26,6 +26,7 @@
  
-    package Compiler is
-       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
-+      for Driver ("C") use External ("GCC", "gcc");
-       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C")
-           & GnatColl_Shared.Iconv_Include;
-    end Compiler;
---- gnatcoll-gpl-2015-src/src/gnatcoll_sqlite.gpr.old	2017-01-07 09:00:17.146448202 +0100
-+++ gnatcoll-gpl-2015-src/src/gnatcoll_sqlite.gpr	2017-01-07 09:00:44.884885281 +0100
-@@ -60,8 +60,9 @@
+ GPRINST_OPTS=-p -f --prefix=${prefix} --install-name=gnatcoll \
+ 	--exec-subdir=${bindir} --project-subdir=lib/gnat -XXMLADA_BUILD=$(@F) \
++	-XGPR_BUILD=$(@F) \
+ 	--build-var=LIBRARY_TYPE --build-name=$(@F) -XLIBRARY_TYPE=$(@F)
  
-                   --  force full optimization for sqlite, we do not debug it
-                   --  in any case.
-                   "-O3") & Gnatcoll_Shared.Sqlite_Switches;
-       end case;
-+      for Driver ("C") use External ("GCC", "gcc");
-    end Compiler;
- 
-    package Linker is
---- gnatcoll-gpl-2015-src/src/gnatcoll_postgres.gpr.old	2017-01-07 09:05:09.177756146 +0100
-+++ gnatcoll-gpl-2015-src/src/gnatcoll_postgres.gpr	2017-01-07 09:05:34.282279733 +0100
-@@ -38,6 +38,7 @@
-            for Switches ("C") use
-               GnatColl_Shared.Compiler'Switches ("C");
-       end case;
-+      for Driver ("C") use External ("GCC", "gcc");
-    end Compiler;
- 
-    package Linker is
---- gnatcoll-gpl-2016-src/gnatcoll_shared.gpr.in.old	2017-01-20 19:50:03.222808656 +0100
-+++ gnatcoll-gpl-2016-src/gnatcoll_shared.gpr.in	2017-01-20 19:50:28.200399274 +0100
+ install-clean:
+--- a/gnatcoll_shared.gpr.in	2017-01-20 19:50:03.222808656 +0100
++++ b/gnatcoll_shared.gpr.in	2017-01-20 19:50:28.200399274 +0100
 @@ -13,7 +13,7 @@
  
     type Yes_No is ("yes", "no");
@@ -67,29 +49,8 @@
     Syslog    : Yes_No := External ("SYSLOG", "@WITH_SYSLOG@");
     Postgres  : Yes_No := External ("POSTGRES", "@WITH_POSTGRES@");
     type Sqlite_Inclusion is ("yes", "no", "embedded");
---- gnatcoll-gpl-2016-src/src/gnatcoll__libgpr.gpr.old	2017-02-04 15:56:11.685079607 +0100
-+++ gnatcoll-gpl-2016-src/src/gnatcoll__libgpr.gpr	2017-02-04 15:57:00.383221978 +0100
-@@ -49,6 +49,8 @@
-    package Builder renames GnatColl_Shared.Builder;
- 
-    package Compiler is
-+      for Driver ("C") use External ("GCC", "gcc");
-+
-       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
-       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C");
-       for Switches ("sinfo.adb") use Compiler'Switches ("Ada") & ("-gnatg");
---- gnatcoll-gpl-2016-src/src/gnatcoll__nogpr.gpr.old	2017-02-04 15:58:41.008450044 +0100
-+++ gnatcoll-gpl-2016-src/src/gnatcoll__nogpr.gpr	2017-02-04 15:59:02.815066080 +0100
-@@ -64,6 +64,7 @@
-       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
-       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C");
-       for Switches ("sinfo.adb") use Compiler'Switches ("Ada") & ("-gnatg");
-+      for Driver ("C") use External ("GCC", "gcc");
- 
-       case GnatColl_Shared.Atomics is
-          when "intrinsic" =>
---- gnatcoll-gpl-2016-src/aclocal.m4.old	2017-04-06 08:25:14.796699365 +0200
-+++ gnatcoll-gpl-2016-src/aclocal.m4	2017-04-06 08:25:36.622318016 +0200
+--- a/aclocal.m4	2017-04-06 08:25:14.796699365 +0200
++++ b/aclocal.m4	2017-04-06 08:25:36.622318016 +0200
 @@ -45,7 +45,7 @@
     cat > conftest.ada <<EOF
  [$3]
@@ -108,8 +69,8 @@
  [
  with Interfaces; use Interfaces;
  procedure Check is
---- gnatcoll-gpl-2016-src/testsuite/json/__init__.py.old	2017-04-24 17:52:34.158513249 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/json/__init__.py	2017-04-24 17:52:52.636207017 +0200
+--- a/testsuite/json/__init__.py	2017-04-24 17:52:34.158513249 +0200
++++ b/testsuite/json/__init__.py	2017-04-24 17:52:52.636207017 +0200
 @@ -21,7 +21,7 @@
      @requires_not_aix    # Storage_Error on that machine
      @chdir("MB28-001")
@@ -119,26 +80,8 @@
          self.gprbuild()
          self.runexec("json_stack_test", "test.out")
  
---- gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c1/c.gpr.old	2017-04-24 18:00:21.652975475 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c1/c.gpr	2017-04-24 18:01:23.035983670 +0200
-@@ -15,5 +15,6 @@
-       for Default_Switches ("ada") use
-         ("-g", "-gnatQ", "-O1", "-gnatf", "-gnato", "-gnatwa.Xe", "-gnaty");
-+      for Driver ("c") use External ("GCC", "gcc");
-    end Compiler;
- 
- end c;
---- gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c2/c.gpr.old	2017-04-24 18:01:28.394896928 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c2/c.gpr	2017-04-24 18:01:44.343638682 +0200
-@@ -15,5 +15,6 @@
-       for Default_Switches ("ada") use
-         ("-g", "-gnatQ", "-O1", "-gnatf", "-gnato", "-gnatwa.Xe", "-gnaty");
-+      for Driver ("C") use External ("GCC", "gcc");
-    end Compiler;
- 
- end c;
---- gnatcoll-gpl-2016-src/testsuite/projects/__init__.py.old	2017-04-24 19:10:30.465246199 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/projects/__init__.py	2017-04-24 19:10:42.768035080 +0200
+--- a/testsuite/projects/__init__.py	2017-04-24 19:10:30.465246199 +0200
++++ b/testsuite/projects/__init__.py	2017-04-24 19:10:42.768035080 +0200
 @@ -105,25 +105,6 @@
          self.gprbuild("default.gpr")
          self.runexec("main", "")
@@ -165,27 +108,8 @@
      @chdir("NB12-045")
      def test_NB12_045(self):
          # Test registering attribute in unknown package
---- gnatcoll-gpl-2016-src/testsuite/xref/tabs/default.gpr.old	2017-04-24 20:01:55.535913959 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/tabs/default.gpr	2017-04-24 20:02:51.740950192 +0200
-@@ -1,3 +1,6 @@
- project Default is
-    for Languages use ("Ada", "C");
-+   package Compiler is
-+      for Driver ("C") use External ("GCC", "gcc");
-+   end Compiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/doc1/dummy.gpr.old	2017-04-24 20:04:12.012574064 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/doc1/dummy.gpr	2017-04-24 20:04:54.025853974 +0200
-@@ -6,4 +6,7 @@
-       for Body_Suffix ("c++") use ".cc";
-    end Naming;
- 
-+   package Compiler is
-+      for Driver ("C") use External ("GCC", "gcc");
-+   end Compiler;
- end Dummy;
---- gnatcoll-gpl-2016-src/src/tools/gnatcoll_db2ada.adb.old	2017-04-24 21:36:09.193973179 +0200
-+++ gnatcoll-gpl-2016-src/src/tools/gnatcoll_db2ada.adb	2017-04-24 21:36:16.029858932 +0200
+--- a/src/tools/gnatcoll_db2ada.adb	2017-04-24 21:36:09.193973179 +0200
++++ b/src/tools/gnatcoll_db2ada.adb	2017-04-24 21:36:16.029858932 +0200
 @@ -211,7 +211,7 @@
  
        declare
@@ -195,35 +119,8 @@
              Arguments   => Args,
              Input       => "",
              Status      => Status'Access,
---- gnatcoll-gpl-2017-src/src/gnatcoll_python.gpr.old	2017-06-24 18:06:19.702063079 +0200
-+++ gnatcoll-gpl-2017-src/src/gnatcoll_python.gpr	2017-06-24 18:05:04.276103652 +0200
-@@ -60,6 +60,7 @@
- 
-       for Switches ("C") use
--        ("-g", "-O2") & GnatColl_Shared.Python_Cflags;
-+        ("-g", "-O2", "-fPIC") & GnatColl_Shared.Python_Cflags;
-+      for Driver ("C") use External ("GCC", "gcc");
-    end Compiler;
- 
-    package Linker is
---- gnatcoll-gpl-2017-src/src/gnatcoll_gtk.gpr.old	2017-06-24 18:37:22.164631219 +0200
-+++ gnatcoll-gpl-2017-src/src/gnatcoll_gtk.gpr	2017-06-24 18:37:55.763186201 +0200
-@@ -71,11 +71,12 @@
-       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
- 
-       for Switches ("C") use
--        ("-g", "-O2")
-+        ("-g", "-O2", "-fPIC")
-         & GnatColl_Shared.Python_Cflags
-         & GnatColl_Shared.Pygtk_Include
-         & GnatColl_Shared.PyGobject_Include
-         & Gtk_Include;
-+      for Driver ("C") use External ("GCC", "gcc");
-    end Compiler;
- 
-    package Linker is
---- gnatcoll-gpl-2017-src/src/gnatcoll-projects.ads.old	2017-11-25 14:50:06.919939453 +0100
-+++ gnatcoll-gpl-2017-src/src/gnatcoll-projects.ads	2017-11-25 14:50:38.932387204 +0100
+--- a/src/gnatcoll-projects.ads	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 @@
        Predefined_Source_Files : GNATCOLL.VFS.File_Array_Access;
        --  The list of source files in Predefined_Source_Path
@@ -234,8 +131,8 @@
        --  The default gnatls command to run.
  
        Xrefs_Subdir : GNAT.Strings.String_Access;
---- gnatcoll-gpl-2017-src/src/tools/gnatinspect.adb.old	2017-11-25 14:52:47.282170250 +0100
-+++ gnatcoll-gpl-2017-src/src/tools/gnatinspect.adb	2017-11-25 14:52:57.691990254 +0100
+--- a/src/tools/gnatinspect.adb	2017-11-25 14:52:47.282170250 +0100
++++ b/src/tools/gnatinspect.adb	2017-11-25 14:52:57.691990254 +0100
 @@ -642,7 +642,7 @@
        GNAT_Version : GNAT.Strings.String_Access;
     begin
diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
deleted file mode 100644
index 7f73bf715c62..000000000000
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit multilib multiprocessing autotools python-single-r1
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="GNAT Component Collection"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5739942ac7a447658d00e1e7
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gmp +gnat_2016 gnat_2017 gtk iconv postgres pygobject projects readline
-	+shared sqlite static-libs syslog tools"
-
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
-	${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:* )
-	gtk? (
-		dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?]
-		dev-libs/atk
-		dev-libs/glib
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:3
-		x11-libs/pango
-	)
-	pygobject? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( dev-db/sqlite )
-	projects? (
-		=dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?,static-libs?]
-		dev-ada/xmlada[shared?,static-libs?]
-	)"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	tools? ( static-libs )
-	pygobject? ( gtk )
-	^^ ( gnat_2016 gnat_2017 )"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	else
-		GCC_PV=6.3.0
-	fi
-	GCC=${CHOST}-gcc-${GCC_PV}
-	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
-	GNATCHOP=${CHOST}-gnatchop-${GCC_PV}
-	if use sqlite; then
-		myConf="--with-sqlite=$(get_libdir)"
-	else
-		myConf="--without-sqlite"
-	fi
-	if use gtk ; then
-		myConf="$myConf --with-gtk=3.0"
-	else
-		myConf="$myConf --with-gtk=no"
-	fi
-	econf \
-		GNATCHOP="${GNATCHOP}" \
-		GNATMAKE="${GNATMAKE}" \
-		--with-python \
-		$(use_with gmp) \
-		$(use_with iconv) \
-		$(use_with postgres postgresql) \
-		$(use_enable projects) \
-		$(use_enable pygobject) \
-		$(use_enable readline gpl) \
-		$(use_enable readline) \
-		$(use_enable syslog) \
-		--with-python-exec=${EPYTHON} \
-		--enable-shared-python \
-		--disable-pygtk \
-		CC=${GCC} \
-		$myConf
-}
-
-src_compile() {
-	if use shared; then
-		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
-			build_library_type/relocatable
-	fi
-	if use static-libs; then
-		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
-			build_library_type/static
-	fi
-	python_fix_shebang .
-}
-
-src_install() {
-	if use shared; then
-		emake prefix="${D}usr" install_library_type/relocatable
-	fi
-	if use static-libs; then
-		emake prefix="${D}usr" install_library_type/static
-	fi
-	emake prefix="${D}usr" install_gps_plugin
-	einstalldocs
-	dodoc -r features-* known-problems-*
-}
-
-src_test() {
-	# The test suite is in
-	# To run you need to have the ada compiler available as gcc
-	# Even in this case there are still some problem
-	# Going into the testsuite directory and running
-	# ./run.py -v -v
-	# run here (having enabled most USE flags)
-	true
-}
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
index e13a6333db26..8790026af64c 100644
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2017.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
@@ -18,11 +18,12 @@ KEYWORDS="amd64 x86"
 IUSE="gmp gnat_2016 +gnat_2017 gtk iconv postgres pygobject projects readline
 	+shared sqlite static-libs syslog tools"
 
-RDEPEND="dev-lang/gnat-gpl:6.3.0
+RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
 	${PYTHON_DEPS}
 	gmp? ( dev-libs/gmp:* )
 	gtk? (
-		dev-ada/gtkada[gnat_2017,shared?,static-libs?]
+		dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?]
 		dev-libs/atk
 		dev-libs/glib
 		x11-libs/cairo
@@ -34,23 +35,27 @@ RDEPEND="dev-lang/gnat-gpl:6.3.0
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite )
 	projects? (
-		=dev-ada/libgpr-2017*[gnat_2017,shared?,static-libs?]
+		~dev-ada/libgpr-2017[gnat_2016=,gnat_2017=,shared?,static-libs?]
 		dev-ada/xmlada[shared?,static-libs?]
 	)"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2017]"
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	tools? ( static-libs )
 	pygobject? ( gtk )
-	!gnat_2016 gnat_2017"
+	^^ ( gnat_2016 gnat_2017 )"
 
 S="${WORKDIR}"/${MYP}-src
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {
-	GCC_PV=6.3.0
+	if use gnat_2016; then
+		GCC_PV=4.9.4
+	else
+		GCC_PV=6.3.0
+	fi
 	default
 	mv configure.{in,ac} || die
 	sed -i \
@@ -62,7 +67,6 @@ src_prepare() {
 }
 
 src_configure() {
-	GCC=${CHOST}-gcc-${GCC_PV}
 	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
 	GNATCHOP=${CHOST}-gnatchop-${GCC_PV}
 	if use sqlite; then
@@ -90,22 +94,18 @@ src_configure() {
 		--with-python-exec=${EPYTHON} \
 		--enable-shared-python \
 		--disable-pygtk \
-		CC=${GCC} \
 		$myConf
 }
 
 src_compile() {
 	if use shared; then
-		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
-			build_library_type/relocatable
+		emake PROCESSORS=$(makeopts_jobs) build_library_type/relocatable
 	fi
 	if use static-libs; then
-		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
-			build_library_type/static
+		emake PROCESSORS=$(makeopts_jobs) build_library_type/static
 	fi
 	if use tools; then
-		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
-			build_tools/static
+		emake PROCESSORS=$(makeopts_jobs) build_tools/static
 	fi
 	python_fix_shebang .
 }
@@ -127,7 +127,7 @@ src_install() {
 src_test() {
 	# The test suite is in
 	# To run you need to have the ada compiler available as gcc
-	# Even in this case there are still some problem
+	# Even in this case there are still some problems
 	# Going into the testsuite directory and running
 	# ./run.py -v -v
 	# run here (having enabled most USE flags)
diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest
index 51540255c701..038359ebf208 100644
--- a/dev-ada/gnatmem/Manifest
+++ b/dev-ada/gnatmem/Manifest
@@ -1,6 +1,4 @@
-AUX gnatmem-2016-gentoo.patch 3139 BLAKE2B 240fdce83be5d6776d79138dad494ed3f8deafda92c4107a4554ac5a97afdf26102b8bcdd7c31ac09edde7e0b6b53b4d1bc8c2e89eeab591da93af94ee357d25 SHA512 6be363642a5b5244050b275c436eed25948a2b8eea936b0b41ecd9c312441281d325ae9b41b84affd30eae1172cb31ed719935e96b9adc21707b20b88dabc84e
-DIST gnatmem-gpl-2017-src.tar.gz 80106 BLAKE2B 81f5b2fe4cacf383a39230bf3ebbbbfce0cd0a774b0289a78774dacedbfa0f2ca385b5538e1d12a075383158ff3c657d3a645f8f08be62fe6a437c9f7cd4b971 SHA512 52ba2cfb24314f481ec07e351ff6d8883753dcfe5d0489a78536bf0b841d931055be02271a5d93b2ec15c52fd775d4b177a17de52f9472cc8f352bf044b28897
+AUX gnatmem-2018-gentoo.patch 2998 BLAKE2B ef2afa9a7ef200adb3729ac6e3bf80b6a4f92cae8c560805c741189917e454a391a6cc09271491110fd2e0c7c95cef672f807a64acf247cea2996fb2bbc71c31 SHA512 259915b1b9c5a586609c0e2801df3239f859871a194da5cd53ad323020832f5e2f37419bbb6f7e3c1d6a0c5d4a2bcf7b709db220b190abe84faa54463f43d199
 DIST gnatmem-gpl-2018-src.tar.gz 80101 BLAKE2B c117552c2f8369f588127933ca1ba3075aeea6d7c3867861817b080f633fe26a7692c101b500d7441b49e79e75ce5a771a80287d0fb28bd0f569a358a8976d7d SHA512 539703bcb97cab996a4b4381685b021a419df781be3997538120580944fdcbb021fd28f574f66b8d52adbf5c6f1d7e29495c2115515d761f3cfce5bcc7bd8f56
-EBUILD gnatmem-2017.ebuild 852 BLAKE2B 9c08a8678c1af06e6e1388d17a3d0a740fbd06301bfb9313c832989d71198b6cce7d54051de0c8c92b0bca779a8b96ba030b5eed6bfddf8990230ea91de13eb5 SHA512 fe4ef12c20bcc2e1a17d9b8d5b507a16ec818d636c2de732b1467828f32de133132430422e7519892f95027397c65dd3f2ed959fafa0ff5fe6d661b9851f47f2
-EBUILD gnatmem-2018.ebuild 1012 BLAKE2B 4f3d6eef03ef25822543d7213b1e9ea4d550d961fb76486270dc1b7fbc059dcb3b54eceb518d4dfd7dca1273a92ab2b601ce509411a59ab7d014d08c272497c6 SHA512 48abcea5f5bfe1bf708d677547e17e395de35c01a40d2ca9618e099b79a97c1f0936f5ce200ffc1e04d65594487eb51157299789cf5cd05fe6cb0dec4bc2119e
+EBUILD gnatmem-2018.ebuild 877 BLAKE2B 882e21d0cb7573791f379ba4cdbdbe1a81985796ca4d6e77756938f1c4246cf465fa78d0878af9ed1dd8749d9456d9d69ef8447a80089ca43a7cf1813104c4b9 SHA512 7a0f486170a8571b54126ea42fa45273b1c23dffa83004298b0eec02425308295c30c141f1a63c850ed9df4c2acc42c6a61aeab9d9dfbe13fecaae200dba171e
 MISC metadata.xml 1206 BLAKE2B 141fe49e4b3fa46b43658dc0e3852624f5e82d6c796eea4b5e228b65b727170f45a0d0675dd0b864a331df0cd14acb11ff8a251c83d9b1f8aff19588b8e7d677 SHA512 9a8ab793dcd6d6903b1fbe59170261b5454560bef9fd70982d261137b7f4d32c5b12755b4073e4d38050f79815796f752fd61dd9b0fee9c449ce3334ed584baa
diff --git a/dev-ada/gnatmem/files/gnatmem-2016-gentoo.patch b/dev-ada/gnatmem/files/gnatmem-2018-gentoo.patch
index 69530dd24b23..32b08af4da89 100644
--- a/dev-ada/gnatmem/files/gnatmem-2016-gentoo.patch
+++ b/dev-ada/gnatmem/files/gnatmem-2018-gentoo.patch
@@ -1,5 +1,5 @@
---- 1/configure.in.old	2016-12-08 20:57:53.942004080 +0100
-+++ 1/configure.in	2016-12-08 21:00:10.393677257 +0100
+--- a/configure.in	2016-12-08 20:57:53.942004080 +0100
++++ b/configure.in	2016-12-08 21:00:10.393677257 +0100
 @@ -2,23 +2,14 @@
  AC_INIT(gnatmem.gpr.in)
  AC_CANONICAL_SYSTEM
@@ -48,13 +48,12 @@
  
  AC_SUBST(BINUTILS_OBJDIR)
  AC_SUBST(BINUTILS_SRCDIR)
---- gnatmem-gpl-2016-src/gnatmem.gpr.in.old	2017-02-02 22:15:30.247906007 +0100
-+++ gnatmem-gpl-2016-src/gnatmem.gpr.in	2017-02-02 22:17:22.604974363 +0100
-@@ -10,8 +10,10 @@
+--- a/gnatmem.gpr.in	2017-02-02 22:15:30.247906007 +0100
++++ b/gnatmem.gpr.in	2017-02-02 22:17:22.604974363 +0100
+@@ -10,8 +10,9 @@
     for Languages use ("ada", "c");
  
     package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
        for Default_Switches ("ada") use ("-O2", "-W", "-Wall", "-gnatpg");
        for Default_Switches ("c")   use ("-O2",
 +                                        "-I..",
@@ -72,8 +71,8 @@
            "@LIBDL@",
            "@LIBZ@");
     end Linker;
---- gnatmem-gpl-2015-src/src/libaddr2line.c.old	2017-01-04 21:03:36.185233702 +0100
-+++ gnatmem-gpl-2015-src/src/libaddr2line.c	2017-01-04 21:04:17.680455390 +0100
+--- a/src/libaddr2line.c	2017-01-04 21:03:36.185233702 +0100
++++ b/src/libaddr2line.c	2017-01-04 21:04:17.680455390 +0100
 @@ -23,9 +23,9 @@
  #include <string.h>
  #include <stdlib.h>
diff --git a/dev-ada/gnatmem/gnatmem-2017.ebuild b/dev-ada/gnatmem/gnatmem-2017.ebuild
deleted file mode 100644
index e7d409d86e59..000000000000
--- a/dev-ada/gnatmem/gnatmem-2017.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multiprocessing autotools
-
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="Monitors dynamic allocation and deallocation activity in a program"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed033 ->
-	${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 +gnat_2017"
-
-RDEPEND=""
-DEPEND="dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
-
-src_prepare() {
-	default
-	mv configure.in configure.ac
-	eautoreconf
-}
-
-src_compile() {
-	gprbuild -Pgnatmem.gpr -j$(makeopts_jobs) \
-		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS}
-}
-
-src_install() {
-	dobin obj/gnatmem
-}
diff --git a/dev-ada/gnatmem/gnatmem-2018.ebuild b/dev-ada/gnatmem/gnatmem-2018.ebuild
index 5c78d05a3175..738da3c95ae8 100644
--- a/dev-ada/gnatmem/gnatmem-2018.ebuild
+++ b/dev-ada/gnatmem/gnatmem-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
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a72 ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018"
 
 RDEPEND=""
@@ -24,7 +24,7 @@ REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 )"
 
 S="${WORKDIR}"/${MYP}
 
-PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {
 	default
@@ -33,14 +33,7 @@ src_prepare() {
 }
 
 src_compile() {
-	if use gnat_2016; then
-		GCC_PV=4.9.0
-	elif use gnat_2017; then
-		GCC_PV=6.3.0
-	else
-		GCC_PV=7.3.1
-	fi
-	gprbuild -v -Pgnatmem.gpr -j$(makeopts_jobs) -XCC=gcc-${GCC_PV} \
+	gprbuild -v -Pgnatmem.gpr -j$(makeopts_jobs) \
 		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS}
 }
 
diff --git a/dev-ada/gnatsymbolize/Manifest b/dev-ada/gnatsymbolize/Manifest
index e0879c98a173..6d9357465773 100644
--- a/dev-ada/gnatsymbolize/Manifest
+++ b/dev-ada/gnatsymbolize/Manifest
@@ -1,3 +1,3 @@
 DIST gnatsymbolize-gpl-2018-src.tar.gz 14286 BLAKE2B ac655b951b584224e64778fd800c082defee9abce4b3e7e1ac766a38c3b1ed8624c349f249714376e5984e37a9e9df256b6627b6ed2898f2f71fcaa8067cf36b SHA512 4fc21b45c32c08f9911cb7cdc0170e36f1c10d703244bbbfbd525386297b6e6779651751281402e8c4caee668df052e7c1ccc234e5cd88151ee471b8e3f06d0f
-EBUILD gnatsymbolize-2018.ebuild 626 BLAKE2B 56bf284d719dcdf27bf8159343bf39345f2fbe72cf75ddc55cbfbc60f8929c58128b2e17df44a9e89655ff9b1def569ccfceda46687d4c8839a6066dc5629d33 SHA512 e17cf9dddd4bfb0fa8b1e3413899f48b01460205c41deb9781a9f831f1260eb558d3d8eb2fe709957f214599a18a8efffcb88cf2d5bb28f5f01d98ed25dc9751
+EBUILD gnatsymbolize-2018.ebuild 621 BLAKE2B 50262887f4d4eaaffa4a6923f655f8e01513fe7adaaa160f6df09891441da59a6569ab1979d9a43d21c6123f2f33f6b30391d6c737162c064f1adb774e645c79 SHA512 707400f48b8be3becdb822a6049b2bb19f36d3e4674ae60b67f2a61318207df0aa242a73e60d90fb62b822f43706f45886a546cb2d20280558f5fad44534ab0e
 MISC metadata.xml 422 BLAKE2B a2e229da82c90f88f59b396418b0c0f94026fda53e21e474e1515500c6a24c3d98382d866eedd51a5342a10b7d2d72e2dddf662a83c3674c580d8b05e72f1c63 SHA512 c73cf5cdc71ecc3e097d21af8b64d00e3ae1927fb67297c2cea1717942e30ba007105c539d02fe12944bd5b071f31f9d24722a4c4dd6e731796273fc862b49ba
diff --git a/dev-ada/gnatsymbolize/gnatsymbolize-2018.ebuild b/dev-ada/gnatsymbolize/gnatsymbolize-2018.ebuild
index 192b6956dbb9..515f57ecd620 100644
--- a/dev-ada/gnatsymbolize/gnatsymbolize-2018.ebuild
+++ b/dev-ada/gnatsymbolize/gnatsymbolize-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
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a6d ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 625f0068f1bc..244077462e3b 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,12 +1,10 @@
 AUX gprbuild-2017-config.patch 5387 BLAKE2B 0c4e970a384dfa569b44dfa0596fd8e7302f9259eede555c7c760e9291bcb6e68b65d1c405840ac1f917bced6c768d2fd189514e871071f0ad6d19ee7289a0ee SHA512 71e95e20e8624f3a05f04e4ad0a80c92c0069c854c82a48aab90f1c8e1cbb4cb4f83a0500d04fd77969b41caeac6c67b3f38a7aa16e520b19bb91a0f8ad8c912
 AUX gprbuild-2017-gentoo.patch 3381 BLAKE2B 4e4c4d19db49aa3100f0acb97af90d942ea39fa5cc6cca5e369cd3459fa898406be18b762b33764bcc8f8ad6b007f00a2a1098990efe10f4aff96b80961ab6ce SHA512 a20642a117f61dd82469fafbd07fcd1d652ae8a11e866aafd55fb643fb9582994f94d643a4bbfcd0985534947cc8b48220de7503f83e74234b17838ce4468a66
-AUX gprbuild-2017.xml 3844 BLAKE2B ca36a571c90235d7f2468ffcd3b1f6703a19ae99c582a6c8a88bb9a237d02c119b191d3d8f8f941e974c74192b1ecab28c9d54fb7c4a9de02691989810e772d8 SHA512 13ba2efec9fa9fa0023d052163e186e9ccad1e8c80acff972568323b7e614dd9953f7c2a8f3a5d2f95eaee17072b1c50a2da5c3c2daafa81f5d2ab17fb95bf89
 AUX gprbuild-2018-gentoo.patch 10903 BLAKE2B ac85c698dd4f0fac0eb2e309cffac073608470408268763a4bea1be4716876fb57271e17b25d98e362dfe8f0b32b7f86f0079352f9a7336e3819fa40c5e05534 SHA512 b2c0a2d0df73d60ab1414675a9cc1cd77adf85076f8904ee7163fb1b2edaa70ebfea6addc6c5bf811d40a55e25d0369c5a25bddf8e6dcbd856fb4ef918d724f2
 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
 DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
 DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430
-EBUILD gprbuild-2017-r1.ebuild 2101 BLAKE2B 0fb50050923296b7e504b3c1926795e50826a05278c140f43285f38ac0e4b00baec80fa5f9f1c002e1789ae98362c66cab3dc60642bc38069881245eedbd415e SHA512 b47f67bad885d74ae5af029de3f5aa1b22aac7fc82dda86883cd036a42d87bc1b1b9775418e1047f4f610b0168ada84a5905a657c0b750759439d3587f633454
-EBUILD gprbuild-2017.ebuild 2019 BLAKE2B f90f05d9e8272399cf3b231631f58df984cdb4d2d3cec2591cb14e1736d218befe14b2b3d1f02ee287f0e6b588b70f3a2ab0d05d0d5404c78645b233b3bcc46b SHA512 6735d6e22ee72d60e7300fc3cd99e7065d3203feddc3a296352bedbecd3f780eba8f776c07bf859404acf24b731387caf44208641b6ec5e8a35ce4b42dc2ce60
-EBUILD gprbuild-2018-r3.ebuild 2273 BLAKE2B 2b7b6eb22413a09dd3715f1ede55728d5f7b25121607f09de49522012ad8e967208b349d8be11f7cdd6d7e07dff492d477dcd4229cc61b50b60c53c5484899c2 SHA512 712601d90df99e241c6304f7b7faac8c11b11905d054d7ae806498ef9d8d8bcd3bdc2544d9ffe0ec3a65ca7875ab1d0741d060441386adbaadf63683a6e45d25
+EBUILD gprbuild-2017-r1.ebuild 2099 BLAKE2B 249b02870c30526a8cf70a647dfb2c6c1d4ba3d32ceb69386e7faafd6e1eb4f36a3353737fb10e3935acf096d2e7d343bc2968cfdee36302ec15a56718e98216 SHA512 752fee648caef4a2bebc57ae3c4fa1679729a52036ae393e6e7527072f94f34afc20a0d05f433909b182769e759372bc2ecae561967f28acbf0079b47f19f48c
+EBUILD gprbuild-2018-r3.ebuild 2271 BLAKE2B fd44965ebe8726240a9ff70f545cf0f800ee572b10102b068465393f30aae4f3d95725283a7e6e977853430c95b7f6f86651381c169b9375ba2bedf2c93bca3c SHA512 8cd9902b9678655fecd4da3d52757ed94709dde15352c78b3211ce881cf6b3e89cc444e6d6ba93d3674a3c8a216491c97580adc20e5b7d4a808ab286d2c55bbf
 MISC metadata.xml 1057 BLAKE2B 5f0e5e778d450e3f0d37ad489e0be03f69bdcd35e60d1555468ba69608268d7ff0bbffece8b36cac58a84a5739f381a449fe9684f7d5540ff8817ea5ac2b8562 SHA512 753f7ba070723fb9ae26bdb8580d72656d115c7f5515fc11fe4933a216bd0e0734a0a410bd14011a2cff0cc791a93b132d2bddfe889aea372d955c38dd91e650
diff --git a/dev-ada/gprbuild/files/gprbuild-2017.xml b/dev-ada/gprbuild/files/gprbuild-2017.xml
deleted file mode 100644
index 9e1e47b512ef..000000000000
--- a/dev-ada/gprbuild/files/gprbuild-2017.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" ?>
-<gprconfig>
-  <compiler_description>
-    <name>GNAT-@VER@</name>
-    <executable prefix="1">gnatls-@VER@</executable>
-    <version>
-      <external>${PREFIX}gnatls-@VER@ -v --version</external>
-      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
-    </version>
-    <languages>Ada</languages>
-    <variable name="gcc_version">
-      <external>${PREFIX}gcc-@VER@ -v</external>
-      <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
-    </variable>
-    <runtimes default="default,kernel,native">
-       <directory group="default" >\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/</directory>
-       <directory group="default" contents="^rts-">\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path</directory>
-       <directory group="2" >\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/</directory>
-       <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory>
-    </runtimes>
-    <target>
-      <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
-      <grep regexp="[^\r\n]+"></grep>
-    </target>
-  </compiler_description>
-
-  <configuration>
-    <compilers>
-      <compiler name="GNAT-@VER@" />
-    </compilers>
-   <config>
-   package Compiler is
-      for Driver                   ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@";
-      for Language_Kind            ("Ada") use "unit_based";
-      for Dependency_Kind          ("Ada") use "ALI_File";
-      for Leading_Required_Switches        ("Ada") use
-	  ("-c", "-x", "ada", "-gnatA")
-             &amp; Compiler'Leading_Required_Switches ("Ada");
-      for Mapping_File_Switches    ("Ada") use ("-gnatem=");
-      for Mapping_Spec_Suffix      ("Ada") use "%s";
-      for Mapping_Body_Suffix      ("Ada") use "%b";
-      for Config_File_Switches     ("Ada") use ("-gnatec=");
-      for Include_Path_File     ("Ada") use "ADA_PRJ_INCLUDE_FILE";
-      for Multi_Unit_Switches ("Ada") use ("-gnateI");
-      for Multi_Unit_Object_Separator ("Ada") use "~";
-      for Config_Body_File_Name ("Ada") use
-           "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"");";
-      for Config_Spec_File_Name ("Ada") use
-           "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"");";
-      for Config_Body_File_Name_Index ("Ada") use
-           "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"", Index => %i);";
-      for Config_Spec_File_Name_Index ("Ada") use
-           "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"", Index => %i);";
-      for Config_Body_File_Name_Pattern ("Ada") use
-           "pragma Source_File_Name_Project " &amp;
-           "  (Body_File_Name  => ""*%b""," &amp;
-           "   Casing          => %c," &amp;
-           "   Dot_Replacement => ""%d"");";
-      for Config_Spec_File_Name_Pattern ("Ada") use
-           "pragma Source_File_Name_Project " &amp;
-           "  (Spec_File_Name  => ""*%s""," &amp;
-           "   Casing          => %c," &amp;
-           "   Dot_Replacement => ""%d"");";
-      for Config_File_Unique    ("Ada") use "False";
-      for PIC_Option      ("Ada") use ("-fPIC");
-      for Leading_Required_Switches ("Ada") use
-        Compiler'Leading_Required_Switches ("Ada") &amp; ("--RTS=${RUNTIME_DIR(ada)}");
-   end Compiler;
-
-   package Binder is
-      for Objects_Path_File     ("Ada") use "ADA_PRJ_OBJECTS_FILE";
-      for Driver         ("Ada") use
-          "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind";
-      for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@");
-      for Required_Switches ("Ada") use
-        Binder'Required_Switches ("Ada") &amp; ("--RTS=${RUNTIME_DIR(ada)}");
-   end Binder;
-
-   for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}";
-
-for Runtime_Dir       ("Ada") use "${RUNTIME_DIR(ada)}";
-   for Library_Encapsulated_Supported use "true";
-   </config>
-  </configuration>
-</gprconfig>
diff --git a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
index 1f443284e879..df5101ac4bfc 100644
--- a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 		-> xmlada-gpl-${PV}-src.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 +gnat_2017 gnat_2018"
 
 DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
diff --git a/dev-ada/gprbuild/gprbuild-2017.ebuild b/dev-ada/gprbuild/gprbuild-2017.ebuild
deleted file mode 100644
index a8b5614d4232..000000000000
--- a/dev-ada/gprbuild/gprbuild-2017.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="Multi-Language Management"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="
-	http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7
-		-> ${MYP}-src.tar.gz
-	http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8
-		-> xmlada-gpl-${PV}-src.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 +gnat_2017"
-
-DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MYP}-src
-
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	else
-		GCC_PV=6.3.0
-	fi
-	sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${P}.xml > gnat-${GCC_PV}.xml
-	default
-	sed -i \
-		-e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
-		src/gprlib.adb \
-		|| die
-}
-
-src_configure() {
-	emake prefix="${D}"usr setup
-}
-
-bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
-lib_progs="gprlib gprbind"
-
-src_compile() {
-	GCC=${CHOST}-gcc-${GCC_PV}
-	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
-	local xmlada_src="../xmlada-gpl-${PV}-src"
-	incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
-		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
-		-I${xmlada_src}/input_sources"
-	${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
-	for bin in ${bin_progs}; do
-		${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
-			-o ${bin} -largs gpr_imports.o || die
-	done
-	for lib in $lib_progs; do
-		${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
-			-largs gpr_imports.o || die
-	done
-}
-
-src_install() {
-	dobin ${bin_progs}
-	exeinto /usr/libexec/gprbuild
-	doexe ${lib_progs}
-	insinto /usr/share/gprconfig
-	doins share/gprconfig/*
-	insinto /usr/share/gpr
-	doins share/_default.gpr
-	insinto /usr/share/gprconfig
-	doins gnat-${GCC_PV}.xml
-	einstalldocs
-}
diff --git a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
index 91e3da95792d..719ce8ae4725 100644
--- a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 		-> xmlada-gpl-${PV}-src.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018"
 
 DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index 80a7887e72e4..5588fed25962 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -4,6 +4,6 @@ DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8
 DIST gps-gpl-2017-src.tar.gz 41216830 BLAKE2B 51ca89c38fa81888a9cf1831cf97f7e0ad72c444328a29063249a4fe72bbdc8357552d470872e9fbbeaf349ef0427b59fa41a0efb56200a07a9426343c731a57 SHA512 101ecef7f183de1da0c2b09d77f284a5e8c5ae56f34a897c8d471e79fe9a2832742608ff5251197ba2a52b5d9dfee6c6937fc22cd55f6d8f38359b070393cb64
 DIST gps-gpl-2018-src.tar.gz 40541905 BLAKE2B abe38dd23d9afede27b4ec8294e3245c12d52d60491b6e7c1b2d120a6f1e5d808fdcfb648e72da31376e2de176f7a039c5493341ad295db33b6a1ce44bb64096 SHA512 da0eaa85eb753f215354c9765272d85378f36ebe207314bab9211642f9d9b505a3d05cdec9de6964ae9139c4f8942a29e06c72db32b2aeb053a694e9c982e470
 DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5
-EBUILD gps-2017.ebuild 1946 BLAKE2B 8f1619962738e8d1fe5a60baa3b63bc0318441b95234c0a667d12ad88040a62635b8b46ec94f3598e583dd33a3d88b2bb1f3dcbb191a1c3007eb9efc007144b8 SHA512 67c410fb567b5b82fce282803f5b6292b0b8b221a4f554eab11dd097229e88d614716ee212bf83695721e254892666b1231073d8616da3f2584f3e187fecfc5d
+EBUILD gps-2017.ebuild 2102 BLAKE2B 6cbd6490b0e1cc1399ae54921abe97a54f28582f40af3485e6cc90535e7be4513cc4bc79dc84e11c477deecf964b1f0553b374cb3fd44bce5c6bd288bb44fef6 SHA512 3237b0abd2ee89851eb2e5232833e7536e501d3e5942329fe0d5c538ca6dd070e865e04b8a16acf237573851acb23d710f2c48ddc4488064f922691c2ca38ce5
 EBUILD gps-2018.ebuild 1837 BLAKE2B 5794a97f5e88cf770bbe035450c9ed5cefdc3a40e183bbaf25ee4c17e9fe4eb758f5454ffa1b5c031ffb25feee1d724a12d1a01e0619d2066883ac8921d63e5a SHA512 b428f2b394f3b1a91884a8a27d6b786120c3b7805e6d9b377a2c8dcf61a02a5c82fb4a630087c6957975af6d57b3ce85badef159ab221b02fd63ef3443f18f7f
-MISC metadata.xml 438 BLAKE2B 105849097d35788d4178db05bd3c9ab5b17eb94bee320d0dfc2914889a3764824f53950f674a4d1488b649a344729e03bb8eacda9896636a632b1288a0abf07c SHA512 2bf4e76aab6f461c501b34fee6fbf719715af34e2af827daee3a145de31b96b5568009a21daaa4269a19386b0be45dd419710e926505bda7763312c809864aae
+MISC metadata.xml 657 BLAKE2B c97ff9ab3140c87cb2066f25c639c3a5053c0775abfe23937b92f912ff71299bf136de797de6fd1010d576ba44f4e1b1f6e7dae4d1e076682382b33482240606 SHA512 498222549bd8c7e48575bdc0250cc810540928b19819759ba8a4f9b3aea39ad1b7b579b988a26b1bcf109774b356c7635e11e5e42a41dc76af8d9230a63f9d91
diff --git a/dev-ada/gps/gps-2017.ebuild b/dev-ada/gps/gps-2017.ebuild
index 6156e0dde66c..ebfb812fbce5 100644
--- a/dev-ada/gps/gps-2017.ebuild
+++ b/dev-ada/gps/gps-2017.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
@@ -17,7 +17,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed03b
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE="doc gnat_2016 +gnat_2017 gnat_2018"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-ada/gnatcoll-2017[gtk,iconv,pygobject,sqlite,static-libs,tools]
@@ -33,6 +33,9 @@ RDEPEND="${PYTHON_DEPS}
 
 DEPEND="${RDEPEND}"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	^^ ( gnat_2016 gnat_2017 ) !gnat_2018"
+
 RESTRICT="test"
 
 S="${WORKDIR}"/${MYP}
@@ -41,7 +44,11 @@ PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {
 	default
-	GCC_PV=6.3.0
+	if use gnat_2016; then
+		GCC_PV=4.9.4
+	else
+		GCC_PV=6.3.0
+	fi
 	mv configure.{in,ac} || die
 	sed -i \
 		-e "s:@GNATMAKE@:${CHOST}-gnatmake-${GCC_PV}:g" \
diff --git a/dev-ada/gps/metadata.xml b/dev-ada/gps/metadata.xml
index eb9ac43cfff3..0657e56673cc 100644
--- a/dev-ada/gps/metadata.xml
+++ b/dev-ada/gps/metadata.xml
@@ -5,6 +5,11 @@
 		<email>tupone@gentoo.org</email>
 		<name>Tupone Alfredo</name>
 	</maintainer>
+	<use>
+		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
+		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
+		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
+	</use>
 	<longdescription lang="en">
 		GPS is a lightweight, extensible IDE, intended to develop
 		high-integrity software in Ada and SPARK, with support for C and C++
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index fb9feb9a9956..60e949d5f3d9 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,6 +1,6 @@
-AUX gtkada-2017-gentoo.patch 2777 BLAKE2B bd13bd4458296c2e40ae7c769a1e1422123638d494d7ee3fb168a72e06a6344876fef0b4745744e6ec02b91c17b4fdff156f045233b47eb22aa8e836bc407a2a SHA512 0027d42e41ee1e754bf54982c5bd31b6fc5a113e9a5e7aed95868ac956097f3226b073721d4a5ccb9dc8d82600089720a72162b02910d6c8afcdfb2ea8ec4b13
+AUX gtkada-2017-gentoo.patch 2270 BLAKE2B 54b7f2258ce0073b79f56a3c0c379123622e7d6e91f0a186d4792b68851521241d778ba7b30686f52d1e0d1afa5d0e239fa5bf401169b67fdc90c0ffab01d83f SHA512 cb104d21ac55046254f03de6d615e98174d92cf3af74d7677eee9620cb38cfce5aaac2e61d3dc248f735f6723bcb69d33486e21dd3c6f5cc64d81067d161f5e8
 DIST gtkada-gpl-2017-src.tgz 11952333 BLAKE2B 2a333452ff271bba0521235598afdb1abebc4ceeab0f915f173862329ae0986b0fc4f654d3df28eac73af075db224c0b12340c3acd1e4ed0ffc965e4365f8b40 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f
 DIST gtkada-gpl-2018-src.tgz 11958880 BLAKE2B 4946918b52de5e15efc77411927812910d84d13cea66b86b1162b987c7849ba7fbb6da487881762f64005dc32a74fa73c9d759d25bb9ac0241d1d76cd4becbfb SHA512 9000de7675f8ee688b1c9cd93cf35b32f698aca8fc22d3b4e695d7c6b34feb60118cc687cf35432cd5ed9af7825eda7e20575a9fad4523a7b59cb0322bce0762
-EBUILD gtkada-2017.ebuild 1333 BLAKE2B a010ed72e62dc6eecd7d84595b00174e4f5967a850d6c24e4c6283ad11a968ab46051a646e9f9f37a2aa1735fdbca417f612c85f586b3777c53ddab42c689bd2 SHA512 41db23dbb72e53b3956585cd33ab2a4e9e32c19de079e6ec5907e44b1a7d1166a132465871ba314f90297c5b0f07b9533890f2cdcda3a56621484a476b9ab01b
-EBUILD gtkada-2018.ebuild 1456 BLAKE2B 89167e673cc23c8e27f2cfc4341067fa7b77e01f3ddb72a329859d7b04e0c51595c969fa50fd488921f9f446c2e05cbef87fee6562cfc2027b40a592231561cb SHA512 01e015bef00579446aa2bfdae9216df85a972da2155e36becfc5e38b31ea8a0bcaf3b2a72fa8d50876a35425862d15c24b3e01c61a312f6042ff4458880c72b1
+EBUILD gtkada-2017.ebuild 1291 BLAKE2B 4f26d0c4c40df64522c77df6acf75175f22cf0aef8e8e3213d663e3bb4c4b7ebff538540b7bbdb212d0ecce2e60f7d7d463f3178a1df44059ce7a2ef22fe8936 SHA512 433a5ce57cf39a012f17756d8843933910e51ad3b1641360e7dd28e0f871399a57f3ec0376e7ae7c69491f2e4712aad23c71c7fabd2ce507c9c5a79c247daabc
+EBUILD gtkada-2018.ebuild 1412 BLAKE2B 60234e0a79c8b865d0adeefe8089de9b2e480b89cd2513c0ff53107202eb7a164350ed182bb6b36e269ec6a946d87d94cbf43cc26a0519de2b94c06e43312d05 SHA512 1c0739006fabdfc1b587eb6db5c55f3de8036db2b6aeb844c14b485b9b7321c90aea91b87e3a390d2e3fba38d94fd12939392557403920f62319b33cb253bb1c
 MISC metadata.xml 772 BLAKE2B 5368ab9afd9387d681eca36cb0e93435b72570c31691a27b830b2ecca307ac3a1aba7c3aece27a5bdc27185fd822c9adc76a5091d480c10b7802bae37efa65c7 SHA512 fe764650755d97e2e148cf36fa1ac973a96e59e2143e5a8e90da27dd1272687f61f0e1fe602535366e068c813e3af54d74c0e2e1b88e2a4df8561165bc6448b7
diff --git a/dev-ada/gtkada/files/gtkada-2017-gentoo.patch b/dev-ada/gtkada/files/gtkada-2017-gentoo.patch
index ec8ebdf8f601..25a018e0d31e 100644
--- a/dev-ada/gtkada/files/gtkada-2017-gentoo.patch
+++ b/dev-ada/gtkada/files/gtkada-2017-gentoo.patch
@@ -1,14 +1,3 @@
---- gtkada-gpl-2015-src/shared.gpr.in.old	2017-01-05 23:28:35.838073270 +0100
-+++ gtkada-gpl-2015-src/shared.gpr.in	2017-01-05 23:30:17.752255709 +0100
-@@ -44,6 +44,8 @@
-              for Switches ("C") use ("-O2");
-       end case;
- 
-+      for Driver ("C") use External ("GCC", "gcc");
-+      for PIC_Option ("C") use ("-fPIC");
-       for Switches ("C") use Compiler'Switches ("C") & Gtk_Include;
-       for Switches ("Objective-C") use Compiler'Switches ("Objective-C") & Gtk_Include;
-    end Compiler;
 --- gtkada-gpl-2016-src/Makefile.in.old	2017-01-21 22:42:18.319969095 +0100
 +++ gtkada-gpl-2016-src/Makefile.in	2017-01-21 22:42:33.989700236 +0100
 @@ -60,30 +60,33 @@
diff --git a/dev-ada/gtkada/gtkada-2017.ebuild b/dev-ada/gtkada/gtkada-2017.ebuild
index 967c1a26d68f..f64be7a6ac09 100644
--- a/dev-ada/gtkada/gtkada-2017.ebuild
+++ b/dev-ada/gtkada/gtkada-2017.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
@@ -48,7 +48,6 @@ src_configure() {
 	else
 		GCC_PV=6.3.0
 	fi
-	GCC=${CHOST}-gcc-${GCC_PV}
 	econf \
 		--prefix="${D}/usr" \
 		$(use_enable static-libs static) \
@@ -58,7 +57,7 @@ src_configure() {
 
 src_compile() {
 	GNATPREP=${CHOST}-gnatprep-${GCC_PV}
-	GCC=${GCC} emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
+	emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
 }
 
 src_install() {
diff --git a/dev-ada/gtkada/gtkada-2018.ebuild b/dev-ada/gtkada/gtkada-2018.ebuild
index 1a6fabc18667..63d33a60a954 100644
--- a/dev-ada/gtkada/gtkada-2018.ebuild
+++ b/dev-ada/gtkada/gtkada-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
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf840c7a4475261f97ced
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
@@ -51,7 +51,6 @@ src_configure() {
 	else
 		GCC_PV=4.9.4
 	fi
-	GCC=${CHOST}-gcc-${GCC_PV}
 	econf \
 		--prefix="${D}/usr" \
 		$(use_enable static-libs static) \
@@ -61,7 +60,7 @@ src_configure() {
 
 src_compile() {
 	GNATPREP=${CHOST}-gnatprep-${GCC_PV}
-	GCC=${GCC} emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
+	emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
 }
 
 src_install() {
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index 67700f350ce7..c22bad97ac71 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,7 +1,7 @@
-AUX langkit-2017-gentoo.patch 4182 BLAKE2B 5f0a275837a80ac41e231c807eb54a620d49311b3539b995951ce30be3de6cbf1d00c7909f5ac3186b4e06892416f8a4274b75f1de10af123824f4eede466c57 SHA512 53530378e4e04d940656244f42161abc0aae9a5fc54b0ddd12c153faef0fd4a8d3f67e27742f6a2e27496a705a8dafe9288d1c7c066a43fe0e8e7c0a0886c21d
+AUX langkit-2017-gentoo.patch 3616 BLAKE2B 3730635b5cb4a2285e3ef283c903705b8f40194bdb65049ca07f651ea9d122e72e863cf132e096f139b9dc6f57a1d7faf7f333a3580e641caa88d4fea4b22009 SHA512 b69c84f3d79adefb254f764ba06c6d5fda81f95a8070b4b651d7a4f2ad078a48e341e5ad94e5ce7e2f756961d943dde3de891c5825c0e367cf7f816e08a31791
 AUX langkit-2018-gentoo.patch 569 BLAKE2B ea4df3a3651da82c7c61d251a2b330ef735d677f1303113160f7bfcf3c0760d7606d4ac7fdd3484efb3bf2fe23deb8d245a68a6425e2b8c36c2fdf0246ad0b38 SHA512 7a115b3f4307a01b7024571ad878b5c459cddf5c3e79747b9e5d7a64a15ffde75f6eef8225721b5f42821248df03d190030d24ae7f82492c8ff415eb76ca1113
 DIST langkit-gpl-2018.tar.gz 565649 BLAKE2B e18beea565351eb4b10baa9168db742598817d231c5eab578b17c2b0409ac77b9972f8f426499e086779eaeda0ac1ba11e5cb3b47ecab8e63674b7ef654b26b7 SHA512 62a8820c3fd3d44f6cd22e181f6eddcf52945c93ea5eb793a63b7f13e71705807170b0cc4c3873b127e3fafe751a5dd27da54087986f506f8500b916ef1f078f
 DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95
-EBUILD langkit-2017.ebuild 924 BLAKE2B 4fde947ea5db44e0e806162a7283bacd4d105d58bd20fcbb68952df7690e5f86c4dd6d998845a977f09808455bdbb29c572649e78addfb41bfe3fb9306ec283c SHA512 3430bc646265ccacc3178ba3f459613e3b0a0f4493b4238a97598158a4dbf7aa81ac5a60e40da380f86a075ce8119fe28770a438273133cef4ca3caa1626348d
+EBUILD langkit-2017.ebuild 911 BLAKE2B f75a3fdec74b278be740b37993909e2627a7f4084d6967c2c9a5a7f41cfa2bfd777e45f5d6143fe88b2ba15ead72d47766d94c59d3283f6c18ab98c7959c409d SHA512 2f2c5939fdb316b63f740e230e442ad33e3ab2bee21b08d3a3688391bc8a40c17a3f9fa578062fe0cd58ea4747c27b8a4ed2689dc1a153043a5bf2d9d04fc1fd
 EBUILD langkit-2018.ebuild 985 BLAKE2B 2b4bc94e8e20f93ba4b98e345bcf07b717d3f07075a447bb69d6ae586cff4a1ed7d0dfd2f61aa6636cc6212aa335f17a7ed8301b52d98e6fe133219292225a73 SHA512 e499e41572d61a668707710824865ba431d8e6ef576668c8d31895334014996fd98adde25baa7d0017087102b1eadd8c0b768aab18ace9fa5192838635d4c3e6
 MISC metadata.xml 748 BLAKE2B 29a7b386b6d8d1b2f2bc8fc16739c28129b7886c8cdae6784d54bfaadea87502a5338ed6113f536e7c5701cefb42d5912f6189dccb55ddd704445ae65f5c4176 SHA512 8a3183336e00f01eeb51a5b7d06833599b408801b71713575d83131d39b82c8c74fda8ce133b352dc356135721ef19ca488ef17723172579cd1507d4c1d7c809
diff --git a/dev-ada/langkit/files/langkit-2017-gentoo.patch b/dev-ada/langkit/files/langkit-2017-gentoo.patch
index ecb7ce6e74dd..7b6501ed8a70 100644
--- a/dev-ada/langkit/files/langkit-2017-gentoo.patch
+++ b/dev-ada/langkit/files/langkit-2017-gentoo.patch
@@ -1,29 +1,5 @@
---- langkit-gps-src/langkit/templates/project_file.mako.old	2017-07-11 14:19:12.841221846 +0200
-+++ langkit-gps-src/langkit/templates/project_file.mako	2017-07-11 14:12:39.104981170 +0200
-@@ -82,9 +82,11 @@
-             for Default_Switches ("Ada") use
-                Common_Ada_Cargs & ("-g", "-O0", "-gnatwe", "-gnata");
- 
--            for Default_Switches ("C") use Common_C_Cargs & ("-g3", "-O0");
-+            for Default_Switches ("C") use Common_C_Cargs &
-+              ("-g3", "-O0", "-fPIC");
- 
--            for Switches ("quex_lexer.c") use Common_C_Cargs & ("-g0", "-O0");
-+            for Switches ("quex_lexer.c") use Common_C_Cargs &
-+              ("-g0", "-O0", "-fPIC");
-             --  This file is *huge* and the debugging information for it harms
-             --  Valgrind runs. We almost never have to debug this file so
-             --  this is acceptable.
-@@ -111,6 +111,7 @@
-                   --  ... and this prevents OOM on other platforms
-             end case;
-       end case;
-+      for Driver ("C") use External ("GCC", "gcc");
-    end Compiler;
- 
-    package Binder is
---- langkit-gps-src/langkit/compile_context.py.old	2017-12-13 22:12:38.689143125 +0100
-+++ langkit-gps-src/langkit/compile_context.py	2017-12-13 22:13:02.446737994 +0100
+--- a/langkit/compile_context.py	2017-12-13 22:12:38.689143125 +0100
++++ b/langkit/compile_context.py	2017-12-13 22:13:02.446737994 +0100
 @@ -1171,8 +1171,7 @@
          # the Quex specification changed from last build.
          if generate_lexer and self.cache.is_stale('quex_specification',
@@ -34,8 +10,8 @@
                                     quex_file,
                                     "-o", "quex_lexer",
                                     "--buffer-element-size", "4",
---- langkit-gps-src/langkit/templates/pkg_analysis_body_ada.mako.old	2017-12-26 20:47:28.461617512 +0100
-+++ langkit-gps-src/langkit/templates/pkg_analysis_body_ada.mako	2017-12-26 20:47:58.912060490 +0100
+--- a/langkit/templates/pkg_analysis_body_ada.mako	2017-12-26 20:47:28.461617512 +0100
++++ b/langkit/templates/pkg_analysis_body_ada.mako	2017-12-26 20:47:58.912060490 +0100
 @@ -2196,7 +2196,7 @@
     --  printing them.
  
@@ -45,36 +21,49 @@
  
     package Address_To_Id_Maps is new Ada.Containers.Hashed_Maps
       (Lexical_Env, Integer, Hash, "=");
---- a/testsuite/testsuite_support/__init__.py.old	2018-05-02 21:40:04.977442020 +0200
+--- a/testsuite/testsuite_support/__init__.py	2018-05-02 21:40:04.977442020 +0200
 +++ b/testsuite/testsuite_support/__init__.py	2018-05-02 21:40:45.422759387 +0200
-@@ -68,6 +68,7 @@
+@@ -68,6 +68,8 @@
          # to build it in parallel.
          if not self.global_env['options'].disable_tear_up_builds:
 -            p = Run(['gprbuild', '-p', '-f', '-P',
 +            p = Run(['gprbuild', '-p', '-f', '-XLIBRARY_TYPE=relocatable',
++                     '-XGPR_BUILD=relocatable',
 +                     '-XXMLADA_BUILD=relocatable', '-P',
                       os.path.join(self.root_dir, '..', 'langkit', 'support',
                                    'langkit_support.gpr')], output=PIPE)
              report(p, "Langkit support")
---- a/testsuite/testsuite_support/langkit_support_driver.py.old	2018-05-03 08:01:20.019944992 +0200
+--- a/testsuite/testsuite_support/langkit_support_driver.py	2018-05-03 08:01:20.019944992 +0200
 +++ b/testsuite/testsuite_support/langkit_support_driver.py	2018-05-03 08:02:50.146430288 +0200
-@@ -36,5 +36,7 @@
+@@ -36,5 +36,8 @@
              ))
  
          self.run_and_check(['gprbuild', '-p', '-P', 'p.gpr', '-gnata',
 +                            '-XLIBRARY_TYPE=relocatable',
++                            '-XGPR_BUILD=relocatable',
 +                            '-XXMLADA_BUILD=relocatable',
                              '-cargs', '-O0', '-g'])
          self.run_and_check(['./{}'.format(source[:-4])])
-+++ a/testsuite/testsuite_support/adalog_driver.py.old	2018-05-03 08:14:30.998698722 +0200
++++ a/testsuite/testsuite_support/adalog_driver.py	2018-05-03 08:14:30.998698722 +0200
 --- b/testsuite/testsuite_support/adalog_driver.py	2018-05-03 08:16:48.275417176 +0200
-@@ -41,6 +41,8 @@
+@@ -41,6 +41,9 @@
                  )
              ))
  
 -        self.run_and_check(['gprbuild', '-p', '-P', 'p.gpr', '-cargs', '-O0',
 +        self.run_and_check(['gprbuild', '-p', '-XLIBRARY_TYPE=relocatable',
++                            '-XGPR_BUILD=relocatable',
 +                            '-XXMLADA_BUILD=relocatable',
 +                            '-P', 'p.gpr', '-cargs', '-O0',
                              '-g'])
          self.run_and_check(['./{}'.format(source[:-4])])
+--- a/langkit/libmanage.py	2018-11-14 22:02:20.283672719 +0100
++++ b/langkit/libmanage.py	2018-11-14 22:02:39.970337338 +0100
+@@ -634,6 +634,7 @@
+ 
+         result = ['-XBUILD_MODE={}'.format(build_mode),
+                   '-XLIBRARY_TYPE={}'.format(library_type),
++                  '-XGPR_BUILD={}'.format(library_type),
+                   '-XXMLADA_BUILD={}'.format(library_type)]
+ 
+         enable_warnings = getattr(args, 'enable_warnings', False)
diff --git a/dev-ada/langkit/langkit-2017.ebuild b/dev-ada/langkit/langkit-2017.ebuild
index df6770a0d6bc..57790df219e3 100644
--- a/dev-ada/langkit/langkit-2017.ebuild
+++ b/dev-ada/langkit/langkit-2017.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
@@ -21,7 +21,7 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
-	dev-ada/gnatcoll[gnat_2017,iconv,shared]
+	dev-ada/gnatcoll[iconv,shared]
 	dev-python/mako
 	dev-python/pyyaml
 	dev-python/enum34
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index 95fa35110a84..73935cd23e2e 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -1,7 +1,8 @@
-AUX libadalang-2017-gentoo.patch 521 BLAKE2B 0493204f7a71f9f906017b69b988260add9744888559034e066dd0e33114aaad3c1f69cca23ca59b2c0b2d3503469772a91d6c278595ad8dbda5cf7fb063f8db SHA512 88613409e2ba5aa4e33ae01bdab3ac5298a363732372a33334a85781d1b29d045c7e1207650a1f9a819acad671c5dbfc1d3940a2eda9bf923456dadebb6c9af0
+AUX libadalang-2017-gentoo.patch 927 BLAKE2B 3c0a92df8aee109faa4be73bc1950af46fbf083a165582bc6ee270171d4317508fe794f8583b5cf6da7ad72ab8ff706befe4339d44319559341228a823b4c188 SHA512 0436780f1eb872c10b30405d467534a752a293d49b5522ff1fafa9524474b3fbc99889a991030ce81178461cb875dca31e1283a3f89a3fc338f4ec3d1a9de4fb
 AUX libadalang-2018-gentoo.patch 678 BLAKE2B ebc0c63b62a0b5c2b53a036de1a71ca33af992dd3774d894f4e0407e291bee15fac5be358c5f2600516ecb15c7b7846c7213b1fdd3c522ecd2f1393247d4b4b4 SHA512 346b561e2db3258e768bc4c4ee92a3ba6977f58de3cdae0ab84df9c31ba178dad3788309db2505c2dc8c8fd4319ef68201499303a6b92d837508a6bd91e49779
 DIST libadalang-2017-src.tar.gz 1862217 BLAKE2B 58f72726285e56a15278e85902fabf988327ea86a08cc6c86271d61075a6b19a0bffa86e5302f5c32e6d35ef95473ad747853b14899a12d09d49d656f4e6559e SHA512 c8663a7214c3c1dd73a6589a6db10d219fcd2db39ba2ce184eea85272c5f206ab0aa8d13b0e19b08a5996906c7fbddd479795363ec22e889dfceda9967c346c7
 DIST libadalang-gpl-2018-src.tar.gz 1990774 BLAKE2B ffad46d4988de7fb8c9bf94d24360a726c59e3c70a2318725a59e0b6b62351e8f5d8dd6501964618607122e3c7cb3bda0e1181818c68324d4067d59ac93e2b1c SHA512 b95196323097065be2996ced767f8f89fb77445f99c249d84043c68d926d61c78b310b4fef0699d08f9112dc423596c076f452745469a75a8467c35b5e10ac2c
-EBUILD libadalang-2017.ebuild 1096 BLAKE2B f0ee4b436c3a7c0288e9360ecf392e7f8b2ae9592f4e3e1a2c3cd50f1979849c52bc52835e8b331ed14c7beaa28ca1f794d3d1bed189935644910505b2c70efa SHA512 802a402622df6d21390aa497342ad4b2fd9b8ba18f7cb52a5377909eedb8e47085f9f3df35d16763904cfaf3dd51413c8526d25a04bd0e1bf26477b6d86ec09c
+EBUILD libadalang-2017-r1.ebuild 1085 BLAKE2B 2239f79e2282925ee0cccda64f41cbf9bd459de1e04f09bdf5be73bd0f01a86d00fc7249c13e8e06373b5a69268ddd5b623a973162da8551b91027b14b9f496e SHA512 b6513432ff0c96cb159325c47aa2af4fc6ab19437c43c94d213f35eb0c1b89226e182da0f80cfb8935e61d50da82731af7e94cd8193f7c26e3472a7918a57976
+EBUILD libadalang-2017.ebuild 1038 BLAKE2B 728c3c30f2b791e8fc88f49f3726118d24221d7b2dd782b08a866c816cbdc3dc0d156022ae2fa61c6e5c891195e898ee8fd4b696d32ffa030568340530f3e44d SHA512 531f5f84f4685038efa9d1bf742aaff2826b0445216d6c7f5664f35d9642f799ea1d50295ec700d7861f6c74b77024fab68175890b89d5189f418fead58bfd6e
 EBUILD libadalang-2018.ebuild 1341 BLAKE2B 2440d20e69e4991a5e0f28f47658080c6c2a3784e6339ae85f01d053dfa5f93c4c8aeb31cdcac4be5c5e99b6c59ef7f30963281604428ad1d539cf5890f49020 SHA512 53570131296ef159031711c777d9b20dc34cc2171f3aea67608267f775ccc1bfaa2b5318952c318868a6bfdc812425c2e6d1d00bb3fcefaa487bd70ebfe58c54
 MISC metadata.xml 810 BLAKE2B 89dbced5c050ba4dea4ba0537cda9512bc534bee25aa8260cd7ac30129ada091ced7c37d29efdbf11ceac9e295171e84b248d186cfb11b2072fd2beb7997089a SHA512 6857c4ac7b2cd9de167039889a99d9cdac1ba0235379f36630d51e075f1fbfccab974bbd9f34a1be08cab7869c8dbc5ec14da9ff4ec6225bd89470c350f22ebd
diff --git a/dev-ada/libadalang/files/libadalang-2017-gentoo.patch b/dev-ada/libadalang/files/libadalang-2017-gentoo.patch
index dc84915ad5a0..00f9aca46959 100644
--- a/dev-ada/libadalang/files/libadalang-2017-gentoo.patch
+++ b/dev-ada/libadalang/files/libadalang-2017-gentoo.patch
@@ -1,10 +1,20 @@
---- libadalang-gps-src/ada/testsuite/testsuite_support/capi_driver.py	2017-07-30 16:01:31.495287196 +0200
-+++ libadalang-gps-src/ada/testsuite/testsuite_support/capi_driver.py.old	2017-07-30 16:00:08.104464440 +0200
-@@ -72,6 +72,7 @@
-                        --  different default standard.
+--- a/ada/testsuite/python_support/utils.py	2018-11-14 22:21:36.366873970 +0100
++++ b/ada/testsuite/python_support/utils.py	2018-11-14 22:21:59.397477086 +0100
+@@ -28,6 +28,7 @@
+     library_kind = 'static' if LAL_DISABLE_SHARED else 'relocatable'
+     argv.extend([
+         '-XLIBRARY_TYPE={}'.format(library_kind),
++        '-XGPR_BUILD={}'.format(library_kind),
+         '-XXMLADA_BUILD={}'.format(library_kind),
+     ])
+     subprocess.check_call(argv)
+--- a/ada/testsuite/testsuite_support/base_driver.py	2018-11-14 22:22:37.698817058 +0100
++++ b/ada/testsuite/testsuite_support/base_driver.py	2018-11-14 22:30:37.631613448 +0100
+@@ -310,6 +310,7 @@
+         """
+         library_type = 'static' if self.disable_shared else 'relocatable'
+         return ['-XLIBRARY_TYPE={}'.format(library_type),
++                '-XGPR_BUILD={}'.format(library_type),
+                 '-XXMLADA_BUILD={}'.format(library_type)]
  
-                        "-I{support_include_dir}", "-g");
-+                   for Driver ("C") use External ("GCC", "gcc");
-                 end Compiler;
-             end P;
-             '''.format(main_source=compile_units[0],
+     #
diff --git a/dev-ada/libadalang/libadalang-2017-r1.ebuild b/dev-ada/libadalang/libadalang-2017-r1.ebuild
new file mode 100644
index 000000000000..b4185f05c645
--- /dev/null
+++ b/dev-ada/libadalang/libadalang-2017-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="high performance semantic engine for the Ada programming language"
+HOMEPAGE="https://libre.adacore.com/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed042
+	-> ${P}-src.tar.gz"
+
+LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 +gnat_2017"
+
+RDEPEND="dev-python/pyyaml
+	dev-ada/gnatcoll[projects,shared,gnat_2016=,gnat_2017=]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	dev-ada/langkit"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}"/${PN}-gps-src
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	default
+	rm -r ada/testsuite/tests/acats_parse || die
+}
+
+src_configure() {
+	ada/manage.py generate || die
+}
+
+src_compile() {
+	ada/manage.py --verbosity=debug build || die
+}
+
+src_test () {
+	ada/manage.py test | grep FAILED && die
+}
+
+src_install () {
+	ada/manage.py install "${D}"usr
+	python_domodule build/python/libadalang.py
+}
diff --git a/dev-ada/libadalang/libadalang-2017.ebuild b/dev-ada/libadalang/libadalang-2017.ebuild
index 2d97d6c5e909..3856ef26ccef 100644
--- a/dev-ada/libadalang/libadalang-2017.ebuild
+++ b/dev-ada/libadalang/libadalang-2017.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
@@ -22,13 +22,10 @@ RDEPEND="dev-python/pyyaml
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	dev-ada/langkit"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( gnat_2016 gnat_2017 )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 S="${WORKDIR}"/${PN}-gps-src
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
 src_prepare() {
 	default
 	rm -r ada/testsuite/tests/acats_parse || die
@@ -39,7 +36,7 @@ src_configure() {
 }
 
 src_compile() {
-	ada/manage.py build || die
+	ada/manage.py --verbosity=debug build || die
 }
 
 src_test () {
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 57c045903c5b..d05da8d64096 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -1,10 +1,7 @@
-AUX libgpr-2016-gentoo.patch 2822 BLAKE2B 759977ffe76fefc27c1aecdfe8a8647c78c8c3b5305b5bcb20d5c403394cd492b68ff3256d65ef0969eb44aa002fdfb83815cf095017c0c06e441639fea8d607 SHA512 c0a507f692002a32d40d56216a033987c3e5e2ad07f9f25d0bd542fe1e77c8c3a7acd1e11a3d4f07d224b63002dbecd548a256599017cf97c820c6cfce2ac596
-AUX libgpr-2017-gentoo.patch 2047 BLAKE2B 8c8befa6b392863163fac1c03acc63b96c075929fec2207fb654ab191bb6a8995e0c2576c218c59b90b1eb90d330ea7837d032427b9b9495bdd5e98709363070 SHA512 51b82725f94488c06e9a9aece82b9a3df78f7a763ed6ae6055335c0eae802207a698e186fb321261b4c45539c2fba076d08605dd5fc64508d71928210fe80f0c
+AUX libgpr-2016-gentoo.patch 2831 BLAKE2B 2f9083ab7e9b75662b224527def3033f1f9f2bd5836fc7812e3c551865e4c3eaab4ef9abdb3c0c06d19aa9aad6ab63a61153ea6fefccc3556ed5587bc5761cb0 SHA512 e807bbccbd5514e9f2919937de657cac306b063ece2d87e0defd41e1dcbbf00faca488699f3c2cfa99118da4b569baaee1610b5aaa65a5bdf6c0859bd06c1b9a
 AUX libgpr-2018-gentoo.patch 1691 BLAKE2B 4e11098f835d9d0adbd6a4eed0e63f71140eb68d0e350fd52303a0d21c308e483556b31ce84ba97a7fccddfc91e519a6ae8f999d87258c0d4f4ee473597f7267 SHA512 959e4e63c3367fd98878a2004d0fac981a1acc2a29e35960a27f2ca48b4557fc16148aa052cdba590f208c8b23832f3bc2f3959523f6e54eb8dfe2e87812f285
-DIST gprbuild-gpl-2016-src.tar.gz 2142261 BLAKE2B 69948427eb6315b9fb2b84755192b53c035f74093dacb34852713083779bf8bd88dac6b38fe7685f6a40ecb2482f78b15a5221913df997847eee8b1359cf6c14 SHA512 6b9e00248aaee90f3c00e7ce442c2b551b8532ec4d94a4471858d117feb27e91fd6d218995d4b71ee3f1f0677e9547d562fc2cda9ba80c3f6eb8d840ed56eb7e
 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
 DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044
-EBUILD libgpr-2016.ebuild 1243 BLAKE2B 68a8d2acd9a75c49cdbfc8828bc004ca4f1a586914302f108fdb655672ea229d965c3d00f08b041c6dc32316627d90a0d9fb1ca9c9126cf9f5fbd51e07043831 SHA512 389b16cbf67e40ef924f50492ac81cecb54eddf25342a435d16cebaf7b3b1be74e86b7ed2539a2c4cbb288f301ed6877998f8c50d5788fb7d075143f9f917349
-EBUILD libgpr-2017.ebuild 1388 BLAKE2B 97c790d84d22f76209bdc4f47a834a190e5faa8f6a3b179bf0d67ef91077e9c98b6a522903ee232a0444dd73a9fb6b8862f2a98155241657193c0175ef03ec93 SHA512 0430a17c2e7250b209cbe9508229a4dc59ff9f3b1f51f2c13de8a6484703946e59ae7380169c0e892b45aa78a5275b987075cf0903ab9e59068e30fab59945ac
-EBUILD libgpr-2018.ebuild 1427 BLAKE2B bbec85a8110884673e969b9b4f0fb740daf289407e8e9bde5cc8c59f8f465862866806df216cc8c220e7299e14d29f0974a87862648b323e4a4d785f0854898b SHA512 7a4c42bae0287c4d78dd5ac14f1846092a3c639b5b5cdd5ae8be1bff7498df12f4b9041cb76f6063aabd32e4994fe0fda97386f72559094a3bd023b439501460
+EBUILD libgpr-2017.ebuild 1299 BLAKE2B c152fef9cef6867ec0b3b04c3756ec3b2c247a72e1c4bf4e5933d817cda35720a729a9fd0d29705bf994ec5d18681501eed752b58d04a9cd161cf6f03b826509 SHA512 dff8e1a99b64f347a1aa1ba5d2675608d1b86a2ff3c5dc125a5b800fd3350278e444573eeb0e272334f28aead87d088e9983604329c6ba628657503e1d6b7861
+EBUILD libgpr-2018.ebuild 1425 BLAKE2B b3e1b294e1028b9a975b75f8b634ef878ef9ae3525c24b0fd4870d36230763106e1caacbfd4e8b09ceac1b9c2f8612b6aca65ad302750fddbf517afd8a23ab15 SHA512 38c68f42fdfa6286668efb0ca7cd2c75e102d92eb26985d28bb34480e3a972025c0263c5f8f42e9cb0c982ae4405157bec6a9295b857870319271aa0dcd224b1
 MISC metadata.xml 1175 BLAKE2B 8b512fd5efae4481d319fc52a11f3730af081d5c3ff12f6c6d62768e905e0651e3b4792765f65edbf659862b56372f32ba3aa7ae51c12b2911b711cb12a013e1 SHA512 edd6bb889abfe036d2509e56f350cf058e249e398811fdb2890bd001b75143b8d9df28bb64acba195852d01d484b7e6381e82ce972aad6d8cf1e0c961b3ade72
diff --git a/dev-ada/libgpr/files/libgpr-2016-gentoo.patch b/dev-ada/libgpr/files/libgpr-2016-gentoo.patch
index 2ddbab095d72..0282e60892bf 100644
--- a/dev-ada/libgpr/files/libgpr-2016-gentoo.patch
+++ b/dev-ada/libgpr/files/libgpr-2016-gentoo.patch
@@ -20,15 +20,15 @@
  
  libgpr.build.shared:
 -	${BUILDER} -XLIBRARY_TYPE=relocatable -P$(srcdir)/gpr/gpr.gpr
-+	${BUILDER} -XLIBRARY_TYPE=relocatable -P$(srcdir)/gpr/gpr.gpr -cargs:Ada $(ADAFLAGS)
++	${BUILDER} -v -XLIBRARY_TYPE=relocatable -P$(srcdir)/gpr/gpr.gpr -cargs:Ada $(ADAFLAGS)
  
  libgpr.build.static:
 -	${BUILDER} -XLIBRARY_TYPE=static -P$(srcdir)/gpr/gpr.gpr
-+	${BUILDER} -XLIBRARY_TYPE=static -P$(srcdir)/gpr/gpr.gpr -cargs:Ada $(ADAFLAGS)
++	${BUILDER} -v -XLIBRARY_TYPE=static -P$(srcdir)/gpr/gpr.gpr -cargs:Ada $(ADAFLAGS)
  
  libgpr.build.static-pic:
 -	${BUILDER} -XLIBRARY_TYPE=static-pic -P$(srcdir)/gpr/gpr.gpr
-+	${BUILDER} -XLIBRARY_TYPE=static-pic -P$(srcdir)/gpr/gpr.gpr -cargs:Ada $(ADAFLAGS)
++	${BUILDER} -v -XLIBRARY_TYPE=static-pic -P$(srcdir)/gpr/gpr.gpr -cargs:Ada $(ADAFLAGS)
  
  libgpr.install: $(foreach t, $(LIBGPR_TYPES), libgpr.install.$(t))
  
diff --git a/dev-ada/libgpr/files/libgpr-2017-gentoo.patch b/dev-ada/libgpr/files/libgpr-2017-gentoo.patch
deleted file mode 100644
index 656240e62589..000000000000
--- a/dev-ada/libgpr/files/libgpr-2017-gentoo.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- gprbuild-2017/gpr/gpr.gpr.old	2017-05-27 20:59:07.061135892 +0200
-+++ gprbuild-2017/gpr/gpr.gpr	2017-05-27 20:59:38.022638398 +0200
-@@ -67,6 +67,7 @@
-             for Switches ("gpr*.ad?") use
-               Compiler'Default_Switches ("Ada") & ("-g1");
-       end case;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
- end GPR;
---- gprbuild-gpl-2016-src/gpr/src/gpr-env.adb.old	2017-11-13 22:16:53.349083426 +0100
-+++ gprbuild-gpl-2016-src/gpr/src/gpr-env.adb	2017-11-13 22:17:22.692590351 +0100
-@@ -1948,6 +1948,8 @@
- 
-       end if;
- 
-+      Add_Directories (Self, "/usr/share/gpr");
-+
-       if Gpr_Prj_Path.all /= "" then
-          Add_Directories (Self, Gpr_Prj_Path.all);
-       end if;
---- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old	2017-11-19 13:09:18.947527738 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads	2017-11-19 13:10:08.125654595 +0100
-@@ -27,6 +27,8 @@
-    Name_Buffer : String (1 .. 1_000_000);
-    Name_Len    : Natural := 0;
- 
-+   Last_Id     : Name_Id := Name_Id'First;
-+
-    procedure Get_Name_String (Id : Name_Id);
-    procedure Get_Name_String (Id : Unit_Name_Type);
-    procedure Get_Name_String (Id : File_Name_Type);
---- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old	2017-11-19 13:10:27.674316703 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb	2017-11-19 13:14:38.360963627 +0100
-@@ -354,6 +354,8 @@
- 
-       Name_Chars.Append (ASCII.NUL);
- 
-+      Last_Id := Name_Entries.Last;
-+
-       return Name_Entries.Last;
-    end Name_Enter;
- 
-@@ -427,6 +429,8 @@
- 
-       Name_Chars.Append (ASCII.NUL);
- 
-+      Last_Id := Name_Entries.Last;
-+
-       return Name_Entries.Last;
-    end Name_Find;
- 
---- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old	2017-11-19 13:12:41.592995718 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb	2017-11-19 13:16:31.980979696 +0100
-@@ -53,6 +53,10 @@
-          return;
-       end if;
- 
-+      if Last_Id = Name_Id'First then
-+         Add_Name ("");
-+      end if;
-+
-       Add_Name ("a");
-       Add_Name ("b");
-       Add_Name ("c");
diff --git a/dev-ada/libgpr/libgpr-2016.ebuild b/dev-ada/libgpr/libgpr-2016.ebuild
deleted file mode 100644
index 39fb18af6899..000000000000
--- a/dev-ada/libgpr/libgpr-2016.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multiprocessing
-
-MYP=gprbuild-gpl-${PV}
-
-DESCRIPTION="Ada library to handle GPRbuild project files"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/57399662c7a447658e0affa8
-		-> ${MYP}-src.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gnat_2016 gnat_2017 +shared static-libs static-pic"
-
-RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=]"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-
-S="${WORKDIR}"/${MYP}-src
-
-REQUIRED_USE="|| ( shared static-libs static-pic )"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	else
-		GCC_PV=6.3.0
-	fi
-	GCC=${CHOST}-gcc-${GCC_PV}
-	if use static-libs; then
-		emake PROCESSORS=$(makeopts_jobs) libgpr.build.static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake PROCESSORS=$(makeopts_jobs) libgpr.build.${kind}
-		fi
-	done
-}
-
-src_install() {
-	if use static-libs; then
-		emake DESTDIR="${D}" libgpr.install.static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake DESTDIR="${D}" libgpr.install.${kind}
-		fi
-	done
-}
diff --git a/dev-ada/libgpr/libgpr-2017.ebuild b/dev-ada/libgpr/libgpr-2017.ebuild
index f2ca1d510730..f143af3dc4f8 100644
--- a/dev-ada/libgpr/libgpr-2017.ebuild
+++ b/dev-ada/libgpr/libgpr-2017.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
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"/${MYP}-src
 
 REQUIRED_USE="|| ( shared static-libs static-pic )"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch )
 
 src_configure() {
 	emake prefix="${D}"usr setup
@@ -35,12 +35,6 @@ src_compile() {
 			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
 			gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
 	}
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	else
-		GCC_PV=6.3.0
-	fi
-	GCC=${CHOST}-gcc-${GCC_PV}
 	if use shared; then
 		build relocatable
 	fi
diff --git a/dev-ada/libgpr/libgpr-2018.ebuild b/dev-ada/libgpr/libgpr-2018.ebuild
index 10776c86ccd1..ae6c33a82bbb 100644
--- a/dev-ada/libgpr/libgpr-2018.ebuild
+++ b/dev-ada/libgpr/libgpr-2018.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68
 		-> ${MYP}-src.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic"
 
 RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?]
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 67234fb6afd1..c022a5336efb 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,6 +1,4 @@
-AUX xmlada-2017-gentoo.patch 1133 BLAKE2B 6b15f8225c8d4094417f20b61261fc247a4c9290831265b15cf1a3f865d532c6e685cebf5c8cf635fc51ae0a44386428ee8b9300738a5fe0c2951e4a68cb7bb8 SHA512 47d383b18c6c46653c5369b691af47d8b7ea333d32d7ddcc5cb6831dea08dbfeec353ffa0e4de279baff4fedf911c39e28a6608529357ad70b9c1ce0a9a42b49
-DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
+AUX xmlada-2018-gentoo.patch 1133 BLAKE2B 6b15f8225c8d4094417f20b61261fc247a4c9290831265b15cf1a3f865d532c6e685cebf5c8cf635fc51ae0a44386428ee8b9300738a5fe0c2951e4a68cb7bb8 SHA512 47d383b18c6c46653c5369b691af47d8b7ea333d32d7ddcc5cb6831dea08dbfeec353ffa0e4de279baff4fedf911c39e28a6608529357ad70b9c1ce0a9a42b49
 DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430
-EBUILD xmlada-2017.ebuild 2120 BLAKE2B 075a4fc91c5a68063f01df6fbbadd51ba550cd4e1b6896b0ad4ab5345d920fbab354aa3dff9ad0c5609fa16a25173c7390cc03dce16cc59bf87c7c3335bcd17a SHA512 bb4e8f7623d06eec64d5677bb41ef69e2fe4dd503799c66da37a2d2a42f63ac125900a10c5f04c4ca1e9b19696c4112877ce233f009352f96b53fdb82eb4da7b
-EBUILD xmlada-2018.ebuild 1879 BLAKE2B 9b0727eb9929e46aaad938400a69d76399d91e9f3247d66e1a1b7e0543893ee7e886acbe24e1bb3a778df8b19ca07fda8be41b482317d3e2c78842699f4393e9 SHA512 275a71bf9ffda5142e3c51fd7e887f81ed7408c47cd405f66cceff8182fb4f0772d424ec7b03087dcbf2f921ba367593ab00f827b51191cf385038e32fa6b47f
+EBUILD xmlada-2018.ebuild 1871 BLAKE2B f36dba5e21dadead63933f44e9b62da81ba3a40e523f92485515c7b9ccda27a84ba454325cbd7155de2da0552708266d4d05907255c852eef685e7ff007093fb SHA512 0753455dcdcc5f9e95d3966cdfffaf4fc7598f75efdc175f401ef759edcf86f89039b5035ca469399b3c67ef6e73387ec5aa53ff2145632e0b0809979d0a2580
 MISC metadata.xml 1143 BLAKE2B 7f633dfb6a079c1e981b7b7fe53f60df746919bea32c32c257002c3e13682d24b269d5bbe1b61700df930b7722d3f503bfff52c00676301f7a19523749edda81 SHA512 ce5fe7f5ca7d79bbd4b648608f1521056b62b90c70aec62b49e4be5737319df56a9248bd57b695b1469e2bb9b9b49c6c910c2321f1a690546ae1447bb0519006
diff --git a/dev-ada/xmlada/files/xmlada-2017-gentoo.patch b/dev-ada/xmlada/files/xmlada-2018-gentoo.patch
index 9e79572e3067..9e79572e3067 100644
--- a/dev-ada/xmlada/files/xmlada-2017-gentoo.patch
+++ b/dev-ada/xmlada/files/xmlada-2018-gentoo.patch
diff --git a/dev-ada/xmlada/xmlada-2017.ebuild b/dev-ada/xmlada/xmlada-2017.ebuild
deleted file mode 100644
index b3ee623ff920..000000000000
--- a/dev-ada/xmlada/xmlada-2017.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 ->
-	${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	^^ ( gnat_2016 gnat_2017 )"
-
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure () {
-	econf --prefix="${D}"/usr
-}
-
-src_compile () {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
-			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
-			-cargs ${ADAFLAGS} || die "gprbuild failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-}
-
-src_test() {
-	emake test
-	emake run_test | grep DIFF && die
-}
-
-src_install () {
-	local includedir=/usr/include/${PN}
-
-	fix_install () {
-		mv "${D}"${includedir}/$1.$2/* "${D}"${includedir}/$1/ || die
-		for file in "${D}"${includedir}/$1/*; do
-			dosym ../$1/$(basename ${file}) \
-				${includedir}/$1.$2/$(basename ${file})
-		done
-	}
-
-	if use static-libs; then
-		emake PROCESSORS=$(makeopts_jobs) install-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake PROCESSORS=$(makeopts_jobs) install-${kind}
-		fi
-	done
-	rm "${D}"/usr/lib/libxmlada_* || die
-	for dir in xmlada_{dom,input,sax,schema,unicode}; do
-		dodir /usr/include/${PN}/${dir}
-		if use shared; then
-			fix_install ${dir} relocatable
-		fi
-		if use static-libs; then
-			fix_install ${dir} static
-		fi
-		if use static-pic; then
-			fix_install ${dir} static-pic
-		fi
-	done
-	einstalldocs
-	dodoc xmlada-roadmap.txt
-	rm "${D}"/usr/share/doc/${PN}/.buildinfo || die
-}
diff --git a/dev-ada/xmlada/xmlada-2018.ebuild b/dev-ada/xmlada/xmlada-2018.ebuild
index 434c852375c6..752a6a94d5a2 100644
--- a/dev-ada/xmlada/xmlada-2018.ebuild
+++ b/dev-ada/xmlada/xmlada-2018.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic"
 REQUIRED_USE="|| ( shared static-libs static-pic )
 	^^ ( gnat_2016 gnat_2017 gnat_2018 )"
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${MYP}-src
 
-PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_configure () {
 	econf --prefix="${D}"/usr