gentoo resync : 01.12.2017

31 files changed, 73 insertions, 205 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 44175fe46323..603e9353ac27 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
index 32703738236b..e6697ed633f2 100644
--- a/dev-ada/asis/Manifest
+++ b/dev-ada/asis/Manifest
@@ -1,7 +1,7 @@
 AUX asis-2016-gentoo.patch 1535 BLAKE2B 726f03a935c9cf26f5fc405ff6d3c18d01405d5b6a61589a45d6cd8f1134646c9e8e57d496428d8e0c9ce613f1756d8bd027e16ab727d605db99ab4301f73da3 SHA512 7b78b1dc4824242c10f409ab4874c11f8dfcc977d31e1bd63e96915e3f8477efa737e35b6d3c1076f920155b89f51572528e1d309fcf450bdc3353ec32dd6bc2
 AUX asis-2017-gentoo.patch 2030 BLAKE2B 261d2e32b818f17ea4ea51047cf71b73f89d918094397702d6b7f9eaa9e2edb39d754d12beb23b2b6b0a55012773767915c2dc3bd69db850558c8c3afbe44dd5 SHA512 9697264392827254fc23993979ddb1cef8276e8f699f776f85a4ce09fcaf2e87b68e4187622fc16c809d71e7e360626c72f5d5f7be33c72a9544996cbf1321f9
-DIST asis-gpl-2016-src.tar.gz 5240554 SHA256 3e36e0835e291dafe6dd2246748ed12b449d33044c32209d3af012c83064c38e SHA512 439195d4cb5d58328dcc8c815cb6a32c5f8ed1d6581246dfa5dcca7c212ffad38dd63df25e490c4ac628eaf8c8e6d286f8ea036b7f39499704565b60c1bba8ee WHIRLPOOL 12ded099fdf510be75d67795f990b0044ba701595c4a2c858c46cc5dc97d5c380bd9d51c654a18183a77f9cbc1a9bb7a5dea344da471e6a136154da9d7cb558d
-DIST asis-gpl-2017-src.tar.gz 5909758 SHA256 ca84ab53418930e79c54566b2377253d5d557e5a2d6e9d2be00aef0c1d921627 SHA512 dee6b8e0851a4b3181d50256697865f7a6a613eef7b59e43cb1a0b066e794d927db9f60df33f7e1af343d41801a6b66feb1f7a963523b2442c85ca506d7e112f WHIRLPOOL 5c179e1b4682fee465e4ac3a32afcd97fd7e88f32488a1f9ad45dadfe14ed5bedd662bae0c8728e9e812adff1ff5d66814f9edc34420b6b81d6de4ec1468e73d
-EBUILD asis-2016.ebuild 994 BLAKE2B bf0ac1acd64296e6ba7e5db3c8b344a9618344f899653dd8ed41bff041816ef87f6e6294e950f257575ba8859516a21164f66999c103faebf66707e8438a17a6 SHA512 4210dd53f33676688f62bbfcd16f6acfeec959c1b0d334e445eb354dfd7a9e61002d6409af7ddd0ffd05733c27e5e58c409b84201a5f03caa021d49f28bb41ff
-EBUILD asis-2017.ebuild 988 BLAKE2B ae4a18e7fec3bf931da7d03b62bbc4d63683fe67df33e1a61227f37ba8ea71572d4a18d124346b0ac7d6c4b0d42d0238ccc4ec75ad19ff2fc67adc2be2867982 SHA512 c72f803b90378348042484400d256291237131b24087a28bda0bd53febfd1d16f02b918820b5b9839e5750718695f5f5eef049b28951c84fcbf9e7c614b8d2ae
+DIST asis-gpl-2016-src.tar.gz 5240554 BLAKE2B b95be816f5f52ac2b29814c09166774884dc166df6e08b26769c9502443f9797c42a1f9b6168336636add6515b748b3ef4b38c6a1dc6f49c1afb9ecec8e50c50 SHA512 439195d4cb5d58328dcc8c815cb6a32c5f8ed1d6581246dfa5dcca7c212ffad38dd63df25e490c4ac628eaf8c8e6d286f8ea036b7f39499704565b60c1bba8ee
+DIST asis-gpl-2017-src.tar.gz 5909758 BLAKE2B 93b2f87c6945b27cff90cb3e227d6e6ae061dc6fc693ee8960cd9b4abf68cc398f6b6d7dba864399c8e007aee2a91789614b7d2bf146645a5d983f20c1ccbc64 SHA512 dee6b8e0851a4b3181d50256697865f7a6a613eef7b59e43cb1a0b066e794d927db9f60df33f7e1af343d41801a6b66feb1f7a963523b2442c85ca506d7e112f
+EBUILD asis-2016.ebuild 995 BLAKE2B abb0455f58df59f1c547b8b9d77ed148687bc73782a8d83738da3e81b63e1ab5ade71a3fdad6299472f02bd00b182032118f9f4da4be2fc19ad36ecd739cfd9a SHA512 b5297b4c270b45b49ef89bd37d620ff60a84b60531b37277aae4248191121a3cca054083af2be8e2e3aa45c40018f0446a84a0083b9b0b90533e2b5481eb0c23
+EBUILD asis-2017.ebuild 886 BLAKE2B 9a08fe73a459305dcb2e8c80f8251003617a302d913871277a222c6a505cdc8a09e729fec1620dc63147ef684c088b80a189805b0375a3c4eef13c70404b8d3e SHA512 f3b5a575974ae4078e979d91401e11d959ede678f39268180ea8b569ca981d0473e950945928175657ff012d45098b1deb1d651e9f412af679bc3058baa1e513
 MISC metadata.xml 691 BLAKE2B 404b4929f2d73b2d8feae8e71107211d82f1b264fade79e88752d3e8e31d9d4321163522cbdcf6223ee2f0f5e04680ad127d9b953e1c5afd6ee8b972458cd9b4 SHA512 ec079b9cfceb47d66966db417e9e6666ca56284413cd9aae3881a488837d9928560d499a4f33fe9b4143281d81dcbdf3a129543c9e7669d4a0da6386d644c1c6
diff --git a/dev-ada/asis/asis-2016.ebuild b/dev-ada/asis/asis-2016.ebuild
index 68c09bcff36e..48c6312f8b75 100644
--- a/dev-ada/asis/asis-2016.ebuild
+++ b/dev-ada/asis/asis-2016.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399029c7a447658e0aff71
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017"
+IUSE="+gnat_2016 gnat_2017"
 
 DEPEND="dev-ada/gnat_util[gnat_2016=,gnat_2017=]
 	dev-ada/gnatcoll[gnat_2016=,gnat_2017=,projects,shared]
diff --git a/dev-ada/asis/asis-2017.ebuild b/dev-ada/asis/asis-2017.ebuild
index bb826f23d567..82141cacc339 100644
--- a/dev-ada/asis/asis-2017.ebuild
+++ b/dev-ada/asis/asis-2017.ebuild
@@ -14,14 +14,13 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecffb
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017"
-
-DEPEND="dev-ada/gnat_util[gnat_2016=,gnat_2017=]
-	dev-ada/gnatcoll[gnat_2016=,gnat_2017=,projects,shared]
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]
-	dev-ada/xmlada[gnat_2016=,gnat_2017=]
-	gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
+IUSE="gnat_2016 +gnat_2017"
+
+DEPEND="dev-ada/gnat_util[gnat_2017]
+	dev-ada/gnatcoll[gnat_2017,projects,shared]
+	dev-ada/gprbuild[gnat_2017]
+	dev-ada/xmlada[gnat_2017]
+	dev-lang/gnat-gpl:6.3.0"
 RDEPEND="${RDEPEND}"
 REQUIRED_USE="!gnat_2016 gnat_2017"
 
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index da5c72e95205..a2b671245646 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -1,7 +1,6 @@
 AUX aunit-2016-gentoo.patch 374 BLAKE2B 00d34a835afdc4a1a80f8c4dad23ae4a30a89eb801c3aeb8177a4d0cb838b3edf0c8463c774da212a9be56378f493ddd41aa4a26d976a38f1800999903dd2263 SHA512 0ea27e0d8783788c83a3916071ea0dd5361f21a4fc67727b735986dfc624c9f1bd6aa471229c389f5453001577ca1eec0ecdd0865952a0aa5fe1453787dac33b
