gentoo resync : 08.06.2019

23 files changed, 491 insertions, 27 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 3c0b079d066c..cbb1232d51f2 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 924a77b9e327..3150ec1c66d7 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -3,6 +3,6 @@ AUX aws-2018-gentoo.patch 2097 BLAKE2B cbb0ed91c632292994efc2bec19d49b8ce62b0ccb
 DIST aws-gpl-2017-src.tar.gz 12298806 BLAKE2B 9c45d77dd44da11efe99c6e3128fc5920b39eaaf620e266b2dab394866c2d6a3cd1abe4eb01d9024960ef9046662c0df690f72c687fbe0a64b1021ed9c383828 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35
 DIST aws-gpl-2018-src.tar.gz 4193276 BLAKE2B 31fa99fc3324f2514799a33cbd282f68a26d133da14ee2a70d3f5091c3670e82a7b77f9f941e593e914a755dd54d5a1e352d201a9dc097991b7bd50aa9f54b3b SHA512 62b85f70dd722148bbf3ad85bfd6cde2d0ab1d8029f673eb7ee42b0890c3dbf0f023c321e96eca99ccd2f0b235347ab577cfb558e7d81993d166683ec815dbe4
 EBUILD aws-2017.ebuild 1025 BLAKE2B f7b86bf4a470b5376061b4ce47263889f66d68cde383136312d979959d9c1f59e96d8367d242e44ec750bf6e006d7144f1fb337bbdcac6f95f2a42b82b3e0756 SHA512 23a477b56590afe16de4fc6707fc776daf431a0f576d002bbf0ab5305694b2d0f701bb5d4c85ca622bb4b13f3f3c7c7760820457688b5ee6bb78984558a68df5
-EBUILD aws-2018-r1.ebuild 1187 BLAKE2B d0da98e6202e6a4f6cd010bf6c7bd06ab98599dbc55ed14c9133493a34cf26fb9256e489b0e341dcb37271869b140d35d100826ce20efea3a2a8eb9f3476a19e SHA512 682f81e42ce05d2c651cd955fd23efcd565a3321caed4472f7a177ee0c72b920e2a103e252ead045d15f33530326cf15365cc13b24da491b5eb797ac4c6c9733
+EBUILD aws-2018-r1.ebuild 1188 BLAKE2B 9fc4e57fba892e399f424bb56307aa3e36be1606fdab1ffad7ac1547bcfa8a3f5249c9625e57c6eb95f538b53cc4b98b738e4d85949311fb0e9e31b1a735ab3a SHA512 f049316cc3a95c4950334cccfb00f74965cd2416e1550309189c56551b84e0e7db8daf1f1cdaf71cce13b7b936f0615c19309ab8c51c9e4287946987d2a7e10f
 EBUILD aws-2018.ebuild 1004 BLAKE2B 54fe0f8d215f2f4e48deecf0439fa38c9a6ea33691e12378e39722413f7615e6650af2e4f14aebe2003f242f2128c97013bb8b035d9ab088377a653f2b50ef25 SHA512 0f61677a688267efc153d69ba68f9e9f12140cc5883f955894c896dacc1b9a1b24c045a476250834e74de12476223fc98e393b7f25038bcb75bab9cd95c7f74d
 MISC metadata.xml 978 BLAKE2B 26ac96459fbd324806e5376c1a37ad537af66cc31452dcf5311a6e994e74daaf81aa67bd3dd045f29375f36af424a637e08312de03ff521ee7311911ab50c9d0 SHA512 100d9184d55d7187cf9e5d4f2923c9aefa1dede4b3edfa6a762a30449b5aa2551e94637e2372260bf3d67ea91a5fd64de9401645a0a318d7e91edb2b2ba7350e
diff --git a/dev-ada/aws/aws-2018-r1.ebuild b/dev-ada/aws/aws-2018-r1.ebuild
index 14d971edcf9c..a3ffe95306c1 100644
--- a/dev-ada/aws/aws-2018-r1.ebuild
+++ b/dev-ada/aws/aws-2018-r1.ebuild
@@ -17,14 +17,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019"
 
-RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018(-)=,gnat_2019(-)=]
+RDEPEND="dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
 	dev-ada/xmlada[shared,static-libs]"
 DEPEND="${RDEPEND}
