Adding metadata

33 files changed, 262 insertions, 1256 deletions

diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index b8234664e4eb..cb2f13b811a3 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1,4 +1,2 @@
 DIST bcel-6.10.0-src.tar.gz 1085294 BLAKE2B d2d3a0824ec45a5f47282a7255915ba0c891d5fc20ee37f4bba3b8ca5e8b61f6bdf47ed8903e60dbb96d253b8df1d79761888227880d44444f8b7fe24dca0853 SHA512 7ea129a048bf510ed15212a17680dfa37fe8c4adcc75504fa9a6ff35ef97d25f267547ad019fe146cd2fea9a3ef0eaca432d4c9cac7570ba5e68897f21c29a14
 DIST bcel-6.10.0-src.tar.gz.asc 488 BLAKE2B c575c3f68f06538dc8d34dccf6dd157824b6ecf8b7a1f0a220fe1828a1546ecfb46699f1374c9dd90bf89d9b311ce48f8d4b9e45818764d5f078817a17573557 SHA512 a19a5a6702c9d8d38733af6d983da6c60dac910f8ef3f4c6daae8e6ebe7bdd0ccc9029bad7af78984979e62cdc63d50e6f3a4ef02f409212fde1479465901863
-DIST bcel-6.6.0-src.tar.gz 1009654 BLAKE2B 9043cc077773383aebf9b56e8c67de9ffb9e278db1737eefb5966b32cbe36131bd6ec14454361daaf424a8114de21e804dadaebfbee6d11493026b8a98135668 SHA512 13f361be498625c3276860ae14c225c49135687f4ba69de4afaac2d135df4e5c6b51277e3cd4c05bac27156e4fab5316c102a25a67d8abb6c640499917d01917
-DIST bcel-6.6.0-src.tar.gz.asc 488 BLAKE2B b3d07f9d6f8f2b92215173d390281cab03b98dea2e926f5fe7f3ced74610c56dfa2915c5bfeeca360cd3904773cb66f8d9042062e6b3821f707853ef5c82fc73 SHA512 65830fcd5f5adb1deb92edd0b9181b9aeaf3d5357858a348606416dcfb416f58420ceb6c8ea58a550d5d7b4d1909dcff125b31496c00a9107ae211936c1d6e1d
diff --git a/dev-java/bcel/bcel-6.10.0-r1.ebuild b/dev-java/bcel/bcel-6.10.0-r1.ebuild
index d6be8e9e7490..caf9bb70691d 100644
--- a/dev-java/bcel/bcel-6.10.0-r1.ebuild
+++ b/dev-java/bcel/bcel-6.10.0-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/bcel/bcel-6.6.0.ebuild b/dev-java/bcel/bcel-6.6.0.ebuild
deleted file mode 100644
index 8ff1a7eb6dde..000000000000
--- a/dev-java/bcel/bcel-6.6.0.ebuild
+++ /dev/null
@@ -1,59 +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 mirror://apache/commons/bcel/source/bcel-6.6.0-src.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" --ebuild bcel-6.6.0.ebuild
-
-EAPI=8
-
-# No tests, junit-jupiter is not packaged
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.bcel:bcel:6.6.0"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Apache Commons Bytecode Engineering Library"
-HOMEPAGE="https://commons.apache.org/proper/commons-bcel/"
-SRC_URI="https://archive.apache.org/dist/commons/bcel/source/bcel-${PV}-src.tar.gz
-	verify-sig? ( https://downloads.apache.org/commons/bcel/source/bcel-${PV}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-# Common dependencies
-# POM: pom.xml
-# org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
-
-CP_DEPEND="
-	dev-java/commons-lang:3.6
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? javax:javaee-api:6.0 -> !!!groupId-not-found!!!
-# test? net.java.dev.jna:jna:5.12.1 -> !!!suitable-mavenVersion-not-found!!!
-# test? net.java.dev.jna:jna-platform:5.12.1 -> !!!artifactId-not-found!!!
-# test? org.apache.commons:commons-exec:1.3 -> !!!artifactId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter:5.9.1 -> !!!groupId-not-found!!!
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-BDEPEND="
-	verify-sig? ( sec-keys/openpgp-keys-apache-commons )
-"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
-
-DOCS=( NOTICE.txt RELEASE-NOTES.txt )
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_AUTOMATIC_MODULE_NAME="org.apache.bcel"
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/checker-framework-qual/Manifest b/dev-java/checker-framework-qual/Manifest
index f0802ea1f788..e05c93373348 100644
--- a/dev-java/checker-framework-qual/Manifest
+++ b/dev-java/checker-framework-qual/Manifest
@@ -1,2 +1 @@
-DIST checker-framework-3.43.0.tar.gz 8306595 BLAKE2B bcabe8e5a0de20615980048780528b6fcb1946f8793b9cd7c3b12afeb4688c6eb91724fd111419a243801b1456537cd40994d062f2ac341e904c93c285c530ad SHA512 73f6d6d45cf926b23160fc6089596f27b33b1ae6b8489aa3a2c2e0d8330331c331ce87d0826de8f512432d469f96330e77a4323082b3db4af5f5abf81ba06295
 DIST checker-framework-3.47.0.tar.gz 8335232 BLAKE2B 4b6d8f5bb055402e6b368640eb42e4e13173dc847a4b8145e7c306856cab2151c17bfbd2c3a645708e9b7525a1e3f73d4c28c3ae24d038ac0c3119d8fcf671df SHA512 17188ab83ee8c91fb112ed0f750611c7fb5fc17f80a0bbd9b19f1514902770c2a227cf879fb581c8c915fa9827febaa8e67a0188c70df625268118344a281fbd
diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild
deleted file mode 100644
index c2990d8c990e..000000000000
--- a/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild
+++ /dev/null
@@ -1,24 +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"
-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-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="org.checkerframework.checker.qual"
-JAVA_SRC_DIR="src/main/java/org/checkerframework/"
diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.47.0.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.47.0.ebuild
index 24b632f602c7..d56fc74e5026 100644
--- a/dev-java/checker-framework-qual/checker-framework-qual-3.47.0.ebuild
+++ b/dev-java/checker-framework-qual/checker-framework-qual-3.47.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/checker-framework-checker-framework-${PV}/checker-qual"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND=">=virtual/jdk-11:*"	# module-info
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest
index d5fc2fa612b3..450597e9e202 100644
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@@ -1,2 +1 @@
-DIST error-prone-2.27.1.tar.gz 2826681 BLAKE2B 8f848a89e97ea939dc4b81751a40d7b6bec64807ddca0d078bc02599bb663fa8a8d10d566536c33c4d50b3af21cf613bb282ac3403fe5345a20361627e116e5a SHA512 54d288dd5d5f23ae052eacc92ce304b2743aa56a524ad1b235ecd35cc4ecd72b44ec0c3fee319076466b8e90c20095fd5191d59b9c48cbe5bd940e189b1a073e
 DIST error-prone-2.32.0.tar.gz 2856245 BLAKE2B 129347be0a1e9ae450c03b47c088962efd7f156dfd5f7343fc17837cb4b64e1787c325ea4d6021570559a09310688a378555c5ab0e1df4996f21e88a73487212 SHA512 ae6286f9cd4d75fb0165d9788a7a2c588a05eef5a4f714a6deb9623d6d8cf4a2173bb44a8faee058f2496dd31124b40570a91a359a8f735a88abf59eea05f39e
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild
deleted file mode 100644
index 8434f7b6be7e..000000000000
--- a/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild
+++ /dev/null
@@ -1,24 +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"
-MAVEN_ID="com.google.errorprone:error_prone_annotations:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java annotations for the Error Prone static analysis tool"
-HOMEPAGE="https://errorprone.info"
-SRC_URI="https://github.com/google/error-prone/archive/v${PV}.tar.gz -> error-prone-${PV}.tar.gz"
-S="${WORKDIR}/error-prone-${PV}/annotations"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="com.google.errorprone.annotations"
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.32.0.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.32.0.ebuild
index 71652ad1320a..914659fb4271 100644
--- a/dev-java/error-prone-annotations/error-prone-annotations-2.32.0.ebuild
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.32.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/error-prone-${PV}/annotations"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND=">=virtual/jdk-11:*"	# module-info
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/guava-testlib/Manifest b/dev-java/guava-testlib/Manifest
index 85db383245eb..2cd99ccae34a 100644
--- a/dev-java/guava-testlib/Manifest
+++ b/dev-java/guava-testlib/Manifest
@@ -1,3 +1,2 @@
-DIST guava-33.2.0.tar.gz 5812764 BLAKE2B ebfc20be079385e1bf4822b1402323d468c49604f585b514c1e6d40c64803df2f9848b73c63961976908ea8e6250f5e706add1619fc0ee0befaeacab02da075f SHA512 8807dd320af652cffc83ac930e6191b36c8942bc8bfe16cec5503e0721e2fe8a36d6636eb45d650c0ccd60c67fafe4f5aa8595ad454a822fd6888d4e1f22d466
 DIST guava-33.3.0.tar.gz 5819234 BLAKE2B 26c5f97b927f4afeb8c5d68714a54ef62bfc3995da8cf98d2022edd93054bb7e0bd38598adcefc209d04a246e3da50346e213ad49152e1fc0c91463cd8f0dea3 SHA512 122a10c98820443cbfc5769e1aaa5843becfc0e2e7119d0f2544d86bd265da1fc48c4113cb706f92d84ab896fc58583b80e7dc91b6cd13f9ee9996ae8457f02c
 DIST truth-1.4.2.jar 275487 BLAKE2B 9c0dce92648f734ab88a0faf1a1e5328d747efffd29aa8f12b7ed2b2c87036ce18bf3195348f9ffce848842a240179fa60e9625c6997439a4cedce6aac6c2b77 SHA512 5f29cb259f2cf63e8a908061d2a58b28ecf12366a03564c8e63c33cdbdb21935ac95ed7b68437b015a2bd055732c88ec8ca1e55b45b99a2cb3e9dd53cb0b87cc
diff --git a/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild b/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild
deleted file mode 100644
index e57335457d23..000000000000
--- a/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild
+++ /dev/null
@@ -1,64 +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.google.guava:guava-testlib:${PV}-jre"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple check-reqs
-
-DESCRIPTION="A set of java classes to assist the tests for Guava itself"
-HOMEPAGE="https://github.com/google/guava"
-# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
-SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz
-	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.4.2/truth-1.4.2.jar )"
-S="${WORKDIR}/guava-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-CP_DEPEND="
-	>=dev-java/error-prone-annotations-2.27.1:0
-	~dev-java/guava-${PV}:0
-	dev-java/jsr305:0
-	dev-java/junit:4
-"
-
-DEPEND="${CP_DEPEND}
-	dev-java/checker-framework-qual:0
-	dev-java/j2objc-annotations:0
-	>=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-JAVA_CLASSPATH_EXTRA="checker-framework-qual j2objc-annotations"
-JAVA_SRC_DIR="${PN}/src"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="${PN}/test"
-
-check_env() {
-	if use test; then
-		# this is needed only for tests
-		CHECKREQS_MEMORY="1024M"
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_env
-}
-
-pkg_setup() {
-	check_env
-	java-pkg-2_pkg_setup
-}
-
-src_test() {
-	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.4.2.jar:testdata.jar"
-	JAVA_TEST_EXTRA_ARGS="-Xmx${CHECKREQS_MEMORY}"
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild b/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild
index 14bfd906b4b9..99cd78d75489 100644
--- a/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild
+++ b/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/guava-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 CP_DEPEND="
 	>=dev-java/error-prone-annotations-2.32.0:0
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
index a0da1bd1de4a..946427f658c1 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1,2 +1 @@
-DIST guava-33.2.0.tar.gz 5812764 BLAKE2B ebfc20be079385e1bf4822b1402323d468c49604f585b514c1e6d40c64803df2f9848b73c63961976908ea8e6250f5e706add1619fc0ee0befaeacab02da075f SHA512 8807dd320af652cffc83ac930e6191b36c8942bc8bfe16cec5503e0721e2fe8a36d6636eb45d650c0ccd60c67fafe4f5aa8595ad454a822fd6888d4e1f22d466
 DIST guava-33.3.0.tar.gz 5819234 BLAKE2B 26c5f97b927f4afeb8c5d68714a54ef62bfc3995da8cf98d2022edd93054bb7e0bd38598adcefc209d04a246e3da50346e213ad49152e1fc0c91463cd8f0dea3 SHA512 122a10c98820443cbfc5769e1aaa5843becfc0e2e7119d0f2544d86bd265da1fc48c4113cb706f92d84ab896fc58583b80e7dc91b6cd13f9ee9996ae8457f02c
diff --git a/dev-java/guava/guava-33.2.0.ebuild b/dev-java/guava/guava-33.2.0.ebuild
deleted file mode 100644
index eb0b91a27385..000000000000
--- a/dev-java/guava/guava-33.2.0.ebuild
+++ /dev/null
@@ -1,35 +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"
-MAVEN_ID="com.google.guava:guava:${PV}-jre"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A collection of Google's core Java libraries"
-HOMEPAGE="https://github.com/google/guava"
-SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-CP_DEPEND="
-	>=dev-java/error-prone-annotations-2.27.1:0
-	dev-java/j2objc-annotations:0
-	dev-java/jsr305:0
-"
-
-DEPEND="${CP_DEPEND}
-	dev-java/checker-framework-qual:0
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="com.google.common"
-JAVA_CLASSPATH_EXTRA="checker-framework-qual"
-JAVA_GENTOO_CLASSPATH_EXTRA=":futures/failureaccess/src"
-JAVA_SRC_DIR="guava/src"
diff --git a/dev-java/guava/guava-33.3.0.ebuild b/dev-java/guava/guava-33.3.0.ebuild
index 5094ca591af0..f30fc400b280 100644
--- a/dev-java/guava/guava-33.3.0.ebuild
+++ b/dev-java/guava/guava-33.3.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 CP_DEPEND="
 	>=dev-java/error-prone-annotations-2.32.0:0
diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest
index 19c388c630ec..4f01e26f1772 100644
--- a/dev-java/jctools-core/Manifest
+++ b/dev-java/jctools-core/Manifest
@@ -1,2 +1 @@
-DIST jctools-4.0.3.tar.gz 4237279 BLAKE2B be74c2b0997ec68b90249c8d2b841737fffa4e09724a25b5f5e15b8c4bbf811215023358bc674ed20f81d06a10db3ac2428b29d159ac99ef6dff7e6c36bf7fe2 SHA512 3d7cede6beba54871365cc2f49dc30f014a6f36a5e1f66e9cebd523d202806d49f24c23dbfd6bef0c25cbea0ca230b5d1afefd2b83b0150d335e8e99b6cec90f
 DIST jctools-4.0.5.tar.gz 4259231 BLAKE2B 33088bdb9f9d0030127990fadcef13295ea446ac54788c7d330c123af7e73626a7214481f8e10c5885e2026da281188c4c606965c8281f62c3fe2427e3754b79 SHA512 13069fb1b5c1275557e2343e6b8008ce549f948c185824a3e6a254fa0c1dc105e59de707d6b5b7bdb81120372a63026334cbd7a244d4e76b1de65d475cf02cd4
diff --git a/dev-java/jctools-core/jctools-core-4.0.3-r1.ebuild b/dev-java/jctools-core/jctools-core-4.0.3-r1.ebuild
deleted file mode 100644
index 9b776803a38f..000000000000
--- a/dev-java/jctools-core/jctools-core-4.0.3-r1.ebuild
+++ /dev/null
@@ -1,70 +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.jctools:jctools-core:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java Concurrency Tools Core Library"
-HOMEPAGE="https://jctools.github.io/JCTools/"
-SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${PV}.tar.gz"
-S="${WORKDIR}/JCTools-${PV}/jctools-core"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-DEPEND="
-	dev-java/osgi-annotation:0
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/guava-testlib:0
-		dev-java/hamcrest:0
-	)"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( ../{README,RELEASE-NOTES}.md )
-PATCHES=( "${FILESDIR}/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch" )
-
-JAVA_AUTOMATIC_MODULE_NAME="org.jctools.core"
-JAVA_CLASSPATH_EXTRA="osgi-annotation"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,hamcrest,junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-}
-
-# Using the defaults of java-pkg-simple would skip more than half the number of tests.
-src_test() {
-	# org.jetbrains.kotlinx.lincheck is not yet packaged
-	rm -r src/test/java/org/jctools/maps/linearizability_test || die
-	# These tests would fail and are not run by "mvn test".
-	# "org.jctools.queues.MpqSanityTest"
-	# "org.jctools.queues.QueueSanityTest"
-	# "org.jctools.queues.ScQueueRemoveTest"
-	# "org.jctools.util.TestUtil"
-	pushd src/test/java || die
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			\( -name "*Test*.java" \
-			-o -name "nbsi_tester.java" \
-			-o -name "nbhs_tester.java" \)\
-			! -name "MpqSanityTest.java" \
-			! -name "QueueSanityTest.java" \
-			! -name "ScQueueRemoveTest.java" \
-			! -name "TestUtil.java" \
-			)
-	popd
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	java-pkg-simple_src_test
-	# OK (8746 tests)
-}
diff --git a/dev-java/jctools-core/jctools-core-4.0.5-r1.ebuild b/dev-java/jctools-core/jctools-core-4.0.5-r1.ebuild
index 2a061661d55c..89ceefc92492 100644
--- a/dev-java/jctools-core/jctools-core-4.0.5-r1.ebuild
+++ b/dev-java/jctools-core/jctools-core-4.0.5-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/JCTools-${PV}/jctools-core"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND="
 	dev-java/osgi-annotation:0
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 0fdfd5362f70..0681c8f2bc14 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,4 +1,7 @@
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.23_9.tar.gz 43361001 BLAKE2B 7f5fe24de2f0967ceeaee783430fc1aa9d8c510d955eff2e10c9d94058a2985308e99a57f1dffb3adb3cee9d90d0a553abcb5438a41a0cda054b0a260e435f31 SHA512 82b4b021b7fb136a9016623cd6ab7b4ac1f5fc3bff69594b74c8b2b0305d6b0c7d20d12759062826dc27ce0b50ea176bcec76960d3d458549e11a5452b7df014
+DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.25_9.tar.gz 43388792 BLAKE2B 59f2ea968f5f243dc2e0b8d82270620839a5cbafd93bfb611b3713455e366f956357b1424e69e3082730e6803934f78852db8e06d6ff6dcda7f7bf5ce2c6323c SHA512 3e602a497d66ef423ba9110a69149ad5fe3c939c629eda1a0946697623ada8a1582d08b55f498b1d0862c95a7c64b0fab804fb713e49bdd4ddd9657c164ab7db
 DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.11_9.tar.gz 46382823 BLAKE2B 79612a8a73cee7a8ac022779a12077fa613ff7b18d8d5d198c42ae886cba21c46a1919422249696a74b5e5491542b88b57244eaa74f3b1bc8ae63ae851d10d40 SHA512 a98534b49a71a1bb6488aff4f1d2fc4fdcadfbaa17ef1ca3003568aed8498b3d3618c065334dd6bd9cffab0af15b6cbc980353e09da66c5ac69f0c96f9b0a889