-AUX aunit-2017-gentoo.patch 374 BLAKE2B 00d34a835afdc4a1a80f8c4dad23ae4a30a89eb801c3aeb8177a4d0cb838b3edf0c8463c774da212a9be56378f493ddd41aa4a26d976a38f1800999903dd2263 SHA512 0ea27e0d8783788c83a3916071ea0dd5361f21a4fc67727b735986dfc624c9f1bd6aa471229c389f5453001577ca1eec0ecdd0865952a0aa5fe1453787dac33b
-DIST aunit-gpl-2016-src.tar.gz 393489 SHA256 ba1b86b853daef98190a7dfc9858aedcd4cc85219b310356c02348f32dcc77cf SHA512 94721f04ff721bbb572ede3fe7b8b61f9682ecaec8076eec3a0a27a41d9bab86248921671b7e63656f473f8d4ddb3a44ecdfb19f479073cf2ae378d62dc68190 WHIRLPOOL fae3579197384972872966b16022e0248d23d207a55af63c6e9daf94ba152a403fa2164a7d9b81fb3ba1214583f2b5506acd87708ffb16f7ef4c66d1f14a3e13
-DIST aunit-gpl-2017-src.tar.gz 638311 SHA256 c9a574d5a4a16648b1a9294b0d18deb571841b3bbd3ea3cd3ede4a6896faa0f7 SHA512 8aad7acc472af127d7c140fb80bd8f1e26866daba2817a436851704bb9048c8347284c5cf2dd05c0c65590cf05ff01d035c3612a698d19607347e961174b3ab4 WHIRLPOOL 4639eb970ca297121b28272d589d3d436c11496d33539a2e336f307888ca63ee96f4d386de870ee3dabeaee1d40e5535b7a78c834c0ab74af4d235f5aae1079c
-EBUILD aunit-2016.ebuild 1021 BLAKE2B 7ebfc42ee026e5954409f6c64d72ffbad4a71bcdfb297631a224c73c61675ffc6b20e49481d0e8419bbc867d1797472297ed503ee8b7f868463dbdc2f4924e29 SHA512 c930ef72a7242c8bb13db0028337983bc0f17bc48637566003dd04e3459520b1ab164eb0bcea661313dd0ad54a646d54d94179387a48dcecb3c8373ea7c057d9
-EBUILD aunit-2017.ebuild 987 BLAKE2B 6eac87739925912a24eecb82a84e768863f1c84af2b8cf71b9ff570dcebbb199a93920b14f51931b74131e1518040cbb724c264112524290889e6b1d7bcaf790 SHA512 a81c6a9c4e4a245afd74e9d34f75a8f0889ef660539dc9fe37be33c0b530c96b6d5dc7d1bb864cb88c88974dd4fa720274de918c9d1bd394a3d04d203f7ea0bd
-MISC metadata.xml 936 BLAKE2B 13170b9fadaa4684917e63c6b044418ee4638194886cafab38b2f3d60e1c9c80c10920c90e47a7371344c77654941c8925011fc46cc5e47ee97d05910c04ab54 SHA512 663611206da2bf967532848d961a0f2ea04780cfb0c97d5f62c6693b4af83417b7fa32fa76d3520c1184f8d3239f0f88ed503e778444e901393c3c798b6848cd
+DIST aunit-gpl-2016-src.tar.gz 393489 BLAKE2B 188c42d20d287d00553a9c35828b2389a480ed1dbc2f4066de352ee3821fa3dc7db3a5600bca47a3b6b047ac43b0991c961dc4569b790adc2be2a62fec1097fc SHA512 94721f04ff721bbb572ede3fe7b8b61f9682ecaec8076eec3a0a27a41d9bab86248921671b7e63656f473f8d4ddb3a44ecdfb19f479073cf2ae378d62dc68190
+DIST aunit-gpl-2017-src.tar.gz 638311 BLAKE2B aa551202677983451d1c8c9f248d85d58f6de442797ee5a3c14d418de1cd8e9a58a82ee7b8bb5b64da924265ef26c64b5d69e86f0103f0721b2c6e007896f6bb SHA512 8aad7acc472af127d7c140fb80bd8f1e26866daba2817a436851704bb9048c8347284c5cf2dd05c0c65590cf05ff01d035c3612a698d19607347e961174b3ab4
+EBUILD aunit-2016.ebuild 1065 BLAKE2B ef2548bb13d111928bd5c649c104ac30e47f87df1239c098b8a506f72d46068f2d2687e82114ff588a2a8859d343fe9fa51d5e6619adda5c45d812ad1b22a8bb SHA512 9f07e046e3f4e5a04f542cc49ffc719d968a80276fe6054d402e16e570034dd5a734ece83b949f79eb3d9386c6601bd8d6294a90eaf140fa7ec801ce355c09d6
+EBUILD aunit-2017.ebuild 1037 BLAKE2B eac0d1a8d072362a3a9f6ec32727133e78a1b599f984795dd8954a44f548bd1c04646a74aab0be18991e116de6fa9774a0db992cf87c6ad6740f191071b6d5cc SHA512 27efa10a7cf424c04e561e2591552f5996d0eee499e0ff349b0d7171b27c1939d58644114e6ece32c108833be96da038fb73b6572ec5d26635d629d2ce6ce4aa
+MISC metadata.xml 935 BLAKE2B 5b05b2dd0e33d0d2d5b8876d3c0b0bfbc89678383b9a3c635decd8762340703a2f75a31e6408f901a9173f28469d8d32bbaf471de377abddc23c8a0c869c05f5 SHA512 e7afc9ef7b05532b2230943b0bec08045d3bb2c0ba875679de97ac4e7948bc4853054bf99e303e1a75da0ead1c592c45070175f62678329a4929ab49a3e6f72e
diff --git a/dev-ada/aunit/aunit-2016.ebuild b/dev-ada/aunit/aunit-2016.ebuild
index 931da83606ac..452fa5ca584e 100644
--- a/dev-ada/aunit/aunit-2016.ebuild
+++ b/dev-ada/aunit/aunit-2016.ebuild
@@ -14,13 +14,15 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/573990c6c7a447658d00e1cb -> ${MYP}.t
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017"
+IUSE="+gnat_2016 gnat_2017"
 
 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}
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
diff --git a/dev-ada/aunit/aunit-2017.ebuild b/dev-ada/aunit/aunit-2017.ebuild
index 5ddb2617c4e7..e5f793ed48af 100644
--- a/dev-ada/aunit/aunit-2017.ebuild
+++ b/dev-ada/aunit/aunit-2017.ebuild
@@ -15,16 +15,18 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed000
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017"
+IUSE="gnat_2016 +gnat_2017"
 
 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}
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
 
 src_compile() {
 	emake GPRBUILD="gprbuild -j$(makeopts_jobs)"
diff --git a/dev-ada/aunit/files/aunit-2017-gentoo.patch b/dev-ada/aunit/files/aunit-2017-gentoo.patch
deleted file mode 100644
index eeace666b45e..000000000000
--- a/dev-ada/aunit/files/aunit-2017-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- aunit-3.8.0w-src/Makefile.old	2017-01-04 18:13:29.634899987 +0100
-+++ aunit-3.8.0w-src/Makefile	2017-01-04 18:15:59.013219503 +0100
-@@ -29,7 +29,7 @@
- .PHONY: all clean targets install_clean install
- 
- all:
--	$(GPRBUILD) -p $(GPROPTS) lib/gnat/aunit.gpr
-+	$(GPRBUILD) -p $(GPROPTS) lib/gnat/aunit.gpr -cargs $(ADAFLAGS)
- 
- clean-lib:
- 	$(RM) -fr lib/aunit lib/aunit-obj
diff --git a/dev-ada/aunit/metadata.xml b/dev-ada/aunit/metadata.xml
index 8e0def15bbcb..e2d94242dd42 100644
--- a/dev-ada/aunit/metadata.xml
+++ b/dev-ada/aunit/metadata.xml
@@ -10,6 +10,6 @@
 		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
 	</use>
 	<longdescription lang="en">
-		 AUnit is a set of Ada packages based on the xUnit family of unit test frameworks. It’s intended as a developer’s tool to facilitate confident writing and evolution of Ada software. It is purposely lightweight, as one of its main goals is to make it easy to develop and run unit tests, rather than to generate artifacts for process management. The framework supports easy composition of sets of unit tests to provide flexibility in determining what tests to run for a given purpose.
+		AUnit is a set of Ada packages based on the xUnit family of unit test frameworks. It’s intended as a developer’s tool to facilitate confident writing and evolution of Ada software. It is purposely lightweight, as one of its main goals is to make it easy to develop and run unit tests, rather than to generate artifacts for process management. The framework supports easy composition of sets of unit tests to provide flexibility in determining what tests to run for a given purpose.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 0e3e17085b05..244d98241783 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,7 +1,6 @@
 AUX aws-2016-gentoo.patch 1510 BLAKE2B 86cbe9166f800a1b8a3a7d388ff256c17527c85665ad0dd32408d180de59357b5f9a593d7e3ebb3bc511a0a234b2549f7e2e090cdc85e1ed98547cad1d3b5f02 SHA512 29f121d22f1dd21a1228a96c15ba28a61da1e07bdb57ae5f0ba2babb2c8d0b38bab21edeb44fb8480fcb4c9bdf55b1f20f7d6b3668943a1814a5564dd168c92d
-AUX aws-2017-gentoo.patch 1510 BLAKE2B 86cbe9166f800a1b8a3a7d388ff256c17527c85665ad0dd32408d180de59357b5f9a593d7e3ebb3bc511a0a234b2549f7e2e090cdc85e1ed98547cad1d3b5f02 SHA512 29f121d22f1dd21a1228a96c15ba28a61da1e07bdb57ae5f0ba2babb2c8d0b38bab21edeb44fb8480fcb4c9bdf55b1f20f7d6b3668943a1814a5564dd168c92d
-DIST aws-gpl-2016-src.tar.gz 15054562 SHA256 310d7a79fba1cf622f6c8d53103226422c788126198911efef09e372d559db32 SHA512 296825e4683bbf4701a42d52cb0b58ebed8d3715972d0c5f83765987d1e96ab4d6d22835c37c043f49ae106fedf5d61ef22cbe348384c2de388519637e26df0b WHIRLPOOL 48428b840149064f96a1656074cfb2f308abdc546ece87d939ab2f95f05e668caafbe9969ab99770909739fe8a4013337cd1ea8b56a7ed06291114c5d812c62f
-DIST aws-gpl-2017-src.tar.gz 12298806 SHA256 f7b2720f31c21c46bf4bca79e0921a4e796e6a4108be1bada1775eb2ba7fd935 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35 WHIRLPOOL 41081537d1d017bb19d665c6b134b54b56d4841a98f713a94367c6e57915185f8ed7fe983ef641d79ce0cece09211fbd34220df81953dfee393d70824c5728d0
-EBUILD aws-2016.ebuild 1062 BLAKE2B 44b9e5049f4380992e3dc308b65d5456e755de8f3e51bbe5df32b715de672c222ea2e421791aac784037d3cbe1e67fb6a2ab3649c029dce78917a0bda730c324 SHA512 fe58623d1d1f86c84d9f79f9c2fd5a98b50637296b0898db633a74726628100a4b5fd6d12019f04718e8b26d1d8593a5ea41c2c1dc15fccf02b078b65e670d2b
-EBUILD aws-2017.ebuild 1063 BLAKE2B 8fa9794d13545a3c1e2c18b77824e1954fe64302bead932eb9ef501606e522a387dca281febf5bbf6364c557ed8c369680b55aa166889fd6161125b96aee622f SHA512 eaf0879a32e26dbc58abd5a8a36991a616a14222c3dd6f46661d72f5bed26ead08010a8071c868afd783ce41cc666583e8ceb2c0050e1d341cc7f5179274be7a
+DIST aws-gpl-2016-src.tar.gz 15054562 BLAKE2B b9d2c6824cc25a1f73dda4e8cfc957660225e6d52ee5f05e89104bbda9cd30e53879f545ade4c54a65e6aea18b1afa01d98da1328a96406bcdf3436492d67241 SHA512 296825e4683bbf4701a42d52cb0b58ebed8d3715972d0c5f83765987d1e96ab4d6d22835c37c043f49ae106fedf5d61ef22cbe348384c2de388519637e26df0b
+DIST aws-gpl-2017-src.tar.gz 12298806 BLAKE2B 9c45d77dd44da11efe99c6e3128fc5920b39eaaf620e266b2dab394866c2d6a3cd1abe4eb01d9024960ef9046662c0df690f72c687fbe0a64b1021ed9c383828 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35
+EBUILD aws-2016.ebuild 1063 BLAKE2B 8740045c5cc3080020201210ec47cb3d534375cf34252cc8bd224beeadb61abad46458d9c8d3344a5b93678be076221cfb960f899098a62b182e0f1b5d7b7f35 SHA512 4ff9923478be7c849cd4dce904c44ff228e2e66d188f732e61930af8b9a7cdd592b5de788cdce602e6bcb240706caf9a98948436dbc2d288433476e29425d41d
+EBUILD aws-2017.ebuild 1070 BLAKE2B 73b9197184d9975165048ffa6650ca0b0bc05c96e2a960bc150e0575f148f19dee1ce0f8f113c0898c6346dff1967020ab3a4d3912a427f3351b22df118f8665 SHA512 e1d2dcd204465fbffec546df8ee7fed6e7ec72cfd01ae163d93de0de025c49b5dd6cdb3bbda8fb4222389ee882e2e37715401dac2a637ee098f8ffbc3085fd46
 MISC metadata.xml 842 BLAKE2B 7ce0bcea2f920058ef51512403c0acc99222e82d3839dba6b27bde1b4de71fe06f3b53f985223c597466c4ccc112796de8f56f05c3675438e5b75e586cf18b51 SHA512 3d9c37dea2923f66efbb4a66ca226ac7874b216683cf54adacef577593d267f3ffd61799626b347c0d78e87a1165bc4518586e7852e38c02fb335847667a48a4
diff --git a/dev-ada/aws/aws-2016.ebuild b/dev-ada/aws/aws-2016.ebuild
index 90711d2b8ec5..e0d114382774 100644
--- a/dev-ada/aws/aws-2016.ebuild
+++ b/dev-ada/aws/aws-2016.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399112c7a447658d00e1cd -> ${MY_P}.
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017"
+IUSE="+gnat_2016 gnat_2017"
 
 RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static]"
 DEPEND="${RDEPEND}
