Adding metadata

14 files changed, 5 insertions, 455 deletions

diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
deleted file mode 100644
index 4e3633fe3296..000000000000
--- a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.ivy:ivy:2.5.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple java-osgi
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="https://ant.apache.org/ivy/"
-SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ppc64 x86"
-
-PROPERTIES="test_network"
-RESTRICT="test"
-
-CDEPEND="
-	dev-java/ant-core:0
-	dev-java/bcpg:0
-	dev-java/bcprov:0
-	dev-java/commons-httpclient:4
-	dev-java/commons-vfs:2
-	dev-java/httpcore:0
-	dev-java/jakarta-oro:2.0
-	dev-java/jsch:0
-	dev-java/jsch-agent-proxy:0
-	test? (
-		dev-java/ant-junit:0
-		dev-java/ant-junit4:0
-		dev-java/ant-junitlauncher:0
-		dev-java/ant-testutil:0
-		dev-java/hamcrest-core:1.3
-		dev-java/hamcrest-library:1.3
-		dev-java/xmlunit:1
-	)"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( LICENSE NOTICE README.adoc )
-
-S="${WORKDIR}/apache-ivy-${PV}"
-
-JAVA_GENTOO_CLASSPATH="ant-core,bcpg,bcprov,commons-httpclient-4,commons-vfs-2,httpcore,jakarta-oro-2.0,jsch,jsch-agent-proxy"
-JAVA_MAIN_CLASS="org.apache.ivy.Main"
-JAVA_SRC_DIR="src/java"
-JAVA_RESOURCE_DIRS="resources/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="ant-junit,ant-junit4,ant-junitlauncher,ant-testutil,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,xmlunit-1"
-JAVA_TEST_SRC_DIR="test-src/java"
-JAVA_TEST_RESOURCE_DIRS="test"
-JAVA_GENTOO_CLASSPATH_EXTRA="ant-ivy.jar:test.jar:custom-resolver.jar"
-
-# according to 57,60 build-release.xml
-# https://github.com/apache/ant-ivy/commit/c0c8df492d2312c983f50cfdc5841e18177f6f7b
-JAVA_TEST_EXTRA_ARGS="-Divy.cache.ttl.default=1s -Dskip.download=true -Divy.home=/tmp -D/offline=true"
-
-# Several tests require a certain treatment to "generate-bundles":
-# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L426-L428
-# <ant dir="${basedir}/test/test-repo" target="generate-bundles"/>
-#
-# The procedure is coded in https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/test/test-repo/build.xml#L19-L71
-# but appears too difficult to be reprodused with 'java-pkg-simple.eclass'.
-# So the failing tests will be excluded, saved for a later attempt.
-#
-# Not excluding any test classes results in  "Tests run: 1109,  Failures: 98"
-# Excluding those test classes listed below leads to "OK (812 tests)"
-JAVA_TEST_EXCLUDES=(
-	# https://github.com/apache/ant-ivy/blob/083e3f685c1fe29092e59c63b87e81d31fc9babe/build.properties#L56
-	# test.class.pattern = *Test
-	"org.apache.ivy.ant.testutil.AntTaskTestCase" # not in scope
-	"org.apache.ivy.core.TestPerformance" # not in scope
-	"org.apache.ivy.util.TestXmlHelper" # not in scope
-	"org.apache.ivy.TestFixture" # not in scope
-	"org.apache.ivy.TestHelper" # not in scope
-	# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L412-L420
-	# <exclude name="**/Abstract*Test.java"/>
-	"org.apache.ivy.util.url.AbstractURLHandlerTest"
-	"org.apache.ivy.plugins.resolver.AbstractDependencyResolverTest"
-	"org.apache.ivy.plugins.matcher.AbstractPatternMatcherTest"
-	# following excluded tests cause test failures
-	"org.apache.ivy.ant.BuildOBRTaskTest" #                                 Tests run: 3,  Failures: 2
-	"org.apache.ivy.core.deliver.DeliverTest" #                             Tests run: 1,  Failures: 1
-	"org.apache.ivy.core.module.descriptor.IvyMakePomTest" #                Tests run: 1,  Failures: 1
-	"org.apache.ivy.core.settings.XmlSettingsParserTest" #                  Tests run: 29,  Failures: 1
-	"org.apache.ivy.osgi.core.AggregatedOSGiResolverTest" #                 Tests run: 3,  Failures: 1
-	"org.apache.ivy.osgi.obr.OBRResolverTest" #                             Tests run: 16,  Failures: 16
-	"org.apache.ivy.osgi.repo.BundleRepoTest" #                             Tests run: 4,  Failures: 3
-	"org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParserTest" #      Tests run: 46,  Failures: 1
-	"org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParserTest" #     Tests run: 44,  Failures: 7
-	"org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriterTest" #     Tests run: 10,  Failures: 1
-	"org.apache.ivy.plugins.parser.xml.XmlModuleUpdaterTest" #              Tests run: 14,  Failures: 3
-	"org.apache.ivy.plugins.resolver.JarResolverTest" #                     Tests run: 3,  Failures: 3
-	# following excluded tests can pass if run individually
-	"org.apache.ivy.ant.IvyConfigureTest" #                                 OK (14 tests)
-	"org.apache.ivy.IvyTest" #                                              OK (1 test)
-	"org.apache.ivy.MainTest" #                                             OK (12 tests)
-	"org.apache.ivy.plugins.report.XmlReportWriterTest" #                   OK (3 tests)
-	"org.apache.ivy.plugins.resolver.BintrayResolverTest" #                 OK (12 tests)
-	"org.apache.ivy.plugins.resolver.ChainResolverTest" #                   OK (15 tests)
-	"org.apache.ivy.plugins.resolver.FileSystemResolverTest" #              OK (27 tests)
-	"org.apache.ivy.plugins.resolver.IBiblioMavenSnapshotsResolutionTest" # OK (1 test)
-	"org.apache.ivy.plugins.resolver.IvyRepResolverTest" #                  OK (3 tests)
-	"org.apache.ivy.plugins.resolver.Maven2LocalTest" #                     OK (2 tests)
-	"org.apache.ivy.plugins.resolver.PackagerResolverTest" #                OK (3 tests)
-	"org.apache.ivy.plugins.resolver.URLResolverTest" #                     OK (5 tests)
-	"org.apache.ivy.plugins.trigger.LogTriggerTest" #                       OK (3 tests)
-	# Without PROPERTIES="test_network", the following test cause additional failures.
-	"org.apache.ivy.core.settings.OnlineXmlSettingsParserTest"
-#	"org.apache.ivy.osgi.updatesite.UpdateSiteAndIbiblioResolverTest"
-	"org.apache.ivy.osgi.updatesite.UpdateSiteLoaderTest"
-#	"org.apache.ivy.plugins.resolver.IBiblioResolverTest"
-#	"org.apache.ivy.plugins.resolver.MirroredURLResolverTest"
-	"org.apache.ivy.util.url.ArtifactoryListingTest"
-#	"org.apache.ivy.util.url.BasicURLHandlerTest"
-#	"org.apache.ivy.util.url.HttpclientURLHandlerTest"
-)
-
-src_prepare() {
-	default
-
-	mkdir --parents "${JAVA_RESOURCE_DIRS}/META-INF" || die
-	pushd "${JAVA_RESOURCE_DIRS}"
-		cp "${S}"/{NOTICE,LICENSE} META-INF/ || die
-		cp -r "${S}"/src/java/* . || die
-
-		# DEPRECATED: 'ivyconf' element is deprecated, use 'ivysettings' instead
-		# according to 210,221 build.xml and still in the upstream .jar file
-		cp org/apache/ivy/core/settings/ivy{settings,conf}-local.xml || die
-		cp org/apache/ivy/core/settings/ivy{settings,conf}-default-chain.xml || die
-		cp org/apache/ivy/core/settings/ivy{settings,conf}-main-chain.xml || die
-		cp org/apache/ivy/core/settings/ivy{settings,conf}-public.xml || die
-		cp org/apache/ivy/core/settings/ivy{settings,conf}-shared.xml || die
-		cp org/apache/ivy/core/settings/ivy{settings,conf}.xml || die
-
-		find . -type f -name '*.java' -exec rm -rf {} + || die
-	popd || die
-}
-
-src_test() {
-	# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L396-L407
-	# name="build-custom-resolver-jar"
-	JAVA_SRC_DIR="test/custom-classpath"
-	JAVA_JAR_FILENAME="test/java/org/apache/ivy/core/settings/custom-resolver.jar"
-	java-pkg-simple_src_compile
-
-	# Without "license.xml" the tests won't even start. "Tests run: 1109,  Failures: 318"
-	jar -cf test.jar \
-		-C test/java org/apache/ivy/plugins/parser/xml/license.xml \
-		-C test/java org/apache/ivy/plugins/parser/m2/license.xml || die
-
-	# Reduce number of failures to "Tests run: 1109,  Failures: 98"
-	jar -uf "test.jar" -C test/java . || die
-
-	# Separate *.java files from test resources
-	# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L389-L393
-	mkdir test-src || die
-	cp -r test/java test-src/ || die
-	find test -type f -name '*.java' -exec rm -rf {} + || die
-
-	# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L430-L438
-	# name="prepare-test-jar-repositories"
-	mkdir test/jar-repos || die
-	jar -cfM "test/jar-repos/jarrepo1.jar" -C test/repositories/1 . || die
-#	jar -cfM "test/jar-repos/jarrepo1_subdir.jar" -C test/repositories 1/**/*/ || die
-
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	default
-	java-osgi_dojar-fromfile "ant-ivy.jar" "META-INF/MANIFEST.MF" "ant-ivy"
-	use doc && java-pkg_dojavadoc target/api
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild b/dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild
index 0a4134224322..c3f9edd9891f 100644
--- a/dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild
+++ b/dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/apiguardian-team/apiguardian/archive/r${PV}.tar.gz -
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index b31577627594..a8ecdcddf113 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,2 +1 @@
 DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490
-DIST httpcomponents-client-4.5.13-src.tar.gz 824131 BLAKE2B 1507c81749a92afcf8b170b606761236d71b02d8b8b257d753a0f09abbdc297057df39661e827dee52804a2138de7d201b2a837418cbec21085fd3ffd558b51c SHA512 421e413fb2206fa95b6428ff067cdf2b440d2d3d4503cc3ca9bcf70ccd8ed1b8273ec4fe0703e6a8cd7612940b7ed966d9f163dbfeb8bf699ae2a8b2e0866d05
diff --git a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
deleted file mode 100644
index 38274be97d07..000000000000
--- a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom httpcomponents-client-4.5.13/httpclient/pom.xml --download-uri https://github.com/apache/httpcomponents-client/archive/refs/tags/rel/v4.5.13.tar.gz --slot 4 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-httpclient-4.5.13.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.httpcomponents:httpclient:4.5.13"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache HttpComponents Client"
-HOMEPAGE="https://hc.apache.org/httpcomponents-client"
-SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-
-# Common dependencies
-# POM: httpcomponents-client-${PV}/httpclient/pom.xml
-# commons-codec:commons-codec:1.11 -> >=dev-java/commons-codec-1.15:0
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-# org.apache.httpcomponents:httpcore:4.4.13 -> >=dev-java/httpcore-4.4.14:0
-
-CDEPEND="
-	dev-java/commons-codec:0
-	dev-java/commons-logging:0
-	dev-java/httpcore:0
-"
-
-# Compile dependencies
-# POM: httpcomponents-client-${PV}/httpclient/pom.xml
-# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
-# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/hamcrest-core:1.3
-		dev-java/mockito:0
-	)"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt )
-
-S="${WORKDIR}/httpcomponents-client-${PV}/httpclient"
-
-JAVA_GENTOO_CLASSPATH="commons-codec,commons-logging,httpcore"
-JAVA_SRC_DIR=(
-	"src/main/java"
-	"src/main/java-deprecated"
-)
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,hamcrest-core-1.3"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
-	# Tests run: 929,  Failures: 1
-	# javax.net.ssl.SSLHandshakeException: Remote host terminated the handshake
-	"org.apache.http.conn.ssl.TestSSLSocketFactory"
-)
-
-src_install() {
-	default
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/fop/fop-2.7.ebuild b/dev-java/fop/fop-2.7.ebuild
index 5c30a5a49912..59fa332f90a6 100644
--- a/dev-java/fop/fop-2.7.ebuild
+++ b/dev-java/fop/fop-2.7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="2.7"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 CP_DEPEND="
 	dev-java/batik:1.14
diff --git a/dev-java/gson/gson-2.8.8.ebuild b/dev-java/gson/gson-2.8.8-r1.ebuild
index a4d0f7c1d6f9..a69ff0ad0aab 100644
--- a/dev-java/gson/gson-2.8.8.ebuild
+++ b/dev-java/gson/gson-2.8.8-r1.ebuild
@@ -26,7 +26,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 # test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
 
 DEPEND="
-	>=virtual/jdk-1.8:*
+	virtual/jdk:11
 "
 
 RDEPEND="
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index e9646ad9808e..b85b4cd1177a 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,2 +1 @@
-DIST jaxen-1.1.6.jar 409677 BLAKE2B 55e03939420c103fb5a6d323595ff0cb7653885eb9ba233fd581c5376d2ac90eecde7aa5576f602cdc459cfd9ba9e79c6bb5bfab3ed7805e717a21670a5748ee SHA512 979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48
 DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97 SHA512 cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53
diff --git a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
deleted file mode 100644
index be43e2578b5a..000000000000
--- a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="https://github.com/codehaus"
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="JDOM"
-SLOT="1.1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-JAVA_SRC_DIR="org"
-
-src_prepare() {
-	default
-
-	# xom depends on jaxen already. if we don't remove xom packages here and
-	# require jaxen to depend on xom, we end up in a circular dep.
-	# I fear though that removing those classes might bite us somewhere down
-	# the line...
-	rm -rv org/jaxen/{dom4j,jdom,xom} || die
-
-	# this is now part of jdk
-	rm -rv org/w3c || die
-}
diff --git a/dev-java/opentest4j/opentest4j-1.2.0.ebuild b/dev-java/opentest4j/opentest4j-1.2.0.ebuild
index 398dc826230c..38ff14588064 100644
--- a/dev-java/opentest4j/opentest4j-1.2.0.ebuild
+++ b/dev-java/opentest4j/opentest4j-1.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ota4j-team/opentest4j/archive/r${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/randomized-runner/Manifest b/dev-java/randomized-runner/Manifest
index b5438d14ff88..4bf9443b6193 100644
--- a/dev-java/randomized-runner/Manifest
+++ b/dev-java/randomized-runner/Manifest
@@ -1,2 +1 @@
-DIST randomized-runner-2.7.8.tar.gz 1501825 BLAKE2B e375d4509d8be914829c4ebfad5584e16f8f03be480ed21b52a0ad3db363b7f2761ae6442bb9baa8c929bc182c422963a6e8480165f53b7b820f9f4e2954a243 SHA512 5627f14dc70a6341838ad1ade0fa0f152ec6a5a7f3da4bc31e0ff040ea2c62aeafd669460f61f37db31de379db857ce3d58f0deed22d1cf714f1461988a92cdc
 DIST randomized-runner-2.7.9.tar.gz 1501927 BLAKE2B 41ac32c724a87021c9fd58d3c421cab1fefd00a1e9e25a29d6188b831120c5e1407894f19fa92254df5cd1f2a66a44bf6e4469fa2128d841c1f17d17a623eec9 SHA512 23db6f21a805146d759fa9d3c9a37199b7181d6c53d0f62a4d82c42cbc15816cc25a87a174ef3d533870d648039b3f8dcac9370ffaff4ef76fefb6fc2c38ee88
diff --git a/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild b/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
deleted file mode 100644
index a5a4ebb406f2..000000000000
--- a/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 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/randomizedtesting/randomizedtesting/archive/refs/tags/release/2.7.8.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild randomized-runner-2.7.8.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.7.8"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JUnit test runner and plugins for running JUnit tests with pseudo-randomness"
-HOMEPAGE="http://labs.carrotsearch.com/randomizedtesting.html"
-SRC_URI="https://github.com/randomizedtesting/randomizedtesting/archive/refs/tags/release/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# junit:junit:4.12 -> >=dev-java/junit-4.12:4
-
-CDEPEND="
-	>=dev-java/junit-4.12:4
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? org.assertj:assertj-core:2.2.0 -> >=dev-java/assertj-core-2.3.0:2
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-	test? (
-		>=dev-java/assertj-core-2.3.0:2
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/randomizedtesting-release-${PV}/${PN}"
-
-JAVA_GENTOO_CLASSPATH="junit-4"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="assertj-core-2"
-JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index b44912b51312..3e6c9904de13 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,5 +1,3 @@
-DIST ST4-4.3.1-sources.jar 198002 BLAKE2B d1bd78dac71800e342291920ba78ab39c9a43b1f3866e2afcb0e1d61d439592663a625efe2a5a215c6032469e7ebeeebb31267e1681536ca0cc524cc58781a3d SHA512 bd06940b629ab0378afd6342b6f5beef002023387843cefd866ebe6ae8e94996edc3f21a0c70ed3570d3fcb7194bf354d0e42d4eff32522b3c01c51369867be0
 DIST ST4-4.3.2-sources.jar 198754 BLAKE2B 667953642ed2721d1a7c7e94d90a1f8690cfa9c31c391e9b5089f04c64728dac75edc9cd0e529607cad4c1b07abaf45719c2cbab9e962a5feef657b59c3baccc SHA512 7de339d34adf6b9207a23e8936092ea4fde78bf1faa63cee869673e91ba73d0fcbaa555602d0905c7347e894985613c63ff4ce04825decc34c896da5a687d42f
 DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435 SHA512 76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
-DIST stringtemplate-4.3.1.tar.gz 432541 BLAKE2B c5b4124524e36a7104908dabf9ed258d2397095d8dc86eef401d0da1ac245629e88a1b2d0e35417ed7735ad6b8495fd2cc82970601a16ee856f5456fdc24b48f SHA512 afe62ca1cbc7572d05859c6fdaa1eb3221045da582bce5d88c328acae39128c904396f8ba1e10643a2757123297ba1924e046841cc8a667fbc724bdeca95680c
 DIST stringtemplate-4.3.2.tar.gz 437013 BLAKE2B 0fb0fd62314a1fa5045285966b28aaf8f18579261722c0383e4ec8b3198aff59fd0e9760dcd43d8ecddf795ce3b2a882f3f339ec56d117a4b5b22e9c2718d679 SHA512 d6150f86ce458b5c74d533016bc3168fad969fc1d814d01c5ad3be2f866f7aa531357a903565f31afa3ba62423acc760b7762865e0ee5dd3af4ea546f6be25e1
diff --git a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
deleted file mode 100644
index 96b458d2cc14..000000000000
--- a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.antlr:ST4:4.3.1"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java template engine"
-HOMEPAGE="https://www.stringtemplate.org/"
-# Maven Central sources JAR for *.java sources pre-generated from *.g files;
-# the source generation requires antlr-tool-3.5, which depends on this package.
-# Tarball for the test suite and DOCS files
-SRC_URI="
-	https://repo1.maven.org/maven2/org/antlr/ST4/${PV}/ST4-${PV}-sources.jar
-	https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-CP_DEPEND="
-	dev-java/antlr-runtime:3.5
-"
-
-BDEPEND="
-	app-arch/unzip
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-	test? (
-		dev-java/antlr-tool:3.5
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-"
-
-S="${WORKDIR}"
-TARBALL_S="${S}/${PN}4-${PV}"
-
-JAVA_SRC_DIR="org"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,antlr-tool-3.5"
-JAVA_TEST_SRC_DIR="${TARBALL_S}/test"
-
-DOCS=( "${TARBALL_S}/"{CHANGES.txt,contributors.txt,README.md} )
-
-src_prepare() {
-	java-pkg_clean # Just in case Maven Central sources JAR contains binary
-	if use test; then
-		pushd "${TARBALL_S}" > /dev/null ||
-			die "Failed to enter directory storing tarball contents"
-		eapply "${FILESDIR}/${P}-BaseTest-javac-source-target.patch"
-		popd > /dev/null ||
-			die "Failed to leave directory storing tarball contents"
-	fi
-	java-pkg-2_src_prepare
-	# Some of these tests requires a graphical display.
-	rm -v "${JAVA_TEST_SRC_DIR}/org/stringtemplate/v4/test/TestEarlyEvaluation.java" || die
-}
-
-src_test() {
-	# Make sure no older versions of this slot are present in the classpath
-	# https://bugs.gentoo.org/834138#c4
-	local old_ver_cp="$(nonfatal java-pkg_getjars "${PN}-${SLOT}")"
-	local new_test_cp="$(\
-		java-pkg_getjars --with-dependencies "${JAVA_TEST_GENTOO_CLASSPATH}")"
-	new_test_cp="${new_test_cp//"${old_ver_cp}"/}"
-
-	# Some of the test cases require an absolute path to the JAR being tested
-	# against to be in the classpath, due to the fact that they call the 'java'
-	# command outside ${S} and reuse the classpath for the tests:
-	# https://github.com/antlr/stringtemplate4/blob/4.3.1/test/org/stringtemplate/v4/test/TestImports.java#L103
-	# https://github.com/antlr/stringtemplate4/blob/4.3.1/test/org/stringtemplate/v4/test/BaseTest.java#L174
-	new_test_cp="${S}/${JAVA_JAR_FILENAME}:${new_test_cp}"
-
-	# Use JAVA_GENTOO_CLASSPATH_EXTRA to set test classpath
-	local JAVA_TEST_GENTOO_CLASSPATH=""
-	[[ -n "${JAVA_GENTOO_CLASSPATH_EXTRA}" ]] &&
-		JAVA_GENTOO_CLASSPATH_EXTRA+=":"
-	JAVA_GENTOO_CLASSPATH_EXTRA+="${new_test_cp}"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs # https://bugs.gentoo.org/789582
-}
diff --git a/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild b/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild
index a202127995b9..101fa55a4c63 100644
--- a/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild
+++ b/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/uniVocity/univocity-parsers/archive/refs/tags/v${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*