gentoo resync : 04.05.2021

3 files changed, 2 insertions, 43 deletions

diff --git a/dev-java/commons-pool/Manifest b/dev-java/commons-pool/Manifest
index 6b6522f49afc..52581acd1ce5 100644
--- a/dev-java/commons-pool/Manifest
+++ b/dev-java/commons-pool/Manifest
@@ -1,5 +1,3 @@
-DIST commons-pool-1.6-src.tar.gz 321409 BLAKE2B 2ed2bc6d7478217fde271bcc64feefae06aa7f946068e7fa3b2ae055e7c788b2431ba20ce202a2cc879c22d32d6d69cdcc4f8dca6794dc4588b11cda4f665934 SHA512 357dd4b1cab8fccb4116add2bee74036c19cf6102946a1e304dcd3049d3d93f1e405f85349e511a4cc71d0d91382696f97997c9e4014303822b386ac7fbfec93
 DIST commons-pool2-2.2-src.tar.gz 163682 BLAKE2B b9a84b1387cd00eb46cc94726ae3295a73f2f47b824401aca525296eddbf04b6c978a4808014bf7e93c113014e0e2fb0db39d6b9ddb9c651bb385cecd05584a5 SHA512 a9c1a30f497f4a6c28b8b4b82d3b2f801b464fc329d1da4f5087dcd6b923c45bde9ac6f3dc9939025453462f9dfea9fff637db9b4334ed513770a546b4807256
-EBUILD commons-pool-1.6.ebuild 874 BLAKE2B 7f513c1f2526330f6c1e6f886c505d89e7179cdcfd1f9d67d884ac954badb217c27a49648210ea889da950560f5dbf58692a9029bdc45b7b13354dccbacc451c SHA512 66da5c550ae3c669c3ca5146f79b58f99f4ddd258d03827ff2c10a61c5dd8f23cd3587c17c18a6d46f7e792ff4fcbc10cf47583b2ed38a5503b79b9f314ec3a2
-EBUILD commons-pool-2.2.ebuild 1082 BLAKE2B 467590a33e977f283beaa9712c661a1be2330184bfcfadd21b400568ecd87f3017801189bc8e0cfddb1ad977633d103512ac6e0aa7496ec271727e8ef58355d5 SHA512 2cddcf9f36c29894531c5d12c8fdd14441bf6da00289418b8b800138037f79eaea043478dee98b4c4dc73bffe09e273b1e1560487e33523eaaa3f0e49d34af1d
+EBUILD commons-pool-2.2.ebuild 1081 BLAKE2B f14a83155a34530a1d8b04d30572cf622f5f7ee7d51fb67d677f2e659b62d6f3ad1938bed2cf7f178e83accc7ef0994153c8f38b140954b968ed85aa06fba538 SHA512 de717fe70ed9ee2298874a00d6ff1541e94cafb4f5c1c1711e288b4eabc6388a66959199a99df52e7b967c2d56050649db7df21618880e7907a34e7c717cbb38
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-pool/commons-pool-1.6.ebuild b/dev-java/commons-pool/commons-pool-1.6.ebuild
deleted file mode 100644
index ad7179cfd030..000000000000
--- a/dev-java/commons-pool/commons-pool-1.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Provides general purpose object pooling API"
-HOMEPAGE="http://commons.apache.org/pool/"
-SRC_URI="mirror://apache/commons/pool/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit
-		dev-java/junit:0
-	)"
-
-S="${WORKDIR}/${P}-src"
-
-EANT_BUILD_TARGET="build-jar"
-
-src_test() {
-	ANT_TASKS="ant-junit" eant -Dclasspath="$(java-pkg_getjars junit)" test
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}-SNAPSHOT.jar
-	dodoc README.txt RELEASE-NOTES.txt
-
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/commons-pool/commons-pool-2.2.ebuild b/dev-java/commons-pool/commons-pool-2.2.ebuild
index 1ab8287ac992..162292b43aa1 100644
--- a/dev-java/commons-pool/commons-pool-2.2.ebuild
+++ b/dev-java/commons-pool/commons-pool-2.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/commons/pool/source/${MY_P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 COMMON_DEP="dev-java/cglib:3
 	dev-java/asm:4"