17 files changed, 75 insertions, 282 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index b736d41b41e0..e981e4f83e00 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index 5fd1e36346e8..c6096f2611da 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,8 +1,6 @@
 AUX byte-buddy-1.15.10-Skip-testIgnoreExistingField.patch 1409 BLAKE2B f327cbb42bd8cd2a39a1cda15e4307a9a366f8350c51bd98af2d70e6f9b36e06e21a6a82a2c3a30abe6b8abb5c8e40da4d5601b6b2061625a750de297e4744b3 SHA512 c4d4aa9a0e4719241ead17bf8bf8a04f06055a9985127e892eec000ef02c0d9ee88e76190d8c19e544e1ac99ec87b01a3d00332d5caca842d2e95b1edf608c8c
-DIST byte-buddy-1.14.0.tar.gz 1989303 BLAKE2B c284f54ebc6bf67e4706380f0876f403fcf5ae172a690888d13d6b3399cf41bf1fd8890bf15059f71a9457ec6343254ad1f421f8e4975aa70dd9a2103ab59610 SHA512 e6ccda287935b5ff7104d5c0e4904b0595918a21bcc90c6ac5b2358cc0371b22a4fcac2a95dde9e377c5d1e43077c8b57ea9520a9093b2380ab53c830f107ced
 DIST byte-buddy-1.15.10.tar.gz 2057524 BLAKE2B 7f5e178b3ea31fb30379e49d69f34ba1b9953d705a54c3609bb771f66962af776dee95ea10ab7049e50351362ff87c164782bc4b1b782985ac8f122e5833cb4e SHA512 3b7a02475433193efe8a8e20378369ec18f10c81dd90b428d5393c45fe261f678b1707c92923381b8a3030f8a2e8525fe95e3337ca7e5455cdc5fc2647416d2a
 DIST byte-buddy-1.15.11.tar.gz 2059994 BLAKE2B b5b11de938d2b96518c01cf1bcebb0f34ca6ccdb81e519e0177fa371f438da9ca5aba5749d1a7af0f42a2359c55228f3cbfbfe32f158d4a18fe7f02a5d5bf4f2 SHA512 9e663dfee80e6ae9e4983a39177a94f160e52e3ef1dec54b8f6a90e32c18ae5b36c9e791fd605b43754b2667f6efd7e15a1f7b0ce6c5034945567aef8a6b8aa8
-EBUILD byte-buddy-1.14.0.ebuild 4836 BLAKE2B 157a0deb79c6011aa6facdf995e5cbcac333cfcb7a6bf23cf1d4aef045f30860dd1e1fadd783ee9c98745e369ab0b84a717a2dfea0f281d2e51305686c1dd134 SHA512 cbdba61c44c69f52f8327857618d8238ff131df0463190d4dcd6985cc58cee5691749a20f7208b0fb091fb405dc4a4af52e1b1608729abd18a2bd5ef4af8c1ca
-EBUILD byte-buddy-1.15.10.ebuild 4171 BLAKE2B deffcb1ee56b09079c711eabb422e79118911e6560ac2bc92307821fa950e09cbf806a2bb5afa19a36578c47cef24d86934663b0f5f3a2f2c284760fa369f58d SHA512 f307cfc5696f0a1b3bf5df324ed012b4419c560b2e4ab2788d1d0a9c2f5c47f07a4a46715e67d215bc516ba61c0bcffa2c4fa636b89a9ef889d68e11a600a4f1
+EBUILD byte-buddy-1.15.10.ebuild 4170 BLAKE2B b1848ac9feec92b06972bab829b8521127fb917777d9d632b80677f10e2e7c6e21250ec01317150940212ad971e4e7a4fba510b26d79318d5abd9d00d27155f4 SHA512 3df5984e206a0befe702732ffa448709a6cc1f3d0196415e25877574038e0cfae0a016f519a070357aec60bf370f04ad1b6aad0daa0a550836000685a9b6a965
 EBUILD byte-buddy-1.15.11.ebuild 4173 BLAKE2B 02c21435e490f8e44c9bf97af9abdfd3c1855c250812bb0b8538ea9402575e3567eeb6967f9842ec58df64811b9a857147d8cac42d7be26624a5619645ef5ce0 SHA512 84677f6f5159309821e427779a7033d0829bef426ae46ce388736dba575443b9f27bfcdc73a964a9b20b1ff452f28b530ebb2b3504ad11a14f1c611ae79d6925
 MISC metadata.xml 440 BLAKE2B ef73e69de33dc6bbea38c81b8744fad5ce4764644d9cc6168d7c0f175856e30c3a577ffc597f25f8caf26bacfd80663b55eddde047a346fcb582d883269233b9 SHA512 b27c92e768c2783c90c8b4693c3265a9533a09abe76b2b3bd54e3865d270eed91414fcd89513bc30feb0243ea21f63d354b907b74eb18e98f899811101a6c956
