gentoo auto-resync : 21:10:2024 - 04:04:33

30 files changed, 719 insertions, 375 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index ab59055b0c63..800599b087c5 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index c9da780f64d4..9fa83a9c9eeb 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -6,5 +6,8 @@ AUX ant-1.10.14-LinkTest.patch 4329 BLAKE2B d4165d378dd63cab2a9d813c9d26c1ef7404
 AUX ant-1.10.14-PathTest.patch 1114 BLAKE2B 870f35f250b4cd31317972c09f4a90eb26b71a8f198d1e96a085f99e0d6e41fd06c0598bcdae35c400aa8ba9b65e52b7dc0d7119308c60c8573a185907f2b7ba SHA512 9847fb3f6f3c2a37ac1e483ca7ac5685cc3d296b92ae35816fc4c58bb4de57d89196c50fabfa546efbec2303ea360066658507be0b4bdaeae3d5ff00e023f498
 DIST apache-ant-1.10.14-src.tar.xz 3779488 BLAKE2B 40091c208c795d03b8f34656594cbf6c414f345cdacf637ece89a19a3ab0373cd8d65c342e0c4603569f9120f8f99a0b2eae8df874e6183649b39d7b88c614b8 SHA512 52936dfceb808a11dc842d2dc957a031508689270b59a2a6e3589f40465f6fa1aae87b189737cdd83eadfaf41b0c3f1ba2579bbd07591153107a5a27422521bd
 DIST apache-ant-1.10.14-src.tar.xz.asc 833 BLAKE2B 4f8b1bb8bbd6d77b6e9eedf86818d42bb448e1b394e00590163e96967e36fe8e8e73e3f4fbf3b5bd1dab51cf69a39b99409bd8604cb7695cd6ae875ff13344a9 SHA512 2b91eda436210247ba39b82ba8aa1859051cf9baaf8ac8b551052e7986aeaa03c8b594347b8a734e08d12d8e270e29bf89b814562550a418abd0d2393ad4ac66
+DIST apache-ant-1.10.15-src.tar.xz 3780456 BLAKE2B c157b488ac5f207daf5afcec3368395cacd44d82e0b8e19cbdf637e8ea43bafd340fcb13aede1292f7a0b31ae82a968831c51dabebfccf2fafb6479aa79f7dc4 SHA512 7513c0909abcc2ebcbb552ec97eaa35f476e57fec54022755d2e83d9d6df5295e0d75274e687208a4689a30592c19a0df041dff511dd3690627b1734ee2171c5
+DIST apache-ant-1.10.15-src.tar.xz.asc 833 BLAKE2B e8741004b141955c729778cb987034f133af174dfc07c75976c8eda13272703b9b6158c68594f54dfef47c0f546c43cc97176b2a9193263076251a75b2f12129 SHA512 3585f32ef230e502db6a376d6343c74eae390931ae6a5c842b668eda6fbce1557e5d400001bbb244544c186e9e51cae4c2c05ccd6ff38cdbb16899aff5d48659
 EBUILD ant-1.10.14-r3.ebuild 13076 BLAKE2B 2168f00aeb12dd66b46d063c3d593c985c9123ae3ef940d5f7a52e40d22240075040b78437a4a23e2f951901380e3022ec99009a87a93a9327edd2a546f1576a SHA512 df08ce210a32da087e045590d63c3ee0337e307f964174c79ed1c2f2f2a4d07441ed506c1ef2c6ef4e6181a7992ba82fdfafe808f911f4efc2d2fce0e69aaa3d
+EBUILD ant-1.10.15.ebuild 12964 BLAKE2B e07dcecda289e3d97a612b7b78b2639fb80db994f11c342ce4ef2aabc1b2594d831d2cfdbe87dd4c697f340054a6e3ecaee82e4e007603ee0955f9f07e4a0902 SHA512 efb98501074856dce0cc95a25b0c249ae647b1f9db796baa9772dbd944640cc21dc325389d0fb170240e3aa599e006e62503279456715b62d1f3fdaab56978cd
 MISC metadata.xml 1928 BLAKE2B b48dbca1bf2ab76b0107466c68489722f4ceed5fa53f2a26d983dfd36c74efad96fce9f58d0e6bb5ba1e02d8e44135bcf96bd77b2db7491fd260da907c02fbab SHA512 9313f5e0914d9c64482c4897e659313480630316ca29b57190e976248a63a17b3c293198f82d4143bd25be0766cd4ce9556d2489d76adf74b0203a9dc4998726
