gentoo resync : 25.11.2020

3 files changed, 2 insertions, 42 deletions

diff --git a/dev-java/ant-testutil/Manifest b/dev-java/ant-testutil/Manifest
index f4faf88e4fc4..c92deeef4d7e 100644
--- a/dev-java/ant-testutil/Manifest
+++ b/dev-java/ant-testutil/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-testutil-1.10.8.ebuild 968 BLAKE2B 9597a535a9b1eecde71073494284aa17f12ce7f428f6cdc64bdb31c34c53e2cd149fa60705528885507f45ee1c37141a0039970ba0205002a82bfba90a90d14c SHA512 31b9149420d6042af0d3c4aec00a6891cdc9b7f225cebb9caa4c6a6870913325035e4d89161dd9fee391ce81e4472de8a0a6a7bc277da93dfec2c1899cc58e1e
-EBUILD ant-testutil-1.10.9.ebuild 971 BLAKE2B b1ad9f0015e1a8e3b9cc3576f8a32a8581dbff6b76eebda39eda65703fd2a71b245ad6225ddd24b286e8023aabbf1579b1645698031dbc9d86925ce661387833 SHA512 2f44e02643d503cd99e1acff1c4008e9fc7d0908c2af0028fc998fd4b6f7f4d513776d0ce7c0dfe764c1d9e5bb5775f5d5f7d497129fec6a21278ef5169c70fd
+EBUILD ant-testutil-1.10.9.ebuild 968 BLAKE2B 9597a535a9b1eecde71073494284aa17f12ce7f428f6cdc64bdb31c34c53e2cd149fa60705528885507f45ee1c37141a0039970ba0205002a82bfba90a90d14c SHA512 31b9149420d6042af0d3c4aec00a6891cdc9b7f225cebb9caa4c6a6870913325035e4d89161dd9fee391ce81e4472de8a0a6a7bc277da93dfec2c1899cc58e1e
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-testutil/ant-testutil-1.10.8.ebuild b/dev-java/ant-testutil/ant-testutil-1.10.8.ebuild
deleted file mode 100644
index dce4d1840353..000000000000
--- a/dev-java/ant-testutil/ant-testutil-1.10.8.ebuild
+++ /dev/null
@@ -1,37 +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
-
-DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-CDEPEND="dev-java/ant-core:0"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8
-	>=dev-java/junit-4.11:4
-	~dev-java/ant-swing-${PV}
-	~dev-java/ant-junit4-${PV}
-	~dev-java/ant-junitlauncher-${PV}"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8"
-
-# The build system builds much more than it actually packages, so there are many
-# build-only deps, but since those are quite common, it wasn't worth to patch it.
-
-src_unpack() {
-	ant-tasks_src_unpack base
-	java-pkg_jar-from --build-only junit-4,ant-junit4,ant-junitlauncher,ant-swing
-	java-pkg_jar-from --build-only ant-core ant-launcher.jar
-}
-
-src_compile() {
-	eant test-jar
-}
diff --git a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild b/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild
index e8763ba32556..dce4d1840353 100644
--- a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild
+++ b/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_JREVER=1.8
 inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND="dev-java/ant-core:0"