diff --git a/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild b/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild
deleted file mode 100644
index 13232b00c524..000000000000
--- a/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/raphw/byte-buddy/archive/byte-buddy-1.12.23.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.23.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_PROVIDES="net.bytebuddy:byte-buddy-agent:1.12.23 net.bytebuddy:byte-buddy:1.12.23"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM"
-HOMEPAGE="https://bytebuddy.net"
-SRC_URI="https://github.com/raphw/byte-buddy/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-DEPEND="
-	>=virtual/jdk-11:*
-	dev-java/asm:9
-	dev-java/findbugs-annotations:0
-	dev-java/jna:4
-	dev-java/jsr305:0
-	test? (
-		dev-java/mockito:4
-	)
-"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/byte-buddy-${P}"
-
-JAVA_CLASSPATH_EXTRA="
-	asm-9
-	findbugs-annotations
-	jsr305
-	jna-4
-"
-
-src_prepare() {
-	default
-	# https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy-agent/pom.xml#L142-L176
-	cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF || die
-		module net.bytebuddy.agent {
-			requires java.instrument;
-			requires static jdk.attach;
-			requires static com.sun.jna;
-			requires static com.sun.jna.platform;
-			requires java.base;
-			exports net.bytebuddy.agent;
-			exports net.bytebuddy.agent.utility.nullability;
-		}
-	EOF
-
-	# instead of shading byte-buddy-dep we move it into byte-buddy.
-	mv byte-buddy{-dep,}/src/main/java || die "cannot move sources"
-
-	# https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy/pom.xml#L159-L195
-	local exports="$( \
-		sed -n '/<packages.list.external>/,/<\/packages.list.external/p' \
-		byte-buddy/pom.xml \
-		| sed -e 's:^:exports :' -e 's:,:;:' \
-		| grep -v 'packages.list.external\|shade' | tr -s '[:space:]' \
-		)" || die
-	cat > byte-buddy/src/main/java/module-info.java <<-EOF || die
-		module net.bytebuddy {
-			requires static java.instrument;
-			requires static java.management;
-			requires static jdk.unsupported;
-			requires static net.bytebuddy.agent;
-			requires static com.sun.jna;
-			requires static com.sun.jna.platform;
-			requires java.base;
-			${exports}
-		}
-	EOF
-}
-
-src_compile() {
-	einfo "Compiling byte-buddy-agent.jar"
-	JAVA_JAR_FILENAME="byte-buddy-agent.jar"
-	JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources"
-	JAVA_SRC_DIR="byte-buddy-agent/src/main/java"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar"
-	rm -r target || die
-
-	einfo "Compiling byte-buddy.jar"
-	JAVA_JAR_FILENAME="byte-buddy.jar"
-	JAVA_MAIN_CLASS="net.bytebuddy.build.Plugin\$Engine\$Default"
-	JAVA_RESOURCE_DIRS=()
-	JAVA_SRC_DIR="byte-buddy/src/main/java"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy.jar"
-	rm -r target || die
-
-	if use doc; then
-		einfo "Compiling javadocs"
-		rm byte-buddy-agent/src/main/java/module-info.java || die
-		JAVA_SRC_DIR=(
-			"byte-buddy-agent/src/main/java"
-			"byte-buddy/src/main/java"
-		)
-		JAVA_JAR_FILENAME="ignoreme.jar"
-		java-pkg-simple_src_compile
-	fi
-}
-
-src_test() {
-	# instead of shading byte-buddy-dep we move it into byte-buddy.
-	mv byte-buddy{-dep,}/src/test || die "cannot move tests"
-
-	# @Ignore one of 4 tests, https://bugs.gentoo.org/863386
-	sed \
-		-e '/import org.junit.Test/a import org.junit.Ignore;' \
-		-e '/testIgnoreExistingField()/i @Ignore' \
-		-i byte-buddy/src/test/java/net/bytebuddy/build/CachedReturnPluginOtherTest.java || die
-
-	# @Ignore one of 39 tests, https://bugs.gentoo.org/863386
-	sed \
-		-e '/import org.junit.Test/a import org.junit.Ignore;' \
-		-e '/testNoParameterNameAndModifiers()/i @Ignore' \
-		-i byte-buddy/src/test/java/net/bytebuddy/description/method/AbstractMethodDescriptionTest.java || die
-
-	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4"
-
-	einfo "Testing byte-buddy-agent"
-	# https://github.com/raphw/byte-buddy/issues/1321#issuecomment-1252776459
-	JAVA_TEST_EXTRA_ARGS=( -Dnet.bytebuddy.test.jnapath="${EPREFIX}/usr/$(get_libdir)/jna-4/" )
-	JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java"
-	java-pkg-simple_src_test
-
-	einfo "Testing byte-buddy"
-	JAVA_TEST_RESOURCE_DIRS=( byte-buddy/src/test/{resources,precompiled*} )
-	JAVA_TEST_SRC_DIR="byte-buddy/src/test/java"
-
-	JAVA_TEST_EXCLUDES=(
-		# all tests in this class fail, https://bugs.gentoo.org/863386
-		net.bytebuddy.build.CachedReturnPluginTest
-	)
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg_dojar "byte-buddy-agent.jar"
-	java-pkg_dojar "byte-buddy.jar"
-
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-
-	if use source; then
-		java-pkg_dosrc "byte-buddy-agent/src/main/java/*"
-		java-pkg_dosrc "byte-buddy/src/main/java/*"
-	fi
-}
diff --git a/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild b/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild
index f406feeebe76..f082462e97d5 100644
--- a/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild
+++ b/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/byte-buddy-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND="
 	>=dev-java/asm-9.7.1:9
