gentoo auto-resync : 23:11:2024 - 03:02:56

18 files changed, 7 insertions, 636 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index e99a31c37b02..a8bfa63fbfe9 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 5417555c0b6b..970800a65916 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -4,10 +4,7 @@ AUX ant-1.10.14-AntlibTest.patch 2067 BLAKE2B d385e3032664fc37eae14dae6580c68852
 AUX ant-1.10.14-JavaTest.patch 3181 BLAKE2B 6f25a4ea6278cbda776c6dc9d92b16749d1e3b4895f6b318133292ac0f54e49d296927b4435e74a96f254842ad1180c92c5a3526413088bcb04d29ab4a6b29bd SHA512 8206e8438679e77fdabc58889343f8601d4d9ab42f9ab7b1713e34c067a9a36f8d04ce14834213fb1444086635f2ca2cbec6d7a0f0ff87f13fdd8447ac5106b5
 AUX ant-1.10.14-LinkTest.patch 4329 BLAKE2B d4165d378dd63cab2a9d813c9d26c1ef7404f01ba7798f41062d0df633675fa341ed925e278d5230c9cc170f1f950ea6a86fcfe616bc94e8e66148b2ed6e6cf3 SHA512 271d9eaffa3f3f17411062bda4d71519db72bc66856058086778c79d2cb1eab6021bdddbd1c92ddb0207786617914b83dc3394aa9fdb789c6f5211500e445a50
 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 12961 BLAKE2B c7a88644266f3a1152786d4f709f828d8e1565df4f5018ed6a238262bd10a8f6c5b7d45b32ab6eebb5dcda6b8aade27ef4b0b81a011eb96486df061c8e311add SHA512 21de59e1a869a4ac696627bee4ea59b2025e610f0f8549015f8413909248ad68d431141ae3a0188fec0b76541ed806f7649d351111f6e8209e6de9dc5c5744dd
 MISC metadata.xml 1928 BLAKE2B b48dbca1bf2ab76b0107466c68489722f4ceed5fa53f2a26d983dfd36c74efad96fce9f58d0e6bb5ba1e02d8e44135bcf96bd77b2db7491fd260da907c02fbab SHA512 9313f5e0914d9c64482c4897e659313480630316ca29b57190e976248a63a17b3c293198f82d4143bd25be0766cd4ce9556d2489d76adf74b0203a9dc4998726
diff --git a/dev-java/ant/ant-1.10.14-r3.ebuild b/dev-java/ant/ant-1.10.14-r3.ebuild
deleted file mode 100644
index a14381eb9ef6..000000000000
--- a/dev-java/ant/ant-1.10.14-r3.ebuild
+++ /dev/null
@@ -1,395 +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_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
-
-	# Compatibility symlink, should be removed after transition period.
-	dosym -r /usr/share/ant{,-core}/lib/ant.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/bnd-annotation/Manifest b/dev-java/bnd-annotation/Manifest
index 66f51fdf83e6..502252057d83 100644
--- a/dev-java/bnd-annotation/Manifest
+++ b/dev-java/bnd-annotation/Manifest
@@ -1,5 +1,3 @@
 DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
