Adding metadata

14 files changed, 51 insertions, 400 deletions

diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest
index 244cc31ca06e..fc8e6bf7ee00 100644
--- a/dev-java/commons-codec/Manifest
+++ b/dev-java/commons-codec/Manifest
@@ -2,3 +2,5 @@ DIST commons-codec-1.19.0-src.tar.gz 465560 BLAKE2B 3164070fbdcf9763a17cdb31f27e
 DIST commons-codec-1.19.0-src.tar.gz.asc 488 BLAKE2B 84b1c4f562378dbf078d383ed69087b475a034123219fe820dc243d6a22936d3436730460dec8cf5d63b921dfad674e197ecab09ce9880ade6ce072105d77676 SHA512 1d020a534c00676eddd620ae18357b3ae081eed20450053865a6bc9f46de613b28a2a834b6264d1e4253cdcd7ef3772c44740a278da7727eb65e6f35e3c7fee4
 DIST commons-codec-1.20.0-src.tar.gz 554550 BLAKE2B f62bf570a898f166823c00233b2f34d69b519118ed7b0695afa396f3b8ddf4f83ce684014f5797c6ab08f39c8c6157598ade94f8710d6f66c4109cbd45d7f2b9 SHA512 88a46488470fdeff6627849474cde035113ce34207cf619763227a4acd7f825b97e19db83b6ad548bc9bcd26b9f92a4c00afce437ff5bd3a35ef30f066c94714
 DIST commons-codec-1.20.0-src.tar.gz.asc 488 BLAKE2B db2bbfdd782e588d1146e629bb17490b6d2cfcded80fb4c263a18d697b5604a263fc742aa1efd3f5ece7e3c8b32647e915b2134219ffbc437c5fedc920549cbe SHA512 8f11614c2cf4fb73e5327f8b87fa3a463f255c0599a0a3d3a82e3b8e9075c4f18c7090a5f75e91676348e17da57c6bdb8a8e959845a0f12ff0998956bf1635ec