-DIST OpenJDK21U-jre_x64_linux_hotspot_21.0.3_9.tar.gz 52430722 BLAKE2B 32a969bfd1a6e334db34db6f12317810a81b60b0f6c4c978aee3fb588ed30daca0b54089feba7721a51f71d2ebb89d453aba8e7ded29f524d5923a3804828d88 SHA512 2fefc61c36f4cf4bbe722aef93aced8dc4b76d2fddeb91ad8687dc54f7afd9dff03df25ff12214bbd66fcbd637ff0ca5a21a1d839e60da9622904284bc2abfee
+DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.13_11.tar.gz 46082619 BLAKE2B 18cfcba579deb6665f45de59b145d2f9b3c047456e548b0728619a8b711890f66c15d0522e89ef3f8d7f9747636cefc509efc0d8c12e709d6f7e2faf8c6d1860 SHA512 6ab44ec3ae9f610b68008e68069a66095c7b2d1deba2990e061baf9800cbeafd818cb16a9386aabbc18299bc46e0f23540111eb6a0597561c835e67506eeff97
+DIST OpenJDK21U-jre_x64_linux_hotspot_21.0.5_11.tar.gz 51849867 BLAKE2B 6769bd34c2ba7f6d4939f1b7647cb7bd5eea5644a05f4e5474db612c29e05d247829b1eea2f0265febf41cd6a64a1e62c5eef7f1ee7c68e84f6bb085d3c656fb SHA512 7077e879e656a2b3bcb6274d5eb312320a95f13e909bd0fb5589e665db545caca0a6bf7d1117d76fe201caaa50a3bf917316e43f08d94b48872607bc25238a94
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u412b08.tar.gz 41415973 BLAKE2B 1372ef4f608eaecd4a82c8e5598e67b91d4b200818a896c2977f40d7c228377ad033187e5afda7cd812b37950b998bc764c155d952a62b7bf7c625299b9477d9 SHA512 f1e3a168724fd9826262d1f4e895d0809618414231e246750f96522bc89fb4f27fed83f83dd548ddd859b519512ac7a080c6a3482a9d129275102aed973eab28
+DIST OpenJDK8U-jre_x64_linux_hotspot_8u432b06.tar.gz 41407945 BLAKE2B 99d146ceb6627be04b30bde28691df1362f2acc147a8b260d9633fb11d9ef2f23f2a0876a6cd32515dc0541ce1f5feb475793225266da9197ac7392db13c512a SHA512 c32343125e66005c9239d1002fad2a183bc3834dc1be5f85ca9bf6535bc40bc629d7e538cefc0d07cc2b49275a54ebd19098e43aecfc34cbd40e549da902b894
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.3_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.25_p9.ebuild
index 9fe0d3158b43..9fe0d3158b43 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.3_p9.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.25_p9.ebuild
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.13_p11.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.13_p11.ebuild
new file mode 100644
index 000000000000..9fe0d3158b43
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.13_p11.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+		)"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+	$(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net/"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64"
+IUSE="alsa cups headless-awt selinux"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>net-libs/libnet-1.1
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}-jre"
+
+src_install() {
+	local dest="/opt/${PN}-${SLOT}"
+	local ddest="${ED}/${dest#/}"
+
+	# Not sure why they bundle this as it's commonly available and they
+	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+	# also has an explicit dependency while Oracle seemingly dlopens it.
+	rm -vf lib/libfreetype.so || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if use headless-awt ; then
+		rm -v lib/lib*{[jx]awt,splashscreen}* || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+}
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
new file mode 100644
index 000000000000..9fe0d3158b43
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.5_p11.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+		)"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+	$(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net/"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64"
+IUSE="alsa cups headless-awt selinux"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>net-libs/libnet-1.1
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}-jre"
+
+src_install() {
+	local dest="/opt/${PN}-${SLOT}"
+	local ddest="${ED}/${dest#/}"
+
+	# Not sure why they bundle this as it's commonly available and they
+	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+	# also has an explicit dependency while Oracle seemingly dlopens it.
+	rm -vf lib/libfreetype.so || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if use headless-awt ; then
+		rm -v lib/lib*{[jx]awt,splashscreen}* || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.432_p06.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.432_p06.ebuild
new file mode 100644
index 000000000000..04fb01a2b751
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.432_p06.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
+		)"
+}
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
+SLOT="$(ver_cut 1)"
+
+DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net/"
+SRC_URI="
+	$(abi_uri x64 amd64)
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64"
+
+IUSE="alsa cups headless-awt selinux"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>net-libs/libnet-1.1
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk${MY_PV}-jre"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest#/}"
+
+	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
+
+	# this does not exist on arm64 hence -f
+	rm -fv lib/*/libfreetype.so* || die
+
+	if ! use alsa ; then
+		rm -v lib/*/libjsoundalsa.so* || die
+	fi
+
+	if use headless-awt ; then
+		rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
+			bin/policytool || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
+	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index bd9260a91235..f8f289eda29c 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,11 +1,8 @@
 DIST openjdk-11.0.18-riscv.patch.xz 272672 BLAKE2B b079612032a5bf135b05bdd1da16f2823772a5d9a18447a435f191daf78c5429a15c2e9ea64758dc9b26ee2a88275532b4f27714b2a7e4489f920c0ed2f5003b SHA512 c0426f243c5aa581d90366cb01ce811e34883a9d8a0298cab420378470e8eb427a56932ca1fbb5ed57e7430be2b38c6bc4491028ebaa25be0a938ba0bb2baf45
