gentoo resync : 22.05.2021

3 files changed, 2 insertions, 46 deletions

diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest
index 123edbc39886..f93932979b81 100644
--- a/dev-java/commons-codec/Manifest
+++ b/dev-java/commons-codec/Manifest
@@ -1,5 +1,3 @@
 DIST commons-codec-1.15.tar.gz 423639 BLAKE2B 5d9d3dd44fda7eee77048eaa1e28f54f9baff7ad276f7e718f4a4d6c5b26605914809db538e9832bf06b1468a65432645ef9de74aec9f9af9973668a82bd996f SHA512 dcf0b86f269a96362dca5b36b9e764a07e390634804b359d4dbd1a0c50bfcc9f778e3797f196e1f553d76dd25b3c6fd016f0ffbbca856fa6c88d3d55791889ce
-DIST commons-codec-1.7-src.tar.gz 291251 BLAKE2B b8fecdb9b88a21ceb3106a13332493617ecd2c8064c84a1514dec1c1c254e18116ff4926f7445bef4171000ba77da411efd6a93fe80a4795e887832035373e10 SHA512 31358283ac2827cb05486b8ff1512242153f61deb086f7fe145ee3ca38d96e43fba080a1e89a3b8cd44d09761015ff4dbe5226d29b7f9fcd59e68ca7701b28d6
-EBUILD commons-codec-1.15.ebuild 1367 BLAKE2B 8543341062ccf924560573600273bd34a989f62a65fbac2fa09ab1eca097994c683af80542c28691f5ba97c8c4cc2736ad129bef4c2d12a0975d7a120c1e9327 SHA512 1bb458fea0f4dd10f6f4f777ca7a0389204bd083c4a9986a68f16d7392030db67fece5b5c0e9df9a31e09cbc08fe7cb83f5bbe88ba821e2d752899fd7ab92a9a
-EBUILD commons-codec-1.7.ebuild 908 BLAKE2B 54d95f6e45fb34815077188bd9ba7b0370d565ab9a2175715e8e90f2b0d3fffcdb4d0fbe547b68bea1e70e996716bf7187dd06dc6510e5873b0a1309aaa08ec5 SHA512 8f0fd884b856b8c1796fcb6c905b70869fee94d753f442f94531045fa39f4f32ff30dc9aadbdba24135139b59c9bc6e5b6d618b335563149e22e7ee05d6e6c8e
+EBUILD commons-codec-1.15.ebuild 1364 BLAKE2B c672f1bd6d6ef10613ce90e077d50956f1a253aaabebbcb51e8d9315f04459db6b8262ceee4c4cd8daadd0b3ebb2ee08f661ed0a88c1cfb9f4554fe694700273 SHA512 e12d1b08bb1aaa5d17d5ab3193f8453ad57f1a7439766fc7d9ac24e894f1ff310c3b93e6ce4918519d85804cad25f822dc984aa4535da84970aed9c1be37c6fe
 MISC metadata.xml 1360 BLAKE2B 5e996a35877486521352b61fdb44872970caab9497267c9d95d1364bd299838486f1853b46f35ec140259d33e7158bca7224488f21c388caa4fa9e7a153006bb SHA512 d16f70860d4880e50d25e6297823fb71955c147eedd115ca7eda0a0bf6c4cbc6121bf8b12062241192facd4583f10df56a838c84940b5914f75d13f10c96e9ae
diff --git a/dev-java/commons-codec/commons-codec-1.15.ebuild b/dev-java/commons-codec/commons-codec-1.15.ebuild
index 8ab0f3bb6464..92af3cd6ce23 100644
--- a/dev-java/commons-codec/commons-codec-1.15.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.15.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 # Compile dependencies
 # POM: ${P}-src/pom.xml
diff --git a/dev-java/commons-codec/commons-codec-1.7.ebuild b/dev-java/commons-codec/commons-codec-1.7.ebuild
deleted file mode 100644
index 600806b1cef7..000000000000
--- a/dev-java/commons-codec/commons-codec-1.7.ebuild
+++ /dev/null
@@ -1,42 +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"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Implementations of common encoders and decoders in Java"
-HOMEPAGE="http://commons.apache.org/codec"
-SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)"
-
-S=${WORKDIR}/${P}-src
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}*.jar
-
-	dodoc RELEASE-NOTES.txt
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/main/java/*
-}