gentoo resync : 06.04.2022

122 files changed, 2509 insertions, 825 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index d0427e82754f..46bea4e18e1f 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-apache-log4j/Manifest b/dev-java/ant-apache-log4j/Manifest
index c16979e7e73a..d5ad7e6c71bf 100644
--- a/dev-java/ant-apache-log4j/Manifest
+++ b/dev-java/ant-apache-log4j/Manifest
@@ -1,5 +1,4 @@
 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
-EBUILD ant-apache-log4j-1.10.9-r1.ebuild 395 BLAKE2B 0d68c72d4fa5a3f28bed9c87a513a8134ca75b4c0631e9f853e60ed9d94cbb9eddef7f291223f0ec7e9956add0bce78fa6322d11ac889f0a8410e0155f96d9cb SHA512 ea4d0f9a2f50029650930166303d1545ce91833b60c09c50c4aec8b4300b8437a34cc7db484b0b4250d87dacd6038159c141a6ded0f2fb09ddea94e47a093716
-EBUILD ant-apache-log4j-1.10.9.ebuild 388 BLAKE2B 4c25ff0efc34bff1fd224d7dea4fb3216b0a1f7c42796edbcdee9eb2bfbca95c441a52fee03dc381a5999905048f5092813db9b359e82ee8ff1423f30c0ad927 SHA512 a9925cb6bd56d0aeb25a398f3640d9867048b1555f9f7970f4294e8eee3cdb4ad0d1747ca4a1fde48346ddf51d1d6a58df8c02125554612cda6eddbd9966fe7c
+EBUILD ant-apache-log4j-1.10.9-r1.ebuild 392 BLAKE2B 1fa0ff853352fef1a6281a5af2745f4662e3f890b7a620ffc0b22be22f3e3b4cc299297cb8afc27fb415a99eace4b282e1fcf505580c45f8b8cb7d165f8f214e SHA512 8933d910b640fdff67621c61b3f79f9371315a37c50d6fcaf311e093c02ea2e033ca714547b0fd0f4df625bc48dea0d8dc873907df5118e3f8a756e83788eaaf
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
index 89617f7176fe..c48b772e49be 100644
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="log4j-12-api-2"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-java/log4j-12-api:2"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild
deleted file mode 100644
index d30b5fb9410a..000000000000
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="log4j"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/log4j-1.2.13-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 71b7551da274..97f5dc6ec729 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -10,7 +10,7 @@ DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2
 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
 EBUILD ant-eclipse-ecj-4.10-r1.ebuild 1248 BLAKE2B 717f74dc7cb1b13d18eac10ffc03db609a90d7a7db908b02475295e2595bef41049dc32b2384012e2d01be90df8937aa13d1620c77fcd3f38c95f5db499064fc SHA512 41b887ad6b860053405f7b4ed11f7a66f7cb9cafc898ee4e4b1680afea411327b291412b1d33d1dab5de6ee1eb6a1c6464d21bdf8859463a8f6d110dbd660149
 EBUILD ant-eclipse-ecj-4.13.ebuild 1253 BLAKE2B 97cbbb46a34ba3b400299517102a7d932f8f3b9114ae028ec65d7b2a30e663721db924fe78f993494244df2da88c908358afdf5210984668ebe4fa076775dbb7 SHA512 a8f641a3305ee1220786ff9a82597f4a21a0b2664633d60cd42d5aa9d98b24cf7e7bd63b4c828515191d127177b9645535dd7c275ad5c2b1a9ce723a003188ee
-EBUILD ant-eclipse-ecj-4.15-r1.ebuild 1265 BLAKE2B 6176f4208828b43831ebcf6a9cb552fdc815fd17aa28e44ea155738ff68584361f83894b6b22d69cb776f425b9f2a144caa554883551ad596a46e3e8d43fc285 SHA512 f177439d504325d9cf25302d873c92bd1f53ad4418ee08fc5b4b84aedcd8f89831584a833c5944a2d7c44df85ad8a047eeebce1025b494722232fe871ca6bd8f
+EBUILD ant-eclipse-ecj-4.15-r1.ebuild 1264 BLAKE2B 631af41f9a02ed8336a7252fd17feb4c080692b10f9e8c6f692562510276dd2feb4714e44698bc7210c96f442ce1b195adad4b3ff57d95d8f6ea1f4cfed41965 SHA512 93ce0a64e99f1b6959136cff595562915751ec4bae0deaba0d4b80b0c0fde55ed87a0ad2ea426293169f0417ec24dc7a8b608452b3701d6159aed6f10f5bbe83
 EBUILD ant-eclipse-ecj-4.22.ebuild 1422 BLAKE2B a61913fa08c0ead3742a7699624a7aae99e428f72996b370765db1ef7952adb96b1000f528e1f5d5ac13e97070ced630d67762bd0be1ad63f84f29839705eac7 SHA512 57fc3e388f5f71a5bd5a01b4891d4192d7297faba5c5f991e9298070d572ed135bb4d0fd201df861696c863547880691aff58529bd924803f62382bb369b646a
 EBUILD ant-eclipse-ecj-4.5.1.ebuild 1247 BLAKE2B 43d30d904d98149ab9d91ea66c3c0a53837010572de25c7b0e0bfdd8b0f4c230c4385c8b156a1a2cf3b77b1e9282c813a448934515953a300da76c4a20788880 SHA512 39e4e0870c2fa5151c77cac1b60a929f4959d68012219d584e8aa395a1983140f86775328f872694addd69ef6a25283265a4dec526bb224eb5335a5f5d6292e8
 MISC metadata.xml 547 BLAKE2B 250bb477a3547d97e993539eb2965d6ff8a5085627c8a4ce221fc74704b1c824b1ba4a2891a850b820bd42c4ccf3e684af3035ccaf45cc595f0eac6b62da2a4a SHA512 e1283be49bebaf5bb03e55ead8336a046eff3c657e600dd1456690280e2ae2f9f4fb12987d7c1cfd192e41d8f8d40b36896a2d7430063d243f374e4aedc4ec77
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
index 5957b5aefbe2..30383fea53f5 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.15"
 IUSE=""
 
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index 4b3b4a462a55..9c30acc23427 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,3 +1,4 @@
 DIST apache-ivy-2.5.0-src.tar.gz 2719181 BLAKE2B 71c47e3493beac8de1bc4e8c86ae18383938265dd2803a1c4b9ad466306227dab9eeca256516ff94064d902d0694b4f0b35ce152c5f64b95b876e47289b25833 SHA512 59d9458345e3a51e8f527258ba26ebe2cf5cf257401c52fb5f75aced0da5f7bf36f8aa0f202bbc0cf029d1d49bd6634f7cb8b65ccc828eb55ff7084430879268
+EBUILD ant-ivy-2.5.0-r1.ebuild 8558 BLAKE2B 76dc5420f88510014df56e19f113f5daa7cf438fab150ec84a5bb55c29c051ee0dec5e4b94992f001d456842672c92acbe2330f28934a4a25e1a5002b42dd7d3 SHA512 ebe13d31a2f096c9f2c88cfff1c048cb2a9ce35f60664fb2093faf1b2477d819f4775ef2a6ffed0e12c79c048fec9f3cc05f7102191a362db80a2746a42781dc
 EBUILD ant-ivy-2.5.0.ebuild 8495 BLAKE2B a78606e6844fe8c7c584695aec2f8c4d1a2d5a7d60fbba7e4e097a2715be9d1ec5cea5d282a0b95c3ae4fb0a06f5aea9768111c48d0d8e17f283c27db9efdc77 SHA512 95b72255d71bbb6e0d773f5d519f19ed8bcaaff2f907052f28d3cd7f7cd848e550c5b8d4c39537c61df14d5d51895f4dead1f4c9707c4629f45ad4970e1974e5
 MISC metadata.xml 853 BLAKE2B deb1f7bed1e2828ff976d7a325fdd193fd099d911849bb53320e2093dd9030056b71858ad24bad3308570bf8ef6cf9c4a1d542ce47417683d484327de3a76d0c SHA512 960bc190397b3b2264dbd62b6487c383d11bbe73460ba76791d720fe4f78713158917b45b7e437707ef63dd87c0863caa333b0a9089b66b521792748a52085a1
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..cb8092656c67
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
@@ -0,0 +1,184 @@
+# 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.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/httpcomponents-client
+	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
+	)"
+
+# Restrict to jdk:1.8 since java.util.jar.Pack200 was removed.
+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,httpcomponents-client-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/antlr-runtime/Manifest b/dev-java/antlr-runtime/Manifest
index c0cc4328b691..759873917d40 100644
--- a/dev-java/antlr-runtime/Manifest
+++ b/dev-java/antlr-runtime/Manifest
@@ -1,5 +1,6 @@
+AUX 4.9.3-test-fixes.patch 1399 BLAKE2B 719571607153951b6a44a7bed7c405b6e217f7a458667388d89ca15683342a5d9849155ad03771eb0f7d326af31fd0cf6e0ab9ddfbd385e189b33f0c842ab53e SHA512 b0aed6d54873ffd841ae5ac6ce1afb5d037fdde6e322903e250e46b38b84fd29ca87668f8b1f38a5c6b0ec4ad99953021d4260b67515158accbc37fd325e98eb
 DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127
 DIST antlr-runtime-3.5.2-sources.jar 206095 BLAKE2B 62b5ca08b13b80e1cdfe82d7354f75dcd3d82d7618bb2d20c4973c0b588d60cc034a8bc265d1cba6b3fc09f5583450a48948dc0beb86c4b13c6b9fdb32de37fd SHA512 fda8b0b1d6f779098c885360ea5f5e93eac5153f5bf761f3dbc954209b69b76edd21a8e4915bb9e567e5c095f1d173e19429bea34da9698bf241d17599858847
 EBUILD antlr-runtime-3.5.2.ebuild 1012 BLAKE2B 4bca36c4491f8e88fd31a8c270737d868b30465e7068db823a354e9dd0d611b19799101cdf448581e4551740f88f70708451f92c93ee9443eb6aab5b6c75e8b7 SHA512 1517b4284e15876a4a4c6dde04ea45410bb20b95f6a5d86c49f6c545bf48d774fcba54ff65a41ed585f440fe2e1f30fc96ab1b29061740e18727f4fd7b35b7d6
-EBUILD antlr-runtime-4.9.3.ebuild 929 BLAKE2B af9f6572ff15703e27f59e03cf151c0dc4c06bcfbcb95cb6a75b7d3162e9d538c502adc03d0bcc148bd56d0b1b3d636c8ab94a22058b91b7467538fbb7093581 SHA512 a577027d78dd7b091187f018e39444db8083417cb8d9beb273ef03862c7fe26de2a1422b2caae9bb62d1bbda194146f67a61091a4ff279f8703cd061cfc353cc
+EBUILD antlr-runtime-4.9.3.ebuild 3856 BLAKE2B be2c41758da73c5158d30a692361eae45f3a5de9a1272d55b85289e1e47e1b29ed7f96c85cb635a6ac38792b8cd497da6e25b53c3b4d9199034c4bfe58bdb1a0 SHA512 8c6287ac52501f41ea0c486f94f4eb17d5be6d4014518ad436be609488944c08bbcbedd20cc54395a7856432f9cd99848aced53b9b162a06caf0d012774c6484
 MISC metadata.xml 402 BLAKE2B 8a48b0d50a6356a3bf1f8f2545269d5d21b75af4ba38b07dea53d5660216a8580f5c87b58dc6c235c79f7b5d15f7e4f6925105a2402f557413cf942d21153686 SHA512 26faab37f0c4c1c44000705ee08ec536c6503b70d972b353fcebbd48236688f3d7b5604b2db55753a9b38ac5b86a2d214a937cc68676e1356bec00045cacfe2b
diff --git a/dev-java/antlr-runtime/antlr-runtime-4.9.3.ebuild b/dev-java/antlr-runtime/antlr-runtime-4.9.3.ebuild
index 31d041e6a974..cf26c16eb71e 100644
--- a/dev-java/antlr-runtime/antlr-runtime-4.9.3.ebuild
+++ b/dev-java/antlr-runtime/antlr-runtime-4.9.3.ebuild
@@ -3,13 +3,9 @@
 
 EAPI=8
 
-# Without annotation processing using runtime-testsuite/processors,
-# the tests are bound to fail.  However, the annotation processor
-# has been dropped from the 'master' branch as of January 2022, so
-# when updating this package to a new upstream version, please
-# check if it is possible to enable the tests and pass them.
-JAVA_PKG_IUSE="doc source"
+JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="org.antlr:antlr4-runtime:4.9.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
@@ -26,6 +22,10 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
+	test? (
+		~dev-java/antlr-tool-${PV}:${SLOT}
+		dev-java/jol-core:0
+	)
 "
 
 RDEPEND="
@@ -35,3 +35,96 @@ RDEPEND="
 S="${WORKDIR}/${MY_PN}4-${PV}"
 
 JAVA_SRC_DIR="runtime/Java/src"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+	junit-4
