gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-ada
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
41 files changed, 57 insertions, 1931 deletions
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 0f0548cb4ab1..b9799be6d5c5 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gnat-suite-bin/Manifest b/dev-ada/gnat-suite-bin/Manifest
index f3f91c51ed90..10db95470680 100644
--- a/dev-ada/gnat-suite-bin/Manifest
+++ b/dev-ada/gnat-suite-bin/Manifest
@@ -3,8 +3,8 @@ DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688
 DIST gnat-gpl-2016-x86_64-linux-bin.tar.gz 372813330 BLAKE2B a0374ad730ae275aaedcf5663c30f8e0221af32f14391fe87a3ce0630d4498a1e90671c02830d62f78857571a5a521af91f6db409a7b3c367c7b0f059571eefd SHA512 5115ac3be0badc5125ee048a98230f18363d72107da3325ce602c0e618cee2e3646a0decc00a2388f14bc61bfed51dd0622f365f5f7ee8b0cec2187ebcf8e075
 DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8fa7217c0731ca1e91ced38700df1d63d91a16c3fa28dfd44c7c8e867c3a857b88e4f0c8b2a7200fb6a8a630b8403538c4784f8914d1a5 SHA512 01a8f3be9b7b7e83cc5bd4a45137b1d35c6448bc22a88bcaf5d312cd63e11081b6b2fe9f09ad2a27d8f0b6471fc5c1a99573bf3bcee1589329054074eaeef04f
 DIST gnat-suite-bin-2018.txz 337235688 BLAKE2B cf1b8f0253907b8fc97b9c7218b23dcda8f1557be5e12293eab59e09427418a8814c1bafbcb3f89c1e5dd755a161c5dfa8a852631d137f17acb3167bf51dadbb SHA512 9b57709c05a121b0a0adabe3232128e3f27659d1928857fbd6883b73a7487c3d457317e8f236df3d16ced635514af8afbafc584cc74d865e11288820ac9c4f77
-EBUILD gnat-suite-bin-2014.ebuild 3278 BLAKE2B ee8a643457b6bba7e2df0c97a109b4369896ce64d3d9dbfb2e469acc40a2c5c36944d5e4b3e728669e6d43049fe9fc81f73328b1c4984f209bb4cf3c568dba21 SHA512 8662718b19e4952c29d9f1899636c5fd8e3ccffc7bfeff04257c65bc8b65ae8516f64edbab7e80b03df3a2bf362897eed840557e2ed679b2d757ce5bec047261
-EBUILD gnat-suite-bin-2016.ebuild 3070 BLAKE2B df8670e3e1b00e3a8481b31b06272118c13992e41f75f8221b28f1a96ace32bf2641ace34495e95bbdab6cc5174205a2bd5c7ca7be0cbf9985e80d26104c1f53 SHA512 dd6a9b7196cfe65478bd631177f66f24fa1f8de79b5ad4e6a53b8471922a94e22f78159a63ce8a56d4de4c7fb039c9ba20c5aa55882cbd74ab5cdd415c4a75d1
-EBUILD gnat-suite-bin-2017.ebuild 3079 BLAKE2B 9178130bd89fc8d2b53e994c2c6b221196d551ae13a0dd2ab3e53b350e93b04c0e0154728a5f868269d2832c16af0c56cff7de12cb719099d7ecd7d4ba947199 SHA512 dbb1f7e41c40724af584d73bfffb99125117b33a95385b73b34904ca262379175e55909863f57034c40428acb92c2ee88c1d316a58266abf238283843912b3ac
-EBUILD gnat-suite-bin-2018.ebuild 2658 BLAKE2B 5d1c5bf2ff669ce5bf1721cde3fd095c654f72cd7d7beeaa7828f39dbcde7957cc3263258f377011f47ccd390f55e59d9cdf17a6b2e561f1bfb3768475c49290 SHA512 589c0c0b27a8970ff4083ecc68e1cb8220db2333d8537a77931ef0b82cbdc4a37169283e41c1c64fb9d0e5347ec5fab95ea1c7fe1c599dd8b2a8186103281907
+EBUILD gnat-suite-bin-2014.ebuild 3215 BLAKE2B f4ac450a4a1125f5fc6c6c202dc70728f36a2f670717f97d97eb033b23854b861f346c302828d3722a7c0b05c2850f75392b0d7b17c9d1727b16e6cc54f6f490 SHA512 1f20d97cf2d7533f1a27f12847c7d5054ca95283e36e50e5395992b03e898dd6df20fcc4bd0f3999912241030ce900f5c33d3a14b930ef41160a28105e009d28
+EBUILD gnat-suite-bin-2016.ebuild 3007 BLAKE2B fb8eda10c0253697f2862949d7166eeb84766a003e4c7f15c770377264b23414af7ce6a9d62b258ef81cba0fa99b873d1a5172a2184018a438a9c779d979824e SHA512 a577b78b1b929809d10e4855c1276ba6f82d4e587bcad75794ab59b511d02672c20cff30dab520d321eb88b50319b5a59352e2543fb09031cbb80ee3e659cc61
+EBUILD gnat-suite-bin-2017.ebuild 3016 BLAKE2B 29e2c3941f50f7bd82b7d466c207443b14ec22f57e3d523d138a5c83ccf60f6aec9a85bc7fabfd308c2d114036aff935708bfc27db0bce188ab4881eb52c56a4 SHA512 f17e87641587151ddf12b72d1081b6e77084a1b66d2c14710834b55e119b1c134c155d2c9e872106a692c0e2703e18f3cf9d97c5e99c4e0549c40cdfb93307df
+EBUILD gnat-suite-bin-2018.ebuild 2595 BLAKE2B 0f9d2a6ca596749a39f0ebfce5e27b791fae39882b5d6f89a7f32d19770c1a08ebe737e96020bd48d5c44279abc3fc63dacf143efb28205427f37d83da9f52ba SHA512 4095191d12d2ca771a64b55b1447c9c7004b274008c52434edb896318e91e792a6922e7882f23af6591cc51f2ceb6019c54ff3b4abf1cf4589fda1a8773f3058
 MISC metadata.xml 353 BLAKE2B 54a9380f89a4e38172b97e56e9d0f604f4cfce08ab15b2c8e3752a57e6dc9fb67d4cc0e833d189fbaf961132c90ae6fec3a8c119434f7fba6cb7540ca000024f SHA512 9abd1b2b91148d7f13c3445d830f816a14e2efff5c1233192b0a7020149e88f2f98323e41d3e3e61c8daf3d9df18b029c46d4e0f3a69e1f0780ded228a2e7ca4