-	gnat_2016? ( dev-ada/asis[gnat_2016] )
-	gnat_2017? ( dev-ada/asis[gnat_2017] )
-	gnat_2018? ( dev-ada/asis[gnat_2018] )
-	gnat_2019? ( dev-ada/asis[gnat_2019] )
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018(-)=,gnat_2019(-)=]"
+	dev-ada/asis[gnat_2016(-)?]
+	dev-ada/asis[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
 
 S="${WORKDIR}"/${MY_P}
 
diff --git a/dev-ada/gnat_util/Manifest b/dev-ada/gnat_util/Manifest
index e0a7ff904dc7..3e3cbf9a0281 100644
--- a/dev-ada/gnat_util/Manifest
+++ b/dev-ada/gnat_util/Manifest
@@ -1,7 +1,10 @@
 AUX gnat_util-2017-gentoo.patch 2419 BLAKE2B e8085e6a6cb65c5ffe6054aa360e90042a0dbba2280ecee060a690f8c06104a7224192045bf4b43d2028cb25d9b336e085968169b3d79d10767ce0694ec8b042 SHA512 b1ba5dbbfa86c943143e570a3ac871935e1e6f6104883abc56d1f8b9395d0e2b5e6317356b309497c6fa942e30f25f2f2f1b8cfd7cf801f40b5b1b64b036154b
+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 1430 BLAKE2B 1d5e92937f0ce1196145bf75b2df951201265ed320b62c6c7709a58127e5e3c0f66a77e23e1becfc95bcc370aafb887c4808fd06ad9376ccfa0c9eb90b388856 SHA512 4c675dcac5771a4581c85ef5fdee785155395af8fe7f8943f7e2a7cc6d562d830f6b8f770055ce0da32c098ea15bce41fbc6e7d90d576feb44b565445a77a8c5
 EBUILD gnat_util-2017.ebuild 1422 BLAKE2B b69c22ede488f993d0efeb7e66846c33f20f15e10b5344ff02252fb6d037910fc4bc24fd0421a08504164796bc50481bae6109e2d3ebd21a4425ff6d969fc918 SHA512 d3a1ebb59b8a31162349bc40027f5cb36f8e7ed4de8190fc336f4ad930792b8263bd0c47909d909245c348823a57d05bfe26fabce0938c4e292c7b7f70154cd4
 EBUILD gnat_util-2018-r1.ebuild 1436 BLAKE2B 4a97460a25fdb8bfcac1eb0783a3fc9111aae0636f01a966a0c58c1298244f23eae1345d56ff72d4b3b6d03ce97e6890b70393d00f00a6347d5ad69e5a9ab652 SHA512 ffcb270b491efdfd0a6cbeb9a3d1c9a3ec1d3c8d7d5b7f3eab9da404789f570611cac0861b77933f67fe2977d9fec5672aea8293d11b66e361650d6f0a2ec6bd
 EBUILD gnat_util-2018.ebuild 1326 BLAKE2B 336432396b5b98f7d59704f30a7063873651c296eb8a63700025c5c37cda497baf1caac3d4097ed95b99cfb1aee9e8402a1e75293560b7db1e12bb40b1a5aaf6 SHA512 8014d612eb4e2fcd1599aa6262f6afc131ca5dea70b40f096aa22c95a94bcb0ecc38a94c705254085b84c56e89fb21a034f082a5606885f58231dfe37738b247
+EBUILD gnat_util-2019.ebuild 1296 BLAKE2B ee2e6b50d0ea4e324864d4be580607616bb8c556c1d53e4afa154d7662e8b396b2d5fc06521d56145dd63d6f5671de7ade9982b0dbd77319925527ae534e7691 SHA512 b849ce93833c3aecd9ee93ef275e546580c261fc395bc440a215590e5d370c098e485e32ccc96a5fcfc04bb0a8af402541ed8babe07bd39890b8b1406379cef7
 MISC metadata.xml 1225 BLAKE2B 17a8dad6ea3eea9f628c65dc437f24f8558b4758cafd4b9b3683ed324afb42d59f082555100388ad8453c0223c1f1a0cbf54df1542a2f3fa8f326989a8591f01 SHA512 f629c1dd7e93c217995923542db690399ba3f2a25774d08cc8e3d9f62fb25d65ec939a80f31a3793fa729ecfe48a357da436d95a94608e2480a92b029661c806
diff --git a/dev-ada/gnat_util/gnat_util-2017-r1.ebuild b/dev-ada/gnat_util/gnat_util-2017-r1.ebuild
new file mode 100644
index 000000000000..0d7f07e12a8f
--- /dev/null
+++ b/dev-ada/gnat_util/gnat_util-2017-r1.ebuild
@@ -0,0 +1,60 @@
+# 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-2019.ebuild b/dev-ada/gnat_util/gnat_util-2019.ebuild
new file mode 100644
index 000000000000..9620ea727055
--- /dev/null
+++ b/dev-ada/gnat_util/gnat_util-2019.ebuild
@@ -0,0 +1,55 @@
+# 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-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index 3a91f83257be..a7e3f2d47c5b 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1,4 +1,6 @@
+DIST gnatcoll-bindings-2019-20190430-1928C-src.tar.gz 138935 BLAKE2B c72398b51bf383b163ac10000c4dd5441334a6f24d7ad075d8115f25c030b43bc1dace6a1121e1e69add1eead93a5389aff09ef013deb4682ccb1d31bb85313f SHA512 6db1d35a1cdf5188001084750f7aa32b193768f8c3dfb6d7db8a8314c745fc054b0a6d2234a6dd64c5acd4b1bafffa7ce7f1080bd51fbb8bc88edfcc855b7a48
 DIST gnatcoll-bindings-gpl-2018-src.tar.gz 100068 BLAKE2B 7e5fe106d421d853135ddaea04b7bf2b306e7d0f054379b4c66b58844ac73270d7c82de549e9440f4ecc672ed7e9df6e2b3c1fea55b67403aaa33b09c124bb9b SHA512 2d42e904ab7324d958b34b103ceb2cf7d9bf620f324578b8d3537c18bcc2b4ba73d553bbec773cde5d57979c3e68bc9eef69f97dd55a3b21e43d464881676295
-EBUILD gnatcoll-bindings-2018-r1.ebuild 2176 BLAKE2B 72cb896359627f2e9e2f129f7160ce7f0f8728a7594ea78661f7d0432420d9e262d4268b1cbce8ff3064f6dbc311622f43bc4c0f5b33f38edddf2f8bd1a63887 SHA512 a53aa84d5846aa308e624afbd06a5966750bd4ece2a1efa648628d460f1923fc3a2e1e8aa2d4a5bd41f462ca5a8c5f7c0efd818dc8874b6e790c855d3d280fda
+EBUILD gnatcoll-bindings-2018-r1.ebuild 2248 BLAKE2B a993d10786af11f28309c092ab9fbeafefa51ead53f8f78b07b672034306fdb202b10cda2fd0a8d1913a192fb0eb6d1a9ed061f9dc131adec38db9a0266f0c49 SHA512 f3c6d4029a8d08d3d74f9c3602f0399e3f12e942346f6a6a8a9545ddefce63b54b86e5d2d89281f5a04230e87346b2e0bc472be65c2618a5636316ea95e7ba7e
 EBUILD gnatcoll-bindings-2018.ebuild 2142 BLAKE2B 8ee5521ae2b74c65a8adff85ae19459c5dfb993184c436d05813236cc8c2bad0b7df87f46e9c1c7efb614020d51cae95f717d0be60fab88229cbfe65d9dc88e9 SHA512 16a17b64f31fbb362c58325efa18da979193befbc642270b240e0b6b36bfe243c1aef67e3b91efba097cb55097ee0b1dadc61bf8faf153d5431a6ceff1d22118
+EBUILD gnatcoll-bindings-2019.ebuild 2252 BLAKE2B e6c1d076c3983d155ec133d42718a58f52b0ab435c46a5ec53666b898182893577b5317c5100a30e44b7f65e0ed94c42bfd02f52134e89f711789b55b2e0b7f7 SHA512 39bf1d9214961bb7087d9bd04dc8e984b71d9572711f2d91d5cfa3c8ee4aa0766f08900f93e49befe3940f16589335cd155736325c9aa1d69eea61199d8883fc
 MISC metadata.xml 1385 BLAKE2B 4c67538a9b8292aa6db271d52fe30461523040a100c44b5f7c0f9450d32691796640613b6275e2d11ba2d95c913e7beb85027beadf1854ff10d211c4e3fec9ba SHA512 23592d21bac06f63bac379a582f6f58b32a1a4477d6f4b5a4cc801417c1f34a74cc7a3ef42d13b682741ccb6dbc4718d8c933f773f410184166e462c925c1490
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild
index dcebe0e138eb..e4b95d410d3e 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild
@@ -20,13 +20,14 @@ IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 gmp iconv python readline +shared
 	static-libs static-pic syslog"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
-	dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]
+	dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
 	dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
 	gmp? ( dev-libs/gmp:* )"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
 
 S="${WORKDIR}"/${MYP}-src
 
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild
new file mode 100644
index 000000000000..60a73d35f0d0
--- /dev/null
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit multilib multiprocessing python-single-r1
+
+MYP=${P}-20190430-1928C
+
+DESCRIPTION="GNAT Component Collection"
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8afa31e87a8f1d425054
+	-> ${MYP}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 gnat_2018 +gnat_2019 gmp iconv python readline +shared
+	static-libs static-pic syslog"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
+	dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
+	gmp? ( dev-libs/gmp:* )"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
+
+S="${WORKDIR}"/${MYP}-src
+
+src_compile() {
+	build () {
+		gprbuild -j$(makeopts_jobs) -m -p -v \
+			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
+			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
+			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
+			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
+			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
+	}
+	for kind in shared static-libs static-pic ; do
+		if use $kind; then
+			lib=${kind%-libs}
+			lib=${lib/shared/relocatable}
+			for dir in gmp iconv python readline syslog ; do
+				if use $dir; then
+					build $dir $lib
+				fi
+			done
+		fi
+	done
+}
+
+src_install() {
+	build () {
+		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
+			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
+			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
+	}
+	for kind in shared static-libs static-pic ; do
+		if use $kind; then
+			lib=${kind%-libs}
+			lib=${lib/shared/relocatable}
+			for dir in gmp iconv python readline syslog ; do
+				if use $dir; then
+					build $dir $lib
+				fi
+			done
+		fi
+	done
+	if use iconv; then
+		sed -i \
+			-e "s:GNATCOLL_ICONV_BUILD:LIBRARY_TYPE:" \
+			"${D}"/usr/share/gpr/gnatcoll_iconv.gpr \
+			|| die
+	fi
+	rm -r "${D}"/usr/share/gpr/manifests || die
+	einstalldocs
+}
diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index 6822a60bdbae..533a0e67e7f3 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -1,5 +1,7 @@
 AUX gnatcoll-core-2018-gentoo.patch 555 BLAKE2B d0913c845f4f7d96afbcec5d400599535417ee1c7b0d9f3c1e0c8766218c6a2556ff2de3e39febc1882b31e947876ca0849fad1564970f422530e58a8966c638 SHA512 90ef785337cb85aa7e2e2b5d0a24efc963512aa19780b215a96a1db6d980e55ff3b1409939e6d77913bf6416d158402ca900fd3ccc4cfb5362ee7440dfb42b64