+	antlr-tool-${SLOT}
+	jol-core
+"
+JAVA_TEST_SRC_DIR=(
+	runtime-testsuite/test
+	runtime-testsuite/annotations
+)
+JAVA_TEST_RESOURCE_DIRS=(
+	runtime-testsuite/resources
+)
+
+src_prepare() {
+	java-pkg_clean
+	eapply "${FILESDIR}/${PV}-test-fixes.patch"
+	java-pkg-2_src_prepare
+}
+
+src_test() {
+	# Build classpath for tests
+	# The JAR created during src_compile must appear in the classpath *before*
+	# any dependencies to ensure that *it* is the JAR being tested; otherwise,
+	# because the test suite depends on antlr-tool, which depends on this
+	# package, the copy of this package's JAR installed on the system would be
+	# tested instead when it appears earlier in the classpath, which might
+	# cause test failures when the version being built differs from the version
+	# already installed on the system, like https://bugs.gentoo.org/834138
+	local CP="${S}/${JAVA_JAR_FILENAME}"
+	local test_dep res_dir
+	for test_dep in ${JAVA_TEST_GENTOO_CLASSPATH}; do
+		CP+=":$(java-pkg_getjars --with-dependencies "${test_dep}")"
+	done
+	for res_dir in "${JAVA_TEST_RESOURCE_DIRS[@]}"; do
+		CP+=":${res_dir}"
+	done
+
+	pushd "${JAVA_TEST_SRC_DIR[0]}" > /dev/null ||
+		die "Failed to enter test source directory for ${PN}"
+
+	einfo "Removing tests for non-Java runtimes ..."
+	find org/antlr/v4/test/runtime/* -maxdepth 0 -type d \
+		-not -name category -not -name descriptors -not -name java \
+		-exec einfo "  {}" \; -exec rm -r "{}" + ||
+		die "Failed to remove tests for non-Java runtimes"
+
+	einfo "Generating ANTLR 4 parsers for tests ..."
+	local java_exe="$(java-config -J)"
+	local g4_files=( $(find * -name "*.g4") )
+	local file
+	for file in "${g4_files[@]}"; do
+		local java_pkg="${file%/*.g4}"
+		java_pkg="${java_pkg//\//.}"
+		"${java_exe}" -cp "${CP}" org.antlr.v4.Tool \
+			-visitor -package "${java_pkg}" "${file}" ||
+			die "Failed to generate ANTLR 4 parser from ${file}"
+	done
+
+	# Create a list of tests to run
+	# https://github.com/antlr/antlr4/blob/4.9.3/runtime-testsuite/pom.xml#L100
+	# Excluding classes with "No runnable methods"
+	local TESTS=$(find * -type f -name "Test*.java" \
+		-not -name "TestContext.java" \
+		-not -name "TestOutputReading.java"
+	)
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	popd > /dev/null || die "Failed to leave test source directory for ${PN}"
+
+	local classes="target/classes"
+
+	# Compile the annotation processor of @CommentHasStringValue
+	# before the test sources (requires tools.jar)
+	ejavac -d "${classes}" -cp "${CP}:$(java-config -t)" \
+		$(find runtime-testsuite/{annotations,processors} -name "*.java")
+	local processor_cp="${classes}:runtime-testsuite/processors/resources"
+
+	# Compile Java test sources, and process @CommentHasStringValue
+	# annotations at the same time
+	local javac_extra_args=()
+	if ver_test "$(java-config -g PROVIDES_VERSION)" -ge 17; then
+		javac_extra_args+=(
+			-J--add-opens=jdk.compiler/com.sun.tools.javac.{main,model,tree,util}=ALL-UNNAMED
+		)
+	fi
+	ejavac -d "${classes}" -cp "${CP}:${processor_cp}" \
+		"${javac_extra_args[@]}" \
+		$(find "${JAVA_TEST_SRC_DIR[@]}" -name "*.java")
+
+	ejunit4 -classpath "${classes}:${CP}" ${TESTS}
+}
diff --git a/dev-java/antlr-runtime/files/4.9.3-test-fixes.patch b/dev-java/antlr-runtime/files/4.9.3-test-fixes.patch
new file mode 100644
index 000000000000..9cb6884ba194
--- /dev/null
+++ b/dev-java/antlr-runtime/files/4.9.3-test-fixes.patch
@@ -0,0 +1,26 @@
+From 3eabbddff69dcbcaf9a59f407cc8bef4be8e215b Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Thu, 3 Feb 2022 11:51:53 -0800
+Subject: [PATCH] Use 1.8 as javac -source/-target for running tests on Java 17
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ .../test/org/antlr/v4/test/runtime/java/BaseJavaTest.java       | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/BaseJavaTest.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/BaseJavaTest.java
+index cc03bdc11..82061135e 100644
+--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/BaseJavaTest.java
++++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/BaseJavaTest.java
+@@ -137,7 +137,7 @@ public class BaseJavaTest extends BaseRuntimeTestSupport implements RuntimeTestS
+ 			fileManager.getJavaFileObjectsFromFiles(files);
+ 
+ 		Iterable<String> compileOptions =
+-			Arrays.asList("-g", "-source", "1.6", "-target", "1.6", "-implicit:class", "-Xlint:-options", "-d", getTempDirPath(), "-cp", getTempDirPath() + PATH_SEP + CLASSPATH);
++			Arrays.asList("-g", "-source", "1.8", "-target", "1.8", "-implicit:class", "-Xlint:-options", "-d", getTempDirPath(), "-cp", getTempDirPath() + PATH_SEP + CLASSPATH);
+ 
+ 		JavaCompiler.CompilationTask task =
+ 			compiler.getTask(null, fileManager, null, compileOptions, null,
+-- 
+2.34.1
+
diff --git a/dev-java/apiguardian-api/Manifest b/dev-java/apiguardian-api/Manifest
new file mode 100644
index 000000000000..278e350f24dd
--- /dev/null
+++ b/dev-java/apiguardian-api/Manifest
@@ -0,0 +1,3 @@
+DIST apiguardian-api-1.1.2.tar.gz 67267 BLAKE2B 27bbe157f23c0904863d093930968854771f4c6b1bc6b6a6e6b86604383abd291348fa8b009d760b3bc739bbfbdb74e9429942ce1acf4bfc52e29e79386f2059 SHA512 7c56ee15e0aba07e95b6f2fe7cedd98e449e774958eb63b2467066c381e1e82ad67c982c2885e18154c62e55fda80a1c2e0f689253afe449db9f7e7563122db6
+EBUILD apiguardian-api-1.1.2.ebuild 740 BLAKE2B 6c3ec891656ec13c25843e6fba68235eb8db87018b2516aac44bfb899c8087d5e81db4097cb793b812741bbd52f1ebff8af93308c7014be39bfb5ec45905cf13 SHA512 8b6f3b156fa24ec789ebea1d783a300c3796c83465e66f64fb6e395d95e3a2ac62d25a8c76d20221802dc797ba64dd3d9ca19cb23ba55de89f2e55c0d03ea492
+MISC metadata.xml 629 BLAKE2B b4b1e0ab2868f0953bbd02fc2ce392f9cc8303a6ba838ac5db93ac1942cbc07c184f1acdce977ba68cf7a842eb9a69d3cb67c9d8ae2631f4f22ba246e514e1ee SHA512 5c8ed27778be5acc2cd4396b72d464d30245667de22183d375c25e1e7fae3a69711557688d22d82fb4876d781c73a50fc0dc5114fd39127446249024c553cb5d
diff --git a/dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild b/dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild
new file mode 100644
index 000000000000..85147e398aa2
--- /dev/null
+++ b/dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apiguardian:apiguardian-api:1.1.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="@org.apiguardian.api.API Java annotation provider"
+HOMEPAGE="https://github.com/apiguardian-team/apiguardian"
+SRC_URI="https://github.com/apiguardian-team/apiguardian/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( README.md )
+
+S="${WORKDIR}/${PN%-api}-r${PV}"
+
+JAVA_SRC_DIR=( src/{main,module}/java )
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/apiguardian-api/metadata.xml b/dev-java/apiguardian-api/metadata.xml
new file mode 100644
index 000000000000..6bc8acd2f803
--- /dev/null
+++ b/dev-java/apiguardian-api/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">apiguardian-team/apiguardian</remote-id>
+	</upstream>
+	<longdescription>
+		Library that provides the @API annotation that is used to annotate public types, methods, constructors, and fields within a framework or application in order to publish their status and level of stability and to indicate how they are intended to be used by consumers of the API.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/assertj-core/Manifest b/dev-java/assertj-core/Manifest
index d25fe21ac995..b8cdcf3a7d8c 100644
--- a/dev-java/assertj-core/Manifest
+++ b/dev-java/assertj-core/Manifest
@@ -1,3 +1,4 @@
 DIST assertj-core-2.3.0.tar.gz 611609 BLAKE2B b99a01f67da75bad18e08df739c10943012f75eda9855ed906d407e474eeafe9a30be2e761de0bc791d72a6ff8c7ec8181cd37c6b6c9126f073df82a974163c3 SHA512 da67930d45afde12d317579edb62b5cff546283ea6a252c9b297f21b74404d7cfb63372d339f51733322205b89d35734e97888085387fb1a83c80d5963b05fd3
+EBUILD assertj-core-2.3.0-r1.ebuild 821 BLAKE2B 37c145003810d09f2a58cc9a0b78014efb2b023b6f12fd892f2faa9eedcd9dd74a75f131a798b9128aff8663584839792d8cf3a8a5193319fd8f510763483b76 SHA512 7d4d650ff8f8a1e27b5fce6cd3476699c9b4c47d68d2e4a6aee42db8a7b0638fcd901f30eb00ed7624c0e4d72e093597ceef879c0ef5dad541870fcca48e04d4
 EBUILD assertj-core-2.3.0.ebuild 801 BLAKE2B 251b6caa0e965be7b0c66d5af54b787d0260ae143806a02d9a05baefedf6378c46d721dbfa7cfb523a9379af88a7f057272ce330e79a95993760b75a42561f87 SHA512 8af9f5a57fd8fdaaf43727ee0e0a9fe58d6c0cfa285af076abfe807a8a26862a01f7ec3fb0ac52bd7c31a4bb024b7934e0808e564f70058979f2f4bcbfca6c74
 MISC metadata.xml 640 BLAKE2B 3582da14da36e366b2436a5f49b6c0265705ebc109a01fdfc9380ec5b02a92a7b7257e2f410118e88ff369c78e126ed87a697088e481637211de572cc84758b8 SHA512 975fe87b3997787302e135fb742893e042eef0a75c6ed0de1a61d34ccbbde8d17b9c637b31c2569236864b00ce9579c8818546ac49d4a1b6c1ad393013b83d7c
diff --git a/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild b/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..21ab78c440d6
--- /dev/null
+++ b/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.assertj:assertj-core:2.3.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java library that provides a fluent interface for writing assertions"
+HOMEPAGE="https://joel-costigliola.github.io/assertj/"
+SRC_URI="https://github.com/assertj/assertj-core/archive/assertj-core-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+SLOT="2"
+
+CDEPEND="dev-java/cglib:3
+	dev-java/junit:4"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-${P}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="cglib-3,junit-4"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc {CONTRIBUTING,README}.md
+}
diff --git a/dev-java/avalon-framework/Manifest b/dev-java/avalon-framework/Manifest
index 0a989519a404..199b55015825 100644
--- a/dev-java/avalon-framework/Manifest
+++ b/dev-java/avalon-framework/Manifest
@@ -1,6 +1,4 @@
 AUX 4.2.0-enum.patch 1086 BLAKE2B 1489abf0aa325060472d55762bc2014bac3c1d5571fddb40ef835be1f59106d0279433eee5e59bcb8e7eef30cd2c2272a840796ce221a490d82f20826ce9a5dc SHA512 076b0c68930da7161ec8068347d05eebc01570b62194126ae28c47af4a559e0d059bf94bb04829dc792441bd6187eba093b966d09b73c45bcdbd05e05f4ad9fc
-AUX build.xml 1838 BLAKE2B aa6ad2f58ef4bc96837c5f616376e2bc6dca2b338d0bdbff575b4ba0e45381e18d96c3266769fa23af60888d1baeb86e9456abb091f08cf92a54389e579a05d4 SHA512 a6dafeac52a7e7421c6e97972407b7b5424a8e35bae66153c52b92419c038d0cf31a049619b843ece7f26bcb1fbd675ea36475857609820ab6c66d03d4f8da2b
 DIST avalon-framework-4.2.0-src.tar.gz 68887 BLAKE2B da71631548bf725315c57439c5db017107d4dac529fbfdd59f68da6b97faa8b9a78fc5d89b05ccd05c7ec68b2de05d286ece6654137278b3e8873c78c65adf6c SHA512 b53dc20ecec058ef0b35a626bea6e04f85f6ae8b3645d7dc5c33c194db49b42071093cd305ef718f925b948ec1b885b2a0d8bec534592f97dc48d6e93db45671
-EBUILD avalon-framework-4.2.0-r3.ebuild 1034 BLAKE2B 6f97f20a75af8a5da7d3b7e910f88ab4e6f3e00032d33985bcaa7104e5597ec0c93132e7b8ca109a1b78674e2590e95009c2bcf10d23b9c50d8a501e475b6d85 SHA512 f32de74236a950982e1fa4ea78d2441ea196d5f9c37dbd4797639ef2fafbd162285b2c0d93e1eba7434a6aa491942a384db9bea54e4fb5f7c3099b6882b62bc0
-EBUILD avalon-framework-4.2.0-r4.ebuild 1152 BLAKE2B baef58b5bac5a738c5d8c8652707f96619c71ef0e1d23fa00a0f1a8ab309d66359cf6d9b83e77e46c3612767929421f3ded7fe3922a2e96559b2d0d8d768b659 SHA512 ca95fcefad094b03a120db91beca9f4865d9b7f92eb0fc88c7bac8e0dc2db128926a3bdb058565ca0fe2dcbd2aeb0efc74ec074fc56976abf9404d51c00b49fc
+EBUILD avalon-framework-4.2.0-r4.ebuild 1148 BLAKE2B cbe48bdcb9ff16cf9da514f13cfeac26e0a08b5d7873dc41e40381b900c321a48c2ccb98639df32bf96734009686a384515484d2baa467a0ea2020732e3bcbcc SHA512 7555598b93cfcee82e73fe41046fd926470affd2b745354852adce04aaae0ab65c0fca800ae6cb6d7690dc31593549c6d2353a6d9526505a3c126f179b800349
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r3.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r3.ebuild
deleted file mode 100644
index fb178f374e64..000000000000
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r3.ebuild
+++ /dev/null
@@ -1,43 +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-ant-2
-
-DESCRIPTION="Avalon Framework"
-HOMEPAGE="https://avalon.apache.org/"
-SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-
-CDEPEND="dev-java/avalon-logkit:2.0
-	dev-java/log4j:0"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}"/4.2.0-enum.patch )
-
-src_prepare() {
-	default
-	cp "${FILESDIR}"/build.xml ./build.xml || die "couldn't copy build.xml"
-	local libs="log4j,avalon-logkit-2.0"
-	echo "classpath=$(java-pkg_getjars ${libs})" > build.properties
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/dist/avalon-framework.jar
-
-	dodoc NOTICE.TXT
-	use doc && java-pkg_dojavadoc target/docs
-	use source && java-pkg_dosrc impl/src/java/*
-}
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r4.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r4.ebuild
index 2b623e3cd005..306dcc7b36cd 100644
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r4.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 CP_DEPEND="
 	dev-java/avalon-logkit:2.0
diff --git a/dev-java/avalon-framework/files/build.xml b/dev-java/avalon-framework/files/build.xml
deleted file mode 100644
index 422246c2dbdc..000000000000
--- a/dev-java/avalon-framework/files/build.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="avalon-framework" basedir="." default="jar">
-   <property file="build.properties"/>
-   <property file="default.properties"/>
-   
-   <property name="api.src" value="${basedir}/api/src/java"/>
-   <property name="api.test.src" value="${basedir}/api/src/test"/>
-   <property name="impl.src" value="${basedir}/impl/src/java"/>
-   <property name="impl.test.src" value="${basedir}/impl/src/test"/>
-   
-   <property name="target" value="${basedir}/target"/>
-   <property name="dist" value="${basedir}/dist"/>
-   
-   <property name="jarfile" value="avalon-framework.jar"/>
-   
-   <property name="packages" value="org.apache.avalon.framework.*"/>
-   
-   <target name="init">
-      <tstamp/>
-      <mkdir dir="${target}"/>
-      <mkdir dir="${target}/docs"/>
-      <mkdir dir="${target}/tests"/>
-      <mkdir dir="${dist}"/>
-   </target>
-
-   <target name="compile" depends="init">
-      <javac srcdir="${api.src}" destdir="${target}" source="1.4" target="1.4" classpath="${classpath}"/>
-      <javac srcdir="${impl.src}" destdir="${target}" source="1.4" target="1.4" classpath="${classpath}:${target}"/>
-   </target>
-
-   <target name="javadoc" depends="compile">
-      <javadoc sourcepath="${api.src}" destdir="${target}/docs" packagenames="${packages}" classpath="${classpath}" source="1.4"/>
-      <javadoc sourcepath="${impl.src}" destdir="${target}/docs" packagenames="${packages}" classpath="${classpath}:${target}" source="1.4"/>
-   </target>
-   
-   <target name="jar" depends="compile">
-      <jar jarfile="${dist}/${jarfile}" basedir="${target}"/>
-   </target>
-   
-   <target name="clean">
-      <delete dir="${target}/api"/>
-      <delete dir="${target}/impl"/>
-      <delete dir="${target}/docs"/>
-      <delete dir="${target}"/>
-      <delete dir="${dist}"/>
-   </target>
-</project>
diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest
index 05999de5bcd1..a74298d37499 100644
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -1,5 +1,4 @@
 AUX avalon-logkit-2.1-java7.patch 1155 BLAKE2B 8e5a7756fed565d23cb7d9265171ad7c42c7c1a1f1f81284461aaad1d85718d77a7767f51d8e5cc7a3724c2a0b15dabc541d1c6c8fbfad670fe56765ac3beda4 SHA512 155bd7d65a2eb59528067605f1c40b1f176228af2fbc11f6560ad929cf5344d74ba79bbd58c7cb35b6065c74ec4e579cea590c0cc23082979d79cd70ce8414e7
 DIST avalon-logkit-2.1-src.tar.gz 60218 BLAKE2B 1c35b38a22d95cffabb19e099d42697adf7aa6ad471f6cb62e02a30b6612c8405b9f7473ca61ea4f7f9c1f3b1ece6ee68f7ec711b79672330db3ac9e57642e0d SHA512 9977a3a172ca4fb5c3ad1f623ff109214f71900d2e244f175cc5d140f5f9993caca7e5ca3220728f18a1d6242d11a48990f9ce0150c36b7a9bb10a7a6d5a905a
-EBUILD avalon-logkit-2.1-r12.ebuild 2951 BLAKE2B 7e2ee819e01521f04dfd4f0dfec456273a24997f5f48df2a1671ea18836b74fa700c958f7beea3c08cdef34dd6876f5987527d3ceecd78447cd3a6e48e0de714 SHA512 6d283bb31bbc8b1a13ec0838d88583d4504f6824ee8c9379a0b267587dea8e0952b60acd3f1d709ea2c78bca2c2f452124e3426da449b2bc7ede61a497ef27bb
-EBUILD avalon-logkit-2.1-r9.ebuild 1445 BLAKE2B 87d3271023f53f5e275c18ae926768186de5122d9b548d26153117c7decadfe47d1b34c384915a03eb118e4215296b417ea2002b6e9c82a7b49c336f1b70d9a0 SHA512 bbd130e50d2da2fa59735aeff1a88bc46599236f3cfb7531d1f63a84d26f27d0066502a63c40fb910022f042b1b5d70e7d200a9071d1398309023ec59c22dc60
+EBUILD avalon-logkit-2.1-r12.ebuild 2947 BLAKE2B 307d1520249befe8cbf5e1af1d508ca2edc5fe5c969d2c775d872aa58acd11193c3b172442db3383037807cc40d05e588e1e9a9850e550d6381e21f01518da63 SHA512 8e8bdaceba8970a36aeb6964a172cec5425c684f15dcd1b3ea79ffe68f1130ab35729fe6557a60ef3956c3b07e386c79662f3952a8f7e54dbd9845d503958dff
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r12.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r12.ebuild
index fadec3b6862a..ca7b6c624e4f 100644
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r12.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r12.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Easy-to-use Java logging toolkit"
 HOMEPAGE="https://avalon.apache.org/closed.html"
 SRC_URI="https://archive.apache.org/dist/excalibur/avalon-logkit/source/avalon-logkit-${PV}-src.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 LICENSE="Apache-2.0"
 SLOT="2.0"
 
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild
deleted file mode 100644
index 3a719687e700..000000000000
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild
+++ /dev/null
@@ -1,63 +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 test"
-
-inherit java-pkg-2 java-ant-2
-
-# NB: this project is dead and we should look into removing it from the tree.
-# Take a look at the homepage.
-DESCRIPTION="Easy-to-use Java logging toolkit"
-HOMEPAGE="https://avalon.apache.org/closed.html"
-SRC_URI="https://archive.apache.org/dist/excalibur/avalon-logkit/source/avalon-logkit-${PV}-src.tar.gz"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-LICENSE="Apache-2.0"
-SLOT="2.0"
-IUSE=""
-
-CDEPEND="
-	dev-java/log4j:0
-	java-virtuals/jms:0
-	dev-java/oracle-javamail:0
-	java-virtuals/servlet-api:3.0"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/ant-junit:0
-	)"
-
-src_prepare() {
-	default
-	# Doesn't like 1.6 / 1.7 changes to JDBC
-	eapply "${FILESDIR}/${P}-java7.patch"
-
-	java-ant_ignore-system-classes
-
-	java-ant_xml-rewrite \
-		-f build.xml \
-		-c -e available \
-		-a classpathref \
-		-v 'build.classpath' || die
-
-	java-pkg_filter-compiler jikes
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_GENTOO_CLASSPATH="oracle-javamail,jms,log4j,servlet-api-3.0"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index d1d905460443..e7c783a415a3 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,4 +1,8 @@
+AUX batik-1.14-modules 461 BLAKE2B a22123561682c3990ad289ca888453b876bb1a4de03b435445758386297cb8e1058db777d4c79941a407c4b95ad8623a6450dc8ba0acf71f66b25a666ab7695c SHA512 19ec52318a76f16122e0740bb8f744e6b669537ad75f44931c1cf64c407a1d11b6eba4ea4b0e0e37ec5402e9ff99b76e8ae0e5b65f529f6ad56e30625cb7b77e
 AUX batik-1.9-ImportInfo.patch 439 BLAKE2B 2d1c13f8ffa944c9f303932818b4df5b2c9c10f2903b67500971413e9e3460340b4c6d9bb3e84875ce06845f6646d0ce566a295a5982e88209bf692266dabbb8 SHA512 ff390670537fd631dbd0041a4496e0a33daa1bbd9390867285d2a817ee7794d19c0d634dbfcf4a1e777db072a0f1b6bc2b68e475bbe590bce825aa7b7d76f643
+AUX batik-squiggle.desktop 177 BLAKE2B 7f4fbc31f31f6ddbdb7802ad4ea6b87c21b39b83cec2caf5f8b68634693b05c66e3f7da6d2cf69f5da6defa2d44fa4c5a0eba4af13308b8f18fb666be86b1d40 SHA512 7e7be90a0a779752cf04bbb1e702f5f3ca773129f7dfebcc3352e55f81cad2d65f6067e07c075f730b7f11235529804856fc226703b5e213216bc110dd978d8e
+DIST batik-src-1.14.tar.gz 17647867 BLAKE2B 9385e77e739ece921012310a53953a6e258a5d748987e85dd20783ca248ae55619db6472b7590a45fe40a1b51c693478a37a7dbe1a958b42392c525e5f228815 SHA512 689c52f58f8f0456c89bd18745d2d92e7590b9054bea71b96be87d44977057d583e78504cbf14afc3e0c585d2383dac3009c7c421de868c847db045e921da8fb
 DIST batik-src-1.9.tar.gz 16748072 BLAKE2B 4e23c0de3d56ba130c5bc9ef80a01549e8c11ab4db3b1ac5dae8525cf0a3a8b7f4df3161c12f1f0df9c74229aaf2034fb6c9c2f91b7fc7407a0af580d144e606 SHA512 96a5c16bd3d61ea33ed5013fd0b00f1724470d9b667f0f84ef4a29dcaaa19b1cc8ffcc92dc49767f4e29d77a47f99df5afca479336ac5619778b51a6fb6cd952
+EBUILD batik-1.14.ebuild 5251 BLAKE2B 64d22677065376d04600941259211d017babf26c612a83b6af5fc8286d1ce63ddf1673bdc2870c345e2a23a210a84892618e6c0983ab850f7d72677d6a8ac2dd SHA512 80171f8ece1e3eaeb17849d4088ae84e0236a1a291062bbb6250b966c03e4a295902e45d228386de4f0718332ac8a14f279025c5b0450226a31f6b5aaf42615e
 EBUILD batik-1.9.ebuild 2594 BLAKE2B a7aa8ebb48b3819cc4fb088cabc6dc858dd5c3f20b2779c910e8f631d2be3920c133ae38caf4048991f1d6a1108a2b16a14a3f8e3d6cdfcea1256bebfcdb1724 SHA512 bf2eee253a058dfe08714e3a533e37a034af1477534a00b425105d9d2330798c37ea9ed3a00dc79f56a7558effa5a44473c74260d0fd2fffe9b621679a120e46
-MISC metadata.xml 450 BLAKE2B a8c857eac8c35c8d2e7f09496db63d086fbfd269d91fb1ca8fa592570545d11ec499053b93c6fe15e35b1db981920f657d2c500b98485bdb86179216b8b5e632 SHA512 303289add9c060eb698462203c35a2eef3332c4ff24c390011a91bd2c0ec05669483a1069a9abb1d6ba97a760565ac34a28b1a7d12eb8d1078bb81a05dbeae68
+MISC metadata.xml 610 BLAKE2B c589c175b595deb71eae6b8fccd46f4d6b82331f636cff28b6074300b6495efb780d157bb1b5b1359070cca7405138fcff719d72f1038023357fc7ab05c52b87 SHA512 73a6bb61c87645d1600ab90ca954599208c8599e967f6e999d973fa80e9693435db8a75ace95c8881486c8e2929d5a201a51e821e5f58763c273b21b5a32c229
diff --git a/dev-java/batik/batik-1.14.ebuild b/dev-java/batik/batik-1.14.ebuild
new file mode 100644
index 000000000000..f4be7b642036
--- /dev/null
+++ b/dev-java/batik/batik-1.14.ebuild
@@ -0,0 +1,191 @@
+# 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 mirror://apache/xmlgraphics/batik/source/batik-src-1.14.tar.gz --slot 1.14 --keywords "~amd64 ~ppc64 ~x86" --ebuild batik-1.14.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.xmlgraphics:batik:1.14"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit desktop java-pkg-2 java-pkg-simple xdg-utils
+
+DESCRIPTION="XML Graphics Batik"
+HOMEPAGE="https://xmlgraphics.apache.org/batik/"
+SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.14"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/jacl:0
+	dev-java/jython:2.7
+	dev-java/rhino:1.6
+	dev-java/xalan:0
+	dev-java/xml-commons-external:1.3
+	dev-java/xmlgraphics-commons:2
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( {CHANGES,NOTICE,README} )
+
+S="${WORKDIR}/batik-${PV}"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_compile() {
+
+	# We loop over the modules list and compile the jar files.
+	while read module ; do \
+
+		echo "compiling $module"
+
+		JAVA_SRC_DIR=""
+		JAVA_RESOURCE_DIRS=""
+		JAVA_JAR_FILENAME="$module.jar"
+		JAVA_MAIN_CLASS=""
+
+		# Not all of the modules have resources.
+		if [[ -d $module/src/main/resources ]]; then \
+			JAVA_RESOURCE_DIRS="$module/src/main/resources"
+		fi
+
+		# Don't let sed die on modules without MainClass.
+		JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' $module/pom.xml )
+
+		# Some modules don't have source code.
+		if [[ -d $module/src/main/java/org ]]; then \
+			JAVA_SRC_DIR="$module/src/main/java"
+			java-pkg-simple_src_compile
+		else
+			# This case applies to batik-rasterizer.
+			if [[ -d $module/src/main/resources/org ]]; then \
+				jar -cfe $module.jar "${JAVA_MAIN_CLASS}" -C "$module/src/main/resources" . || die
+			# Else for batik-rasterizer-ext, batik-squiggle and batik-squiggle-ext
+			else
+				jar -cfe $module.jar "${JAVA_MAIN_CLASS}" -C . README || die
+				zip -d $module.jar "README"
+			fi
+		fi
+
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar"
+
+		rm -fr target || die
+
+	# Modules batik-rasterizer-ext and batik-squiggle-ext, upstream puts their jar files in the extensions
+	# directory, see batik-extension/src/main/resources/org/apache/batik/extensions/README.txt
+	# We keep them in the mudules list for later but omit them by 'grep -v'.
+	# The same for batik-test-old which depends on fop-transcoder-allinone which itself depends on batik.
+	# batik-1.14-modules is the "Reactor Build Order" extracted from the output of "mvn dependency:tree".
+	done < <(grep -v '\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' "${FILESDIR}"/batik-1.14-modules)
+
+	if use doc; then
+
+		JAVA_SRC_DIR=""
+		JAVA_JAR_FILENAME="ignoreme.jar"
+
+		while read module ; do \
+
+			# Some modules don't have source code
+			if [[ -d $module/src/main/java/org ]]; then \
+				JAVA_SRC_DIR+=( "$module/src/main/java" )
+			fi
+
+		done < "${FILESDIR}"/batik-1.14-modules
+
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+	while read module ; do \
+
+		echo "testing $module"
+
+		JAVA_TEST_SRC_DIR=""
+		JAVA_TEST_RESOURCE_DIRS=""
+		JAVA_TEST_RUN_ONLY=""
+
+		if [[ -d $module/src/test/resources ]]; then \
+			JAVA_TEST_RESOURCE_DIRS="$module/src/test/resources"
+		fi
+
+		# https://github.com/apache/xmlgraphics-batik/blob/refs/tags/batik-1_14/batik-util/pom.xml#L74-L75
+		if [[ $module == batik-util ]]; then \
+			JAVA_TEST_RUN_ONLY="org.apache.batik.util.Base64TestCases"
+		fi
+
+		if [[ -d $module/src/test/java/org ]]; then \
+			JAVA_TEST_SRC_DIR="$module/src/test/java"
+			java-pkg-simple_src_test
+		fi
+
+	done < <(grep -v '\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' "${FILESDIR}"/batik-1.14-modules)
+}
+
+src_install() {
+	einstalldocs
+	domenu "${FILESDIR}"/batik-squiggle.desktop
+	doicon batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/init.svg
+
+	while read module ; do \
+
+		JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' $module/pom.xml )
+
+		java-pkg_dojar $module.jar
+
+		# Add a launcher if the module has a MainClass.
+		if [[ -n "${JAVA_MAIN_CLASS}" ]]; then \
+			java-pkg_dolauncher "$module-${SLOT}" --main "${JAVA_MAIN_CLASS}"
+		fi
+
+		# Some modules don't have source code
+		if [[ -d $module/src/main/java/org ]]; then \
+
+			if use source; then
+				java-pkg_dosrc "$module/src/main/java/*"
+			fi
+
+		fi
+
+	done < <(grep -v '\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' "${FILESDIR}"/batik-1.14-modules)
+
+	local java_policy_file="${JAVA_PKG_SHAREPATH}/etc/${PN}.policy"
+	insinto "$(dirname "${java_policy_file}")"
+	newins - "$(basename "${java_policy_file}")" <<- _EOF_
+		grant codeBase "file:${EPREFIX}${JAVA_PKG_JARDEST}/-" {
+			permission java.security.AllPermission;
+		};
+	_EOF_
+	java-pkg_register-environment-variable \
+		gjl_java_args \
+		"-Djava.security.policy=file:${EPREFIX}${java_policy_file}"
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-java/batik/files/batik-1.14-modules b/dev-java/batik/files/batik-1.14-modules
new file mode 100644
index 000000000000..d9c964870901
--- /dev/null
+++ b/dev-java/batik/files/batik-1.14-modules
@@ -0,0 +1,33 @@
+batik-constants
+batik-i18n
+batik-test
+batik-util
+batik-awt-util
+batik-css
+batik-ext
+batik-xml
+batik-dom
+batik-parser
+batik-svg-dom
+batik-anim
+batik-gvt
+batik-script
+batik-bridge
+batik-svggen
+batik-transcoder
+batik-codec
+batik-extension
+batik-gui-util
+batik-svgrasterizer
+batik-rasterizer-ext
+batik-rasterizer
+batik-slideshow
+batik-swing
+batik-svgbrowser
+batik-squiggle-ext
+batik-squiggle
+batik-svgpp
+batik-ttf2svg
+batik-test-swing
+batik-test-svg
+batik-test-old
diff --git a/dev-java/batik/files/batik-squiggle.desktop b/dev-java/batik/files/batik-squiggle.desktop
new file mode 100644
index 000000000000..95bb990177c7
--- /dev/null
+++ b/dev-java/batik/files/batik-squiggle.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Squiggle
+Comment=SVG browser
+Exec=batik-squiggle-1.14
+Icon=init
+Terminal=false
+Type=Application
+Categories=Graphics;VectorGraphics;
+MimeType=image/svg+xml;
diff --git a/dev-java/batik/metadata.xml b/dev-java/batik/metadata.xml
index 2841917ad49d..a9b2477896cb 100644
--- a/dev-java/batik/metadata.xml
+++ b/dev-java/batik/metadata.xml
@@ -5,6 +5,10 @@
 	<email>java@gentoo.org</email>
 	<name>Java</name>
 </maintainer>
+<upstream>
+	<bugs-to>https://issues.apache.org/jira/projects/BATIK/issues/</bugs-to>
+	<remote-id type="github">apache/xmlgraphics-batik</remote-id>
+</upstream>
 <longdescription>
 	Java toolkit for applications or applets that want to use
 	images in the Scalable Vector Graphics (SVG) format for various
diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest
index 9e8e05088005..ce71b7ff5219 100644
--- a/dev-java/bsf/Manifest
+++ b/dev-java/bsf/Manifest
@@ -1,5 +1,6 @@
-AUX bsf-2.4.0-PyJavaInstance.patch 1650 BLAKE2B ceb772a69d454d1d85e05486d28d13824724813e7875f731a165aaf97bdd7f0c006baa927e849f82de7fa16228c3de5847f8d59013142f8df4823a951b42c785 SHA512 7946622658473ef4cf6b5921f58d224f7378cb00c345a748653306d2648a89b5ab3ed68786d09bbb170b95dc657f7f55501013c854536d6dfd6b38e6a1f3963e
+AUX bsf-2.4.0-PyJavaInstance.patch 1654 BLAKE2B c6a0efc5c429adb7dd0ba6a7fd68e7b49ac13b98b1bd3998e70294dd4bf15516c719807c940fbf0b2203f6804878edce223b12b29cccefd790812db186a71cf1 SHA512 ceb07c1613c4a68654132a1b95d4db2494183cb86fe20be050bf4f57079fc1967ac76dda17b28df586d3fe34b696eef4d5790e6fe82a73d13c5a4f64267048f0
 AUX bsf-2.4.0-build-properties.xml 1984 BLAKE2B 6db0c1ca7f899e95a0728d61b79ef6c0a1320ee747b5479c9c50a7bd258dc7fee0b6b569e3813f323cbc694d405f9af1d269dd5370ac82e6eca2bde5072d905d SHA512 d262daec432d7a22c217e24089f22e4c349be0487fd00a2e6992e77770a3699e7e2b5977e2108455d7f73c31b372d6a73febdff2856e256f93b25f3781e11679
 DIST bsf-src-2.4.0.tar.gz 299749 BLAKE2B 41f3cfe77b1ccf6b78493df7f5f288b397234b3236977c4b7d2e6c85b330e40319474419f560eefa1632da4d0524593b8c3e0c66cd27b852749b1405c20df5a6 SHA512 a1e7564fd14abbf725fee75c4b0ba5f92d7eada0e242ad05897753bb4afe639d859c42cae1d684e8dd9151409d4cc68e1a422a70bc74d8016144cc30d03a2d43
 EBUILD bsf-2.4.0-r2.ebuild 2703 BLAKE2B 21733021922b517a7de471aa3688899d169e3accffe5859cfa16d08844f2ef0c91ad658e7b1439d2ea95a5dab9f83f0ada0db63b865beb351286274ac1269ad0 SHA512 52c57333a2bc951dcc37de9d0ef113b671f0e52a9e9c2d4cd459b9cc0f54e241adcb51b6a4196c3331d855665fb3537afcf9e88a5672fee72101ba8c9eac4d2d
+EBUILD bsf-2.4.0-r3.ebuild 2727 BLAKE2B 92e3e8b2e14b26f823abc503af43cd3baa86dfbea694a349cc8791615290b27e0479475faa31e13a692440dc211a7fe09688507e7486e34ea5e6135b82818ddb SHA512 e4ae153513c3a83b049099449afa137b18991651a656679268d7e7c5de8cdfda950024c54fb31f4b51f8c9d0f9a7ecead1c12ea3669c806abdf862686cee29f9
 MISC metadata.xml 904 BLAKE2B 6e791ca9562cd211b97a13c79701155efa8b58be87f9af9c076017da0ca9f406a2ccc673eefb1d56db9cb2b9481fc77b01e9f762a98bd858199883ac06fde17e SHA512 36cd9c82eaa80842fae4c0f51ca63611d6a2b7a5724d755d0651edf069a67dcad3ce13789ca07cf2be353efb1c8b3a04e367be548925e29507155235749af66b
diff --git a/dev-java/bsf/bsf-2.4.0-r3.ebuild b/dev-java/bsf/bsf-2.4.0-r3.ebuild
new file mode 100644
index 000000000000..3310d4809efd
--- /dev/null
+++ b/dev-java/bsf/bsf-2.4.0-r3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Bean Script Framework"
+HOMEPAGE="https://commons.apache.org/proper/commons-bsf/"
+SRC_URI="mirror://apache/commons/bsf/source/${PN}-src-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# If you add new ones, add them to ant-apache-bsf too for use dependencies
+IUSE="javascript python tcl"
+
+CDEPEND="
+	python? (
+		dev-java/jython:2.7
+	)
+	javascript? (
+		dev-java/rhino:1.6
+	)
+	tcl? (
+		dev-java/jacl:0
+	)
+	dev-java/xalan:0
+	dev-java/commons-logging:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_prepare() {
+	default
+	rm -v lib/*.jar || die
+	rm samples/*/*.class || die
+
+	java-ant_ignore-system-classes
+
+	# somebody forgot to add them to source tarball... fetched from svn
+	cp "${FILESDIR}/${P}-build-properties.xml" build-properties.xml || die
+
+	# Silence javadoc.
+	java-ant_xml-rewrite -f build.xml -c \
+		-e javadoc \
+		-a failonerror \
+		-v no
+
+	# http://bugs.jython.org/issue1814
+	# Also, bsf is an old project (2011) and hasn't officially taken the leap to
+	# jython-2.7. This patch fixes the issue.
+	eapply "${FILESDIR}"/${P}-PyJavaInstance.patch
+}
+
+src_compile() {
+	local pkgs="commons-logging,xalan"
+	local antflags="-Dxalan.present=true"
+
+	if use python; then
+		antflags="${antflags} -Djython.present=true"
+		pkgs="${pkgs},jython-2.7"
+	fi
+	if use javascript; then
+		antflags="${antflags} -Drhino.present=true"
+		pkgs="${pkgs},rhino-1.6"
+	fi
+	if use tcl; then
+		antflags="${antflags} -Djacl.present=true"
+		pkgs="${pkgs},jacl"
+	fi
+
+	local cp="$(java-pkg_getjars ${pkgs})"
+	eant -Dgentoo.classpath="${cp}" ${antflags} jar
+
+	# stupid clean
+	mv build/lib/${PN}.jar "${S}" || die
+	use doc && eant -Dgentoo.classpath="${cp}" ${antflags} javadocs
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	java-pkg_dolauncher ${PN} --main org.apache.bsf.Main
+
+	dodoc CHANGES.txt NOTICE.txt README.txt RELEASE-NOTE.txt TODO.txt
+
+	use doc && java-pkg_dojavadoc build/javadocs
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/org
+
+	java-pkg_register-optional-dependency bsh,groovy-1,jruby
+}
+
+pkg_postinst() {
+	elog "Support for python, javascript, and tcl is controlled via USE flags."
+	elog "Also, following languages can be supported just by installing"
+	elog "respective package with USE=\"bsf\": BeanShell (dev-java/bsh),"
+	elog "Groovy (dev-java/groovy) and JRuby (dev-java/jruby)"
+}
diff --git a/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch b/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch
index bef35c168e48..4e8c4de7b015 100644
--- a/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch
+++ b/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch
@@ -1,5 +1,5 @@
---- src/org/apache/bsf/engines/jython/JythonEngine.java.orig	2015-07-04 08:00:17.120000000 +0000
-+++ src/org/apache/bsf/engines/jython/JythonEngine.java	2015-07-04 08:04:55.230000000 +0000
+--- a/src/org/apache/bsf/engines/jython/JythonEngine.java.orig	2015-07-04 08:00:17.120000000 +0000
++++ b/src/org/apache/bsf/engines/jython/JythonEngine.java	2015-07-04 08:04:55.230000000 +0000
 @@ -26,7 +26,7 @@
  import org.apache.bsf.util.BSFFunctions;
  import org.python.core.Py;
diff --git a/dev-java/c3p0/Manifest b/dev-java/c3p0/Manifest
index 2a1a87b660a8..e0de783ffa2f 100644
--- a/dev-java/c3p0/Manifest
+++ b/dev-java/c3p0/Manifest
@@ -1,4 +1,3 @@
 DIST c3p0-0.9.5.5.src.tgz 869069 BLAKE2B 6e1349d1cd02647a7c2424b8e89a8c21cfd8faefd26b7e05ee9e2da1a1a501b2b3102b142eef52f56dea672408d683a6f47b4c89b25d529a578c4b1fe4aa819c SHA512 fa96b5d0042442c773309090b9cf8f0db8e16f334e321ac952afb198ca06cd66f6f7162369f22a439a0e6b45b1ffcddf540af53804f223844d7a5465213bece1
-EBUILD c3p0-0.9.5.5-r1.ebuild 1322 BLAKE2B f73ed9d33c5e510b8a5c8b5b3b4a10ef97940f67a0fc1a74059ecb1e78d4aa3c09ee3fea3c82b607cd860c68a45b076724c122a6270049072d7d41e196d4bf96 SHA512 b9cd8f8b80bb4564c52210752722f312978b8e81e7d1692eebd3375cbd0f63e73410956014502b7ef545a6f1f025f50fa78aecedd18a2d37e7c6aef2b41ec729
-EBUILD c3p0-0.9.5.5.ebuild 1304 BLAKE2B 12e0e9d144e0e14582e0ca37c40e4df33d746377697942d62dbeb5811cc76991e7c33d8c59f3dc4b1cdbff48fbf58a10336734932c412156a31e2fe3db8cda0a SHA512 b822c1570529ab43716475125273364df68f973f82155dc1d486b5ac234b68b7fbc7ad00288d7e0b78522fb3137794f509728265b4b6780aec227fc82ffac757
+EBUILD c3p0-0.9.5.5-r1.ebuild 1320 BLAKE2B 707f7de2a549ebf06fe03e1fb3289e9a34a4c77c4cb4cdf68f62758f5a68043acebb65d1283d99ead21682e4e6c58c223e04682521abc3f3c7f9dbae859ca35c SHA512 c767505847992ccc176b9112ec61eb57a3cf272f8a1dc56d2d7ce42abdc12bf5e3c0525da155aa6e83cbc2df0f72b2050121cace304677adc6d3f103b8a8e8e6
 MISC metadata.xml 311 BLAKE2B 94e12506ba1bdd92ded65a3ceb8421881aa0a2bce4a93affc09208ff35b942e10ebc855833056e118fbf3e3d4b04e653b3de9ed2d45266191bd580040fdfbe69 SHA512 d4d0cd654557b0ea5d850a8af90db536b3893d2221aba93449559abd2469725e853e5f1ac4bcd67629f1f5be253106eb0a3d1a53b9da144256a01bd7264b6cfe