-DIST biz.aQute.bnd.annotation-6.3.1-sources.jar 50600 BLAKE2B 6ace86a803c378be17b4ecfb658eb17e9c95f4f8797cdf22cbb9a5acb2a382fe0ee6791ad0280a2de9d9e85fbe2732487e693b2c93f08145b3633810f480f8b9 SHA512 751855a173e6d5f9d09f6d63775b97d971cebbfc019053988ec7fe144d0f49b4d09b9a2339d63bb43cea51d09d7d766554255f727cad8d73d9c196097e58d0fd
-EBUILD bnd-annotation-6.3.1.ebuild 1615 BLAKE2B e8f7d88995093e2ea2478596e9a4d541dae5eb9d149fe61522eb33dd920b314d40e6764e46864400d97a320d99a44701e76fe419835026f715ab3b8b69693720 SHA512 a663b05a53212b6262c74483232f22c0c0801601456a6cb0cc7c802e26cd3e7f8ffcf060bb02db016e3220301bde9c6c657a2bdf83a0773588f55c6ea8758306
 EBUILD bnd-annotation-7.0.0.ebuild 709 BLAKE2B bc5315922dd31d8c3dacbb86aa025bc76d0337d18c01ee184f4c2109fc8602b520f49bcaf6fe0c0f72f6d1bf2706c11ae7345ba1bdf33ade7b4250682f41236e SHA512 4e17dc24443df7255a8eb04effce1ed831996eed7fc9c0ddca52086cd33f694e1f21a64c94beecdbc4a93bd127971ad9d9176cdaa8ae7e3c0e28ab9df86df3d5
 MISC metadata.xml 294 BLAKE2B 66837ec99fde5f758bfca40e387481d9e99d8ea6c520b4ec74fd83cf51670aa2626277f231fb6e0159495da497d8c74725ec18fa2d09d4fc1223e0e84a13f58a SHA512 e79f2bc0d9b0e9981f3688d97299a4897f453695dbeebb6bd44e93706bb19e6b2542d3d89cc8f222cf353604bf47b6134ab8f67bb070650a558736a9ff5e6cc4
diff --git a/dev-java/bnd-annotation/bnd-annotation-6.3.1.ebuild b/dev-java/bnd-annotation/bnd-annotation-6.3.1.ebuild
deleted file mode 100644
index 70550ab55d21..000000000000
--- a/dev-java/bnd-annotation/bnd-annotation-6.3.1.ebuild
+++ /dev/null
@@ -1,48 +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 biz.aQute.bnd.annotation-6.3.1.pom --download-uri https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/6.3.1/biz.aQute.bnd.annotation-6.3.1-sources.jar --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild aqute-bnd-annotation-6.3.1.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="biz.aQute.bnd:biz.aQute.bnd.annotation:6.3.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="bnd Annotations Library"
-HOMEPAGE="https://bnd.bndtools.org/"
-SRC_URI="https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/${PV}/biz.aQute.bnd.annotation-${PV}-sources.jar"
-
-LICENSE="Apache-2.0 EPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-# Common dependencies
-# POM: biz.aQute.bnd.annotation-${PV}.pom
-# org.osgi:org.osgi.resource:1.0.0 -> !!!artifactId-not-found!!!
-# org.osgi:org.osgi.service.serviceloader:1.0.0 -> !!!artifactId-not-found!!!
-
-CP_DEPEND="dev-java/osgi-annotation:0"
-
-# Compile dependencies
-# POM: biz.aQute.bnd.annotation-${PV}.pom
-# org.osgi:org.osgi.namespace.extender:1.0.1 -> !!!artifactId-not-found!!!
-# org.osgi:org.osgi.namespace.service:1.0.0 -> !!!artifactId-not-found!!!
-# org.osgi:osgi.annotation:8.1.0 -> >=dev-java/osgi-annotation-8.1.0:0
-
-DEPEND=">=virtual/jdk-1.8:*
-	dev-java/osgi-cmpn:8
-	dev-java/osgi-core:0
-	${CP_DEPEND}"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-JAVA_CLASSPATH_EXTRA="osgi-cmpn-8,osgi-core"
-JAVA_SRC_DIR="."
diff --git a/dev-java/commons-imaging/Manifest b/dev-java/commons-imaging/Manifest
index bfdaf9e6e2ba..31cad257392a 100644
--- a/dev-java/commons-imaging/Manifest
+++ b/dev-java/commons-imaging/Manifest
@@ -3,5 +3,5 @@ DIST apache-sanselan-incubating-0.97-src.tar.gz 33317875 BLAKE2B c9db6c30accc308
 DIST commons-imaging-1.0-alpha3-src.tar.gz 39966281 BLAKE2B f0fbb6d7ae0c12be19fe13d3ff4e1cced5acfe7ea72326528c67b57fade73c0acee3eb8eaa62b3d40c473c0c2faf7f60ec190bc0954c5159405358bfac4efd42 SHA512 16300adb5873fef464bedfdce7e1368f52add8d33087f059667840880b8666024feeecdb278a53d5c3d8e76d01ab921ea146d41ca688757f0cf0c2f2b32b0d53
 DIST commons-imaging-1.0-alpha3-src.tar.gz.asc 833 BLAKE2B b28631badf344fa476a99db78e26a9453d033d21dba8484b2621a4cb0295ea262f58d2df4f8afd6d8090ecd0ea98ec2dca0168e2b401d662c335ad1ef9518b98 SHA512 b7e6691d5eac6f81657dc42aa69184da7fd1bf364da391ac4e1a27991d9a8bbba23296d58b874b4c69a20d39c3c1e821ca19c312f3e71b3acd8903156a2a0a1d
 EBUILD commons-imaging-0.97.ebuild 1263 BLAKE2B 0ff63d5ba9c55d7ae44042b3e3c9f38e769a6bca3c353e92ddfd2d7d1d3d0ea43b04127de28c4fe658f00044fd06561e8f58a024cd2000bf16c0d69852a5cd20 SHA512 53f3e8ea605cb244ad88beeac78a44988652c59eed154a4f6a58f3453d9575a264ce32ffdb1ec72557edd47c8dd0708e55b70d62241608ec8e10ff0eaea7205e