-DIST openjdk-11.0.24_p8.tar.gz 116418943 BLAKE2B cb768b202b42f426f4edaead16ba09800d86c10da4a664176842ee396332284d410191a55dbb35d7604272231e5b3daf8a75ddc03bb819d670622b7682eec7f6 SHA512 ce45efd934b9bacc56c468d92083a85de311b4436a519ae1d6038aff025c2fa8a811abca4cdd99aeb8c09455effff53500f96c287976cd2ae90d4e11da2385a3
 DIST openjdk-11.0.25_p9.tar.gz 116541441 BLAKE2B 5be0d6e1996860f0d8f36732758207044668fdbd6e9c9b21b96c897d526f2d86a931f2b8d732ebe4b668679c0e48cb49a472baf29d4ea5785dc4edb0d8a5de2f SHA512 25971b26d04dd111a21c112f694968c8d56c3692a62eb1366a1f49617a308a3a0cb37ab92ff02cff727041d6e32cbbc345f313db46df58f9e933a801a1588e8b
-DIST openjdk-17.0.12_p7.tar.gz 106597045 BLAKE2B f0e9baec472ecefbf28359abfc10757dc7cb2a6ddf8428086a6565831f1c13ee1a7cdb87b67d6b3840860ddbf2c74e80ece55f09238fddc2cb8fa77208695b9b SHA512 cc99e9742123f7d8ac7ad78abab0fbe5cff37999b9c06ad14851009a95c9868968e97dd0f3e4dea8bfa8578f8f903fccaa37134466a778375cdf24344138f1fc
 DIST openjdk-17.0.13_p11.tar.gz 107315661 BLAKE2B e403a8f33d4e79dd5c77a5dbfc991b443e15bddefe7cfde6cbd6f8df29f1cf499d0bd467d23f0c1b89b92b1dca16ebfb398a5c64b8787f787465a8a5f50bdfce SHA512 6f2220b3b0b9ab4441968d487858449f0e58400bfbbf8cc322b6c9393ab44869ea27285bed1022ac531f0a9eec5b7d6a07db4f7e78b094bb5ca8cedd5f40711a
 DIST openjdk-21.0.5_p11.tar.gz 112679148 BLAKE2B 6cfb2ab73e1bcc5d74c28f56e163778ca42fa1b9eda5367f2198827eae04d5a269926c97b326d1e71b2a57f2780588f538db8d3a81f367903fd967534747d3af SHA512 2fdfdb7e21fcaf97590fa54317f87169d5fdabf38027f4f6570942b2af637fc9ace3d35c3bbb0df29720e7a0f6d6a4087253a713389743ed7947e433d7b8103b
 DIST openjdk-23.0.1_p11.tar.gz 116677478 BLAKE2B ad5e8ea1f4c55627941909473401ce54a690c36d3162b108bafceb3a8a15982711876864067c960322092fa1855f4b0e199a870f1ce74e360456dccc569010a7 SHA512 9c60352aa792c2802adc14426aaeb81ea97d2462fba3e7d5692912447e64fc22c6058bf24c41ac18c72eac6759cb627e6ce174b9b407f370dd28d22838142510