diff --git a/dev-ada/gnat-suite-bin/gnat-suite-bin-2014.ebuild b/dev-ada/gnat-suite-bin/gnat-suite-bin-2014.ebuild
index 9dcff4585b0a..84e63a9aef84 100644
--- a/dev-ada/gnat-suite-bin/gnat-suite-bin-2014.ebuild
+++ b/dev-ada/gnat-suite-bin/gnat-suite-bin-2014.ebuild
@@ -89,15 +89,15 @@ src_install() {
 	doins -r etc include lib* share
 	insinto ${PREFIX}/share/gps/plug-ins
 	doins share/examples/gnat/gnat-examples.xml
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1 || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2 || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1 || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0 || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1 || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper || die
-	fperms 755 ${PREFIX}/libexec/gprbuild/gprbind || die
-	fperms 755 ${PREFIX}/libexec/gprbuild/gprlib || die
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper
+	fperms 755 ${PREFIX}/libexec/gprbuild/gprbind
+	fperms 755 ${PREFIX}/libexec/gprbuild/gprlib
 }
 
 pkg_postinst () {
diff --git a/dev-ada/gnat-suite-bin/gnat-suite-bin-2016.ebuild b/dev-ada/gnat-suite-bin/gnat-suite-bin-2016.ebuild
index 03db6ca157d7..fe753f78bac8 100644
--- a/dev-ada/gnat-suite-bin/gnat-suite-bin-2016.ebuild
+++ b/dev-ada/gnat-suite-bin/gnat-suite-bin-2016.ebuild
@@ -84,15 +84,15 @@ src_install() {
 	doins -r etc include lib* share
 	insinto ${PREFIX}/share/gps/plug-ins
 	doins share/examples/gnat/gnat-examples.xml
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1 || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2 || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1 || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0 || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1 || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper || die
-	fperms 755 ${PREFIX}/libexec/gprbuild/gprbind || die
-	fperms 755 ${PREFIX}/libexec/gprbuild/gprlib || die
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper
+	fperms 755 ${PREFIX}/libexec/gprbuild/gprbind
+	fperms 755 ${PREFIX}/libexec/gprbuild/gprlib
 }
 
 pkg_postinst () {
diff --git a/dev-ada/gnat-suite-bin/gnat-suite-bin-2017.ebuild b/dev-ada/gnat-suite-bin/gnat-suite-bin-2017.ebuild
index 32edf6f51a1c..538f8b0544bb 100644
--- a/dev-ada/gnat-suite-bin/gnat-suite-bin-2017.ebuild
+++ b/dev-ada/gnat-suite-bin/gnat-suite-bin-2017.ebuild
@@ -84,15 +84,15 @@ src_install() {
 	doins -r etc include lib* share
 	insinto ${PREFIX}/share/gps/plug-ins
 	doins share/examples/gnat/gnat-examples.xml
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1 || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2 || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1 || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0 || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1 || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper || die
-	fperms 755 ${PREFIX}/libexec/gprbuild/gprbind || die
-	fperms 755 ${PREFIX}/libexec/gprbuild/gprlib || die
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper
+	fperms 755 ${PREFIX}/libexec/gprbuild/gprbind
+	fperms 755 ${PREFIX}/libexec/gprbuild/gprlib
 }
 
 pkg_postinst () {
diff --git a/dev-ada/gnat-suite-bin/gnat-suite-bin-2018.ebuild b/dev-ada/gnat-suite-bin/gnat-suite-bin-2018.ebuild
index 2edb4e58a554..a6d08d2be740 100644
--- a/dev-ada/gnat-suite-bin/gnat-suite-bin-2018.ebuild
+++ b/dev-ada/gnat-suite-bin/gnat-suite-bin-2018.ebuild
@@ -64,15 +64,15 @@ src_install() {
 	doins share/examples/gnat/gnat-examples.xml
 	basever=7.3.1
 	machine=x86_64-pc-linux-gnu
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1 || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2 || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1 || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0 || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1 || die
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper || die
-	fperms 755 ${PREFIX}/libexec/gprbuild/gprbind || die
-	fperms 755 ${PREFIX}/libexec/gprbuild/gprlib || die
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper
+	fperms 755 ${PREFIX}/libexec/gprbuild/gprbind
+	fperms 755 ${PREFIX}/libexec/gprbuild/gprlib
 }
 
 pkg_postinst () {
diff --git a/dev-ada/gnat_util/Manifest b/dev-ada/gnat_util/Manifest
index c3c30d71f003..08e35d621b38 100644
--- a/dev-ada/gnat_util/Manifest
+++ b/dev-ada/gnat_util/Manifest
@@ -2,11 +2,7 @@ AUX gnat_util-2017-gentoo.patch 2419 BLAKE2B e8085e6a6cb65c5ffe6054aa360e90042a0
 DIST gnat_util-2019-20190517-18c94-src.tar.gz 906682 BLAKE2B d00ae8b92429f9a7d7476ff6437148a869555fb66435f9355b8ba1ec3d827cd32063e9b64a6862b99a4b26e570e1a1a7b4dfabd67d1aa1b997fb5510e9b43324 SHA512 fbf9114a75f6f794705384a67581f1630460292b8d640c34323c8147bea280bdf2ac8b6097313992d27716f2edc814e587d9396d85d28158ea82ee6002e47425
 DIST gnat_util-gpl-2017-src.tar.gz 868496 BLAKE2B d105a59f0533428a4d57b3c81c0818f4d1bd457b113d775fe97f35f7352e03b602ac0e6d7b970e408fb3dd6d30f0d4e60feffccf42dbdc0723a76855b0164ee0 SHA512 d5e48c6fafc870f36094d2dfd5f45f2d5b5729c97596afff7475b7838c1c7c029ef57395ca1011ee74d8a4195597ea1f502732e654a02561a7abc72c8a7d3a6a
 DIST gnat_util-gpl-2018-src.tar.gz 883945 BLAKE2B e30ee379f4ea9525337b0794d4fc91c80458b3b1dd3d10cbc455c6f566d4d073b6753c171ffbbabd85995717de249cdee7c094b7ba00d752a13e18d0f54da192 SHA512 490b0fa944f4b9fee2a4e78c1181658eb8f95262314455c41beb3ebe9db5dd540090d1f9840357572969721966fa11085dc680f3498dc539631ef3f4dbf56426
-EBUILD gnat_util-2017-r1.ebuild 1428 BLAKE2B 82c57959eecc3aaa4aa4f47495ec92d05dbdb195f03834d5d0fa8c133b69f293e1cb460c071daf9025e69e15eba75160f81874118d2055c312ef832a92a33a05 SHA512 c7df4a1ed891db9d537b819aaa9ffae0f7750e0b95ae1182a8d90619288888287e6336624dd127a913b872f35a890527714f16e5c48a246ee45aebd4f06bb8d0
 EBUILD gnat_util-2017-r2.ebuild 1248 BLAKE2B f0785a2673c48dda445563cd458e1a21f20967fcf41f10b3869574872a393dddd504b1156b90f887225c85cf46f8f62778ef118f5b2239d45096eb0e940b8cf4 SHA512 105f0f6f8883d968cbc22fac64c20d5b8eb8573df538033983ae716170464b6e266740c4a1b2e40a98b2b04c93332e21a38668ab735ae70ecf8213d36297317c
-EBUILD gnat_util-2018-r1.ebuild 1434 BLAKE2B 51df631a50fb03c30aa2a415e0224f1aaabb98db88e176d3a01c82feb51578792aca9546d7f3e07e835c331a1691df75ba95426066cb5bfe16df6da400cd210f SHA512 57b132e327e4dc077cec242175b616deb16b3323be886f6dfb86897e7143686f44427ef42e0b6f2e6120ed13b3b101ea528454906adaf14c1a7a39dc8806d490
 EBUILD gnat_util-2018-r2.ebuild 1253 BLAKE2B 72b6eccc9972817dbcec0509aa3af9ac29022b7b5df46684ca965770c040219d22bdca884d114ed6dd73c15275e7188394820ee0e138d821174901dac4870f7a SHA512 0fbb2651dbabe8112b0362e0f777191d939dd557d80b3699ac18bf65e1a2449e975a91cdb48eeae03a30d135f5231e019d1753d6b9ab53d3912516df604d3892
-EBUILD gnat_util-2018.ebuild 1326 BLAKE2B 336432396b5b98f7d59704f30a7063873651c296eb8a63700025c5c37cda497baf1caac3d4097ed95b99cfb1aee9e8402a1e75293560b7db1e12bb40b1a5aaf6 SHA512 8014d612eb4e2fcd1599aa6262f6afc131ca5dea70b40f096aa22c95a94bcb0ecc38a94c705254085b84c56e89fb21a034f082a5606885f58231dfe37738b247
 EBUILD gnat_util-2019-r1.ebuild 1259 BLAKE2B 400c5a88a9e79726b80fb3460f022b218be554f16369ab49ddcdb48ff875df9e480dee8edbcd4ca0bd444b4f1d6a9f532260dd76fd660d34a4b69f8e5d86d55d SHA512 32631f35eb4c21a29d18a62437d1a39deb8b0ab9c30f7c7e67c8dcfc3dc86ebc4ee45ac60fc6ca1b26d46b084fadfcc13fab0e80796036ccc8064b5904e2ff9f
-EBUILD gnat_util-2019.ebuild 1294 BLAKE2B 1d372556c49fed799cc77ccba51eb42b04592e0e5da07f047289a5aeeeb5661c243630dc243af0bbe468e97ec97c345bf76cc901b36fcbc3857a6888ca06bf3e SHA512 0508f33480ca3ec77397bbc2004d30546d8f2a200d41219614552487a012688e4cf61d423249069b3b4b83fb9d1c2eae66bdc814769d7411b8a5254724f9b640
 MISC metadata.xml 921 BLAKE2B 7e70b07f291098feab880aaedb4ebf5eb1dd6a83d4e5bff1f50b9e8657b9d2fc947cc33d91c02b1a1df5cfd15ce565fee9c267fdbe4063affc4a02e8944348c2 SHA512 d313f2d9d6dfd9a5616e75ce7ab5fb3670deb54f0fbc66f584ce398d5b5c8b9196f92833f54188ab8ea5dc50e5b7b8c74104b4af7050b268e9c2dfd5defe0374
diff --git a/dev-ada/gnat_util/gnat_util-2017-r1.ebuild b/dev-ada/gnat_util/gnat_util-2017-r1.ebuild
deleted file mode 100644
index 3a211e741e37..000000000000
--- a/dev-ada/gnat_util/gnat_util-2017-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="Provides access to GNAT compiler internals for AdaCore utilities"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic"
-
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?]"
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	else
-		GCC_PV=6.3.0
-	fi
-	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
-	emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
-		BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
-	if use static-libs; then
-		emake BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake BUILDER="gprbuild -v -j$(makeopts_jobs)" \
-				build-${kind}
-		fi
-	done
-}
-
-src_install() {
-	if use static-libs; then
-		emake prefix="${D}"/usr install-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake prefix="${D}"/usr install-${kind}
-		fi
-	done
-	einstalldocs
-}
diff --git a/dev-ada/gnat_util/gnat_util-2018-r1.ebuild b/dev-ada/gnat_util/gnat_util-2018-r1.ebuild
deleted file mode 100644
index 54ff9a99e51f..000000000000
--- a/dev-ada/gnat_util/gnat_util-2018-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="Provides access to GNAT compiler internals for AdaCore utilities"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a6b
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gnat_2018 gnat_2019 +shared static-libs static-pic"
-
-RDEPEND="gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
-	gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2018(-)?,gnat_2019(-)?]"
-REQUIRED_USE="^^ ( gnat_2018 gnat_2019 )"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
-
-src_compile() {
-	if use gnat_2018; then
-		GCC_PV=7.3.1
-	else
-		GCC_PV=8.3.1
-	fi
-	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
-	emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
-		BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
-	if use static-libs; then
-		emake BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake BUILDER="gprbuild -v -j$(makeopts_jobs)" \
-				build-${kind}
-		fi
-	done
-}
-
-src_install() {
-	if use static-libs; then
-		emake prefix="${D}"/usr install-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake prefix="${D}"/usr install-${kind}
-		fi
-	done
-	einstalldocs
-}
diff --git a/dev-ada/gnat_util/gnat_util-2018.ebuild b/dev-ada/gnat_util/gnat_util-2018.ebuild
deleted file mode 100644
index c7b5206b2a5d..000000000000
--- a/dev-ada/gnat_util/gnat_util-2018.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="Provides access to GNAT compiler internals for AdaCore utilities"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a6b
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic"
-
-RDEPEND="dev-lang/gnat-gpl:7.3.1"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2018]"
-REQUIRED_USE="!gnat_2016 !gnat_2017 gnat_2018"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
-
-src_compile() {
-	GCC_PV=7.3.1
-	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
-	emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
-		BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
-	if use static-libs; then
-		emake BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake BUILDER="gprbuild -v -j$(makeopts_jobs)" \
-				build-${kind}
-		fi
-	done
-}
-
-src_install() {
-	if use static-libs; then
-		emake prefix="${D}"/usr install-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake prefix="${D}"/usr install-${kind}
-		fi
-	done
-	einstalldocs
-}
diff --git a/dev-ada/gnat_util/gnat_util-2019.ebuild b/dev-ada/gnat_util/gnat_util-2019.ebuild
deleted file mode 100644
index f8122223b8c9..000000000000
--- a/dev-ada/gnat_util/gnat_util-2019.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs multiprocessing
-
-MYP=${P}-20190517
-
-DESCRIPTION="Provides access to GNAT compiler internals for AdaCore utilities"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8e5031e87a8f1d425090
-	-> ${MYP}-18c94-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gnat_2019 +shared static-libs static-pic"
-
-RDEPEND="dev-lang/gnat-gpl:8.3.1"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2019]"
-REQUIRED_USE="gnat_2019"
-
-S="${WORKDIR}"/${MYP}-194CA-src
-
-PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
-
-src_compile() {
-	GCC_PV=8.3.1
-	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
-	emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
-		BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
-	if use static-libs; then
-		emake BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake BUILDER="gprbuild -v -j$(makeopts_jobs)" \
-				build-${kind}
-		fi
-	done
-}
-
-src_install() {
-	if use static-libs; then
-		emake prefix="${D}"/usr install-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake prefix="${D}"/usr install-${kind}
-		fi
-	done
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest
deleted file mode 100644
index fde240b43834..000000000000
--- a/dev-ada/gnatcoll/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gnatcoll-2017-gentoo.patch 7843 BLAKE2B 1a7a7cc1bb1ad94f65fced28888c37acc3cc3711b0c488413313357551f3109e818f25eeba5fe25448f8362256ed5e8bccb6c5b67fe8195492d0e3b1e271f78b SHA512 d2eef0a5d4fecba7f081b97fc7c78efdb6dad76b492b1711e5c5d47b88ae621ca6826497668c9363ee16e36aaeb0e4978cc978c8688d3b346c3dd08b96a8537c
-AUX gnatcoll-2017-r1-gentoo.patch 7206 BLAKE2B 87404d98273fad107a4bc0711161676342acc42bb1d54a85c6680b71ad12ee1b9ec6ced694e6bf74cf724b024775b485377965930aefea54a4860c4937605b96 SHA512 907aa86f7efc68e1176212725f3af19a6dcf9c58377a0478d63553f30a90e4ba19891b1ab746e8ee3d4fba3c470b968e3bb1a718f413db5c39fc80959abd9224
-DIST gnatcoll-gpl-2017-src.tar.gz 5785988 BLAKE2B 828aff797f7d992bf3f5dda7f8ce8a79e97ecd98253a657fb6e79a2fd08aac97e19cb421f47010f8c1f26442a013b9126ab3a95353d9ce0f29d071601e9dfe2f SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363
-EBUILD gnatcoll-2017-r1.ebuild 3018 BLAKE2B 316bcfcc62d0e529d252f40e249921d457ab2f756d2588991f40ddee1e6ae98015052f3ab239b00f3184a116622c9066df71690862d384b0331f0e24cdb700c7 SHA512 d2bee235f1b38ece1b56c2f84c7a1235dffa70a87d5aa2c5cfe0c3b645a585d5f4bfaf844e54d28b61ad6d71e9af5dc564f5e25a14625cd2dc4fd0819ad3b62f
-EBUILD gnatcoll-2017.ebuild 3257 BLAKE2B 3fe04c24429c39e1904bd95ecc09ac7f45a357ee9305fdfb3689fe9201ebedc51b838188a15d1c3ed1b40cb31fed42dc12da08a0e2a1171bebeb0af1816281a5 SHA512 d029004d698dae4016008e2c29a2a106c68f7b1b5647d3a05108d49fa44b2e5c7d90d806b2218736cb6116c18c7be6ebb2ff6d7f2a92bca65c7860d3c516fc65
-MISC metadata.xml 1194 BLAKE2B b4b93464f8dffd89bb43ca27e18e015d7cb720041fd7d405d3c7e5af9f8a53316959ab6696d5d762a1afa887648f7028cb831305b63a1782cd1c62f2486447c1 SHA512 a6fb6bf6f82f5582f4cca95e5864202664483fba5c4b813c4f515f670cb5fd720437001fd497167235c29843da2fb967e429f9a410d5b7ec2acefbc01ac30bf3
diff --git a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
deleted file mode 100644
index f0ec53f368ea..000000000000
--- a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
+++ /dev/null
@@ -1,206 +0,0 @@
---- a/Makefile	2017-01-20 19:39:07.131398270 +0100
-+++ b/Makefile	2017-01-20 19:42:30.088728844 +0100
-@@ -43,18 +43,18 @@
- 
- # Build either type of library. The argument (%) is the type of library to build
- 
--GPRBLD_OPTS=-p -m -j${PROCESSORS} -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build} -XXMLADA_BUILD=$(@F)
-+GPRBLD_OPTS=-p -m -j${PROCESSORS} -XGPR_BUILD=$(@F) -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build} -XXMLADA_BUILD=$(@F)
- 
- build_library_type/%: generate_sources
- 	@${RM} src/gnatcoll-atomic.adb
- 
- 	@echo "====== Building $(@F) libraries ======"
--	${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full
-+	${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full -v -cargs ${ADAFLAGS}
- 
- 	@# Need to build libgnatcoll_gtk separately, because its project files
- 	@# requires gtkada.gpr, which might not exist on the machine.
- ifeq (${WITH_GTK},yes)
--	${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk
-+	${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk -v -cargs ${ADAFLAGS}
- endif
- 
- build_tools/%: build_library_type/%
-@@ -63,13 +63,14 @@
- 	@# They are not build as part of the above because only the Main from
- 	@# gnatcoll_full.gpr are build. We could use aggregate projects to
- 	@# speed things up.
--	${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools
-+	${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools -v -cargs ${ADAFLAGS}
- 
- #######################################################################
- #  install
- 
- GPRINST_OPTS=-p -f --prefix=${prefix} --install-name=gnatcoll \
- 	--exec-subdir=${bindir} --project-subdir=lib/gnat -XXMLADA_BUILD=$(@F) \
-+	-XGPR_BUILD=$(@F) \
- 	--build-var=LIBRARY_TYPE --build-name=$(@F) -XLIBRARY_TYPE=$(@F)
- 
- install-clean:
---- a/gnatcoll_shared.gpr.in	2017-01-20 19:50:03.222808656 +0100
-+++ b/gnatcoll_shared.gpr.in	2017-01-20 19:50:28.200399274 +0100
-@@ -13,7 +13,7 @@
- 
-    type Yes_No is ("yes", "no");
-    Gtk       : Yes_No := External ("GTK", "@WITH_GTK@");
--   Python    : Yes_No := External ("PYTHON", "@WITH_PYTHON@");
-+   Python    : Yes_No := "@WITH_PYTHON@"; 
-    Syslog    : Yes_No := External ("SYSLOG", "@WITH_SYSLOG@");
-    Postgres  : Yes_No := External ("POSTGRES", "@WITH_POSTGRES@");
-    type Sqlite_Inclusion is ("yes", "no", "embedded");
---- a/aclocal.m4	2017-04-06 08:25:14.796699365 +0200
-+++ b/aclocal.m4	2017-04-06 08:25:36.622318016 +0200
-@@ -45,7 +45,7 @@
-    cat > conftest.ada <<EOF
- [$3]
- EOF
--   if AC_TRY_COMMAND([gnatchop -q conftest.ada && $1 $2 >/dev/null 2>conftest.out])
-+   if AC_TRY_COMMAND([${GNATCHOP} -q conftest.ada && $1 $2 >/dev/null 2>conftest.out])
-    then
-       : Success
-       $4
-@@ -68,7 +68,7 @@
- AC_DEFUN(AM_HAS_INTRINSIC_SYNC_COUNTERS,
- [
-   AC_MSG_CHECKING([whether platform supports atomic inc/dec])
--  AM_TRY_ADA([gnatmake], [check.adb],
-+  AM_TRY_ADA([${GNATMAKE}], [check.adb],
- [
- with Interfaces; use Interfaces;
- procedure Check is
---- a/testsuite/json/__init__.py	2017-04-24 17:52:34.158513249 +0200
-+++ b/testsuite/json/__init__.py	2017-04-24 17:52:52.636207017 +0200
-@@ -21,7 +21,7 @@
-     @requires_not_aix    # Storage_Error on that machine
-     @chdir("MB28-001")
-     def test_MB28_001(self):
--        self.runexec(["python", "make_json.py"])
-+        self.runexec(["python2.7", "make_json.py"])
-         self.gprbuild()
-         self.runexec("json_stack_test", "test.out")
- 
---- a/testsuite/projects/__init__.py	2017-04-24 19:10:30.465246199 +0200
-+++ b/testsuite/projects/__init__.py	2017-04-24 19:10:42.768035080 +0200
-@@ -105,25 +105,6 @@
-         self.gprbuild("default.gpr")
-         self.runexec("main", "")
- 
--    @support.requires_not_windows
--    @chdir("N918-040")
--    def test_bareboard(self):
--        self.create_fake_bb_compiler('install', 'arm-eabi', '6.1.0w', '3.4.6')
--
--        # Make sure auto.cgpr is not deleted on exit
--        try:
--            os.unlink('auto.cgpr')
--        except:
--            pass
--        self.gprbuild('main_prj', switches=['--autoconf=auto.cgpr'])
--        m = re.search('for Target use "(.*?)"', open('auto.cgpr').read())
--        target = m.group(1)
--
--        def customFilter(actual):
--            return actual.replace(target, "<native>")
--
--        self.runexec(['sh', 'test.sh'], 'test.out', customFilter=customFilter)
--
-     @chdir("NB12-045")
-     def test_NB12_045(self):
-         # Test registering attribute in unknown package
---- a/src/tools/gnatcoll_db2ada.adb	2017-04-24 21:36:09.193973179 +0200
-+++ b/src/tools/gnatcoll_db2ada.adb	2017-04-24 21:36:16.029858932 +0200
-@@ -211,7 +211,7 @@
- 
-       declare
-          Output : constant String := Get_Command_Output
--           (Command     => "python",
-+           (Command     => "python2.7",
-             Arguments   => Args,
-             Input       => "",
-             Status      => Status'Access,
---- a/src/gnatcoll-projects.ads	2017-11-25 14:50:06.919939453 +0100
-+++ b/src/gnatcoll-projects.ads	2017-11-25 14:50:38.932387204 +0100
-@@ -1917,7 +1917,8 @@
-       Predefined_Source_Files : GNATCOLL.VFS.File_Array_Access;
-       --  The list of source files in Predefined_Source_Path
- 
--      Default_Gnatls : GNAT.Strings.String_Access := new String'("gnatls");
-+      Default_Gnatls : GNAT.Strings.String_Access :=
-+         new String'("@GNATLS@");
-       --  The default gnatls command to run.
- 
-       Xrefs_Subdir : GNAT.Strings.String_Access;
---- a/src/tools/gnatinspect.adb	2017-11-25 14:52:47.282170250 +0100
-+++ b/src/tools/gnatinspect.adb	2017-11-25 14:52:57.691990254 +0100
-@@ -642,7 +642,7 @@
-       GNAT_Version : GNAT.Strings.String_Access;
-    begin
-       Env.Set_Path_From_Gnatls
--        (Gnatls       => "gnatls",
-+        (Gnatls       => "@GNATLS@",
-          GNAT_Version => GNAT_Version,
-          Errors       => Local_On_Error'Unrestricted_Access);
-       Free (GNAT_Version);
---- a/src/gnatcoll-projects.adb	2018-11-14 18:47:27.760365233 +0100
-+++ b/src/gnatcoll-projects.adb	2018-11-14 19:10:43.961337201 +0100
-@@ -3273,9 +3273,9 @@
-       Status                   : out Status_Type;
-       Result                   : out GNATCOLL.VFS.File_Array_Access)
-    is
--      Mains_Str_List : String_List_Access;
-+      Mains_Str_List : String_Vectors.Vector;
-       Closure_Status : GPR.Util.Status_Type;
--      Closures_List  : String_List_Access;
-+      Closures_List  : String_Vectors.Vector;
-    begin
-       Trace (Me, "Get_Closures");
- 
-@@ -3287,25 +3287,18 @@
-          return;
-       end if;
- 
--      Mains_Str_List := new String_List (Mains'First .. Mains'Last);
-       for I in Mains'Range loop
--         Mains_Str_List (I) := new String'(Mains (I).Display_Base_Name);
-+         Mains_Str_List.Append (Mains (I).Display_Base_Name);
-       end loop;
- 
-       GPR.Util.Get_Closures
-         (Project.Get_View, Project.Tree_View,
--         Mains                    => Mains_Str_List.all,
-+         Mains                    => Mains_Str_List,
-          All_Projects             => All_Projects,
-          Include_Externally_Built => Include_Externally_Built,
-          Status                   => Closure_Status,
-          Result                   => Closures_List);
- 
--      --  Freeing temporary list of mains.
--      for I in Mains_Str_List'Range loop
--         Free (Mains_Str_List (I));
--      end loop;
--      Free (Mains_Str_List);
--
-       case Closure_Status is
-          when Success =>
-             Status := Success;
-@@ -3321,17 +3314,10 @@
-       end case;
- 
-       if Closure_Status in Success | Incomplete_Closure then
--         for I in Closures_List'Range loop
--            Append (Result, Create (+Closures_List (I).all));
-+         for Closure of Closures_List loop
-+            Append (Result, Create (+Closure));
-          end loop;
-       end if;
--
--      --  Freeing temporary list of closures.
--      for I in Closures_List'Range loop
--         Free (Closures_List (I));
--      end loop;
--      Free (Closures_List);
--
-    end Get_Closures;
- 
-    ----------------
diff --git a/dev-ada/gnatcoll/files/gnatcoll-2017-r1-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2017-r1-gentoo.patch
deleted file mode 100644
index b8b92e4b7378..000000000000
--- a/dev-ada/gnatcoll/files/gnatcoll-2017-r1-gentoo.patch
+++ /dev/null
@@ -1,186 +0,0 @@
---- a/Makefile	2017-01-20 19:39:07.131398270 +0100
-+++ b/Makefile	2017-01-20 19:42:30.088728844 +0100
-@@ -43,18 +43,18 @@
- 
- # Build either type of library. The argument (%) is the type of library to build
- 
--GPRBLD_OPTS=-p -m -j${PROCESSORS} -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build} -XXMLADA_BUILD=$(@F)
-+GPRBLD_OPTS=-p -m -j${PROCESSORS} -XGPR_BUILD=$(@F) -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build} -XXMLADA_BUILD=$(@F)
- 
- build_library_type/%: generate_sources
- 	@${RM} src/gnatcoll-atomic.adb
- 
- 	@echo "====== Building $(@F) libraries ======"
--	${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full
-+	${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full -v -cargs ${ADAFLAGS}
- 
- 	@# Need to build libgnatcoll_gtk separately, because its project files
- 	@# requires gtkada.gpr, which might not exist on the machine.
- ifeq (${WITH_GTK},yes)
--	${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk
-+	${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk -v -cargs ${ADAFLAGS}
- endif
- 
- build_tools/%: build_library_type/%
-@@ -63,13 +63,14 @@
- 	@# They are not build as part of the above because only the Main from
- 	@# gnatcoll_full.gpr are build. We could use aggregate projects to
- 	@# speed things up.
--	${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools
-+	${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools -v -cargs ${ADAFLAGS}
- 
- #######################################################################
- #  install
- 
- GPRINST_OPTS=-p -f --prefix=${prefix} --install-name=gnatcoll \
- 	--exec-subdir=${bindir} --project-subdir=lib/gnat -XXMLADA_BUILD=$(@F) \
-+	-XGPR_BUILD=$(@F) \
- 	--build-var=LIBRARY_TYPE --build-name=$(@F) -XLIBRARY_TYPE=$(@F)
- 
- install-clean:
---- a/gnatcoll_shared.gpr.in	2017-01-20 19:50:03.222808656 +0100
-+++ b/gnatcoll_shared.gpr.in	2017-01-20 19:50:28.200399274 +0100
-@@ -13,7 +13,7 @@
- 
-    type Yes_No is ("yes", "no");
-    Gtk       : Yes_No := External ("GTK", "@WITH_GTK@");
--   Python    : Yes_No := External ("PYTHON", "@WITH_PYTHON@");
-+   Python    : Yes_No := "@WITH_PYTHON@"; 
-    Syslog    : Yes_No := External ("SYSLOG", "@WITH_SYSLOG@");
-    Postgres  : Yes_No := External ("POSTGRES", "@WITH_POSTGRES@");
-    type Sqlite_Inclusion is ("yes", "no", "embedded");
---- a/testsuite/json/__init__.py	2017-04-24 17:52:34.158513249 +0200
-+++ b/testsuite/json/__init__.py	2017-04-24 17:52:52.636207017 +0200
-@@ -21,7 +21,7 @@
-     @requires_not_aix    # Storage_Error on that machine
-     @chdir("MB28-001")
-     def test_MB28_001(self):
--        self.runexec(["python", "make_json.py"])
-+        self.runexec(["python2.7", "make_json.py"])
-         self.gprbuild()
-         self.runexec("json_stack_test", "test.out")
- 
---- a/testsuite/projects/__init__.py	2017-04-24 19:10:30.465246199 +0200
-+++ b/testsuite/projects/__init__.py	2017-04-24 19:10:42.768035080 +0200
-@@ -105,25 +105,6 @@
-         self.gprbuild("default.gpr")
-         self.runexec("main", "")
- 
--    @support.requires_not_windows
--    @chdir("N918-040")
--    def test_bareboard(self):
--        self.create_fake_bb_compiler('install', 'arm-eabi', '6.1.0w', '3.4.6')
--
--        # Make sure auto.cgpr is not deleted on exit
--        try:
--            os.unlink('auto.cgpr')
--        except:
--            pass
--        self.gprbuild('main_prj', switches=['--autoconf=auto.cgpr'])
--        m = re.search('for Target use "(.*?)"', open('auto.cgpr').read())
--        target = m.group(1)
--
--        def customFilter(actual):
--            return actual.replace(target, "<native>")
--
--        self.runexec(['sh', 'test.sh'], 'test.out', customFilter=customFilter)
--
-     @chdir("NB12-045")
-     def test_NB12_045(self):
-         # Test registering attribute in unknown package
---- a/src/tools/gnatcoll_db2ada.adb	2017-04-24 21:36:09.193973179 +0200
-+++ b/src/tools/gnatcoll_db2ada.adb	2017-04-24 21:36:16.029858932 +0200
-@@ -211,7 +211,7 @@
- 
-       declare
-          Output : constant String := Get_Command_Output
--           (Command     => "python",
-+           (Command     => "python2.7",
-             Arguments   => Args,
-             Input       => "",
-             Status      => Status'Access,
---- a/src/gnatcoll-projects.ads	2017-11-25 14:50:06.919939453 +0100
-+++ b/src/gnatcoll-projects.ads	2017-11-25 14:50:38.932387204 +0100
-@@ -1917,7 +1917,8 @@
-       Predefined_Source_Files : GNATCOLL.VFS.File_Array_Access;
-       --  The list of source files in Predefined_Source_Path
- 
--      Default_Gnatls : GNAT.Strings.String_Access := new String'("gnatls");
-+      Default_Gnatls : GNAT.Strings.String_Access :=
-+         new String'("@GNATLS@");
-       --  The default gnatls command to run.
- 
-       Xrefs_Subdir : GNAT.Strings.String_Access;
---- a/src/tools/gnatinspect.adb	2017-11-25 14:52:47.282170250 +0100
-+++ b/src/tools/gnatinspect.adb	2017-11-25 14:52:57.691990254 +0100
-@@ -642,7 +642,7 @@
-       GNAT_Version : GNAT.Strings.String_Access;
-    begin
-       Env.Set_Path_From_Gnatls
--        (Gnatls       => "gnatls",
-+        (Gnatls       => "@GNATLS@",
-          GNAT_Version => GNAT_Version,
-          Errors       => Local_On_Error'Unrestricted_Access);
-       Free (GNAT_Version);
---- a/src/gnatcoll-projects.adb	2018-11-14 18:47:27.760365233 +0100
-+++ b/src/gnatcoll-projects.adb	2018-11-14 19:10:43.961337201 +0100
-@@ -3273,9 +3273,9 @@
-       Status                   : out Status_Type;
-       Result                   : out GNATCOLL.VFS.File_Array_Access)
-    is
--      Mains_Str_List : String_List_Access;
-+      Mains_Str_List : String_Vectors.Vector;
-       Closure_Status : GPR.Util.Status_Type;
--      Closures_List  : String_List_Access;
-+      Closures_List  : String_Vectors.Vector;
-    begin
-       Trace (Me, "Get_Closures");
- 
-@@ -3287,25 +3287,18 @@
-          return;
-       end if;
- 
--      Mains_Str_List := new String_List (Mains'First .. Mains'Last);
-       for I in Mains'Range loop
--         Mains_Str_List (I) := new String'(Mains (I).Display_Base_Name);
-+         Mains_Str_List.Append (Mains (I).Display_Base_Name);
-       end loop;
- 
-       GPR.Util.Get_Closures
-         (Project.Get_View, Project.Tree_View,
--         Mains                    => Mains_Str_List.all,
-+         Mains                    => Mains_Str_List,
-          All_Projects             => All_Projects,
-          Include_Externally_Built => Include_Externally_Built,
-          Status                   => Closure_Status,
-          Result                   => Closures_List);
- 
--      --  Freeing temporary list of mains.
--      for I in Mains_Str_List'Range loop
--         Free (Mains_Str_List (I));
--      end loop;
--      Free (Mains_Str_List);
--
-       case Closure_Status is
-          when Success =>
-             Status := Success;
-@@ -3321,17 +3314,10 @@
-       end case;
- 
-       if Closure_Status in Success | Incomplete_Closure then
--         for I in Closures_List'Range loop
--            Append (Result, Create (+Closures_List (I).all));
-+         for Closure of Closures_List loop
-+            Append (Result, Create (+Closure));
-          end loop;
-       end if;
--
--      --  Freeing temporary list of closures.
--      for I in Closures_List'Range loop
--         Free (Closures_List (I));
--      end loop;
--      Free (Closures_List);
--
-    end Get_Closures;
- 
-    ----------------
diff --git a/dev-ada/gnatcoll/gnatcoll-2017-r1.ebuild b/dev-ada/gnatcoll/gnatcoll-2017-r1.ebuild
deleted file mode 100644
index 07ae2ebc26a3..000000000000
--- a/dev-ada/gnatcoll/gnatcoll-2017-r1.ebuild
+++ /dev/null
@@ -1,134 +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 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/591c45e2c7a447af2deed016
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gmp gtk iconv postgres pygobject projects readline
-	+shared sqlite static-libs syslog tools"
-
-RDEPEND="${ADA_DEPS}
-	${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:* )
-	gtk? (
-		dev-ada/gtkada[${ADA_USEDEP},shared?,static-libs?]
-		dev-libs/atk
-		dev-libs/glib
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:3
-		x11-libs/pango
-	)
-	pygobject? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( dev-db/sqlite )
-	projects? (
-		>=dev-ada/libgpr-2018[${ADA_USEDEP},shared?,static-libs?]
-		dev-ada/xmlada[shared?,static-libs?]
-	)
-	!dev-ada/gnatcoll-core
-	!dev-ada/gnatcoll-bindings
-	!dev-ada/gnatcoll-db"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	tools? ( static-libs )
-	pygobject? ( gtk )
-	${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-r1-gentoo.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ada_setup
-}
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	sed -i \
-		-e "s:@GNATLS@:${GNATLS}:g" \
-		src/gnatcoll-projects.ads \
-		src/tools/gnatinspect.adb \
-		|| die
-	eautoreconf
-}
-
-src_configure() {
-	if use sqlite; then
-		myConf="--with-sqlite=$(get_libdir)"
-	else
-		myConf="--without-sqlite"
-	fi
-	if use gtk ; then
-		myConf="$myConf --with-gtk=3.0"
-	else
-		myConf="$myConf --with-gtk=no"
-	fi
-	econf \
-		--with-python \
-		$(use_with gmp) \
-		$(use_with iconv) \
-		$(use_with postgres postgresql) \
-		$(use_enable projects) \
-		$(use_enable pygobject) \
-		$(use_enable readline gpl) \
-		$(use_enable readline) \
-		$(use_enable syslog) \
-		--with-python-exec=${EPYTHON} \
-		--enable-shared-python \
-		--disable-pygtk \
-		$myConf
-}
-
-src_compile() {
-	if use shared; then
-		emake PROCESSORS=$(makeopts_jobs) build_library_type/relocatable
-	fi
-	if use static-libs; then
-		emake PROCESSORS=$(makeopts_jobs) build_library_type/static
-	fi
-	if use tools; then
-		emake PROCESSORS=$(makeopts_jobs) build_tools/static
-	fi
-	python_fix_shebang .
-}
-
-src_install() {
-	if use shared; then
-		emake prefix="${D}/usr" install_library_type/relocatable
-	fi
-	if use static-libs; then
-		emake prefix="${D}/usr" install_library_type/static
-	fi
-	if use tools; then
-		emake prefix="${D}/usr" install_tools/static
-	fi
-	emake prefix="${D}/usr" install_gps_plugin
-	einstalldocs
-}
-
-src_test() {
-	# The test suite is in
-	# To run you need to have the ada compiler available as gcc
-	# Even in this case there are still some problems
-	# Going into the testsuite directory and running
-	# ./run.py -v -v
-	# run here (having enabled most USE flags)
-	true
-}
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
deleted file mode 100644
index 54e0a586a460..000000000000
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild
+++ /dev/null
@@ -1,138 +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/591c45e2c7a447af2deed016
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gmp gnat_2016 +gnat_2017 gtk iconv postgres pygobject projects readline
-	+shared sqlite static-libs syslog tools"
-
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
-	${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:* )
-	gtk? (
-		dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?]
-		dev-libs/atk
-		dev-libs/glib
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:3
-		x11-libs/pango
-	)
-	pygobject? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( dev-db/sqlite )
-	projects? (
-		>=dev-ada/libgpr-2018[gnat_2016=,gnat_2017=,shared?,static-libs?]
-		dev-ada/xmlada[shared?,static-libs?]
-	)
-	!dev-ada/gnatcoll-core
-	!dev-ada/gnatcoll-bindings
-	!dev-ada/gnatcoll-db"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?]"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	tools? ( static-libs )
-	pygobject? ( gtk )
-	^^ ( gnat_2016 gnat_2017 )"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	else
-		GCC_PV=6.3.0
-	fi
-	default
-	mv configure.{in,ac} || die
-	sed -i \
-		-e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \
-		src/gnatcoll-projects.ads \
-		src/tools/gnatinspect.adb \
-		|| die
-	eautoreconf
-}
-
-src_configure() {
-	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
-	GNATCHOP=${CHOST}-gnatchop-${GCC_PV}
-	if use sqlite; then
-		myConf="--with-sqlite=$(get_libdir)"
-	else
-		myConf="--without-sqlite"
-	fi
-	if use gtk ; then
-		myConf="$myConf --with-gtk=3.0"
-	else
-		myConf="$myConf --with-gtk=no"
-	fi
-	econf \
-		GNATCHOP="${GNATCHOP}" \
-		GNATMAKE="${GNATMAKE}" \
-		--with-python \
-		$(use_with gmp) \
-		$(use_with iconv) \
-		$(use_with postgres postgresql) \
-		$(use_enable projects) \
-		$(use_enable pygobject) \
-		$(use_enable readline gpl) \
-		$(use_enable readline) \
-		$(use_enable syslog) \
-		--with-python-exec=${EPYTHON} \
-		--enable-shared-python \
-		--disable-pygtk \
-		$myConf
-}
-
-src_compile() {
-	if use shared; then
-		emake PROCESSORS=$(makeopts_jobs) build_library_type/relocatable
-	fi
-	if use static-libs; then
-		emake PROCESSORS=$(makeopts_jobs) build_library_type/static
-	fi
-	if use tools; then
-		emake PROCESSORS=$(makeopts_jobs) build_tools/static
-	fi
-	python_fix_shebang .
-}
-
-src_install() {
-	if use shared; then
-		emake prefix="${D}usr" install_library_type/relocatable
-	fi
-	if use static-libs; then
-		emake prefix="${D}usr" install_library_type/static
-	fi
-	if use tools; then
-		emake prefix="${D}usr" install_tools/static
-	fi
-	emake prefix="${D}usr" install_gps_plugin
-	einstalldocs
-}
-
-src_test() {
-	# The test suite is in
-	# To run you need to have the ada compiler available as gcc
-	# Even in this case there are still some problems
-	# Going into the testsuite directory and running
-	# ./run.py -v -v
-	# run here (having enabled most USE flags)
-	true
-}
diff --git a/dev-ada/gnatcoll/metadata.xml b/dev-ada/gnatcoll/metadata.xml
deleted file mode 100644
index cc1fe1d3561e..000000000000
--- a/dev-ada/gnatcoll/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ada@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="projects">Adds support for projects</flag>
-		<flag name="pygobject">Adds support for pygobject</flag>
-		<flag name="shared">Build shared library</flag>
-		<flag name="tools">Build associated tools</flag>
-	</use>
-	<longdescription lang="en">
-		The reusable library known as the GNAT Component Collection (GNATColl)
-		is based on one main principle: general-purpose packages that are part
-		of the GNAT technology should also be available to GNAT user
-		application code. The compiler front end, the GNAT Programming Studio
-		(GPS) Interactive Development Environment, and the GNAT Tracker
-		web-based interface all served as sources for the components.
-
-		The GNATColl components complement the predefined Ada and GNAT
-		libraries and deal with a range of common programming issues including
-		string and text processing, memory management, and file handling.
-		Several of the components are especially useful in enterprise
-		applications.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 703469661e4e..ddbf5415a19a 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -5,8 +5,6 @@ DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd
 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
 DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
-EBUILD gprbuild-2017-r1.ebuild 2207 BLAKE2B 50a99fa4729a7cb8a9689fa23b6f764be7077094101aa7dbe7452002b7b0c5602dbd82924ef1a6252ce6c973ec5f1ed687ef1d773b43ada1d0a5c707c97d564c SHA512 0c0d40bcd506f86da9e9b1e2d1d57163de5e3dc12095e6566251a673ddc236e099460a83be1a47e2b103d30474c168240257a442ebc5f727633fa6608e105b7b
 EBUILD gprbuild-2017-r2.ebuild 2003 BLAKE2B 38de852e3e89d34fb0392f13b81aa1a615551874a49a0a825ff4884c4e3efd9d1252bed78a83c175c65547571b6c565bad155fd153e219313e0a069e570cd63a SHA512 629b7a22ff13c049bcdf7e6413f0059d9c223958f41861aa8ee15a639fd8553de9011936fb328a98c5dd1b33ff9eb9b2f62cee76c35f69886d66457932ad2761
 EBUILD gprbuild-2019-r1.ebuild 1868 BLAKE2B 0da947626ada0499ad24a66f696556242e9be465b728636704a2c7319996620fdf57a8d196b51be6b6ecd0c24b461f9a53d561d8f679b202de429b2e2ad81275 SHA512 570882f4afca2d40885c505a5b1fc60f34692b931068d273e582804168059ccd57998db2603743fc647a8aec27401140e3b64182554e76fedfa4793c86aed241
-EBUILD gprbuild-2019.ebuild 2173 BLAKE2B 9d2e45af39dc7ba00768f6e2dad33b45bb41d356302e3b95ba8f563723ef6a1c6a963feebbfe7b48a11b674a81eb10953c406a5db6194d65fb87e6e1c82f0ff0 SHA512 971ff937c6b44df9d953b0e229bee3a09fd958b64925c295f7c75bffb20a7db693899731c46971f790c550d1c850163af63b711ed0474102adb7ee4124178519
 MISC metadata.xml 806 BLAKE2B 9d6978348f59b502b01b50115341a30ee205bc7022197e70be4048e59b510bded9a1b292e8c33085a59291b2322bb14a1bbcb6f1a779f13189aa7d8e816c8d62 SHA512 76843dcfafdee7a423975793838849602b7ecc437704932d852cff87000bd1ab98c36ea33cb9a07ca09ee40eb728df1c78b4f6aa37a11ae9fe3f8bd74d83138f
diff --git a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
deleted file mode 100644
index d279f478a5e8..000000000000
--- a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="Multi-Language Management"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="
-	http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7
-		-> ${MYP}-src.tar.gz
-	http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8
-		-> xmlada-gpl-${PV}-src.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 +gnat_2017 gnat_2018"
-
-DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MYP}-src
-
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-config.patch
-)
-
-src_prepare() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	else
-		GCC_PV=6.3.0
-	fi
-	default
-	sed -i \
-		-e "s:@VER@:${GCC_PV}:g" \
-		share/gprconfig/compilers.xml \
-		share/gprconfig/gnat.xml \
-		share/gprconfig/c.xml \
-		share/gprconfig/linker.xml \
-		|| die
-	sed -i \
-		-e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
-		src/gprlib.adb \
-		|| die
-	if use gnat_2016; then
-		sed -i \
-			-e 's:"-no-pie", ::g' \
-			share/gprconfig/linker.xml \
-			|| die
-	fi
-}
-
-src_configure() {
-	emake prefix="${D}"usr setup
-}
-
-bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
-lib_progs="gprlib gprbind"
-
-src_compile() {
-	GCC=${CHOST}-gcc-${GCC_PV}
-	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
-	local xmlada_src="../xmlada-gpl-${PV}-src"
-	incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
-		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
-		-I${xmlada_src}/input_sources"
-	${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
-	for bin in ${bin_progs}; do
-		${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
-			-o ${bin} -largs gpr_imports.o || die
-	done
-	for lib in $lib_progs; do
-		${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
-			-largs gpr_imports.o || die
-	done
-}
-
-src_install() {
-	dobin ${bin_progs}
-	exeinto /usr/libexec/gprbuild
-	doexe ${lib_progs}
-	insinto /usr/share/gprconfig
-	doins share/gprconfig/*
-	insinto /usr/share/gpr
-	doins share/_default.gpr
-	einstalldocs
-}
diff --git a/dev-ada/gprbuild/gprbuild-2019.ebuild b/dev-ada/gprbuild/gprbuild-2019.ebuild
deleted file mode 100644
index 59749d8d9a7d..000000000000
--- a/dev-ada/gprbuild/gprbuild-2019.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs multiprocessing
-
-MYP=${P}-20190517-194D8-src
-XMLADA=xmlada-${PV}-20190429-19B9D-src
-
-DESCRIPTION="Multi-Language Management"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="
-	http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093
-		-> ${MYP}.tar.gz
-	http://mirrors.cdn.adacore.com/art/5cdf916831e87a8f1d4250b5
-		-> ${XMLADA}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2017 gnat_2018 +gnat_2019"
-
-DEPEND="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 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MYP}
-
-REQUIRED_USE="^^ ( gnat_2017 gnat_2018 gnat_2019 )"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	if 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:@VER@:${GCC_PV}:g" \
-		share/gprconfig/compilers.xml \
-		share/gprconfig/gnat.xml \
-		share/gprconfig/c.xml \
-		share/gprconfig/linker.xml \
-		|| die
-	sed -i \
-		-e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
-		src/gprlib.adb \
-		|| die
-}
-
-src_configure() {
-	emake prefix="${D}"/usr setup
-}
-
-bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
-lib_progs="gprlib gprbind"
-
-src_compile() {
-	GCC=${CHOST}-gcc-${GCC_PV}
-	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
-	local xmlada_src="../${XMLADA}"
-	incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
-		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
-		-I${xmlada_src}/input_sources"
-	${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
-	for bin in ${bin_progs}; do
-		${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
-			-o ${bin} -largs gpr_imports.o || die
-	done
-	for lib in $lib_progs; do
-		${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
-			-largs gpr_imports.o || die
-	done
-}
-
-src_install() {
-	dobin ${bin_progs}
-	exeinto /usr/libexec/gprbuild
-	doexe ${lib_progs}
-	insinto /usr/share/gprconfig
-	doins share/gprconfig/*
-	insinto /usr/share/gpr
-	doins share/_default.gpr
-	einstalldocs
-}
diff --git a/dev-ada/gps-bin/Manifest b/dev-ada/gps-bin/Manifest
deleted file mode 100644
index a273f3e94998..000000000000
--- a/dev-ada/gps-bin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST gnat-gpl-2016-x86_64-linux-bin.tar.gz 372813330 BLAKE2B a0374ad730ae275aaedcf5663c30f8e0221af32f14391fe87a3ce0630d4498a1e90671c02830d62f78857571a5a521af91f6db409a7b3c367c7b0f059571eefd SHA512 5115ac3be0badc5125ee048a98230f18363d72107da3325ce602c0e618cee2e3646a0decc00a2388f14bc61bfed51dd0622f365f5f7ee8b0cec2187ebcf8e075
-EBUILD gps-bin-2016-r1.ebuild 1415 BLAKE2B dd8861729be62b4c5f872600a1a60db92f6c8879bea9186e7127c71897e1960742b87570e9cd749e73a8c1ddea77d60bd9ecf7f6a209a6ec278cf6e250d3a14d SHA512 3241234bc8474cea2fa93801f8e6fc4bdb327fe1a1a22af848ccd034c4a3c4413ebf458f5696f18e641f448b2d0aab68edbd8894547b42ae0a9e6c5ec3d2f969
-EBUILD gps-bin-2016.ebuild 1496 BLAKE2B e8d1a2485842a8d9d430a406056436e5adb218213a2244ac1494bd5b48818d4cde7818ef7f7fbcc7bd7b9b29cb57235d028e4a719ffbbc3da8b5979ef923b699 SHA512 f1d1c2210b155d6b95de70da50526eb55e575134fe889a9e35aedf2c2783d2af1af229537b03b7fb00985b56f9e5631d1a9d0df880d36373771094fb63b41e91
-MISC metadata.xml 988 BLAKE2B 001b5bbc39d9e1a046455353977d84243724e8bfb3b112415f366dd6a90f8ffe05456f570919fe7d39f8f71f91ec1780773427ff452920b1f2f6cdee71ee202a SHA512 c13d0d9ae64b8097b42603d8da8b36c03622c18251beba9a9b37e0024a45aaac6e615c010f5befd5b3d043126179d7fcc8a9737bbb09e2f6ea6952ece93e9310
diff --git a/dev-ada/gps-bin/gps-bin-2016-r1.ebuild b/dev-ada/gps-bin/gps-bin-2016-r1.ebuild
deleted file mode 100644
index e8bf0f90aee0..000000000000
--- a/dev-ada/gps-bin/gps-bin-2016-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=7
-ADA_COMPAT=( gnat_2016 )
-inherit ada toolchain-funcs
-
-MY_P=gnat-gpl-2016-x86_64-linux-bin
-
-DESCRIPTION="The GNAT Programming Studio"
-HOMEPAGE="http://libre.adacore.com/tools/gps/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5739cefdc7a447658e0b016b -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="${ADA_DEPS}"
-RDEPEND="${DEPEND}
-	dev-ada/gnatcoll[${ADA_USEDEP},iconv,postgres,projects,readline,sqlite]
-	dev-libs/atk
-	dev-libs/glib
-	dev-libs/gobject-introspection
-	dev-libs/libffi
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-devel/llvm
-	sys-devel/clang
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+
-	x11-libs/pango
-	x11-themes/adwaita-icon-theme
-	x11-themes/hicolor-icon-theme"
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	into /opt/${P}
-	dobin bin/gps_exe
-	dobin bin/gps_cli
-	insinto /opt/${P}/share
-	doins -r share/doc
-	doins -r share/examples
-	doins -r share/gpr
-	doins -r share/gprconfig
-	doins -r share/gps
-	doins -r share/themes
-	insinto /opt/${P}/lib/
-	doins -r lib/python2.7
-	dosym ../../../usr/bin/gnatinspect /opt/${P}/bin/gnatinspect
-	dosym ${GNATLS} /opt/${P}/bin/gnatls
-	dosym ${GNATMAKE} /opt/${P}/bin/gnatmake
-	dosym ${GNAT} /opt/${P}/bin/gnat
-	dosym ../../opt/${P}/bin/gps_exe /usr/bin/gps
-}
diff --git a/dev-ada/gps-bin/gps-bin-2016.ebuild b/dev-ada/gps-bin/gps-bin-2016.ebuild
deleted file mode 100644
index a3f6dbb57216..000000000000
--- a/dev-ada/gps-bin/gps-bin-2016.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-MY_P=gnat-gpl-2016-x86_64-linux-bin
-
-DESCRIPTION="The GNAT Programming Studio"
-HOMEPAGE="http://libre.adacore.com/tools/gps/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5739cefdc7a447658e0b016b -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-ada/gnatcoll[gnat_2016,iconv,postgres,projects,readline,sqlite]
-	dev-libs/atk
-	dev-libs/glib
-	dev-libs/gobject-introspection
-	dev-libs/libffi
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-devel/llvm
-	sys-devel/clang
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+
-	x11-libs/pango
-	x11-themes/adwaita-icon-theme
-	x11-themes/hicolor-icon-theme"
-
-S="${WORKDIR}"/${MY_P}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	GCC_PV=4.9.4
-	GCC=gcc-${GCC_PV}
-	GNATLS=gnatls-${GCC_PV}
-	GNAT=gnatt-${GCC_PV}
-	GNATMAKE=gnatmake-${GCC_PV}
-	into /opt/${P}
-	dobin bin/gps_exe
-	dobin bin/gps_cli
-	insinto /opt/${P}/share
-	doins -r share/doc
-	doins -r share/examples
-	doins -r share/gpr
-	doins -r share/gprconfig
-	doins -r share/gps
-	doins -r share/themes
-	insinto /opt/${P}/lib/
-	doins -r lib/python2.7
-	dosym ../../../usr/bin/gnatinspect /opt/${P}/bin/gnatinspect
-	dosym ../../../usr/bin/${GNATLS} /opt/${P}/bin/gnatls
-	dosym ../../../usr/bin/${GNATMAKE} /opt/${P}/bin/gnatmake
-	dosym ../../../usr/bin/${GNAT} /opt/${P}/bin/gnat
-	dosym ../../opt/${P}/bin/gps_exe /usr/bin/gps
-}
diff --git a/dev-ada/gps-bin/metadata.xml b/dev-ada/gps-bin/metadata.xml
deleted file mode 100644
index 2768f4f2cde1..000000000000
--- a/dev-ada/gps-bin/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ada@gentoo.org</email>
-	</maintainer>
-	<longdescription lang="en">
-		GPS, the GNAT Programming Studio, is a cutting-edge Free Software IDE
-		that streamlines the interaction between developers and their software.
-		With its intuitive interface, GPS is easy to use, simplifying source
-		navigation and highlighting the fundamental ideas in the program.
-
-		By displaying core application structures, such as call graphs, program
-		entity graphs, and project dependencies, GPS facilitates the
-		development of systems. GPS helps construct reliable code while
-		providing the same interface and behavior across a variety of
-		platforms. Designed by programmers for programmers, GPS is a new kind
-		of IDE that offers the experience of designing software in a uniquely
-		comfortable environment.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index 0cc89e1e79ed..52ae7580bfe0 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -6,6 +6,6 @@ DIST gps-gpl-2019-src.tar.gz 13758956 BLAKE2B 71158537d9d970b97db06c1a5ed40cfec2
 DIST gtk+-3.14.15-src.tar.gz 32009863 BLAKE2B 93c6897c431fa8e1c19ea758378bc7e365d486d1decccefbba64876d8c51a488e6bcf932481daa11e7e43a960a328c3db746e41a845e574c6b6070ab71e23188 SHA512 add4607a1758319a938d2be0bbd0dd140c4099accffa9301e3049bc460bf94f395c5a092368214e8b28d53bc25335d1b8329b50c7eb80a1e9a65b2e154135b84
 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 gps-2018-r2.ebuild 2826 BLAKE2B 5a2a574b9897041d16b0b91abfd0a7e156b0aaf693df4343890a838b8869e0932edc5fcbadd2a9331d94ceb43a2c368fc6f144c9db75a3f6540064f715b62823 SHA512 99c8d2c356285a62747f488ca5cd36d0b9dba2e5edbe300bcbfb48bc5fc7233e0441d58faa1e1d4fc7fafc1b0342baad6cbcbea6bd388b5a13170ae422e9ca5a
-EBUILD gps-2019.ebuild 3149 BLAKE2B cb23c29aef034c0f3b370c42fae6a3c01c2bdbd4fcfab2d54c6863912bb0b354875ab766466ed44a3ea2b6b55381b41bc62045a5ce4c5a5347c99e3e9629b6a9 SHA512 4fd58f7c4505751e932e896adf52cfd67af925b06edb89f776251734c19b95e5f26b5be542e36a6e4de945c524958b2b62160ab109be665c3f0659e0dc42fd08
+EBUILD gps-2018-r2.ebuild 2797 BLAKE2B d7dc72cb2af43e6027a37a52816f1660dec8a68be252b5ef34bad3872e3ca1c5a9675a64353d9888c2dfef681104d7fc04c78ad1c2c7cdf9ff77dabb11283a60 SHA512 a16bbddb19e95abffa98e26e25917023581147606348989a89e51a31c3487903e956a7ee12ba528a538f9201cf92de919abe0a3c729dcde2e61651390d670b35
+EBUILD gps-2019.ebuild 3124 BLAKE2B cecb5bf8ce8545b0a320fc1ba3160bd8cbb6e2eb159a58f1649bd1a37b54d71ff1e174bc46d06eaecfe46c32def2fe01d60e43b7c508d4404fe8f8661fc03548 SHA512 7f7d5ea632743d2cbeac0442365f3812d2924abb03ad8901f69e42963a8f01d90a40c0a92c0ec0f3f276fc68ae35b828271e75e4f567ff31acdf4c2aa07a8cff
 MISC metadata.xml 406 BLAKE2B 663412f7328e2ed9ca4df57304073e48b2c18d43c84c6a5a4b8331f57f731bd63c38d7eb23b9edb4939e0644238a7883581e3ae50afb708cd263a9c39f936671 SHA512 7e13f81414da0346f385d66d88eca699dab64aeaf7d22a38ff05bec1ddc3fab5f98f7d2049902a75f63bfe10f918c599f15a1497cdb09799fec8330152251b46
diff --git a/dev-ada/gps/gps-2018-r2.ebuild b/dev-ada/gps/gps-2018-r2.ebuild
index 83075c6b1fc6..1551312c0378 100644
--- a/dev-ada/gps/gps-2018-r2.ebuild
+++ b/dev-ada/gps/gps-2018-r2.ebuild
@@ -29,10 +29,7 @@ RDEPEND="${PYTHON_DEPS}
 	~dev-ada/libadalang-2018[${ADA_USEDEP}]
 	dev-libs/gobject-introspection
 	dev-libs/libffi
-	|| (
-		sys-devel/llvm:6
-		sys-devel/llvm:7
-	)
+	sys-devel/llvm:7
 	sys-devel/clang:=
 	x11-themes/adwaita-icon-theme
 	x11-themes/hicolor-icon-theme
diff --git a/dev-ada/gps/gps-2019.ebuild b/dev-ada/gps/gps-2019.ebuild
index fef7223a4b72..2f20596db004 100644
--- a/dev-ada/gps/gps-2019.ebuild
+++ b/dev-ada/gps/gps-2019.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python2_7 )
-ADA_COMPAT=( gnat_2018 )
+ADA_COMPAT=( gnat_201{8,9} )
 inherit ada python-single-r1 autotools desktop llvm multilib
 
 MYP=${PN}-gpl-${PV}-src
@@ -34,10 +34,7 @@ RDEPEND="${PYTHON_DEPS}
 	~dev-ada/libadalang-2019[${ADA_USEDEP}]
 	dev-libs/gobject-introspection
 	dev-libs/libffi
-	|| (
-		sys-devel/llvm:6
-		sys-devel/llvm:7
-	)
+	sys-devel/llvm:7
 	sys-devel/clang:=
 	x11-themes/adwaita-icon-theme
 	x11-themes/hicolor-icon-theme
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 69e4b750157c..70b0738cd995 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,13 +1,9 @@
-AUX gtkada-2017-gentoo.patch 2270 BLAKE2B 54b7f2258ce0073b79f56a3c0c379123622e7d6e91f0a186d4792b68851521241d778ba7b30686f52d1e0d1afa5d0e239fa5bf401169b67fdc90c0ffab01d83f SHA512 cb104d21ac55046254f03de6d615e98174d92cf3af74d7677eee9620cb38cfce5aaac2e61d3dc248f735f6723bcb69d33486e21dd3c6f5cc64d81067d161f5e8
 AUX gtkada-2017-r1-gentoo.patch 2082 BLAKE2B 129c162fbc6d89565d4d383fe0f071b04513a66d138599d0b5dfce8f4bc40bb7609eb26a1df414dcac212827a2ece39c4db4a2f785d8eb5367688b83fd59c121 SHA512 defc57274798e8ff24436153bd4f6d6f94e25617eee249101708c1bfd01d3960a07a948407d2c126d21fba34a9f770762fc20d0c1711c28b4d77e11a190a9dea
 AUX gtkada-2019-gentoo.patch 468 BLAKE2B 80de36b927875d360e35be6b5829ced6fa1a0bff2c2e8f2186bdd375db27965cc9258b94c41ade6919047d0ac12deafe37b7a58c1365bd453b7293118f81709d SHA512 85b6e3d3060283370ab9d2ad5980a2aa110db44edcb615caf8ebfd6e49ca53011d5a049f4fac1584fce2755414883abde16824d28a5fa3db17d0d50cb00e8c81
 DIST gtkada-2019-20190424-19D98-src.tgz 12273911 BLAKE2B e2d0f3c410973d0412bf433f2e1cc60a5b00e9f34ad0471cb583596587e6073fdeb9b6441aa50dfa81894ce692101fe51c7714090477d585721571261737a823 SHA512 aed0758b42ee8eac752c2c83a0974ee0c7cddfa15149879472ff2fb8ee7565456a225ce783739ede76bc0f47340e97af5b5d1149e244611bcd3b3760e20f8cf5
 DIST gtkada-gpl-2017-src.tgz 11952333 BLAKE2B 2a333452ff271bba0521235598afdb1abebc4ceeab0f915f173862329ae0986b0fc4f654d3df28eac73af075db224c0b12340c3acd1e4ed0ffc965e4365f8b40 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f
 DIST gtkada-gpl-2018-src.tgz 11958880 BLAKE2B 4946918b52de5e15efc77411927812910d84d13cea66b86b1162b987c7849ba7fbb6da487881762f64005dc32a74fa73c9d759d25bb9ac0241d1d76cd4becbfb SHA512 9000de7675f8ee688b1c9cd93cf35b32f698aca8fc22d3b4e695d7c6b34feb60118cc687cf35432cd5ed9af7825eda7e20575a9fad4523a7b59cb0322bce0762
 EBUILD gtkada-2017-r1.ebuild 1101 BLAKE2B 844190bc4e75298c6854464062952d73f63103271a9c0bb4bbf451d0815c8fbc72471382af7253314b14737436e8a974a5ebef8508b223bb4decc4fe27b64383 SHA512 e47af143eda267de31b56d16e2884a1d22252516aeae5159992d9267ce78720cea8582880cee7e72fb9f7aac32d32df0a73d73340b1bb90afd0ff7c49d302531
-EBUILD gtkada-2017.ebuild 1297 BLAKE2B 83536071e25bc43cff672b957b9473029d910d8ac283496ff9bde6b282b57d478999780340b74b16987e935f4b042b9ecc28f0f0455217bfd89df9f297a0a89f SHA512 396961a4521e82fabbde327e7d66fef20dc5815253275e3de9118c3538ad166c85e3cdb27db2867e6e06ae683fc381a859f0c5f2afcfcfc78af23fc66120293b
-EBUILD gtkada-2018-r1.ebuild 1552 BLAKE2B 4175046358b5a6abed6de7112a6d4c0d7f65f156ec417e5f8882c5580e032bf0dce6ba7d26544723d35ad3ee0ba04cd1763a11e6140f64168ef09fd8c71f50d9 SHA512 27b3f09407e484b3edf9344fea4ab1d5800f1c347b31e10a8cfa6fef4126dc6151e35ba122ea25b7a8c864ec900231db78f1c9b8efa978edf2133950f509a1c6
 EBUILD gtkada-2018-r2.ebuild 1111 BLAKE2B 7156ea399e371958b6319e78e13cf34375dddef245f9b67631e1da424ae67bca44275118d47998b8fbf2a6837e9d68cd8e632b363bc46fccc929260f060cc376 SHA512 2ee7b3edc21dbe915c8c7cd5f838d2a3b806e7e08b5162da196df29b1a48f454c20eec658da3d909239e098e91da67db84ca7209972d79b4f68c2cd52780ebc8
 EBUILD gtkada-2019-r1.ebuild 1149 BLAKE2B 56fbfbd4dfa321def9c40e613f0df71f5538d2eb652c5b8bf2213e0df0d0d5d27b63409c831aa4dc12e4742b9b09296013de2b9a117cd5dd1a1619180a64f8af SHA512 38268434835bca957bc01332a1222717d9ea632cd59f2062f139abcb9eaef54ac5d03c88630dae47a3da0bde1864f937a282f8b2b3cf249970a1d5426e0bd85d
-EBUILD gtkada-2019.ebuild 1556 BLAKE2B 2a49f5336c6f52ba042a799a77b02b906f4bfa97f0b85df6c7e5ef07d7d2f91503e4e0c4e3abc2e0be09690339dfef840e2ff9a9f5b163d6c8a716f7779870f4 SHA512 1fa71bb6b73b119beb2bf41c6b4f8f0ecd4529eea34565502eab78dd186cdd450081807a0e104a784a62f3a5f6e3400793d4a21b2c13a01419f3cfccd7f7d2c4
 MISC metadata.xml 536 BLAKE2B 9809d3168ce41ea5f2aaaf8f9ed0c61ffca037a42dc1d3ba5424f68c399a24f64336494b0e73b3f6a3ab1be9c5ec2e499d93d62aa34a4e2a45af09bd15482b5b SHA512 f6ce7169d8015d691548836e074450d79afffdb7449bc7bd4b7ab868b967763675d8f69b1ad89a3642de0e1c5c9271261d72ee1b8fe448b9aa4afa4879b619d5
diff --git a/dev-ada/gtkada/files/gtkada-2017-gentoo.patch b/dev-ada/gtkada/files/gtkada-2017-gentoo.patch
deleted file mode 100644
index 25a018e0d31e..000000000000
--- a/dev-ada/gtkada/files/gtkada-2017-gentoo.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- gtkada-gpl-2016-src/Makefile.in.old	2017-01-21 22:42:18.319969095 +0100
-+++ gtkada-gpl-2016-src/Makefile.in	2017-01-21 22:42:33.989700236 +0100
-@@ -60,30 +60,33 @@
- LIBRARY_TYPE_FOR_TOOLS=static
- endif
- 
--all: tools tests
-+all: tools
- static: build_library_type/static
- relocatable: build_library_type/relocatable
- 
- tools:
- 	@echo "====== Building tools ====="
--	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Psrc/tools/tools.gpr
-+	${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-+	  -Psrc/tools/tools.gpr -cargs:Ada $(ADAFLAGS)
- 
- build_library_type/%:  src/gtkada-intl.adb
- 	@echo "====== Building $(@F) libraries ====="
--	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr
-+	${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \
-+	  -cargs:Ada $(ADAFLAGS) -cargs:C $(CFLAGS)
- ifeq (${HAVE_OPENGL}, True)
- 	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/opengl/gtkada_gl.gpr
- endif
- 
- src/gtkada-intl.adb: src/gtkada-intl.gpb Makefile
--	gnatprep -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@
-+	$(GNATPREP) -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@
- 
- testgtk/opengl/view_gl.adb: testgtk/opengl/view_gl.gpb Makefile
--	gnatprep -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@
-+	$(GNATPREP) -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@
- 
- tests: testgtk/opengl/view_gl.adb
- 	@echo "====== Building tests ====="
--	cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Ptestgtk.gpr -aP ../src
-+	cd testgtk; ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-+	  -Ptestgtk.gpr -aP ../src -cargs:Ada $(ADAFLAGS)
- 
- install/%: force
- 	${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \
-@@ -121,9 +121,6 @@
- install: install-clean
- 	${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
- 		--mode=usage -Psrc/tools/tools.gpr
--	cd testgtk; ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
--		--mode=usage --exec-subdir=${DESTDIR}${exampledir} \
--		-Ptestgtk.gpr -aP ../src
- 
- 	@echo '-----------------------------------------------------------------------'
- 	@echo '--  GtkAda has now been installed.                                   --'
diff --git a/dev-ada/gtkada/gtkada-2017.ebuild b/dev-ada/gtkada/gtkada-2017.ebuild
deleted file mode 100644
index f6edaf0546c7..000000000000
--- a/dev-ada/gtkada/gtkada-2017.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="A complete Ada graphical toolkit"
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591ae7a8c7a4473fcbb154c9
-	-> ${MYP}-src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 +gnat_2017 +shared static-libs"
-
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
-	dev-libs/atk
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?]"
-
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	default
-	mv configure.{in,ac}
-	eautoreconf
-}
-
-src_configure() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	else
-		GCC_PV=6.3.0
-	fi
-	econf \
-		--prefix="${D}/usr" \
-		$(use_enable static-libs static) \
-		$(use_enable shared) \
-		--without-GL
-}
-
-src_compile() {
-	GNATPREP=${CHOST}-gnatprep-${GCC_PV}
-	emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
-	emake -j1 install
-	einstalldocs
-}
diff --git a/dev-ada/gtkada/gtkada-2018-r1.ebuild b/dev-ada/gtkada/gtkada-2018-r1.ebuild
deleted file mode 100644
index a4f93c664a1a..000000000000
--- a/dev-ada/gtkada/gtkada-2018-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="A complete Ada graphical toolkit"
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf840c7a4475261f97ced
-	-> ${MYP}-src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs"
-
-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 )
-	dev-libs/atk
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/pango"
-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}-2017-gentoo.patch )
-
-src_prepare() {
-	default
-	mv configure.{in,ac}
-	eautoreconf
-}
-
-src_configure() {
-	if use gnat_2018; then
-		GCC_PV=7.3.1
-	elif use gnat_2019; then
-		GCC_PV=8.3.1
-	elif use gnat_2017; then
-		GCC_PV=6.3.0
-	else
-		GCC_PV=4.9.4
-	fi
-	econf \
-		--prefix="${D}/usr" \
-		$(use_enable static-libs static) \
-		$(use_enable shared) \
-		--without-GL
-}
-
-src_compile() {
-	GNATPREP=${CHOST}-gnatprep-${GCC_PV}
-	emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
-	emake -j1 install
-	einstalldocs
-}
diff --git a/dev-ada/gtkada/gtkada-2019.ebuild b/dev-ada/gtkada/gtkada-2019.ebuild
deleted file mode 100644
index 2f1f273e3bc2..000000000000
--- a/dev-ada/gtkada/gtkada-2019.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multiprocessing
-
-MYP=${P}-20190424-19D98
-
-DESCRIPTION="A complete Ada graphical toolkit"
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5ce7f58931e87adb2d312c53
-	-> ${MYP}-src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 gnat_2018 +gnat_2019 +shared static-libs"
-
-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 )
-	dev-libs/atk
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/pango"
-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}-2017-gentoo.patch )
-
-src_prepare() {
-	default
-	mv configure.{in,ac}
-	eautoreconf
-}
-
-src_configure() {
-	if use gnat_2018; then
-		GCC_PV=7.3.1
-	elif use gnat_2019; then
-		GCC_PV=8.3.1
-	elif use gnat_2017; then
-		GCC_PV=6.3.0
-	else
-		GCC_PV=4.9.4
-	fi
-	econf \
-		--prefix="${D}/usr" \
-		$(use_enable static-libs static) \
-		$(use_enable shared) \
-		--without-GL
-}
-
-src_compile() {
-	GNATPREP=${CHOST}-gnatprep-${GCC_PV}
-	emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
-	emake -j1 install
-	einstalldocs
-}
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index f93a457871b1..5f9c2244f6f8 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -1,7 +1,4 @@
-AUX libgpr-2018-gentoo.patch 1691 BLAKE2B 4e11098f835d9d0adbd6a4eed0e63f71140eb68d0e350fd52303a0d21c308e483556b31ce84ba97a7fccddfc91e519a6ae8f999d87258c0d4f4ee473597f7267 SHA512 959e4e63c3367fd98878a2004d0fac981a1acc2a29e35960a27f2ca48b4557fc16148aa052cdba590f208c8b23832f3bc2f3959523f6e54eb8dfe2e87812f285
+AUX libgpr-2019-gentoo.patch 1515 BLAKE2B 0641ed287592709ae58f554e14189d7bb44b864d48518198180e060189714ab3de8a18cba0af3ed92f45e7d72ae2029d1ed17a05de656935cd88d8d6910cd372 SHA512 1cd8225e7aec41a01327de1cd1e10e006a0d84c74345979b07157caa7188e4dd0159cf6f015f479452a068074eba76997b4f694f2975f578b34ffd1a4ac22684
 DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b
-DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044
-EBUILD libgpr-2018-r1.ebuild 1484 BLAKE2B a7d8bc4137640c55f24f0d26bea4cbad31aee22b9226402d1ccec485b39730276be75c4f8ec9568d86c4a4bd0e736a9f9b5c71a1197223f7566c4dab5a39ee44 SHA512 47a20f6b42e982f0cbe0f2ac8064c71e8384529f50b1e8e93d9b0a3125d910c7f54ae992e714968313588038bfb9b16b4f8001dbb5ba7457c0742877701c8261
-EBUILD libgpr-2019-r1.ebuild 1362 BLAKE2B 98ca9b0672a128f6e73cb75f3e6d5b39bf0ecc27d0e66cbac3bf2ba3023f45bf3ec8a19a4af3c1393c8001124a5c014c12a323453c3f7c352b4a3d6baabc07bf SHA512 d4ab3a4a13d86bab81dcc109fb67eb667c27dd558982b9ff9634699ccb35bba7b2d5dda289e806e8fbaf305134dff4c3bafe8f267c32953f2ce6437f7bfc1424
-EBUILD libgpr-2019.ebuild 1451 BLAKE2B 974cfb4da43aed484fba18cb88b922d8139dacc1e7d2fd06f32d6c1d2f48ee5eb10fbeade2cd969a91d7fb1d553f61fbd51e47bb24b1ec14b882c044b69d8df9 SHA512 51ac3ce060d096e71faefaf481011592acbd4de25de1c9ee5c3e4a79ce622ab9bed793adf63df3c1dab2541cc72afe0d6379dcdf2221bdace22caebd6043e0a3
+EBUILD libgpr-2019-r1.ebuild 1407 BLAKE2B b3f88bd6116977c382ba3c8164ada748af412c48a51333b7a0a510bdfe4e0ac08b72cb2045ac976a67eef6847cdf84308bcec3dd6430c7a6e5aa74f334e99182 SHA512 a182e1dba2020ad168bd1711afbd55fd8382039f3a23bb09b54afdd3b77c4ff0c5893c064020044354e2148c9b6ca82217f1ee7fccb9f93240c4d0d5e022c630
 MISC metadata.xml 939 BLAKE2B a14a037f7b5a45004833b83bd6ef13accff7e1d107873c823f0c42dd663eb638a59fdbedd8ce06aa5c00cb53e2c89bbc9f23f1f0a4dd1a388b0f5f9d5f522617 SHA512 3a09da26b5f736ece53917fbee3939ebff2045297d81043cf282fa0e0b1344be9e551df0a92b35db38b6feeb516e5319a8c65507b2f574971c9f5df66bda8079
diff --git a/dev-ada/libgpr/files/libgpr-2018-gentoo.patch b/dev-ada/libgpr/files/libgpr-2019-gentoo.patch
index 013a56b92e78..b7b9a2d3c870 100644
--- a/dev-ada/libgpr/files/libgpr-2018-gentoo.patch
+++ b/dev-ada/libgpr/files/libgpr-2019-gentoo.patch
@@ -1,5 +1,5 @@
---- gprbuild-gpl-2016-src/gpr/src/gpr-env.adb.old	2017-11-13 22:16:53.349083426 +0100
-+++ gprbuild-gpl-2016-src/gpr/src/gpr-env.adb	2017-11-13 22:17:22.692590351 +0100
+--- a/gpr/src/gpr-env.adb	2017-11-13 22:16:53.349083426 +0100
++++ b/gpr/src/gpr-env.adb	2017-11-13 22:17:22.692590351 +0100
 @@ -1948,6 +1948,8 @@
  
        end if;
@@ -9,8 +9,8 @@
        if Gpr_Prj_Path.all /= "" then
           Add_Directories (Self, Gpr_Prj_Path.all);
        end if;
---- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old	2017-11-19 13:09:18.947527738 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads	2017-11-19 13:10:08.125654595 +0100
+--- a/gpr/src/gpr-names.ads	2017-11-19 13:09:18.947527738 +0100
++++ b/gpr/src/gpr-names.ads	2017-11-19 13:10:08.125654595 +0100
 @@ -27,6 +27,8 @@
     Name_Buffer : String (1 .. 1_000_000);
     Name_Len    : Natural := 0;
@@ -20,8 +20,8 @@
     procedure Get_Name_String (Id : Name_Id);
     procedure Get_Name_String (Id : Unit_Name_Type);
     procedure Get_Name_String (Id : File_Name_Type);
---- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old	2017-11-19 13:10:27.674316703 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb	2017-11-19 13:14:38.360963627 +0100
+--- a/gpr/src/gpr-names.adb	2017-11-19 13:10:27.674316703 +0100
++++ b/gpr/src/gpr-names.adb	2017-11-19 13:14:38.360963627 +0100
 @@ -354,6 +354,8 @@
  
        Name_Chars.Append (ASCII.NUL);
@@ -40,8 +40,8 @@
        return Name_Entries.Last;
     end Name_Find;
  
---- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old	2017-11-19 13:12:41.592995718 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb	2017-11-19 13:16:31.980979696 +0100
+--- a/gpr/src/gpr-snames.adb	2017-11-19 13:12:41.592995718 +0100
++++ b/gpr/src/gpr-snames.adb	2017-11-19 13:16:31.980979696 +0100
 @@ -53,6 +53,10 @@
           return;
        end if;
diff --git a/dev-ada/libgpr/libgpr-2018-r1.ebuild b/dev-ada/libgpr/libgpr-2018-r1.ebuild
deleted file mode 100644
index fdd4077231da..000000000000
--- a/dev-ada/libgpr/libgpr-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
-
-inherit toolchain-funcs multiprocessing
-
-MYP=gprbuild-gpl-${PV}
-
-DESCRIPTION="Ada library to handle GPRbuild project files"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68
-		-> ${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/xmlada[shared?,static-libs?,static-pic?]
-	dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
-	!net-libs/grpc"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
-	dev-ada/gprbuild[gnat_2019(-)?]"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure() {
-	emake prefix="${D}"usr setup
-}
-
-src_compile() {
-	build () {
-		gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \
-			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
-			gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-}
-
-src_install() {
-	if use static-libs; then
-		emake DESTDIR="${D}" libgpr.install.static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake DESTDIR="${D}" libgpr.install.${kind}
-		fi
-	done
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
diff --git a/dev-ada/libgpr/libgpr-2019-r1.ebuild b/dev-ada/libgpr/libgpr-2019-r1.ebuild
index 08adbdbfde3f..7906a8d27d4f 100644
--- a/dev-ada/libgpr/libgpr-2019-r1.ebuild
+++ b/dev-ada/libgpr/libgpr-2019-r1.ebuild
@@ -25,6 +25,8 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
 
 S="${WORKDIR}"/${MYP}-src
 
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
 src_configure() {
 	emake prefix="${D}"/usr setup
 }
diff --git a/dev-ada/libgpr/libgpr-2019.ebuild b/dev-ada/libgpr/libgpr-2019.ebuild
deleted file mode 100644
index c493b2839717..000000000000
--- a/dev-ada/libgpr/libgpr-2019.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs multiprocessing
-
-MYP=gprbuild-${PV}-20190517-194D8
-
-DESCRIPTION="Ada library to handle GPRbuild project files"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093
-		-> ${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/xmlada[shared?,static-libs?,static-pic?]
-	dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
-	!net-libs/grpc"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
-	dev-ada/gprbuild[gnat_2019(-)?]"
-
-S="${WORKDIR}"/${MYP}-src
-
-src_configure() {
-	emake prefix="${D}"/usr setup
-}
-
-src_compile() {
-	build () {
-		gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \
-			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
-			gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-}
-
-src_install() {
-	if use static-libs; then
-		emake DESTDIR="${D}" libgpr.install.static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake DESTDIR="${D}" libgpr.install.${kind}
-		fi
-	done
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 008fa3a2d7f9..f202dc7138ad 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,8 +1,4 @@
-AUX xmlada-2018-gentoo.patch 1553 BLAKE2B efc30a51ffa02bbf20704cb5e89f540e0da880ee9ff7f7c9d9a0bed48aee34706d803bd8fc22e61ce984f92dd63da5503b618b983a42a3a9a62a1f78987382d0 SHA512 89e82f45f6762078fe7dd695c46270f7015ce7938f8348c926f7571ba8fb757588be1bb4b8c3e8e8108e4547151506bfe47cea452cd1d0ec8223afdcfdff1f13
 AUX xmlada-2019-gentoo.patch 1053 BLAKE2B 33403adf7bf4f774d7fbcf9f07fe0d248a0c7e54df1d4620231813519932b91522c6d17f4f1774b84f48975cb5ca1e14cb01e87607da86df5a005b6766c9b1ff SHA512 0cdd0e9ff1cafcacaaeadb541ab0fa6a783dfd4b2d51528d18eeb99fdcba4a0a1f005c6210d5ac6b0c3052eb67e777f5e481d7fd8ef723d93be1561fba2afe26
 DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380
-DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430
-EBUILD xmlada-2018.ebuild 1871 BLAKE2B f36dba5e21dadead63933f44e9b62da81ba3a40e523f92485515c7b9ccda27a84ba454325cbd7155de2da0552708266d4d05907255c852eef685e7ff007093fb SHA512 0753455dcdcc5f9e95d3966cdfffaf4fc7598f75efdc175f401ef759edcf86f89039b5035ca469399b3c67ef6e73387ec5aa53ff2145632e0b0809979d0a2580
 EBUILD xmlada-2019-r1.ebuild 1758 BLAKE2B 49abbe1b9c1efea3b0a9d5fc01abf13ebd41feb751d2ab7b85ee267cc87959aff120a7160919799d502f2d8700e73929d947e4e35d5ba344eb0f37ff7b125a8e SHA512 4eae9122d367ef5ff35bdab0ba7b272adf5c663b5f1ba1ab159841d0a1116f4d11ea0b0e2b480661aee7323fb61774875f02febd3b20300ae2d007727b4a74fe
-EBUILD xmlada-2019.ebuild 2007 BLAKE2B 41f019a98cdbc81ac952ed4048de4f9bb9371f24edcbfd60fcf2c1f5cc33f275719a981723bc0542155df065d3c1df5f2dd6f18ccb21512fec7f4883ce67816e SHA512 bba6ad966ebb6ae63668856446b646be6f6a90e33030760f1d9b734084c52663dbf05d2ba096afd18a29772e0b735b76226781b8370b95ddfe5344bd426d5f0f
 MISC metadata.xml 907 BLAKE2B c57fbc3e91a6647b5687dc02c78986d161d6a8482119984a420685ce5366a4e0901aca404d066259b1e8384ba45875f15e54810d6d0fe97812ed3fb1983f1a91 SHA512 eb1acaf3359b0ca8544e07e5681ec2ab800581401644f3ee2313dcca9be163e2bdeac16b551aacb19402fd13c18e0787850fb5529382e3e0e77ba4a1b420f53a
diff --git a/dev-ada/xmlada/files/xmlada-2018-gentoo.patch b/dev-ada/xmlada/files/xmlada-2018-gentoo.patch
deleted file mode 100644
index 439b85026d5f..000000000000
--- a/dev-ada/xmlada/files/xmlada-2018-gentoo.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/Makefile.in	2017-12-04 20:09:23.730805855 +0100
-+++ b/Makefile.in	2017-12-04 20:09:51.586331155 +0100
-@@ -62,7 +62,8 @@
- 
- # Rebuild the tests (and not the XML/Ada code itself)
- test: force
-+	GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
- 	${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} \
- 		-XTESTS_ACTIVATED=Only xmlada.gpr
- 
- # Run the tests. This requires an install of XML/Ada first
---- a/tests/Makefile	2017-12-04 21:38:29.722818904 +0100
-+++ b/tests/Makefile	2017-12-04 21:38:54.229382658 +0100
-@@ -1,8 +1,6 @@
- TESTS= test_unicode \
- 		 test_state \
--		 test_xml \
- 		 test_adacore_dom \
--		 test_schema \
- 		 test_date_time \
- 		 test_numbers \
- 		 test_adacore_schema \
-@@ -71,6 +71,7 @@
- test_multiple_xsd:
- 	@echo "multiple xsd"
- 	@cd schema/multiple_xsd; \
-+		GPR_PROJECT_PATH=../../../distrib:../../../input_sources:../../../dom:../../../sax:../../../schema:../../../unicode \
- 		gprbuild -q -Pdefault.gpr; \
- 		./validate > $(RESULTS)/multiple_xsd.out; \
- 		cp $(RESULTS)/multiple_xsd.out $(RESULTS)/multiple_xsd.diff; \
---- a/input_sources/input_sources-http.adb	2019-05-29 10:18:23.428517625 +0200
-+++ b/input_sources/input_sources-http.adb	2019-05-29 10:17:53.451007226 +0200
-@@ -191,7 +191,7 @@
- 
-       Create_Socket (Socket);
-       Set_Socket_Option (Socket, Socket_Level, (Reuse_Address, True));
--      Set_Socket_Option (Socket, Option => (Receive_Buffer, 3000));
-+      Set_Socket_Option (Socket, Socket_Level, (Receive_Buffer, 3000));
-       Connect_Socket (Socket, Addr);
- 
-       Channel := Stream (Socket);
diff --git a/dev-ada/xmlada/xmlada-2018.ebuild b/dev-ada/xmlada/xmlada-2018.ebuild
deleted file mode 100644
index 752a6a94d5a2..000000000000
--- a/dev-ada/xmlada/xmlada-2018.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 ->
-	${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	^^ ( 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(-)?]"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure () {
-	econf --prefix="${D}"/usr
-}
-
-src_compile () {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
-			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
-			-cargs ${ADAFLAGS} || die "gprbuild failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-}
-
-src_test() {
-	emake test
-	emake run_test | grep DIFF && die
-}
-
-src_install () {
-	build () {
-		gprinstall -XLIBRARY_TYPE=$1 -f -p -XBUILD=Production \
-			-XPROCESSORS=$(makeopts_jobs) --prefix="${D}"usr \
-			--install-name=xmlada --build-var=LIBRARY_TYPE \
-			--build-var=XMLADA_BUILD \
-			--build-name=$1 xmlada.gpr || die "gprinstall failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-
-	einstalldocs
-	dodoc xmlada-roadmap.txt
-	rm "${D}"/usr/share/doc/${PN}/.buildinfo || die
-	rm -r "${D}"/usr/share/gpr/manifests || die
-}
diff --git a/dev-ada/xmlada/xmlada-2019.ebuild b/dev-ada/xmlada/xmlada-2019.ebuild
deleted file mode 100644
index b841cf90e04c..000000000000
--- a/dev-ada/xmlada/xmlada-2019.ebuild
+++ /dev/null
@@ -1,83 +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-19B9D
-
-DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf916831e87a8f1d4250b5
-	-> ${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"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	^^ ( 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(-)?]"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure () {
-	econf --prefix="${D}"/usr
-}
-
-src_compile () {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
-			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
-			-cargs ${ADAFLAGS} || die "gprbuild failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-}
-
-src_test() {
-	emake test
-	emake run_test | tee xmlada.testLog
-	grep -q DIFF xmlada.testLog && die
-}
-
-src_install () {
-	build () {
-		gprinstall -XLIBRARY_TYPE=$1 -f -p -XBUILD=Production \
-			-XPROCESSORS=$(makeopts_jobs) --prefix="${D}"/usr \
-			--install-name=xmlada --build-var=LIBRARY_TYPE \
-			--build-var=XMLADA_BUILD \
-			--build-name=$1 xmlada.gpr || die "gprinstall failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-
-	einstalldocs
-	dodoc xmlada-roadmap.txt
-	rm "${D}"/usr/share/doc/${PN}/.buildinfo || die
-	rm -r "${D}"/usr/share/gpr/manifests || die
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-ada
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)