gentoo auto-resync : 19:10:2024 - 04:04:35

author: V3n3RiX <venerix@koprulu.sector> 2024-10-19 04:04:36 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2024-10-19 04:04:36 +0100
commit: d895362f98ae63a6ed12cd16d3b3df95d6967f25 (patch)
tree: e6c8a50e31dc122b10c6dc3d9eee5d6ec6f002c0 /dev-java
parent: 483d7c056fba15727fe24545f93627a1d1e1e2eb (diff)
42 files changed, 282 insertions, 1307 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 033188b8fc87..ab59055b0c63 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index edcd684a81b3..1f5ee60e7855 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1,7 +1,4 @@
 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
-EBUILD bcel-6.10.0-r1.ebuild 1461 BLAKE2B 29356592d521bbfe88b04a1929ab85db39ab1667ff4c5e8672297ace4ff01cd7ce7a3f6d87f5532fe83a95a0fdeb728ae38037089992818d9dd180d370ae7e24 SHA512 ced7eafc42724f4d75212b1c7f8674da7ddfcb96138ca4795d37fdc3e77d52b79b2b6c7e854d99e2253f19369d9e706e571bc818a23517cfeec7db36c7d496b9
-EBUILD bcel-6.6.0.ebuild 1904 BLAKE2B 9455b84e37faefe3b5a2c48b57227484482101292933546b76aa3264b5bccf45beff3be237936544f5648faf7c61aa32e02bf9daabfafd980cb060e03143a133 SHA512 a32e5ca60ef3da7ada84b23cecb03fa6679c3fe64954109d91008b1664e471e8f3c205e18b60a3ccd4d6699870db37c45cbc9148e55ef8cdb2daec10a604a808
+EBUILD bcel-6.10.0-r1.ebuild 1460 BLAKE2B e94d48a6405f7dce6909f68dc539d7558974524f44e5ed3b167ecbf610d121b1c4813f745a2f0f67825b57266df22fe06f369d71106193d392bd24f88c7bffda SHA512 f8d2d25967e02ed079f9fe10baab7fcb3608df42e25c59760c4489bf948b000cdb0d1bad9376855b9e18826edfce6a35939522077c0d7b0db218ba1f77aa9cd7
 MISC metadata.xml 897 BLAKE2B fdd417f23c2717d0ff95cbf4decc58768b60710baa803f71c956a3fb4c5049fd83b14679f0ebdb95185f3212541706e2b598617e2a61d6399cd254bd66d031a2 SHA512 99ea77ae905471f571c87a43fd9e8621ea169cf2b41bf3025fc2ecf2e4eed0088c6cc6cbc5c5d756f9083b9c6b11c2f8d0cb05090dcef9f69a797f6c887cab57
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 d20093d5e6c9..f50f265bf7a9 100644
--- a/dev-java/checker-framework-qual/Manifest
+++ b/dev-java/checker-framework-qual/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD checker-framework-qual-3.43.0.ebuild 732 BLAKE2B 6191b19cef0d175462189b8394a8dd468e827ac0c73e2cee9a7a1351f8b599969dfcadbcc9d61631c23761a18c7bc6d1112a29d3eb909ff91013d7f8d4b39694 SHA512 f1858e4f66c4b4670933a6e1a1ff01eb990c66c50ceb513dae6ad8d3a35c055c7617e8ae7b1e4aab4be2cfaa85f1ac81a7d17d3d807f46dd93598f4e6b943e59
-EBUILD checker-framework-qual-3.47.0.ebuild 661 BLAKE2B eb154d5fb5569ed40410e7a0d316b009e63648784a1e4cfd7800f85af2d5d62e66d84cbcc11116d03a64579816f083e603e8ec8926b8e22d88fed20cb2cf8409 SHA512 51ea9c26a199be418a92f8d8fb80fa496043938e01da4f2b2b09608ece78542f11dc3a5d03d716ef866f4f6c5273fad9a1b007f65ba2c54ac85590ef0645b6c3
+EBUILD checker-framework-qual-3.47.0.ebuild 660 BLAKE2B 14490f050de37909cfb5c89273f4e40b0529bf6bc091edbcbfbd63d7f504db85a4b7329ce9be7ebb8245210c31030cb4cdc054e84be5bcf5b8f639627ddddd66 SHA512 6b9b6103eccc354fc015e98add9caf9a00ebcf6120071d5cd454d1e9ff39a15c7ba0b980f43176a5f655102c64c127a8f17201fd71fe28e80f1e55c4cc086527
 MISC metadata.xml 651 BLAKE2B 2c53d072eaaaa7d09e5d185281efc9c897d1c8008dcbeb791c6b737614aa13f1091bda90b7fea33ff083c32dbd60dec180414af016af94850dee8b2bda8e865a SHA512 3428b96b3eac8b7416aabe2201af09c9bc4c444240ae682750573187a5ba137644aed7cfbcacb3a1162780a9eeb8544b0d6500cefc8f6e62f700271fe185a4d1
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 4c2130f554bf..684be7f1b43a 100644
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD error-prone-annotations-2.27.1-r1.ebuild 702 BLAKE2B 8027186ef0ed1bcd2712876893dd91d7dc231226b2b58ed94f218240cdd704f45c8915b11b6bb1b70593da55b6d7ba0891272c93d3f3d0d984ca8c1c9e3dde7f SHA512 32ce6d42f200d915aa0ce663d8cc452ac71a7038259950b0949e4a47de42a41270c314cbee74cc21331bd013d8fc7f796fb9d4ff979254b4a5c3ddb685bfffc0
-EBUILD error-prone-annotations-2.32.0.ebuild 654 BLAKE2B 32733aa150193bd0b232b1d0e58c28d000953fc336ea7d2238072774090537f756407d8d4dd76f6301b468f44dd8cb32472d30e0dd5f26254f624effe186b064 SHA512 5b30b1c54df6e06716c54aaa2c6d376a165c7cd6ba24152ce2a584bce5b50b7d0383d13397584688c7fb71b526bf25558d99c2dcc29cdc2d8483ae41b833d084
+EBUILD error-prone-annotations-2.32.0.ebuild 653 BLAKE2B 68ec32a8b6f23664b0689909a4db6f010892a6fe647ecb5c5f3e1d9372dcff6bd9d87f970e84565c5cc87f2e9fe40ec3a99d43db56c17dd5256c68b338d5dc3a SHA512 dbfeb7ef52b3c5749dadda69885c38db74580f7d05fe9bf7c3fd096a50220812d76789b7df548f4c4e7647cf31b6366f479fa66aa34ff2301f829b99ac4197ca
 MISC metadata.xml 320 BLAKE2B 2e99f822caa8b83ed1ababb800cd9d3b1c8027e5623bc4498a475b7e0e72943c2140ec07c42a1d967472186094a0933fcc82b5cbfe45d1111f0fec9924e161dc SHA512 c47744406f133d3553b5982f0a7f690ca4bb360e76e633c30015489bb6489ee74629f4d6cd1986558932acc7b18449cd9840f9080f71d682cc6fbf97981cbf21
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 f0e4f6ef42b2..f9747bc1b0bd 100644
--- a/dev-java/guava-testlib/Manifest
+++ b/dev-java/guava-testlib/Manifest
@@ -1,6 +1,4 @@
-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
-EBUILD guava-testlib-33.2.0.ebuild 1554 BLAKE2B 5989339f1035bab75bbe26be2504ce965dfe7796bc6f2e6b2591d055be310c0677e1edce9c7f1b0ce62a9c66edfddd4f270fef8f8a40a1d2dc8a18083d371bed SHA512 8a368ce6adceb9fec0d129121510e5b8593de58a9f838e623ae5898bfb4aec40fe5ee9e9ca67a3dbf1dc35bf49f0aee61cf29bbf9d3be00a917fb9ca8b770c02
-EBUILD guava-testlib-33.3.0.ebuild 1564 BLAKE2B 3d3865027b7be5ad23f867a55e824929cc43dde03abd256dd348ae4fdc6eff0dc6c744f8346d4a20a59becb33ac10de8483d561a39c8bba47d99f1b797db3f42 SHA512 63cf0ed79d911f7a832b2808021c38011514109a3bce644f64086a37d60c91fbfbb5e67dc1dfeedffb3b7adfe98b49a1c4aae31ffe0caff517c03863c1cf10a5
+EBUILD guava-testlib-33.3.0.ebuild 1563 BLAKE2B 88a95dd25f1b09b46ea7749f25b42a3433900eea274043d119372f5da66bf8289079079060960d8dcbec3c71455bd5f516a2618ee64159648890547362b01b53 SHA512 1c07e250ee7668207d742a4e3ded30c26eb48928b079092d8557ff53e9c14afe977c7075db3e2199ea490f13935cdef2c4232774cf9bd624c6c3070c06ba9d9b
 MISC metadata.xml 465 BLAKE2B 4219510a2bd85c049ada17dd780de974e3a972df9992cd693b52ae2b2d325342a8e70e233b2b884f8a07243da1abe0a1dc3affe1700f30b4093feb0e9ab07e95 SHA512 f7098be969eae6b094e54df6f05735dd6becf0dcdb19f28c5f7a675fe699e988655991f1846c9cb599b8932bfa1365e739ae762e8a0be8a83536e7fbbfa5e3e9
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 4bf8f1b9e6f2..c716cd0a1ebe 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1,5 +1,3 @@
-DIST guava-33.2.0.tar.gz 5812764 BLAKE2B ebfc20be079385e1bf4822b1402323d468c49604f585b514c1e6d40c64803df2f9848b73c63961976908ea8e6250f5e706add1619fc0ee0befaeacab02da075f SHA512 8807dd320af652cffc83ac930e6191b36c8942bc8bfe16cec5503e0721e2fe8a36d6636eb45d650c0ccd60c67fafe4f5aa8595ad454a822fd6888d4e1f22d466
 DIST guava-33.3.0.tar.gz 5819234 BLAKE2B 26c5f97b927f4afeb8c5d68714a54ef62bfc3995da8cf98d2022edd93054bb7e0bd38598adcefc209d04a246e3da50346e213ad49152e1fc0c91463cd8f0dea3 SHA512 122a10c98820443cbfc5769e1aaa5843becfc0e2e7119d0f2544d86bd265da1fc48c4113cb706f92d84ab896fc58583b80e7dc91b6cd13f9ee9996ae8457f02c
