gentoo resync : 15.12.2019

4 files changed, 2 insertions, 82 deletions

diff --git a/dev-java/ant-junit4/Manifest b/dev-java/ant-junit4/Manifest
index 4f4dce112378..bfe667632dd9 100644
--- a/dev-java/ant-junit4/Manifest
+++ b/dev-java/ant-junit4/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-junit4-1.10.5.ebuild 940 BLAKE2B f4eff21908f9362bf6d00892cfbf4db10f898c45e3e207a939c6cc2c4db2591d53d3ffd4570b3537d944138a85185a5a381cf357acf33785e0ae7e3dc1423e1c SHA512 25c9a902be0d5f28cd2fc364a50542d33ecc2f42e8180af31caee13811fd078cef6c724b798d21948a36d7df0adc814cba05a419e7ea66628a16783ea4629cfd
-EBUILD ant-junit4-1.10.7.ebuild 943 BLAKE2B 0ad78e1848caeb51dd1524301f86f7a3b68573d071fbdd1f292e71dc28d0da03f5fbefc9135207497138a49c41a27731d5a3ff39b6a9d2f232a419ce84c680f9 SHA512 3584de5cb4fccc25aff05855ec7f0a740e8203c126e6d633b5f59ad9c88fdbbb49d2e6b141ff2d02ca651f570fee90a59d0548b62b0d677c8b50f86c8bc66cbb
-EBUILD ant-junit4-1.9.13.ebuild 940 BLAKE2B f4eff21908f9362bf6d00892cfbf4db10f898c45e3e207a939c6cc2c4db2591d53d3ffd4570b3537d944138a85185a5a381cf357acf33785e0ae7e3dc1423e1c SHA512 25c9a902be0d5f28cd2fc364a50542d33ecc2f42e8180af31caee13811fd078cef6c724b798d21948a36d7df0adc814cba05a419e7ea66628a16783ea4629cfd
+EBUILD ant-junit4-1.10.7.ebuild 939 BLAKE2B 7ccbe217a1cfef571a1c11aba47c16a78d671abac94b8e4a8a1027dc0c4e941e3f91a1a5e80ceb47aba59319313b1bc37189ec04e442607ca04c605ac1b4890d SHA512 18936a5e9143e89587f9f98619a37b919f6ecce39d02941b8e1cec26f5169ae81edf969a1b465783cc63a625145b9e633cc774a92ec9053904aab1c0ddb02bac
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junit4/ant-junit4-1.10.5.ebuild b/dev-java/ant-junit4/ant-junit4-1.10.5.ebuild
deleted file mode 100644
index 676db3e8bdee..000000000000
--- a/dev-java/ant-junit4/ant-junit4-1.10.5.ebuild
+++ /dev/null
@@ -1,37 +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
-ANT_TASK_DEPNAME="junit-4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-DEPEND="dev-java/junit:4
-	~dev-java/ant-junit-${PV}"
-
-RDEPEND="${DEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="junit-4,ant-junit"
-
-src_prepare() {
-	default
-
-	java-pkg_jar-from --build-only --into "${S}/lib" ant-junit
-}
-
-src_install() {
-	# No registration as ant-task, would be loaded together with ant-junit.
-	java-pkg_dojar build/lib/ant-junit4.jar
-
-	# As we dont't want to depend on and-junit in package.env, because it depends
-	# on junit:0. Instead, we "steal" its jar and record it to our package.env as
-	# if it belongs to this package's classpath.
-	java-pkg_getjar --build-only ant-junit ant-junit.jar
-	java-pkg_regjar $(java-pkg_getjar --build-only ant-junit ant-junit.jar)
-}
diff --git a/dev-java/ant-junit4/ant-junit4-1.10.7.ebuild b/dev-java/ant-junit4/ant-junit4-1.10.7.ebuild
index 7dc055115082..756310d347a2 100644
--- a/dev-java/ant-junit4/ant-junit4-1.10.7.ebuild
+++ b/dev-java/ant-junit4/ant-junit4-1.10.7.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="junit-4"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 DEPEND="dev-java/junit:4
 	~dev-java/ant-junit-${PV}"
diff --git a/dev-java/ant-junit4/ant-junit4-1.9.13.ebuild b/dev-java/ant-junit4/ant-junit4-1.9.13.ebuild
deleted file mode 100644
index 676db3e8bdee..000000000000
--- a/dev-java/ant-junit4/ant-junit4-1.9.13.ebuild
+++ /dev/null
@@ -1,37 +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
-ANT_TASK_DEPNAME="junit-4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-DEPEND="dev-java/junit:4
-	~dev-java/ant-junit-${PV}"
-
-RDEPEND="${DEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="junit-4,ant-junit"
-
-src_prepare() {
-	default
-
-	java-pkg_jar-from --build-only --into "${S}/lib" ant-junit
-}
-
-src_install() {
-	# No registration as ant-task, would be loaded together with ant-junit.
-	java-pkg_dojar build/lib/ant-junit4.jar
-
-	# As we dont't want to depend on and-junit in package.env, because it depends
-	# on junit:0. Instead, we "steal" its jar and record it to our package.env as
-	# if it belongs to this package's classpath.
-	java-pkg_getjar --build-only ant-junit ant-junit.jar
-	java-pkg_regjar $(java-pkg_getjar --build-only ant-junit ant-junit.jar)
-}