gentoo resync : 06.08.2019

5 files changed, 11 insertions, 16 deletions

diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 791adfd2b684..598bca431537 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -3,8 +3,8 @@ AUX aws-2018-gentoo.patch 2097 BLAKE2B cbb0ed91c632292994efc2bec19d49b8ce62b0ccb
 DIST aws-2019-20190512-18AB9-src.tar.gz 4241817 BLAKE2B 1054c17c0e79ea4992a7e29fdb1996caa663321407b64ae88cb76cb03d953b7ea36a8c91a28f60328ea2ec3223c1d7f8c2f052f4f181f03b1f59cf33443ee27e SHA512 989043f75504ee8b3736800fa36f4d3a98a6bc745ff4bef38dd4f7c8a7072d5d1ea383dfd2fc090d8558a6d6442953e5f3c65e4633ab16bfb3dacf60ebf79a3b
 DIST aws-gpl-2017-src.tar.gz 12298806 BLAKE2B 9c45d77dd44da11efe99c6e3128fc5920b39eaaf620e266b2dab394866c2d6a3cd1abe4eb01d9024960ef9046662c0df690f72c687fbe0a64b1021ed9c383828 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35
 DIST aws-gpl-2018-src.tar.gz 4193276 BLAKE2B 31fa99fc3324f2514799a33cbd282f68a26d133da14ee2a70d3f5091c3670e82a7b77f9f941e593e914a755dd54d5a1e352d201a9dc097991b7bd50aa9f54b3b SHA512 62b85f70dd722148bbf3ad85bfd6cde2d0ab1d8029f673eb7ee42b0890c3dbf0f023c321e96eca99ccd2f0b235347ab577cfb558e7d81993d166683ec815dbe4
-EBUILD aws-2017.ebuild 1025 BLAKE2B f7b86bf4a470b5376061b4ce47263889f66d68cde383136312d979959d9c1f59e96d8367d242e44ec750bf6e006d7144f1fb337bbdcac6f95f2a42b82b3e0756 SHA512 23a477b56590afe16de4fc6707fc776daf431a0f576d002bbf0ab5305694b2d0f701bb5d4c85ca622bb4b13f3f3c7c7760820457688b5ee6bb78984558a68df5
-EBUILD aws-2018-r1.ebuild 1188 BLAKE2B 9fc4e57fba892e399f424bb56307aa3e36be1606fdab1ffad7ac1547bcfa8a3f5249c9625e57c6eb95f538b53cc4b98b738e4d85949311fb0e9e31b1a735ab3a SHA512 f049316cc3a95c4950334cccfb00f74965cd2416e1550309189c56551b84e0e7db8daf1f1cdaf71cce13b7b936f0615c19309ab8c51c9e4287946987d2a7e10f
-EBUILD aws-2018.ebuild 1004 BLAKE2B 54fe0f8d215f2f4e48deecf0439fa38c9a6ea33691e12378e39722413f7615e6650af2e4f14aebe2003f242f2128c97013bb8b035d9ab088377a653f2b50ef25 SHA512 0f61677a688267efc153d69ba68f9e9f12140cc5883f955894c896dacc1b9a1b24c045a476250834e74de12476223fc98e393b7f25038bcb75bab9cd95c7f74d
+EBUILD aws-2017.ebuild 1043 BLAKE2B 4bf8df983ccf8dc107999091aacc234dc16e53c8cad90a06fe41cb00808a1394612a684864daf6931ba2dc5c940975256e5d0e9bdf6831d618dfcc74856ec876 SHA512 b09d084921f0a5268188405801e107f0679d1f8041dfb93f116eade1c04033146b4dd9c521fe1b5217cc6e927d91c7583e1662259c50b0975ed8d66b36807c93
+EBUILD aws-2018-r1.ebuild 1207 BLAKE2B d57e15312c9735c240b71679e379cec64249d1dea46462b62f00bbacb7f150cc295bb6b4b99d9e5e75eba310c15c82d2b3fa389e331964409e9c4f485a5afed7 SHA512 04d8b535f4086d32bbdf792ed9f80a071777b61e04b34048a88185262d3addd983f4b91b12e43ad6e4554751cb3bd8571ff591310fb60830f1dd7576fa97c110
+EBUILD aws-2018.ebuild 1010 BLAKE2B 220f4ef079cbe6a6e2d5672c338e1c8cdde58c985ed6fac110c07ad867390ec2e654c2b94db609ac0b4d3ee3679b73b98e73d7664a5e527a342d174780ded586 SHA512 b547af64ff976d2bc95d7cddfd1bceefcea0f92ce6e5065bb14442a3693236ea6b91682223a5b357690e32d6f3fc960e857e55f25af2971c6f845ccd32bdaf89
 EBUILD aws-2019.ebuild 844 BLAKE2B fb145d0a9ad8af618b011dbe870932077ee571b5474019603d9ac7e00aaaa1dbbbc6a94606dca60b76792093f9e8d447221dabb46824b270125ff9cdce974bbf SHA512 38f856ed7a87e116a556a084fb7ed3f1131028998d7fc1595dae97e87b1613112b014705dd83f24a161047760e8beb9b6adb615d55664cfd6cf5dde1d827a096