diff --git a/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild b/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild
index cc33ee96ffbd..ab37f59be694 100644
--- a/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild
+++ b/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.mchange.com/projects/c3p0/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
 LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 CP_DEPEND="
 	dev-java/log4j-12-api:2
diff --git a/dev-java/c3p0/c3p0-0.9.5.5.ebuild b/dev-java/c3p0/c3p0-0.9.5.5.ebuild
deleted file mode 100644
index a65d10630f90..000000000000
--- a/dev-java/c3p0/c3p0-0.9.5.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Tests require an existing running SQL server and 'junit.jar.file' property
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JDBC drivers with JNDI-bindable DataSources"
-HOMEPAGE="https://www.mchange.com/projects/c3p0/"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
-LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-CP_DEPEND="
-	dev-java/log4j:0
-	dev-java/mchange-commons:0
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-"
-
-S="${WORKDIR}/${P}.src"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_prepare() {
-	java-pkg_clean
-	java-pkg-2_src_prepare
-	java-pkg_jar-from --into lib/ log4j
-	java-pkg_jar-from --into lib/ mchange-commons
-
-	# Test sources interfere with Javadoc generation on JDK 11
-	# Remove since the tests will never be run
-	rm -r src/java/com/mchange/v2/c3p0/test ||
-		die "Failed to remove unused test sources"
-}
-
-src_install() {
-	java-pkg_newjar "build/${P}.jar"
-	einstalldocs
-
-	use doc && java-pkg_dojavadoc build/apidocs
-	use examples && java-pkg_doexamples src/java/com/mchange/v2/c3p0/example
-	use source && java-pkg_dosrc src/java/com/mchange/v2
-}
diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest
index bf7bdec40bcd..0e89cb99a2e6 100644
--- a/dev-java/cglib/Manifest
+++ b/dev-java/cglib/Manifest
@@ -1,4 +1,3 @@
 DIST cglib-RELEASE_3_3_0.tar.gz 151490 BLAKE2B d7ca4cc9ea6dad9f7a827c784ad13f93e8f31c817c5a0182a86b2ba759ccd3dfbec88d5178507599cd08a97a1ef13ba4880cab016b68b92dda3358bfb0a751c0 SHA512 635dcdb10a8fe83887a1dc8cf12844fe61b73a12fb530bf84d6ac53f75b0103820d76518cbc0d93d63dba86d13929f0df4dbae3b4943a402cf9f2af76f44161a
-EBUILD cglib-3.3.0-r1.ebuild 2078 BLAKE2B 5b08824f25fdcbaf87201b2328a7f31353662f1724eda0fe59e01f9d757657d3e06be2ffc7986c06553d633db9b192d0ed932da1084c0fa7d66cfe980a0338b5 SHA512 fb49e9889e13df00d0d64de33caaab86fc9f212b2720710484a81dc90769b9cf8e8a8e7b50f064d73234a62332a1fb973d7604e584d31abd3927c2cfc30405c0
-EBUILD cglib-3.3.0.ebuild 1488 BLAKE2B c0547570011c4dc76a9fe6a769499dd806278bb1ff7c70b4cd2cb388915f44d103bc5f4d1e3f26dcbf5251db68fe86ae4d86a19e4a814c5c2db40a29a72f1137 SHA512 984fa1a2fe01a3add9b9fe3f616a2a416356a43e499a76f8a5b21d738660ab184384e97de2391cdaaa9e4e28d6bb83f5258577715363e58a13a6dd8445c036cd
+EBUILD cglib-3.3.0-r1.ebuild 2076 BLAKE2B c422f04f799d55ffc657dd28d05ab0b5fe598c352ded8ebcbc941f1e317c68fcde850f25b5daca101c3ad611380702cd264c3e05d00411c0cc9a8d207421dd10 SHA512 25820a58538d0b281fdbe6579ba1f7ffff7a28cf4f6a77227eefc4fe1873c83f6cd0dc271985520c3119fcac8f102a0f1eca3f65400b93524313bd284371b9d7
 MISC metadata.xml 663 BLAKE2B b64f3da3e4d1dd5ac67867d982f124244f81c03e91b5d7140ee1b16a0fd0250751d41debf9a228150569b7e750929942d011afb0872e3e5098e6106639e0ee3b SHA512 d05d3d71c2511c289c2d1cd4ba638cdc488ee5ea5a8a0da8145929befb41c3efa64f672f12584974239039536c68051f7665730221364ffd20fb8f301672db42
diff --git a/dev-java/cglib/cglib-3.3.0-r1.ebuild b/dev-java/cglib/cglib-3.3.0-r1.ebuild
index 3a73e5eb1fb1..64fd2b7900fc 100644
--- a/dev-java/cglib/cglib-3.3.0-r1.ebuild
+++ b/dev-java/cglib/cglib-3.3.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cglib/cglib/archive//${MY_PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CDEPEND="dev-java/ant-core:0
 	dev-java/asm:9
diff --git a/dev-java/cglib/cglib-3.3.0.ebuild b/dev-java/cglib/cglib-3.3.0.ebuild
deleted file mode 100644
index a1d5a874f9a7..000000000000
--- a/dev-java/cglib/cglib-3.3.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# doc USE flag is not in IUSE as the docs does not compile because of errors
-JAVA_PKG_IUSE="examples source test"
-MAVEN_ID="cglib:cglib:3.3.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PV=RELEASE_${PV//./_}
-MY_P=cglib-${MY_PV}
-
-DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library"
-HOMEPAGE="https://github.com/cglib/cglib"
-SRC_URI="https://github.com/cglib/cglib/archive/refs/tags/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CDEPEND="dev-java/ant-core:0
-	dev-java/asm:9
-"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-"
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}
-"
-
-S="${WORKDIR}"
-
-JAVA_GENTOO_CLASSPATH="asm-9 ant-core"
-JAVA_SRC_DIR="${MY_P}/${PN}/src/main/java"
-JAVA_RESOURCE_DIRS="${MY_P}/${PN}/src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="${MY_P}/${PN}/src/test/java"
-JAVA_TEST_EXCLUDES=(
-	"net.sf.cglib.CodeGenTestCase"		# not a test class
-	"net.sf.cglib.TestAll"
-	"net.sf.cglib.TestGenerator"		# not a test class
-	"net.sf.cglib.proxy.TestEnhancer"	# broken tests
-	"net.sf.cglib.proxy.TestInterceptor"	# not a test class
-	"net.sf.cglib.reflect.TestFastClass"	# broken tests
-)
-
-src_install() {
-	java-pkg-simple_src_install
-
-	use examples && java-pkg_doexamples --subdir samples ${MY_P}/cglib-sample/src/main/java
-}
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index e91f96123618..a7f63b139760 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,6 +1,5 @@
 AUX commons-logging-1.2-gentoo.patch 825 BLAKE2B 154927ebbda77a76007fe9b448fc2801404717fa933002a69916b9a0558af82b0172039ef294ba01b4cb98bcc93bf40b54681d4c2343e4a404e58772e8a8585d SHA512 1886a28bbccf0f8aa42a147628aeac444a672cb3dc006604088a67d536c376a03781b22394770c580d80c5616569b751e63c91d86cbff6f5caa47100897cd027
 AUX commons-logging-1.2-servletapi.patch 1783 BLAKE2B 5f8bc256542335b5d955d998ef2ee49d8becca46b367ba0ac1152f68ea4fccc226afcd2475331cf292c3f0f11471052e6917c9508a6737c6482c556c2ec87363 SHA512 bf2f0aca771b7278f2d80ae3c149492040c137c1ab190513fd9894fad315f75e4b0423f65a5ffaff04faed3f7256728b5f474cfbe0aefc2a53d60337a6344d39
 DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
-EBUILD commons-logging-1.2-r3.ebuild 2428 BLAKE2B ec1bb9560770cce42e810c9be98cb90f29951f15b4d86856806b33364b7a0137fb44c886c8b1d8929ace6a62f94cff08da22673846d8650f3d511a7e329d29e9 SHA512 8787240bdaccc05b6ef2dd5ce717a4f4bd5224f37ac8cab943fec9c5ca31c7a11f55e229d4ead8d4f568cfe06f4d15281ceb7c15757cd86c0f04272b1e19206e
-EBUILD commons-logging-1.2-r5.ebuild 4166 BLAKE2B 5938a00e5a813dcb68e396d45b0134609ba6bab577246639d5c9dae017882ee94bff0eb77d5616a496a555552e29ab6eecc3169b2549dbea85aec73bf842dd90 SHA512 23ebef4dbe7770c814afe134c750a9cfd664429339ca75d00611211341afcccbf72fafc2ea18212af3a85655158bd6e6dc107665a2b4bdb4cf57eb65cfae82c5
+EBUILD commons-logging-1.2-r5.ebuild 4162 BLAKE2B d459324c5da6caff691d148aae1f29abf934f924c9afa62733f39b5aca8e7aa5d819609ff9bca3546dd32533d905abad588913d9e1e87aab61c482b3cf2b3346 SHA512 f3d3d2d630e25e24eb4dffe061bab2c7b970692cbefddd90b70d3cab8276353ff14669d40ad01fa1c05dcae1eea1f15895a027b8e4b75ad3172e5b3f4cc72005
 MISC metadata.xml 552 BLAKE2B ec2efc6f1e5e694ae68d977b40387ecdf6bff5fd184a4a5cd7c65830108d82522e5951a9b9868f4e94b08ec00c1901f43cd027f328b49cffc90ca971fb041026 SHA512 89c4f003ea15a5201ba713ca1819b9ea35d65c27e4106e6bc8e3806f1667f95b3e96c7b76c77b8545ded8abbb3955f6cf96dea11eeaea7740696bb01a933e077
diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
deleted file mode 100644
index 4635bb99ffe2..000000000000
--- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
+++ /dev/null
@@ -1,83 +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"
-MAVEN_ID="commons-logging:commons-logging:1.2"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
-HOMEPAGE="https://commons.apache.org/logging/"
-SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="avalon-framework avalon-logkit log4j servletapi test"
-REQUIRED_USE="doc? ( avalon-framework avalon-logkit log4j servletapi )"
-RESTRICT="!test? ( test ) !servletapi? ( test )"
-
-CDEPEND="
-	avalon-logkit? ( dev-java/avalon-logkit:2.0 )
-	avalon-framework? ( dev-java/avalon-framework:4.2 )
-	log4j? ( dev-java/log4j:0 )
-	servletapi? ( dev-java/tomcat-servlet-api:4.0 )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${P}-src"
-
-EANT_BUILD_TARGET="compile"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
-
-DOCS=( RELEASE-NOTES.txt PROPOSAL.html )
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}/${P}-gentoo.patch"
-	# patch to make the build.xml respect no servletapi
-	eapply "${FILESDIR}/${P}-servletapi.patch"
-
-	# bug #208098
-	echo "jdk.1.4.present=true" > build.properties || die
-
-	if use avalon-framework; then
-		echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties || die
-	fi
-	if use avalon-logkit; then
-		echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties || die
-	fi
-	if use log4j; then
-		echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties || die
-	fi
-
-	if use servletapi; then
-		echo "servletapi.jar=$(java-pkg_getjar tomcat-servlet-api-4.0 servlet-api.jar)" >> build.properties || die
-	fi
-}
-
-src_install() {
-	local pkg=org.apache.commons.logging
-	java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\""
-	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
-	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
-
-	einstalldocs
-	use doc && java-pkg_dojavadoc target/docs/
-	use source && java-pkg_dosrc src/main/java/org
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild b/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
index f93740de50e1..b3a0f8533760 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 REQUIRED_USE="doc? ( avalon-framework avalon-logkit log4j servletapi )"
 RESTRICT="!test? ( test ) !servletapi? ( test )"
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index ebffa2f8ff7c..5b21fd938a1d 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -5,7 +5,7 @@ DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2
 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
 EBUILD eclipse-ecj-4.10.ebuild 1678 BLAKE2B 933c353919c86dd1d1a8adff7604bb42a35ed0de363134d8a3169dfefd91c90f6827a0bd661371515da6b9a63fd55745578dd70c50e808ccb29f1e5e1ffa4fb1 SHA512 2bd4398ccc15505ef35081e5afce5302001a0eec585c8c5463b233922e3faf234fc982293d873b4c181785f23b883993e157555202c0e2c1f823b68aa844f87f
 EBUILD eclipse-ecj-4.13-r2.ebuild 1738 BLAKE2B fc8b94e3d55e1a72473c9723b496fef18a5122af2f94c34ed52c929fce8be6703d2a4c8f99ef836a896bbc0c7e6e93d5675db2588f79beb9551e918b251c5864 SHA512 5a4e6e40cd35e1d815f2eb83ca15ad638d5f931a3ad1539147aa716dbae82a89763b51ffcd59490ceee6e80846475ce550654acb45cac5444be1835b080b8ea5
-EBUILD eclipse-ecj-4.15.ebuild 1737 BLAKE2B 8f0cf422581ddadc232cad2edb41a3ccc35d3390e99e02caf498b0b50334ef95e70a022c090bbd23fd67b3cd62c5871c3e89801e9b9c6a1c2a3d67e306b7068b SHA512 fd63c0a189d4e2d928674814ba7e681a7f83569937004c28785acb5d7c969db49fc8538c3ca093431e2a3067b432d2889f6e205bc53bec9d07db2302206fe0c4
+EBUILD eclipse-ecj-4.15.ebuild 1736 BLAKE2B 13759bf79686882e0314427741b1c76543700e51def44232eb5aedc7a6f28fdff2a37e041476ef19a0ee9fabc9d7f227ca80ca7835a4372fcd21aa70eb38e3df SHA512 4c8414eaba06bf30e9879bd58b8394f67941ac81e3fcf3f88fd97e26979f852129f0065fb5fc49f7436f501009dfe6f65d88d873c8fb6bca0607ea3929b79fdd
 EBUILD eclipse-ecj-4.22.ebuild 1693 BLAKE2B 85963cd268d50412c1e185f762b94b040a1d29b3d0c352e155006e5f65d14b7133ab8853e47a86b7c4e45016e9921430671953a21efa7128e6fd3dbbe91be27f SHA512 d644260970dfa5f767962c39d47d513188fa46f09fb8aaa2adcdd63c1e1b3d7f1848c504aaeedb05b83d9d703b096c62604cb0706a482e98344603360b769436
 EBUILD eclipse-ecj-4.5.1.ebuild 1628 BLAKE2B 19a0422c19a19998e199dae7170e3b89954d412e62523ec4742fbf514015afdfe01a9c932b044dfd4f6971a96ba1bf3bf98697732b677f567c3d2a83368d575e SHA512 ba5ded5ba46b10e1467c42ad8f63f67f065acd08f3e39541e3794e97a0f8974edc1d4e3eff474916922b83e8fd9656cba6f34b67c3febc4ea15bf08c933ca2ff
 MISC metadata.xml 646 BLAKE2B 644ff172a0719eb9a8669ea6c472adeace597f2c9baef893707c366d1aa86d04a92c4873abe2894e8405c0198c7588f4f7110df11b520f22afd20cb0a018d9f3 SHA512 c611a29d9e2f37b25cbfb631e1292832aab4c78122b26fca2b5689b4aa7337ed87b3dd17a95ee5aacfeae6d57f9400c6ef79479b190df072eadcdcbefc38edf7
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
index 8e6af419fbc2..37b49f67ee47 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.15"
 IUSE="+ant"
 
diff --git a/dev-java/fec/Manifest b/dev-java/fec/Manifest
index 18129d0a22db..a4403b4ac696 100644
--- a/dev-java/fec/Manifest
+++ b/dev-java/fec/Manifest
@@ -3,6 +3,5 @@ AUX fec-1.0.4-libfec8path.patch 1091 BLAKE2B 4e19c8615b20694f26d3ee5bd83e33ec342
 AUX fec-1.0.4-remove-concurrent-util-imports.patch 3146 BLAKE2B 8716fcc73a5e1030d12709c12d15adb2462c40da5ab896806e4dc8b572fc6d952b6b09c550f1ba4511a84b9a75306804b67526ee34fac33d2f3d4bf453c807f9 SHA512 592cfd6502a000cc1ac02e534e5436cb3d621855cc682a4588a5fd6f17c8d7f4811743fa9dbcd30851221ba55ab2adb188f6dc9e32f8735651edd28e032803a6
 AUX fec-1.0.4-soname.patch 790 BLAKE2B 852ef6ec83d42a15bfb1d67b05364d15c3027a8579d5e90dab4dec4cc99273383d89f5d5174ec8a6e2ab3cb09986d3fd60f39aedec6ae2da3f893325f88756c4 SHA512 1586fc0408274fff7eb3ba2cd95cfac8a94dad9981e2e01e8e11642692d2a27068936b673364c9c2cc70ca848d364648a66c728dc41d85c605a25b7fe79e2ec3
 DIST fec-1.0.4.tar.gz 449406 BLAKE2B 132bb87ff0da35b9a1830d014c46fb82209b344d159b88c6dbf36c706de668cdb2dfc10894690009e9a47f461100beaf9cf25ad1c75a3b18194e5499457bcb6b SHA512 0244de5e44ab108e921c6ca4cf341ce7b3ba807a76d24b768cfe3de71ffd525c9ebf389f9981e7eaa83fec301a65ba60ef4f51c5b3befa6c7af42b793d430343
-EBUILD fec-1.0.4-r3.ebuild 1483 BLAKE2B 59340c027d79d5a9eaf0d1a4d6b6234396a8b113f8a8365b16148fdfdc90c34b4874a2b69eb00bebc6b52a58ad6d82a615557030dfb86714654b5a3f86056b42 SHA512 69c55282ec66e0bd2907408ec431e8650c2bdb116c4d2e906ac9caccd00f362e7001a450c4b675421cd0667f1aa627a37beacac5d6bd9dded92be3c071285eab
-EBUILD fec-1.0.4-r4.ebuild 1517 BLAKE2B 1b580e3a6f0b3a0032d6ba304d3314e7920d9a2dec5d7943aedb6a7f8913ab5910bda4d0e359a5890ab8b622633af270dc3c5477a23b34af27ec4da1541fa890 SHA512 41e0094963ffda6ce3bb31f4a02f27315fc333a2a4968c4155edb33bb316586d53d3fb6b0ee18d5a90b68fc18d98af18a949261e57dea71c070117e9c1c1fc98
+EBUILD fec-1.0.4-r4.ebuild 1515 BLAKE2B a6e489336bf2a0437de321dd5a48aa0477787a017965f599e41b47eff208108914803ae4f18f2eec13d272d2e71a325228e9ac10b98354c9c25a37747eed9fd6 SHA512 42eee0911b3ab09205ef96874a32a17adc28d3fa8fd876cb0cc375681507cc778ec1aa1c1e258c109225de7209d1052e9bee2c136df394a0a384005c6b800b68
 MISC metadata.xml 435 BLAKE2B f15bf1cf8797a940aef17b1a72884aad2859be1790129554172bbeec7ea0e2f68da81c0e5362cc7d94302bb9090bc1d0960d608335bc1a88168a3607ccb0d191 SHA512 13f1c5f833c69547926d60f4f9325624db5e82ea9b01900b00d48b38079e0cd8b1d038f6a69d784d78fa3cafa6f23e7ce57b78812b91154e0850466c2daf2ab9
diff --git a/dev-java/fec/fec-1.0.4-r3.ebuild b/dev-java/fec/fec-1.0.4-r3.ebuild
deleted file mode 100644
index 4a2592c69750..000000000000
--- a/dev-java/fec/fec-1.0.4-r3.ebuild
+++ /dev/null
@@ -1,69 +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 flag-o-matic toolchain-funcs java-pkg-2 java-ant-2
-
-DESCRIPTION="Forward Error Correction library in Java"
-HOMEPAGE="https://bitbucket.org/onionnetworks/"
-SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="dev-java/log4j:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*
-	app-arch/unzip"
-
-PATCHES=(
-	"${FILESDIR}"/"${P}-libfec8path.patch"
-	"${FILESDIR}"/"${P}-build.patch"
-	"${FILESDIR}"/"${P}-soname.patch"
-	"${FILESDIR}"/"${P}-remove-concurrent-util-imports.patch"
-)
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="log4j"
-EANT_BUILD_TARGET="jars"
-
-# There seems to be unit tests, but they are in such a state.
-RESTRICT="test"
-
-src_prepare() {
-	# Apply patches.
-	default
-
-	# In fact, we'll wipe tests altogether.
-	rm -rf tests || die
-
-	# Get rid of bundled jars.
-	java-pkg_clean
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-	einfo "Sucessfully compiled Java classes!"
-
-	cd "${S}"/src/csrc || die
-	append-flags -fPIC
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)"
-	einfo "Sucessfully compiled C files!"
-}
-
-src_install() {
-	java-pkg_newjar "lib/onion-${PN}.jar" "${PN}.jar"
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/com
-	dolib.so src/csrc/libfec{8,16}.so
-}
diff --git a/dev-java/fec/fec-1.0.4-r4.ebuild b/dev-java/fec/fec-1.0.4-r4.ebuild
index 29f4fada481c..98864fd2a92e 100644
--- a/dev-java/fec/fec-1.0.4-r4.ebuild
+++ b/dev-java/fec/fec-1.0.4-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="dev-java/log4j-12-api:2"
 
diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
index ae869655a0cb..56985015c818 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -5,6 +5,6 @@ DIST SourceSansProBold.otf 104072 BLAKE2B 2c6538ed97cca04a6a38a1bcca7def6c9e923f
 DIST fontbox-1.7.1.zip 9167805 BLAKE2B f9e02d1540eaf7e4bb748906e56887494d81eecc88685fa9d758cb50712a530528573f4a7e5f816b4ff57d664a416b35444517d840c9b37239ec1e2b5a62b5a1 SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0
 DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
 EBUILD fontbox-1.7.1-r1.ebuild 971 BLAKE2B 5d0a36f8cca1a5793386111563cf793a57c665f903c467c8a244dcfbe6986b59072661fbee1b363d1d0aaff1dc1f921d016c0723a3237a722ae9b05227c1fc0b SHA512 44d237b4a9e505dc45ff2bd0afbd4cbe8452ffc66e7b6155dfe3ecc00dedd1467e8a5870d429ad494cd48d8437461dcedeaa5c68f2fb02f613363c5134abc2d5
-EBUILD fontbox-1.7.1-r2.ebuild 1003 BLAKE2B 3cc7534d254e21227874680898102e8ac524f0ecd5b806fa81987a2232425630ea70034316862438dc2ef2a98b6f3c6c664f9aa567415f96b8b68bf827c72a06 SHA512 199cd68e15fed122b8540e925cca177d8616d71f5df742e04889b688b8ada63712811a87987919fcfc8c18eca26fb0bf6678a423083cb390b700d60dd9fdec94
+EBUILD fontbox-1.7.1-r2.ebuild 1002 BLAKE2B 0e98236ca4c4807f97e2c3071b757dbf3bf16208f271bc36861ca122b7cf7ff7af99e39fd638ac3347716cbc0b9ea0abe16e82ee13b47ccd29e020660643dde6 SHA512 f0b42749a47819b9d54e10b0e17def96d3ab9682ffa9a9babc1dfea0b23da5ee5a0a3615593adecdb840381385d803c6ab7c902f475c3f94b8ed544a2c752e21
 EBUILD fontbox-2.0.24.ebuild 1762 BLAKE2B 483d3d83508a4db99f14ef171c480b4c06d262a913b967922ab223975636e8176165ae65dc38c01c97e3b1c61264d4bd53d367cb63530eeefd542eea9e4cc851 SHA512 72917eac46cbc8be4636a35dbd2b8ccebe3c9fd271895be79e20a309b8ebef3373974dd5fb6cccf5f4d3c45689274497f4d3997615ece8f2680eb0fcad504e1c
 MISC metadata.xml 571 BLAKE2B 1ffa3f19fb3e5035c5a73503ce6abbeb02de7ea42fb74e21eecb30aa3827085802644b797f197f35d9001d86ec969b0cc6cbdaa634ab0d003fa65bd03c3d09ab SHA512 e1b958bb3eff6c3428581dd3851b8857048e81df192b87ad91fc61d3074a4ebf88dfecf6310ac96a3da6ba6b96d476ef1e258781e36b8f0c5cbf3110d5608f8e
diff --git a/dev-java/fontbox/fontbox-1.7.1-r2.ebuild b/dev-java/fontbox/fontbox-1.7.1-r2.ebuild
index f2a8f156229d..0f32b29e1928 100644
--- a/dev-java/fontbox/fontbox-1.7.1-r2.ebuild
+++ b/dev-java/fontbox/fontbox-1.7.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://archive.apache.org/dist/pdfbox/${PV}/${MY_P}-src.zip -> ${P}.zi
 
 LICENSE="BSD"
 SLOT="1.7"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86 ~x64-macos"
 
 RDEPEND="
 	>=virtual/jre-1.8:*"
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index e9a911fdc4a0..a637501f4cbd 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,4 +1,8 @@
+AUX fop-2.7-core-event-models.jar 8835 BLAKE2B d9bebf4dec77e79a5adf202929840b7333b6ce3c9b66654b2d14b229c08a092d7286c948a2a758ec52a3ab829badb4cc6c614bd111b741344281d87f5d215b92 SHA512 f2ceee4d98043084fbe0c4c1ef3a72513d782964e56acab2b9eadf10da707d951f13ad1fa60f8ad112f3a55d5c007a326b711e0a28d46c20194acf976687249b
+AUX fop-2.7-test-event-model.jar 428 BLAKE2B 434f8bfa73b1702f14102c9bf10e435edc216b6ba643ed0ffb2097654532acb57c05697e142140a594dc8892f5c6973f617efc32f6e63fcc06c0573aa9caa333 SHA512 f7bfa500b37c902acfca46399fe86d7fa5e51701b3a568ad0081b2e33c0190de5c8b5e652ef08156119622833de63d2ca9f24fec871be8c61e425935e542bb69
 AUX headless-launcher.bash 67 BLAKE2B 29ea0750d057e9a914ce26a14f1d6d1c4d49967aa553d6f55b115df0ebf1b77d693e01a7a06dbe92de4a589ff5847b176ccb820c23acde06b336e302a763d089 SHA512 d3a6635105ea62a62f1ff690a457bfbdebe3d15f8fd220f5508a4ec20b8a5c46e66bf9189562661d5053c6ac31a6998d1f4a117e0ac6087b336a0475635d7d3a
 DIST fop-2.0-src.zip 26381859 BLAKE2B 8500de6a23e93c14fdb4f27c59bafba27a64e6aaffb7a761f16de5bd523e2fdb83593ab53a66de79bf7b7d6c2b887ab97a34accb18be416b26448753babe2395 SHA512 428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a
+DIST fop-2.7-src.tar.gz 26799877 BLAKE2B 00bcbd4cc915aad67c0dac54e85b7c5d10576115a0a8a16517846af249137c73b10c8b0ff161c9957f7c49686eefbf9777dc452b038573c996e29cbad951176a SHA512 bffbc0a97db8bbc826cf9af89fbf4a7e6f705585ea4915c0954df57c6d7af50d323387bb4bb9e2d13047826352d9eb7cbf4f23d5146ce246965b4c531e015633
 EBUILD fop-2.0-r3.ebuild 3050 BLAKE2B 99e24888912fda8f6d9d2ca37ad03d6af2b4631e8bbf6d3fd3f2398c92636612afba50127fa1c627401b4a41b7f8c03632aea486e92c3c3c493a083a0b9d15b2 SHA512 debaeea4df79a274fe79c531e808e331f1995deb23c981224fe3f8dde57dd62c911494c86a578d314d373289d286d0475c96ad8bbeedf9227f87a4679c21ea45
-MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
+EBUILD fop-2.7.ebuild 4101 BLAKE2B 8c2fd3cf9077539fd68beda97cdb19dbd7a3a528c7516712739c7372be57009313008e8a0edf19ee84f9a4df8671e08baaa8bc00fd124069596ca42d1979f0ba SHA512 89776b3f7bc2d4b5e54f7679f9a98c3656bb7dfa0fc64eb86d96f9340438128f88df033e0920a0c63766665a951d48c04b6ac4267412258d0f9b439c725a3751
+MISC metadata.xml 449 BLAKE2B 91dd2fd3b50581a408755aade7aa37406c527e9298bd0156cb18d363fef88cf60eb85f259ba443022fbd6c5377be0e0fc990cb2826d418347dc92bf7b6ff5ca9 SHA512 cf49f03d1ed992a7df7deebb7c00721895be45ff144da8c4b1777aecba5e17d86a7353a83ad8df8b356f70afda5fadcdc53350b2c5732a0f0469b18f501959d4
diff --git a/dev-java/fop/files/fop-2.7-core-event-models.jar b/dev-java/fop/files/fop-2.7-core-event-models.jar
new file mode 100644
index 000000000000..49bece365d93
--- /dev/null
+++ b/dev-java/fop/files/fop-2.7-core-event-models.jar
diff --git a/dev-java/fop/files/fop-2.7-test-event-model.jar b/dev-java/fop/files/fop-2.7-test-event-model.jar
new file mode 100644
index 000000000000..7c2fff6a088d
--- /dev/null
+++ b/dev-java/fop/files/fop-2.7-test-event-model.jar
diff --git a/dev-java/fop/fop-2.7.ebuild b/dev-java/fop/fop-2.7.ebuild
new file mode 100644
index 000000000000..b6bc2ad9ebca
--- /dev/null
+++ b/dev-java/fop/fop-2.7.ebuild
@@ -0,0 +1,154 @@
+# 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.apache.xmlgraphics:fop:2.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XML Graphics Format Object Processor All-In-One"
+HOMEPAGE="https://xmlgraphics.apache.org/fop/"
+SRC_URI="mirror://apache/xmlgraphics/fop/source/fop-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.7"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/batik:1.14
+	dev-java/commons-io:1
+	dev-java/fontbox:0
+	dev-java/qdox:1.12
+	dev-java/sun-jai-bin:0
+	dev-java/xmlgraphics-commons:2
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	dev-java/ant-core:0
+	dev-java/sun-jai-bin:0
+	test? (
+		dev-java/mockito:0
+		dev-java/pdfbox:0
+		dev-java/xmlunit:1
+	)
+"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( NOTICE README )
+
+S="${WORKDIR}/fop-${PV}"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_compile() {
+	JAVA_SRC_DIR="fop-util/src/main/java"
+	JAVA_JAR_FILENAME="fop-util.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-util.jar"
+	rm -r target || die
+
+	JAVA_SRC_DIR="fop-events/src/main/java"
+	JAVA_RESOURCE_DIRS="fop-events/src/main/resources"
+	JAVA_JAR_FILENAME="fop-events.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-events.jar"
+	rm -r target || die
+
+	JAVA_SRC_DIR="fop-core/src/main/java"
+	JAVA_RESOURCE_DIRS="fop-core/src/main/resources"
+	JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' fop-core/pom.xml )
+	JAVA_JAR_FILENAME="fop-core.jar"
+	# Code generation according to
+	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_7/fop-core/pom.xml#L150-L219
+	pushd fop-core/src/main/codegen/fonts >/dev/null || die
+		local fonts=$(find . -name "Courier*.xml" \
+			-o -name "Helvetica*.xml" \
+			-o -name "Times*.xml" \
+			-o -name "Symbol.xml" \
+			-o -name "ZapfDingbats.xml"
+			)
+		for font in ${fonts}; do \
+			xalan -XSLTC \
+				-IN $font \
+				-XSL font-file.xsl \
+				-OUT ../../java/org/apache/fop/fonts/base14/${font//.xml}.java || die
+		done
+		xalan -XSLTC \
+			-IN encodings.xml \
+			-XSL code-point-mapping.xsl \
+			-OUT ../../java/org/apache/fop/fonts/base14/CodePointMapping.java || die
+	popd
+	java-pkg-simple_src_compile
+	rm -r target || die
+
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-core.jar"
+
+	# Update "fop-core.jar" with "event-mode.xml" files produced manually
+	# by running "mvn package".
+	mkdir event-model && pushd $_ >/dev/null || die
+		jar -xf "${FILESDIR}/fop-2.7-core-event-models.jar"
+	popd
+	jar -uf "fop-core.jar" -C event-model . || die
+	# Upstream does this with maven-antrun-plugin:
+	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_7/fop-core/pom.xml#L263-L284
+
+	# public class EventProducerCollectorTask extends Task {
+	#
+	#     private List<FileSet> filesets = new java.util.ArrayList<FileSet>();
+	#     private File destDir;
+	#     private File translationFile;
+
+	if use doc; then \
+		JAVA_SRC_DIR=(
+			"fop-util/src/main/java"
+			"fop-events/src/main/java"
+			"fop-core/src/main/java"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,pdfbox,xmlunit-1"
+
+	JAVA_TEST_SRC_DIR="fop-events/src/test/java"
+	JAVA_TEST_RUN_ONLY="org.apache.fop.events.BasicEventTestCase"
+
+	# This jar file was created manually from the output of "mvn test".
+	# Upstream does this with maven-antrun-plugin
+	jar -xf ${FILESDIR}/fop-2.7-test-event-model.jar || die
+
+	java-pkg-simple_src_test
+
+	JAVA_TEST_SRC_DIR="fop-core/src/test/java"
+	JAVA_TEST_RESOURCE_DIRS="fop-core/src/test/resources"
+
+	# Testing fop-core seems to want a newer mockito:
+	# error: cannot find symbol
+	# import static org.mockito.ArgumentMatchers.anyInt;
+#	java-pkg-simple_src_test
+}
+
+src_install() {
+	for module in fop-util fop-events fop-core ; do
+		java-pkg_dojar $module.jar
+		if use source; then
+			java-pkg_dosrc "$module/src/main/java/*"
+		fi
+	done
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+	java-pkg_dolauncher "fop-${SLOT}" --main "org.apache.fop.cli.Main"
+	einstalldocs
+}
diff --git a/dev-java/fop/metadata.xml b/dev-java/fop/metadata.xml
index 6ef2d50cf07e..3f00c936434b 100644
--- a/dev-java/fop/metadata.xml
+++ b/dev-java/fop/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://issues.apache.org/jira/projects/FOP/issues</bugs-to>
+		<changelog>https://xmlgraphics.apache.org/fop/changes.html</changelog>
+		<remote-id type="github">apache/xmlgraphics-fop</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 264189e024b1..db9d6eba23b5 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -3,11 +3,13 @@ DIST gradle-bin-7.1.1.zip 154838841 BLAKE2B 0a0ad08101f0c5fa7c0cb2a4c9ad6e53320c
 DIST gradle-bin-7.2.zip 157058280 BLAKE2B 918213df58ac2afbd075c74588f60676cd7dc99030834828138c621348ac1abd368e0b54c2f6937cbfc9533e55e310b46cf841c92dcb1039b898c6f456032d38 SHA512 6ccc79f08afdc20b3d5abf876c3cabb69114d1ab4285cdb77158cd8c5e09207589edefb6c79f2bcffe4629a38c6b9e2f473de42dab29a24310965bc5816b907d
 DIST gradle-bin-7.3.3.zip 158875257 BLAKE2B 94f86e06da3eae4a9522d35a28577d033d64ce1bc2f36d0f5c1992e9b92ec311d25bd98bbeaf4b8a9869f22d93e14c88952e12166e436a0a6c206541d1f967aa SHA512 03f2bdd77202788cd43bb3e3a6390340f4d083d69ade5a53e0163204fb85307f5bbbbf4e04077c6ae558bc36ab3c478674f941079bc14a8344f55631fbba1490
 DIST gradle-bin-7.4.1.zip 159312495 BLAKE2B 591ab6af118d8fac7d0ead1a040ed4e69b8f84d18807fc4fb88778a58917a31d2111f2c140f7d723523a2411b6e57e7682ba94bd9043c948bafb1de7c2c066ff SHA512 bd2bc3570537e0878186a81eecee2c8578b2f7ea76a23b1f49de9cd0e70529a591f42c2d1433f29eddfab87f25d986a6c48b52e66396653153f20785f39aa977
+DIST gradle-bin-7.4.2.zip 159315974 BLAKE2B c7c8dbe82d22dec699d1997a781f3a66110c9910dfe67df2304c48cead96c130ca072550b8c5fa2362744cd2ea3c9723c45a6ecf6e0737fe3c9b7e286b44f4ae SHA512 2e1d05486baa9661d5c8ffead2df87874a66f6cfc958ee6840432b89d221d8b0af9e3cad3675766f5413d12aa61c5b5fb0dd82f4164e5da3022865eba9ceadbf
 DIST gradle-bin-7.4.zip 159248291 BLAKE2B db9dde35d0c285afb8b30d08ee1a509660d7bf169530d734b1bffd0dbf22fec0360b12a78588e5f8b6180669678868f86e73950bf9bfd110ac1f24a73b3d2549 SHA512 9742efccd6539325f6cb3929f794afaf8f55763b9a09cccea8d6a84c55b8e0bf350ddf10d59e9a5271b9320719ade57e2e4c0b9bac5faf0afcb0304c75728cc9
 EBUILD gradle-bin-6.8.3.ebuild 1107 BLAKE2B 349fbd166d7051019a6861ff9b4cf3551b4da9931beb867b55ccdf74094a477bd2e4607763de59d037b7e48d33ae6ffe033853cfc6baf54f1c3ffb878dacd1a2 SHA512 29a5b48b85ea22e5446e210d2ca05e4bdef13f89607b7fb19e8463f478554b08edb68b0ccbe6002b5c1600a25a01507c3297aad9ac608c6cc9880473f8d61a93
 EBUILD gradle-bin-7.1.1.ebuild 1107 BLAKE2B 349fbd166d7051019a6861ff9b4cf3551b4da9931beb867b55ccdf74094a477bd2e4607763de59d037b7e48d33ae6ffe033853cfc6baf54f1c3ffb878dacd1a2 SHA512 29a5b48b85ea22e5446e210d2ca05e4bdef13f89607b7fb19e8463f478554b08edb68b0ccbe6002b5c1600a25a01507c3297aad9ac608c6cc9880473f8d61a93
 EBUILD gradle-bin-7.2.ebuild 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb67d911d143ee6711150c3e7d69c9c55f7ab0bf44b554935539ee20d0c945a4f10c914a2bcb471d2c3be4d249346 SHA512 3cfcbdf0bea512bb3e82053ad824953b5d95d7954796ea6f1846d46d8812e7b482608f1c8e60d30982127e05ad5fd29ae660965afd9176c872618dade74c821e
 EBUILD gradle-bin-7.3.3.ebuild 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb67d911d143ee6711150c3e7d69c9c55f7ab0bf44b554935539ee20d0c945a4f10c914a2bcb471d2c3be4d249346 SHA512 3cfcbdf0bea512bb3e82053ad824953b5d95d7954796ea6f1846d46d8812e7b482608f1c8e60d30982127e05ad5fd29ae660965afd9176c872618dade74c821e
-EBUILD gradle-bin-7.4.1.ebuild 1109 BLAKE2B 219b535d3339d37bf485fe2c96715433912e0c3bc75cc9f0aaaee9f86f01b7cfe557d4ff65a9ad72c40a048eff551a8ac4f455cad993d51bfcd49e953379270e SHA512 6c42e222620593e1a5d906334ac36efce86b3a82d667048833e74eae62207544f3ce9b9fd59b81078426d03b934ee8e2c94e463f77a184b9b4a08e271a96dabf
+EBUILD gradle-bin-7.4.1.ebuild 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb67d911d143ee6711150c3e7d69c9c55f7ab0bf44b554935539ee20d0c945a4f10c914a2bcb471d2c3be4d249346 SHA512 3cfcbdf0bea512bb3e82053ad824953b5d95d7954796ea6f1846d46d8812e7b482608f1c8e60d30982127e05ad5fd29ae660965afd9176c872618dade74c821e
+EBUILD gradle-bin-7.4.2.ebuild 1109 BLAKE2B 219b535d3339d37bf485fe2c96715433912e0c3bc75cc9f0aaaee9f86f01b7cfe557d4ff65a9ad72c40a048eff551a8ac4f455cad993d51bfcd49e953379270e SHA512 6c42e222620593e1a5d906334ac36efce86b3a82d667048833e74eae62207544f3ce9b9fd59b81078426d03b934ee8e2c94e463f77a184b9b4a08e271a96dabf
 EBUILD gradle-bin-7.4.ebuild 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb67d911d143ee6711150c3e7d69c9c55f7ab0bf44b554935539ee20d0c945a4f10c914a2bcb471d2c3be4d249346 SHA512 3cfcbdf0bea512bb3e82053ad824953b5d95d7954796ea6f1846d46d8812e7b482608f1c8e60d30982127e05ad5fd29ae660965afd9176c872618dade74c821e
 MISC metadata.xml 356 BLAKE2B fa5433b47d358144596ec5c02ea3d766d13561cbf383a2dcb492ca66f9ebae593e12534630edf229ee6e136f336a0ff091dedeb67e155cb43bd219284fd1f4d3 SHA512 d8e58592957b0707bb016273f8209e3ba975a907a691b60d610e8ef4204a62ed89e4475b8b198659afb9f9b654b71c0f52eb3ce7a00e46fa17831da69dc24470
diff --git a/dev-java/gradle-bin/gradle-bin-7.4.1.ebuild b/dev-java/gradle-bin/gradle-bin-7.4.1.ebuild
index bec8bc49d5c4..fe6f492c7e4e 100644
--- a/dev-java/gradle-bin/gradle-bin-7.4.1.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-7.4.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.gradle.org/"
 
 LICENSE="Apache-2.0"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="app-eselect/eselect-gradle"
 BDEPEND="app-arch/unzip"
diff --git a/dev-java/gradle-bin/gradle-bin-7.4.2.ebuild b/dev-java/gradle-bin/gradle-bin-7.4.2.ebuild
new file mode 100644
index 000000000000..bec8bc49d5c4
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-7.4.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+IUSE="doc"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
+HOMEPAGE="https://www.gradle.org/"
+
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-eselect/eselect-gradle"
+BDEPEND="app-arch/unzip"
+RDEPEND="
+	${DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local gradle_dir="/usr/share/${PN}-${SLOT}"
+
+	if use source; then
+		java-pkg_dosrc src
+	fi
+
+	docinto html
+	dodoc -r docs/release-notes.html
+	if use doc; then
+		dodoc -r docs/{dsl,userguide}
+		java-pkg_dojavadoc docs/javadoc
+	fi
+
+	insinto "${gradle_dir}"
+	doins -r bin/ lib/
+	fperms 755 "${gradle_dir}/bin/gradle"
+	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
+}
+
+pkg_postinst() {
+	eselect gradle update ifunset
+}
+
+pkg_postrm() {
+	eselect gradle update ifunset
+}
diff --git a/dev-java/httpcomponents-client/Manifest b/dev-java/httpcomponents-client/Manifest
index c478ac90d4ca..e614f2b9c877 100644
--- a/dev-java/httpcomponents-client/Manifest
+++ b/dev-java/httpcomponents-client/Manifest
@@ -1,3 +1,3 @@
 DIST httpcomponents-client-4.5.13-src.tar.gz 824131 BLAKE2B 1507c81749a92afcf8b170b606761236d71b02d8b8b257d753a0f09abbdc297057df39661e827dee52804a2138de7d201b2a837418cbec21085fd3ffd558b51c SHA512 421e413fb2206fa95b6428ff067cdf2b440d2d3d4503cc3ca9bcf70ccd8ed1b8273ec4fe0703e6a8cd7612940b7ed966d9f163dbfeb8bf699ae2a8b2e0866d05
-EBUILD httpcomponents-client-4.5.13-r1.ebuild 2234 BLAKE2B 193917142633805b8663f25a95b103ebe7fd498fd640cf51e5e70828786e92dcb7d6e3f4da100cd0485dca2f57bc78dc4ef0668e7d44d1485c907313f9d8ced1 SHA512 137bca4b83f20d955b4c0c90edd2ab4896c3a10c8d22db9d082246479400a1429f2d4d2dcc8fa96568e33d6386241e3e45e4a4c21b63d84ac257052749c3fd90
+EBUILD httpcomponents-client-4.5.13-r1.ebuild 2233 BLAKE2B 88901103428958896b76bf6e18122742a6ab0151ddeed41b5c68e88efe8d5cb3c498a5d602f7f7aac1e5936ff7bf612be9fc1d478411d31db5334a56430c5133 SHA512 13d999d5d34e82f97d0fc3bfc85ce0e67b18614e31d2be1a1c38f815fcbe673553c8fd47cd6ec743a52737b8a77e0bd64abcdf448a98ca6b7b88bb79e5a25f3d
 MISC metadata.xml 310 BLAKE2B b068de1d99141665479706b2ee3af6195a1eb34cb7a063d2dd51434b4a5c6bbff26a06c94436fd352fd079cfa9ac6a9364cbf379991e803d771c04bdb9e12294 SHA512 26ec17ca1d7ccc803139a9f17dc51ef9cdf8e0bc697f0442c1718dd1807460add3d0560cd8f10ba2234f8e32990b922428b5903c0acfcd7d5e815dc9ba11280d
diff --git a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild
index 38274be97d07..5c35d1fb5ad7 100644
--- a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild
+++ b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: httpcomponents-client-${PV}/httpclient/pom.xml
diff --git a/dev-java/httpcore/Manifest b/dev-java/httpcore/Manifest
index c5a64cc37d6b..ef99a24ff059 100644
--- a/dev-java/httpcore/Manifest
+++ b/dev-java/httpcore/Manifest
@@ -1,3 +1,3 @@
 DIST httpcomponents-core-4.4.14-src.tar.gz 591869 BLAKE2B d6f4900d8781cf7189edb2dfa9c1157b02584e8c66cde02dc261b0e29cdfb971e0323ce4478966b8e125df475ab1014fbee5b4bdf411eb118647f47f95c8f1a7 SHA512 9c713c7ea4e966a35ed391bc2a3aa10a0963cd21978c028dbd0790c9c2a6592385c7b2f135ea2836e6c495d9faea1bdcc65aa994bd5548bc2d84db38d5dbb713
-EBUILD httpcore-4.4.14.ebuild 1601 BLAKE2B 385c593a8ae32fdcb2e01482e5cb7b3fd9709cc99bd8702e0233006a127a3f0ce26b9f5624a1b9f04726b0d93ae4c6a403ad433ce9f3f619947686f7add35991 SHA512 d7d15735c8a3a0cb7f8991fc9f9bee6f3c80a362937f3e4503de81416bd16acb452ad00e47f2246054afd1e8048483e0a339938396439bc0a6d2c84f93a8ac15
+EBUILD httpcore-4.4.14.ebuild 1600 BLAKE2B cad4226f5c1ab642d186a2d417777ed4c6f45493003935f7a079f9b8988fa7d4e43cde09309b73f36654153fd589f323c55553665954ad4e984a3eeb886b7fad SHA512 647aed390f7f09f3efd5c203bb02aabe6e28f8a0f46788b295847cdd3393bd84802601e7a5dbf9a8714367e5900e96a6773e22aaf74e2bb8eef1ed9ce35a8f01
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild
index 016fad82327b..ff51d1ba0fdb 100644
--- a/dev-java/httpcore/httpcore-4.4.14.ebuild
+++ b/dev-java/httpcore/httpcore-4.4.14.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: httpcore/pom.xml
diff --git a/dev-java/jackrabbit-webdav/Manifest b/dev-java/jackrabbit-webdav/Manifest
index 1a6f079e78ca..bba689b3fcff 100644
--- a/dev-java/jackrabbit-webdav/Manifest
+++ b/dev-java/jackrabbit-webdav/Manifest
@@ -1,6 +1,5 @@
 DIST jackrabbit-2.10.1-src.zip 13437021 BLAKE2B 3542bbe5f7c8ab8feb585fecdaca028a4908eb664d01cb9fb32156c71756973671969b1141e796fbc165f7f6f305db25f74d36657e4d86dac6766e4d79b888dd SHA512 c371ff941054f3a916f43f7020f0aebd8146422835a75ab2ad9f9f716c4ef0a94b3b962f9b6e4fadef87b9e82e8143b4ece27280714a4eb71a6b0a38c47d48e9
 DIST jackrabbit-2.21.7-src.zip 13532529 BLAKE2B ea3ebf687e29b58e75840d6f5665da8abcb474dbaa353c0caf6a8d1cb1de6c6347830cbe0b6c91259fd496eeff834278874b64306da85a7e0c82ab71dd0b1c34 SHA512 254e151ed7e814ff8b4df985814ace12316a9dc56e87f4ba6236986ac2364936d3b15327f50ebc1b9fa7ac9bbed067924148436cc8ac31a7ef91d11faecb4678
 EBUILD jackrabbit-webdav-2.10.1-r2.ebuild 1336 BLAKE2B 29fe4d5a86ec6cbd57037c32cd5dcad29df07d323b7805d373671cfffefaea588cea0d1ca37e166acf9db4d085dff0d11c61b6f8ef15075ddd293cda28aee5a1 SHA512 d64d1b4c323cdc147cc5dc171f06bf674a6fb5035147936177698f63c2ed401d3b53e0d96222aa5a34b724af16fa9732c7d786736c73318b227a64db9033b180
-EBUILD jackrabbit-webdav-2.21.7-r1.ebuild 2088 BLAKE2B 594b7ea4a6088bc044e1cc1c344c6b638ee7387acbfe76a4b4eba0258ad7b763c729dcafbca1fbe6811a66f87afd1f88ceccb93eae342d7956a4c0b2fe233bea SHA512 865f14061d7d22b1c64e6b581a38ce967c355ab710f12f049d907fcdbdceb87a10e8082b6a6d873684c7366ef62bba1e9156322347189f2a91eda79a2bc3762d
-EBUILD jackrabbit-webdav-2.21.7.ebuild 2082 BLAKE2B 87576a5edaa1ee1a2ba080d5e97663e468425e2be50bae6816eb8a3096f40272541625b805d8d181dd9cdab4101245bd9123cf2ba5c514879fd9ee973e4655d9 SHA512 f6122353276b1f8ef8b754dea98b09dc01b9cf5ddac97c996b2da31dc54329b256972fc29a0cb6534dfb7313d7236b56543b0e3aa0ddd9774ca5042f06a9f2c6
+EBUILD jackrabbit-webdav-2.21.7-r1.ebuild 2087 BLAKE2B 2c4e2a95ab3790d7898312e98b25807d5450537838148208d515514d0ad7ea9b1bb40828f1bc1736494d21dbd1235a0501729ab0cada996db52ce46b852d26cd SHA512 fd00e1cd75320d94d29131f0f405a2df1da981965fdbf161cb49a13ee317133737b18a5375490dcec0a0afce74c554aa2a09854bc8be4563a2321b4de0e5ab27
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
index e0f65097e26b..ab072c3b1bd9 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/jackrabbit/${PV}/jackrabbit-${PV}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild
deleted file mode 100644
index 76bd9541226d..000000000000
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild
+++ /dev/null
@@ -1,63 +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://ftp.halifax.rwth-aachen.de/gentoo/distfiles/3b/jackrabbit-2.21.7-src.zip --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jackrabbit-webdav-2.21.7.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.jackrabbit:jackrabbit-webdav:2.21.7"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Generic WebDAV Library"
-HOMEPAGE="http://jackrabbit.apache.org/jackrabbit-webdav/"
-SRC_URI="mirror://apache/jackrabbit/${PV}/jackrabbit-${PV}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# org.apache.httpcomponents:httpclient:4.5.13 -> >=dev-java/commons-httpclient-4.5.13:4
-# org.apache.httpcomponents:httpcore:4.4.14 -> >=dev-java/httpcore-4.4.14:0
-# org.slf4j:jcl-over-slf4j:1.7.30 -> !!!artifactId-not-found!!!
-# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
-
-CDEPEND="
-	dev-java/commons-httpclient:4
-	dev-java/httpcore:0
-	dev-java/osgi-annotation-versioning:0
-	dev-java/slf4j-api:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# javax.servlet:javax.servlet-api:3.1.0 -> !!!groupId-not-found!!!
-# org.osgi:org.osgi.annotation:6.0.0 -> !!!groupId-not-found!!!
-# POM: pom.xml
-# test? ch.qos.logback:logback-classic:1.2.3 -> !!!groupId-not-found!!!
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*
-	dev-java/osgi-annotation-versioning:0
-	java-virtuals/servlet-api:3.1"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/jackrabbit-${PV}/${PN}"
-
-JAVA_GENTOO_CLASSPATH="commons-httpclient-4,httpcore,osgi-annotation-versioning,servlet-api-3.1,slf4j-api"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS=( "src/main/resources" "src/main/appended-resources" )
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
diff --git a/dev-java/jackson-annotations/Manifest b/dev-java/jackson-annotations/Manifest
index 8aaadf739044..ae6216cc85ca 100644
--- a/dev-java/jackson-annotations/Manifest
+++ b/dev-java/jackson-annotations/Manifest
@@ -1,3 +1,5 @@
 DIST jackson-annotations-2.13.0.tar.gz 1819614 BLAKE2B edb0a0e7586033a61722fda22bbb13f1ed119bd6af63931572396a4ee3f19f66fb20d750742b53d68a4159d11863b612d8e802b42b0359d90700dc6c03c8793e SHA512 e24fd9dfd6b7e3a7ee37cd41c30a073ec9b2d64dacfa47f7418643615b0ed145f8b1ac3e889b0f411412b74661b36ed352d89a62edebc8f2e07aeeed5d283c2f
+DIST jackson-annotations-2.13.2.tar.gz 1983139 BLAKE2B 511f62548ad3daa4aad265502e5c5e63cf3d60186b96f96ab2ebb3a904a8cca9e5eadfa31ac2fee1a8ce62c7ba51b4a722e9e46c9bbc390291048b0a852b8f30 SHA512 b024b5bff985a6104a122c58735249f3c3fa8e9ddb678283d876ff3750b72872bac13258456cca18828cda65e03eee85a9ef816f924fdbbec211fd03c7652439
 EBUILD jackson-annotations-2.13.0.ebuild 1431 BLAKE2B 2274e9b3b19c510f1b4a0187b5453ce8eb00558cc8196ac71de6336218558b0e778ba96a042b7aff0fe4736efffd93b7252f799aede9af53e89bd3a4d6ccdcfd SHA512 a487c150a3c9df585feba859a2b8aa536fbeb811ae3493807859ffa8269a44e50ce3c5cef45b2e592b857a3c04607516e17229d242cd119582b878be3c5453ad
+EBUILD jackson-annotations-2.13.2.ebuild 1407 BLAKE2B 73fe35236313888fc1718292a253dcf0a410af0508783677de0d6fc492972cdb53e697ccb9de17d41e8da5b154d20985dea8875bda96d5801294dc0bca67854d SHA512 2b18010014ef9368cf3f4cbef9d1669db433a44790b39198ab88404cb5c06815f1f6c4ce8bcf062e0ef095e1fb71150a04b3f1fbd8a2a513e6be488b80d55b68
 MISC metadata.xml 341 BLAKE2B 1a6bf9fc13afb0c6d95cb0752f40474fff4135031e2771f3c0555cd7961e23ea7c026d6cf905acb505ceb2aa4fad01ea5dfac310004b51828b1383dd9a44f9bb SHA512 51655fad0847b2bbc92ed31310c155f26edf6dc41da35cbe239c99eea205a054f6bf7a7839201b8f8fb397110b50935d7c069f3baa7650970580a0c9ef156f12
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild
new file mode 100644
index 000000000000..81ea0df6638c
--- /dev/null
+++ b/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild
@@ -0,0 +1,43 @@
+# 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/FasterXML/jackson-annotations/archive/jackson-annotations-2.13.2.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-annotations-2.13.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.jackson.core:jackson-annotations:2.13.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Core annotations used for value types, used by Jackson data binding package."
+HOMEPAGE="https://github.com/FasterXML/jackson-annotations"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( README.md release-notes/VERSION-2.x )
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_EXCLUDES=(
+	# 1) warning(junit.framework.TestSuite$1)
+	# junit.framework.AssertionFailedError: No tests found in com.fasterxml.jackson.annotation.TestBase
+	com.fasterxml.jackson.annotation.TestBase
+)
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jackson-core/Manifest b/dev-java/jackson-core/Manifest
index 39a28d2f50f9..8f34301c6f9a 100644
--- a/dev-java/jackson-core/Manifest
+++ b/dev-java/jackson-core/Manifest
@@ -1,3 +1,5 @@
 DIST jackson-core-2.13.0.tar.gz 11437457 BLAKE2B d4629f7a5c497bb837369050564ed91b9520290c2355a3fe20939c6211112c552b8e2db5dfc8bd9965ec17df8194191368189dcb425e3f9a5ad60a08c3a2b900 SHA512 b3d50849f0912252cbdde77de05a1c9836d044f48c50c4a4992e7b207d1f83ea9580df2bf843d9cb1c50008a808525ca82dd22d8dfa192fa394f8a923ee274a3
+DIST jackson-core-2.13.2.tar.gz 12267420 BLAKE2B 4acaef320fbd08bd3d3ae835eb4a96771b1f25aade7433e4c87beac0f6e365e641eea8c70ed7d3884159bd6990286b80891b57ac967ee292ee639cb2b56b66e1 SHA512 8e424ea255a6cd78c550300b0ff18d5e63945a3608dab2803211da2df5eb99fbd249779b2d051569b421c393e073d88a21b01c02a25b9647bcc8545f2d8cc1ee
 EBUILD jackson-core-2.13.0.ebuild 2215 BLAKE2B 7783e6a6f574c54427fad6d256b652394170e5587a6dc2b8c7a358ead90f2b1db94a63af228d0e612ac9e3461e37d85560b6d1ebcb921b5ee3878fce4a25114b SHA512 a133ad7be357b05af753ee228f4978d26535af30c1d58179eba48a4567fc7ef04f10e0cb18e8c3d60ef1d4385231323dbbdfa7a3572e7e2742ad03f5298c92fd
+EBUILD jackson-core-2.13.2.ebuild 2090 BLAKE2B aa21495f81271773550a6e9e31ca4d483f3f1d0822e4f4db5df2d276e8be1f12aeaa945808d0978b7886ffbab053cc9dbcbde042a300d531ed7eaad819056635 SHA512 ead02b325acbc966a669065f2afbc2f7fbc0b7f9a80730b0fb9c5f7ce7d110a8844f12a90bc0e882a9a7016e255da728a73bfda69eb96a8d4e56fbe30998a47e
 MISC metadata.xml 312 BLAKE2B b1beb51833c35e3ab2191a3c722768a34ec6cbf3ee240d67381b5137aabc0bb8be862f32638f35c1ba84a75498bb66303223c1d43b7d48c8bfe143ee837d6338 SHA512 b85d17092438f67523cf8c3c861de1183e061f55620342239bd662e5e90058f82fb501ba24bf2c1de6ebbe512ae4559d4b746a575261cbf2feb142e120118372
diff --git a/dev-java/jackson-core/jackson-core-2.13.2.ebuild b/dev-java/jackson-core/jackson-core-2.13.2.ebuild
new file mode 100644
index 000000000000..89cdf79b4682
--- /dev/null
+++ b/dev-java/jackson-core/jackson-core-2.13.2.ebuild
@@ -0,0 +1,69 @@
+# 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/FasterXML/jackson-core/archive/jackson-core-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-core-2.13.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.jackson.core:jackson-core:2.13.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Core Jackson processing abstractions (Streaming API), implementation for JSON"
+HOMEPAGE="https://github.com/FasterXML/jackson-core"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( README.md release-notes/{CREDITS-2.x,VERSION-2.x} )
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+	default
+
+	sed -e 's:@package@:com.fasterxml.jackson.core.json:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
+		-e 's:@projectartifactid@:jackson-core:g' \
+		"${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java" || die
+
+	java-pkg-2_src_prepare
+}
+
+src_test() {
+	pushd src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * -name "*Test*.java" \
+			! -wholename "**/failing**/*.java" \
+			! -wholename "**/testsupport**/*.java" \
+			! -wholename "perf**/*.java" \
+			! -name "*TestBase.java" \
+			! -name "*BaseTest.java" \
+			)
+	popd
+
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jackson-databind/Manifest b/dev-java/jackson-databind/Manifest
index 942b607b0e94..662489fd8241 100644
--- a/dev-java/jackson-databind/Manifest
+++ b/dev-java/jackson-databind/Manifest
@@ -1,3 +1,5 @@
 DIST jackson-databind-2.13.0.tar.gz 44195827 BLAKE2B f623840b21ba149510d81722ef5aa94dcc99fadc18954427340db2c411e90db53d1507789e79048d4bc84f56786202a4ad741a30bf904863a974939e038e7bb8 SHA512 f76a0b0b940f297d65c6bcf9ba3e6f276294f5ef70fe1c5b1dddab826ef9b49ef195fa0115d422906925e32ced1002c7e02991106e8cf196f48db49b67e39067
+DIST jackson-databind-2.13.2.tar.gz 48047657 BLAKE2B 9efb9004d983613b4b0f9a3242d7c0a8610eaac868beff1b5343c268b9381a86c22176d2bbe847fba121f9f928f87838fc7e05bd34955ea3f811ed02a8547e5f SHA512 d15167e1a5a19a9aea369123faca3e7dd5b27a9a3cfa2f76c871967ec7b4331f1d5a266cf6084e94dafe00971abcbf17d01c6e3b91cae0b4a298769dac05f486
 EBUILD jackson-databind-2.13.0.ebuild 2695 BLAKE2B 3d00beae87e25831f3fe9368787d5e75fd2e6e0667fe207f6cbf147c708323f04d87a8c903184dbd6546c8b59199804d4c36aaad854f8ff72f031f61a8f0096a SHA512 52fc3cd41f28027943ed90ba042456912328d8c86f43c891166574fd178922cf87da72bcef14003aa774a362cdf4d18d28b784bf1e84d121b5b8b36e57b8a90d
+EBUILD jackson-databind-2.13.2.ebuild 2682 BLAKE2B 328cd9f477c207a144bdef1a48c30fb6e8a766ba49e9b45fd5b2b8a895104bc01e04517619589d8138c1bdca225c2ae6271a571035da5b20df93b8ad0d0db1e0 SHA512 ab35f717787512ef382547f190f4d3f6376cb39411d64558f1b6317dd61c452d836b79b161ba56e6b97c8c12dc652fa2ce8951903ab07980ef0545d6e592832d
 MISC metadata.xml 316 BLAKE2B 06c857b21b1c39450aefd3a56ee67e0a9c57ce28f434e0af285397bf9c0a73801983b71415c1dd3ee1b53e9b1bf855d81b204559ccfe5bda7cf0703975a8420e SHA512 3308a8e0872865b0da8c3c5720364f786764d6cb751b6ad465dc450338b8c3f672b8266ab957a27609363d507b7f711ccb0edb921388a8f50cba73424fc85253
diff --git a/dev-java/jackson-databind/jackson-databind-2.13.2.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.2.ebuild
new file mode 100644
index 000000000000..af5adb449b65
--- /dev/null
+++ b/dev-java/jackson-databind/jackson-databind-2.13.2.ebuild
@@ -0,0 +1,83 @@
+# 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/FasterXML/jackson-databind/archive/jackson-databind-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-databind-2.13.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.jackson.core:jackson-databind:2.13.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="General data-binding functionality for Jackson: works on core streaming API"
+HOMEPAGE="https://github.com/FasterXML/jackson-databind"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Dependencies like powermock-{core,module-junit4,api-mockito2} are not available in ::gentoo
+RESTRICT="test"
+
+# Common dependencies
+# POM: pom.xml
+# com.fasterxml.jackson.core:jackson-annotations:2.13.2 -> >=dev-java/jackson-annotations-2.13.2:2
+# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
+
+CP_DEPEND="
+	~dev-java/jackson-annotations-2.13.2:2
+	~dev-java/jackson-core-2.13.2:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? javax.measure:jsr-275:0.9.1 -> !!!groupId-not-found!!!
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+# test? org.powermock:powermock-api-mockito2:2.0.0 -> !!!groupId-not-found!!!
+# test? org.powermock:powermock-core:2.0.0 -> !!!groupId-not-found!!!
+# test? org.powermock:powermock-module-junit4:2.0.0 -> !!!groupId-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+#	test? (
+#		!!!groupId-not-found!!!
+#	)
+#"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION}-2.x )
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+#	JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,junit-4,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+#	JAVA_TEST_SRC_DIR="src/test/java"
+#	JAVA_TEST_RESOURCE_DIRS=(
+#		"src/test/resources"
+#	)
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	sed -e 's:@package@:com.fasterxml.jackson.databind.cfg:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
+		-e "s:@projectartifactid@:${PN}:g" \
+		"${JAVA_SRC_DIR}/com/fasterxml/jackson/databind/cfg/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/databind/cfg/PackageVersion.java" || die
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
index 4e7caa520468..adb884245636 100644
--- a/dev-java/jackson-dataformat-xml/Manifest
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -1,3 +1,5 @@
 DIST jackson-dataformat-xml-2.13.0.tar.gz 3009443 BLAKE2B eaad5101f74ba5fdc0b91bc1c2b1f6174e812a63aea43d64ae9626bd22f5623fd9fb8dcd98384124e6860ea60dec4f4bb25196bd0be21daa9cf71e59a3b0252b SHA512 ad8bff16efe62cd9b8a509bc6677f771cf8e8f76bf320b8a463fe4d63d533e2cf7e3d9eda8c665c32383cf70b790f0847ea5e63a0cfcad5d4ea6918db21d6573
+DIST jackson-dataformat-xml-2.13.2.tar.gz 3201222 BLAKE2B c4db7ae5f3f3fc41bb3890337cc2cf6f1fe4dd65e96bff336d0c21e19758ca797497affbd189b731518a164fa8ad7f40c07e1c64ab3250ac438f1d4bf122a6ce SHA512 048550c465a83e0e5b72313d601eace9d817572a7d331d37ac48af51d5e0ef8d52cccadb1412c27d4ebd28b222b7707a0bfba114e10168d233e4c4e9f8d2fd1f
 EBUILD jackson-dataformat-xml-2.13.0.ebuild 4705 BLAKE2B 3b16243ca8f8d96a2e14c94ec3f8daa120625f6d0e156e9a04e7fb1a4c3b22d12db77be74d7863c6beda7c89a33b9ee328f4dcecf998bf28a5d8c570b4c9c50a SHA512 c930c58cae4b92976d92d55283aa2ddc0e4bd70bd0ff53fd2193ba777bd860dc225f293fcd70f1c143cdaf4b42d6577e80fb075170aa446952c70ee1aff8ee96
+EBUILD jackson-dataformat-xml-2.13.2.ebuild 3886 BLAKE2B 572a75237c482576dfbc22fb07c0d160e2cdcc5044d75d4db7f5fc0551164748a8ba6409774a98361c1e647b0f37cea26d5d7b34160d543a4e9873058130f1a5 SHA512 d0f8ba906fefdd3cbe2695cd56a0c0be1cb6752b4e257bb534fb5c2bdec8118fc1450568f8233e26b02a991bf8d1b50d23ab1182a037bb613d1561d36be93148
 MISC metadata.xml 487 BLAKE2B 0e5e73be66b890aab37fce8ccd162c168c7cff415c418a30f5cdcc76624499633abfd366f86ece75de208b981a03364566659e37c2b3a34ad90a01f3577a707a SHA512 b920c1d3b8d8f6023df6c100ba4b36282c7cbfdad4a4690055d70cd3dac8d0da91f236a38565bee798342dd94c49cf2c9ce125282a7e5fd818321e28d288b3f1
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2.ebuild
new file mode 100644
index 000000000000..96988a0eca88
--- /dev/null
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2.ebuild
@@ -0,0 +1,110 @@
+# 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/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-xml-2.13.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Data format extension for Jackson"
+HOMEPAGE="https://github.com/FasterXML/jackson-dataformat-xml"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.fasterxml.jackson.core:jackson-annotations:2.13.2 -> >=dev-java/jackson-annotations-2.13.2:2
+# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.2 -> >=dev-java/jackson-databind-2.13.2:0
+# com.fasterxml.woodstox:woodstox-core:6.2.7 -> >=dev-java/woodstox-core-6.2.7:0
+# org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0
+
+CP_DEPEND="
+	~dev-java/jackson-annotations-${PV}:2
+	~dev-java/jackson-core-${PV}:0
+	~dev-java/jackson-databind-${PV}:0
+	dev-java/stax2-api:0
+	dev-java/woodstox-core:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.2 -> >=dev-java/jackson-module-jakarta-xmlbind-2.13.2:0
+# test? com.sun.xml.stream:sjsxp:1.0.2 -> >=dev-java/sjsxp-1.0.2:0
+# test? jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		~dev-java/jackson-module-jakarta-xmlbind-${PV}:0
+		dev-java/jaxb-api:3
+		dev-java/sjsxp:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( README.md release-notes/{CREDITS,VERSION}-2.x )
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="jackson-module-jakarta-xmlbind,sjsxp,jaxb-api-3,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	sed -e 's:@package@:com.fasterxml.jackson.dataformat.xml:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
+		-e "s:@projectartifactid@:${PN}:g" \
+		"${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java" || die
+}
+
+src_test() {
+	pushd src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * -name "*Test*.java" \
+			! -wholename "**/failing**/*.java" \
+			! -name "*TestBase.java" )
+	popd
+
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+
+	# The same failure under openjdk-17 occurs upstream (running 'mvn test')
+
+	# 1) testCollection(com.fasterxml.jackson.dataformat.xml.lists.ListAsObjectTest)
+	# com.fasterxml.jackson.databind.exc.InvalidDefinitionException: Failed to call `setAccess()` on Field 'first' due to
+	# `java.lang.reflect.InaccessibleObjectException`, problem: Unable to make field transient java.util.LinkedList$Node
+	# java.util.LinkedList.first accessible: module java.base does not "opens java.util" to unnamed module @42bb2aee
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge "17" ; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
+	fi
+
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jackson-dataformat-yaml/Manifest b/dev-java/jackson-dataformat-yaml/Manifest
index 7bd9e9f8f183..1f0557ef29be 100644
--- a/dev-java/jackson-dataformat-yaml/Manifest
+++ b/dev-java/jackson-dataformat-yaml/Manifest
@@ -1,3 +1,5 @@
 DIST jackson-dataformat-yaml-2.13.0.tar.gz 3125487 BLAKE2B 84ad1a6c041df324be312161b944435063c11c4e572532d3b0a50a207ad4babff59d90aad112e9d46f2c35f6be4732e3e2d8426e42f3bccb1dfcbe4c083056b4 SHA512 9dc9a683f5cc943711221ac1a4ec862681ae49c8003f08a4a29f15ff77893de3936b37e28fadc433db5a9f498fb70c78eaa4dc0fc6b0875d773999c78f74365a