-EBUILD commons-imaging-1.0_alpha3-r2.ebuild 1143 BLAKE2B 51ef66c599bf7d3071c31122a00c96384eeb6df18a35908e8e322ff0c88225188e65e491f71a6728144178b0b938fe74af2743326a51d58bcbbf0356ee650302 SHA512 d2f63235d10f2f7b527cce410905f0f877079af879d6f175778a09e285141626b4331e8376151afd0e4199a18b0dd8f718fcc04c0ac7cfb0b29aa169d1c8f056
+EBUILD commons-imaging-1.0_alpha3-r2.ebuild 1144 BLAKE2B ebbc89cb142ae39e86559df7051eb8f8807e63526ad82a3b7986e5ed0c7a1130664362a7a036b398fb529f9c194494831b21e94118eb8ff67fd32e7b19cefe3d SHA512 3ef5ce17a226635da4f6605e06ad3c2cd154e6fe549185aed347af6fabf29f5c21e1f9392bfe9b1236ae6dab8fdd4182b80573aa50823a249939f4c4752d008f
 MISC metadata.xml 1078 BLAKE2B e2b1574082b656f2025228403463c5111b3d8174d72f9f4d9e31de9c9f72682b6cdd534d4aee455c30f222ae29fddf516395484a7b7fd5811cbd1f82382f4865 SHA512 812966e93eaea83f94ad0957d2421e73bafceff6c354b822d6936cbea9cd058e7dd0400d8d21e88eaa37a1cf1db625f2d5300317ea9817fc705558092c579cf3
