Adding metadata

14 files changed, 11 insertions, 722 deletions

diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
deleted file mode 100644
index dccd735d44ed..000000000000
--- a/dev-java/ant-core/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-core/ant-core-1.10.14.ebuild b/dev-java/ant-core/ant-core-1.10.14.ebuild
index b26b93661c3c..c69d378ddc71 100644
--- a/dev-java/ant-core/ant-core-1.10.14.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.14.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 DEPEND="
 	~dev-java/ant-${PV}:0
diff --git a/dev-java/ant-core/ant-core-1.10.9-r5.ebuild b/dev-java/ant-core/ant-core-1.10.9-r5.ebuild
deleted file mode 100644
index 40333bc9a9d1..000000000000
--- a/dev-java/ant-core/ant-core-1.10.9-r5.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Don't depend on itself.
-JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
-
-# Rewriting build.xml files for the testcases has no use at the moment.
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.ant:ant:1.10.9"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-ant-${PV}"
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
-HOMEPAGE="https://ant.apache.org/"
-SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-gentoo.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-CDEPEND=">=virtual/jdk-1.8:*"
-DEPEND="${CDEPEND}
-	doc? (
-		dev-java/bcel:0
-		dev-java/bsf:2.3
-		dev-java/commons-logging:0
-		dev-java/commons-net:0
-		dev-java/jakarta-activation-api:1
-		dev-java/jakarta-regexp:1.4
-		dev-java/jakarta-oro:2.0
-		dev-java/jdepend:0
-		dev-java/jsch:0
-		dev-java/log4j-12-api:2
-		dev-java/javax-mail:0
-		dev-java/sun-jai-bin:0
-		dev-java/xalan:0
-		dev-java/xml-commons-resolver:0
-		dev-java/xz-java:0
-	)"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${WORKDIR}/${PV}-build.patch"
-	"${WORKDIR}/${PV}-launch.patch"
-)
-
-src_prepare() {
-	default
-
-	eprefixify "${S}/src/script/ant"
-
-	# Fixes bug 556008.
-	java-ant_xml-rewrite -f build.xml \
-		-c -e javadoc \
-		-a failonerror \
-		-v "false"
-
-	# See bug #196080 for more details.
-	java-ant_bsfix_one build.xml
-	java-pkg-2_src_prepare
-
-	# Remove JDK9+ stuff
-	einfo "Removing JDK9+ classes (Jmod and Link)"
-	rm "${S}"/src/main/org/apache/tools/ant/taskdefs/modules/{Jmod,Link}.java
-}
-
-src_compile() {
-	export ANT_HOME=""
-	# Avoid error message that package ant-core was not found
-	export ANT_TASKS="none"
-
-	local bsyscp
-
-	# This ensures that when building ant with bootstrapped ant,
-	# only the source is used for resolving references, and not
-	# the classes in bootstrapped ant but jikes in kaffe has issues with this...
-	if ! java-pkg_current-vm-matches kaffe; then
-		bsyscp="-Dbuild.sysclasspath=ignore"
-	fi
-
-	CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal ||
-		die "build failed"
-
-	if use doc; then
-		# All Java packages imported by the source files need to present in
-		# the classpath, otherwise it would be https://bugs.gentoo.org/780531
-		local doc_deps=(
-			bcel
-			bsf-2.3
-			commons-logging
-			commons-net
-			jakarta-activation-api-1
-			jakarta-oro-2.0
-			jakarta-regexp-1.4
-			jdepend
-			jsch
-			log4j-12-api-2
-			javax-mail
-			sun-jai-bin
-			xalan
-			xml-commons-resolver
-			xz-java
-		)
-		for dep in "${doc_deps[@]}"; do
-			java-pkg_jar-from --build-only --into lib/optional/ "${dep}"
-		done
-		# This file imports netrexx.lang.Rexx, which is not available
-		# from ::gentoo.  Fortunately, there is not a dev-java/ant-*
-		# package for it, so even if we could generate documentation
-		# for it, it would be irrelevant
-		rm src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java ||
-			die "Failed to remove Java source file blocking Javadoc generation"
-		./build.sh ${bsyscp} javadocs || die "Javadoc build failed"
-	fi
-}
-
-src_install() {
-	dodir /usr/share/ant/lib
-
-	for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
-		java-pkg_dojar build/lib/${jar}
-		dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar}
-	done
-
-	dobin src/script/ant
-
-	dodir /usr/share/${PN}/bin
-	for each in antRun antRun.pl runant.pl runant.py ; do
-		dobin "${S}/src/script/${each}"
-		dosym ../../../bin/${each} /usr/share/${PN}/bin/${each}
-	done
-	dosym ../${PN}/bin /usr/share/ant/bin
-
-	insinto /usr/share/${PN}
-	doins -r dist/etc
-	dosym ../${PN}/etc /usr/share/ant/etc
-
-	echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
-	doenvd "${T}/20ant"
-
-	dodoc NOTICE README WHATSNEW KEYS
-
-	if use doc; then
-		dodoc -r manual/*
-		java-pkg_dojavadoc --symlink manual/api build/javadocs
-	fi
-
-	use source && java-pkg_dosrc src/main/*
-}
diff --git a/dev-java/ant/ant-1.10.14-r2.ebuild b/dev-java/ant/ant-1.10.14-r3.ebuild
index 9a6c7aacc165..d1d0486dd712 100644
--- a/dev-java/ant/ant-1.10.14-r2.ebuild
+++ b/dev-java/ant/ant-1.10.14-r3.ebuild
@@ -20,9 +20,9 @@ S="${WORKDIR}/apache-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="bcel bsf commonslogging commonsnet jai jakartamail javamail jdepend jsch junit junit4
-	junitlauncher log4j oro regexp resolver testutil xalan xz"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~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"
@@ -71,9 +71,7 @@ DEPEND="
 	)
 	xz? ( dev-java/xz-java:0 )
 "
-PDEPEND="~dev-java/ant-core-${PV}:0"
 RDEPEND="
-	!<dev-java/ant-core-1.10.14
 	!dev-java/ant-apache-regexp
 	!dev-java/ant-apache-log4j
 	!dev-java/ant-apache-xalan2
@@ -143,7 +141,7 @@ src_prepare() {
 	eprefixify "src/script/ant"
 
 	ANT_TASKS=(
-		ant-antlr # no dependencies
+		$(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)
@@ -153,12 +151,12 @@ src_prepare() {
 		$(use xalan && echo ant-apache-xalan2)
 		$(use commonslogging && echo ant-commons-logging)
 		$(use commonsnet && echo ant-commons-net)
-		ant-imageio	# no dependencies
+		$(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)
-		ant-jmf	# no dependencies
+		$(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)
@@ -167,7 +165,7 @@ src_prepare() {
 		# 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
-		ant-swing # no dependencies
+		$(use swing && echo ant-swing) # no dependencies
 		$(use testutil && echo ant-testutil)
 		$(use xz && echo ant-xz)
 	)
diff --git a/dev-java/ant/ant-1.10.9.ebuild b/dev-java/ant/ant-1.10.9.ebuild
deleted file mode 100644
index e68c9948a493..000000000000
--- a/dev-java/ant/ant-1.10.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
-HOMEPAGE="https://ant.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
-	+jsch +junit +junit4 +junitlauncher +log4j +oro +regexp +resolver swing testutil xz"
-
-DEPEND="~dev-java/ant-core-${PV}"
-
-RDEPEND="${DEPEND}
-	~dev-java/ant-core-${PV}
-	~dev-java/ant-junit-${PV}
-	~dev-java/ant-apache-xalan2-${PV}
-	antlr? ( ~dev-java/ant-antlr-${PV} )
-	bcel? ( ~dev-java/ant-apache-bcel-${PV} )
-	bsf? ( ~dev-java/ant-apache-bsf-${PV} )
-	commonslogging? ( ~dev-java/ant-commons-logging-${PV} )
-	commonsnet? ( ~dev-java/ant-commons-net-${PV} )
-	jai? ( ~dev-java/ant-jai-${PV} )
-	javamail? ( ~dev-java/ant-javamail-${PV} )
-	jdepend? ( ~dev-java/ant-jdepend-${PV} )
-	jmf? ( ~dev-java/ant-jmf-${PV} )
-	jsch? ( ~dev-java/ant-jsch-${PV} )
-	junit? ( ~dev-java/ant-junit-${PV} )
-	junit4? ( ~dev-java/ant-junit4-${PV} )
-	junitlauncher? ( ~dev-java/ant-junitlauncher-${PV} )
-	log4j? ( ~dev-java/ant-apache-log4j-${PV} )
-	oro? ( ~dev-java/ant-apache-oro-${PV} )
-	regexp? ( ~dev-java/ant-apache-regexp-${PV} )
-	resolver? ( ~dev-java/ant-apache-resolver-${PV} )
-	swing? ( ~dev-java/ant-swing-${PV} )
-	testutil? ( ~dev-java/ant-testutil-${PV} )
-	X? ( ~dev-java/ant-swing-${PV} )
-	xz? ( ~dev-java/ant-xz-${PV} )
-"
-
-S="${WORKDIR}"
-
-src_compile() { :; }
diff --git a/dev-java/ant/metadata.xml b/dev-java/ant/metadata.xml
index e99b1884787b..198cd9259ca3 100644
--- a/dev-java/ant/metadata.xml
+++ b/dev-java/ant/metadata.xml
@@ -17,6 +17,7 @@
       (<pkg>dev-java/bsf</pkg>)</flag>
   <flag name="commonslogging">Enable commons-logging Ant tasks</flag>
   <flag name="commonsnet">Enable commons-net Ant tasks</flag>
+  <flag name="imageio">Enable imageio Ant tasks</flag>
   <flag name="jai">Enable JAI (Java Imaging) Ant task</flag>
   <flag name="jakartamail">Enable Jakartamail Ant task</flag>
   <flag name="javamail">Enable JavaMail Ant task</flag>
diff --git a/dev-java/apache-rat/apache-rat-0.15.ebuild b/dev-java/apache-rat/apache-rat-0.15.ebuild
deleted file mode 100644
index 278f8ba410cf..000000000000
--- a/dev-java/apache-rat/apache-rat-0.15.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# javadoc is broken for java 17, see https://bugs.gentoo.org/914458
-JAVA_PKG_IUSE="doc source test"
-MAVEN_PROVIDES="
-	org.apache.rat:apache-rat-core:${PV}
-	org.apache.rat:apache-rat-tasks:${PV}
-"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Apache Rat is a release audit tool, focused on licenses"
-HOMEPAGE="https://creadur.apache.org/rat/"
-SRC_URI="mirror://apache//creadur/${P}/${P}-src.tar.bz2
-	verify-sig? ( https://archive.apache.org/dist/creadur/${P}/${P}-src.tar.bz2.asc )"
-S="${WORKDIR}/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CP_DEPEND="
-	dev-java/ant-core:0
-	dev-java/commons-cli:1
-	dev-java/commons-collections:4
-	dev-java/commons-compress:0
-	dev-java/commons-io:1
-	dev-java/commons-lang:3.6
-"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	test? ( dev-java/ant-testutil:0 )"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-creadur )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/creadur.apache.org.asc"
-
-DOCS=( NOTICE README.md README.txt RELEASE-NOTES.txt RELEASE_NOTES.txt )
-
-PATCHES=( "${FILESDIR}/apache-rat-0.15-fix-tests.patch" )
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	einfo "Compiling apache-rat-core.jar"
-	JAVA_JAR_FILENAME="${PN}-core.jar"
-	JAVA_RESOURCE_DIRS="${PN}-core/src/main/resources"
-	JAVA_SRC_DIR="${PN}-core/src/main/java"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":${PN}-core.jar"
-	rm -r target || die
-
-	einfo "Compiling apache-rat-tasks.jar"
-	JAVA_JAR_FILENAME="${PN}-tasks.jar"
-	JAVA_RESOURCE_DIRS="${PN}-tasks/src/main/resources"
-	JAVA_SRC_DIR="${PN}-tasks/src/main/java"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":${PN}-tasks.jar"
-	rm -r target || die
-
-	# javadoc is broken for java 17, see https://bugs.gentoo.org/914458
-	if use doc; then
-		einfo "Compiling javadocs"
-		ejavadoc \
-			-verbose \
-			-classpath "$(java-pkg_getjars \
-				--build-only ant-core)":"$(java-pkg_getjars \
-				--build-only commons-cli-1)":"$(java-pkg_getjars \
-				--build-only commons-collections-4)":"$(java-pkg_getjars \
-				--build-only commons-compress):$(java-pkg_getjars \
-				--build-only commons-io-1):$(java-pkg_getjars \
-				--build-only commons-lang-3.6)" \
-			-sourcepath "${PN}-core/src/main/java:${PN}-tasks/src/main/java" \
-			-d javadoc -subpackages org.apache.rat org.apache.rat.anttasks
-	fi
-}
-
-src_test() {
-	JAVA_TEST_GENTOO_CLASSPATH="ant-testutil,junit-4"
-
-	einfo "Testing apache-rat-core"
-	cp -r "${PN}"-core/src/{main,test} src || die
-	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-	JAVA_TEST_SRC_DIR="src/test/java"
-	java-pkg-simple_src_test
-	rm -r src/{main,test} || die
-
-	einfo "Testing apache-rat-tasks"
-	cp -r "${PN}"-tasks/src/{main,test} src || die
-	mkdir -p target/it-sources || die
-	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-	JAVA_TEST_SRC_DIR="src/test/java"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg_dojar "${PN}-core.jar"
-	java-pkg_dojar "${PN}-tasks.jar"
-	java-pkg_dolauncher "${PN}" --main org.apache.rat.Report
-
-	use doc && java-pkg_dojavadoc javadoc
-
-	if use source; then
-		java-pkg_dosrc "${PN}-core/src/main/java/*"
-		java-pkg_dosrc "${PN}-tasks/src/main/java/*"
-	fi
-}
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
deleted file mode 100644
index 6e82213d770d..000000000000
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc examples source test"
-MAVEN_ID="commons-httpclient:commons-httpclient:3.1"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The Jakarta Commons HttpClient library"
-HOMEPAGE="https://hc.apache.org/httpclient-legacy/"
-SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# doesn't work with IBM JDK, bug #176133
-RESTRICT="test"
-
-CDEPEND="dev-java/commons-logging:0
-	dev-java/commons-codec:0"
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )
-	${CDEPEND}"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="commons-logging,commons-codec"
-EANT_BUILD_TARGET="dist"
-EANT_DOC_TARGET="doc"
-
-# patch against CVE-2012-{5783,6153}. See bug 442292.
-PATCHES=(
-	"${FILESDIR}/${P}-SSLProtocolSocketFactory.java.patch"
-)
-
-src_prepare() {
-	default
-
-	# generated docs go into docs/api
-	rm -rf docs/apidocs
-
-	# remove javadoc task from compile task
-	sed -i -e 's/depends="compile,doc"/depends="compile"/' build.xml || die
-	sed -i -e '/link/ d' build.xml || die
-
-	mkdir lib && cd lib
-	java-pkg_filter-compiler jikes
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit"
-EANT_TEST_TARGET="test"
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-
-	# contains both html docs and javadoc in correct subdir
-	if use doc ; then
-		java-pkg_dojavadoc dist/docs/api
-		java-pkg_dohtml -r dist/docs/*
-	fi
-	use source && java-pkg_dosrc src/java/*
-	use examples && java-pkg_doexamples src/examples
-}
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
index f18caf90421b..c0053b42b61e 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 # Tests run: 2036,  Failures: 91
 RESTRICT="test"
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild
deleted file mode 100644
index 38a0c3f54a50..000000000000
--- a/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Ant-tasks to compile various source languages and produce executables"
-HOMEPAGE="http://ant-contrib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ant-contrib/ant-contrib/${P/_/-}/${P/_beta/b}.tar.gz"
-S="${WORKDIR}/${P/_beta/b}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="
-	dev-java/ant-core:0
-	dev-java/xerces:2
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:0
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
-
-EANT_BUILD_TARGET="jars"
-EANT_TEST_TARGET="run-tests -Djunit-available=true"
-EANT_DOC_TARGET="javadocs -Dbuild.javadocs=build/api"
-
-src_prepare() {
-	java-pkg_clean
-	use test && eapply "${FILESDIR}/${P}-test-classpath.patch"
-	java-pkg-2_src_prepare
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/lib/${PN}.jar
-
-	java-pkg_register-ant-task
-
-	dodoc NOTICE
-	use doc && java-pkg_dojavadoc build/api
-	use examples && java-pkg_doexamples src/samples/*
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/javacc/javacc-5.0-r4.ebuild b/dev-java/javacc/javacc-5.0-r4.ebuild
deleted file mode 100644
index f63c12eccf55..000000000000
--- a/dev-java/javacc/javacc-5.0-r4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
-HOMEPAGE="https://javacc.github.io/javacc/"
-SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-CDEPEND="dev-java/junit:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? (	dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-javadoc.patch
-)
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-EANT_GENTOO_CLASSPATH="junit"
-
-src_prepare() {
-	default
-
-	rm -v lib/junit*/*.jar || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar "bin/lib/${PN}.jar"
-
-	if use doc; then
-		java-pkg_dohtml -r www/*
-		java-pkg_dojavadoc doc/api
-	fi
-
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc src/*
-
-	echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc || die
-	doenvd "${T}"/22javacc
-
-	echo "export VERSION=${PV}" > "${T}"/pre || die
-
-	local launcher
-	for launcher in javacc jjdoc jjtree; do
-		java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
-	done
-
-	einstalldocs
-}
diff --git a/dev-java/javacc/javacc-5.0-r5.ebuild b/dev-java/javacc/javacc-5.0-r5.ebuild
index e0d97089ffc3..6df77f9fca66 100644
--- a/dev-java/javacc/javacc-5.0-r5.ebuild
+++ b/dev-java/javacc/javacc-5.0-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 CDEPEND="dev-java/junit:0"
 
diff --git a/dev-java/snappy/snappy-1.1.10.5.ebuild b/dev-java/snappy/snappy-1.1.10.5.ebuild
deleted file mode 100644
index 9f690d9c4df7..000000000000
--- a/dev-java/snappy/snappy-1.1.10.5.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.xerial.snappy:snappy-java:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple toolchain-funcs check-reqs
-
-DESCRIPTION="Snappy compressor/decompressor for Java"
-HOMEPAGE="https://github.com/xerial/snappy-java/"
-# ::gentoo does not have hadoop-common packaged. Currently we bundle the binary version.
-# It's used for testing only and does not get installed.
-HCV="3.3.5"
-SRC_URI="https://github.com/xerial/snappy-java/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-common/${HCV}/hadoop-common-${HCV}.jar )"
-S="${WORKDIR}/snappy-java-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="1.1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="dev-java/osgi-core:0"
-
-CDEPEND="
-	app-arch/snappy
-	dev-libs/bitshuffle
-"
-
-DEPEND=">=virtual/jdk-1.8:*
-	${CP_DEPEND}
-	${CDEPEND}
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/commons-io:1
-		dev-java/commons-lang:3.6
-		dev-java/plexus-classworlds:0
-		dev-java/xerial-core:0
-	)"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${CP_DEPEND}
-	${CDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/1.1.7.8-java-version-target.patch"
-	"${FILESDIR}/snappy-1.1.10.1-unbundle-snappy.patch"
-	"${FILESDIR}/1.1.7.8-unbundle-bitshuffle.patch"
-	"${FILESDIR}/1.1.7.8-gentoo.patch"
-	"${FILESDIR}/snappy-1.1.10.5-SnappyOutputStreamTest.patch"
-	"${FILESDIR}/snappy-1.1.10.1-commons-lang3.patch"
-)
-
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="
-	commons-io-1
-	commons-lang-3.6
-	junit-4
-	plexus-classworlds
-	xerial-core
-"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-check_env() {
-	if use test; then
-		# this is needed only for tests
-		CHECKREQS_MEMORY="2560M"
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_env
-}
-
-pkg_setup() {
-	check_env
-	java-pkg-2_pkg_setup
-}
-
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-	# remove pre-compiled sofiles
-	rm -r src/main/resources/org/xerial/snappy/native || die
-	rm -r src/test/resources/lib || die
-}
-
-src_compile() {
-	emake \
-		CXX="$(tc-getCXX)" \
-		JAVA_SOURCE="$(java-pkg_get-source)" \
-		JAVA_TARGET="$(java-pkg_get-target)"
-
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/hadoop-common-${HCV}.jar"
-	JAVA_TEST_EXTRA_ARGS=( -Xmx${CHECKREQS_MEMORY} )
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -ge 17; then
-		java-pkg-simple_src_test
-	else
-		einfo "Tests need jdk-17 to pass."
-	fi
-}
-
-src_install() {
-	java-pkg-simple_src_install
-
-	local jniext=.so
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		jniext=.jnilib
-		# avoid install_name check failure
-		install_name_tool -id "@loader_path/libsnappyjava${jniext}" \
-			"target/libsnappyjava${jniext}"
-	fi
-	java-pkg_doso "target/libsnappyjava${jniext}"
-}
diff --git a/dev-java/xmlunit/xmlunit-1.6-r1.ebuild b/dev-java/xmlunit/xmlunit-1.6-r1.ebuild
deleted file mode 100644
index 5f464a7ad02a..000000000000
--- a/dev-java/xmlunit/xmlunit-1.6-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="xmlunit:xmlunit:1.6"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="XMLUnit extends JUnit and NUnit to enable unit testing of XML"
-HOMEPAGE="https://sourceforge.net/projects/xmlunit/ https://www.xmlunit.org"
-SRC_URI="mirror://sourceforge/project/xmlunit/xmlunit%20for%20Java/XMLUnit%20for%20Java%20${PV}/${P}-src.zip"
-
-LICENSE="BSD"
-SLOT="1"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-CDEPEND="dev-java/junit:0"
-
-DEPEND=">=virtual/jdk-1.8:*
-	app-arch/unzip:0
-	doc? ( app-text/docbook-xsl-stylesheets:0 )
-	test? (
-		dev-java/ant-junit:0
-		dev-java/ant-core:0
-	)
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="junit"
-
-EANT_DOC_TARGET="users-guide-html javadocs"
-EANT_ANT_TASKS="ant-core"
-EANT_EXTRA_ARGS="-Ddb5.xsl=/usr/share/sgml/docbook/xsl-stylesheets"
-
-src_test() {
-	ANT_TASKS="ant-junit ant-core" eant test
-}
-
-src_install() {
-	java-pkg_newjar "build/lib/${P}.jar"
-
-	dodoc README.txt
-
-	if use doc; then
-		java-pkg_dojavadoc build/doc/api
-		docinto html
-		dodoc -r build/doc/userguide/html/
-	fi
-
-	use source && java-pkg_dosrc src/java/org
-}