+DIST jackson-dataformats-text-2.13.2.tar.gz 3528945 BLAKE2B 5dc38706b714121478e82b2f4bc0b3831fa84708b708c08c20d4744c4fc7130149d8dace5c20437514ce9431b1c39183f4d283717f4ad5876fac3651c53ea096 SHA512 1101aabc4b3b652ff90c23186fada6391db9cb4cb5ec6ba9ff78cd91b73ef3b632f38027e192d739d8e47f7ed2726ac03d8c3a1d20d416dfaac3b50ca11abb67
 EBUILD jackson-dataformat-yaml-2.13.0.ebuild 2726 BLAKE2B 835171fa0cbb9f2b1a554cf465e9c62a79429202cae8e7fc8a5c4a3c8035fe3ae1e9ce6d0c2dfdf7d9bc7ee5a4f28b1bb724bd3a7dbc75588287f66c2a11579e SHA512 ea0587ee2732acdf3dfd11d6c7ec66dd1d678e1a568b73034fd7183788400c531437cf8a20722fa0942ff4d409d4e81ad736eb2aa82f28c9c28ab9f703e89110
+EBUILD jackson-dataformat-yaml-2.13.2.ebuild 2667 BLAKE2B ecf5bac5e9404462818cb1b89166ae439e2ae9ae645335f7271d43db2766d5642bccecaa6e40d16846a5b4be146e2ee1bb2c59741633369c572fb78b7d43f3a9 SHA512 cc55652f04adba9146d5a6b8023d018bdfd34cbea4d6a4cf4f3c0810e6bb48dd7daa66bf8a52d665a933fe270951a80c4a4d9365abdf451b0378292da4238902
 MISC metadata.xml 342 BLAKE2B 4d57f5b5bc0e926e2c359501044c45f3c8223639349286adf9e979cc0cf2bc02070999b1fae29b1da8e14b0348a0aa95dac24006b138f7a60fb7d2d9127fea1f SHA512 7ec10474b90f26e90dfd0d4039901582620a8f84d1a859283522c14aac5a11677d624a3cb773245add8d9fb5704ae94f8a825e68cd4299bf93d4678894561742
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild
new file mode 100644
index 000000000000..c444dc69b4f7
--- /dev/null
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild
@@ -0,0 +1,79 @@
+# 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/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-yaml-2.13.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Support for reading and writing YAML-encoded data via Jackson abstractions"
+HOMEPAGE="https://github.com/FasterXML/jackson-dataformats-text"
+SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.2 -> >=dev-java/jackson-databind-2.13.2:0
+# org.yaml:snakeyaml:1.30 -> >=dev-java/snakeyaml-1.30:0
+
+CP_DEPEND="
+	~dev-java/jackson-core-${PV}:0
+	~dev-java/jackson-databind-${PV}:0
+	dev-java/snakeyaml:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( README.md release-notes/{CREDITS,VERSION} )
+
+S="${WORKDIR}/jackson-dataformats-text-jackson-dataformats-text-${PV}/yaml"
+
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_EXCLUDES=(
+	# Upstream's usual exclude pattern: "**/failing**/*.java"
+	com.fasterxml.jackson.dataformat.yaml.failing.ObjectIdWithTree2Test
+	com.fasterxml.jackson.dataformat.yaml.failing.PolymorphicWithObjectId25Test
+	com.fasterxml.jackson.dataformat.yaml.failing.SimpleGeneration215Test
+)
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+
+	sed -e 's:@package@:com.fasterxml.jackson.dataformat.yaml:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
+		-e "s:@projectartifactid@:${PN}:g" \
+		"${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java" || die
+
+	# dev-java/snakeyaml-1.30 does not provide module-info
+	sed -e '/snakeyaml;/d' -i src/moditect/module-info.java || die
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jackson-module-jakarta-xmlbind/Manifest b/dev-java/jackson-module-jakarta-xmlbind/Manifest
index 221b7918dde8..79ebdca3dd81 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/Manifest
+++ b/dev-java/jackson-module-jakarta-xmlbind/Manifest
@@ -1,3 +1,5 @@
 DIST jackson-module-jakarta-xmlbind-2.13.0.tar.gz 1841327 BLAKE2B 41b4f92979274265901fb5facd16169ee38d792f8cbd38fbadecb7cd9cdc836b0b42b3cc5a7372af92c77cb5a08ac8d33a9c9c51b6e499ad3dbb8b1dc204a406 SHA512 6c076eaaf7713ed82d60bb48492747bcdd09d8eedf73aae521b446cc5944ce3c2d01ce942f00cab85a1139b5383afc78142aab32093fc9b8e8bf5b743534d2a4
+DIST jackson-module-jakarta-xmlbind-2.13.2.tar.gz 2146359 BLAKE2B 242d148b1945745f2578a751cf7aec7764000e3400fbc63d9c4b5b9ee029c77868b97590c922c3900e8b3800271176099d4928f3d63936c6b9e5e2326321616b SHA512 ea8d6a230f736cc0429e8d9a8883609074dc7e723bb01bdecbb49a665fc8f879b3f2da906c1d9816d6675a38479943a8b5e6fa1b67d495bbf882262808bce10b
 EBUILD jackson-module-jakarta-xmlbind-2.13.0.ebuild 3120 BLAKE2B a34ddf77f92c3fed0c3bba60cc6980cdd051faaf1cc61a76bf7701774b2894c90e05d0650ee9967b40298b82f4a3a7f69c4922c017037e50cc87c87214d758e3 SHA512 4960fd3b384ae104c540136dfec05e5daeabee250a73f3608f2f27345456bc7f1a28a2b244a85c7f4e400e8d742d527f425532146932e0430c51c76a40e75fb6
+EBUILD jackson-module-jakarta-xmlbind-2.13.2.ebuild 2796 BLAKE2B 52af590cdb6d8e379588dae413ac2ff1bc6ed16d65567cca4a6ba8d6bf665514f2bae3b36678fc089c660d4cd7ce3200953c12485170d66179522bc2ea7158d4 SHA512 d619aee9e10759f19a77d9b3560767bea3db164dd366ff42bffb9fb6cd53e62902d8826207e7ed757326164fad0aeb18361561ce7596a6e7556e8c84d37bddac
 MISC metadata.xml 506 BLAKE2B 4e62bddea5ad8f7e6b73de9a173dbc8416b309caf4e4f9801496712f1cc88bdab646d237e48c3f55c99d95c198056b6642cf19070805f694b3a8e996e9bd0528 SHA512 96825b1a8ec0808f4dfa4a2482a1c184acab23d624ab178be8df496c67ff3ca5cd7cf012e6e7017721a3355a6ff3265d6f76734a655bfb261d3530781825f5d5
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild
new file mode 100644
index 000000000000..642e074deac8
--- /dev/null
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild
@@ -0,0 +1,83 @@
+# 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/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-module-jakarta-xmlbind-2.13.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Support for using Jakarta XML Bind (aka JAXB 3.0) annotations"
+HOMEPAGE="https://github.com/FasterXML/jackson-modules-base"
+SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# We don't have jaxb-runtime:3.0.1
+RESTRICT="test"
+
+# Common dependencies
+# POM: pom.xml
+# com.fasterxml.jackson.core:jackson-annotations:2.13.2 -> >=dev-java/jackson-annotations-2.13.2:2
+# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.2 -> >=dev-java/jackson-databind-2.13.2:0
+# com.sun.activation:jakarta.activation:2.0.1 -> >=dev-java/jakarta-activation-2.0.1:2
+# jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3
+
+CP_DEPEND="
+	~dev-java/jackson-annotations-${PV}:2
+	~dev-java/jackson-core-${PV}:0
+	~dev-java/jackson-databind-${PV}:0
+	dev-java/jakarta-activation-api:1
+	dev-java/jaxb-api:3
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+# test? org.glassfish.jaxb:jaxb-runtime:3.0.1 -> !!!groupId-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+#	test? (
+#		!!!groupId-not-found!!!
+#	)
+#"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( ../README.md )
+
+S="${WORKDIR}/jackson-modules-base-jackson-modules-base-${PV}/jakarta-xmlbind/"
+
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+# JAVA_TEST_GENTOO_CLASSPATH="junit-4,!!!groupId-not-found!!!"
+# JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	sed -e 's:@package@:com.fasterxml.jackson.module.jakarta.xmlbind:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.module:g' \
+		-e "s:@projectartifactid@:jackson-module-jakarta-xmlbind-annotations:g" \
+		"${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jakarta/xmlbind/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jakarta/xmlbind/PackageVersion.java" || die
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/log4j-12-api/Manifest b/dev-java/log4j-12-api/Manifest
index 915502beb967..be1cfaa6103b 100644
--- a/dev-java/log4j-12-api/Manifest
+++ b/dev-java/log4j-12-api/Manifest
@@ -1,3 +1,5 @@
 DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
+DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
 EBUILD log4j-12-api-2.17.1.ebuild 3114 BLAKE2B 7562325f5e69a7214ba566703a02a25e68711c97586d86bc9890a7130ae7c866c593cc57bfe17b7054a71a195fcd24749a5ed4b0a6bff25bd10bbd67e4e9d47f SHA512 b3132797dd6e578b5c560a97181b7ed4793564067d4164315eb537f417a195c36b64c3ad571d90e665ccf85e97ca79f172480533f048851c2ea84bb64a1d3fb4
+EBUILD log4j-12-api-2.17.2.ebuild 3245 BLAKE2B 89db0cdfbb308eabb2d516ae8cc2ab5daa03db1fd2907cf845dc3d07e90688595a6d9ef200a9034335642f1b93ced5c0b7773649a289fe9f01ffcf205a0a6b3b SHA512 52fe2d2c24d09f8f071276bd071600d19fc9a80f2094e159bd3822b737bd228e53d261844895fc3fe94898e03dc20fc1ba9ab56a8e7c24234500a5905e8c59f5
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-12-api/log4j-12-api-2.17.2.ebuild b/dev-java/log4j-12-api/log4j-12-api-2.17.2.ebuild
new file mode 100644
index 000000000000..d18971755058
--- /dev/null
+++ b/dev-java/log4j-12-api/log4j-12-api-2.17.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom log4j-1.2-api/pom.xml --download-uri mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-12-api-2.17.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.logging.log4j:log4j-1.2-api:2.17.2"
+JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Apache Log4j 1.x Compatibility API"
+HOMEPAGE="https://logging.apache.org/log4j/2.x/"
+SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# We don't have junit-vintage and junit-jupiter
+RESTRICT="test"
+
+# Common dependencies
+# POM: log4j-1.2-api/pom.xml
+# org.apache.logging.log4j:log4j-api:2.17.2 -> >=dev-java/log4j-api-2.17.2:2
+# org.apache.logging.log4j:log4j-core:2.17.2 -> >=dev-java/log4j-core-2.17.2:2
+
+CP_DEPEND="
+	~dev-java/log4j-api-${PV}:2
+	~dev-java/log4j-core-${PV}:2
+"
+
+# Compile dependencies
+# POM: log4j-1.2-api/pom.xml
+# org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.1.Final -> >=dev-java/jboss-jms-api-1.0.1:1.1
+# POM: log4j-1.2-api/pom.xml
+# test? com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.1 -> >=dev-java/jackson-dataformat-xml-2.13.2:0
+# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
+# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
+# test? org.apache.felix:org.apache.felix.framework:5.6.12 -> !!!groupId-not-found!!!
+# test? org.apache.logging.log4j:log4j-api:2.17.2 -> >=dev-java/log4j-api-2.17.2:2
+# test? org.apache.logging.log4j:log4j-core:2.17.2 -> >=dev-java/log4j-core-2.17.2:2
+# test? org.apache.velocity:velocity:1.7 -> !!!artifactId-not-found!!!
+# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
+# test? oro:oro:2.0.8 -> >=dev-java/jakarta-oro-2.0.8:2.0
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	dev-java/jboss-jms-api:1.1"
+#	test? (
+#		!!!artifactId-not-found!!!
+#		!!!groupId-not-found!!!
+#		>=dev-java/commons-io-2.11.0:1
+#		>=dev-java/jackson-dataformat-xml-2.13.0:0
+#		~dev-java/log4j-api-${PV}:2
+#		~dev-java/log4j-core-${PV}:2
+#	)
+#"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
+
+S="${WORKDIR}/apache-log4j-${PV}-src"
+
+JAVA_CLASSPATH_EXTRA="jboss-jms-api-1.1"
+JAVA_SRC_DIR="log4j-1.2-api/src/main/java"
+JAVA_RESOURCE_DIRS="log4j-1.2-api/src/main/resources"
+
+#	JAVA_TEST_GENTOO_CLASSPATH="jackson-dataformat-xml,commons-io-1,!!!groupId-not-found!!!,log4j-api-2,log4j-core-2,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+#	JAVA_TEST_SRC_DIR="log4j-1.2-api/src/test/java"
+#	JAVA_TEST_RESOURCE_DIRS=(
+#		"log4j-1.2-api/src/test/resources"
+#	)
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/log4j-api-java9/Manifest b/dev-java/log4j-api-java9/Manifest
index ec08e86283fa..4ea8478cae1a 100644
--- a/dev-java/log4j-api-java9/Manifest
+++ b/dev-java/log4j-api-java9/Manifest
@@ -1,3 +1,3 @@
 DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
-EBUILD log4j-api-java9-2.17.1.ebuild 1531 BLAKE2B b62af1c2ecfe9d66d8001db9f5082b32fc6a3cf50182e1434a50ab97e78313cc2f70118f93146fc1e031421a02375726c676cadb8f427ba8ce6048ff87667a16 SHA512 4ccab859e3b171a4eb25e19007e76c36a0e9338b8cf85bbafd67cc85f4dd3dac04f4211a5181306d9bbe22ad1fab558e234825571b98c9e222f0089b5bcfaa20
+EBUILD log4j-api-java9-2.17.1.ebuild 1530 BLAKE2B 1f4431b6bd4a290ed6b3ca5c46330e033594d99a4478c69af4185d9233e5ae3f32fd801db629c3d2d56f0b0c7efc967bebe9c7e992378e06fbeffdabfced4ee3 SHA512 b164c370986f16efa0e87104f636d2bb6f5cfa2434cc552618f385c89f37f3bbe72e8879f4083ac8b6992d63124fb4399d6bf4ff06a0778796ffe146c1ff7f00
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild b/dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild
index 428acb0e79bf..878a708b6dbb 100644
--- a/dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild
+++ b/dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 
 # junit-jupiter is not available in ::gentoo
 RESTRICT="test"
diff --git a/dev-java/log4j-api/Manifest b/dev-java/log4j-api/Manifest
index 57920f6243f5..354bd5b0a36a 100644
--- a/dev-java/log4j-api/Manifest
+++ b/dev-java/log4j-api/Manifest
@@ -1,3 +1,5 @@
 DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
+DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
 EBUILD log4j-api-2.17.1.ebuild 3342 BLAKE2B c3547005b8a23ed6bdf9414dcdf556d3a8f9894aefa0a6d918ffbde75da4ff1386ce8996281678593b0b931508612d45f2efdf3041e79d9c799b5648c84476c4 SHA512 881b89b9ee72ab0005fd75a2f9ef802bcc1e70e647ca378c6cf4f100d403b432c2125bf000ebbcbb79a0bcefcef6df810efa080da45c6bb2e9850a17075ee9aa
+EBUILD log4j-api-2.17.2.ebuild 2902 BLAKE2B 02cd5c720fe7eaf30a9e7b934173c436661616b1d105e06f1f0bbc6b625a03c07f24f30d2662306818635e0780565b7c157395568810daf5d9369ffa70470e74 SHA512 8c16c4aa1874590879170494c36c4346ad982fb59dcd775114f60978c1855548df7d4e104264be3aa17eb7dca8f85cbe29a903dc270959c63ef6e5bb7776a7ca
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-api/log4j-api-2.17.2.ebuild b/dev-java/log4j-api/log4j-api-2.17.2.ebuild
new file mode 100644
index 000000000000..5de77360899f
--- /dev/null
+++ b/dev-java/log4j-api/log4j-api-2.17.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom log4j-api/pom.xml --download-uri mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-2.17.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.logging.log4j:log4j-api:2.17.2"
+JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Apache Log4j API"
+HOMEPAGE="https://logging.apache.org/log4j/2.x/"
+SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# junit-{jupiter,vintage} is not available in ::gentoo
+RESTRICT="test"
+
+# Compile dependencies
+# POM: ${PN}/pom.xml
+# org.osgi:org.osgi.core:4.3.1 -> >=dev-java/osgi-core-api-5.0.0:0
+# POM: ${PN}/pom.xml
+# test? com.fasterxml.jackson.core:jackson-core:2.13.1 -> >=dev-java/jackson-core-2.13.2:0
+# test? com.fasterxml.jackson.core:jackson-databind:2.13.1 -> >=dev-java/jackson-databind-2.13.2:0
+# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
+# test? org.apache.felix:org.apache.felix.framework:5.6.12 -> !!!groupId-not-found!!!
+# test? org.apache.maven:maven-core:3.8.4 -> !!!groupId-not-found!!!
+# test? org.assertj:assertj-core:3.22.0 -> !!!suitable-mavenVersion-not-found!!!
+# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-migrationsupport:5.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
+
+DEPEND=">=virtual/jdk-1.8:*
+	dev-java/osgi-core-api:0"
+#	test? (
+#		!!!groupId-not-found!!!
+#		!!!suitable-mavenVersion-not-found!!!
+#		>=dev-java/commons-lang-3.12.0:3.6
+#		>=dev-java/jackson-core-2.13.2:0
+#		>=dev-java/jackson-databind-2.13.2:0
+#	)
+#"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
+
+S="${WORKDIR}/apache-log4j-${PV}-src"
+
+JAVA_CLASSPATH_EXTRA="osgi-core-api"
+JAVA_SRC_DIR="${PN}/src/main/java"
+JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
+
+#	JAVA_TEST_GENTOO_CLASSPATH="jackson-core,jackson-databind,commons-lang-3.6,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!suitable-mavenVersion-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+#	JAVA_TEST_SRC_DIR="${PN}/src/test/java"
+#	JAVA_TEST_RESOURCE_DIRS=(
+#		"${PN}/src/test/resources"
+#	)
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/log4j-core/Manifest b/dev-java/log4j-core/Manifest
index 7114dd2eee76..4d5bb259b571 100644
--- a/dev-java/log4j-core/Manifest
+++ b/dev-java/log4j-core/Manifest
@@ -1,3 +1,5 @@
 DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
+DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
 EBUILD log4j-core-2.17.1-r1.ebuild 8262 BLAKE2B 2f2014a50da0d4d488773cd2fb07bc83dc101c300b490ffd12f19b9fbdc415898398f9eb841b71d7e1691a19c107bcf3a4cd7bf0d23c9a78135e3ad990722c18 SHA512 599aee21fc409744a86ba3a8e98002fdf7cac966f6042174272870c8bb2aa634177bda8e85b2b1bc3cf2ffb433757514d9b732916e03e2cda5597c081facccf8
+EBUILD log4j-core-2.17.2.ebuild 8448 BLAKE2B 3ebdbcfe6cc3e3d067d5838c1f3cc1185c2c96e6060ac861166e65448213659d1fd9d99d9f1af243ca10dd449b24e4c1c4063ee10ecf866a48da94de4136f0d3 SHA512 7dc705084593bdb2b8701b99680fdcda44f075e6e7c63d831bdb4aeaec1c3d77d3cbe06c1ef5f7b6de3f9da3864a33ceb7c3a7c2d0bcf825d17ecbe35f597496
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-core/log4j-core-2.17.2.ebuild b/dev-java/log4j-core/log4j-core-2.17.2.ebuild
new file mode 100644
index 000000000000..9dcdcd2dc96a
--- /dev/null
+++ b/dev-java/log4j-core/log4j-core-2.17.2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom log4j-core/pom.xml --download-uri mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-core-2.17.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.logging.log4j:log4j-core:2.17.2"
+# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Apache Log4j Implementation"
+HOMEPAGE="https://logging.apache.org/log4j/2.x/"
+SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# We don't have junit-vintage and junit-jupiter
+RESTRICT="test"
+
+# Common dependencies
+# POM: ${PN}/pom.xml
+# com.conversantmedia:disruptor:1.2.15 -> >=dev-java/conversant-disruptor-1.2.19:0
+# com.fasterxml.jackson.core:jackson-core:2.13.1 -> >=dev-java/jackson-core-2.13.2:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.1 -> >=dev-java/jackson-databind-2.13.2:0
+# com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.1 -> >=dev-java/jackson-dataformat-xml-2.13.2:0
+# com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.1 -> >=dev-java/jackson-dataformat-yaml-2.13.2:0
+# com.fasterxml.woodstox:woodstox-core:6.2.8 -> >=dev-java/woodstox-core-6.2.8:0
+# com.lmax:disruptor:3.4.4 -> >=dev-java/lmax-disruptor-3.4.4:0
+# com.sun.mail:javax.mail:1.6.2 -> !!!suitable-mavenVersion-not-found!!!
+# org.apache.commons:commons-compress:1.21 -> >=dev-java/commons-compress-1.21:0
+# org.apache.commons:commons-csv:1.9.0 -> >=dev-java/commons-csv-1.9.0:0
+# org.apache.kafka:kafka-clients:1.1.1 -> >=dev-java/kafka-clients-1.1.1:0
+# org.apache.logging.log4j:log4j-api:2.17.2 -> >=dev-java/log4j-api-2.17.2:2
+# org.fusesource.jansi:jansi:2.4.0 -> >=dev-java/jansi-2.4.0:2
+# org.jctools:jctools-core:1.2.1 -> >=dev-java/jctools-core-2.0.2:0
+# org.slf4j:slf4j-api:1.7.35 -> >=dev-java/slf4j-api-1.7.36:0
+# org.zeromq:jeromq:0.4.3 -> >=dev-java/jeromq-0.5.2:0
+
+CP_DEPEND="
+	dev-java/commons-compress:0
+	dev-java/commons-csv:0
+	dev-java/conversant-disruptor:0
+	dev-java/jackson-core:0
+	dev-java/jackson-databind:0
+	dev-java/jackson-dataformat-xml:0
+	dev-java/jackson-dataformat-yaml:0
+	dev-java/jakarta-activation-api:1
+	dev-java/jansi:2
+	dev-java/javax-mail:0
+	dev-java/jctools-core:0
+	dev-java/jeromq:0
+	dev-java/kafka-clients:0
+	dev-java/lmax-disruptor:0
+	~dev-java/log4j-api-${PV}:2
+	dev-java/slf4j-api:0
+	dev-java/woodstox-core:0
+"
+
+# Compile dependencies
+# POM: ${PN}/pom.xml
+# org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.1.Final -> >=dev-java/jboss-jms-api-1.0.1:1.1
+# org.osgi:org.osgi.core:4.3.1 -> >=dev-java/osgi-core-api-5.0.0:0
+# POM: ${PN}/pom.xml
+# test? ch.qos.logback:logback-classic:1.2.3 -> !!!groupId-not-found!!!
+# test? ch.qos.logback:logback-core:1.2.3 -> !!!groupId-not-found!!!
+# test? com.github.tomakehurst:wiremock:2.26.3 -> !!!groupId-not-found!!!
+# test? com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0 -> !!!groupId-not-found!!!
+# test? com.h2database:h2:1.4.200 -> !!!groupId-not-found!!!
+# test? commons-codec:commons-codec:1.15 -> >=dev-java/commons-codec-1.15:0
+# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
+# test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+# test? log4j:log4j:1.2.17 -> >=dev-java/log4j-1.2.17:0
+# test? net.javacrumbs.json-unit:json-unit:2.32.0 -> !!!groupId-not-found!!!
+# test? org.apache-extras.beanshell:bsh:2.0b6 -> >=dev-java/bsh-2.0_beta6:0
+# test? org.apache.activemq:activemq-broker:5.16.4 -> !!!groupId-not-found!!!
+# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
+# test? org.apache.felix:org.apache.felix.framework:5.6.12 -> !!!groupId-not-found!!!
+# test? org.apache.logging.log4j:log4j-api:2.17.2 -> >=dev-java/log4j-api-2.17.2:2
+# test? org.apache.maven:maven-core:3.8.4 -> !!!groupId-not-found!!!
+# test? org.awaitility:awaitility:4.1.1 -> !!!groupId-not-found!!!
+# test? org.codehaus.groovy:groovy-dateutil:3.0.9 -> !!!groupId-not-found!!!
+# test? org.codehaus.groovy:groovy-jsr223:3.0.9 -> !!!groupId-not-found!!!
+# test? org.codehaus.plexus:plexus-utils:3.4.1 -> !!!groupId-not-found!!!
+# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
+# test? org.hamcrest:hamcrest:2.2 -> !!!artifactId-not-found!!!
+# test? org.hdrhistogram:HdrHistogram:2.1.12 -> !!!groupId-not-found!!!
+# test? org.hsqldb:hsqldb:2.5.2 -> !!!groupId-not-found!!!
+# test? org.jmdns:jmdns:3.5.7 -> !!!groupId-not-found!!!
+# test? org.junit-pioneer:junit-pioneer:1.6.1 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.platform:junit-platform-commons:1.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
+# test? org.mockito:mockito-core:4.3.1 -> !!!suitable-mavenVersion-not-found!!!
+# test? org.mockito:mockito-junit-jupiter:4.3.1 -> !!!artifactId-not-found!!!
+# test? org.slf4j:slf4j-ext:1.7.35 -> >=dev-java/slf4j-ext-1.7.36:0
+# test? org.springframework:spring-test:5.3.15 -> !!!groupId-not-found!!!
+# test? org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0
+# test? org.xmlunit:xmlunit-core:2.9.0 -> !!!groupId-not-found!!!
+# test? org.xmlunit:xmlunit-matchers:2.9.0 -> !!!groupId-not-found!!!
+# test? org.zapodot:embedded-ldap-junit:0.8.1 -> !!!groupId-not-found!!!
+
+DEPEND="${CP_DEPEND}
+	dev-java/jboss-jms-api:1.1
+	dev-java/osgi-core-api:0
+	>=virtual/jdk-1.8:*"
+#	test? (
+#		!!!artifactId-not-found!!!
+#		!!!groupId-not-found!!!
+#		!!!suitable-mavenVersion-not-found!!!
+#		>=dev-java/bsh-2.0_beta6:0
+#		>=dev-java/commons-codec-1.15:0
+#		>=dev-java/commons-io-2.11.0:1
+#		>=dev-java/commons-lang-3.12.0:3.6
+#		>=dev-java/commons-logging-1.2:0
+#		>=dev-java/log4j-1.2.17:0
+#		~dev-java/log4j-api-${PV}:2
+#		>=dev-java/slf4j-ext-1.7.36:0
+#		>=dev-java/xz-java-1.9:0
+#	)
+#"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
+
+S="${WORKDIR}/apache-log4j-${PV}-src"
+
+JAVA_CLASSPATH_EXTRA="jboss-jms-api-1.1,osgi-core-api"
+JAVA_SRC_DIR="${PN}/src/main/java"
+JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
+
+#	JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,commons-codec,commons-io-1,commons-logging,log4j,!!!groupId-not-found!!!,bsh,!!!groupId-not-found!!!,commons-lang-3.6,!!!groupId-not-found!!!,log4j-api-2,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!suitable-mavenVersion-not-found!!!,!!!artifactId-not-found!!!,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,xz-java,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+#	JAVA_TEST_SRC_DIR="${PN}/src/test/java"
+#	JAVA_TEST_RESOURCE_DIRS=(
+#		"${PN}/src/test/resources"
+#	)
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# Process the @Plugin annotation used on Log4j 2 built-in plugins
+	# to generate a serialized plugin listing file
+	# https://logging.apache.org/log4j/2.x/manual/plugins.html
+	local processor="org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor"
+	local classes="target/classes"
+	local classpath="${JAVA_JAR_FILENAME}:$(\
+		java-pkg_getjars --build-only --with-dependencies \
+		"${JAVA_GENTOO_CLASSPATH},${JAVA_CLASSPATH_EXTRA}")"
+	# Just in case java-pkg-simple.eclass changes the path in the future
+	mkdir -p "${classes}" || die "Failed to create directory for classes"
+	ejavac -d "${classes}" -cp "${classpath}" \
+		-proc:only -processor "${processor}" \
+		$(find "${JAVA_SRC_DIR}" -name "*.java")
+	# Update the JAR to include the serialized plugin listing file
+	local jar="$(java-config -j)"
+	"${jar}" -uf "${JAVA_JAR_FILENAME}" -C "${classes}" . ||
+		die "Failed to update JAR"
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/mchange-commons/Manifest b/dev-java/mchange-commons/Manifest
index 1fb6ce484419..9450c084b276 100644
--- a/dev-java/mchange-commons/Manifest
+++ b/dev-java/mchange-commons/Manifest
@@ -1,5 +1,3 @@
-DIST mchange-commons-0.2.10.tar.gz 218657 BLAKE2B f073aac7a560c31ea71c4114c5128de55d4b384c9579f649e0ca28c1257be64d22bce406b241f3b7665c5ec0e4cdc64c079c0f27f328e54803612abae43aef42 SHA512 098712b3b61d74a832699b6c92c75fdb243260400c1180511b5299a25553660750261ff8c2cf322350afd3d4b84fdf9900c26123b56add0f772e26e4f3ed8d7b
 DIST mchange-commons-0.2.20.tar.gz 231274 BLAKE2B f13d82d8a9f67a81c0fe69bd2d59e4ee88100c21067e454ba81ba5b5f60761c2352e8f2303c12e1ab0d54027ae9e7daca76f4e8308417a8e933d5a4c8cc0ad73 SHA512 d9019ca73f77f3f629c54bb65416f92b0a2c2fe5b23ef32cc48b4a951d505d8ba89f0ab71654b8e5d5983e4237c5c4e15c529abbb91ef0abdbff989806c2e44f
-EBUILD mchange-commons-0.2.10-r1.ebuild 804 BLAKE2B 691dfddfcb78346e6032d98acc9846a0e606f60c588ceb6fdaa8f2b5287653a1cd9a92c73b4161e055bafbc1e97f440fe874f46920fa37c2451d331a9c18a132 SHA512 c1398a4b55fe890961d6e2ebc63b38d59d9f7f1d6f0d78d0a4e123e5ab3c3de9a1c187cb9a203d294e4ed4fa6a29c3c0cf18be6ef73546dd79a98e6c3dc8ffcc
-EBUILD mchange-commons-0.2.20.ebuild 1347 BLAKE2B d8e8a3d19c4fb712febaae966c181fdb4951bd9a4db2d61197771982b64087c3f00b93ebd0b252abcdd22c02507e21d664bf321bb0ff61918381861e31d1f48f SHA512 b0f4a0779f5755c11f0b81ced62e3d2b31c8922b3894d3d44add475994f0845cde1c25252f58e1de84489f26119870f00c17aa4bf54d7e1a0827ec786a4dd4ac
+EBUILD mchange-commons-0.2.20.ebuild 1344 BLAKE2B 7113783f8c8d611ef638aec6ab5ef42ac588a9c16a8b3e146750384ebe2ac391bbd9ad24f9cd7f1094ba6e6e5007f2cb2552792e8e195b889c08a9e1f73fc34e SHA512 54d7256acc4386eed1f86d0c7c11035bfc5ab9b6314380901faeab2a27345e6d8051c9efcc2268a0ffc305381a55fe06c4bd66488449bb5028875f1d502fe122
 MISC metadata.xml 341 BLAKE2B 12a8c6400c7e33d2c48d1421066d1f653f0ad0055743be43fe646824a111c879d9e94baea50a6837e4b58584e06d733d83070e60ce92e12957878265edfc8266 SHA512 9a31c179d0086aa0b461544594472f6ecae3fb0c4aa1585c8dcf49ab20f5b9dd1aa48e435cc1195d5f5509ece1a231a644264e4c91ceefc6bf87d99c2566122a
diff --git a/dev-java/mchange-commons/mchange-commons-0.2.10-r1.ebuild b/dev-java/mchange-commons/mchange-commons-0.2.10-r1.ebuild
deleted file mode 100644
index 6df76356d302..000000000000
--- a/dev-java/mchange-commons/mchange-commons-0.2.10-r1.ebuild
+++ /dev/null
@@ -1,43 +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"
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="${PN}-java"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="a library of arguably useful Java utilities"
-HOMEPAGE="https://github.com/swaldman/mchange-commons-java"
-SRC_URI="https://github.com/swaldman/${MY_PN}/archive/refs/tags/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-IUSE="doc source"
-
-CDEPEND="
-	dev-java/log4j:0
-	dev-java/slf4j-api:0
-	dev-java/typesafe-config:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/zip
-	>=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}"
-
-JAVA_SRC_DIR="src/main"
-
-JAVA_GENTOO_CLASSPATH="
-	log4j
-	slf4j-api
-	typesafe-config"
diff --git a/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild b/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild
index 8e2886a930c9..9ad7bcf8724b 100644
--- a/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild
+++ b/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/swaldman/${PN}-java/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="EPL-1.0 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 CP_DEPEND="
 	dev-java/log4j-api:2
diff --git a/dev-java/netty-common/Manifest b/dev-java/netty-common/Manifest
index 4015717cdc66..e5736cb154fd 100644
--- a/dev-java/netty-common/Manifest
+++ b/dev-java/netty-common/Manifest
@@ -1,5 +1,3 @@
 DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
-EBUILD netty-common-4.0.36-r1.ebuild 1985 BLAKE2B c7cf7c00ae6c9e38070f469fdd3b15941b3f9d2e52282602dbecd4c923ce847417cafa7af247145fff8eed8fe82208e61a9f56283ed82c061a11953e7afa29d7 SHA512 eea2879c06b4d2eb695cb9f24a1275d2b78408a986a5f845fdaa1174c8bb50ab3807f78ff3ed9ba0d01403bb1086ee8c4fc9eb0e777f8910b615a1d8c97692aa
-EBUILD netty-common-4.0.36-r2.ebuild 1958 BLAKE2B 76261b2ac5ab0a0163ba27953360767a382d2a2b2e3fd16ad962dc14c197b71a49876bf1c64f2900f5b1e78f840b4cd841823822e4339c9f0742ead7e0c787fa SHA512 0742d56a578577bb26c7833b5f28d9dcced6607b8c280626efefe8ed689612f3acbc3e38bdf6ec4ca66ff141dcde9f24ba6f6621e7edd294e6bcb7ab9124225d
-EBUILD netty-common-4.0.36.ebuild 1603 BLAKE2B 20210d9a3d5f26ca914d2ca739c59cfe2ebeac66ba59f1d7a8a00cb0b2cadf0e146f341d3c79b6de762513f89bc00c8fc42df8bd29b80297d810dde211299920 SHA512 d5aa89abcc60bd5313693773b9a24bd0fcde2ad7623f246fbad156c7251831507dbfa6d671fcfe1de0957ce8c165e6e04079df93881bba0c5730dcdf2e70fde0
+EBUILD netty-common-4.0.36-r2.ebuild 1954 BLAKE2B 78138e80ea4aae375307b578428552ca59fa9888e36393d5e32f7ecd1004c9e9f3114d70c1222614f59d74f16556ccce750dc618cbdf2364e13cb3d81a53b7e0 SHA512 ecdd4650655632fa53141d8e0339ea5d980891fe53ddd0c50328c1566a9683807d30ba783599390134808cd4fa8cb7418191704c7225a53016b35f6cda18cf8a
 MISC metadata.xml 323 BLAKE2B de4c9f6ab6a8f2e4243cb7ea8d3e96a08e9a99b579d7996601094ca1bba95c4331fec32c42c4fa42defb8de1f5ed3bf9e52cc3ac3ca9e6a0bec6a55c3edf3d3a SHA512 99c3bb74ad41a72119dbccfaf446e9d13fd1002204188c363531a68e4434fb01a9f2ab0158ad359cea6163f3791759e8fa5b7b2c8cb7268212776d912840b89a