diff --git a/dev-ada/aws/aws-2017.ebuild b/dev-ada/aws/aws-2017.ebuild
index c6f097ad1dce..919248e920a4 100644
--- a/dev-ada/aws/aws-2017.ebuild
+++ b/dev-ada/aws/aws-2017.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed001
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017"
+IUSE="gnat_2016 +gnat_2017"
 
 RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static]"
 DEPEND="${RDEPEND}
@@ -26,7 +26,7 @@ REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
 
 S="${WORKDIR}"/${MY_P}
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
 
 src_configure() {
 	emake -j1 setup prefix=/usr
diff --git a/dev-ada/aws/files/aws-2017-gentoo.patch b/dev-ada/aws/files/aws-2017-gentoo.patch
deleted file mode 100644
index b33073afa443..000000000000
--- a/dev-ada/aws/files/aws-2017-gentoo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- aws-gpl-2016-src/shared.gpr.old	2017-01-30 20:00:39.022743691 +0100
-+++ aws-gpl-2016-src/shared.gpr	2017-01-30 20:01:20.524985069 +0100
-@@ -130,6 +130,7 @@
-    package Compiler is
- 
-       for Driver ("Makefile") use "";
-+      for Driver ("C") use External ("GCC", "gcc");
- 
-       case Build is
-          when "Debug" =>
-@@ -151,11 +151,11 @@
-       end case;
- 
-       for Switches ("aws-attachments.adb")
--        use Common_Options & Debug_Options & ("-gnatVn");
-+        use Common_Options & Debug_Options & ("-gnatVn") & Adaflags;
-       for Switches ("aws-session.adb")
--        use Common_Options & Debug_Options & ("-gnatVn");
-+        use Common_Options & Debug_Options & ("-gnatVn") & Adaflags;
-       for Switches ("templates_parser.adb")
--        use Common_Options & Debug_Options & ("-gnatVn");
-+        use Common_Options & Debug_Options & ("-gnatVn") & Adaflags;
-       --  Disable validity check on this unit to work-around N728-028
- 
-       --  ADAFLAGS and CFLAGS should come last so that command line
---- aws-gpl-2016-src/include/include.gpr.old	2017-02-17 22:09:14.361695926 +0100
-+++ aws-gpl-2016-src/include/include.gpr	2017-02-17 22:11:36.497215517 +0100
-@@ -54,7 +54,7 @@
- 
-          when "Release" =>
-             for Default_Switches ("Ada") use
--              ("-gnat2012", "-O2", "-gnatws", "-gnatn") & Shared.Global_Options;
-+              ("-gnat2012", "-O2", "-gnatws", "-gnatn") & Shared.Adaflags & Shared.Global_Options;
-       end case;
- 
-       case Shared.S_Target is
diff --git a/dev-ada/gnat_util/Manifest b/dev-ada/gnat_util/Manifest
index ef9b61b43ba8..caf604f6982a 100644
--- a/dev-ada/gnat_util/Manifest
+++ b/dev-ada/gnat_util/Manifest
@@ -1,7 +1,7 @@
 AUX gnat_util-2016-gentoo.patch 3197 BLAKE2B e5a15c5becd1882fa7649c7b18d628dd38c7c7c621e34152110b20b658464ca98fcdffaa9ee90224f7d828f7e935d090f47cb446ceb6f898fac76cac6ce19cf4 SHA512 599d3c2cb1d22513c9ef2200d100a80b55d2efe8d8bf7b541cfb845da2a40d1a8d24234208b92a3fcfeba305cb0157b01576d16129e3979e8869ab4b098bb9f7
 AUX gnat_util-2017-gentoo.patch 2840 BLAKE2B 95e39f8c054cefb2ddc879e44b9e11e49fa91bb3e521440e25ca050e276d3ff067f0d407be29826f550d960cc729f3adabb7d81134906af39c1fb0ce668edec3 SHA512 6fb7c9fd3ac282fd0571aec55acfcafc5a72e8814dd9c158751f36f6bab29d682da9b6e89eca774f424831c2985776b07f6749c97bff4ee1baa423a9ed142846
-DIST gnat_util-gpl-2016-src.tar.gz 1126296 SHA256 8e76d7eb1cbae1d3040b9e4196ab07d6e0dd5d4eeb3f5e0fbeb267b1a3470af5 SHA512 1edb67e762637e9e951356c7be402d7b2b903a05abdc93eadaf5ba98bc7bfa936b4fa2a2ae7eb986200dec755020e53d312d42769512fba2e290099f6030bbd0 WHIRLPOOL c2218ba14f669aa2412be4e0a42b1ffb475c720e608e73bca3bbe42dcaefe2dc4410c4632e0e900a8c72ed92c3ec670bd35935783f43c1eb0eb2cdb7afc4f63e
-DIST gnat_util-gpl-2017-src.tar.gz 868496 SHA256 46910f4248ebbb6cae5e576cae766768d376fdbf459c55f7efca9ea10d4ea8ad SHA512 d5e48c6fafc870f36094d2dfd5f45f2d5b5729c97596afff7475b7838c1c7c029ef57395ca1011ee74d8a4195597ea1f502732e654a02561a7abc72c8a7d3a6a WHIRLPOOL 9db8569a56e5ca61ba9cc76276838bb82b07bd1cf9357540d2716136df85a85144eb4f93c2d8336a67b071cf07dfb7b3c0197a0010442b9d1b65471c057cd0b9
-EBUILD gnat_util-2016.ebuild 1307 BLAKE2B 34468438553683353dc4cf42b4a7c9e36cc5c8d5d2e0baa50e479e9c9f4af22ecb4fee184c764fac7f1f12b5fe929412a41b22a4cc863958794e696f6d954f5c SHA512 14beff76e4dfa5322e86d26be022d0111db1bcace518752d33d19f06ac42085d462a24172a36d387f0060ddce4fb7f623d973ad925f781500696bba93eba8f5d
-EBUILD gnat_util-2017.ebuild 1301 BLAKE2B d55dbca57cd62dd3151df412304a92a54afbb8454a0ae3acc912044ec2dacf18bd8a275ecc68d17ca7d65bd629e0d2f89b96cf88a94401424d3acc0ed133940f SHA512 9e7da34419a6aa471ad45f7faea79bdb264d33ae0d7a2809777beaf897bb476f67f5f1c1679de9cb95895628cc46f874ff76b7c14bc7615c9b0368587878075b
+DIST gnat_util-gpl-2016-src.tar.gz 1126296 BLAKE2B e1e7c2628b6a012ca3ad5809d4ea785a9fa68ed5e7f67a80475ece80161f53d611eb9a383591167d30f2a1125de48299123cc0c0b4807b6bcb4bca197bda78ed SHA512 1edb67e762637e9e951356c7be402d7b2b903a05abdc93eadaf5ba98bc7bfa936b4fa2a2ae7eb986200dec755020e53d312d42769512fba2e290099f6030bbd0
+DIST gnat_util-gpl-2017-src.tar.gz 868496 BLAKE2B d105a59f0533428a4d57b3c81c0818f4d1bd457b113d775fe97f35f7352e03b602ac0e6d7b970e408fb3dd6d30f0d4e60feffccf42dbdc0723a76855b0164ee0 SHA512 d5e48c6fafc870f36094d2dfd5f45f2d5b5729c97596afff7475b7838c1c7c029ef57395ca1011ee74d8a4195597ea1f502732e654a02561a7abc72c8a7d3a6a
+EBUILD gnat_util-2016.ebuild 1308 BLAKE2B 11b5bfc7afd2f9d9ddb6b72fddb5e89d83c61fb9a7220f0731365eca2769d904b91368425093b8f805c4bd499da46ee7787cf18084d1506672baa396427aaf1e SHA512 96dbb211227db1918ff6bc8cb5e91d360f804576f9f7a6eeaf31686e7161109b86474ff67baed28ef9baa13c4127b1f9f24a73d07beff2c7ec5a0ee8d5e2a7dc
+EBUILD gnat_util-2017.ebuild 1235 BLAKE2B 42d41ee344fae4aa675a356da98749d7a5877c2b4f40f6d97a74e5c24bdbe76fe12c24929050c8e30db7bc5b12fcc697916eee6a5b95a0cb31f2305147431e56 SHA512 9d39a0de6d9f60162d4144ec40161bc6f01b4cb5171cc7d0d5e774406d11411207346ba278dbb820558aa392110d93d5dc0120bc5e66eff6807eaebfe1be5d1e
 MISC metadata.xml 1149 BLAKE2B 4dbc973d0a669f2db9c2fee1aad40cd6eab81d453e1cf7805f98a220b8c2f8e91642b4a5e5474befed69357400a7ed70da703f4ce71ba5f3df706c248803fe31 SHA512 d433f228882662e5b896d0ade071d502cee9c260fad096fe2556a5e7c4eb9ce82287edfb0240f96716538160d5403db010712633248bd6c53097951bb899313c
diff --git a/dev-ada/gnat_util/gnat_util-2016.ebuild b/dev-ada/gnat_util/gnat_util-2016.ebuild
index 81f44021d41e..2fc260b394ac 100644
--- a/dev-ada/gnat_util/gnat_util-2016.ebuild
+++ b/dev-ada/gnat_util/gnat_util-2016.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399637c7a447658e0affa6
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017 +shared static static-pic"
+IUSE="+gnat_2016 gnat_2017 +shared static static-pic"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
diff --git a/dev-ada/gnat_util/gnat_util-2017.ebuild b/dev-ada/gnat_util/gnat_util-2017.ebuild
index afceac741060..6116171b45ce 100644
--- a/dev-ada/gnat_util/gnat_util-2017.ebuild
+++ b/dev-ada/gnat_util/gnat_util-2017.ebuild
@@ -15,12 +15,11 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017 +shared static static-pic"
+IUSE="gnat_2016 +gnat_2017 +shared static static-pic"
 
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
+RDEPEND="dev-lang/gnat-gpl:6.3.0"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
+	dev-ada/gprbuild[gnat_2017]"
 REQUIRED_USE="!gnat_2016 gnat_2017"
 
 S="${WORKDIR}"/${MYP}-src
diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest
index e5b59f8e61c4..7848a6b8691f 100644
--- a/dev-ada/gnatcoll/Manifest
+++ b/dev-ada/gnatcoll/Manifest
@@ -2,6 +2,6 @@ AUX gnatcoll-2016-gentoo.patch 14137 BLAKE2B 9e3c7086a4ecce79dbb7d2c21f5d97b46bf
 AUX gnatcoll-2017-gentoo.patch 10577 BLAKE2B 02d129052b0b10429ce8e003b0a0759a547884f92d67b0018170f8d2e8719cf22da1f277f9568673006e8f7abdb4759ec37626e3b4260d343f5560e479f0c729 SHA512 bf61075b9ce327b37d01f36d8fcb38f6f2e197167abb02a1dee9a96d456a710c986ed079a40e07edceb280281f8c8465315f09e5a0e3b880f3db44371ae3efef
 DIST gnatcoll-gpl-2016-src.tar.gz 5687584 BLAKE2B 0ff5489f3e02ceeb44292f0d13907959884a55ec8f00fcadb21ee4e8a07f863a3bae3c7ae18d3fc669895a76b5f8f495699d31af71940a5abd32b156ad5fe247 SHA512 8cf06e7c5d58d3b159855534791e7969882e04856ba9d03982a63dcfc630f5b5910c6cad57fec9b00c3d04008b0cb0a1fb238e349766348fa4548868238ede8a
 DIST gnatcoll-gpl-2017-src.tar.gz 5785988 BLAKE2B 828aff797f7d992bf3f5dda7f8ce8a79e97ecd98253a657fb6e79a2fd08aac97e19cb421f47010f8c1f26442a013b9126ab3a95353d9ce0f29d071601e9dfe2f SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363
-EBUILD gnatcoll-2016.ebuild 2959 BLAKE2B 879163b9525d76c83e29bd6fb5077f9fc2bb296e9acd6a9390dee6da460be8ff821bfb617cbbb190590bf6a96db72d74aa523f012e4b990d252496753b63d09e SHA512 2ef7e10aa95aa7a5496af2c758ebd8073e6a13713789b0420a39f5a0cb4a72bdd5ec1f7ff51e63d42ff283ea928796d6185a448801e7afad09ea21a13380f6c7
-EBUILD gnatcoll-2017.ebuild 3056 BLAKE2B b1f3ea0230c59c1e568685cc5a3e24efffc9fd0854b95fcc97daf24fbafce1f7816bb633f28cc7222419aa8a97b804a175adea55cbf6018d0ac9ea4d03427abd SHA512 541c6bc787d5e68b017f74be394255e6c5a57bbd6fa2094b9a35e761e787ee3373e2d05e43888bc14690dfdc209add2d35be94ab46d68303d1b799de93f1e00f
+EBUILD gnatcoll-2016.ebuild 2960 BLAKE2B 41d19c2422e31f6e1abfdfd98bd2a8891147bb55d81ef77f352a9fc70b42693068bae1c65458506c7ed3c2bf4ef97ba105c3bae3eed3238a5dc4fe265634afb9 SHA512 21be637997513be6b0be976b6945b8e174f0979a984f39b146c0588d3d3a448cfe7f1d8ca0df056a30918a3bda50d56337d296a1073f8bf67f4366e772cae986
+EBUILD gnatcoll-2017.ebuild 3079 BLAKE2B 9dcfd18784474b550678c07d870103274432e69541c2b58fd097501412523f1c9d5514f47a40c7d72f61b7487f1777dd7f8238fa05fa464216cbc6ba5a7a0383 SHA512 7a6056a9227f73e5152e48cd0bc6cbffa19cb9b460ae45e3066b3839d5428d9b861b26d09f268577f3611d3778b2fe53f23a0de49e2d91ea3d80b85248b5710e
 MISC metadata.xml 1473 BLAKE2B dbcae7c0fcf02880fec66bc055d318274499b05714b8065a792f5ff56bd2e4dacc59b77bf7d909495c58f9d667d6703fe8e7594b13993eb0808167ca8bc60d21 SHA512 43c44b85940e585406e90e856f83af23a605d69c3e52af16b17e22eb49de170422a4981c366f19f7554c68a67d4633da117c19eceb8824fa33a7f8e21316ddaa
diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
index b4e04558bddd..c43f62f12724 100644
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5739942ac7a447658d00e1e7
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gmp gnat_2016 gnat_2017 gtk iconv postgresql pygobject projects readline
+IUSE="gmp +gnat_2016 gnat_2017 gtk iconv postgresql pygobject projects readline
 	+shared sqlite static syslog tools"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
index 2064ea175d36..448ee7db83fc 100644
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed016
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gmp gnat_2016 gnat_2017 gtk iconv postgresql pygobject projects readline
+IUSE="gmp gnat_2016 +gnat_2017 gtk iconv postgresql pygobject projects readline
 	+shared sqlite static syslog tools"
 
 RDEPEND="dev-lang/gnat-gpl:6.3.0
@@ -40,7 +40,8 @@ DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2017]"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	pygobject? ( gtk )"
+	pygobject? ( gtk )
+	!gnat_2016 gnat_2017"
 
 S="${WORKDIR}"/${MYP}-src
 
diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest
index b6c7507ee6f6..1cb0ab14f1b8 100644
--- a/dev-ada/gnatmem/Manifest
+++ b/dev-ada/gnatmem/Manifest
@@ -1,7 +1,6 @@
 AUX gnatmem-2016-gentoo.patch 3139 BLAKE2B 240fdce83be5d6776d79138dad494ed3f8deafda92c4107a4554ac5a97afdf26102b8bcdd7c31ac09edde7e0b6b53b4d1bc8c2e89eeab591da93af94ee357d25 SHA512 6be363642a5b5244050b275c436eed25948a2b8eea936b0b41ecd9c312441281d325ae9b41b84affd30eae1172cb31ed719935e96b9adc21707b20b88dabc84e
-AUX gnatmem-2017-gentoo.patch 3139 BLAKE2B 240fdce83be5d6776d79138dad494ed3f8deafda92c4107a4554ac5a97afdf26102b8bcdd7c31ac09edde7e0b6b53b4d1bc8c2e89eeab591da93af94ee357d25 SHA512 6be363642a5b5244050b275c436eed25948a2b8eea936b0b41ecd9c312441281d325ae9b41b84affd30eae1172cb31ed719935e96b9adc21707b20b88dabc84e
-DIST gnatmem-gpl-2016-src.tar.gz 80104 SHA256 bd39c7b18e4f52fdd029b999f7e1af52d01c975063c28ae1ef6875e4fc5e224f SHA512 bc711af9eda55e89a22fee9dbe506a60fbdd718a9f47141a8d13ad4b97c4520c3988e3a55b6c85bb53098e542f655de9572aeefc99d88c41a2645d9f01b2828b WHIRLPOOL 8aee794c18efcbdbb50a4d58b9f247de30dea8d5b0a41034b1e20ad7786eefab5dfd14bf99994340a993d67989eab939ba78097d46933d841686d1bbc68fce0b
-DIST gnatmem-gpl-2017-src.tar.gz 80106 SHA256 11a27a66030b1a074875ccdaa0ffb06e86d687e1904ab0f5922e08bb488e5e7c SHA512 52ba2cfb24314f481ec07e351ff6d8883753dcfe5d0489a78536bf0b841d931055be02271a5d93b2ec15c52fd775d4b177a17de52f9472cc8f352bf044b28897 WHIRLPOOL 6599c8b77e89d7bc1f6b1eea459009aa2626173a7ebe47b65ead3ba76a109699ff8d0f27cfe1cea9fb0a8cb90cf9a897f70cf8af4647f21feec87b422e544c1b
-EBUILD gnatmem-2016.ebuild 798 BLAKE2B 6ece7c705de8475e47a7b5e005ba94ec7c298ba77b51dd031a68aede5e82afa2a0e9db36e2a7806ca8737fea220436f5dd5bf1adfa906299f8d8d528453ef909 SHA512 aa134d61620fac8b91ab2548f632ab35657c07cf73aa8a4cb93471a2907ea8efaa030f4a5e91b135d5df2ea922587bbc749488db52e08a543d4bc68a747d2e9e
-EBUILD gnatmem-2017.ebuild 798 BLAKE2B be8f1beeac2846a2b16667fab975cc8ba8d267a22c7baeee234aaa40f27392c92f70ed60f2b3251f8ec977d7ffdd047cd4af7edcb483a4731498be03db6aac54 SHA512 f1549b01ac1d8a23562e741cc2e1ac4034f49f60c72d247b6a9432d7903b442ad51f1a6bb72c35aa636820388b9c2696323fcd08ff48a92f941bd11906ee169c
+DIST gnatmem-gpl-2016-src.tar.gz 80104 BLAKE2B c7ccdf4a8b2c91117550592763c467a32befc00ad3fa6488963635be283d6e84dd572123d9586166af215dd845aa785f5953dae7fadca6e49fbb6004af0576fa SHA512 bc711af9eda55e89a22fee9dbe506a60fbdd718a9f47141a8d13ad4b97c4520c3988e3a55b6c85bb53098e542f655de9572aeefc99d88c41a2645d9f01b2828b
+DIST gnatmem-gpl-2017-src.tar.gz 80106 BLAKE2B 81f5b2fe4cacf383a39230bf3ebbbbfce0cd0a774b0289a78774dacedbfa0f2ca385b5538e1d12a075383158ff3c657d3a645f8f08be62fe6a437c9f7cd4b971 SHA512 52ba2cfb24314f481ec07e351ff6d8883753dcfe5d0489a78536bf0b841d931055be02271a5d93b2ec15c52fd775d4b177a17de52f9472cc8f352bf044b28897
+EBUILD gnatmem-2016.ebuild 842 BLAKE2B dd7e2a614fb95e1efd71c52b656add578e0f19d75ea5ee196583af2d5a52fa04c953719cfc2b4a6ce78ad0cfbd87e9d0cbe60760f0971480b10dea6255fdd0cf SHA512 4e664ce22d13588ff3df666eab80c33eeb11e02e9a8afe5133f7a09174e61e7b60ec35468fcfa74773473adb841b2df31d659e36adec12dce8b346a5ac85be91
+EBUILD gnatmem-2017.ebuild 848 BLAKE2B 3b84c0264ea45eceb521e601c0294c2d73f11f338e4b64177f9aa8224b97c76e93dba33764e720042743ce07de47b84584b395735ab6d36be17da428193b58dd SHA512 458273979293719d0332de7f911593f5cf8f14968cd53a3b20ed94b4ddd941d9190bc69dda2e97a121a41c7b9d937f9dae2bc7b9a42c5cce89a4833c32b1bbd8
 MISC metadata.xml 1138 BLAKE2B 867c1ccc45c510480cc4e93b62534182248cfe2e7aad4e5e8e3c5fef153590c2a9832687a5614786b115145d477ddc74a38008566266fa44e9e5e0a4769332d1 SHA512 1b4794806992a99021a8c8c0d8c49374ca2ca676b5ac0dd60fd2e433d8f91225033255a59ab5e5adea2ed0fea20ce704ad7b7f2aa2c7538f8d504ba3df122b7b