-MISC metadata.xml 946 BLAKE2B b3cbfc3e5c25db14f46b6a3f617fc9f8d6cdb043fa4cd3f678969625df42fe63503ad9bdd01e71dfc580c2e86c1b0cf8de4d2807dbe84b81518dbb8216f807dd SHA512 1751c4efb119a546872823b4f937cb39a7964b09dd60cbf9c8db083b9fd06e7ed801d3adcabc793ac633d2aef540a120e940956d63da7a6eb90bf704ebcc087a
+MISC metadata.xml 659 BLAKE2B b9dcbdc561b8ffd774e7aa8d5fc1a6a809e1017e3b83d6473d8c72c690abac54b3a0ea7c4df5cbc5ed832ce9bf60e26d71c43f09cf35b3c33bdba9c3fb2dd423 SHA512 b17cf2ab035805b5e0fd7f423cfbaca61eaa6a8e7ce575fcb65b631b3c3318fc0eb9fbdcd4010a0187f07a4986acd351809697a7fc044ab7a9f4fe394b6ca227
diff --git a/dev-ada/aws/aws-2017.ebuild b/dev-ada/aws/aws-2017.ebuild
index 081d598a0027..7bc3f363c081 100644
--- a/dev-ada/aws/aws-2017.ebuild
+++ b/dev-ada/aws/aws-2017.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
@@ -19,9 +19,9 @@ IUSE="gnat_2016 +gnat_2017"
 
 RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs]"
 DEPEND="${RDEPEND}
-	dev-ada/gnat_util[gnat_2016=,gnat_2017=,static-libs]
-	dev-ada/asis[gnat_2016=,gnat_2017=]
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
+	dev-ada/gnat_util[gnat_2016(-)?,gnat_2017(-)?,static-libs]
+	dev-ada/asis[gnat_2016(-)?,gnat_2017(-)?]
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?]"
 REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-ada/aws/aws-2018-r1.ebuild b/dev-ada/aws/aws-2018-r1.ebuild
index a3ffe95306c1..8cdf9346bfde 100644
--- a/dev-ada/aws/aws-2018-r1.ebuild
+++ b/dev-ada/aws/aws-2018-r1.ebuild
@@ -22,7 +22,8 @@ RDEPEND="dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
 DEPEND="${RDEPEND}
 	dev-ada/asis[gnat_2016(-)?]
 	dev-ada/asis[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+	dev-ada/gprbuild[gnat_2019(-)?]"
 
 REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
 
diff --git a/dev-ada/aws/aws-2018.ebuild b/dev-ada/aws/aws-2018.ebuild
index 877e8c4fc1e0..13df9f3052b8 100644
--- a/dev-ada/aws/aws-2018.ebuild
+++ b/dev-ada/aws/aws-2018.ebuild
@@ -21,7 +21,7 @@ RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018(-)=]
 	dev-ada/xmlada[shared,static-libs]"
 DEPEND="${RDEPEND}
 	dev-ada/asis[gnat_2016(-)=,gnat_2017(-)=,gnat_2018(-)=]
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018(-)=]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]"
 
 S="${WORKDIR}"/${MY_P}
 
diff --git a/dev-ada/aws/metadata.xml b/dev-ada/aws/metadata.xml
index 9f6b024a0833..732360689a7a 100644
--- a/dev-ada/aws/metadata.xml
+++ b/dev-ada/aws/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">
 		AWS is a complete framework to develop Web based applications. The main part
 		of the framework is the embedded Web server. This small yet powerful Web