Adding metadata

16 files changed, 23 insertions, 199 deletions

diff --git a/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild b/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild
index a1021afe6a00..1068fc1ac9b4 100644
--- a/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild
+++ b/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/byte-buddy-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ppc64"
 
 DEPEND="
 	>=dev-java/asm-9.7.1:9
diff --git a/dev-java/fop/fop-2.10.ebuild b/dev-java/fop/fop-2.10-r1.ebuild
index 07e4bc1319a9..7f308bf708e0 100644
--- a/dev-java/fop/fop-2.10.ebuild
+++ b/dev-java/fop/fop-2.10-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
-SLOT="2.8"
+SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ppc64"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc"
@@ -206,6 +206,6 @@ src_install() {
 	if use doc; then
 		java-pkg_dojavadoc target/api
 	fi
-	java-pkg_dolauncher "fop-${SLOT}" --main "org.apache.fop.cli.Main"
+	java-pkg_dolauncher "fop" --main "org.apache.fop.cli.Main"
 	einstalldocs
 }
diff --git a/dev-java/javassist/javassist-3.30.2.ebuild b/dev-java/javassist/javassist-3.30.2.ebuild
index fd3122df656a..9cff24299ac1 100644
--- a/dev-java/javassist/javassist-3.30.2.ebuild
+++ b/dev-java/javassist/javassist-3.30.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-rel_${PV//./_}_ga"
 
 LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1"
 SLOT="3"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ppc64 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=virtual/jdk-11:*
diff --git a/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild b/dev-java/jchart2d/jchart2d-3.2.2-r2.ebuild
index f7b83ec0b7a9..39ae7001d24c 100644
--- a/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild
+++ b/dev-java/jchart2d/jchart2d-3.2.2-r2.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 CP_DEPEND="dev-java/jide-oss:0
-	dev-java/xmlgraphics-commons:2"
+	>=dev-java/xmlgraphics-commons-2.10:0"
 
 DEPEND=">=virtual/jdk-1.8:*
 	${CP_DEPEND}"
diff --git a/dev-java/mockito/mockito-2.28.2-r1.ebuild b/dev-java/mockito/mockito-2.28.2-r1.ebuild
index 6b413be4b92e..0b537f6ba2db 100644
--- a/dev-java/mockito/mockito-2.28.2-r1.ebuild
+++ b/dev-java/mockito/mockito-2.28.2-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ppc64"
 
 # Tests need a version of byte-buddy supporting Java 21. #930103
 CP_DEPEND="
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 4a1ae24a308a..3db04f596a46 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,9 +1,15 @@
 DIST OpenJDK-jdk_aarch64_alpine-linux_hotspot_24_20-ea.tar.gz 213486173 BLAKE2B 429486689b28a436462d20691919ff90f242ea0d7f9e2f35c10596cb21780c14cfc8434531e2c75af0a486cec9004a815815ce0ac759a99612c8d325fd925230 SHA512 e003b0f91325560891c831e4e37a641699685b8e32f032040c65bf75c7557f89673976bd87ece4ad31a8e5b46f7854a830d553f91804379661319da087d9a9f1
+DIST OpenJDK-jdk_aarch64_alpine-linux_hotspot_25_2-ea.tar.gz 138188020 BLAKE2B 5565338caf2b16e8ae91ab78709314b3a1540f24d38230f547113edaa24ce375f2decd19bc17126e48c823342775c6d4747c99167a58d5e15adebb896c99392f SHA512 e1470842b0f023d92a6e228f7ca9a1edd9d27d4ae5850a935ed862176289dfccfac8c9037db38af5cfd70378d4526aa4e46cd3875779b2aabfe60f2394529087
 DIST OpenJDK-jdk_aarch64_linux_hotspot_24_20-ea.tar.gz 213435180 BLAKE2B 0163fbc674b7f04dc69bf2d57444e2f9625f22050a6ae09bd976d9d393d69c3b557332302a6ff0cc58e04ea910bb4f2bc5fda677024c06ac568df6cc57698d11 SHA512 b6fd2b0750e22dd986314314e126932dc95475314636733083d1d0f50c1e298371d418cad098e0062f6e4a3b3d4a2f50e3cf2e7954db407b01ea5f3432e606d2
+DIST OpenJDK-jdk_aarch64_linux_hotspot_25_2-ea.tar.gz 138225211 BLAKE2B b6d029aa8870eeb1600e626567bc96c5e9b8a648a984d3e92c18a90f0276c72b6baa5c587842522f5fdf70e47822d1ef79a343869a3d90ebeeee235d728419f3 SHA512 dbda88f277a6e915f8866fe408612188e4e0dd9b76acee25707cbbf979eae8fe21b2739a048a1f57039a585c06cd4c710f774732624d238e6c76b1e232dc5ac1
 DIST OpenJDK-jdk_ppc64le_linux_hotspot_24_20-ea.tar.gz 214984344 BLAKE2B c6582a845579246f920b0ab94657870650669a30e45f0435a4ad8b63657771b5a708cf5aa417f87d9e2a7dde7fae0603864e21558e022fd39cfa818d1d5bd20b SHA512 f5e8644094b737a3eb8b1d40b2140fbc283e9c397c0dd23bc53c4678430abf84dc8f2e264ac4aee824b135e30dd3df390d8a38af5b7e7ac74e945ce081984f91
+DIST OpenJDK-jdk_ppc64le_linux_hotspot_25_2-ea.tar.gz 138760006 BLAKE2B 0526ed58a4068f876422d0a99f832a79c8e298e8152ebc29ec2fd281895d87f529c7cff404fff20273bc990cabef337e708a107da4d77686660c9ad796db8d28 SHA512 d1ef8bdc32adb89be2c37c8a34d7547705c886ed7fd7b80a65a52b9e7ea1afb86d483edc5b2ead891a1860aad6aebb2f497fc5c11bdad9bc7a6b21f3f49aa31b
 DIST OpenJDK-jdk_riscv64_linux_hotspot_24_20-ea.tar.gz 211454913 BLAKE2B c5aec2757115c71abf2a3d711c5cc8074661ba558d7657ceb1774e2a59681a58a08e167eb17aeae7140a61aa8f32cab891c56130ea74db490a51795d81a148c6 SHA512 78e601771ce3b22c3ec361aceac53184524eccb6ae0e0434be415a7af4cd528253facaf8d161bdec691946394f8fdc47a0b37d8fd3cffae0627dbcbd347ccf98
+DIST OpenJDK-jdk_riscv64_linux_hotspot_25_2-ea.tar.gz 137068288 BLAKE2B ca30c5dc1240edb1c8f580df359937cd25528fa9f11b29f6c6a92aaa668c359c6e0522c886a405e53868c56c769c2ad7cc164837cdea25db8e802946377da5be SHA512 1b1cbb7ee68a4e7de47017be23d3ac66f010e99175ed7d9ef66c216ae2bce6c8eb94629633cfa4ddd4a7d27deb359289bce48d54eec203d0be343c47bc93c318
 DIST OpenJDK-jdk_x64_alpine-linux_hotspot_24_20-ea.tar.gz 215768214 BLAKE2B 32dc974b0e13a14c79c77333bc2208b29455f5c1f2818bc2480b09ae7ff1f48e2ea9c03ae80264a4bf389bdf3df9f17157456576e943fd71713fae97110404d9 SHA512 62f1776e1b34fd5950450745e1de81ade2f882037b8bb707926c9deec19101d3623e1c9d76702d577458cbaf0d1239be5674d3752e8d58eb0200e4b446464fe1
+DIST OpenJDK-jdk_x64_alpine-linux_hotspot_25_2-ea.tar.gz 139310462 BLAKE2B e6e7f2fc5390b74a2206beda0a40bb83f41c7ae576957499912bb4c56dc64e61af8bf791436d43d433f2ea2249cf77af09e1e0a8960597c3bbc8fd669fd6703a SHA512 a97f506056ea8d97f450e1aa7e4f6f6be39c4d7f006877d40aaef30bce745cab06a80bb53c078973280024c0b84452d2768b03b20eaa6cdfbf9e1ad5d1acdd6d
 DIST OpenJDK-jdk_x64_linux_hotspot_24_20-ea.tar.gz 215528275 BLAKE2B abfe4b018d32fcd8c814033bfea181300b3c166694e2e3e58dbba53bf7d2b6236294e619837474cefdea972d229588e41b488d7043aca9533bc14376dcf79da9 SHA512 b7ccdb432f7f837acfbe6e617486d032bf6da191ab767e2a607ca4cea0e46b58ebc4d91b9e8611771ae0814ed60db4f9c9def3d1987b85c9f2c31bb43d6bbabc
+DIST OpenJDK-jdk_x64_linux_hotspot_25_2-ea.tar.gz 139202344 BLAKE2B e86a13c0a8dcfadbad2142d195afa56658569230fa0df823932be3b961564fa497a3ace37dbea8a98097b6be6fa0aa8ae8756a5e130d4483427a000929ae4ce5 SHA512 75cbc70ab4780c201b5158b268808408bcfc383f80deb14a98187439255a2116f7d115028386c35ee7961a0ea43ee2c7db3eebb2d8aeb396a59d0081dfebf428
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.25_9.tar.gz 192125336 BLAKE2B e083ce8691f8462310eeaa7495d26519754f5bfadc8a786dd188f1dad4dc36164eea9220125340b43c9e6b4321be6e26d66a9c18247a6462e4cae9f453fe1171 SHA512 860fff5eff6ef2a29062aac0ee7f90d80dca417fb58ccbf9a9f2ca96a8dc4798a00dab42deedbc64a371d0356b17e6cd12cdc2b2879edfcec9463ffc004ce5fb
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.25_9.tar.gz 182871332 BLAKE2B ac6ba9e02fcec38dbb685cdebf379ecdcb5041bc53a71a0896baf7f2628faaa0dd1402b045a57010e2495c16e48116fd1216fe6d4b6cf35cbc996dafe8516e0a SHA512 db0761f8b0baa82c61567a869f2c23da61470d055ecbd73c7693a7be37167282af7387006f22a0c7a46e1e71591615fac0431925987af8fb8e36d77207669856
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.25_9.tar.gz 177532830 BLAKE2B 5a2e15a9cd601dfbc6749875ee53de1ca5d41c41335e52588c778412499c4825b9108bcf8dacbe250814ff5664d8b8fceefceb738dc24c3ab3d13d292fa3d027 SHA512 8ba8c210717046ab167eeccfc8a3b18e34e77262a0aef866b6268cbd5b91bfd6ed90003ce7de852d6e24f923e044839092e5faac2f3df6273b8b3868eb7e7398
@@ -23,12 +29,6 @@ DIST OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.5_11.tar.gz 206643081 BLAKE2B e8b
 DIST OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.5_11.tar.gz 202809140 BLAKE2B 7ca8b039b8859856d853751f09da0d5ec84021a4c670610a5c51cba78867ba5fcf3a825a3e5d7fe1a1d75fdc00a4aeaa1439f18c24355f15838c35df2d697c8d SHA512 5c4f050d2bafa8187acb0c2fdfbc047a4560d6eed9e79a2e7298e4b0c6e05da7ba13fc78ef024b68668450d8664436bf0ba4a05fb7580bc00b4991d79b41b2e5
 DIST OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.5_11.tar.gz 207005595 BLAKE2B b63e61e46b0fe40ae81adbcf3e9f694ac82620abe80f64ccbd4d39ddd065b3fa53afa3cc6b3182d0b28e858ae70f4921bdda6e322a2ade29776d372e28190d25 SHA512 562509cc29ef465d718e3978c848e09c2f8adce9b6376a1c762076018a1a570466656d670784aba231d336dd25fba6b5bbb87960e8990914921f635173aa49ab
 DIST OpenJDK21U-jdk_x64_linux_hotspot_21.0.5_11.tar.gz 206798126 BLAKE2B ed139c216a82ed9c258bc3b48fccee184f8facd4f53f607ed6db79b7fe01193a41d3097bece31b5bf53c6964c96ac5e4f473f27fbb57a3e24b58149f3bd3db3c SHA512 0b5abec819b5c49a5e3feeb80ec97f508cb4436129b94a44195eacf24ff19077a6ed49381074a37f8c9f8fc71b9964f0ff035b62eb594290574c355f8231965a
-DIST OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23.0.1_11.tar.gz 212364285 BLAKE2B 72987f790c8c3b7fbf1f07eaa36a4e87cebeed3d62c9aed36ea1baa718243c31d39c93a31cfb53b3f54228a34f6eaf3338fb9c98c792d476a676a474ee745f7a SHA512 bdebae0e2648c9a6e9334e5bf7ad3c42baef900d6c7f941d41903f2156177064d9d2c45ce37d776b5f513948320abe73eb056646da2b6fe04a662513aac44574
-DIST OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.1_11.tar.gz 212358248 BLAKE2B 7d08e73b742a9405d4eb84aeca0d94c1a52abe738a8e72c49e42741893501ebded0b2c498ac5a379bd922cab483688e8e49ffd80d1686913bb0c1b250824d2e0 SHA512 2bc1d9e3a2741e1359915a2479b6f09a3877a6fbb9e358e01e0e5305585c3b974a7847da08857692bc2a65e9dadc77b443739ad1d963941ded37ea97ab8329a0
-DIST OpenJDK23U-jdk_ppc64le_linux_hotspot_23.0.1_11.tar.gz 213965373 BLAKE2B 945e1956d5ad1ab3400ee2a930d4263dbec506dc4654e36dc0a2b59aee57d024351a3a1789d8576773519db7853edf475f983c719e87e2f2f3b492bd90f6f129 SHA512 67921f45b7830dde531dd3a2ea70c9de01fba1db26d7ae7c7be8276b6d7f1c4cb5eaf12c023eeb74edcd83730bdcb88c2e8ac734af4a0c328a50e9402cc4ce69
-DIST OpenJDK23U-jdk_riscv64_linux_hotspot_23.0.1_11.tar.gz 210270830 BLAKE2B 5f637d1cbe29f51376bd4d53acb2bc71c8ea829290c932f396a40edc5d9edd6fec0dccd06ff4ef3c1698f318446014a4921155e8a56c69c5437f75da52cd2c74 SHA512 b17949738831ac9f608425d6d26837d44d6154f8a7cd29a70e862fb27c1fa38a4fd226db78de39cfe79d2439d2565e9c2548645a77101a6eb65c86755f063e50
-DIST OpenJDK23U-jdk_x64_alpine-linux_hotspot_23.0.1_11.tar.gz 214667027 BLAKE2B 0dc31688d75fe2498f86eb115d6b258e3bb60272005487275731481d4e56a5ea4c37f7467e2d2498c534d33405242b45784123d67f732bbbbc7f1fb3272bac4f SHA512 01772bd293cc87b95deafef5a0a72443c89d8e2baf19c71229d789d48900bc1c3dff1354226ecd92ae9fa6e27e15bd09e60ba52eabd8102854a2958744e49d53
-DIST OpenJDK23U-jdk_x64_linux_hotspot_23.0.1_11.tar.gz 214453113 BLAKE2B 214c74408ef2397425f374c6183d4d7d9e27ad5401199f6b7e48faf8a42a0bc2e5918896b0ebd47e0590acedb535669fe8e53858a76ee3bf0d8732155a7cecee SHA512 bcfc8ea1d835afcfbafc9f99c9e897588bf01e219dda936a4bda7e4982ff0b2cc2f21f5e3deadb0e1cf86a9a58295a25f8f82f9fadd2eab520817350a6a862c1
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u432b06.tar.gz 102158189 BLAKE2B bcb350a98234a7483eacf6387b20563965c514d3f92620283540e1e9f0d578263f0d1490e3f230d638f69189926b9d02a12b17bfaf246e5a4da5096739a4073a SHA512 6f5921e08bcf6af7d8011df2fe380b32da2bd43ab88c014503899f55ae55df128aca2e1e90b64faac698730cba55dd80567dc023a00b8bd829f6e48a565f8f61
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u432b06.tar.gz 98353185 BLAKE2B 38d09e21378af517f3ff24b17bdad3263dd4b88b7989d359bc8ac79ef6bcb65dc397dab8811e2d83cc56578dc72de3dc41d90328070b4b93352303c29fe4899c SHA512 f3f8ca2e51d04388b30a6cd52e906b0dd88ecf17da221ca6420581e8e2504f57900efae84a36a3ec3f0fa2c774d5ee79a272a9e13c7a0326cda2f11c2525638f
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u432b06.tar.gz 100556456 BLAKE2B ad3b5b0cf06bb76062e96d9f3dc82378e523734f6252b21af2bd63565f1c084ed535348cd5c95c67193a45785bc52ecad839e557ab7c82c022ae15ce62c682d2 SHA512 f63a81fff5e653ee7421d269fc5243b3af068408051c883475ee4be86501ecd4951a9228b40135dead84a2363d0bd87e5136908b3dbbfc354631a00b1dc4d9e1
diff --git a/dev-java/openjdk-bin/openjdk-bin-23.0.1_p11.ebuild b/dev-java/openjdk-bin/openjdk-bin-25_p2_beta.ebuild
index ef32c37add26..0d6bc9a78d7a 100644
--- a/dev-java/openjdk-bin/openjdk-bin-23.0.1_p11.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-25_p2_beta.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit java-vm-2 toolchain-funcs
 
 abi_uri() {
-	local baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV}/"
+	local baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV1}/"
 	local musl=
 	local os=linux
 