diff --git a/dev-java/commons-imaging/commons-imaging-1.0_alpha3-r2.ebuild b/dev-java/commons-imaging/commons-imaging-1.0_alpha3-r2.ebuild
index 13d24c8e36ec..bf8374ec9408 100644
--- a/dev-java/commons-imaging/commons-imaging-1.0_alpha3-r2.ebuild
+++ b/dev-java/commons-imaging/commons-imaging-1.0_alpha3-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.commons:commons-imaging:${PV/_/-}"
+MAVEN_ID="org.apache.commons:commons-imaging:1.0-alpha3"
 
 inherit java-pkg-2 java-pkg-simple verify-sig
 
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 49ed7dad6e68..acac7ee8c18d 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,8 +1,6 @@
-DIST mysql-connector-j-9.0.0.tar.gz 4469329 BLAKE2B 3248d43654c56a2b566bbf515de996ab43f845beb2104f69c3c3c837b8b527d8e9851fe849bcf55fd7eafb061e4780dfaa19b42583a7d12b72367d0a36a61ab3 SHA512 40028f528e8bff686fcd700d165785194e1732a8c2c29efb2ffe67623f8915caaac4d2a9e548b0e9cda4328e25cfd6fe4e008cca1491117e38a4c79af0231475
 DIST mysql-connector-j-9.1.0.tar.gz 4485702 BLAKE2B f382d58f559c6ec10899e32d4370e817f07561b294c1a173856df98a088a3e981952ac117ec3cc0946b8ef43a68eb52880ba45d9bb23b393b8a00a6999d52176 SHA512 042aa06fc5fb84d33b8308731371a29199a68bac5ae0866729fb2881f1bd4f41141f355c56c24764f2084059d99da56d9bba35d6ce3b48d9286bd1294d84ac02
 DIST oci-java-sdk-common-3.29.0.jar 453619 BLAKE2B 41a68344a9cf4733c642e3a6e4254f3991f19c13edf57b3c61352b1e6ffdfabfe29cd8dccaa9b128fae618a492fb342007d14ad65b06cd614da572c787cf35ab SHA512 b6def960e114b69d3f34706d5e293f0a05b30c31a1443a92e454631712bb633eaea3795beeeabe4eb1303b8ad42ef2b73d69880b73d360e193f8f1b532bc3430
 DIST opentelemetry-api-1.40.0.jar 141734 BLAKE2B 1f14ca7caadd0a3eed615da7ee528e5df72474d9a4eabcf5a820996830cf76c8fa3402de7d283598f1e4bb44b1a15c488b81863c4b5c0685ea35fe65f3fb12c2 SHA512 d4a1af66075b5f147ba297a8133a707716e323800d8aa2debcdace2bbe10046b2fee8a47d87fa9b6f1f11ad30f4da688670c546841990ad8daa7c8c0535498f2
 DIST opentelemetry-context-1.40.0.jar 47251 BLAKE2B 7effcc63ec6695184467518686ec8165118cae1e7a4f1a7db273a3cbd1ff0b1e98c2a83252291db9536121e1e2999d1d77734acd7ddb5b272264138af4e6af74 SHA512 14ebc39edce8b603fe9f13d304faf54d7362abe3b1ae574aa84d5bbe37c43b133c8131976efd2bfedc94c646b2487054f7b3cce04e1f09efbce0f4ce5a6d5921
