gentoo resync : 06.08.2019

4 files changed, 10 insertions, 16 deletions

diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
index fd5cb6dfabf9..3b154b482d12 100644
--- a/dev-ada/asis/Manifest
+++ b/dev-ada/asis/Manifest
@@ -3,7 +3,7 @@ AUX asis-2017-gentoo.patch 2030 BLAKE2B 261d2e32b818f17ea4ea51047cf71b73f89d9180
 DIST asis-2019-20190517-18AB5-src.tar.gz 6173053 BLAKE2B 2ce8ba783f5d58503f6b792329779eb8a5f99746b3b03225f13da058ed5a757aef49c6ae8729b71079c67da6537c35db1c7173a569a2d7063421da5d2adee2c4 SHA512 3ca32fa2eeee10ef2d0e6eb8ab555c3e31b417bdab6749fdd8bd264efa2c93a388a5731c40705782a3a28f16e0c385af195f69d95020e265b2230ead1c91977f
 DIST asis-gpl-2016-src.tar.gz 5240554 BLAKE2B b95be816f5f52ac2b29814c09166774884dc166df6e08b26769c9502443f9797c42a1f9b6168336636add6515b748b3ef4b38c6a1dc6f49c1afb9ecec8e50c50 SHA512 439195d4cb5d58328dcc8c815cb6a32c5f8ed1d6581246dfa5dcca7c212ffad38dd63df25e490c4ac628eaf8c8e6d286f8ea036b7f39499704565b60c1bba8ee
 DIST asis-gpl-2018-src.tar.gz 5983604 BLAKE2B d91e3ff5cb95ec5b69121ed09e73f7bff234147b809353577315cd25cae0069ec5ebfc221a9798341b2a33bde316d74c4ce47c7ace580fe4d867e47032e207f2 SHA512 e00750adf17df8d534f0e561d129002d8b3c9efd6ba9c8d6768840d1399933271d748bafb7358a45d0a520620a335e669a6c2770ed89660bb319b609961a433a
-EBUILD asis-2016.ebuild 1220 BLAKE2B 3d31f42030ea2cf19b2c98159018528cfe423cdb4fbabb0bfe116cd5f153c2c2f4a80f357381cc8dbacb25134234f4529b36214596bdfd6f03af03423ed71e03 SHA512 77c3f1f87a1cfbbb96080e37a1ebf5d3a3407eda5e31e8fba02f2e155207e07cc3ec5c47917a0b4ae11293ae053e5c0602a2b46d5655bbe817a5a1a0d0010111
-EBUILD asis-2018.ebuild 1297 BLAKE2B e8fd884ce0b058dd198aadc4c0937ccac24585ec37dfe40e34f44f65e756df2ddf6b84d366a200f018aa60887c8564cc552966118cf8be2ce81a9cf803e355fd SHA512 6f4ced4d984e41c98bce656dc82c266f04287728660d80720595c4382c799b1382522eb7f4df6e6f8b81b34ee5fb7865ecccf40dee3f4e86982470fce602d395
+EBUILD asis-2016.ebuild 1232 BLAKE2B d3a93a852880141b7403033fa92830477e7df5a1f915a5114caa44524370da669b46784debe3d2eb752733aa5427f337ecf6874cde2c1118240f85668656e577 SHA512 e90b86afa5992ea86ae4f11d1023486f96a758b218091f2b7fc05a5434815d71d9b93c770f67144a80b87dd973fc211a13f8d5b900e809ef1251bcf499bca83f
+EBUILD asis-2018.ebuild 1315 BLAKE2B b9dc4ee73cca440af4b9af2987ebcf216d462b1551ac7a0147962bf456036f2ad36821234e3a76ee38bb77e81d4f42adf5ee8dae553c0e5745955cfe5c731f55 SHA512 e5f61d632e71e995319194ef9d813c4434446c6c18ae02bfec32cd974aebf0e723e6f55fd3241221f4b667785644dcde623612506cd448cadc36157b27b321ff
 EBUILD asis-2019.ebuild 1418 BLAKE2B d9576140d91ddeae07f5eb5c25ee740f6223492827ad5070029ad92db4c01926c5a875a4792ab441bdaabf1c89662bcfac5274683ed015424dd6fb67049e6348 SHA512 c27a90fc7082419a9a016add0d6c68274af236d498a47368464886b09436df44d29989fb2eac75945d723ff1ca94043a4bd5ec200046a042ef3f752c889de163