+DIST commons-codec-1.21.0-src.tar.gz 572343 BLAKE2B 21a5f04a93e2d31ffbd171994ac18df814f39a0150e3a117247b7c33df204531b25c400d75f5614550a97c9cee446ce7ae5ccf20b90958b93e8f02f94279f530 SHA512 62521f0e0a35729d37cf8e297ea3ff14badfcd002497b57a2ce39ec11aa3f729a6f3357b8233a9162c2ff4e612072c6a0216549a74dd7d27ded4b844541f3e8e
+DIST commons-codec-1.21.0-src.tar.gz.asc 228 BLAKE2B 90715e610eec6c8b144c7ead7788dc173a3c9ef85cfe26f71dae62fb77924475758798265dcbad12a0e777e4069493b0f1fd59510e690377f38814f8068376aa SHA512 d73b9a9d0da9b416b9b36519965dc69dd459478737f46d9709e13c886f20d79dd5d6424cfe380437f47f2cc79f676610c83dc8264d62104bf3840eca21afa0ea
diff --git a/dev-java/commons-codec/commons-codec-1.21.0.ebuild b/dev-java/commons-codec/commons-codec-1.21.0.ebuild
new file mode 100644
index 000000000000..4e3029a3e08b
--- /dev/null
+++ b/dev-java/commons-codec/commons-codec-1.21.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple junit5 verify-sig
+
+DESCRIPTION="Implementations of common encoders and decoders in Java"
+HOMEPAGE="https://commons.apache.org/proper/commons-codec/"
+SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/commons/codec/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+
+# [-vintage] because, if junit:5 compiled with 'USE=vintage':
+# Error: Module junit not found, required by org.junit.vintage.engine
+DEPEND="
+	>=virtual/jdk-11:*
+	test? (
+		>=dev-java/commons-io-2.21.0:0
+		>=dev-java/commons-lang-3.20.0:0
+		>=dev-java/hamcrest-3.0:0
+		dev-java/junit:5[-vintage]
+		>=dev-java/opentest4j-1.3.0-r1:0
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_INTERMEDIATE_JAR_NAME="org.apache.${PN/-/.}"
+JAVA_MODULE_INFO_OUT="src/main"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="commons-io commons-lang hamcrest junit-5 opentest4j"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
diff --git a/dev-java/commons-validator/Manifest b/dev-java/commons-validator/Manifest
index c3a5b1b2ce6d..cfc7997886c9 100644
--- a/dev-java/commons-validator/Manifest
+++ b/dev-java/commons-validator/Manifest
@@ -1,4 +1,2 @@
 DIST commons-validator-1.10.0-src.tar.gz 314716 BLAKE2B 403352ece53e0b5c00b92442403f7f0ea77e8e4be8638ced425a04e85d783dbecb865131642901a63072915eedb3eaab933c302ee85ad2a46dd21fc3f23aa227 SHA512 4a89e4b59c6cb255fbb827ec6b8561be12a79d9c1031be6e2fdd9416c4e7aef1917a2578a0c3265562c379081ce9b9c66d93a86d8eb440164c839de00ce15ab6
 DIST commons-validator-1.10.0-src.tar.gz.asc 488 BLAKE2B e6282fae3ff43cdc8bea09bf02ade315e71d370ea9dff3a5524b6584546b1f7d60822bac7d3764814aea284877d09cb68f9b26f31d73ef561eefb4547d3e3052 SHA512 b978babf8b8451976e449626c9685354035404c38cfddede638bdea3df7a7db17bb6196f592b1a625d1810aab7bb6da43cac6f11d7996d81bd5696d09a52352b
-DIST commons-validator-1.9.0-src.tar.gz 296710 BLAKE2B e5f119cd7e6e1fe148038cb62a3bdc01e5d1b8dee37930e9369e331a398dbc86e3b1fdc1a618b69fce0f96c621d23a44f88dccd4a51cd6a4c6df81a3a4c8c3af SHA512 4e36f0ec5b1b8ae9724f020c51396332444d7359988fbcceaab004cde30e223b8130315e85d9b3d568fdc30399e9e503783bb81f217fe5f846f9e14c484a1fe0
-DIST commons-validator-1.9.0-src.tar.gz.asc 488 BLAKE2B 0d7d76a24043c20eda4080273f1535a84256ca1c3b8d52a55b004c62f70f9f6ae481cb6d5667d5b0f0d7468d09041520627127597e1e8d81fc132348e2d8994d SHA512 fa68ae531f7678cb172be1ecd0181999619ef4e711930b880b07156a40f14adbf92fa09c971ab36055936cf6221fda800abc54800eba0aeb90fd95c38175d628
diff --git a/dev-java/commons-validator/commons-validator-1.9.0.ebuild b/dev-java/commons-validator/commons-validator-1.9.0.ebuild
deleted file mode 100644
index 48c8643539ef..000000000000
--- a/dev-java/commons-validator/commons-validator-1.9.0.ebuild
+++ /dev/null
@@ -1,74 +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"
-MAVEN_ID="commons-validator:commons-validator:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Commons component to validate user input, or data input"
-HOMEPAGE="https://commons.apache.org/proper/commons-validator/"
-SRC_URI="mirror://apache/commons/validator/source/${P}-src.tar.gz
-	verify-sig? ( https://downloads.apache.org/commons/validator/source/${P}-src.tar.gz.asc )"
-S="${WORKDIR}/${P}-src"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64"
-IUSE="log4j"
-RESTRICT="test" #839681
-
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
-
-COMMON_DEPEND="
-	>=dev-java/commons-beanutils-1.10.1:0[log4j=]
-	dev-java/commons-collections:0
-	>=dev-java/commons-digester-2.1-r3:2.1[log4j=]
-	>=dev-java/commons-logging-1.3.5:0[log4j=]
-	dev-java/jakarta-servlet-api:4
-	dev-java/slf4j-api:0
-	log4j? (
-		dev-java/log4j-12-api:2
-		dev-java/log4j-api:2
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	>=virtual/jdk-11:*
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	>=virtual/jre-1.8:*
-"
-
-JAVA_GENTOO_CLASSPATH="
-	commons-beanutils
-	commons-collections
-	commons-digester-2.1
-	commons-logging
-	jakarta-servlet-api-4
-	slf4j-api
-"
-
-JAVA_INTERMEDIATE_JAR_NAME="org.apache.${PN/-/.}"
-JAVA_MODULE_INFO_OUT="src/main"
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	if use log4j; then
-		JAVA_GENTOO_CLASSPATH+="
-			log4j-12-api-2
-			log4j-api-2
-		"
-	fi
-}
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index 44fcbcc3c36f..ee60c0b41b58 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1,4 +1,3 @@
-DIST guice-5.1.0.tar.gz 650452 BLAKE2B 66c56b8605d189a3a6834a1de9ba6b7c6600583dfefa7808ae0b0b71d7f07746811a76326fc3ff56f2fd0d377f7bc3eb04d1c996ab2289eb48dff91d2f12b5f0 SHA512 b9719f07725c3188b8b903c8eee74ef59397f85f7452e38ef8ba2b3b66a56cef427d4dcee4e5d9c4033404a2f5cdadc2d40b6f7076b4c08fe1ec109910206e6a
 DIST guice-7.0.0.tar.gz 662679 BLAKE2B a1eafc582d48c85fb61ed76d99cfa72fad8a503cb0c656b8db336be3ad3ec48b947ea2c952e39e6d3184f1791842ba5f27c28fd993f7b6dae4109cf7b7fed766 SHA512 777ca2bd06ab83f0167f194a84be293f33bbcbcd6cce449ecf98440c0d9f0f396791a7cbb5df262a41f21e07b94d0c58fda93d34d2f6d7bfe8c22a503d35f185
 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
 DIST truth-java8-extension-1.1.3.jar 18122 BLAKE2B ca73ece34d5011e414e7603999287c37193fe69b19d72d181208cb943306a657a1506961404d2d44c4085fad1debcd7167031e5fafc932a03fe37a00085cb437 SHA512 7dbab8c67144b1fa16a23105d7c56b87b6936c92b7599fd7af24c4ce595c29d08ac1ba87f7786791bd64fe715ebfe96bf09a010bc2a6dc1844e61657c0a798c1
diff --git a/dev-java/guice/guice-5.1.0-r1.ebuild b/dev-java/guice/guice-5.1.0-r1.ebuild
deleted file mode 100644
index b1fb56915543..000000000000
--- a/dev-java/guice/guice-5.1.0-r1.ebuild
+++ /dev/null
@@ -1,57 +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"
-MAVEN_ID="com.google.inject:guice:5.1.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Guice is a lightweight dependency injection framework for Java 6 and above"
-HOMEPAGE="https://github.com/google/guice"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="4"
-KEYWORDS="amd64 arm64 ppc64"
-
-# Most of the test dependencies are missing in Gentoo.
-RESTRICT="test"
-
-CP_DEPEND="
-	dev-java/aopalliance:1
-	dev-java/asm:9
-	dev-java/error-prone-annotations:0
-	dev-java/guava:0
-	dev-java/javax-inject:0
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-	test? (
-		dev-java/guava-testlib:0
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( {COPYING,{CONTRIBUTING,README}.md} )
-
-JAVA_SRC_DIR=( "core/src" )
-JAVA_RESOURCE_DIRS=( "core/res" )
-
-JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,junit-4"
-JAVA_TEST_SRC_DIR=( "core/test" )
-JAVA_TEST_RESOURCE_DIRS=( "core/test" )
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	mkdir -p "core/res/com/google/inject/" || die
-	cp core/{src,res}/com/google/inject/BUILD || die
-}
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
-}
diff --git a/dev-java/maven-bin/maven-bin-3.9.12.ebuild b/dev-java/maven-bin/maven-bin-3.9.12.ebuild
index 974f8eb6447a..9ab186930af8 100644
--- a/dev-java/maven-bin/maven-bin-3.9.12.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.9.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="3.9"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-sjaranowski )"
 