-EBUILD jdbc-mysql-9.0.0.ebuild 2150 BLAKE2B 520f0b21982ffefd5e68432df84c39a829f222c0bde1ebef680801cea17ab55173142760c85e4d776e82374564e9d1f5aadafb6a4f0b32e1c9f203109eaf598e SHA512 19826dac5ee57a887e8147b5c6fa6877794b84d720ff887adb8d8409778307224b05fe658cc62c549b428466c523542d8176d60d26acbef9973be891f46ff607
 EBUILD jdbc-mysql-9.1.0.ebuild 2150 BLAKE2B d7f6efcca1076ebaeeb4f1554e6bb9a20413d53328117d79b06ef5a93c3fe845c18964f51fdd145877a0c67886b70dc0f0d1dd0b7f040601dce3e78a029c8a51 SHA512 6f2b2e86ed181455fa57bcb5cd90ba2d57d789753fe3f0665156cdf94ac2bca6b0899062f519ad8d094f0568d3c70d90960f04db9b1972e60ea32aef2c5a03f3
 MISC metadata.xml 325 BLAKE2B e1c3ff68e092bb0e4cd63ed17da632f053f938e8e119a3b5f9a68a3961aac6c1df48a03e281583c22e881576ac9c50b405f0a6b40323bd85a183541a02792a05 SHA512 f855f395f2cc16667e5c524b63c409f754e399d657e50e7aeaebaa99af850480e271a890460a313b8be3c5a66d3e51d26dd2ceaade8828ce3d700232b892fca8
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-9.0.0.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-9.0.0.ebuild
deleted file mode 100644
index 7875ebd0d754..000000000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-9.0.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# No tests, see bug #902723
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.mysql:mysql-connector-j:9.0.0"
-# JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-# Bundling binary versions of oci-java-sdk-common and opentelemetry
-# https://github.com/oracle/oci-java-sdk/blob/v2.47.0/bmc-common/pom.xml
-OSC="3.29.0"
-OAV="1.40.0"
-
-DESCRIPTION="JDBC Type 4 driver for MySQL"
-HOMEPAGE="https://dev.mysql.com/doc/connector-j/en/"
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${PV}.tar.gz
-	https://repo1.maven.org/maven2/com/oracle/oci/sdk/oci-java-sdk-common/${OSC}/oci-java-sdk-common-${OSC}.jar
-	https://repo1.maven.org/maven2/io/opentelemetry/opentelemetry-context/${OAV}/opentelemetry-context-${OAV}.jar
-	https://repo1.maven.org/maven2/io/opentelemetry/opentelemetry-api/${OAV}/opentelemetry-api-${OAV}.jar"
-
-S="${WORKDIR}/mysql-connector-j-${PV}"
-
-LICENSE="GPL-2-with-MySQL-FLOSS-exception"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-
-CP_DEPEND="
-	dev-java/c3p0:0
-	>=dev-java/protobuf-java-4.27.2:0
-	dev-java/slf4j-api:0
-"
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( CHANGES README )
-
-JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/oci-java-sdk-common-${OSC}.jar"
-JAVA_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/opentelemetry-context-${OAV}.jar"
-JAVA_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/opentelemetry-api-${OAV}.jar"
-JAVA_JAR_FILENAME="mysql-connector-j.jar"
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR=(
-	"src/generated"
-	"src/legacy/java"
-	"src/main/core-api/java"
-	"src/main/core-impl/java"
-	"src/main/protocol-impl/java"
-	"src/main/user-api/java"
-	"src/main/user-impl/java"
-)
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_newjar "${DISTDIR}/oci-java-sdk-common-${OSC}.jar" oci-java-sdk-common.jar
-	java-pkg_newjar "${DISTDIR}/opentelemetry-context-${OAV}.jar" opentelemetry-context.jar
-	java-pkg_newjar "${DISTDIR}/opentelemetry-api-${OAV}.jar" opentelemetry-api.jar
-	java-pkg_regjar "${ED}/usr/share/jdbc-mysql/lib/oci-java-sdk-common.jar"
-}
diff --git a/dev-java/joda-convert/Manifest b/dev-java/joda-convert/Manifest
index 43ebe36d6a7d..ce5c0ed5d3b6 100644
--- a/dev-java/joda-convert/Manifest
+++ b/dev-java/joda-convert/Manifest
@@ -1,5 +1,3 @@
-DIST joda-convert-2.2.2.tar.gz 65476 BLAKE2B 9ef8e3b172d31f4e3b748ba5aae807b1d344c3b6bedeb0bf0b84b93009171495f271d03cd9f7b29147a256ddd1081b3fc9640c1df6b45425080ce1d44e2c0f37 SHA512 9660491373d5f7d415ab47cec7164922fc8901803e759bbf8cf7d0cc58040c2c8b245271f33d641a563ffb25b8e42f8197e297da7d1fe68a5c50ebb61536f3ae
 DIST joda-convert-2.2.4.tar.gz 56778 BLAKE2B 76bcbf6a63461e2a1bb2ce82c38aa65fef1f385cdb9752ef7cffefcbd6b535b822f25a7d21026fd117fb2f40ec15113a6f2884ae21c56d1f49ea182fe9993fae SHA512 4d503328a8424f3992b4ad13f192481268136630426c3d9830d9e4bb4c6b14422d7097654c80b69f9c863b55b8da1938971b1dad5be70293824953c6c3a719ae
-EBUILD joda-convert-2.2.2-r2.ebuild 1869 BLAKE2B c52ce7b7bb42053c48c594014b19b0de436a10a6f21cb5115704dda47c2bf075e12b3541bf99060f468e98b310fe14ea848609514b4c65c44969c1aa8348b030 SHA512 9ec7111128899368a55d2cdf26182ee66852e7c8024cd8e408bbca19d13b07f7bd521834c12d24fc20e5331f7954010cd6b8a5e42edd4462ef55933cd0662228
 EBUILD joda-convert-2.2.4.ebuild 1431 BLAKE2B b4643121d6bf360d921ae493ef19b69a78ad9e255688dc911eacd6b1a795777ec88c3d5067c58f43b9b5e5bbc0a6524c5a7545eb9542c296147ba963cfac2b47 SHA512 58f0f4b8163c2f6316c8765e13fac57c2f1fd51d4f8117451081d6d2106f8f1f1c5c801bfde2ff54a8450f516ec63b8308655d690cea5b4d37952ed1fa59257c
 MISC metadata.xml 390 BLAKE2B 50a8eb1f9935a4b0bc775f4c5f069df312da8aec16f6aeb6fb9c66df41f1af3ad4b3a06697e7a2d660275f6cdb19571b99b6d2a9d7418c7d4d9cb177e7660769 SHA512 da06cf231ded50201b189737b5021486c4ec324f6f7e6eb5df1ed2f1ae67a29bd529d4f108eb904c6820994c960c7c6523d69f70378f5d928286736c4ce78cc0