-EBUILD guava-33.2.0.ebuild 891 BLAKE2B ce99ed14f324f4fffdf02176a1481b99e961e76f8a0f5bfeb947242564bc28b8220ff5a8eba95cc76dbbf9af3cd9514635702b41300e344769186f57372b4d80 SHA512 cc843756d84d4aa67cb8a3893aa208e94377d0921bf2c2d51af039a503bc4012034d3ca3c7df9ae5fb8e622120d486dd5b4ed8d0aa884fad181db97f569d5c93
-EBUILD guava-33.3.0.ebuild 901 BLAKE2B cdf0dbf31a126c92a67dd21d7f1e005181b05ae3a388ab125f9ac0ef292689a405e3a0138abc0e342043ddaaaf86d5f9ef4bf8f069aeb4cc082f744d2a84b6f9 SHA512 3456b4feb827e588d3f7f19bcfd9687e63d91d3b1172384da25c965e238f7f5303fb5dceb8dc762670cc5068cd849b0b1899bf11993d642ba444a3e13d2fe07a
+EBUILD guava-33.3.0.ebuild 900 BLAKE2B 8af41b5a562ba16e6557a841fb91e559c5142174780cc5232ec0f301899b416a5efbf6750d8983388d7866ac1a34403da4ec891f567788f44770bfbe7aeb415c SHA512 ea4918f9b0c4a2964aaf14109ff5a7ae8795a6dfdb438a7ff8a776340ea4b12a27d9738adee82c2d7bb9acba1cd366aada382e325cd612af579ac8abf9ecf87e
 MISC metadata.xml 589 BLAKE2B 36b17e71aeb533194b87a9101d730b3f233c23b175b65216bdeecfcbf1bc7ac0936b7b284cdb40a30573d630d34a9bf7c2ca966b26bef4a3e7c5d6e90a1075a5 SHA512 0b8556db4fe43dc25f7604dd98ebb01fb4318c8a861ca25a5d7db76fef4b076c2eb2a67b801807233ad950cfb0d70b438af3f9e84f408060a168d9897158c6eb
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 6e419e4750cb..9a1116fea6f7 100644
--- a/dev-java/jctools-core/Manifest
+++ b/dev-java/jctools-core/Manifest
@@ -1,6 +1,4 @@
 AUX jctools-core-4.0.3-increase-TEST_TIMEOUT.patch 899 BLAKE2B c4196ee85e66e2914a2cb40cce8b1bbcb261f6c9c48ff4cbb9683130c201b614de91a34575b4ceb9d28060ee914b5df1e25f9c6ae9da993cd2d08644a5be1c1e SHA512 0e03a9f01a55deb6577fcb4598e1d5cf7ac5e4ea696ac5398130e4b6ef10e579f98adf403fa3be05870225a6354d37cf405e49c81ea4a0f9edd801eacc1b83e1