diff --git a/dev-java/checker-framework-qual/Manifest b/dev-java/checker-framework-qual/Manifest
index 3ab87525323d..4916375989ac 100644
--- a/dev-java/checker-framework-qual/Manifest
+++ b/dev-java/checker-framework-qual/Manifest
@@ -1,5 +1,7 @@
 DIST checker-framework-3.47.0.tar.gz 8335232 BLAKE2B 4b6d8f5bb055402e6b368640eb42e4e13173dc847a4b8145e7c306856cab2151c17bfbd2c3a645708e9b7525a1e3f73d4c28c3ae24d038ac0c3119d8fcf671df SHA512 17188ab83ee8c91fb112ed0f750611c7fb5fc17f80a0bbd9b19f1514902770c2a227cf879fb581c8c915fa9827febaa8e67a0188c70df625268118344a281fbd
 DIST checker-framework-3.48.3.tar.gz 8345833 BLAKE2B 6c3f2c641414a7cb388ee2ed672a572ca40157e89976f472c58d1a04d74ec2e24893421757fea1bbaee9791e7fbb6d617cba1c5cdda284debd87250299820518 SHA512 a0a41e7bd70d85b8dcb23d358c0a6f10884f4e119e5ae5e1d17c283beab02ba4183f56b4a07d88e9e30bb4b25ebbd003bde2ecf399bf647d23e46869d414e2d6
+DIST checker-framework-3.48.4.tar.gz 8347976 BLAKE2B 29a874f406ca20d12563950e6f7603c94e8c0672871ec8c3f05bc7f37629cc7fc26ae8743283e55cc69f4eb8c40e1e8fc123ba636d19bba3084cd9f1b36a8b0c SHA512 6495e328c041e0b5fc0fddfc4e5811171531933e7154f95eb39113d7aaa78b08a83860426406f66461614f53c024a55a9486a3dd736bc04fb9c306ab3349157f
 EBUILD checker-framework-qual-3.47.0.ebuild 660 BLAKE2B 14490f050de37909cfb5c89273f4e40b0529bf6bc091edbcbfbd63d7f504db85a4b7329ce9be7ebb8245210c31030cb4cdc054e84be5bcf5b8f639627ddddd66 SHA512 6b9b6103eccc354fc015e98add9caf9a00ebcf6120071d5cd454d1e9ff39a15c7ba0b980f43176a5f655102c64c127a8f17201fd71fe28e80f1e55c4cc086527
 EBUILD checker-framework-qual-3.48.3.ebuild 662 BLAKE2B 51e0c7cb16c0a4186a6d71c3854b495748ce6cfefbc2d29a50f097b30698d7a65740904f4234e4e9d0c59d3c58516b7e3d476d72fc723e430ada29ea9970e89e SHA512 3279d8b00b676fa8ddb5cd4d88a896a57f209a450097813e6d21fa11aa7f54902ea3049a53b4dfe7e36aae7df3cb1460f4db4656cc8ea37b9df6b5d2419a2f0f
+EBUILD checker-framework-qual-3.48.4.ebuild 663 BLAKE2B a6322f138048a38d0c5a751dedfe0b8006d4a6f90d7dd8adf4a7ae9f9f2d13863e83e915560e9e9fb53a6e02422fde1b8abf202709378795cecfafd1175a3f25 SHA512 9efacb612f612dcaac2b4ad15882e3153270f06fa5e4ed5a44961f9e973b99c7e6fdca432054894fcaaece89b69c93df6afc59f4a7010d5d3ee6ed129814f190
 MISC metadata.xml 651 BLAKE2B 2c53d072eaaaa7d09e5d185281efc9c897d1c8008dcbeb791c6b737614aa13f1091bda90b7fea33ff083c32dbd60dec180414af016af94850dee8b2bda8e865a SHA512 3428b96b3eac8b7416aabe2201af09c9bc4c444240ae682750573187a5ba137644aed7cfbcacb3a1162780a9eeb8544b0d6500cefc8f6e62f700271fe185a4d1
diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.48.4.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.48.4.ebuild
new file mode 100644
index 000000000000..435d4b3f0da2
--- /dev/null
+++ b/dev-java/checker-framework-qual/checker-framework-qual-3.48.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.checkerframework:checker-qual:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Annotations for type-checking by the Checker Framework"
+HOMEPAGE="https://checkerframework.org/"
+SRC_URI="https://github.com/typetools/checker-framework/archive/checker-framework-${PV}.tar.gz"
+S="${WORKDIR}/checker-framework-checker-framework-${PV}/checker-qual"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND=">=virtual/jdk-11:*"	# module-info
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/jol-core/Manifest b/dev-java/jol-core/Manifest
index b3a14e604866..aa669fcb1e7e 100644
--- a/dev-java/jol-core/Manifest
+++ b/dev-java/jol-core/Manifest
@@ -1,3 +1,5 @@
 DIST jol-0.16.tar.gz 120373 BLAKE2B 06301e1802c89c76038aec2247cbb45d96cc74afa9f099500f8e5f33b919117e85744bc2b8214b6c9e765a2579a43f256eecc2ba8537e76c81aceaa8694f49dc SHA512 d9abf579d0230f2b6d0e0a33ee11c9599b4f36d945239dd8670bbd00591137c2229e5251b32dd5405fd4b08e0070af70e6b04e4ea4be0c28c4d5bc94874858de