-DIST openjdk-8.422_p05.tar.gz 93034877 BLAKE2B 2489fea62fbc5a7e3735055656ae89c67caf63e5bc6d5385ee811d0707d056bc3d10dd83f7eae5a5a86b7f57b8da47a9c1a77405f127b6f506bbf3b310ecd2ae SHA512 706db67f9be7509380e96ae2187bdb928e40c4382fd7073dd310da2981eeff324a5871702b087d4466911dbbea8376d5f9fed7029562ca62c9a1a193d931833e
 DIST openjdk-8.432_p06.tar.gz 92765730 BLAKE2B 9c3823ed0394730cdbf306a92062656a793dd7b57a333319282a6aa01a8150927227d3e91ee2ee975108b8c3aa2b0b87669af2971dfc27a6400fb7c4ef22d246 SHA512 263642d56915e0533c154ab51148b0f6a9860b243dddf5bbb70f49174d07dd505393fa6e257bfa34eca6e95ecd4f271737fa48fee8db93e624e8336fe488eb83
 DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e
 DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f
diff --git a/dev-java/openjdk/openjdk-11.0.24_p8.ebuild b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild
deleted file mode 100644
index 777fecd885e4..000000000000
--- a/dev-java/openjdk/openjdk-11.0.24_p8.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release tag.
-# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
-# set build version properly
-MY_PV="${PV%_p*}-ga"
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-PPC64_XPAK="11.0.13_p8" # big-endian bootstrap tarball
-RISCV_XPAK="11.0.14_p9" # lp64d bootstrap tarball
-X86_XPAK="11.0.13_p8"
-
-# Usage: bootstrap_uri <keyword> <version> [extracond]
-# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
-# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
-bootstrap_uri() {
-	local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
-	local suff="tar.xz"
-	local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
-	local ver="${2:?${FUNCNAME[0]}: version not specified}"
-	local cond="${3-}"
-
-	# here be dragons
-	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })"
-}
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org"
-SRC_URI="
-	https://github.com/${PN}/jdk11u/archive/jdk-${MY_PV}.tar.gz
-		-> ${P}.tar.gz
-	!system-bootstrap? (
-		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
-		$(bootstrap_uri riscv ${RISCV_XPAK})
-		$(bootstrap_uri x86 ${X86_XPAK})
-	)
-	riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.18-riscv.patch.xz )
-"
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
-
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="${MY_PV%%[.+]*}"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
-
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap"
-
-REQUIRED_USE="
-	javafx? ( alsa !headless-awt )
-	!system-bootstrap? ( jbootstrap )
-"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	media-libs/harfbuzz:=
-	media-libs/libpng:0=
-	media-libs/lcms:2=
-	sys-libs/zlib
-	media-libs/libjpeg-turbo:0=
-	systemtap? ( dev-debug/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	javafx? ( dev-java/openjfx:${SLOT}= )
-	system-bootstrap? (
-		|| (
-			dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
-			dev-java/openjdk:${SLOT}[gentoo-vm(+)]
-		)
-	)
-"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	[[ ${MERGE_TYPE} == "binary" ]] && return
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	if use system-bootstrap; then
-		for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-			if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
-				java-pkg-2_pkg_setup
-				return
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	use riscv && eapply "${WORKDIR}"/openjdk-11.0.18-riscv.patch
-	default
-	chmod +x configure || die
-}
-
-src_configure() {
-	if ! use system-bootstrap; then
-		local xpakvar="${ARCH^^}_XPAK"
-		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
-	fi
-
-	# Work around stack alignment issue, bug #647954.
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# bug 906987; append-cppflags doesnt work
-	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
-
-	# Strip some flags users may set, but should not. #818502
-	filter-flags -fexceptions
-
-	# Strip lto related flags, we rely on USE=lto and --with-jvm-features=link-time-opt
-	# https://bugs.gentoo.org/833097
-	# https://bugs.gentoo.org/833098
-	filter-lto
-	filter-flags -fdevirtualize-at-ltrans
-
-	# Enabling full docs appears to break doc building. If not
-	# explicitly disabled, the flag will get auto-enabled if pandoc and
-	# graphviz are detected. pandoc has loads of dependencies anyway.
-
-	local myconf=(
-		--disable-ccache
-		--disable-precompiled-headers
-		--enable-full-docs=no
-		--with-boot-jdk="${JDK_HOME}"
-		--with-extra-cflags="${CFLAGS}"
-		--with-extra-cxxflags="${CXXFLAGS}"
-		--with-extra-ldflags="${LDFLAGS}"
-		--with-freetype="${XPAK_BOOTSTRAP:-system}"
-		--with-giflib="${XPAK_BOOTSTRAP:-system}"
-		--with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
-		--with-lcms="${XPAK_BOOTSTRAP:-system}"
-		--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
-		--with-libpng="${XPAK_BOOTSTRAP:-system}"
-		--with-native-debug-symbols=$(usex debug internal none)
-		--with-vendor-name="Gentoo"
-		--with-vendor-url="https://gentoo.org"
-		--with-vendor-bug-url="https://bugs.gentoo.org"
-		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-		--with-vendor-version-string="${PVR}"
-		--with-version-pre=""
-		--with-version-string="${PV%_p*}"
-		--with-version-build="${PV#*_p}"
-		--with-zlib="${XPAK_BOOTSTRAP:-system}"
-		--enable-dtrace=$(usex systemtap yes no)
-		--enable-headless-only=$(usex headless-awt yes no)
-		$(tc-is-clang && echo "--with-toolchain-type=clang")
-	)
-	! use riscv && myconf+=( --with-jvm-features=shenandoahgc )
-
-	use lto && myconf+=( --with-jvm-features=link-time-opt )
-
-	if use javafx; then
-		# this is not useful for users, just for upstream developers
-		# build system compares mesa version in md file
-		# https://bugs.gentoo.org/822612
-		export LEGAL_EXCLUDES=mesa3d.md
-
-		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
-		if [[ -r ${zip} ]]; then
-			myconf+=( --with-import-modules="${zip}" )
-		else
-			die "${zip} not found or not readable"
-		fi
-	fi
-
-	# Workaround for bug #938302
-	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
-		myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace )
-	fi
-
-	if use !system-bootstrap ; then
-		addpredict /dev/random
-		addpredict /proc/self/coredump_filter
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	# Too brittle - gets confused by e.g. -Oline
-	export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
-	unset GNUMAKEFLAGS MAKEFLAGS
-
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-		NICE= # Use PORTAGE_NICENESS, don't adjust further down
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images product-images)
-	)
-	emake "${myemakeargs[@]}" -j1
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/jdk || die
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	# must be done before running itself
-	java-vm_set-pax-markings "${ddest}"
-
-	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
-	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${S}"/build/*-release/images/docs/*
-		dosym -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk/openjdk-11.0.25_p9.ebuild b/dev-java/openjdk/openjdk-11.0.25_p9.ebuild
index 2c917adee686..777fecd885e4 100644
--- a/dev-java/openjdk/openjdk-11.0.25_p9.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.25_p9.ebuild
@@ -50,7 +50,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="${MY_PV%%[.+]*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 
 IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap"
 
