commit: 898b43776923dbd31730d055fbd37c9bda32bff4 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri Jan 30 19:19:42 2026 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sat Jan 31 18:55:05 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=898b4377
dev-java/jcommander: drop 1.64-r1, 1.82-r1 Closes: https://bugs.gentoo.org/918883 (obsolete) Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Part-of: https://github.com/gentoo/gentoo/pull/45586 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/jcommander/Manifest | 2 - .../jcommander-1.64-DynamicParameterTest.patch | 57 -------------------- dev-java/jcommander/jcommander-1.64-r1.ebuild | 36 ------------- dev-java/jcommander/jcommander-1.82-r1.ebuild | 60 ---------------------- 4 files changed, 155 deletions(-) diff --git a/dev-java/jcommander/Manifest b/dev-java/jcommander/Manifest index 79a06c0847ba..22fa266c1d9b 100644 --- a/dev-java/jcommander/Manifest +++ b/dev-java/jcommander/Manifest @@ -1,3 +1 @@ -DIST jcommander-1.64.tar.gz 4404316 BLAKE2B 17ade214604de2ed8e85fd8b8043483f5b3c6d26b7a59afe2cc83dfa804fa298a2a1a4251ac65f66ad3a89002f532c29ee031b0a26293cbbd4f3df72e9a3a6ac SHA512 aaf7c323d9a829635847774b927d63cc35fbe479271029b8f3fdb94c6839dc26ac55f5c28fefbee6a0219e11c73f2c487c3660bf2f3a7f4033c0e2092d6f2fa4 -DIST jcommander-1.82.tar.gz 4433079 BLAKE2B 08111ae7a85202dc3a082db58f42ef5183b05cae827bc304ba426a3d02bf7a4123f84500e6ec5694578a7aa29c631cca692fe71d67e12a1107c57e1858be4dcf SHA512 1abcb54cec21e95a3e5fc952320a7fca1d480f9900992e686f66df49749b6eee79e18dc670f10cc05b0d2a4f0a72fae302568a51ff193788897878aefc3ff67b DIST jcommander-1.83.tar.gz 4438667 BLAKE2B 9581682599bcf93b4ad8c80e684f7936dfb7c9ddae6cc769b1c45f2955e55aa403df5450c56ac43d2842aa061423ceeef2963c7e87ab97e819c4f32893165132 SHA512 5bc530a6f6694afcc018edf688c3d622003a884316819d099ebed86185e6da7e0a57d4e83db9e47e3de3fc738391f56cc7d9c818749ce5539fada96bfe374358 diff --git a/dev-java/jcommander/files/jcommander-1.64-DynamicParameterTest.patch b/dev-java/jcommander/files/jcommander-1.64-DynamicParameterTest.patch deleted file mode 100644 index 9867533bcf25..000000000000 --- a/dev-java/jcommander/files/jcommander-1.64-DynamicParameterTest.patch +++ /dev/null @@ -1,57 +0,0 @@ -FAILED: usage -java.lang.NullPointerException: Cannot invoke "com.beust.jcommander.Parameter.order()" because "<local3>" is null - at com.beust.jcommander.JCommander$Options$1.compare(JCommander.java:144) - at com.beust.jcommander.JCommander$Options$1.compare(JCommander.java:139) - at java.base/java.util.TimSort.countRunAndMakeAscending(TimSort.java:355) - at java.base/java.util.TimSort.sort(TimSort.java:220) - at java.base/java.util.Arrays.sort(Arrays.java:1307) - at java.base/java.util.ArrayList.sort(ArrayList.java:1721) - at java.base/java.util.Collections.sort(Collections.java:179) - at com.beust.jcommander.JCommander.usage(JCommander.java:1158) - at com.beust.jcommander.JCommander.usage(JCommander.java:1113) - at com.beust.jcommander.dynamic.DynamicParameterTest.usage(DynamicParameterTest.java:40) - at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) - at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.base/java.lang.reflect.Method.invoke(Method.java:568) - at org.testng.internal.MethodInvocationHelper.invokeMethod(MethodInvocationHelper.java:108) - at org.testng.internal.Invoker.invokeMethod(Invoker.java:661) - at org.testng.internal.Invoker.invokeTestMethod(Invoker.java:869) - at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:1193) - at org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:129) - at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:112) - at org.testng.TestRunner.privateRun(TestRunner.java:756) - at org.testng.TestRunner.run(TestRunner.java:610) - at org.testng.SuiteRunner.runTest(SuiteRunner.java:380) - at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:375) - at org.testng.SuiteRunner.privateRun(SuiteRunner.java:340) - at org.testng.SuiteRunner.run(SuiteRunner.java:289) - at org.testng.SuiteRunnerWorker.runSuite(SuiteRunnerWorker.java:52) - at org.testng.SuiteRunnerWorker.run(SuiteRunnerWorker.java:86) - at org.testng.TestNG.runSuitesSequentially(TestNG.java:1306) - at org.testng.TestNG.runSuitesLocally(TestNG.java:1231) - at org.testng.TestNG.runSuites(TestNG.java:1146) - at org.testng.TestNG.run(TestNG.java:1117) - at org.testng.TestNG.privateMain(TestNG.java:1447) - at org.testng.TestNG.main(TestNG.java:1416) - - -=============================================== - JCommander tests - Tests run: 189, Failures: 1, Skips: 0 -=============================================== ---- a/src/test/java/com/beust/jcommander/dynamic/DynamicParameterTest.java -+++ b/src/test/java/com/beust/jcommander/dynamic/DynamicParameterTest.java -@@ -35,10 +35,12 @@ public class DynamicParameterTest { - simple("-Da=b", "-Dc=d"); - } - -+ /* - public void usage() { - DSimple ds = new DSimple(); - new JCommander(ds).usage(new StringBuilder()); - } -+ */ - - public void differentAssignment() { - DSimple ds = new DSimple(); diff --git a/dev-java/jcommander/jcommander-1.64-r1.ebuild b/dev-java/jcommander/jcommander-1.64-r1.ebuild deleted file mode 100644 index 711f0e8997a6..000000000000 --- a/dev-java/jcommander/jcommander-1.64-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.beust:jcommander:${PV}" -JAVA_TESTING_FRAMEWORKS="testng" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Command line parsing framework for Java" -HOMEPAGE="https://jcommander.org/"; -SRC_URI="https://github.com/cbeust/jcommander/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P}" - -LICENSE="Apache-2.0" -SLOT="1.64" -KEYWORDS="amd64 arm64 ppc64" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -PATCHES=( "${FILESDIR}/jcommander-1.64-DynamicParameterTest.patch" ) - -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="testng" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_RUN_ONLY="src/test/resources/testng.xml" -JAVA_TEST_SRC_DIR="src/test/java" - -src_prepare() { - default #780585 - java-pkg-2_src_prepare -} diff --git a/dev-java/jcommander/jcommander-1.82-r1.ebuild b/dev-java/jcommander/jcommander-1.82-r1.ebuild deleted file mode 100644 index 664b5ca6b26f..000000000000 --- a/dev-java/jcommander/jcommander-1.82-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -JAVA_TESTING_FRAMEWORKS="testng" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Command line parsing framework for Java" -HOMEPAGE="https://github.com/cbeust/jcommander"; -SRC_URI="https://github.com/cbeust/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64" - -DEPEND=" - >=virtual/jdk-1.8:* - test? ( dev-java/jackson-annotations:1 ) -" -RDEPEND=" - >=virtual/jre-1.8:* -" - -S="${WORKDIR}/${P}" - -JAVA_SRC_DIR="src/main/java" - -# =============================================== -# Command line suite -# Total tests run: 258, Failures: 3, Skips: 0 -# =============================================== -# -# * ERROR: dev-java/jcommander-1.82::gentoo failed (test phase): -# * Running TestNG failed. - -# https://bugs.gentoo.org/801694 -# Needs "java-util-2-runner-args.patch" from https://github.com/gentoo/gentoo/pull/21319#issuecomment-878128343 -JAVA_TEST_RUNNER_EXTRA_ARGS=( -verbose 3 -usedefaultlisteners true ) - -JAVA_TEST_GENTOO_CLASSPATH="jackson-annotations-1,testng" -JAVA_TEST_EXTRA_ARGS=( -Djava.io.tmpdir="${T}" ) -JAVA_TEST_SRC_DIR=( src/test/java ) -JAVA_TEST_RESOURCE_DIRS=( src/test/resources ) - -src_prepare() { - default - java-pkg_clean -} - -src_test() { - # because module java.base does not export sun.reflect.annotation to unnamed module @0x42bb2aee - local vm_version="$(java-config -g PROVIDES_VERSION)" - if ver_test "${vm_version}" -ge 17; then - JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/sun.reflect.annotation=ALL-UNNAMED ) - fi - java-pkg-simple_src_test -}