diff --git a/dev-java/swt/swt-4.38.ebuild b/dev-java/swt/swt-4.38.ebuild
index f9103a10f79b..216638bd8d90 100644
--- a/dev-java/swt/swt-4.38.ebuild
+++ b/dev-java/swt/swt-4.38.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ S="${WORKDIR}/library"
 
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 arm64 ppc64"
 IUSE="cairo opengl webkit"
 
 BDEPEND="
diff --git a/dev-java/testng/Manifest b/dev-java/testng/Manifest
index 0c93aa9768aa..1e6432f6d3ff 100644
--- a/dev-java/testng/Manifest
+++ b/dev-java/testng/Manifest
@@ -1,11 +1,6 @@
-DIST apache-groovy-binary-2.4.21.zip 37467992 BLAKE2B e0f925bad53f0f8a7012f0bea420ec3e5986118cc23cd677a11f619284754eacc15c3012cf780063fef574053781bba924a86e5fa2ac284d86f349ad18173704 SHA512 e2f73405d7521b99e3ce5622cffcc505bbc039ccb1c35696fc895d648a9325937a136cf97a229f7ac1b90b63ad8603881350c4d41e514ad45233fb333d76d510
 DIST apache-groovy-binary-5.0.2.zip 34506332 BLAKE2B db48db7075972de6474ee18a72007db94213db819ef14a7ccbd86f81f5422a1b438948d500c9bb8330aa864e79dd4004434af93a1c5d064852ed12a50a9652cf SHA512 3798c077451a5d5b53b9a02c782c2c1e3c273cea735f8f6e3ed284cf4a0927a89a898fc78e73e449e38b2d94b1297dc8cfae8a42abf8d984f0e847b3a6fa6e73
 DIST groovy-3.0.22.jar 8053888 BLAKE2B 3929db705f735d082b81fa341f49a2a22a461103e5c6af73f6c523bac2e6653199d7a9b4b2999119ec44a3b9c54341fd8744776dbee38685a8d0bda758147cd4 SHA512 6964bdf2a05f9c5e31b0d455c3c7573330d06fcef92358ab0ef6571a71f05d7f329e6e480f2164bbb7c11d44ebfdd16474f4aadb64189d2f5149d6f9f2b7cb58