+DIST jol-0.17.tar.gz 121365 BLAKE2B 3bacae2bba0f76799b0d9700201d908e1e04bad5276139b9661e969a0818e526eae1d6a0b0adf38501ef974dd18016710365f9fd578ecf4116896bb1dd44b51a SHA512 ea9424b43779a535a5463bdb11fc760f5fd5ee99ec9fb2706ddff48136739b488d9cebb690cd1d6fd30e5b4e66a2aa024bc878ffad0e56807aa499000d96b239
 EBUILD jol-core-0.16-r1.ebuild 843 BLAKE2B 3836346891a4238aaf77b65cabd4e1078b2be358e52e281a08778a00e7ff062d692ab9d5a252ccd3994832fe9f9cc4e2b4514cdeb05ef4e194e573b38ed5124f SHA512 aba3144db38a963eabe81af2a458cd66e68e67efef1788ada392f5e088d771779a29a721ebb209954dfe84a52129f20355246501845123a8201c6138fcd995f7
+EBUILD jol-core-0.17.ebuild 839 BLAKE2B 7bc3c2f66112e932525a60640e6c8ca5abe91ce34dd8749f4b500326228218e6b4035243be2dc3464b7f47bca251e08d3b00b97c9e33ffd94d89fef11873acda SHA512 57f2093be7f243d5c94f459b671d84ce59c2f416a4ae5f4a14011f59063cc6534fcc1b662a33c16dc79f264e6ac1ce7068a594ff63907f30650117a68a198430
 MISC metadata.xml 313 BLAKE2B 3925dd7555fc2d9739c092e1949399e496d7b2d40bc2219dd95a5c3bba98e398e57e64eb30414e6efe5e432582ec52b3b2926c7858da7a09ec2590f72b52948a SHA512 e7d4a307cc24ee5ff8f7d5c1c65c87bd7ff2edbc48730355f05faa50c35c7f3dcb4d4667dce909ce77d299da603503b2c30eab4e68f1293f5f4410d20bd53314
diff --git a/dev-java/jol-core/jol-core-0.17.ebuild b/dev-java/jol-core/jol-core-0.17.ebuild
new file mode 100644
index 000000000000..ef35447f37fe
--- /dev/null
+++ b/dev-java/jol-core/jol-core-0.17.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-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.openjdk.jol:jol-core:0.17"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN%-core}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Java Object Layout: Core"
+HOMEPAGE="https://openjdk.org/projects/code-tools/jol/"
+SRC_URI="https://github.com/openjdk/jol/archive/${PV}.tar.gz -> jol-${PV}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/asm:0
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
+JAVA_SRC_DIR="${PN}/src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,asm"
+JAVA_TEST_SRC_DIR="${PN}/src/test/java"
diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest
index 5f85052e89fa..2dcaa6b012c9 100644
--- a/dev-java/mockito/Manifest
+++ b/dev-java/mockito/Manifest
@@ -4,7 +4,6 @@ DIST mockito-2.28.2.tar.gz 875085 BLAKE2B d0aab378c028530724156f999700506fe64f5b
 DIST mockito-4.11.0.tar.gz 1050218 BLAKE2B 7f7298e233c9cdb0b475aa201300a1063fd8efc587f3a4de0cb1caedd6f6506a32f8e9b0548fa5898892515ec96625153a1a2ad65fc8070b7dc6c254206fbbfd SHA512 b1de01c8e9b2fc4eef0013af562efeac7e22babdebbd8c7842ecd55071627e11c5e6ab575436990ea70d4ceefb56fc260333278c8d4b833e454956bf89841fc5
 DIST mockito-core-1.9.5-sources.jar 723074 BLAKE2B e553a923542a1a2574ee0cda5979d168cc3e9644dbbc9fceed2301ae1bac150c4e35dbc4432d50e2479efea2a6cd35ec19c62c3598f61709f1f5dc8959cc0155 SHA512 271e626c3b5be9a7d7c82a2f0bf44077aabd51924b0956a88633ace7fe8c134d8cd1f89ce348ce0d15ccce55a50027e303836d2d2f430500317b6136d308d3d4
 EBUILD mockito-1.9.5-r4.ebuild 712 BLAKE2B bbb94a982384032ed4e2fd38cb32be5feb2b3a7aa35ed054c62d73d5b2dbf8853b594cebfadfa49d3134f89131a4cd875ea0ebbac051c23e00d39378fbe11498 SHA512 34bdf3f6c8182307a41b28371c0e8406aea00e3f47184fde5097076c008992e6cf52341413ccedc003c3685f88d7b52d5aaee161632cec7bb909c1958f3be6b4