diff --git a/dev-java/openjdk/openjdk-17.0.12_p7.ebuild b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild
deleted file mode 100644
index 90f9a664d446..000000000000
--- a/dev-java/openjdk/openjdk-17.0.12_p7.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-ARM64_XPAK="17.0.2_p8" # musl bootstrap install
-PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball
-RISCV_XPAK="17.0.3_p7"
-X86_XPAK="17.0.1_p12"
-
-# Usage: bootstrap_uri <keyword> <version> [extracond]
-# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
-# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
-bootstrap_uri() {
-	local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
-	local suff="tar.xz"
-	local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
-	local ver="${2:?${FUNCNAME[0]}: version not specified}"
-	local cond="${3-}"
-	[[ ${cond} == elibc_musl* ]] && local musl=yes
-
-	# here be dragons
-	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
-}
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release tag.
-MY_PV="${PV%_p*}-ga"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org"
-SRC_URI="
-	https://github.com/${PN}/jdk17u/archive/jdk-${MY_PV}.tar.gz
-		-> ${P}.tar.gz
-	!system-bootstrap? (
-		$(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
-		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
-		$(bootstrap_uri x86 ${X86_XPAK})
-		$(bootstrap_uri riscv ${RISCV_XPAK})
-	)
-"
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
-
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="${MY_PV%%[.+]*}"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
-
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap"
-
-REQUIRED_USE="
-	javafx? ( alsa !headless-awt )
-	!system-bootstrap? ( jbootstrap )
-"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	media-libs/harfbuzz:=
-	media-libs/libpng:0=
-	media-libs/lcms:2=
-	sys-libs/zlib
-	media-libs/libjpeg-turbo:0=
-	systemtap? ( dev-debug/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	javafx? ( dev-java/openjfx:${SLOT}= )
-	system-bootstrap? (
-		|| (
-			dev-java/openjdk-bin:${SLOT}
-			dev-java/openjdk:${SLOT}
-		)
-	)
-"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	[[ ${MERGE_TYPE} == "binary" ]] && return
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-}
-
-src_prepare() {
-	default
-	chmod +x configure || die
-}
-
-src_configure() {
-	if has_version dev-java/openjdk:${SLOT}; then
-		export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT}
-	elif use !system-bootstrap ; then
-		local xpakvar="${ARCH^^}_XPAK"
-		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
-	else
-		JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
-		[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-		JDK_HOME=${JDK_HOME#*/}
-		JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*}
-		export JDK_HOME
-	fi
-
-	# Work around stack alignment issue, bug #647954. in case we ever have x86
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# bug 906987; append-cppflags doesnt work
-	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
-
-	# Strip some flags users may set, but should not. #818502
-	filter-flags -fexceptions
-
-	# Strip lto related flags, we rely on USE=lto and --with-jvm-features=link-time-opt
-	# https://bugs.gentoo.org/833097
-	# https://bugs.gentoo.org/833098
-	filter-lto
-	filter-flags -fdevirtualize-at-ltrans
-
-	# Enabling full docs appears to break doc building. If not
-	# explicitly disabled, the flag will get auto-enabled if pandoc and
-	# graphviz are detected. pandoc has loads of dependencies anyway.
-
-	local myconf=(
-		--disable-ccache
-		--disable-precompiled-headers
-		--disable-warnings-as-errors
-		--enable-full-docs=no
-		--with-boot-jdk="${JDK_HOME}"
-		--with-extra-cflags="${CFLAGS}"
-		--with-extra-cxxflags="${CXXFLAGS}"
-		--with-extra-ldflags="${LDFLAGS}"
-		--with-freetype="${XPAK_BOOTSTRAP:-system}"
-		--with-giflib="${XPAK_BOOTSTRAP:-system}"
-		--with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
-		--with-lcms="${XPAK_BOOTSTRAP:-system}"
-		--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
-		--with-libpng="${XPAK_BOOTSTRAP:-system}"
-		--with-native-debug-symbols=$(usex debug internal none)
-		--with-vendor-name="Gentoo"
-		--with-vendor-url="https://gentoo.org"
-		--with-vendor-bug-url="https://bugs.gentoo.org"
-		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-		--with-vendor-version-string="${PVR}"
-		--with-version-pre=""
-		--with-version-string="${PV%_p*}"
-		--with-version-build="${PV#*_p}"
-		--with-zlib="${XPAK_BOOTSTRAP:-system}"
-		--enable-jvm-feature-dtrace=$(usex systemtap yes no)
-		--enable-headless-only=$(usex headless-awt yes no)
-		$(tc-is-clang && echo "--with-toolchain-type=clang")
-	)
-
-	use lto && myconf+=( --with-jvm-features=link-time-opt )
-
-	if use javafx; then
-		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
-		if [[ -r ${zip} ]]; then
-			myconf+=( --with-import-modules="${zip}" )
-		else
-			die "${zip} not found or not readable"
-		fi
-	fi
-
-	# Workaround for bug #938302
-	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
-		myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace )
-	fi
-
-	if use !system-bootstrap ; then
-		addpredict /dev/random
-		addpredict /proc/self/coredump_filter
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	# Too brittle - gets confused by e.g. -Oline
-	export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
-	unset GNUMAKEFLAGS MAKEFLAGS
-
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-		NICE= # Use PORTAGE_NICENESS, don't adjust further down
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images product-images)
-	)
-	emake "${myemakeargs[@]}" -j1
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/jdk || die
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	# must be done before running itself
-	java-vm_set-pax-markings "${ddest}"
-
-	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
-	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${S}"/build/*-release/images/docs/*
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk/openjdk-17.0.13_p11.ebuild b/dev-java/openjdk/openjdk-17.0.13_p11.ebuild
index 09ab2d7bf56a..90f9a664d446 100644
--- a/dev-java/openjdk/openjdk-17.0.13_p11.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.13_p11.ebuild
@@ -50,7 +50,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="${MY_PV%%[.+]*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 
 IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap"
 