diff --git a/dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild b/dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild
deleted file mode 100644
index dd3b55a98160..000000000000
--- a/dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild
+++ /dev/null
@@ -1,65 +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/JodaOrg/joda-convert/archive/refs/tags/v2.2.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild joda-convert-2.2.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.joda:joda-convert:2.2.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Library to convert Objects to and from String"
-HOMEPAGE="https://www.joda.org/joda-convert/"
-SRC_URI="https://github.com/JodaOrg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-# Compile dependencies
-# POM: pom.xml
-# test? com.google.guava:guava:31.0.1-jre -> !!!suitable-mavenVersion-not-found!!!
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="
-	>=virtual/jdk-11:*
-	test? (
-		dev-java/guava:0
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-DOCS=( {NOTICE,RELEASE-NOTES}.txt README.md )
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
-	# Upstream: Tests run: 186, Failures: 0, Errors: 0, Skipped: 0
-	# All following: No runnable methods
-	org.joda.convert.test1.Test1Class
-	org.joda.convert.test1.Test1Interface
-	org.joda.convert.test2.Test2Class
-	org.joda.convert.test2.Test2Factory
-	org.joda.convert.test2.Test2Interface
-	org.joda.convert.test3.Test3Class
-	org.joda.convert.test3.Test3Factory
-	org.joda.convert.test3.Test3Interface
-	org.joda.convert.test3.Test3SuperClass
-	org.joda.convert.test4.Test4Class
-	org.joda.convert.test4.Test4Factory
-	org.joda.convert.test4.Test4Interface
-	org.joda.convert.TestRenameHandlerBadInit
-)
diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest
index e9d3e1615936..1d3bdd48b524 100644
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@@ -2,5 +2,5 @@ AUX joda-time-2.11.0-test.patch 577 BLAKE2B 072cb890960ae26fef7297e7e7af18ab36f5
 DIST joda-time-2.11.2.tar.gz 1055885 BLAKE2B 52281dcb530734dd33d0c01b07c9fbc5e7afd507a97e6926f7ef442dc91907d999d126289bc609e6fabf6af4267e47e5a79452d462a3f0561c405e6cd7f5976f SHA512 ea43deea4ef751fc631c35589adec0c5d9d0a5c836c1a24ada5d994cb9310a55b5af69260afd2647516c64fc84b892a2e25fca4bb38e852982c40f7caa5858b3
 DIST joda-time-2.13.0.tar.gz 1076948 BLAKE2B d70be1086175c80f72c7dc945aea24f71d74552e7f8e56bd84a62f308bd9db0e006951ae415dfec6f18cb47485019e179e66a198b6c1adafaa79b3f590318825 SHA512 0e185c433891d6d6a1ac9e93e5ddf6cde4097de4b810881266ab8f149de4cfbe089b857a946e8d36731ad82f84c789e12ffcde1836cd088e9056e3533ce79200
 EBUILD joda-time-2.11.2.ebuild 2593 BLAKE2B d6da0b344ee28b387078cbe6ce0e44a2b28ed8ed0089ebd9e4d84dd848e2c8c1eab994498af210708cdf2011c221b13d3b4a127b95ae6b70d1b57946eae99773 SHA512 714fbc61dbadbbf8e23f70a9c29df58d0fb20704ca91c3e7410190bf6559117948e118f1d145c4be847dd535a43da74267169364fdf68ae32741525956d56b5f