-DIST jctools-4.0.3.tar.gz 4237279 BLAKE2B be74c2b0997ec68b90249c8d2b841737fffa4e09724a25b5f5e15b8c4bbf811215023358bc674ed20f81d06a10db3ac2428b29d159ac99ef6dff7e6c36bf7fe2 SHA512 3d7cede6beba54871365cc2f49dc30f014a6f36a5e1f66e9cebd523d202806d49f24c23dbfd6bef0c25cbea0ca230b5d1afefd2b83b0150d335e8e99b6cec90f
 DIST jctools-4.0.5.tar.gz 4259231 BLAKE2B 33088bdb9f9d0030127990fadcef13295ea446ac54788c7d330c123af7e73626a7214481f8e10c5885e2026da281188c4c606965c8281f62c3fe2427e3754b79 SHA512 13069fb1b5c1275557e2343e6b8008ce549f948c185824a3e6a254fa0c1dc105e59de707d6b5b7bdb81120372a63026334cbd7a244d4e76b1de65d475cf02cd4
-EBUILD jctools-core-4.0.3-r1.ebuild 1968 BLAKE2B e1df69b99b3277870313b1eb13453364cf0399e371d9b63414ced7f3906b865acf5cdd25363aee26a3e1ce17ae1a8b1d32505aaacefc62c67656e5acb27d5b21 SHA512 0babf8425b268f25ea1e3a4f403873f2d86fcba720a37f410dd00168768457ed21dfa1091aa6e9ac618f42c3399066cb6bd7faf5d438ea14056ca2362e4fec63
-EBUILD jctools-core-4.0.5-r1.ebuild 2270 BLAKE2B 39e9dcb21fda71a328d6622017172a0c31eac06fb13a186f741e6403469f64db2aa7739b42e3783c82e0f222b510ab7ebb6a9f1f5e3b27172ceec7f8a1c21121 SHA512 f749acadf5408f8bcaccaa01382ba5966aaca6bbe8a99dc4f1303a5996152605c9e0b6c6db33d707bde544f6fe6edfe99227fe19789406a7e94b0d5f8262cabf
+EBUILD jctools-core-4.0.5-r1.ebuild 2269 BLAKE2B efbd7502f2e82de296825cbc3b0b94d102edb1a2f00ca2c683e2747a73afefec68c0312d89aea48b2bb582924e8aaf6fee4dd75ba6e65071e30beda9732c2488 SHA512 318f3d050452ffe6f2c19bbc894c33a477d51e11c3ae502cc1b9e4cb509eb5c021b04dc26f6b1da61bad464ba09f542f998db6fe21d3647a994c640795f350d2
 MISC metadata.xml 360 BLAKE2B 17c673e9f1a2114b2ba115cdd8f4240dc3731b26f7f5fef3a8ca2425192aece79740a7be59b030f79163c6ebece400940316991e34ec55c0e3490acd2fd8262d SHA512 ee2a7373801073e1c3af974bd937189f61e55af28ffd0a724d852da714e8b7abeb5375d377a7629a265c684880fb6a858358c63fe4434b768de9c92bfffe4637
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/jeromq/Manifest b/dev-java/jeromq/Manifest
index cc869b521713..36e794b3cb2e 100644
--- a/dev-java/jeromq/Manifest
+++ b/dev-java/jeromq/Manifest
@@ -1,5 +1,5 @@
 DIST jeromq-0.5.2.tar.gz 422673 BLAKE2B f244ef95bff70de8eb184e6eda8e292c54488435b8c9e000dbff5f1d6cb7b2b3066061bcb1fa678d2756117a52c39df795dae84071b544b0f577a331aecc8516 SHA512 49a3e9f7ff6b54dcde03958a84e72b8d4b44fb150fc980e9f1ea4ba9e258dcb0a0730d006550a3eb33e9f241e6d89cdc0ee2155213ddd309e255d606d1fa567b
 DIST jeromq-0.6.0.tar.gz 467854 BLAKE2B 65b5b8cf676965a07d4bc26898a6db6739a1b5431678c16c0c182eee5d0c69c86a01b17ad1055caacec78149816ddc0c9468fec577f2ab82c681b7822858ee17 SHA512 2e140d456bf6a7f566b3cd563a7697d08c96b004ae70cdc37e427e4526cf8db83e5df6a492e63887f3dba639e3c29384fc46ee9e9e4a6a800e3c2c2446a65695
 EBUILD jeromq-0.5.2.ebuild 1255 BLAKE2B 174c60505822c89178466c82a7e024c7f28c6cb6d829f06a69ee5edd1905a5e27a7528cc046623f67a49c2d5f2f71bd0af1249acd583126d77a950e7602b63a7 SHA512 356587ed087822d7ff96a031332d32975b3822738ea3fdf71ecb22da5ac82aa55ae11542a317869399b4762dc27026e0e8e59aaaf0f32f25e5c8929332e4670d
