gentoo resync : 10.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-10 13:21:36 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-10 13:21:36 +0000
commit: 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch)
tree: 5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /dev-ada
parent: bd4aeefe33e63f613512604e47bfca7b2187697d (diff)
45 files changed, 25 insertions, 1972 deletions
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index f48c01da2d0a..2105dffbde23 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
index 173b0777770b..a2474bf188e5 100644
--- a/dev-ada/asis/Manifest
+++ b/dev-ada/asis/Manifest
@@ -2,10 +2,6 @@ AUX asis-2016-gentoo.patch 1487 BLAKE2B 859aebba0bfe56ab846f82f2f75cb04c6b5edf25
 AUX asis-2017-gentoo.patch 2030 BLAKE2B 261d2e32b818f17ea4ea51047cf71b73f89d918094397702d6b7f9eaa9e2edb39d754d12beb23b2b6b0a55012773767915c2dc3bd69db850558c8c3afbe44dd5 SHA512 9697264392827254fc23993979ddb1cef8276e8f699f776f85a4ce09fcaf2e87b68e4187622fc16c809d71e7e360626c72f5d5f7be33c72a9544996cbf1321f9
 DIST asis-2019-20190517-18AB5-src.tar.gz 6173053 BLAKE2B 2ce8ba783f5d58503f6b792329779eb8a5f99746b3b03225f13da058ed5a757aef49c6ae8729b71079c67da6537c35db1c7173a569a2d7063421da5d2adee2c4 SHA512 3ca32fa2eeee10ef2d0e6eb8ab555c3e31b417bdab6749fdd8bd264efa2c93a388a5731c40705782a3a28f16e0c385af195f69d95020e265b2230ead1c91977f
 DIST asis-gpl-2016-src.tar.gz 5240554 BLAKE2B b95be816f5f52ac2b29814c09166774884dc166df6e08b26769c9502443f9797c42a1f9b6168336636add6515b748b3ef4b38c6a1dc6f49c1afb9ecec8e50c50 SHA512 439195d4cb5d58328dcc8c815cb6a32c5f8ed1d6581246dfa5dcca7c212ffad38dd63df25e490c4ac628eaf8c8e6d286f8ea036b7f39499704565b60c1bba8ee
-DIST asis-gpl-2018-src.tar.gz 5983604 BLAKE2B d91e3ff5cb95ec5b69121ed09e73f7bff234147b809353577315cd25cae0069ec5ebfc221a9798341b2a33bde316d74c4ce47c7ace580fe4d867e47032e207f2 SHA512 e00750adf17df8d534f0e561d129002d8b3c9efd6ba9c8d6768840d1399933271d748bafb7358a45d0a520620a335e669a6c2770ed89660bb319b609961a433a
-EBUILD asis-2016-r1.ebuild 1173 BLAKE2B 7b833a60dd5ee7bff7c527a192a8f0714879d275cd532a20dddb41e8047660630dd96ed78e48696fecf1999a1806f82e77d0261d2beb5674e1cb7ef18812fa9f SHA512 065af1eb07091e224101f57136362af42d7a40cd56263752d99a82d9165e49f68267af46c9f17424ffc594c1c6a49846b7529d9f6ded5a1787fa51170ab5074d
-EBUILD asis-2016.ebuild 1232 BLAKE2B d3a93a852880141b7403033fa92830477e7df5a1f915a5114caa44524370da669b46784debe3d2eb752733aa5427f337ecf6874cde2c1118240f85668656e577 SHA512 e90b86afa5992ea86ae4f11d1023486f96a758b218091f2b7fc05a5434815d71d9b93c770f67144a80b87dd973fc211a13f8d5b900e809ef1251bcf499bca83f
-EBUILD asis-2018.ebuild 1315 BLAKE2B b9dc4ee73cca440af4b9af2987ebcf216d462b1551ac7a0147962bf456036f2ad36821234e3a76ee38bb77e81d4f42adf5ee8dae553c0e5745955cfe5c731f55 SHA512 e5f61d632e71e995319194ef9d813c4434446c6c18ae02bfec32cd974aebf0e723e6f55fd3241221f4b667785644dcde623612506cd448cadc36157b27b321ff
-EBUILD asis-2019-r1.ebuild 1273 BLAKE2B 8d586884d8d8dd605092403a9a2b26a697f39987919abd8ffbfa708d2e1f1c077ac3d180e64919f48896459efd98116ba71fb645ce5166833d74e0e93808b100 SHA512 c0fee6e57bb15f42e18e270a1d5287b3c1cbeba6b5389d304323cf4c5b49425ba5b29bc7951b427692b4a131d026a83aff57bf5ba739fdb7a13871aeab745942
-EBUILD asis-2019.ebuild 1416 BLAKE2B a95f6b45eb90223f42bb351f16467f0d587fa4ce7737b481d64d8400911e57cfc45eee3839c68dd703a7ad83d4f75aba43ff9c57f61e9d1b4d1b40be4d5df8b2 SHA512 00168cf5e50c24484a8871f4248501bd9a07994d1d1348f85cfe8b4ca043fd6d8191df01e2fc6e27e05f756bc492bf40e34c620b08df67809e43ef2c11257c08
+EBUILD asis-2016-r1.ebuild 1113 BLAKE2B 38a3e218153d8a9f35d3f0bc795de883a6d069e5dd459a6e9fda06590e5a4c8ead23ba0c3704ad1b8c7b6f7b7a62f2be2820b4fa67ee23351fb973e96c4dd2ed SHA512 26f1ae553eda889add57c0791ee906c3e5d2ad4d1d01fa856f7b0de8172db0b8f42025ee91b187d2a0cebb7d80339915faae7466371d87e054edbd9e3eeddcd9
+EBUILD asis-2019-r1.ebuild 1213 BLAKE2B 8460b7c7e3185d15d2ee21f784a01a71c91b35af39be467b39b80c8e1649a6f38e84c199d8db255a073c0f7ef3952c0eb401042c63152a8ffc82183f426f6548 SHA512 8f6212f5612a12a463d894351fb1848ad2fef415e671b9da066bb7ddd0b6c39cdf3ceb848f6b4173650aa137b1140b5521a3a9069b46ac0a8d8133d8a70c832f
 MISC metadata.xml 507 BLAKE2B 8b1df4ce46d0dad00a66b5460fe5274c3d31080a6dbfe88c2482bce2097c22899ed9bf8415243c4af658dfb383c5865bf0b363cec7f72ddda54d595bbd772708 SHA512 09fcf4af4c0ff4a27bdd41a2abece2736c6f78c38b1a5a4f05dbe418def78493df4940b2ee6e528f9ffc9184f69c61deb1912fc309b0304da0b4a30f1690dd9d
diff --git a/dev-ada/asis/asis-2016-r1.ebuild b/dev-ada/asis/asis-2016-r1.ebuild
index acbf13c1d35b..1918e6f75d29 100644
--- a/dev-ada/asis/asis-2016-r1.ebuild
+++ b/dev-ada/asis/asis-2016-r1.ebuild
@@ -18,10 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-ada/gnat_util[${ADA_USEDEP}]
-	|| (
-		dev-ada/gnatcoll[${ADA_USEDEP},projects,shared]
-		dev-ada/gnatcoll-core[${ADA_USEDEP},shared]
-	)"
+	dev-ada/gnatcoll-core[${ADA_USEDEP},shared]"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
 
diff --git a/dev-ada/asis/asis-2016.ebuild b/dev-ada/asis/asis-2016.ebuild
deleted file mode 100644
index e86f691ae7bb..000000000000
--- a/dev-ada/asis/asis-2016.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multiprocessing
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="To develop tools for Ada software"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/57399029c7a447658e0aff71
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gnat_2016 gnat_2017 gnat_2018"
-
-RDEPEND="dev-ada/gnat_util[gnat_2016(-)?,gnat_2017(-)?]
-	|| (
-		dev-ada/gnatcoll[gnat_2016=,gnat_2017=,projects,shared]
-		dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,shared]
-	)"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?]"
-
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 ) !gnat_2018"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	emake PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD_FLAGS="-vl"
-	emake tools PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD_FLAGS="-vl \
-		-XGPR_BUILD=relocatable \
-		-XLIBRARY_TYPE=relocatable \
-		-XXMLADA_BUILD=relocatable"
-}
-
-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/asis-2018.ebuild b/dev-ada/asis/asis-2018.ebuild
deleted file mode 100644
index b895af4212b4..000000000000
--- a/dev-ada/asis/asis-2018.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multiprocessing
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="To develop tools for Ada software"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27ab8
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2017 +gnat_2018"
-
-RDEPEND="dev-ada/gnat_util[gnat_2017(-)?,gnat_2018(-)?]
-	|| (
-		dev-ada/gnatcoll-core[gnat_2017(-)?,gnat_2018(-)?,shared]
-		dev-ada/gnatcoll[gnat_2017(-)?,gnat_2018(-)?,projects,shared]
-	)"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2017(-)?,gnat_2018(-)?]"
-
-REQUIRED_USE="|| ( gnat_2017 gnat_2018 )"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
-
-src_compile() {
-	emake PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD_FLAGS="-vl"
-	emake tools PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD_FLAGS="-vl \
-		-XGPR_BUILD=relocatable \
-		-XLIBRARY_TYPE=relocatable \
-		-XXMLADA_BUILD=relocatable"
-}
-
-src_install() {
-	emake prefix="${D}"/usr install
-	emake prefix="${D}"/usr install-tools \
-		GPRINSTALL="gprinstall \
-		-XGPR_BUILD=relocatable \
-		-XLIBRARY_TYPE=relocatable \
-		-XXMLADA_BUILD=relocatable"
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	mv "${D}"/usr/bin/gnatpp{,-asis} || die
-}
diff --git a/dev-ada/asis/asis-2019-r1.ebuild b/dev-ada/asis/asis-2019-r1.ebuild
index b55e5b3ed45e..ce52378a7851 100644
--- a/dev-ada/asis/asis-2019-r1.ebuild
+++ b/dev-ada/asis/asis-2019-r1.ebuild
@@ -19,10 +19,7 @@ IUSE=""
 
 RDEPEND="
 	dev-ada/gnat_util[${ADA_USEDEP}]
-	|| (
-		dev-ada/gnatcoll-core[${ADA_USEDEP},shared]
-		dev-ada/gnatcoll[${ADA_USEDEP},projects,shared]
-	)"
+	dev-ada/gnatcoll-core[${ADA_USEDEP},shared]"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
 