diff --git a/dev-java/openjdk/openjdk-8.422_p05.ebuild b/dev-java/openjdk/openjdk-8.422_p05.ebuild
deleted file mode 100644
index d006b5c56f80..000000000000
--- a/dev-java/openjdk/openjdk-8.422_p05.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release tag.
-# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
-# set build version properly
-MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)"
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-X86_XPAK="8.402_p06"
-PPC64_XPAK="8.402_p06"
-
-# Usage: bootstrap_uri <keyword> <version> [extracond]
-# Example: $(bootstrap_uri x86 8.402_p06)
-# Output: ppc64? ( big-endian? ( https://...8.402_p06-x86.tar.xz ) )
-bootstrap_uri() {
-	local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
-	local suff="tar.xz"
-	local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
-	local ver="${2:?${FUNCNAME[0]}: version not specified}"
-	local cond="${3-}"
-
-	# here be dragons
-	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })"
-}
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org"
-SRC_URI="
-	https://github.com/openjdk/jdk8u/archive/jdk${MY_PV}.tar.gz
-		-> ${P}.tar.gz
-	!system-bootstrap? (
-		$(bootstrap_uri x86 ${X86_XPAK})
-		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
-	)
-"
-S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
-
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="${PV%%[.+]*}"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="alsa big-endian debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	sys-libs/zlib
-"
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	system-bootstrap? (
-		|| (
-			dev-java/openjdk-bin:${SLOT}
-			dev-java/openjdk:${SLOT}
-		)
-	)
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
-
-PATCHES=(
-	"${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch"
-	"${FILESDIR}/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch"
-	"${FILESDIR}/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch"
-	"${FILESDIR}/openjdk-8.402_p06-0003-Fix-negative-value-left-shift.patch"
-	"${FILESDIR}/openjdk-8.402_p06-0004-Fix-misc.-warnings.patch"
-)
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	[[ ${MERGE_TYPE} == "binary" ]] && return
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	if use system-bootstrap; then
-		for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-			if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
-				java-pkg-2_pkg_setup
-				return
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	# new warnings in new gcc https://bugs.gentoo.org/685426
-	sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
-		hotspot/make/linux/makefiles/gcc.make || die
-
-	chmod +x configure || die
-}
-
-src_configure() {
-	if ! use system-bootstrap; then
-		local xpakvar="${ARCH^^}_XPAK"
-		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
-	fi
-
-	# general build info found here:
-	# https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
-
-	# -Wregister use (bug #918655)
-	append-cxxflags -std=gnu++14
-
-	# Work around stack alignment issue, bug #647954.
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Strip some flags users may set, but should not. #818502
-	filter-flags -fexceptions
-
-	# Strip lto related flags, no support in this version.
-	# https://bugs.gentoo.org/833097
-	# https://bugs.gentoo.org/833098
-	filter-lto
-	filter-flags -fdevirtualize-at-ltrans
-
-	tc-export_build_env CC CXX PKG_CONFIG STRIP
-
-	local myconf=(
-			--disable-ccache
-			--disable-freetype-bundling
-			--disable-precompiled-headers
-			--enable-unlimited-crypto
-			--with-boot-jdk="${JDK_HOME}"
-			--with-extra-cflags="${CFLAGS}"
-			--with-extra-cxxflags="${CXXFLAGS}"
-			--with-extra-ldflags="${LDFLAGS}"
-			--with-freetype-lib="$( $(tc-getPKG_CONFIG) --variable=libdir freetype2 )"
-			--with-freetype-include="$( $(tc-getPKG_CONFIG) --variable=includedir freetype2)/freetype2"
-			--with-giflib="${XPAK_BOOTSTRAP:-system}"
-			--with-jtreg=no
-			--with-jobs=1
-			--with-num-cores=1
-			--with-update-version="$(ver_cut 2)"
-			--with-build-number="b$(ver_cut 4)"
-			--with-milestone="fcs" # magic variable that means "release version"
-			--with-vendor-name="Gentoo"
-			--with-vendor-url="https://gentoo.org"
-			--with-vendor-bug-url="https://bugs.gentoo.org"
-			--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-			--with-zlib="${XPAK_BOOTSTRAP:-system}"
-			--with-native-debug-symbols=$(usex debug internal none)
-			$(usex headless-awt --disable-headful '')
-			$(tc-is-clang && echo "--with-toolchain-type=clang")
-		)
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		CONFIG_SHELL="${BROOT}/bin/bash"
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	# Too brittle - gets confused by e.g. -Oline
-	export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
-	unset GNUMAKEFLAGS MAKEFLAGS
-
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-		NICE= # Use PORTAGE_NICENESS, don't adjust further down
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images images)
-	)
-	emake "${myemakeargs[@]}" -j1
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/j2sdk-image || die
-
-	if ! use alsa; then
-		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	# build system does not remove that
-	if use headless-awt ; then
-		rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
-		{,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v src.zip || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${S}"/build/*-release/docs/*
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-	einfo "JavaWebStart functionality provided by icedtea-web package"
-}
diff --git a/dev-java/openjdk/openjdk-8.432_p06.ebuild b/dev-java/openjdk/openjdk-8.432_p06.ebuild
index 6280651782d6..d006b5c56f80 100644
--- a/dev-java/openjdk/openjdk-8.432_p06.ebuild
+++ b/dev-java/openjdk/openjdk-8.432_p06.ebuild
@@ -47,7 +47,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="${PV%%[.+]*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="alsa big-endian debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source"
 
 COMMON_DEPEND="