-EBUILD jeromq-0.6.0-r1.ebuild 1407 BLAKE2B 9a274535c031efe06995dfb3ec675d6314c6ad33d2024d0bd5494c5faf7b8dd8150e6db8a4827aaf1a7aac3c46f0992ae4223ebafe5e0efc6058142c85ab7ec5 SHA512 837131983ebf3f489b7827e65e09d419b5ea7e16c39218408efd90ed7b3d247d4ed5f8e88957c60d9281d21979675622fe97a51edc074224323efe85fd99c2bb
+EBUILD jeromq-0.6.0-r1.ebuild 1405 BLAKE2B daabb8a9af2da0a2dd247c074f56820e2b7e2392c5e11b2271496003d6952f65e8b78e3ac26dc2db5555464e1283dca51cbeb06fb201f98faecff0ad54fd7995 SHA512 2326fe6d4f9c33c75aec016444ca30658e3565e4eb4323915d1a5ee628d302dc6b253cbc247f86852044738b19388b9450c7f422b38523ac309ca64cf0d90c5d
 MISC metadata.xml 295 BLAKE2B cc5e491443af7c5808738d518bbd4e7f6012c782487fb29ada12e177a5cdf8d7963995fff7bc0663f0f300259de931dd64d6a11231044ab6ac9ccdac1a0055ae SHA512 cbe037fc5d2620849406bdb16273d3ce99e404f3c3b2c0017a6becf2c828950f9010c4bb84572ecea3c2d10fd137e765aa33660a98a5c0defe74f20c982855de
diff --git a/dev-java/jeromq/jeromq-0.6.0-r1.ebuild b/dev-java/jeromq/jeromq-0.6.0-r1.ebuild
index a2bf48996304..1179addc0cab 100644
--- a/dev-java/jeromq/jeromq-0.6.0-r1.ebuild
+++ b/dev-java/jeromq/jeromq-0.6.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ppc64"
 
 PROPERTIES="test_network"
 RESTRICT="test"
diff --git a/dev-java/jnacl/Manifest b/dev-java/jnacl/Manifest
index 4d19216319e5..66c2e57016a8 100644
--- a/dev-java/jnacl/Manifest
+++ b/dev-java/jnacl/Manifest
@@ -1,4 +1,4 @@
 DIST jnacl-1.0.tar.gz 9485 BLAKE2B ecbe56d12d7cc53dfc87b2f332c1c4328946ca4ed0d4ec3b8fa22a2ea5d98a3acf51fb17e1d93d3d7831f98a36a3d657a904cb63b225da4a30b8e907cbfe8384 SHA512 b4f28b4bd6deb13c17e74f911f89e762c9111aa90474754f072df66f0ca4bd366dc8369f51404fbd4f6c5f55223bb98b6bfe3de78e2f6b5527509741008f2015
-EBUILD jnacl-1.0-r1.ebuild 1064 BLAKE2B 32382474d3ae7cb8269671c81b8a39940334cfd86199ea65f1d5e8b87dd873ce8518af6a500f8143fba409215531480280e174acc90f670fff144d384dd78b1e SHA512 673a897ecbb8c924cdafbb5aba6f0ff93471133bf75f9cfc1e2ca05e50729b8f962fa2ba0a8a23c1378357a4e3a3f6ae4c698f7ebb4ea8cc417229c7e5e45143
+EBUILD jnacl-1.0-r1.ebuild 1062 BLAKE2B b9dccca7a5b48c373faac32f5755f38ac77288b3121e6c50cdc5413795cf8b26cbabd26006a924d6e312e9d444a3fab0d07c6b40c4330306a7668b54ddce1c43 SHA512 b892dfe255e4d936963ef910ad1b2e33973f4e93df36130ffb23109d9ec5c5b21e68970917194bfb6821e0e04f3edd3469193ebf3e0fc5d74a80f4260c59c37b
 EBUILD jnacl-1.0.ebuild 1376 BLAKE2B ad0e675935e720a10e3a1f363cb67083aeb2138124d90b61876ffb3fd58f6a75c84c1b62c4907315f0e94508732137235ce01300c407f126ba7a4ae7a7eb3772 SHA512 ab2e4b011d380de5e455e90c607343ff91660a3fb0b0c84ab7dba1162823de98fcbcc5354cbf371ba9850d327d4d88415a50c0bbad2e20169b00a5ae11f0f0b4
 MISC metadata.xml 555 BLAKE2B 59925630623875311237a760ed617ba6e16cf17224ab7691bb312ef6cc06b3004169345988f41a7af57363163b154d9246d13af24375c44eb98b5e134e3a039f SHA512 86c5a601c098952f2588371ba473a8998fb1e7bc14e765430ea20a5251d570ec175334e5de9b85186b7894c99665dbf561bfe40718bfee729b6afe5aa3e0be28
diff --git a/dev-java/jnacl/jnacl-1.0-r1.ebuild b/dev-java/jnacl/jnacl-1.0-r1.ebuild
index c6f3b8deffab..afeeab1a1e75 100644
--- a/dev-java/jnacl/jnacl-1.0-r1.ebuild
+++ b/dev-java/jnacl/jnacl-1.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ppc64"
 
 # We don't have fest-assert
 RESTRICT="test"