-EBUILD joda-time-2.13.0.ebuild 2382 BLAKE2B 42f46691217ed741ad17a808337ce9e23fadc0f55803f5b872016159b01ae3f14f9d715a30acb2af81e934462dc2e9c603667c3ba4da8fb0c1ee3e402b83534a SHA512 94e071fad37a083d2851535e5d64f23749b33e169c2e96509cd48926af5a2f55bfaa492dc14abcabe3720e2f481fc815b2a71269cddaa45f5ea2f4e7a3b52fca
-MISC metadata.xml 497 BLAKE2B 96303e9c4ee30156cb9f6dc9260155270fbc3aece7c8dcfb1fd796e69ed4ee2f3ec91030f016dcdd53f411a5c216c3d41dd68ea45079c036e0ee55d529548fd2 SHA512 9f5a300ca1ee6a68e555393879c61c6898c5ba22f0cdd83d83c1411d3009af7478ddb0e1087bc88d695b2bab162c4cc62952d3fc29b4902a857db95c2fc2f130
+EBUILD joda-time-2.13.0.ebuild 2380 BLAKE2B 90aef2e9a892540f7651715a1965fec3b926d6cd5780fe54af037840ebd8fb6c0aebabe21b6b2ec40dcdeb267e577f9d92c3bebd7979f64b27719b41cfaa26dd SHA512 27d955eeb1e63189c039299367f199254e330bf58639d6de87dd9a86390ab5b3006f46cb60e8d0c8ba1010b352202727e97933a6bb244ea8592e60dc910f04f8
+MISC metadata.xml 443 BLAKE2B 504be6c5e1ad2932378893d87247956cd8eb7ab0d0a11515c0f53b1bbcacda07249a751892816703aa544312a5920be810ccef2a0f1adcd6db1c007dd78c8116 SHA512 9dd5a06656ae01180a29dd2b9d2a777ebec20bf91d528033392ebba5c79f6a3d8882eae50dedb2c1c1d6cfa945edb2087907aa28e2ec2081b96b4b2e32aabdff
diff --git a/dev-java/joda-time/joda-time-2.13.0.ebuild b/dev-java/joda-time/joda-time-2.13.0.ebuild
index dde3b7f870f3..90f47fd6522f 100644
--- a/dev-java/joda-time/joda-time-2.13.0.ebuild
+++ b/dev-java/joda-time/joda-time-2.13.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="
 	dev-java/joda-convert:0
diff --git a/dev-java/joda-time/metadata.xml b/dev-java/joda-time/metadata.xml
index 8a540039ed06..9eb8b5151f2d 100644
--- a/dev-java/joda-time/metadata.xml
+++ b/dev-java/joda-time/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">JodaOrg/joda-time</remote-id>
-		<remote-id type="sourceforge">joda-time</remote-id>
 		<bugs-to>https://github.com/JodaOrg/joda-time/issues</bugs-to>
 		<doc>https://www.joda.org/joda-time/userguide.html</doc>
 	</upstream>
diff --git a/dev-java/objenesis/Manifest b/dev-java/objenesis/Manifest
index 2badb1a3ffc9..b728fa5f819c 100644
--- a/dev-java/objenesis/Manifest
+++ b/dev-java/objenesis/Manifest
@@ -1,5 +1,3 @@
-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 1164 BLAKE2B 9655ba462f98ebb6ab26fb283ca78543f0183bb95fae877dd7e12ca0f578caa5cecaad5e0b2f5f276b13460786d8a5ef258903ee99f5972c12f99c41fc53fc0f SHA512 0b8189e86ffff302e9865624540f3ec9768e1392682397c0c2378b8575dfe436078e2eb3f56c4d1fb7e069669ddfc5e91c07f5d045f218961330d72d4fdf9fd7
 MISC metadata.xml 386 BLAKE2B 1015a40cbff1c5726a54996b8e0387b287ad70fbe45f732f399f4ef90c1839f0bfd0531139d9a304232fd6a49decd4bf287f746993ee7a1258b8bd3b920f2483 SHA512 e293fd7928f753745c69bb0357cc8140574c632d9a35e353df7dbbbc524855db423ac0cfc505b7bef2f98875cf5c05ed1144251702a0b932b6e1630d4be7ec95