-EBUILD mockito-2.28.2-r1.ebuild 3475 BLAKE2B cefad9073947d3d96180e9e2b72bba929d27b377f52f81af4696416d148a1d987f11a125cab9aefa2eacf437d5fb38f3c915e438e36382fcb345e5e1a985e260 SHA512 f83d0c49f05a89184fb50e8a0ac5aef4420b8c68f32e8ec7ccbf3ca17cb9ab3d76d694a111b243801654eac8de2452e1ee92771c24c9612002e702f64b93afb6
-EBUILD mockito-2.28.2.ebuild 3376 BLAKE2B eacb33f6976ae1665d984de0a811470335c9e2490bbb78459ed309b4557236d8dfaa140827028fcf110e9ffa28166084e75b898d571b1bf27d88eaa3f4ac5a2e SHA512 77b40fa3984e0fff77846365c21eb8306d6d81a2e8fa1e19f275258e25be764381a2f13d1a4232e1d14c6d97db733db8bd5e927766bd9136f9bd0d115bcb0f17
+EBUILD mockito-2.28.2-r1.ebuild 3474 BLAKE2B d257c34ef974640b7546d832160171c59bba738681c5e7d6e0ddb0302dc463ccdf4649ea1a2c13b2a24f68c2b06e30c944f93130894e8777873125c6b195ef4c SHA512 47d6260248bd3b748579a0c1c2dfcb170795ac019af5600555fbc549abeef63ef7a60bc6443739de5d1422777d701cb8b000cf922c36cbe99a848c224792c2f1
 EBUILD mockito-4.11.0.ebuild 1228 BLAKE2B 27c976b0ee2e782d471c91ef89708a62002c6e8a385ea67d865ff5430a34ec932146ee57493ce9684c7d566b1d9f1f54b709287bf0b2fb93b465b7596c641957 SHA512 189d3b3d14f847efce028a87c1706a26ded43f45e28299177bfb86f18d11398b2f03428ed48d9c4944cc277e199cb85424b0735a34fa78fbe82ab368bf7b119d
 MISC metadata.xml 317 BLAKE2B 209b27a429c1fdeca71c1e215f8fc43bfc66c961b1a3ad3dfcda16d5ea1df51e54cea248f4f152966aa1f91059b91c21fb734c6995f8033150dbda5e1813d121 SHA512 1f7be64d432b4004d2bbf1ec2c6776ec8618875356ea0308b8409f322d48bf3440d692732406ddb3fa7a273c9754c4cc5a6f6cd9808348d0ba8beb7159887a5b
diff --git a/dev-java/mockito/mockito-2.28.2-r1.ebuild b/dev-java/mockito/mockito-2.28.2-r1.ebuild
index d691c2ee07e7..3bbd8b65d910 100644
--- a/dev-java/mockito/mockito-2.28.2-r1.ebuild
+++ b/dev-java/mockito/mockito-2.28.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 ~arm64 ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 # Tests need a version of byte-buddy supporting Java 21. #930103
 CP_DEPEND="