diff --git a/dev-java/netty-common/netty-common-4.0.36-r1.ebuild b/dev-java/netty-common/netty-common-4.0.36-r1.ebuild
deleted file mode 100644
index dadd4d4a6f1e..000000000000
--- a/dev-java/netty-common/netty-common-4.0.36-r1.ebuild
+++ /dev/null
@@ -1,71 +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"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="netty"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Async event-driven framework for high performance network applications"
-HOMEPAGE="https://netty.io/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="test"
-
-# Same test failures as before the revbump still occur. See https://bugs.gentoo.org/827221
-RESTRICT="test"
-
-CDEPEND="dev-java/commons-logging:0
-	dev-java/javassist:3
-	dev-java/log4j:0
-	dev-java/slf4j-api:0"
-
-RDEPEND="virtual/jre:1.8
-	${CDEPEND}"
-
-# It does not build with java 11, https://bugs.gentoo.org/788364
-# src/main/java/io/netty/util/internal/Cleaner0.java:44: error: cannot find symbol
-#                Cleaner cleaner = (Cleaner) cleanerField.get(direct);
-#                ^
-#  symbol:   class Cleaner
-#  location: class Cleaner0
-DEPEND="virtual/jdk:1.8
-	${CDEPEND}
-	test? (
-		dev-java/asm:4
-		dev-java/cglib:3
-		dev-java/easymock:3.2
-		dev-java/hamcrest-core:1.3
-		dev-java/hamcrest-library:1.3
-		dev-java/junit:4
-		dev-java/mockito:0
-		dev-java/objenesis:0
-		dev-java/slf4j-simple:0
-	)"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="commons-logging,javassist-3,log4j,slf4j-api"
-
-src_prepare() {
-	default
-	# Needs Mockito 1.10.
-	rm -v src/test/java/io/netty/util/concurrent/PromiseCombinerTest.java || die
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH},asm-4,cglib-3,easymock-3.2,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,mockito,objenesis,slf4j-simple)"
-	local TESTS=$(find * -name "*Test.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/netty-common/netty-common-4.0.36-r2.ebuild b/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
index 9536f39175b8..3b2e51daa692 100644
--- a/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="test"
 
 # Same test failures as before the revbumps still occur. See https://bugs.gentoo.org/827221
diff --git a/dev-java/netty-common/netty-common-4.0.36.ebuild b/dev-java/netty-common/netty-common-4.0.36.ebuild
deleted file mode 100644
index 6abc0507c74b..000000000000
--- a/dev-java/netty-common/netty-common-4.0.36.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="netty"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Async event-driven framework for high performance network applications"
-HOMEPAGE="https://netty.io/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-java/commons-logging:0
-	dev-java/javassist:3
-	dev-java/log4j:0
-	dev-java/slf4j-api:0"
-
-RDEPEND=">=virtual/jre-1.7
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	test? (
-		dev-java/asm:4
-		dev-java/cglib:3
-		dev-java/easymock:3.2
-		dev-java/hamcrest-core:1.3
-		dev-java/hamcrest-library:1.3
-		dev-java/junit:4
-		dev-java/mockito:0
-		dev-java/objenesis:0
-		dev-java/slf4j-simple:0
-	)"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="commons-logging,javassist-3,log4j,slf4j-api"
-
-java_prepare() {
-	# Needs Mockito 1.10.
-	rm -v src/test/java/io/netty/util/concurrent/PromiseCombinerTest.java || die
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH},asm-4,cglib-3,easymock-3.2,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,mockito,objenesis,slf4j-simple)"
-	local TESTS=$(find * -name "*Test.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index fbc6ccfd9cee..40ea434b4b6e 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -29,7 +29,7 @@ DIST openjdk-jdk-8.312_p07.tar.bz2 48705905 BLAKE2B 0e9849a58a05e300441e63702846
 DIST openjdk-langtools-8.312_p07.tar.bz2 2403774 BLAKE2B 2eaaf2d23b0d31d566b95075f1e00a8ec01617a48bd860b927fc56f56c0ec1e4232c1d2e316b9b13bf563b89ecc6464bf1e49a86eda1a31d998dbbc85e1fa542 SHA512 b77d8b1864e121a838023da424b0910903cc2b11cd9669e61c0ced84e1210d4902b2a0b97031e6646f26b01f1120d72b6f3382c6aee4d25fcd2d8e4605b8b4ff
 DIST openjdk-nashorn-8.312_p07.tar.bz2 2848133 BLAKE2B 4e416ddb38aafb97796233adda615525fb6e583428cdf0b25fd285276b3bef81682d3a607122aa8724dd9ec2ef0890b889ef809aa8f72cb03ac5bc9bfce9192e SHA512 411ac87cf1e8c889330b3fc41ce8cd8ed70c553d079dd46349813b02b171a22c2421075cc6391e46a866ee802df874cf1a6ff3e7dfba20e73564380be24ae843
 EBUILD openjdk-11.0.13_p8.ebuild 7470 BLAKE2B 51487f24150b411a085a022f83f539c11e2532b82afafc76f03a15a6ff96b3b04d3ce9078a3cde6b2c91ffcedf55dac2976eb00bdbb0ad4352c7a428df4d5956 SHA512 644cdae2f094d080eb27054a4f2b7fc3dfb6a540567a15e1c07d0cf0540dead5a97f7751747e2d4db2ed9e860611f19bd958eb4732c2db0d95c5119d61df8a34
-EBUILD openjdk-11.0.14_p9-r1.ebuild 7768 BLAKE2B 242092fb322793922d01c4125dbef63edbc1ccb12176634df8cf07048de88faf04106f7138a8c862a76b3fedb1d2f9ed680ad2ad68e1afd1389d59e8da1c861d SHA512 9b43396290e3958809c0bdb97d2de3df4cfd5756b2c5d046e7e5661fa3a5de091a156dbd4c4995c18252dd93c284a796ed005b67ed415cf1fb7448e4954c49c5
+EBUILD openjdk-11.0.14_p9-r1.ebuild 7767 BLAKE2B fc257c726bc2a3ef04711b84b28c0b14b5f291cdbeebcc31f9d9a8ece088c5d1c6cdd7cdef3bd803e8d35c625a993b0637b1164d034fcc6bf0ad9c83dc03e518 SHA512 1943350c5c12b71c2c06b2a9326c83506da54363562d2736c836e5c5d8239c6fab2a47a47378768c1ce7626eaeec8acb7d9a7b7f8934f4558e85cfea2ad2fc19
 EBUILD openjdk-17.0.1_p12.ebuild 7855 BLAKE2B cb7a7215afcd9382edd8053ea4182012d46743fdff5ba03ac4ff2f8750b454c352b25ec4ca04b0b3a5dcfeadf64cf24518ebf119a87cde7ca7f2c9a09bf39256 SHA512 5bc08b0e7707725dafd4165d8f7af2964981195d19fc95ae5465ab3f2907bd4c81d2ba2bfbf6eb42dd331dd8a9eb2c8c0584615146163669514a2c2773cf68df
 EBUILD openjdk-17.0.2_p8.ebuild 9105 BLAKE2B 0510a231c319d95ba3c3ad411524956872184bb958993dce100e2b39c7654ddea8cd4842f9ece6d7da53efa54b06d165db3c15d4d69be08a676a5cd6d42978e1 SHA512 bc349ca6ab90f97cdaecf6bb0634b43a1b122c086a808c854613799ef896b61617736b82fac0a209c37fafbe54d329da546076cb077931f11112c5e2bc0e7863
 EBUILD openjdk-8.312_p07.ebuild 7399 BLAKE2B b07477683dd271a5c1cf0830137f9c846df5375666ac0d3863f3647f9c0ca3db3bce0e68e4f3931124a071e9b0fb81434733d034194cbee3a764056cfa2721fe SHA512 467b1479f425e9d36be216c24d2f226a2c4a1aec9947fedc73d0b4703e1efaad727c36c427c3010a78576db997d2975623d0209d11ba6adbd65e360265173c10
diff --git a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
index b1990f6ea4f8..1e00ec30c2ed 100644
--- a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
@@ -40,7 +40,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
 
diff --git a/dev-java/opentest4j/Manifest b/dev-java/opentest4j/Manifest
new file mode 100644
index 000000000000..9d354786c477
--- /dev/null
+++ b/dev-java/opentest4j/Manifest
@@ -0,0 +1,3 @@
+DIST opentest4j-1.2.0.tar.gz 77616 BLAKE2B a331cc5e97d1e50b3b57e6aac926278d16f4d75067b4e4b25acb5ee25d4d4cd9d1f75c115155303ec63f5cb22b09ad1cbaa01d62620b350dd2c1d61541657b78 SHA512 cd98d976935de97d259ec4c04510334f2b56f8a32db2c97e0f20a2e3b99f119ffeb390589eb42d4594808d96194067871d5eaad6a40dd58af30b9f995b13ef08
+EBUILD opentest4j-1.2.0.ebuild 746 BLAKE2B 7050e49a9b982258eb82304702bc78315e3d72d277effe3a586260ff67ddf3205441731fe37dc6d932a18006ea346a13724396aac9511885fddbe4dc33d6e6c6 SHA512 ee3394bfc5c99d87d19202e149eff2746613766ab6b17964e2b64550a8c849b1febe8e2106442ef235722ab2ce8d40510cdfd014aed29aa5f2b3f85596c82084
+MISC metadata.xml 302 BLAKE2B ea077bd25f3dc10129d182bad603f229905bea89332134c5a8792983bc5d338452087844adc12a7a0c1496ebd2df6c1fa0fb4c55198cf84885ab2f1ba99bfc72 SHA512 b88e1884b81818b405494ce7eff1790d3e726c66a6a04fa4caf510c8178893f5afd31d867893b118051db4a06954b73b783341b5eb2b7e8779e76ddc520d9636
diff --git a/dev-java/opentest4j/metadata.xml b/dev-java/opentest4j/metadata.xml
new file mode 100644
index 000000000000..0327a99ea474
--- /dev/null
+++ b/dev-java/opentest4j/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ota4j-team/opentest4j</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/opentest4j/opentest4j-1.2.0.ebuild b/dev-java/opentest4j/opentest4j-1.2.0.ebuild
new file mode 100644
index 000000000000..18298098512e
--- /dev/null
+++ b/dev-java/opentest4j/opentest4j-1.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 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.opentest4j:opentest4j:1.2.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Open Test Alliance for the JVM"
+HOMEPAGE="https://github.com/ota4j-team/opentest4j"
+SRC_URI="https://github.com/ota4j-team/opentest4j/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${PN}-r${PV}"
+
+JAVA_SRC_DIR=( src/{main,module}/java )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR=( src/test/java )
+JAVA_TEST_RESOURCE_DIRS=( src/test/resources )
diff --git a/dev-java/osgi-annotation-versioning/Manifest b/dev-java/osgi-annotation-versioning/Manifest
index 4f6600b1e5c5..751a04da4723 100644
--- a/dev-java/osgi-annotation-versioning/Manifest
+++ b/dev-java/osgi-annotation-versioning/Manifest
@@ -1,3 +1,3 @@
 DIST osgi-annotation-versioning-1.1.1-sources.jar 5301 BLAKE2B 3c45fc25bda97a3b98e8db1d725f64a4e237300251a3414daed8ddcb54c5d8a68aa4c603e57a3831a34761c4cbfa0d544b1ed345e26ca1a1a1b4d4fa5bf2f9dc SHA512 39b208b4f72a33cb9a8c2dff1a4c52e07b32a553bcf2d7cb014ae50935c6b8ff26b67961117019fb5222e99c59ab4ec6e73788124f309dac86defeeb212d407b
-EBUILD osgi-annotation-versioning-1.1.1.ebuild 1019 BLAKE2B 7da557ee880c7492d0e37a8ba77306e41bde8c97e9b13a437f606b1db980525a99ab126fc679be0857174be7d076c29cb4906f9c9c777f7fd6348764d638ded8 SHA512 0dbf4b39804fc8b3160fcb5d4d849eeae82730defbf4bd10aeae2e90ffcc628862d2ba8ead2cac4bb1d4b01cd3d278d5cda0979611a8bdd720c98c253b3e06ae
+EBUILD osgi-annotation-versioning-1.1.1.ebuild 1018 BLAKE2B a166ce64034891b8095e537a0be364adff90974bd982e6ecf387e74bdc5c93238244e3c78947a3d8f6e0205544b6c8112946b10ba921dd3001fa908faebb8cd5 SHA512 cdadc218ee24a350fd67dbdcd5b3c2599e5670a910dec136cd5c398e3e85600c405369a682e90b3fdd846034cda9a67da21dd2da89130fe969fdb9fa1bc8cba6
 MISC metadata.xml 291 BLAKE2B c85b76df77fc86b1590849e2ddbd23981924ae4172b592d72c45845212691f01cddcdd91ee9a079d977455ac6fdb1a7c4eafe6b507cef45cf28418e78092aafb SHA512 13c78a573ef594b87860d0c0a1b0f7eef9418fcaf5554995c5149cb42b434c6e81816e70ad8af6e35ecbd9fe12931700c9a2ade5a303e88b266922f4ffe0ff76
diff --git a/dev-java/osgi-annotation-versioning/osgi-annotation-versioning-1.1.1.ebuild b/dev-java/osgi-annotation-versioning/osgi-annotation-versioning-1.1.1.ebuild
index 5e7e31472bdb..80b9d802bee5 100644
--- a/dev-java/osgi-annotation-versioning/osgi-annotation-versioning-1.1.1.ebuild
+++ b/dev-java/osgi-annotation-versioning/osgi-annotation-versioning-1.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/osgi/org.osgi.annotation.versioning/
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index 782df16172a7..b9a03482df56 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1,6 +1,5 @@
 AUX jflex-1.6.1.patch 680 BLAKE2B 2dba9bdba8ce77ebe28a608b505891ff49d51e9d7549bb17f21935ad9511fcdf4428a79b5243e5eb8cfb5747eaaaafb97eb6edca980ce337d37ed48772ff5ea5 SHA512 73e8067a31392a1975877470a2a239c9ca0913f807faa3e5c660bc2487dca9a46c1753ab86526e66581111fcded89229a4e9e3a16fa787ce3669ef6c07a28081
 DIST qdox-1.12.1.tar.gz 519833 BLAKE2B 83a732f1582b714cf943ede61bacc5216804c00cfbb642a479afb74739564f4fdbcd923dd7cb84a9626a97c5ad0a0f04895e0ae68252891cb25299e1fe1c9c72 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5
-DIST qdox-1.6.3.jar 63731 BLAKE2B 77d117f0f76f531f9320b5eb3650db315aab838d5d79a9df8997649b498b375db3fb0c694ea8b5911512097dd2325554d7599bed51a978e38af6fa55600d7c24 SHA512 0b05620809e3830c7e12c289cd4765f96d845adabc1f09497993bd9f39852784f454eb4aff1deecb325608a5773e86fbb1f5863e0f25387805472b59b46cf965
 EBUILD qdox-1.12.1-r2.ebuild 2225 BLAKE2B caf3e51d9d81e1a597092a5c20c2468266dda3559de0b07f948cd6026b983718941060f066a004464c4b177ec6a859139fd0549ff48dc82aff6fba24e8a60f90 SHA512 51a8c940ba702933bad4367de1f6a2a54d4d66710d3631529f61137ce27be1aaa0ce9dadb83005aa22331c241947637fe9a17a802923eef1002c0dad37051582
-EBUILD qdox-1.6.3-r2.ebuild 687 BLAKE2B e4cb8a16f5f5c116b7d4a6247b5c9a8aae67ea29725a25c8d6a6ee5e3bbdd19140d1ed4b33c32d6c5c0c81deb4b7d391e04af784eb3f0ca26d6458b061a9a72c SHA512 e154d9ae1c0528d248e24ffb3063dee953be8f3b69e93ff1331f2d111f61c7337210a2421192027066307caa6341f307e50b0bee4f41d29047736ee6d05c2913
+EBUILD qdox-1.12.1-r3.ebuild 2176 BLAKE2B 768b1467779bb393d1db716aa3a1672507c8575d247bb1556d0569ce7063395422ced4eec92160fce27f6320cf87a7502909239362db4dc46b3b6b0f0ff541b5 SHA512 bc5017d33e50e5c04111f05862a2ed24c1d18f68f29f065c8f27a05c42943c118b2462e66be22f3294afa4043679afa54b8fb3f664e1affecd5b977492ec6cac
 MISC metadata.xml 490 BLAKE2B 0074cd0a7da6af8028ff8bc8eba4b26f86d4ae5ea55da7a6fe0bfbcc73e779a9a6deeed0e82f95abc28324dcd1a89634b504d02265dea16ac26e576b6f29ace8 SHA512 039a450284a930e163cd9cd4c39c5ee6dd0a2f5678b5f77db7f809bbe0a141a564fa7232cbe3a428b31170068b1377cb953a8ccda4ee3b14b5ddb4d313180496
diff --git a/dev-java/qdox/qdox-1.12.1-r3.ebuild b/dev-java/qdox/qdox-1.12.1-r3.ebuild
new file mode 100644
index 000000000000..b4f4cd178563
--- /dev/null
+++ b/dev-java/qdox/qdox-1.12.1-r3.ebuild
@@ -0,0 +1,86 @@
+# 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="com.thoughtworks.qdox:qdox:1.12.1"
+
+inherit java-pkg-2
+
+DESCRIPTION="Parser for extracting class/interface/method definitions"
+HOMEPAGE="https://github.com/codehaus/qdox"
+SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.12"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${PN}-${PV}"
+
+CDEPEND="dev-java/ant-core:0"
+
+DEPEND=">=virtual/jdk-1.8:*
+	dev-java/byaccj:0
+	>=dev-java/jflex-1.6.1:0
+	dev-java/jmock:1.0
+	test? ( dev-java/junit:0 )
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/jflex-1.6.1.patch"
+)
+
+src_prepare() {
+	default
+
+	if ! use test ; then
+		rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java
+		rm -rf src/java/com/thoughtworks/qdox/junit
+		rm -rf src/test
+	fi
+}
+
+src_compile() {
+	jflex src/grammar/lexer.flex --skel src/grammar/skeleton.inner -d src/java/com/thoughtworks/qdox/parser/impl/ || die
+	byaccj -v -Jnorun -Jnoconstruct -Jclass=Parser -Jsemantic=Value -Jpackage=com.thoughtworks.qdox.parser.impl src/grammar/parser.y || die
+	mv Parser.java src/java/com/thoughtworks/qdox/parser/impl/ || die
+
+	# create jar
+	mkdir -p build/classes || die
+
+	local cp="$(java-pkg_getjars --build-only ant-core,jmock-1.0)"
+
+	if use test ; then
+		cp="${cp}:$(java-pkg_getjars --build-only junit)"
+	fi
+
+	ejavac -sourcepath . -d build/classes -classpath "${cp}" \
+		$(find . -name "*.java") || die "Cannot compile sources"
+
+	mkdir dist || die
+	cd build/classes || die
+	jar -cvf "${S}"/dist/${PN}.jar com || die "Cannot create JAR"
+
+	# generate javadoc
+	if use doc ; then
+		cd "${S}"
+		mkdir javadoc || die
+		javadoc -d javadoc -sourcepath src/java -subpackages com -classpath "${cp}"
+	fi
+}
+
+src_test() {
+	java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant-core,junit,jmock-1.0) \
+		com.thoughtworks.qdox.tools.QDoxTester src || die "Tests failed!"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	use source && java-pkg_dosrc src/java/com
+	use doc && java-pkg_dojavadoc javadoc
+}
diff --git a/dev-java/qdox/qdox-1.6.3-r2.ebuild b/dev-java/qdox/qdox-1.6.3-r2.ebuild
deleted file mode 100644
index 824060300ab3..000000000000
--- a/dev-java/qdox/qdox-1.6.3-r2.ebuild
+++ /dev/null
@@ -1,32 +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="Parser for extracting class/interface/method definitions"
-HOMEPAGE="https://github.com/codehaus/qdox"
-SRC_URI="mirror://gentoo/${P}.jar"
-
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-SLOT="1.6"
-LICENSE="Apache-2.0"
-
-DEPEND="
-	>=virtual/jdk-1.8"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-S="${WORKDIR}"
-
-JAVA_SRC_DIR="com"
-
-src_prepare() {
-	default
-	rm -v com/thoughtworks/qdox/ant/AbstractQdoxTask.java \
-		com/thoughtworks/qdox/junit/APITestCase.java || die
-}
diff --git a/dev-java/randomized-runner/Manifest b/dev-java/randomized-runner/Manifest
index 285a991f80de..4961095e5ce5 100644
--- a/dev-java/randomized-runner/Manifest
+++ b/dev-java/randomized-runner/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD randomized-runner-2.7.8.ebuild 1487 BLAKE2B 09ab6b7da23ca31d7c79da86baab005ef485821e2ba7bedee6a26444a8c0dca6673c74fd4793d8488b1072ad9e849acef16224b5a476cf0ff80fe42f9c28f6a1 SHA512 0c7964b579de9109c7527277e3d0154293e49dd2e6a4ca615d102771ce2f3fca16fd760f209021e2843f9e9055070fe704d49ab40a31d0935406ab844f72eb74
-MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
+EBUILD randomized-runner-2.7.9.ebuild 1931 BLAKE2B 09f6da01b65a81b92365db9196a2dbdf4e2246140350746c0c840adc572cb29021752955e407d271fbf60fd0e2e941a5753ea89afccf64b9ccb46ddb038d89e5 SHA512 7119d04a6d46368dd7e3e48de3c46f76a44feb1a1e20780fdac7a34e18c46ca53e0b3d6e0a39c4bc76fbb6b198f63a588221206454a1510d15cabc7085a51fca
+MISC metadata.xml 317 BLAKE2B 3da80829ccd32c18e7f9d05eaffee0f9433c2d0893363e911f1a0fb6d4260507ec4712c7035cdb2bd9d7b3fc7269d60f8346f2d82eb9bf7f3e25c03068ec1edd SHA512 f72fc2cfb58f31854ceb21c43f771b7eaf9b89d444e54179e54b2940ab7759f702640535f89b2101b65585ac8ea73d13c64583ae485608ab5a88e8f35f5a2a94
diff --git a/dev-java/randomized-runner/metadata.xml b/dev-java/randomized-runner/metadata.xml
index 75321cfb5598..960cc7109212 100644
--- a/dev-java/randomized-runner/metadata.xml
+++ b/dev-java/randomized-runner/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">randomizedtesting/randomizedtesting</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/randomized-runner/randomized-runner-2.7.9.ebuild b/dev-java/randomized-runner/randomized-runner-2.7.9.ebuild
new file mode 100644
index 000000000000..80a8dbc84563
--- /dev/null
+++ b/dev-java/randomized-runner/randomized-runner-2.7.9.ebuild
@@ -0,0 +1,70 @@
+# 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/release/2.7.9.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~x86" --ebuild randomized-runner-2.7.9.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.7.9"
+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="https://labs.carrotsearch.com/randomizedtesting.html"
+SRC_URI="https://github.com/randomizedtesting/randomizedtesting/archive/release/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+
+CP_DEPEND="
+	>=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:*
+	${CP_DEPEND}
+	test? (
+		>=dev-java/assertj-core-2.3.0:2
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( ../{CHANGES,CONTRIBUTING,README}.txt )
+
+S="${WORKDIR}/randomizedtesting-release-${PV}/${PN}"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="assertj-core-2"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if [[ "${vm_version}" -ge "17" ]] ; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/sun.nio.fs=ALL-UNNAMED )
+	fi
+
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index 02c7996972eb..41d05244861a 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1,4 +1,7 @@
 AUX snakeyaml-1.28-fix-test-check.patch 728 BLAKE2B 3c2e1607f03cfb00dba8808fec19b7a705afcc6ad8b1a3c2ee9b2b38e05e0e4e50b00413e5da236827ba4d7ca715b27158d0354dd7ce3950645a2a3bc9057540 SHA512 81bd69b9780e75df4d0964119a0c15684b54533ce2eebc94de3d481b7cf521b26f82f62279eabf3fc0e41eefb9c1648fb2700d6f07ae3b1fd99c6a5f55cbecd8
+AUX snakeyaml-1.30-fix-test-check.patch 664 BLAKE2B add2f85384f819b30e9ee7af02b73b12ba406c24e63eb7408d9eadcc6f11d532dc635f5d6a3aa73bd09a6975941bb56b69a389c2c1b3edd37dbedcffd83a8bc2 SHA512 5f395fa1f79a9801de11a5e81244799511c88e689bf480e6099357dfbd6666ee8f19bb204adac47c1f6014e92f65476e5f0031b73268f8279cf6253cf6a387b1
 DIST asomov-snakeyaml-b28f0b4d87c6.tar.gz 397832 BLAKE2B 054c228cd739e0d7ae89227cba7ae1aba76e5b6a7aae4915a765816d916ab3a47e80d6c2795a5e9bcaee96a70c1751fb9e67523e7faed2db5a6d2123d773d04a SHA512 2d19aee8c3aef2c4c300382451c1241dd2452180fe28c39eb9fe1bbc9d6c615bb8504535d3cf1cf5fe2ad55def8c43b709e8ecd97f760403cfaee7db977f074c
+DIST snakeyaml-1.30.tar.gz 402525 BLAKE2B 1d130ce8c5313b302463df11493a0fa845faf3921cd0b0a47f9db8d31f568f266f14a1543e33d77bf9e1b86c462ae4bba8e140339a6245341bdc05d76a1ccf07 SHA512 9ae09163d933e0899cf48ba0c80b5f01423847f1c18306859fa4c4002f0c909611df7096d494e04bb0f8f7d2bc5d1eb4f656e2f322941ddef642b0c23a351908
 EBUILD snakeyaml-1.28-r1.ebuild 2964 BLAKE2B bf8a1757ad1d41516cc55ac05737d48c6dbc681fe33fd8ead62de25a1fb0006059c778858e945c85bab913a37928869d33281ada50e4c6b8e7afbddb98dd38be SHA512 a70b5a39e84eb98623536a9e3eafee142c1d99f50697680b9f9b6db4415c247a9a7053294cbdbc9dbc6d75a3d2b6e2b22e0c30e1763d8b13584b12bba5a84570
-MISC metadata.xml 321 BLAKE2B 289b6f22e9b660717461d5da64ab6fc7543bc6d46dc803e79ac0694ad1836297469eec4ab224b1c5dccf8a77e7e750b688e0cfcdab371506aff143fce090794c SHA512 b4a92e6a613847f4b8d59e723505b223ee34cc03a31ab656b5d4f8424ff76f3073ec626dbe4ef6cabb93674c62a4ac923756d05bec8a110c25f0b9880effa5d7
+EBUILD snakeyaml-1.30.ebuild 3147 BLAKE2B 7ecb31f84c2f779f31e5cd3d22ab09a5e54dc77d1d6865adeffd8b59d4fa36614300d27acbf133c184a97c16cbafc81aa67851534549646e5171b16f70715097 SHA512 6784de89821f053ceb8f8164ad58bae8d4c89db74bef105aeb0c4e95839a59b15d6f3a23a4fc8accb8d2fc919cc16ed95ba463710574c84a7fe3b490bf9c1fbf
+MISC metadata.xml 548 BLAKE2B b9d917044a58addef7e75a2714a1a2f70c6ac4db0b30469b93c034b5aca8cd834652c5446b42c99e6785c222667c523b6325341e8f35be342622ad1486411ba6 SHA512 bfb8134a7351f7d0fe4a6433a4655ad8baa207641cb9939591209d05c3caf2d92593891b4b2dced236bb2186d3e410c54ba28682251c5d5f1d5d590e4e94ee61
diff --git a/dev-java/snakeyaml/files/snakeyaml-1.30-fix-test-check.patch b/dev-java/snakeyaml/files/snakeyaml-1.30-fix-test-check.patch
new file mode 100644
index 000000000000..f2742f658fa2
--- /dev/null
+++ b/dev-java/snakeyaml/files/snakeyaml-1.30-fix-test-check.patch
@@ -0,0 +1,18 @@
+--- a/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java
++++ b/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java
+@@ -69,7 +69,7 @@ public class BillionLaughsAttackTest {
+             map.toString();
+             fail("Expected overflow");
+         } catch (Throwable e) {
+-            assertTrue(e.getMessage().contains("heap"));
++            assertTrue("Catched exception " + e + " is not an instance of OutOfMemoryError", e instanceof OutOfMemoryError);
+         }
+     }
+ 
+@@ -94,4 +94,4 @@ public class BillionLaughsAttackTest {
+         assertNotNull(map);
+     }
+     
+-}
+\ No newline at end of file
++}
diff --git a/dev-java/snakeyaml/metadata.xml b/dev-java/snakeyaml/metadata.xml
index 48c5a4489132..6bb50777c8e8 100644
--- a/dev-java/snakeyaml/metadata.xml
+++ b/dev-java/snakeyaml/metadata.xml
@@ -6,6 +6,9 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="bitbucket">asomov/snakeyaml</remote-id>
+		<remote-id type="bitbucket">snakeyaml/snakeyaml</remote-id>
+		<changelog>https://bitbucket.org/snakeyaml/snakeyaml/wiki/Changes</changelog>
+		<bugs-to>https://bitbucket.org/snakeyaml/snakeyaml/issues</bugs-to>
+		<doc>https://bitbucket.org/snakeyaml/snakeyaml/wiki/Documentation</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/snakeyaml/snakeyaml-1.30.ebuild b/dev-java/snakeyaml/snakeyaml-1.30.ebuild
new file mode 100644
index 000000000000..6ae8d5e2d63e
--- /dev/null
+++ b/dev-java/snakeyaml/snakeyaml-1.30.ebuild
@@ -0,0 +1,95 @@
+# 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://bitbucket.org/snakeyaml/snakeyaml/get/snakeyaml-1.30.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild snakeyaml-1.30.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.yaml:snakeyaml:1.30"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="YAML 1.1 parser and emitter for Java"
+HOMEPAGE="https://bitbucket.org/snakeyaml/snakeyaml"
+SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? joda-time:joda-time:2.10.1 -> >=dev-java/joda-time-2.10.10:0
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.velocity:velocity:1.6.2 -> !!!artifactId-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/velocity:0
+		dev-java/joda-time:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+# https://bitbucket.org/snakeyaml/snakeyaml/pull-requests/7
+PATCHES=( "${FILESDIR}/snakeyaml-1.30-fix-test-check.patch" )
+DOCS=( README.md )
+
+S="${WORKDIR}/snakeyaml-snakeyaml-49227c24d741/"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="joda-time,junit-4,velocity"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+	default
+	java-utils-2_src_prepare
+}
+
+src_test() {
+	export EnvironmentKey1="EnvironmentValue1"
+	export EnvironmentEmpty=""
+
+	# There were 2 failures:
+	# 1) yamlClassInYAMLCL(org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest)
+	# java.lang.ClassNotFoundException: org.yaml.snakeyaml.Yaml
+	#         at java.base/java.net.URLClassLoader.findClass(URLClassLoader.java:476)
+	#         at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:589)
+	#         at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:522)
+	#         at org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest.yamlClassInYAMLCL(ContextClassLoaderTest.java:127)
+	# 2) domainInDifferentConstructor(org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest)
+	# java.lang.ClassNotFoundException: org.yaml.snakeyaml.Yaml
+	#         at java.base/java.net.URLClassLoader.findClass(URLClassLoader.java:476)
+	#         at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:589)
+	#         at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:522)
+	#         at org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest.domainInDifferentConstructor(ContextClassLoaderTest.java:135)
+
+	pushd src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * -name "*Test.java" \
+			! -name "StressTest.java" \
+			! -name "ParallelTest.java" \
+			! -name "AbstractTest.java" \
+			! -name "PyImportTest.java" \
+			! -name "ContextClassLoaderTest.java" \
+			)
+	popd
+
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index 61b317cf6a38..700deba5a560 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,7 +1,10 @@
 AUX stringtemplate-4.3.1-BaseTest-javac-source-target.patch 1318 BLAKE2B 6b93c9591b220584c8dca11a10c7012801f54d922a2dc938ce87cb7c996b0eec1124fb5ec57725a71c482c18922f8bae585f7aacc5609ac9e40715553f96d8e8 SHA512 618b10a46373cc0be12e3bbc6cf4d2177b300b52e65385d1babd1af67236f080a848ab61271c84102a305552de48071945e5f66c40aa084bf4aa8705ed92a267
 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
 EBUILD stringtemplate-3.2.1-r2.ebuild 1557 BLAKE2B 23393c4b73e75d1dd536957bceef00194eef22db42db38a6423f3fbc515e9bcd89a554d725735c94040c8abdae462e712ed92e2f58594338710c8790b8ef3c0c SHA512 244089013be014dbc4de338339ead998c9aa19464e651f7fcc02fa56410218e8289e1d91b5deb6b3905a11696b4ff6c44a0d19f783157b96acf8f3d85647a7d6
 EBUILD stringtemplate-4.3.1.ebuild 2946 BLAKE2B d6552374db1cea1a9bcf20e725f0ebb441579e0a7f56872fdecb2d6276203618bbdfed84ddc6680b7f464aeb3746e0fedae4597026ccb90a8808f662662d83c3 SHA512 17cb383f2e8e6111a82bf1d257136e789e7fafe1ffd88c50ca5065236a36a03001e3adaad600696766d34db5ac25fa16dcbec544dd6a933efa77950d24aacd64
+EBUILD stringtemplate-4.3.2.ebuild 3316 BLAKE2B 06dd4da8ed999fc0b5b45cdfa4bc20e8a761a3d8124af852d7e2da144c6e50f6c72248cb7283cbbe6878b35cfe8e2bed2d3d6a36f7e352b6495ce632c0c3389b SHA512 6de7c508469f70597611c196b70926a0d57a49dde870b8e769bf34fb24fc1fee706322f5b1c5b54f69dc75c367999abfc79cfb0ff8facf8b56d3cae1f0f3a987
 MISC metadata.xml 323 BLAKE2B 4b53767b7c81b78dfcfb69b4175baba46ee266cf145dff77dc855838f8b3209edf2fa1949b17aa88b284f0cc92d68250c0b64d4966253de734f1263d46b6b6be SHA512 9f7523f1186535db76c503816be7b41a6f58fb07469347d43acfbee68effdb5e748ebae3cc9cba2c9ac45b0c504b64eabd4947c48f040efa2d42f11328ae100c
diff --git a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
new file mode 100644
index 000000000000..1d0130c2b54f
--- /dev/null
+++ b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
@@ -0,0 +1,103 @@
+# 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.2"
+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"
+JAVA_TEST_RESOURCE_DIRS=( "${TARBALL_S}/test/resources" )
+
+DOCS=( "${TARBALL_S}/"{CHANGES.txt,README.md} )
+
+src_prepare() {
+	# Do not call java-pkg_clean; otherwise, it would remove
+	# ${TARBALL_S}/test/test.jar, which is merely used as a
+	# test resource file, does not contain any *.class files,
+	# and is required to pass the tests as of version 4.3.2
+	pushd "${TARBALL_S}" > /dev/null ||
+		die "Failed to enter directory storing tarball contents"
+	eapply "${FILESDIR}/${PN}-4.3.1-BaseTest-javac-source-target.patch"
+	popd > /dev/null ||
+		die "Failed to leave directory storing tarball contents"
+	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}"
+
+	# The JAR used as a test resource file needs to be in the classpath
+	# https://github.com/antlr/stringtemplate4/blob/4.3.2/pom.xml#L53-L58
+	new_test_cp+=":${JAVA_TEST_SRC_DIR}/test.jar"
+
+	# 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/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 77f94ef12ea8..62143de98ed6 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,30 +1,30 @@
 AUX 2.5-build-r1.xml 3084 BLAKE2B 6eb6025444ad6b2af035217bc7c1410a1238e25eaafdfdfe4ac706137791b329b05a28f56f77c57fa8de30b77d457e912208068b97bf6b8fbee7d7af168d07a5 SHA512 1bf5789c683896ffde160f96dc6fcb2ef58dd645a208b3d8e08863fd176337ae81e4d29535bb18df909cfe233576f25d93c35ad1072fca3a79b19e784638f5fb
 AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1e0b8193fa80d70a776c0cf24b2eee585cf77292bc2112b60075414a4d05ebe16dc26eb3c2976a44420774 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41
 AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
