gentoo auto-resync : 07:08:2024 - 12:37:20

author: V3n3RiX <venerix@koprulu.sector> 2024-08-07 12:37:21 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2024-08-07 12:37:21 +0100
commit: b8c7370a682e4e29cda623222d17a790c01c3642 (patch)
tree: f6caa14689bd00a5760eadaa381ff41e50ef3c1b /dev-java
parent: 8a4997a7e2d1e36c089d4d76935b5a902d98d3d0 (diff)
59 files changed, 1726 insertions, 590 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 56a99b098ea8..74fc3ace2349 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index 29522d86c154..e48aa0e65b64 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1,3 +1,3 @@
 DIST ant-contrib-1.0_beta6_pre20201123.tar.gz 473435 BLAKE2B f73f0a3cfbf92719143a806e1b4b753f7809aeef4976fd6f75aef85490daa0a44a90c03779aba0784e9e59dfe9b9abf7b19c405287fa20838b29e621fa5f7dac SHA512 0b4d05c90c16c5d076364aa140d3ce503b7b7abf187d7d4cccbf0170dd3afab879bb71b002b3c467f73d2632a57dfd70f74715e8b48f26376cb88e872ec1014e
-EBUILD ant-contrib-1.0_beta6_pre20201123-r2.ebuild 1981 BLAKE2B 7a68e3b812ea888204ee5656e71675c0c42484a5b6ea07cceaaf4c557782f2ec594355841aab7146a88446d8662f676ae126b7e0ff88e13966b2000d1f667f80 SHA512 0a7889334bc4515981e6cfbd2206cc73e3c34dc12dcf90210dd9dea7c87542c422673c0443b111c65433496ebdbf49466b3f2182090ff4416f954de866c7cb30
+EBUILD ant-contrib-1.0_beta6_pre20201123-r3.ebuild 1979 BLAKE2B f0edc72d57d0865d09a9994dffd46f0c2384b3bbfefbe22b758da461b7c115da8b5354b197cb1d39187d9b0e67d3a3fe791641974958bba57c5435a6de7d9a84 SHA512 f99925614acf5db260529745891b23be7d2e4c4ef40f9c6411820a59adac470e6d72186ada6706954c8e5a4c4b90eafcac36050bf264afab8fee21694b2b21d1
 MISC metadata.xml 376 BLAKE2B 9a2a0c2682879b564c70896325934cbc53ec1289781487f4d82b1d053b5e45ed16a3fb9ff228c29f29975e8a2cc3231e9f9a7694ed2e504025f5d909e0a2e89a SHA512 a54fd5353676f4c1cbe28d463e4d245dccc342dd79d5809f1b130a0b93f9eceb2a93aa4addb8de98cfe26b5999c1bc7cb65fd075117a2b0f14ed41d92c2c144c
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild
index 172467ec6ed4..120a631bc481 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild
@@ -33,7 +33,7 @@ RESTRICT="test"
 
 CDEPEND="
 	>=dev-java/ant-1.10.14-r3:0
-	dev-java/ant-ivy:2
+	dev-java/ant-ivy:0
 	dev-java/bcel:0
 	dev-java/commons-httpclient:3
 	dev-java/xerces:2
@@ -54,7 +54,7 @@ RDEPEND="${CDEPEND}
 	>=virtual/jre-1.8:*"
 
 #	JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,!!!groupId-not-found!!!,xerces-2"
-JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant,bcel,ant-ivy-2,xerces-2"
+JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant,bcel,ant-ivy,xerces-2"
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
 
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index 8ba724658f42..a239bf2d959a 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,3 +1,3 @@
 DIST apache-ivy-2.5.0-src.tar.gz 2719181 BLAKE2B 71c47e3493beac8de1bc4e8c86ae18383938265dd2803a1c4b9ad466306227dab9eeca256516ff94064d902d0694b4f0b35ce152c5f64b95b876e47289b25833 SHA512 59d9458345e3a51e8f527258ba26ebe2cf5cf257401c52fb5f75aced0da5f7bf36f8aa0f202bbc0cf029d1d49bd6634f7cb8b65ccc828eb55ff7084430879268
-EBUILD ant-ivy-2.5.0-r2.ebuild 8507 BLAKE2B f88f6e98d61e346fca76f3e4cdfc1d9ce8cd96fc45bcf7872d2b5e1007ef67346b3a05f02a5b682ca732a014c5f6edfc0e87b28b661635ac38e6d10b46e14491 SHA512 5c6a77d82be45a6e50c4a3ee3615b82a06f36307f5e5436b4f45cf1496e060c650604e0cb300320f19e233e17b307eb40d37c7fd5217b78c3731956f458ab861
+EBUILD ant-ivy-2.5.0-r4.ebuild 8508 BLAKE2B 94f99f12bf306817969e6b38512871a0fe97c8c5841d0f685ea55dd8257771556c4fab68b83cabcb3d642e791e1d54f093b407bc581880944cd1f91783cf1946 SHA512 7ffb7a3df1bd596a4d48e6636683667cba668d48d10ca1e07373f83a07737de740782cb6fca6e299183d1631266415f7e06b289654fd3cdce7c2f25c22b1b971
 MISC metadata.xml 853 BLAKE2B 908a789bf1e0310f1cb5fe27b360fb21c8b3569d99c20891a10b68be9162cf3c7009eefe0497c370699d005875d937da59b03d8f844a4d1a1a474f313f4c152a SHA512 af35a6ba951105d6c5e24ab2dcfa84a859184623c3911594bc82d72f3f96307da1dd8f6bef9be1297ec7cd0942680d77d6bdb44e2e5c5afe56cde761e018812f
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild
index 0158c70768f5..32e0a711eb11 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild
@@ -12,9 +12,10 @@ inherit java-pkg-2 java-pkg-simple java-osgi
 DESCRIPTION="Ivy is a free java based dependency manager"
 HOMEPAGE="https://ant.apache.org/ivy/"
 SRC_URI="https://archive.apache.org/dist/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
+S="${WORKDIR}/apache-ivy-${PV}"
 
 LICENSE="Apache-2.0"
-SLOT="2"
+SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 
 PROPERTIES="test_network"
@@ -24,7 +25,7 @@ CDEPEND="
 	>=dev-java/ant-1.10.14-r3:0
 	dev-java/bcpg:0
 	dev-java/bcprov:0
-	dev-java/httpcomponents-client
+	dev-java/httpcomponents-client:4
 	dev-java/commons-vfs:2
 	dev-java/httpcore:0
 	dev-java/jakarta-oro:2.0
@@ -45,8 +46,6 @@ RDEPEND="${CDEPEND}
 
 DOCS=( LICENSE NOTICE README.adoc )
 
-S="${WORKDIR}/apache-ivy-${PV}"
-
 JAVA_GENTOO_CLASSPATH="
 	ant
 	bcpg
diff --git a/dev-java/c3p0/Manifest b/dev-java/c3p0/Manifest
index ca216fdfd52a..6d9377abb69d 100644
--- a/dev-java/c3p0/Manifest
+++ b/dev-java/c3p0/Manifest
@@ -1,3 +1,5 @@
+AUX c3p0-0.9.5.5-source-target.patch 1729 BLAKE2B c077cc97c0f8dc880268f7b60175ce705536f8c12294e70450b6cdcf86677cf92f5c541411fa3d2034e90c8ceedcd79f10d70169eced3c3844022709091e84ee SHA512 c69d8223674510557b86b0adf83ea461e09d2d6f7dee559823c5955ee7d01d963c9d6a247d7cb52672743d6f03fc4c5747a6476002512238f4b0ee12cc9bfbf4
 DIST c3p0-0.9.5.5.src.tgz 869069 BLAKE2B 6e1349d1cd02647a7c2424b8e89a8c21cfd8faefd26b7e05ee9e2da1a1a501b2b3102b142eef52f56dea672408d683a6f47b4c89b25d529a578c4b1fe4aa819c SHA512 fa96b5d0042442c773309090b9cf8f0db8e16f334e321ac952afb198ca06cd66f6f7162369f22a439a0e6b45b1ffcddf540af53804f223844d7a5465213bece1
 EBUILD c3p0-0.9.5.5-r1.ebuild 1360 BLAKE2B 1a1b15eb6de048720a89c42dd934810a9f64eb66b3afad1728a86260f1528cd7ed3a7d69c9f245af468e29680eb866ae3cac046434436cf42656d1f13bd6537a SHA512 77c61f9f98e0f2f5e72289590775b4748b9562e5d661e65a1c7e5c3f71e9c36a337294d87fd55474cfbe4c2a68fa45dd623ef3fd041f7fa3baf3626156428739
+EBUILD c3p0-0.9.5.5-r2.ebuild 1551 BLAKE2B 19d9a5e96bded024bb5b9f2103ed23ff003c5fd9f55d671f121ce1abcb3ffb2b6f7a2ecaad892c1fd8cf3b6e87b3b47eaa549b26325fc3a17532a88f631ce668 SHA512 e55be2dc605cb7c1f38ed1b6b90893c3456df4c2c906fb3c48e9c6b5f7c67abb509b7c95f2bf7942e144651af518b6245742a8c23930f941a6c1d73fbbc1f50b
 MISC metadata.xml 364 BLAKE2B 41a7f0e98d0f4de31b20f73cef598f7b92b7978c02a86709698152150e56ff00ab2c38204c270b316f0549961f550b53a50e5b32a40ad479aa6a24906a75e77c SHA512 724b392d317b00aa3f0e4f8e3ca1dd20f52abd03581172a15a54c9f803582fc4be26e92fa5c61786e6db821900a7d23c02655494d4fe33a552ec3aaf086ab5cf
diff --git a/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild b/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild
new file mode 100644
index 000000000000..89dc72a719c4
--- /dev/null
+++ b/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Tests require an existing running SQL server and 'junit.jar.file' property
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2
+
+DESCRIPTION="JDBC drivers with JNDI-bindable DataSources"
+HOMEPAGE="https://www.mchange.com/projects/c3p0/"
+SRC_URI="https://downloads.sourceforge.net/project/c3p0/c3p0-src/c3p0-${PV}/${P}.src.tgz"
+S="${WORKDIR}/${P}.src"
+
+LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+CP_DEPEND="
+	dev-java/log4j-12-api:2
+	dev-java/mchange-commons:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+PATCHES=( "${FILESDIR}/c3p0-0.9.5.5-source-target.patch" )
+
+src_prepare() {
+	java-pkg_clean
+	default #780585
+	java-pkg-2_src_prepare
+	java-pkg_jar-from --into lib/ log4j-12-api-2
+	java-pkg_jar-from --into lib/ mchange-commons
+
+	# Test sources interfere with Javadoc generation on JDK 11
+	# Remove since the tests will never be run
+	rm -r src/java/com/mchange/v2/c3p0/test ||
+		die "Failed to remove unused test sources"
+}
+
+src_compile() {
+	eant jar $(usev doc javadoc) \
+		-Dant.build.javac.source="$(java-pkg_get-source)" \
+		-Dant.build.javac.target="$(java-pkg_get-target)"
+}
+
+src_install() {
+	java-pkg_newjar "build/${P}.jar"
+	einstalldocs
+
+	use doc && java-pkg_dojavadoc build/apidocs
+	use examples && java-pkg_doexamples src/java/com/mchange/v2/c3p0/example
+	use source && java-pkg_dosrc src/java/com/mchange/v2
+}
diff --git a/dev-java/c3p0/files/c3p0-0.9.5.5-source-target.patch b/dev-java/c3p0/files/c3p0-0.9.5.5-source-target.patch
new file mode 100644
index 000000000000..d066a59fde1b
--- /dev/null
+++ b/dev-java/c3p0/files/c3p0-0.9.5.5-source-target.patch
@@ -0,0 +1,49 @@
+diff --git a/build.xml b/build.xml
+index 47a0f2a..47f8f2b 100644
+--- a/build.xml
++++ b/build.xml
+@@ -180,8 +180,6 @@
+   <target name="init-codegen" depends="debuggen,subst">
+     <javac destdir="${build.classes.dir}" 
+            classpathref="codegen-classpath"
+-	   source="${jvm.target.version}"
+-	   target="${jvm.target.version}"
+            debug="true">
+       <src>
+ 	<pathelement location="${build.codegen.dir}" />
+@@ -224,8 +222,6 @@
+   <target name="compile-common" depends="codegen">
+     <javac destdir="${build.classes.dir}" 
+            classpathref="build-classpath" 
+-	   source="${jvm.target.version}"
+-	   target="${jvm.target.version}"
+            debug="on">
+       <sourcepath>
+ 	<pathelement location="${build.codegen.dir}" />
+@@ -246,8 +242,6 @@
+   <target name="compile-subst" depends="codegen">
+     <javac destdir="${build.classes.dir}" 
+            classpathref="build-classpath" 
+-	   source="${jvm.target.version}"
+-	   target="${jvm.target.version}"
+            debug="on">
+       <sourcepath>
+ 	<pathelement location="${build.codegen.dir}" />
+@@ -262,8 +256,6 @@
+   <target name="compile-mgmt" depends="codegen" unless="no-mgmt">
+     <javac destdir="${build.classes.dir}" 
+            classpathref="build-classpath" 
+-	   source="${jvm.target.version}"
+-	   target="${jvm.target.version}"
+            debug="on">
+       <sourcepath>
+ 	<pathelement location="${java.src.dir}" />
+@@ -318,8 +310,6 @@
+   <target name="compile-junit" depends="compile">
+     <javac destdir="${test.classes.dir}" 
+            classpathref="test-classpath" 
+-	   source="${jvm.target.version}"
+-	   target="${jvm.target.version}"
+            debug="on">
+       <sourcepath>
+ 	<pathelement location="${java.src.dir}" />
diff --git a/dev-java/iso-relax/Manifest b/dev-java/iso-relax/Manifest
index 9ce1e69dddb8..c54caae87140 100644
--- a/dev-java/iso-relax/Manifest
+++ b/dev-java/iso-relax/Manifest
@@ -1,3 +1,3 @@
 DIST iso-relax-20050331.tar.bz2 696665 BLAKE2B 4f366818bed5e31fa8fc2f8759a38dddda26b8d379c4ba81ff3679228826890f7383606901440f51d958a2401943822bcb3a03bde9be1a647245563d58316526 SHA512 c327b461785ce647f9913afa6f5b77c41440e806d566884058be76e14a118d14fa305a1bc0157ee150b199b573e75af954311dc79eb8535599544f094526320a
-EBUILD iso-relax-20050331-r6.ebuild 652 BLAKE2B fa5d90b3cb303c1347f751c75cf9382c1cfcb78787db7bb2d1619919b2b8b34b108fbd5ef9bec7a0a86bed76c7f35b568c66302431959659766c676ccbeb70a7 SHA512 09e50d63432cf5329e8963838e1543e779fb3f47ec6189a8d021bd948da2d68a6474a9ee6213a94a1694796bfaa465c362e7c5072f377639918f13e1c94da863
+EBUILD iso-relax-20050331-r7.ebuild 666 BLAKE2B e1d7ab33f16429b9c87267c58bfa40b356f5a66d937b679422fcf9354da7ef0d5a16b64d9d85dc1b0b5e5b253ab71e7d17eb25c955f1d0e84e4d6719adbbb9f7 SHA512 39523c4596c6d39732ac99fe34b053e6ddc92a64b8744d0773afe4866a3cc809e1128834bcb6885103212219f9b8ded475cf33909eba8882728d08f261162b29
 MISC metadata.xml 316 BLAKE2B 360a0a89a1c6cf082f7995e4ac740dda2e0197b5bdc1141f0cc2c21dbd7200ff46fa91897663cbb22777322cf49ea876300e792971d2654a9feb3009fca57b06 SHA512 d43cdc8324eca4c92128e04fede85cf82f03de72285ac294599beeee8809e228536a84ee917b18c24ed721e5063e8eb451154dc1eea217ee795d677aa8061745
diff --git a/dev-java/iso-relax/iso-relax-20050331-r6.ebuild b/dev-java/iso-relax/iso-relax-20050331-r7.ebuild
index 6359c5cb8203..de9ed0e1d7b9 100644
--- a/dev-java/iso-relax/iso-relax-20050331-r6.ebuild
+++ b/dev-java/iso-relax/iso-relax-20050331-r7.ebuild
@@ -19,7 +19,8 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-sol
 CP_DEPEND=">=dev-java/ant-1.10.14-r3:0"
 DEPEND="${CP_DEPEND}
 	>=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
 
 JAVA_SRC_DIR="src"
 
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 48035f9edf03..469116a8f9fd 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,8 +1,4 @@
-DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
-DIST java-config-2.3.3.tar.gz 33837 BLAKE2B dc522a61775272e520521a06c80ac33cbe40010a40051857df8abdbda72cc064969cb00dbf8f7d06efabd352d9cf2c711808205579c7cef73ce4bb7fe2845c8d SHA512 f999ccbdd47f2552913467d3b0c6704fc6511f2bc9d0a6f62d38a9c2e9899f11b239f2039b025f7fdee5e0713d2aaf13c1a9a9baf4f1551bb97d85b12d3f28e9
 DIST java-config-2.3.4.tar.gz 33833 BLAKE2B 36cb628375a05530f515d886d819bc99a7ed233bec2956db3562349ae845be57363a2b6629ab5536be15c5f64387d0760cca7959b76a5685918732ee7bf62300 SHA512 9df42a70aceb400a9fab73668151da783e98e767fa6289c13427095d7a3268bd4bb15de9ef980b82692e7c1cb0eaf5326c19a632679419d78a419294579fb29e
-EBUILD java-config-2.3.1-r1.ebuild 1115 BLAKE2B 56a55948eb49929d4f9852662fcaaa17432abfba9c43367186d017bbc5854fe6a66aafe7313f3000db280500573badbc422dc5ee9f0e82ff15cf48ac4149d4b3 SHA512 8d13961648a6ff645dc1b6bffbc0389cb2b73455e798ab71f87f1d03c540efdef30dd276d70e7c5b6a181a8aa0916c91194a77a7b505b86ffd941a9ea0d69fd6
-EBUILD java-config-2.3.3-r1.ebuild 1717 BLAKE2B d27e002a008385ce859d191512e57932083276b5546a6a454a45fc811b6e2d5eef94ac22d45b89e1916c7dc7d2d0bcc181798800d6acd78678a8ab53a50667df SHA512 2ad4119601732d4827857340c4efe65bbac5fa6ae2082c150713433f52d7aba7cdccae36d81fde32a36d0cc6c0888b80ecc47b9d85bb91b044a312df82e2993e
-EBUILD java-config-2.3.4.ebuild 1745 BLAKE2B 2960c01b67cdf2c21310f3cbcc4f3571568a4224b66894a61c87ad4a1d3b4817aa7af21cc1c6445a05cc6836dcdf3a2da821aad5d5ac186c44fd3d28d6bf6107 SHA512 71492ebdfc527147051260ea5dbaa4f0b6cfdf3117a7044b3e20abd2f14cb8a8e048853f4fada3f2fc0ce8aafc1c5d39cc749a2984ffe919280ad07db83a5a44
+EBUILD java-config-2.3.4.ebuild 1741 BLAKE2B bded2a20c13a7f4564847ac98a22899b43ec9f3755e3c2dbc46fd6d1dec736df46053e746496aa55d367b69c130bcc2fa19262a167c70d2c5ce7e5859f17cf01 SHA512 af216cb651e6b77c0004b469aa75537dc76856b4b9d272c450650d4367c30e4b40b26907d44673f27681650bd6559359c8e6f174bce8cabaffb8584837ad27fe
 EBUILD java-config-9999.ebuild 1745 BLAKE2B 27d584230b5fcf22c3e73a2437789e48caac5ad4deab8676914d5d55aef8b2a5a80dbfab45c3078cff7100b8719dc0ca518527ea894a9d6ca24ed5a363ff5a63 SHA512 ffbb3ecde7a588675111ad1908d56016fff4ec72297037fe9a3708abf244515a4fc427385d0448270d4799ad946574524a74be3496053e91d19f98e0fc6622c7
 MISC metadata.xml 802 BLAKE2B 300762f5d21abce3b3c37d88e678125c0c760813acb3b3171c1d151da89bd404d6914874d93b52580ca245d14d1fbdfd5801ab7e0204ece3bee7ec084180de1a SHA512 76efa4ab5aaeecce7d952d2a48b0d63027d5dc7d0fed45c947817c4e599e0dd2b8ea664d951a2f4b2fa2885a2a46a9750b5687f328691701d72d93d8ead494d3
