gentoo resync : 15.12.2019

4 files changed, 2 insertions, 56 deletions

diff --git a/dev-java/ant-junit/Manifest b/dev-java/ant-junit/Manifest
index 1761dec646a3..aca375ab0a61 100644
--- a/dev-java/ant-junit/Manifest
+++ b/dev-java/ant-junit/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-junit-1.10.5-r1.ebuild 496 BLAKE2B 54692d1ed0dd3ae37b961b67e064378d6ba861276dbf4a2935e52296ff5d11eb868bea3bc50adfb61e6095c3758ce044b139ca16b6cd26be8eb71508b2fbae6a SHA512 0f2e756b2131d5181d71feef7b0d2b395b5c2ed1f5c7df0e7d139fd6c105f70ce4230545c1ceddda1be21674f41e0f8a35049e33d3005a97d5acd071b50c094f
-EBUILD ant-junit-1.10.7.ebuild 500 BLAKE2B 83475c488afb53dc0a9269bebfb4d461bde7b2a153b3bb1bb96366bd64c241bc11a893ed1b2b62ec8eb8e678a3979a1793f52363c20d4edec4be076c58f7575a SHA512 d66c56dd7cd1e34e23c79101359b4e2a926998ec383eb28c2ce71371186d76184a0b5681ac5f48845d876f7f8f6c4b378f7e408683a92614abf6a11b51c0bdd4
-EBUILD ant-junit-1.9.13-r1.ebuild 497 BLAKE2B 0207bc0b6a519399adcb49c2ddcbc1a73ecb39bf54a87e726fd33346ffc6b3f4163b2fcb70796540ec55a143fe38694d580eab5beb5fd34ba10dbf821db27028 SHA512 36ef29c67d3c0051837a474ea185023cc1664f67d7fc4cf7252ac65f8d0e2519e779bf2aecbe77487cea9f9172da0b3f5d3bf56b36e481853438053c65f669ca
+EBUILD ant-junit-1.10.7.ebuild 496 BLAKE2B 286ed5603b8fdde53f11a056b47c05fb5c0423fa38b7b5a22168d5db47a892f9f41ac9be814f79cc3fc8986ce1d8955b755a88fe988d4ddb0732061295857577 SHA512 5ba204c07a7079c70ef36b8729fb15411862a5ce808b148eb1514973dd216b359ae60b61821a77a65e6280b9dd85d0641f2e0dea25da10318736ca0d3bd2551a
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild b/dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild
deleted file mode 100644
index 396f79a943f4..000000000000
--- a/dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="
-	dev-java/junit:0
-	dev-java/junit:4
-"
-RDEPEND="${DEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="junit-4"
-
-src_compile() {
-	eant jar-junit
-}
diff --git a/dev-java/ant-junit/ant-junit-1.10.7.ebuild b/dev-java/ant-junit/ant-junit-1.10.7.ebuild
index 19d5b57501e8..e2d1e14ddca2 100644
--- a/dev-java/ant-junit/ant-junit-1.10.7.ebuild
+++ b/dev-java/ant-junit/ant-junit-1.10.7.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-java/junit:0
diff --git a/dev-java/ant-junit/ant-junit-1.9.13-r1.ebuild b/dev-java/ant-junit/ant-junit-1.9.13-r1.ebuild
deleted file mode 100644
index db0df142a354..000000000000
--- a/dev-java/ant-junit/ant-junit-1.9.13-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="
-	dev-java/junit:0
-	dev-java/junit:4
-"
-RDEPEND="${DEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="junit-4"
-
-src_compile() {
-	eant jar-junit
-}