diff --git a/dev-java/ant/ant-1.10.15.ebuild b/dev-java/ant/ant-1.10.15.ebuild
new file mode 100644
index 000000000000..9738f6ec6e14
--- /dev/null
+++ b/dev-java/ant/ant-1.10.15.ebuild
@@ -0,0 +1,392 @@
+# 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_PROVIDES="
+	org.apache.ant:ant:${PV}
+	org.apache.ant:ant-launcher:${PV}
+"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig prefix
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
+HOMEPAGE="https://ant.apache.org/"
+SRC_URI="mirror://apache/ant/source/apache-${P}-src.tar.xz
+	verify-sig? ( https://downloads.apache.org/ant/source/apache-${P}-src.tar.xz.asc )"
+S="${WORKDIR}/apache-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="antlr bcel bsf commonslogging commonsnet imageio jai jakartamail javamail jdepend
+	jmf jsch junit junit4 junitlauncher log4j oro regexp resolver swing testutil xalan xz"
+
+# At least 10 test cases would fail without network
+PROPERTIES="test_network"
+RESTRICT="test"
+
+REQUIRED_USE="
+	junit4? ( junit )
+	test? ( bsf )
+	testutil? ( junit )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/ant.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-ant )"
+# jdk-11:* because it needs java/util/spi/ToolProvider, available since Java 9.
+DEPEND="
+	>=virtual/jdk-11:*
+	bcel? ( dev-java/bcel:0 )
+	bsf? ( dev-java/bsf:2.3 )
+	commonslogging? ( dev-java/commons-logging:0 )
+	commonsnet? ( dev-java/commons-net:0 )
+	jai? ( dev-java/sun-jai-bin:0 )
+	jakartamail? ( dev-java/jakarta-mail:0 )
+	javamail? (
+		dev-java/jakarta-activation-api:1
+		dev-java/javax-mail:0
+	)
+	jdepend? ( >=dev-java/jdepend-2.10-r1:0 )
+	jsch? ( dev-java/jsch:0 )
+	junit4? ( dev-java/junit:4 )
+	junit? ( dev-java/junit:4 )
+	junitlauncher? ( dev-java/junit:5[vintage] )
+	log4j? ( dev-java/log4j-12-api:2 )
+	oro? ( dev-java/jakarta-oro:2.0 )
+	regexp? ( dev-java/jakarta-regexp:1.4 )
+	resolver? ( dev-java/xml-commons-resolver:0 )
+	test? (
+		dev-java/antunit:0
+		dev-java/bsf:2.3[javascript]
+		dev-java/bsh:0
+		dev-java/hamcrest-library:1.3
+		dev-java/xerces:2
+	)
+	xalan? (
+		dev-java/xalan:0
+		dev-java/xalan-serializer:0
+	)
+	xz? ( dev-java/xz-java:0 )
+"
+RDEPEND="
+	!dev-java/ant-apache-regexp
+	!dev-java/ant-apache-log4j
+	!dev-java/ant-apache-xalan2
+	!dev-java/ant-commons-logging
+	!<dev-java/ant-core-1.10.14
+	!dev-java/ant-swing
+	!dev-java/ant-junit4
+	!dev-java/ant-testutil
+	!dev-java/ant-junitlauncher
+	!dev-java/ant-jai
+	!dev-java/ant-commons-net
+	!dev-java/ant-apache-bsf
+	!dev-java/ant-jmf
+	!dev-java/ant-apache-oro
+	!dev-java/ant-javamail
+	!dev-java/ant-junit
+	!dev-java/ant-jdepend
+	!dev-java/ant-antlr
+	!dev-java/ant-apache-bcel
+	!dev-java/ant-apache-resolver
+	!dev-java/ant-jsch
+	!dev-java/ant-xz
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( CONTRIBUTORS INSTALL NOTICE README WHATSNEW )
+PATCHES=(
+	"${FILESDIR}/1.10.9-launch.patch"	# reusing this patch since the script has not changed
+	"${FILESDIR}/ant-1.10.14-AntlibTest.patch"	# skips  1 of  6 tests
+	"${FILESDIR}/ant-1.10.14-AntTest.patch"		# skips  1 of 32 tests
+	"${FILESDIR}/ant-1.10.14-JavaTest.patch"	# skips 12 of 38 tests
+	"${FILESDIR}/ant-1.10.14-LinkTest.patch"	# skips  4 of 67 tests
+	"${FILESDIR}/ant-1.10.14-PathTest.patch"	# skips  1 of 33 tests
+)
+
+JAVADOC_SRC_DIRS=(
+	ant
+	ant-launcher/src/main
+)
+JAVA_TEST_GENTOO_CLASSPATH="
+	bsh
+	hamcrest-library-1.3
+	junit-4
+	xerces-2
+"
+JAVA_TEST_RESOURCE_DIRS=(
+	"src/etc/testcases"
+	"src/main"
+)
+JAVA_TEST_SRC_DIR="src/tests/junit"
+
+# $1 ant-apache-bsf (source directory)
+# $2 bsf-2.3  (classpath of external dependency)
+taskdeps() {
+	if [[ ${task} == $1 ]]; then
+		JAVA_CLASSPATH_EXTRA="${2}"
+		JAVADOC_CLASSPATH+=" ${2}"
+		JAVADOC_SRC_DIRS+=( "${task}/src/main" )
+		JAVA_RESOURCE_DIRS="${3}"
+	fi
+}
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	java-pkg_clean ! -path "./src/etc/*" # keep test resources
+
+	eprefixify "src/script/ant"
+
+	ANT_TASKS=(
+		$(use antlr && echo ant-antlr) # no dependencies
+		$(use bcel && echo ant-apache-bcel)
+		$(use bsf && echo ant-apache-bsf) # REQUIRED_USE for tests
+		$(use log4j && echo ant-apache-log4j)
+		$(use oro && echo ant-apache-oro)	# ORO is retired - replace with java.util.regex?
+		$(use regexp && echo ant-apache-regexp)
+		$(use resolver && echo ant-apache-resolver)
+		$(use xalan && echo ant-apache-xalan2)
+		$(use commonslogging && echo ant-commons-logging)
+		$(use commonsnet && echo ant-commons-net)
+		$(use imageio && echo ant-imageio)	# no dependencies
+		$(use jai && echo ant-jai)
+		$(use jakartamail && echo ant-jakartamail)
+		$(use javamail && echo ant-javamail)
+		$(use jdepend && echo ant-jdepend)
+		$(use jmf && echo ant-jmf)	# no dependencies
+		$(use jsch && echo ant-jsch)
+		$(use junit && echo ant-junit)	# REQUIRED_USE for junit4 and for testutil
+		$(use junit4 && echo ant-junit4)
+		$(use junitlauncher && echo ant-junitlauncher)
+		# depends on "com.ibm.netrexx:netrexx:2.0.5" which is
+		# available on https://www.netrexx.org/downloads.nsp and states:
+		# "IBM's last NetRexx release, suitable for JVM versions 1.5 and below [...]"
+		# $(use netrexx && echo ant-netrexx) # src/etc/poms/ant-netrexx/pom.xml
+		$(use swing && echo ant-swing) # no dependencies
+		$(use testutil && echo ant-testutil)
+		$(use xz && echo ant-xz)
+	)
+
+	# defaultManifest.mf
+	sed -e "s:\${project.version}:${PV}:" \
+		-i src/main/org/apache/tools/ant/defaultManifest.mf || die
+
+	# version.txt
+	local mydate="$(date '+%B %d %Y')"
+	echo "VERSION=${PV}" > src/main/org/apache/tools/ant/version.txt || die
+	echo "DATE=${mydate}" >> src/main/org/apache/tools/ant/version.txt || die
+
+	# src directory for ant.jar
+	mkdir ant || die "cannot create src directory for ant"
+	cp -r {src/main/,ant}/org || die "cannot copy ant sources"
+
+	# resources directory for ant.jar according to lines 317-325 src/etc/poms/ant/pom.xml
+	local INCLUDES=( $(
+		sed -n '/<resources>/,/<\/resources>/p' \
+			src/etc/poms/ant/pom.xml \
+		| grep org \
+		| sed -e 's:.*<include>\(.*\)</include>:\1:' || die
+	))
+	cp -r {src/,ant}/resources || die "cannot copy ant resources"
+	pushd src/main > /dev/null || die "pushd src/main"
+		cp --parents -v "${INCLUDES[@]}" ../../ant/resources || die "CANNOT"
+	popd > /dev/null || die "popd"
+
+	# Remove sources according to lines 158-187 src/etc/poms/ant/pom.xml
+	# We don't remove anything from src/main/org
+	local EXCLUDES=$(
+		sed -n '/<excludes>/,/<\/excludes/p' \
+			src/etc/poms/ant/pom.xml \
+		| grep org \
+		| sed -e 's:<exclude>\(.*\)</exclude>:ant/\1:' || die
+	)
+	rm -r ${EXCLUDES} || die
+	# Remove one more file directly, could not get it with sed.
+	rm ant/org/apache/tools/ant/taskdefs/optional/ANTLR.java || die
+
+	# Same handling for everything between <testExcludes> </testExcludes>
+	# Removing non-existing files is not possible: We ignore them ( grep -v ).
+	local TEST_EXCLUDES=$(
+		sed -n '/<testExcludes>/,/<\/testExcludes/p' \
+			src/etc/poms/ant/pom.xml \
+		| grep org \
+		| grep -v CommonsLoggingListener \
+		| grep -v Log4jListener \
+		| sed -e 's:<exclude>\(.*\)</exclude>:src/tests/junit/\1:' || die
+	)
+	rm -r ${TEST_EXCLUDES} || die
+
+	# Prepare a separate JAVA_SRC_DIR directory for each jar file to be created.
+	einfo "Copy source files of ant-tasks"
+	local task
+	for task in ant-launcher "${ANT_TASKS[@]}"; do
+		# "${task}/src/main" will be JAVA_SRC_DIR
+		mkdir -p "${task}/src/main" || die "mkdir ${task}"
+		# Read from pom.xml the file names which can still contain wildcards
+		local INCLUDES=( $(
+			sed -n '/<includes>/,/<\/includes>/p' "src/etc/poms/${task}/pom.xml" \
+			| grep org \
+			| sed -e 's:.*<include>\(.*\)</include>:\1:' || die
+		))
+		local sourcefile
+		# Resolve wildcards in file names using find and copy the files to the corresponding
+		# "${task}"/src/main directory
+	#	echo "${INCLUDES[@]}"
+		for sourcefile in "${INCLUDES[@]}"; do
+	#		einfo "${task}: ${sourcefile}"
+			# Parameter substitution % to remove trailing slash from ${sourcefile}.
+			# Applies to ant-jdepend and ant-junitlauncher where find would otherwise fail.
+			find  \
+				-path "./src/*/${sourcefile%/}" \
+				-exec cp -r --parents "{}" \
+				"${task}/src/main" \;
+		done
+	#	tree "${task}"
+	done
+
+	# JAVA_RESOURCE_DIRS for ant-junit
+	mkdir -p ant-junit/src/resources/org/apache/tools/ant/taskdefs/optional/junit/xsl \
+		|| die "junit resource dir"
+	cp src/etc/{junit-frames,junit-noframes,junit-frames-saxon,junit-noframes-saxon}.xsl \
+		ant-junit/src/resources/org/apache/tools/ant/taskdefs/optional/junit/xsl \
+		|| die "junit resources"
+}
+
+src_compile() {
+	einfo "Compiling ant-launcher.jar"
+	JAVA_JAR_FILENAME="ant-launcher.jar"
+	JAVA_MAIN_CLASS="org.apache.tools.ant.launch.Launcher"
+	JAVA_SRC_DIR="ant-launcher/src/main"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":ant-launcher.jar"
+	rm -r target || die
+
+	einfo "Compiling ant.jar"
+	JAVA_JAR_FILENAME="ant.jar"
+	JAVA_LAUNCHER_FILENAME="ant"
+	JAVA_MAIN_CLASS="org.apache.tools.ant.Main"
+	JAVA_RESOURCE_DIRS="ant/resources"
+	JAVA_SRC_DIR="ant"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":ant.jar"
+	rm -r target || die
+
+	local task
+	for task in "${ANT_TASKS[@]}"; do
+		einfo "Compiling ${task}"
+		JAVA_JAR_FILENAME="${task}.jar"
+		JAVA_MAIN_CLASS=""
+		JAVA_RESOURCE_DIRS=""
+		JAVA_SRC_DIR=""
+
+		JAVA_SRC_DIR="${task}/src/main"
+		taskdeps ant-apache-bcel bcel
+		taskdeps ant-apache-bsf bsf-2.3
+		taskdeps ant-apache-log4j log4j-12-api-2
+		taskdeps ant-apache-oro jakarta-oro-2.0
+		taskdeps ant-apache-regexp jakarta-regexp-1.4
+		taskdeps ant-apache-resolver xml-commons-resolver
+		taskdeps ant-apache-xalan2 xalan
+		taskdeps ant-commons-logging commons-logging
+		taskdeps ant-commons-net commons-net
+		taskdeps ant-jai sun-jai-bin
+		taskdeps ant-jakartamail jakarta-mail
+		taskdeps ant-javamail 'javax-mail jakarta-activation-api-1'
+		taskdeps ant-jdepend jdepend
+		taskdeps ant-jsch jsch
+		taskdeps ant-junit junit-4 ant-junit/src/resources
+		taskdeps ant-junit4 junit-4
+		taskdeps ant-junitlauncher junit-5
+		# $(use netrexx && echo ant-netrexx)
+		taskdeps ant-xz xz-java
+
+		java-pkg-simple_src_compile
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":${task}.jar"
+		rm -fr target || die
+	done
+	use doc && ejavadoc
+}
+
+src_test() {
+	# Avoid "--with-dependencies" as used by JAVA_TEST_GENTOO_CLASSPATH.
+	# dev-java/antunit has a circular dependency with dev-java/ant[test]
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only antunit)"
+	# according to line 115 src/etc/poms/ant/pom.xml
+	jar -cvf src/etc/testcases/org/apache/tools/ant/taskdefs/test2-antlib.jar \
+		-C src/etc/testcases taskdefs/test.antlib.xml || die "cannot test2-antlib.jar"
+
+	JAVA_TEST_EXCLUDES=(
+		# according to lines 1956-1964 build.xml (abstract classes, not testcases)
+		org.apache.tools.ant.taskdefs.TaskdefsTest
+		org.apache.tools.ant.BuildFileTest
+		org.apache.tools.ant.util.regexp.RegexpMatcherTest
+		org.apache.tools.ant.util.regexp.RegexpTest
+		org.apache.tools.ant.types.selectors.BaseSelectorTest
+		# according to line 1970 build.xml (helper classes, not testcases)
+		org.apache.tools.ant.TestHelper
+		# lines 2097-2102 build.xml (interactive tests)
+		org.apache.tools.ant.taskdefs.TestProcess			# 1. No runnable methods
+		# 1) testAll(org.apache.tools.ant.taskdefs.InitializeClassTest)
+		# /var/tmp/portage/dev-java/ant-1.10.14/work/apache-ant-1.10.14/
+		# src/etc/testcases/taskdefs/initializeclass.xml:24: Java returned: 1
+		# 	<pathelement path="${build.tests.value}"/>
+		# 	<pathelement location="${java.home}/lib/classes.zip"/>
+		org.apache.tools.ant.taskdefs.InitializeClassTest	# Tests run: 1,  Failures: 1
+	)
+
+#	tests with patches to be revisited
+#	JAVA_TEST_RUN_ONLY=(
+#		org.apache.tools.ant.taskdefs.AntlibTest			# Tests run: 6,  Failures: 1 test2-antlib.jar?
+#		org.apache.tools.ant.taskdefs.AntTest				# Tests run: 32,  Failures: 1
+#		org.apache.tools.ant.taskdefs.JavaTest				# Tests run: 38,  Failures: 12
+#		org.apache.tools.ant.taskdefs.modules.LinkTest		# Tests run: 67,  Failures: 4
+#		org.apache.tools.ant.types.PathTest					# Tests run: 33,  Failures: 1
+#	)
+
+	# according to lines 276-297 src/etc/poms/ant/pom.xml
+	JAVA_TEST_EXTRA_ARGS=(
+		-Dant.home="${ANT_HOME}"
+		-Dbuild.classes.value=../../../target/test-classes	# needed for org.apache.tools.ant.taskdefs.SignJarTest
+		-Dbuild.tests.value=target/test-classes
+		-Doffline=true
+		-Dant.test.basedir.ignore=true
+	)
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg_dojar ant.jar ant-launcher.jar
+
+	for task in "${ANT_TASKS[@]}"; do
+		java-pkg_dojar "${task}.jar"
+		java-pkg_register-ant-task --version "${PV}" "${task}"
+	done
+
+	dobin src/script/ant
+
+	dodir /usr/share/ant/bin
+	for each in antRun antRun.pl runant.pl runant.py ; do
+		dobin "${S}/src/script/${each}"
+	done
+
+	insinto /usr/share/ant/etc
+	doins -r src/etc/*.xsl
+	insinto /usr/share/ant/etc/checkstyle
+	doins -r src/etc/checkstyle/*.xsl
+
+	echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
+	doenvd "${T}/20ant"
+
+	einstalldocs
+	if use doc; then
+		java-pkg_dojavadoc target/api
+		docinto html
+		dodoc -r manual
+	fi
+
+	use source && java-pkg_dosrc src/main/*
+}
diff --git a/dev-java/commons-csv/Manifest b/dev-java/commons-csv/Manifest
index 9fb9e3a80534..ba48a5459f49 100644
--- a/dev-java/commons-csv/Manifest
+++ b/dev-java/commons-csv/Manifest
@@ -1,3 +1,6 @@
+DIST commons-csv-1.12.0-src.tar.gz 36993963 BLAKE2B ae6e207906efa3265ba92e1919356c77fa75616eaae0b095d9795100df2c5eb514c73a855ab4fc7a77c7958aff2eacaac860775b514e705e010e6cd3e5fb9e8c SHA512 67d8fd651a9785825b2f13c5f6bd95e0f2649ef9f65ec6889a2f9fcb34bd7a2a8c2b2df06e71eb0bcb1d0063953696daadbe06cf87624714682f0c3235fe7d11
+DIST commons-csv-1.12.0-src.tar.gz.asc 488 BLAKE2B a8185e5625b87fa6040b989f3c5d768c6cd689a63ddcec871b4a38ac1b4b8ae053f03d2a5f1a8e209205c1203f3514e8ef352e7c61eef009508cc0271a3944ad SHA512 0a74375a57a585cb7182cbd1935850b456ad33c119111eff8bac9c39470ed522ad64527b759eb1df5563ca12ca7dab983b7bf6eec3565970969e8d94ba357d4b
 DIST commons-csv-1.9.0-sources.tar.gz 36975991 BLAKE2B b2e2091556f3766968dbe660e4059f491eedc458d3c15c0372770d144737ab3ddcc78ff36f674759bde8aa9690e4bbe14866f8546e1de3b67498736678650697 SHA512 4610197fbbf1b3fb3ff19ff8f5ee0ffe945c34c05e3db71b89156bf17aa7f6b2816ddace85457fec82cb22337f777e08eac5984d7299e702b537f0d242d368d8
+EBUILD commons-csv-1.12.0.ebuild 2340 BLAKE2B d0134d6af52b1f7ae82b49f789ba975104f1abecb427e68493d61ccb72f788095309e5eb179b91da49b2a1732d02537ba2be8cb31b1b8268586c7a427f6a99e1 SHA512 8fda52ae8a0b0ef3959750532f31ecd426b5f17dca09de9c5f3ccb2d38e5ef021e73da2d8077b38ff52bf73663e2f308f4f35ad5fadb278e6e9bef88e6ec50d3
 EBUILD commons-csv-1.9.0.ebuild 1662 BLAKE2B c8d57f66182a8c4338d4c13cee4ce8b9804dc2071298576c5871f53b40c88fe77f95e35c51362a7c28f8673940a697f03e5dcac93c5bd690e72dce9e8f97b241 SHA512 f17b7cbf6f44e114f20b60ed0abda6efe6eb04b87ff05bca0c2617dd2ca65b8c76452a7f7534735be75536ed373016b57139e9f2fc76092af71940a1baa11c8b
 MISC metadata.xml 416 BLAKE2B 193c84e7cdd7d31c475be29d0f00c44f86dba7226d4c9d3de052b9ecc8e2dae8fe9b402cdd797b04d714253591b39b3f858be13caf0584b1e67f6756cbae7bce SHA512 9c3695f3b80d8efb699cf1f1b8801aa173480a71604abdcc8cf3d093f9631fbf0ef2c6cfbf22ae106831b0b58747219184966904b9c3622c1ce424d4325e18b6
diff --git a/dev-java/commons-csv/commons-csv-1.12.0.ebuild b/dev-java/commons-csv/commons-csv-1.12.0.ebuild
new file mode 100644
index 000000000000..a85b884d5160
--- /dev/null
+++ b/dev-java/commons-csv/commons-csv-1.12.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.commons:commons-csv:1.12.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Simple interface for reading and writing CSV files of various types"
+HOMEPAGE="https://commons.apache.org/proper/commons-csv/"
+SRC_URI="mirror://apache/commons/csv/source/${P}-src.tar.gz
+	verify-sig? ( https://archive.apache.org/dist/commons/csv/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+RESTRICT="test"	#839681
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	dev-java/commons-codec:0
+	dev-java/commons-io:1
+	test? (
+		>=dev-java/commons-lang-3.12.0:3.6
+		dev-java/junit:5
+		dev-java/mockito:4
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( LICENSE.txt NOTICE.txt RELEASE-NOTES.txt )
+
+JAVA_CLASSPATH_EXTRA="
+	commons-codec
+	commons-io-1
+"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+	commons-io-1
+	commons-lang-3.6
+	junit-5
+	mockito-4
+"
+
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_compile() {
+	# getting dependencies into the modulepath
+	DEPENDENCIES=(
+		commons-codec
+		commons-io-1
+	)
+	local modulepath
+	for dependency in ${DEPENDENCIES[@]}; do
+		modulepath="${modulepath}:$(java-pkg_getjars --build-only ${dependency})"
+	done
+
+	local JAVA_MODULE_NAME="org.apache.${PN/-/.}"
+	JAVA_JAR_FILENAME="${JAVA_MODULE_NAME}.jar"
+	java-pkg-simple_src_compile	# creates a legacy jar file without module-info
+
+	# generate module-info.java
+	jdeps \
+		--module-path "${modulepath}" \
+		--add-modules=ALL-MODULE-PATH \
+		--generate-module-info src/main \
+		--multi-release 9 \
+		"${JAVA_MODULE_NAME}.jar" || die
+
+	# compile module-info.java
+	ejavac \
+		-source 9 -target 9 \
+		--module-path "${modulepath}" \
+		--patch-module "${JAVA_MODULE_NAME}"="${JAVA_MODULE_NAME}.jar" \
+		-d target/versions/9 \
+		src/main/"${JAVA_MODULE_NAME}"/versions/9/module-info.java
+
+	# package
+	JAVA_JAR_FILENAME="${PN}.jar"
+	jar cvf "${JAVA_JAR_FILENAME}" \
+		-C target/classes . \
+		--release 9 -C target/versions/9 . || die
+}
diff --git a/dev-java/jakarta-servlet-api/Manifest b/dev-java/jakarta-servlet-api/Manifest
index 388b5af1334d..6247204c799f 100644
--- a/dev-java/jakarta-servlet-api/Manifest
+++ b/dev-java/jakarta-servlet-api/Manifest
@@ -1,5 +1,7 @@
 DIST jakarta-servlet-api-4.0.4-RELEASE.tar.gz 188270 BLAKE2B 6c5db208603333abb9aa31726e60d489c5f860e3b6ad61e691d65e8b99909a8139f7677cec52d2a74ed9e8445ea2f0f510875ca32a2e512a09183245a9822889 SHA512 9cd613f8c33f5d415b06f70543eee926c81e87a14d03b837998a6c4db11ce5fb9c2b97f796f2936a63f2a6dc7847d7a97aec7a804b80234cd52e4bfdca9920a9
 DIST jakarta-servlet-api-6.0.0-RELEASE.tar.gz 634690 BLAKE2B e48375f6a0b74950a2c50d73f2d50f7c79db96e22d5c845380bff670948cd1a1d1ea98eaf93e7fa02887e94010c8573382ba3f6fb52a8fca6fa98e5915c307f6 SHA512 65285bce3e8b5143eb33d548549ff5653c6c90f55e7a19e8fdb4a7799842d3430cfe0cebe54f7a7d253d9da4c2b6d4d7a08b35846636c11a2ca814b8311cecc7
+DIST jakarta-servlet-api-6.1.0-RELEASE.tar.gz 1268162 BLAKE2B f31a6276461c579a4f81778d9d55af6c367775eb21eb51b591d8e704b803ae0af019244f8a35683f0f30096256d4f19e8dad3959fa807a7087fe67d46bcf3c93 SHA512 52299b4b50fd03129753a239371ba6d35db14ff9d6292968c19d99632e965a279fbcf025722da3b174f7f0a4b620576863d7134c817f3fa34a098a9a794ca97b
 EBUILD jakarta-servlet-api-4.0.4.ebuild 931 BLAKE2B 037cbc8df989ea536962460660ac040d6a7c920e9b4d928ce6c538fabf2f05f33e9839847a5167e2c5e76f3787262b511f6261b846c44046184d2d64015a0c4a SHA512 c881327fdfb5ccfa10661db5142d8e1c03386e075f7219a3650f218135cde636507fce5bfda135f97ee498fc5c3aecea45305f03d0f612e3a4c9ad1138fe12ca
 EBUILD jakarta-servlet-api-6.0.0.ebuild 1275 BLAKE2B 5d6dc8abd00abc28de2b859ebf5570c3df39fc55e902aff6cfd49a8c1392a875a08ff21b110bb782fcfd9368b490e46997fad95c36885887753f64065ee57f46 SHA512 e18919ccbfa1a7684a359fe39fcd3b47c7625f57d1c6b7fd1b8997ad568dc565f3c46b740e613f5da55eb795d9728c47ed0a7beff0cc0550d06f856d772f9ff3
-MISC metadata.xml 332 BLAKE2B b9a06fe2a5573bde0da5b4f0d11a4cdf8c26738b67ac575014c01ed7fadfbc057a63fe2de907942a83d12afe8335933edbf671460b33939969bbb8d2657ffd81 SHA512 4c044f785c3a41116e24cc56b46b8e74327e4fbe29b11a25e1004e18d815023d073465658bb9467afbf80f8490e29815e1e52ce3d5ccde250ae48f0edbf0d380
+EBUILD jakarta-servlet-api-6.1.0.ebuild 1037 BLAKE2B c8bbd445ebceb565e9f06435118be1d791f1aaf0195ef97490820e17a378bffd9a314a68babde85424e35e294b6d3e26fa5bccc7d14cdf2027df8c0b5dced1c4 SHA512 39c11677341e7b7f35e765e718fe7d2b64968231cd2f8a4497fcda87ca15ed44d113a1c0ed33814f26b16377615cc255fed956478be184af147a1e219021ad73
+MISC metadata.xml 509 BLAKE2B 6f4b937f1d18bc36066eedac89e4fda54deb9609b7170863fd2d2bcfaea3d97dd0268475e8fdb431f10c88479ab325b3b9b26464deb23683bcc6021ba3b1201d SHA512 23254b4cdd530163936bd2d8e9da0fb0de6c81b80d353a0ec14a79763f5ba8d30691328ee8595fbe53c6d1a973d6df65a147ac40bef987cc2f83386c1a01d3ce
diff --git a/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.1.0.ebuild b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.1.0.ebuild
new file mode 100644
index 000000000000..ac536a4f8119
--- /dev/null
+++ b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.servlet:jakarta.servlet-api:6.1.0"
+# No tests because of still missing junit-jupiter
+# JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Javax servlet API"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.servlet"
+SRC_URI="https://github.com/jakartaee/servlet/archive/${PV}-RELEASE.tar.gz -> ${P}-RELEASE.tar.gz"
+S="${WORKDIR}/servlet-${PV}-RELEASE"
+
+LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="6.1"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND=">=virtual/jdk-11:*" # module-info
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,NOTICE,README}.md )
+
+JAVA_RESOURCE_DIRS=( api/src/main/resources )
+JAVA_SRC_DIR="api/src/main/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	pushd api/src/main/java > /dev/null || die
+		find -type f -name '*.properties' \
+			| xargs cp --parents -t ../resources || die
+	popd > /dev/null || die
+}
diff --git a/dev-java/jakarta-servlet-api/metadata.xml b/dev-java/jakarta-servlet-api/metadata.xml
index 77e11a268a0a..ded6fe6b7534 100644
--- a/dev-java/jakarta-servlet-api/metadata.xml
+++ b/dev-java/jakarta-servlet-api/metadata.xml
@@ -4,8 +4,12 @@
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">jakartaee/servlet</remote-id>
+	</upstream>
 	<slots>
 		<slot name="4">provides javax.servlet</slot>
-		<slot name="6">provides jakarta.servlet</slot>
+		<slot name="6">https://jakarta.ee/specifications/servlet/6.0/</slot>
+		<slot name="6.1">https://jakarta.ee/specifications/servlet/6.1/</slot>
 	</slots>
 </pkgmetadata>
diff --git a/dev-java/jeromq/Manifest b/dev-java/jeromq/Manifest
index 36e794b3cb2e..26c1f07c69c5 100644
--- a/dev-java/jeromq/Manifest
+++ b/dev-java/jeromq/Manifest
@@ -1,5 +1,3 @@
-DIST jeromq-0.5.2.tar.gz 422673 BLAKE2B f244ef95bff70de8eb184e6eda8e292c54488435b8c9e000dbff5f1d6cb7b2b3066061bcb1fa678d2756117a52c39df795dae84071b544b0f577a331aecc8516 SHA512 49a3e9f7ff6b54dcde03958a84e72b8d4b44fb150fc980e9f1ea4ba9e258dcb0a0730d006550a3eb33e9f241e6d89cdc0ee2155213ddd309e255d606d1fa567b
 DIST jeromq-0.6.0.tar.gz 467854 BLAKE2B 65b5b8cf676965a07d4bc26898a6db6739a1b5431678c16c0c182eee5d0c69c86a01b17ad1055caacec78149816ddc0c9468fec577f2ab82c681b7822858ee17 SHA512 2e140d456bf6a7f566b3cd563a7697d08c96b004ae70cdc37e427e4526cf8db83e5df6a492e63887f3dba639e3c29384fc46ee9e9e4a6a800e3c2c2446a65695
-EBUILD jeromq-0.5.2.ebuild 1255 BLAKE2B 174c60505822c89178466c82a7e024c7f28c6cb6d829f06a69ee5edd1905a5e27a7528cc046623f67a49c2d5f2f71bd0af1249acd583126d77a950e7602b63a7 SHA512 356587ed087822d7ff96a031332d32975b3822738ea3fdf71ecb22da5ac82aa55ae11542a317869399b4762dc27026e0e8e59aaaf0f32f25e5c8929332e4670d
-EBUILD jeromq-0.6.0-r1.ebuild 1405 BLAKE2B daabb8a9af2da0a2dd247c074f56820e2b7e2392c5e11b2271496003d6952f65e8b78e3ac26dc2db5555464e1283dca51cbeb06fb201f98faecff0ad54fd7995 SHA512 2326fe6d4f9c33c75aec016444ca30658e3565e4eb4323915d1a5ee628d302dc6b253cbc247f86852044738b19388b9450c7f422b38523ac309ca64cf0d90c5d
+EBUILD jeromq-0.6.0-r1.ebuild 1404 BLAKE2B 733949a0d9f4b595bf218fe7592adf18cefb8916bc4ba4fdc459c1d968611b65a6940c6f76ffd6620917bd932d20cd25d0ced9400f1f1892a39118f5e423b601 SHA512 af5675ea73d11d6fa9320b23c19c435cc522775589040dd9deab3ee81a2de8222286e9fa8b0aef61573fdb720346c10a595def3c259c1a38ff57b56bd6eb45b7
 MISC metadata.xml 295 BLAKE2B cc5e491443af7c5808738d518bbd4e7f6012c782487fb29ada12e177a5cdf8d7963995fff7bc0663f0f300259de931dd64d6a11231044ab6ac9ccdac1a0055ae SHA512 cbe037fc5d2620849406bdb16273d3ce99e404f3c3b2c0017a6becf2c828950f9010c4bb84572ecea3c2d10fd137e765aa33660a98a5c0defe74f20c982855de
diff --git a/dev-java/jeromq/jeromq-0.5.2.ebuild b/dev-java/jeromq/jeromq-0.5.2.ebuild
deleted file mode 100644
index f554fbfac8ee..000000000000
--- a/dev-java/jeromq/jeromq-0.5.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/zeromq/jeromq/archive/refs/tags/v0.5.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jeromq-0.5.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.zeromq:jeromq:0.5.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Pure Java implementation of libzmq"
-HOMEPAGE="https://github.com/zeromq/jeromq"
-SRC_URI="https://github.com/zeromq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-PROPERTIES="test_network"
-RESTRICT="test"
-
-# Common dependencies
-# POM: pom.xml
-# com.neilalexander:jnacl:1.0.0 -> >=dev-java/jnacl-1.0:0
-
-CP_DEPEND="dev-java/jnacl:0"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( AUTHORS LICENSE {CHANGELOG,CONTRIBUTING,README}.md )
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jeromq/jeromq-0.6.0-r1.ebuild b/dev-java/jeromq/jeromq-0.6.0-r1.ebuild
index 1179addc0cab..0f381fd73740 100644
--- a/dev-java/jeromq/jeromq-0.6.0-r1.ebuild
+++ b/dev-java/jeromq/jeromq-0.6.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 PROPERTIES="test_network"
 RESTRICT="test"
diff --git a/dev-java/jnacl/Manifest b/dev-java/jnacl/Manifest
index 66c2e57016a8..61c22e286ce7 100644
--- a/dev-java/jnacl/Manifest
+++ b/dev-java/jnacl/Manifest
@@ -1,4 +1,3 @@
 DIST jnacl-1.0.tar.gz 9485 BLAKE2B ecbe56d12d7cc53dfc87b2f332c1c4328946ca4ed0d4ec3b8fa22a2ea5d98a3acf51fb17e1d93d3d7831f98a36a3d657a904cb63b225da4a30b8e907cbfe8384 SHA512 b4f28b4bd6deb13c17e74f911f89e762c9111aa90474754f072df66f0ca4bd366dc8369f51404fbd4f6c5f55223bb98b6bfe3de78e2f6b5527509741008f2015
-EBUILD jnacl-1.0-r1.ebuild 1062 BLAKE2B b9dccca7a5b48c373faac32f5755f38ac77288b3121e6c50cdc5413795cf8b26cbabd26006a924d6e312e9d444a3fab0d07c6b40c4330306a7668b54ddce1c43 SHA512 b892dfe255e4d936963ef910ad1b2e33973f4e93df36130ffb23109d9ec5c5b21e68970917194bfb6821e0e04f3edd3469193ebf3e0fc5d74a80f4260c59c37b
-EBUILD jnacl-1.0.ebuild 1376 BLAKE2B ad0e675935e720a10e3a1f363cb67083aeb2138124d90b61876ffb3fd58f6a75c84c1b62c4907315f0e94508732137235ce01300c407f126ba7a4ae7a7eb3772 SHA512 ab2e4b011d380de5e455e90c607343ff91660a3fb0b0c84ab7dba1162823de98fcbcc5354cbf371ba9850d327d4d88415a50c0bbad2e20169b00a5ae11f0f0b4
+EBUILD jnacl-1.0-r1.ebuild 1061 BLAKE2B c6ac8a373ae3ff81286cbd3fdfa5e29e9cfebe8249c993fd17ea682d25d6e9f9ef0bd103f089512a13d260fa1ccff75bc5127ee8a1efb29aee16083477fde68e SHA512 f287d3bd844dd137fa540c510f225732e27d8c163406c81683ad21e786295f7a26be5a309972d43ca223e9977623fbbdcfeff4052a3a6a82fc64965af04e8d2a
 MISC metadata.xml 555 BLAKE2B 59925630623875311237a760ed617ba6e16cf17224ab7691bb312ef6cc06b3004169345988f41a7af57363163b154d9246d13af24375c44eb98b5e134e3a039f SHA512 86c5a601c098952f2588371ba473a8998fb1e7bc14e765430ea20a5251d570ec175334e5de9b85186b7894c99665dbf561bfe40718bfee729b6afe5aa3e0be28
diff --git a/dev-java/jnacl/jnacl-1.0-r1.ebuild b/dev-java/jnacl/jnacl-1.0-r1.ebuild
index afeeab1a1e75..ed0de93aa2d2 100644
--- a/dev-java/jnacl/jnacl-1.0-r1.ebuild
+++ b/dev-java/jnacl/jnacl-1.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 # We don't have fest-assert
 RESTRICT="test"
diff --git a/dev-java/jnacl/jnacl-1.0.ebuild b/dev-java/jnacl/jnacl-1.0.ebuild
deleted file mode 100644
index fec05a922c29..000000000000
--- a/dev-java/jnacl/jnacl-1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/neilalexander/jnacl/archive/refs/tags/v1.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jnacl-1.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.neilalexander:jnacl:1.0"
-# JAVA_TESTING_FRAMEWORKS="testng"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Pure Java implementation of NaCl: Networking and Cryptography library"
-HOMEPAGE="https://github.com/neilalexander/jnacl"
-SRC_URI="https://github.com/neilalexander/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# We don't have fest-assert
-RESTRICT="test"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-# Compile dependencies
-# POM: pom.xml
-# test? org.easytesting:fest-assert:1.4 -> !!!groupId-not-found!!!
-# test? org.testng:testng:6.13.1 -> !!!groupId-not-found!!!
-
-DEPEND=">=virtual/jdk-1.8:*"
-#	test? (
-#		!!!groupId-not-found!!!
-#	)
-#"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( LICENSE README.md )
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
-
-# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,!!!groupId-not-found!!!"
-# JAVA_TEST_SRC_DIR="src/test/java"
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/objenesis/Manifest b/dev-java/objenesis/Manifest
index 39a9c00c0243..a4b4f24bbe61 100644
--- a/dev-java/objenesis/Manifest
+++ b/dev-java/objenesis/Manifest
@@ -1,3 +1,5 @@
 DIST objenesis-3.3.tar.gz 125400 BLAKE2B 36cff7cb5a2dca9a81f3ca07d56995f68d9c61c9d2b7caeac5f87bb13da02b0494053927e2221c776edef0bafb862f5c97dfc0e79cf991c6c970b5b9206a5aa3 SHA512 786fe0d2d1dba0f006d5218101578d8fd23616765f5cdb4df190d138fd10dd675b9189887c27a40b63f09ed5e1dac1324b2936c7ac24a655e6f63d53b9cd7c01
+DIST objenesis-3.4.tar.gz 128447 BLAKE2B 220694fb496b4a29ad50c92741477e08475a6bdbd4f6ff647a03995a86945d9474672ee1be4f60f1fc07f0b05a4f1e59110977fccf9fd063dbd57750a66e2a26 SHA512 e4b106ae71e5f62e6057dba749ac56c42030a2a1aca5c2ec5c95c934a7fe1af99e6c62ca9c50e76fa67610bfbf075e46a0c9f37d4e6c35ea6047175189ab686e
 EBUILD objenesis-3.3.ebuild 1178 BLAKE2B e77f8ddd1697bb46659c22ff6e23e6aeb4605b0e5a1fd13b8ec2043423534d84ae47f72f19777b9da13289544a79d3f0caf0c726d9373f96980e98f970a59af9 SHA512 a7890025d4aa0a73e1738dbaea98dfaa5f8575e27ad2802ee81efa2312e60398bef4745f2ae038548ae3dddf2ee6159d89d8a9809d9ac97be1b2108009e9d623
+EBUILD objenesis-3.4.ebuild 1167 BLAKE2B 85838ba88cadb1a19a267e2a30ad415991c82a7bef5a0ccc3b6042ae3e5afd91419b25d60b5633f3851ed3ebd9bb62bf28476ecd46a639eb9b6e074030df729b SHA512 4475ab447d4c0af93a431579a5ea6682a4ae0f82de724223c71619fa036c4c503e5f149c6d595c5a3a8733426b9f923352e2c304263a57dc9da1498482fdc177
 MISC metadata.xml 386 BLAKE2B 1015a40cbff1c5726a54996b8e0387b287ad70fbe45f732f399f4ef90c1839f0bfd0531139d9a304232fd6a49decd4bf287f746993ee7a1258b8bd3b920f2483 SHA512 e293fd7928f753745c69bb0357cc8140574c632d9a35e353df7dbbbc524855db423ac0cfc505b7bef2f98875cf5c05ed1144251702a0b932b6e1630d4be7ec95
diff --git a/dev-java/objenesis/objenesis-3.4.ebuild b/dev-java/objenesis/objenesis-3.4.ebuild
new file mode 100644
index 000000000000..61b9dc73a2eb
--- /dev/null
+++ b/dev-java/objenesis/objenesis-3.4.ebuild
@@ -0,0 +1,48 @@
+# 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.objenesis:objenesis:3.4"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A library for instantiating Java objects"
+HOMEPAGE="https://objenesis.org/"
+SRC_URI="https://github.com/easymock/objenesis/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+RESTRICT="test" #839681
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+	junit-4
+	junit-5
+"
+
+JAVA_TEST_SRC_DIR="main/src/test/java"
+
+src_compile() {
+	if use test; then
+		einfo "Compiling objenesis-test"
+		JAVA_AUTOMATIC_MODULE_NAME="org.objenesis.test"
+		JAVA_SRC_DIR="test/src/main/java"
+		JAVA_JAR_FILENAME="objenesis-test.jar"
+		java-pkg-simple_src_compile
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":objenesis-test.jar"
+		rm -r target || die
+	fi
+
+	einfo "Compiling objenesis"
+	JAVA_SRC_DIR="main/src/main/java"
+	JAVA_JAR_FILENAME="objenesis.jar"
+	JAVA_AUTOMATIC_MODULE_NAME="org.objenesis"
+	java-pkg-simple_src_compile
+}
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 587f765bf9c5..66845e1e1f4b 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,17 +1,11 @@
 AUX openjdk-jre-bin-8.env.sh 573 BLAKE2B 02f032b60578e95a5f370afce4bec7aef12262b5f87c854a4ffc3844a4db5e88abcfb6e7539152b05e447eedb99c58e0a5944ffc2af82c10b5b0f04e447ea1ef SHA512 79bf447ffb50782348396ed1a64737f0a4adacfc21ef70d5f652db782e9492cde89f2ba740c28b6465eb4a6c32a483b2f50daaee784a03ff3d371e843f712fe5
 AUX openjdk-jre-bin.env.sh 342 BLAKE2B 194a81416378ac4729fc333f40c210bb33dea66cfc2b6a5341aab048c63f2c7c9a7bf9c45f10f5d23e2d7dd99cde80b03e79a79c30d08b6be90d6d8d6e850ec2 SHA512 6690285c5fa3866731ef28e0ff2153395e94a3e37837bf334ebea8fb132915a37002d70457810dbddbcaff78d5404f14818735ab6a722456780add4ad9efdafd
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.23_9.tar.gz 43361001 BLAKE2B 7f5fe24de2f0967ceeaee783430fc1aa9d8c510d955eff2e10c9d94058a2985308e99a57f1dffb3adb3cee9d90d0a553abcb5438a41a0cda054b0a260e435f31 SHA512 82b4b021b7fb136a9016623cd6ab7b4ac1f5fc3bff69594b74c8b2b0305d6b0c7d20d12759062826dc27ce0b50ea176bcec76960d3d458549e11a5452b7df014
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.25_9.tar.gz 43388792 BLAKE2B 59f2ea968f5f243dc2e0b8d82270620839a5cbafd93bfb611b3713455e366f956357b1424e69e3082730e6803934f78852db8e06d6ff6dcda7f7bf5ce2c6323c SHA512 3e602a497d66ef423ba9110a69149ad5fe3c939c629eda1a0946697623ada8a1582d08b55f498b1d0862c95a7c64b0fab804fb713e49bdd4ddd9657c164ab7db
-DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.11_9.tar.gz 46382823 BLAKE2B 79612a8a73cee7a8ac022779a12077fa613ff7b18d8d5d198c42ae886cba21c46a1919422249696a74b5e5491542b88b57244eaa74f3b1bc8ae63ae851d10d40 SHA512 a98534b49a71a1bb6488aff4f1d2fc4fdcadfbaa17ef1ca3003568aed8498b3d3618c065334dd6bd9cffab0af15b6cbc980353e09da66c5ac69f0c96f9b0a889
 DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.13_11.tar.gz 46082619 BLAKE2B 18cfcba579deb6665f45de59b145d2f9b3c047456e548b0728619a8b711890f66c15d0522e89ef3f8d7f9747636cefc509efc0d8c12e709d6f7e2faf8c6d1860 SHA512 6ab44ec3ae9f610b68008e68069a66095c7b2d1deba2990e061baf9800cbeafd818cb16a9386aabbc18299bc46e0f23540111eb6a0597561c835e67506eeff97
 DIST OpenJDK21U-jre_x64_linux_hotspot_21.0.5_11.tar.gz 51849867 BLAKE2B 6769bd34c2ba7f6d4939f1b7647cb7bd5eea5644a05f4e5474db612c29e05d247829b1eea2f0265febf41cd6a64a1e62c5eef7f1ee7c68e84f6bb085d3c656fb SHA512 7077e879e656a2b3bcb6274d5eb312320a95f13e909bd0fb5589e665db545caca0a6bf7d1117d76fe201caaa50a3bf917316e43f08d94b48872607bc25238a94
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u412b08.tar.gz 41415973 BLAKE2B 1372ef4f608eaecd4a82c8e5598e67b91d4b200818a896c2977f40d7c228377ad033187e5afda7cd812b37950b998bc764c155d952a62b7bf7c625299b9477d9 SHA512 f1e3a168724fd9826262d1f4e895d0809618414231e246750f96522bc89fb4f27fed83f83dd548ddd859b519512ac7a080c6a3482a9d129275102aed973eab28
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u432b06.tar.gz 41407945 BLAKE2B 99d146ceb6627be04b30bde28691df1362f2acc147a8b260d9633fb11d9ef2f23f2a0876a6cd32515dc0541ce1f5feb475793225266da9197ac7392db13c512a SHA512 c32343125e66005c9239d1002fad2a183bc3834dc1be5f85ca9bf6535bc40bc629d7e538cefc0d07cc2b49275a54ebd19098e43aecfc34cbd40e549da902b894
-EBUILD openjdk-jre-bin-11.0.23_p9.ebuild 1998 BLAKE2B 2110836c46d6079d88d453a3057e77cf8c76a273d2afed8cce6552e181357d744675fec2c436d2c294284be2b5951916f80ba08d506942b25210f79451ea3020 SHA512 24693feea7018ad27cdad4405128b46c859da493bef70a01e2a0914dec0b0e08f51c201800aa78ea52a78fcb8bce9616981eb53844938ca0aab91010921dac4d
-EBUILD openjdk-jre-bin-11.0.25_p9.ebuild 1999 BLAKE2B f49555cb1512494a4fde6853fe50ef816193078d006bba671f1d71d6e11420114466821d6b047f4a656b56ecd8d378ec69e5cd81b2fc7a13ee7f61d5119f4717 SHA512 98ef54e07ae1c3e2d50e3ac25731ed3677c1cd41559ff8dd21020dc82fb5bb4194cb20353962fb1b2181c4abed59f9d31d221202e13b24fc9aa419ccfc647a2b
-EBUILD openjdk-jre-bin-17.0.11_p9.ebuild 1998 BLAKE2B 2110836c46d6079d88d453a3057e77cf8c76a273d2afed8cce6552e181357d744675fec2c436d2c294284be2b5951916f80ba08d506942b25210f79451ea3020 SHA512 24693feea7018ad27cdad4405128b46c859da493bef70a01e2a0914dec0b0e08f51c201800aa78ea52a78fcb8bce9616981eb53844938ca0aab91010921dac4d
-EBUILD openjdk-jre-bin-17.0.13_p11.ebuild 1999 BLAKE2B f49555cb1512494a4fde6853fe50ef816193078d006bba671f1d71d6e11420114466821d6b047f4a656b56ecd8d378ec69e5cd81b2fc7a13ee7f61d5119f4717 SHA512 98ef54e07ae1c3e2d50e3ac25731ed3677c1cd41559ff8dd21020dc82fb5bb4194cb20353962fb1b2181c4abed59f9d31d221202e13b24fc9aa419ccfc647a2b
+EBUILD openjdk-jre-bin-11.0.25_p9.ebuild 1998 BLAKE2B 2110836c46d6079d88d453a3057e77cf8c76a273d2afed8cce6552e181357d744675fec2c436d2c294284be2b5951916f80ba08d506942b25210f79451ea3020 SHA512 24693feea7018ad27cdad4405128b46c859da493bef70a01e2a0914dec0b0e08f51c201800aa78ea52a78fcb8bce9616981eb53844938ca0aab91010921dac4d
+EBUILD openjdk-jre-bin-17.0.13_p11.ebuild 1998 BLAKE2B 2110836c46d6079d88d453a3057e77cf8c76a273d2afed8cce6552e181357d744675fec2c436d2c294284be2b5951916f80ba08d506942b25210f79451ea3020 SHA512 24693feea7018ad27cdad4405128b46c859da493bef70a01e2a0914dec0b0e08f51c201800aa78ea52a78fcb8bce9616981eb53844938ca0aab91010921dac4d
 EBUILD openjdk-jre-bin-21.0.5_p11.ebuild 1999 BLAKE2B f49555cb1512494a4fde6853fe50ef816193078d006bba671f1d71d6e11420114466821d6b047f4a656b56ecd8d378ec69e5cd81b2fc7a13ee7f61d5119f4717 SHA512 98ef54e07ae1c3e2d50e3ac25731ed3677c1cd41559ff8dd21020dc82fb5bb4194cb20353962fb1b2181c4abed59f9d31d221202e13b24fc9aa419ccfc647a2b
-EBUILD openjdk-jre-bin-8.412_p08.ebuild 1833 BLAKE2B 5b4c1f5e8cc03712fd969653a85dfe53517fa56d488aae953f78ca38dd33fd3433f172be1ca2fa9d35cdabbf9e11c3c375c5e10633096791aad1e1aa33788a1e SHA512 7c64ea39325b3838b078af5acfdbe6f86c7698d809b1b721592fd33cc0f08325c52e5995c2e2038120c17ee8aa0761873ee440ff6ccac5488d5e7c6c000463ae
-EBUILD openjdk-jre-bin-8.432_p06.ebuild 1834 BLAKE2B 0e3cabd430a05f3f434263ec3f0a0d74a188a0467bd9984ca09acfd66648edf716a953493ba39d7ff33274e12bf26e9a8c470c664d40372ecb411aeef45795d8 SHA512 757ea9e3c90a1d65d42bdf53f48889e14aa6e7fc58b7b18cdcb09c43332fe09d93e0b9a53ff9583e7f23d21f24fd9d6f991484ea1641f6152718bdc10e5c8aea
+EBUILD openjdk-jre-bin-8.432_p06.ebuild 1833 BLAKE2B 5b4c1f5e8cc03712fd969653a85dfe53517fa56d488aae953f78ca38dd33fd3433f172be1ca2fa9d35cdabbf9e11c3c375c5e10633096791aad1e1aa33788a1e SHA512 7c64ea39325b3838b078af5acfdbe6f86c7698d809b1b721592fd33cc0f08325c52e5995c2e2038120c17ee8aa0761873ee440ff6ccac5488d5e7c6c000463ae
 MISC metadata.xml 655 BLAKE2B e05648526464c16e698e8fc1b16a4c7ab646ad42402241a5a23eecd209406446b9a77a46f1ed55d27a924ffa7019ce8cf976f3037a8adc091b1406c501c35e88 SHA512 437ded048327540f6010e462448317eef13da67f5cfca0b62c15fd2367f1a5bfb125b73de9228d3054d2001bef557e5d9a13f80686678df9c03bd6c10b4d1fe2
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.23_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.23_p9.ebuild
deleted file mode 100644
index 4bac8986b66a..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.23_p9.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net/"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64"
-IUSE="alsa cups headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.25_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.25_p9.ebuild
index 9fe0d3158b43..4bac8986b66a 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.25_p9.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.25_p9.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net/"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa cups headless-awt selinux"
 
 RDEPEND="
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.11_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.11_p9.ebuild
deleted file mode 100644
index 4bac8986b66a..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.11_p9.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net/"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64"
-IUSE="alsa cups headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.13_p11.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.13_p11.ebuild
index 9fe0d3158b43..4bac8986b66a 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.13_p11.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.13_p11.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net/"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa cups headless-awt selinux"
 
 RDEPEND="
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.412_p08.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.412_p08.ebuild
deleted file mode 100644
index 30f0a4d988c1..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.412_p08.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
-		)"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net/"
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64"
-
-IUSE="alsa cups headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}/${dest#/}"
-
-	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
-	# this does not exist on arm64 hence -f
-	rm -fv lib/*/libfreetype.so* || die
-
-	if ! use alsa ; then
-		rm -v lib/*/libjsoundalsa.so* || die
-	fi
-
-	if use headless-awt ; then
-		rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
-			bin/policytool || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	# provide stable symlink
-	dosym "${P}" "/opt/${PN}-${SLOT}"
-
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.432_p06.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.432_p06.ebuild
index 04fb01a2b751..30f0a4d988c1 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.432_p06.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.432_p06.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="alsa cups headless-awt selinux"
 
diff --git a/dev-java/pebble/Manifest b/dev-java/pebble/Manifest
index 2aefea91d209..02c016ee4378 100644
--- a/dev-java/pebble/Manifest
+++ b/dev-java/pebble/Manifest
@@ -1,3 +1,3 @@
 DIST pebble-3.1.6.tar.gz 222475 BLAKE2B 783e999f463820af9ac1c43610e2a257f7921fa46d274a3898496662119f74336e4bf78b42a92847359f8ee4efde7a074cbc57274ec6fb8475eb9c6c1ba9455e SHA512 0963e4c04dd67cb0069aa0b3e0ac33b4bdc524e07cec4074493d56232e31360d629b5f2c2fcbf663a26fd3df97d0e973e842d30edb547ec83b7335818417c9f0
-EBUILD pebble-3.1.6.ebuild 843 BLAKE2B f0e344df550f83c5a98127e9f50ace652fcfde9062499f499061f77f354e54012b1b214e87699dc6fe22ca822a0bbf9563008bbdd15f859f86a18a5ba8d5bd88 SHA512 e514a14cd8e7557e7b36b52dd5d26f561613f0d450ac4a17383287389f8ce6d8e79627d7c25a64af262a19b0dd58f649183a4f77ab658d7ae191cce592afac5a
+EBUILD pebble-3.1.6.ebuild 842 BLAKE2B 8bd2f8dcce6c1ae1a98f404666fd662aac08b6c9d13dfe374601bb92b415f87fac9cdd2ef2ba63eacf1ca216c29e620a1a25ef276d57ead815d1dfc01fe1c00c SHA512 47c4e074db98f4922dd704ee80dd6b4e668cd1c85397270824abd44313a7198463fe10656f1d862d3d2e0509b354df574c7e9be538e37c0504df53580b33c20a
 MISC metadata.xml 304 BLAKE2B bdf44bc9852ee185400a758b3d366880acc3d7dd21af9952c729a90ba5f6fcea675eaca5054d2bda1e17a39d7af6399b46c08f691dfd63925fb7cb4b804e1714 SHA512 ce21c41d9d6ec073be3643d86fc6ac80621d598fdb6c622cfec979e1f6f68170cb992b53a2584c50e1575bc6da08523cadc6c29ebfee94c81ae5701f2dc4a584
diff --git a/dev-java/pebble/pebble-3.1.6.ebuild b/dev-java/pebble/pebble-3.1.6.ebuild
index aedaa41b9a98..fdbaef75fa08 100644
--- a/dev-java/pebble/pebble-3.1.6.ebuild
+++ b/dev-java/pebble/pebble-3.1.6.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 CP_DEPEND="
 	dev-java/caffeine:0
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index cee1987ed30e..f7071bb83c76 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -31,5 +31,5 @@ EBUILD swt-4.29-r1.ebuild 3456 BLAKE2B 6d48de8cc8e1d9c034fafe3ca67951bf0c5920122
 EBUILD swt-4.30-r2.ebuild 3526 BLAKE2B 7d7d2f4af8b64b169daaff9486311d50324170cfabfa948f0b3029a77ba487fa2953d8c531260a5db1bc8185449ca6126a4693f8cc30cdd5ecdbb572dae896f8 SHA512 0256a8bc0e5b16cf3e50f81cbef51f9ef7b8c91f1e006ceb020d11026d19317459e1148c655eb68e05b75bd8601de8372e7ce6ae38dd695e70465a9b02d8ab07
 EBUILD swt-4.31-r1.ebuild 3597 BLAKE2B 3ebfa0ada9993a92ee67868ee6070b0a4812b455e3e3209e1a00abe4a528c2202be78d413d62123d113edfd22d998d728d2913b4d03296922a01cde4835ce8c8 SHA512 414e93ee4cc2398bb5f7b1b7079a865e48a0d3de4dcd62bba170c2207d4283fe7eace273736335233a6b16848f73890f59646ff763ba311d5aa75ecb5c146870
 EBUILD swt-4.32.ebuild 3597 BLAKE2B 6f6b08425ff52668c342394c50437397eeec8621d766f67d8a90999e2e659919da3837cc987f5166a268016351176406e7bbafa7b74cf59176c276bb5eca5402 SHA512 e9b246638d08f0d415f8412913b9369d9ce257f2a4e43e0741f2e5b989aac31d091d5c4f533a7a6ea50a3ea2cd73ee21728ec7e44a4ed7715aab6fe09a2f554c
-EBUILD swt-4.33.ebuild 3598 BLAKE2B 0aa21e489be339fe0dc7b562ec82df8cf2bfdacfa23dd1d1cc945ed2672e2629d514f45af1ce515dfd2143b0089fb4e9b1a6c76ac3f181dd7c128010750e92a9 SHA512 f5a1ef338dbbbd2fbc565d436514849156348ec668199dafe651503fe3575849ec72f1f1c624c612efe438a2e018b286147624192fda93cc91c6cb34c1933057
+EBUILD swt-4.33.ebuild 3597 BLAKE2B c078bc253f2c56298421dc2c59efb9928b2ee058bf95929d847d52e113f488e1799a6cd56be0a38c802fa6450a3a353c518e5f13104eb174295cc218f65b1358 SHA512 c331378ea4954e967c83ced0cbb3cd1d24e16a75a3b972ae707860efd240ec001818e961fe92f733b5826e95a0142b0bf0807b6a9b32c997d97bd62d1df4eedb
 MISC metadata.xml 762 BLAKE2B 6d1ffda9ea96f50b3e4736513ca9a3af4e7e9d3cd59a3f8ff8efcae118d290d141ffa90181fb1669f9a4380c6e4c618d780b459ada909c5dd5aa4f5fc1865b7d SHA512 5c50e0d80478a6af08886d9b65230fc161a000a7ea39d0ffa873114e13fd1fb9bcbcc554df41eebd63ee60dd9ed14e6f19110e71a49bd32adef6c43051c2c380
diff --git a/dev-java/swt/swt-4.33.ebuild b/dev-java/swt/swt-4.33.ebuild
index e92183b61a73..db276ff29466 100644
--- a/dev-java/swt/swt-4.33.ebuild
+++ b/dev-java/swt/swt-4.33.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/library"
 
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="4.33"
-KEYWORDS="amd64 ~arm64 ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 IUSE="cairo opengl webkit"
 
 BDEPEND="
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index c72aac207393..8d12ea185842 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,3 +1,5 @@
 DIST velocity-2.3_p20240314.tar.gz 440967 BLAKE2B c5fcea7af49d6c46d5c0943efe82f3c04d921afc2c53201b97842ae71714e7035d075c147b3bea71e959db12dd970b7879ade73bbc23bab09a1fd262e21f2fc6 SHA512 9055e780d2a3c798bfe30e5c7859a7311c4984b551d7b2ffa68c57c076549326d0ddae31eabff8009ea021c749331d34c71eee8cab55599dea5f3c8dba841a02
+DIST velocity-2.4.tar.gz 444952 BLAKE2B 0db598bad6743383e62e89acc55b887f28108b6065c3e615b78485e4f94c9f1a316bff7c04d66052541d6173311e97dab28142dad69e6caca168b2a2fcc28637 SHA512 b3f7ae68fa2e0f30193f089a2e8ee5366e71726d93e85fa2f4c3f95d20aa599df053ee7103c71b01c89fe08dd5276e5a2c7da3e26eaffeafd94c078241a9e264
 EBUILD velocity-2.3_p20240314.ebuild 3484 BLAKE2B d523792a502ce5fe7318b3a48c3daad09c05ad3e8bac6e02527abd6d7288865230ee8a1e490dc04a18f9817c4fc84aba789678af003628b885fafeea3ec5d54b SHA512 be61868f896446727b26c9bbfcf2f7d072aabe1b64da73c5963c75c6aa747da0b989eba05eef00c2320f48a9bc7a88b8434e64b4b9532af8b2c744e0b2a1483a
-MISC metadata.xml 324 BLAKE2B c8eea57701703ec431e972c8e9c79135f5c124f1d16d4882cdcf64b884ba656654f030dc63ae7bcba3f0485cf751c53cce51e3b337eae198d61ae84abb3d04ed SHA512 29c6d5194ebede2598996e03408bd4c3c54bdcfce18c1025ffa95fbfba99a953acc66af25e4bb046d33a71d2c462e4fc84867ff8067a2434af885fb046980840
+EBUILD velocity-2.4.ebuild 3498 BLAKE2B 7eb3687afa4c291363c8420c5548debef6dac1ae53cfe60768ee3107ec71092381818d066a4ba7330b37ed0ef990fe9940acf05d3a812ff60c2e5997ce1c7bd8 SHA512 ca4b99627d1f62dc3282aad474accfa9e233e930728a4a7880a8c8a8e6a3fcd1b251e4d03046065da7b63d16695e48093be24391638bc858d5b1e879fce9c70c
+MISC metadata.xml 401 BLAKE2B b11e2740816123dd6a2e4c19958be0309b72bce734f677acac45570597adaaf7b1b21b240612fe7f0a31165d81bc8d70c258f0ff2ab41922acd74acd1e731b54 SHA512 1ebed6a12dd89d632574519db9e266fbf434d11ae28221813499a96a926fe33db2e52af6e36f5854b49df7b1898d166eece550a67c5e6bab4b4439e8b6289c36
diff --git a/dev-java/velocity/metadata.xml b/dev-java/velocity/metadata.xml
index 8e49c08df5a1..859cbf7156a4 100644
--- a/dev-java/velocity/metadata.xml
+++ b/dev-java/velocity/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
+		<changelog>https://velocity.apache.org/engine/2.4/changes.html</changelog>
 		<remote-id type="github">apache/velocity-engine</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/velocity/velocity-2.4.ebuild b/dev-java/velocity/velocity-2.4.ebuild
new file mode 100644
index 000000000000..27d9d96922dc
--- /dev/null
+++ b/dev-java/velocity/velocity-2.4.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.velocity:velocity-engine-core:2.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Velocity is a general purpose template engine"
+HOMEPAGE="https://velocity.apache.org"
+SRC_URI="https://github.com/apache/${PN}-engine/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-engine-${PV}/${PN}-engine-core"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+CP_DEPEND="
+	dev-java/commons-lang:3.6
+	dev-java/slf4j-api:0
+"
+
+DEPEND="
+	${CP_DEPEND}
+	dev-java/commons-io:1
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-db/hsqldb:0
+		dev-java/slf4j-simple:0
+	)
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+JAVACC_SLOT="7.0.13"
+BDEPEND="dev-java/javacc:${JAVACC_SLOT}"
+
+JAVA_CLASSPATH_EXTRA="commons-io-1"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_EXTRA_ARGS="-Dtest.compare.dir=target/test-classes -Dtest.result.dir=results"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,hsqldb,slf4j-simple"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	cp -r src/main/{,resources/org/apache/velocity/runtime}/parser || die
+
+	sed -e "s/\${project.version}/${PV}/" \
+		src/main/java-templates/org/apache/velocity/runtime/VelocityEngineVersion.java > \
+		src/main/java/org/apache/velocity/runtime/VelocityEngineVersion.java || die
+
+	sed -i \
+		-e 's/\${parser.basename}/Standard/g' \
+		-e 's/\${parser.package}/org.apache.velocity.runtime.parser/g' \
+		-e 's/\${parser.char.asterisk}/\*/g' \
+		-e 's/\${parser.char.at}/\@/g' \
+		-e 's/\${parser.char.dollar}/\$/g' \
+		-e 's/\${parser.char.hash}/\#/g' \
+		"${S}/src/main/parser/Parser.jjt" || die
+
+	# File "StandardParserTreeConstants.java" does not exist.  Will create one.
+	# File "StandardParserVisitor.java" does not exist.  Will create one.
+	# File "JJTStandardParserState.java" does not exist.  Will create one.
+	"jjtree-${JAVACC_SLOT}" -GRAMMAR_ENCODING=UTF-8 \
+		-JDK_VERSION=1.8 \
+		-BUILD_NODE_FILES=false \
+		-MULTI=true \
+		-NODE_PACKAGE=org.apache.velocity.runtime.parser.node \
+		-NODE_USES_PARSER=true \
+		-STATIC=false \
+		-OUTPUT_DIRECTORY="${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node" \
+		"${S}/src/main/parser/Parser.jjt" \
+		|| die "Code generation via jjtree failed"
+
+	"javacc-${JAVACC_SLOT}" -GRAMMAR_ENCODING=UTF-8 \
+		-JDK_VERSION=1.8 \
+		-STATIC=false \
+		-DEBUG_PARSER=false \
+		-DEBUG_LOOKAHEAD=false \
+		-DEBUG_TOKEN_MANAGER=false \
+		-BUILD_PARSER=true \
+		-TOKEN_MANAGER_USES_PARSER=true \
+		-OUTPUT_DIRECTORY="${JAVA_SRC_DIR}" \
+		"${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node/Parser.jj" \
+		|| die "Parser.java code generation via javacc failed"
+
+	# Avoid "error: duplicate class: org.apache.velocity.runtime.parser...."
+	rm -v "${JAVA_SRC_DIR}/CharStream.java" || die "cannot remove 'CharStream.java'"
+	rm -v "${JAVA_SRC_DIR}/ParseException.java" || die "cannot remove 'ParseException.java'"
+}
+
+src_test() {
+	pushd src/test/java || die
+		# DataSourceResourceLoaderTestCase.java requires configured jdbc
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			-name "*TestCase.java" \
+			! -name "BaseTestCase.java" \
+			! -name "DataSourceResourceLoaderTestCase.java" \
+			)
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	popd
+	java-pkg-simple_src_test
+}