gentoo resync : 01.12.2017

5 files changed, 13 insertions, 21 deletions

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>