diff --git a/dev-ada/gnatmem/files/gnatmem-2017-gentoo.patch b/dev-ada/gnatmem/files/gnatmem-2017-gentoo.patch
deleted file mode 100644
index 69530dd24b23..000000000000
--- a/dev-ada/gnatmem/files/gnatmem-2017-gentoo.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- 1/configure.in.old	2016-12-08 20:57:53.942004080 +0100
-+++ 1/configure.in	2016-12-08 21:00:10.393677257 +0100
-@@ -2,23 +2,14 @@
- AC_INIT(gnatmem.gpr.in)
- AC_CANONICAL_SYSTEM
- AC_PROG_CC(gcc)
--AC_CHECK_TOOL(GNATBIND,gnatbind,"no")
--if test ${GNATBIND} = "no"; then
--   AC_MSG_ERROR(Ada compiler needed,1)
--fi
-+AC_CONFIG_HEADERS(config.h:config.in)
-+AC_DEFINE_UNQUOTED(TARGET, "${target}", [Configured target name.])
- AC_ARG_WITH(binutils-buildtree,
-             [AC_HELP_STRING(
-              [--with-binutils-buildtree=<dir>],
-              [Specifify location of binutils build tree])],
-             BINUTILS_OBJDIR=$withval,
-             BINUTILS_OBJDIR=no)
--AC_MSG_CHECKING([for binutils build tree validity])
--if test -f "$BINUTILS_OBJDIR/bfd/libbfd.a"; then
--   AC_MSG_RESULT(yes)
--else
--   AC_MSG_RESULT(no) 
--   AC_MSG_FAILURE([need valid binutils build tree directory (got $BINUTILS_OBJDIR)])
--fi
- 
- AC_ARG_WITH(binutils-sources,
-             [AC_HELP_STRING(
-@@ -26,21 +21,6 @@
-              [Specifify location of binutils sources])],
-             BINUTILS_SRCDIR=$withval,
-             BINUTILS_SRCDIR=auto)
--if test "$BINUTILS_SRCDIR" = "auto"; then
--   BINUTILS_SRCDIR=`cat "$BINUTILS_OBJDIR/Makefile" | sed -n -e "/^ *srcdir *=/ s/^ *srcdir *= *// p"`
--   case "$BINUTILS_SRC_DIR" in
--     /*) ;;
--      *) # assume we have relative path
--         BINUTILS_SRCDIR="$BINUTILS_OBJDIR/$BINUTILS_SRCDIR";;
--   esac
--fi
--AC_MSG_CHECKING([for binutils source dir validity])
--if test -f "$BINUTILS_SRCDIR/bfd/Makefile.in"; then
--   AC_MSG_RESULT(yes)
--else
--   AC_MSG_RESULT(no)
--   AC_MSG_FAILURE([need valid binutils sources directory])
--fi
- 
- AC_SUBST(BINUTILS_OBJDIR)
- AC_SUBST(BINUTILS_SRCDIR)
---- gnatmem-gpl-2016-src/gnatmem.gpr.in.old	2017-02-02 22:15:30.247906007 +0100
-+++ gnatmem-gpl-2016-src/gnatmem.gpr.in	2017-02-02 22:17:22.604974363 +0100
-@@ -10,8 +10,10 @@
-    for Languages use ("ada", "c");
- 
-    package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-       for Default_Switches ("ada") use ("-O2", "-W", "-Wall", "-gnatpg");
-       for Default_Switches ("c")   use ("-O2",
-+                                        "-I..",
-                                         "-I" & BINUTILS_OBJDIR & "/binutils",
-                                         "-I" & BINUTILS_OBJDIR & "/bfd",
-                                         "-I" & BINUTILS_SRCDIR & "/include");
-@@ -19,8 +21,8 @@
- 
-    package Linker is
-       for Default_Switches ("ada") use
--         (BINUTILS_OBJDIR & "/bfd/libbfd.a",
--          BINUTILS_OBJDIR & "/libiberty/libiberty.a",
-+         ("-lbfd",
-+          "-liberty",
-           "@LIBDL@",
-           "@LIBZ@");
-    end Linker;
---- gnatmem-gpl-2015-src/src/libaddr2line.c.old	2017-01-04 21:03:36.185233702 +0100
-+++ gnatmem-gpl-2015-src/src/libaddr2line.c	2017-01-04 21:04:17.680455390 +0100
-@@ -23,9 +23,9 @@
- #include <string.h>
- #include <stdlib.h>
- 
--#include "bfd.h"
--#include "libiberty.h"
--#include "demangle.h"
-+#include <bfd.h>
-+#include <libiberty/libiberty.h>
-+#include <libiberty/demangle.h>
- 
- static asymbol **cur_syms;		/* Symbol table.  */
- static bfd *cur_bfd;
diff --git a/dev-ada/gnatmem/gnatmem-2016.ebuild b/dev-ada/gnatmem/gnatmem-2016.ebuild
index 5875024baefd..1b7bae00d069 100644
--- a/dev-ada/gnatmem/gnatmem-2016.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2016.ebuild
@@ -14,11 +14,13 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/573995c8c7a447658e0affa2 -> ${MYP}.t
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017"
+IUSE="+gnat_2016 gnat_2017"
 
 RDEPEND=""
 DEPEND="dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
 
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
+
 S="${WORKDIR}"/${MYP}
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
diff --git a/dev-ada/gnatmem/gnatmem-2017.ebuild b/dev-ada/gnatmem/gnatmem-2017.ebuild
index ee97065ed89f..c9a384fa74dc 100644
--- a/dev-ada/gnatmem/gnatmem-2017.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2017.ebuild
@@ -14,14 +14,16 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed033 -> ${MYP}.t
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017"
+IUSE="gnat_2016 +gnat_2017"
 
 RDEPEND=""
 DEPEND="dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
 
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
+
 S="${WORKDIR}"/${MYP}
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
 
 src_prepare() {
 	default
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 6e518fa6f03a..60d1e2b9b86b 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -2,10 +2,10 @@ AUX gprbuild-2016-gentoo.patch 9724 BLAKE2B 6e37028cfd54bb69f8b28e7f12a1f8756c27
 AUX gprbuild-2016.xml 4083 BLAKE2B 3380d4e12e4c85c318f971d57d6e4be550a49f18aff5c5254ec1105315e27280db6d388cdb5195f1f48244e9f67c0936c845971c20cfbd56d89c5baa4e0e4d2f SHA512 f6416039c980e7482f8fd45690a68cf190101ebf408bc253332d8a9557ede8d3da5af004fe7f6f2f416e74b6411232c2e17744d20e36cbe50a51d5b21b816b79
 AUX gprbuild-2017-gentoo.patch 2632 BLAKE2B bbc9edc85685bbb4eba6168b61f9a5d192a8a0c0e4626a832159d207b965cea7b9f80d9ecfa6635b7cb90c8ca23b3c429521b254ea3e802276321250b8ce2b2a SHA512 4c4ccc865e44b329d7565b8e282dd3c0c409040e8052a6494924699680a9174701143b68d9e134a4eb6de565bd3877b4aa8d51d77911b0cfb2872ec9633681cd
 AUX gprbuild-2017.xml 3844 BLAKE2B ca36a571c90235d7f2468ffcd3b1f6703a19ae99c582a6c8a88bb9a237d02c119b191d3d8f8f941e974c74192b1ecab28c9d54fb7c4a9de02691989810e772d8 SHA512 13ba2efec9fa9fa0023d052163e186e9ccad1e8c80acff972568323b7e614dd9953f7c2a8f3a5d2f95eaee17072b1c50a2da5c3c2daafa81f5d2ab17fb95bf89
-DIST gprbuild-gpl-2016-src.tar.gz 2142261 SHA256 d51659454bc0aaf1a9a9f1d05aab469a1f3d900065a4542123d3a59ab067275d SHA512 6b9e00248aaee90f3c00e7ce442c2b551b8532ec4d94a4471858d117feb27e91fd6d218995d4b71ee3f1f0677e9547d562fc2cda9ba80c3f6eb8d840ed56eb7e WHIRLPOOL 2afb9d3188f9498cf9cf9a6605081e27a843a15e4c4d5541616b8818757c6f8d458e8d6fbe97bcfc0607ac98d58ec2e4830d17aefd26458b3adcf1489a646945
-DIST gprbuild-gpl-2017-src.tar.gz 2454957 SHA256 0d0a48b8744e4f7230a85008d8213b583459046395704e8ab8c5cabedbf7c616 SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 WHIRLPOOL 905b3a6d64a7f8a6970586b5d1c010badcc24c42e4b406ed7508e0470920b86d0992e80dc2326b10a314cb27519944f5199a7f0d75e72dae8fb096180c22a781
-DIST xmlada-gpl-2016-src.tar.gz 1440671 SHA256 ea64d8da2c5fb01a257fc5bf474b8d4ec40b01dc15b320b9fe260ff2db668ba4 SHA512 d1d7c3d91731394235aed4b80c91b1babe30d5f184282fae8087ee556318475e3923ed628b805693fc89a4d9bb219b0fb0937bc5024a742226da0245d36ed652 WHIRLPOOL b6ebb927d801394ad0b62d9538142c420ab33627582059466d4f64b12c3a45b1b5b489019aef715a59101370220a78507fe03d97c9e67233dfcc4f3aad1f16d7
-DIST xmlada-gpl-2017-src.tar.gz 1578393 SHA256 9b103157eb3ecd697b597ad4e60f56f39028bc2d6ea513d2dce8a3b0e65ac54b SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 WHIRLPOOL 4b2da3fb799f8def6eb6383a9483258340368cc80e96e8ffab207c3c8849c1279a80cf68ca47c8a20ce91c084041bdfa95128a14321454055534d804272ef4dd
-EBUILD gprbuild-2016.ebuild 2506 BLAKE2B 05d845e83a0987c47cd5a143317747df42b4337d4a03277bb4f2f40671ba63ecd88bc72a2cac58db9e9c2198c2df24630d07a2b381af3d5743571d919207b00a SHA512 4334181f60b48a90f03795eccff460a658c1268a2d3576e0d68894adaf042f6f107d905cac4534958f837b5d60f46fc606aca1243b72a3c2b4491d9f95c44799
-EBUILD gprbuild-2017.ebuild 2993 BLAKE2B 3f4b62bb614d66cd52ef6de4ec0427b8c541b8da76b20111fec8459524d3fae020d7fd3871f7759485aed437d12c6f170515ae27f4ce726f6de1477787fc1873 SHA512 6b31d85097144a6cfcb990ad4153ba090802c0c5cb31b52355c0efc2570bd7f425dcd9da5b5b583584d3995daeecbbacee0bf7f2ed3cd404d219d57013bbabf0
+DIST gprbuild-gpl-2016-src.tar.gz 2142261 BLAKE2B 69948427eb6315b9fb2b84755192b53c035f74093dacb34852713083779bf8bd88dac6b38fe7685f6a40ecb2482f78b15a5221913df997847eee8b1359cf6c14 SHA512 6b9e00248aaee90f3c00e7ce442c2b551b8532ec4d94a4471858d117feb27e91fd6d218995d4b71ee3f1f0677e9547d562fc2cda9ba80c3f6eb8d840ed56eb7e
+DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
+DIST xmlada-gpl-2016-src.tar.gz 1440671 BLAKE2B 32998fbdb680f3a1ea7915f144c3039441d8608ded9fe2df99d9b5c9d13436a020c25a9773cced753ffa3ff89a918bbb1ef3ca310cbc58f583682deb7dcc9d09 SHA512 d1d7c3d91731394235aed4b80c91b1babe30d5f184282fae8087ee556318475e3923ed628b805693fc89a4d9bb219b0fb0937bc5024a742226da0245d36ed652
+DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
+EBUILD gprbuild-2016.ebuild 2507 BLAKE2B a3907e12e5150f717489412c5d971b42eac1581e6e1b2662e56ea0c9a997e9c10ecb4b6cc7db2259f815ac951bee3785bf470a84a9e2f76db131795de64d3d8b SHA512 81634ab42782ff032dae9f3e773de64a05d4de862b1e6cea4b0fdfbf05e898adec348e463f0d8925d0a23c0f4236ff567cf944b7e692dc1299239d0c88a67d8a
+EBUILD gprbuild-2017.ebuild 2994 BLAKE2B fa67cda6a5ecefbd8a31fa3c17e227ba24ea25623af1f751a9ee3f47d90d7c18ef7d8540bd1b3531c4d5bdd57ac3ffccc39f1e291189501b71e94838fe06bd39 SHA512 73d30c0990e5779263b9ae5b31971932394e15f0466a99fac0faadedb59bc735ce2a2e8783e50007472ec3d3223f18522090714ff487475e23ead0e3abf3a610
 MISC metadata.xml 1157 BLAKE2B 7a4bc1bbe6ebfb46595c86335b371dc07b7a3f45ab1dbb4cffe382ed8006dd83ba095702ef462580c272341f7ead36e08c6de27900667e4ee2610de4edb1dc76 SHA512 47a7793368b83f9f9101df74a87214ae6615c163a6ffbb24644b102b427ca8559f39f16075b6b5048b8dade368f540f2b8e9b19b376905996b0915c74faff580
diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild b/dev-ada/gprbuild/gprbuild-2016.ebuild
index 60d1b029292a..162f31f1ee4d 100644
--- a/dev-ada/gprbuild/gprbuild-2016.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2016.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="bootstrap gnat_2016 gnat_2017 +shared static static-pic"
+IUSE="bootstrap +gnat_2016 gnat_2017 +shared static static-pic"
 
 DEPEND="!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] )
 	gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
diff --git a/dev-ada/gprbuild/gprbuild-2017.ebuild b/dev-ada/gprbuild/gprbuild-2017.ebuild
index a6101175e17e..889b9667cf1b 100644
--- a/dev-ada/gprbuild/gprbuild-2017.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2017.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="bootstrap gnat_2016 gnat_2017 +shared static static-pic"
+IUSE="bootstrap gnat_2016 +gnat_2017 +shared static static-pic"
 
 DEPEND="!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] )
 	gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 8fe2acbff970..b3820bc5cf29 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -4,4 +4,4 @@ DIST gtkada-gpl-2016-src.tgz 11944697 SHA256 263cc8323e726ae22946508792dd719ff26
 DIST gtkada-gpl-2017-src.tgz 11952333 SHA256 545a125dd41cce2a5e4aeeefbd9538e9e8c7aecbe39c106d27078eb5a649b5f0 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f WHIRLPOOL 69a05d9e8cd956681951a7adeb5eedd5b13f8d403f5fd0f2473e1f2f4579676314cfa7aac81631fe0e8f68362cdb09dde685b8b2bf30801c38f82ae7ba484b88
 EBUILD gtkada-2016.ebuild 1269 BLAKE2B 3c2772faa6a43f7f1ac0e19f1d50b0a840382f2b85280c9d4f446069d8625e71a1d863202cc6f246e327b0e07499800d11242b42c002d7407187a4c119d9620c SHA512 32a327fa14ec2f7a4e658356d8af7cff460cd7faa6b2dd8d20ae593be5689f9bd8824047b0d034b32833fc978b66290cb2b584730828615f87ee9af18116f689
 EBUILD gtkada-2017.ebuild 1269 BLAKE2B 0d9ff1fe178b4804a14cca0f373e938400fbd91004af7184b915ec12bd62e36ce1dbf11d783f349b78ab6f8d65a0d85a62a6ed4803d9a77721f5d1f6cb9369cc SHA512 c82beb455477b41b485a6c8b1dfa34f50d94112f649f205f0c8b3411c637caa9dd9fc84d90d68fce61e95febdf9a504cbda57999739a6cbebcfc84f99f908d78
-MISC metadata.xml 765 BLAKE2B 133d4eb632f6053e1ea36ab6244f871d3204f78d4761a3c0bfbe1caf7621980856ddcb54085e561bcf3ddd5aac1f99c1fffc3b9f8a234922c7a4c1165bb7516d SHA512 f1f6999e5458ffb19a0d2a99a674f67af4a8839eed7c6a50c31c2d839f0f09abb6a2d1ad05bcf5b4c809a04a5d6b6959d9f27c7a3aca6c94bf50f8044201c59a
+MISC metadata.xml 764 BLAKE2B dfc39e0e4fa7b9919f02f67680bdd5c5afa200a45102184b8aa760291694a20431798b5de06b87bbc366590ff7b49dfc5114f466b219bff6c9a1e4abc01344a7 SHA512 96d85d1f4ddc06554fd4fb8572bf55b2bb880423c9813f00a69d7211bf9b441e84feac1e19c04cb99a54396ac220e9d79cdc441e4c10de5805487baebcee0e64
diff --git a/dev-ada/gtkada/metadata.xml b/dev-ada/gtkada/metadata.xml
index ba0f05fc23e8..1b27068850f3 100644
--- a/dev-ada/gtkada/metadata.xml
+++ b/dev-ada/gtkada/metadata.xml
@@ -12,6 +12,6 @@
 		<flag name="static">Build gtkada as static library</flag>
 	</use>
 	<longdescription lang="en">
-		 GtkAda is an Ada graphical toolkit based on Gtk+, providing the complete set of Gtk+ widgets using the Object-Oriented features of this language. GtkAda supports the latest 3.14 stable releases.
+		GtkAda is an Ada graphical toolkit based on Gtk+, providing the complete set of Gtk+ widgets using the Object-Oriented features of this language. GtkAda supports the latest 3.14 stable releases.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index d6ba7943d9cd..58e5c6843058 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,6 +1,6 @@
 AUX xmlada-2016-gentoo.patch 736 BLAKE2B 735fe5de39998f65777c4cdebd2390e9c3eb487d53a505faf8d2a1b083c71a439a5ef127e645b1aa23c9e90cedd82feb2f570d394aab308aed1432f46467a750 SHA512 23de23e5af65b02133730cdc30112e1f0585019aa3e6154b30b029f3d2f3bec74d7fe93549d5c505426eb2a13e6b820bafb78c02885dd70c4f3bf66b754171d4
-DIST xmlada-gpl-2016-src.tar.gz 1440671 SHA256 ea64d8da2c5fb01a257fc5bf474b8d4ec40b01dc15b320b9fe260ff2db668ba4 SHA512 d1d7c3d91731394235aed4b80c91b1babe30d5f184282fae8087ee556318475e3923ed628b805693fc89a4d9bb219b0fb0937bc5024a742226da0245d36ed652 WHIRLPOOL b6ebb927d801394ad0b62d9538142c420ab33627582059466d4f64b12c3a45b1b5b489019aef715a59101370220a78507fe03d97c9e67233dfcc4f3aad1f16d7
-DIST xmlada-gpl-2017-src.tar.gz 1578393 SHA256 9b103157eb3ecd697b597ad4e60f56f39028bc2d6ea513d2dce8a3b0e65ac54b SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 WHIRLPOOL 4b2da3fb799f8def6eb6383a9483258340368cc80e96e8ffab207c3c8849c1279a80cf68ca47c8a20ce91c084041bdfa95128a14321454055534d804272ef4dd
-EBUILD xmlada-2016.ebuild 1236 BLAKE2B ebf64878afece76ca190cda760c5bde72c32b1f95021e2e1524963b1a50ad301954e94f083f914025a217417d04317f7e197e78d992bd56a2599107e08fc4aa3 SHA512 49a1a17034d3e8a4600ae237750528a5568798ebfaf9144280f67eb1e393bb8c030caf09f2f2066b53bcdb415c709c5bbd11b47034cb9e84eae3b43b34fdb2d6
-EBUILD xmlada-2017.ebuild 1480 BLAKE2B 4ed5bcbfa3ba121cb43860ff5a7afcac24c970e52708a897145b3a967b0f5dbbbfbbcbf99d843299e7d8c7b9f27fc83c792e8cb1792596c2a59636cc73bf24b7 SHA512 93b51117c84e55abc54aebe54b95eee4c788044b83f1edbc626c8157a7eecab2c890ca41ac8a4f9530e251f20a1b3745493d1227c282415b78677535429d8a7f
+DIST xmlada-gpl-2016-src.tar.gz 1440671 BLAKE2B 32998fbdb680f3a1ea7915f144c3039441d8608ded9fe2df99d9b5c9d13436a020c25a9773cced753ffa3ff89a918bbb1ef3ca310cbc58f583682deb7dcc9d09 SHA512 d1d7c3d91731394235aed4b80c91b1babe30d5f184282fae8087ee556318475e3923ed628b805693fc89a4d9bb219b0fb0937bc5024a742226da0245d36ed652
+DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
+EBUILD xmlada-2016.ebuild 1237 BLAKE2B 0b53093c667a9d5f7b4f229a5a7d74403bbf39d836e0e05ee7a85f3140d1734b37a727096a90a652c8947771112044cdfb896c6a31d94d01a09ddc477dd029bb SHA512 1a30b3a57563657c760f3c1dca68c523aac805de9bdc0a07036d4376d0ceb1c68f6569a70205a3faa689b69b18537396f85cd2fe526fb14e728723940edbbc3d
+EBUILD xmlada-2017.ebuild 1481 BLAKE2B c26b9a4eaebfb75012a03f9df54555fdfd7b7d757c778fdf1e149937771cd5d4360a19c45cf5f80dea1de372dfc7c892ace4f1826b84fc2491c3823db23beede SHA512 49a749c0d45be451c55035dfccbbe2eba694a10146805b10a461b7941bec13f1706ebe42bba8caa70eb17337cae48bf2bcf5f70a9e42dd98a99d63b6e1c2f06d
 MISC metadata.xml 1125 BLAKE2B 83c42db46eee7113a19c4cabb92e2f2b4607609e3ee4b624a5cf680c9a5d0b8394f31f9f99b973cd563b04a268aaab2f74f4bc2c1209179235f9f4814363087d SHA512 ab8a13a6e09513797895a7966adf026a21aa5f738853b039ec15d7091e32a8dd747c1c179ef92a24f2eb83f0a381c819f891bf35e6b4a90e1085aced8606f14d
diff --git a/dev-ada/xmlada/xmlada-2016.ebuild b/dev-ada/xmlada/xmlada-2016.ebuild
index 51ef27e6c65e..a99eb9103ca9 100644
--- a/dev-ada/xmlada/xmlada-2016.ebuild
+++ b/dev-ada/xmlada/xmlada-2016.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0 ->
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017 +shared static static-pic"
+IUSE="+gnat_2016 gnat_2017 +shared static static-pic"
 REQUIRED_USE="|| ( shared static static-pic )
 	^^ ( gnat_2016 gnat_2017 )"
 
diff --git a/dev-ada/xmlada/xmlada-2017.ebuild b/dev-ada/xmlada/xmlada-2017.ebuild
index b7d4d8f03d5c..4d5d16493c38 100644
--- a/dev-ada/xmlada/xmlada-2017.ebuild
+++ b/dev-ada/xmlada/xmlada-2017.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 ->
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017 +shared static static-pic"
+IUSE="gnat_2016 +gnat_2017 +shared static static-pic"
 REQUIRED_USE="|| ( shared static static-pic )
 	^^ ( gnat_2016 gnat_2017 )"