-MISC metadata.xml 794 BLAKE2B 4a70d59a4f24d7c0e075a11acd84a5e0cc21f9836e10bb4c3adffb98a5b4cd738489d0089852a7b303c014f78d38a758aae753db09f70285fe76a2cefaae5510 SHA512 99f17f74644496f2f74fb430f46b3e9e2927773b41d101d761d358f16c06bc8f2202b5467e718cabdaf0258a94511ff86718028cbd278fedc3814ac3d7c808d4
+MISC metadata.xml 507 BLAKE2B 8b1df4ce46d0dad00a66b5460fe5274c3d31080a6dbfe88c2482bce2097c22899ed9bf8415243c4af658dfb383c5865bf0b363cec7f72ddda54d595bbd772708 SHA512 09fcf4af4c0ff4a27bdd41a2abece2736c6f78c38b1a5a4f05dbe418def78493df4940b2ee6e528f9ffc9184f69c61deb1912fc309b0304da0b4a30f1690dd9d
diff --git a/dev-ada/asis/asis-2016.ebuild b/dev-ada/asis/asis-2016.ebuild
index 74f0b0bdfadc..e86f691ae7bb 100644
--- a/dev-ada/asis/asis-2016.ebuild
+++ b/dev-ada/asis/asis-2016.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,13 +16,13 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+gnat_2016 gnat_2017 gnat_2018"
 
-RDEPEND="dev-ada/gnat_util[gnat_2016=,gnat_2017=]
+RDEPEND="dev-ada/gnat_util[gnat_2016(-)?,gnat_2017(-)?]
 	|| (
 		dev-ada/gnatcoll[gnat_2016=,gnat_2017=,projects,shared]
 		dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,shared]
 	)"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?]"
 
 REQUIRED_USE="^^ ( gnat_2016 gnat_2017 ) !gnat_2018"
 
diff --git a/dev-ada/asis/asis-2018.ebuild b/dev-ada/asis/asis-2018.ebuild
index 503e02383473..b895af4212b4 100644
--- a/dev-ada/asis/asis-2018.ebuild
+++ b/dev-ada/asis/asis-2018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,11 +18,11 @@ IUSE="gnat_2017 +gnat_2018"
 
 RDEPEND="dev-ada/gnat_util[gnat_2017(-)?,gnat_2018(-)?]
 	|| (
-		dev-ada/gnatcoll-core[gnat_2017=,gnat_2018=,shared]
-		dev-ada/gnatcoll[gnat_2017=,gnat_2018=,projects,shared]
+		dev-ada/gnatcoll-core[gnat_2017(-)?,gnat_2018(-)?,shared]
+		dev-ada/gnatcoll[gnat_2017(-)?,gnat_2018(-)?,projects,shared]
 	)"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2017=,gnat_2018=]"
+	dev-ada/gprbuild[gnat_2017(-)?,gnat_2018(-)?]"
 
 REQUIRED_USE="|| ( gnat_2017 gnat_2018 )"
 
diff --git a/dev-ada/asis/metadata.xml b/dev-ada/asis/metadata.xml
index 4d4d828b644c..a2c17d742260 100644
--- a/dev-ada/asis/metadata.xml
+++ b/dev-ada/asis/metadata.xml
@@ -4,12 +4,6 @@
 	<maintainer type="project">
 		<email>ada@gentoo.org</email>
 	</maintainer>
-	<use>
-		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
-		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
-		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
-		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
-	</use>
 	<longdescription lang="en">
 		ASIS is a library that gives applications access to the complete
 		syntactic and semantic structure of an Ada compilation unit. This