diff --git a/dev-ada/asis/asis-2019.ebuild b/dev-ada/asis/asis-2019.ebuild
deleted file mode 100644
index 7477d83c7a8b..000000000000
--- a/dev-ada/asis/asis-2019.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing
-MYP=${P}-20190517-18AB5-src
-
-DESCRIPTION="To develop tools for Ada software"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf849031e87aa2cdf16b10
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2017 gnat_2018 +gnat_2019"
-
-RDEPEND="
-	dev-ada/gnat_util[gnat_2017(-)?]
-	dev-ada/gnat_util[gnat_2018(-)?,gnat_2019(-)?]
-	|| (
-		dev-ada/gnatcoll-core[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?,shared]
-		dev-ada/gnatcoll[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?,projects,shared]
-	)"
-DEPEND="${RDEPEND}
-dev-ada/gprbuild[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
-
-REQUIRED_USE="|| ( gnat_2017 gnat_2018 gnat_2019 )"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
-
-src_compile() {
-	emake PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD_FLAGS="-vl"
-	emake tools PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD_FLAGS="-vl \
-		-XGPR_BUILD=relocatable \
-		-XLIBRARY_TYPE=relocatable \
-		-XXMLADA_BUILD=relocatable"
-}
-
-src_install() {
-	emake prefix="${D}"/usr install
-	emake prefix="${D}"/usr install-tools \
-		GPRINSTALL="gprinstall \
-		-XGPR_BUILD=relocatable \
-		-XLIBRARY_TYPE=relocatable \
-		-XXMLADA_BUILD=relocatable"
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	mv "${D}"/usr/bin/gnatpp{,-asis} || die
-}
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index 26d6499cd534..157bf67debec 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -1,7 +1,4 @@
 AUX aunit-2016-gentoo.patch 374 BLAKE2B 00d34a835afdc4a1a80f8c4dad23ae4a30a89eb801c3aeb8177a4d0cb838b3edf0c8463c774da212a9be56378f493ddd41aa4a26d976a38f1800999903dd2263 SHA512 0ea27e0d8783788c83a3916071ea0dd5361f21a4fc67727b735986dfc624c9f1bd6aa471229c389f5453001577ca1eec0ecdd0865952a0aa5fe1453787dac33b
 DIST aunit-2019-20190429-18B77-src.tar.gz 624683 BLAKE2B 455c3566ed46138116f258b175e883a59102dc334b41040cd6a332175fc4138d7ccdab1357c5b8886f14e551e3a6f4f4aa73eb755ade4a7a1663ac2d999973ca SHA512 9b1834ebacb9dbaa7a01f702455a44921a26a8d8d00f55ecc2fc8ddf2d884ef2ef2bba0f62551421f5a47d558d0fba88cbd57671459bba0c9f90c6310d714b19
-DIST aunit-gpl-2018-src.tar.gz 639544 BLAKE2B a7d7469b0ec4951517b113a794dca4399a27d6d5d848194fc5bfa7728a5cd04644e4b5f1247eb3cfbab64c0294502ac70cdd6e7052cd60b788c7892eddb4294e SHA512 3409b490978e9160e3ec2d9214d50f846c4c38f7a728cd4ff306d6454d1e0944023342f17a580b0449cb528f42d3c608adec58b61318284237d02b7f77498513
-EBUILD aunit-2018.ebuild 1165 BLAKE2B ec11e394f0c83a3570d4e917a614fd4c42629409f53160e149ebd73bf80e51500be6427927845108a82a4c0ec81490866afe0fd291427a15a22e200b76271e91 SHA512 399dbeec06d5dd59adeaf107cb997c9ccce3acfe61c2733dd5bc17685b9aa748666942c552766f3c39bf0e9bc86353fafd9da5cf5e4556ba205b06afcabfcee7
 EBUILD aunit-2019-r1.ebuild 1114 BLAKE2B e3e407ab3a5d1ba65b3c66c974f3b5e9f465db9016a5e1b6fba6f32d0c03e6f8e6c0a3e180080746900fe02564ba4b051bff770c88413bd68c401563530c44c1 SHA512 a157a9e1dddc297fdb1f5e40174316775f8ea9fde182b255afa5d843b76646076060c5c1ceb32467eb63869b69aea5a6b9140136ccd49a0f24461d1e90315627
-EBUILD aunit-2019.ebuild 1352 BLAKE2B 9b2cc19ce94bc95c6d8cd0bbb46cf910e33b1cdd59cc5c76ca0f2c5d9e17e067c418628b930d4b6cfc712417f5660a9334fbcb976313c08c9d26bba3c3e3460f SHA512 9e5dffe86b7d6c35eac0af5f290772f3a2a0ff394e01dc2a83a66cb8235ca1be59839c5948eeb06dfbb7990376666ea6a44c6ff43cf7da4b5e05686b425cf999
 MISC metadata.xml 764 BLAKE2B fa5a767e7539d5fa8d2ce44240495fe471f8221897273a6c73748b0065a5239afaf99d4c28172a877b47611aa7d568a439cf47d172bee4a3f2878d4bd778ef9d SHA512 211f0200353e3573a700d1cbacb421e53e817617bbc5b74dbfb668194eae397b34193ad743acf70287b66d3fcb4c366214822b2e97a15bcfa80f9252b7f5faa9
diff --git a/dev-ada/aunit/aunit-2018.ebuild b/dev-ada/aunit/aunit-2018.ebuild
deleted file mode 100644
index 9e5b6ccce816..000000000000
--- a/dev-ada/aunit/aunit-2018.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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/5b0819e0c7a447df26c27ab3
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018"
-
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
-	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]"
-
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 )"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
-
-src_compile() {
-	emake GPRBUILD="gprbuild -j$(makeopts_jobs) -v"
-}
-
-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
-	rm -r "${D}"/usr/share/gpr/manifests || die
-}
diff --git a/dev-ada/aunit/aunit-2019.ebuild b/dev-ada/aunit/aunit-2019.ebuild
deleted file mode 100644
index 5fe8d14ab217..000000000000
--- a/dev-ada/aunit/aunit-2019.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing
-
-MYP=${P}-20190429-18B77-src
-
-DESCRIPTION="Ada unit testing framework"
-HOMEPAGE="http://libre.adacore.com/tools/aunit/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf859431e87aa2cdf16b18
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 gnat_2018 +gnat_2019"
-
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
-	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
-	gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
-	dev-ada/gprbuild[gnat_2019(-)?]"
-
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
-
-src_compile() {
-	emake GPRBUILD="gprbuild -j$(makeopts_jobs) -v"
-}
-
-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
-	rm -r "${D}"/usr/share/gpr/manifests || die
-}
-
-src_test() {
-	emake PROJECT_PATH_ARG="ADA_PROJECT_PATH=$(pwd)/lib/gnat" -C test
-}
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 893fcca1a92e..8f229246631e 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,12 +1,7 @@
 AUX aws-2016-gentoo.patch 1255 BLAKE2B a2b2d944a131d83b789fe91a1b31b062f039b2f6bafa870d524aefbdb59146a26ad5e7cc39222318aaa8ae9ccca663bead98e198aef845ce86d3195568a15d33 SHA512 53b4156f9c025969a8e2f603e1672949f7f2dd58a4c3d1a4ee8b17094a399bb207b6a242419ddd5e5a7e151ea3a72baee1c67f132aafb260ab5f89d8d12ad377
 AUX aws-2018-gentoo.patch 2097 BLAKE2B cbb0ed91c632292994efc2bec19d49b8ce62b0ccb04b052d201cf698c71c5adf0b699a9dab8df92f7a8787af1c7147b53ac620f4d98466bd04d3b05b8224d3ac SHA512 08bd51c90699e8d64acd1947c430ee2dd73c3fc82e754f8330be5a58525c0fce7953bc55e3d3a42078e717bc935db4b49bf3d73f154ff1e8695e1567644c8182
 DIST aws-2019-20190512-18AB9-src.tar.gz 4241817 BLAKE2B 1054c17c0e79ea4992a7e29fdb1996caa663321407b64ae88cb76cb03d953b7ea36a8c91a28f60328ea2ec3223c1d7f8c2f052f4f181f03b1f59cf33443ee27e SHA512 989043f75504ee8b3736800fa36f4d3a98a6bc745ff4bef38dd4f7c8a7072d5d1ea383dfd2fc090d8558a6d6442953e5f3c65e4633ab16bfb3dacf60ebf79a3b
-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 1043 BLAKE2B 4bf8df983ccf8dc107999091aacc234dc16e53c8cad90a06fe41cb00808a1394612a684864daf6931ba2dc5c940975256e5d0e9bdf6831d618dfcc74856ec876 SHA512 b09d084921f0a5268188405801e107f0679d1f8041dfb93f116eade1c04033146b4dd9c521fe1b5217cc6e927d91c7583e1662259c50b0975ed8d66b36807c93
-EBUILD aws-2018-r1.ebuild 1205 BLAKE2B ecc7e9974d3886bf35526716a802a6b8e5bc2ca499568a73567cf01e666d2f9589d4c42b314cfbbbdc3a34e9d0d806eca5d45a1af7f214ed5381241814911108 SHA512 bd6a86045303281dea61504f03d2b10df0702d06f0d0e7e33e55fd08482c1280a93d9fc46fc5274c69cbb88944f22cf9f2cf2edaf7fab544db01f98d2878bcaf
 EBUILD aws-2018-r2.ebuild 935 BLAKE2B 008b7dfdac6b1ab61b64c9d9d63aef6349ba5d74c8872fb387a9544f6caf78b33e14e82b3872f83088d4dc4b741fe5746fcc6b79c3cc0ed31dd72090339b13fe SHA512 3e1d24cae29ad40fd31368cedfa8a63e86366aae45e4e2aa79bacbb883277ea74e71130dc6e801fd623657a50f8150fb4ae2a9469ad7c4a33899165c26743357
-EBUILD aws-2018.ebuild 1010 BLAKE2B 220f4ef079cbe6a6e2d5672c338e1c8cdde58c985ed6fac110c07ad867390ec2e654c2b94db609ac0b4d3ee3679b73b98e73d7664a5e527a342d174780ded586 SHA512 b547af64ff976d2bc95d7cddfd1bceefcea0f92ce6e5065bb14442a3693236ea6b91682223a5b357690e32d6f3fc960e857e55f25af2971c6f845ccd32bdaf89
 EBUILD aws-2019-r1.ebuild 892 BLAKE2B a364986dd0a40544fb4915ce6484d517f62437468a55c01189751b3d9c0818acea43df3db2ff29de97736fc045da9c3346bbeff77ccf73e146cf80e68c433c7a SHA512 c394e76af5ba613cb8d817b563947f8d12a988f1e2d024ea31c95bd0f361a342ddf30a769bf77a8dc9c001d404e65afb609997130f3a08cdf63940497e0f3603
-EBUILD aws-2019.ebuild 842 BLAKE2B 66434f75c4b9f50f855e336029e468b3636ddc5fa5fb639139cee59d86c478095a540b7d1c8ac0fde9777007d2e332a522e1c8e0a19fd9ac2fd131109f518e87 SHA512 69bf8c1dec98e23c0473e45c882f28937af5fb8849472f14958a252c51948ad171f82c96bb31f99781cf7e5480b0b6cfd2916bb3bbbf2a468d96fd10257abba3
 MISC metadata.xml 659 BLAKE2B b9dcbdc561b8ffd774e7aa8d5fc1a6a809e1017e3b83d6473d8c72c690abac54b3a0ea7c4df5cbc5ed832ce9bf60e26d71c43f09cf35b3c33bdba9c3fb2dd423 SHA512 b17cf2ab035805b5e0fd7f423cfbaca61eaa6a8e7ce575fcb65b631b3c3318fc0eb9fbdcd4010a0187f07a4986acd351809697a7fc044ab7a9f4fe394b6ca227