-DIST groovy-all-2.4.7.jar 7015434 BLAKE2B 23d22ddd78229c485ed9384169acee154258644249b856661e17d1d0efb5518e32473a26962b5d657a09b41d490813ed76254820ffdf39e83869209617b66c2d SHA512 4c26ff9f7137c0506c95f7ba1d4228ce57e16d87b77dd1d114390224207d71d3958460c7b5a239d5f41596ab87e7f4aa7aaea1dfce19a50badf8f9b818329c54
 DIST jlibs-core-3.0.1.jar 273505 BLAKE2B f09857d8c9e9f784f0158a0da6f990fb1cfe98a71b0f6efca47360977409e5818fb96a6f3ba551a82a63f1e33008ed95bd1dfbf47af2dcd9b5cfa5c6d81cb6a6 SHA512 89df63b06a59dd4ea2a039e90443fe70c3b8f2ab6080b525f1b7cde3b3d8e7470b4340e6096753ddecf8e7bf73df8652cef950d8f33a2e47b273d14a778c6d3b
-DIST jquery-3.5.1.jar 313070 BLAKE2B 76abfbd21d83f72a3cfcb666f3a2fcfcf5975e723a462996bac9701caf6b59cb9998746af713ebb1f6bfe49cce91544216cc65dc6819e95e8a15930744685415 SHA512 9f560415b36875958ff1d3c6d37fa79d6d134c5f5fc7719dd21db36d1f24dec39787834b2a9ffb104ec6b56e725ccc524a8ff9b189ced3d68e24296b2daae720
 DIST jquery-3.7.1.jar 307911 BLAKE2B 6aca8f3e1bc5448018b20f04e2a7ae9d3ecde7a9e6471af7a560aa89a52dbadf798244781df843467673a11a9db334414ec4f6610c65bd751b5a5f53e70099c0 SHA512 a15af2262b4bf3f465310877a2e57b8efe6c0654abcd35ac3614d1b79666628786224e1dc19857bded72bc02b9a21cd437adffbed34f21050f9b348a07b11a7d
 DIST kotlin-compiler-2.2.0.zip 78044187 BLAKE2B cc2520d0b93299c715b6be809c94ef0ce2e52f69687429f7e8e1f3fefa9e2e951748b8b0cbef40e51bf47a849210e9e064048707b133a8180c14215c0e763bc5 SHA512 3d5c25cc34e1b916646a1fc5ad8428df52136034fe03e95dcb2b0682eaecb8eeeaf3720422a415872514326e26bb84bb9f6ea46ac5926a77109f56c8421db3e7
