gentoo resync : 25.11.2020

3 files changed, 2 insertions, 29 deletions

diff --git a/dev-java/ant-junit/Manifest b/dev-java/ant-junit/Manifest
index 0db94e4f93ea..4f83918f7292 100644
--- a/dev-java/ant-junit/Manifest
+++ b/dev-java/ant-junit/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-junit-1.10.8.ebuild 496 BLAKE2B aaf3d938343f4fa82ad5021630b602fc004f84afa73784efd8c65d5ba36f7fcd41e111499f14731a897d6a78261c62ae34087cd3b3dffacb84834037b83e4fbc SHA512 2d84e047ac431b74c31fdf337cbfb3c68a1da851bc54b518625619467faec3b1cb83a3b299df4d4562928d0a39ce4000486aad14968fb80cc92213528f57c854
-EBUILD ant-junit-1.10.9.ebuild 500 BLAKE2B de046ac17fee8881c6bf13a216457ec5670f58883cf7ae107319ee8cbe68e23474a613fe4562c971288d476a5d4fcbdbb3c36d11b54a5892e7ac5888f0556c29 SHA512 6ff978b6c34aa84dc9a39cd8da5d0866445e008e1c52348c131b2ad701fe56da3a81a4102f5c41633b5129f712cf8f637afc50a8b9338112ee357295a38a53f7
+EBUILD ant-junit-1.10.9.ebuild 496 BLAKE2B aaf3d938343f4fa82ad5021630b602fc004f84afa73784efd8c65d5ba36f7fcd41e111499f14731a897d6a78261c62ae34087cd3b3dffacb84834037b83e4fbc SHA512 2d84e047ac431b74c31fdf337cbfb3c68a1da851bc54b518625619467faec3b1cb83a3b299df4d4562928d0a39ce4000486aad14968fb80cc92213528f57c854
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junit/ant-junit-1.10.8.ebuild b/dev-java/ant-junit/ant-junit-1.10.8.ebuild
deleted file mode 100644
index e02101593cf1..000000000000
--- a/dev-java/ant-junit/ant-junit-1.10.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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.9.ebuild b/dev-java/ant-junit/ant-junit-1.10.9.ebuild
index 65978134b5b6..e02101593cf1 100644
--- a/dev-java/ant-junit/ant-junit-1.10.9.ebuild
+++ b/dev-java/ant-junit/ant-junit-1.10.9.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