gentoo resync : 29.12.2022

3 files changed, 2 insertions, 47 deletions

diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
index 28d0f8d4ee0d..e7599a630540 100644
--- a/dev-java/commons-cli/Manifest
+++ b/dev-java/commons-cli/Manifest
@@ -1,5 +1,3 @@
-DIST commons-cli-1.4-src.tar.gz 148530 BLAKE2B 72460ee073b4e8c5179da03c3d599cf04b37b5b3aff89e4927b07765bd879acc9ac56f52e7dee03214e21f7ba9e5af3adf54d2f943aebb266bfa9b4983ba0380 SHA512 a5db856f6154e4340aab1865e3b34c752c0dceb8063faa64740ed470d8e6b3e7782242ae51d6bb57a535a6d6dad2943cc3130d7202223b8f89b8cbecdc3d9d4f
 DIST commons-cli-1.5.0-src.tar.gz 156731 BLAKE2B b3bc3c7426f4564187f6b2fecf2977a8d307277cb244bb51064f32e6d2fc0ddb08c539b3bae68bba5ccc2319d0e483f01f6765ae3e86ebfe99eb775564fd7c8f SHA512 aa2165695177c3e4561f68585cafb5434758138d8a863f3db1860477f660cf78664d2afb07cc3bc767bc8fa87befc7eaa5bdead423ee8b883c62ff00aec7cdda
-EBUILD commons-cli-1.4.ebuild 1073 BLAKE2B 47369d5c19d43c955e2cfafed597607929c8cac3d940a7bfd07abad0a9f7527453c55e6ce47c98ec53c2f741884c1049015a5b4d02f1187c0558367865d6068c SHA512 6158af3b2d265f06499174fd392f95ac46feaad3d5b76b8e85448600e724ebbfd6de2614b35d8e3f31b6bd120baf0265403487c42d1c20e2271a1a0df0ed8750
-EBUILD commons-cli-1.5.0.ebuild 1241 BLAKE2B 04ce102c416377aa8b3d217cf6133e5de6f7cace7f013e190f6d657acb1253d7a1875617ca428af3a7b0c50efcd89e90a1468d9d93d16121a537d45ce7706e86 SHA512 6c623f4549da4d5c89e878e496637bd82a4465168ed4a70cb330530e8597316fc3d321f5ecb6ad44ebf704187d042eb073a70c882b7cbfce2717c833729eaf31
+EBUILD commons-cli-1.5.0.ebuild 1238 BLAKE2B ff00a5f32b33c14ed0359c2213ff6b1a2601be8bf2511f4f9e6b56e518f8be515cc6a400e5f718a2123f14b6d0e761ddc286dc1647c25e50dba93565aad5a4cd SHA512 ba1a83a2848c1bee51782a32f9ac3a01f274bb52ef3264eac799d5cd6a48ebe96939e0c0b4be2121665aa1c93beaead053c4cc40d37259e8a2d817b7ceb8565c
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/commons-cli/commons-cli-1.4.ebuild b/dev-java/commons-cli/commons-cli-1.4.ebuild
deleted file mode 100644
index cfe05d27ae26..000000000000
--- a/dev-java/commons-cli/commons-cli-1.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="commons-cli:commons-cli:1.4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java library for working with the command line arguments and options"
-HOMEPAGE="http://commons.apache.org/cli/"
-SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.7"
-
-DEPEND=">=virtual/jdk-1.7
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${P}-src"
-JAVA_SRC_DIR="src/main/java"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc CONTRIBUTING.md NOTICE.txt README.md RELEASE-NOTES.txt
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4)"
-	local TESTS=$(find * -name "*Test.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/commons-cli/commons-cli-1.5.0.ebuild b/dev-java/commons-cli/commons-cli-1.5.0.ebuild
index 8fb0198774dc..5edf37d89a77 100644
--- a/dev-java/commons-cli/commons-cli-1.5.0.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.5.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND=">=virtual/jre-1.8:*"