diff --git a/dev-java/mockito/mockito-2.28.2.ebuild b/dev-java/mockito/mockito-2.28.2.ebuild
deleted file mode 100644
index 92706ad5b55e..000000000000
--- a/dev-java/mockito/mockito-2.28.2.ebuild
+++ /dev/null
@@ -1,106 +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="org.mockito:mockito-core:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Mockito mock objects library core API and implementation"
-HOMEPAGE="https://github.com/mockito/mockito"
-SRC_URI="https://github.com/mockito/mockito/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 ~arm64 ppc64"
-
-CP_DEPEND="
-	dev-java/asm:9
-	dev-java/byte-buddy:0
-	dev-java/objenesis:0
-"
-
-DEPEND="
-	dev-java/junit:4
-	dev-java/opentest4j:0
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-	test? ( dev-java/assertj-core:3 )
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-"
-
-# see https://bugs.gentoo.org/903897
-PATCHES=(
-	"${FILESDIR}/mockito-2.28.2-skip-failing-tests.patch"
-	"${FILESDIR}/mockito-2.28.2-fix-unused-stubbings-test.patch"
-)
-
-JAVA_AUTOMATIC_MODULE_NAME="org.mockito"
-JAVA_CLASSPATH_EXTRA="junit-4 opentest4j"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_EXCLUDES=(
-	org.mockito.internal.junit.JUnitRuleTest # We run it in JAVA_TEST_RUN_ONLY
-	org.mockito.internal.util.reflection.DummyClassForTests # No runnable methods
-	org.mockito.internal.util.reflection.DummyParentClassForTests # No runnable methods
-	org.mockito.junit.TestableJUnitRunner # No runnable methods
-	org.mockitoutil.TestBase #  No runnable methods
-)
-JAVA_TEST_GENTOO_CLASSPATH="assertj-core-3,junit-4"
-JAVA_TEST_RUN_ONLY=(
-	# This needs to run separately, otherwise one of its 4 tests would fail.
-	org.mockito.internal.junit.JUnitRuleTest
-)
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	default
-	# dev-java/byte-buddy is built from byte-buddy-dep without shaded stuff.
-	sed \
-		-e 's:net.bytebuddy.jar.asm:org.objectweb.asm:' \
-		-i src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java \
-		-i src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	mv target/classes/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.{class,raw} || die
-	jar ufv mockito.jar -C target/classes org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.raw || die
-}
-
-src_test() {
-	# Increasing number of test failures with higher Java versions
-	# Test failures are documented in https://bugs.gentoo.org/903897
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -ge 11; then
-		JAVA_TEST_EXCLUDES+=(
-			org.mockito.internal.stubbing.defaultanswers.ReturnsMocksTest
-			org.mockitousage.bugs.GenericsMockitoAnnotationsTest
-		)
-	fi
-	if ver_test "${vm_version}" -ge 17; then
-		JAVA_TEST_EXCLUDES+=(
-			org.concurrentmockito.ThreadsRunAllTestsHalfManualTest
-			org.mockitousage.matchers.InvalidUseOfMatchersTest
-			org.mockitousage.serialization.DeepStubsSerializableTest
-			org.mockitousage.stubbing.StubbingWithDelegateTest
-		)
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED )
-	fi
-	# First run what needs to run separately
-	java-pkg-simple_src_test
-	# And then the other tests
-	JAVA_TEST_RUN_ONLY=""
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index bd3bf5b1f485..6c2a691368c3 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -33,7 +33,7 @@ DIST OpenJDK8U-jdk_x64_linux_hotspot_8u432b06.tar.gz 103033330 BLAKE2B 940dbba03
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u432b06.tar.gz 109538778 BLAKE2B fc00cb8789e874b5ea8c85ed15f988a7d445e93562e21ee0d8cb35e24af0df455cc9dfa7bdd0c93749c48d8c2a7d845ba5c67d0f8199884682dbdd7369eba3dc SHA512 668e557ac0f9438908d3d8659e478f83cca0da6fd3f6a5dd61a214a46401818deb9eb48891120628052d550cb2546cfd89febc0f8814973f662bd3f8357ebf03
 EBUILD openjdk-bin-11.0.25_p9.ebuild 3183 BLAKE2B 02e074b8eb4be70ea24d84ba28817e63848531440471c05ff7b0e8c1b085a82670b84af16cf267463bbaf639750d5fe9caa6f78eb5b4a3c4a98d3575a90e8507 SHA512 9b37045ffe35d5c91634737f44e7c4a0733fe569fa2d59d7b077a0af4e4273dbf39b16abdc1ec1a638f6b3a3a13ea08069831a2c896de072fae264dbaa0cb5f9
 EBUILD openjdk-bin-17.0.13_p11.ebuild 3215 BLAKE2B f2ec6fe938342dbdce0a068c391d99520bc657b6d70edbd90b5690a63ab4229724792a1e247ecddce7a207abc448c145f70786fe01f81ad1850050a6553a1d39 SHA512 5c458e8e7001beb6c791ad7b82e1e4d6cb759f4ab3065a8e7b2b1ad82a57488b159c52f1a29afd35aa398f9f76ecd1f80258674de631f9f0a2ed30e40b514d55
-EBUILD openjdk-bin-21.0.5_p11.ebuild 3245 BLAKE2B c04b7d757849f3ddd8ba3276531f94d838e2406eddf7cf61e58bb1ecaa570ebc156f9b0d7ca798587cfbc0f23711f05a502d0569ec98fb8249afeccf27616a66 SHA512 d004a7a422a70a97cccafbc4fe58052ce7b1ba956ff04500b49536cb24b8a4bbad1194820a6ee08249083a05012009abc3de26e4921a4d3a818dd3d8e5e5bba8
+EBUILD openjdk-bin-21.0.5_p11.ebuild 3244 BLAKE2B f3662b3df32641ce5688231d68af1d65b650da771c1520e504a2479dbc585046693e1ad964a58c79d7ac9786b4c9e21b4a9d998e2610f64e776b9b50c53513cb SHA512 9be1a111ce4678f37d2cc9beb77dc3ab905ae881d686786f17503b76d5ea1e2e163a37344499c581313d6e75829c4aaac464672d8c0057422271e1303cc91200
 EBUILD openjdk-bin-25_p4_beta.ebuild 3244 BLAKE2B e8d619e3cd047b15fda4f677b2d24f2e5f08488d67505a4ae4a8de0ad216c64e79807954e3a5e45408f2ca6da842a4d766735c30df5a019e6fead621ca157d42 SHA512 aa4a4b1288cbf94137b5d1a648a2fcbb25890c9bf1023aef7c86d27bde4b4dd5bb9d226678aaee5f8bc5c72a30f1d9bbeca31b357f547547689b2731cab904f9
 EBUILD openjdk-bin-8.432_p06.ebuild 2936 BLAKE2B 6a60e6aa39cb48a07345b57bb30f8184bc2297957b0b71cc819c395815203ca16978b4008eb05bb21ebb6e54ab533da877e6f6f4a62711163b0b90aa7df46d6a SHA512 6149ff525bc36f48b61ab64f988698d6fca229844f03f3099e9f4d58e47446e711bb06f76bd06910d75f0f2ef040b0e3cb5b0c11019884cd0705162792a9056d
 MISC metadata.xml 1059 BLAKE2B 07f5d1d3aff8e962f70522b1fd1b33d9589695e1ccec43191bc31d065f48ff0efde065ac25d96ae994b6eb15fad9a6dcf2a24cc3c2b37633df242ba8b9d5e35b SHA512 a5094da75f572407c4391fb449469c56c4f1a6b86b8e72be98db45d8cadb9f142bc11a2e0a9131cba5d4fe2c9942edcd8e43066caddf8cab8638fbaba230e7b6