diff --git a/dev-java/metainf-services/Manifest b/dev-java/metainf-services/Manifest
index e9ad3784199e..9f19e275057c 100644
--- a/dev-java/metainf-services/Manifest
+++ b/dev-java/metainf-services/Manifest
@@ -1,5 +1,3 @@
 DIST metainf-services-1.11.tar.gz 5364 BLAKE2B 35c02791b4874a4806b9886c5d1d25e68ea0fbbd2e2e34c716e87e5043b56416c00e32e53f31e5ede0a4c9d466a64bb1e882ec9fff1ca0771ac9ae534c666394 SHA512 ccbe31a061c29ce45d1f86efee40675b89d328ad40b717abf28b9b7b62c678b584281b2d99848ff41992c7ff38941e5f9b93aac8e967605e2221d4bd02019490
-DIST metainf-services-1.9.tar.gz 5353 BLAKE2B a2d72b886169f6697033c56fa581e4fed9f69236a335397b0480111959e87e1d25ee16b96c6449b37b467aa68f0b4997873346416d8a09e3b14b911ffe37ffd4 SHA512 6d666c2582944e824cc66dd58c09474775e475146af7f8edcb4abce45eff6573481f550d8c37b854addd81825201207be7855b9bbc21f539559395a63e9fa261
 EBUILD metainf-services-1.11.ebuild 520 BLAKE2B 14d75eeda22e0ca024e6343879ef6dc5f8924b8497983ecf5ff478f8debe369f0f4c1e1be6a54536f08cb91509ebe25e4cb45e058f8d1853c88a64a18fa066aa SHA512 3e755d66c69f3f49cc2b5c80d22b8b012234874739614272bb06d6e85ed0255920a6f839d1eac51b810ed9ed46f7eed92cd84c0eb0c9bc5f4e45ae901446b9bc
-EBUILD metainf-services-1.9.ebuild 521 BLAKE2B 41c84e7506c89cd5ef7f08fbf1f7432b462a4d998f22cd462911cbc1239047bd2b6eac5d6f99d74c9e66134cd9078debd57a0ddc5cfc1b7f36abf4c8de8da101 SHA512 61975318ea79ca1e4e0d1295e9cec83c0ca676570c07ca3c7f4bdb81bac04a8a528e3f8792a40b97881c4ec85287bcb9614854e2d7f78480773efc464f378db0
 MISC metadata.xml 336 BLAKE2B b113ab8fbfc9b92ca28ffd74d92fbea63d51e156566c0cb5292186efe18e8cc6b1e4c8d53efa1bade7d7ffacfed5780e699838805ac7ec6e2dd6684067fa9297 SHA512 1e1092dca56408b2ea5d09537f33d685c6ee97d59e62b1894f2fa24255d699b82c6aeb6fe7af90045bf4498035a6f45be93b843784ee1e89fdcf7ce165aeccc9
diff --git a/dev-java/metainf-services/metainf-services-1.9.ebuild b/dev-java/metainf-services/metainf-services-1.9.ebuild
deleted file mode 100644
index 91c6c09f8493..000000000000
--- a/dev-java/metainf-services/metainf-services-1.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Generates META-INF/services files automatically"
-HOMEPAGE="https://metainf-services.kohsuke.org/"
-SRC_URI="https://github.com/kohsuke/${PN}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 3e4d9437805b..587f765bf9c5 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,11 +1,17 @@
 AUX openjdk-jre-bin-8.env.sh 573 BLAKE2B 02f032b60578e95a5f370afce4bec7aef12262b5f87c854a4ffc3844a4db5e88abcfb6e7539152b05e447eedb99c58e0a5944ffc2af82c10b5b0f04e447ea1ef SHA512 79bf447ffb50782348396ed1a64737f0a4adacfc21ef70d5f652db782e9492cde89f2ba740c28b6465eb4a6c32a483b2f50daaee784a03ff3d371e843f712fe5
 AUX openjdk-jre-bin.env.sh 342 BLAKE2B 194a81416378ac4729fc333f40c210bb33dea66cfc2b6a5341aab048c63f2c7c9a7bf9c45f10f5d23e2d7dd99cde80b03e79a79c30d08b6be90d6d8d6e850ec2 SHA512 6690285c5fa3866731ef28e0ff2153395e94a3e37837bf334ebea8fb132915a37002d70457810dbddbcaff78d5404f14818735ab6a722456780add4ad9efdafd
 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
 EBUILD openjdk-jre-bin-11.0.23_p9.ebuild 1998 BLAKE2B 2110836c46d6079d88d453a3057e77cf8c76a273d2afed8cce6552e181357d744675fec2c436d2c294284be2b5951916f80ba08d506942b25210f79451ea3020 SHA512 24693feea7018ad27cdad4405128b46c859da493bef70a01e2a0914dec0b0e08f51c201800aa78ea52a78fcb8bce9616981eb53844938ca0aab91010921dac4d
+EBUILD openjdk-jre-bin-11.0.25_p9.ebuild 1999 BLAKE2B f49555cb1512494a4fde6853fe50ef816193078d006bba671f1d71d6e11420114466821d6b047f4a656b56ecd8d378ec69e5cd81b2fc7a13ee7f61d5119f4717 SHA512 98ef54e07ae1c3e2d50e3ac25731ed3677c1cd41559ff8dd21020dc82fb5bb4194cb20353962fb1b2181c4abed59f9d31d221202e13b24fc9aa419ccfc647a2b
 EBUILD openjdk-jre-bin-17.0.11_p9.ebuild 1998 BLAKE2B 2110836c46d6079d88d453a3057e77cf8c76a273d2afed8cce6552e181357d744675fec2c436d2c294284be2b5951916f80ba08d506942b25210f79451ea3020 SHA512 24693feea7018ad27cdad4405128b46c859da493bef70a01e2a0914dec0b0e08f51c201800aa78ea52a78fcb8bce9616981eb53844938ca0aab91010921dac4d