diff --git a/dev-java/java-config/java-config-2.3.1-r1.ebuild b/dev-java/java-config/java-config-2.3.1-r1.ebuild
deleted file mode 100644
index 13f2ded5c0e8..000000000000
--- a/dev-java/java-config/java-config-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 prefix
-
-DESCRIPTION="Java environment configuration query tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
-
-# baselayout-java is added as a dep till it can be added to eclass.
-RDEPEND="
-	sys-apps/baselayout-java
-	sys-apps/portage[${PYTHON_USEDEP}]"
-
-python_configure_all() {
-	# setup.py fails to update this file
-	eprefixify src/launcher.bash
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# This replaces the file installed by java-config-wrapper.
-	dosym java-config-2 /usr/bin/java-config
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-java/java-config/java-config-2.3.3-r1.ebuild b/dev-java/java-config/java-config-2.3.3-r1.ebuild
deleted file mode 100644
index ab1cb1b890e9..000000000000
--- a/dev-java/java-config/java-config-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit meson python-r1
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git"
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-DESCRIPTION="Java environment configuration query tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
-
-# baselayout-java is added as a dep till it can be added to eclass.
-RDEPEND="
-	${PYTHON_DEPS}
-	sys-apps/baselayout-java
-	sys-apps/portage[${PYTHON_USEDEP}]
-"
-
-src_configure() {
-	local python_only=false
-	python_foreach_impl my_src_configure
-}
-
-my_src_configure() {
-	local emesonargs=(
-		-Darch="${ARCH}"
-		-Dpython-only="${python_only}"
-		-Deprefix="${EPREFIX}"
-	)
-
-	meson_src_configure
-	python_only=true
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	python_foreach_impl meson_src_test --no-rebuild --verbose
-}
-
-src_install() {
-	python_foreach_impl my_src_install
-
-	local scripts
-	mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/bin/* || die)
-	python_replicate_script "${scripts[@]}"
-
-	# This replaces the file installed by java-config-wrapper.
-	dosym java-config-2 /usr/bin/java-config
-}
-
-my_src_install() {
-	meson_src_install
-
-	local pydirs=(
-		"${D}$(python_get_sitedir)"
-	)
-	python_optimize "${pydirs[@]}"
-}
diff --git a/dev-java/java-config/java-config-2.3.4.ebuild b/dev-java/java-config/java-config-2.3.4.ebuild
index 90c000f935f3..5e3221048e7a 100644
--- a/dev-java/java-config/java-config-2.3.4.ebuild
+++ b/dev-java/java-config/java-config-2.3.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Java environment configuration query tool"
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index f140fb992acd..375c695e12d3 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -1,5 +1,4 @@
 AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1292 BLAKE2B 192bb8dc9deb6d39131b4af992dc3e906fcf6d6d21e4d2edcb5e4aea9169c01dff273643c196b47c1f118b44e38083c1092f71e49e5502936945d51cf4c4c8b5 SHA512 075434a9a2067593332f7b0827dcc077102fb1c1ca11347ed3e2d62e499f6022c1948feaa3be66b17891e539c12a77d98bc292ac143bc5acdf387bd1e3ec399f
 DIST wrapper_3.5.50_src.tar.gz 779253 BLAKE2B 64863e408c2147014946f869bbd98775d1d23d4cd63ef562167f40191febf87cc72697a55fe2ec6a5d085f3df4897cc4485f4ed88a3ee3a7f7930215448972f7 SHA512 403deec1bcc70a93ce0b0749bf2d5bc27a4a540d07785bc3ac83b38257cc5e8247a784f646770c96ac318f22d30c463dafb2f002720041b93443b292d6669c09
-EBUILD java-service-wrapper-3.5.50-r1.ebuild 2388 BLAKE2B f157561b01c9cbd75bc5f4327bdaa1eafb7fc445b024cf75c81c4f01cad3229cc4f542e8c3e932b188c03a09c23ca434536a0f5c83ead8ae3ccde3180add7fef SHA512 8a00fdb945e8cd0053daa3546c56e8000600f4bc81fe8c7fa25206b8d55f68c391e309f4c7a8f504844d8da5d9310324c0751aaa849a3dd99c1b9e7dfcda88dc
-EBUILD java-service-wrapper-3.5.50-r2.ebuild 2403 BLAKE2B 1a592cd6c11e0d26d7e98dd0b9d57048fc56008a0ffd231beb43ee6244662752c7e33b883c2e469f596316d7fbcb5435b27fef7f05e0529df496657ff169ee81 SHA512 bcb2f9b0463031960c0b9b0c501d813dc9c6d457aa62317419c21c4423ab82c3573b669b7dea84293c362b3d53aa85e352b3fcbd647b4684e2731c664dbb1f33
+EBUILD java-service-wrapper-3.5.50-r2.ebuild 2401 BLAKE2B f803ff8ba0834d57bc17b8a0ee9dbf3784e67cad21062ce7fbbab440f48621c899ad9fe6ab4865ebf77b330198ced6e296898a1ee0daae2a965244cf4b758247 SHA512 decd48432171932342c37b1e677b03d44ed8245c521b2c302830a013058bd3bf63a3a040436fe962841995b609a2510d17c1ef13cc33ebf1f93b6cfc7d5bdc63
 MISC metadata.xml 640 BLAKE2B 1ced5abe1a0ff9b141f3a6020cd6352b02cf228524b694f36bedb7ef91a892ee471235b36e81e03fbe98eee6f28f680821b15501447b58c8788129eaf8e6b39a SHA512 4d9eb54f0328aa00380b40a0ead3fc43e552b71e8d4b5279341d5249a9615c3c161ca19295d6f586c43708f9e29aaf3799799243dd277c8822b95d7c1f82afd1
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild
deleted file mode 100644
index 8fdfe9ac2063..000000000000
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-inherit java-pkg-2 java-pkg-simple toolchain-funcs java-ant-2
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon"
-HOMEPAGE="https://wrapper.tanukisoftware.com"
-SRC_URI="https://download.tanukisoftware.com/wrapper/${PV}/wrapper_${PV}_src.tar.gz"
-
-LICENSE="tanuki-community"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/junit:4
-		dev-util/cunit
-	)
-"
-BDEPEND="virtual/jdk"
-
-S="${WORKDIR}/wrapper_${PV}_src"
-
-JAVA_SRC_DIR="src/java/"
-JAVA_JAR_FILENAME="wrapper.jar"
-JAVA_TEST_SRC_DIR="src/test"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-
-PATCHES=(
-	"${FILESDIR}"/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
-)
-
-src_prepare() {
-	default
-
-	# replaces as-needed.patch
-	sed -i \
-		-e 's/gcc -O3/$(CC)/g' \
-		-e 's/ -pthread/ $(CFLAGS) $(LDFLAGS) -pthread/g' \
-		-e 's/ -shared/ $(LDFLAGS) -shared/g' \
-		-e 's/$(TEST)\/testsuite/testsuite/g' \
-		src/c/Makefile-*.make || die
-
-	cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make"
-	java-pkg-2_src_prepare
-
-	# disable tests by default (they are only enabled by default on amd64)
-	sed -e "s/\(all: init wrapper libwrapper.so\) testsuite/\1/g" \
-		-i src/c/Makefile-linux-x86-64.make || die
-
-	# re-enable tests on all platforms if requested
-	if use test; then
-		grep "testsuite_SOURCE" "src/c/Makefile-linux-x86-64.make" | tee -a src/c/Makefile-*.make
-		assert
-		echo 'all: testsuite' | tee -a src/c/Makefile-*.make
-		assert
-	fi
-}
-
-src_compile() {
-	tc-export CC
-
-	pushd "${T}" || die
-	echo 'public class GetArchDataModel{public static void main(String[] args){System.out.println(System.getProperty("sun.arch.data.model"));}}' \
-		> GetArchDataModel.java || die
-	ejavac GetArchDataModel.java
-	local BITS
-	BITS="$(java GetArchDataModel)" || die "Failed to identify sun.arch.data.model property"
-	popd || die
-	eant -Dbits="${BITS}" compile-c
-
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	src/c/testsuite --basic || die
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_doso lib/libwrapper.so
-
-	dobin bin/wrapper
-	dodoc README*.txt
-	dodoc doc/revisions.txt
-}
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild
index 7d8fc6989375..2576ab85e550 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/wrapper_${PV}_src"
 
 LICENSE="tanuki-community"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index 52ca3e7f1133..a655258ceef6 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,8 +1,17 @@
 AUX javacc-4.0-javadoc.patch 420 BLAKE2B 8f26c37e26f8967cf527a6f7f4b6c5396bffb5cde4cf9aad292217d41e614800cac438b92971e0c942f71ace4f551db30bae873e83ecdcf2ee7940153fca50bf SHA512 e20554696a27137b7f9c086f7d8c4854742fa1e14ad84e2157cecebdc65f2fb6726a0eaaff7bf3f1113a6fade51c5825b86641b61b917a4fcdd96663a8830438
+AUX javacc-4.1-javadoc.patch 376 BLAKE2B 24d09c2b38493f19a789407c53eb9300a7fa80ba4f86b84ef172bd3595c78ddb83d805e8b8ac09ecc275f77439ac993bb259023f9c27537fa53fe8642f473882 SHA512 befb1dfc7ee46ea8bcaf9495196adadfc5517987059f2985ea7faa50cf178aa05780ff53f34d19fb997d45ae70e989a480b7515ae3de68a92ae00d9c0cc0255d
+AUX javacc-4.1-source8.patch 3965 BLAKE2B 8951d57248b16be28cf404b3d5858b1810417e62c1669d578d49ebbbf08d1b8e2f9364e589a49e6791e6c93ef3808399d1d6443025fc949f1857d5471018cd23 SHA512 58f72973441f2e7bdaad74e3e2bba396193268eb607bea477f3c09e9967af919b8a4dcd34527ba2c1a8e1552af261be4d5d85d4205ae6b058b0a90b4786456e2
+AUX javacc-7.0.13-javadoc.patch 310 BLAKE2B e162fec107faac81615da6a887a904c8b0cae8ab33da81b6c3199b181ab9ca485a37a2f6a2833fe6440054c59cadbee38e81931c0d36d8adb4dc29801e06216a SHA512 012b88dceb5581ebdb7ac23cbbeca25d07a2357fb6f14b880f4cca269a173728d8c1d5183c1d559c041946fd0ecf936c70f09c64e1892adc13f474b0ae77c490
+AUX javacc-7.0.13-source8.patch 4562 BLAKE2B 9fae0163ec4f3392497716c083748603a461067f7d5a28b09050c20481554b42e71f83e5836fd62918b26f307ff81cc99c27a7c5da6f79565014b3165b5d7627 SHA512 33c63fe0efb8b7cda936f3974dee9eb7ca31982a64fbaa546def2fb3021cd8c9d17e59ab3538a8d7b53a78bf078ff0f59a57ae42973df23b2b9022df5e557882
+AUX javacc-7.0.4-javadoc.patch 375 BLAKE2B 41271d7e84e859eb298e65e09372e018fa479984c7224eb31a62239e0522cbea3211859a73edecb89a743a1bfc93d0364a6a2b350bd5401c18bce7b4792c7957 SHA512 2954b59d75a41dc2aafdba48e017353fcc4baac9e8439ffda3e1da2e8890386ce20cc840a0e4a35bd74bdaedd05fdd0461959fec0a0dd24f0fd65a754647e2dd
+AUX javacc-7.0.4-source8.patch 4491 BLAKE2B 57422bdae093197f30b8f2f45f0025625ecd9eb778e1f4976de6844a2313b95a13a24e0a847dc1dfff16fa96a003f43b98465b123dafa03a63efd4d253143ed7 SHA512 3786601b6ddd280250791b2ad829f8094974d350fdcbd80543b2b5dbbd6a896b531573f3b5169bb3cfe04c8da841a1713f33d1400e022c6c7f0de41d14d7b565
 DIST javacc-4.1.tar.gz 769476 BLAKE2B c2a22fa78ff4dcf1e36221a23ca1e3cd1eecb473a59ea94ce52e298673f6bd18c0ea0cf757dd68885696ebc8cc724d271c69c923a21ffa433d03c1062b1201ee SHA512 911e5e9f062561ade1748dcef3596e0f25c399c4d52dd174773783dadf24a4ceea8d3feab9ab08880370677959051d8557aed815d4c4184f5ecd5789ee8a5754
 DIST javacc-7.0.13.tar.gz 3199783 BLAKE2B 7e3dddbe53a6e417a31bb7386d154c0e9589f17f88e652f5e146a4e344d72cd948d4d8e55fab753bb983e5d31971efc948c1ecdca4e875031bea3f8a38bfc082 SHA512 ed71e47fc4a382c9c53067bbf73bd9736ee0c41d65e328d5e4843cd71c88d3b7715d7a8fe38f10152ef7ef3be064abf9e801c6ea78066c4fcbabf124dfc4e144
 DIST javacc-7.0.4.tar.gz 2842349 BLAKE2B e5a2e24c99e5e3883270cf0e3931d7667e5b5b49a11c1d9b79b98767f74f4addf2dc7d3d620550bc1b5bb0bfbef8bf07af48a40d250d0902d97c8215f6cb8e01 SHA512 b93c93e8490aae9a26b0de948896ec6d7a044c205d09584c3908988e24a3ea63a1147365115b17a15c6fb311c44f53ddff7c11f092731cbd05d3ec1950ef57f1
+EBUILD javacc-4.1-r1.ebuild 1546 BLAKE2B 652cc53934eebf5947446e4f3672012a35a6476d8b6b2ff9cf3dc87fed808247ca2488313da9bbe64b3df76d742598d7e1caebb8fd98f8d11fdeaa8ed5959635 SHA512 877540d3088e0b8d196e5abc3ea6dc9ecd5f9aa2ea8c9bd09c822db2e06a8c6946197308d408a198f06c71270217a6292570946d54d7da0c3ee441b1cb6d8609
 EBUILD javacc-4.1.ebuild 1474 BLAKE2B 284881056fa0908f182327bc15490b16b061e84692a6a0544c843b9a7ea4af69d0eaac5e776add2f4b0b3231cceff3c6ad75530c49a39f4017086de5b8c1c72d SHA512 c30a3ff8049735df79bed7af32265d1390f3ed089970ac56cc5e28d559345339cdcf7cf235a44aa640e2145359cc1bd9d8a6f23593b9d5715da2041aca74ea9d
+EBUILD javacc-7.0.13-r1.ebuild 1604 BLAKE2B f144ed8b61460a15b8baec4c83bdb08b3c50a07bd0f8a10393286be4fa1c7d38bc419ce98f5cde601a0471f2e2870d93a900fe384a6d41ac3e0524c7b6598fda SHA512 52a3172fc2294c8d7020c4df57c112331dd95feb1b84a877ab987969a4da8bb77b100cc3bd9f6fc5f80ad3d1ce2963fcf03bf5211648884abfc3ab8826dc2911
 EBUILD javacc-7.0.13.ebuild 1228 BLAKE2B d8c1a6eb01d2a50cfb6283be656cf9c624b5d5456ef43e580236e5b8ba4ac7bc8b2d0039772e1373b7368e44679295d3ed836b6cbce3b3bdd987ce93a30d43b7 SHA512 470ec78a6d3d0badc579a7971b56d476731ffbb3aadb847c0b7837a7540e4e81ffa44e0b1c47529242980bf647387c972ba6d84cd94ec6fa4ec1a75a31d79161
+EBUILD javacc-7.0.4-r1.ebuild 1710 BLAKE2B 48d884305a55315443aa19d3eda8f3ce958b996a7bdfc680a0be7f355bf80258194d9303ea942663de0df26b16093772be89970f355493bca42274c145cae8e2 SHA512 d21adb8c8897531551982dbe6e294cd8d5a18325dc7c7a649efade97a5a1c25e9ae8ac5091c7ba8005896f12d035ff6c8bd832c58e3a5b79c5074f63c3ac27e9
 EBUILD javacc-7.0.4.ebuild 1387 BLAKE2B d8bb05a52eaa591aa9bd904479b59bb564d021734ea91328a3b5d69b5c4e7a3c1bcd1bc8770e43a51e298b820a5e349be1b9101d551a46c2b106c9f644d9de0f SHA512 c001d5c429da55420c56ef2f3e01236a4b6e70047d0f981c07ff5e6fe81521962466ea8be291ded7ab43f2dc606031d621c448cbd7b18905ea72bbd2a798c645
 MISC metadata.xml 308 BLAKE2B 421dc38149fa3d88a66071836b7b00e6218c44f3111bf9e99b3f35f5e6ae3e550290d03b9f4ac960828484c8993b1ae5fe5ba6b4b73e172ddf905127df96eb25 SHA512 d365ba4454a45f49ceadbb4f1700ca58de8b9e0715f02056cbff899507fe39bd64e5d388245d0458ec5be9a30f134a4bcc2d8e678745f0b79502741ae30aeaa0
diff --git a/dev-java/javacc/files/javacc-4.1-javadoc.patch b/dev-java/javacc/files/javacc-4.1-javadoc.patch
new file mode 100644
index 000000000000..134aaa35abc9
--- /dev/null
+++ b/dev-java/javacc/files/javacc-4.1-javadoc.patch
@@ -0,0 +1,16 @@
+--- a/build.xml
++++ b/build.xml
+@@ -150,5 +150,13 @@
+   	<arg line="${version}" />
+   </exec>
+   </target>
++   <target name="javadoc" depends="compile">
++      <javadoc destdir="doc/api" source="8">
++      	<packageset dir="src"/>
++       <classpath>
++         <pathelement path="lib/junit3.8.1/junit.jar" />
++       </classpath>
++      </javadoc>
++   </target>
+ 
+ </project>
diff --git a/dev-java/javacc/files/javacc-4.1-source8.patch b/dev-java/javacc/files/javacc-4.1-source8.patch
new file mode 100644
index 000000000000..6dfc3e47382d
--- /dev/null
+++ b/dev-java/javacc/files/javacc-4.1-source8.patch
@@ -0,0 +1,134 @@
+--- a/build.xml
++++ b/build.xml
+@@ -112,6 +112,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+     <junit printsummary="yes" haltonfailure="yes">
+       <classpath>
+        <pathelement path="classes" />
++       <pathelement path="lib/junit3.8.1/junit.jar" />
+       </classpath>
+       <batchtest fork="no" todir=".">
+         <fileset dir="classes">
+--- a/src/org/javacc/jjdoc/build.xml
++++ b/src/org/javacc/jjdoc/build.xml
+@@ -46,7 +46,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+     <javac srcdir="${javacc.root}/src"
+            destdir="${javacc.root}/classes"
+            debug="${build.compiler.debug}"
+-           source="1.4"
++           source="8"
++           target="8"
+            classpath="${javacc.root}/classes">
+     </javac>
+   </target>
+--- a/src/org/javacc/jjtree/build.xml
++++ b/src/org/javacc/jjtree/build.xml
+@@ -54,7 +54,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+     <javac srcdir="${javacc.root}/src"
+            destdir="${javacc.root}/classes"
+            debug="${build.compiler.debug}"
+-           source="1.4"
++           source="8"
++           target="8"
+            classpath="${javacc.root}/classes">
+     </javac>
+   </target>
+--- a/src/org/javacc/parser/build.xml
++++ b/src/org/javacc/parser/build.xml
+@@ -52,7 +52,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+     <javac srcdir="${javacc.root}/src"
+            destdir="${javacc.root}/classes"
+            debug="${build.compiler.debug}"
+-           source="1.4"
++           source="8"
++           target="8"
+            classpath="${javacc.root}/classes:${junit.jar}">
+     </javac>
+   </target>
+--- a/test/imports/build.xml
++++ b/test/imports/build.xml
+@@ -41,7 +41,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ 
+     <javac srcdir="out-dir"
+            destdir="out-dir"
+-           source="1.4"
++           source="8"
++           target="8"
+ 	   debug="true"
+            classpath="../../bin/lib/javacc.jar">
+     </javac>
+--- a/test/javaFiles/build.xml
++++ b/test/javaFiles/build.xml
+@@ -52,7 +52,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ 
+     <javac srcdir="out-dir"
+            destdir="out-dir/static"
+-           source="1.4"
++           source="8"
++           target="8"
+ 	   debug="true"
+            classpath="../../bin/lib/javacc.jar">
+     </javac>
+@@ -74,7 +75,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ 
+     <javac srcdir="out-dir"
+            destdir="out-dir/non-static"
+-           source="1.4"
++           source="8"
++           target="8"
+ 	   debug="true"
+            classpath="../../bin/lib/javacc.jar">
+     </javac>
+@@ -99,7 +101,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ 
+     <javac srcdir="out-dir"
+            destdir="out-dir/non-static"
+-           source="1.4"
++           source="8"
++           target="8"
+ 	   debug="true"
+            classpath="../../bin/lib/javacc.jar">
+     </javac>
+@@ -126,7 +129,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ 
+     <javac srcdir="out-dir"
+            destdir="out-dir/non-static"
+-           source="1.4"
++           source="8"
++           target="8"
+ 	   debug="true"
+            classpath="../../bin/lib/javacc.jar">
+     </javac>
+@@ -152,7 +156,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ 
+     <javac srcdir="out-dir"
+            destdir="out-dir/non-static"
+-           source="1.4"
++           source="8"
++           target="8"
+ 	   debug="true"
+            classpath="../../bin/lib/javacc.jar">
+     </javac>
+--- a/test/javacodeLA/build.xml
++++ b/test/javacodeLA/build.xml
+@@ -40,7 +40,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ 
+     <javac srcdir="out-dir"
+            destdir="out-dir"
+-           source="1.4"
++           source="8"
++           target="8"
+ 	   debug="true"
+            classpath="../../bin/lib/javacc.jar">
+     </javac>
+--- a/test/lom/build.xml
++++ b/test/lom/build.xml
+@@ -40,7 +40,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ 
+     <javac srcdir="out-dir"
+            destdir="out-dir"
+-           source="1.4"
++           source="8"
++           target="8"
+            debug="true"
+            classpath="../../bin/lib/javacc.jar">
+     </javac>
diff --git a/dev-java/javacc/files/javacc-7.0.13-javadoc.patch b/dev-java/javacc/files/javacc-7.0.13-javadoc.patch
new file mode 100644
index 000000000000..2849ced4340f
--- /dev/null
+++ b/dev-java/javacc/files/javacc-7.0.13-javadoc.patch
@@ -0,0 +1,14 @@
+diff --git a/build.xml b/build.xml
+index bddc709..52f3626 100644
+--- a/build.xml
++++ b/build.xml
+@@ -202,9 +202,6 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ 			<fileset dir="${java-src}" />
+ 		</javadoc>
+ 
+-		<zip destfile="${install-name}-javadoc.jar" basedir="${target-folder}/javadoc">
+-		</zip>
+-
+ 	</target>
+ 
+ 
diff --git a/dev-java/javacc/files/javacc-7.0.13-source8.patch b/dev-java/javacc/files/javacc-7.0.13-source8.patch
new file mode 100644
index 000000000000..544da8197eca
--- /dev/null
+++ b/dev-java/javacc/files/javacc-7.0.13-source8.patch
@@ -0,0 +1,100 @@
+--- a/test/exceptions/build.xml
++++ b/test/exceptions/build.xml
+@@ -40,7 +40,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+       <arg line="Parser.jj" />
+     </java>
+ 
+-    <javac srcdir="out-dir" destdir="out-dir" source="1.7" debug="true" includeantruntime='false'
++    <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+            classpath="../../target/javacc.jar">
+     </javac>
+ 
+@@ -83,7 +83,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+       <arg line="Parser.jj" />
+     </java>
+ 
+-    <javac srcdir="out-dir" destdir="out-dir" source="1.7" includeantruntime='false'
++    <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" includeantruntime='false'
+ 	   debug="true"
+            classpath="../../target/javacc.jar">
+     </javac>
+--- a/test/imports/build.xml
++++ b/test/imports/build.xml
+@@ -39,7 +39,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+       <arg line="Parser.jj" />
+     </java>
+ 
+-    <javac srcdir="out-dir" destdir="out-dir" source="1.7" debug="true" includeantruntime='false'
++    <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+            classpath="../../target/javacc.jar">
+     </javac>
+ 
+--- a/test/javaFiles/build.xml
++++ b/test/javaFiles/build.xml
+@@ -50,7 +50,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+      </condition>
+     </fail>
+ 
+-    <javac srcdir="out-dir" destdir="out-dir/static" source="1.7" debug="true" includeantruntime='false'
++    <javac srcdir="out-dir" destdir="out-dir/static" source="8" target="8" debug="true" includeantruntime='false'
+            classpath="../../target/javacc.jar">
+     </javac>
+     <java fork="true" classname="Parser" classpath="out-dir/static" inputstring="A" failonerror="true"> </java>
+@@ -69,7 +69,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+      </condition>
+     </fail>
+ 
+-    <javac srcdir="out-dir"  destdir="out-dir/non-static"  source="1.7" debug="true" includeantruntime='false'
++    <javac srcdir="out-dir"  destdir="out-dir/non-static"  source="8" target="8" debug="true" includeantruntime='false'
+            classpath="../../target/javacc.jar">
+     </javac>
+     <java fork="true" classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+@@ -91,7 +91,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+      </condition>
+     </fail>
+ 
+-    <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.7" debug="true" includeantruntime='false'
++    <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false'
+            classpath="../../target/javacc.jar">
+     </javac>
+     <java fork="true" classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+@@ -115,7 +115,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+     </fail>
+ 
+ 
+-    <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.7" debug="true" includeantruntime='false'
++    <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false'
+            classpath="../../target/javacc.jar">
+     </javac>
+     <java fork="true" classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+@@ -138,7 +138,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+     </fail>
+ 
+ 
+-    <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.7" debug="true" includeantruntime='false'
++    <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false'
+            classpath="../../target/javacc.jar">
+     </javac>
+     <java fork="true" classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+--- a/test/javacodeLA/build.xml
++++ b/test/javacodeLA/build.xml
+@@ -38,7 +38,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+       <arg line="javacode.jj" />
+     </java>
+ 
+-    <javac srcdir="out-dir" destdir="out-dir" source="1.7" debug="true" includeantruntime='false'
++    <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+            classpath="../../target/javacc.jar">
+     </javac>
+ 
+--- a/test/lom/build.xml
++++ b/test/lom/build.xml
+@@ -38,7 +38,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+       <arg line="Parser.jj" />
+     </java>
+ 
+-    <javac srcdir="out-dir" destdir="out-dir" source="1.7" debug="true" includeantruntime='false'
++    <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+            classpath="../../target/javacc.jar">
+     </javac>
+ 
diff --git a/dev-java/javacc/files/javacc-7.0.4-javadoc.patch b/dev-java/javacc/files/javacc-7.0.4-javadoc.patch
new file mode 100644
index 000000000000..57699b5249d5
--- /dev/null
+++ b/dev-java/javacc/files/javacc-7.0.4-javadoc.patch
@@ -0,0 +1,12 @@
+--- a/build.xml
++++ b/build.xml
+@@ -201,9 +201,6 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ 			<fileset dir="${generated-src}" />
+ 			<fileset dir="${java-src}" />
+ 		</javadoc>
+-
+-		<zip destfile="${install-name}-javadoc.jar" basedir="${target-folder}/javadoc">
+-		</zip>
+ 	</target>
+ 
+ 	<target name="unittest" depends="jar" description="run JUnit unit test cases" unless="true">
diff --git a/dev-java/javacc/files/javacc-7.0.4-source8.patch b/dev-java/javacc/files/javacc-7.0.4-source8.patch
new file mode 100644
index 000000000000..620b1c03f78b
--- /dev/null
+++ b/dev-java/javacc/files/javacc-7.0.4-source8.patch
@@ -0,0 +1,100 @@
+--- a/test/exceptions/build.xml
++++ b/test/exceptions/build.xml
+@@ -40,7 +40,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+       <arg line="Parser.jj" />
+     </java>
+ 
+-    <javac srcdir="out-dir" destdir="out-dir" source="1.5" debug="true" includeantruntime='false'
++    <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+            classpath="../../target/javacc.jar">
+     </javac>
+ 
+@@ -83,7 +83,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+       <arg line="Parser.jj" />
+     </java>
+ 
+-    <javac srcdir="out-dir" destdir="out-dir" source="1.5" includeantruntime='false'
++    <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" includeantruntime='false'
+ 	   debug="true"
+            classpath="../../target/javacc.jar">
+     </javac>
+--- a/test/imports/build.xml
++++ b/test/imports/build.xml
+@@ -39,7 +39,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+       <arg line="Parser.jj" />
+     </java>
+ 
+-    <javac srcdir="out-dir" destdir="out-dir" source="1.5" debug="true" includeantruntime='false'
++    <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+            classpath="../../target/javacc.jar">
+     </javac>
+ 
+--- a/test/javaFiles/build.xml
++++ b/test/javaFiles/build.xml
+@@ -50,7 +50,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+      </condition>
+     </fail>
+ 
+-    <javac srcdir="out-dir" destdir="out-dir/static" source="1.5" debug="true" includeantruntime='false'
++    <javac srcdir="out-dir" destdir="out-dir/static" source="8" target="8" debug="true" includeantruntime='false'
+            classpath="../../target/javacc.jar">
+     </javac>
+     <java classname="Parser" classpath="out-dir/static" inputstring="A" failonerror="true"> </java>
+@@ -69,7 +69,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+      </condition>
+     </fail>
+ 
+-    <javac srcdir="out-dir"  destdir="out-dir/non-static"  source="1.5" debug="true" includeantruntime='false'
++    <javac srcdir="out-dir"  destdir="out-dir/non-static"  source="8" target="8" debug="true" includeantruntime='false'
+            classpath="../../target/javacc.jar">
+     </javac>
+     <java classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+@@ -91,7 +91,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+      </condition>
+     </fail>
+ 
+-    <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.5" debug="true" includeantruntime='false'
++    <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false'
+            classpath="../../target/javacc.jar">
+     </javac>
+     <java classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+@@ -115,7 +115,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+     </fail>
+ 
+ 
+-    <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.5" debug="true" includeantruntime='false'
++    <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false'
+            classpath="../../target/javacc.jar">
+     </javac>
+     <java classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+@@ -138,7 +138,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+     </fail>
+ 
+ 
+-    <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.5" debug="true" includeantruntime='false'
++    <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" debug="true" includeantruntime='false'
+            classpath="../../target/javacc.jar">
+     </javac>
+     <java classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+--- a/test/javacodeLA/build.xml
++++ b/test/javacodeLA/build.xml
+@@ -38,7 +38,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+       <arg line="javacode.jj" />
+     </java>
+ 
+-    <javac srcdir="out-dir" destdir="out-dir" source="1.5" debug="true" includeantruntime='false'
++    <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+            classpath="../../target/javacc.jar">
+     </javac>
+ 
+--- a/test/lom/build.xml
++++ b/test/lom/build.xml
+@@ -38,7 +38,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+       <arg line="Parser.jj" />
+     </java>
+ 
+-    <javac srcdir="out-dir" destdir="out-dir" source="1.5" debug="true" includeantruntime='false'
++    <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+            classpath="../../target/javacc.jar">
+     </javac>
+ 
diff --git a/dev-java/javacc/javacc-4.1-r1.ebuild b/dev-java/javacc/javacc-4.1-r1.ebuild
new file mode 100644
index 000000000000..ba73aa439119
--- /dev/null
+++ b/dev-java/javacc/javacc-4.1-r1.ebuild
@@ -0,0 +1,72 @@
+# 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"
+MAVEN_ID="net.java.dev.javacc:javacc:${PV}"
+
+inherit java-pkg-2
+
+DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
+HOMEPAGE="https://javacc.github.io/javacc/"
+SRC_URI="https://github.com/javacc/javacc/archive/release_${PV//./}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/javacc-release_${PV//./}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND=">=dev-java/ant-1.10.14:0"
+
+DEPEND="
+	dev-java/junit:0
+	>=virtual/jdk-1.8:*
+	test? (	>=dev-java/ant-1.10.14:0[junit] )
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1-javadoc.patch"
+	"${FILESDIR}/javacc-4.1-source8.patch"
+)
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	java-pkg_clean ! -path "./bootstrap/*"
+	java-pkg_jar-from --build-only --into lib/junit3.8.1 junit
+}
+
+src_compile() {
+	eant
+	use doc && eant javadoc
+}
+
+src_test() {
+	eant test
+}
+
+src_install() {
+	java-pkg_dojar bin/lib/"${PN}".jar
+
+	if use doc; then
+		java-pkg_dohtml -r www/*
+		java-pkg_dojavadoc doc/api
+	fi
+
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/*
+
+	echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die
+	doenvd "${T}"/22javacc-${SLOT}
+
+	echo "export VERSION=${PV}" > "${T}"/pre || die
+
+	local launcher
+	for launcher in javacc jjdoc jjtree; do
+		java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
+	done
+
+	einstalldocs
+}
diff --git a/dev-java/javacc/javacc-7.0.13-r1.ebuild b/dev-java/javacc/javacc-7.0.13-r1.ebuild
new file mode 100644
index 000000000000..83edc96db3e2
--- /dev/null
+++ b/dev-java/javacc/javacc-7.0.13-r1.ebuild
@@ -0,0 +1,69 @@
+# 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"
+MAVEN_ID="net.java.dev.javacc:javacc:${PV}"
+
+inherit java-pkg-2
+
+DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
+HOMEPAGE="https://javacc.github.io/javacc/"
+SRC_URI="https://github.com/javacc/javacc/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="BSD-2"
+SLOT="7.0.13"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND=">=dev-java/ant-1.10.14:0[junit]"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=(
+	README.md
+	docs/faq.md
+	docs/release-notes.md
+)
+
+PATCHES=(
+	"${FILESDIR}/javacc-7.0.13-javadoc.patch"
+	"${FILESDIR}/javacc-7.0.13-source8.patch"
+)
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	java-pkg_clean ! -path "./bootstrap/*"
+}
+
+src_compile() {
+	eant -Dant.build.javac.source="8" -Dant.build.javac.target="8"
+	use doc && eant javadoc -Dant.build.javac.source="8" -Dant.build.javac.target="8"
+}
+
+src_test() {
+	eant test -Dant.build.javac.source="8" -Dant.build.javac.target="8"
+}
+
+src_install() {
+	java-pkg_dojar "target/${PN}.jar"
+
+	use doc && java-pkg_dojavadoc target/javadoc
+
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/*
+
+	echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die
+	doenvd "${T}"/22javacc-${SLOT}
+
+	echo "export VERSION=${PV}" > "${T}"/pre || die
+
+	local launcher
+	for launcher in javacc jjdoc jjtree; do
+		java-pkg_dolauncher ${launcher}-${SLOT} -pre "${T}"/pre --main ${launcher}
+	done
+
+	einstalldocs
+}
diff --git a/dev-java/javacc/javacc-7.0.4-r1.ebuild b/dev-java/javacc/javacc-7.0.4-r1.ebuild
new file mode 100644
index 000000000000..41b912eee734
--- /dev/null
+++ b/dev-java/javacc/javacc-7.0.4-r1.ebuild
@@ -0,0 +1,77 @@
+# 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"
+MAVEN_ID="net.java.dev.javacc:javacc:${PV}"
+
+inherit java-pkg-2
+
+DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
+HOMEPAGE="https://javacc.github.io/javacc/"
+SRC_URI="https://github.com/javacc/javacc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="7.0.4"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND=">=dev-java/ant-1.10.14-r3:0"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (	>=dev-java/ant-1.10.14:0[junit] )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=(
+	README
+	javacc-releases.notes
+	jjdoc-releases.notes
+	jjtree-releases.notes
+	release.notes
+)
+
+PATCHES=(
+	"${FILESDIR}/javacc-7.0.4-javadoc.patch"
+	"${FILESDIR}/javacc-7.0.4-source8.patch"
+)
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	java-pkg_clean ! -path "./bootstrap/*"
+}
+
+src_compile() {
+	eant -Dant.build.javac.source="8" -Dant.build.javac.target="8"
+	use doc && eant javadoc -Dant.build.javac.source="8" -Dant.build.javac.target="8"
+}
+
+src_test() {
+	eant test -Dant.build.javac.source="8" -Dant.build.javac.target="8"
+}
+
+src_install() {
+	java-pkg_dojar "target/${PN}.jar"
+
+	if use doc; then
+		java-pkg_dohtml -r www/*
+		java-pkg_dojavadoc target/javadoc
+	fi
+
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/*
+
+	echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die
+	doenvd "${T}"/22javacc-${SLOT}
+
+	echo "export VERSION=${PV}" > "${T}"/pre || die
+
+	local launcher
+	for launcher in javacc jjdoc jjtree; do
+		java-pkg_dolauncher ${launcher}-${SLOT} -pre "${T}"/pre --main ${launcher}
+	done
+
+	einstalldocs
+}
diff --git a/dev-java/jclasslib/Manifest b/dev-java/jclasslib/Manifest
index 5f8bbd8964a4..27aa19543f26 100644
--- a/dev-java/jclasslib/Manifest
+++ b/dev-java/jclasslib/Manifest
@@ -1,3 +1,6 @@
+DIST annotations-24.1.0.jar 30570 BLAKE2B 55120bf8969384048e0fd438fc96dc6769d6974b96e0e492636351c15466401da623341fe526685e51cd63378fa54c6485fa5dca83b2fc853b85ed4a75dc5d7d SHA512 663395a885561cc97eed411c67b496c06ec9a54906185a871de8743bf53e92152f4bc7c2a0118b7f3cfe85cc0a6c408ac6d589839b8d25c851637f85880331f2
 DIST jclasslib-3.1.tar.gz 4630493 BLAKE2B 2dbede05833a6f7ff0f32194ea91aeb071615ee8562541d1b5abc2fc61c3f393bd93f5e444110a6a72df161d488cf21551af8208b1f391951b5ae7002ceb6ef3 SHA512 5c44043eb30ab32110097ef6b52f459bf4d512db71efc79aae99fdb6b9db740a7be1e6a59f6e3a233a3b303933ed90fe482c6b9c81d76de93af6c9724aad41dc
+DIST jclasslib-4.3.1.tar.gz 1396903 BLAKE2B 2f070186f75e40be7cb7122e34d3a00688691cb9da49b6c161beaff7da3170b8ddf3e805467b7ecfbd820ca4bd0b335dee765d7318d0f487f2242e5f8bf4ae76 SHA512 25e35b39a39eb09fe7730d70abb4f6f500522f755801f80ece9357a1a90429254eb3bf57ea7a6cd638fcac77b0d04a62e0df9336c8184738acc74901ed4516e9
 EBUILD jclasslib-3.1-r1.ebuild 789 BLAKE2B 1a71e7babeebbb55abe6652fa120eed10e97ec49c1a4bebed026b98887781c6a89e43ae1feb056e7ad82ff33a82e80398b8a7f78ad80c721392f3a469dcb2bdc SHA512 ad7b08f1a8f8d77593e775e2066eacb64e0b9bcfe885116121a432f8f0e7bec2a63bc59ba66cdccb7cd13a409b72213ecde77c96972d18de4ea3f6974e0d0db8
+EBUILD jclasslib-4.3.1.ebuild 1094 BLAKE2B 80e0d7690e0862e05fa237e52d062a0597aeade0a2523496d3533de2ff989308469ba88d25386e99628aeee20fcce3a6c4268ab96beb7488e4ffc5a8c2271088 SHA512 1811defae03eaa1761693341100f708103d6807e7c9154b341ba9ff1835d25c2ee12e8348e3918572d1dab40bafa067b849bf63ddb162b71fa1b4292722e5e53
 MISC metadata.xml 375 BLAKE2B a604e3c57ee7ec7fc9d48a15cbfeeec58ce11483275d250f5fbeb69d0343f41de2617770a2445c575ce0d66ff4619e4bd2e1a7911d117282e66ee5ea7bc5d9a4 SHA512 c3b644a00bf9a0c92cfdc04c4d03f3974dc151538f67925ab967b8e2e5ce8e3865129f01843cd2c55d23a85365e31d2bb526f6c4c2e4edca13381dabea29c786
diff --git a/dev-java/jclasslib/jclasslib-4.3.1.ebuild b/dev-java/jclasslib/jclasslib-4.3.1.ebuild
new file mode 100644
index 000000000000..79ad0e367e27
--- /dev/null
+++ b/dev-java/jclasslib/jclasslib-4.3.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 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-pkg-simple
+
+DESCRIPTION="Java bytecode viewer"
+HOMEPAGE="https://github.com/ingokegel/jclasslib"
+JAV="24.1.0"
+SRC_URI="https://github.com/ingokegel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://repo1.maven.org/maven2/org/jetbrains/annotations/${JAV}/annotations-${JAV}.jar"
+S="${WORKDIR}/${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_GENTOO_CLASSPATH_EXTRA="lib-compile/i4jruntime.jar"
+JAVA_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/annotations-${JAV}.jar"
+JAVA_MAIN_CLASS="org.gjt.jclasslib.browser.BrowserApplication"
+JAVA_RESOURCE_DIRS=( modules/browser/src/main/resources )
+JAVA_SRC_DIR=( modules/{data,browser}/src/main/java )
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dojar lib-compile/i4jruntime.jar
+}
+
+pkg_postinst() {
+	elog "jclasslib uses Firefox by default."
+	elog "Set the BROWSER environment at your discretion."
+}
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index 85b679a1e05e..846b3b78e4a2 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,9 +1,6 @@
-DIST json-20231013.tar.gz 240211 BLAKE2B c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8 SHA512 4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183
 DIST json-20240205.tar.gz 245788 BLAKE2B 2c4fa44aa16a53cce153879af6a31364e21e9cc140bc7472535d2a8d2d0fc346502fd4a6e5022d326c80fe23557ce4ce408faf142bcdeec0c9b22aca13b044df SHA512 55e79510819b8e318e15b04cab317fdfd9785ac6b8fe60ef740b2f1eb7298548622556b968def89f4f2eb7761765149f192747b0966698b431cfeb9f2ea72284
 DIST json-20240303.tar.gz 245665 BLAKE2B 3462398895ab6da9610dac8851f2aa4528359e255015fd59a160fe99443819fa5bb57eb30ce177238d06abe95aaae9847cc85e4eee59c90edf7732bd823d9b89 SHA512 22465216eca7e4721aacca7b519d0bf1b0fe20b2de68ef0b6c62feae811e11203bfc733d8e9c97e2aa5b6ed30c74eefc601025b31807e51d496666412516afc9
-DIST json-path-2.1.0.jar 189658 BLAKE2B 2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85 SHA512 c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6
 DIST json-path-2.9.0.jar 276633 BLAKE2B bb83d6c6d972ea05dce3ef9878c0db0b93d6168cb796b63365a4615434c24edaad86bf021d6bf8736d67504ed8803c423efe01a323e094a59854cd9e73eb6862 SHA512 9a9dbb2cd36662c8049419ed891290602baeca2549eb7df62122cb20c91e66bc8c2c0e5e13199c4a70bf0b6e62ea4c2601f84e4c79d2af25ff1704481c86740a
-EBUILD json-20231013-r1.ebuild 1494 BLAKE2B 3d43885a8994103e747a25ceb1506b443069e88ebd1bcc14f62d9f67bb6905a09e98c7cea205294f89755f50c292ab558e1dbf4ebb4d01d04a4783a53b5c5901 SHA512 8e790530ae9d77b53b45ee67c68bec7c1f57c448683203d48a91ff688addf7b059e6c69a19d481b1384c4ee92388dac6e4520d5f35b4180c50f79feb67c1fb13
-EBUILD json-20240205-r1.ebuild 1483 BLAKE2B b4c279e5baa9e93de70570cc394d24340bfefd07bdbef1b639557da6f501ed536d8ba6b6229b36f6b279542b30f40367ca563a0110994bf8946353348d6cc2da SHA512 2eb3ca377472c51c337885c41c478cbdce1963d68dd93140147711011ede9563650db58422a21aaf04027dad031d33f4a6b863b487f4fb94b575b24a9d7cde2d
-EBUILD json-20240303.ebuild 1798 BLAKE2B 845d148da3c08e05aa42dabae863c96d43f2086e0b237d9a4a20714738438351e81e418b88e3b9a0fa9bd0c4d199c6c1749a35d0ccb339d01c4785d10c7a6ee3 SHA512 f693bf2b5e425947e9ff628ccc5188811fc1e876490e18403cc0c6a4e4865ed3d065d152559e13872e2dd6ed07ff207f52320107b45c116cafcf88aec7759827
+EBUILD json-20240205-r1.ebuild 1478 BLAKE2B 69e06bfe1533edd1d1d140482d4a82611cfc6b400f04e30908a0808ca56194818f015ac14bbfec6b0d4f547c61e3b190ebad965ccc457f18031d29d65a6bc0e4 SHA512 fd0e386ec86aaefe60b2989de9240a15c747290794d30cac3392c591f7cab1bda9ff9d3005133619754cf07034db8db9cb5e0dcc2c36d06639dd2caa086e5aae
+EBUILD json-20240303.ebuild 1793 BLAKE2B 29de4eb3152607aa2608f345fcde84031efc8ce46fd86377e76891aab907a7e962ccd9e71774c1e70d6c6a95e7a55fe14368d7bab3ab21cb4d18410b856fd1f7 SHA512 3b19da2cf319d2f47001ea8c492320fd591a10a85517bb9cc75d5a17edff6658e4ac8d0a2bba4fe99c4d89e1de3cbf2a2a4e3b898be86c302626c0792ca383e8
 MISC metadata.xml 1083 BLAKE2B 9dfa3392b02d2bb6ae3198a884c154a52926de81aead27309fd0bbe25011a1b0ea89c0c7fa3694c56fee4cb339c2fd161384c9d7c780369cc3da4464d3abd40a SHA512 3d0f231f0e67e178f838474e6aa07e88dffc26e26261a49515124c3e68120d323cc1a790be017b082af8f27dd051121750c1e1829e7a2fc2714821caf9a8802b
diff --git a/dev-java/json/json-20231013-r1.ebuild b/dev-java/json/json-20231013-r1.ebuild
deleted file mode 100644
index 33b11fb0702e..000000000000
--- a/dev-java/json/json-20231013-r1.ebuild
+++ /dev/null
@@ -1,65 +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.json:json:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A reference implementation of a JSON package in Java"
-HOMEPAGE="https://github.com/stleary/JSON-java"
-SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz
-	test? (
-		https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/2.1.0/json-path-2.1.0.jar
-	)"
-S="${WORKDIR}/JSON-java-${PV}"
-
-LICENSE="JSON"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/asm:9
-		dev-java/json-smart:2
-		dev-java/mockito:4
-		dev-java/slf4j-api:0
-	)
-"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( {CONTRIBUTING,README,SECURITY}.md )
-
-JAVA_AUTOMATIC_MODULE_NAME="org.json"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="
-	asm-9
-	json-smart-2
-	junit-4
-	mockito-4
-	slf4j-api
-"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-}
-
-src_test() {
-	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-2.1.0.jar" # Test compile dependency
-
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -ge 17; then
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
-	fi
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/json/json-20240205-r1.ebuild b/dev-java/json/json-20240205-r1.ebuild
index 49f6e727afd8..8dcbc599e326 100644
--- a/dev-java/json/json-20240205-r1.ebuild
+++ b/dev-java/json/json-20240205-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/JSON-java-${PV}"
 
 LICENSE="JSON"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/json/json-20240303.ebuild b/dev-java/json/json-20240303.ebuild
index 5e807e77efd0..c53dca8a5657 100644
--- a/dev-java/json/json-20240303.ebuild
+++ b/dev-java/json/json-20240303.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/JSON-java-${PV}"
 
 LICENSE="JSON"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index c211bcd29c23..2f697a5f84ba 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,38 +1,60 @@
 AUX openjdk-bin-8.env.sh 607 BLAKE2B 447575fc213003930ba6d6bbbd7cda0d53f53b16e3679fcb13d219cccf3525c7dfda755c79826b4d3c7b238502ed5ecaf4c8514971e576c756f4fc168fd9a0d2 SHA512 4cfbe2dddc89408824621bbd2036afa2966d550e6e189a8835f78b46fe91305221d8fa46219e9c53c83c9f73d83cdb1208bc78a46b9115041511b97b70abbf1b
 AUX openjdk-bin.env.sh 398 BLAKE2B b83d85e2a4e0dbeb24b8c21fb442a8964e55eaf01125cd52f5c930cd67b95b7d1744362cbefe436e4f4115f0b7600860200d8f134b241b6b60ffae6b807b476b SHA512 2c2f753a05154d17a7c324e61d3e4513119050f44d2a8d0aea5c6e2542e9989a955689a97d47fc1d5c710a056f2ccc7b239e3eed3b2d516df6b2aa7450c44613
-DIST OpenJDK-jdk_aarch64_linux_hotspot_24_6-ea.tar.gz 212520258 BLAKE2B 38e66bdbadaa812b15c60fd4d52c19855207e832a50b34a6a78619d423a90a6211aa8315f7ebb6ebb45f85a258db0d80925b223b7602f1c24d832a8568704619 SHA512 509c272320a020cd077a6ff3c0d600f70f6ebd1ad69b00b0e96e58fc7d727ef26f1ee94059f7b3594394f2c884870a6bcfca237212301655bfe16c1acaecd09c
-DIST OpenJDK-jdk_ppc64le_linux_hotspot_24_6-ea.tar.gz 214153451 BLAKE2B aef40a4af20212f156edf4d78033096ecfebe9450cb3b8b19f028625d98cc9afaa22d5c6ebb3c51f58defad5dd26d754013e241a93c16e9d519fd6a9d35f8da6 SHA512 007c32a521b8a3bece215501bc6a686606fbbf4bf143e7c05fe14b36a467acc320b6432bc56082a16be26f68983ab2542a8c3a4f6b69d0759e68b9f20fc8ed65
-DIST OpenJDK-jdk_riscv64_linux_hotspot_24_6-ea.tar.gz 210480800 BLAKE2B 473a1f7288fdeb3af08147e92288cf35e191e3a3d3de817af65bc3407496bcda822afe5264f644286a0aae6a8829275bc2f82b5e53c0f13ffafb962c542cfff0 SHA512 f5e625ed8466660857b5376ff1d8583a15377eaece9715fd2a3f0f9a812f15af718fb19ce7d430ef231bfafaca097218627cdea213fdce5efacb3de8e72c8fd8
-DIST OpenJDK-jdk_x64_alpine-linux_hotspot_24_6-ea.tar.gz 214819598 BLAKE2B 334e42c0ae0cc527dcb35e7272edb18d7e1958e22f57e9a6eba9f1a0ba0322157bf1fa6ee59a975854671260440e65f05ca6d35d7017a7afe1bb91176b7c2e0e SHA512 8b9c4e9018e4482bf8394cdf185223fc72e451eaea5fcb651dcf568a9bbe6cb6d5641b8c14416fd06660b2d306eaec1dea050ffdc0f47891694b1135019fd6db
-DIST OpenJDK-jdk_x64_linux_hotspot_24_6-ea.tar.gz 214637760 BLAKE2B 8f3a7895891297005661c6a5fac93b011a41f96620ab59b5b96098fb12daf7a4f0557e218e049fe9214f8dcfc387b1045b36edb09d5f792357491bbba0ca6a3b SHA512 c1d144cd9b2673c4986b80cb139ff241052800c29f814b6b4f25d17b33d54bde41a1ec0c39f6ae5f68d2745dfb28edb3d5f3c8396bef767f216ed908eec56f9c
+DIST OpenJDK-jdk_aarch64_linux_hotspot_24_8-ea.tar.gz 212736873 BLAKE2B 19b1e544e8bb70a2377f9aeb85241ed807167795742e96829dccf8fa5e6ea8d8512fd85f781d40e1428f415775b6ab77c4bdbec4e3ad66b05010665e535d2a8e SHA512 5c7daf6d12bb4acc031ce17dc429f4e3bd2e7bb74ca9b8f3ef90598ef69fd017bd3c73589d64d23919344328869465c3551832d2095311f3b6208c2e62fcc4b1
+DIST OpenJDK-jdk_ppc64le_linux_hotspot_24_8-ea.tar.gz 214372109 BLAKE2B 891f3b1a16fa9ea1ec247a9c68d84fabbe67c9052584580626f67d2cd87504f7eaaf008bfbf59b6250c63b348d6b1cb734b75d7aa0ad334f9738b8f624c0d874 SHA512 d9756fcd2e02f4317c6be0c97e163c6d836c07dcf83f272ca97920433f596bbda01beac6c302a425bed3ca0fb628bc919a2e33ebe754b8bd9672787f1be9d255
+DIST OpenJDK-jdk_riscv64_linux_hotspot_24_8-ea.tar.gz 210709698 BLAKE2B a612df8e357a930ae1bc6f54a5f0f0c55f8fec279ce7ea7f52ff45a097badd1a848dbdad5778adf2a13e622c7ff63b6c10b6feb7e3f8de75016eb9bf404f03d4 SHA512 1c4d93def2a92de4e1a1a8f6ab624de542c4fc177b9d66815d50b1cac823ca6295a4a702402ae09b8b9662ea40c56da836d6a962af8a2fbd7bf6576a3036187e
+DIST OpenJDK-jdk_x64_alpine-linux_hotspot_24_8-ea.tar.gz 215051746 BLAKE2B b58ad14f0faa0940621245eeca212ed6112352c9e52833fc5dd2aa740956bce85d69f8d30aa923bc0fe0a0d81ed8dc4d4c9d8cfea5132de03d34d6c40bb7f3c8 SHA512 610a2bc5df2670a214ce39ec426428c3dfca47e5c4c04ed3bfe92fe48ec944324208f4edbb242842508a1964b97bf1085aaadec14d5fe8c4cf7bde57e20d505b
+DIST OpenJDK-jdk_x64_linux_hotspot_24_8-ea.tar.gz 214855714 BLAKE2B 4230cd14375499463872f9c9e879b27ffcff602ca2401634fa0ae1dbfbc9a7aabff67f6f99b7a2e5ce409eabef962775706785268b8bdce8cd3f40dc76042b83 SHA512 55ff9c22d61815e7b4cdf8bdadc75d6ab16c0a6d6a559a71bb11ae9ac3236e4305b9928981d489ca71078e64bb647f8731534d093e1c81249e32d7c168cc9df3
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.23_9.tar.gz 192013902 BLAKE2B 6a4b47b9a3397d3436bd55a16a459a3cab3f8a2a7dc3285b3bde8db13f0e66d5e094803df0c5901a17272e6378161caada6f27845184e2efd17a6761661299c8 SHA512 90e53418efc7c34d7cf0691d566f07a84f02bd2d34cdee0c9c343e27c8d9bfd4d1bf86f104ae33a47274932ab8ba6ec8071a35e7d613129d03e439ae3382452c
+DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.24_8.tar.gz 192087968 BLAKE2B 12659ef10cf2728ca5eba2b4eed5f592a5bbff5065f33309498e7a465661957e0e8191bb691a89934a8221e26ae7265f0aca059ba59731b5d9a80e7f6cc55206 SHA512 84dbb810134199cb2f0278ccbcfca2d1abe32bf65bbb399e99c2ea9a027e21c2ace5685adae98930be4a185970640626b5bbbf822d499f815d803fa4485134f7
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.23_9.tar.gz 182785851 BLAKE2B 453ca29859e749a9050f8b6627696ab6d38ee5e83ab69b1d159eb3b7c0bae68104cf68ca21b87123b4fc61059e528ba4ed0ee29fa4759f33a3cf46182f52a48a SHA512 af8ed3659f8ff07f5e5c135d96a7368d326f5b19e3d73077a3fa701716f6e415d4a784ff6c5f81267eb1b3d2e171a688126253f1c3197fc80ea260826ebad5a0
+DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.24_8.tar.gz 182800065 BLAKE2B 50158e8e84637ab841226da590f53ef3d0f18aa2dc4ce5c2fabc2260d864a1de65a3021e380fa9a1af1aec92177c2618790ced8c7f12f449fd7ab4851bf37ac0 SHA512 893ab22f39f102724e7b77b7a06e09b33ee0551b166c0154ce19d4e6abd7e346d0a8314fe2e675e102febf93e001679a1c7c665f6b131c04a453cfbfbabb5003
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.23_9.tar.gz 177453532 BLAKE2B aa98f381f2ac4f208ced4dac4f4b01d20cfd27c8ccc75a0c41db6a57b67ca11d87b8133cb0af96283f646e5e90612f9ad69db5129e6f50518ad2eb0a53c86db1 SHA512 c590fa032593db48531d49977c95d1f884fe751472d927d0d0bc15f36ec35f71ea53c9acafa3dc00c4b25e88d4c18ab590b42f8057a277e16947c3ce31362381
+DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.24_8.tar.gz 177494491 BLAKE2B acc6c4893a57250284b7be0fe98d6ea3b44f42227174050ac3d035ff68e482a61aeb32b38f1404f597c47dc3090fa49aa27401c6903367cc938b1f4041cb714b SHA512 88d8e3eee4af1f3578ee001516fd9a2a71af6317af404e39b64365ac780f89455dbbac1eccf50aa6d09cb879a79da88e720c344cc527d7313d6abfb8b148c3ae
 DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.23_9.tar.gz 193956832 BLAKE2B bc334b59bbb021812ee7064b1915b6106923d41a74a3acf5b5d8fbcf50f6e0d467a96da22f996252422b08f5c7864418c552a102a18f3bd9cb14e5b4904656e5 SHA512 f0992a7fdb1acadf8cb19a94822e7a75f7453033cc0a3432f9efface7827b4a7ebb1ff67a81774da83844afdb046461415f50ddf11192863e88ab06889c86836
+DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.24_8.tar.gz 193983794 BLAKE2B 1e2c87450db7dc12c634ae5d12f3a5c0ca9406d85c01e4b5953921b54a144d868b4f5b8fda17865ee42c7ad082177770286367b8ca38e7faaf30a80f438caab1 SHA512 1e55b979254f2ca7c1b53496471a089538fc6c31bb9a40dc1cab5e09f42b0ae23b383f768c2614421868d16d8eb2f3fcb5768fa24a944a8296439fbc31d7f841
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.23_9.tar.gz 195220527 BLAKE2B b2f024fdd2d72e78c86f562fbd37684c9d9639472d66e15b4b882c35241c500c09467e97440249bf69f4e63ef99d3f057b0e79852b67d55c5518d041cba2d657 SHA512 ccccb5003b78cff0cbf471d9b885ebd5805b5a21dd71afdb03a0d447cd6715e781dbf01f11970f7632b8181147fe0090f7fe8fc46c8732d2b17f0978f01934a4
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.24_8.tar.gz 195251808 BLAKE2B 920459ebe96477e79fa3e933958c3fdfac476231dbcd7473ef9fdcab0691e807e67bd94b92fe43dfcd66c401b62da0a450892d5561530c17c5f159d44f537f3f SHA512 91e20884152a5d670c05e83e0b2b875b324af2683bbfb063015cfef4956e1ef4f3051955222f854753ea4144d99b30f3f9bd1b5220204f9a9bdc51ef461a1590
 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.23_9.tar.gz 187689918 BLAKE2B c1ccebd2bfeccdf64f1ab0c781e4ba5f2701f6c70de81486c6b4d91bb1d1df367f58fa66bf8f073ed47413649905a306ad3f75c6696e1d0510ce02fe3453d255 SHA512 93974938c10d58b182a7bda49e21e26806a01a03fe72915ca559df3e02c694b3b88ed11c49987bc2ca7c1acabda0892d8c22a4ab19ed8b796dd02f29c44dbff0
+DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.24_8.tar.gz 187710109 BLAKE2B 7565adb6e64d2c53ffed1d64b8e23ac02b82f4feeb9315327c9825d1b134cd476d3331f64def991b23b5b568379c9e31dfdfd97fe87b6caad7eea039a47b652a SHA512 91d8da2812f8f709916de9f2fd90afbe2caec38c1ca0da2d3ed50d79663aa274126c010c1c19f841845b493c7efb57307b74b28e2f89789ba52c0dd80dd54e04
 DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.11_9.tar.gz 191052267 BLAKE2B 837cd3f3e9cdff7b66d1a8e10e2e8ebb9db1168fad2982fd523eb8067ca017efdc05e577b93af74623558d04a8458dc1d790c9626e7ed2d6568bf7fc22a44925 SHA512 eeeacbd0f8daa1d62663f7ec95fb7dd3ff855a0187347e3c1ddb4a5d13e494c1a940b43b5fdf75480963d65dd4d94330570b751fa7cde540124ed2164c176870
+DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.12_7.tar.gz 191121494 BLAKE2B 92b72ef8fc0ecc6bd4fa785baf6b799db48de5e82e12a09ec630de854b19a0b17ad2408a7cf8d1cea9a663ddd062e88026bb91ca1d7cbaf51c261e189ece697e SHA512 662ffbeb67238612d56ad5e53abfc11738aef595f96bb8775819c7d78cbcc6888755baeafa9695c1673c1833ea328de67d6d0e4c6736c7e3006b0a886108de9d
 DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.11_9.tar.gz 178367345 BLAKE2B 7f1c8f77ab8ce9ce401947e51cc3051491df1579409f7ecb73107f091b58d6e7fce2004604951dfad019cd60e8da84fd4ee9f8987f92c9363889b310ee098e54 SHA512 0283452e56b3fbd85af33a7939ec8ae69624241ef07224152de55c5aafb1a5cb8423b8a211b5fadf8f5ea50aa0e5ed8211d02abf1398473ddf3ef13f2ba3f1c4
+DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.12_7.tar.gz 178427485 BLAKE2B a2ceda0b6b2abd5643517f53bf8e89c7ccbaf1c29d784e8dc4de568a534fff8564561fc48ca64183205754ae453b5fe2027c7881c8904a126f420cb76745bec2 SHA512 2ddb35fa6214f29c254e0f27f401bd7da1f85ff7bb171b12fa477321883b0c31ce6a6f0713c76df2ced18884a0b8261b8772d9c7f6382cb08625aea36e8a3824
 DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.11_9.tar.gz 189349607 BLAKE2B 2508ca965c27b1cf6457a595418ee9cd0450f9633a2fb80605a58a4bb7546cebb95b04c0d66bb14107c75fdff9fb678d78cdb879316929a3da6863579d4df9dd SHA512 bb76dcc65f65bbd3a256a54cea00eddb25312f1a1e2ed30fd3088bd44e9f8db7bb2ff3a6776b5ff6733ea7afc02928ef9e2bae296325fb1b8eb9b66b4e6f4a87
+DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.12_7.tar.gz 189408363 BLAKE2B c6569c14d010262b29c1d4b879f9384028c6a6be71fb29fb2cff1407fdd3bace0f22e20af0cec7fbf1277ad4d75000d32a0357776a32ed4166de64630847c59c SHA512 85368a3c6f60847dc1c55f29c8d465e87ec64a690198f68ae9022cf897671fbb2c5f0b509adf90d541ac7ce48f2f7d8159070b64bc5bc7b652e52c95cf20f10a
 DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.11_9.tar.gz 191737628 BLAKE2B d78a0a64bf936bf85a4f9fe1c9299d1db4773e10cd308afa5167d61ce35ea7415d2a94a1dc160345fa5aa3d3a7b730235801789db147d62dae621572ca060fe7 SHA512 9ae308f12b5c74b48aed4ef2312d7e0b23e9fa73b7d78eb3576037b0fcbcfc3a5381ebc448fb41279e770d5994c46bdda6822b97181fa3d3365da63c8b0ecadf
+DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.12_7.tar.gz 191814558 BLAKE2B 326e3bea419e404be9b8c33640355d7f94e07068779edcebdc59370410e1944d0e4681fc3966b4bc4871989900c296149d82b331061424223f9fbf0c08616f75 SHA512 bcd5a53f82a6dc84aa069651228cf7be3de69195f58954230b34e575be62fe3ed403d57a7870b88ae930fadeda6e29d6af27e3ec7e5bf862e434df0c627985cf
 DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.11_9.tar.gz 191615499 BLAKE2B 4b342ebf3da0cf49d448b95dec6b04819d2ab2e31327b793b9d9aef86b4e78ce33a54995a5d0608d14214f3d0fde73d0ad334c9b0e3c5d2cbb6d40c4bb22637f SHA512 7773843e3b2a02ccb70c3ea49639c723f5da715dcb3e27ed85dbd2182648621a5822c49728436377c8e8af4d20231ba5b861e45be17efe44a5a81a92c225a851
+DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.12_7.tar.gz 191681951 BLAKE2B 40548a12e485b36700726d7fe0826d716feca2d7db9bed403a6b61a13ee929a4ded93d85acdc2cc2170b8d01daf616a9ac7faa7e673ca37484b1f408b201af48 SHA512 28720148b92c7dd0649921a46dcb81aa05203e309ea851bcd41990fe59bc3566cbedb07ef08d7aff5f7399f063a05d56048798b99bb60a6a7b69533a44ca152f
 DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz 192396023 BLAKE2B 1e5f12041d9c17195f242d7d36edf6995b1f71cb52ca211773faaa0cca6af983ec8c7885d58d4b87b38a0a26f71d088c104cdbcb84fdfffd97643f2a09a2a4ed SHA512 f11e61d91ad27ca31196ded87d06b5e379e4e652c09ffdd5c3d73cdc9fe6c46cd7785838c70514897645213ff6c6948227be27d7fd773949f1055338966ba275
+DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz 192452655 BLAKE2B 1b38d3aa527b585f931235b737e0628fc74e0f1b996dc64b9c3cb84598c66f28d908ca550786f691912ecd03473d43bc87309a479442d4c4de85a67298a69fcd SHA512 59db63a7b25f851153bdf3aef81acae6b7de88eff14d481f14c346d894bd7e3899c40224e51049047687330e1c43a8c23c45bd375966ad9992d4ab538a08aeb1
 DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.11_9.tar.gz 180563846 BLAKE2B f9bf368e39d95cce40413caeb98192f88f90cad7dcb486ef5e1d7369cfc346603d37de88c049930b958043621e44c103e020354eb80faff0cf83fac8dc7497a7 SHA512 999ad1fb7c822e9000e734c86e70e73aa572ec1a75d14219b391e9d358d1dba1fd0d9d568df4c28d8ca88fd4341e24feee2f840b6c35c4c530d2cd174dd797b1
-DIST OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.3_9.tar.gz 205753676 BLAKE2B 80d419cb5b75b7117c534e09c174e5b281d6786445b3569a8e566416b22d3efbb15196fb4cc979b32c597663afcb8df3132a363e9fad22ecb053b98d3406c9df SHA512 0a87d9cf60a8843408e55cbdac66e44f988208c9b2117a8ac61d7bc5fc8df9fbdb1a5d75f7d5e100dcad5380f890a067f4ae198880938064534bed6b5a5b313d
-DIST OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.3_9.tar.gz 205794447 BLAKE2B 4d6ac1fa90b81be10cd32be76665dc26bae59a5c288d1b1f87e396ea356bf46f73b58db06b5b09417714f4638550d7ade55792f276f39dabc100345efd18c28f SHA512 b9cea7a7f4405c66722b3562e0ded7362475146753b1fcc4ad0d068264e9f228b8547dae704c6ce2be9c4a879902c2fbd93524176ffa02ddcb3edc4d4f6759cb
-DIST OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.3_9.tar.gz 207595331 BLAKE2B 7358f61aaee85fc5ac584307f1d5372de17aa06676aa823de157236e4332184b9212e74cc4214845a9e834ebac88d41ba185d1823257254174a960db88cb0574 SHA512 dafe0f31867f2ef817f188fe1222adefae72fe4443ec95eba8f18d60c141bdca0f63c2591c834c470c7b15d011618c97c45bbc65e746cdc47ba9be9a2f2ce523
-DIST OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.3_9.tar.gz 203760093 BLAKE2B 6be42a229745d9f8616b2738a3301642b8358b542625af01aa943779a029e4ef16f70eec437a22e2215a720d99420a01d498093c54387374ab8169a517eff9d9 SHA512 d10f6dea263dcf32e4e356f941fd275a64a4ad331db638332788623240f0f30869932542857653a65fca0e18a49d154fe2dce5bcf645c878ce86efa02fe05471
-DIST OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.3_9.tar.gz 207940807 BLAKE2B 331e80062987c1932c24c8ecee8456240261ab43da04df2e5782f28c9683226e74116b2d8b5dac7047ce62e1ccaa5020fb9d94b98c515e9c94445ac8165f9692 SHA512 149dc0e7f058443787e99641b0c996ea7ac15d171abcf03778ca6a44769583cae5e507415b16fd8de5015d2acfef4705910cd43289cdfe624d07280e7b7ad961
-DIST OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz 207698369 BLAKE2B 27dbfba74a3dc46ff98c982208e10c1c40940cfb90db0d756e8038cbb1c5f45e30ac3ca07b408a3593c471d0f5ea75bb652902d49786490e9ad5ba290ca91162 SHA512 cd9e6054989a838004490f6162f6831397e5498033777d90da224f0aa4809e0f5c8a14459e6f30d441fa1238371d7db9718e2c606c38862b803dda824bbdba1f
+DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.12_7.tar.gz 180640890 BLAKE2B 23b97b0bae054210155663e5d92fe6868827d353aa9ee6a0fa46cc53d41e43ba5378ac7901dfa4a323a2aad541a45ecbb2dbf7e4ac367cf58908203c7b216c5b SHA512 06ee1f7d0d3b346cc5c72534f7d00f53d02260d8d41672a94228de805eb0c38b1afa8947504ebf740dea2646f45c5868983c82a6ddb800a577d305a56200d13a
+DIST OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.4_7.tar.gz 205835448 BLAKE2B 12aecce2bde9d78c721a378554de5132a5e4fcd3bf95edf7178b7ad837cf4873717a7c8fc9611a811840f32fb4b2a794c4ad80fe19ed42a55f94430240fc19f9 SHA512 d349ea6ca15f8be8818283ebb11c4eddef57a7d1cc98bcfbaf885366ea44ecf520d2deaef43c7d9443a00dc8eb8b3d0821c1dbf4eff886199ad9f484c3b2fc04
+DIST OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.4_7.tar.gz 205880079 BLAKE2B 995b78580e88b922852d3f3ef59e40d11e4c7666790a1590f3672f1fb22f8b58e3a2965507cdd85d75b3bbe03e4daa603519e5d00933b86abbeeddffd5c2475d SHA512 e5f263007f3aa10fb6f4c80ccec503ca08e62bf220d5c90a206edba99e8b9d2c4585dbef7f7a84c3abeeef80a964ac171f11eaa40e5eb9b06310974dd57c42cc
+DIST OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.4_7.tar.gz 207691025 BLAKE2B 5413063795dff4ba6a6c865eeed02c45c3abfe63ca08b91ded278e2da46db721aaa50a4b6cb658600454efb3eceb1178f2759277d2ae0ebc9e1a1f2476ce7059 SHA512 cdcc9546c99edd72c71c7003f04e08919748794ba2f3175254f2d02e9006a3e4eee79592c84f51b115e8dd56ee321b1c078e6173dc75790a6a3b5a1aa7900fe1
+DIST OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.4_7.tar.gz 203854772 BLAKE2B acecfba0619cd5856f2e2c835240729f5d70a1f4fc373c99e7dec2aadc701d5779c8b42b804337653d6e8b99089fcd1622f48232a9a36bd25b4e4b7016ce68e6 SHA512 92a12dad45b80ee25b555b26456a592db65e5cf2373984e7102ee0527a923cc1d015fba0a75177f3f0063c5d1843f4999fb6627b506cd506571b9625871dc892
+DIST OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.4_7.tar.gz 208015131 BLAKE2B b143b83ff40affffd0be90cc19fec59777a80f783c6a4d9d1161d5205dee9a50f88d89fc21e402a14a1849d2dfefb780935acb47b7366b8fb07a3cd10f9ca65b SHA512 9cf65b7ea2cc4e7a21c5832c3522211c53b55fb6f0d4ec4deecb94744dafbf1412c17508ed1c21cb06b03c5bcf8212a0e5d6f2804663833735a1ac2f77dae7a2
+DIST OpenJDK21U-jdk_x64_linux_hotspot_21.0.4_7.tar.gz 207789015 BLAKE2B da61c96f082f18bbb64e543b96972d0cf812cbd64ac970a45000506e41f9f54628453d4a24b4090271dc267e21bfe285a04173c106259e67dc72246c43edbe32 SHA512 7675079ac1ed0c0428f806908b21c58549df7fc18043d26c011e063b58772ddb1c1c9648a46ab7d5204d47c2af5d3f08eace30028113d64e09cadc69c4fd0def
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u412b08.tar.gz 102116126 BLAKE2B 19f8deee04fe5521323ead5193ff7b383979afa32c4375bdef7ce53b868dd7cb317bcd208b94d373c353f5480433cb3a28beeacbb7f42b501058acdfe6917079 SHA512 e2c5e17eda6a25b8f12c8fe5a50b5c58a9b52bf9cdac7213e2b0eb7ea0c99ba0d3c31ecbaea834443fac12adacfe506ecbe3a487abd16846c6619678ac24c4ee
+DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u422b05.tar.gz 102132553 BLAKE2B b59a2d99f9999f86eac2ab15617ee7c58d179a7db2e3606b3296b4bee8bbfaaee2f3cd1f441d90b7462ef9a502f4f351bdb4acc8e723d6b16f208827b813e8a7 SHA512 3856d2e711fd0f93f5efb73ffe5dc115d03dbd0cd015e903b7c2d02b6a3940b10793243edd6a372d7f84306f10c7a41cf13d7b787a33d525f1e86e9975453d06
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u412b08.tar.gz 98318417 BLAKE2B 11ec1cb2e793da8252511dee62ad193b67b3bc5c8aa91dbd6b1e8aa2d2f7e2e342528d145e0eb9e26b17b7e81c9ff17586f068b4d146f6789b157026aff67099 SHA512 84eab7b032fb55e02870013f9a87d0898ece12c52c560c0600d8d2ecb4901cc64e6e5cd44375ec6785a5c8f139263e8b6b32d348149e22200c962438fabea9fe
+DIST OpenJDK8U-jdk_arm_linux_hotspot_8u422b05.tar.gz 98342561 BLAKE2B e34d6c959a2100b7c1817ad0fa213331e1cca75229edccf68ed4fcbd3b9bdeb0852dfdf59dac3e9cdae0179af38edc64ff7329af9f44fadcfaa7cf301f8f4e13 SHA512 a667d531b3318e7f75d3d4d9a32248c5c9ae7c1d4bd9bfcbcb5f11418016c1faa179ed748c3eae09c8693885a9401a80de8f3530891883b9f6e9de0b50002ed5
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u412b08.tar.gz 100529230 BLAKE2B 1498ff1c4d89f65a41a565cf3d6949f715bc8783a33b70e6cf7b44e513ddf7ade1242e2a0a95b582813ab212fb2367a5f17f794f54b5e458f0e23dd22e74123d SHA512 cf80eb66063559d4fbe062d8a198490468e4936c9e0b27ffe04912b4468a2d1f4d12fffe5df5fede38b44870b65a7f0cd85545f7031957b12a7d1a368a7770c6
+DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u422b05.tar.gz 100533202 BLAKE2B b83b926e5bf0fe45bce9a79489422b96c6ab321227a56d8b3c683a26e5b71cbf9ec80a4dc2706aa4853095a4ee3174591cba8725b9e1b645f4c275137a97abee SHA512 e345de1325f9807d1cc3e4b043d650d655ad8a3672edec304023af54c7dd1d8fea0e671781ed46e6d7459909afedb2458c1b45966b55957389ec62449aec6469
 DIST OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u412b08.tar.gz 100923084 BLAKE2B 9c9b0d7f95983a44f040efa83c69100163b1450d04102000d4f75361e9164024697380c055fdb31bac2ef4dabc05df592bbf342e716d8f438954b89236ff0986 SHA512 07b721e57225165d3dbc51c1d8f79f269e75fa3fe946ab76e933d1d3645dd19b3e7e8ea924d4f510382b5bcebbf073e262010c0e4655e0282379cce9d411eeab
+DIST OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u422b05.tar.gz 100948020 BLAKE2B db92e2d9ef5bd15816d2fb3cd6a6dc0accd250fa16ec9b3eea9b23a72e73a32be43527d8f520f39aea1b7a84723e07d24e3de136b6888b869d8e75e446fc04cd SHA512 20b47a527c1b19d6f2779e619507a250316ee3d95d7ad7b5fa45c86e26e90515cace468a0ec6fd37be108f473f92d70eadd0a61ee901594ff0309272af4f61e5
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u412b08.tar.gz 103005511 BLAKE2B f3df80c160d723df67700363ed6f40f3308a7625635b5afcb1656c77c9f78cc2796c5878aac0bda6cbde8d6551371ed15223de6aa8e75c01ba3e4848285a88eb SHA512 6f7df3fbb34c5971b7bbc4bafbe0179983abfa0aee212cc810e2656697cf0a7f4736cbbf6755cc88cc885d7beb5c15482a21d5287c52bae560988cf80908ca05
+DIST OpenJDK8U-jdk_x64_linux_hotspot_8u422b05.tar.gz 103022651 BLAKE2B e144aee88326b4ed539324d8dfa35db461a3595c23a3bfdf0af557b4402ac4dd65d9000fa875b6570d7475ca7fef90d2e7021938f04918d40a04c04029e2e1bf SHA512 d44bdb72e616771d6b465abb66228f08968afdc0e8e40f73e892ea5c5c441f554d793f1e1643f1f682e0c0f4e25d24ee3f9ddec8c6191c43e77a3820c9f3d2a1
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u412b08.tar.gz 109506799 BLAKE2B bdf043df0df0f0fe100e80a464a0fe8c60e7c80ab7ca5e7481c8f7458b793a24b0f2d93ec482b5f0de7a65b3d068322b7b3a9e9c9ec5c5b61342cb85232db847 SHA512 4d774c3f0794d7403dfbf953e7e9d635b71c463bb193ffb4cc98e98455ff7a448f0bbf290a28c9290e3d9affc7390eeb4be88ad48cbfb60d9f605e57158f5058
+DIST OpenJDK8U-jdk_x64_mac_hotspot_8u422b05.tar.gz 109522911 BLAKE2B 37472be9a5f061ade8e27318ef2a7782f0fd4aa38362c2d19eae47cf18ac0d4085a84aab4630b97e0162d6b8288e3bcce2b1fb1a8f1bc25e8a129137f5407657 SHA512 e6718c635d42d2662a404ac71f5c4cae45714f7e1e7f92af28191dfb5f01ac3c4c9c5335073386a7cf7a0c628d9dd0ae211fc4e9c0bc953e3827362f1fc39344
 EBUILD openjdk-bin-11.0.23_p9.ebuild 3174 BLAKE2B c20c05800f5be936ece355f8f4434e8ef6556f680cd7a784b8e40d601a883ae679e3439c33e8ef1db722db3153833ba0f38858483eb226c3236ea3d2c137e78f SHA512 f8a17638440efd97e0588cbd0079ff6b3cf2f9eac9be21f15c2fb17ff2ba84a74c9321b47c89d2a278aa26d23a7d2329d398ca639566edc36f0265fcc64835d8
+EBUILD openjdk-bin-11.0.24_p8.ebuild 3186 BLAKE2B f34208ad8f2174355865f45f0e9156de50ee2c8a0801cc8f8de3f15fe92f5d889e2e927397719552d3981347cae438943e517a3fa5a90b7f2a9138de98a7159a SHA512 49a63843a3095155a40462ee65693181180ed42fe8c06520061f397c394fbaa3a63591f18033bbf31e92cb01248dec7844386c960cccb257b80add2db53af524
 EBUILD openjdk-bin-17.0.11_p9.ebuild 3206 BLAKE2B 6d5f39a34005e0eb44836331c1b93a491ee1a6cb78e4a12494626316e1e6813182212c2eeeb480656adc276ff1b3e548ab4b9733f5826ea7b9e51ba469649c99 SHA512 7844a7f79c66356e6a7c5cd18a6793bb4a86a408de72d784c5b888d9facc2aa1706ead137f2a9c140ba00e566c14d0a06389fd9b664aab587307326b1a185311
-EBUILD openjdk-bin-21.0.3_p9-r1.ebuild 3246 BLAKE2B 0b6a856283cf4554917afd3579f09dc8514c6b20fb5f663de8a3b4dcb64270c81887d6459428fb8252536df0eb7a3bc1393890f8029aa9ea2a17264f355330ea SHA512 78cf14a399dc8a93f00a0f16d08ce03f1227ad62fa2d37644e380e47dc19e66d157c19c5e7e81d5cbcbfef37bb292fdbca610cad0f7564dfbed7b9260ed1a6d0
-EBUILD openjdk-bin-24_p6_beta.ebuild 3213 BLAKE2B 5907e99efc562257ac4af366a984d33694daf506a99fe7ef328e07d5a2871b447bf26710e561e0a1948f98a10d4f6837dffe494d57c9a5e2223a0da1ff92632c SHA512 b0a8bbeffd3beedb36e70de0bbef005ce3c3a9578c191ce29b52a17c398bdf21e1e84a1f7b27bf16e8115de897fa3b118048afd8bcaf69a41d6dc11a72a4b100
+EBUILD openjdk-bin-17.0.12_p7.ebuild 3218 BLAKE2B 83fc9cd1194cfebecf38426421ae62c50f9826fd00ca750826f28f09834e8d61af920d09ce8ba76a9732c22962dd2f2cd05a13f2b66f28f0de404f13381e36d8 SHA512 e848a8b20a9256691e058933369a794292029557b6f7512eb89c9f18e653318fce07c1641a1d4158e8bf244393f518df20513a53f1c17a98bee17751d03eb525
+EBUILD openjdk-bin-21.0.4_p7.ebuild 3246 BLAKE2B 0b6a856283cf4554917afd3579f09dc8514c6b20fb5f663de8a3b4dcb64270c81887d6459428fb8252536df0eb7a3bc1393890f8029aa9ea2a17264f355330ea SHA512 78cf14a399dc8a93f00a0f16d08ce03f1227ad62fa2d37644e380e47dc19e66d157c19c5e7e81d5cbcbfef37bb292fdbca610cad0f7564dfbed7b9260ed1a6d0
+EBUILD openjdk-bin-24_p8_beta.ebuild 3213 BLAKE2B 5907e99efc562257ac4af366a984d33694daf506a99fe7ef328e07d5a2871b447bf26710e561e0a1948f98a10d4f6837dffe494d57c9a5e2223a0da1ff92632c SHA512 b0a8bbeffd3beedb36e70de0bbef005ce3c3a9578c191ce29b52a17c398bdf21e1e84a1f7b27bf16e8115de897fa3b118048afd8bcaf69a41d6dc11a72a4b100
 EBUILD openjdk-bin-8.412_p08.ebuild 2927 BLAKE2B f62bab1ebf203a714edec548e16a08a96333012887a9a122d4f3d4801e50f3e9e5aceef1e40ab41f5fa312ef2884ae9547a96d2e8fa058bb1d69ad24abb74a97 SHA512 4712fb05b86e306c764af75252d4fb1201295bfa92817eb646bb793a56708c7655523b703428ca63e5e63d3a40bf77d4266dc8fa6244357702868787385bc0ef
+EBUILD openjdk-bin-8.422_p05.ebuild 2939 BLAKE2B 8063304652bafc188ffc8673a89b9a0d08a1c9aff63c5bd7e247fd1b03500555c37dc29a373c4263bf837d506000302a90dd12c19dfe38ee08fbe3f3c7f4d8a2 SHA512 ede178813b66e0f3de0ba3db73dc38ca6d1b3db55196d55158efd21180ebc3493c00b0de783041521c81733609c9560c0d5510b8a7332135069211bc50d135dd
 MISC metadata.xml 992 BLAKE2B faf08cbddeb47356eb249430ec21526fbadb95f666be9092a39d26f7167173cff526510c63f920b3891ee2738c915c0cb2319e4737f511f709b721555da2f061 SHA512 1f9fc80bc7bc07a1b6fc3d820368f05f46bcdd818fdba458729ac6c5ae9a55f43a435f9827f6d3986a17d2ef30929723b1f05acfa0017c855dbb3d9cbceda29c
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.24_p8.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.24_p8.ebuild
new file mode 100644
index 000000000000..602158ffbaf9
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.24_p8.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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 musl=
+	local os=linux
+
+	case ${2} in
+		*-macos)    os=mac      ;;
+		*-solaris)  os=solaris  ;;
+	esac
+
+	if [[ ${3} == musl ]]; then
+		os=alpine-linux
+		musl=true
+	fi
+
+	echo "${2-$1}? (
+		${musl:+ elibc_musl? ( }
+			${baseuri}/OpenJDK$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+		${musl:+ ) } )"
+}
+
+MY_PV=${PV/_p/+}
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+SRC_URI="
+	$(abi_uri aarch64 arm64)
+	$(abi_uri arm)
+	$(abi_uri ppc64le ppc64)
+	$(abi_uri x64 amd64)
+	$(abi_uri x64 x64-macos)
+	$(abi_uri x64 amd64 musl)
+"
+S="${WORKDIR}/jdk-${MY_PV}"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT=$(ver_cut 1)
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+IUSE="alsa cups headless-awt selinux source"
+
+RDEPEND="
+	>=sys-apps/baselayout-java-0.1.0-r1
+	kernel_linux? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+		media-libs/harfbuzz
+		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
+		elibc_musl? ( sys-libs/musl )
+		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="*"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_unpack() {
+	default
+	if [[ ${A} == *_mac_* ]] ; then
+		mv -v "${S}/Contents/Home/"* "${S}" || die
+		rm -Rf "${S}/Contents"  # drop macOS executable
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest#/}"
+
+	# on macOS if they would exist they would be called .dylib, but most
+	# importantly, there are no different providers, so everything
+	# that's shipped works.
+	if [[ ${A} != *_mac_* ]] ; then
+		# 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
+
+		# prefer system copy # https://bugs.gentoo.org/776676
+		rm -vf lib/libharfbuzz.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
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || 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}.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-bin/openjdk-bin-17.0.12_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.12_p7.ebuild
new file mode 100644
index 000000000000..79896f0974c5
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.12_p7.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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 musl=
+	local os=linux
+
+	case ${2} in
+		*-macos)    os=mac      ;;
+		*-solaris)  os=solaris  ;;
+	esac
+
+	if [[ ${3} == musl ]]; then
+		os=alpine-linux
+		musl=true
+	fi
+
+	echo "${2-$1}? (
+		${musl:+ elibc_musl? ( }
+			${baseuri}/OpenJDK$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+		${musl:+ ) } )"
+}
+
+MY_PV=${PV/_p/+}
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+SRC_URI="
+	$(abi_uri aarch64 arm64)
+	$(abi_uri aarch64 arm64-macos)
+	$(abi_uri arm)
+	$(abi_uri ppc64le ppc64)
+	$(abi_uri x64 amd64)
+	$(abi_uri x64 amd64 musl)
+	$(abi_uri x64 x64-macos)
+"
+S="${WORKDIR}/jdk-${MY_PV}"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT=$(ver_cut 1)
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+IUSE="alsa cups headless-awt selinux source"
+
+RDEPEND="
+	>=sys-apps/baselayout-java-0.1.0-r1
+	kernel_linux? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+		media-libs/harfbuzz
+		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
+		elibc_musl? ( sys-libs/musl )
+		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="*"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_unpack() {
+	default
+	if [[ ${A} == *_mac_* ]] ; then
+		mv -v "${S}/Contents/Home/"* "${S}" || die
+		rm -Rf "${S}/Contents"  # drop macOS executable
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest#/}"
+
+	# on macOS if they would exist they would be called .dylib, but most
+	# importantly, there are no different providers, so everything
+	# that's shipped works.
+	if [[ ${A} != *_mac_* ]] ; then
+		# 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
+
+		# prefer system copy # https://bugs.gentoo.org/776676
+		rm -vf lib/libharfbuzz.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
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || 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}.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-bin/openjdk-bin-21.0.3_p9-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-21.0.4_p7.ebuild
index 7fc34d184029..7fc34d184029 100644
--- a/dev-java/openjdk-bin/openjdk-bin-21.0.3_p9-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-21.0.4_p7.ebuild
diff --git a/dev-java/openjdk-bin/openjdk-bin-24_p6_beta.ebuild b/dev-java/openjdk-bin/openjdk-bin-24_p8_beta.ebuild
index 72e3e2f5c768..72e3e2f5c768 100644
--- a/dev-java/openjdk-bin/openjdk-bin-24_p6_beta.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-24_p8_beta.ebuild
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.422_p05.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.422_p05.ebuild
new file mode 100644
index 000000000000..f362abc652e7
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-8.422_p05.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2
+
+abi_uri() {
+	local baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk${MY_PV}"
+	local musl=
+	local os=linux
+
+	case ${2} in
+		*-macos)    os=mac      ;;
+		*-solaris)  os=solaris  ;;
+	esac
+
+	if [[ ${3} == musl ]]; then
+		os=alpine-linux
+		musl=true
+	fi
+
+	echo "${2-$1}? (
+		${musl:+ elibc_musl? ( }
+			${baseuri}/OpenJDK$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV//-/}.tar.gz
+		${musl:+ ) } )"
+}
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+SRC_URI="
+	$(abi_uri aarch64 arm64)
+	$(abi_uri arm)
+	$(abi_uri ppc64le ppc64)
+	$(abi_uri x64 amd64)
+	$(abi_uri x64 amd64 musl)
+	$(abi_uri x64 x64-macos)
+"
+S="${WORKDIR}/jdk${MY_PV}"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT=$(ver_cut 1)
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+
+IUSE="alsa cups examples headless-awt selinux source"
+
+RDEPEND="
+	>=sys-apps/baselayout-java-0.1.0-r1
+	kernel_linux? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
+		elibc_musl? ( sys-libs/musl )
+		sys-libs/zlib
+		alsa? ( media-libs/alsa-lib )
+		arm? ( dev-libs/libffi-compat:6 )
+		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 strip"
+QA_PREBUILT="*"
+
+src_unpack() {
+	default
+	# 753575
+	if use arm; then
+		mv -v "${S}"* "${S}" || die
+	elif [[ ${A} == *_mac_* ]] ; then
+		mv -v "${S}/Contents/Home/"* "${S}" || die
+		rm -Rf "${S}/Contents"  # drop macOS executable
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest#/}"
+
+	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
+
+	# on macOS if they would exist they would be called .dylib, but most
+	# importantly, there are no different providers, so everything
+	# that's shipped works.
+	if [[ ${A} != *_mac_* ]] ; then
+		# this does not exist on arm64 hence -f
+		rm -fv jre/lib/*/libfreetype.so* || die
+
+		if ! use alsa ; then
+			rm -v jre/lib/*/libjsoundalsa.so* || die
+		fi
+
+		if ! use examples ; then
+			rm -vr sample || die
+		fi
+
+		if use headless-awt ; then
+			rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+				{,jre/}bin/policytool bin/appletviewer || die
+		fi
+	fi
+
+	if ! use source ; then
+		rm -v src.zip || die
+	fi
+
+	rm -v jre/lib/security/cacerts || die
+	dosym ../../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/jre/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 7664d8a438f3..5eae72070607 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -12,6 +12,7 @@ DIST openjdk-17.0.11_p9.tar.gz 106574173 BLAKE2B 3db4763527d1acb83a2d492c3e94dc5
 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-8.422_p05.tar.gz 93034877 BLAKE2B 2489fea62fbc5a7e3735055656ae89c67caf63e5bc6d5385ee811d0707d056bc3d10dd83f7eae5a5a86b7f57b8da47a9c1a77405f127b6f506bbf3b310ecd2ae SHA512 706db67f9be7509380e96ae2187bdb928e40c4382fd7073dd310da2981eeff324a5871702b087d4466911dbbea8376d5f9fed7029562ca62c9a1a193d931833e
 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
 DIST openjdk-bootstrap-11.0.14_p9-riscv.tar.xz 104601676 BLAKE2B 5f976e8a626a829fae70ad6c007f10bfeff79e29c85d6c75fb2f5ff8984fd2a2bd44ee6e07958dbbdaaed761c6839d375e1b5ba6cffc63b02ad9e2c9178310db SHA512 580dec81626553fe3e7afd0f6385a733ba80a0502cf0f9e8bdc973048887290c9ab6171267d61d8838c4ece4de58c9ca8b78540bd52b1757495a27175057ec64
@@ -29,4 +30,5 @@ EBUILD openjdk-17.0.11_p9.ebuild 9254 BLAKE2B e8fe5423eeb601c2d360041ff68e206d47
 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
+EBUILD openjdk-8.422_p05.ebuild 7823 BLAKE2B df25782738aa40faf91a4eac7b06eef4ddb8d7cfd1d2a2ae05c42f63eac88a37e51e788e2ebcbbcd54fb491f35c7b26e5c98a675415483aa70f9eecda735291b SHA512 345aa3c92e51568a88f36cd6669ed7c6ae4b7f12c0c74b378ffaba29d086a3f02af62839d212277579f2e1e282bffe112bc49a0031fd2884c05bee7489a3980b
 MISC metadata.xml 1549 BLAKE2B 5f7caf2330b7d8eb264df12fe6eebbf1e4acf91b04e37a4c6ea6c45101a39f2e84b4d40152d58c93e63a1d2d6fdb5649b096a314f7269d33ce72da263d392c90 SHA512 8fa15bf9544f2665a47185a3701c3a9ce1654ddedf1aebfb344f77f544a71a3bda33c2d4f3c1d5d65d7ea42b6c1f04a6e1dfaaae723c1a5fcaf63ec48d79f3de
diff --git a/dev-java/openjdk/openjdk-8.422_p05.ebuild b/dev-java/openjdk/openjdk-8.422_p05.ebuild
new file mode 100644
index 000000000000..6280651782d6
--- /dev/null
+++ b/dev-java/openjdk/openjdk-8.422_p05.ebuild
@@ -0,0 +1,283 @@
+# 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/owasp-java-encoder/Manifest b/dev-java/owasp-java-encoder/Manifest
index 745a965e44a1..557236fdd886 100644
--- a/dev-java/owasp-java-encoder/Manifest
+++ b/dev-java/owasp-java-encoder/Manifest
@@ -1,4 +1,6 @@
 AUX owasp-java-encoder-1.2.3-BenchmarkTest.patch 1971 BLAKE2B 1a4d60fb1b16b98878f1c9bd056d1600327768613a9df9017395f40f8d249b7034bb44b5573638307398ab5296c01f618f0e5348023e84aa526ca0d76ab41113 SHA512 376c5cad6e7cb4ebc3fe6998d90155c71bdfa793ecb132ea49e018169f6fe150485cd0b79984e5f88c96afb3ceb80cfdb68f49fe9aea4cabffc29ec3a7fc40e0
 DIST owasp-java-encoder-1.2.3.tar.gz 134303 BLAKE2B 76b9652863fcdfdce82bd26062fa500bb92b21ba6edff7b3f409a1375e135176f826dca4bb02b4dd48905112ae20a0af0a1f09cb4e21ea41c672a44c52fea209 SHA512 19c13894ce68325553bdbee41190cb113d698c79ec74885604fd9db4f083efe0fcdc4313b7191014bfd972d0ee52f0fbe0621d7bb407745bd1feeb2ac9e49783
+DIST owasp-java-encoder-1.3.0.tar.gz 150029 BLAKE2B 31e350f02a7374f809e435d90ee9b4b1424cd9cb2da7d4062dfe0fc5898e02623496e464483bafd550b82b926260ab4df918f9be776e47f66587c6bc3829ebba SHA512 0ccdd6ae63e657ee28a4d9de7664269eff57802bddb03c7163fdb27326668256573d995b0111dc83cc1e5a6acc247e03da443f4b34c08cf99b085ec0a383a439
 EBUILD owasp-java-encoder-1.2.3.ebuild 837 BLAKE2B d80fffeab535d7de8a4c227cd29b2afe74861e7fe8a4df5fc8c21053dfb2bf0503fe8091c62c4bfb62dd00e14a6feee6cac9027704b51da32c18c7b8a6d4b256 SHA512 f8c2275ad2397108a07be95d4cd028d18ae896068bf153fcc4c5819cd556a381e90540116a544ef26a811f0aa47032d6e6e72d354076ecf0818060f2fd4de7dc
+EBUILD owasp-java-encoder-1.3.0.ebuild 1244 BLAKE2B 3c78a5ff087f17578b40c66bf7ac9b320eedb3e7b41dbc8851571241513ca587d8d1782c5aa5ff9623e067751b45b2da4874d194e4f8b3934e38872c3682b472 SHA512 cf37a0865cd38f85ae39d291bc15765ae28260b3ffb26da4b4cd7f95b6b0158975e6751c8be83e6d6af610ea64b51dfaf9e08dbe2677abb1a4c21af3ae381ec5
 MISC metadata.xml 306 BLAKE2B 8dfe8c2f01f21e1e865973e9865f3a9439a7a378d2acc52a6e148dcf70e3ef0f0fcce4efff20d89c0e2872e5d23fb0795b2d669eb18c278abf3ae6406db8f84a SHA512 c696a3c2763ff1868b3b80ee7c4b47fc697679a0539c2b9b300f0a969ad3bcd168e75f5d0275c10bac5b1ba7052e2e498c2c7daf3290f593cd0be8c9f35940fd
diff --git a/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.0.ebuild b/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.0.ebuild
new file mode 100644
index 000000000000..84640fdb1e59
--- /dev/null
+++ b/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2023-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.owasp.encoder:encoder:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OWASP Java Encoder"
+HOMEPAGE="https://owasp.org/www-project-java-encoder/"
+SRC_URI="https://github.com/OWASP/owasp-java-encoder/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/core"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+# skipping 10 tests because they seem to be unreliable depending on hardware used
+# as some of them fail on some setups because the benchmark results don't align
+# with the hardcoded value 200 for the expected results. here are some examples:
+# Benchmarked Encode.forJavaScript: 442,382250 ns/op (+253,85% on baseline)
+# Benchmarked Encode.forCssString: 446,929231 ns/op (+257,49% on baseline)
+# Benchmarked Encode.forJava: 409,038065 ns/op (+227,18% on baseline)
+JAVA_RM_FILES=( src/test/java/org/owasp/encoder/BenchmarkTest.java )
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/scala-cli-bin/Manifest b/dev-java/scala-cli-bin/Manifest
index 363a5d1f0d02..0ad5d942562c 100644
--- a/dev-java/scala-cli-bin/Manifest
+++ b/dev-java/scala-cli-bin/Manifest
@@ -1,21 +1,9 @@
-DIST scala-cli-amd64-1.0.4.gz 33291617 BLAKE2B bd97626e7e95fb6b2a82fd424673078b89f5f4270087c667193e4de1ceff614076e73b728ba1f0334d5f9d7aa6f52c660487d52bf8fb49a786f7fe4ce18a0428 SHA512 447acafd47041cd173a06b5d113cd30adee76a2c161b2efc98b8ece60082d5b98189fd9b3da1f048061d306343cacb9b67566daa78ce8fe54dc82dd90a1e34bc
-DIST scala-cli-amd64-1.1.0.gz 33673708 BLAKE2B 332f5a974949af49914de8fdb3129b0937fbce842616d6fefe16f7aff89baf6be1ba536d0ee6ff9bc1dd2b5ebfa51943bd0c6279ef83b95bd25a337530fa1295 SHA512 ba7ebb321a27e95f786027257c3f50dac1d12e0cc33abde24dc7c5dffb2f57a11c3ea67d92ed487968c49ff9ec3eaf5d1d62065beda5b6fa373d09b9126f4529
-DIST scala-cli-amd64-1.1.1.gz 33754319 BLAKE2B 91fb5e9b828a2c6c6dd984b421bb101ea1ae03c85d94eda14ba79433d29a88cb2850cb376c212f677c1b8167a0a21b320aeb0e4e63a29e6c8502d76babc1543d SHA512 1e0cd5eee280e208090961e4b6d216d472fef360f13e0f4e28412b9a52883d65c97e3fe70c8ce5cf96e6cd866f14b175454175be9df3bdc5c229fb2f121c925a
-DIST scala-cli-amd64-1.2.1.gz 33851353 BLAKE2B 31c92901f970ec2c0a74cb45d94b98e6d8f282c175cf8deb1a806db4b6d2e9a8b2150bca9fc9e373948e5092bf4bb7d5d1145a133d3b1c234d3cbe383ff9a270 SHA512 169c81bee582c6144501e8bd5436bae0bd3447ed89856a4d4763d13d3083ad26d948729b71bea864986f2c676e50855b8fb036d3a69ed0a316e2c6af0f98ef5f
 DIST scala-cli-amd64-1.2.2.gz 33871512 BLAKE2B ef9328b26afb52ada07739539d560239d6ce2ffd72d1e353ce94d45c7358b6789aa0019804e249584ca497d5d15c96caab12eb31fab5b84a14162c00ca30c181 SHA512 02da0915ee140a129f622f973291c98c7dd7b7f16f5a2a5250ac825e09876b616a315fe5e6af43691f43870fa68234efeff73eadd4f6060d2d90fe937302eae7
-DIST scala-cli-arm64-1.0.4.gz 33185346 BLAKE2B 2b0131a56ed3f67fb5d5f25db6c511dc7d9e9128089e6826fa7d859b1457f03a99e290cc63f185820ea849a857f40d667d5db7a378dabcf545cdcdefded6a577 SHA512 3ff1c025a1035aa6a8550de17e85bc5c483007d5f07f03e0d792d6dc9ed1b18eb26909b3c7195fde12056a3b84ffa69dc53c01ec21b34187c1d7188a0a023aaa
-DIST scala-cli-arm64-1.1.0.gz 33575885 BLAKE2B ebccbe86044b4708a356060a16f06bb94df01d261ab7dabe8eba8e644c121864cdee99debf95468d936cbff670413ec47e1ef903a9071b267a61c5fe46738c1a SHA512 6a85529be06a8d43d729c5a795bb0dcdb2680bd7ef3de471fee908e91249401262e8322019c640d4eb45d0a15ed0073ff51b24d61846228f46c36bfb48731408
-DIST scala-cli-arm64-1.1.1.gz 33656505 BLAKE2B b943f370c9375fec5cec3c63628ecd9e416b569ec2d692422f217b2506c104a1c3bb415569581d68c9476bf892b4a087e7b95b2310955dd0f9af52edc90af2e9 SHA512 79836261613bafe4710c1d904ec39e88c1862b3021f7b37ac5004c6079c762e68550522fbb7240e48e7408f844f648ab92c12cb568ebc63bb3e01f1992a7eaf3
-DIST scala-cli-arm64-1.2.1.gz 33769006 BLAKE2B 4bc2c830d17e235a3eba7029bfd018ee4cd12f8ee27a3574b1c2195ab8ad22b79c452a0660fb55f1be99a610be1f4ea38f8e2de622f10277be7f5403b540778a SHA512 90a8f6b4ae2fa90dcdd3c88fdbbd1079db1cbbde80f496da8663223ad79dc4b499b6ae43835067d8fde945d4fb5ed079dec850f688b9d1b62602d186d426f7cb
+DIST scala-cli-amd64-1.4.2.gz 34238180 BLAKE2B 90cb8af5561bf5324e4fef3183b301d15839ac188f8ba7154e65306333d765429243591fc17a33f48e4b8a48c43034782643ba4014bfed3719c5037805c58878 SHA512 12ff3eff0117df6d9ae526203724a8261150fbd5436f61beeda33a5f4292b7a71196e2ee762d4e005f827ac2f104d3c5d2a657abc0a63a2b66e526d18ef2887a
 DIST scala-cli-arm64-1.2.2.gz 33766128 BLAKE2B d5b2d7ab8157f3874b1cfe0b0647ab30f5dd191337e575056eb758d52eda30871c54b20a08a1cda3e28c51afd744b4b8320aee6aef056b39b98f2534184739ba SHA512 004ca188e4ddd01c0e46277fa514b1c9bd061ea26d4318b8daff3ffaae5bb7cc9f4746509401da19774537c7e56f8a5a7da846cd4b5f90c61a3ab1f8d3ed0493
-DIST scala-cli-non-native-1.0.4 7553232 BLAKE2B 9299b20dddec80d12e738af4b283e816de5bae23262510146cd33a9b175f2a343f52932fbd3254974bd4219d2903f32772409f234423d3a027b6b0f02268e584 SHA512 4e5281ef7f8a886ad79746477d852f485ccad317568a64ee513e691dcd9a9121c2aed51f6170b959f0226fb81efe9aa1f8ecf1d94a84a0b387c349adfb756762
-DIST scala-cli-non-native-1.1.0 7728727 BLAKE2B 05deb93b91029721a21bac729aa9b370e05909e67bbade921e00d09c3a37e851e519188bff73dc614c3f5768834ae56f94623347735e756a6bcb0c4c81c8713c SHA512 13e426915794df757b6eb029d2545316bd9f4b9ba6f58cf59a546227d6997741cf681ce0c5e721e8e95cb9e420702f2d28f004df1780637dc9b39fd3bc4c884a
-DIST scala-cli-non-native-1.1.1 7779964 BLAKE2B 08849ce4a6fbf1e6eb2e4fafd2e29522e535c0795d6f1acbcd25ec4523d14dcae4a746f3729786db8f62a3770e6fdbd78a76477b182b32945454ac19a2f8217c SHA512 61c2a1a325f83e19102cd2f5d6b89d37b9914d64f86da6218258f064a6a8e5ab927d28b278363316446611e2cbdc8e4687616ea2b001da00ecbafb4207eabeb2
-DIST scala-cli-non-native-1.2.1 7836408 BLAKE2B a7c191020a65a4420ef7cc9d8fe5f9c6d1548c1cfb14dea94c0d9a798f608c038083bb678bd1a4fbdc9bd3de58f02a11e970cfebec4ac755f7f12af21eeb4dbc SHA512 d889ad3fa96953423fc1d948b6e260f55ffc4234d6e9da05299afe0a6cbc2b66c42a7a65113f887d1bf41a699679d09e02aed6686150551d1e1171d7c1c7331b
+DIST scala-cli-arm64-1.4.2.gz 34142373 BLAKE2B d7c2d87503e0c8916902e293d5d16e59b7ec80c942b72307667a0e8c16635e4d2e9839bf20a4284a1ffaf2eef001db4801bdc62afe9600babd1abd915783ba09 SHA512 10dcc3991d4e9951d688f907da38683701f8ff4784e86dcd1fd7441c79f70bdfef7d8022d98e247914800312b4eb37670a99059f77c045fd66f6d34e92179e5c
 DIST scala-cli-non-native-1.2.2 7837019 BLAKE2B 799ed83805ba767b687cf9a041a3e23f008e20e3ca55b8c52a9361c0b2465141abb7c17ca7dca59c9307af5a5a07a0cfe0d8035eea14a2adf2580913d67d6a10 SHA512 40aa43ee601c52238989a81884b6acc7a023599abb561bed1c9d31dff6053eff0f3477097a228bc30aab4df22d81b10fbbb64b5557d3067b4715c821c4eacb3e
-EBUILD scala-cli-bin-1.0.4.ebuild 1818 BLAKE2B b6f64c1a87aaeb118f5cea239ec569a77d8593a0963745c9977cc28e60b6538218eca4f8f7dd79205fc97ef6dc5fee1142b93da5f37a4b62a733b292327a06f8 SHA512 304c303924f7485630911d125f92fbdb05d25dc76581ec3a6737808a96e16780bcb33600cedb0078a0ba66c9828316a54e0f67f0e5ecb33445085b8becca4243
-EBUILD scala-cli-bin-1.1.0.ebuild 1818 BLAKE2B 5b07a1917af542f3141556d5de5932ce036254087765630bd3e498088193b8c0cf2862dc9c2abf3e125f3d28ea78f3b5f8333680bd9db3376858f8671b6c1b86 SHA512 3caa40269b85c7bb04517902637fc4eac76801f931fa24163cf4fa86bad9cee2944e89b20d75bb0b6b16a1ada1586240b150a4f56d86a8ecf81a2748052e29c7
-EBUILD scala-cli-bin-1.1.1.ebuild 1819 BLAKE2B 5048953ca83fb189a59272673d715cd98be632b9ee60b6087a82ec38da56e43c9a23073a467a85918d1cba72232a50b1c7230dc11a6d027f8a79a209870f7a9f SHA512 cebdb118fa90c5444d2bbf9ca1052bf11d739e9992c1fa1add031506016412b6a0e5b94d4aa5e9e89bc32656dd34ee6a6ea81f5ddd67b496d38f813fa4a7ef70
-EBUILD scala-cli-bin-1.2.1.ebuild 1819 BLAKE2B 5048953ca83fb189a59272673d715cd98be632b9ee60b6087a82ec38da56e43c9a23073a467a85918d1cba72232a50b1c7230dc11a6d027f8a79a209870f7a9f SHA512 cebdb118fa90c5444d2bbf9ca1052bf11d739e9992c1fa1add031506016412b6a0e5b94d4aa5e9e89bc32656dd34ee6a6ea81f5ddd67b496d38f813fa4a7ef70
-EBUILD scala-cli-bin-1.2.2.ebuild 1819 BLAKE2B 5048953ca83fb189a59272673d715cd98be632b9ee60b6087a82ec38da56e43c9a23073a467a85918d1cba72232a50b1c7230dc11a6d027f8a79a209870f7a9f SHA512 cebdb118fa90c5444d2bbf9ca1052bf11d739e9992c1fa1add031506016412b6a0e5b94d4aa5e9e89bc32656dd34ee6a6ea81f5ddd67b496d38f813fa4a7ef70
+DIST scala-cli-non-native-1.4.2 8004132 BLAKE2B 5254d25395080a26598bb4445c2200100b1c511e928774d5d52f5174b43d3fd9cd2b58ae97033a25e45495273bbf0717abccccbe84c5d4a8bb70a3c9f42f5b7e SHA512 002d052ec4b2409ede4da6cfda86ff638534d702a934d679aac0d18dab4c6c69ac8d9d8e67a8e9a410af8c8d0c19f1c864247b0d790e6f040976f4fb3dcabfe5
+EBUILD scala-cli-bin-1.2.2.ebuild 1818 BLAKE2B 5b07a1917af542f3141556d5de5932ce036254087765630bd3e498088193b8c0cf2862dc9c2abf3e125f3d28ea78f3b5f8333680bd9db3376858f8671b6c1b86 SHA512 3caa40269b85c7bb04517902637fc4eac76801f931fa24163cf4fa86bad9cee2944e89b20d75bb0b6b16a1ada1586240b150a4f56d86a8ecf81a2748052e29c7
+EBUILD scala-cli-bin-1.4.2.ebuild 1819 BLAKE2B 7bab0342099834960ad00942acd09fd8fd41c2f309284dc944ea5d4cf2ad332142004e2d5f5aa2d167f4cde99194f4881d085fd827b398d0fb8ec96795dd5696 SHA512 d0d38479d38e5f859dec3f9aab5d9a2b8f7072bfb7dba3f79e9fba14e2e3d05e2166d36b515b0ee1b443b253e3786e929c66234eedeff8cf4130dec4fd7517f1
 MISC metadata.xml 471 BLAKE2B 651dc485aacabfc581d9f5d5ab1cf524601b38fd2024113fbd8986090131e6c458db3c2d9649e9876df74f0e7471cdc66c8f1307ed71baa18508754143c10411 SHA512 6906a09bc65b6d1887a9a17d9be2e7afc990ea017439cad751fcfee806df0c456006473141b69f52b5373227cfd6e2f66e7750903d4bd9736f40d6c93cbede4e
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.0.4.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.0.4.ebuild
deleted file mode 100644
index 67f4eefef2f4..000000000000
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.0.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1
-
-UPSTREAM_PV=${PV/_/-}
-UPSTREAM_PV=${UPSTREAM_PV/rc/RC}
-
-DESCRIPTION="CLI to interact with Scala and Java"
-HOMEPAGE="https://scala-cli.virtuslab.org/"
-SRC_URI="
-	!amd64? ( !arm64? (
-		https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli
-			-> scala-cli-non-native-${UPSTREAM_PV}
-	) )
-	amd64? (
-		https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-x86_64-pc-linux.gz
-			-> scala-cli-amd64-${UPSTREAM_PV}.gz
-	)
-	arm64? (
-		https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-aarch64-pc-linux.gz
-			-> scala-cli-arm64-${UPSTREAM_PV}.gz
-	)
-"
-
-KEYWORDS="amd64 ~arm64"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-S="${WORKDIR}"
-
-# A JRE is not strictly required if native images of scala-cli are used
-# (amd64, arm64). However we may want a system JRE anyway, and having JRE
-# in RDEPEND reduces the chances that scala-cli needs to install one
-# for the user.
-RDEPEND="
-	>=virtual/jre-11
-	sys-libs/zlib
-"
-BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )"
-
-QA_TEXTRELS="*"
-QA_FLAGS_IGNORED="/usr/bin/scala-cli"
-
-src_prepare() {
-	default
-
-	if use amd64; then
-		mv scala-cli-amd64-${UPSTREAM_PV} scala-cli || die
-	elif use arm64; then
-		mv scala-cli-arm64-${UPSTREAM_PV} scala-cli || die
-	else
-		mv scala-cli-non-native-${UPSTREAM_PV} scala-cli || die
-	fi
-
-	chmod +x scala-cli || die
-}
-
-src_compile() {
-	for shell in bash zsh; do
-		./scala-cli install-completions \
-					--shell ${shell} \
-					--env \
-					--output "${S}" \
-					> ${shell}-completion || die
-	done
-}
-
-src_install() {
-	dobin scala-cli
-
-	newbashcomp bash-completion scala-cli
-
-	insinto /usr/share/zsh/site-functions
-	doins zsh/_scala-cli
-}
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild
deleted file mode 100644
index d73c7e68ad79..000000000000
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1
-
-UPSTREAM_PV=${PV/_/-}
-UPSTREAM_PV=${UPSTREAM_PV/rc/RC}
-
-DESCRIPTION="CLI to interact with Scala and Java"
-HOMEPAGE="https://scala-cli.virtuslab.org/"
-SRC_URI="
-	!amd64? ( !arm64? (
-		https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli
-			-> scala-cli-non-native-${UPSTREAM_PV}
-	) )
-	amd64? (
-		https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-x86_64-pc-linux.gz
-			-> scala-cli-amd64-${UPSTREAM_PV}.gz
-	)
-	arm64? (
-		https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-aarch64-pc-linux.gz
-			-> scala-cli-arm64-${UPSTREAM_PV}.gz
-	)
-"
-
-KEYWORDS="amd64 ~arm64"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-S="${WORKDIR}"
-
-# A JRE is not strictly required if native images of scala-cli are used
-# (amd64, arm64). However we may want a system JRE anyway, and having JRE
-# in RDEPEND reduces the chances that scala-cli needs to install one
-# for the user.
-RDEPEND="
-	>=virtual/jre-11
-	sys-libs/zlib
-"
-BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )"
-
-QA_TEXTRELS="*"
-QA_FLAGS_IGNORED="/usr/bin/scala-cli"
-
-src_prepare() {
-	default
-
-	if use amd64; then
-		mv scala-cli-amd64-${UPSTREAM_PV} scala-cli || die
-	elif use arm64; then
-		mv scala-cli-arm64-${UPSTREAM_PV} scala-cli || die
-	else
-		mv scala-cli-non-native-${UPSTREAM_PV} scala-cli || die
-	fi
-
-	chmod +x scala-cli || die
-}
-
-src_compile() {
-	for shell in bash zsh; do
-		./scala-cli install-completions \
-					--shell ${shell} \
-					--env \
-					--output "${S}" \
-					> ${shell}-completion || die
-	done
-}
-
-src_install() {
-	dobin scala-cli
-
-	newbashcomp bash-completion scala-cli
-
-	insinto /usr/share/zsh/site-functions
-	doins zsh/_scala-cli
-}
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild
deleted file mode 100644
index dc0659cfd5ec..000000000000
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1
-
-UPSTREAM_PV=${PV/_/-}
-UPSTREAM_PV=${UPSTREAM_PV/rc/RC}
-
-DESCRIPTION="CLI to interact with Scala and Java"
-HOMEPAGE="https://scala-cli.virtuslab.org/"
-SRC_URI="
-	!amd64? ( !arm64? (
-		https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli
-			-> scala-cli-non-native-${UPSTREAM_PV}
-	) )
-	amd64? (
-		https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-x86_64-pc-linux.gz
-			-> scala-cli-amd64-${UPSTREAM_PV}.gz
-	)
-	arm64? (
-		https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-aarch64-pc-linux.gz
-			-> scala-cli-arm64-${UPSTREAM_PV}.gz
-	)
-"
-
-KEYWORDS="~amd64 ~arm64"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-S="${WORKDIR}"
-
-# A JRE is not strictly required if native images of scala-cli are used
-# (amd64, arm64). However we may want a system JRE anyway, and having JRE
-# in RDEPEND reduces the chances that scala-cli needs to install one
-# for the user.
-RDEPEND="
-	>=virtual/jre-11
-	sys-libs/zlib
-"
-BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )"
-
-QA_TEXTRELS="*"
-QA_FLAGS_IGNORED="/usr/bin/scala-cli"
-
-src_prepare() {
-	default
-
-	if use amd64; then
-		mv scala-cli-amd64-${UPSTREAM_PV} scala-cli || die
-	elif use arm64; then
-		mv scala-cli-arm64-${UPSTREAM_PV} scala-cli || die
-	else
-		mv scala-cli-non-native-${UPSTREAM_PV} scala-cli || die
-	fi
-
-	chmod +x scala-cli || die
-}
-
-src_compile() {
-	for shell in bash zsh; do
-		./scala-cli install-completions \
-					--shell ${shell} \
-					--env \
-					--output "${S}" \
-					> ${shell}-completion || die
-	done
-}
-
-src_install() {
-	dobin scala-cli
-
-	newbashcomp bash-completion scala-cli
-
-	insinto /usr/share/zsh/site-functions
-	doins zsh/_scala-cli
-}
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild
index dc0659cfd5ec..d73c7e68ad79 100644
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild
+++ b/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 	)
 "
 
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.2.1.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.4.2.ebuild
index dc0659cfd5ec..e89ddb52ce30 100644
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.2.1.ebuild
+++ b/dev-java/scala-cli-bin/scala-cli-bin-1.4.2.ebuild
@@ -25,11 +25,11 @@ SRC_URI="
 	)
 "
 
-KEYWORDS="~amd64 ~arm64"
+S="${WORKDIR}"
+
 LICENSE="Apache-2.0"
 SLOT="0"
-
-S="${WORKDIR}"
+KEYWORDS="~amd64 ~arm64"
 
 # A JRE is not strictly required if native images of scala-cli are used
 # (amd64, arm64). However we may want a system JRE anyway, and having JRE
diff --git a/dev-java/shrinkwrap-spi/Manifest b/dev-java/shrinkwrap-spi/Manifest
index f32d8dddd45d..8041115c0282 100644
--- a/dev-java/shrinkwrap-spi/Manifest
+++ b/dev-java/shrinkwrap-spi/Manifest
@@ -1,3 +1,3 @@
 DIST shrinkwrap-1.2.6.tar.gz 987090 BLAKE2B 0c837b6fae6c3e9c7155b6ddf1923b14320d39ee3fd45af5436f967535e8c3ab290b62b6ca67aafc146558466e8c161fa6527055e48a55b5456fce728c5618f9 SHA512 8d91e265f60f1ead931166da836106412ecb861112a65e4976f63df0e351d7cb2d1f64bc2633c5df1052eb39541906ac17d6c886d7d25cb1600799d17637a58c
-EBUILD shrinkwrap-spi-1.2.6.ebuild 744 BLAKE2B 369dec74e9d4506fcd8e7f5c262f2253477b56e4fbf5d2020834caf7787892c64c5bf1343bedd7bb90b5a0bf4b719ce79d7f11a6bbf7985d4b3defce92e5d39d SHA512 5fd30175961b343ade73342e135d35b70002dde74274efbc71db2330ebe3dc817f62b008dd13280ca745c0fcf215c6819169bba6db8b3cae1214372678640b38
+EBUILD shrinkwrap-spi-1.2.6-r1.ebuild 744 BLAKE2B 7a2e9e9eced25c28ac889ffdb8bd518b182a90d8f529555e6edb74eec199f8d368ff7611c965ad791c209962e2186964f8e0f8c3e2ef3e6e6563ba0f22b916d5 SHA512 8134815c89e7d894dba38f11f76252c3dc51de17c9b3fc644012671ab2ee90a0fa58c081925e4ab6676a57f8e005d976d9c4ad3125244a0d7ae0a4c5b7df8056
 MISC metadata.xml 303 BLAKE2B 9befb02178286b65db97b836897ace4dab5c9ccccbc4d2a98242960b18acbf9cf0e8ade440125332cbc6555c92b6813a141c2fa61d0ca1db911e625844178543 SHA512 a7417fe5d51ab1a5871cfd2ac6c8d0ae8190cc7bea21f8d2f43b99fab72c73a58fd88ccea32ed59871d043aa6ac4eefb5a1493f1a204d1f3c427d1809c3a5f39
diff --git a/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6.ebuild b/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6-r1.ebuild
index 309ee2cc69c9..fb5680283e62 100644
--- a/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6.ebuild
+++ b/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,7 @@ DEPEND="
 "
 
 RDEPEND="
-	${CDP_EPEND}
+	${CP_DEPEND}
 	>=virtual/jre-1.8:*
 "
 
diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index bd1c71853f2e..21a25290459c 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,10 +1,10 @@
 AUX stringtemplate-3.2.1-TestStringTemplate.patch 463 BLAKE2B f4c9b1bce8b48a2d1299e866510a87038d34b636f2da942ca14e2ba9b75a77397abe7b430adcca35380d6362b5e3a6c6150f37b4e1efba521d1b63417cf7d4de SHA512 8f69547dd3e48ce32619f21daff19888f3cdf1d0df41e2f35ac534001c56eaa0e504edf481fd692241e2041c3d62f120df6ab4bb5b961f15662a399b9a915f8c
 AUX stringtemplate-4.3.4-BaseTest-javac-source-target.patch 1233 BLAKE2B abafe7d60c9667cb0838b33d67d9e4eee1afe9f5f989e2152fb03a5e88c402bda49b927320ad912990b617b6c60322e99417c5fad0c3e60d48b9e8bb4a69053d SHA512 fc5da02c16109817ab7bb30c31a90ce535560e8bf1e7e1dfb203846e930bbd665aeaf46a4641d67e2960e8ae9d88b21275317b0b6e0494eeac8f20aa4f546a04
-AUX stringtemplate-4.3.4-Java21-TestRenderers.patch 2293 BLAKE2B 48a0ac8fcf10dd67511c5f679c3194d980f22b3c4a471a200a6a5f228bdf5769bf0a89857dd29f0575e2648d71f79a15dd8b63f45bd01543497d5a0dbbd4e4c9 SHA512 094bd4c6f0678579b0f0419a5a2a6c7a1dac1c86602e137d0b66da7d4a49ab4faa85d26b20266a54b3106964521cb33f6690aaa6265a1348fddc0fe3b93eaa74
+AUX stringtemplate-4.3.4-Java21+-TestRenderers.patch 2437 BLAKE2B fec8d2c0726a3bc130e0a43da3e4444d02afd9cd2882b75bb8e52e77caa0a9594682ac59e4f4a0a72b0d6346c98556ccaf422108558f3d1dffe68c275e537a4c SHA512 ea887454b1a26d6f04ac9be69d793bff61340c51c75ba55c1160c76f537e3a8b37a719b5134874b80ad1f894423698621c80c4af940cb78586be8ce5d77e5be4
 DIST ST4-4.3.4-sources.jar 198780 BLAKE2B 25f9b4baf43075ddbc946933a517e8361f88d152c4caba29a88770ab229c1b40636ebc4ccdf52a2132d94974e0d81dd114e4018658d178a2c44228007450ab7d SHA512 83ff2e17659c37407b91c83e7fcd3b5d44b206f6fdaaf8034122a3c9490778aeb24ecf90778b9dc9d6836bc59a01d75bacce71e27aadb8a5fa22b9373f7f7878
 DIST ST4-4.3.4.tar.gz 436814 BLAKE2B 40aba1cb009b669ad00285b4cdffa66632c38267f42b6b973bdb0a2f57f3c46fc13d1a929ac4745c104d658f127a63081ed5dde4c813c10e60ce7df3490d3517 SHA512 5061663c3130a50b03aaf1800a04103afae7db59758bc7957914b07718e50a139c5d486f90098368500c46d3d751ea1659c63531126fb146fb77eaeb6e244ea2
 DIST stringtemplate-3.2.1-4-java21-compatibility.patch 1973 BLAKE2B b48891549f1d9a3386b0a44a78f453a7938122e5b0b5eeba98888bfa843aea4e5732b4dbcf6aac66272c9fe5aeb9ed98aabcf3edcd155f43d5ad0c1d4d4cdd57 SHA512 8dcf841affc0e7da006b13bf4c5d44fc5315aa4790926e8598650b519fd57a4c322e4292ba58561c921308697a4be1b8b6528931eb79e6a9f2e9f7d1370599cc
 DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435 SHA512 76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
 EBUILD stringtemplate-3.2.1-r3.ebuild 1453 BLAKE2B 21864c434a6d4bd30706ecb52ac4bf74ea95796479288f6112c303918f64aa1cefb5d2ec1bf9cf9e3de0471be049ef2ae5d7beab3e93dee0e43223fd400a6e98 SHA512 63d481137f9254f98921386ce84b213ac36cc9a40b09ad31d600415c84eae37be6bb24187c02bed39cd7e791bfeff1eef9bf68ff22dc5046b31e6f536a29db0b
-EBUILD stringtemplate-4.3.4.ebuild 3075 BLAKE2B 0bb4e03971e0eaf7e075335ab9beb80f9a1d4aaf2b7410590745b1559aba0992978b366899fe7b7ae6cc8c932c01f5deca852e75d8f3a5c1434095a73ecd764d SHA512 20133120b08e0bbcc172029594f0038a227d45312ce2f092b0405017f7a9cffb12a73f0399bfe3955a8f6f7ac53c191a19e378a89695ad83752d101bb2987ae3
+EBUILD stringtemplate-4.3.4.ebuild 2968 BLAKE2B d20d6fdd4f51284f89dfeadc900d51d59cdd3f7c53cb99067ec7d2503c4831655cd32372e763acaa97ee41da4c09540f033664ec4a5855a9d01b8030073f3a34 SHA512 065d2d8045efa3678981cf978b9ec4a1c1481bb05a137ee05294c147fd10707da641848eabb781a8e1627f7e6678a5330226f16816440b171c261b10f5877089
 MISC metadata.xml 384 BLAKE2B 16689f763ad8d9c0ce861933ca359a87ff74e2b464b740989a12700c9ad9eb8b2a79b0dd4ca6a2aecfe908b107c6abd907e1a25775783ea911a4a76fdf0d6e19 SHA512 71e70442b1128c1fbddc8ea936584090bf17ab8ecefc0ad35674b7d04bbab4f9981e0b2ea3465a386d43cc3363710fcf0bfd78412f29f387e85b5ebad998dbea
diff --git a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch
index 127f5e0a4b61..22b271671b8d 100644
--- a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch
+++ b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch
@@ -6,7 +6,7 @@ there are different space characters used in java 21 (narrow space)
          String expecting = "datetime: 7/5/05, 12:00 AM";
          if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
              expecting = "datetime: 7/5/05 12:00 AM";
-+        } else if ( javaVersion.startsWith("21") ) {
++        } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) {
 +            expecting = "datetime: 7/5/05, 12:00 AM";
          }
          String result = st.render();
@@ -15,7 +15,7 @@ there are different space characters used in java 21 (narrow space)
          String expecting = " datetime: 7/5/05, 12:00 AM ";
          if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
              expecting = " datetime: 7/5/05 12:00 AM ";
-+        } else if ( javaVersion.startsWith("21") ) {
++        } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) {
 +            expecting = " datetime: 7/5/05, 12:00 AM ";
          }
          String result = st.render();
@@ -24,7 +24,7 @@ there are different space characters used in java 21 (narrow space)
              String expecting = " datetime: Tuesday, July 5, 2005 at 12:00:00 AM Pacific Daylight Time ";
              if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
                  expecting = " datetime: Tuesday, July 5, 2005 12:00:00 AM PDT ";
-+            } else if ( javaVersion.startsWith("21") ) {
++            } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) {
 +                expecting = " datetime: Tuesday, July 5, 2005, 12:00:00 AM Pacific Daylight Time ";
              }
              String result = st.render();
@@ -33,7 +33,7 @@ there are different space characters used in java 21 (narrow space)
          ST st = group.getInstanceOf("dateThing");
          st.add("created", new GregorianCalendar(2005, 7 - 1, 5));
          String expecting = " time: 12:00:00 AM ";
-+        if ( javaVersion.startsWith("21") ) {
++        if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) {
 +            expecting = " time: 12:00:00 AM ";
 +        }
          String result = st.render();
diff --git a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
index dd01fef37fd3..0ed931834169 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
@@ -53,7 +53,10 @@ JAVA_TEST_SRC_DIR="${TARBALL_S}/test"
 JAVA_TEST_RESOURCE_DIRS=( "${TARBALL_S}/test/resources" )
 
 DOCS=( "${TARBALL_S}/"{CHANGES.txt,README.md} )
-PATCHES=( "${FILESDIR}/stringtemplate-4.3.4-BaseTest-javac-source-target.patch" )
+PATCHES=(
+	"${FILESDIR}/stringtemplate-4.3.4-BaseTest-javac-source-target.patch"
+	"${FILESDIR}/stringtemplate-4.3.4-Java21+-TestRenderers.patch"
+)
 
 src_prepare() {
 	default #780585
@@ -65,10 +68,6 @@ src_prepare() {
 }
 
 src_test() {
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -ge 21; then
-		eapply "${FILESDIR}/stringtemplate-4.3.4-Java21-TestRenderers.patch"
-	fi
 	# Make sure no older versions of this slot are present in the classpath
 	# https://bugs.gentoo.org/834138#c4
 	local old_ver_cp="$(nonfatal java-pkg_getjars "${PN}-${SLOT}")"
diff --git a/dev-java/swingx-ws/Manifest b/dev-java/swingx-ws/Manifest
index a547551a387d..56f23d61caad 100644
--- a/dev-java/swingx-ws/Manifest
+++ b/dev-java/swingx-ws/Manifest
@@ -1,4 +1,4 @@
 AUX swingx-ws-1.0_p20110515-replace-sun.misc-classes-for-java-9+.patch 1446 BLAKE2B 4abe6f6f22d46cc2f39720f43645098aad3b9e13ffeba1017dfb06e12f2acd1e3c7fa8e328ab421f24cc907dab223c6098fd65fbeeb500d178af75bab6429913 SHA512 5fe1b2af4834bd90183d9cbe0d697e5fbf22b6c401d7c2240fc1cdece71a24ed80ba8e4fbb3beeb4345761a51c1ee214f02206dac0efa1bf97a60523a39745d0
 DIST swingx-ws-2011_05_15-src.zip 7010679 BLAKE2B 529507f3a7f48d38eb755001b2d442d040adf884a31a49c00f57fc638855e96b195a50813196fdb7318860b0a547eb8220fdd2d05ed613c2cd7d83cb8b7dd7fd SHA512 1929bcd5d615e336fbf77f5c0406a15f0b8aae1ea2167106b8efe2708bf365b39a2313d2a22b5f77ca9559b161db5c50dc18d0cc4cebfcf7a0e4e0c978d4d5da
-EBUILD swingx-ws-1.0_p20110515-r2.ebuild 1886 BLAKE2B f1efab71ab53a8127edc7843813548251640b67ec7eeb86f18e10aba39ac2e4339191bc80c4b15f430a21d50b1fd27677ed4fae48487ef3ee4167fe3e038b05b SHA512 9241fef989fb1e6ac21cd799d78353630ba29c56fa0ef1e2aa0a8d158ba40145d7d482c80074254476c775c1768557a1292c6fc6af4d65c86e7b6f96f615cc71
+EBUILD swingx-ws-1.0_p20110515-r2.ebuild 1881 BLAKE2B 615a2e531486b39aad31024606c37f2959d131d79c87ce1bd1a11a85488dd316a9da6df43cab69037d8f2963ab08a4cf7894477fa544a3f23ce7c33166d4c272 SHA512 e465d7f25e5e36c81fe5600fb97722f79477053bf79df20836b124ea9976ef060ad58991ebabc0fa370266c3eb93bc8e4e56b67c0f889fe5f5db0043061e2bfa
 MISC metadata.xml 460 BLAKE2B 745c927a4a496be4c3ea9ce20a9e70bfcd85887421cc7836f056a2c048101c423f1c2e6c7ae39ebbce80e7f35ee659809463138dc37b5ddc50254d28b8871f79 SHA512 7cc9fcc1d808f78b4b38559af09e21dac1e8832b4e2d21e3a81abfa3881e54572d81fe18c5c646cf0e75179942a007a0bbed97e1809610366edc7de701b49121
diff --git a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild
index 3900e1d0a5c4..fb902a0a9f6b 100644
--- a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild
+++ b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://java.net/projects/swingx-ws/"
 SRC_URI="https://downloads.sourceforge.net/bt747/Development/${MY_P}.zip"
 LICENSE="LGPL-2.1"
 SLOT="bt747"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 CP_DEPEND="
 	dev-java/jakarta-xml-soap-api:1
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index e928213c3115..cd934d8818aa 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,8 +1,14 @@
 AUX tomcat-native-1.2.39-slibtool.patch 829 BLAKE2B 2af44125d0ac68f8fa23c4a48456646401608980775d2631f9b82c16b0596222b04ecafd2914d95fa01c6fc460de602a0028ef2d58f0a0d77c95d2c81a0145db SHA512 89bdb82f5cca2a32be8cfa4c72122d0e713eea099d081faa8ac5b4af8127a4d36913ec6a2c172511024b223f34fdfcc6c1d1550859a0e96d71820a6997efc078
 DIST tomcat-native-1.3.0-src.tar.gz 345276 BLAKE2B 73e8433e12bdd88036509f4ffbd2c0ed25b367567728829a56918d082627d43643865c492f4bc8eac4551e2ed82648ada71e6decfb45c173a856ab2fda6e01a5 SHA512 5a6c7337280774525c97e36e24d7d278ba15edd63c66cec1b3e5ecdc472f8d0535e31eac83cf0bdc68810eb779e2a118d6b4f6238b509f69a71d037c905fa433
 DIST tomcat-native-1.3.0-src.tar.gz.asc 833 BLAKE2B b7e05447643000ffda0d66143c199192b41843f10ae89874c353d613f612a6d481be3081aa971b640a3bedc6c903be7d052c418e2abc2d7d6db42924c7b3cf91 SHA512 9cfc137cd13086ccf421376a006164e6e6e14844636457db0cf7c0f699a1b1ceab28a52bd80da71dc9e190bdf84676abfdbe07a0cabecfc59b7845ac82a171e5
+DIST tomcat-native-1.3.1-src.tar.gz 346588 BLAKE2B 3b979845dd10a0c74c7ed2e6404b217c7bdebf2d432ac904b50f8288cd3cf3b1489b4e5111ce02eca442c45deb805523062862225130386a6d47853cd972d788 SHA512 06951c67d2739ab9205a537d24345e13e4472f192602fc52015ea84612c6e2c9334404b30a82be7d1e7d4ce470ea9df8b1b8ca1a3b8674d82706ff432280724f
+DIST tomcat-native-1.3.1-src.tar.gz.asc 833 BLAKE2B d7483efea5dc4d9cc069a667896950526e22a6b4b0ee1fd6739754196d1b9e84a2b16f766f68419faf2c3fcc87d1fa83c9985de7149849d4f761d2c5b7e45af7 SHA512 3550e38556dab5594aea469cd8ae43505deceeab25bf60ecd61c26ed1106ce88e35634f936cb36e7fc766f30b5c5f0f19dd01a1513ed219ae7f68c8c10e960f1
 DIST tomcat-native-2.0.7-src.tar.gz 538131 BLAKE2B ef973c830e3e3e04f4bf7bd711915b1ac5f28e34832edd0750117a5d6b00f9a7fa9e390858d23bfaeeb08ad825d7dcc1e95967c00d4ada96cac83377fca7bea6 SHA512 625b334271494f7c86c06d6a8c6d13c06d9d6094f65cccbdc8d3df13ee2aae4cb42ad326e20bcbf8a8f141240111778991882f9bf87793b09a2920433d6c8c85
 DIST tomcat-native-2.0.7-src.tar.gz.asc 833 BLAKE2B 081f40de6fdc5ad819a167e0150a2e03ab8d4fd679be0dbabac9a9f2aabffd2fa36fd6a9c764deefd419576dcda07bc1b22ea2f14c04eddbfa7f94e4834bec7e SHA512 16a96a3c3b55d258ad0820c30392f37643f433c563b74a983109492569d06a399471acc42c7f07b87b50bff8711bc10ed278bfa183807bcdde1355e6b8058605
+DIST tomcat-native-2.0.8-src.tar.gz 471386 BLAKE2B 7fb5e3c4671e4b56bfa5eb546ac1f87fdf1e33b350533ffcadb9005c1f3054013d61d15f4212923d9ec9370d15fd2717e2b446c80818c82d83cd9f1497e321c4 SHA512 fd45533b9c34b008717d18ed49334c7286b93c849c487c1c42746f2998cc4a6ff0362e536a8b5124c6539847a92a9f7631c7638a21cd5d22134fe1a9bb0f0702
+DIST tomcat-native-2.0.8-src.tar.gz.asc 833 BLAKE2B b438034baf5191ce2af55087d1fcd55f196c3cfa75dc2c7fc9d1bfa8fa5b5289181dad6a02e55674e7d685482228df603478ba1f73a9b67169f50390cdd198a7 SHA512 64879cd6f02a6213a2b6cd102dc175d968a7c20bc821877e9f6f5bbaa11069e5cb672b584c47e3a7563a6c872d56646535a59e42331a2ad524c7f85e628085df
 EBUILD tomcat-native-1.3.0.ebuild 2210 BLAKE2B 34fe48c4c0fca3aa6c7db823ca2fe2957bf6f664af78ed0107164bfae6eefb2db4697817cb8dc3d7c695573535d905362e32b858715041c0910c0b38db14846a SHA512 f26273200fc7b14db5c71fdf6ff20f19ed802355736bfbba067ab5a02247de93617a67ceed14350ddc62b43a84407144e8194aad7a464dd4cdae7c7e55a6c4e2
+EBUILD tomcat-native-1.3.1.ebuild 2211 BLAKE2B 532b7197fc277f5abee07feb68546fcf288029788cbb0a0d226fd526cec4d8ca99867e06099a2e16f2ce6c70e8f5f56a4430c865ff43bbfd0ac73973b7a2992b SHA512 5175785147aa997299eb5bb07de853ecce0b5524bc9bb06bf18df8c4c26e9449dfceff2ce83874cc185bcd09f88774a9740929b30aa5939a6915987cd307c92c
 EBUILD tomcat-native-2.0.7.ebuild 1964 BLAKE2B 20268866489e1a85e741358b2fea72449b1acb35a00cfaccb8483d8025579450c61762ca4547616148dbdad89a14cfaf7c8457342f4748619cb7a07cb7670170 SHA512 dcca9bd56e243dd7c6d619b0dc2659ffe6d4a2a808e02af06799f5640e6a0fb54d16b01d7744b4d382659c67731dd8db7c7bdca849a1ee643fa19ad9235c8d73
+EBUILD tomcat-native-2.0.8.ebuild 1965 BLAKE2B 5c52f6a9f0720061cd6678980a0f7ea9a1488d2438694261cdb38afb9c20fd86535cd5b088cb49b6744a7a16da0d35671d279cef7a1adab131c5d7b919f0a8da SHA512 af02bfe3059d88f2e2ae6e24bae5a58022abb10423f7f58f6d30f752ed58677509dbc6c96cc0e170d1e96c8ec6a6d6ea38aacc8478a8956caad2e5ae5bbabab6
 MISC metadata.xml 1096 BLAKE2B cc5973c26004db986d1cd7020212163380883cb3b01ed08b518d87abaf43a1e875de226064a123b9a5792e0e2285e70eeb50234654049ad22d906c4c5c454928 SHA512 f19053a4c75f84fa8491aee4f74d7334e369bb38125c69f6c839d37cc3b6c90ce348039845a3635d0b637b50c379efaee22dd811c46c49645fc6f8192e7a01cc
diff --git a/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild b/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild
new file mode 100644
index 000000000000..f3d7eb0760fe
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
+HOMEPAGE="https://tomcat.apache.org/native-doc/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz
+	verify-sig? (
+		https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz.asc
+	)"
+S=${WORKDIR}/${P}-src/native
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+RDEPEND="
+	dev-libs/apr:1=
+	dev-libs/openssl:0/3
+	>=virtual/jre-1.8:*
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
+
+JAVA_RESOURCE_DIRS="../resources"
+JAVA_SRC_DIR="../java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="../test"
+
+DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
+PATCHES=( "${FILESDIR}/tomcat-native-1.2.39-slibtool.patch" )
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
+	sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \
+		../build.xml \
+		| sed "s:\${version}:${PV}:" \
+		> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
+		--with-ssl="${EPREFIX}"/usr
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	default
+}
+
+src_test() {
+	# Adjusting "String testFile =" path in TestFile.java:29 to match ${S}
+	sed \
+		-e '/String testFile =/s&test/&../test/&' \
+		-i ../test/org/apache/tomcat/jni/TestFile.java || die
+
+	JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" )
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_doso .libs/*.so*
+	dodoc -r ../docs
+	! use static-libs && find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "For more information, please visit"
+	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
+}
diff --git a/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild
new file mode 100644
index 000000000000..8bddbdc05820
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
+HOMEPAGE="https://tomcat.apache.org/native-doc/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz
+	verify-sig? (
+		https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc
+	)"
+S=${WORKDIR}/${P}-src/native
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+RDEPEND="
+	dev-libs/apr:1=
+	dev-libs/openssl:0/3
+	>=virtual/jre-1.8:*
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
+
+JAVA_RESOURCE_DIRS="../resources"
+JAVA_SRC_DIR="../java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="../test"
+
+DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
+	sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \
+		../build.xml \
+		| sed "s:\${version}:${PV}:" \
+		> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
+		--with-ssl="${EPREFIX}"/usr
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	default
+}
+
+src_test() {
+	JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" )
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_doso .libs/*.so*
+	dodoc -r ../docs
+	! use static-libs && find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "For more information, please visit"
+	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
+}
author	V3n3RiX <venerix@koprulu.sector>	2024-08-07 12:37:21 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2024-08-07 12:37:21 +0100
commit	b8c7370a682e4e29cda623222d17a790c01c3642 (patch)
tree	f6caa14689bd00a5760eadaa381ff41e50ef3c1b /dev-java
parent	8a4997a7e2d1e36c089d4d76935b5a902d98d3d0 (diff)