diff --git a/dev-ada/aws/aws-2017.ebuild b/dev-ada/aws/aws-2017.ebuild
deleted file mode 100644
index 7bc3f363c081..000000000000
--- a/dev-ada/aws/aws-2017.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multiprocessing
-
-MY_P=${PN}-gpl-${PV}-src
-
-DESCRIPTION="A complete Web development framework"
-HOMEPAGE="http://libre.adacore.com/tools/aws/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed001
-	-> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 +gnat_2017"
-
-RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs]"
-DEPEND="${RDEPEND}
-	dev-ada/gnat_util[gnat_2016(-)?,gnat_2017(-)?,static-libs]
-	dev-ada/asis[gnat_2016(-)?,gnat_2017(-)?]
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?]"
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
-
-src_configure() {
-	emake -j1 setup prefix=/usr \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
-
-src_compile() {
-	emake \
-		PROCESSORS=$(makeopts_jobs) \
-		DEBUG=true \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
-
-src_install() {
-	emake DESTDIR="${D}" DEBUG=true install
-	einstalldocs
-}
diff --git a/dev-ada/aws/aws-2018-r1.ebuild b/dev-ada/aws/aws-2018-r1.ebuild
deleted file mode 100644
index 8df40c75b3a7..000000000000
--- a/dev-ada/aws/aws-2018-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multiprocessing
-
-MY_P=${PN}-gpl-${PV}-src
-
-DESCRIPTION="A complete Web development framework"
-HOMEPAGE="http://libre.adacore.com/tools/aws/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27abd
-	-> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019"
-
-RDEPEND="dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
-	dev-ada/xmlada[shared,static-libs]"
-DEPEND="${RDEPEND}
-	dev-ada/asis[gnat_2016(-)?]
-	dev-ada/asis[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
-	dev-ada/gprbuild[gnat_2019(-)?]"
-
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2016-gentoo.patch
-	"${FILESDIR}"/${PN}-2018-gentoo.patch
-)
-
-src_configure() {
-	emake -j1 setup prefix=/usr ENABLE_SHARED=true \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
-
-src_compile() {
-	emake \
-		PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/dev-ada/aws/aws-2018.ebuild b/dev-ada/aws/aws-2018.ebuild
deleted file mode 100644
index 13df9f3052b8..000000000000
--- a/dev-ada/aws/aws-2018.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multiprocessing
-
-MY_P=${PN}-gpl-${PV}-src
-
-DESCRIPTION="A complete Web development framework"
-HOMEPAGE="http://libre.adacore.com/tools/aws/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27abd
-	-> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018"
-
-RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018(-)=]
-	dev-ada/xmlada[shared,static-libs]"
-DEPEND="${RDEPEND}
-	dev-ada/asis[gnat_2016(-)=,gnat_2017(-)=,gnat_2018(-)=]
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
-
-src_configure() {
-	emake -j1 setup prefix=/usr ENABLE_SHARED=true \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
-
-src_compile() {
-	emake \
-		PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/dev-ada/aws/aws-2019.ebuild b/dev-ada/aws/aws-2019.ebuild
deleted file mode 100644
index 6096f1148c3d..000000000000
--- a/dev-ada/aws/aws-2019.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing
-
-MY_P=${P}-20190512-18AB9-src
-
-DESCRIPTION="A complete Web development framework"
-HOMEPAGE="http://libre.adacore.com/tools/aws/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf85a031e87aa2cdf16b19
-	-> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gnat_2019"
-
-RDEPEND="dev-ada/xmlada[gnat_2019]
-	dev-ada/xmlada[shared,static-libs]"
-DEPEND="${RDEPEND}
-	dev-ada/asis[gnat_2019]
-	dev-ada/gprbuild[gnat_2019]"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2016-gentoo.patch
-)
-
-src_configure() {
-	emake -j1 setup prefix=/usr ENABLE_SHARED=true \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
-
-src_compile() {
-	emake \
-		PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index 5c0102f3c686..43cb3a4d6f18 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1,6 +1,3 @@
 DIST gnatcoll-bindings-2019-20190430-1928C-src.tar.gz 138935 BLAKE2B c72398b51bf383b163ac10000c4dd5441334a6f24d7ad075d8115f25c030b43bc1dace6a1121e1e69add1eead93a5389aff09ef013deb4682ccb1d31bb85313f SHA512 6db1d35a1cdf5188001084750f7aa32b193768f8c3dfb6d7db8a8314c745fc054b0a6d2234a6dd64c5acd4b1bafffa7ce7f1080bd51fbb8bc88edfcc855b7a48
-DIST gnatcoll-bindings-gpl-2018-src.tar.gz 100068 BLAKE2B 7e5fe106d421d853135ddaea04b7bf2b306e7d0f054379b4c66b58844ac73270d7c82de549e9440f4ecc672ed7e9df6e2b3c1fea55b67403aaa33b09c124bb9b SHA512 2d42e904ab7324d958b34b103ceb2cf7d9bf620f324578b8d3537c18bcc2b4ba73d553bbec773cde5d57979c3e68bc9eef69f97dd55a3b21e43d464881676295
-EBUILD gnatcoll-bindings-2018-r1.ebuild 2265 BLAKE2B 6a68652aa98e6cc69e4158542b72826ed4aa12164e0c5555d7d490d6ad4d10196e3527875be17f6bc02a7f485e3dc9eccd9cc25ae5cdb8fedee3f4888a2ce8b7 SHA512 b324c1a8f9eb2cacb141ea49d1f1901d26f584976f34c1e3d8334bb2fcbfcc7483151c866d40b2d9e5ca36f8565c212d22e519b85dbb14f8691e96245efc268e
 EBUILD gnatcoll-bindings-2019-r1.ebuild 2183 BLAKE2B 0406c1a302581dacd187b74cdf44ae71623ffc41426ad8bf15373bc84ac854be225490ababea7bdf5f22055ba94398fde7b9af5e3de552500f29f23d09de0e2a SHA512 da2e5688800c07c427918cdb67b0fb3f531751eae2d1f65c7a7e82c228184f7bab5d50af3d39937cf43cd8921c20099bc7bb834883fa0c849e2c5d73047e3405
-EBUILD gnatcoll-bindings-2019.ebuild 2269 BLAKE2B 928245bba79199762141e8f1d1fe422468620c3288bccea8987aee1a0a286401bbc5c638b5f9c3bc6b5ff527a553758888dac51497680ea1e497228d3e7ff5b0 SHA512 0436f7d6eed39f5763f4bf30255feb6f85c5f92bf0de427c38db66b35b8b609e40246d96680f3a139420a0254ba87a272eaa1709e1fe6bd6cf4e493851e0ed04
 MISC metadata.xml 1081 BLAKE2B a4c643dd943c019ebb42f81dc078391885d80fb3abf3afb52494d33802592eacbf43c33560855239c7e88e86f306444392b9a6336a8255d18762f095d8283838 SHA512 7e4006ffc2f972dc45efb174451c9450545c10b1b55c63bad0157940d5c64da2ac7a908f51c4a0244e2df3b09e448aac610b97dfdfa8e80a32d913de2f6c31af
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild
deleted file mode 100644
index 131bd638518d..000000000000
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit multilib multiprocessing python-single-r1
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="GNAT Component Collection"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0ce9cfc7a4475261f97ca5
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 gmp iconv python readline +shared
-	static-libs static-pic syslog"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
-	dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
-	gmp? ( dev-libs/gmp:* )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
-	dev-ada/gprbuild[gnat_2019(-)?]"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
-
-S="${WORKDIR}"/${MYP}-src
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v \
-			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
-			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
-			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
-			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in gmp iconv python readline syslog ; do
-				if use $dir; then
-					build $dir $lib
-				fi
-			done
-		fi
-	done
-}
-
-src_install() {
-	build () {
-		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
-			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in gmp iconv python readline syslog ; do
-				if use $dir; then
-					build $dir $lib
-				fi
-			done
-		fi
-	done
-	if use iconv; then
-		sed -i \
-			-e "s:GNATCOLL_ICONV_BUILD:LIBRARY_TYPE:" \
-			"${D}"/usr/share/gpr/gnatcoll_iconv.gpr \
-			|| die
-	fi
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild
deleted file mode 100644
index a9df5354e778..000000000000
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit multilib multiprocessing python-single-r1
-
-MYP=${P}-20190430-1928C
-
-DESCRIPTION="GNAT Component Collection"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8afa31e87a8f1d425054
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 gnat_2018 +gnat_2019 gmp iconv python readline +shared
-	static-libs static-pic syslog"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
-	dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
-	gmp? ( dev-libs/gmp:* )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
-	dev-ada/gprbuild[gnat_2019(-)?]"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
-
-S="${WORKDIR}"/${MYP}-src
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v \
-			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
-			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
-			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
-			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in gmp iconv python readline syslog ; do
-				if use $dir; then
-					build $dir $lib
-				fi
-			done
-		fi
-	done
-}
-
-src_install() {
-	build () {
-		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
-			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in gmp iconv python readline syslog ; do
-				if use $dir; then
-					build $dir $lib
-				fi
-			done
-		fi
-	done
-	if use iconv; then
-		sed -i \
-			-e "s:GNATCOLL_ICONV_BUILD:LIBRARY_TYPE:" \
-			"${D}"/usr/share/gpr/gnatcoll_iconv.gpr \
-			|| die
-	fi
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index 6cecdb764e5b..fb806de2ccfe 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -1,7 +1,4 @@
 AUX gnatcoll-core-2018-gentoo.patch 555 BLAKE2B d0913c845f4f7d96afbcec5d400599535417ee1c7b0d9f3c1e0c8766218c6a2556ff2de3e39febc1882b31e947876ca0849fad1564970f422530e58a8966c638 SHA512 90ef785337cb85aa7e2e2b5d0a24efc963512aa19780b215a96a1db6d980e55ff3b1409939e6d77913bf6416d158402ca900fd3ccc4cfb5362ee7440dfb42b64
 DIST gnatcoll-core-2019-20190515-24AD8-src.tar.gz 1423276 BLAKE2B 154b7a7f77c1f0d6414cb407958d64b84be8d19b7e3a12f69bd3dd1253b71df394aa0c842d2caf9d2de071ea5466589111526329155291f0d967c8b4cc2b18ac SHA512 9b2101448b96ac46cebada1fe3cb7b583cbf296f9b7d627771e83c56c78ce72c50ede5474f64f16feba252a18fd46b473901820766902b0c68d63beaf55a884a
-DIST gnatcoll-core-gpl-2018-src.tar.gz 1657129 BLAKE2B 616aef931fb542f4a022c63db53acb0f8b4323e3b948eb7b8b5688c36817b3f52b5f517b969b0560b6492d51a3e59c8350449cbbe7246b5294c45caeead4d9d6 SHA512 bf6082573dc537836ea8506a2c9a75dc7837440c35c5b02a52add52e38290d99e90a9706690591f8899b8b4935824b195f230b3aa1c4da10911e3caf954c04ac
-EBUILD gnatcoll-core-2018-r1.ebuild 1836 BLAKE2B 47ca0213599f3b740c14934bb3360599d86409a221ef555e5388c39f16bb1e7f73fae3b7bdd914919e4d4d9d8431630af364166daccb3fc5aa491739c4be5a37 SHA512 e54b32a58803f4c2bb06a56d3981dff7ae9a8bdd0fd8a055316a489e433a7f807828f32501718644983fa602e7bf0556342148099ce0be00a8e9a4ffa5bd8815
 EBUILD gnatcoll-core-2019-r1.ebuild 1534 BLAKE2B f35eaf7d3ae1bf5798e203bbd7caab039a2c7b82d61ea8495eed3753405791f8612a1b7a3c16e5732525ea2eefaa6be95deaed1641faf41f66ed7dc274002213 SHA512 332e2b088a585ee7e7ac037d70f4e6710b096d736eb3ff0ae371dfa1f3ddfec266fe96167af0e43b2f4012919df58a250575b8e97e1bbb92b828c92cbb78d9b5
-EBUILD gnatcoll-core-2019.ebuild 1847 BLAKE2B eeede51b4df2382b351a82666cea64d4ea4ae835fcdbea06b4aa0d0ae4be3fbebaf2099b91cc996e284547303b069ca2df924b316b73ccbb211e87c1c8f98eff SHA512 2497d6c5fe6e88857d2c6411020cf6380e915669be8e0b8c4501793f03e9a59ccddadb03787f0761c42aa70d218fbbe5cd92a5b3eca02e7e969b715aba662cf6
 MISC metadata.xml 1095 BLAKE2B 52c64e5050f7d0be080c1c05a6beef22b88e1389c61c958c8f0ccd6958e7686c3b8ca5dcca685f0314e68e1713635475178d63edef1d41277ca83fdb59322529 SHA512 57963c0ed66d0f4844b6d41e66c3c2451f4d61da45119b38e3ef2e5b80de94d6426eefbc0307928c3629e052bd4c0fdd2e6e2cf7678029308299ffb151960905
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild
deleted file mode 100644
index 605dcf42e672..000000000000
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="GNAT Component Collection Core packages"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a99
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs static-pic"
-
-RDEPEND="
-	dev-ada/libgpr[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
-	dev-ada/libgpr[shared?,static-libs?,static-pic?]
-	!dev-ada/gnatcoll"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
-	dev-ada/gprbuild[gnat_2019(-)?]"
-
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	elif use gnat_2017; then
-		GCC_PV=6.3.0
-	elif use gnat_2018; then
-		GCC_PV=7.3.1
-	else
-		GCC_PV=8.3.1
-	fi
-	default
-	sed -i \
-		-e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \
-		src/gnatcoll-projects.ads \
-		|| die
-}
-
-src_configure() {
-	emake prefix="${D}usr" PROCESSORS=$(makeopts_jobs) setup
-}
-
-src_compile() {
-	build () {
-		gprbuild -p -m -j$(makeopts_jobs) \
-			-XBUILD=PROD -v -XGNATCOLL_VERSION=${PV} \
-			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$* -XGPR_BUILD=$1 \
-			gnatcoll.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-	if use static-libs; then
-		build static
-	fi
-}
-
-src_install() {
-	if use shared; then
-		emake install-relocatable
-	fi
-	if use static-pic; then
-		emake install-static-pic
-	fi
-	if use static-libs; then
-		emake install-static
-	fi
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild
deleted file mode 100644
index b5e4f695b3c1..000000000000
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multiprocessing
-
-MYP=${P}-20190515-24AD8
-
-DESCRIPTION="GNAT Component Collection Core packages"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8ae231e87a8f1d425052
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 gnat_2018 +gnat_2019 +shared static-libs static-pic"
-
-RDEPEND="
-	dev-ada/libgpr[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
-	dev-ada/libgpr[shared?,static-libs?,static-pic?]
-	!dev-ada/gnatcoll"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
-	dev-ada/gprbuild[gnat_2019(-)?]"
-
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch )
-
-src_prepare() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	elif use gnat_2017; then
-		GCC_PV=6.3.0
-	elif use gnat_2018; then
-		GCC_PV=7.3.1
-	else
-		GCC_PV=8.3.1
-	fi
-	default
-	sed -i \
-		-e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \
-		src/gnatcoll-projects.ads \
-		|| die
-}
-
-src_configure() {
-	emake prefix="${D}"/usr PROCESSORS=$(makeopts_jobs) setup
-}
-
-src_compile() {
-	build () {
-		gprbuild -p -m -j$(makeopts_jobs) \
-			-XBUILD=PROD -v -XGNATCOLL_VERSION=${PV} \
-			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$* -XGPR_BUILD=$1 \
-			gnatcoll.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-	if use static-libs; then
-		build static
-	fi
-}
-
-src_install() {
-	if use shared; then
-		emake install-relocatable
-	fi
-	if use static-pic; then
-		emake install-static-pic
-	fi
-	if use static-libs; then
-		emake install-static
-	fi
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll-db/Manifest b/dev-ada/gnatcoll-db/Manifest
index 79e5f7d12266..ebab19d7f462 100644
--- a/dev-ada/gnatcoll-db/Manifest
+++ b/dev-ada/gnatcoll-db/Manifest
@@ -1,6 +1,4 @@
 AUX gnatcoll-db-2018-gentoo.patch 361 BLAKE2B c7b15cb7433a5bb0f9fee68df4594a390d8d77ccd027e583dd14037a7a1319e727c99fbf4dc81de97ff457f1e0f6b237d1436f6b336668aca956fc5c083cbab6 SHA512 4d90c530bfa6948282c61c6df92a32aa8e03fa794768568ce10dda9a43cd3b56970761a0bd30913ae51f0a2605f2bc0ecc2124561982c7951985c35a974264e7
 DIST gnatcoll-db-2019-src.tar.gz 2405755 BLAKE2B 70db599e8fe90a1312c2078379c6cddf518159fd8eea8c958d1abf4f4ccc504c8296e0018b03fe7f145619b6f73d6ce38b7a43cfd73dd5e1df7eb1949aa81043 SHA512 89e941a786b1d9591f4cb9f5f7db02875bb37638be7efb88e31087900c8c10ac52680f1246f90cda6fbac1b9ab213bf364d88bf583ad262f17c0a647492019a3
-DIST gnatcoll-db-gpl-2018-src.tar.gz 2375712 BLAKE2B d5678bdc0993b67d93bdd4cb33ee3ecba15f7cdeead173caaaa08312103505d97099037215a3b0699296aadfa0ef68327f28e01c6229db1fefc5b7d7ebf93187 SHA512 02c967b5951ef0e17e58874e03c9a6252f9c4b28100c9530fb88212e91bc692545f3acc8623477942db220bd54d56b494150b088d05c40f6a24aad8cf6a8f8de
-EBUILD gnatcoll-db-2018-r1.ebuild 2819 BLAKE2B 8ea0088b103661b811009fe4bbaa8a9de77e07e04e82d0387edc708b527527bb35a6f539944edf38385d36509a0482bffdc72934a7f9e99dff7f6ed51a3b1ad3 SHA512 2b1f5c94d82d86a7737c68aedfda88674bb427911117036a7c1439cb297659de3167456b4cd8127413526d4107c6197f6220fc42b2ea8949799f3c0060355eeb
 EBUILD gnatcoll-db-2019.ebuild 2879 BLAKE2B c63d41cccbe419906927068a23c690da4f6fc62c3d0e94c770136d4515a6982abfb21c4c8b29825bddb8e62493c8ac37393fed30112c1d792b660d64f0d06f53 SHA512 c5cf114975caa802d0b8d7df9e2839fd87560b6eeee81b21786cbba2050fae76f76ceac17b632ed410e6a0aace3ae8523598c62f427249d7abc339d7613711c6
-MISC metadata.xml 1334 BLAKE2B 19a30eae622d616152c1a35e30f6c732c4018963a903e3644738404a8a0b5205e5231c7aa9640ff64d0f7b0e1f8dc4ee092ba66f368e7a81e66937f8bf6c0f44 SHA512 3729735cf08a4bb8dd07d6837dd238911d882aabe9e5021a5d89b54fb3a65bf840a25f3e25b8bc24dc667cf9025661c8944538817b21f61dbfec69e5a055072a
+MISC metadata.xml 1274 BLAKE2B 4ad9306fe74b983dfc03d23ed61bb9dab8791169bbb33e316514ad6a59ec3b947fade3b61455e8554f1af4721f5647afd9649d06b721349024c0ef2d02de87ba SHA512 bd09add1cc91e61e428a05bcafdbbb23c39bcfab58e42a2e46fd8d6b1df16af2b65ea78bf5a21b74509ed3e498ef257f263c30412e2de7457bb850b5d93be169
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
deleted file mode 100644
index af9bc69a22f9..000000000000
--- a/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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/5b0ce9cbc7a4475263382be6
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 gnatcoll_db2ada gnatinspect postgres
-	+shared sql sqlite static-libs static-pic xref"
-
-RDEPEND="dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
-	dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
-	sqlite? ( dev-db/sqlite:3 )
-	postgres? ( dev-db/postgresql:* )
-	xref? (
-		dev-ada/gnatcoll-bindings[iconv,shared?,static-libs?,static-pic?]
-		dev-ada/gnatcoll-bindings[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
-	)
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
-	dev-ada/gprbuild[gnat_2019(-)?]"
-
-REQUIRED_USE="gnatinspect? ( xref )
-	xref? ( sqlite )
-	sqlite? ( sql )
-	gnatcoll_db2ada? ( sql )
-	^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )
-	${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	build () {
-		GPR_PROJECT_PATH="${S}/sql":"${S}/sqlite":"${S}/xref" \
-			gprbuild -p -m -v -j$(makeopts_jobs) -XGNATCOLL_SQLITE=external \
-			-XGNATCOLL_VERSION=2018 \
-			-XBUILD=PROD -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 -XGPR_BUILD=$2 \
-			-P $1/$3.gpr \
-			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in sql sqlite xref postgres ; do
-				if use $dir; then
-					build $dir $lib gnatcoll_${dir}
-				fi
-			done
-		fi
-	done
-	if use shared; then
-		preflib=relocatable
-	elif use static-libs; then
-		preflib=static
-	else
-		preflib=static-pic
-	fi
-	for dir in gnatinspect gnatcoll_db2ada ; do
-		if use $dir; then
-			build $dir $lib ${dir}
-		fi
-	done
-}
-
-src_install() {
-	build () {
-		GPR_PROJECT_PATH="${D}/usr/share/gpr" gprinstall -p -f \
-			-XBUILD=PROD -XGNATCOLL_VERSION=2018 \
-			--prefix="${D}"/usr -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 \
-			-XGPR_BUILD=$2 --build-name=$2 --build-var=LIBRARY_TYPE \
-			-P $1/$3.gpr
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in sql sqlite xref postgres ; do
-				if use $dir; then
-					build $dir $lib gnatcoll_${dir}
-				fi
-			done
-		fi
-	done
-	for dir in gnatinspect gnatcoll_db2ada ; do
-		if use $dir; then
-			build $dir $lib ${dir}
-		fi
-	done
-	rm -rf "${D}"/usr/share/gpr/manifests
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll-db/metadata.xml b/dev-ada/gnatcoll-db/metadata.xml
index e07dfab5a68c..b73349412d9b 100644
--- a/dev-ada/gnatcoll-db/metadata.xml
+++ b/dev-ada/gnatcoll-db/metadata.xml
@@ -5,7 +5,6 @@
 		<email>ada@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="gnatcoll_db2ada">Build gnatcoll_db2ada</flag>
 		<flag name="db2ada">Build gnatcoll_db2ada</flag>
 		<flag name="gnatinspect">Build gnatinspect</flag>
 		<flag name="shared">Build shared library</flag>
diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest
index 05f99026558e..588789a8825f 100644
--- a/dev-ada/gnatmem/Manifest
+++ b/dev-ada/gnatmem/Manifest
@@ -1,5 +1,4 @@
 AUX gnatmem-2018-gentoo.patch 2998 BLAKE2B ef2afa9a7ef200adb3729ac6e3bf80b6a4f92cae8c560805c741189917e454a391a6cc09271491110fd2e0c7c95cef672f807a64acf247cea2996fb2bbc71c31 SHA512 259915b1b9c5a586609c0e2801df3239f859871a194da5cd53ad323020832f5e2f37419bbb6f7e3c1d6a0c5d4a2bcf7b709db220b190abe84faa54463f43d199
 DIST gnatmem-2019-20190429-19745-src.tar.gz 80136 BLAKE2B 8ae3b41827416f951abb0d0a1fe533946fad2ac8d67ae6aad2b14495a3c068718befbbbf11800c1864f3becaa0ca6dfb838aeec3b3d715b250d4436ccee93c69 SHA512 4354a30efcf95a013f481b3519a79a22f85348840f074c734013d6c73e00fd771118b84eec416260983c383484f7a404217a32c012ca0bd7c37253ba17f2eb85
 EBUILD gnatmem-2019-r1.ebuild 905 BLAKE2B 47d5390466d5f1536b2d4eab885b89753026e731c70b97fe97948b4f54ef61a20051e0c0c09f39f535d0231354a8d922db5a559615fd1cb7ec33b9abfd0c8746 SHA512 d645247bfe698975c86fdc90a56a8ba81df3d1237a9fcd12445c1a2b395b832996147a6c0217700164968593ac30fc1ceaff0f8a8454ac8b736ca323c0126ef9
-EBUILD gnatmem-2019.ebuild 973 BLAKE2B 6377ebe8d84042b57458c20105119849507e44dad55db598e472f7ef58d07828ca2db1d2a76dc78238899717221073813f963349b3b68776780cdb13739c204f SHA512 1502881ffc88f3bca1543abcae61331aa4f69010a9a42186ba2511fb8610fd35d3e9af08d6905968141fd00d1e8e2ad5bac12936f978b7a1131cff8305b69066
 MISC metadata.xml 955 BLAKE2B fe2d45bebeeb3f23c6eae6b4b2fbc14156884636af28c5bf31bb946d9a8bd74280a426be7d5e003aa88d1c6bc390f8ddd96c864d4715ce1c034b44995eeba3d1 SHA512 f2fee13e2c491e0a0393b67aa558bac39c7f3ea5a186da421ceb3ebf092bc5acb74cd2076ae59abb81d28a83c07bf4561017164ab27558a1805653023877fa72
diff --git a/dev-ada/gnatmem/gnatmem-2019.ebuild b/dev-ada/gnatmem/gnatmem-2019.ebuild
deleted file mode 100644
index b99814fd6e4c..000000000000
--- a/dev-ada/gnatmem/gnatmem-2019.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing autotools
-
-MYP=${P}-20190429-19745-src
-
-DESCRIPTION="Monitors dynamic allocation and deallocation activity in a program"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8e1431e87a8f1d425089
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 gnat_2018 +gnat_2019"
-
-RDEPEND=""
-DEPEND="dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
-	dev-ada/gprbuild[gnat_2019(-)?]
-	sys-libs/binutils-libs"
-
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch )
-
-src_prepare() {
-	default
-	mv configure.in configure.ac
-	eautoreconf
-}
-
-src_compile() {
-	gprbuild -v -Pgnatmem.gpr -j$(makeopts_jobs) \
-		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS}
-}
-
-src_install() {
-	dobin obj/gnatmem
-}
diff --git a/dev-ada/gnatsymbolize/Manifest b/dev-ada/gnatsymbolize/Manifest
index 450d7d1a78b5..7c864b24b22c 100644
--- a/dev-ada/gnatsymbolize/Manifest
+++ b/dev-ada/gnatsymbolize/Manifest
@@ -1,6 +1,3 @@
 DIST gnatsymbolize-2019-20190429-19761-src.tar.gz 14297 BLAKE2B 8ea689266abc485632c04a696c0d30632fdfcc123153ae006158700514ebedd6d067124e59e519a0ebe35569eb0e2fad8dd48a33d49551ba608e14d3ec73d636 SHA512 68e8c9bb2880738160722a2c413c6146c86efd0822236019ca5824eed4a2b392252676d0f96c035830b80068b82344b44953006fc96ea208f6bde6618190336c
-DIST gnatsymbolize-gpl-2018-src.tar.gz 14286 BLAKE2B ac655b951b584224e64778fd800c082defee9abce4b3e7e1ac766a38c3b1ed8624c349f249714376e5984e37a9e9df256b6627b6ed2898f2f71fcaa8067cf36b SHA512 4fc21b45c32c08f9911cb7cdc0170e36f1c10d703244bbbfbd525386297b6e6779651751281402e8c4caee668df052e7c1ccc234e5cd88151ee471b8e3f06d0f
-EBUILD gnatsymbolize-2018.ebuild 621 BLAKE2B 50262887f4d4eaaffa4a6923f655f8e01513fe7adaaa160f6df09891441da59a6569ab1979d9a43d21c6123f2f33f6b30391d6c737162c064f1adb774e645c79 SHA512 707400f48b8be3becdb822a6049b2bb19f36d3e4674ae60b67f2a61318207df0aa242a73e60d90fb62b822f43706f45886a546cb2d20280558f5fad44534ab0e
 EBUILD gnatsymbolize-2019-r1.ebuild 684 BLAKE2B ba84f79bca690a353219a3a030a80720062e33337dc4e1a56eabc2f7f5f9879f8c212050078eb04b64179aa1bb3df8bf51711863d7ba7f0dca2a5cf052079086 SHA512 2be018da0d9bc07498ddb855e9cdcf167f884fcc914c03277e139547fcc22633f1e91d721499738cd74cd58335ac469c0b316d04dc622a2ba01e32e5a6ae86e0
-EBUILD gnatsymbolize-2019.ebuild 811 BLAKE2B 41a86fd5b4eafda5964e891d8b6415a7df3096faa6336e6d5e9237b159adb0df973dff122bbf938518079dc410e4a496969ab5b278e1be6ac264db626d0d482d SHA512 b7d12335dbb8dbe9fdfab6a47f37805f29e28ca382946f9a815284257c1aca42e43e5c438c87df627e49ffac8a39830c1c82432f6dd06762bdca61c9fd8a0fe4
 MISC metadata.xml 390 BLAKE2B e655e84d98e4db460d4a5ad93fbe44c1de69cccabca3e19640ce08bf159be414aa86096e7bdf79692f99a53f433ff83fb5cf82f01be3fc67d45fff4a01e2b72d SHA512 48aa4b2d37b38a602b064a6e312fad19c193239899d859e2558b1a9090cc927f9b9983cc0c7f9a2384bf3bb7665a342d6871c236b19ed2b695fb1618d525cc05
diff --git a/dev-ada/gnatsymbolize/gnatsymbolize-2018.ebuild b/dev-ada/gnatsymbolize/gnatsymbolize-2018.ebuild
deleted file mode 100644
index 515f57ecd620..000000000000
--- a/dev-ada/gnatsymbolize/gnatsymbolize-2018.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multiprocessing autotools
-
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="Translates addresses into filename, line number, and function names"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a6d ->
-	${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-lang/gnat-gpl:7.3.1"
-
-S="${WORKDIR}"/${MYP}
-
-src_compile() {
-	gnatmake-7.3.1 -v gnatsymbolize -cargs ${ADAFLAGS} || die
-}
-
-src_install() {
-	dobin gnatsymbolize
-}
diff --git a/dev-ada/gnatsymbolize/gnatsymbolize-2019.ebuild b/dev-ada/gnatsymbolize/gnatsymbolize-2019.ebuild
deleted file mode 100644
index 41e7c88b7fa9..000000000000
--- a/dev-ada/gnatsymbolize/gnatsymbolize-2019.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing autotools
-
-MYP=${P}-20190429-19761-src
-
-DESCRIPTION="Translates addresses into filename, line number, and function names"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cc7d5e431e87a23952f18c4 ->
-	${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2018 +gnat_2019"
-
-RDEPEND=""
-DEPEND="gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
-	gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )"
-REQUIRED_USE=" ^^ ( gnat_2018 gnat_2019 )"
-
-S="${WORKDIR}"/${MYP}
-
-src_compile() {
-	if use gnat_2018; then
-		GCC_PV=7.3.1
-	else
-		GCC_PV=8.3.1
-	fi
-	gnatmake-${GCC_PV} -v gnatsymbolize -cargs ${ADAFLAGS} || die
-}
-
-src_install() {
-	dobin gnatsymbolize
-}
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index fd499ae39b3a..5f7122b409ae 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -1,10 +1,6 @@
-AUX gps-2017-gentoo.patch 12673 BLAKE2B 12ef9c50feae72b458cf274f4dcc75e62d25b43bd234559b68716fc3e7a9743dc907a0a897e7ffa573be013772fe83f8efa3118414998dd0ae4eddeb7512d382 SHA512 04eaf45789b76f4ed5cd8b3a14757b50df8470235fe8a2f190233429e5d99d9e7af561566e54159deb94411f9b94bb9dc7d4812813db5f6d6ceefd0290524625
 AUX gps-2018-gentoo.patch 2976 BLAKE2B dd72c2c4c8dc8f971b819eb76b4433dd78c587d79bd903e17be0fd879027638821edaa625a64f355b2355a37fa7472b9c1b1072e06fd24c9c5547369916f2bde SHA512 fbfb23f29de218ca1371e39aed70aa4ef22080a11aa8bcbd13ef3ea6b68f69db9a4c6f6f5c7c0cefa85ef6495685fb9811de2521b3085f2f25d9acce0ad14047
-DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8fa7217c0731ca1e91ced38700df1d63d91a16c3fa28dfd44c7c8e867c3a857b88e4f0c8b2a7200fb6a8a630b8403538c4784f8914d1a5 SHA512 01a8f3be9b7b7e83cc5bd4a45137b1d35c6448bc22a88bcaf5d312cd63e11081b6b2fe9f09ad2a27d8f0b6471fc5c1a99573bf3bcee1589329054074eaeef04f
-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 gtk+-3.14.15-src.tar.gz 32009863 BLAKE2B 93c6897c431fa8e1c19ea758378bc7e365d486d1decccefbba64876d8c51a488e6bcf932481daa11e7e43a960a328c3db746e41a845e574c6b6070ab71e23188 SHA512 add4607a1758319a938d2be0bbd0dd140c4099accffa9301e3049bc460bf94f395c5a092368214e8b28d53bc25335d1b8329b50c7eb80a1e9a65b2e154135b84
 DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5
-EBUILD gps-2017.ebuild 2120 BLAKE2B a78b670ff9915bef812bb51b8a45e26feb1ec109b5cafcc1dbfbe3628aa33a02d32585829424e9660cb3759d464d7aca413c038aa5db2d24f0513ba86d2bfbf9 SHA512 f50681981837153b0df3080992c57c17315afbcc90848fe803b03d504284eb6f4f0a8c24cc2caa6aef2e4b5f29fb70af3b06b3c684e5b37844d350e1fa1150a0
-EBUILD gps-2018-r1.ebuild 3163 BLAKE2B b97918cfad05d883c0ea9365b73768351c15878a784e3381eefa0b1f24ff319bfdc508c2f615c245fe30e5e3a0a87fb388084fb8dc7224ecf5b8a3a3d1ea24b7 SHA512 b2da7c1b5ebd5726ee1abd24bfb512dfb94ba680a0270bee413f4003eabbc08a16f98bd491e3e7b4385faeb3c431557b5b15063104e5ca84b220a596fefb517c
+EBUILD gps-2018-r2.ebuild 2826 BLAKE2B 5a2a574b9897041d16b0b91abfd0a7e156b0aaf693df4343890a838b8869e0932edc5fcbadd2a9331d94ceb43a2c368fc6f144c9db75a3f6540064f715b62823 SHA512 99c8d2c356285a62747f488ca5cd36d0b9dba2e5edbe300bcbfb48bc5fc7233e0441d58faa1e1d4fc7fafc1b0342baad6cbcbea6bd388b5a13170ae422e9ca5a
 MISC metadata.xml 406 BLAKE2B 663412f7328e2ed9ca4df57304073e48b2c18d43c84c6a5a4b8331f57f731bd63c38d7eb23b9edb4939e0644238a7883581e3ae50afb708cd263a9c39f936671 SHA512 7e13f81414da0346f385d66d88eca699dab64aeaf7d22a38ff05bec1ddc3fab5f98f7d2049902a75f63bfe10f918c599f15a1497cdb09799fec8330152251b46
diff --git a/dev-ada/gps/files/gps-2017-gentoo.patch b/dev-ada/gps/files/gps-2017-gentoo.patch
deleted file mode 100644
index 1af2488c932d..000000000000
--- a/dev-ada/gps/files/gps-2017-gentoo.patch
+++ /dev/null
@@ -1,339 +0,0 @@
---- a/aclocal.m4	2017-05-13 21:59:20.129039064 +0200
-+++ b/aclocal.m4	2017-05-13 22:02:12.637234659 +0200
-@@ -37,7 +37,7 @@
-   HAVE_GNAT_PROJECT_$1=yes
- else
-   # Try with "gnatls", in case gprls was not available
--  if AC_TRY_COMMAND([gnat ls -Pconftest.gpr system.ads > /dev/null 2>conftest.out])
-+  if AC_TRY_COMMAND([@GNAT@ ls -Pconftest.gpr system.ads > /dev/null 2>conftest.out])
-   then
-     HAVE_GNAT_PROJECT_$1=yes
-   else
-@@ -156,7 +156,7 @@
- 
- AC_DEFUN(AM_PATH_GNAT,
- [
--   AC_PATH_PROG(GNATMAKE, gnatmake, no)
-+   AC_PATH_PROG(GNATMAKE, @GNATMAKE@, no)
- 
-    if test x$GNATMAKE = xno ; then
-       AC_MSG_ERROR(I could not find gnatmake. See the file 'INSTALL' for more details.)
-@@ -279,7 +279,7 @@
-     AC_MSG_RESULT($GTK_PREFIX $GLIB_PREFIX $ATK_PREFIX $PANGO_PREFIX $CAIRO_PREFIX)
-   fi
- 
--  AC_PATH_PROG(GNATDRV, gnat, no)
-+  AC_PATH_PROG(GNATDRV, @GNAT@, no)
-   min_gtk_version=ifelse([$1], ,2.0.0,$1)
-   AC_MSG_CHECKING(for GtkAda - version >= $min_gtk_version)
-   GTKADA_PRJ=`$GNATDRV ls -vP1 -Pgtkada 2>&1 | grep gtkada.gpr | grep Parsing | cut -d'"' -f2 | head -1`
---- a/templates_parser/templates_parser.gpr	2017-05-18 21:34:42.892039427 +0200
-+++ b/templates_parser/templates_parser.gpr	2017-05-18 21:35:16.661512990 +0200
-@@ -55,7 +55,7 @@
- 
-    end Naming;
- 
--   Common_Options := ("-gnat05");
-+   Common_Options := ("-gnat05", "-fPIC");
-    --  Common options used for the Debug and Release modes
- 
-    Debug_Options :=
---- a/shared.gpr.in	2017-05-18 21:35:56.475892075 +0200
-+++ b/shared.gpr.in	2017-05-18 21:36:24.972447550 +0200
-@@ -24,7 +24,7 @@
-    end IDE;
- 
-    package Compiler is
--      Common := ("-g", "-gnat12");
-+      Common := ("-g", "-gnat12", "-fPIC");
-       Optimize := ();
- 
-       case OS is
-@@ -83,6 +83,7 @@
-          when "false" =>
-             null;
-       end case;
-+      for Driver use External ("CC", "gcc");
-    end Linker;
- 
- end Shared;
---- a/common/common_with_xmlada.gpr.in	2017-05-18 21:37:25.302506085 +0200
-+++ b/common/common_with_xmlada.gpr.in	2017-05-18 21:37:58.472988222 +0200
-@@ -13,7 +13,7 @@
-       for Switches ("Ada") use Shared.Compiler'Switches ("Ada");
-       for Switches ("C") use Shared.Compiler'Switches ("C");
-       for Switches ("test_htables.adb") use ("-g", "-O2", "-gnatwue");
--      for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg");
-+      for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg", "-fPIC");
- 
-       No_Checks := ("-g", "-O2", "-gnat2012", "-gnatpn");
- 
---- a/common/common_no_xmlada.gpr.in	2017-05-18 21:37:31.406410812 +0200
-+++ b/common/common_no_xmlada.gpr.in	2017-05-18 21:38:14.796733359 +0200
-@@ -12,7 +12,7 @@
-       for Switches ("Ada") use Shared.Compiler'Switches ("Ada");
-       for Switches ("C") use Shared.Compiler'Switches ("C");
-       for Switches ("test_htables.adb") use ("-g", "-O2", "-gnatwue");
--      for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg");
-+      for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg", "-fPIC");
- 
-       No_Checks := ("-g", "-O2", "-gnat2012", "-gnatpn");
- 
---- a/widgets/widgets.gpr	2017-05-18 22:26:05.117847006 +0200
-+++ b/widgets/widgets.gpr	2017-05-18 22:21:01.646368091 +0200
-@@ -12,6 +12,7 @@
-    package Compiler extends Shared.Compiler is
-       for Switches ("C") use
-         Shared.Compiler'Switches ("C") & GnatColl_Gtk.Gtk_Include;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
-    package IDE renames Shared.IDE;
---- a/cli/Makefile	2017-05-19 08:07:44.591042479 +0200
-+++ b/cli/Makefile	2017-05-19 08:08:50.086991123 +0200
-@@ -1,8 +1,9 @@
- GPRBUILD=gprbuild
- GPRCLEAN=gprclean
-+GPRBUILD_FLAGS=0
- 
- all default:
--	$(GPRBUILD) -p -Pcli
-+	$(GPRBUILD) $(GPRBUILD_FLAGS) -p -Pcli
- 
- clean:
- 	$(GPRCLEAN) -q -r -Pcli
---- a/gps/gps.gpr	2017-05-19 09:24:19.438123599 +0200
-+++ b/gps/gps.gpr	2017-05-19 09:24:58.639492518 +0200
-@@ -75,7 +75,7 @@
-       end case;
-       for Switches ("Ada") use Linker'Switches ("Ada")
-          & Shared.Linker'Switches ("Ada");
--
-+      for Driver use External ("CC", "gcc");
-       --  for Switches ("Ada") use ("-lgmem");
-       --  for Switches ("Ada") use ("-pg");
-    end Linker;
---- a/testsuite/Makefile	2017-05-19 11:08:48.966913663 +0200
-+++ b/testsuite/Makefile	2017-05-19 11:06:17.245366714 +0200
-@@ -1,5 +1,6 @@
- GPRBUILD=gprbuild
- GPRCLEAN=gprclean
-+GPRBUILD_FLAGS=
- 
- SYS := $(shell gcc -dumpmachine)
- ifeq ($(OS),Windows_NT)
-@@ -14,7 +14,7 @@
- endif
- 
- all default: package
--	$(GPRBUILD) -P testsuite_drivers.gpr -m -XOS=${OS} -j0 -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
-+	$(GPRBUILD) $(GPRBUILD_FLAGS) -P testsuite_drivers.gpr -m -XOS=${OS} -j0 -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
- 
- package:
- 	mkdir -p share/doc
---- a/testsuite/testsuite_drivers.gpr	2017-05-19 11:21:20.645705481 +0200
-+++ b/testsuite/testsuite_drivers.gpr	2017-05-19 11:15:42.163206405 +0200
-@@ -10,6 +10,10 @@
-    for Object_Dir use "obj";
-    for Exec_Dir use "bin";
- 
-+   package Compiler is
-+      for Switches ("Ada") use ("-fPIC");
-+   end Compiler;
-+
-    package Builder is
-       for Switches ("Ada") use ("-gnat12", "-ws", "-g", "-j0", "-m", "-gnaty");
-    end Builder;
---- a/Makefile.in	2017-05-19 11:49:47.172018411 +0200
-+++ b/Makefile.in	2017-05-19 11:50:24.653412280 +0200
-@@ -10,7 +10,7 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA    = @INSTALL_DATA@
- GNATCOLL_INSTALL  = @GNATCOLL_INSTALL@
--prefix          = @prefix@
-+prefix          = $(DESTDIR)@prefix@
- bindir          = $(prefix)/bin
- sharedir        = $(prefix)/share
- examplesdir     = $(prefix)/share/examples/gps
---- a/docs/Makefile.in	2017-05-19 11:54:52.805076624 +0200
-+++ b/docs/Makefile.in	2017-05-19 11:55:24.332566945 +0200
-@@ -1,4 +1,4 @@
--prefix = @prefix@
-+prefix = $(DESTDIR)@prefix@
- docdir = $(prefix)/share/doc/gps
- sharedir = $(prefix)/share/gps
- 
---- a/share/support/core/gnat_help_menus.py	2017-11-23 21:41:11.897912345 +0100
-+++ b/share/support/core/gnat_help_menus.py	2017-11-23 21:44:53.019038030 +0100
-@@ -25,7 +25,7 @@
-    # GPRbuild
-    'gprbuild': {"GPR Tools User's Guide":
-                 ('gprbuild/html/gprbuild_ug.html', 'GPR/')},
--   'gnatls': {
-+   '@GNATLS@': {
-        # Ada RMs
-        "Ada 2005 Reference Manual": ('gnat/html/arm05.html', 'Ada/'),
-        "Ada 2012 Reference Manual": ('gnat/html/arm12.html', 'Ada/'),
-@@ -86,8 +86,8 @@
- 
-         for exec_name in _DOC_ENTRIES.keys():
-             executable = exec_name
--            if exec_name == 'gnatls' and GPS.get_target():
--                executable = '{}-gnatls'.format(GPS.get_target())
-+            if exec_name == '@GNATLS@' and GPS.get_target():
-+                executable = '{}-@GNATLS@'.format(GPS.get_target())
-             ex = os_utils.locate_exec_on_path(executable)
-             if ex:
-                 for descr, tup in _DOC_ENTRIES[exec_name].iteritems():
---- a/share/support/core/toolchains.py	2017-11-23 21:46:11.969652447 +0100
-+++ b/share/support/core/toolchains.py	2017-11-23 21:47:21.723427305 +0100
-@@ -16,11 +16,11 @@
-        nullified by using an empty value in the corresponding tag
-   -->
-   <toolchain_default>
--    <gnat_driver>gnat</gnat_driver>
--    <gnat_list>gnatls</gnat_list>
-+    <gnat_driver>@GNAT@</gnat_driver>
-+    <gnat_list>@GNATLS@</gnat_list>
-     <debugger>gdb</debugger>
-     <cpp_filt>c++filt</cpp_filt>
--    <compiler lang="ada">gnatmake</compiler>
-+    <compiler lang="ada">@GNATMAKE@</compiler>
-     <compiler lang="c">gcc</compiler>
-     <compiler lang="c++">g++</compiler>
-     <compiler lang="asm">gcc</compiler>
---- a/share/support/core/projects.py	2017-11-23 21:49:13.477462632 +0100
-+++ b/share/support/core/projects.py	2017-11-23 21:51:53.774640693 +0100
-@@ -143,7 +143,7 @@
-           <string />
-        </index>
-        <specialized_index value="Ada">
--          <choice default="true" >gnatmake</choice>
-+          <choice default="true" >@GNATMAKE@</choice>
-        </specialized_index>
-    </project_attribute>
- 
-@@ -163,7 +163,7 @@
-        description="The gnatls command used to find where the Ada run time files are installed (including optional arguments, e.g. gnatls --RTS=sjlj)."
-        hide_in="all"
-        label="Gnatls">
--       <choice default="true" >gnatls</choice>
-+       <choice default="true" >@GNATLS@</choice>
-        <string />
-    </project_attribute>
- 
-@@ -175,7 +175,7 @@
-        description="The gnat driver used to run the various commands associated with the GNAT toolchain."
-        hide_in="all"
-        label="Gnat">
--       <choice default="true" >gnat</choice>
-+       <choice default="true" >@GNAT@</choice>
-        <string />
-    </project_attribute>
- 
---- a/cli/src/gps-cli_utils.adb	2017-11-23 22:00:22.716652753 +0100
-+++ b/cli/src/gps-cli_utils.adb	2017-11-23 22:01:19.885640611 +0100
-@@ -166,7 +166,7 @@
- 
-       --  Set GNAT version
-       Kernel.Registry.Environment.Set_Path_From_Gnatls
--        ("gnatls", GNAT_Version);
-+        ("@GNATLS@", GNAT_Version);
-    end Create_Kernel_Context;
- 
-    ----------------------------
---- a/toolchains_editor/core/src/toolchains.adb	2017-11-23 22:02:52.819994229 +0100
-+++ b/toolchains_editor/core/src/toolchains.adb	2017-11-23 22:07:20.326248295 +0100
-@@ -309,12 +309,13 @@
-                else
-                   Set_Command
-                     (Tc, GNAT_Driver,
--                     To_String (Full_Path) & "gnat",
-+                     To_String (Full_Path) & "@GNAT@",
-                      From_Default,
-                      Is_Default_Path);
-                   Set_Command
-                     (Tc, GNAT_List,
--                     To_String (Full_Path) & "gnatls",
-+                     To_String (Full_Path) &
-+                        "@GNATLS@",
-                      From_Default,
-                      Is_Default_Path);
-                   Set_Command
-@@ -728,10 +728,10 @@
-       begin
-          case Name is
-             when GNAT_List =>
--               return "gnatls";
-+               return "@GNATLS@";
- 
-             when GNAT_Driver =>
--               return "gnat";
-+               return "@GNAT@";
- 
-             when Debugger =>
-                return "gdb";
-@@ -2000,15 +2000,18 @@
-          Manager            => Toolchain_Manager (Manager),
-          Refs               => 0);
- 
--      Set_Command (Native_Toolchain, GNAT_Driver, "gnat", From_Default, True);
--      Set_Command (Native_Toolchain, GNAT_List, "gnatls", From_Default, True);
-+      Set_Command (Native_Toolchain, GNAT_Driver,
-+         "@GNAT@", From_Default, True);
-+      Set_Command (Native_Toolchain, GNAT_List,
-+         "@GNATLS@", From_Default, True);
-       Set_Command (Native_Toolchain, Debugger, "gdb", From_Default, True);
-       Set_Command (Native_Toolchain, CPP_Filt, "c++filt", From_Default, True);
- 
-       Compute_Predefined_Paths (Native_Toolchain);
- 
-       if Get_Compiler (Native_Toolchain, "Ada") = No_Compiler then
--         Add_Compiler (Native_Toolchain, "Ada", "gnatmake", From_Default);
-+         Add_Compiler (Native_Toolchain, "Ada",
-+            "@GNATMAKE@", From_Default);
-       end if;
- 
-       if Get_Compiler (Native_Toolchain, "C") = No_Compiler then
---- a/gps/Makefile	2017-12-10 20:29:18.267622400 +0100
-+++ b/gps/Makefile	2017-12-10 20:29:34.564312700 +0100
-@@ -45,7 +45,8 @@
- 	for f in ../kernel/generated/*; do cat $$f | tr -d '\015' > $$f-aux; mv -f $$f-aux $$f; done
- endif
- 	$(GPRBUILD) $(GPRBUILD_FLAGS) -m -p -ws -XTP_TASKING=No_Tasking \
--	  $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs`
-+	  $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` \
-+	  -cargs:Ada $(ADAFLAGS) -cargs:C ${CFLAGS}
- 
- resources:
- ifeq ($(OS),Windows_NT)
---- a/common/common_no_xmlada.gpr.in	2017-12-10 20:48:13.986166250 +0100
-+++ b/common/common_no_xmlada.gpr.in	2017-12-10 20:48:29.654872055 +0100
-@@ -22,6 +22,7 @@
-              for Switches ("dynamic_arrays.adb") use No_Checks;
-           when "Debug" =>
-       end case;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
-    package Naming is
---- a/common/common_with_xmlada.gpr.in	2017-12-10 20:48:37.352727540 +0100
-+++ b/common/common_with_xmlada.gpr.in	2017-12-10 20:48:50.423482155 +0100
-@@ -23,6 +23,7 @@
-              for Switches ("dynamic_arrays.adb") use No_Checks;
-           when "Debug" =>
-       end case;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
-    package Binder is
---- a/shared.gpr.in	2017-12-10 20:52:51.117967249 +0100
-+++ b/shared.gpr.in	2017-12-10 20:53:15.627507886 +0100
-@@ -56,6 +56,7 @@
-                );
-             for Switches ("C") use Optimize & ("-g", "-O2");
-       end case;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
-    package Binder is
diff --git a/dev-ada/gps/gps-2017.ebuild b/dev-ada/gps/gps-2017.ebuild
deleted file mode 100644
index 0cc43ab49084..000000000000
--- a/dev-ada/gps/gps-2017.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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 autotools desktop
-
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="The GNAT Programming Studio"
-HOMEPAGE="http://libre.adacore.com/tools/gps/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed03b
-	-> ${MYP}.tar.gz
-	doc? ( http://mirrors.cdn.adacore.com/art/591c6d80c7a447af2deed1d7
-			-> gnat-gpl-2017-x86_64-linux-bin.tar.gz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc gnat_2016 +gnat_2017 gnat_2018"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-ada/gnatcoll[gtk,iconv,pygobject,sqlite,static-libs,tools]
-	~dev-ada/gtkada-2017
-	dev-ada/libadalang
-	dev-libs/gobject-introspection
-	dev-libs/libffi
-	sys-devel/clang:=
-	x11-themes/adwaita-icon-theme
-	x11-themes/hicolor-icon-theme
-	dev-python/pep8[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( gnat_2016 gnat_2017 ) !gnat_2018"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	default
-	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" \
-		-e "s:@GNAT@:${CHOST}-gnat-${GCC_PV}:g" \
-		-e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \
-		aclocal.m4 \
-		share/support/core/gnat_help_menus.py \
-		share/support/core/toolchains.py \
-		share/support/core/projects.py \
-		cli/src/gps-cli_utils.adb \
-		toolchains_editor/core/src/toolchains.adb \
-		|| die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-clang=$(llvm-config --libdir)
-}
-
-src_compile() {
-	ADAFLAGS+=" -fno-strict-aliasing"
-	emake GPRBUILD_FLAGS="-v ${MAKEOPTS} \
-		-XLIBRARY_TYPE=relocatable \
-		-XGPR_BUILD=relocatable \
-		-XXMLADA_BUILD=relocatable"
-}
-
-src_install() {
-	default
-	if use doc; then
-		insinto /usr/share/doc
-		doins -r "${WORKDIR}"/gnat-gpl-2017-x86_64-linux-bin/share/doc/gnat
-	fi
-	make_desktop_entry "${PN}" "GPS" "${EPREFIX}/usr/share/gps/icons/hicolor/32x32/apps/gps_32.png" "Development;IDE;"
-}
diff --git a/dev-ada/gps/gps-2018-r1.ebuild b/dev-ada/gps/gps-2018-r2.ebuild
index 26542379d09d..83075c6b1fc6 100644
--- a/dev-ada/gps/gps-2018-r1.ebuild
+++ b/dev-ada/gps/gps-2018-r2.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 autotools desktop llvm multilib
+ADA_COMPAT=( gnat_2018 )
+inherit ada python-single-r1 autotools desktop llvm multilib
 
 MYP=${PN}-gpl-${PV}-src
 
@@ -19,21 +20,18 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="gnat_2017 +gnat_2018"
+IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
-	dev-ada/gnatcoll-db[gnat_2017=,gnat_2018=,gnatcoll_db2ada,gnatinspect,xref]
-	dev-ada/gnatcoll-bindings[gnat_2017=,gnat_2018=,python]
-	~dev-ada/gtkada-2018[gnat_2017=,gnat_2017=]
-	dev-ada/libadalang[gnat_2017(-)?,gnat_2018(-)?]
+	dev-ada/gnatcoll-db[${ADA_USEDEP},db2ada,gnatinspect,xref]
+	dev-ada/gnatcoll-bindings[${ADA_USEDEP},python]
+	~dev-ada/gtkada-2018[${ADA_USEDEP}]
+	~dev-ada/libadalang-2018[${ADA_USEDEP}]
 	dev-libs/gobject-introspection
 	dev-libs/libffi
-	gnat_2017? ( sys-devel/llvm:5 )
-	gnat_2018? (
-		|| (
-			sys-devel/llvm:6
-			sys-devel/llvm:7
-		)
+	|| (
+		sys-devel/llvm:6
+		sys-devel/llvm:7
 	)
 	sys-devel/clang:=
 	x11-themes/adwaita-icon-theme
@@ -43,7 +41,8 @@ RDEPEND="${PYTHON_DEPS}
 
 DEPEND="${RDEPEND}"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	${ADA_REQUIRED_USE}"
 
 RESTRICT="test"
 
@@ -52,27 +51,18 @@ S="${WORKDIR}"/${MYP}
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 pkg_setup() {
-	if use gnat_2017; then
-		GCC_PV=6.3.0
-		LLVM_MAX_SLOT=5
-	else
-		GCC_PV=7.3.1
-		LLVM_MAX_SLOT=7
-	fi
-	GNATMAKE=gnatmake-${GCC_PV}
-	GNATDRV=gnat-${GCC_PV}
-	GNATLS=gnatls-${GCC_PV}
+	LLVM_MAX_SLOT=7
 	llvm_pkg_setup
 	python-single-r1_pkg_setup
+	ada_pkg_setup
 }
 
 src_prepare() {
-	GCC_PV=7.3.1
 	default
 	sed -i \
-		-e "s:@GNATMAKE@:${CHOST}-${GNATMAKE}:g" \
-		-e "s:@GNAT@:${CHOST}-${GNATDRV}:g" \
-		-e "s:@GNATLS@:${CHOST}-${GNATLS}:g" \
+		-e "s:@GNATMAKE@:${GNATMAKE}:g" \
+		-e "s:@GNAT@:${GNAT}:g" \
+		-e "s:@GNATLS@:${GNATLS}:g" \
 		share/support/core/toolchains.py \
 		share/support/core/projects.py \
 		|| die
@@ -89,8 +79,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		GNATMAKE=/usr/bin/${GNATMAKE} \
-		GNATDRV=/usr/bin/${GNATDRV} \
 		--with-clang=$(llvm-config --libdir)
 	cd ../gtk+-3.14.15-src
 	econf --disable-cups
@@ -116,5 +104,5 @@ src_install() {
 	cd ../gtk+-3.14.15-src
 	emake -C gtk DESTDIR="${D}" install-libLTLIBRARIES
 	rm "${D}"/usr/$(get_libdir)/libgtk-3.{la,so,so.0} || die
-	dosym "${D}"/usr/$(get_libdir)/libgtk-3.so.0.* /usr/$(get_libdir)/gps/libgtk-3.so.0
+	dosym ../libgtk-3.so.0.1400.15 /usr/$(get_libdir)/gps/libgtk-3.so.0
 }
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index cd5aa1fd2bd3..854f15b76967 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,10 +1,7 @@
-AUX langkit-2017-gentoo.patch 3616 BLAKE2B 3730635b5cb4a2285e3ef283c903705b8f40194bdb65049ca07f651ea9d122e72e863cf132e096f139b9dc6f57a1d7faf7f333a3580e641caa88d4fea4b22009 SHA512 b69c84f3d79adefb254f764ba06c6d5fda81f95a8070b4b651d7a4f2ad078a48e341e5ad94e5ce7e2f756961d943dde3de891c5825c0e367cf7f816e08a31791
 AUX langkit-2018-gentoo.patch 2962 BLAKE2B 7da72c1739c972c6d1aa01c84e8fab3f8864c5449bb3717c8515c41f63eb1a2258ae9be0cfd5bb3bf54327fbe552c2448aa2fb80d69814c1d46f34611683d7db SHA512 72c6ba5e4994ef22f6246a196fdae81ee5f77f7f0420fd31b9bfecb32740b8878863ba75d342cb0c5326ca7031260aefc21f57d430866f7008515470d9ee0899
 AUX langkit-2019-gentoo.patch 3308 BLAKE2B 266bd5bd1d507a565c325e5668eebc3a2a96a448656a6c1f74644d222a4fbdb1cc77eb0c51a33d9453c19a958ed0867bdb59245f09c2b383c59cbd62f699c277 SHA512 d85677824a2da7a8b3c06b665a8e517d7151da4ff458fa595e7c5b71dcf4f78a5a0914e9fe8f8a700b0422071af4d6e4890bc8e70c539f59ae25f89c19d4a8d9
 DIST langkit-2019-20190510-19B8C-src.tar.gz 699205 BLAKE2B 770f904cf2a2014dc6ed6383d3be51361a311d1feb5d594bf9e81ab80a01835ac0b24cd743539a70dff2120307b25a61f781586b504d910401018afcf3b8ae7b SHA512 fbaac1b6407292396711d3deba3a7b5eef6655b877c5515a3653699decdbb2c9824b42bb8e9680122a3ac6ac3eb605333eda7c0265fafd6ab2d117f932790b3b
 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 911 BLAKE2B f75a3fdec74b278be740b37993909e2627a7f4084d6967c2c9a5a7f41cfa2bfd777e45f5d6143fe88b2ba15ead72d47766d94c59d3283f6c18ab98c7959c409d SHA512 2f2c5939fdb316b63f740e230e442ad33e3ab2bee21b08d3a3688391bc8a40c17a3f9fa578062fe0cd58ea4747c27b8a4ed2689dc1a153043a5bf2d9d04fc1fd
 EBUILD langkit-2018.ebuild 1031 BLAKE2B 70e31054892cb9d53288827932fbbc57d6584ec87168a3dc461c993618eb46198ea9045600fb2f76d595ba63b6faa0bd28c2a9effac09691818552049eaa3024 SHA512 819a47dec6c36f66ac1240f2dd7d7cfb469604f8c12d10d095ba4010d9aadc04ae6cf72cf4a08b37cacc87ebd9cdc0baef85c6945c48f32dc9c4200c37b11b84
 EBUILD langkit-2019.ebuild 1051 BLAKE2B b2d9f137be3bd39deef51864af08f1b1a38a0d334df3d161bec6e963b91cf4fe42e3d896033af0d9249191c3f4c91da4dfc92544670f3da136bf9341542b45ab SHA512 ea814d9477fbc593bf0471b63e653c3be5f769277e453ebc4a74beed021069f83ce2acdd9d02661d82515e244dc1abd3346c534fd7ea7d53670a24ebc755852f
 MISC metadata.xml 716 BLAKE2B e32738d2a347420bf4e01dcbcf953cfab18b1c6920a6b52b6278d9fcf26dd26fdb1fb8b490a2f050cbf33efb952768eea2bfeadeb40781783a69ebdad97001de SHA512 8c986d121e0afc68640dc9c5d1e6d3b9dc3bf79fd2ca783a9386c82319a10f8734170b330702cb82d4c790f22d67626606904072f8e57cee32dda5f5fa275714
diff --git a/dev-ada/langkit/files/langkit-2017-gentoo.patch b/dev-ada/langkit/files/langkit-2017-gentoo.patch
deleted file mode 100644
index 7b6501ed8a70..000000000000
--- a/dev-ada/langkit/files/langkit-2017-gentoo.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- 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',
-                                                   quex_spec):
--            quex_py_file = path.join(os.environ["QUEX_PATH"], "quex-exe.py")
--            subprocess.check_call([sys.executable, quex_py_file, "-i",
-+            subprocess.check_call(["quex", "-i",
-                                    quex_file,
-                                    "-o", "quex_lexer",
-                                    "--buffer-element-size", "4",
---- 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.
- 
-    function Hash (S : Lexical_Env) return Hash_Type is
--     (Hash_Type (To_Integer (S.all'Address)));
-+     (Hash_Type'Mod (To_Integer (S.all'Address)));
- 
-    package Address_To_Id_Maps is new Ada.Containers.Hashed_Maps
-      (Lexical_Env, Integer, Hash, "=");
---- 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,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	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,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	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,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
deleted file mode 100644
index 57790df219e3..000000000000
--- a/dev-ada/langkit/langkit-2017.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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
-
-MYPN=${PN}-gps-src
-
-DESCRIPTION="A Python framework to generate language parsers"
-HOMEPAGE="https://www.adacore.com/community"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed044
-	-> ${MYPN}-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	dev-ada/gnatcoll[iconv,shared]
-	dev-python/mako
-	dev-python/pyyaml
-	dev-python/enum34
-	dev-python/funcy
-	dev-python/docutils
-	dev-python/quex"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MYPN}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_test() {
-	testsuite/testsuite.py | grep FAILED && die "Test failed"
-}
-
-src_install() {
-	default
-	python_domodule langkit
-	python_doscript scripts/create-project.py
-}
diff --git a/dev-ada/libadalang-tools/Manifest b/dev-ada/libadalang-tools/Manifest
index 8f6ccfc71883..7437872fe17f 100644
--- a/dev-ada/libadalang-tools/Manifest
+++ b/dev-ada/libadalang-tools/Manifest
@@ -1,6 +1,3 @@
 DIST libadalang-tools-2019-20190517-195C4-src.tar.gz 625775 BLAKE2B 2ec69e307576c505d20a43d229b13404966f4442778e5390da327ae71cc065873de4fff03a720949fa6bfb5ce66f405e7d45f7f0c21032a639efcff208323aed SHA512 b7368606847244cbb08ff2111fabfbfc8a9aa7f58e953febc70838006d94711dba1fd75bfb69ed2081a37a2dfaaad46097127870696c882d7cc54de5d7b051a1
-DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5
-EBUILD libadalang-tools-2018.ebuild 683 BLAKE2B febce43b74a1dfb6b91f14a5964a466384009c8a76cfa85b6e5bafb9bfceb78ecce7cea9026bea06c3df1a90c0f7656037da493c3caa006f464cab8d14cca7dd SHA512 e9a3f22278267bc0254155af14c2285b3d9383f5a9b055136fd26a91a314b54d621077682ac1cf73fa58ded89c26de8dbca98df2c1e81a0712926126af253ef9
 EBUILD libadalang-tools-2019-r1.ebuild 897 BLAKE2B a06ab3cc98c80a5de552ad231665ab6747d59121c4755ba9e5ed2397fab7d3b0193d2c2efc94ea40f7ab9882dddda586ddd42f3ce23a3703f1cfd31de889c52a SHA512 9074fb61e967bdabff40c2433c655a4d700a8c917590e9f11a4124e8948edadebb7f95ce049938382a84c98ba2ad4b0dd39e8ea4a3b1e16c238937732f0a4631
-EBUILD libadalang-tools-2019.ebuild 1013 BLAKE2B 52774900388e9f204017bdef6f2a5ca8d974a9332935e288c706cb2f84ca18214d8c93790c738195840a36281f59d65f8854e3264646e7bbfa0ace649d823506 SHA512 8fee504a879b9104236138a134eefa7dfb10e3fd9cdafb4e5b0af5acadc4fb037b022403a7e3232eba61495778784f17af3e6f1b7057fe507e275777d6c98a87
 MISC metadata.xml 322 BLAKE2B 15b950c159b5ceea83d02f9bc17739607d76cc1ddf829fb9eea4187cfba6721d9ff81385e011cbba5c31114c8932354b40cf40dcb7582205ffc39e9204b2a8cf SHA512 dba6a4015eaa3143d0e165df7e1d18ac8faf4077ea8b3521ebb12979aa24b5519dfa90239cc2a41630edc803cbf4529338f9ddc2de5ed3fb0987702747c5ab80
diff --git a/dev-ada/libadalang-tools/libadalang-tools-2018.ebuild b/dev-ada/libadalang-tools/libadalang-tools-2018.ebuild
deleted file mode 100644
index 65d07091482a..000000000000
--- a/dev-ada/libadalang-tools/libadalang-tools-2018.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYP=${PN}-gpl-${PV}
-DESCRIPTION="Libadalang-based tools: gnatpp, gnatmetric and gnatstub"
-HOMEPAGE="https://www.adacore.com/community"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 ->
-	${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ada/libadalang[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,static-libs]"
-
-S="${WORKDIR}"/${PN}-src
-
-src_install() {
-	dobin bin/gnatpp
-	newbin bin/gnatmetric gnatmetric-tool
-	newbin bin/gnatstub gnatstub-tool
-	einstalldocs
-}
diff --git a/dev-ada/libadalang-tools/libadalang-tools-2019.ebuild b/dev-ada/libadalang-tools/libadalang-tools-2019.ebuild
deleted file mode 100644
index b32836a551f9..000000000000
--- a/dev-ada/libadalang-tools/libadalang-tools-2019.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing
-
-MYP=${P}-20190517-195C4
-DESCRIPTION="Libadalang-based tools: gnatpp, gnatmetric and gnatstub"
-HOMEPAGE="https://www.adacore.com/community"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8f4e31e87a8f1d42509f ->
-	${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 gnat_2018 +gnat_2019"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ada/libadalang[gnat_2016(-)?]
-	dev-ada/libadalang[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?,static-libs]
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
-	dev-ada/gprbuild[gnat_2019(-)?]"
-
-S="${WORKDIR}"/${MYP}-src
-
-src_compile() {
-	gprbuild -v -k -XLIBRARY_TYPE=static -XXMLADA_BUILD=static \
-		-XGNATCOLL_GMP_BUILD=static \
-		-P src/build.gpr -p -j$(makeopts_jobs) || die
-}
-
-src_install() {
-	dobin bin/gnatpp
-	newbin bin/gnatmetric gnatmetric-tool
-	newbin bin/gnatstub gnatstub-tool
-	einstalldocs
-}
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index 47cba8ebaa8e..dbf1ed2e3aaa 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -1,14 +1,8 @@
 AUX libadalang-2017-gentoo.patch 927 BLAKE2B 3c0a92df8aee109faa4be73bc1950af46fbf083a165582bc6ee270171d4317508fe794f8583b5cf6da7ad72ab8ff706befe4339d44319559341228a823b4c188 SHA512 0436780f1eb872c10b30405d467534a752a293d49b5522ff1fafa9524474b3fbc99889a991030ce81178461cb875dca31e1283a3f89a3fc338f4ec3d1a9de4fb
 AUX libadalang-2018-gentoo.patch 678 BLAKE2B ebc0c63b62a0b5c2b53a036de1a71ca33af992dd3774d894f4e0407e291bee15fac5be358c5f2600516ecb15c7b7846c7213b1fdd3c522ecd2f1393247d4b4b4 SHA512 346b561e2db3258e768bc4c4ee92a3ba6977f58de3cdae0ab84df9c31ba178dad3788309db2505c2dc8c8fd4319ef68201499303a6b92d837508a6bd91e49779
 AUX libadalang-2019-gentoo.patch 2826 BLAKE2B 11269fd6165c6138cfc67f28d460768376af4b2ba96c694b6fd8145b1b091a5396c26ad34a8d6b330cf80793138bc59782bfe8e653ae2d1659fbbfc4110ef001 SHA512 8657243bad9f63455c0c3670669114743a9c988f1a6a3dbe89eed8c2d6b730af286498dcedab36cb51ca0951a2abed0acecaab27085fc9e1aa8b603d4d2c1464
-DIST libadalang-2017-src.tar.gz 1862217 BLAKE2B 58f72726285e56a15278e85902fabf988327ea86a08cc6c86271d61075a6b19a0bffa86e5302f5c32e6d35ef95473ad747853b14899a12d09d49d656f4e6559e SHA512 c8663a7214c3c1dd73a6589a6db10d219fcd2db39ba2ce184eea85272c5f206ab0aa8d13b0e19b08a5996906c7fbddd479795363ec22e889dfceda9967c346c7
 DIST libadalang-2019-20190510-19916-src.tar.gz 2345942 BLAKE2B 807fd6ea0183b5535e96b258998a0540aa77dec0669db81bae10b56894e12bbb381b356bd55d6684156101d2ea0e5439c2551a4213a81e79e4697a7ff6ba5df2 SHA512 9ebf8d0c01d12f5a8081fced9504b78a45cbde6ecc0e6abeed99aff03abd0b241c1ecba85b256911e474cb77e10e5e387f64d51a2d9b18596baf40313f44f089
 DIST libadalang-gpl-2018-src.tar.gz 1990774 BLAKE2B ffad46d4988de7fb8c9bf94d24360a726c59e3c70a2318725a59e0b6b62351e8f5d8dd6501964618607122e3c7cb3bda0e1181818c68324d4067d59ac93e2b1c SHA512 b95196323097065be2996ced767f8f89fb77445f99c249d84043c68d926d61c78b310b4fef0699d08f9112dc423596c076f452745469a75a8467c35b5e10ac2c
-EBUILD libadalang-2017-r1.ebuild 1089 BLAKE2B ff0e7e37c2f2cf5f7ce0d38b5d0efc073edaf16aa77d65bcf5edad54d234549c33a105164e417a7dc838300415568d34bd2a1dbf3d5d07df99a5e00b2940c331 SHA512 1673bb70bc3a2f323b8ca3cc00d2213e5b6ee81eb90319776845b2ec797ebfca1709ce264cfbe995a76f5ca5d0dd9d91bc80b812d94fef650cc3f6e98b8c5510
-EBUILD libadalang-2017-r2.ebuild 1189 BLAKE2B 23dba13be8419811ba381ca65c96e3e3aad3b2ca80ba9f14a299b24fa9e49fdc03fbeec67cd9dd47d59a93e40bac68147cbaf7847fe49563d0ea0577cf78f26e SHA512 23400a3acf073355c251ffa2b8325faf805c8965e30c3d15d3485dcf7a9e84ff290a33969ae03b8500a9e124e2bd845f186d039fe4115677a497c79ec26b94b7
-EBUILD libadalang-2018-r1.ebuild 1459 BLAKE2B 1c2f48d9db06ac78d65cc69dbbf01d49d7658d5b99bed02ec272ec5bbf1a104c1712b636a17d2c44e72759d495bd8bf77f2e11db957dd370685b1e64825d8c92 SHA512 636278a5651eb9a61c542815c944a7f691af9c533dd8b80f9a16aa40e33896e2e32611ae32e181fd57c287ae4bfacd319eb4db3e536e0287f07259cbe66725bc
 EBUILD libadalang-2018-r2.ebuild 1437 BLAKE2B 3fb9d77c0c7fe88a75746277163632a3567cb59c0dc7b4db3575a1c8dfa85d41beb71ad627e205dce21f0aecf5d22efb0d6114adf272431e93612481e32fa75e SHA512 132639d28b8f4ab2df3c6a4622056d6b8b93daf6fe9403d964eff5e1d864d75bbec215ab9a0b38270555c21c025c5db2bcf780621efd0c46f1fc7ed8e18100af
-EBUILD libadalang-2018.ebuild 1327 BLAKE2B 802fdf2de0d0f4659807458581887278febe957924f30e021557566c271fd4301cf3ee1587056d7d29c3a0f964c3f8074bcd0e613105e5030736f7feef1cd10a SHA512 0a08c3661094e31ca8c6bf132fa029da706b10321cf97d14e43cf856da3fba6a890de09353af2a29478a52c538f4d2d06ce4452089e9331164ced4e77d85a696
 EBUILD libadalang-2019-r1.ebuild 1539 BLAKE2B b46601e5a64a2775f0932b2ea4354cc632f523d0b145b7c09cd0931b37eec286f4babd3c92105ae82fbb417926982e7663cd4c3ace47c0d54f25ddc64f0e5243 SHA512 1ec89c7eaf08d8c1cf1760c50b5cc4adc7ba16d59710548a909920c7fbb6a2cf59ee5854e30b5277416d8a0f94ac512328a8a75d1e63813e64032216ec203e01
-EBUILD libadalang-2019.ebuild 1517 BLAKE2B be505f9753fc13f073666f6831ecb83544affd75d14f35b729ba65b93d73c9aa9cadded74c283e0244652c86a59cf9fd242fd81d47da7502d9f9f4907cd5c2c2 SHA512 76b8464db841f6882a780dce7fb307d3a9c7bd121b0a837cdca7a18bed026ff3003d1922dfd2e8688ce31db0b89d864705d20b3185083b186d5301987018faae
 MISC metadata.xml 574 BLAKE2B d8d9f0fb7ec754f8da6d372845758ef8738e6642eee742532ea1b0389029c4cbcf6cc502886ca11add1ca4dffa6cdc7b708efe397fda10921fe2b67afa1de03f SHA512 62f862b759c82a402015b3dbf6d6979240c642724df3c9591f31ef00a85e65fb3187138672b93f71cbd122083666731be61447acf4e46e24b81d8568778cdad9
diff --git a/dev-ada/libadalang/libadalang-2017-r1.ebuild b/dev-ada/libadalang/libadalang-2017-r1.ebuild
deleted file mode 100644
index ef338c304996..000000000000
--- a/dev-ada/libadalang/libadalang-2017-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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-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
-}
-
-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-r2.ebuild b/dev-ada/libadalang/libadalang-2017-r2.ebuild
deleted file mode 100644
index 7896a4c5e03f..000000000000
--- a/dev-ada/libadalang/libadalang-2017-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-ADA_COMPAT=( gnat_201{6,7} )
-
-inherit ada 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=""
-
-RDEPEND="${ADA_DEPS}
-	dev-python/pyyaml
-	dev-ada/gnatcoll[${ADA_USEDEP},projects,shared]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	~dev-ada/langkit-2017"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${PN}-gps-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ada_pkg_setup
-}
-
-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-2018-r1.ebuild b/dev-ada/libadalang/libadalang-2018-r1.ebuild
deleted file mode 100644
index 21136132a52f..000000000000
--- a/dev-ada/libadalang/libadalang-2018-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-MYP=${PN}-gpl-${PV}-src
-DESCRIPTION="high performance semantic engine for the Ada programming language"
-HOMEPAGE="https://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf9adc7a4475263382c18
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2017 +gnat_2018 gnat_2019 +shared static-libs"
-
-RDEPEND="dev-python/pyyaml
-	dev-ada/gnatcoll-bindings[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
-	dev-ada/gnatcoll-bindings[iconv,shared=,static-libs=]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	~dev-ada/langkit-2018
-	dev-ada/gprbuild[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( gnat_2017 gnat_2018 gnat_2019 )"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${PN}-2017-gentoo.patch
-)
-
-src_configure() {
-	ada/manage.py -v debug generate || die
-}
-
-src_compile() {
-	ada/manage.py \
-		-v \
-		$(use_enable shared) \
-		$(use_enable static-libs static) \
-		build \
-		--build-mode='prod' || die
-}
-
-src_test () {
-	ada/manage.py test | grep FAILED && die
-}
-
-src_install () {
-	ada/manage.py \
-		$(use_enable shared) \
-		$(use_enable static-libs static) \
-		install "${D}"usr || die
-	python_domodule build/python/libadalang.py
-	rm -r "${D}"usr/python || die
-}
diff --git a/dev-ada/libadalang/libadalang-2018.ebuild b/dev-ada/libadalang/libadalang-2018.ebuild
deleted file mode 100644
index 2f0bf1aa8eee..000000000000
--- a/dev-ada/libadalang/libadalang-2018.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-MYP=${PN}-gpl-${PV}-src
-DESCRIPTION="high performance semantic engine for the Ada programming language"
-HOMEPAGE="https://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf9adc7a4475263382c18
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs"
-
-RDEPEND="dev-python/pyyaml
-	dev-ada/gnatcoll-bindings[gnat_2016=,gnat_2017=,gnat_2018=]
-	dev-ada/gnatcoll-bindings[iconv,shared=,static-libs=]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	~dev-ada/langkit-2018"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${PN}-2017-gentoo.patch
-)
-
-src_configure() {
-	ada/manage.py -v debug generate || die
-}
-
-src_compile() {
-	ada/manage.py \
-		-v \
-		$(use_enable shared) \
-		$(use_enable static-libs static) \
-		build || die
-}
-
-src_test () {
-	ada/manage.py test | grep FAILED && die
-}
-
-src_install () {
-	ada/manage.py \
-		$(use_enable shared) \
-		$(use_enable static-libs static) \
-		install "${D}"usr || die
-	python_domodule build/python/libadalang.py
-	rm -r "${D}"usr/python || die
-}
diff --git a/dev-ada/libadalang/libadalang-2019.ebuild b/dev-ada/libadalang/libadalang-2019.ebuild
deleted file mode 100644
index b82f0de8e748..000000000000
--- a/dev-ada/libadalang/libadalang-2019.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-MYP=${P}-20190510-19916-src
-DESCRIPTION="high performance semantic engine for the Ada programming language"
-HOMEPAGE="https://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8f3331e87a8f1c967d27
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2018 +gnat_2019 +shared static-libs"
-
-RDEPEND="dev-python/pyyaml
-	dev-ada/gnatcoll-bindings[gnat_2018(-)?,gnat_2019(-)?]
-	dev-ada/gnatcoll-bindings[iconv,shared=,static-libs=]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2018(-)?,gnat_2019(-)?]
-	>=dev-ada/langkit-2019"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( gnat_2018 gnat_2019 )"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure() {
-	ada/manage.py -v debug generate || die
-}
-
-src_compile() {
-	libtype=relocatable
-	if use shared; then
-		if use static-libs; then
-			libtype=static,relocatable
-		fi
-	elif use static-libs; then
-		libtype=static
-	fi
-	ada/manage.py \
-		-v \
-		--library-types $libtype \
-		build \
-		--build-mode='prod' || die
-}
-
-src_test () {
-	ada/manage.py test | tee libadalang.testOut;
-	grep -q FAILED libadalang.testOut && die
-}
-
-src_install () {
-	ada/manage.py \
-		-v \
-		--library-types $libtype \
-		install "${D}"/usr || die
-	python_domodule build/python/libadalang
-	rm -r "${D}"/usr/python || die
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-10 13:21:36 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-10 13:21:36 +0000
commit	77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch)
tree	5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /dev-ada
parent	bd4aeefe33e63f613512604e47bfca7b2187697d (diff)