diff --git a/dev-java/objenesis/objenesis-3.3.ebuild b/dev-java/objenesis/objenesis-3.3.ebuild
deleted file mode 100644
index 9075fa6f0501..000000000000
--- a/dev-java/objenesis/objenesis-3.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# No tests since we don't have junit-jupiter
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.objenesis:objenesis:3.3"
-# JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A library for instantiating Java objects"
-HOMEPAGE="http://objenesis.org/"
-SRC_URI="https://github.com/easymock/objenesis/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${P}"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-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/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index 6527b5f7e80e..fa38a1235426 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -2,6 +2,6 @@ DIST xmlgraphics-commons-2.10-src.tar.gz 1618901 BLAKE2B 4ce0bda4715d8d9326f2c42
 DIST xmlgraphics-commons-2.10-src.tar.gz.asc 833 BLAKE2B 15a9aa963695863bf27624f3f1afc6f3b1277bc58a01a103f76a4c25060e31f38e3e155bf240c816839cc216834ee0d4e639c3b60a91de9a4dde39c29c54af12 SHA512 5f44396867501ab2ab58c1da8e6212d873457eb6d4de545058f84530f05f0bfddf319b2c4bb5a711bf48cca402d7c68e5efae3a0ada71742a706f3b14290dec3
 DIST xmlgraphics-commons-2.9-src.tar.gz 2236891 BLAKE2B 5071418eb2773ade7d48faa00a45834ee392603adb7844ce7b7ffc6ab41f0d655ce29265fc56326093b06b7e2cb1b1f4b95ab5e0f339c05cca4e0eb71d59f368 SHA512 896a5fe41277783021075df0de1aa109a7f05416af6b0141301a2452197d85df0daef28f5c2a71802644cbff3bfe79579a1544000a4c1b5cec4c211d8effd521
 DIST xmlgraphics-commons-2.9-src.tar.gz.asc 833 BLAKE2B e85533d2509dc49f42346e373a416c8215600ff84a393ca6de545fce6e73d704a8146a257522e66a254248ebdbc6770e0040658223582184e0d8fd71f95bd941 SHA512 e52f02efba535192455b47a4adbb903426e51163083297eb7be83146e2c7ead913f4c0a51345681123afa64fbb3bffcea982a81fd2b92be2aa4c135082ed8e17
-EBUILD xmlgraphics-commons-2.10.ebuild 1422 BLAKE2B e6e65ca3cc33c6d7d02f7953634a91f1e63ed327fde355755faaddb7d174185fdb882d1d11bfbee1c630c04583fcb36f60d025eb4492ce269e298c5d1d665e90 SHA512 0e0a3b1351de15500dad96c2501f0cbed4db427304b55b589df1214640dfe0fe57951613d4aab50872e3553d14144c55f29c1f7eedc20b54265d63ab0dbdafac
+EBUILD xmlgraphics-commons-2.10.ebuild 1421 BLAKE2B 5dd2a06a682afc411b6c4b2f194097b296abb350122d963cae6b1d48ad26534d49c06bf1b988d2e49aece5cec4d54b764a0dbc48127490fb7985e563363b72f5 SHA512 2669c7524ee03dad66ce171702a88ecea9dfcbe569bfb41d36e77ee93f31585a7e5742f8632bef77d9b41f86ae31a63740753e414bd701f963bbedc076623ef1
 EBUILD xmlgraphics-commons-2.9.ebuild 1375 BLAKE2B 7d1e396d818f8b51984fbff35db0cc05237ef582b74fcc34c10549ba1cafdcd2eefae0bb9e1403336068c21692b82088a00d4c1fc99a3d63a0f3abb3d7001272 SHA512 357353dd0b33b498fbb23547ea163880f3329fff31603dc750e0655e2558de0921c373ef54f39e19dac7f358b986ee72819c241bcb82bc8f819fb0aa0ca01c69
 MISC metadata.xml 328 BLAKE2B 0116b6e35d9f22341807f3da68bd8d38fc43447920207a08508c46796bf1ff9d2634f38002b22139b7142c912e531d27043f629f259ab2e87d12b8e590d4b92a SHA512 74979721cdcb0c26c82a27e23043487990f41691ea1dd6acf87fb4e403dc8a44402c9907d697ac3024d754b3c504c266d51753b3cad1e4e3a16d861758574a61
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.10.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.10.ebuild
index f0d4d0f6bd04..6be7ebc188f8 100644
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.10.ebuild
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.10.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-commons )"