@@ -22,11 +22,13 @@ abi_uri() {
 
 	echo "${2-$1}? (
 		${musl:+ elibc_musl? ( }
-			${baseuri}/OpenJDK$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+			${baseuri}/OpenJDK-jdk_${1}_${os}_hotspot_${MY_PV2//+/_}.tar.gz
 		${musl:+ ) } )"
 }
 
 MY_PV=${PV/_p/+}
+MY_PV1=${MY_PV/_beta/-ea-beta}
+MY_PV2=${MY_PV1/-beta/}
 
 DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index f8f289eda29c..906b71ad6e36 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -2,7 +2,7 @@ DIST openjdk-11.0.18-riscv.patch.xz 272672 BLAKE2B b079612032a5bf135b05bdd1da16f
 DIST openjdk-11.0.25_p9.tar.gz 116541441 BLAKE2B 5be0d6e1996860f0d8f36732758207044668fdbd6e9c9b21b96c897d526f2d86a931f2b8d732ebe4b668679c0e48cb49a472baf29d4ea5785dc4edb0d8a5de2f SHA512 25971b26d04dd111a21c112f694968c8d56c3692a62eb1366a1f49617a308a3a0cb37ab92ff02cff727041d6e32cbbc345f313db46df58f9e933a801a1588e8b
 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-24.0.1_p0.tar.gz 122453193 BLAKE2B 660539336f68d7ad850e8d9f2e8ad68fe4ef4a8c936c5c2f255b6651d9cd8464cc0c2abebfbdb933d934c44906b3d9bbf3e0321ae1a224ab8a00eea95a827b10 SHA512 db75846a92bb3c8edfcfcc3b35cefd3d80c03c9fd05bf994983174b0696a14e75130283407371eb765d16f5820d5ca4744c94332c8ed5a33560b343effedb37d
 DIST openjdk-8.432_p06.tar.gz 92765730 BLAKE2B 9c3823ed0394730cdbf306a92062656a793dd7b57a333319282a6aa01a8150927227d3e91ee2ee975108b8c3aa2b0b87669af2971dfc27a6400fb7c4ef22d246 SHA512 263642d56915e0533c154ab51148b0f6a9860b243dddf5bbb70f49174d07dd505393fa6e257bfa34eca6e95ecd4f271737fa48fee8db93e624e8336fe488eb83
 DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e
 DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f
diff --git a/dev-java/openjdk/files/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch b/dev-java/openjdk/files/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch
deleted file mode 100644
index bc4d96dfc141..000000000000
--- a/dev-java/openjdk/files/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-src/java.desktop/share/native/libfontmanager/HBShaper_Panama.c:27:10: fatal error: hb.h: No such file or directory
-
---- jdk23u-jdk-23-ga/make/modules/java.desktop/lib/ClientLibraries.gmk~	2024-08-20 17:57:04.000000000 +0200
-+++ jdk23u-jdk-23-ga/make/modules/java.desktop/lib/ClientLibraries.gmk	2024-09-20 10:00:52.460817053 +0200
-@@ -279,6 +279,7 @@ endif
- ################################################################################
-
- ifeq ($(USE_EXTERNAL_HARFBUZZ), true)
-+   LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
-    LIBFONTMANAGER_EXTRA_SRC =
-    LIBFONTMANAGER_LIBS += $(HARFBUZZ_LIBS)
- else
diff --git a/dev-java/openjdk/openjdk-23.0.1_p11.ebuild b/dev-java/openjdk/openjdk-24.0.1_p0.ebuild
index c88d48ceb72d..24341f94692b 100644
--- a/dev-java/openjdk/openjdk-23.0.1_p11.ebuild
+++ b/dev-java/openjdk/openjdk-24.0.1_p0.ebuild
@@ -30,12 +30,14 @@ bootstrap_uri() {
 # 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"
+#	MY_PV="${PV%_p*}-ga" # '-ga' isn't available
+MY_PV="${PV/_p/+}"
 
 DESCRIPTION="Open source implementation of the Java programming language"
 HOMEPAGE="https://openjdk.org"
 SRC_URI="
-	https://github.com/${PN}/jdk23u/archive/jdk-${MY_PV}.tar.gz
+	https://github.com/${PN}/jdk24u/archive/jdk-${MY_PV}.tar.gz
+
 		-> ${P}.tar.gz
 	!system-bootstrap? (
 		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
@@ -109,8 +111,6 @@ DEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.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.
diff --git a/dev-java/saslprep/saslprep-1.1-r1.ebuild b/dev-java/saslprep/saslprep-1.1-r2.ebuild
index 9fc2ec1f9f2f..71127be41c2e 100644
--- a/dev-java/saslprep/saslprep-1.1-r1.ebuild
+++ b/dev-java/saslprep/saslprep-1.1-r2.ebuild
@@ -16,7 +16,7 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 ppc64"
 
-CP_DEPEND="dev-java/stringprep:0"
+CP_DEPEND="~dev-java/stringprep-${PV}:0"
 DEPEND=">=virtual/jdk-1.8:*
 	${CP_DEPEND}"
 RDEPEND=">=virtual/jre-1.8:*
diff --git a/dev-java/stringprep/stringprep-2.2.ebuild b/dev-java/stringprep/stringprep-2.2.ebuild
index 0c0be2c3c2c4..f62f4268663d 100644
--- a/dev-java/stringprep/stringprep-2.2.ebuild
+++ b/dev-java/stringprep/stringprep-2.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64"
 
 DEPEND=">=virtual/jdk-11:*"	# module-info
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index f30870a05ae7..3c972ffcdd9f 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,3 +1,2 @@
 DIST velocity-2.3_p20240314.tar.gz 440967 BLAKE2B c5fcea7af49d6c46d5c0943efe82f3c04d921afc2c53201b97842ae71714e7035d075c147b3bea71e959db12dd970b7879ade73bbc23bab09a1fd262e21f2fc6 SHA512 9055e780d2a3c798bfe30e5c7859a7311c4984b551d7b2ffa68c57c076549326d0ddae31eabff8009ea021c749331d34c71eee8cab55599dea5f3c8dba841a02
 DIST velocity-2.4.1.tar.gz 445671 BLAKE2B 3a142303bd7bb1a6e012b9d33f96078fa925249bd62287e166e45faca7ad605b1b57f8f72b4829d009e4c11f54780727d919a96bcc081d83c26adf0a61eaecaa SHA512 3e821eaeb705e6ede8a51a8d3bff00d26909c20738bed92f5ef9600f3736709324807f7bbb93f5d431e60380b9a4f757f47cca6ec64e8e774c7ec1e4708d25f1
-DIST velocity-2.4.tar.gz 444952 BLAKE2B 0db598bad6743383e62e89acc55b887f28108b6065c3e615b78485e4f94c9f1a316bff7c04d66052541d6173311e97dab28142dad69e6caca168b2a2fcc28637 SHA512 b3f7ae68fa2e0f30193f089a2e8ee5366e71726d93e85fa2f4c3f95d20aa599df053ee7103c71b01c89fe08dd5276e5a2c7da3e26eaffeafd94c078241a9e264
diff --git a/dev-java/velocity/velocity-2.4.ebuild b/dev-java/velocity/velocity-2.4.ebuild
deleted file mode 100644
index e3727ab40d9f..000000000000
--- a/dev-java/velocity/velocity-2.4.ebuild
+++ /dev/null
@@ -1,113 +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.apache.velocity:velocity-engine-core:2.3"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache Velocity is a general purpose template engine"
-HOMEPAGE="https://velocity.apache.org"
-SRC_URI="https://github.com/apache/${PN}-engine/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-engine-${PV}/${PN}-engine-core"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-
-CP_DEPEND="
-	dev-java/commons-lang:3.6
-	dev-java/slf4j-api:0
-"
-
-DEPEND="
-	${CP_DEPEND}
-	dev-java/commons-io:1
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-db/hsqldb:0
-		dev-java/slf4j-simple:0
-	)
-"
-
-RDEPEND="
-	${CP_DEPEND}
-	>=virtual/jre-1.8:*
-"
-
-JAVACC_SLOT="7.0.13"
-BDEPEND="dev-java/javacc:${JAVACC_SLOT}"
-
-JAVA_CLASSPATH_EXTRA="commons-io-1"
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
-JAVA_TEST_EXTRA_ARGS="-Dtest.compare.dir=target/test-classes -Dtest.result.dir=results"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,hsqldb,slf4j-simple"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	cp -r src/main/{,resources/org/apache/velocity/runtime}/parser || die
-
-	sed -e "s/\${project.version}/${PV}/" \
-		src/main/java-templates/org/apache/velocity/runtime/VelocityEngineVersion.java > \
-		src/main/java/org/apache/velocity/runtime/VelocityEngineVersion.java || die
-
-	sed -i \
-		-e 's/\${parser.basename}/Standard/g' \
-		-e 's/\${parser.package}/org.apache.velocity.runtime.parser/g' \
-		-e 's/\${parser.char.asterisk}/\*/g' \
-		-e 's/\${parser.char.at}/\@/g' \
-		-e 's/\${parser.char.dollar}/\$/g' \
-		-e 's/\${parser.char.hash}/\#/g' \
-		"${S}/src/main/parser/Parser.jjt" || die
-
-	# File "StandardParserTreeConstants.java" does not exist.  Will create one.
-	# File "StandardParserVisitor.java" does not exist.  Will create one.
-	# File "JJTStandardParserState.java" does not exist.  Will create one.
-	"jjtree-${JAVACC_SLOT}" -GRAMMAR_ENCODING=UTF-8 \
-		-JDK_VERSION=1.8 \
-		-BUILD_NODE_FILES=false \
-		-MULTI=true \
-		-NODE_PACKAGE=org.apache.velocity.runtime.parser.node \
-		-NODE_USES_PARSER=true \
-		-STATIC=false \
-		-OUTPUT_DIRECTORY="${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node" \
-		"${S}/src/main/parser/Parser.jjt" \
-		|| die "Code generation via jjtree failed"
-
-	"javacc-${JAVACC_SLOT}" -GRAMMAR_ENCODING=UTF-8 \
-		-JDK_VERSION=1.8 \
-		-STATIC=false \
-		-DEBUG_PARSER=false \
-		-DEBUG_LOOKAHEAD=false \
-		-DEBUG_TOKEN_MANAGER=false \
-		-BUILD_PARSER=true \
-		-TOKEN_MANAGER_USES_PARSER=true \
-		-OUTPUT_DIRECTORY="${JAVA_SRC_DIR}" \
-		"${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node/Parser.jj" \
-		|| die "Parser.java code generation via javacc failed"
-
-	# Avoid "error: duplicate class: org.apache.velocity.runtime.parser...."
-	rm -v "${JAVA_SRC_DIR}/CharStream.java" || die "cannot remove 'CharStream.java'"
-	rm -v "${JAVA_SRC_DIR}/ParseException.java" || die "cannot remove 'ParseException.java'"
-}
-
-src_test() {
-	pushd src/test/java > /dev/null || die
-		# DataSourceResourceLoaderTestCase.java requires configured jdbc
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			-name "*TestCase.java" \
-			! -name "BaseTestCase.java" \
-			! -name "DataSourceResourceLoaderTestCase.java" \
-			)
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	popd > /dev/null || die
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index 89201781a570..0e4e361500e7 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -1,4 +1,2 @@
 DIST xmlgraphics-commons-2.10-src.tar.gz 1618901 BLAKE2B 4ce0bda4715d8d9326f2c42f4d2f0eac65ea59dd527c42927f1a0096526cd54e90e0d71087060a05bf9819f4bac17b14eee08dfce41b950edd26c7a4dcc9669a SHA512 49b055891e6b76f3c357b616c34f152033ccf807432d55dd57ac83c41234c224d1a716f77ae7ef24ff49d9f376dfa6b161cde18b258d94438a467a4ad91be21d
 DIST xmlgraphics-commons-2.10-src.tar.gz.asc 833 BLAKE2B 15a9aa963695863bf27624f3f1afc6f3b1277bc58a01a103f76a4c25060e31f38e3e155bf240c816839cc216834ee0d4e639c3b60a91de9a4dde39c29c54af12 SHA512 5f44396867501ab2ab58c1da8e6212d873457eb6d4de545058f84530f05f0bfddf319b2c4bb5a711bf48cca402d7c68e5efae3a0ada71742a706f3b14290dec3
-DIST xmlgraphics-commons-2.9-src.tar.gz 2236891 BLAKE2B 5071418eb2773ade7d48faa00a45834ee392603adb7844ce7b7ffc6ab41f0d655ce29265fc56326093b06b7e2cb1b1f4b95ab5e0f339c05cca4e0eb71d59f368 SHA512 896a5fe41277783021075df0de1aa109a7f05416af6b0141301a2452197d85df0daef28f5c2a71802644cbff3bfe79579a1544000a4c1b5cec4c211d8effd521
-DIST xmlgraphics-commons-2.9-src.tar.gz.asc 833 BLAKE2B e85533d2509dc49f42346e373a416c8215600ff84a393ca6de545fce6e73d704a8146a257522e66a254248ebdbc6770e0040658223582184e0d8fd71f95bd941 SHA512 e52f02efba535192455b47a4adbb903426e51163083297eb7be83146e2c7ead913f4c0a51345681123afa64fbb3bffcea982a81fd2b92be2aa4c135082ed8e17
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild
deleted file mode 100644
index 1fbf7d2b6de3..000000000000
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild
+++ /dev/null
@@ -1,50 +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.apache.xmlgraphics:xmlgraphics-commons:2.9"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="XML Graphics Commons"
-HOMEPAGE="https://xmlgraphics.apache.org/commons/"
-SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz
-	verify-sig? ( https://downloads.apache.org/xmlgraphics/commons/source/xmlgraphics-commons-${PV}-src.tar.gz.asc )"
-
-S="${WORKDIR}/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 arm64 ppc64"
-
-CP_DEPEND="
-	dev-java/commons-io:1
-	dev-java/commons-logging:0
-"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/mockito:4
-		dev-java/xml-commons-resolver:0
-	)"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-commons )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-commons.apache.org.asc"
-
-DOCS=( NOTICE README )
-
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_EXTRA_ARGS=( -ea )
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4,xml-commons-resolver"
-# Some *.{png,tiff,txt,xmp} are misplaced in "src/test/java".
-JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" "src/test/java" )
-JAVA_TEST_SRC_DIR="src/test/java"