-EBUILD openjdk-jre-bin-21.0.3_p9.ebuild 1999 BLAKE2B f49555cb1512494a4fde6853fe50ef816193078d006bba671f1d71d6e11420114466821d6b047f4a656b56ecd8d378ec69e5cd81b2fc7a13ee7f61d5119f4717 SHA512 98ef54e07ae1c3e2d50e3ac25731ed3677c1cd41559ff8dd21020dc82fb5bb4194cb20353962fb1b2181c4abed59f9d31d221202e13b24fc9aa419ccfc647a2b
+EBUILD openjdk-jre-bin-17.0.13_p11.ebuild 1999 BLAKE2B f49555cb1512494a4fde6853fe50ef816193078d006bba671f1d71d6e11420114466821d6b047f4a656b56ecd8d378ec69e5cd81b2fc7a13ee7f61d5119f4717 SHA512 98ef54e07ae1c3e2d50e3ac25731ed3677c1cd41559ff8dd21020dc82fb5bb4194cb20353962fb1b2181c4abed59f9d31d221202e13b24fc9aa419ccfc647a2b
+EBUILD openjdk-jre-bin-21.0.5_p11.ebuild 1999 BLAKE2B f49555cb1512494a4fde6853fe50ef816193078d006bba671f1d71d6e11420114466821d6b047f4a656b56ecd8d378ec69e5cd81b2fc7a13ee7f61d5119f4717 SHA512 98ef54e07ae1c3e2d50e3ac25731ed3677c1cd41559ff8dd21020dc82fb5bb4194cb20353962fb1b2181c4abed59f9d31d221202e13b24fc9aa419ccfc647a2b
 EBUILD openjdk-jre-bin-8.412_p08.ebuild 1833 BLAKE2B 5b4c1f5e8cc03712fd969653a85dfe53517fa56d488aae953f78ca38dd33fd3433f172be1ca2fa9d35cdabbf9e11c3c375c5e10633096791aad1e1aa33788a1e SHA512 7c64ea39325b3838b078af5acfdbe6f86c7698d809b1b721592fd33cc0f08325c52e5995c2e2038120c17ee8aa0761873ee440ff6ccac5488d5e7c6c000463ae
+EBUILD openjdk-jre-bin-8.432_p06.ebuild 1834 BLAKE2B 0e3cabd430a05f3f434263ec3f0a0d74a188a0467bd9984ca09acfd66648edf716a953493ba39d7ff33274e12bf26e9a8c470c664d40372ecb411aeef45795d8 SHA512 757ea9e3c90a1d65d42bdf53f48889e14aa6e7fc58b7b18cdcb09c43332fe09d93e0b9a53ff9583e7f23d21f24fd9d6f991484ea1641f6152718bdc10e5c8aea
 MISC metadata.xml 655 BLAKE2B e05648526464c16e698e8fc1b16a4c7ab646ad42402241a5a23eecd209406446b9a77a46f1ed55d27a924ffa7019ce8cf976f3037a8adc091b1406c501c35e88 SHA512 437ded048327540f6010e462448317eef13da67f5cfca0b62c15fd2367f1a5bfb125b73de9228d3054d2001bef557e5d9a13f80686678df9c03bd6c10b4d1fe2
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 dff5a6bce8ad..792fdfe1fd88 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -7,13 +7,10 @@ AUX openjdk-8.402_p06-0004-Fix-misc.-warnings.patch 3075 BLAKE2B 8da8de4830a4545
 AUX openjdk-8.env.sh 687 BLAKE2B 4bb851545955fafa6a4b08f2589fa9a5441ef37484eb21ac5db06cde111d325903e70b5b7473659973a0bab972386c8f33ded1da57858fdca325cfa29b1122f5 SHA512 a43fc0fcf57108350235d47d6da65a12fb9f77f12f6163c649ceceacb3317c6a25516efa060efe129b74138a529945163343e5a7d1de2b7af36f6580054ed5e5
 AUX openjdk.env.sh 432 BLAKE2B 8779a373af2f9e52473cb5e3bc2bbcb7fa83c6d09382d498466888dd322299adc1b736c6e3723fa68e92a80067599228b3511cc2826e1ebc3c5845a7a2f62fa3 SHA512 e6604a88fb857945a618e4b7735d49dbc23bdd4c6fb70fc5753470e9c1047825208a40fe25107bcde95f290656b44f92e1667ebc414454cbae2e71f16fec5fbd
 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
@@ -26,12 +23,9 @@ DIST openjdk-bootstrap-21.0.0_p35-ppc64.tar.xz 125375264 BLAKE2B 28802995f393dc7
 DIST openjdk-bootstrap-21.0.0_p35-x86.tar.xz 120906212 BLAKE2B c3a56f4e51a8aca1c318b9c32bebdb4c09e42d80416ce1843bc80077f09466b7f54627ab6992f9149fdabdb4d5557c3cad6b5e93b37ba3d89d84f736fc07a57a SHA512 40f0cf60adaebd0c6ae11badb6b71727a5cc64c89077731b0f7cc82f203297b9b780ae43ec74eca9dd5a64de1209f519c2ad0f9083c017cf474d1020206f762c
 DIST openjdk-bootstrap-8.402_p06-ppc64.tar.xz 34476368 BLAKE2B 1f896772f5e40a2793c5d9294e65e429c94204f91e91bfd76ff780e1d6318741c2052c3f20e59abcfb7018924983b5c9f386f14f912660e3e86296185f348482 SHA512 7bace068c5ac7604ad9db3ed655a52a4a90195efbf2fc342389cf7929d82d3f7b861fe700c16f513599bf9c064a87c9aa5966d7bd45aa7ed5e55ec317667be6a
 DIST openjdk-bootstrap-8.402_p06-x86.tar.xz 37076244 BLAKE2B bd50f84e8ac2ee9850c158c7e7d9fae9741112230dcd6e314163911921d63e3222cd3f4ab9d08bbaacbf6d9bfce9a1a9336e21088fba6396613489a701b30797 SHA512 fe5719e0bbf9bcd6eb9790ebd4da34e7f6c99fe4b7d41de2b5d00b20ebe76a77d857c726d1a71b7f40657ca2a9aa08eaa9efc1ab4be60016f66af95530b454b5