-DIST apache-tomcat-10.0.16-src.tar.gz 6088262 BLAKE2B f02a5b08e4502d4e7be2fa14f8dae8760c2844f262cdc75e2cc821038d248ed961281d11f7bb847cf55ecf012ee05c870366508fb1fe1485da2100e87aa13c55 SHA512 44a1ac752077603c5366ec92c6a5860d33ce810bf2554190a013329106ec118d1a18d1a26823b3024d046b05160a20dda65573365451d0481be8be97218445c8
 DIST apache-tomcat-10.0.17-src.tar.gz 6086996 BLAKE2B ff3584e58ec6f22f493cf7f32435423d68b941d9eec22441ee54ba69af03b50b687b23012129108485c9db147c8e7364ded037cf9ed2add174e6c928b927382a SHA512 1cc0f8e2187934c6dac3e31739f8c53a0a152527a98210deab8ce027c1347cbbd1cef3bdf0294bee3c4dbed20ba57b2291bcd887f353837fd505ea2d17e7ba3d
 DIST apache-tomcat-10.0.18-src.tar.gz 6088118 BLAKE2B 7d3fdb5a682dd44d358a619a18ca3df3bde27c9fc963436c9bce86baf07a42e87ba80724afdc6ce72b493d2fb35dda644eba29df7d4434f8c815ada4cb5d2ca3 SHA512 001205f382f44163f08dba1d306472b7ef3256e31a522c3f1f7595bca4fd084776a0c1f69b241302fa5d0d2f143ac063cb34d4fcf79a51ec9722f2f2ce3f1dab
+DIST apache-tomcat-10.0.20-src.tar.gz 6097471 BLAKE2B 77df97d73ff87a5ad55dfc3a0df02e3a306e619a5ae4bd2df0a0e3d42d236ccf2c6a6c46f60f56311f9be1bd561be9096d810d932f136b5856ff275fb3ae8368 SHA512 1e75b0bad54a9fac6ddc650156fac88bc91933ff0bf4e9a62948f5e116454b6def10d7ad632968e709e8aac72b15c567e4497cdb9b594352cd12d7518fdaf18f
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
-DIST apache-tomcat-8.5.75-src.tar.gz 5961981 BLAKE2B a8d3c0ef390ce6b12b09cedb71cd9c102e3a37265f7ef6db9797eb7eaf04429f75bdedf6a7dbaa7ade0b57a12cbb461498c37d9c7e234bb9dc98e3d095b66b8a SHA512 c1c2609db623eb94a5e177c0f7ccabf8753a34151961ddc0fdea47704aca86123ef63f746b7ca76e818185cae19121823f7700f9bd47ba27625b3c801ddc8bad
 DIST apache-tomcat-8.5.76-src.tar.gz 5961741 BLAKE2B 4c661c2f753edac48c28fdec3caa06c487e1546feb91f2d69003a4d9f71fb023eb2314520bb156f3087656d655acdfdbdff3f68cd3f81d0d9dfbb2c9577898ee SHA512 b1c1b8c870c77e46969fe64acc71194d37605e5ccda87d105186d8070ec2dd0b7b9c64cf2f9b276db140fd3927832405123018f6fe8f46c0ebda50af6404d8b9
 DIST apache-tomcat-8.5.77-src.tar.gz 5963037 BLAKE2B 63192409b148cf0691e6ad22180e4f79d8603e89633598ee3f1dcfdd7d55b88530ecb1aa7c585920e086a7582dea78fcbcd1498ed2552e0f8d17127658769f66 SHA512 a0d2f77540b5370e09d03d04340e0c7f539eb5761b84ea3c8ef924e2a3e7f9528b3ed83a0c8e413bc9335cee6052135788e48e30d95f231ba3ade7f0b53ec157
-DIST apache-tomcat-9.0.58-src.tar.gz 6142037 BLAKE2B 0515273882468958f5bc2ef95e3085c22975e0ec9f8153a20773266a43710645c2262da8cb10736f0f0b255716fa05a12252194e1f32851704364ef89a62e5e9 SHA512 b2b572dcad2efadf3e5e5a6ae6e108f5699af23b7751ca3c9c00e6ba896f5179745108fa602d8bd87a9611fd8bebe8817fad53c38fc75b0063835b953c67d74a
+DIST apache-tomcat-8.5.78-src.tar.gz 5972826 BLAKE2B 93acb2e997a877a2195642da7d896ec4f08bebd83aa12d868607056c23722bdb90147814173dde17fc142a9e4e434e4570a15ebfa1f8b1c7911a16408728b4bb SHA512 b58fdaa57420fcf7759420fba26bfd6edaa5174f5d3a81fdf8783f19d5385e2502d2ad4bfa0e4a77c6a084bf6d97a6d3cd274ab0ab3f2311d23079e273c41b32
 DIST apache-tomcat-9.0.59-src.tar.gz 6142359 BLAKE2B 26dee501a374e54280237dbe392924ac89e3e4b331a11b30c2e0923ac38fa16bb52c02dfc8a9f3597fb0ee169ae2835ac254eab745d1e2ab1e64cfed6395d0c3 SHA512 cea0125ca9b90b247ed114fa7b2e9c63da38b1ef97b3a373a43ed0d775764178534a4014b254219c8c5a26575eaf0ddc25ebc1e276b2ad5086ef3406627f1c80
 DIST apache-tomcat-9.0.60-src.tar.gz 6143845 BLAKE2B af7061854659de06afa6a7cf6380c4be4375e18bec896049bf468ddb9139794170271454af4712ade5099b8d46ed7c8d642e9c5f37ea168f0e31394a5128beeb SHA512 e5cb12fb134ff0a59e01a30fbcabc350ddbef6959494176848c2858c3c68444bc520153e00fdcdecb0eefbe7f69876c2965fedbffeeb0aeda7931dc1c11b0de5
-EBUILD tomcat-servlet-api-10.0.16.ebuild 3015 BLAKE2B 8326a595c857ea61fb4c7c684de79a3255822ba0235f9734cfbc64240b9e4917033f242ed12be88efaf8498fcf306c4b8e2162462fbaf0df808fdb33c40f4219 SHA512 a530aeb1d78bb9cb95ec8cb54113668995d3d6989ae50ddeeb1bf220d1629198b6b5d5a1009826aa329d1174eb99cf5b7c2df33e789f01f61d33b7521353775f
-EBUILD tomcat-servlet-api-10.0.17.ebuild 3018 BLAKE2B 7407df97c33c89d436e1d338f9c30a1dd2b2b0b90aad199e2e1d02a6a2d0360ef2f95f7b452d4b677d4daad016d5a27bc7a823e353355c7c28f6586117efa6e9 SHA512 7c08253ab8ec762c693902e17a0261023e9cbdd022b436944fd921b0969807bf79766d3ff6c951db1b9cae1580d073c6259d3d4688ae3a3ab88a8c3762cefc27
+DIST apache-tomcat-9.0.62-src.tar.gz 6156545 BLAKE2B 414f4f7193a8db2bb3d0abcbd2d8c30ede5783e83ba01229ffb322e9bf6b08d2fb10d83ce4742d9e6a4ebc50c9b047679ae798fbd3db8ae165f76d2782034d71 SHA512 7e9cad2703473d9f096009c464b28d54d3765259fab1923ef8c9b1cbfa231fa51cedadfe771a3a95abffd258759a71023e036bda78b949440a5e826fbd4e9e09
+EBUILD tomcat-servlet-api-10.0.17.ebuild 3015 BLAKE2B 8326a595c857ea61fb4c7c684de79a3255822ba0235f9734cfbc64240b9e4917033f242ed12be88efaf8498fcf306c4b8e2162462fbaf0df808fdb33c40f4219 SHA512 a530aeb1d78bb9cb95ec8cb54113668995d3d6989ae50ddeeb1bf220d1629198b6b5d5a1009826aa329d1174eb99cf5b7c2df33e789f01f61d33b7521353775f
 EBUILD tomcat-servlet-api-10.0.18.ebuild 3018 BLAKE2B 7407df97c33c89d436e1d338f9c30a1dd2b2b0b90aad199e2e1d02a6a2d0360ef2f95f7b452d4b677d4daad016d5a27bc7a823e353355c7c28f6586117efa6e9 SHA512 7c08253ab8ec762c693902e17a0261023e9cbdd022b436944fd921b0969807bf79766d3ff6c951db1b9cae1580d073c6259d3d4688ae3a3ab88a8c3762cefc27
+EBUILD tomcat-servlet-api-10.0.20.ebuild 3018 BLAKE2B 7407df97c33c89d436e1d338f9c30a1dd2b2b0b90aad199e2e1d02a6a2d0360ef2f95f7b452d4b677d4daad016d5a27bc7a823e353355c7c28f6586117efa6e9 SHA512 7c08253ab8ec762c693902e17a0261023e9cbdd022b436944fd921b0969807bf79766d3ff6c951db1b9cae1580d073c6259d3d4688ae3a3ab88a8c3762cefc27
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802e96cdb2d431778dced5de495f7ed2c665ff079300b37e658b3cad133c99bda92505eaf8add6c3e582d00ccdad61ebc4097c80 SHA512 7a571e537319eee86a34070e5e8e2baa722238fff2a57bea51a9e9ca746ec43ef07c7864a7235ef3ab33560b111c8d4971b8e4848f1e54f2719ed162857a7437
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2549a23f359648d8df6f69399be2c821eb55426fd9cdaa284aa3d474bf26a3cbed649d0e46ccf0a2334f8430e0927d35a72d8dbf SHA512 0ad484e1c808864d96daec646c5a14857f87ae097388f02631687a199c12888581edf24ff2e992a3b48ed0d4f5f5e954960673519705f4885004a46bd47dca78
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
-EBUILD tomcat-servlet-api-8.5.75.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634
-EBUILD tomcat-servlet-api-8.5.76.ebuild 3006 BLAKE2B ffed57a50da25f7e5ba64026f6ed77a530f09b54f548a6e4ec99cc2f97313ed3c527a43f91e39d4b89d3ff016146ca9cfdfef22fcb9206914261afaa214e2bbb SHA512 8927451e4d1c067b17b758fbdf21c17f63fcf7e135b31e0f0b67e471dc0aa5eec0a10fc0e31f091a29614343b856cfff50e3a063674b9b1613edcd696793626d
+EBUILD tomcat-servlet-api-8.5.76.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634
 EBUILD tomcat-servlet-api-8.5.77.ebuild 3006 BLAKE2B ffed57a50da25f7e5ba64026f6ed77a530f09b54f548a6e4ec99cc2f97313ed3c527a43f91e39d4b89d3ff016146ca9cfdfef22fcb9206914261afaa214e2bbb SHA512 8927451e4d1c067b17b758fbdf21c17f63fcf7e135b31e0f0b67e471dc0aa5eec0a10fc0e31f091a29614343b856cfff50e3a063674b9b1613edcd696793626d
-EBUILD tomcat-servlet-api-9.0.58.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
-EBUILD tomcat-servlet-api-9.0.59.ebuild 3013 BLAKE2B 642b4fd0b2c0703f48dc9b0354dc9df887d149485ca538a9450ee2110cee17dc145be54538d27c21da079db942543cc7e7ffa4206cb3e2c8f755b2dbf0159012 SHA512 adb2ef89bfa5e7b111b0135ae318ea5989d0f5350ccaa23053108a1c53a17aa2b908eab00879c3e384edb22630dec79d582ed682ffd8fff6eba58470d77e977d
+EBUILD tomcat-servlet-api-8.5.78.ebuild 3006 BLAKE2B ffed57a50da25f7e5ba64026f6ed77a530f09b54f548a6e4ec99cc2f97313ed3c527a43f91e39d4b89d3ff016146ca9cfdfef22fcb9206914261afaa214e2bbb SHA512 8927451e4d1c067b17b758fbdf21c17f63fcf7e135b31e0f0b67e471dc0aa5eec0a10fc0e31f091a29614343b856cfff50e3a063674b9b1613edcd696793626d
+EBUILD tomcat-servlet-api-9.0.59.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
 EBUILD tomcat-servlet-api-9.0.60.ebuild 3013 BLAKE2B 642b4fd0b2c0703f48dc9b0354dc9df887d149485ca538a9450ee2110cee17dc145be54538d27c21da079db942543cc7e7ffa4206cb3e2c8f755b2dbf0159012 SHA512 adb2ef89bfa5e7b111b0135ae318ea5989d0f5350ccaa23053108a1c53a17aa2b908eab00879c3e384edb22630dec79d582ed682ffd8fff6eba58470d77e977d
+EBUILD tomcat-servlet-api-9.0.62.ebuild 3013 BLAKE2B 642b4fd0b2c0703f48dc9b0354dc9df887d149485ca538a9450ee2110cee17dc145be54538d27c21da079db942543cc7e7ffa4206cb3e2c8f755b2dbf0159012 SHA512 adb2ef89bfa5e7b111b0135ae318ea5989d0f5350ccaa23053108a1c53a17aa2b908eab00879c3e384edb22630dec79d582ed682ffd8fff6eba58470d77e977d
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.17.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.17.ebuild
index 5ed928878473..440d44e0a658 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.17.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.17.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.16.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.20.ebuild
index 440d44e0a658..5ed928878473 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.16.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.20.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.76.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.76.ebuild
index c6359840b613..888295412849 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.76.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.76.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.75.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.78.ebuild
index 888295412849..c6359840b613 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.75.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.78.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.59.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.59.ebuild
index 09fffd263372..f1c865a27bec 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.59.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.59.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.58.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.62.ebuild
index f1c865a27bec..09fffd263372 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.58.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.62.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/univocity-parsers/Manifest b/dev-java/univocity-parsers/Manifest
new file mode 100644
index 000000000000..43f5ace30117
--- /dev/null
+++ b/dev-java/univocity-parsers/Manifest
@@ -0,0 +1,4 @@
+AUX univocity-parsers-2.9.1-explicitly-import-Record.patch 7598 BLAKE2B dabf3f190ecedc9f8897418ffb03351c9dc2b6db2d0cece5325997ba7b6b99da5a52466fbef920a5c09785874f99422c0eaba70031159a5186a26109a8fbc275 SHA512 80a84722a81a97b3f799dc2962c19b7bed077170a436e09a4440d536ec78ab6a994df7dfe1e4e3ea30c9fdecfb61f5f78147fa0045b63cfc3d274952b4dffb47
+DIST univocity-parsers-2.9.1.tar.gz 486417 BLAKE2B 4da3d31a1e57613731a0e112dfedcb084e57a2d0b6568e14f49986c447a080cb2cf8c530a6bb0ed30026a3afe5c5c648de2b4559eeca9432c5e13b5eb9b92b67 SHA512 f22062a277015c5f7fdc10b192ff07576baa6a8b67116bdc8e9aed37a70b6f3268a8faf0e422620be63deff13e3d74d4606f7c972cd9b4afda553f88feb75887
+EBUILD univocity-parsers-2.9.1.ebuild 981 BLAKE2B cde807edd70b02ad0e71da6ba057da4b94effb8684795ff0d481418a7f8bb6fa6ac2bbe43b81abd922754b9c8c914adb3b7e0dab4f073232dee3b9d6f1857b84 SHA512 4994d40cf0d7a542935d63ab8132a1ae9064002703e8a07e46f781ef7e72210bae85637fabfa4d2e9da43f9f1ae6852d47cdb729e22b5f912b9a0f1c4f686f95
+MISC metadata.xml 562 BLAKE2B a15a9a3770842da39b54d159216f2aaa51d45034c85e88001a2be7132ba7d9723f15c0a4ff9a3a90aa1fd4748b36ed74ac51a4ef5d9bfcbaeb48f51d5c5fe06a SHA512 3999b470a7b5318086021ba8df7b47f545658b096e1151ef6b56a73623c43f3bf2a6da7a35dd4911de764068524b8bb9ee7d511ed3d5d8d44dd0a9e06129df06
diff --git a/dev-java/univocity-parsers/files/univocity-parsers-2.9.1-explicitly-import-Record.patch b/dev-java/univocity-parsers/files/univocity-parsers-2.9.1-explicitly-import-Record.patch
new file mode 100644
index 000000000000..ca18412aeac4
--- /dev/null
+++ b/dev-java/univocity-parsers/files/univocity-parsers-2.9.1-explicitly-import-Record.patch
@@ -0,0 +1,159 @@
+From 6dffca791430639ca06dc6f2d9c309e085d8ba32 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Mon, 4 Apr 2022 09:36:20 -0700
+Subject: [PATCH] Fix "reference to Record is ambiguous" for JDK 16+
+
+Since Java 16, a new java.lang.Record class has been added to the Java
+SE API.  Classes under the java.lang package, including this Record
+class, are automatically imported in any Java source file.  Because this
+project also has a com.univocity.parsers.common.record.Record interface,
+when it is being compiled on JDK 16 and above, there would be an
+ambiguity as to which class/interface to use for the 'Record' type:
+
+src/main/java/com/univocity/parsers/common/Context.java:136: error: reference to Record is ambiguous
+        Record toRecord(String[] row);
+        ^
+  both interface com.univocity.parsers.common.record.Record in com.univocity.parsers.common.record and class java.lang.Record in java.lang match
+
+The resolution to this issue is simply to import the Record interface
+under this project explicitly in every source file using it.
+
+Bug: https://github.com/Leo3418/junit-5-ebuild-repo/issues/4
+Reported-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ src/main/java/com/univocity/parsers/common/AbstractParser.java   | 1 +
+ src/main/java/com/univocity/parsers/common/AbstractWriter.java   | 1 +
+ src/main/java/com/univocity/parsers/common/Context.java          | 1 +
+ src/main/java/com/univocity/parsers/common/ContextWrapper.java   | 1 +
+ src/main/java/com/univocity/parsers/common/DefaultContext.java   | 1 +
+ .../java/com/univocity/parsers/common/NoopParsingContext.java    | 1 +
+ .../java/com/univocity/parsers/common/ParsingContextWrapper.java | 1 +
+ .../com/univocity/parsers/common/iterators/RecordIterator.java   | 1 +
+ src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java  | 1 +
+ src/main/java/com/univocity/parsers/fixed/Lookup.java            | 1 +
+ 10 files changed, 10 insertions(+)
+
+diff --git a/src/main/java/com/univocity/parsers/common/AbstractParser.java b/src/main/java/com/univocity/parsers/common/AbstractParser.java
+index 42191ad..6dd4dac 100644
+--- a/src/main/java/com/univocity/parsers/common/AbstractParser.java
++++ b/src/main/java/com/univocity/parsers/common/AbstractParser.java
+@@ -20,6 +20,7 @@ import com.univocity.parsers.common.input.*;
+ import com.univocity.parsers.common.iterators.*;
+ import com.univocity.parsers.common.processor.*;
+ import com.univocity.parsers.common.processor.core.*;
++import com.univocity.parsers.common.record.Record;
+ import com.univocity.parsers.common.record.*;
+ 
+ import java.io.*;
+diff --git a/src/main/java/com/univocity/parsers/common/AbstractWriter.java b/src/main/java/com/univocity/parsers/common/AbstractWriter.java
+index 6a19562..d7a5207 100644
+--- a/src/main/java/com/univocity/parsers/common/AbstractWriter.java
++++ b/src/main/java/com/univocity/parsers/common/AbstractWriter.java
+@@ -18,6 +18,7 @@ package com.univocity.parsers.common;
+ import com.univocity.parsers.common.fields.*;
+ import com.univocity.parsers.common.input.*;
+ import com.univocity.parsers.common.processor.*;
++import com.univocity.parsers.common.record.Record;
+ import com.univocity.parsers.common.record.*;
+ import com.univocity.parsers.fixed.*;
+ 
+diff --git a/src/main/java/com/univocity/parsers/common/Context.java b/src/main/java/com/univocity/parsers/common/Context.java
+index d0adf5f..f3b28c9 100644
+--- a/src/main/java/com/univocity/parsers/common/Context.java
++++ b/src/main/java/com/univocity/parsers/common/Context.java
+@@ -15,6 +15,7 @@
+  ******************************************************************************/
+ package com.univocity.parsers.common;
+ 
++import com.univocity.parsers.common.record.Record;
+ import com.univocity.parsers.common.record.*;
+ 
+ /**
+diff --git a/src/main/java/com/univocity/parsers/common/ContextWrapper.java b/src/main/java/com/univocity/parsers/common/ContextWrapper.java
+index bee87e8..c338895 100644
+--- a/src/main/java/com/univocity/parsers/common/ContextWrapper.java
++++ b/src/main/java/com/univocity/parsers/common/ContextWrapper.java
+@@ -15,6 +15,7 @@
+  ******************************************************************************/
+ package com.univocity.parsers.common;
+ 
++import com.univocity.parsers.common.record.Record;
+ import com.univocity.parsers.common.record.*;
+ 
+ /**
+diff --git a/src/main/java/com/univocity/parsers/common/DefaultContext.java b/src/main/java/com/univocity/parsers/common/DefaultContext.java
+index 11ea961..7346e64 100644
+--- a/src/main/java/com/univocity/parsers/common/DefaultContext.java
++++ b/src/main/java/com/univocity/parsers/common/DefaultContext.java
+@@ -15,6 +15,7 @@
+  */
+ package com.univocity.parsers.common;
+ 
++import com.univocity.parsers.common.record.Record;
+ import com.univocity.parsers.common.record.*;
+ 
+ /**
+diff --git a/src/main/java/com/univocity/parsers/common/NoopParsingContext.java b/src/main/java/com/univocity/parsers/common/NoopParsingContext.java
+index fe1f07d..79d8787 100644
+--- a/src/main/java/com/univocity/parsers/common/NoopParsingContext.java
++++ b/src/main/java/com/univocity/parsers/common/NoopParsingContext.java
+@@ -15,6 +15,7 @@
+  ******************************************************************************/
+ package com.univocity.parsers.common;
+ 
++import com.univocity.parsers.common.record.Record;
+ import com.univocity.parsers.common.record.*;
+ 
+ import java.util.*;
+diff --git a/src/main/java/com/univocity/parsers/common/ParsingContextWrapper.java b/src/main/java/com/univocity/parsers/common/ParsingContextWrapper.java
+index 20a59d8..e8b4f9d 100644
+--- a/src/main/java/com/univocity/parsers/common/ParsingContextWrapper.java
++++ b/src/main/java/com/univocity/parsers/common/ParsingContextWrapper.java
+@@ -15,6 +15,7 @@
+  */
+ package com.univocity.parsers.common;
+ 
++import com.univocity.parsers.common.record.Record;
+ import com.univocity.parsers.common.record.*;
+ 
+ import java.util.*;
+diff --git a/src/main/java/com/univocity/parsers/common/iterators/RecordIterator.java b/src/main/java/com/univocity/parsers/common/iterators/RecordIterator.java
+index 01b22cb..1620205 100644
+--- a/src/main/java/com/univocity/parsers/common/iterators/RecordIterator.java
++++ b/src/main/java/com/univocity/parsers/common/iterators/RecordIterator.java
+@@ -16,6 +16,7 @@
+ package com.univocity.parsers.common.iterators;
+ 
+ import com.univocity.parsers.common.*;
++import com.univocity.parsers.common.record.Record;
+ import com.univocity.parsers.common.record.*;
+ 
+ import java.io.*;
+diff --git a/src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java b/src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java
+index b38bc99..25285eb 100644
+--- a/src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java
++++ b/src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java
+@@ -17,6 +17,7 @@ package com.univocity.parsers.fixed;
+ 
+ import com.univocity.parsers.common.*;
+ import com.univocity.parsers.common.input.*;
++import com.univocity.parsers.common.record.Record;
+ import com.univocity.parsers.common.record.*;
+ 
+ /**
+diff --git a/src/main/java/com/univocity/parsers/fixed/Lookup.java b/src/main/java/com/univocity/parsers/fixed/Lookup.java
+index 1aeff0d..bcf0f98 100644
+--- a/src/main/java/com/univocity/parsers/fixed/Lookup.java
++++ b/src/main/java/com/univocity/parsers/fixed/Lookup.java
+@@ -16,6 +16,7 @@
+ package com.univocity.parsers.fixed;
+ 
+ import com.univocity.parsers.common.*;
++import com.univocity.parsers.common.record.Record;
+ import com.univocity.parsers.common.record.*;
+ 
+ import java.util.*;
+-- 
+2.35.1
+
diff --git a/dev-java/univocity-parsers/metadata.xml b/dev-java/univocity-parsers/metadata.xml
new file mode 100644
index 000000000000..155f678863f2
--- /dev/null
+++ b/dev-java/univocity-parsers/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">uniVocity/univocity-parsers</remote-id>
+	</upstream>
+	<longdescription>
+		univocity-parsers is a collection of extremely fast and reliable parsers for Java. It provides a consistent interface for handling different file formats, and a solid framework for the development of new parsers.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild b/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild
new file mode 100644
index 000000000000..d8a1215f2da3
--- /dev/null
+++ b/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Some test dependencies have not been packaged yet
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.univocity:univocity-parsers:2.9.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of extremely fast and reliable parsers for Java"
+HOMEPAGE="https://www.univocity.com/"
+SRC_URI="https://github.com/uniVocity/univocity-parsers/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+# Restore value of S overridden by java-pkg-simple.eclass to default
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	# https://github.com/uniVocity/univocity-parsers/pull/502
+	eapply "${FILESDIR}/${P}-explicitly-import-Record.patch"
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	einstalldocs # https://bugs.gentoo.org/789582
+}
diff --git a/dev-java/xpp3/Manifest b/dev-java/xpp3/Manifest
index 6fbd1cf4ab93..872fdd45d489 100644
--- a/dev-java/xpp3/Manifest
+++ b/dev-java/xpp3/Manifest
@@ -1,4 +1,3 @@
 DIST xpp3-1.1.4c.jar 128334 BLAKE2B a0c1d871216e44f7196ae8edd4c0ca2503a16821b6f592e4af0fcc1da346135fd5023fa5210abe1ce772d0001274c0f6a3d2383b7ebad1a65ffa967ac31c1d5e SHA512 743d2a0b20d16e97b640d9ad3e20e56a7446cdaf4ca0ebba072bdbe3eed0ef90289c2829376b4a209b35e0960adee5e01f11e8f361798333d8b4eaf4f1038445
-EBUILD xpp3-1.1.4c-r5.ebuild 775 BLAKE2B 4904458b949700ab454da89f332c7e2e6e114ceaea21f53886f85d28d05d60fd0b0b515fd5c0519c408ad872c1c04d2d33748e27c0427efbcea075a697b6ee0a SHA512 85ca3d9ad08ca1f65f346593245c41d07614893a56b77d605e714f0046e15253fa953a5af9a4169854f8895e77629960ead6b81b171f28e35bda185b4566c5c5
-EBUILD xpp3-1.1.4c-r6.ebuild 985 BLAKE2B de83e919fb7e2bca8110b862067543c449cb98c71c64aea2837b1e650b837f89aae6fea79e7389fb3a767a9d11b312159d176d88f5e7b0b5e60ba3060334eacb SHA512 62fee410e9e3a3996620eada51812d1855c72107e3ae0f786d7af03c280fa07c11a17731746f8cc50ac846cef5c929e089ceab12d5f22ae3cc5c930bbe324967
+EBUILD xpp3-1.1.4c-r6.ebuild 981 BLAKE2B ce40a84d65ef3841f4ca9500ca0abb7f3f7fa6a402a82d6cf76f062b40c7f0d8da9fdc1e2b958be6faf523959cdfdc4d9aa7d143ef7d936c18acac28d22ae6c9 SHA512 ab9a8bb70ebb08500f0479033e1956fb1e5bd36fca40b21bc7dc3959dd9ffc134d899cb2d98c3e202c26f472a54c33a9d9ceafc418775f1815d52eeae84ca185
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r5.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r5.ebuild
deleted file mode 100644
index 3f30d6b9c176..000000000000
--- a/dev-java/xpp3/xpp3-1.1.4c-r5.ebuild
+++ /dev/null
@@ -1,29 +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"
-MAVEN_ID="xpp3:xpp3:1.1.4c"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An implementation of XMLPULL V1 API"
-HOMEPAGE="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html"
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
-SLOT="0"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-
-JAVA_RESOURCE_DIRS="resources"
-
-src_prepare() {
-	default
-	mkdir "resources" || die
-	cp -r "META-INF" "resources" || die
-}
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild
index 3b9eb1d77ff8..8a6c69a8706a 100644
--- a/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
 LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # Restriction to java 1.8
 # Otherwise jdk 11+ would fail to build javadoc: