gentoo auto-resync : 17:07:2024 - 12:28:31

20 files changed, 649 insertions, 258 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index d5df925ef2ec..a1fc87d76338 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/cpptasks/Manifest b/dev-java/cpptasks/Manifest
index b76520d51564..db454f9fd891 100644
--- a/dev-java/cpptasks/Manifest
+++ b/dev-java/cpptasks/Manifest
@@ -1,4 +1,3 @@
 DIST cpptasks-1.0b5.tar.gz 902930 BLAKE2B 02cc20ea8e4316f7d0572cd147868219f1cfa326fd87d2edbea8a9b81c88f83173a373a88149bc2da55099bb9a0ac4d1f8927a6c708e6a5640b56220dbdba006 SHA512 620d16e60cdd4d8a09efe6c5889ec1beb20d38df3a7ebf337de546cd60881b4c22a08f24374e7dac02dbbb3b23defbb740a70f1d0ff59212496e631251f0e32c
-EBUILD cpptasks-1.0_beta5-r2.ebuild 1332 BLAKE2B 944ccd54edfe0de536f0f5462601da381ba52450008802fc4b9c09cd07d5b041bb045507ebc039bbccc3f5d2bb491c8dfb04edfe783cb3890a45df9f736d3919 SHA512 6c960a332ea92b88ce6b58c642ea3e328ae8732011e92fbc7a8cd0dfa1b7e9ee11ee05b556835ad580e1e910dfd186aae821ab1839db726105d9651cb464c5eb
-EBUILD cpptasks-1.0_beta5-r3.ebuild 1161 BLAKE2B f820bfb90e52a8f1b8807f29ce00340e5c04f962b76f188f7433613bec3e2f3fd0bd249ea7d71aced712b634738b5931eb23ca2bace176dc569e29f6f860ef71 SHA512 971faaca92bf8cb4a8a47424bb0ecfc968e5f8189bc9f43ed58773e0ba20eafbce0beb9dbf48e663e643529b23e0ac22811c754e433719fe1ad18216e50093d7
+EBUILD cpptasks-1.0_beta5-r3.ebuild 1157 BLAKE2B b2c29de250192acd09c03d4120b71ad318018311a5231d0138313fb74769c197785472eb11b48a7e2564557a50a51fc9605e7b0cfd19004fefd21d6939a5c22e SHA512 5db7372ac70c9ab9376185ce566c079e5c1da400e2d1446eb5a57da844eab58a255a4e63565ed50c8efed3714697316898113a1e81fdbac0aedf3b1082d4d479
 MISC metadata.xml 318 BLAKE2B 53f5719585c7a4f0479017c4410975aefadcedd17db45949c351329e28761f05ebd89ef0557505a9a3ae03967b9baefe3e2c5b1edf0116a10434755a8d76fbe3 SHA512 b89f13a465ae0f1cad3352319206dc922badf513f63af878b118577e1f6da322b824dd14ca9220cf10aa5c5463c30399f001395a36c45c3b69228a375be379ee
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild
deleted file mode 100644
index 4908c223c0ce..000000000000
--- a/dev-java/cpptasks/cpptasks-1.0_beta5-r2.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 examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Ant-tasks to compile various source languages and produce executables"
-HOMEPAGE="https://ant-contrib.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/ant-contrib/ant-contrib/${P/_/-}/${P/_beta/b}.tar.gz"
-S="${WORKDIR}/${P/_beta/b}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="
-	>=dev-java/ant-1.10.14:0
-	dev-java/xerces:2
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-	test? (
-		>=dev-java/ant-1.10.14:0[junit]
-		dev-java/junit:0
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
-
-EANT_BUILD_TARGET="jars"
-EANT_TEST_TARGET="run-tests -Djunit-available=true"
-EANT_DOC_TARGET="javadocs -Dbuild.javadocs=build/api"
-
-src_prepare() {
-	java-pkg_clean
-	use test && eapply "${FILESDIR}/${P}-test-classpath.patch"
-	java-pkg-2_src_prepare
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/lib/${PN}.jar
-
-	java-pkg_register-ant-task
-
-	dodoc NOTICE
-	use doc && java-pkg_dojavadoc build/api
-	use examples && java-pkg_doexamples src/samples/*
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild
index c588ecf5dcc6..22c0fbb9f05f 100644
--- a/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_beta/b}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CP_DEPEND="
 	>=dev-java/ant-1.10.14:0
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index c20e5c4d6e93..f943fb4fbb00 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -3,5 +3,5 @@ DIST gson-2.10.2_pre20231128.tar.gz 451312 BLAKE2B d16e0510e0806fd33e8d49b5a8fb7
 DIST gson-parent-2.11.0.tar.gz 458360 BLAKE2B 88d242c725b054ac5e7e3ef31f312f77dd03aea29f6604770253564d80f84cd752b43d74dd416785836d08884e462275f8ec924a00e2ffee195c0237bc2bac0b SHA512 1834b7c95f0a40ff1bcf8088f3ffdb8332ae38d452bab4ad2c9271421e75a9236645d1ee0fdb58c2f32eac86cf503afa3de19f08eb422cc91c4d32e370c36eac
 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
 EBUILD gson-2.10.2_pre20231128-r1.ebuild 2349 BLAKE2B d6dfbd7cedb55f46be4555af5ed44ab5f354a144f1976f63a2484fb82fdc7bdb223d81c2d14b67500f9fe28b1e083058ce09d1aeb706112a0e06e6f2f3175633 SHA512 387f18057dd39e4d232c5937d3f32b5d888a70ea2a2f63fcb661a9a02e382c4964d4c7b8da0a2835063f7f72628510cf43869bdd15dd8a09bf7a8f60100863ce
-EBUILD gson-2.11.0-r1.ebuild 2090 BLAKE2B 9ff706735c564cad5b7e8d5f6f3d3f90c5cec4a9a3008bfd2a32a4f10bddbb57b3801846e444a9b25b712f0600a346414bc3254682e21b3bfcfbcff260be1130 SHA512 8fa0e54275e9cc3cbc91cb3f34a6cff983d155900d70d954c87d7549d050f4a41a60dfb237e2e995377bbcdc0ae8731428c54ef5c9ce4ebfe57ddea8af130189
+EBUILD gson-2.11.0-r2.ebuild 2089 BLAKE2B d2e8cd5dc26fae2833588755ac3c4e02ced20ec695934f02a334fc0b0fea7dc48804b18b11dddef7014088de9b663e04569485502f99e7a151a86823ded37fc8 SHA512 cc5839ad1e20acd46e829c84105768ad9db65136f64eeceba90acb02741d48a92f491110bc9aa1530a82e5123ee3bab32e0f083cbeb09d08330e677df195da03
 MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504
diff --git a/dev-java/gson/gson-2.11.0-r1.ebuild b/dev-java/gson/gson-2.11.0-r2.ebuild
index fe65dfb3af3d..935c5f12fafd 100644
--- a/dev-java/gson/gson-2.11.0-r1.ebuild
+++ b/dev-java/gson/gson-2.11.0-r2.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 DEPEND="
 	dev-java/error-prone-annotations:0
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	test? (
 		dev-java/guava:0
 		dev-java/guava-testlib:0
diff --git a/dev-java/jcalendar/Manifest b/dev-java/jcalendar/Manifest
index b6c69ddbd3d6..4abbd510cef4 100644
--- a/dev-java/jcalendar/Manifest
+++ b/dev-java/jcalendar/Manifest
@@ -1,4 +1,3 @@
 DIST jcalendar-1.4.zip 982517 BLAKE2B f82ba64d26aefe44a197d78998427af2173c41d1843e080f12c35984c18be58235ca115bc1f53d17a035e4c1ab7bd590b4993b0509e7408a4af50f4ec4b4697e SHA512 aeab6f98451f4fa8718e127de6c0af345410bebbd1de4fa1ca4b9e7f5a22908f9e455ba96da34ef9e8691b4d462e8a01dbd7881b6565a0f3a65d18fe58b68d9c
-EBUILD jcalendar-1.4-r1.ebuild 920 BLAKE2B 539afb6e0a5e5403a2ade349bdacaf143d577f15381e8a7ff353f7adbf356013042546582f04f84740da807fffbe7e5583e982d75914804f1ed88f3f6063a02e SHA512 8bbff1c750dbb220e39942d315c3748e81a5346a1d065b2e53c4b6dd076be9a35c781e2a47eca5d4c55e0da64ec2c03b8eed16d124330be15238416488f00a5e
-EBUILD jcalendar-1.4-r2.ebuild 938 BLAKE2B b61c1634bcd556b21f815c0aaf83f789ad2e456965aefb346a0713879a962d977d2a43773cd4b67234a7d3c45907a1a7dc5159268c4e534419e46c9c308242bc SHA512 410c18d7d74069162d6469a434279e62becc494219a5e26d45f28505143cb4ec36f8d1c369427e400eef4f703a444314aabe77926c27915f9f5997a92e8da7c3
+EBUILD jcalendar-1.4-r2.ebuild 936 BLAKE2B f288f40beeb5be937e77d4c28f1c1021404eafd9d3a229f904b30689981d59944d3729de0dc302576fad6f5f194c787dd9999f551a5aef434df680ad9f88ff74 SHA512 3ef30be0f13fcc193a2b519112876c3a162214a9827a277488851c44b1787026327681a8d1bf6690c71378a7d7db897d14f8d584dbb210433b19dff0470c41fe
 MISC metadata.xml 643 BLAKE2B 8912f34c6db67cfc93128de60b468ff57f33fad59d320c3bde5e724480e3f029772c6709be554ede57151b9295ffeccdf5d2d31b0a6ca0d46249143ae966ca4b SHA512 0fa2211e2fcea4cd103bf43a1903ffaf0bd9432328b9032d30de51c1be238e8aa2b2c5ff40cb6439a864aee10992dffe77d86af846252a728df10e637f7f2e13
diff --git a/dev-java/jcalendar/jcalendar-1.4-r1.ebuild b/dev-java/jcalendar/jcalendar-1.4-r1.ebuild
deleted file mode 100644
index c0de4b6cfb3e..000000000000
--- a/dev-java/jcalendar/jcalendar-1.4-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java date chooser bean for graphically picking a date"
-HOMEPAGE="https://www.toedter.com/en/jcalendar/"
-SRC_URI="https://www.toedter.com/download/${P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="1.2"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/jgoodies-looks:2.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-RESTRICT="test"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jgoodies-looks-2.6"
-EANT_BUILD_XML="src/build.xml"
-EANT_BUILD_TARGET="jar"
-EANT_DOC_TARGET=""
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_install() {
-	java-pkg_newjar lib/${P}.jar
-
-	dodoc readme.txt
-
-	use doc && java-pkg_dohtml -r doc/*
-	use source && java-pkg_dosrc src/com
-}
diff --git a/dev-java/jcalendar/jcalendar-1.4-r2.ebuild b/dev-java/jcalendar/jcalendar-1.4-r2.ebuild
index cc3c29b2f91c..2985f2ad4db0 100644
--- a/dev-java/jcalendar/jcalendar-1.4-r2.ebuild
+++ b/dev-java/jcalendar/jcalendar-1.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.toedter.com/download/${P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="1.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 2da633791ce3..267c0ce9a225 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,7 +1,6 @@
 AUX jdom-2.0.6.1-skip-failing-tests.patch 8392 BLAKE2B b906e2854f51a534af29fa1d8191ecb53a1cb7f4b390820847f30213db9e58bd4526a20ac4c8763c49382f35fbe67caf12962a720f5edd5e004f9881ee29070f SHA512 bf753bb13b633bbf39d0f55f1a34e273876c2fb7841ab73baa9e03fb1945a61bf19c0aceb6891df6abe8b57cbc81f33773da4fd5e4e3f42b5ace51b666f4ece2
 DIST JDOM-2.0.6.1.tar.gz 8368301 BLAKE2B b9d5d8e611b9a0505c9576f2c4a2243eddd8a171bbe44d83440edf44154cae80138ddca8a0bceb3124a6825111d30641a28d645507a1bacad6a8cb9ad1dbccdd SHA512 c09b422b0635a478cb70e57e4c35bc7f505f6a2730be813d6e63c053814581e4dc3fdf431b945394c30ab37a8fb83fd103767f8de84d28bef79e95e2c37518e1
 DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
-EBUILD jdom-1.1.3-r1.ebuild 1252 BLAKE2B 1f13d6f90843dd28a886d5b8158d33602239d6fe7540655166a7bf8aa6f3201cb9a3700a7a1ea669c04a7aa8a94432ed6b8e6c1df5a3b1ed36243ec1bb3d0f1d SHA512 bf245f0d9e759c1c0ebe8937d980e391480687eb53ba0234e5f7b02f124b4a55b61bf6001d391da7fbb58de4a82d7ec90b9bd63a101d869e1d96c14d43a792a6
-EBUILD jdom-1.1.3-r2.ebuild 827 BLAKE2B 880f75219e9e475b63921ffda7bcf8ce1f519291c12743186f1d88ceec0603d43741c0063a4d61e39a83cad8d0a970ca255f1d533131e8cd22046e8503d79cb5 SHA512 94157be7a910cb2ec5a3064c64ca8b2741a6e04fa1d238e0f43557d5eb2ed175e91b67a3bb17d09ef5463f9dd34c28c3d46cd200233067c53ff59d3525c1882d
+EBUILD jdom-1.1.3-r2.ebuild 823 BLAKE2B 80c1bfa3a2bb3472cd246ba5811efbab8198ea2ff39e3b3b51960e703205e016db392f2e3dde0faff3857a37347ca95c5cff44731369187305b4c6da88968e6b SHA512 bbc0f29efbed8d5ffda47e50c02245f9e8e1821a8092b1716110726a4a41b61229a844f073eb0f364a8a084f3f9fae6e248e53ba322aac3dcd44ec0ef99344ee
 EBUILD jdom-2.0.6.1.ebuild 2748 BLAKE2B 3e0e6123893a15827ed6202b16387e4403748a33c70132ac0c1edafe6b505046d6fa1896d4cec93dc01d0adb551f1b548e5c2af1c8998c541ff8ac7ef4aa292f SHA512 66ced362fd81ddd13989cac07f6093628ce6166fdfe8f7c6b41fe94376fff4ee5911f7637cf5a43375731674d6410efe0ecfe740e838a45558930293bedf4d46
 MISC metadata.xml 870 BLAKE2B 4f720a44e7f3d2c808e81aeebcdb11963cbdc590d61d9edd4ea5794913096b84ad463726071f66848a26d7a6209c466db4a00253793c08d7fc848fc780da1763 SHA512 516809ec60e2c6763949ddac1cd2cce46a52973c3be148a6153b0941787d4a798699206367ba26e707f1e671a5f851b00281b84b18592b3ece442bc4129aafaf
diff --git a/dev-java/jdom/jdom-1.1.3-r1.ebuild b/dev-java/jdom/jdom-1.1.3-r1.ebuild
deleted file mode 100644
index f176d2284a81..000000000000
--- a/dev-java/jdom/jdom-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="http://www.jdom.org/dist/binary/archive/${P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-
-LICENSE="JDOM"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-	java-pkg_clean
-
-	rm -r build/apidocs || die
-
-	rm -v src/java/org/jdom/xpath/JaxenXPath.java \
-		|| die "Unable to remove Jaxen Binding class."
-
-	sed -i -e 's|${name}-${version.impl}|${name}|g' \
-		-e 's|<jar jarfile="${build.dir}/${name}-sources|<!-- <jar jarfile="${build.dir}/${name}-sources|' \
-		-e 's|build.javadocs}" />|build.javadocs}" /> -->|' \
-		"${S}"/build.xml || die
-
-	if ! use doc; then
-		sed -i -e 's|depends="compile,javadoc"|depends="compile"|' \
-			"${S}"/build.xml || die
-	fi
-}
-
-EANT_BUILD_TARGET="package"
-
-src_install() {
-	java-pkg_dojar build/*.jar
-	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt
-	use doc && java-pkg_dojavadoc build/apidocs
-	use examples && java-pkg_doexamples samples
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/jdom/jdom-1.1.3-r2.ebuild b/dev-java/jdom/jdom-1.1.3-r2.ebuild
index e321b981d167..e4c3088a799d 100644
--- a/dev-java/jdom/jdom-1.1.3-r2.ebuild
+++ b/dev-java/jdom/jdom-1.1.3-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="JDOM"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index f9c7b6370bf4..7664d8a438f3 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -7,8 +7,10 @@ AUX openjdk-8.env.sh 687 BLAKE2B 4bb851545955fafa6a4b08f2589fa9a5441ef37484eb21a
 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.23_p9.tar.gz 116316363 BLAKE2B a3745b2afe9d2529daf89aceed43025aca72a353210b0987aacb32af971262077411e9a2b6cfd938ca9d0c93c8762759b9207a13cee0808288674671164e3a36 SHA512 3851063289042ed467a9cb636eba7170a0feeaa3e5d19bda6c30a186ea624e4ae1b308006652acb9c9820c2065382bd719ee130b7a1a0524fe25ecd639f8a51d
+DIST openjdk-11.0.24_p8.tar.gz 116418943 BLAKE2B cb768b202b42f426f4edaead16ba09800d86c10da4a664176842ee396332284d410191a55dbb35d7604272231e5b3daf8a75ddc03bb819d670622b7682eec7f6 SHA512 ce45efd934b9bacc56c468d92083a85de311b4436a519ae1d6038aff025c2fa8a811abca4cdd99aeb8c09455effff53500f96c287976cd2ae90d4e11da2385a3
 DIST openjdk-17.0.11_p9.tar.gz 106574173 BLAKE2B 3db4763527d1acb83a2d492c3e94dc571065b844cf2ac56b7377a821cf2cb48af405b9fef73f477502bedc2c119ac57a115315140af04d51dbab5a78dfa6c789 SHA512 77baa3ec3ff2d06b28121342357311d1d5ca2ddd9ac7982b1aa5fc745b49519d2f95d14226ad4ac413d9a0ecf0e49d15078cabbba0b2897d0c6883b92ef0b5e9
-DIST openjdk-21.0.3_p9.tar.gz 112404688 BLAKE2B e73688fdd2e4f4da144f66058e4ff68da4a557d9c7693c7854ba6c7e1a12155abec4aa0fcd724f62333060c4b4f7488f827c1b5499fe5667743516101f7f2fa6 SHA512 efc2d03a7e7afed62a2cdc9f7707d056ed62d63f513394d7e3c6bbe11980ac492a2cad144021cea4180f4c93f1a481bdd65cb61156023a3f14ba596fd9c0eb60
+DIST openjdk-17.0.12_p7.tar.gz 106597045 BLAKE2B f0e9baec472ecefbf28359abfc10757dc7cb2a6ddf8428086a6565831f1c13ee1a7cdb87b67d6b3840860ddbf2c74e80ece55f09238fddc2cb8fa77208695b9b SHA512 cc99e9742123f7d8ac7ad78abab0fbe5cff37999b9c06ad14851009a95c9868968e97dd0f3e4dea8bfa8578f8f903fccaa37134466a778375cdf24344138f1fc
+DIST openjdk-21.0.4_p7.tar.gz 112506384 BLAKE2B d58636bc9221d56afcf118a91e41326d2e086c9fe22675429ec50d0b62fefd9e2040140a9d99682547e8bf0d40fa4ca2cbcdf8be55b9a0556b95c90fc0a08d56 SHA512 507524d842fb7c371cf7d3163cdce87e9266d613998b797f2828178b35c087354ae30941384d5afd1d6e3982eddf5c9067553bc2b918a9e223b93893f7f27e76
 DIST openjdk-8.412_p08.tar.gz 93003614 BLAKE2B 71a3825bf69bb196ae219f5125e8452f634be2ff7b9f42a4829f6581f0a143bfec95013971c6f6b8f402c11efa34443f55a7f89d4133eac0b05a6d1cd6e0324d SHA512 d198f26474a4bd0b5e09c3c3aa53fbf77f217b8cd23499f7e661224048e925e0e020b28264b6ce7401baf83f8ffd8e3247788e2f5e7188509dea8b06f9fa0572
 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
@@ -21,8 +23,10 @@ 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.23_p9.ebuild 8835 BLAKE2B bea1b8c33090c4990cd5c9c8954273b76b5ffb68c68a41959b98367f83f1ccbb398050de0866a18ba3ff7ef6c1dcabcd3add6f68ea8d9ebf1b5b3743fa65e0e1 SHA512 b8f3ad74db69fe48d8ab347d6ff5fdf81271b83aa25fd94c15630bc2c7e265ed73a710803e4098ff8451f2443c4344dfd02f4e73135f4c535733ac069f3eeb35
+EBUILD openjdk-11.0.23_p9-r1.ebuild 8834 BLAKE2B e10c23f599ce193c329bdd95cf9965704da9951d7eda2521606e4250f9046fa9d66234fe6858c89b9d7849d1bcf687e53f73f629594c54ffeea5ce864af12f5c SHA512 3521115c2cd51c586652dfd53b759cb22028f30b82ccead407d60f2f7f8df096b55a3c9e2b345a723487dac9707471c779d70fad236e961449122290680d7855
+EBUILD openjdk-11.0.24_p8.ebuild 8838 BLAKE2B 7c651631156f28fd0ab8ef50d671a6068d02572fdfdcff8be8576d61601ea78e64c40955f0120c3265f5876148437a4aa82a20f6536dd81533ee6ed9ce993566 SHA512 679c30febe9f91c58df5ca7cd7e344d4b0cb079652e92d7ce2c3867219c86be4db3385cf4ca697b123727ae4f75f3804b61fa6385383169a86301f841491ca9b
 EBUILD openjdk-17.0.11_p9.ebuild 9254 BLAKE2B e8fe5423eeb601c2d360041ff68e206d47a9e303c0343e7981fbe14160fce5f805059e57f5a4253c8fea9dd1b2caf7c3c7f2ace4bde2700c97708a38b6999b3d SHA512 0fd70e8c691ff8eaeea3b8c2e722a220d1f978c704fde47431d8893e1d423a36c11a1e364b4eca69dae653dc68cd3c77bb30e0499468af69980b4e4bb7f3f90f
-EBUILD openjdk-21.0.3_p9.ebuild 9222 BLAKE2B a99c8167af247502103af8adccc900ee8cf2a426eb62b506fd44369de32a63b48e22081112de3c65b9b07287a8bd5225d2e87aa80dc8eec3bf37e6a4580d71c9 SHA512 1e001792d4a317b2f68e7a5a888c119c297c74780af7784c30e419ea6361d0e3601c07cca16429635d606336dc1dd8c84e924163bd2a259de9cb4ceda9aea45a
+EBUILD openjdk-17.0.12_p7.ebuild 9258 BLAKE2B 499c3e6fdbb6d956457ec61cbf05091466e3378f57f5aedb3472a7636734ace6e8e18455402d35ad5765f8ad8007e8f733d41a80eab9c397fed196a436deaa3f SHA512 61dbc61daa884bafce6440846a7a458dfaaf65fc0c0bba3c4a62688dfb512361bcc8bfd9820cb1678eb6baf1fc98817851fdb03930581e387accd0943f7b0880
+EBUILD openjdk-21.0.4_p7.ebuild 9222 BLAKE2B a99c8167af247502103af8adccc900ee8cf2a426eb62b506fd44369de32a63b48e22081112de3c65b9b07287a8bd5225d2e87aa80dc8eec3bf37e6a4580d71c9 SHA512 1e001792d4a317b2f68e7a5a888c119c297c74780af7784c30e419ea6361d0e3601c07cca16429635d606336dc1dd8c84e924163bd2a259de9cb4ceda9aea45a
 EBUILD openjdk-8.412_p08.ebuild 7819 BLAKE2B 46ee633ad8c8751885c948f3648e76f973266336fe15fa0016368302719770d9435c5e0db4cb59481e782e2b89adabe8b8cd0b4624749051c066de120509f8b7 SHA512 250754810305bf30ac7ce4dbc15dd1a321f4dc47cf5e49154f26b80b704218b21b6ab2f428a9857096936793460f2471df2fcd921c7fdc40838f11a2d0cce377
 MISC metadata.xml 1549 BLAKE2B 5f7caf2330b7d8eb264df12fe6eebbf1e4acf91b04e37a4c6ea6c45101a39f2e84b4d40152d58c93e63a1d2d6fdb5649b096a314f7269d33ce72da263d392c90 SHA512 8fa15bf9544f2665a47185a3701c3a9ce1654ddedf1aebfb344f77f544a71a3bda33c2d4f3c1d5d65d7ea42b6c1f04a6e1dfaaae723c1a5fcaf63ec48d79f3de
diff --git a/dev-java/openjdk/openjdk-11.0.23_p9.ebuild b/dev-java/openjdk/openjdk-11.0.23_p9-r1.ebuild
index 60f9354ff576..7b836738329f 100644
--- a/dev-java/openjdk/openjdk-11.0.23_p9.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.23_p9-r1.ebuild
@@ -302,7 +302,7 @@ src_install() {
 	if use doc ; then
 		docinto html
 		dodoc -r "${S}"/build/*-release/images/docs/*
-		dosym8 -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+		dosym -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
 	fi
 }
 
diff --git a/dev-java/openjdk/openjdk-11.0.24_p8.ebuild b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild
new file mode 100644
index 000000000000..7a870e1198b5
--- /dev/null
+++ b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild
@@ -0,0 +1,311 @@
+# 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
+
+	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-17.0.12_p7.ebuild b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild
new file mode 100644
index 000000000000..1c4f51f66acd
--- /dev/null
+++ b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild
@@ -0,0 +1,320 @@
+# 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
+
+	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-21.0.3_p9.ebuild b/dev-java/openjdk/openjdk-21.0.4_p7.ebuild
index 943ac23576da..943ac23576da 100644
--- a/dev-java/openjdk/openjdk-21.0.3_p9.ebuild
+++ b/dev-java/openjdk/openjdk-21.0.4_p7.ebuild
diff --git a/dev-java/xpp2/Manifest b/dev-java/xpp2/Manifest
index 40312a5ce931..85d7977fd345 100644
--- a/dev-java/xpp2/Manifest
+++ b/dev-java/xpp2/Manifest
@@ -1,5 +1,4 @@
 AUX xpp2-2.1.10-fix-java5+.patch 872 BLAKE2B a8fa53326a2fefa40f726a4cd3e5e2828b3d2e50907736be1b2639489692ff2a0ff683d1538123163d5fe52d2935d97832d643d7365829ca1eaa7c7936623e75 SHA512 495dfb83a773d11fb1f9f423f1bfa532770710b4b16c1f6e64e517e8148958a5160ddbbc43dd4cdc7ecc51126fba1062a10277bc9234b58e46a044e81180b3a5
 DIST PullParser2.1.10.tgz 2310288 BLAKE2B 0c1f3aedf88aae18e7cab40b04055fa7a20f6bfe05973e6cbe3b459b408dfa193834d22a6d77b3d1ba3802e115d89f73e3f423efc7571efc8f09bb73625950d6 SHA512 87a091e415a31cde27ca1193735743b60f516feb336a9a3577792636e54ab8d671a22e74eb8aa41268f6251c688c68fe92a28f735ec78b96b919909f80c59590
-EBUILD xpp2-2.1.10-r3.ebuild 1854 BLAKE2B 886333476332b887bfb6e02a235a6d7f50fbca065b5533a774881077d622bd7c12de73632d2cdae2fa9983781fe7ef88f10f51bccf3249b4e936247c93bbf3ae SHA512 4e011582986248939e206b8a2652e2d2a5d902615e29e3f15e87f92121093b73977fc7a36f6c0a354dde4c2562026e73c665a66187b40ba6384902d87ebeb198
-EBUILD xpp2-2.1.10-r4.ebuild 2400 BLAKE2B 9c7e4e9660d9e7b809c7503dad6224e78fe6ef49557888ac66b99ffd44263d50d82eea0be1f16eb7a06dcb05008b7b16702c1e5560608c2b78a0f77160476964 SHA512 d15b1c37d618aa308aa7459fb7628ba9a3f1ad832d77e4e24e6d02373fa75da6a5093be688ba771670d3d4f610d2c2adc2872a62eef3beb0cbd66473e2263a23
+EBUILD xpp2-2.1.10-r4.ebuild 2396 BLAKE2B 9616be3c427fc97b51d9ef43909b9b21188e9a167fd6e2a4edec59c1439d39e4d974dc60f9fdf1ba0d013e27894661ec4c28471aeeaaf8f04e0b2dde49aa7e98 SHA512 0aae9f8c45b4cb1500396a0afb987be8e1914ec882c58ec76e6397a3da798bd3473db8dbf7f24d65561229fde3ae39ccf0bcb802ad58a110e008b6c2b0495242
 MISC metadata.xml 459 BLAKE2B 6b230c468ed9a62380563114c50b9b3cbd58237df4327ddc6194dba9524c6a0872c04354927d800544b1095db4a7f3c3ee0b0d37f16d23578da1b84f79628218 SHA512 f41891c17a7ab0a61bff751bdef3cb45f9385de1c10219aa19a8cc194b780b0db7d46ee89ed5403b193f473178828e79e88fa80833b5bdd56f8c9d3a532fff9d
diff --git a/dev-java/xpp2/xpp2-2.1.10-r3.ebuild b/dev-java/xpp2/xpp2-2.1.10-r3.ebuild
deleted file mode 100644
index c4b5aaa7a88b..000000000000
--- a/dev-java/xpp2/xpp2-2.1.10-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="pull-parser:pull-parser:2"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="PullParser"
-MY_P="${MY_PN}${PV}"
-
-DESCRIPTION="A streaming pull XML parser used to quickly process input elements"
-HOMEPAGE="https://web.archive.org/web/20130904163229/http://www.extreme.indiana.edu/xgws/xsoap/xpp/xpp2/"
-SRC_URI="https://web.archive.org/web/20130904173708/http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/${MY_P}.tgz"
-
-LICENSE="Apache-1.1 IBM"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-
-# Some failures, partly because we haven't patched Xerces but probably
-# also because this software is ancient. :(
-RESTRICT="test"
-
-CDEPEND="dev-java/xerces:2"
-DEPEND=">=virtual/jdk-1.8:*
-	test? ( dev-java/junit:4 )
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-java5+.patch"
-)
-
-EANT_GENTOO_CLASSPATH="xerces-2"
-EANT_EXTRA_ARGS="-Dx2_present=true -Djunit.present=true"
-EANT_BUILD_TARGET="intf intf_jar impl x2impl"
-EANT_DOC_TARGET="api"
-EANT_TEST_TARGET="junit"
-
-src_prepare() {
-	default
-
-	rm -r build/ lib/ || die
-
-	# Our usual rewriting stomps over the existing classpath, which
-	# isn't helpful here.
-	sed -i -r \
-		-e 's/\bclasspath="/\0${gentoo.classpath}:/g' \
-		-e 's/\$\{java\.class\.path\}/${gentoo.classpath}/g' \
-		build.xml || die
-}
-
-src_install() {
-	local suffix
-
-	for suffix in "" -intf -standard -x2; do
-		java-pkg_newjar build/lib/${MY_PN}${suffix}-${PV}.jar ${MY_PN}${suffix}.jar
-	done
-
-	dodoc README.html
-	use doc && java-pkg_dojavadoc doc/api
-	use source && java-pkg_dosrc $(find src/java -name org -o -name javax)
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/xpp2/xpp2-2.1.10-r4.ebuild b/dev-java/xpp2/xpp2-2.1.10-r4.ebuild
index 0e785ac7de74..cc77774f1703 100644
--- a/dev-java/xpp2/xpp2-2.1.10-r4.ebuild
+++ b/dev-java/xpp2/xpp2-2.1.10-r4.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-1.1 IBM"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 # Some failures, partly because we haven't patched Xerces but probably
 # also because this software is ancient. :(