diff --git a/dev-java/openjdk-bin/openjdk-bin-21.0.5_p11.ebuild b/dev-java/openjdk-bin/openjdk-bin-21.0.5_p11.ebuild
index 05863220f290..a4636d98d3cc 100644
--- a/dev-java/openjdk-bin/openjdk-bin-21.0.5_p11.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-21.0.5_p11.ebuild
@@ -42,7 +42,7 @@ S="${WORKDIR}/jdk-${MY_PV}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT=$(ver_cut 1)
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
 IUSE="alsa cups headless-awt selinux source"
 
 RDEPEND="
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 4d76034d464c..f834980fa21f 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -6,6 +6,6 @@ DIST OpenJDK21U-jre_x64_linux_hotspot_21.0.5_11.tar.gz 51849867 BLAKE2B 6769bd34
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u432b06.tar.gz 41407945 BLAKE2B 99d146ceb6627be04b30bde28691df1362f2acc147a8b260d9633fb11d9ef2f23f2a0876a6cd32515dc0541ce1f5feb475793225266da9197ac7392db13c512a SHA512 c32343125e66005c9239d1002fad2a183bc3834dc1be5f85ca9bf6535bc40bc629d7e538cefc0d07cc2b49275a54ebd19098e43aecfc34cbd40e549da902b894
 EBUILD openjdk-jre-bin-11.0.25_p9.ebuild 1998 BLAKE2B 2110836c46d6079d88d453a3057e77cf8c76a273d2afed8cce6552e181357d744675fec2c436d2c294284be2b5951916f80ba08d506942b25210f79451ea3020 SHA512 24693feea7018ad27cdad4405128b46c859da493bef70a01e2a0914dec0b0e08f51c201800aa78ea52a78fcb8bce9616981eb53844938ca0aab91010921dac4d
 EBUILD openjdk-jre-bin-17.0.13_p11.ebuild 1998 BLAKE2B 2110836c46d6079d88d453a3057e77cf8c76a273d2afed8cce6552e181357d744675fec2c436d2c294284be2b5951916f80ba08d506942b25210f79451ea3020 SHA512 24693feea7018ad27cdad4405128b46c859da493bef70a01e2a0914dec0b0e08f51c201800aa78ea52a78fcb8bce9616981eb53844938ca0aab91010921dac4d
-EBUILD openjdk-jre-bin-21.0.5_p11.ebuild 1998 BLAKE2B bbd07258ab2d7533b611121aa8ddee02950cda4536f730af63c5f203847f36f9f96705ae2494d41af4ae54d6bbea89c0744a6a115d4e1b00ed1772e68f982935 SHA512 60a0cc83c476c0578433823683f160bfb301f33be9ca728226194ed8c625c56f66149dece709aaf7d1626a9bc2c7ce25735c0d857382493a28e77f8229818d21
+EBUILD openjdk-jre-bin-21.0.5_p11.ebuild 2004 BLAKE2B 5e356cde87244b0eb2cb4b8fb2fee36906f8bfcc67ec977678fbcb551133d513473ae8eeaa8ccdaaf78082e8f1a536d145c210cff9e03b491cd11eb73c2cf002 SHA512 5793080a93869cfc1b61a2e5e86020de1f4bed5a69cf360beea351d36e91abb17d7abb615b004144b1a54d2e643ac3b149e69169ad3336e44b7d592aada31df6
 EBUILD openjdk-jre-bin-8.432_p06.ebuild 1833 BLAKE2B 5b4c1f5e8cc03712fd969653a85dfe53517fa56d488aae953f78ca38dd33fd3433f172be1ca2fa9d35cdabbf9e11c3c375c5e10633096791aad1e1aa33788a1e SHA512 7c64ea39325b3838b078af5acfdbe6f86c7698d809b1b721592fd33cc0f08325c52e5995c2e2038120c17ee8aa0761873ee440ff6ccac5488d5e7c6c000463ae
 MISC metadata.xml 655 BLAKE2B e05648526464c16e698e8fc1b16a4c7ab646ad42402241a5a23eecd209406446b9a77a46f1ed55d27a924ffa7019ce8cf976f3037a8adc091b1406c501c35e88 SHA512 437ded048327540f6010e462448317eef13da67f5cfca0b62c15fd2367f1a5bfb125b73de9228d3054d2001bef557e5d9a13f80686678df9c03bd6c10b4d1fe2
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.5_p11.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.5_p11.ebuild
index a8fd6c79ea49..a2dced3a8d7e 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.5_p11.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.5_p11.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net/"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64"
+KEYWORDS="amd64 arm64"
 IUSE="alsa cups headless-awt selinux"
 
 RDEPEND="
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index ed314013671d..3a335a16a989 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -24,7 +24,7 @@ DIST openjdk-bootstrap-8.402_p06-ppc64.tar.xz 34476368 BLAKE2B 1f896772f5e40a279
 DIST openjdk-bootstrap-8.402_p06-x86.tar.xz 37076244 BLAKE2B bd50f84e8ac2ee9850c158c7e7d9fae9741112230dcd6e314163911921d63e3222cd3f4ab9d08bbaacbf6d9bfce9a1a9336e21088fba6396613489a701b30797 SHA512 fe5719e0bbf9bcd6eb9790ebd4da34e7f6c99fe4b7d41de2b5d00b20ebe76a77d857c726d1a71b7f40657ca2a9aa08eaa9efc1ab4be60016f66af95530b454b5
 EBUILD openjdk-11.0.25_p9.ebuild 9003 BLAKE2B e8b0c87b9fb1322893cb137cf7eb94c29e0b4d33720d40d464c5d4c171297642eedcbcb66f637c963c07d83db84d551f7d536e5ba6c8510f6140f6051fa15134 SHA512 3ed25ec77e46faf8843085a3eceabf801a242ed0471eed32d344c871cb1e006477009d9a19db748ff1fd083ac0b7874f364d48360ee258bb57e3bdfcdd79227b
 EBUILD openjdk-17.0.13_p11.ebuild 9423 BLAKE2B 269c2108f9807cac55c140e93901566537d99c865238da907be7e2542664eebde575e02fa425414e786cde43ec804937819e4311036ac9b74c4c81cce964b0fc SHA512 d1c49ce3d13496a945a362fe52b1b6cebe43280b82e41a32180c077e0c9c0e60ef5f4c752a3288331ac33e659e92bdb98f7e54c64d31414cdb600161766c68df