diff --git a/dev-java/opentest4j/Manifest b/dev-java/opentest4j/Manifest
index 8d2641eca5a8..59aa3fdb02e6 100644
--- a/dev-java/opentest4j/Manifest
+++ b/dev-java/opentest4j/Manifest
@@ -1,2 +1 @@
-DIST opentest4j-1.2.0.tar.gz 77616 BLAKE2B a331cc5e97d1e50b3b57e6aac926278d16f4d75067b4e4b25acb5ee25d4d4cd9d1f75c115155303ec63f5cb22b09ad1cbaa01d62620b350dd2c1d61541657b78 SHA512 cd98d976935de97d259ec4c04510334f2b56f8a32db2c97e0f20a2e3b99f119ffeb390589eb42d4594808d96194067871d5eaad6a40dd58af30b9f995b13ef08
 DIST opentest4j-1.3.0.tar.gz 89527 BLAKE2B f8ac763c3ec1b1617c38c3744a8fac82e0d93ff4ff409a00e3e22d343fc873aa4129bee3d906de0e13cc78450a1c67cdcffebed91d00c9758f20113a68a76dc7 SHA512 6141fed5230d1195eee137031fc6cf8e3df0b857f2fd341ba823d5aeb92d86e56262b57b93a901a4e00f6000920b67f28e02e04f404df7df8e62be9d60c3e79d
diff --git a/dev-java/opentest4j/opentest4j-1.2.0-r1.ebuild b/dev-java/opentest4j/opentest4j-1.2.0-r1.ebuild
deleted file mode 100644
index 7bc870ed0ad4..000000000000
--- a/dev-java/opentest4j/opentest4j-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-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.opentest4j:opentest4j:1.2.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Open Test Alliance for the JVM"
-HOMEPAGE="https://github.com/ota4j-team/opentest4j"
-SRC_URI="https://github.com/ota4j-team/opentest4j/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-DEPEND="
-	>=virtual/jdk-11:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-JAVA_SRC_DIR=( src/{main,module}/java )
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR=( src/test/java )
-JAVA_TEST_RESOURCE_DIRS=( src/test/resources )
diff --git a/dev-java/opentest4j/opentest4j-1.3.0-r1.ebuild b/dev-java/opentest4j/opentest4j-1.3.0-r1.ebuild
index e5d22fb3004a..37b822022672 100644
--- a/dev-java/opentest4j/opentest4j-1.3.0-r1.ebuild
+++ b/dev-java/opentest4j/opentest4j-1.3.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-r${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND=">=virtual/jdk-11:*"	# module-info
 RDEPEND=">=virtual/jre-1.8:*"	#939580