-DIST spock-core-1.0-groovy-2.4.jar 588030 BLAKE2B 68d8fad8b6ffb45a18778797ea23d4f3b09256bf4e9f207ee666d07572399cd13522e6f1590219a80e23f6906a2e9eaf1f22c6a3c01717e8c1e99b5d37b89210 SHA512 078c0b16688eaa3134043e58ed4273981797ea92f08723b5508c7d7e4f635278dd5ca731fb294da2a1f35674623d969ee423d4344c2c822e1d4cb8d4f3383790
-DIST testng-6.11.tar.gz 677522 BLAKE2B 2e7bf30fcf805cce5a7ec42f22c39e9f4678642fcde9752c51d118e655189805661edeeff1a3db0e960c79e7542fe25ab8fa6995f142da12b3adc8753fd8a361 SHA512 996d7a18399e16626756b7a790182c7b6bf3453280209d0a09d4a509d698fcad1a80e58ec36702de95bd59c90c237463719ad44934c14390620fc9655d871252
 DIST testng-7.11.0.tar.gz 912532 BLAKE2B 44578931a8d933caacbd9845ffe217f1f70cb7c485c7f0caf4cb09b6780aeb18d8b7aac94d460d6736d9e308572c2e149532d494a4ae229edc1298878aec12cd SHA512 4f45eea5aedd2c26827d8628db79230338c3d49f7efd53ec13ebb28d5090024529960d39bdc53126cdf2c8f17ab8a0ce07424908e3e2f7155f0ff6185dffc0d1
diff --git a/dev-java/testng/testng-6.11-r3.ebuild b/dev-java/testng/testng-6.11-r3.ebuild
deleted file mode 100644
index 9b69765b7e7a..000000000000
--- a/dev-java/testng/testng-6.11-r3.ebuild
+++ /dev/null
@@ -1,102 +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"
-MAVEN_ID="org.testng:testng:6.11"
-JAVA_TESTING_FRAMEWORKS="testng"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Testing framework inspired by JUnit and NUnit with new features"
-HOMEPAGE="https://testng.org/"
-# Presently we install the binary version of jquery since it is not packaged in ::gentoo.
-JQV="3.5.1"
-# Currently we bundle the binary versions of spock-core, groovy-all and apache-groovy-binary.
-# These are used only for tests, we don't install them.
-SCV="1.0-groovy-2.4"
-GAV="2.4.7"
-AGV="2.4.21"
-SRC_URI="https://github.com/testng-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://repo1.maven.org/maven2/org/webjars/jquery/${JQV}/jquery-${JQV}.jar
-	test? (
-		https://repo1.maven.org/maven2/org/spockframework/spock-core/${SCV}/spock-core-${SCV}.jar
-		https://repo1.maven.org/maven2/org/codehaus/groovy/groovy-all/${GAV}/groovy-all-${GAV}.jar
-		https://downloads.apache.org/groovy/${AGV}/distribution/apache-groovy-binary-${AGV}.zip
-	)"
-S="${WORKDIR}/${P}"
-
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm64 ppc64"
-SLOT="0"
-
-CP_DEPEND="
-	>=dev-java/ant-1.10.14-r3:0
-	dev-java/bsh:0
-	dev-java/guice:4
-	dev-java/jcommander:1.64
-	dev-java/junit:4
-	dev-java/snakeyaml:1
-"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/assertj-core:3
-		dev-java/guava:0
-	)"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-DOCS=( README {ANNOUNCEMENT,CHANGES}.txt )
-
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="assertj-core-3"
-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() {
-	java-pkg-2_src_prepare
-	java-pkg_clean ! -path "./src/*"
-
-	rm src/main/resources/META-INF/MANIFEST.MF || die
-}
-
-src_test() {
-	# This contains the compiler groovyc
-	unzip "${DISTDIR}/apache-groovy-binary-${AGV}.zip"
-
-	JAVA_GENTOO_CLASSPATH_EXTRA=":${DISTDIR}/spock-core-${SCV}.jar"
-
-	ejavac -cp "${JAVA_TEST_SRC_DIR}:${PN}.jar:$(java-pkg_getjars --build-only guava)" \
-		src/test/java/test/SimpleBaseTest.java || die
-
-	# java-pkg-simple.eclass expects generated test classes in this
-	# directory and will copy them to target/test-classes
-	mkdir generated-test || die "cannot create generated-test directory"
-	"groovy-${AGV}/bin/groovyc" \
-		-cp "${JAVA_TEST_SRC_DIR}:${DISTDIR}/spock-core-${SCV}.jar" \
-		-d generated-test \
-		src/test/groovy/test/groovy/* || die
-
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/groovy-all-${GAV}.jar"
-	JAVA_TEST_EXTRA_ARGS=( -Dtest.resources.dir=src/test/resources )
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${PN} --main org.testng.TestNG
-
-	java-pkg_newjar "${DISTDIR}/jquery-${JQV}.jar" jquery.jar
-	java-pkg_regjar "${ED}/usr/share/${PN}/lib/jquery.jar"
-
-	java-pkg_register-ant-task
-}