+DIST gnatcoll-core-2019-20190515-24AD8-src.tar.gz 1423276 BLAKE2B 154b7a7f77c1f0d6414cb407958d64b84be8d19b7e3a12f69bd3dd1253b71df394aa0c842d2caf9d2de071ea5466589111526329155291f0d967c8b4cc2b18ac SHA512 9b2101448b96ac46cebada1fe3cb7b583cbf296f9b7d627771e83c56c78ce72c50ede5474f64f16feba252a18fd46b473901820766902b0c68d63beaf55a884a
 DIST gnatcoll-core-gpl-2018-src.tar.gz 1657129 BLAKE2B 616aef931fb542f4a022c63db53acb0f8b4323e3b948eb7b8b5688c36817b3f52b5f517b969b0560b6492d51a3e59c8350449cbbe7246b5294c45caeead4d9d6 SHA512 bf6082573dc537836ea8506a2c9a75dc7837440c35c5b02a52add52e38290d99e90a9706690591f8899b8b4935824b195f230b3aa1c4da10911e3caf954c04ac
-EBUILD gnatcoll-core-2018-r1.ebuild 1732 BLAKE2B b46a3422419a8b7c78fc1c8c42b01798a481b1d359f7b89c02fdc5640dbd6b93f2ff0c0287c52a195449f5a6dc0f24873683bc84681bdabf5a5949325597f98f SHA512 c79ca25354e6be4afb1c870d05e1a862f0a3debb9109828c5e6929dd16e2debafe27fa27277c0318cf3afc67911cd8b4339c7a6a02cbdb9bc1f65db0dfb6360d
+EBUILD gnatcoll-core-2018-r1.ebuild 1819 BLAKE2B c7ebb38b4ee6b3cce6b2a54aadad4482b03405cdf290498f63ca0106af6fc9b8e865f31b352112f7dc875047388a5cdfd9681bfff3505c8dd4d5248ead9fc9de SHA512 469841e1059869a40084d23150ec8c053e3752c319c8945b004a2422ab5a09df222a3039def88c764356de7f325adf72ee6a483b878055fe8f78bc3625bd6d2a
 EBUILD gnatcoll-core-2018.ebuild 1657 BLAKE2B 65f2a5a2f354b4582607e90d278099cdc17f9dfa416639e39c095f991b531d01c45256d059b30a9f26c41393c52f6f84d9e91cf8e073b3f6d314f7585334bc1f SHA512 17303963480f1335c29d4af93e2038f128a676a2a62ced9a77cf4434892b1bc94356992f55af24f3dee18f4cc9f5b65c10a799298bcee691a1d84a891cf46881
