gentoo resync : 25.11.2020

3 files changed, 2 insertions, 50 deletions

diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 824d1b12821a..7e05ff7f3512 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,3 +1,2 @@
-EBUILD ant-1.10.8.ebuild 1642 BLAKE2B d31e2db667b00077054a439ccda45dc2926275438b3f8af2a28509001e21352dcfcdc56f66acb8a59e2938b4f9688a00fa7fec25d98bc10924a43e7be1dd990f SHA512 82188aefc10f3f00c4ef1720bcb94015b8594dc38fc4bc5885c6092c2bcf0379486664510415f2687d2afb972253d808b5bf61d2817daf8da2f00576314262dd
-EBUILD ant-1.10.9.ebuild 1645 BLAKE2B b7996e32d4c692f46019ebcee31f6d7019c132125e14088e2f6af8ec1c4ed56038022b89a477f671ce2ac97f7ad7f55cdb0bb8919396be7a90b712b9acebab04 SHA512 313ef117a8634993b07dd439eaca03c9503ad960921d03b4a06a9b8178e3fdd37e89c6c7da8ed38bf9ed381c73d524a5866880399db137f76bc606601b134f8d
+EBUILD ant-1.10.9.ebuild 1642 BLAKE2B d31e2db667b00077054a439ccda45dc2926275438b3f8af2a28509001e21352dcfcdc56f66acb8a59e2938b4f9688a00fa7fec25d98bc10924a43e7be1dd990f SHA512 82188aefc10f3f00c4ef1720bcb94015b8594dc38fc4bc5885c6092c2bcf0379486664510415f2687d2afb972253d808b5bf61d2817daf8da2f00576314262dd
 MISC metadata.xml 1540 BLAKE2B 5536e37e8d4b18a8b744b88968c8f5f87973dedd25dfc5a0c96202bed4991034e93b57ad9a8737b5dfab6526adfa1e563768f08c6b85442f87f0b4ebc87345a4 SHA512 651f97c959e8322e51a7d937dd5886604e3118249907cbd7c0695e65b91b39c22539aeac2870c4f8ffe49e6f4edb8736459eb68266cfc4cb0baac9e439d0a4e5
diff --git a/dev-java/ant/ant-1.10.8.ebuild b/dev-java/ant/ant-1.10.8.ebuild
deleted file mode 100644
index 20c1a2ead30c..000000000000
--- a/dev-java/ant/ant-1.10.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
-HOMEPAGE="https://ant.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
-	+jsch +junit +junit4 +junitlauncher +log4j +oro +regexp +resolver swing testutil xz"
-
-DEPEND="~dev-java/ant-core-${PV}"
-
-RDEPEND="${DEPEND}
-	~dev-java/ant-core-${PV}
-	~dev-java/ant-junit-${PV}
-	~dev-java/ant-apache-xalan2-${PV}
-	antlr? ( ~dev-java/ant-antlr-${PV} )
-	bcel? ( ~dev-java/ant-apache-bcel-${PV} )
-	bsf? ( ~dev-java/ant-apache-bsf-${PV} )
-	commonslogging? ( ~dev-java/ant-commons-logging-${PV} )
-	commonsnet? ( ~dev-java/ant-commons-net-${PV} )
-	jai? ( ~dev-java/ant-jai-${PV} )
-	javamail? ( ~dev-java/ant-javamail-${PV} )
-	jdepend? ( ~dev-java/ant-jdepend-${PV} )
-	jmf? ( ~dev-java/ant-jmf-${PV} )
-	jsch? ( ~dev-java/ant-jsch-${PV} )
-	junit? ( ~dev-java/ant-junit-${PV} )
-	junit4? ( ~dev-java/ant-junit4-${PV} )
-	junitlauncher? ( ~dev-java/ant-junitlauncher-${PV} )
-	log4j? ( ~dev-java/ant-apache-log4j-${PV} )
-	oro? ( ~dev-java/ant-apache-oro-${PV} )
-	regexp? ( ~dev-java/ant-apache-regexp-${PV} )
-	resolver? ( ~dev-java/ant-apache-resolver-${PV} )
-	swing? ( ~dev-java/ant-swing-${PV} )
-	testutil? ( ~dev-java/ant-testutil-${PV} )
-	X? ( ~dev-java/ant-swing-${PV} )
-	xz? ( ~dev-java/ant-xz-${PV} )
-"
-
-S="${WORKDIR}"
-
-src_compile() { :; }
diff --git a/dev-java/ant/ant-1.10.9.ebuild b/dev-java/ant/ant-1.10.9.ebuild
index 28e798b5fdde..20c1a2ead30c 100644
--- a/dev-java/ant/ant-1.10.9.ebuild
+++ b/dev-java/ant/ant-1.10.9.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://ant.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
 	+jsch +junit +junit4 +junitlauncher +log4j +oro +regexp +resolver swing testutil xz"