gentoo resync : 25.11.2020

3 files changed, 2 insertions, 28 deletions

diff --git a/dev-java/ant-apache-bsf/Manifest b/dev-java/ant-apache-bsf/Manifest
index ac2b84993c3e..060645ca52c8 100644
--- a/dev-java/ant-apache-bsf/Manifest
+++ b/dev-java/ant-apache-bsf/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-apache-bsf-1.10.8.ebuild 673 BLAKE2B 27bb3543a976716d6fe96aeaa567bf3dc2febbc9da0c837e7946417ff87da33287ffe0355dedc6c7e44e7fc67813dcd307968276f92e0b15fe1f804d134b9935 SHA512 ba0cb12f7a14c441abad47eac5ab8e5be767ed059d2cf8625d86038d005cba96594622ec4b413ec5b51cbf847fd92d9790e71fc4770e90d0c388811c4cc4d74e
-EBUILD ant-apache-bsf-1.10.9.ebuild 676 BLAKE2B a0be42ee7a1e9a09dce30358a823d120fe2b15e258dfd7b025945fb640b501fab9d584a28b49de3a1b2d5fd9f2d8942db43cb534f8c1631bf4f2209d2329e7eb SHA512 ca276880b47b3a37e27ad811d7eaac47027272d057f34a088e681c1a8d6b1b868f06245100899e4c309233ed27fed93420523d6503e6667a091cfac17f8d68f8
+EBUILD ant-apache-bsf-1.10.9.ebuild 673 BLAKE2B 27bb3543a976716d6fe96aeaa567bf3dc2febbc9da0c837e7946417ff87da33287ffe0355dedc6c7e44e7fc67813dcd307968276f92e0b15fe1f804d134b9935 SHA512 ba0cb12f7a14c441abad47eac5ab8e5be767ed059d2cf8625d86038d005cba96594622ec4b413ec5b51cbf847fd92d9790e71fc4770e90d0c388811c4cc4d74e
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.8.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.8.ebuild
deleted file mode 100644
index 3c8fb636298f..000000000000
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.8.ebuild
+++ /dev/null
@@ -1,23 +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
-ANT_TASK_DEPNAME="bsf-2.3"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="python javascript tcl"
-
-DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Also, >=dev-java/bsf-2.4.0-r1 adds optional support for groovy,"
-		elog "ruby and beanshell. See its postinst elog messages for instructions."
-	fi
-}
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild
index 4fd4bd7de77a..3c8fb636298f 100644
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="bsf-2.3"
 
 inherit ant-tasks
 
-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="python javascript tcl"
 
 DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"