Adding metadata

13 files changed, 3 insertions, 626 deletions

diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 174a42745cc1..8202ae31468b 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,4 +1,2 @@
-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
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 4a41f3f9f080..a890570b45c8 100644
--- a/dev-java/bnd-annotation/Manifest
+++ b/dev-java/bnd-annotation/Manifest
@@ -1,2 +1 @@
 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
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/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 48e9276fa13f..2c3dcda5087a 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,4 +1,3 @@
-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
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 766da8a5024a..b21b8311ca0a 100644
--- a/dev-java/joda-convert/Manifest
+++ b/dev-java/joda-convert/Manifest
@@ -1,2 +1 @@
-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
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/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/objenesis/Manifest b/dev-java/objenesis/Manifest
index b106bf82c6ef..c474ebc59816 100644
--- a/dev-java/objenesis/Manifest
+++ b/dev-java/objenesis/Manifest
@@ -1,2 +1 @@
-DIST objenesis-3.3.tar.gz 125400 BLAKE2B 36cff7cb5a2dca9a81f3ca07d56995f68d9c61c9d2b7caeac5f87bb13da02b0494053927e2221c776edef0bafb862f5c97dfc0e79cf991c6c970b5b9206a5aa3 SHA512 786fe0d2d1dba0f006d5218101578d8fd23616765f5cdb4df190d138fd10dd675b9189887c27a40b63f09ed5e1dac1324b2936c7ac24a655e6f63d53b9cd7c01
 DIST objenesis-3.4.tar.gz 128447 BLAKE2B 220694fb496b4a29ad50c92741477e08475a6bdbd4f6ff647a03995a86945d9474672ee1be4f60f1fc07f0b05a4f1e59110977fccf9fd063dbd57750a66e2a26 SHA512 e4b106ae71e5f62e6057dba749ac56c42030a2a1aca5c2ec5c95c934a7fe1af99e6c62ca9c50e76fa67610bfbf075e46a0c9f37d4e6c35ea6047175189ab686e
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/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 )"