-EBUILD openjdk-21.0.5_p11-r1.ebuild 9560 BLAKE2B 70fa8dddfe11b50da1c6d33b18f54b246c5b68237d15bf87d5228dd7502fc8710b27ce76a370f4bd65c5aa3b9502ec5c45d837cec78698f9c5448e6d63ef3661 SHA512 094df374760e666f93cffc42ba9b16f62750b998f918b5841c96fbd55c88abc12347f8f867342b8f75942b13532278f31645cfdf1c19bc0a6eca1aa542f0c9e4
+EBUILD openjdk-21.0.5_p11-r1.ebuild 9559 BLAKE2B 3a6a90112daf12161d2314207a8371689a483dbd46abaecf0b02f877831e93d9eeea4e867b8da7d410283626e63555445aabb79b93813a785f459dea71b1c993 SHA512 5f0f8bfa1ae1dd504d0aff29c07d110f2501806dfafdb47f1a37da89cb824d1768801a97b8f0ac23eec974f69eb605940f00a572511b88d79696020bd40ebe5a
 EBUILD openjdk-25_p4.ebuild 9442 BLAKE2B 9a0e8ee1d523bfbc2243ac4625ded98b953a4e5fcba241e2d66db1397c01e093a500268d48d8a97f1c5d5c4ab838466f70bcd7ba614d39ea13a4a645716f7aec SHA512 7f3f6c90ffbfadd66879e0e35187842f7479d965036bce66205b9d01176cd97dcfaa44905a0724c4c86c0c7efd5d85ee7f2d1b19925f4ac463fe1176b3548514
 EBUILD openjdk-8.432_p06.ebuild 7819 BLAKE2B 46ee633ad8c8751885c948f3648e76f973266336fe15fa0016368302719770d9435c5e0db4cb59481e782e2b89adabe8b8cd0b4624749051c066de120509f8b7 SHA512 250754810305bf30ac7ce4dbc15dd1a321f4dc47cf5e49154f26b80b704218b21b6ab2f428a9857096936793460f2471df2fcd921c7fdc40838f11a2d0cce377
 MISC metadata.xml 1549 BLAKE2B 6c922cbe1dd4261036670a176be092d495024dd25e2ffb83cc1af1e3ad0dda3491e8973cdd7f8688f1c0854acf55cdc11e9d80ac5b9a16b544455d2cd1bdcbfe SHA512 57cd1a08f0479e8b11d37665c1d905255685ed2d8d27f469a9689ffe070c7ee6cd5944a1baf87cb19722b31af56b1a4692f7967e817d1e4ffbf7c4d97881d838
diff --git a/dev-java/openjdk/openjdk-21.0.5_p11-r1.ebuild b/dev-java/openjdk/openjdk-21.0.5_p11-r1.ebuild
index 8957ca5d41b1..258d469289b7 100644
--- a/dev-java/openjdk/openjdk-21.0.5_p11-r1.ebuild
+++ b/dev-java/openjdk/openjdk-21.0.5_p11-r1.ebuild
@@ -46,7 +46,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="${MY_PV%%[.+]*}"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 
 # lto temporarily disabled due to https://bugs.gentoo.org/916735
 IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source +system-bootstrap systemtap"