-EBUILD openjdk-11.0.24_p8.ebuild 9003 BLAKE2B e8b0c87b9fb1322893cb137cf7eb94c29e0b4d33720d40d464c5d4c171297642eedcbcb66f637c963c07d83db84d551f7d536e5ba6c8510f6140f6051fa15134 SHA512 3ed25ec77e46faf8843085a3eceabf801a242ed0471eed32d344c871cb1e006477009d9a19db748ff1fd083ac0b7874f364d48360ee258bb57e3bdfcdd79227b
-EBUILD openjdk-11.0.25_p9.ebuild 9007 BLAKE2B e9747cce4d2096bc91fecd78f0dc50aa167b3cc7f57f762ddb6a4daec88b72060baf212456b524ac900dec4570cbf2a20a2eecbc227e9ce08f5240f1b3501779 SHA512 de9bb7c4f8dfe6966d31b33503fec7aaac1e860490d25ab36134be6726a7fdc57d58fe8e03ed04c1f55243515c498855f797cd9c6445eb87f9ba6e7f0d58393c
-EBUILD openjdk-17.0.12_p7.ebuild 9423 BLAKE2B 269c2108f9807cac55c140e93901566537d99c865238da907be7e2542664eebde575e02fa425414e786cde43ec804937819e4311036ac9b74c4c81cce964b0fc SHA512 d1c49ce3d13496a945a362fe52b1b6cebe43280b82e41a32180c077e0c9c0e60ef5f4c752a3288331ac33e659e92bdb98f7e54c64d31414cdb600161766c68df
-EBUILD openjdk-17.0.13_p11.ebuild 9427 BLAKE2B 008121fd06890a4c1ce788ada5ae095aebf8f80a23b3ac82e7d58f246553c8bf3946af57002a4328bd73bf819f0ad25f79dfd57b25b76ca827e7883098b2a4a4 SHA512 cd1935bcf1847e4f3dceb12611e6a02d01f2ff41beab81529a772e8e1c0286713daa7bc3c539c4f25d6e2ba7e58bb845b434c3a62837be4f485b3a9f18b52415
+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.ebuild 9534 BLAKE2B 16ec3a58ac789c46f3527b72da86a282916e9dc9774f8fbddea40a66763f35eebbb545493682f869ecf03bb3d2d86829bb3d0c7e2c61ec879d9c722eb6a9806d SHA512 3ed2814c35176848b3ec882f2c679c62be126091945008a12945041d24bc6e2941bcd6c975661c9dde6bfbd596a702123c017a7f74d9b79deadf9aa87ce37b4a
 EBUILD openjdk-23.0.1_p11.ebuild 9584 BLAKE2B e114f8858f737e48fab5c1295a0fcc8af495d4ac1d2102a6aab51a02282380bd84081a7d98771873d5020ab7d5b7e7f1e83859633ab7a154ea40ef16b0b72d9f SHA512 78c6b34b4c95de3362a48a1192cf53f51564c11f6ca1032429edba9543ee73c0ccc684e3df4a7d1d0e753610f839f5a57a59b3cdea0a85ec189d251f6014340d
-EBUILD openjdk-8.422_p05.ebuild 7819 BLAKE2B 46ee633ad8c8751885c948f3648e76f973266336fe15fa0016368302719770d9435c5e0db4cb59481e782e2b89adabe8b8cd0b4624749051c066de120509f8b7 SHA512 250754810305bf30ac7ce4dbc15dd1a321f4dc47cf5e49154f26b80b704218b21b6ab2f428a9857096936793460f2471df2fcd921c7fdc40838f11a2d0cce377
-EBUILD openjdk-8.432_p06.ebuild 7823 BLAKE2B df25782738aa40faf91a4eac7b06eef4ddb8d7cfd1d2a2ae05c42f63eac88a37e51e788e2ebcbbcd54fb491f35c7b26e5c98a675415483aa70f9eecda735291b SHA512 345aa3c92e51568a88f36cd6669ed7c6ae4b7f12c0c74b378ffaba29d086a3f02af62839d212277579f2e1e282bffe112bc49a0031fd2884c05bee7489a3980b
+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-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 e05e58c45311..fb5e80f1bff1 100644
--- a/dev-java/opentest4j/Manifest
+++ b/dev-java/opentest4j/Manifest
@@ -1,5 +1,3 @@
-DIST opentest4j-1.2.0.tar.gz 77616 BLAKE2B a331cc5e97d1e50b3b57e6aac926278d16f4d75067b4e4b25acb5ee25d4d4cd9d1f75c115155303ec63f5cb22b09ad1cbaa01d62620b350dd2c1d61541657b78 SHA512 cd98d976935de97d259ec4c04510334f2b56f8a32db2c97e0f20a2e3b99f119ffeb390589eb42d4594808d96194067871d5eaad6a40dd58af30b9f995b13ef08
 DIST opentest4j-1.3.0.tar.gz 89527 BLAKE2B f8ac763c3ec1b1617c38c3744a8fac82e0d93ff4ff409a00e3e22d343fc873aa4129bee3d906de0e13cc78450a1c67cdcffebed91d00c9758f20113a68a76dc7 SHA512 6141fed5230d1195eee137031fc6cf8e3df0b857f2fd341ba823d5aeb92d86e56262b57b93a901a4e00f6000920b67f28e02e04f404df7df8e62be9d60c3e79d