+EBUILD gnatcoll-core-2019.ebuild 1830 BLAKE2B 45bb3e91490790ae103d74ccf9397dbae604c4f1200bace2452e881d7b7fd6fa72663b991b3e1ea91ca13905ed3c683432e565cf4b3d513f368da6640bb19056 SHA512 25a6c2dfad3738c5aed6bfd7c1cb5852d5511ff568e45ce557ec454c20222671c9790a34e8850e15c03ef5378f2b31886736ec480fe78836b3e8036e5e154b13
 MISC metadata.xml 1399 BLAKE2B 087446f8961a357f11c578ab00a3971bab55bc58b4d959b701377461db3ca764701801a3cca7ec09539b8e603b384ca1f394890d92e7fff6e19ce07878bb6006 SHA512 7ab75b65bf39980464d60f8103c2ca2357b0d392981af771eac547ca4d01bd9f12df71394cba9aa71435457f827c4b77b3d1b3d14679ef2e654159401b755e77
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild
index 5aee1f706e90..e3449f09b04f 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild
@@ -17,11 +17,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs static-pic"
 
 RDEPEND="
-	dev-ada/libgpr[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]
+	dev-ada/libgpr[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
 	dev-ada/libgpr[shared?,static-libs?,static-pic?]
 	!dev-ada/gnatcoll"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
 
 S="${WORKDIR}"/${MYP}-src
 
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild
new file mode 100644
index 000000000000..e9678209c711
--- /dev/null
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multiprocessing
+
+MYP=${P}-20190515-24AD8
+
+DESCRIPTION="GNAT Component Collection Core packages"
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8ae231e87a8f1d425052
+	-> ${MYP}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 gnat_2018 +gnat_2019 +shared static-libs static-pic"
+
+RDEPEND="
+	dev-ada/libgpr[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
+	dev-ada/libgpr[shared?,static-libs?,static-pic?]
+	!dev-ada/gnatcoll"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch )
+
+src_prepare() {
+	if use gnat_2016; then
+		GCC_PV=4.9.4
+	elif use gnat_2017; then
+		GCC_PV=6.3.0
+	elif use gnat_2018; then
+		GCC_PV=7.3.1
+	else
+		GCC_PV=8.3.1
+	fi
+	default
+	sed -i \
+		-e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \
+		src/gnatcoll-projects.ads \
+		|| die
+}
+
+src_configure() {
+	emake prefix="${D}"/usr PROCESSORS=$(makeopts_jobs) setup
+}
+
+src_compile() {
+	build () {
+		gprbuild -p -m -j$(makeopts_jobs) \
+			-XBUILD=PROD -v -XGNATCOLL_VERSION=${PV} \
+			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$* -XGPR_BUILD=$1 \
+			gnatcoll.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+	if use static-libs; then
+		build static
+	fi
+}
+
+src_install() {
+	if use shared; then
+		emake install-relocatable
+	fi
+	if use static-pic; then
+		emake install-static-pic
+	fi
+	if use static-libs; then
+		emake install-static
+	fi
+	rm -r "${D}"/usr/share/gpr/manifests || die
+	einstalldocs
+}
diff --git a/dev-ada/gnatcoll-db/Manifest b/dev-ada/gnatcoll-db/Manifest
index 5ebaa4ede88f..8189dec5d7aa 100644
--- a/dev-ada/gnatcoll-db/Manifest
+++ b/dev-ada/gnatcoll-db/Manifest
@@ -1,5 +1,5 @@
 AUX gnatcoll-db-2018-gentoo.patch 361 BLAKE2B c7b15cb7433a5bb0f9fee68df4594a390d8d77ccd027e583dd14037a7a1319e727c99fbf4dc81de97ff457f1e0f6b237d1436f6b336668aca956fc5c083cbab6 SHA512 4d90c530bfa6948282c61c6df92a32aa8e03fa794768568ce10dda9a43cd3b56970761a0bd30913ae51f0a2605f2bc0ecc2124561982c7951985c35a974264e7
 DIST gnatcoll-db-gpl-2018-src.tar.gz 2375712 BLAKE2B d5678bdc0993b67d93bdd4cb33ee3ecba15f7cdeead173caaaa08312103505d97099037215a3b0699296aadfa0ef68327f28e01c6229db1fefc5b7d7ebf93187 SHA512 02c967b5951ef0e17e58874e03c9a6252f9c4b28100c9530fb88212e91bc692545f3acc8623477942db220bd54d56b494150b088d05c40f6a24aad8cf6a8f8de
-EBUILD gnatcoll-db-2018-r1.ebuild 2678 BLAKE2B fb771dd4bcefbaf7facb102bc5580b7e2eb048a07a52e258ad4955b7b51415901e3c0141e65f64c14ef67daf29dfa354e4c2fb20bdb102cfe767e435dce2cc76 SHA512 916494ae81f97370432aadf5bf5c3d38e257ae3d436cad85280940e72aaa84bd1d04b276bf9eab8868a6d09b92c5ea948016058efc7956641fdbad32fbcc46ea
+EBUILD gnatcoll-db-2018-r1.ebuild 2762 BLAKE2B 8a6825d2ac13b1b1692474a0e9d41369ee4720986ae142287700ca8c97ab242e3ac24f555a6e7245a9413552005006a7952a25e3473e1bd5431d0de77191cd35 SHA512 a1d100ffe86b45185ed4e7f2ebcdd630a67f00ec23dd43ef73a598083d92a68aa2fcb41a6cb12fbb5a9db4d87b4354f3a28ac4101a5a8b5e08e02db7b65f8611
 EBUILD gnatcoll-db-2018.ebuild 2633 BLAKE2B 87dd5f392ab6986ba13268ca70c7c873486471c9dd4e62f8160666a149a386249693506c244b02b455f47f033c28325da27c7ca893ca93a7cae4a39a1fa9e8d8 SHA512 5e0885514dc75800d83b444f53d5487b1c0ea3faf04581335f876cd64b2631ba541f76fc5bb1b704190f20c13ba9421e0bd7ac7d0e336654de3e3f16f7de2280
 MISC metadata.xml 1587 BLAKE2B 93b843e3b7074661abbb461a9be802ddef765688c4301241669a39546892e22370fa1dbc7d1e91d4235f81bc56affe979f34be720e9bd7c7bc2c228a97851540 SHA512 9a5c5a683005bb02decec2445e5af02569762931fca5e258e0152410e4e1d702f22321dffb0ca01dbfd4c1579a07513bc4eded7cb2f5db3f9643efb2388dca8c
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
index 98215d07880b..8e99e1edcd4c 100644
--- a/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
+++ b/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
@@ -18,21 +18,22 @@ KEYWORDS="~amd64 ~x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 gnatcoll_db2ada gnatinspect postgres
 	+shared sql sqlite static-libs static-pic xref"
 
-RDEPEND="dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]
+RDEPEND="dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
 	dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
 	sqlite? ( dev-db/sqlite:3 )
 	postgres? ( dev-db/postgresql:* )
 	xref? (
 		dev-ada/gnatcoll-bindings[iconv,shared?,static-libs?,static-pic?]
-		dev-ada/gnatcoll-bindings[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]
+		dev-ada/gnatcoll-bindings[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
 	)"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
 
 REQUIRED_USE="gnatinspect? ( xref )
 	xref? ( sqlite )
 	sqlite? ( sql )
-	gnatcoll_db2ada? ( sql )"
+	gnatcoll_db2ada? ( sql )
+	^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
 
 S="${WORKDIR}"/${MYP}-src
 
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index ff2febd3910c..6169083fa24a 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -11,5 +11,5 @@ DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77c
 EBUILD gprbuild-2017-r1.ebuild 2207 BLAKE2B 50a99fa4729a7cb8a9689fa23b6f764be7077094101aa7dbe7452002b7b0c5602dbd82924ef1a6252ce6c973ec5f1ed687ef1d773b43ada1d0a5c707c97d564c SHA512 0c0d40bcd506f86da9e9b1e2d1d57163de5e3dc12095e6566251a673ddc236e099460a83be1a47e2b103d30474c168240257a442ebc5f727633fa6608e105b7b
 EBUILD gprbuild-2018-r3.ebuild 2115 BLAKE2B 6a30d38af19eb3c18bcacae6aa3bdd6e4315102c5f0c3591df90f31e51fa954c654c975c527b8b93d5190851fda8d50cd894050f36cacd351fc707d06dfbf20c SHA512 91dab25795db0e5acfa4d3a1ce9d3653d94726ad9a8f733437b2ea23cda9db17af81c998fa8b70e5ad8d5abb14f15f59aaf9aaf6f4640b11a471b14a5e0b2099
 EBUILD gprbuild-2018-r4.ebuild 2218 BLAKE2B d5fa3a5a331aa64863907e3f20b581f7849dfb9b39e437bb4b37623c987c1ba89326f2b2bad000e7cca887c8f25ee39a1bd0024988d9eec8d4ca9975b5443129 SHA512 e6bbbd20754a90acce55c8f8145e8867491cd0208a0fe19d22e6fdd357a2e17dad9e4cc912d82aa263791cd6cc12c608531f8f72b2d386d35c22fe52dace903a
-EBUILD gprbuild-2019.ebuild 2235 BLAKE2B 8ad3da8f3d75130c32b061b20767eb2c69104e7f0e0ed5fd3cce1e559da8b4027894866341559c6e0c5dbb157bcb30e2681e32a980e110b3aadcaa6ba297cc55 SHA512 f0cf271cc42876b71a82763228e877ff74f5a97ae460366abc94a885ba220245c7743ba9c454007e5a467b740d061d61a24b1e2ad6d4c0445777c9ece579902c
+EBUILD gprbuild-2019.ebuild 2174 BLAKE2B be188b72986f626ba9c7d70ee89ee631d7631be59d54f583b2100470a54ce1bcf0b282b6b05a9621ff9f29fd8884387e8e499222f4c8b7ff2bddb326f5fa35a0 SHA512 d66953cd304bbc3192121232d3af21f21d34cdb763b3df7cd7b216bb9b868a7fc1909679c6112ed78be8557b72ad06a25ab5b81e8e6e27cfead289626ba2f681
 MISC metadata.xml 1125 BLAKE2B eb8158df946472627b36cf599bcb82e0784667b167be320007d1ebeabdd0fc5d286ba0bf9ae0560fd74b938aa10c8e807471ba4d1a1334e0d56432c195a9c23d SHA512 2975617f346492a42da5085de24ac8243ea8360a1c2dce200c1438ce4d33e9ee60ee0101b01df1cdfcb02a59b306bba5f954ae60c2fc82c991e0592671323181
diff --git a/dev-ada/gprbuild/gprbuild-2019.ebuild b/dev-ada/gprbuild/gprbuild-2019.ebuild
index 7afdf9a67bf6..48221ce5813b 100644
--- a/dev-ada/gprbuild/gprbuild-2019.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2019.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs multiprocessing
 
@@ -18,17 +18,16 @@ SRC_URI="
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnat_2016 gnat_2017 gnat_2018 +gnat_2019"
+IUSE="gnat_2017 gnat_2018 +gnat_2019"
 
-DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
+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_2016 ^^ ( gnat_2017 gnat_2018 gnat_2019 )"
+REQUIRED_USE="^^ ( gnat_2017 gnat_2018 gnat_2019 )"
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 383bcc2e3dad..aef304fbf8b5 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -2,6 +2,6 @@ AUX gtkada-2017-gentoo.patch 2270 BLAKE2B 54b7f2258ce0073b79f56a3c0c379123622e7d
 DIST gtkada-gpl-2017-src.tgz 11952333 BLAKE2B 2a333452ff271bba0521235598afdb1abebc4ceeab0f915f173862329ae0986b0fc4f654d3df28eac73af075db224c0b12340c3acd1e4ed0ffc965e4365f8b40 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f
 DIST gtkada-gpl-2018-src.tgz 11958880 BLAKE2B 4946918b52de5e15efc77411927812910d84d13cea66b86b1162b987c7849ba7fbb6da487881762f64005dc32a74fa73c9d759d25bb9ac0241d1d76cd4becbfb SHA512 9000de7675f8ee688b1c9cd93cf35b32f698aca8fc22d3b4e695d7c6b34feb60118cc687cf35432cd5ed9af7825eda7e20575a9fad4523a7b59cb0322bce0762
 EBUILD gtkada-2017.ebuild 1291 BLAKE2B 4f26d0c4c40df64522c77df6acf75175f22cf0aef8e8e3213d663e3bb4c4b7ebff538540b7bbdb212d0ecce2e60f7d7d463f3178a1df44059ce7a2ef22fe8936 SHA512 433a5ce57cf39a012f17756d8843933910e51ad3b1641360e7dd28e0f871399a57f3ec0376e7ae7c69491f2e4712aad23c71c7fabd2ce507c9c5a79c247daabc
-EBUILD gtkada-2018-r1.ebuild 1528 BLAKE2B 80bd791d0dfe9d660730d416715c8b1a3ce58c538bfd3174a8184e308a08b366b24518f3cde15cb7c945601b4a08ee212291465e41e91f37084472df0bad92cb SHA512 0d98424fc275821ad887d45fbcc546805574956c2e95b126c5b27af8762bcde267606686f687612d6d7f747c6c6a082ce234553bdc91ed41b79b6f02d744365d
+EBUILD gtkada-2018-r1.ebuild 1535 BLAKE2B edaf0ee99f67f2dfcc7dac73c42a1ec79f2c13b5a5b01193f7ea0a515a74078a5bebaf4640ac4cb25c833d2d41617759a54e9c4da566e8db28af5e30f8bce69e SHA512 0e616bffcd61d6ac790149b896a405964356a1a5431868486f0ddebacffd2e9f05779f6eb00171196c4d9abe3174bfd2c06b165168fe92d2aa9039695e06227c
 EBUILD gtkada-2018.ebuild 1412 BLAKE2B 60234e0a79c8b865d0adeefe8089de9b2e480b89cd2513c0ff53107202eb7a164350ed182bb6b36e269ec6a946d87d94cbf43cc26a0519de2b94c06e43312d05 SHA512 1c0739006fabdfc1b587eb6db5c55f3de8036db2b6aeb844c14b485b9b7321c90aea91b87e3a390d2e3fba38d94fd12939392557403920f62319b33cb253bb1c
 MISC metadata.xml 840 BLAKE2B 0067a781b5e7074b09d838209ac8847b8834782f284c4d998610779b91fdf35bd8bb06cac5d9841ec10bbe67281ac15e6f34d6ef9e5405c4f7f29be778b23c17 SHA512 17a1c9f90bd0b05e859ee2dea19c50c8ff67165b4b03f800c5e031561187594501af5e9c331763d35c1ce8e9059ac8f8def3ab6261267bc50f33f50fba251756
diff --git a/dev-ada/gtkada/gtkada-2018-r1.ebuild b/dev-ada/gtkada/gtkada-2018-r1.ebuild
index e00886917885..4ce851b8da6b 100644
--- a/dev-ada/gtkada/gtkada-2018-r1.ebuild
+++ b/dev-ada/gtkada/gtkada-2018-r1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	x11-libs/gtk+:3
 	x11-libs/pango"
 DEPEND="${RDEPEND}
-dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018(-)=,gnat_2019(-)=]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
 
 REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
 
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 6a2a781dfe4a..266cca0eda46 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -1,5 +1,7 @@
 AUX libgpr-2018-gentoo.patch 1691 BLAKE2B 4e11098f835d9d0adbd6a4eed0e63f71140eb68d0e350fd52303a0d21c308e483556b31ce84ba97a7fccddfc91e519a6ae8f999d87258c0d4f4ee473597f7267 SHA512 959e4e63c3367fd98878a2004d0fac981a1acc2a29e35960a27f2ca48b4557fc16148aa052cdba590f208c8b23832f3bc2f3959523f6e54eb8dfe2e87812f285
+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 1455 BLAKE2B 09c0754d011aaa9507c89e7931ee261a06d72f507fb171ea2290a5087fe423837e4c16c82408732ffbf5375f16fd315e19dff4889604f3a934b1379e8c514e06 SHA512 2e48d5c512756b1e0222a43e958b6bab697be451b74e20a9b3afb3f7dfd65a15671b1a81b2479cad60eecd9f0b893201ebba9d1fa70b47cb9fd5a63d4b49c4f3
 EBUILD libgpr-2018.ebuild 1418 BLAKE2B ea2cd84edd7c32b6094559a9de24d8ac0ff84806b6f90fa393f07e48d984ad4f79be53211198952456b2695dc2d1af2e0bc46a0e6cf30ecbb36cccc9e64430d1 SHA512 77c55ea1e0d33b2f4ced11e495390bbccc30425fd1842361306b92aa21eff2be446837d6100977deb1ea174a1415d6de9e8c5a195a95bbbba6386bce89f0e4f1
+EBUILD libgpr-2019.ebuild 1434 BLAKE2B bd5ec33870135ccbe9dfcdd42d2c12cee85a593afd6cadfd764d260dd17d640193f167b46751816368ae5e6fc8030d8e69a9e3a39d46646fba19502d0ac945aa SHA512 de84b8e96df7d2d1a8f2449e731bcf964c96555d16001f47746b637eec35b8a3626434dfcff51dabc251b917d95dc9a9c0235dbe9d34d8db0d85ef2f56d5b540
 MISC metadata.xml 1243 BLAKE2B 83ab2df9d1adc5438dcf1b1a66cfcc6da75ddc676a4a7a8a7c0930cffc25dcdd4831cd066aa5883d3a7ff3e49fc121bad04572269b96a842ea9ebb2b692c8cca SHA512 ade42a66f1e614f719b9dcf1c1ba30d80b851667817bb9206967b6937bc373d53df717449fa34d02cf21a0c0ff8b8b428441ddd98ed64c0c12af90f7c8b89f75
diff --git a/dev-ada/libgpr/libgpr-2019.ebuild b/dev-ada/libgpr/libgpr-2019.ebuild
new file mode 100644
index 000000000000..aa2517a75a3c
--- /dev/null
+++ b/dev-ada/libgpr/libgpr-2019.ebuild
@@ -0,0 +1,59 @@
+# 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(-)?,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 42314f28a0af..a9753edb3949 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,5 +1,8 @@
 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-r1.ebuild 1947 BLAKE2B 0cafb5e8a347f4ffe68416af6ea936ec61f30da8951b2b099fcfff0d1502ff974d9538de8786722507e3f0abad05bf9f2febade8243e70968514c7413f3ef829 SHA512 50096d45540d4edcfde73271b5fc4f7a228bafebd0210a48f17f09267f664c7ac83b082b29a3ac9d5f887d9e30f12784cf4d20d34518b5a261f2cb8902410983
 EBUILD xmlada-2018.ebuild 1871 BLAKE2B f36dba5e21dadead63933f44e9b62da81ba3a40e523f92485515c7b9ccda27a84ba454325cbd7155de2da0552708266d4d05907255c852eef685e7ff007093fb SHA512 0753455dcdcc5f9e95d3966cdfffaf4fc7598f75efdc175f401ef759edcf86f89039b5035ca469399b3c67ef6e73387ec5aa53ff2145632e0b0809979d0a2580
+EBUILD xmlada-2019.ebuild 1952 BLAKE2B 5d3417605764b979c1827d03eff5ecc73ea13c2ad49d91a57252ae85521da8e4e2e886ad3c01c94fb58d64e9bec69ec7f62f5797947e34ba45e01426d02f4b25 SHA512 4c753eccbc0a2c28b84fb5d2859bcbab77277fa2849ec9bdd50981e6303cd3bd5141bc5371d9955f2ad72a8cf577128cbfaadc523478c4f466d223961195814f
 MISC metadata.xml 1211 BLAKE2B c4a426110f0fee7aedb724e8e20528c1975ef2e95b107fc9c7712a5d9a747bded5ab0992f744f375d522f1aa5afe564c3f48af0ddbd4385d32d37795014c8ad9 SHA512 bfe1919e064a72a81cd50197880579c2280e38bd63956ad329c26f0bc0b493df3718036feebf5f380d4ab669c7ace09878e36102317658f473e05e50fd900cf6
diff --git a/dev-ada/xmlada/files/xmlada-2019-gentoo.patch b/dev-ada/xmlada/files/xmlada-2019-gentoo.patch
new file mode 100644
index 000000000000..901797ebfde0
--- /dev/null
+++ b/dev-ada/xmlada/files/xmlada-2019-gentoo.patch
@@ -0,0 +1,30 @@
+--- 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; \
diff --git a/dev-ada/xmlada/xmlada-2019.ebuild b/dev-ada/xmlada/xmlada-2019.ebuild
new file mode 100644
index 000000000000..f68f31a5a464
--- /dev/null
+++ b/dev-ada/xmlada/xmlada-2019.ebuild
@@ -0,0 +1,81 @@
+# 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(-)?,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 | 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
+}