-EBUILD opentest4j-1.2.0-r1.ebuild 761 BLAKE2B a8c69c0a5867738f9f48e43b1362087d8157ebe347fa62652bda946898128a3bda3ed4ebdf193a94990c10ff883d6213b17edb9cc389d2aa4dd7fa57add3d33e SHA512 7adc80aadd3a683be3340d3013a5d7059eef0992727e2cd838af89b9abcebb899ac248e89884c15decdd86e57f56b19a62f6e7cb319670a8391b5ed8c000a414
-EBUILD opentest4j-1.3.0-r1.ebuild 1661 BLAKE2B dce2244b1d6e02bc614f1f99934f3157e9f3fb8c98d77bccce5c9b700f0b834f0b1101b247b75c1c606374c9c8debaecedabc80a0d186517b27598606d37f4e4 SHA512 88edd0fdb40ba03232fbd9f1b84b7f21f00d65ba80f65f27d5d42eaf5a6f17c5fb35b9fa639680bf0c5fc03eed5f7752289b46581017ea2d808dbad031188b6e
+EBUILD opentest4j-1.3.0-r1.ebuild 1660 BLAKE2B 2601574aed69570cb1d2c4ac7004bdb359ac0839c21ffec04c8c8bd2e7b34f6a27da08febb86629520e05998c46cb4431f6f649b82415d01083a4bce5a96fb1b SHA512 f91a95715d4dced95e7fe7d01a4622442a24bf5a4aa100ddec71a633329c02f55fe504d834d066d2a77a65e419a169d1ef92280e6169b934fa039b9ecccb1141
 MISC metadata.xml 303 BLAKE2B 07307ccd1ef1f074fa091ff02bdacfe83a3f3c0a2d79f7545821d5955834a83391d64d34dc8170cb5a4752302296e746393491f7b628a6936a3f0c2b85e09f29 SHA512 9760587d9dec49089d8ea86b7046d145e41075c6ae02af3be319e795272b3eeaef6540dfbb90564bb85d50974f44acd4bfd71d57956b1ff0e2e216220bf60f48
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
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 99b80618bb63..cee1987ed30e 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -31,5 +31,5 @@ EBUILD swt-4.29-r1.ebuild 3456 BLAKE2B 6d48de8cc8e1d9c034fafe3ca67951bf0c5920122
 EBUILD swt-4.30-r2.ebuild 3526 BLAKE2B 7d7d2f4af8b64b169daaff9486311d50324170cfabfa948f0b3029a77ba487fa2953d8c531260a5db1bc8185449ca6126a4693f8cc30cdd5ecdbb572dae896f8 SHA512 0256a8bc0e5b16cf3e50f81cbef51f9ef7b8c91f1e006ceb020d11026d19317459e1148c655eb68e05b75bd8601de8372e7ce6ae38dd695e70465a9b02d8ab07
 EBUILD swt-4.31-r1.ebuild 3597 BLAKE2B 3ebfa0ada9993a92ee67868ee6070b0a4812b455e3e3209e1a00abe4a528c2202be78d413d62123d113edfd22d998d728d2913b4d03296922a01cde4835ce8c8 SHA512 414e93ee4cc2398bb5f7b1b7079a865e48a0d3de4dcd62bba170c2207d4283fe7eace273736335233a6b16848f73890f59646ff763ba311d5aa75ecb5c146870
 EBUILD swt-4.32.ebuild 3597 BLAKE2B 6f6b08425ff52668c342394c50437397eeec8621d766f67d8a90999e2e659919da3837cc987f5166a268016351176406e7bbafa7b74cf59176c276bb5eca5402 SHA512 e9b246638d08f0d415f8412913b9369d9ce257f2a4e43e0741f2e5b989aac31d091d5c4f533a7a6ea50a3ea2cd73ee21728ec7e44a4ed7715aab6fe09a2f554c
-EBUILD swt-4.33.ebuild 3600 BLAKE2B 1d51537df59fbe769806327c0215817a1110243611535c3de072785f47c6e4d3216b851a2ed56447deea83a881a1574a5a247bcd2f98a7e1ea6cf65fe9161c39 SHA512 9cd98c933803db37a255875f8c5ad3ccb8fe7103f25118c8715f0983e5683b3a7f97deb307a46c117a9b6f8a984104f934db9a710c070d52449f6cfe8197ca07
+EBUILD swt-4.33.ebuild 3598 BLAKE2B 0aa21e489be339fe0dc7b562ec82df8cf2bfdacfa23dd1d1cc945ed2672e2629d514f45af1ce515dfd2143b0089fb4e9b1a6c76ac3f181dd7c128010750e92a9 SHA512 f5a1ef338dbbbd2fbc565d436514849156348ec668199dafe651503fe3575849ec72f1f1c624c612efe438a2e018b286147624192fda93cc91c6cb34c1933057
 MISC metadata.xml 762 BLAKE2B 6d1ffda9ea96f50b3e4736513ca9a3af4e7e9d3cd59a3f8ff8efcae118d290d141ffa90181fb1669f9a4380c6e4c618d780b459ada909c5dd5aa4f5fc1865b7d SHA512 5c50e0d80478a6af08886d9b65230fc161a000a7ea39d0ffa873114e13fd1fb9bcbcc554df41eebd63ee60dd9ed14e6f19110e71a49bd32adef6c43051c2c380
diff --git a/dev-java/swt/swt-4.33.ebuild b/dev-java/swt/swt-4.33.ebuild
index 444346927d00..e92183b61a73 100644
--- a/dev-java/swt/swt-4.33.ebuild
+++ b/dev-java/swt/swt-4.33.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/library"
 
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="4.33"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ppc64"
 IUSE="cairo opengl webkit"
 
 BDEPEND="
author	V3n3RiX <venerix@koprulu.sector>	2024-10-19 04:04:36 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2024-10-19 04:04:36 +0100
commit	d895362f98ae63a6ed12cd16d3b3df95d6967f25 (patch)
tree	e6c8a50e31dc122b10c6dc3d9eee5d6ec6f002c0 /dev-java
parent	483d7c056fba15727fe24545f93627a1d1e1e2eb (diff)