gentoo resync : 12.05.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
committer: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
commit: 752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree: 330d16e6362a49cbed8875a777fe641a43376cd3 /dev-java
parent: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
286 files changed, 2359 insertions, 4414 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 7f3c99d462a4..6fc64a876c86 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 97f5dc6ec729..682eed797391 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,16 +1,10 @@
-AUX ecj-4.10 342 BLAKE2B c69e9a66c9239e7ff4b7b35a4dcddec7cdec02ccf782862a0428e7e4d720dc22a931b58d40db5027e186a6129d0598702d9a95b1fc85ac38957ab6769377054b SHA512 c5ed672288d957ff52d6b44e2758dd589aba050e5915ebc1be92c112ef91c7506051893ac03f08115e9a75e16f91a68d26837e8e8e1e84c6bdb5fd8f4b953474
-AUX ecj-4.13 348 BLAKE2B 8c591be42a3f2fbe414ca7f8ea3546d99bf5bf88c65a802992ddf7eed4da4642f245215b44b64e1781de33550f48459a5288feb58fd079214a59f5d3a4537c51 SHA512 2a318687de82cdd314e5a7036a59ee6638d4983c8cd1458574fba01eedd589fa265b5ebefd1bdb4a9d0e0488d39fcc71e164598d66d9423431b4293b068de8fa
 AUX ecj-4.15 354 BLAKE2B e8ddbe928140e99fa36f0e4937cf1e9bf06bc3660ffdfba91099b35e4effaae3df1cb582a3cc8e9b26415d129d3c7e6b43f69e80f714ec1770ff593aebe4d5a8 SHA512 a8c159538a280ddc3616dce8fe6d1677ac45d7a72b27c23c85224a1d7e3acbb73912f2013be99b075f7b91e7ab52b4d871280246f1af56cf3718e3ce24b8ccc0
 AUX ecj-4.22 378 BLAKE2B d0d01286ef045eabeb70a82c9839a12758a5b942208262a1eae1abf49dc2b9a8397de773a75fafb821cfc5e65d16203d7969982275b8cd0b8941be9ccca5d200 SHA512 f687c6105029f6b46191277e88a6d16b9d814bca5dfb9ddc6dcc306db49a97052e04be8aeb52b82a9e512645b4eb47614ec046f53b398de19e0e27405314baa2
 AUX ecj-4.5 322 BLAKE2B 2941d70de68459d2bea21ae10680dbbee7888e156753e2bb7bae89b4c2aa41e453106b6ab0ae3660790cf70799550e09fd612a8736b0ac07a3859cdc25446e86 SHA512 d46976eb709a65e1d01af6b48d095325daf10a1ee4ff5da22de12593a253ba21e9550538ff13d1b7844fdb2604462d28133011301ba6a69cab83b2de7c7324f2
-DIST ecjsrc-4.10.jar 2036945 BLAKE2B cf9e50e53dac970a0b6b1231024a4efdc9adc92e02585aa4767c6511b367b32eefaf6fb3461c3c5c8160cf7205c0f708af0c433f4636b5a49caf637ba60fa092 SHA512 e85cacf6d2e21d464ff0226eac12bab8388df7a1413cb16d2982e255eb7369341792562f5080354279be0643c08fd80564a8eb2d8f59b72c8443c02577e4e1ee
-DIST ecjsrc-4.13.jar 2074963 BLAKE2B d74caf3b81543ac12497148a477dcd99fb6d14bd1d601b9e2baa0fb82d12f1211533f5ee909465b190c780ac18f1fbc1f8e12c22cddfce10501923effd7a4cc1 SHA512 f7e49b29e8aa80d627230059c9aba3f1e1fe3824bfd43eac962331d545471df5af0ac49b489aa3795e79e161101a3c6406b29f71a06143914f241916ae6953a9
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
 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 1264 BLAKE2B 631af41f9a02ed8336a7252fd17feb4c080692b10f9e8c6f692562510276dd2feb4714e44698bc7210c96f442ce1b195adad4b3ff57d95d8f6ea1f4cfed41965 SHA512 93ce0a64e99f1b6959136cff595562915751ec4bae0deaba0d4b80b0c0fde55ed87a0ad2ea426293169f0417ec24dc7a8b608452b3701d6159aed6f10f5bbe83
-EBUILD ant-eclipse-ecj-4.22.ebuild 1422 BLAKE2B a61913fa08c0ead3742a7699624a7aae99e428f72996b370765db1ef7952adb96b1000f528e1f5d5ac13e97070ced630d67762bd0be1ad63f84f29839705eac7 SHA512 57fc3e388f5f71a5bd5a01b4891d4192d7297faba5c5f991e9298070d572ed135bb4d0fd201df861696c863547880691aff58529bd924803f62382bb369b646a
+EBUILD ant-eclipse-ecj-4.15-r1.ebuild 1265 BLAKE2B 10003921348e6a8c03eb7fb048fdaf391ecfcf2c9a8d45cff57491bc0bd4507462fbba41282c8998aa4b4b50792fc6d374052c1ef1019e4dab30e24f8ff853fa SHA512 2cac62f7e51e2086fcdfbbef59a2e794d165692683d993e6c8aa77f0fb3daf55f0c4c20c117a984edb70b268d2fac1c3742ab674a56e73778ecc4b434242e00a
+EBUILD ant-eclipse-ecj-4.22.ebuild 1424 BLAKE2B 88ac2787bd6de2231fba225e8874ea615c705fa5aa0fa51fe8c251ab6f7069e9df4e72ef6bb9a16733de7850dac70c80497caba87f5fd70743a9b720bf90488c SHA512 a258c8f8451235cc21106e8617528d3503415dd3305a6b358cc6a286b62b24d5dfd46ea5d25d0fc4bed46c0907795f84e1df3a45e9b0c16b84c7cca522d9a3a6
 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.10-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild
deleted file mode 100644
index 720f27959e1a..000000000000
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple prefix
-
-DMF="R-${PV}-201812060815"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-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"
-SLOT="4.10"
-IUSE=""
-
-CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
-	>=dev-java/ant-core-1.7"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-11"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-11"
-
-JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
-
-java_prepare() {
-	# Remove everything but the Ant component.
-	find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
-
-	rm build.xml || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	insinto /usr/share/java-config-2/compiler
-	doins "${FILESDIR}/ecj-${SLOT}"
-	eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
-}
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild
deleted file mode 100644
index a7881b3908e8..000000000000
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild
+++ /dev/null
@@ -1,50 +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 prefix
-
-DMF="R-${PV}-201909161045"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-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"
-SLOT="4.13"
-IUSE=""
-
-CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
-	dev-java/ant-core:0"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-11"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-11"
-
-JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
-
-src_prepare() {
-	default
-
-	# Remove everything but the Ant component.
-	find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
-
-	rm build.xml || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	insinto /usr/share/java-config-2/compiler
-	doins "${FILESDIR}/ecj-${SLOT}"
-	eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
-}
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 30383fea53f5..449a22d33932 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
@@ -10,8 +10,8 @@ inherit java-pkg-2 java-pkg-simple prefix
 DMF="R-${PV}-202003050155"
 
 DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
 
 LICENSE="EPL-1.0"
 KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild
index 21b3dfc5b0d8..1fc9f8bb2347 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild
@@ -10,8 +10,8 @@ inherit java-pkg-2 java-pkg-simple prefix
 DMF="R-${PV}-202111241800"
 
 DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
 
 LICENSE="EPL-1.0"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.10 b/dev-java/ant-eclipse-ecj/files/ecj-4.10
deleted file mode 100644
index cc87bb2fc4d6..000000000000
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.10
+++ /dev/null
@@ -1,7 +0,0 @@
-JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.10"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.10*"
-SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11"
-SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11"
-ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.10,ant-eclipse-ecj-4.10"
-GENERATION="2"
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.13 b/dev-java/ant-eclipse-ecj/files/ecj-4.13
deleted file mode 100644
index d9c479e37367..000000000000
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.13
+++ /dev/null
@@ -1,7 +0,0 @@
-JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.13"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.13*"
-SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12"
-SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12"
-ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.13,ant-eclipse-ecj-4.13"
-GENERATION="2"
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index 9c30acc23427..7c0703e76771 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,4 +1,3 @@
 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
+EBUILD ant-ivy-2.5.0-r1.ebuild 8555 BLAKE2B cf37b07fe2a32e39193130bda115e0bafbd268a6c62e3b63ee16717323d81a601af415fc7ad974539f36aa3c86460404b6880c58f64d47fabecf469de0a4bcbd SHA512 ccc5281d3da84393ce2a4e6fcbc5ac78e72fd384365d238900aca37d0b996e011aa022f6afd760195d3b7178728fa18bc2a5b4b67a457aa060a3859a1888820d
 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
index cb8092656c67..fff42019b905 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 PROPERTIES="test_network"
 RESTRICT="test"
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
deleted file mode 100644
index 4e3633fe3296..000000000000
--- a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.ivy:ivy:2.5.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple java-osgi
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="https://ant.apache.org/ivy/"
-SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ppc64 x86"
-
-PROPERTIES="test_network"
-RESTRICT="test"
-
-CDEPEND="
-	dev-java/ant-core:0
-	dev-java/bcpg:0
-	dev-java/bcprov:0
-	dev-java/commons-httpclient:4
-	dev-java/commons-vfs:2
-	dev-java/httpcore:0
-	dev-java/jakarta-oro:2.0
-	dev-java/jsch:0
-	dev-java/jsch-agent-proxy:0
-	test? (
-		dev-java/ant-junit:0
-		dev-java/ant-junit4:0
-		dev-java/ant-junitlauncher:0
-		dev-java/ant-testutil:0
-		dev-java/hamcrest-core:1.3
-		dev-java/hamcrest-library:1.3
-		dev-java/xmlunit:1
-	)"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( LICENSE NOTICE README.adoc )
-
-S="${WORKDIR}/apache-ivy-${PV}"
-
-JAVA_GENTOO_CLASSPATH="ant-core,bcpg,bcprov,commons-httpclient-4,commons-vfs-2,httpcore,jakarta-oro-2.0,jsch,jsch-agent-proxy"
-JAVA_MAIN_CLASS="org.apache.ivy.Main"
-JAVA_SRC_DIR="src/java"
-JAVA_RESOURCE_DIRS="resources/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="ant-junit,ant-junit4,ant-junitlauncher,ant-testutil,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,xmlunit-1"
-JAVA_TEST_SRC_DIR="test-src/java"
-JAVA_TEST_RESOURCE_DIRS="test"
-JAVA_GENTOO_CLASSPATH_EXTRA="ant-ivy.jar:test.jar:custom-resolver.jar"
-
-# according to 57,60 build-release.xml
-# https://github.com/apache/ant-ivy/commit/c0c8df492d2312c983f50cfdc5841e18177f6f7b
-JAVA_TEST_EXTRA_ARGS="-Divy.cache.ttl.default=1s -Dskip.download=true -Divy.home=/tmp -D/offline=true"
-
-# Several tests require a certain treatment to "generate-bundles":
-# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L426-L428
-# <ant dir="${basedir}/test/test-repo" target="generate-bundles"/>
-#
-# The procedure is coded in https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/test/test-repo/build.xml#L19-L71
-# but appears too difficult to be reprodused with 'java-pkg-simple.eclass'.
-# So the failing tests will be excluded, saved for a later attempt.
-#
-# Not excluding any test classes results in  "Tests run: 1109,  Failures: 98"
-# Excluding those test classes listed below leads to "OK (812 tests)"
-JAVA_TEST_EXCLUDES=(
-	# https://github.com/apache/ant-ivy/blob/083e3f685c1fe29092e59c63b87e81d31fc9babe/build.properties#L56
-	# test.class.pattern = *Test
-	"org.apache.ivy.ant.testutil.AntTaskTestCase" # not in scope
-	"org.apache.ivy.core.TestPerformance" # not in scope
-	"org.apache.ivy.util.TestXmlHelper" # not in scope
-	"org.apache.ivy.TestFixture" # not in scope
-	"org.apache.ivy.TestHelper" # not in scope
-	# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L412-L420
-	# <exclude name="**/Abstract*Test.java"/>
-	"org.apache.ivy.util.url.AbstractURLHandlerTest"
-	"org.apache.ivy.plugins.resolver.AbstractDependencyResolverTest"
-	"org.apache.ivy.plugins.matcher.AbstractPatternMatcherTest"
-	# following excluded tests cause test failures
-	"org.apache.ivy.ant.BuildOBRTaskTest" #                                 Tests run: 3,  Failures: 2
-	"org.apache.ivy.core.deliver.DeliverTest" #                             Tests run: 1,  Failures: 1
-	"org.apache.ivy.core.module.descriptor.IvyMakePomTest" #                Tests run: 1,  Failures: 1
-	"org.apache.ivy.core.settings.XmlSettingsParserTest" #                  Tests run: 29,  Failures: 1
-	"org.apache.ivy.osgi.core.AggregatedOSGiResolverTest" #                 Tests run: 3,  Failures: 1
-	"org.apache.ivy.osgi.obr.OBRResolverTest" #                             Tests run: 16,  Failures: 16
-	"org.apache.ivy.osgi.repo.BundleRepoTest" #                             Tests run: 4,  Failures: 3
-	"org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParserTest" #      Tests run: 46,  Failures: 1
-	"org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParserTest" #     Tests run: 44,  Failures: 7
-	"org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriterTest" #     Tests run: 10,  Failures: 1
-	"org.apache.ivy.plugins.parser.xml.XmlModuleUpdaterTest" #              Tests run: 14,  Failures: 3
-	"org.apache.ivy.plugins.resolver.JarResolverTest" #                     Tests run: 3,  Failures: 3
-	# following excluded tests can pass if run individually
-	"org.apache.ivy.ant.IvyConfigureTest" #                                 OK (14 tests)
-	"org.apache.ivy.IvyTest" #                                              OK (1 test)
-	"org.apache.ivy.MainTest" #                                             OK (12 tests)
-	"org.apache.ivy.plugins.report.XmlReportWriterTest" #                   OK (3 tests)
-	"org.apache.ivy.plugins.resolver.BintrayResolverTest" #                 OK (12 tests)
-	"org.apache.ivy.plugins.resolver.ChainResolverTest" #                   OK (15 tests)
-	"org.apache.ivy.plugins.resolver.FileSystemResolverTest" #              OK (27 tests)
-	"org.apache.ivy.plugins.resolver.IBiblioMavenSnapshotsResolutionTest" # OK (1 test)
-	"org.apache.ivy.plugins.resolver.IvyRepResolverTest" #                  OK (3 tests)
-	"org.apache.ivy.plugins.resolver.Maven2LocalTest" #                     OK (2 tests)
-	"org.apache.ivy.plugins.resolver.PackagerResolverTest" #                OK (3 tests)
-	"org.apache.ivy.plugins.resolver.URLResolverTest" #                     OK (5 tests)
-	"org.apache.ivy.plugins.trigger.LogTriggerTest" #                       OK (3 tests)
-	# Without PROPERTIES="test_network", the following test cause additional failures.
-	"org.apache.ivy.core.settings.OnlineXmlSettingsParserTest"
-#	"org.apache.ivy.osgi.updatesite.UpdateSiteAndIbiblioResolverTest"
-	"org.apache.ivy.osgi.updatesite.UpdateSiteLoaderTest"
-#	"org.apache.ivy.plugins.resolver.IBiblioResolverTest"
-#	"org.apache.ivy.plugins.resolver.MirroredURLResolverTest"
-	"org.apache.ivy.util.url.ArtifactoryListingTest"
-#	"org.apache.ivy.util.url.BasicURLHandlerTest"
-#	"org.apache.ivy.util.url.HttpclientURLHandlerTest"
-)
-
-src_prepare() {
-	default
-
-	mkdir --parents "${JAVA_RESOURCE_DIRS}/META-INF" || die
-	pushd "${JAVA_RESOURCE_DIRS}"
-		cp "${S}"/{NOTICE,LICENSE} META-INF/ || die
-		cp -r "${S}"/src/java/* . || die
-
-		# DEPRECATED: 'ivyconf' element is deprecated, use 'ivysettings' instead
-		# according to 210,221 build.xml and still in the upstream .jar file
-		cp org/apache/ivy/core/settings/ivy{settings,conf}-local.xml || die
-		cp org/apache/ivy/core/settings/ivy{settings,conf}-default-chain.xml || die
-		cp org/apache/ivy/core/settings/ivy{settings,conf}-main-chain.xml || die
-		cp org/apache/ivy/core/settings/ivy{settings,conf}-public.xml || die
-		cp org/apache/ivy/core/settings/ivy{settings,conf}-shared.xml || die
-		cp org/apache/ivy/core/settings/ivy{settings,conf}.xml || die
-
-		find . -type f -name '*.java' -exec rm -rf {} + || die
-	popd || die
-}
-
-src_test() {
-	# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L396-L407
-	# name="build-custom-resolver-jar"
-	JAVA_SRC_DIR="test/custom-classpath"
-	JAVA_JAR_FILENAME="test/java/org/apache/ivy/core/settings/custom-resolver.jar"
-	java-pkg-simple_src_compile
-
-	# Without "license.xml" the tests won't even start. "Tests run: 1109,  Failures: 318"
-	jar -cf test.jar \
-		-C test/java org/apache/ivy/plugins/parser/xml/license.xml \
-		-C test/java org/apache/ivy/plugins/parser/m2/license.xml || die
-
-	# Reduce number of failures to "Tests run: 1109,  Failures: 98"
-	jar -uf "test.jar" -C test/java . || die
-
-	# Separate *.java files from test resources
-	# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L389-L393
-	mkdir test-src || die
-	cp -r test/java test-src/ || die
-	find test -type f -name '*.java' -exec rm -rf {} + || die
-
-	# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L430-L438
-	# name="prepare-test-jar-repositories"
-	mkdir test/jar-repos || die
-	jar -cfM "test/jar-repos/jarrepo1.jar" -C test/repositories/1 . || die
-#	jar -cfM "test/jar-repos/jarrepo1_subdir.jar" -C test/repositories 1/**/*/ || die
-
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	default
-	java-osgi_dojar-fromfile "ant-ivy.jar" "META-INF/MANIFEST.MF" "ant-ivy"
-	use doc && java-pkg_dojavadoc target/api
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/antlr-runtime/Manifest b/dev-java/antlr-runtime/Manifest
index bac6d10b68f0..b7f7f0217351 100644
--- a/dev-java/antlr-runtime/Manifest
+++ b/dev-java/antlr-runtime/Manifest
@@ -3,6 +3,6 @@ DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df8
 DIST antlr-runtime-3.5.2-sources.jar 206095 BLAKE2B 62b5ca08b13b80e1cdfe82d7354f75dcd3d82d7618bb2d20c4973c0b588d60cc034a8bc265d1cba6b3fc09f5583450a48948dc0beb86c4b13c6b9fdb32de37fd SHA512 fda8b0b1d6f779098c885360ea5f5e93eac5153f5bf761f3dbc954209b69b76edd21a8e4915bb9e567e5c095f1d173e19429bea34da9698bf241d17599858847
 DIST antlr-runtime-3.5.3-sources.jar 204572 BLAKE2B 8f4493497cbfef613028d4847d1a68a0fdd29f5bf80c3a72b33093aa048409fb740aa95e16e7ceb279b939fabf3a617ccc8046ef6b879eafdb4ae14599951799 SHA512 fbfb656b32aa40ce731996774c9a5df28e2dbf67d097a834b39ef137555ff618c26a881af599191fb75366dc3824e281e93a32dbed65d49cc39e2017d836ae95
 EBUILD antlr-runtime-3.5.2.ebuild 1012 BLAKE2B 4bca36c4491f8e88fd31a8c270737d868b30465e7068db823a354e9dd0d611b19799101cdf448581e4551740f88f70708451f92c93ee9443eb6aab5b6c75e8b7 SHA512 1517b4284e15876a4a4c6dde04ea45410bb20b95f6a5d86c49f6c545bf48d774fcba54ff65a41ed585f440fe2e1f30fc96ab1b29061740e18727f4fd7b35b7d6
-EBUILD antlr-runtime-3.5.3.ebuild 1016 BLAKE2B 503a5e51666dbbab7ca03eb37f9809df32f7dd8901d3a466ab0339984f32b17c475c72fa8b313dc077631e32a4c9fb7db335e98f63789318959ca156c213fc2d SHA512 0b37ebd2e2644c6000e195b7f8d80875b0d35a8b51a5ba2576b21e5d6bd71d2005308b3ea58c259d074a1e4ce452130ad8ade81822668db9a854cbc76c8d972f
+EBUILD antlr-runtime-3.5.3.ebuild 1013 BLAKE2B ec560f7c28f1f4b90ddf1682c9cf20a9cff944efe05cae2d4b73c0b2265f1449c622ac69900ab74266713c22b54c221ff2144b0cceb4389b1686e3ed25482e3c SHA512 6ea6a2beb2cdd0b6ddda64c336286d0de8c2aa2641e87e8c9c8de0a170dd4e79b009170e4dd0dc46318f90b226ed9788782743c02529ef8e228396e68ac64a3b
 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-3.5.3.ebuild b/dev-java/antlr-runtime/antlr-runtime-3.5.3.ebuild
index 7d9d8d21d52c..a28985e8f7b6 100644
--- a/dev-java/antlr-runtime/antlr-runtime-3.5.3.ebuild
+++ b/dev-java/antlr-runtime/antlr-runtime-3.5.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/antlr/${PN}/${PV}/${P}-sources.jar"
 
 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 # Common dependencies
 # POM: ${P}.pom
diff --git a/dev-java/antlr-tool/Manifest b/dev-java/antlr-tool/Manifest
index 7c99d56e1e92..a61e400ea0e6 100644
--- a/dev-java/antlr-tool/Manifest
+++ b/dev-java/antlr-tool/Manifest
@@ -7,6 +7,6 @@ DIST antlr-tool-3.5.2-sources.jar 957096 BLAKE2B 39b75824e129c8111f302eb71407a68
 DIST antlr-tool-3.5.3-sources.jar 949247 BLAKE2B f7afa52faae8324093206b7e56dfda58a79815cc2c13baca1cb93b3424c8b310325885ca8c86f0ca8a016a73e30740c2fa5f34ce71ed3a6cfc5fdeb6f2c4a9a7 SHA512 cfbc612c0257c4f0e09451cd76fe904680b6af132596696f2ef9c4e21dcfc53d53501e4d4d2b1c1cf4391355fa3766cf8dabc718dc3580728d24db3ebc14e696
 DIST antlr-tool-4.9.3-sources.jar 961749 BLAKE2B 294c7ba6dff9a1039d3e570d7d49f46a564302d1e7a25ac9f662a2c293cbabadd6a5a4a94d026c4e5fcca37c407e104956badbd1cbbf71b957e464dc67cf823e SHA512 7d70e80714b673eb8301def5e66a7133b2ac477e3cc219e37877ef9df673e0599a1148a8c1929ca8eab081d4e7375c9079241765a1f38832b21cfe8608ef4429
 EBUILD antlr-tool-3.5.2.ebuild 1979 BLAKE2B 8a50f774daf5cf0f89963b1ca66444dff7e5f23b087c9049d065cceedf4c64fca5a2ee7d2f8ad6fe24367b97f467808bef8123e0b579d2c3e9398a056fb4cf3b SHA512 4fba8468420a8bfaea0800d3269cbb7ffe75465571d6523b118d40088e43eb723f0af78ff1cdace480d9c57313528011d6518767004c123d4060522b03f05781
-EBUILD antlr-tool-3.5.3.ebuild 1934 BLAKE2B 943bf7987fa70db630f14cb1b2629ffc24206ac93b3e36875d00cb0d225d92e29afcd3b80843c92995e2b80d9370072708ad82a07aac240ccb6dd22bf33c0ffc SHA512 5ff6bcb8c83b57205fc3df49b200dfcbe82d87184789e927d305d739835bce4d5886da1798e4b015cd36c08edace8cc8c267d7d377226a97436ebbb4d7d78b87
-EBUILD antlr-tool-4.9.3.ebuild 3753 BLAKE2B 761078ed141755b481e74bc16685b731371afe062e93e0f60f44ed72a7491836d507d86306ad96208fafd693a76fea4d802a5818d66d85fdaf10d8857774f9d7 SHA512 676f88674a0b05b5b4a20172a5dfeab54a329f274a0e23c8e2b0f02fc740a1ba284db401f99d6388c92a687490eaa478ca99578a8d99a6f1c9245d764b25557a
+EBUILD antlr-tool-3.5.3.ebuild 1931 BLAKE2B e8dd37f1fe914ac96c7204d597b26b7db00a1fa226586708fc6e9a7bc53294a567bccaaf84d6ea4a324ec438feee596f5e3977a3d537636a25b978bbe8bc68b1 SHA512 ecfd086168aba2362f8af0f7a388d6dd599a485c58852dd328c12892fa708bb82e54e56f47557bfed2553c57667df67cd42b0d5ba503d8bbfa4df62fa874989b
+EBUILD antlr-tool-4.9.3.ebuild 3751 BLAKE2B 148b08582d38087e00413bddb0ebaf47fa3dd9eef87bf8cae25cea455610f2016438afe5b59a49a479f82e6a8db446df1ceae5395e5b13c6e383501a1a62652b SHA512 ffbd7b9fe6bdd3e0c4be521f22131055e48f03550a1e8f2857b05fa6f5f669d74719e6f9eaf6ccdc2b39f223dbb4c11457bfc19273fe1d6c616ccaf8ad6f5ce2
 MISC metadata.xml 366 BLAKE2B 134ea633a45f3e33d57f4761afb1ff2d7f7778d06d66ff6e2e77a0c5777d48e8009697f64a4d50780b84b6672f352f4714a2b61d206cd158fcddd50902485caa SHA512 5b0bb774c494f1e7bbc486732abcea66922e65cd209df3d9fa090d71dabbc9aae59d437c340a5d78941d730388c95554fa80fb9852c8c0ceed05c9197d236301
diff --git a/dev-java/antlr-tool/antlr-tool-3.5.3.ebuild b/dev-java/antlr-tool/antlr-tool-3.5.3.ebuild
index 622181ef1f45..15acdcf47e32 100644
--- a/dev-java/antlr-tool/antlr-tool-3.5.3.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-3.5.3.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}
diff --git a/dev-java/antlr-tool/antlr-tool-4.9.3.ebuild b/dev-java/antlr-tool/antlr-tool-4.9.3.ebuild
index 835e4633d53d..3d4f0e5b9450 100644
--- a/dev-java/antlr-tool/antlr-tool-4.9.3.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-4.9.3.ebuild
@@ -82,7 +82,7 @@ src_prepare() {
 }
 
 src_compile() {
-	ebegin "Generating ANTLR 3 parsers"
+	einfo "Generating ANTLR 3 parsers"
 	"${MY_JAVA}" -cp "$(java-pkg_getjars \
 		--build-only --with-dependencies antlr-tool-3.5)" \
 		org.antlr.Tool $(find "${JAVA_SRC_DIR[@]}" -name "*.g") ||
@@ -109,7 +109,7 @@ src_test() {
 		CP+=":${res_dir}"
 	done
 
-	ebegin "Generating ANTLR 4 parsers for tests"
+	einfo "Generating ANTLR 4 parsers for tests"
 	pushd runtime-testsuite/test > /dev/null ||
 		die "Failed to enter runtime test source directory"
 	g4_files=( $(find * -name "*.g4") )
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index bcf3c65e1318..c6db48e4e6c2 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -9,6 +9,6 @@ DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df8
 EBUILD antlr-2.7.7-r9.ebuild 1151 BLAKE2B c5e4df7a9ddc43f3e1b490dbc9e05d252cfef1350a96ef9d4f8cf01dff06953e949a192d5bd36ba80d0315f33e32d91cab07176a4f0d5e7f368088342751891d SHA512 faf7da062bfbd5558d29d9d4fa2036f1cba91d4921e2b83ea3bf30f966a41536de0d657ef14ec19e45c8ed460e28778bc90e55edc4940b3331eac5ea2e3d4056
 EBUILD antlr-3.2-r1.ebuild 3249 BLAKE2B d0c72e2b8052f426e5c001f2860d7af1ca1c1bc213451507fbab4ea6570e3045e1c55307dc1b1dd0820d97d16347ae794d93b64e1b9049976c3b02f56b2ff29d SHA512 5f21e8ab24d2040299e7638d74a2f764a165c31c36128c07414960c317d1895804bc79dffe2c6ea760b21cd1e4a27aa01a8ebb44c4ef21dfae42edc51e4a6080
 EBUILD antlr-3.5.2-r2.ebuild 1604 BLAKE2B 8e9c84841818f52589ca22790f7e61c5c8b78b018e1f78dfa45b0bc3245f3c1a10a48f5fa96f1a45c6b5a2d1640ebe24683bd41d705f18e9ddab41a0ee0da5bc SHA512 46ff86ab7b47a783b8080ab7957fda04d8765da069d2e5daed6e9a39b921ed9bc56c21b32807b29ebdb3240282515e355a8ec3ec5d0e15a1ca5fbe997c9a7199
-EBUILD antlr-3.5.3.ebuild 1616 BLAKE2B 8d867382609cd4aa8bf29952c9a6bfcf7f75205bd5e981d113f97a0e3da2f1cd0284199dae9dad983c813843c83d4fa7a6fe1186769b6a0988e8cf810ff684e8 SHA512 695ab317abde0193763ea976679d1891c46568a8c925d4919aab5201ad3c2653aea53993c0148dc90e6516b482934ca3a6a63ca5f2620e0ae0bc1082933f0428
+EBUILD antlr-3.5.3.ebuild 1613 BLAKE2B 8f4f55c7946a48127ce629e7aaec265cde92ed0174aa569403821bce0cc230dff5da4fa13167d24b42086256c4dcacdd0842a173dd9118b5924c0b36a401dea1 SHA512 31a22d538a8e5b900c51c26220afa43398acc962ccdcd2ca1aa2b3c3b71ba369e1968cbc830948e495932c73d2d7d36d4d0da2e143846fec57a86416eb812ae1
 EBUILD antlr-4.9.3.ebuild 1640 BLAKE2B 408eb5fda7d1598621e34462f177fd641ad36d8e7906e508227377eeea2dd7e55ad3cb71af2a603de6a38cb0da85065ee7b71db42af4309c3ee251e10f5c4bd0 SHA512 485130449328d364975926fc0374e0ed9e12ca2c7d619c9d1af0daaa3dd5879a491bb953d41ffe84ef653702863f7da950b38766414ce9e1823fa1c909ce3174
 MISC metadata.xml 314 BLAKE2B 997f9c85d72f9b4cae21a3ecd063374f769f369d66ce8531fb158a17b9408ae3d35f117386acd08b89c16d5e0e8130b26ddada87b448529bf41a02deb5c1cdf2 SHA512 ad99513f6581ce95415e908eeba185cd4b6d03a8297e99735c7e79bf3dca1fa0c61a7ae03e47d8ba7429269a29558fae7321583b4f7d328e1da6a091237d9fde
diff --git a/dev-java/antlr/antlr-3.5.3.ebuild b/dev-java/antlr/antlr-3.5.3.ebuild
index 41ea8dc96c2b..541574a8f149 100644
--- a/dev-java/antlr/antlr-3.5.3.ebuild
+++ b/dev-java/antlr/antlr-3.5.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}
diff --git a/dev-java/aopalliance/Manifest b/dev-java/aopalliance/Manifest
index 9bf9c160ebf7..128128833ab8 100644
--- a/dev-java/aopalliance/Manifest
+++ b/dev-java/aopalliance/Manifest
@@ -1,3 +1,3 @@
 DIST aopalliance-1.0-gentoo.tar.bz2 4203 BLAKE2B 193ef51f8670a0e659ff7d43e909629168c3840f205368ab31a00b07e1e0bd81c8fec2a0429dd4d2932dd7bc6f582c54708c4f118ad697b4f3b41ab999a322c7 SHA512 6761933b9c127af9773f518df89a905fd67696964837b8cb841664f16564bc879dcfbd5f47dcf85e999d4dd64561a3b46edac1c639471d3ee9be3237d9064187
-EBUILD aopalliance-1.0-r3.ebuild 908 BLAKE2B d0997356ff3d8d988579fd7307d8960d0ca43477e8053ff81c46224095f7ecca881aa682968345118c8c3edd099b61373a508447dd2511107a5078535d5ad867 SHA512 d44957e3d52ecc4cf5a733791ff8c842685d7d97b1cd71fe84f7a9b8e9a55637fac9ded5f386758191ea4e065b1e4094b70ccb591f9f8e14055ca523ab89f184
+EBUILD aopalliance-1.0-r3.ebuild 947 BLAKE2B a5cc1e2801edf941aadf89254cf5b24c41d41428c5213d703166551bbed23bf6840dd1aaa7d58666d95cc67630296b03a3126395ab1086c51cb1947521a034cd SHA512 7c48c07bf538ed2e6abea47bb752e562be17591d8c27abe4ba419451c5768fd5a5e06123eaf47e352147548387f75500e60508a4e5b0145eb0cfa1099ee00117
 MISC metadata.xml 318 BLAKE2B 8f8307ee22954f2e845092c05b3552d9320a1ccb8421787a5373cbc0123e76ce2dacc93cfd6b83cec87b85927c95a674b28b81811ebd2223b78a1988c7904e4c SHA512 4307e863e3fabedc9971ae68ad8f1c46c2bef00e7daea5fc928c623caeb09424150b1f724dda149d755a7af1ddf22db065160e3dd11dc86b51ec32f6846d4d8d
diff --git a/dev-java/aopalliance/aopalliance-1.0-r3.ebuild b/dev-java/aopalliance/aopalliance-1.0-r3.ebuild
index 9c7c1638e2f2..777a3412b445 100644
--- a/dev-java/aopalliance/aopalliance-1.0-r3.ebuild
+++ b/dev-java/aopalliance/aopalliance-1.0-r3.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="aopalliance:aopalliance:1.0"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/apiguardian-api/Manifest b/dev-java/apiguardian-api/Manifest
index 3390a7fdfce4..683cf4495ef5 100644
--- a/dev-java/apiguardian-api/Manifest
+++ b/dev-java/apiguardian-api/Manifest
@@ -1,3 +1,3 @@
 DIST apiguardian-api-1.1.2.tar.gz 67267 BLAKE2B 27bbe157f23c0904863d093930968854771f4c6b1bc6b6a6e6b86604383abd291348fa8b009d760b3bc739bbfbdb74e9429942ce1acf4bfc52e29e79386f2059 SHA512 7c56ee15e0aba07e95b6f2fe7cedd98e449e774958eb63b2467066c381e1e82ad67c982c2885e18154c62e55fda80a1c2e0f689253afe449db9f7e7563122db6
-EBUILD apiguardian-api-1.1.2.ebuild 764 BLAKE2B 53cbbf796d53b9b6812b56be208d0dd81bdabddfd917655f54d9e0475b749c08843d54f39713ca570c16c09926990cba4a5424b2e8e5889b6bf04ff9095cc0d5 SHA512 2781ecb5c87cb0ea750082a64ecc97b901f271bd517173713cb2804b52e74c59439a0d6928941865b08adea4396bd1c77f8fddb2e1fb321c0292ab3ee1c60bed
-MISC metadata.xml 629 BLAKE2B b4b1e0ab2868f0953bbd02fc2ce392f9cc8303a6ba838ac5db93ac1942cbc07c184f1acdce977ba68cf7a842eb9a69d3cb67c9d8ae2631f4f22ba246e514e1ee SHA512 5c8ed27778be5acc2cd4396b72d464d30245667de22183d375c25e1e7fae3a69711557688d22d82fb4876d781c73a50fc0dc5114fd39127446249024c553cb5d
+EBUILD apiguardian-api-1.1.2.ebuild 760 BLAKE2B bff17e704af6674b3fc6ae6f5fc694f7d3de3b0df3edf1a5bc154012f8c15ae0c238e910c9da0e32fbed10d8d03c459b9a88102d1d2ddb5f77914ebf9f668b0a SHA512 ca5dd36c585792d4ae9230996a1b6f2ae138457d53dd974e34b0b59b39fc94edabd22d07f4877cf30d6f9ac36a3026d6f34d64082be22842b0d9a031b8c32a53
+MISC metadata.xml 630 BLAKE2B 4d001de91a36f097a4a939e959ef99d68374661bf7ee8ecbbe53cf6c4802eb4de781b2410e0e9e0a33e17ed1647a02094561ab6f95b8140b9e0b60824e71251f SHA512 6b327e02c57224a464bde643b82b385a4ef874cddd1c61cb0d7bdfbd4ef98c8a3dd0c150d02998ad1189f194713e2f0d1b1738fffe63f84070d1aa6eb8df140e
diff --git a/dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild b/dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild
index 0a4134224322..b9bd660df331 100644
--- a/dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild
+++ b/dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/apiguardian-team/apiguardian/archive/r${PV}.tar.gz -
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/apiguardian-api/metadata.xml b/dev-java/apiguardian-api/metadata.xml
index 6bc8acd2f803..abafa97106c0 100644
--- a/dev-java/apiguardian-api/metadata.xml
+++ b/dev-java/apiguardian-api/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index d95ef747babc..5b096201100f 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,6 +1,8 @@
 DIST asm-ASM_4_0.tar.gz 14789505 BLAKE2B 62b49d904f1ef2d32379f4f5d644cdc274b30f292ee4f64ad02be7d2226a90965f7b12421700e79dcd1e67a46e6a8543d5e353486a1577313616688ddc57f3b3 SHA512 e654623a882d9fe414e71861183f64840f7b6629231864872497d4bf9274e8ac05e05496593fa54a90d8c6a2e6d701b9a6f3876df611637f7d2079c5519def1e
 DIST asm-ASM_5_1.tar.gz 16258842 BLAKE2B bd7d717cdfa6ff652c96b88d7b7d33fae614acba390c256ea72ecfbb3edc48382621a076dedf9b8728fdb1d0961cda943f165f99de840824b766c9af45a49339 SHA512 4bb32ce6eba267928261238f8f13cd2365ab374780039ad1df31698cd791645a370aca58c44270ec05f8377d6aa0a0d00f9f3890961cbd32a10cbd2e79e2d518
 DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd
+DIST asm-ASM_9_3.tar.gz 1666740 BLAKE2B 6905233f666159f861dda68a855e8f5632817b0627c2006d3a8e61340cd4afca9310860dd1eff46173ca7356583e6c44027e674f7e17eacaaf0dbcc24b92198e SHA512 401a4dd7c2638bbad940ca92c42b7ec6f44e1d19c407bba3cd6a081e0b51969cf62a0fbcc407ef4889d3c7d6c7b9893e77642c058f812e9d10b9d67c5215be42
 EBUILD asm-5.1-r1.ebuild 1280 BLAKE2B 9b4395b97760514e0f54c72ab1df3a0751991d13caf567a0441fb16c05f4a89559b1347b19a820ea79871123895a4f86431230fd41bd4735aa1e0d4e57c7d128 SHA512 78fa99694b9a1156a85067bab400bfb99f83f4908cd0e6f03eb64e067b15fe757f3cf4cd6b8b109227d6c42b1e3bc2900fc798d3e35d7323cf18a6dde9605c69
 EBUILD asm-9.2.ebuild 599 BLAKE2B 09ead99318e19ba5e0e8a32d1477966bedab99ce3ee004b1f326a33358dc2339bb49f02392a6523cb8ddbe4edd04e0104292013533947fa9ce6ecca6890e2adc SHA512 dc8383950360d58bf74a674ca9330acd522a5f3e8c64a5ba1a7527d7ca5f704d79df9449908a2479c3bea3842e6f81d20e7f3ac340c01ef4e167673701e6618d
+EBUILD asm-9.3.ebuild 1584 BLAKE2B 77bbcd3506dbc422a97aafd888109935bdb5872f3e13d9129d8f59df1737bdf2a8367de620113e8d9129305d059c6b5168670628038679c7ae77eb54cb77429a SHA512 f03be27d9203cc08f35388204adcabcace402629c8452874fff5a2043012443d61827926ab2b85f913d36f092638f6a582ae3388b370ff403485ae8553521938
 MISC metadata.xml 1231 BLAKE2B c61d8566d1a337e99616013267474cf4fc92afdfed38f1c2183d41980528fd1b8994bd6ce5a06b4fa85f54819d560379bb1b505c62f26f7421bd1965cbcf7244 SHA512 c0b4d632146cab80755c18a6e15e9e9673c7adc60addac523bbf98e8fb0f771b526fbaa65906914984d27658a7ee390e90d164e855f5bc5601bfef7b89d902a2
diff --git a/dev-java/asm/asm-9.3.ebuild b/dev-java/asm/asm-9.3.ebuild
new file mode 100644
index 000000000000..1f60fa7df080
--- /dev/null
+++ b/dev-java/asm/asm-9.3.ebuild
@@ -0,0 +1,65 @@
+# 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.ow2.asm:asm-bom:9.3"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Bytecode manipulation framework for Java"
+HOMEPAGE="https://asm.ow2.io"
+MY_P="ASM_${PV//./_}"
+SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+ASM_MODULES=( "asm" "asm-tree" "asm-analysis" "asm-commons" "asm-util" )
+
+S="${WORKDIR}/asm-${MY_P}"
+
+src_compile() {
+	local module
+	for module in "${ASM_MODULES[@]}"; do
+		einfo "Compiling ${module}"
+		JAVA_RESOURCE_DIRS=()
+		JAVA_MAIN_CLASS=""
+		JAVA_SRC_DIR="$module/src/main/java"
+		JAVA_JAR_FILENAME="$module.jar"
+		# Not all of the modules have resources.
+		if [[ -d $module/src/main/resources ]]; then \
+			JAVA_RESOURCE_DIRS="$module/src/main/resources"
+		fi
+		java-pkg-simple_src_compile
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar"
+		rm -r target || die
+	done
+
+	if use doc; then
+		JAVA_SRC_DIR=()
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		for module in "${ASM_MODULES[@]}"; do
+			JAVA_SRC_DIR+=( "$module/src/main/java" )
+		done
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_install() {
+	einstalldocs # https://bugs.gentoo.org/789582
+	local module
+	for module in "${ASM_MODULES[@]}"; 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
+}
diff --git a/dev-java/assertj-core/Manifest b/dev-java/assertj-core/Manifest
index b8cdcf3a7d8c..387771951369 100644
--- a/dev-java/assertj-core/Manifest
+++ b/dev-java/assertj-core/Manifest
@@ -1,4 +1,3 @@
 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
+EBUILD assertj-core-2.3.0-r1.ebuild 817 BLAKE2B 185e0e988f59a0c512c762176f83e5fbb5005ae950cdb9fab78ee4e80b222f23b203504f32f60d96648efb06c6ab23516cb30570672d6c7a89bede1037303ed9 SHA512 1c8356ce2314bc8e956092e2e8a0c849d9fb0d29bc24256e461b554ae1b5d18bfeafcbb3265f7b83c6281851df12a28b62f6cf8c86dba796d3eda3171752b9d3
 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
index 21ab78c440d6..018ad72c7861 100644
--- a/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild
+++ b/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 SLOT="2"
 
 CDEPEND="dev-java/cglib:3
diff --git a/dev-java/assertj-core/assertj-core-2.3.0.ebuild b/dev-java/assertj-core/assertj-core-2.3.0.ebuild
deleted file mode 100644
index 4d52cde7788b..000000000000
--- a/dev-java/assertj-core/assertj-core-2.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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="http://joel-costigliola.github.io/assertj/"
-SRC_URI="https://github.com/joel-costigliola/${PN}/archive/${P}.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.7"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-
-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/batik/Manifest b/dev-java/batik/Manifest
index 244492fabbfb..9cb153a3263a 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,8 +1,6 @@
 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 5258 BLAKE2B 7646b84b78affb3b789e026a9f71a6689b5835b368faf9acfad705b1c7314ba6870f4b7fadf7583a82ae697dc86f50cb9687cc8ac034f56920f152ae52bd53a7 SHA512 004bc8c5ff37a085951c258a43cfdd66da68c0e58890328bc349776e3db4306c6d33676af641c77679396dd301ad0402e5cfe9292d7e407aa9f589b5da25957e
-EBUILD batik-1.9.ebuild 2594 BLAKE2B a7aa8ebb48b3819cc4fb088cabc6dc858dd5c3f20b2779c910e8f631d2be3920c133ae38caf4048991f1d6a1108a2b16a14a3f8e3d6cdfcea1256bebfcdb1724 SHA512 bf2eee253a058dfe08714e3a533e37a034af1477534a00b425105d9d2330798c37ea9ed3a00dc79f56a7558effa5a44473c74260d0fd2fffe9b621679a120e46
+EBUILD batik-1.14-r1.ebuild 5215 BLAKE2B ef6d32420076d58c4973cd981fa71d448868dd8facb7b0213adb439f44886ae0e95a32a01ed533dce70940fab561ceecff9099e1530b1bdc978f2ef15e2bebab SHA512 5458ace08f1f2c2165607507c7684238769a4c0ecf9c3a52a8ca5abbbe5f8632512146efd32b7be83eb171d99dc8db8e98a75cca74b145d7e09852fff2710a1f
+EBUILD batik-1.14.ebuild 5255 BLAKE2B 941c89a89636efafbcc3607a1d5103d458f3acba4ae1806b7a4df24b3e5b53e081a5a5d8e5deb7fc3ce845be7723cc751ad2733a50e9e6680579eb5db4deb7ce SHA512 c8da33549a8cb656214403dc1b30914cd82f325daccb518f5b024c5036e12e28de8ec2b70fc61cec259a0ae85ea9894f30539bce1639369f68cdca6d4f279ad1
 MISC metadata.xml 610 BLAKE2B c589c175b595deb71eae6b8fccd46f4d6b82331f636cff28b6074300b6495efb780d157bb1b5b1359070cca7405138fcff719d72f1038023357fc7ab05c52b87 SHA512 73a6bb61c87645d1600ab90ca954599208c8599e967f6e999d973fa80e9693435db8a75ace95c8881486c8e2929d5a201a51e821e5f58763c273b21b5a32c229
diff --git a/dev-java/batik/batik-1.14-r1.ebuild b/dev-java/batik/batik-1.14-r1.ebuild
new file mode 100644
index 000000000000..97c0d8183481
--- /dev/null
+++ b/dev-java/batik/batik-1.14-r1.ebuild
@@ -0,0 +1,178 @@
+# 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 ~arm64 ~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.4
+	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
+		einfo "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
+		einfo "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/batik-1.14.ebuild b/dev-java/batik/batik-1.14.ebuild
index fa844886caec..74222ffb9dd1 100644
--- a/dev-java/batik/batik-1.14.ebuild
+++ b/dev-java/batik/batik-1.14.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.14"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 
 CP_DEPEND="
 	dev-java/jacl:0
diff --git a/dev-java/batik/batik-1.9.ebuild b/dev-java/batik/batik-1.9.ebuild
deleted file mode 100644
index 2e905bf8073d..000000000000
--- a/dev-java/batik/batik-1.9.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2 java-ant-2 epatch
-
-DESCRIPTION="Java based SVG toolkit"
-HOMEPAGE="https://xmlgraphics.apache.org/batik/"
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/source/${PN}-src-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.9"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc python tcl"
-
-CDEPEND="
-	tcl? ( dev-java/jacl:0 )
-	python? ( dev-java/jython:2.7 )
-	dev-java/xalan:0
-	dev-java/rhino:1.6
-	dev-java/ant-core:0
-	dev-java/xmlgraphics-commons:2
-	dev-java/xml-commons-external:1.3"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="
-	xml-commons-external-1.3
-	xmlgraphics-commons-2
-	rhino-1.6
-	xalan"
-
-src_prepare() {
-	default
-
-	# See bug 318323.
-	local file
-	for file in build.xml contrib/rasterizertask/build.xml; do
-		java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v no -a maxmemory -v 512m
-	done
-
-	# See bug 628812.
-	use tcl && epatch "${FILESDIR}/${P}-ImportInfo.patch"
-
-	cd lib || die
-	rm -v *.jar build/*.jar || die
-	use python && java-pkg_jar-from jython-2.7
-	use tcl && java-pkg_jar-from jacl
-}
-
-src_compile() {
-	# Fails to build on amd64 without this
-	export ANT_OPTS="-Xmx256m"
-	use amd64 && export ANT_OPTS="-Xmx1g"
-
-	eant jars all-jar $(use_doc)
-	cd contrib/rasterizertask || die
-	eant -Dgentoo.classpath="$(java-pkg_getjar ant-core ant.jar):../../classes" jar $(use_doc)
-}
-
-src_install() {
-	batik_unversion_jars() {
-		local jar
-		for jar in batik-*.jar; do
-			newj="${jar%-*}.jar"
-			java-pkg_newjar ${jar} ${newj}
-		done
-	}
-
-	# First unversion jars in ${P}/lib
-	cd "${S}/${P}/lib" || die
-	batik_unversion_jars
-
-	# Then, only those in ${P}
-	cd "${S}/${P}" || die
-	batik_unversion_jars
-
-	# Proceed with documentation installation
-	cd "${S}" || die
-	dodoc README CHANGES
-	use doc && java-pkg_dojavadoc "${P}/docs/javadoc"
-
-	# See bug #116976.
-	java-pkg_dolauncher "batik-${SLOT}" \
-		--pwd "${EPREFIX}/usr/share/${PN}-${SLOT}/" \
-		--main org.apache.batik.apps.svgbrowser.Main
-
-	# To find these lsjar batik-${SLOT} | grep Main.class
-	local launcher
-	for launcher in ttf2svg slideshow svgpp rasterizer; do
-		java-pkg_dolauncher batik-${launcher}-${SLOT} \
-			--main org.apache.batik.apps.${launcher}.Main
-	done
-
-	# Install and register the ant task.
-	java-pkg_dojar contrib/rasterizertask/build/lib/RasterizerTask.jar
-	java-pkg_register-ant-task
-}
diff --git a/dev-java/batik/files/batik-1.9-ImportInfo.patch b/dev-java/batik/files/batik-1.9-ImportInfo.patch
deleted file mode 100644
index 103b99e1b967..000000000000
--- a/dev-java/batik/files/batik-1.9-ImportInfo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreterFactory.java	2017-10-28 17:24:11.401276868 +0000
-+++ b/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreterFactory.java	2017-10-28 17:27:13.314255999 +0000
-@@ -20,6 +20,7 @@
- 
- import java.net.URL;
- 
-+import org.apache.batik.script.ImportInfo;
- import org.apache.batik.script.Interpreter;
- import org.apache.batik.script.InterpreterFactory;
- 
diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest
index ce71b7ff5219..2d9a53dd7e84 100644
--- a/dev-java/bsf/Manifest
+++ b/dev-java/bsf/Manifest
@@ -1,6 +1,5 @@
 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
+EBUILD bsf-2.4.0-r3.ebuild 2723 BLAKE2B 346854857aeea8cc8c9020d3cd04d824c49daf2e7b4d6b678c04b452623e9055ecbb6750fc61815a8a51bf1fa1fc5229c80ef987729be176325182a59c8d0150 SHA512 d1d9c3e2dea130d92d2898d3f6449d0e66b25d86fa65b94cfd5212143b94527450a742505cf2551cb3e61012e4ac94becb48ab1c7b18a23a793605f1d9b0e967
 MISC metadata.xml 904 BLAKE2B 6e791ca9562cd211b97a13c79701155efa8b58be87f9af9c076017da0ca9f406a2ccc673eefb1d56db9cb2b9481fc77b01e9f762a98bd858199883ac06fde17e SHA512 36cd9c82eaa80842fae4c0f51ca63611d6a2b7a5724d755d0651edf069a67dcad3ce13789ca07cf2be353efb1c8b3a04e367be548925e29507155235749af66b
diff --git a/dev-java/bsf/bsf-2.4.0-r2.ebuild b/dev-java/bsf/bsf-2.4.0-r2.ebuild
deleted file mode 100644
index a6d049b54c10..000000000000
--- a/dev-java/bsf/bsf-2.4.0-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 epatch java-ant-2
-
-DESCRIPTION="Bean Script Framework"
-HOMEPAGE="http://commons.apache.org/bsf/"
-SRC_URI="mirror://apache/jakarta/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.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-java_prepare() {
-	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.
-	epatch "${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/bsf-2.4.0-r3.ebuild b/dev-java/bsf/bsf-2.4.0-r3.ebuild
index 3310d4809efd..93a6ebde1b57 100644
--- a/dev-java/bsf/bsf-2.4.0-r3.ebuild
+++ b/dev-java/bsf/bsf-2.4.0-r3.ebuild
@@ -12,7 +12,7 @@ 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"
+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"
diff --git a/dev-java/cal10n/Manifest b/dev-java/cal10n/Manifest
index cec42534e7d5..dfac47ed45e9 100644
--- a/dev-java/cal10n/Manifest
+++ b/dev-java/cal10n/Manifest
@@ -1,3 +1,3 @@
 DIST cal10n-0.8.1.tar.gz 358264 BLAKE2B 1561d2ea7309e470b5bf5990d166af1974ddbfc766ee14101bef33d3b41e5d18bcadbe1ba769eb028d6a41c43b7498c29118a5d7c7b4a93bd55d0a9db5d42eb4 SHA512 882146cddcc8489f08c7354b2029448cc084932fbb6c448271dbfc9ddb11740744bfe161a4e4d58071fc010bc3891d094681584a7a559514d443dcceedafbca2
 EBUILD cal10n-0.8.1.ebuild 3469 BLAKE2B ee5741e87a7c23feafb8cdb799b938513f28da15b6df68a89a2d1f4a2d9e05fc1d8935e65dd75692e03d66d9806a0d2a4b445934e6f330e802887048cdec8183 SHA512 75e37861c032157d70b853cdea43e91f28ee71fdb780ccbb3c2e8f2396e8f678a8fe211a0ca8f51ec200472f4e41784e6ad0ae99f341bf33c0c5dac7d474b29a
-MISC metadata.xml 314 BLAKE2B 9a158ffea633bbed9cd2f7d24c6783bed4c200214d8ab6b7463b7093f9aab9e545cd86a8723d89b7466172e4d50be85acd800ef5f48ec407e773256e35454071 SHA512 6e703050f8faa8ed9c3b4b8b85cb503876ac1b9cf06ff248b70dd4416f06803110f54ba412fcd5cb5ebea38a6aff8d1369520539decfb5a5c75d34442812a1c6
+MISC metadata.xml 315 BLAKE2B 970db2ada29fa2c11cfa52dae30569a31828643e6a9b351a1cc4fbc47fde1636bde688a330355b98bd196a3544b02d4a25efb035d37b427bd0e537371a7d911a SHA512 54256e88722e9d6f171cef5977bbfd970e6bff02e3fbebd389711c0309bc3d5703d818a67a2afb44a00bb8a348f536b7abd18e662f6675b7f84d5fc4986d0d37
diff --git a/dev-java/cal10n/metadata.xml b/dev-java/cal10n/metadata.xml
index 846277cea474..792aa536ff7c 100644
--- a/dev-java/cal10n/metadata.xml
+++ b/dev-java/cal10n/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
index 3e032beae0e9..28d0f8d4ee0d 100644
--- a/dev-java/commons-cli/Manifest
+++ b/dev-java/commons-cli/Manifest
@@ -1,3 +1,5 @@
 DIST commons-cli-1.4-src.tar.gz 148530 BLAKE2B 72460ee073b4e8c5179da03c3d599cf04b37b5b3aff89e4927b07765bd879acc9ac56f52e7dee03214e21f7ba9e5af3adf54d2f943aebb266bfa9b4983ba0380 SHA512 a5db856f6154e4340aab1865e3b34c752c0dceb8063faa64740ed470d8e6b3e7782242ae51d6bb57a535a6d6dad2943cc3130d7202223b8f89b8cbecdc3d9d4f
+DIST commons-cli-1.5.0-src.tar.gz 156731 BLAKE2B b3bc3c7426f4564187f6b2fecf2977a8d307277cb244bb51064f32e6d2fc0ddb08c539b3bae68bba5ccc2319d0e483f01f6765ae3e86ebfe99eb775564fd7c8f SHA512 aa2165695177c3e4561f68585cafb5434758138d8a863f3db1860477f660cf78664d2afb07cc3bc767bc8fa87befc7eaa5bdead423ee8b883c62ff00aec7cdda
 EBUILD commons-cli-1.4.ebuild 1073 BLAKE2B 47369d5c19d43c955e2cfafed597607929c8cac3d940a7bfd07abad0a9f7527453c55e6ce47c98ec53c2f741884c1049015a5b4d02f1187c0558367865d6068c SHA512 6158af3b2d265f06499174fd392f95ac46feaad3d5b76b8e85448600e724ebbfd6de2614b35d8e3f31b6bd120baf0265403487c42d1c20e2271a1a0df0ed8750
+EBUILD commons-cli-1.5.0.ebuild 1241 BLAKE2B 04ce102c416377aa8b3d217cf6133e5de6f7cace7f013e190f6d657acb1253d7a1875617ca428af3a7b0c50efcd89e90a1468d9d93d16121a537d45ce7706e86 SHA512 6c623f4549da4d5c89e878e496637bd82a4465168ed4a70cb330530e8597316fc3d321f5ecb6ad44ebf704187d042eb073a70c882b7cbfce2717c833729eaf31
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/commons-cli/commons-cli-1.5.0.ebuild b/dev-java/commons-cli/commons-cli-1.5.0.ebuild
new file mode 100644
index 000000000000..8fb0198774dc
--- /dev/null
+++ b/dev-java/commons-cli/commons-cli-1.5.0.ebuild
@@ -0,0 +1,43 @@
+# 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="commons-cli:commons-cli:1.5.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java library for working with the command line arguments and options"
+HOMEPAGE="https://commons.apache.org/proper/commons-cli/"
+SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DEPEND=">=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+# There were 62 failures:
+# 1) testSimpleLong(org.apache.commons.cli.ParserTestCase)
+# java.lang.InstantiationException
+#         at java.base/jdk.internal.reflect.InstantiationExceptionConstructorAccessorImpl.newInstance(InstantiationExceptionConstructorAccessorImpl.java:48)
+# FAILURES!!!
+# Tests run: 444,  Failures: 62
+JAVA_TEST_EXCLUDES="org.apache.commons.cli.ParserTestCase"
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index 83dfee5a0cee..ee312efdd1e4 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,6 +1,4 @@
 AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12404 BLAKE2B 294ef11924310e2e63865018843faf199521f619e0859cc2c857d8a9fb038fbc44d88b06cf2df44b05cc6891c9e9d1bba5898071a873fc0dd774427afb0a2de2 SHA512 af18eeb48d8da55fc63526a528b88f626d9fad2369a6a8f570fe2dfee76384a5d86a9bab4883e557a1acd0a866859c4bd075476f9cfaff8e8465de6db0f2848d
 DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490
-DIST httpcomponents-client-4.5.13-src.tar.gz 824131 BLAKE2B 1507c81749a92afcf8b170b606761236d71b02d8b8b257d753a0f09abbdc297057df39661e827dee52804a2138de7d201b2a837418cbec21085fd3ffd558b51c SHA512 421e413fb2206fa95b6428ff067cdf2b440d2d3d4503cc3ca9bcf70ccd8ed1b8273ec4fe0703e6a8cd7612940b7ed966d9f163dbfeb8bf699ae2a8b2e0866d05
 EBUILD commons-httpclient-3.1-r2.ebuild 1709 BLAKE2B 73b08779a549b7f3ba8e5961e9db672aa69ebdd89e7998f389763fe8c70a57f40ec8bd83b343f17670e1934038a4699ae443451071b4b24f21ff6b33118dbbc5 SHA512 9b5a9f39c2e2856e1778cb04db68d12211d1d0bd789f94d7ac3dfb5eeec1803d5ede3b93087a0af092824fea3e916aad5d05b3e606c02e2994318cdac615d4a0
-EBUILD commons-httpclient-4.5.13-r1.ebuild 2234 BLAKE2B 193917142633805b8663f25a95b103ebe7fd498fd640cf51e5e70828786e92dcb7d6e3f4da100cd0485dca2f57bc78dc4ef0668e7d44d1485c907313f9d8ced1 SHA512 137bca4b83f20d955b4c0c90edd2ab4896c3a10c8d22db9d082246479400a1429f2d4d2dcc8fa96568e33d6386241e3e45e4a4c21b63d84ac257052749c3fd90
 MISC metadata.xml 457 BLAKE2B aa9b78ee94c6ac0cd435c142183612524e588138764dcf4ea6b2474925f5238983ebbcf75ba32d78e42b62f3751e042785291f00cd9a6453c9711b4110ce04a5 SHA512 46da6fef35f122be653de8ff6f87048475dae83e8853a05210e403f239ce3823caafca0e26aa503377ccfd9c5616f4f69d4d3b483b9adb7b512351d85be5f531
diff --git a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
deleted file mode 100644
index 38274be97d07..000000000000
--- a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom httpcomponents-client-4.5.13/httpclient/pom.xml --download-uri https://github.com/apache/httpcomponents-client/archive/refs/tags/rel/v4.5.13.tar.gz --slot 4 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-httpclient-4.5.13.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.httpcomponents:httpclient:4.5.13"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache HttpComponents Client"
-HOMEPAGE="https://hc.apache.org/httpcomponents-client"
-SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-
-# Common dependencies
-# POM: httpcomponents-client-${PV}/httpclient/pom.xml
-# commons-codec:commons-codec:1.11 -> >=dev-java/commons-codec-1.15:0
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-# org.apache.httpcomponents:httpcore:4.4.13 -> >=dev-java/httpcore-4.4.14:0
-
-CDEPEND="
-	dev-java/commons-codec:0
-	dev-java/commons-logging:0
-	dev-java/httpcore:0
-"
-
-# Compile dependencies
-# POM: httpcomponents-client-${PV}/httpclient/pom.xml
-# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
-# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/hamcrest-core:1.3
-		dev-java/mockito:0
-	)"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt )
-
-S="${WORKDIR}/httpcomponents-client-${PV}/httpclient"
-
-JAVA_GENTOO_CLASSPATH="commons-codec,commons-logging,httpcore"
-JAVA_SRC_DIR=(
-	"src/main/java"
-	"src/main/java-deprecated"
-)
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,hamcrest-core-1.3"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
-	# Tests run: 929,  Failures: 1
-	# javax.net.ssl.SSLHandshakeException: Remote host terminated the handshake
-	"org.apache.http.conn.ssl.TestSSLSocketFactory"
-)
-
-src_install() {
-	default
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/conversant-disruptor/Manifest b/dev-java/conversant-disruptor/Manifest
index 13d658a0eaa9..e9b5aaeb2861 100644
--- a/dev-java/conversant-disruptor/Manifest
+++ b/dev-java/conversant-disruptor/Manifest
@@ -1,3 +1,3 @@
 DIST conversant-disruptor-1.2.19.tar.gz 171364 BLAKE2B 2ac7a42835f22ae7361f156b9cb9853cea39b757c9869847b9b4c526e3e04e46ae8b7ca90c1c38bd3fa57f6925bfc95767235fb4640e7ecf1e62044973b53932 SHA512 f475507e2ab2e4260ec04b699c42115fa917f3df9dc67bbf944c96441e58fff1ab8ba63beb97dbc77d3b76f65b6b116d84b17a1eb4b40d58dedbc029e81e39ee
-EBUILD conversant-disruptor-1.2.19.ebuild 1292 BLAKE2B 83cec59db360ef0071f6f73dbd7ee8e456a790ef779184b3636277589b688746822c2de7bc9c5014eacca135c6b50a4587f2bd679a55265fbd39ae630345446c SHA512 2264cd76056eef7de35c51d2d682a29fcb7c639c61562fc43e2d2e7fb8e9b9069fc6573677e93553faf8c2517e6acb515406fadc8ea64decbe584f332fc9faf1
+EBUILD conversant-disruptor-1.2.19-r1.ebuild 1291 BLAKE2B 2bc5ca4d984836415961f6060911a76e0bf3fb11347d4076726c5f55eab5abdb524b7116f7dca48a4f5d7333b76d9c76a635e769e7c548ba196aa1d2ad18e5e2 SHA512 089076214d1aace12c37068bb9e6ecea208a2642786fffb9ef05f0b26712af564a990d5b168eeaf371b18caeedf93f855c626ca61a172fc7bd9eafe86180ece7
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/conversant-disruptor/conversant-disruptor-1.2.19.ebuild b/dev-java/conversant-disruptor/conversant-disruptor-1.2.19-r1.ebuild
index 29858069b4b0..f16f11a1f119 100644
--- a/dev-java/conversant-disruptor/conversant-disruptor-1.2.19.ebuild
+++ b/dev-java/conversant-disruptor/conversant-disruptor-1.2.19-r1.ebuild
@@ -26,7 +26,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 # test? org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
 
 DEPEND="
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	test? (
 		dev-java/slf4j-api:0
 	)
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 5b21fd938a1d..a16a8e359205 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,11 +1,7 @@
-DIST ecjsrc-4.10.jar 2036945 BLAKE2B cf9e50e53dac970a0b6b1231024a4efdc9adc92e02585aa4767c6511b367b32eefaf6fb3461c3c5c8160cf7205c0f708af0c433f4636b5a49caf637ba60fa092 SHA512 e85cacf6d2e21d464ff0226eac12bab8388df7a1413cb16d2982e255eb7369341792562f5080354279be0643c08fd80564a8eb2d8f59b72c8443c02577e4e1ee
-DIST ecjsrc-4.13.jar 2074963 BLAKE2B d74caf3b81543ac12497148a477dcd99fb6d14bd1d601b9e2baa0fb82d12f1211533f5ee909465b190c780ac18f1fbc1f8e12c22cddfce10501923effd7a4cc1 SHA512 f7e49b29e8aa80d627230059c9aba3f1e1fe3824bfd43eac962331d545471df5af0ac49b489aa3795e79e161101a3c6406b29f71a06143914f241916ae6953a9
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
 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 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
+EBUILD eclipse-ecj-4.15.ebuild 1737 BLAKE2B de3aff3c46cf68494920930ffbf337cc79864d1adaef1c603f1c9ea8ce168823e8ba772a0a616c77ab7dafc596e37687e6460db89ee61c4127c41ed739b2d914 SHA512 6a0bd08a4aac020bc4f299907777d40673128798bd093b3bc03602aa86bb7c3436d7400ba0dc31c58ff0703d6357ac691f909dd2358a773e0b548139d251a8e7
+EBUILD eclipse-ecj-4.22.ebuild 1695 BLAKE2B 2628143984d6915cf4ebad4b5194909d4f5ab742bbfb5beeec03741b9ad4654762fd5e7b8429be2bf082dc5978dae0d85c2a8e902566c8bb98da956793015721 SHA512 a613f6cb111f2ed21aa66d91ca93cb3c21f28daf3ac93208701749cce4d7445603b53c872b920ae0350fb7cf396f93e0dc0f20aedf979ad319ad1705f44e1bf6
+EBUILD eclipse-ecj-4.5.1.ebuild 1629 BLAKE2B bfeed649e040db43497aa5e204d5eefcf997bcf57cfbad18745bf43b8196ac60e8e13b8641841935b85b6417790f404c85044fc66e36f83ed5cb7e528065faab SHA512 37a7ff7eb2ee2e072a1315285a2a5f3ea60637afd69ac6636904d5fe76353300ac2f4d94b06d43ba56e41547a6e99585f881e2c3b22e423f849151e109adbef4
 MISC metadata.xml 646 BLAKE2B 644ff172a0719eb9a8669ea6c472adeace597f2c9baef893707c366d1aa86d04a92c4873abe2894e8405c0198c7588f4f7110df11b520f22afd20cb0a018d9f3 SHA512 c611a29d9e2f37b25cbfb631e1292832aab4c78122b26fca2b5689b4aa7337ed87b3dd17a95ee5aacfeae6d57f9400c6ef79479b190df072eadcdcbefc38edf7
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.10.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.10.ebuild
deleted file mode 100644
index 18842971b055..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.10.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="ecj"
-DMF="R-${PV}-201812060815"
-
-DESCRIPTION="Eclipse Compiler for Java"
-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"
-SLOT="4.10"
-IUSE="+ant"
-
-COMMON_DEP="
-	app-eselect/eselect-java
-	dev-java/ant-core"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-11"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-11
-	app-arch/unzip"
-PDEPEND="
-	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
-
-JAVA_JAR_FILENAME="${MY_PN}.jar"
-JAVA_GENTOO_CLASSPATH="ant-core"
-
-S="${WORKDIR}"
-
-# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
-java_prepare() {
-	# These have their own package.
-	rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-	rm -r org/eclipse/jdt/internal/antadapter || die
-
-	# JavaCore is not distributed in the jar
-	sed -i -e '/import org.eclipse.jdt.core.JavaCore;/d' \
-		-e 's|JavaCore.getOptions()||g' \
-		org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
-		org.eclipse.jdt.internal.compiler.batch.Main
-}
-
-pkg_postinst() {
-	einfo "To select between slots of ECJ..."
-	einfo " # eselect ecj"
-
-	eselect ecj update ecj-${SLOT}
-}
-
-pkg_postrm() {
-	eselect ecj update
-}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.13-r2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.13-r2.ebuild
deleted file mode 100644
index 11d2edd08bd6..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.13-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 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
-
-MY_PN="ecj"
-DMF="R-${PV}-201909161045"
-
-DESCRIPTION="Eclipse Compiler for Java"
-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"
-SLOT="4.13"
-IUSE="+ant"
-
-COMMON_DEP="
-	app-eselect/eselect-java
-	dev-java/ant-core:0"
-RDEPEND="${COMMON_DEP}
-	virtual/jre"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-11
-	app-arch/unzip"
-PDEPEND="
-	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
-
-JAVA_PKG_WANT_SOURCE="1.8"
-JAVA_PKG_WANT_TARGET="1.8"
-JAVA_JAR_FILENAME="${MY_PN}.jar"
-JAVA_GENTOO_CLASSPATH="ant-core"
-
-S="${WORKDIR}"
-
-# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
-src_prepare() {
-	default
-
-	# These have their own package.
-	rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-	rm -r org/eclipse/jdt/internal/antadapter || die
-
-	# JavaCore is not distributed in the jar
-	sed -i -e '/import org.eclipse.jdt.core.JavaCore;/d' \
-		-e 's|JavaCore.getOptions()||g' \
-		org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
-		org.eclipse.jdt.internal.compiler.batch.Main
-}
-
-pkg_postinst() {
-	einfo "To select between slots of ECJ..."
-	einfo " # eselect ecj"
-
-	eselect ecj update ecj-${SLOT}
-}
-
-pkg_postrm() {
-	eselect ecj update
-}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
index 37b49f67ee47..56b7b7bfeed2 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
@@ -11,8 +11,8 @@ MY_PN="ecj"
 DMF="R-${PV}-202003050155"
 
 DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://archive.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"
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild
index e9f4bee64891..12eec977d83f 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild
@@ -11,8 +11,8 @@ MY_PN="ecj"
 DMF="R-${PV}-202111241800"
 
 DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://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"
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
index 5e2a7d0f72aa..2aed82b6859b 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
@@ -11,8 +11,8 @@ MY_PN="ecj"
 DMF="R-${PV}-201509040015"
 
 DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://archive.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"
diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
index 56985015c818..2ad57a9ac4f2 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -1,10 +1,6 @@
-AUX fontbox-1.7.1-build.xml 10618 BLAKE2B 6fe7b6a3b274ee3a419675c56e86a865d1e05c393d39b5bd897bf54cf6c45fb27674078747da927c3df1e9d017d332ccf1aec00499947a62fc850590adfd5c31 SHA512 8f3173325808c096cca21f69bb70f9ed5a43c0e56b5d6487604de399625bb40fbeecc569c068bb6840a87fb5edcc3e22171d8c6fab28a2c00b36172196c1935c
 DIST DejaVuSansMono.ttf 317336 BLAKE2B c80f50cea451963a75c66160596b67655afb19c9ea0d61b8a5cd38b81c66bdd89a24872d293fa8752b1ce0bb828d63caf91e682c283312d5828218943c63c095 SHA512 1af1ce3e6d34a0b89c93072d8646e92cceb45b276389d2dd0d84457ec1193394d2bcc49bf3ce99c9c6b2658cd1337fc40ee5c61957f74cd45dbc3d51b6aef417
 DIST NotoEmoji-Regular.ttf 418804 BLAKE2B e94f7b1d5bced052ff3f15a32ecce8f0f1dc2ef19565d3bcaa75b82676fbf0efeaa6efa1d25edf352b577acce17a45c6f0e7be1550c46a8c2ab6cef208cd6f11 SHA512 51b01ab0794be9f92c59679f6d56d4ce09ed959daeb9ec945bb837eb15a82ab302e83b29aab1972ac9cb648f7196a5f5ff4488a4622b36bedbc9cd0cab6dc3de
 DIST SourceSansProBold.otf 104072 BLAKE2B 2c6538ed97cca04a6a38a1bcca7def6c9e923f0e7a773c2715d50ca1a526b1ff683bc6544155b1e170fb828c3923d6b22cdf7017f9da9de164523f328c1cc187 SHA512 28a044a2685fbc8da7810d9ac7b6b93a95542d504d7d8e671f009b8ebb2f5b70c974be7ea78974b188d8e6ab17d65b08f276c054927857315d5aad26f6fe36fc
-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 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/files/fontbox-1.7.1-build.xml b/dev-java/fontbox/files/fontbox-1.7.1-build.xml
deleted file mode 100644
index ccde1983d680..000000000000
--- a/dev-java/fontbox/files/fontbox-1.7.1-build.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 8/2/12 1:39 PM                        -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="fontbox-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="fontbox-1.7.1"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath"/>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             source="1.5" 
-             linksource="false" 
-             breakiterator="false">
-      <link href="http://download.oracle.com/javase/1.5.0/docs/api/"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.8.1"/>
-    <get src="http://repository.apache.org/snapshots/junit/junit/4.8.1/junit-4.8.1.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.8.1/junit-4.8.1.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/fontbox/fontbox-1.7.1-r1.ebuild b/dev-java/fontbox/fontbox-1.7.1-r1.ebuild
deleted file mode 100644
index d2cd213f9ef4..000000000000
--- a/dev-java/fontbox/fontbox-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="pdfbox"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="An open source Java library for parsing font files"
-HOMEPAGE="https://pdfbox.apache.org/"
-SRC_URI="https://archive.apache.org/dist/pdfbox/${PV}/${MY_P}-src.zip -> ${P}.zip"
-
-LICENSE="BSD"
-SLOT="1.7"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~x64-macos"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-
-src_prepare() {
-	default
-	cp -v "${FILESDIR}/${P}-build.xml" build.xml || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/fontbox/fontbox-1.7.1-r2.ebuild b/dev-java/fontbox/fontbox-1.7.1-r2.ebuild
deleted file mode 100644
index 0f32b29e1928..000000000000
--- a/dev-java/fontbox/fontbox-1.7.1-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="pdfbox"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="An open source Java library for parsing font files"
-HOMEPAGE="https://pdfbox.apache.org/"
-SRC_URI="https://archive.apache.org/dist/pdfbox/${PV}/${MY_P}-src.zip -> ${P}.zip"
-
-LICENSE="BSD"
-SLOT="1.7"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86 ~x64-macos"
-
-RDEPEND="
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)"
-
-BDEPEND="
-	app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-
-src_prepare() {
-	default
-	cp -v "${FILESDIR}/${P}-build.xml" build.xml || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index c6d39023f5ea..23456a18e42a 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,8 +1,4 @@
-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-jars.tar.xz 7348 BLAKE2B 79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c SHA512 71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6
 DIST fop-2.7-src.tar.gz 26799877 BLAKE2B 00bcbd4cc915aad67c0dac54e85b7c5d10576115a0a8a16517846af249137c73b10c8b0ff161c9957f7c49686eefbf9777dc452b038573c996e29cbad951176a SHA512 bffbc0a97db8bbc826cf9af89fbf4a7e6f705585ea4915c0954df57c6d7af50d323387bb4bb9e2d13047826352d9eb7cbf4f23d5146ce246965b4c531e015633
-EBUILD fop-2.0-r3.ebuild 3050 BLAKE2B 99e24888912fda8f6d9d2ca37ad03d6af2b4631e8bbf6d3fd3f2398c92636612afba50127fa1c627401b4a41b7f8c03632aea486e92c3c3c493a083a0b9d15b2 SHA512 debaeea4df79a274fe79c531e808e331f1995deb23c981224fe3f8dde57dd62c911494c86a578d314d373289d286d0475c96ad8bbeedf9227f87a4679c21ea45
-EBUILD fop-2.7.ebuild 4136 BLAKE2B 03c747bd16ae9a34e55e6ef90bf3655f3626b97a781bdd015ccaf938fafe1351f04d6fc7f855f401a9e6ea8b126b37deb7b30d3fea6d64dd0b9f71b11b241816 SHA512 3a0ee2ccf107c2e8925f6e6df6cdaef46bebaea64b45c79955409736d0e81c5eb3cd0fdfdfe112067fc8adeb127c0ab17e0d18ce9ced30924defa308412327a2
+EBUILD fop-2.7.ebuild 4192 BLAKE2B 605530413f1d44ee7604c6115b3448a54a7bd171f234fea0145e445c98e68bcdbb7bc989fcd01ee2c950932687547d2e4dcd20aa8a1006fc339c8dd014489459 SHA512 0a022f9c1238760823f66299c78d13267a7168273630ca42b7bcf5c18527fcaeec153bb171ad10bc7c187620568ac03fbe901321ab1c960db56fc36f951ad50f
 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
deleted file mode 100644
index 49bece365d93..000000000000
--- a/dev-java/fop/files/fop-2.7-core-event-models.jar
+++ /dev/null
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
deleted file mode 100644
index 7c2fff6a088d..000000000000
--- a/dev-java/fop/files/fop-2.7-test-event-model.jar
+++ /dev/null
diff --git a/dev-java/fop/files/headless-launcher.bash b/dev-java/fop/files/headless-launcher.bash
deleted file mode 100644
index a01c56f5e6ef..000000000000
--- a/dev-java/fop/files/headless-launcher.bash
+++ /dev/null
@@ -1 +0,0 @@
-[[ "${!#}" = "-awt" ]] || gjl_java_args="-Djava.awt.headless=true"
diff --git a/dev-java/fop/fop-2.0-r3.ebuild b/dev-java/fop/fop-2.0-r3.ebuild
deleted file mode 100644
index 6265183f67ad..000000000000
--- a/dev-java/fop/fop-2.0-r3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot
-#       be built as it needs forrest which we do not have
-# TODO: package and use optional dependency jeuclid
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
-HOMEPAGE="https://xmlgraphics.apache.org/fop/"
-SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# Tests are broken even in 2.0
-RESTRICT="test"
-
-CDEPEND="
-	dev-java/batik:1.9
-	dev-java/ant-core:0
-	dev-java/fontbox:1.7
-	dev-java/commons-io:1
-	dev-java/commons-logging:0
-	java-virtuals/servlet-api:3.0
-	dev-java/avalon-framework:4.2
-	dev-java/xmlgraphics-commons:2
-	dev-java/xml-commons-external:1.3
-	dev-java/qdox:1.12"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-#	test? (
-#		dev-java/ant-junit:0
-#		dev-java/junit:4
-#		dev-java/xmlunit:1
-#		dev-java/mockito:0
-#	)"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="
-	ant-core
-	batik-1.9
-	fontbox-1.7
-	commons-io-1
-	commons-logging
-	servlet-api-3.0
-	avalon-framework-4.2
-	xmlgraphics-commons-2
-	xml-commons-external-1.3
-"
-
-TARGETS=(
-	resourcegen
-	jar-hyphenation
-	jar-sandbox
-	jar-main
-)
-
-java_prepare() {
-	find "${S}"/lib -type f | xargs rm -v
-}
-
-src_compile() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=554386
-	# http://wiki.apache.org/xmlgraphics-fop/HowTo/BuildFOPAlternatively
-	java-pkg_jar-from --into lib qdox-1.12 qdox.jar
-	java-pkg_jar-from --into lib xmlgraphics-commons-2 xmlgraphics-commons.jar
-	java-pkg_jar-from --into lib commons-logging commons-logging.jar
-	java-pkg_jar-from --into lib commons-io-1 commons-io.jar
-	java-pkg_jar-from --into lib fontbox-1.7 fontbox.jar
-	java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis-ext.jar
-	java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis.jar
-	java-pkg_jar-from --into lib avalon-framework-4.2 avalon-framework.jar
-	java-pkg_jar-from --virtual --into lib servlet-api-3.0 servlet-api.jar
-
-	for target in ${TARGETS[@]}; do
-		EANT_BUILD_TARGET="${target}" \
-			java-pkg-2_src_compile
-	done
-
-	if use doc; then
-		sed -i -e 's/failonerror=\"true\"/failonerror=\"false\"/;' ./build.xml
-		EANT_BUILD_TARGET="javadocs" \
-			java-pkg-2_src_compile
-	fi
-}
-
-src_install() {
-	java-pkg_dojar \
-		build/${PN}.jar \
-		build/${PN}-sandbox.jar \
-		build/${PN}-hyph.jar
-
-	java-pkg_dolauncher \
-		${PN} --main org.apache.fop.cli.Main \
-		-pre "${FILESDIR}/headless-launcher.bash"
-
-	dodoc NOTICE README
-
-	if use doc; then
-		java-pkg_dojavadoc \
-			build/javadocs
-	fi
-
-	if use examples; then
-		java-pkg_doexamples \
-			examples/* conf
-	fi
-
-	if use source; then
-		java-pkg_dosrc \
-			src/java/org \
-			src/sandbox/org
-	fi
-}
diff --git a/dev-java/fop/fop-2.7.ebuild b/dev-java/fop/fop-2.7.ebuild
index e6aa1be68d31..a40189884199 100644
--- a/dev-java/fop/fop-2.7.ebuild
+++ b/dev-java/fop/fop-2.7.ebuild
@@ -11,11 +11,14 @@ 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"
+SRC_URI="
+	mirror://apache/xmlgraphics/fop/source/${P}-src.tar.gz
+	https://dev.gentoo.org/~flow/distfiles/fop/${P}-jars.tar.xz
+"
 
 LICENSE="Apache-2.0"
 SLOT="2.7"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 
 CP_DEPEND="
 	dev-java/batik:1.14
@@ -95,7 +98,7 @@ src_compile() {
 	# 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"
+		jar -xf "${WORKDIR}/fop-2.7-core-event-models.jar"
 	popd
 	jar -uf "fop-core.jar" -C event-model . || die
 	# Upstream does this with maven-antrun-plugin:
@@ -126,7 +129,7 @@ src_test() {
 
 	# 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
+	jar -xf "${WORKDIR}/fop-2.7-test-event-model.jar" || die
 
 	java-pkg-simple_src_test
 
diff --git a/dev-java/freehep-graphicsbase/Manifest b/dev-java/freehep-graphicsbase/Manifest
deleted file mode 100644
index 74079c7f6d6e..000000000000
--- a/dev-java/freehep-graphicsbase/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST freehep-vectorgraphics-2.4.tar.gz 4118379 BLAKE2B c8a5840ebab43398a6f87f97855a38f843b0e05267f5446b5f22a0c0124c98717c00801fe93ef3b541b2c53d07176ab1319a27ad26ed177b6dded11e3fa2e7bb SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382
-EBUILD freehep-graphicsbase-2.4.ebuild 1232 BLAKE2B 96548095f99407031b5b33578598020279f28549ee2521d2359e935f7f0f53665deb26fb6d489a340a9de670add1468ea7b68819a848df8d5dccced2db775d34 SHA512 91fc0324bcd02ee36e446bb5ec081eee54da58743ddab0fd086e22a92bde956cfe276725bf51e532e5927a5fd7295587d420b1d55da8ed7d78a5b28b1767f81e
-MISC metadata.xml 332 BLAKE2B b068badae4c159eb9fae77c3780edd8cb8dc6462750c4dd144f21e6534d173d65b05948ab2827beb407387f44c70474437d8536c11f6c1b776642c3c6374b5f6 SHA512 2c2eb1120fcad20dc8cc98aaa56d07bbf415cbd28198d292f6fb5c038d1944ce1ae29b38ff79a7382264f7fc06eb0ad8eb55448731bdb9643ec8b99337d0df4a
diff --git a/dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild b/dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild
deleted file mode 100644
index 75ea8d477b41..000000000000
--- a/dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="freehep-vectorgraphics"
-MY_P="${MY_PN}-${PV}"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP Graphics Base Library"
-HOMEPAGE="http://java.freehep.org/"
-SRC_URI="https://github.com/freehep/${MY_PN}/archive/${MY_P}.tar.gz"
-LICENSE="Apache-2.0 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-java/freehep-io:0
-	dev-java/junit:4"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}/${PN}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="freehep-io,junit-4"
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_test() {
-	local DIR=src/test/java
-	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH})"
-	local TESTS=$(find ${DIR} -name "*Test.java" ! -name "ExportFileTypeTest.java")
-	TESTS="${TESTS//src\/test\/java\/}"
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/freehep-io/Manifest b/dev-java/freehep-io/Manifest
deleted file mode 100644
index 39bc5f732cec..000000000000
--- a/dev-java/freehep-io/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST freehep-io-2.2.2.tar.gz 76935 BLAKE2B 11468effa883c44f4376bac7282881942209cd5769545083bd761489f31eceec96c909d452f2a056172c8fee65917895acb34c18583d771a258883e4e12c3906 SHA512 1cc7cab3d9648b119aa8c637c84cd985adc0f9dd2cdd153021500831325d719ef5fa41d8964ccbeed3af95b87e09c4886597c0ede1370a209f6807932636b0ee
-EBUILD freehep-io-2.2.2.ebuild 936 BLAKE2B cf9191988fe948d49462eaa97f18f52fd86ee3c241216230a37d30ac1da1cba2c70135f0a792ab40666725470c5028177d2b4aab1cd2c3d6c53ec9dd70a3bd9e SHA512 720219b1e3fce51361ec3cc4cc99206463abc77931d02c9320b41ffa073e253552f4777bbdfa92ec9595877f21d1f5a411aba6a9f366619384b052529f8331f7
-MISC metadata.xml 320 BLAKE2B b44bc879ee1d52a81b92424d7725b1c7313588af0844c2e51e32781bd8e96dc78122e3352dbd5112e0286b8691a4eaac2ab873fe32f323f0f9fa9eaaebb27f07 SHA512 1861759d80238474516ad621c51e4f08255d0934cb6c92c0d45aee0d0422b1821f2c408698ab34b2abdc75f63172d4551bcb4214848f22ea09b4a8a4937570f4
diff --git a/dev-java/freehep-io/freehep-io-2.2.2.ebuild b/dev-java/freehep-io/freehep-io-2.2.2.ebuild
deleted file mode 100644
index 12bf7791effb..000000000000
--- a/dev-java/freehep-io/freehep-io-2.2.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 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
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP I/O Library"
-HOMEPAGE="http://java.freehep.org/"
-SRC_URI="https://github.com/freehep/${PN}/archive/${P}.tar.gz"
-LICENSE="Apache-2.0 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=virtual/jdk-1.7
-	test? ( dev-java/junit:4 )"
-
-RDEPEND=">=virtual/jre-1.7"
-
-S="${WORKDIR}/${PN}-${P}"
-JAVA_SRC_DIR="src/main/java"
-
-src_test() {
-	local DIR=src/test/java
-	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4)"
-	local TESTS=$(find ${DIR} -name "*Test.java" ! -name "Abstract*")
-	TESTS="${TESTS//src\/test\/java\/}"
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/freehep-io/metadata.xml b/dev-java/freehep-io/metadata.xml
deleted file mode 100644
index ed1a26e8a4fd..000000000000
--- a/dev-java/freehep-io/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-	<upstream>
-		<remote-id type="github">freehep/freehep-io</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/glassfish-interceptor-api/Manifest b/dev-java/glassfish-interceptor-api/Manifest
deleted file mode 100644
index ecbe549a2a30..000000000000
--- a/dev-java/glassfish-interceptor-api/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX glassfish-interceptor-api-3.1-build.xml.patch 376 BLAKE2B 55ee41094ff5877474578e6ed77f1e5c8aae221b1080672de3f7bf2d949fda26f13bf43d891e899b61f1fc65032661831e6c5c2247e47901a07e80e48fd52961 SHA512 9c98831903c3f96df13a5ce0771a1064e9458f12f8e2a898758ccb63f0dbaab6047082dda5fa5a8e111c442536af28681eb712a6f4dc8844b388f721a0101c26
-DIST glassfish-interceptor-api-3.1.tar.xz 14600 BLAKE2B ef46f503a0a44650750f9cc53b51d02219779e2b1891c46179e07566a7ed359cb8ac455d2819bd22c5af7a78f33861a32e26c2cf977ebdac46f172e144c536dd SHA512 674f53d53afb63799c579b0ec177a009178315fb62f027441da14ceb5d6fa07408840ad82aa8fa7be31b53d43b53ff28ffb1617d644c989bc4ac17ce5e626563
-EBUILD glassfish-interceptor-api-3.1.ebuild 842 BLAKE2B a3faf04ee1ee021570566498c5eb713bdd93f6cc1543da35bcf392c1d57d74c6b71bde7a5f7aef8b6c9d55d416292c2da51dd12982c6541373def94c82683f14 SHA512 f4ebd4be93896f145936807b4b3ff68cf62684ffc5334a7e759ddd93cc48bdbe30b1746da312301ce44e3cb3b5e93b9444c74ebdbdf32354655fa03bff4f6fcd
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/glassfish-interceptor-api/files/glassfish-interceptor-api-3.1-build.xml.patch b/dev-java/glassfish-interceptor-api/files/glassfish-interceptor-api-3.1-build.xml.patch
deleted file mode 100644
index 1a912da629c2..000000000000
--- a/dev-java/glassfish-interceptor-api/files/glassfish-interceptor-api-3.1-build.xml.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/maven-build.xml
-+++ b/maven-build.xml
-@@ -166,7 +166,6 @@
-     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-          compress="true" 
-          index="false" 
--         manifest="/tmp/glassfish-interceptor-api-3.1/target/classes/META-INF/MANIFEST.MF" 
-          basedir="${maven.build.outputDir}" 
-          excludes="**/package.html"/>
-   </target>
diff --git a/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild b/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild
deleted file mode 100644
index 33ed4ef1f8d2..000000000000
--- a/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-TOMEE_PV="1.5.2"
-
-DESCRIPTION="Project GlassFish Interceptor API"
-HOMEPAGE="https://glassfish.java.net/"
-SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-
-CDEPEND=""
-
-DEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.7
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH=""
-JAVA_PKG_BSFIX_NAME="maven-build.xml"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-build.xml.patch
-}
-
-src_install() {
-	java-pkg_newjar target/javax.interceptor-api-${PV}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/javax
-}
diff --git a/dev-java/glassfish-interceptor-api/metadata.xml b/dev-java/glassfish-interceptor-api/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/glassfish-interceptor-api/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
-</pkgmetadata>
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
deleted file mode 100644
index 9ca8b3b1521f..000000000000
--- a/dev-java/gnu-classpath/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gnu-classpath-0.98-freetype-2.5.3-support.patch 1192 BLAKE2B 18a8c2a6516def598c614a50c7c260c13ba7304a1d189ef0d0d7ffbea37b2c8972fdb0449eacfe49deb58c3aaaac44b36593d2b3df745066f64889a957e08d51 SHA512 5832a27caf0a064a29fb00a186d116193af98c0f2a97ef868be7ca0cab1aa51bd32df90f32ee43f9ecdbda52ea3b264f6f3bbd48d8b8f7cb4d1e0a1444f716fb
-DIST classpath-0.98.tar.gz 11021342 BLAKE2B 8bd0c55153569b34dfde767233ed48f6ebf0f507d34d991a410b0e40a2ddfbd20d4568697265f8544823337f568a916288e92c096b39fcd5c67afc82ddfc3cc3 SHA512 0d98f87cd78c166d566ecd8d0372f2d6cdf422e8c4c806ca01d3a77dafbdd80ee936de78a2c5d4226174027efdc053fe92669514bdd8acb3290a7b3ec002d31f
-EBUILD gnu-classpath-0.98-r6.ebuild 2908 BLAKE2B 43d72cce9d97c8a58f3b2d166d39e7183721d9e65c8ead2661038bab68e3b1089e9b6d2fcd96b561cfaba8eda7e1686e4f3c9fc6e66978d37608caf268722c3a SHA512 3f3efd40f380a6e71c8c024ff277435d05d04280a9e9f66f5f06fc89030f52617123b8460a3f46841b4fea89115c0ba7ef5bd6f6c12b7bdbbd3415963b3a1aa3
-MISC metadata.xml 704 BLAKE2B 8fc63998c01d59a4180044b7610f220aeba7da80d57ad862530a9b9490dd33ada5d072352e4e8150ded3977289cc19c8fd930f6b50452b59052275adeb587460 SHA512 ddf64513a594122259b5f2f050626bf04c3da0ad31b5adf40082b5d416978ccd2b164d2bfd514c4099b4e57d585392f4fb34de34e773ec94279f0205ba339b5d
diff --git a/dev-java/gnu-classpath/files/gnu-classpath-0.98-freetype-2.5.3-support.patch b/dev-java/gnu-classpath/files/gnu-classpath-0.98-freetype-2.5.3-support.patch
deleted file mode 100644
index 42828e2a4b8f..000000000000
--- a/dev-java/gnu-classpath/files/gnu-classpath-0.98-freetype-2.5.3-support.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c.orig	2014-03-18 10:35:50.904133661 +0100
-+++ ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c	2014-03-18 10:37:03.808131298 +0100
-@@ -42,8 +42,9 @@
- #include <pango/pango.h>
- #include <pango/pangoft2.h>
- #include <pango/pangofc-font.h>
--#include <freetype/ftglyph.h>
--#include <freetype/ftoutln.h>
-+#include <ft2build.h>
-+#include FT_GLYPH_H
-+#include FT_OUTLINE_H
- #include "jcl.h"
- #include "gdkfont.h"
- #include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h"
---- ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c.orig	2014-03-18 10:37:12.048131031 +0100
-+++ ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c	2014-03-18 10:37:58.416129528 +0100
-@@ -39,10 +39,11 @@
- #include <pango/pango.h>
- #include <pango/pangoft2.h>
- #include <pango/pangofc-font.h>
--#include <freetype/ftglyph.h>
--#include <freetype/ftoutln.h>
--#include <freetype/fttypes.h>
--#include <freetype/tttables.h>
-+#include <ft2build.h>
-+#include FT_GLYPH_H
-+#include FT_OUTLINE_H
-+#include FT_TYPES_H
-+#include FT_TRUETYPE_TABLES_H
- #include "gdkfont.h"
- #include "gtkpeer.h"
- #include "gnu_java_awt_peer_gtk_GdkFontPeer.h"
-\ No newline at end of file
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
deleted file mode 100644
index 618fe63fb741..000000000000
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch java-pkg-2 multilib
-
-MY_P=${P/gnu-/}
-DESCRIPTION="Free core class libraries for use with Java VMs and compilers"
-SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
-HOMEPAGE="https://www.gnu.org/software/classpath"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0.98"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="alsa debug doc dssi examples gconf +gjdoc gmp gtk xml"
-REQUIRED_USE="doc? ( gjdoc )"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-		dssi? ( >=media-libs/dssi-0.9 )
-		gconf? ( gnome-base/gconf:2= )
-		gjdoc? ( >=dev-java/antlr-2.7.7-r7:0 )
-		gmp? ( >=dev-libs/gmp-4.2.4:0= )
-		gtk? (
-				>=x11-libs/gtk+-2.8:2=
-				dev-libs/glib:2=
-				media-libs/freetype:2=
-				>=x11-libs/cairo-1.1.9:=
-				x11-libs/libICE
-				x11-libs/libSM
-				x11-libs/libX11
-				x11-libs/libXrandr
-				x11-libs/libXrender
-				x11-libs/libXtst
-				x11-libs/pango
-		)
-		xml? ( >=dev-libs/libxml2-2.6.8:2= >=dev-libs/libxslt-1.1.11 )"
-
-DEPEND="app-arch/zip
-		gtk? (
-			x11-base/xorg-proto
-			x11-libs/libXrender
-			>=x11-libs/libXtst-1.1.0
-		)
-		>=virtual/jdk-1.5
-		${RDEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
-	${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-freetype-2.5.3-support.patch
-}
-
-src_configure() {
-	# don't use econf, because it ends up putting things under /usr, which may
-	# collide with other slots of classpath
-	local myconf
-	if use gjdoc; then
-		local antlr=$(java-pkg_getjar antlr antlr.jar)
-		myconf="--with-antlr-jar=${antlr}"
-	fi
-
-	if use doc; then
-		# Avoid a cyclic dependency on gjdoc by building gjdoc before
-		# the docs. First we need to trick configure. Hack alert!
-		echo -e "#!/bin/sh\necho gjdoc 0.8" > tools/gjdoc.build || die
-		chmod 755 tools/gjdoc.build || die
-	fi
-
-	ANTLR= ./configure \
-		$(use_enable alsa) \
-		$(use_enable debug ) \
-		$(use_enable examples) \
-		$(use_enable gconf gconf-peer) \
-		$(use_enable gjdoc) \
-		$(use_enable gmp) \
-		$(use_enable gtk gtk-peer) \
-		$(use_enable xml xmlj) \
-		$(use_enable dssi ) \
-		$(use_with doc gjdoc "${S}/tools/gjdoc.build") \
-		--enable-jni \
-		--disable-plugin \
-		--host=${CHOST} \
-		--prefix="${EPREFIX}"/usr/${PN}-${SLOT} \
-		--disable-Werror \
-		${myconf} || die "configure failed"
-}
-
-src_compile() {
-	if use doc; then
-		# Build gjdoc before the docs. We need to hack the real gjdoc
-		# script to run from the build directory instead.
-		sed -r "s:^(tools_dir=).*:\1${S}/tools:" tools/gjdoc > tools/gjdoc.build || die
-		emake -C lib
-		emake -C tools
-	fi
-
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
-	java-pkg_regjar /usr/${P}/share/classpath/glibj.zip
-
-	if use doc; then
-		# Strangely the Makefile doesn't install these.
-		insinto /usr/${PN}-${SLOT}/share/classpath/api
-		doins -r doc/api/html/*
-	fi
-}
diff --git a/dev-java/gnu-classpath/metadata.xml b/dev-java/gnu-classpath/metadata.xml
deleted file mode 100644
index 9f8cf8c4062b..000000000000
--- a/dev-java/gnu-classpath/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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>
-	<use>
-		<flag name="alsa">Build with ALSA javax.sound.midi provider</flag>
-		<flag name="dssi">Build with DSSI javax.sound.midi provider</flag>
-		<flag name="gconf">Build with GConf preferences backend</flag>
-		<flag name="gmp">Build with GMP backend for java.math.BigInteger</flag>
-		<flag name="gjdoc">Build GJDoc, a documentation generator</flag>
-		<flag name="gtk">Build with Gtk+ AWT peers</flag>
-		<flag name="xml">Build with native XML backend</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-java/gnu-jaf/Manifest b/dev-java/gnu-jaf/Manifest
index 1ba4a91a18fd..1f807d9a0d3f 100644
--- a/dev-java/gnu-jaf/Manifest
+++ b/dev-java/gnu-jaf/Manifest
@@ -1,3 +1,4 @@
 DIST activation-1.1.2.tar.gz 290644 BLAKE2B 15ec89a5c757bb134b9ec71e384a80dea5394b9b6463ca1fe44e2e622993fa8809231379b262b0a54595c32451a49ef508bea45ce82120138efe07d81939a817 SHA512 26534f7bb47daddf97b850ab74fc8ef2c5bd62d12cfb96e28e235071af7dcfc7761fa15f2d8f3a2d194f035665cef127812b7476af6cc81f6d6374f1fa725584
+EBUILD gnu-jaf-1.1.2-r1.ebuild 711 BLAKE2B c8a845ab8aa1b093ce3b075198e587aeff4e4a1f28a59daeac9b87d7a0ec30ceb8df41f2c201e0bf32a814da79adbfc2ffd3ae09ff678185f86605f80dc32ee8 SHA512 606c6a52444f52b46d13f8b411d2fb848476158628c82e4254bff393af70a7a41f1b302b6cfcf1ed2d138589c65a17a5a90c524291ac3d8d980626bf48e7a125
 EBUILD gnu-jaf-1.1.2.ebuild 704 BLAKE2B d1b3e89e599dee2eda8aabc1dd158efd5183bf1d943487ee11f7a5f2927beca1a896f0252fd08d542cde03a8cdf293e6883d7876876f9fe02899ce6b469f9f82 SHA512 5f969065bd4d92e251ceb8c3152dfc2826ec59a2115f66030585f1ebb4f3fe3a580d3b4dfc936075139026c46d9dc678e3aba18f16e66000914cf234bf4d9b0e
 MISC metadata.xml 1073 BLAKE2B 34bda1c508acadfec823c9e621452efd7184f5b8b6491d85fce1c4286a983914511e8fe160afb09d71161a1564de0a6e6bcaa7fa85c3a74b65e7e72d117379c9 SHA512 ce26ee9c2e7eb00599548ac00130c7e3485c45f63d7dc040b69267a417d53f0a56fbd1a3d481d69bb26e3f332c8ff0fefac6cc4a0bbaf226f06fd712397e0dab
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..6c4ef7d1e74d
--- /dev/null
+++ b/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild
@@ -0,0 +1,29 @@
+# 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-ant-2
+
+DESCRIPTION="GNU implementation of the JavaBeans Activation Framework"
+HOMEPAGE="https://www.gnu.org/software/classpathx/jaf/jaf.html"
+SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/activation-${PV}"
+
+EANT_BUILD_TARGET="activation.jar"
+
+src_install() {
+	java-pkg_dojar activation.jar
+	einstalldocs
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc source/*
+}
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index db9d6eba23b5..807cacbe8c5d 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -10,6 +10,6 @@ EBUILD gradle-bin-7.1.1.ebuild 1107 BLAKE2B 349fbd166d7051019a6861ff9b4cf3551b4d
 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 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb67d911d143ee6711150c3e7d69c9c55f7ab0bf44b554935539ee20d0c945a4f10c914a2bcb471d2c3be4d249346 SHA512 3cfcbdf0bea512bb3e82053ad824953b5d95d7954796ea6f1846d46d8812e7b482608f1c8e60d30982127e05ad5fd29ae660965afd9176c872618dade74c821e
-EBUILD gradle-bin-7.4.2.ebuild 1109 BLAKE2B 219b535d3339d37bf485fe2c96715433912e0c3bc75cc9f0aaaee9f86f01b7cfe557d4ff65a9ad72c40a048eff551a8ac4f455cad993d51bfcd49e953379270e SHA512 6c42e222620593e1a5d906334ac36efce86b3a82d667048833e74eae62207544f3ce9b9fd59b81078426d03b934ee8e2c94e463f77a184b9b4a08e271a96dabf
+EBUILD gradle-bin-7.4.2.ebuild 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb67d911d143ee6711150c3e7d69c9c55f7ab0bf44b554935539ee20d0c945a4f10c914a2bcb471d2c3be4d249346 SHA512 3cfcbdf0bea512bb3e82053ad824953b5d95d7954796ea6f1846d46d8812e7b482608f1c8e60d30982127e05ad5fd29ae660965afd9176c872618dade74c821e
 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.2.ebuild b/dev-java/gradle-bin/gradle-bin-7.4.2.ebuild
index bec8bc49d5c4..fe6f492c7e4e 100644
--- a/dev-java/gradle-bin/gradle-bin-7.4.2.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-7.4.2.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/gson/Manifest b/dev-java/gson/Manifest
index 052668c08614..0a09227d582a 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1,3 +1,5 @@
 DIST gson-2.8.8-sources.tar.gz 393941 BLAKE2B ebdd1088a069eea58e5ea4e2eddea0d42064c53f7284778b1b7217c8bc7abeb7e14350e19d838af1d94f78c5c38aca6de0f37674b022f0e528ed65eef803c3f1 SHA512 f90ad679c99c5e9a6ee9e397e59ab1d7d94a9c82366902b808addc40ebbab101fdba7fc83e4666c4f35e52d8b127e6f901e65072a7de210496466074dcd043c5
-EBUILD gson-2.8.8.ebuild 1750 BLAKE2B e0b59437e868dc049ce0ea9d70fb9f09ea14302c4a5d9131097ddf8cc1cb711d24e2f65d88c4983bab24025b6e49a84d84428c9da06817e552c5b1b65cc28d61 SHA512 01ee9babce849f123f7bd9468130909ae380487e617d77c4e536399695b36ac6e6848879d0b2ed124fbdd6dd3d5a6b194a9527d438d083bc6de1e7c4bca3e9a7
+DIST gson-2.9.0.tar.gz 350309 BLAKE2B f17f7a7410744b14cb79c979b35c7f3c46a3d9e922722c41893b872013319a1bd06d81526e8380055aafa47524bfcc50e02629d1c5994e1f9f81df4391a9c651 SHA512 25e57f0e3cbff7e4d33070d250ba4ecf1c659380bce07863c52a3b30edd0ba88c923e55b0f38098b5ce3827a74a21c4d41f9de02f6a84da771ae39fd823667d3
+EBUILD gson-2.8.8-r1.ebuild 1745 BLAKE2B 6df1694112b6a71a33b7e96cb84d227cd96a69e6f55c3a964e3f4cbb585e96f9f457900e47260fb8204e7bdaf5e771f4dd9833090e9f22a63388e224e9fb4d7f SHA512 af2f7b14c43f914a91ab4285c1f702388fc45d9d78bcf9fdb65b918436bc4cfda135269168255df20813c24cfa32c38ec4eabf5a49fc6e22b2c6cd6e5bc3c063
+EBUILD gson-2.9.0-r1.ebuild 2099 BLAKE2B 34a065a1b94566a0c7f032f1bc96c41d55eb238af2943716b8347b2fca15dc9697151c9e00181d2431f08b394be9237b0419c334d119796dafca6b0a8ff1b772 SHA512 c59e4829276a3b3e7a10c1c286dd0f9b7582af7452a9c133ce7a3e79d35d594a810cc2f6a33136874dcd3e7bcd52f4dd253196160ff81cecbe8caa6a701eee7f
 MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504
diff --git a/dev-java/gson/gson-2.8.8.ebuild b/dev-java/gson/gson-2.8.8-r1.ebuild
index a4d0f7c1d6f9..a69ff0ad0aab 100644
--- a/dev-java/gson/gson-2.8.8.ebuild
+++ b/dev-java/gson/gson-2.8.8-r1.ebuild
@@ -26,7 +26,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 # test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
 
 DEPEND="
-	>=virtual/jdk-1.8:*
+	virtual/jdk:11
 "
 
 RDEPEND="
diff --git a/dev-java/gson/gson-2.9.0-r1.ebuild b/dev-java/gson/gson-2.9.0-r1.ebuild
new file mode 100644
index 000000000000..655185099b31
--- /dev/null
+++ b/dev-java/gson/gson-2.9.0-r1.ebuild
@@ -0,0 +1,63 @@
+# 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/google/gson/archive/gson-parent-2.9.0.tar.gz --slot 2.6 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild gson-2.9.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.code.gson:gson:2.9.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Gson JSON library"
+HOMEPAGE="https://github.com/google/gson"
+SRC_URI="https://github.com/google/${PN}/archive/${PN}-parent-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	virtual/jdk:11
+"
+
+# Set to jre-11:* since jre-1.8:* causes errors:
+# error: Invalid SafeVarargs annotation. Instance method <T>assertIterationOrder(Iterable<T>,T...) is not final.
+# in src/test/java/com/google/gson/internal/LinkedTreeMapTest.java:164:
+RDEPEND="
+	>=virtual/jre-11:*
+"
+
+S="${WORKDIR}/${PN}-${PN}-parent-${PV}/${PN}"
+
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"src/main/java-templates"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+	"src/test/resources"
+)
+
+JAVA_TEST_EXCLUDES=(
+	# requires the test class to be obfuscated using proguard which we do not have atm
+	"com.google.gson.functional.EnumWithObfuscatedTest"
+	# FAILURES!!!
+	# Tests run: 1090,  Failures: 3
+	# testComGoogleGsonAnnotationsPackage(com.google.gson.regression.OSGiTest)
+	# junit.framework.AssertionFailedError: Cannot find com.google.gson OSGi bundle manifest
+	"com.google.gson.regression.OSGiTest"
+	# testSerializeInternalImplementationObject(com.google.gson.functional.ReflectionAccessTest)
+	# java.lang.IllegalStateException: Expected BEGIN_ARRAY but was BEGIN_OBJECT at line 1 column 2 path $
+	"com.google.gson.functional.ReflectionAccessTest"
+)
+
+src_prepare() {
+	default
+	sed -i "s/\${project.version}/${PV}/g" src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java || die "Failed to set version"
+}
diff --git a/dev-java/guava-testlib/Manifest b/dev-java/guava-testlib/Manifest
new file mode 100644
index 000000000000..f37ee9ad367e
--- /dev/null
+++ b/dev-java/guava-testlib/Manifest
@@ -0,0 +1,3 @@
+DIST guava-30.1.1.tar.gz 5404546 BLAKE2B 818ef4b17c4f0c8e92c327f046434a3bb428ac35d6e95edd6d6be558c755d138a8ac7f8ad2032073cad131890d8f838e896fff84ba217f8305be8bd65c619a48 SHA512 23b30d886a3200b8f998897ca7bc424b2d223a4fecb03ab644e08a989a85f008e30ef093055e6305c4148a1eb8919c407e35d19f492c5b189830bd115e9484f2
+EBUILD guava-testlib-30.1.1.ebuild 1989 BLAKE2B 1372298289ee70e1b5bb4bd4bbdcb18a6eafcce6c510a0dad190b45ff10df50b67e1c84a84f6d043918d7118073a9aa90be9e9a9c1ec6e691049d988ddc85229 SHA512 f82172afba82e756cd958e3bb8308acb553a1e89551dd863c0fa6a0f7925cef4ee3139d76814f0b58e1c2b8736ffbb808f8f4376340559bba9d6d5fc36794876
+MISC metadata.xml 388 BLAKE2B 619e640d22637685b8b59294275ab1a36e74839c5eb2f6002055cb40037406800379274d4085d41ce2a8f2000b6bedcd137b4e7fe38933734474f998e4cf909b SHA512 b44014388651d54e41671847c438c9ba03ff1a551924a82ff0ce12deb8f347e94f49469ab41413e052776c9b7893a1989d570f12454117e828051eef5fef1c11
diff --git a/dev-java/guava-testlib/guava-testlib-30.1.1.ebuild b/dev-java/guava-testlib/guava-testlib-30.1.1.ebuild
new file mode 100644
index 000000000000..49c1e1b3aca3
--- /dev/null
+++ b/dev-java/guava-testlib/guava-testlib-30.1.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom guava-testlib --download-uri https://codeload.github.com/google/guava/tar.gz/refs/tags/v30.1.1 --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild guava-testlib-30.1.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.guava:guava-testlib:30.1.1-jre"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A set of java classes to assist the tests for Guava itself"
+HOMEPAGE="https://github.com/google/guava"
+SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# error: package com.google.common.truth does not exist
+RESRTICT="test"
+
+# Common dependencies
+# POM: ${PN}
+# com.google.code.findbugs:jsr305:3.0.2 -> !!!groupId-not-found!!!
+# com.google.errorprone:error_prone_annotations:2.5.1 -> >=dev-java/error-prone-annotations-2.7.1:0
+# com.google.guava:guava:30.1.1-jre -> >=dev-java/guava-30.1.1:0
+# com.google.j2objc:j2objc-annotations:1.3 -> !!!groupId-not-found!!!
+# junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+# org.checkerframework:checker-qual:3.8.0 -> >=dev-java/checker-framework-qual-3.14.0:0
+
+CP_DEPEND="
+	dev-java/checker-framework-qual:0
+	dev-java/error-prone-annotations:0
+	~dev-java/guava-30.1.1:0
+	dev-java/jsr305:0
+	dev-java/junit:4
+	dev-java/j2objc-annotations:0
+"
+
+# Compile dependencies
+# POM: ${PN}
+# test? com.google.truth:truth:1.1 -> !!!groupId-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+#	test? (
+#		!!!groupId-not-found!!!
+#	)
+#"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/guava-${PV}"
+
+JAVA_SRC_DIR=( "${PN}/src" )
+#	JAVA_RESOURCE_DIRS="${PN}/src"
+
+#	JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!"
+JAVA_TEST_SRC_DIR=( "${PN}/test" )
+JAVA_TEST_RESOURCE_DIRS=( "${PN}/test" )
diff --git a/dev-java/freehep-graphicsbase/metadata.xml b/dev-java/guava-testlib/metadata.xml
index 496b6e6faccc..8f8ff281cf6a 100644
--- a/dev-java/freehep-graphicsbase/metadata.xml
+++ b/dev-java/guava-testlib/metadata.xml
@@ -3,9 +3,8 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
-		<name>Java</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">freehep/freehep-vectorgraphics</remote-id>
-	</upstream>
+	<longdescription>
+		Guava testlib is a set of java classes used for more convenient unit testing - particularly to assist the tests for Guava itself.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index 079b00acfda7..d7f782a6c6b6 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1,3 +1,5 @@
 DIST guice-4.1.tar.gz 23212767 BLAKE2B bab34da971c1a154eca468bbae4f32db97c0f7ce88bd66cea9c79ef08871db06877ab1ea6495c920977ae139af0bddef2fa4bef8ff5783d2bd53c736bfa07153 SHA512 b42c6475a1d17c111a2ca278ac007bee541806685c0938c66f638808bd81d58aa99ba5aef2e4d8320dd5014df4307c5d2dd192111f4610c73a1eeef328771c00
+DIST guice-5.1.0.tar.gz 650452 BLAKE2B 66c56b8605d189a3a6834a1de9ba6b7c6600583dfefa7808ae0b0b71d7f07746811a76326fc3ff56f2fd0d377f7bc3eb04d1c996ab2289eb48dff91d2f12b5f0 SHA512 b9719f07725c3188b8b903c8eee74ef59397f85f7452e38ef8ba2b3b66a56cef427d4dcee4e5d9c4033404a2f5cdadc2d40b6f7076b4c08fe1ec109910206e6a
 EBUILD guice-4.1.ebuild 1140 BLAKE2B 656569e3c4d002cddbc0d36858bc82e323937e325a624300143355202ab131a83bf2c3df1091ba8ed9cb8150fd8b3026360cfdc49b2e3f55820646eac47e60dc SHA512 cb4ad67515a9bedfa8d736c5dd4b3ba3e031a0db6624d22edb7740fd7fb8a0c3564c86294e2208845e8e2d1813f9b4b3727643c707247ba11e567638928e0f01
+EBUILD guice-5.1.0.ebuild 2281 BLAKE2B adad775d03e5518dde990a47900a5b96f39110bdb51700820afba87f92f25e578db98d884bf4206e94197014d5a4b8c117aa2455268f491eaeaba6efb0c610c6 SHA512 b6b220a0f873296608234c51bd473c01ec1b7cfeb82b6136db9e28d33ab929760ad92d9c29c528e6938e564b22375e91f30fef2ac2f01b514e17478adf48faae
 MISC metadata.xml 371 BLAKE2B 2960f7040449f39cf4371b64df2a64fadfb000d042ccc4560d23cdc0f92cc4c55718a155990db42f7d1eebf1d8b5702e5094cca9bcb0e3e01cccf37e6509889d SHA512 522b9d8b6b85e48e522663cf9b93ee077b2adeb073795d5adb4df81935518dc8e712e85e2a4fc56e4ae1a0656ccc0b35831038afed7d65b880b80d1bffcbbec8
diff --git a/dev-java/guice/guice-5.1.0.ebuild b/dev-java/guice/guice-5.1.0.ebuild
new file mode 100644
index 000000000000..dd9bb5373e8d
--- /dev/null
+++ b/dev-java/guice/guice-5.1.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom core/pom.xml --download-uri https://github.com/google/guava/archive/v30.1.1.tar.gz --slot 5 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x866" --ebuild guice-5.1.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.inject:guice:5.1.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Guice is a lightweight dependency injection framework for Java 6 and above"
+HOMEPAGE="https://github.com/google/guice"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Most of the test dependencies are missing in Gentoo.
+RESTRICT="test"
+
+# Common dependencies
+# POM: core/pom.xml
+# aopalliance:aopalliance:1.0 -> >=dev-java/aopalliance-1.0:1
+# com.google.guava:guava:30.1-jre -> >=dev-java/guava-30.1.1:0
+# javax.inject:javax.inject:1 -> >=dev-java/javax-inject-1:0
+# org.ow2.asm:asm:9.2 -> >=dev-java/asm-9.2:9
+
+CP_DEPEND="
+	dev-java/aopalliance:1
+	dev-java/asm:9
+	dev-java/guava:0
+	dev-java/javax-inject:0
+"
+
+# Compile dependencies
+# POM: core/pom.xml
+# test? biz.aQute:bnd:0.0.384 -> !!!groupId-not-found!!!
+# test? com.google.guava:guava-testlib:30.1-jre -> >=dev-java/guava-testlib-30.1.1:0
+# test? com.google.truth:truth:0.45 -> !!!groupId-not-found!!!
+# test? javax.inject:javax.inject-tck:1 -> !!!artifactId-not-found!!!
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.felix:org.apache.felix.framework:3.0.5 -> !!!groupId-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+	test? (
+		dev-java/guava-testlib:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( {COPYING,{CONTRIBUTING,README}.md} )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR=( "core/src" )
+JAVA_RESOURCE_DIRS=( "core/res" )
+
+JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,junit-4"
+JAVA_TEST_SRC_DIR=( "core/test" )
+JAVA_TEST_RESOURCE_DIRS=( "core/test" )
+
+src_prepare() {
+	default
+	mkdir -p "core/res/com/google/inject/" || die
+	cp core/{src,res}/com/google/inject/BUILD || die
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/gwt/Manifest b/dev-java/gwt/Manifest
index a744f6983b95..0998e051c70c 100644
--- a/dev-java/gwt/Manifest
+++ b/dev-java/gwt/Manifest
@@ -2,5 +2,5 @@ AUX gwt-2.9.0-jsinterop-classpath.patch 1045 BLAKE2B 8efec183d5d7f2d2196d176d13e
 AUX gwt-2.9.0-remove-git-usage.patch 1284 BLAKE2B cf06867ab6917e04a90a6f98f6868467dab8a54eda93847cf77a2e45917a59329c5be0857e3ad38eab942c90f696f9d6e8fd8509174b16c1cc72d242a01fcc3c SHA512 b32c808cf6514893aad5fdd07aa2724a9a3f0c9dede9aa1092ffe2470db02f481f6d2cba8b1521f221dfff0f2353dbe41aa1169eba28512f7c8feaf1dffba879
 DIST gwt-2.9.0.tar.gz 13081965 BLAKE2B 8b18e4cad6df9b1a2336bdf537a26def021ccd950299a6064e9a7328d0161c093f56284cce7b8a0e0a0c72b0dc9604e5e5527332d1878afd19a3c95eed5129a7 SHA512 424484a42f28387734a89a3a12b48716031e194e3a712a5e7cbdb66f77ab68e72ff8751f70a4048f4b9f35d92948c285490fd8e23c34d5c5e5558fee33952bf5
 DIST gwt-tools-194772ed94078802d8030136796de344eb1fdbe1.tar.gz 575902138 BLAKE2B 518ed1752cc82a527521525e181db712a641d36db203f511bdcc5206de314aa1eb693415b690fc42f38c9beabaffc484ad6ec3444e3cd8b4f2a3fa2ab9505f11 SHA512 0365d664b4b14ec833c922c8fab5df269e69ac8f1526315810f4922132439b880ee15e7e8b80e8b505469a374ba4a47998c7ed07b5f53227d50100247fade82b
-EBUILD gwt-2.9.0-r2.ebuild 2217 BLAKE2B 9febb8ee3a06581254ce51d249460785b05e863a2f0be6cf3b4599187188e5090cb6fa39908b4200a8a0f95e6b321b4477f88d6f62172390e38c4a6521823c77 SHA512 cdf631ec8ed488ca2c28a472cb40869e76a169a8b8d68a2339f14f114f31c100f1dfb19d87899fdb14bf4d99fba546a42359c461c7bd3beb831c42f3c8a25083
+EBUILD gwt-2.9.0-r3.ebuild 2201 BLAKE2B 85ded9a527a5fd3fe1d6052177fae33f91b83177b3df92ffedcb343c89bdf80390efe98a0cd75299794593e12d5103e8b7b6a6fc68731a0c10ba5a43e1fd4189 SHA512 161f635795b1bbc13432cb1ea2163d9a777593576699f393c6fd0551c5bfe6443a4337b22849337eb77b1bcbb3790be0fb41150d125b7191e63cd5fd012a3875
 MISC metadata.xml 767 BLAKE2B 60e78ac74d5021f7e0b01effc813edafb64db277274897b8942887ccd8311636b0610a6bf4d90440de4d2dc6f82b29eba25aaff52616ab247b3016c3c775ba6b SHA512 592310ab6704c8388000489391b96d24ba592932c0519bea8ed2690aed34aba43af651cec6e3444d0749bdd8660630930a087b7ce141472c0b3545988a6b9089
diff --git a/dev-java/gwt/gwt-2.9.0-r2.ebuild b/dev-java/gwt/gwt-2.9.0-r3.ebuild
index dee867ac74da..a86cdb15be16 100644
--- a/dev-java/gwt/gwt-2.9.0-r2.ebuild
+++ b/dev-java/gwt/gwt-2.9.0-r3.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="source"
 
-inherit java-pkg-2 java-ant-2 java-utils-2
+inherit java-pkg-2 java-ant-2
 
 GWT_TOOLS_COMMIT="194772ed94078802d8030136796de344eb1fdbe1"
 GWT_TOOLS_PN="tools"
 
 DESCRIPTION="Google Web Toolkit library"
-HOMEPAGE="http://www.gwtproject.org/"
+HOMEPAGE="https://www.gwtproject.org/"
 SRC_URI="https://github.com/gwtproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 		https://github.com/gwtproject/${GWT_TOOLS_PN}/archive/${GWT_TOOLS_COMMIT}.tar.gz -> ${PN}-${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}.tar.gz"
 # While the test suite does compile and does execute with an exit status of 0,
@@ -24,7 +24,7 @@ LICENSE="Apache-2.0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 CDEPEND="
-	dev-java/guava:20
+	dev-java/guava:0
 	dev-java/rhino:1.6
 	dev-java/asm:9
 	dev-java/eclipse-ecj:4.15
@@ -43,7 +43,7 @@ JAVA_ANT_REWRITE_CLASSPATH="yes"
 EANT_BUILD_TARGET="build"
 EANT_GENTOO_CLASSPATH="
 		asm-9
-		guava-20
+		guava
 		rhino-1.6
 		eclipse-ecj-4.15
 		validation-api-1.0
diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest
index 4a280ebe0343..0c44e8a4245e 100644
--- a/dev-java/hamcrest-core/Manifest
+++ b/dev-java/hamcrest-core/Manifest
@@ -2,6 +2,6 @@ AUX hamcrest-core-1.1-java-11.patch 1198 BLAKE2B 0c9610b9225a6eff96669dbc0c4e052
 AUX hamcrest-core-1.3-java-11.patch 886 BLAKE2B eb6e3a1f3cd47d067987a436d947ab89732dfec0f73096b9b9a0be3213cb0bd7ee800f29ff2766e997c202f9309b766aeede966d399c080e1529c9f0d83c7e1d SHA512 82ead3c1344ac7a153992923e06bdb40dad2729202aa695e690c755937f570ad927c5aa832de13553050dfcce48bd84c6e73164c26c39890c134259c9ab67254
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
 DIST hamcrest-core-1.1.tar.gz 1247348 BLAKE2B 07b874ca2e61808cd1a30246cbfe7baa220a9c83df7be94dbb50c4df0279bcf906a32cc1b69aed0ebd81d51392af28050d070b7fabb50f8063964b0782b5e105 SHA512 d86080f1ef5982faee728e29675676a89b42a02c4b00783c67be948076e502e70a2b435568502d8ed3c5b1bcc5441b3cdd8817dab841cac537087edeee47632f
-EBUILD hamcrest-core-1.1-r4.ebuild 815 BLAKE2B cdffa29ff20d6b06b31d603bc2c55bfc5d5c492eb7e6cb778b0287b6d6f11acaab57a17f31640a94972f68c3c57afa8c83cb613de3e258ff35e7dcd6628befd1 SHA512 b77edf3f90c512774e0b959a6792b99380bd8a467c3251652f95f98d65ca134d429b06dffdacb8fb4b2b14c3a8bcf384b3373603733ad6c0566092f9ce63b4a0
-EBUILD hamcrest-core-1.3-r2.ebuild 1431 BLAKE2B 574f974933f7b3bfa4ba1c5838d3e0e338d57da71f75ce869d93128e32264593ab6f00ff9d4ccf2791f69fde0b9610d7a782e324f6650162c898b1f140fff1ea SHA512 85d31dbf825c5cac7a7a2c4b690dcb167b9a3a1b21c4aa75ef26d20c58641aa8198d66179b9431e143f267372565d7a42edc39c0dff9502be70edbf2f55afd34
-MISC metadata.xml 311 BLAKE2B 7b18e98cbbc5347a4fec2cc99c965e9ae8403f351c89a869dafcc194dc9e65adf898cc43d30eaf6665c700cbb08ba282e08000145c167acde6cf29a0b1048c23 SHA512 d6bdaac2484cf4baf46037b4476fa9bc1974bc629a503e678f65e6cf0a3fecfdcf45b54fa4f69557652fe92d61187c6b5ba1ee87c4eac63af3444a2b5b75e870
+EBUILD hamcrest-core-1.1-r4.ebuild 821 BLAKE2B 30910ba60c0e94cfeb1f9c3d79b4dda9bd1066587256c52065414f82710505f9f97e5318e73ee27e34faa967f8832667423cbafa0bac535dd716c4e6c625b516 SHA512 0d28817e28f71b998c486191634716547422d1b69fa06c0669c2acd0c74fa955b97afcd91dc60138eb5a2611d419cfd9648757b64bdd849eccf5482d933e3d91
+EBUILD hamcrest-core-1.3-r2.ebuild 1437 BLAKE2B b1684d104029405966570710953c925611380e3097ff237df1c3360a8ecb1414ccae56b8270162ff9261814e230bab371f4ce1326d24ad0a312d9e85bd3a61c5 SHA512 aac0853eeda9017275e431c3d34295bcd0e0478b1445e9c2fe0fe2c16e74f377f4396f1b19c9166836af52d5c9c8bdeb43b92cc36a8cd5d6f503d2d01af0b584
+MISC metadata.xml 323 BLAKE2B f7c4c0d73758ceea718f9806b335dccdc09747708775fb0ca9978c0c4380e34f9c96045fa101093b25285f3fa0b66acb18a17bd3319a6889f3697e71e8175e95 SHA512 598d129d610f8a4c56237eeb09a72d1edb6bfe3b953836fb12353e7ceed679cda3009cd3b77d8f3c08f749e16c75a0ffb56a52aeaf42ac54b7668046fa906ed5
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
index 4023e0a16ff8..e8d9fbe997ec 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ MY_PN="hamcrest"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
+HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
 SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
index a8ef97c4a000..27f4ffa43866 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
+HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
 SRC_URI="mirror://gentoo/${MY_P}.tgz"
 
 LICENSE="BSD-2"
diff --git a/dev-java/hamcrest-core/metadata.xml b/dev-java/hamcrest-core/metadata.xml
index f94f57c00f21..4de8b3f48a51 100644
--- a/dev-java/hamcrest-core/metadata.xml
+++ b/dev-java/hamcrest-core/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">hamcrest/</remote-id>
+		<remote-id type="github">hamcrest/JavaHamcrest</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/hamcrest-generator/Manifest b/dev-java/hamcrest-generator/Manifest
index 8d1a80cd2b50..d83dde4685fc 100644
--- a/dev-java/hamcrest-generator/Manifest
+++ b/dev-java/hamcrest-generator/Manifest
@@ -1,4 +1,4 @@
 AUX hamcrest-generator-1.3-no_jarjar.patch 982 BLAKE2B 4c09b64a6b824025771682dad6875b8c048f488fd777545d7c8f7219de04193fe40eaea63b7e319d5c00843175f66033e26216f68436c2d99e256fe06218daba SHA512 26b77758ab603b02dde03ec7a51f6b1f1077aa45580e8a21ffa671fc385c54ff00b3a79f8a3be037f28a8b77289d1290493469a1c8c856a9b61846d4cedac58f
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
-EBUILD hamcrest-generator-1.3-r3.ebuild 1264 BLAKE2B 5995afbb47b6b2fd169de7c843502eeb4d3bc714ba82b302eef7b4b80362fb8e8fbdccaede33094a3e1094e844a29e920ca192ed1a72b0344921cfad108b025e SHA512 e337e7048f7fe2fb57631ec6bbc114a7bb224ff4307a4d6cb82d70b1f05b71214878aa8e3de4a8c9544bb4dffba3a1861d9467eaee159a2506f9a17797c72389
-MISC metadata.xml 364 BLAKE2B 53ba1f3714a307f1a2b4fc604b54b22ee35ef9bc2b9ac3b7640898f0b0f79f68a4deebe5fb55c06ae24aa425728a1a0cdab03c9ce15ee21d7a1f084595b8e068 SHA512 9438e55f425ce2cb2f3e1b9c2c8603a3e5ad6cb6de362aa3af3741f82335a210689dbd9b32b2d51204fc2b09e1113808498d8e11be52b481ca95bd7e22566140
+EBUILD hamcrest-generator-1.3-r3.ebuild 1270 BLAKE2B 2f77de5d517a01a481d80eed57068d89b8a8cb89d627b6ee2976e1f0c845df993a3aae83e0740e9ee2a9a7a49e58c377d0f4f6de7f1833cdc83a5d77ee2d7a80 SHA512 d393b620bae221599e28cdfdf2f84071a782590936312aa41718af293588eb2527a8a586c5b0030ee27fb233a1a713b80faef38491af69dee018194f3676e32d
+MISC metadata.xml 323 BLAKE2B f7c4c0d73758ceea718f9806b335dccdc09747708775fb0ca9978c0c4380e34f9c96045fa101093b25285f3fa0b66acb18a17bd3319a6889f3697e71e8175e95 SHA512 598d129d610f8a4c56237eeb09a72d1edb6bfe3b953836fb12353e7ceed679cda3009cd3b77d8f3c08f749e16c75a0ffb56a52aeaf42ac54b7668046fa906ed5
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild
index bed740f60fbe..6aa236cef3f7 100644
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild
@@ -12,7 +12,7 @@ MY_P="${MY_PN}-${PV}"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Code generator for Hamcrest's library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
+HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
 SRC_URI="mirror://gentoo/${MY_P}.tgz"
 
 LICENSE="BSD-2"
diff --git a/dev-java/hamcrest-generator/metadata.xml b/dev-java/hamcrest-generator/metadata.xml
index 625ad5a85cc5..4de8b3f48a51 100644
--- a/dev-java/hamcrest-generator/metadata.xml
+++ b/dev-java/hamcrest-generator/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="google-code">hamcrest</remote-id>
-		<remote-id type="github">hamcrest/</remote-id>
+		<remote-id type="github">hamcrest/JavaHamcrest</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest
index f296d8588f3f..7e9c34147097 100644
--- a/dev-java/hamcrest-library/Manifest
+++ b/dev-java/hamcrest-library/Manifest
@@ -1,4 +1,4 @@
 AUX hamcrest-library-1.3-java-11.patch 2323 BLAKE2B 6a16d58c3aadfbb7b6447b68f5d89ec17f82639b530f331e29276d1ebe947daa0c572e874efa328c03397058884ad6cc523c1ded08086fcfa42d1902624c948e SHA512 827966cf7ca175287df5005e35527575427986367013745ef49a7b1719fc3c6a0c7dd5697158726ff7d04122bc6e558bc402b71b6f2e9b932b87b61b5f71cecf
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
-EBUILD hamcrest-library-1.3-r2.ebuild 1497 BLAKE2B 0b60108a6f3c48220a765b09a317db9bc0157b86c8fdd73b50edc9c178b263c7a02016a7fca1e4d848111b9089c9ad86b04e9dbfac5372caa36220ee18949fac SHA512 a3a594d61c5d7c8b3a4ed301b59e884ce9e04a30287f18b8a07d3870dc5e475bc85bac8100496f3c5549820481121caf5973b771e95e612e3fcac14162cba91f
-MISC metadata.xml 311 BLAKE2B 7b18e98cbbc5347a4fec2cc99c965e9ae8403f351c89a869dafcc194dc9e65adf898cc43d30eaf6665c700cbb08ba282e08000145c167acde6cf29a0b1048c23 SHA512 d6bdaac2484cf4baf46037b4476fa9bc1974bc629a503e678f65e6cf0a3fecfdcf45b54fa4f69557652fe92d61187c6b5ba1ee87c4eac63af3444a2b5b75e870
+EBUILD hamcrest-library-1.3-r2.ebuild 1503 BLAKE2B fb98d145b85162ac56a2a832f6e27008024c4f2125ee1e3bf4a1f4b4520c884c2c21377bfef9fbb07afe5b0235f7473b3583e9737d07896fe59b45301248d765 SHA512 334452a0d983ce4cd59fbdcb0738f54548604976f1724318d6cc2701e3496930987b0f65042e2d3e0df169fda2389fa6002839bb9d951dab20dac967d64cfc9e
+MISC metadata.xml 323 BLAKE2B f7c4c0d73758ceea718f9806b335dccdc09747708775fb0ca9978c0c4380e34f9c96045fa101093b25285f3fa0b66acb18a17bd3319a6889f3697e71e8175e95 SHA512 598d129d610f8a4c56237eeb09a72d1edb6bfe3b953836fb12353e7ceed679cda3009cd3b77d8f3c08f749e16c75a0ffb56a52aeaf42ac54b7668046fa906ed5
diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
index 3ab303aebbcd..116e14e5b5b7 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
+HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
 SRC_URI="mirror://gentoo/${MY_P}.tgz"
 
 LICENSE="BSD-2"
diff --git a/dev-java/hamcrest-library/metadata.xml b/dev-java/hamcrest-library/metadata.xml
index f94f57c00f21..4de8b3f48a51 100644
--- a/dev-java/hamcrest-library/metadata.xml
+++ b/dev-java/hamcrest-library/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">hamcrest/</remote-id>
+		<remote-id type="github">hamcrest/JavaHamcrest</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/icedtea-sound/Manifest b/dev-java/icedtea-sound/Manifest
index 84f481b2d27d..cb1ca05c2971 100644
--- a/dev-java/icedtea-sound/Manifest
+++ b/dev-java/icedtea-sound/Manifest
@@ -1,4 +1,3 @@
 DIST icedtea-sound-1.0.1.tar.xz 1515308 BLAKE2B 4d9939e1bc0e0b331b032c3a54244960d61354d6b85b83cbbce1aeb96f2748906d5bd0936b36e2aacac526bd7927dbc0686a47a0dd0f41568ca86e3805b943ea SHA512 505d02f5ce885d4c7638cde8042a686aa3651de9072d325db6fefb8c5bd3d7de73253b27162555396e827a65f50aeed8326e99099757d5efe18d14ccebc1c07a
-EBUILD icedtea-sound-1.0.1-r1.ebuild 846 BLAKE2B 79fc33dee581f71df125f08bcc2bbb81215424cff6490dd7fa698650d5ec6349a81b9df8ae4b12d2027aa4838fde55069fcfd1eff8f99385e31beb080e56d91e SHA512 603e0a81270603d300676900fa933b8a8e33c8417d7197a73cfd0a8c3050a560cc4fc7fc50a0bf6ae85fc6b241329fa76e72c20164b740632ac98284cfd08a54
-EBUILD icedtea-sound-1.0.1.ebuild 882 BLAKE2B f99da70389da19d3bb85e7562e818ceb900524e90b3ad250285834c2a7c3c0146c8e80b9436538166fc51cdeaf76e352d356ace0943dcb37503cb57d07f78409 SHA512 8f88bbd9d26a34067d4fce8c7fed64c4c3c84b7d6470cd4fc7a178b7bade00da3debcb62ba4157aaa8cc561b00e136a8d6eafaea7898c1c453c1850d1adac7b6
+EBUILD icedtea-sound-1.0.1-r1.ebuild 844 BLAKE2B 6246982262a7550b584bc6eaded9afa279ab7215c40281c197a4cab81d2d0bc27592c586932fa16af92ed3e6ee755660ff22abf14cc2a43991f85f000d1f3f5c SHA512 3535f1e228556f3aa7ad44b99a1013ba5170a0777bcbcf33d03bf23ab2a9d0c087a7c394878190442219e3d11dca4b6256b3c463b312815d188a00052351df3d
 MISC metadata.xml 383 BLAKE2B a8ad98d91ffcf88637ec7ca5e0634a0ddb1d03f0af1f6f1fce5fed2a166dc57b264284afa71cf473a121ab4cbb1ff75c36f730cdc4c1af7760e94aeae7f488a5 SHA512 ad4a47c9c3fbd92438837e90d25e5de2a7bb94669ddcf22e6787b9ee7d59925a6da3c3483d712a6cabd6555f48613717cd9da491f8ee7b0e09f76ba6e5a4e379
diff --git a/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild b/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild
index aeac8c929ed5..9990e63fba50 100644
--- a/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild
+++ b/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://icedtea.classpath.org/download/source/${P}.tar.xz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 IUSE="+doc"
 
diff --git a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
deleted file mode 100644
index c480a1189a79..000000000000
--- a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-EAPI="5"
-
-inherit java-pkg-2 prefix
-
-DESCRIPTION="Plugins for javax.sound"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.xz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-IUSE="+doc test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEP="
-	>=virtual/jdk-1.6.0
-	>=media-sound/pulseaudio-0.9.11:="
-RDEPEND="${COMMON_DEP}"
-DEPEND="${COMMON_DEP}
-	app-arch/zip"
-
-pkg_setup() {
-	JAVA_PKG_WANT_SOURCE="1.6"
-	JAVA_PKG_WANT_TARGET="1.6"
-
-	java-pkg-2_pkg_setup
-}
-
-src_configure() {
-	econf --with-jdk-home="${JAVA_HOME}" \
-		$(use_enable doc docs) \
-		--htmldir="${EPREFIX%/}/usr/share/doc/${PF}/html"
-}
-
-src_compile() {
-	default
-}
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index 55c7621f1610..06d4fe6f2161 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -1,7 +1,9 @@
 AUX README.gentoo-r2 452 BLAKE2B 81347eaa073b22f2b4ddb8c07dbdc07bbe81b2f848c2e86db295b5ee86f133e5c5c98997b7089f78850cdab38fc841647144474efd95c21d079223062dd9a9cc SHA512 0a844f4b180cfb447e267d9783a50f7785bb3458b5fa04e92b74ace3412b9af0f326adfe92929a3166fdfb37f6ee03553f7b7f097f14eab1c7927d25f5d722db
+AUX README.gentoo-r3 554 BLAKE2B d29ff7518dec550796a885ca4af41cbe2b112f314ddc33697f4fff8bf6f3a19f2ac7c19ae3f811f209b870e3df18aca2e1be8327c7a2fab5e7beeebc02732ba8 SHA512 5499c13e4897f8fd72add9e98a9408b32dbc2f4692f5e165a1596bbbcb60355dff1251537f8fc0f09433164db8d887d1ae90340302f86ba6e1cf7f8e96d7827e
 DIST dunce-0.1.1.crate 4311 BLAKE2B 07b775c2e79d6414af5854282fdfbba26ac4675207f840cf627a33c7bdbca163283466011c641d62646fa77f8623f1f7143b5e3d87c34e0b9840e4807eea2df8 SHA512 3fa16c1d6d78374e6360b9e2349516859b617ac5532ade34359d952002a1fb6d5e70f27ce2c9b3d6e230c753218fcf6e9b3973161bf1f8dd9c08152fbda2f5ad
 DIST icedtea-web-1.8.4.tar.gz 2358591 BLAKE2B a62a88cfce49f473a0ab768ca386c4733d69fd3b603b29a8d5e7478b33030e2d016a0577bfc0fa4657bb0b3f99a2524d1b46cad7a8e4f97c1404eff5ca218613 SHA512 d155ec6ed9a007b2c59fd09fed9f4005a79640016ae62287eab7076c05b5ddd56d07b0ff86babf732f1bb82653fc0f7cf434550eabdaac8d666e64feabe4f890
 DIST icedtea-web-1.8.8.tar.gz 2365638 BLAKE2B 39a19bd46a235d016f9192da7f15ffa17546dfbe8502df4991f6d45c6211723504c0d2dc0bc7aaa508e4b47295f244c65b6e7113666028824562b8d2b0ccf5b2 SHA512 99f246ce603e3edd4357a2c4d280f1ef92e1f760ca5d843eaccf7ca60950a47defec64eed87dac26c5c2e9776bed2f3e53f2c8793dabd47e1b5fc82823190dcc
 EBUILD icedtea-web-1.8.4-r1.ebuild 2412 BLAKE2B 908ed64b517a4ef3288a112a4051f9e8da8a99333232ed51ec26c58b39d11123ae38ccc0f0f70a213e452f3dd9634831bf9c6ce591119ad2ddfca8794467f281 SHA512 14b3cdc5db7503201e7eaaceb1ecd23628be9b7565022bc538c7abd732de9e16e35bf08024f0b03f0c751fd519ca3b3944944ba900f6d44c6b05bfb2d971485b
+EBUILD icedtea-web-1.8.8-r1.ebuild 3566 BLAKE2B e3d408f3e5eb1c182eb5b25cbe963b12080cac4219f005fadb9b02e523c2324a869c5239091358157108029924d5365d809ee6fc48dbe31f6886d0888c443185 SHA512 1b68665fca490828d342ac40f3da7a5183b2e7f08591b51529d211a9236dcfbecef0314a8038da911e6b6b26c5e29da005e7444fca4c13791482f1000ebbd8c5
 EBUILD icedtea-web-1.8.8.ebuild 2416 BLAKE2B 4902b8a63cdfa922c71af2471026d192fdde554eddd2573b9383bf0936cd6ebe5cbb43cc05d578744aa6078297daa72bd0ecac8f9947deff2db20cedc3f65bf6 SHA512 de1ee9abcf06632cb0dd76245e531baeedebfdd1f0d2b4475448fe28834cc5d5ef362d940b7e645a7771ef0d341fb41baa558087afbb7c9b4140d60f150bf140
 MISC metadata.xml 470 BLAKE2B ae3861fd34b819ef3889a6ca4f56702608b20fd74e4c856d934d8094649d2c19703010c0fc581154f77e6f82ec19b99fcb670b3bc16530c194a6e590084b8ccd SHA512 8911c14a652c2e24e0679263f040452513e4e018623169760953accedee778c6bab255ad78e07f43617907d4c6d8524f1493beaf48507d9743ee37d4aecea24d
diff --git a/dev-java/icedtea-web/files/README.gentoo-r3 b/dev-java/icedtea-web/files/README.gentoo-r3
new file mode 100644
index 000000000000..fc199f3c50f2
--- /dev/null
+++ b/dev-java/icedtea-web/files/README.gentoo-r3
@@ -0,0 +1,16 @@
+Browser plugin
+--------------
+
+The IcedTea browser plugin (NPPlugin) is no longer available,
+as modern browsers no longer support this plugin format.
+
+JVM selection
+-------------
+
+By default, Web Start uses the JVM
+selected via eselect environment variable.
+Note that this doesn't have to be an IcedTea. Openjdk will also work.
+Also note that the selected JVM must have been installed with the
+'headless-awt' USE flag *disabled*.
+The choice can be overridden using the itweb-settings program.
+Simply blank out the field to restore the default behaviour.
diff --git a/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
new file mode 100644
index 000000000000..238bb9080267
--- /dev/null
+++ b/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+README_GENTOO_SUFFIX="-r3"
+CRATES="dunce-0.1.1"
+
+inherit autotools bash-completion-r1 cargo java-pkg-2 readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
+HOMEPAGE="https://github.com/AdoptOpenJDK/IcedTea-Web"
+SRC_URI="https://github.com/AdoptOpenJDK/${PN}/archive/${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="doc"
+
+# tests require ton of java deps we don't have packaged/working
+# but rust tests pass.
+RESTRICT="test"
+
+BDEPEND="
+	app-arch/zip
+	sys-devel/bc
+	virtual/pkgconfig
+	virtual/rust
+	doc? ( sys-devel/bc )
+"
+
+# Build within Portage using JDK 11+ (also presumably 9+) fails during
+# src_configure:
+#	configure: error: sun.security.util.SecurityConstants not found.
+#
+# When upstream's build instructions are executed outside Portage using
+# JDK 11+, ./configure also fails, though a different error pops up:
+#	configure: error: sun.applet.AppletImageRef not found.
+#
+# If even the upstream build instructions fail outside Portage with JDK 11+,
+# then it is very unlikely that the build issue within Portage is fixable.
+# The upstream has moved forward to development of 2.0.0 and 3.0.0 versions,
+# so they might no longer be interested in fixing the legacy 1.x versions.
+#
+# The 'sun.applet.AppletImageRef not found' issue has been reported to
+# FreeBSD <https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=248197#c2>,
+# and some efforts there to fix the issue were unsuccessful.  They seem
+# to have ended up with restricting Java version to 8
+# <https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244976#c17>.
+#
+# Thus, the build VM version is restricted to 1.8 here.
+DEPEND="
+	virtual/jdk:1.8
+"
+
+RDEPEND="
+	>=app-eselect/eselect-java-0.2.0
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/IcedTea-Web-${P}"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+src_prepare() {
+	eapply_user
+	sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die
+	eautoreconf
+	cargo_gen_config
+}
+
+src_configure() {
+	xdg_environment_reset
+	# some functionality (tagsoup rhino) is disabled, because dev-java is
+	# unmaintained and a lot of things simply does not build anymore.
+	# native plugins also disabled, modern browsers no longer support it.
+	# modularjdk-file and the 'itw-modularjdk.args' file controlled by it
+	# are required to run this package's programs using JRE 9+.
+	local myconf=(
+		--disable-native-plugin
+		--program-transform-name='s/^javaws$/itweb-javaws/'
+		--with-jdk-home="$(java-config -O)"
+		--with-modularjdk-file="${EPREFIX}/usr/share/${PN}/"
+		--with-itw-libs=DISTRIBUTION
+		--without-rhino
+		--without-tagsoup
+		$(use_enable doc docs)
+	)
+	unset _JAVA_OPTIONS
+	export bashcompdir="$(get_bashcompdir)" # defaults to /etc if not found in pkg-config
+	export CARGO_HOME="${ECARGO_HOME}"
+	CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myconf[@]}"
+}
+
+src_compile() {
+	# races in makefile
+	emake -j1 #nowarn
+}
+
+src_install() {
+	default
+	rename -v '.bash' '' "${ED}/usr/share/bash-completion/completions/"*.bash || die
+	rename -v 'javaws' 'itweb-javaws' "${ED}/usr/share/man/man1/"javaws.1* || die
+	mv -v "${ED}/usr/share/bash-completion/completions/"{javaws,itweb-javaws} || die
+	sed -i 's/javaws/itweb-javaws/g' \
+		"${ED}/usr/share/bash-completion/completions/itweb-javaws" || die
+
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	# we want to override cargo.eclass' src_test
+	:
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index bb525f961e4b..e0a0eb689985 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1,5 +1,3 @@
-DIST icu4j-70.1.tar.gz 65661187 BLAKE2B 9d2d38fa91092d8f2fa39c773b722019f1d0c9b06ba6e8abaf05c3d3b50977232d6f1a37fd5ab6be6461d133dd361dae9b8633e22c9f165ef4e6e4b8029f6b8a SHA512 f1a653452f42605f799de7ec1d5bf27aa4b715f2ec18534cd3b52bd9be7ddbe7a6d18b47e3a5b36c7a63442bc38304ddc80f519ac65b9a91978ab15b462d9456
 DIST icu4j-71.1.tar.gz 66177851 BLAKE2B 39c5f6e1a8adc6ee913a7a41dcbf733c1f50e6de3047c0c548bf39426102fccef1a03dd7cb4020bd56b32d0c565848f11cc5ce3f738519dd7d2820a670c40443 SHA512 cc9ccb3208d8079c4f8169713aa0ebb930e86cf6c72510a3b7de5824e6482f26166a2e530abaaecfb8338764b23ac215b2921a821167b41d6a3f23952e2718e6
-EBUILD icu4j-70.1.ebuild 6898 BLAKE2B ad622c6b4b24175e73ca520a3410b13b7890aceb060e052a88766d1533841db31680eb5b57dadcb37c4477ec9e495a8b7fc21d065eaad8df4951b057dc1b6582 SHA512 48928ca0cfc6041023880c1bce496aca4e446404a1e692826cb9d4284a2f0af6b946dca548381a6c63047c82e7dd712fbad42d2bec7c4067f3fd30cc05fee7c5
-EBUILD icu4j-71.1.ebuild 6918 BLAKE2B 4f71e99f702089eae1dcad0b59b17f6de79c3eae3d2c4c542a2b738929ccb5acb5fb31cdf9b1bc901c27dd914a75efec7b9215a28c032a43cc02461e92dea93f SHA512 496ee4a0d346dcd856254bffa9d08fc4353babf1f35863b45f11b3449b74df7a35de33729daef822ef7736939620b78d98807125f7753178cd1ea2f721608d62
+EBUILD icu4j-71.1.ebuild 6914 BLAKE2B 8856aef271500f9521313f519aebc4ab5e010a16f97723667be394c8430648444c4dbb841fbb4555e01e70423aff70fd5e25533d217421a03701345bea938288 SHA512 14b8d4ce9dc4ab01512f8570ea8c4bd970b727e5aae60a727d7e10414268877d962feca1d25b95ce7da69bda5011123c1a62d366aad7e0ed2621d66df4bb3892
 MISC metadata.xml 408 BLAKE2B 8d73c37540d7adce52f3f5b316d7c322bdbbacc3fd2dea5e361352bff8efb3ec2a5b49ca4e7b97d15e8c668e52fe32f90ec1972bae78b9b3b3354973d8fc992a SHA512 eb7df20108b1ebcbf5dd9edd72c2089df2c675028824b4c04976e35b4c306dd459a40aa45b0ac7da5392552657cd1dbaf2fb17b269f9d58110a6ac40dc377b0c
diff --git a/dev-java/icu4j/icu4j-70.1.ebuild b/dev-java/icu4j/icu4j-70.1.ebuild
deleted file mode 100644
index 784b9ff223b4..000000000000
--- a/dev-java/icu4j/icu4j-70.1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2021 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/unicode-org/icu/archive/refs/tags/release-70-1.tar.gz --slot 70 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild icu4j-70.1.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.ibm.icu:icu4j:70.1"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
-HOMEPAGE="https://icu.unicode.org"
-SRC_URI="https://github.com/unicode-org/icu/archive/refs/tags/release-${PV/./-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="icu"
-SLOT="70"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*
-	test? ( dev-java/junitparams:0 )"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main"
-
-HTML_DOCS=( ../{APIChangeReport,license,readme}.html )
-
-JAVA_GENTOO_CLASSPATH_EXTRA="icu4j.jar:icu4j-charset.jar:icu4j-localespi.jar:testdata.jar:framework.jar"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,junitparams"
-JAVA_TEST_EXTRA_ARGS="-Djava.locale.providers=CLDR,COMPAT,SPI"
-
-JAVA_TEST_SRC_DIR=(
-	tests/charset/src
-	tests/collate/src
-	tests/core/src
-#	tests/framework/src # we compile it in src_compile
-	tests/localespi/src
-	tests/packaging/src
-	tests/translit/src
-)
-
-JAVA_TEST_RESOURCE_DIRS=(
-	tests/charset/resources
-	tests/collate/resources
-	tests/core/resources
-#	tests/framework/resources
-	tests/localespi/resources
-	tests/packaging/resources
-	tests/translit/resources
-)
-
-JAVA_TEST_EXCLUDES=(
-	"com.ibm.icu.dev.data.TestDataElements_testtypes" # Invalid test class 1. No runnable methods
-	"com.ibm.icu.dev.data.resources.TestDataElements_en_Latn_US" # Invalid test class 1. No runnable methods
-	"com.ibm.icu.dev.data.resources.TestDataElements_en_US" # Invalid test class 1. No runnable methods
-	"com.ibm.icu.dev.data.resources.TestDataElements_fr_Latn_FR" # Invalid test class 1. No runnable methods
-	"com.ibm.icu.dev.data.resources.TestDataElements_te" # Invalid test class 1. No runnable methods
-	"com.ibm.icu.dev.data.resources.TestMessages" # Invalid test class 1. No runnable methods
-	"com.ibm.icu.dev.test.translit.TestUtility" # Invalid test class 1. No runnable methods
-	"com.ibm.icu.dev.test.localespi.TestUtil" # Invalid test class 1. No runnable methods
-	"com.ibm.icu.dev.test.stringprep.TestData" # Invalid test class 1. No runnable methods
-	"com.ibm.icu.dev.test.calendar.ChineseTestCase" # Invalid test class 1. Test class should have exactly one public zero-argument constructor
-	"com.ibm.icu.dev.test.calendar.TestCase" # java.lang.IllegalArgumentException: Test class can only have one constructor
-	"com.ibm.icu.dev.test.bidi.TestData" # Invalid test class 1. Test class should have exactly one public constructor
-	# following kills 98 tests and and avoids 9 test failures
-	# coverage tests fail because test handlers for the parametrized tests are not defined so the tests are broken and cannot succeed
-	"com.ibm.icu.dev.test.serializable.CoverageTest"
-)
-
-src_prepare() {
-	default
-
-	# create the resources directories
-	mkdir resources || die
-	cp -r classes/* resources || die
-
-	# remove .java files from resources
-	find resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed"
-
-	# this should not go in the jar files
-	mv shared/licenses/license.html .. || die
-
-	# icudata and icutzdata for "icu4j.jar"
-	pushd resources/core/src || die
-		jar -xf "${S}"/shared/data/icudata.jar || die
-		jar -xf "${S}"/shared/data/icutzdata.jar || die
-		# move these resources to "icu4j-charset.jar"
-		mkdir -p "${S}"/resources/charset/src/com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b || die
-		mv com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b/{*.cnv,cnvalias.icu} \
-			"${S}"/resources/charset/src/com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b || die
-
-		# create 9 files com/ibm/icu/impl/data/icudt69b/*/fullLocaleNames.lst
-		for dir in $(find com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b/ -type d ! -name 'unit' -exec echo {} +); do
-			ls -1 $dir/*.res | sed -e 's%.*\/%%' -e 's%\..*$%%' -e '/pool/d' -e '/res_index/d' -e '/tzdbNames/d'\
-				> $dir/'fullLocaleNames.lst';
-		done || die "fullLocaleNames.lst failed"
-	popd
-
-	# this test class was failing with "No runnable methods"
-	# but text_excluding it would kill tousands of other tests.
-	mkdir -p tests/framework/src/com/ibm/icu/dev/data/resources || die
-	mv tests/{core,framework}/src/com/ibm/icu/dev/data/resources/TestDataElements.java || die
-
-	# testdata.jar needs to be on classpath
-	cp shared/data/testdata.jar . || die
-
-	# clone tests src
-	for i in charset collate core framework localespi packaging translit; do \
-		cp -r tests/$i/{src,resources} ; \
-		done || die "copying tests from src to resources failed"
-	cp -r ../tools/misc/{src,resources} || die
-
-	# separate tests resources from tests src
-	find tests/*/resources -type f -name '*.java' -exec rm -rf {} + || die
-	find ../tools/misc/resources -type f -name '*.java' -exec rm -rf {} + || die
-}
-
-src_compile() {
-	# "icu4j.jar"
-	JAVA_SRC_DIR=(
-		classes/collate/src
-		classes/core/src
-		classes/currdata/src
-		classes/langdata/src
-		classes/regiondata/src
-		classes/translit/src
-	)
-	JAVA_RESOURCE_DIRS=(
-		resources/collate/src
-		resources/core/src
-		resources/currdata/src
-		resources/langdata/src
-		resources/regiondata/src
-		resources/translit/src
-		shared/licenses
-	)
-	JAVA_JAR_FILENAME="icu4j.jar"
-#	JAVA_MAIN_CLASS="com.ibm.icu.util.VersionInfo"
-	java-pkg-simple_src_compile
-	rm -fr target || die
-
-	# "icu4j-charset.jar"
-	JAVA_SRC_DIR=( classes/charset/src )
-	JAVA_RESOURCE_DIRS=( resources/charset/src shared/licenses )
-	JAVA_JAR_FILENAME="icu4j-charset.jar"
-	java-pkg-simple_src_compile
-	rm -fr target || die
-
-	# "icu4j-localespi.jar"
-	JAVA_SRC_DIR=( classes/localespi/src )
-	JAVA_RESOURCE_DIRS=( resources/localespi/src shared/licenses )
-	JAVA_JAR_FILENAME="icu4j-localespi.jar"
-	java-pkg-simple_src_compile
-	rm -fr target || die
-
-	# main/test/framework
-	# needed for compilicg the tests
-	# but "No runnable methods" ("Invalid test class")
-	if use test; then
-		JAVA_SRC_DIR=( tests/framework/src ../tools/misc/src )
-		JAVA_RESOURCE_DIRS=( tests/framework/resources ../tools/misc/resources )
-		JAVA_JAR_FILENAME="framework.jar"
-		java-pkg-simple_src_compile
-		rm -fr target || die
-	fi
-
-	# javadocs
-	if use doc; then
-		JAVA_SRC_DIR=( classes )
-		JAVA_JAR_FILENAME="ignoreme.jar"
-		java-pkg-simple_src_compile
-	fi
-}
-
-src_test () {
-	# https://bugs.gentoo.org/827212
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if [[ "${vm_version}" != "1.8" ]] ; then
-		java-pkg-simple_src_test
-	fi
-}
-
-src_install() {
-	default
-	java-pkg_dojar "icu4j.jar"
-	java-pkg_dojar "icu4j-charset.jar"
-	java-pkg_dojar "icu4j-localespi.jar"
-
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-	if use source; then
-		java-pkg_dosrc "classes"
-	fi
-}
diff --git a/dev-java/icu4j/icu4j-71.1.ebuild b/dev-java/icu4j/icu4j-71.1.ebuild
index 33022e52d6d9..a14ec6534942 100644
--- a/dev-java/icu4j/icu4j-71.1.ebuild
+++ b/dev-java/icu4j/icu4j-71.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/unicode-org/icu/archive/refs/tags/release-${PV/./-}.
 
 LICENSE="icu"
 SLOT="70"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*
 	test? ( dev-java/junitparams:0 )"
diff --git a/dev-java/invokebinder/Manifest b/dev-java/invokebinder/Manifest
deleted file mode 100644
index eba6446b1957..000000000000
--- a/dev-java/invokebinder/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX invokebinder-1.6-build.xml 9883 BLAKE2B 956e962ef531cfc4e3b90aedb804e709c2528c0c37747a4c897686eb5072e01fc95c4fdf5d88c882412da2131751f312b7fbc3a8c90ab9016bcb3b5d2f312480 SHA512 d498da02a99a4dbbf6c05862a027bca3ed06b8575b8cd7f0c1413750b88b48fe6823ee0c02067a6e476f737b8884a1e7e53bcc9dfe7f74613601bd780c3965a2
-DIST invokebinder-1.6.tar.gz 36027 BLAKE2B b1a676063690500ae0a2c39eed7828d115074fd18ac88338e6078413d837f91e5a1a9a5beb2da976f82315fc6fb63de6f3df47e82c2e7589d4689986d78e3fa1 SHA512 cacdd6dd5fe74bbba940be1b3d53b183adc247b74e89cc0784805b2ad2c63d12ca1abe20bacf0a90ea50db7574e43d4ac52b5a46e61912e5153e2ac2f6bc559a
-EBUILD invokebinder-1.6.ebuild 896 BLAKE2B a009c871e0f31e7c7a3cc529348465d9fc60fd120cdfe46668cfe04caa3927d700d297ebccab61c384117cfbbef4a916d036b217d08b0577d6bdc3b9e4409b2c SHA512 0b26690302f1676e171d618a23c9a3d0de1c2bb9b403c3481fcbf6ac604f1f3e948ba4769632e1efbde3479f2a9aebc8eaff9e6f3adc0762fa33be0a87715817
-MISC metadata.xml 332 BLAKE2B bcda7ff56d916303e916e8a2dcd167fa5bca6db1e5248710b5ae25543b426b595eac5cacb81d5f1fa6d71409a5e1c6aad12717492b5eaa7e446df17f2dc889e7 SHA512 5f8e3d700c95d84b07592e1246300d8c7f65238f56168d18cd2a2ad290f2dbc2b254728812c76b7901424f15dce655f41501469cdfa3e88d4692ba0e3bc49c34
diff --git a/dev-java/invokebinder/files/invokebinder-1.6-build.xml b/dev-java/invokebinder/files/invokebinder-1.6-build.xml
deleted file mode 100644
index 55c846cf0427..000000000000
--- a/dev-java/invokebinder/files/invokebinder-1.6-build.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 10/12/15 9:24 PM                      -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="invokebinder-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="invokebinder-1.6"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath"/>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/junit/junit/4.9/junit-4.9.jar"/>
-    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.7" 
-           verbose="false" 
-           fork="false" 
-           source="1.7">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.7" 
-           verbose="false" 
-           fork="false" 
-           source="1.7">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-</project>
diff --git a/dev-java/invokebinder/invokebinder-1.6.ebuild b/dev-java/invokebinder/invokebinder-1.6.ebuild
deleted file mode 100644
index 6eafa55d1d55..000000000000
--- a/dev-java/invokebinder/invokebinder-1.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Provide a friendly DSL for binding method handles"
-HOMEPAGE="https://github.com/headius/invokebinder"
-SRC_URI="https://github.com/headius/${PN}/archive/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-LICENSE="Apache-2.0"
-
-S="${WORKDIR}/${PN}-${P}"
-
-DEPEND=">=virtual/jdk-1.7
-	test? (
-		dev-java/ant-junit:0
-	)"
-RDEPEND=">=virtual/jre-1.7"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_TEST_TARGET="test"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar "target/${P}.jar" "${PN}.jar"
-	use source && java-pkg_dosrc src/main/java/com
-	if use doc; then
-		java-pkg_dojavadoc target/site/apidocs
-		dodoc README.markdown
-	fi
-}
diff --git a/dev-java/invokebinder/metadata.xml b/dev-java/invokebinder/metadata.xml
deleted file mode 100644
index d097145e4f4e..000000000000
--- a/dev-java/invokebinder/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-  <upstream>
-    <remote-id type="github">headius/invokebinder</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-java/jackson-annotations/Manifest b/dev-java/jackson-annotations/Manifest
index ae6216cc85ca..075ebba98e0f 100644
--- a/dev-java/jackson-annotations/Manifest
+++ b/dev-java/jackson-annotations/Manifest
@@ -1,5 +1,4 @@
-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
+EBUILD jackson-annotations-2.13.2-r1.ebuild 1406 BLAKE2B 1e23e4a34af9bbf0889aec12c029f9d1b330fb44dc323ff88d61fcb690de0f50653c45aea511832107be00461352e4ddb4532c0ffd4f9e690f26b4a228c7c9c1 SHA512 c2b86332f87035bcf1467bc9523278dca5822a665840c8ca9f60af5503289703226b4e27aec0a709a19d95f7a3bb47ee457a70ff6dfbf4f8487ba805994ce55a
+EBUILD jackson-annotations-2.13.2.ebuild 1403 BLAKE2B 357387e57a65eefa466c7c3878f45bc840c8e898686be2339a3145a087bf473b1764b0c4b0011954888217c86ed7b37e04c5eaaaa6112cb5c4d88408f5113353 SHA512 87619ade60bc93c1322873ad93bd0678d8f776208a1a16feac8598250bd7b92c1145f4526315c96a5efe71d1fa44fa729bcfedfccbac22dd53e34d712a95981d
 MISC metadata.xml 341 BLAKE2B 1a6bf9fc13afb0c6d95cb0752f40474fff4135031e2771f3c0555cd7961e23ea7c026d6cf905acb505ceb2aa4fad01ea5dfac310004b51828b1383dd9a44f9bb SHA512 51655fad0847b2bbc92ed31310c155f26edf6dc41da35cbe239c99eea205a054f6bf7a7839201b8f8fb397110b50935d7c069f3baa7650970580a0c9ef156f12
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.2-r1.ebuild
index 04d11cb62cce..ebc4e66b08e7 100644
--- a/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild
+++ b/dev-java/jackson-annotations/jackson-annotations-2.13.2-r1.ebuild
@@ -2,28 +2,28 @@
 # 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/refs/tags/jackson-annotations-2.13.0.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-annotations-2.13.0.ebuild
+# 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.0"
+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/refs/tags/${P}.tar.gz"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-DEPEND=">=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
 
-DOCS=( LICENSE README.md release-notes/VERSION-2.x )
+DOCS=( README.md release-notes/VERSION-2.x )
 
 S="${WORKDIR}/${PN}-${P}"
 
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild
index 81ea0df6638c..c2835290b469 100644
--- a/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild
+++ b/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-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/jackson-core/Manifest b/dev-java/jackson-core/Manifest
index 8f34301c6f9a..bd94be2730ae 100644
--- a/dev-java/jackson-core/Manifest
+++ b/dev-java/jackson-core/Manifest
@@ -1,5 +1,4 @@
-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
+EBUILD jackson-core-2.13.2-r1.ebuild 2089 BLAKE2B 651f71fcf51ff24725078c008391ff16ef24f524d153493079af657f319e565fd51163f88b5d8a5e058a614d2a5bb1de4fd70592a84d8c1901b973704a611431 SHA512 9bd82d0407ecd86bcb6e1435b31e6a7a5afca0ed3943f74618affe07336dd87926867500d82018df62af122935c858f6bb2671cf28ad55f056d7bf095afed072
+EBUILD jackson-core-2.13.2.ebuild 2086 BLAKE2B 2985b182545844f21a57bedcf0ccb80d88b3ef5256ad8627c20eb4a2156cd6c4a8874da62741e995da05fb0924766c9f6cabfe9a5a7345182e8dc97cb8a7d230 SHA512 37fb40bea78345bd524ff326bfbfee0676b06087833a61e9c1fb024eef369416fa65f371f8afda7b2d69148595c124b66bc3c1591709bff7e4ac7d3c480c2fdd
 MISC metadata.xml 312 BLAKE2B b1beb51833c35e3ab2191a3c722768a34ec6cbf3ee240d67381b5137aabc0bb8be862f32638f35c1ba84a75498bb66303223c1d43b7d48c8bfe143ee837d6338 SHA512 b85d17092438f67523cf8c3c861de1183e061f55620342239bd662e5e90058f82fb501ba24bf2c1de6ebbe512ae4559d4b746a575261cbf2feb142e120118372
diff --git a/dev-java/jackson-core/jackson-core-2.13.0.ebuild b/dev-java/jackson-core/jackson-core-2.13.2-r1.ebuild
index 562b36a94013..9892ac01a0ed 100644
--- a/dev-java/jackson-core/jackson-core-2.13.0.ebuild
+++ b/dev-java/jackson-core/jackson-core-2.13.2-r1.ebuild
@@ -2,28 +2,28 @@
 # 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/refs/tags/jackson-core-2.13.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-core-2.13.0.ebuild
+# 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.0"
+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 abstractionis (Streaming API), implementation for JSON"
+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/refs/tags/${P}.tar.gz"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-DEPEND=">=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
 
-DOCS=( LICENSE README.md release-notes/{CREDITS-2.x,VERSION-2.x} )
+DOCS=( README.md release-notes/{CREDITS-2.x,VERSION-2.x} )
 
 S="${WORKDIR}/${PN}-${P}"
 
@@ -33,18 +33,6 @@ 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 doesn't run these tests and gets
-	# »Tests run: 928, Failures: 0, Errors: 0, Skipped: 0«
-	com.fasterxml.jackson.failing.async.AsyncTokenErrorTest
-	com.fasterxml.jackson.failing.filter.BasicParserFilteringTest
-	com.fasterxml.jackson.failing.ParserErrorHandling105Test
-	com.fasterxml.jackson.failing.ParserErrorHandling679Test
-	com.fasterxml.jackson.failing.ParserFilterEmpty708Test
-	com.fasterxml.jackson.failing.Surrogate223Test
-	perf.ConcurrencyReadTest
-	perf.ManualCharAccessTest
-)
 
 src_prepare() {
 	default
@@ -59,6 +47,22 @@ src_prepare() {
 	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-core/jackson-core-2.13.2.ebuild b/dev-java/jackson-core/jackson-core-2.13.2.ebuild
index 89cdf79b4682..e156fbe67bdc 100644
--- a/dev-java/jackson-core/jackson-core-2.13.2.ebuild
+++ b/dev-java/jackson-core/jackson-core-2.13.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jackson-databind/Manifest b/dev-java/jackson-databind/Manifest
index 662489fd8241..50f7618b401a 100644
--- a/dev-java/jackson-databind/Manifest
+++ b/dev-java/jackson-databind/Manifest
@@ -1,5 +1,5 @@
-DIST jackson-databind-2.13.0.tar.gz 44195827 BLAKE2B f623840b21ba149510d81722ef5aa94dcc99fadc18954427340db2c411e90db53d1507789e79048d4bc84f56786202a4ad741a30bf904863a974939e038e7bb8 SHA512 f76a0b0b940f297d65c6bcf9ba3e6f276294f5ef70fe1c5b1dddab826ef9b49ef195fa0115d422906925e32ced1002c7e02991106e8cf196f48db49b67e39067
+DIST jackson-databind-2.13.2.2.tar.gz 48061394 BLAKE2B c67b0a23c5fcff881d91ddec14877a5ec16c13eebfc76b34c1666bc9ebc73f573d279d1951ff2be96c612fa87281e08332047bb6c75df73184249b7ebb552d16 SHA512 0c3550aa3ada1c5fcd2f19076670c7ddffde59542b10fa270d1c7bd54d7866f0f10c256738ed76815af55c8531f7553f8b977c461fe710f759811b0ffa660245
 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
+EBUILD jackson-databind-2.13.2.2.ebuild 2687 BLAKE2B 2021205cc19d6f806ee43df675d01d3938a8495b993da4e9913039bda46f97b28ee2bda45613c461a303549bdbebde418e19ab13af1736960f04d98e4f578d6b SHA512 cd6947dcca14f2bda538996a12292d1e7604bacd86a91bf9c310d93093ba981131b64d674877bb63dc26edf3e563607406cc7b4d566f7d904a2677cdaff35de9
+EBUILD jackson-databind-2.13.2.ebuild 2678 BLAKE2B 73a94733e41321a63d6efce8626d35dbf57fccca30739983e555f1f34103cd223f61b7288522165d6e3e4031d64b4976367bbf698c28cdfb40469b4d926f790f SHA512 1f4a50f7d904ecf1c1c4e40c17cf6835ff49d9d102a270034054e965c1a7881ffd91c71c94ea10b2c6b80c12fe2bb119320cc1a1827f754afce5e1172649f902
 MISC metadata.xml 316 BLAKE2B 06c857b21b1c39450aefd3a56ee67e0a9c57ce28f434e0af285397bf9c0a73801983b71415c1dd3ee1b53e9b1bf855d81b204559ccfe5bda7cf0703975a8420e SHA512 3308a8e0872865b0da8c3c5720364f786764d6cb751b6ad465dc450338b8c3f672b8266ab957a27609363d507b7f711ccb0edb921388a8f50cba73424fc85253
diff --git a/dev-java/jackson-databind/jackson-databind-2.13.0.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.2.2.ebuild
index 1d9ce42a4732..6cf6a5d4464d 100644
--- a/dev-java/jackson-databind/jackson-databind-2.13.0.ebuild
+++ b/dev-java/jackson-databind/jackson-databind-2.13.2.2.ebuild
@@ -2,35 +2,35 @@
 # 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/refs/tags/jackson-databind-2.13.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-databind-2.13.0.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.13.2.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-databind-2.13.2.2.ebuild
 
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-databind:2.13.0"
+MAVEN_ID="com.fasterxml.jackson.core:jackson-databind:2.13.2.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/refs/tags/${P}.tar.gz"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+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.0 -> >=dev-java/jackson-annotations-2.13.0:2
-# com.fasterxml.jackson.core:jackson-core:2.13.0 -> >=dev-java/jackson-core-2.13.0:0
+# 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.0:2
-	dev-java/jackson-core:0
+	~dev-java/jackson-annotations-2.13.2:2
+	~dev-java/jackson-core-2.13.2:0
 "
 
 # Compile dependencies
@@ -41,19 +41,21 @@ CP_DEPEND="
 # test? org.powermock:powermock-core:2.0.0 -> !!!groupId-not-found!!!
 # test? org.powermock:powermock-module-junit4:2.0.0 -> !!!groupId-not-found!!!
 
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}"
 #	test? (
 #		!!!groupId-not-found!!!
 #	)
 #"
 
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
 
-S="${WORKDIR}/${PN}-${P}"
+DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION}-2.x )
 
-DOCS=( LICENSE {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"
diff --git a/dev-java/jackson-databind/jackson-databind-2.13.2.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.2.ebuild
index af5adb449b65..9500e3416646 100644
--- a/dev-java/jackson-databind/jackson-databind-2.13.2.ebuild
+++ b/dev-java/jackson-databind/jackson-databind-2.13.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Dependencies like powermock-{core,module-junit4,api-mockito2} are not available in ::gentoo
 RESTRICT="test"
diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
index adb884245636..1b6b2b626481 100644
--- a/dev-java/jackson-dataformat-xml/Manifest
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -1,5 +1,4 @@
-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
+EBUILD jackson-dataformat-xml-2.13.2-r1.ebuild 3898 BLAKE2B d40d3321dbd4b92e2266074c65c196c8090aba379521fbb28f257851c0e47f395c9994a3ac4d951572f7be2179645ee8699cf1c19c606fb277884fcf679c9c3b SHA512 9e1f61c1786e76f1dd61cdf692291b61d7e6512382087de96d05f00934f0ecd369ba8663316f892e765fedc94dd8450b63e8f6a8167aede277e4a91b2415d750
+EBUILD jackson-dataformat-xml-2.13.2.ebuild 3882 BLAKE2B ae53d37dcf97621d756ea1f77cf5333133a2c4da8b1d65920b8fab5a696386cfe10d75a5ef799136c7a78f42b5eb81ffd42b6b350c99b433112b9c77ff1cb5e5 SHA512 ab5a4bb15ed17a3b79a4bc4cc46c87178c7e1d645c54aac1614cbbe12c370fd74119059b8d849fe6de64d8b69e6188be0cde047d789e793afab93ae1ff9cb284
 MISC metadata.xml 487 BLAKE2B 0e5e73be66b890aab37fce8ccd162c168c7cff415c418a30f5cdcc76624499633abfd366f86ece75de208b981a03364566659e37c2b3a34ad90a01f3577a707a SHA512 b920c1d3b8d8f6023df6c100ba4b36282c7cbfdad4a4690055d70cd3dac8d0da91f236a38565bee798342dd94c49cf2c9ce125282a7e5fd818321e28d288b3f1
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2-r1.ebuild
index 4430aa547511..da444ab5520e 100644
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2-r1.ebuild
@@ -2,12 +2,12 @@
 # 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/refs/tags/jackson-dataformat-xml-2.13.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-xml-2.13.0.ebuild
+# 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.0"
+MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.2"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
@@ -18,44 +18,46 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # Common dependencies
 # POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.0 -> >=dev-java/jackson-annotations-2.13.0:2
-# com.fasterxml.jackson.core:jackson-core:2.13.0 -> >=dev-java/jackson-core-2.13.0:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.0 -> >=dev-java/jackson-databind-2.13.0:0
-# com.fasterxml.woodstox:woodstox-core:6.2.6 -> >=dev-java/woodstox-core-6.2.7:0
+# 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-2.13.0:2
-	>=dev-java/jackson-core-2.13.0:0
-	>=dev-java/jackson-databind-2.13.0:0
-	>=dev-java/stax2-api-4.2.1:0
-	>=dev-java/woodstox-core-6.2.7:0
+	~dev-java/jackson-annotations-${PV}:2
+	~dev-java/jackson-core-${PV}:0
+	~dev-java/jackson-databind-${PV}.2:0
+	>=dev-java/stax2-api-4.2.1-r1:0
+	dev-java/woodstox-core:0
 "
 
 # Compile dependencies
 # POM: pom.xml
-# test? com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.0 -> >=dev-java/jackson-module-jakarta-xmlbind-2.13.0:0
+# 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="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}
 	test? (
-		dev-java/jackson-module-jakarta-xmlbind:0
+		~dev-java/jackson-module-jakarta-xmlbind-${PV}:0
 		dev-java/jaxb-api:3
 		dev-java/sjsxp:0
 	)
 "
 
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
 
-DOCS=( LICENSE README.md release-notes/{CREDITS,VERSION}-2.x )
+DOCS=( README.md release-notes/{CREDITS,VERSION}-2.x )
 
 S="${WORKDIR}/${PN}-${P}"
 
@@ -65,23 +67,6 @@ 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"
-JAVA_TEST_EXCLUDES=(
-	# Upstream: Tests run: 316, Failures: 0, Errors: 0, Skipped: 0
-	# All the following are not run by upstream (mvn test).
-	com.fasterxml.jackson.dataformat.xml.failing.ConflictingGetters27Test
-	com.fasterxml.jackson.dataformat.xml.failing.ElementWrapperViaCreator149Test
-	com.fasterxml.jackson.dataformat.xml.failing.EnumIssue9Test
-	com.fasterxml.jackson.dataformat.xml.failing.Issue37AdapterTest
-	com.fasterxml.jackson.dataformat.xml.failing.Issue491NoArgCtorDeserRegressionTest
-	com.fasterxml.jackson.dataformat.xml.failing.PojoAsAttributeSer128Test
-	com.fasterxml.jackson.dataformat.xml.failing.PolymorphicIssue4Test
-	com.fasterxml.jackson.dataformat.xml.failing.PolymorphicList426Test
-	com.fasterxml.jackson.dataformat.xml.failing.UntypedListSerialization8Test
-	com.fasterxml.jackson.dataformat.xml.failing.UnwrappedAndList299DeserTest
-	com.fasterxml.jackson.dataformat.xml.failing.VerifyRootLocalName247Test
-	com.fasterxml.jackson.dataformat.xml.failing.XmlTextViaCreator306Test
-	com.fasterxml.jackson.dataformat.xml.failing.XmlTextWithEmpty449Test
-)
 
 src_prepare() {
 	java-pkg-2_src_prepare
@@ -95,7 +80,16 @@ src_prepare() {
 }
 
 src_test() {
-	# The same failure occurs upstream (running 'mvn 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
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
index 96988a0eca88..c5854f85e438 100644
--- 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
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jackson-dataformat-yaml/Manifest b/dev-java/jackson-dataformat-yaml/Manifest
index 1f0557ef29be..8a7f9a17babc 100644
--- a/dev-java/jackson-dataformat-yaml/Manifest
+++ b/dev-java/jackson-dataformat-yaml/Manifest
@@ -1,5 +1,4 @@
-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
+EBUILD jackson-dataformat-yaml-2.13.2-r1.ebuild 2668 BLAKE2B f4cffdc70c4a401f57fe2b46c10c8de15440508eff222ff9979354ff93a7fb4753941cad626efd14478f94a70ab467fa814102a98dd8f08f25908a02c47d9820 SHA512 819c502af6462c4012e3d6d6309e6e0188ceb822d03fa32446a2b65e3a897b1639931e1a4e26d174cdd39146c633649abb63af4f4354553cdb2a8e956273075d
+EBUILD jackson-dataformat-yaml-2.13.2.ebuild 2663 BLAKE2B d1efad7633939422a69e409d9c36f360a9b20122d744ac21a0c7cafb189857f465f85d9757a9be0c0583cb5c4aadb878d581c05bf62e25634998124a956afa52 SHA512 d76652d58f9192458cf5684801cb34d3dacc124a233184d81d9c3170e74c29f4a058dc246c6cf7703640d19ceb8344834ba057659c6c6ad89417b9b3d41d946b
 MISC metadata.xml 342 BLAKE2B 4d57f5b5bc0e926e2c359501044c45f3c8223639349286adf9e979cc0cf2bc02070999b1fae29b1da8e14b0348a0aa95dac24006b138f7a60fb7d2d9127fea1f SHA512 7ec10474b90f26e90dfd0d4039901582620a8f84d1a859283522c14aac5a11677d624a3cb773245add8d9fb5704ae94f8a825e68cd4299bf93d4678894561742
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.0.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2-r1.ebuild
index e90213a12e8c..139c808cdee6 100644
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.0.ebuild
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2-r1.ebuild
@@ -2,41 +2,44 @@
 # 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/refs/tags/jackson-dataformats-text-2.13.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-yaml-2.13.0.ebuild
+# 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.0"
+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/refs/tags/jackson-dataformats-text-${PV}.tar.gz -> ${P}.tar.gz"
+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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # Common dependencies
 # POM: pom.xml
-# com.fasterxml.jackson.core:jackson-core:2.13.0 -> >=dev-java/jackson-core-2.13.0:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.0 -> >=dev-java/jackson-databind-2.13.0:0
-# org.yaml:snakeyaml:1.28 -> >=dev-java/snakeyaml-1.28:0
+# 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:0
-	dev-java/jackson-databind:0
+	~dev-java/jackson-core-${PV}:0
+	~dev-java/jackson-databind-${PV}.2:0
 	dev-java/snakeyaml:0
 "
 
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}
+"
 
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
 
 DOCS=( README.md release-notes/{CREDITS,VERSION} )
 
@@ -49,8 +52,7 @@ JAVA_TEST_GENTOO_CLASSPATH="junit-4"
 JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_RESOURCE_DIRS="src/test/resources"
 JAVA_TEST_EXCLUDES=(
-	# Upstream doesn't run these tests and gets
-	# »Tests run: 121, Failures: 0, Errors: 0, Skipped: 0«
+	# 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
@@ -67,7 +69,7 @@ src_prepare() {
 		"${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.28-r1 does not provide module-info
+	# dev-java/snakeyaml-1.30 does not provide module-info
 	sed -e '/snakeyaml;/d' -i src/moditect/module-info.java || die
 }
 
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
index c444dc69b4f7..a324875e0e97 100644
--- 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
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-d
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jackson-module-jakarta-xmlbind/Manifest b/dev-java/jackson-module-jakarta-xmlbind/Manifest
index 79ebdca3dd81..5468474998c7 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/Manifest
+++ b/dev-java/jackson-module-jakarta-xmlbind/Manifest
@@ -1,5 +1,4 @@
-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
+EBUILD jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild 2797 BLAKE2B 3fb3ebfbe0db71fa162703af10d62a18c3b32bc7875199cf4c555467c4af855ba3188f33f99c8fb66a4ec2f1d80a5d4944bb36f5b8e9873a25bb514993a5a6ae SHA512 e682ffdfa4022ef9d1fabf2cd07a5842d802cdb121eaf26e58004755f7b553fbdd79a23d7b3fe5920e9e5b93e43b7e263e26bf68ddb3caadbf35d190abc7333c
+EBUILD jackson-module-jakarta-xmlbind-2.13.2.ebuild 2792 BLAKE2B cc25393d71497d490dd6156a9ae1121959b09cc8d13b9a839f38a435c495ec4e01d8da6e4e7dc2c35309156b4f3a068c886fe5a7642eeab7dcf5a47ce4541334 SHA512 3ac9d6ea9bd1facb0496aad8c687543ca1e7edf432a0dde014c5530acede124b1df4d9bd3e8a17d228bbc678a9e4a67f6750a6dc3c2433d60199c4840484218c
 MISC metadata.xml 506 BLAKE2B 4e62bddea5ad8f7e6b73de9a173dbc8416b309caf4e4f9801496712f1cc88bdab646d237e48c3f55c99d95c198056b6642cf19070805f694b3a8e996e9bd0528 SHA512 96825b1a8ec0808f4dfa4a2482a1c184acab23d624ab178be8df496c67ff3ca5cd7cf012e6e7017721a3355a6ff3265d6f76734a655bfb261d3530781825f5d5
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.0.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild
index e93391f95948..bc1ab00b11a4 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.0.ebuild
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild
@@ -2,39 +2,39 @@
 # 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/refs/tags/jackson-modules-base-2.13.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-xmlbind-annotations-2.13.0.ebuild
+# 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.0"
+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/refs/tags/jackson-modules-base-${PV}.tar.gz -> ${P}.tar.gz"
+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"
+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.0 -> >=dev-java/jackson-annotations-2.13.0:2
-# com.fasterxml.jackson.core:jackson-core:2.13.0 -> >=dev-java/jackson-core-2.13.0:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.0 -> >=dev-java/jackson-databind-2.13.0:0
-# jakarta.activation:jakarta.activation-api:1.2.1 -> >=dev-java/jakarta-activation-api-1.2.2:1
+# 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:2
-	dev-java/jackson-core:0
-	dev-java/jackson-databind:0
+	~dev-java/jackson-annotations-${PV}:2
+	~dev-java/jackson-core-${PV}:0
+	~dev-java/jackson-databind-${PV}.2:0
 	dev-java/jakarta-activation-api:1
 	dev-java/jaxb-api:3
 "
@@ -44,15 +44,19 @@ CP_DEPEND="
 # 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="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}"
 #	test? (
 #		!!!groupId-not-found!!!
 #	)
 #"
 
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( ../README.md )
 
 S="${WORKDIR}/jackson-modules-base-jackson-modules-base-${PV}/jakarta-xmlbind/"
 
@@ -71,14 +75,9 @@ src_prepare() {
 		-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
+}
 
-	# This is an ugly hack, but ...
-	#	src/moditect/module-info.java:13: error: cannot find symbol
-	#	        com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindModule;
-	#	                                                    ^
-	#	  symbol:   class JakartaXmlBindModule
-	#	  location: package com.fasterxml.jackson.module.jakarta.xmlbind
-	sed -e '/JakartaXmlBindModule/d' \
-		-e '/provides/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/jackson-module-jakarta-xmlbind-2.13.2.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild
index 642e074deac8..18d572895a82 100644
--- 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
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modul
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # We don't have jaxb-runtime:3.0.1
 RESTRICT="test"
diff --git a/dev-java/jakarta-activation-api/Manifest b/dev-java/jakarta-activation-api/Manifest
index c706048306f9..fca8d6cc5fbc 100644
--- a/dev-java/jakarta-activation-api/Manifest
+++ b/dev-java/jakarta-activation-api/Manifest
@@ -1,5 +1,5 @@
 DIST jakarta-activation-2.1.0.tar.gz 118833 BLAKE2B ad4b23405b412eb31ffe6fa9ebb62e5f3d21f721908bec6607d1e236b1aa36a5fbc5d721db879210b99a236a3ead4e6b89854f311b4593f32bc537f0d37638a0 SHA512 6552789b3bc590b241250387e07fd9973f2ba210544baf5e5c272ce9824ddc568dd186d2db2b28d89698b68c6505d8263d8aa5ceedf1a12a2d8fc94d648cc8fa
 DIST jakarta-activation-api-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
-EBUILD jakarta-activation-api-1.2.2.ebuild 1590 BLAKE2B ba56e982f02880249e8a1cd29da6b83d3e8cf0d6ed78675da877cca54067f70f0d1e5655c2e83b759db7968740bffaea1ed124ff2ff1f8ff82533a4af68f19aa SHA512 a762af840f87fbb91659e96aad528f0fb2b3163f8579ec154a1c997ad9f5569d751cbf38653396cbd84d47e7f89e7df8f0b4ddb32a11dbc98ed6eca293d360ec
-EBUILD jakarta-activation-api-2.1.0.ebuild 1062 BLAKE2B 09c650e668080f9fa97a80ef94667b20d7db41ab097245f676e2f3863d5d2f97a54d2536ec1681b9251c23942fa374e902b29e8ac2ab7675f8f11efac2e8a660 SHA512 500afa3a79e46e13a9a62b3ff7cc24f1306b4cf608016210c6f30f272edd38ba2da1033399cf62371418160d51940cac65f1d55926e6c39433b44f7ea82f8beb
+EBUILD jakarta-activation-api-1.2.2-r1.ebuild 1571 BLAKE2B 735ce68ad35184b309031f339deb652161acd3491fe0de6cc3c57a3b214fce63d6aa24517c5d30db4df42bf17822324c7e731dea2ccc247d98287a46569d6dc0 SHA512 aa726b74aefbba61c8678cba3edde77930f6747dbd999860262e3fca731bcc337eab792ba35136116da965fb61d6434dcf1af11f814b1be564de258c29b90cac
+EBUILD jakarta-activation-api-2.1.0-r1.ebuild 1043 BLAKE2B bb91273f1543ede3541b5f145c00c5af91b40352228b96b1552d6a5f22dc9b03b34c6bfc1490d4f7f45922581226298e978a6866e722a0e78b5b103c10a578f0 SHA512 2c80f897c060da4ee53e817f2e08ce54a585ddcc979c83d48468dfd4d04c9373410192e9bfc8fb68004031ef7dae3c8a6ed8fa8bc167b4396006c275db59c62a
 MISC metadata.xml 362 BLAKE2B bfda62be71a4c85153713dd7e8546ce32c783612d2810046280cb9bdb86f3e2187000254c12b040bdb9fd91ac29a7dd910a9d99022fae851402944eebb428b8f SHA512 61b83467d9f5636bbd8c1e4bd4a553de3e36173db5c572d1d499c41615c7a3ffc83a2d8db1e6ee1551602534deba745edfc0394659b61f4dd3c252d84c196c06
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild
index 94b9355e3a91..459fa0f06282 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
 # java-ebuilder --generate-ebuild --workdir . --pom jaf-1.2.2/activationapi/pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/1.2.2.tar.gz --slot 1 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-api-1.2.2.ebuild
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 MAVEN_ID="jakarta.activation:jakarta.activation-api:1.2.2"
@@ -13,17 +13,17 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Activation API jar"
 HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="EPL-1.0"
 SLOT="1"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
-DEPEND=">=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
 BDEPEND="app-arch/zip"
 
-DOCS=( ../{CONTRIBUTING,LICENSE,NOTICE,README}.md )
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
 
 S="${WORKDIR}/jaf-${PV}/activation"
 
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild
index b7c470c56a1e..2b6b9f6729b6 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild
@@ -13,16 +13,16 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Activation API jar"
 HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz"
+SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz"
 
 LICENSE="EPL-1.0"
 SLOT="2"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
-DEPEND=">=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
 
-DOCS=( ../{CONTRIBUTING,LICENSE,NOTICE,README}.md )
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
 
 S="${WORKDIR}/jaf-${PV}/api"
 
diff --git a/dev-java/jakarta-activation/Manifest b/dev-java/jakarta-activation/Manifest
index 9fe1f97a5c0d..b56f5689e71c 100644
--- a/dev-java/jakarta-activation/Manifest
+++ b/dev-java/jakarta-activation/Manifest
@@ -1,5 +1,5 @@
 DIST jakarta-activation-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
 DIST jakarta-activation-2.0.1.tar.gz 133807 BLAKE2B 3b793fc767601cc1406482facb0456efd1f784371dff602e71f579a2c74f8e66affed384c8ce3b6aa7c2abfcb5cb0ff5f781ea109829c03f645099fb52016e21 SHA512 51e60d851b9f2027944ab24b248b3c7c19028a504ccf5f92a61495ffa65176df78c63c25e91de4a22d6aa9a1989db274f419f91693a21f052875635b8b21bad1
-EBUILD jakarta-activation-1.2.2.ebuild 1609 BLAKE2B ea8344052807a8d93da556279f8fef6a42a99317be98ccab2cb8e18d7834d04f4fe54821b9511ada0506b36979b2af4720860e858955590af578080aefcff750 SHA512 27a2dd8955cf3ed76927da79ae25b3d738b14fac05cda428ecb2527d00c146ff36281d2b02bd219de068e58a3ab1e307d2f2a1d7adfbe567fc75ac23289872c5
-EBUILD jakarta-activation-2.0.1.ebuild 925 BLAKE2B 57738556632dfbf21afa79b03fc54f2bc4910c34caa2ca7e1e5739a333484b791b2840032be41b82de1a22545257ac6d5f02c738ea86b87953927fe0cf7d63eb SHA512 469571fd8e95a797b28ebd3f751e8f47f58d661bc2999e676d5f2cf415d0258cef555610f1242d48f2c3fffbc030a32b05469c13e6b7841515c074df63ee851d
+EBUILD jakarta-activation-1.2.2-r1.ebuild 1590 BLAKE2B 8f97fe4b0d557e37c4c808af4c7f8bb52895af54c23c0f1f3af447af34c3ec0ac0213dd8cdba588f9f3dab3c1346dd4a84b2a5e3bc676f7d033bc87148e6b497 SHA512 95691423ba5596fa56ad1c18453644f1cd22de91d667d0d88a47fc4c3fb6bb4a34eb009123146984544d75ab49cf9afa68afaf23dbc91b9862eeaca7eb4bc48b
+EBUILD jakarta-activation-2.0.1-r1.ebuild 895 BLAKE2B e28c54f1f86ab0376c0ac5abcc03941c0239868a8bf92bbe4bb6e72498e620626c480085f60961c0b5605935e3668bc154870ce610511779db7f3caae5e6c37e SHA512 229cdd0db6e0691fdcef006d1aeb50ec465b3fd7fc9071f18b7fb49c22b0dede4c98c4eb99454fa936d5ff945ebc91aa024335a405270e507372a5efa6b780fa
 MISC metadata.xml 362 BLAKE2B bfda62be71a4c85153713dd7e8546ce32c783612d2810046280cb9bdb86f3e2187000254c12b040bdb9fd91ac29a7dd910a9d99022fae851402944eebb428b8f SHA512 61b83467d9f5636bbd8c1e4bd4a553de3e36173db5c572d1d499c41615c7a3ffc83a2d8db1e6ee1551602534deba745edfc0394659b61f4dd3c252d84c196c06
diff --git a/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild b/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild
index 4c78c930809f..0a83f80926ed 100644
--- a/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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/eclipse-ee4j/jaf/archive/refs/tags/1.2.2.tar.gz --slot 1 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-1.2.2.ebuild
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 MAVEN_ID="com.sun.activation:jakarta.activation:1.2.2"
@@ -13,7 +13,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Activation"
 HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="EPL-1.0"
 SLOT="1"
@@ -21,12 +21,12 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CDEPEND="dev-java/jakarta-activation-api:1"
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
+	>=virtual/jdk-11:*"
 RDEPEND="${CDEPEND}
 	>=virtual/jre-1.8:*"
 BDEPEND="app-arch/zip"
 
-DOCS=( ../{CONTRIBUTING,LICENSE,NOTICE,README}.md )
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
 
 S="${WORKDIR}/jaf-${PV}/activation"
 
diff --git a/dev-java/jakarta-activation/jakarta-activation-2.0.1.ebuild b/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
index f7fe1163b923..c409f44c8000 100644
--- a/dev-java/jakarta-activation/jakarta-activation-2.0.1.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
@@ -12,15 +12,15 @@ MAVEN_ID="com.sun.activation:jakarta.activation:2.0.1"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Activation"
-HOMEPAGE="https://github.com/eclipse-ee4j/jaf/jakarta.activation"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/eclipse-ee4j/jaf"
+SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="EPL-1.0"
 SLOT="2"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 "
 
 RDEPEND="
diff --git a/dev-java/jakarta-xml-soap-api/Manifest b/dev-java/jakarta-xml-soap-api/Manifest
index 83e3b4c05f70..446c8a9ad5c4 100644
--- a/dev-java/jakarta-xml-soap-api/Manifest
+++ b/dev-java/jakarta-xml-soap-api/Manifest
@@ -1,3 +1,3 @@
 DIST jakarta-xml-soap-api-1.4.2.tar.gz 107226 BLAKE2B 4de5b994505d1964b6804010191b7b623322005d7bac6e9295062e821b5e0994a02d04f72d7f1bba9a8bf835ce42f455678af35c8cdf3e9e7208a2fde4151927 SHA512 9df8bb191fee0f6afa46f2d0c4bd5d1760324220be6862ff17df77d0dd4c9341360f18dd935233fdf6d9656d511c5378bd557e3dadd6570dfd3c9d7981179516
-EBUILD jakarta-xml-soap-api-1.4.2.ebuild 1766 BLAKE2B 84865b7ae86ccca453cffc000619830315650c4be7cdca20168ca19a13ff3b4f11683d11e19bb60e8c9830edeea5882d2c013816af0f0748880cffd56afa81ea SHA512 2b9ac28826b1241e0a0a5c4589c61bd7c09e31d6a6c352ebe4d34818be989be4dc81e097d912811058dd2d6b1c464626cf711c88f5258a74342d63a69b277f4b
+EBUILD jakarta-xml-soap-api-1.4.2-r1.ebuild 1405 BLAKE2B 7dcd1daa61b9b90cc09376eaadf078e42d287e490a5c33cff7f9065511f6e4288fc375a22e5c622e1069b490e682968534c90b831ad314348ac47ec0c3c78c3c SHA512 aa650a8565aaa5037ff91af2f4049ac43282ed6e5e27d223a83817438ac4abb39da85d6235b7d5d12f71001628a8afa952927a813838d8e0f6cbc9b1da427d02
 MISC metadata.xml 323 BLAKE2B 4344e9fa5329a4353e4d1c824a0b64b4bcc4c9a59a9e085e2d4d4e075206b8137f36ec01673684881a93da8c4a4fca7f53770d9d0012e347a32e316582e4a709 SHA512 19672c91b0f5da04ad8d44d477a6192a010b57651eda3e6e4e68c0020ace835132a18a519015e49ab06fa4091a8fdb67a3cdeaee1058602c5009df086796a16e
diff --git a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild
index cd78fb76c776..be69299aa916 100644
--- a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild
+++ b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild
@@ -13,7 +13,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="SOAP with Attachments API for Java (SAAJ) API (Eclipse Project for JAX-WS)"
 HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jaxws"
-SRC_URI="https://github.com/eclipse-ee4j/saaj-api/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/eclipse-ee4j/saaj-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 # EDL-1.0 equivalent to BSD
 # - 'SPDX-License-Identifier: BSD-3-Clause' in source files' headers
@@ -24,11 +24,11 @@ SLOT="1"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CP_DEPEND="
-	dev-java/jakarta-activation-api:1
+	>=dev-java/jakarta-activation-api-1.2.2-r1:1
 "
 
 DEPEND="
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	${CP_DEPEND}
 "
 
@@ -44,21 +44,10 @@ JAVA_SRC_DIR="api/src/main/java"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
 JAVA_TEST_SRC_DIR="api/src/test/java"
 JAVA_TEST_RESOURCE_DIRS=( "api/src/test/resources" )
+JAVA_TEST_EXTRA_ARGS=( -Xbootclasspath/a:target/classes )
 
 DOCS=( CONTRIBUTING.md NOTICE.md README.md )
 
-src_test() {
-	if ver_test "$(java-config -g PROVIDES_VERSION)" -lt 9; then
-		# https://github.com/javaee/javax.xml.soap/blob/1.4.0/pom.xml#L134-L143
-		JAVA_TEST_EXTRA_ARGS=( -Xbootclasspath/p:target/classes )
-	else
-		# '-Xbootclasspath/p' removed since JDK 9; '-Xbootclasspath/a' remains
-		# https://openjdk.java.net/jeps/261
-		JAVA_TEST_EXTRA_ARGS=( -Xbootclasspath/a:target/classes )
-	fi
-	java-pkg-simple_src_test
-}
-
 src_install() {
 	java-pkg-simple_src_install
 	einstalldocs # https://bugs.gentoo.org/789582
diff --git a/dev-java/janino/Manifest b/dev-java/janino/Manifest
index dfae9b5f5661..1f3cc5e6cdb9 100644
--- a/dev-java/janino/Manifest
+++ b/dev-java/janino/Manifest
@@ -1,3 +1,3 @@
 DIST janino-3.1.6.tar.gz 1730264 BLAKE2B a4e15b7b9a9d17b8762f5964171a01da3ce6f1045b8830c9a6e9a0d35c5096376fd667103360791f6848c762177f48f858e4e6233205fb6ff8258e6582211b89 SHA512 6e729733f74e0cc24db56c4030de8751c131c94b3abf0519288cc7539b5dda45de8c33e8dd37d8e70565ad0c3a3122cac7c73d77bc5f92a16db0b0f7ea7436d3
-EBUILD janino-3.1.6.ebuild 2440 BLAKE2B f344f6b8dccf046641459569ef792fcaac9e57fceaf54e51cf6daab7903f8667a72f2b7d03e838ccb782bcbe1f7acb0b67129b0f54590c8ca3e155d2b0e7b03f SHA512 f06b08013d81c52578012dd936971d8beeca1c28778f09d6ecf829e82349604a8f0dc97e660c43dd28ecf568fda2ab5e65e15fa7a3771197d079e9b7535e8733
+EBUILD janino-3.1.6.ebuild 2450 BLAKE2B bb333aa06465cde9ad61f34642a7753f48603cb7328fdb9bf0ab888bdcdc24f6fb642621e65a6a46fb9d4db08cde39fe6b1542c754b14d5f73f490e8575a1217 SHA512 2bdeb13ed634e0af780c9e9ce236e88996ffa184477fd3813383e771b0243223950fb0fe4c25200c56086eb1243a552ba6913c1d3ec7eccdada2413c6fc688dc
 MISC metadata.xml 402 BLAKE2B 24ce6bf4574089a37f3f65f463269ffaa05cc5491b630b69ce205d62967d9dda038caa1af286974c908921c57819e59c4f63a1377c3c6d4dc5ab87fbc20286da SHA512 c26dddfc7e65fcfe8cd2d359acecc410592cbe1b73453110b3c27b360676d3ecdd247e05c936bef1125d19d97e78ccaeaff9707f52be882e5dd14b9b1b04df56
diff --git a/dev-java/janino/janino-3.1.6.ebuild b/dev-java/janino/janino-3.1.6.ebuild
index 3d03e3570bd3..1da22362d3d2 100644
--- a/dev-java/janino/janino-3.1.6.ebuild
+++ b/dev-java/janino/janino-3.1.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://codeload.github.com/janino-compiler/janino/tar.gz/v${PV} -> ${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # Common dependencies
 # POM: janino/pom.xml
diff --git a/dev-java/java-apicheck/Manifest b/dev-java/java-apicheck/Manifest
deleted file mode 100644
index fd806961020a..000000000000
--- a/dev-java/java-apicheck/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST java-apicheck-0_p20150907.tar.gz 1550 BLAKE2B 75d53337c6ead56927897ec26f7c475296564e737eb91c66f330aefed8f0675b27c23cbbf34a27d15e42e3e3a74ac078465b7dd6030faf1fe3d09cd1f45d7255 SHA512 68a3a5443ea26840a526c2e53451e47e441f6ec15b2ddffef8f5d63a50f1129d18cd65506ecfe0bbf3f9829514697648eff8f64e558f0bd5376b0bf2add70b70
-EBUILD java-apicheck-0_p20150907.ebuild 477 BLAKE2B 32e9f43fda75b74d809e0ee11040e52a7581e9e641cf88571bf778257e3cc1e22e45e1ae5d506e6ad98c9322bb947bd38688a277d5024786a385da0d70c6a79e SHA512 b72df259425ea2b1d0639529b94ead9a14a5ad7a6428fa99109487744913f68388af7158d6fd015c30f53572f1f81765f4b511f4a1b7ceb64b1e46653f9fbaff
-MISC metadata.xml 322 BLAKE2B ea5e94aaa924ebff56df9322e810656a075f1b892f1f1e609273991f41951dad47a95887972219788dc10a234cef75061d365754ff9d0038a80e4e2a71555526 SHA512 b2904b4007758a4de65fb2cf276daf67f8dde5058b6f91b2459a1e458c722d36fc0735037efa3d227177f7ec8e6ffb7164c8f25e874c9ed78c5543d294a98572
diff --git a/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild b/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild
deleted file mode 100644
index 2e81654149b2..000000000000
--- a/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Command line tool to check Java packages for API compatibility"
-HOMEPAGE="https://github.com/gentoo/java-apicheck/"
-SRC_URI="https://github.com/gentoo/java-apicheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-java/japitools
-	dev-java/java-config
-	"
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/dev-java/java-apicheck/metadata.xml b/dev-java/java-apicheck/metadata.xml
deleted file mode 100644
index 02873abc63b1..000000000000
--- a/dev-java/java-apicheck/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-	<upstream>
-		<remote-id type="github">gentoo/java-apicheck</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index a0e3b68ab162..1899226f89ae 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,4 +1,4 @@
 DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
-EBUILD java-config-2.3.1.ebuild 1050 BLAKE2B f2276df38a345847ee777a582ea00bfb8da45e8bddd22e100a8c828783dd588a0253f2cfbeaf566bbbe1f54c584abe061b4e7cc6c1888f7e8579aa2f4ebd11fa SHA512 38dd588bc7df5c7e214e42004f27ff215ee0d65378b96a11687df7ce0e1e47f4cadb81d3017d14ca93ac8c06bc573af653b2c55d9f9a46fc995dc3b92105258d
-EBUILD java-config-9999.ebuild 1179 BLAKE2B 6c41a1282a6723430059a402fab76f3c29b050bbf1330cf3821236fa4d604985aa068e21aaa91dab5e492026fae4443fc459cc54db41cbaa98b17859a25036a7 SHA512 94b6189fce4e21387c5ceb7bbfbd0d5625a8c8c018377b947b1075d70e1b87c5fbf8550db6c1e9006361ed3381493e6daf9b9bc4db69ebd7da430387a4925e3d
+EBUILD java-config-2.3.1.ebuild 1057 BLAKE2B dda06c070d1e3bd304ad4dc98d41bbf519bf028ec950679d5de994b887d591e450ecaaa93276c50fe10d0c48f95552bf956e72b8977b100156521a06492da227 SHA512 eae6722ba77fcd553a5a72ddfd034f3c4b193ceac5080d79542203903fd75dd3c6e0895b5f39b9a154bee14e41f13232407fce6a879746f604c67f3dfeae1123
+EBUILD java-config-9999.ebuild 1186 BLAKE2B 7e32531de50edefe55f69edc682550f76718c5216b15ddf1dd504dff4c756c9e03c6ed1ba32bf6bf0e6c2391c5164e6648f81202820b8a5d5a3b87795db48856 SHA512 273d11710109cd2283d7ec0b3dba90e955a32000d7b35c425b8fd1bdee4c9ab1930ce9e0115e4f2d0938206ff0326464b3d1edfb7e437605a0b6cead3b3fab7b
 MISC metadata.xml 561 BLAKE2B b4008379c9254490bad41d6bdd747fbe15d8b72fb01d6bbab635e9a7c15ff456eb6199012479912b95cacfce20787c865181e5c05fcd72574a2964e484144ff0 SHA512 5164814ae329b2f1fa8a714ed669cf42a32fac4c920cb902520122a321ea165ad7a8ec13d39c16d05ed07bc42d17c742813797081290129690163064efd1a8cf
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild b/dev-java/java-config/java-config-2.3.1.ebuild
index 45feed60cc35..bc0266c8e44b 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild
index 00d8aaa41b61..395572d16010 100644
--- a/dev-java/java-config/java-config-9999.ebuild
+++ b/dev-java/java-config/java-config-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Java environment configuration query tool"
diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest
index c6936502f3ee..425bec062390 100644
--- a/dev-java/javahelp/Manifest
+++ b/dev-java/javahelp/Manifest
@@ -1,3 +1,4 @@
 DIST javahelp-2.0.05_p20170719.tar.gz 6045243 BLAKE2B 3cea100e6087f7f8884a04cc1b046f2611e4c516be0086faec685a85311f2cfd9ca49ee9f3fdff37d7e9a496685dc288601521047a3d4c2ae6b31faee2ad7390 SHA512 6d98c33f831052133176cf50419aae6dc1f5715485bcfd33f7e346cb694f5483b1f7a159f47799a72933db8ca42d83cb73b23946179aa6ccaee946d524b3bd36
+EBUILD javahelp-2.0.05_p20170719-r1.ebuild 1677 BLAKE2B 4cc26c9f82d310c8afe60e7829a2308a6f7c9bfb9bd8da1833b8dfe1ff8e4aea0586e25a1713f697ef01d8d56f61dc84e0b7d27f93822670b0333832048428b1 SHA512 142694a8723240321a55c4a2c28c50f90767c4bf5e18a8bc6f7ee82d2936fc696e8d30e1cde535cfb57c367023ea1df683197d47c1669abfed454f8c98ad5d54
 EBUILD javahelp-2.0.05_p20170719.ebuild 1675 BLAKE2B f34208c7916f586887ec1aaa8406f901b13091e39cc95968c79b8edaf9a24fe95d1e87ebd3e0b98b8f0aac1b830a77dbb40abd87edd4d68877e06e9492e63b05 SHA512 096d8d05f423741b3b7cacbe672c6b2d42a44ede611cff8aaa3252da75f0a0c391f184a8a9f7a93266d5054c0e39c708afdd251a1b984efdacf246de7df2b8fe
 MISC metadata.xml 625 BLAKE2B b63396d9a8f628c5965eb8eb15071f56456605ce28d247fc191ef808db0f14c464149d3d3bcee746d058addf3d9eed7d12ae59ac94a1d7b0ac4a45f75ccb8b68 SHA512 a1878d27bdb64c2d1ecf2c8107158f8852486d22a5473d852e7a993c63475be17cd13a47de1fd5b29cdcc72dacf09259473b253822c10cddbf2e8dfea8a1fa82
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild
new file mode 100644
index 000000000000..bfedce9fba1b
--- /dev/null
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT="3ca862d8626096770598a3a256886d205246f4a4"
+JAVA_PKG_IUSE="examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="The JavaHelp system online help system"
+HOMEPAGE="https://javaee.github.io/javahelp/"
+SRC_URI="https://github.com/javaee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+CDEPEND="java-virtuals/servlet-api:2.4"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+
+DEPEND="virtual/jdk:1.8
+	${CDEPEND}"
+
+JAVA_PKG_NV_DEPEND="virtual/jdk:1.8"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+_eant() {
+	local \
+		servlet_jar=$(java-pkg_getjar --virtual servlet-api-2.4 servlet-api.jar) \
+		jsp_jar=$(java-pkg_getjar --virtual servlet-api-2.4 jsp-api.jar)
+
+	eant \
+		-f javahelp_nbproject/build.xml \
+		-Dfile.reference.servlet-api.jar="${servlet_jar}" \
+		-Dfile.reference.jsp-api.jar="${jsp_jar}" \
+		-Dservlet-jar="${servlet_jar}" \
+		-Djsp-jar="${jsp_jar}" \
+		-Dservlet-jar-present=true \
+		-Djsp-jar-present=true \
+		-Dtomcat-zip-present=true \
+		${@}
+}
+
+src_compile() {
+	_eant release
+}
+
+#Does not actually run anything
+#src_test() {
+#	_eant test
+#}
+
+src_install() {
+	java-pkg_dojar javahelp_nbproject/dist/lib/*.jar
+
+	java-pkg_dolauncher jhsearch \
+		--main com.sun.java.help.search.QueryEngine
+	java-pkg_dolauncher jhindexer \
+		--main com.sun.java.help.search.Indexer
+
+	use source && java-pkg_dosrc \
+		jhMaster/JSearch/*/com \
+		jhMaster/JavaHelp/src/*/{javax,com}
+
+	use examples && java-pkg_doexamples jhMaster/JavaHelp/demos
+}
diff --git a/dev-java/javax-inject/Manifest b/dev-java/javax-inject/Manifest
index 0c1bacd6d870..89f1801ebac5 100644
--- a/dev-java/javax-inject/Manifest
+++ b/dev-java/javax-inject/Manifest
@@ -1,3 +1,3 @@
 DIST javax-inject-1.jar 10928 BLAKE2B 3294e302dd1af079d1bc57620dcd4b46169498a1619711837e329dc682aae4e204bc1d6733c9e7dac3fa978ddc183bf6d9833f5d0524d31c1ac95db8c81f2648 SHA512 8bcfae4933073c212c3370a36cdacbff0474648720766df5d0acfc2dafd3307a514b7fb49c08762d32bfca9d8afce47cbfe1eba7399b459b6543472ac9de715b
-EBUILD javax-inject-1-r4.ebuild 572 BLAKE2B fbf12ffdaecb13e08a94e1d03bf7074120347cd206e4d921af11ea32b53cb327dc4cd2be8e6ba8e124440fdde6e885376c2a4325f8576b69b6791158cf6117a8 SHA512 e97a8083e764265e71570047d87b15e324dcf35af60041c09d6e2b47b4d964bfd5e3bd5549eb8e81e4040cee71fbdece680f5e6ac1caa8fa6f4e421e0f548916
+EBUILD javax-inject-1-r4.ebuild 611 BLAKE2B 1f30203b0259e88d648db8bd6f2ee8a78c8af60091b53f61d3afa576180130f9925ca89865b5b6d2408c0ca4ed3c72dbf660b07677ea5991404509fb584be11c SHA512 f5199435ba2ddae4584af65073c4b2ffd324bc71791c47a030a81b3a0997ba93269bc2323301353a3088bee411c02c580ac7d9e417d3fbf383b00de24819eb87
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/javax-inject/javax-inject-1-r4.ebuild b/dev-java/javax-inject/javax-inject-1-r4.ebuild
index 44283325ca8a..e211c0f48a5e 100644
--- a/dev-java/javax-inject/javax-inject-1-r4.ebuild
+++ b/dev-java/javax-inject/javax-inject-1-r4.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="javax.inject:javax.inject:1"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/javax-mail/Manifest b/dev-java/javax-mail/Manifest
index 33ffa5b0d328..01e94a8f5e42 100644
--- a/dev-java/javax-mail/Manifest
+++ b/dev-java/javax-mail/Manifest
@@ -1,3 +1,3 @@
 DIST javax-mail-1.6.7.tar.gz 1854297 BLAKE2B 70dac40cdf67c413db3370f9cdf5b9786fcebce4ba12725758bf6120a2b6874e079a5beef08ee1190e30bfe2f14ad21e73ef1710c982e3f658a2f2f11e524f2e SHA512 9e8754839efb43d14ade6189428c4b86f5fc180e2e18b4e121a9463aaa52c34a431dbf05a6264ef8221faf0b09cc08f914ff758cbb3931df97cea1a897c54c08
-EBUILD javax-mail-1.6.7.ebuild 2051 BLAKE2B 665e0612fd271172dadcb8edb5b9b33e2e61c6b7eb1b12fb41c7d79dfee933c5fa3a01fea64989f07819523880f09d03ddce2cecdef35eca1bb546f3c2d3cebf SHA512 c9b34da68b53e3a773b7bffce383eeab5e21a6fea31a2dd2ba2b2129df83e0dc4ad459252ace64d7f720db79f13d0332ea4acefa0e3674149e8630289a390210
+EBUILD javax-mail-1.6.7-r1.ebuild 2047 BLAKE2B 4187a02c47c7c7310d7d32a46dfe53b4bd52aa454f78040240bfe838f51d59ca33e94d2ed54920935bac6fe7ffa871eae1269bc04b01e68fd28789d2825297f7 SHA512 7139bc9cb731bada24a6e9cc1d694282fb5df50847c3820acafc7c0fe89b81ec76b5ce88f9c1052a5f9b824adcb6648dc6935d2d2a44aab2a585a3729771b761
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/javax-mail/javax-mail-1.6.7.ebuild b/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild
index 985b9effbf4a..c72608beb918 100644
--- a/dev-java/javax-mail/javax-mail-1.6.7.ebuild
+++ b/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild
@@ -29,7 +29,7 @@ CDEPEND="
 "
 
 DEPEND="
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	${CDEPEND}
 "
 
@@ -61,7 +61,7 @@ src_test() {
 	pushd src/test/java || die
 		# Selection according to 137,138 pom.xml
 		# 1) com.sun.mail.util.logging.MailHandlerTest
-		# java.io.IOException: Permission denied			
+		# java.io.IOException: Permission denied
 		local JAVA_TEST_RUN_ONLY=$(find * \
 			-name "*TestSuite.java" -o -name "*Test.java" \
 			! -name "MailHandlerTest.java" \
diff --git a/dev-java/jaxb-api/Manifest b/dev-java/jaxb-api/Manifest
index 32b28c50dc40..b7e53fc7c9ef 100644
--- a/dev-java/jaxb-api/Manifest
+++ b/dev-java/jaxb-api/Manifest
@@ -1,5 +1,7 @@
 DIST jaxb-api-2.3.3.tar.gz 193025 BLAKE2B 1cf4461fdc67cc05ee43e880c254290b9dbe8a40b1dc39444d8fb6656698876a4bb16c679ee551ec7baa95c07eaf83e2fe5638a71eafbb158805c14c38888cb8 SHA512 37d6705fc1563f0d35a215e2f176473ee5e817a4a3017afe22042a4235c86b8556ea1fb23210d07ca7ea3cd1e0a3271daa4be8c9652cfe92ce2898f1381de3bf
 DIST jaxb-api-3.0.1.tar.gz 420695 BLAKE2B 70da435e75f6fcb155d57ee20659897d7d1a72dc38e77f0348eaa767b56e2c5fbb7df88c3b0c794cfc7eaad3d839550a197288dab59520a63562f083388764c0 SHA512 16d62a1fd6045a57f1d215227ce75860340c286eb0986b1086a0312dbc8ca8119b25533c42fe54f367231ec1c34795fec6a9355417f71ce826ee28d5fb6cf9fe
+EBUILD jaxb-api-2.3.3-r1.ebuild 1535 BLAKE2B 029a11d2436bc4594c2c8dada183331431ac42fdf7e6c380fc4397086784e24561742dc1d4164a85dcb79ac0fafe48758863d31b07d5dbec199f4d52d38efabb SHA512 b60a357fe7e7e9d788cb34eee2a2f98b792e5bd4eeb56fc9e25186fce890def4895b2012cb18b878fbabce756e460bdf59c3367678b267984d6772fbaa0e8704
 EBUILD jaxb-api-2.3.3.ebuild 1786 BLAKE2B 677c14dcf9c7b350c71ee541ca2f3c873bfbd4dcbe06e6e2ae6242574612b78cfb62459286f2747c55b57168a1b1b5e1a77c336a85a7b057fb5aa3cb237a7dca SHA512 50e54d9ba94020606b0074a4da951c8d487c1c5e884c4d585880a73824a014b5188b275537d09954a3e1aa225424b0d0bfb55a77f0813f0562dcf85aab956139
+EBUILD jaxb-api-3.0.1-r1.ebuild 1141 BLAKE2B a73ebcc3494456a487462d27c4dc3cf3383a2d79534ab208c83346791f82fcf08cd06bbae221de59ee503d7b3607c8e9f2cc2faa26ded586b33ad3f3196977c7 SHA512 eb37dc0efe9c58f641dff72cd5325ca5e1a34b6d1cbbcba350551c4e46718090783d3b56ce82dc18b1e9ca3198f9ef9b1ce2dd30333e8997f40c3373d469d606
 EBUILD jaxb-api-3.0.1.ebuild 1153 BLAKE2B c9ba7c100acff5546a1a84c7d4c44459218bba27d183df4b17f51f61396ecbc4b1f1bcbcfdef146c607c5bd2474233116b12bd713c999af83fbf7cd311fe6a52 SHA512 36e32cb358e10716831a33daa388c2fce8012c0cac637e20fcd412e946df8a4395f64db46cf5a82ebbf77d40a2d861cf0fd37fd4cc59c41c0cc36ac90b1dc955
 MISC metadata.xml 372 BLAKE2B 989cc55b0f2734eaffc192a47e27d159a4dcb39b4383c9a19d5a331e2f30d136e7db69e67533d1e6823433ddadd08d127372fa4be0bbf20971dcd9d4d3eade82 SHA512 75fbacfd6c24164733c2382ffef0e56545b304af647880c10f1de7ac599062fed293f9f907097fcb0afe566b370cc9e74887d8450af6f196ca34087e4e0c8153
diff --git a/dev-java/jaxb-api/jaxb-api-2.3.3-r1.ebuild b/dev-java/jaxb-api/jaxb-api-2.3.3-r1.ebuild
new file mode 100644
index 000000000000..8e24eccaf3cd
--- /dev/null
+++ b/dev-java/jaxb-api/jaxb-api-2.3.3-r1.ebuild
@@ -0,0 +1,50 @@
+# 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/eclipse-ee4j/jaxb-api/archive/refs/tags/2.3.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxb-api-2.3.3.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="jakarta.xml.bind:jakarta.xml.bind-api:2.3.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta XML Binding API"
+HOMEPAGE="https://github.com/eclipse-ee4j/jaxb-api"
+SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# jakarta.activation:jakarta.activation-api:1.2.2 -> >=dev-java/jakarta-activation-api-2.0.1:0
+# jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 -> >=dev-java/jaxb-api-2.3.3:0
+
+CDEPEND="dev-java/jakarta-activation-api:1"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-11:*"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( ../{LICENSE,NOTICE,README}.md )
+
+S="${WORKDIR}/${P}/${PN}"
+
+JAVA_GENTOO_CLASSPATH="jakarta-activation-api-1"
+JAVA_GENTOO_CLASSPATH_EXTRA="jaxb-api.jar"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="../${PN}-test/src/test/java"
+JAVA_TEST_RESOURCE_DIRS="../${PN}-test/src/test/resources"
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild b/dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..6b3427db5392
--- /dev/null
+++ b/dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild
@@ -0,0 +1,38 @@
+# 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/eclipse-ee4j/jaxb-api/archive/refs/tags/3.0.1.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxb-api-3.0.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.xml.bind:jakarta.xml.bind-api:3.0.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta XML Binding API"
+HOMEPAGE="https://github.com/eclipse-ee4j/jaxb-api/jakarta.xml.bind-api"
+SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.sun.activation:jakarta.activation:2.0.1 -> >=dev-java/jakarta-activation-2.0.1:2
+
+CDEPEND="dev-java/jakarta-activation:2"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-11:*"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${P}/${PN}"
+
+JAVA_GENTOO_CLASSPATH="jakarta-activation-2"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index f5a9de75ee28..a5b8079df996 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,5 +1,3 @@
-DIST jaxen-1.1.6.jar 409677 BLAKE2B 55e03939420c103fb5a6d323595ff0cb7653885eb9ba233fd581c5376d2ac90eecde7aa5576f602cdc459cfd9ba9e79c6bb5bfab3ed7805e717a21670a5748ee SHA512 979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48
 DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97 SHA512 cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53
-EBUILD jaxen-1.1.6-r2.ebuild 861 BLAKE2B 97da05063fd187441941327f16b6091c87559bf4b569f5a89caffae5b4d19e439901705272d2614747e89bcef84f27788155c903f26566aa9ad15eab33ba2698 SHA512 e5ccdf47ac5886a9f58d520a7cf587292c47f5adffdb668fcbc47eba8d3b2d70d2875561aa69dc6b6fad2bcda4a9db530bd47dc87a0fe72da644adaf5890d874
 EBUILD jaxen-1.2.0-r1.ebuild 1912 BLAKE2B b7c2b6d75ae49f3df6a46c20a23488f9084fc81d39cec91e3d5258c8ba26532bc03c7da45a4520c245a5b9132d40437cf93b0ab7eefa18459401fe6e091ce1e0 SHA512 f9a9252c02312941af0c08073956449834a5baaf19ff0ebe32fd279cda927e0e6b951c928270e3699d3fccf54b8867f5198aec24ddf8977339e78dbad6d3f3d8
 MISC metadata.xml 719 BLAKE2B 81b0a7991de9a06ca79c793dc619356856370488753d22fbfc77d92e5323ab6a5cd489fe9098a60d1de248fa481d906696a20032e7a27972f9630d72a8175906 SHA512 221fb2b9430c909ea27039513feb2c9395992cd67ec087e008cc284dcb3a8d19fd373405c52d59f0ad41cf481586ce58588c04b05e864cc7731d6c4162a3544d
diff --git a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
deleted file mode 100644
index be43e2578b5a..000000000000
--- a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="https://github.com/codehaus"
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="JDOM"
-SLOT="1.1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-JAVA_SRC_DIR="org"
-
-src_prepare() {
-	default
-
-	# xom depends on jaxen already. if we don't remove xom packages here and
-	# require jaxen to depend on xom, we end up in a circular dep.
-	# I fear though that removing those classes might bite us somewhere down
-	# the line...
-	rm -rv org/jaxen/{dom4j,jdom,xom} || die
-
-	# this is now part of jdk
-	rm -rv org/w3c || die
-}
diff --git a/dev-java/jboss-marshalling-river/Manifest b/dev-java/jboss-marshalling-river/Manifest
deleted file mode 100644
index 0e63368d12d7..000000000000
--- a/dev-java/jboss-marshalling-river/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jboss-marshalling-river-1.3.0.CR9-sources.jar 45310 BLAKE2B 87eced675dbdb0d645ae4f3321954142922053008a650a9604b32c5e850c280c16d941997874c420e48e894e9f63c6441e6b3cd629fcfe7ad31ae13abb6f41e7 SHA512 0ff0ba48f8e4c1e76d378843aeae4793992fc200cf6d5aeeeec7341ddcd6bc3c93915ccb2bddbf3996661ff21e3a992e232c0721ec4469c5347811afabec4351
-EBUILD jboss-marshalling-river-1.3.0.ebuild 679 BLAKE2B dfe7292413af40bb33773ce3ee23708ce1e3ec8a38e80843733328ab19fc718a6e75fb0c869a41146fb9703151fd7e12337fa691f4e03880b8cc2698d49d3d09 SHA512 1072ff5fd979e0855744c8263b42ec8d73f0b743acd3bb6c781286bf3740de6a4ad19e2bfaa4f7c584e033f75f7db6bd65e6c3e9432e8920e0bbc8519c46229e
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jboss-marshalling-river/jboss-marshalling-river-1.3.0.ebuild b/dev-java/jboss-marshalling-river/jboss-marshalling-river-1.3.0.ebuild
deleted file mode 100644
index 89c496f77cee..000000000000
--- a/dev-java/jboss-marshalling-river/jboss-marshalling-river-1.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 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
-
-DESCRIPTION="River protocol implementation for JBoss Marshalling"
-HOMEPAGE="https://jbossmarshalling.jboss.org/"
-SRC_URI="https://download.jboss.org/jbossmarshalling/${P}.CR9-sources.jar"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-CDEPEND="~dev-java/jboss-marshalling-${PV}:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7
-	app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="jboss-marshalling"
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar .
-}
diff --git a/dev-java/jboss-marshalling-river/metadata.xml b/dev-java/jboss-marshalling-river/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/jboss-marshalling-river/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
-</pkgmetadata>
diff --git a/dev-java/jboss-marshalling-serial/Manifest b/dev-java/jboss-marshalling-serial/Manifest
deleted file mode 100644
index 5c6b275f6f4b..000000000000
--- a/dev-java/jboss-marshalling-serial/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jboss-marshalling-serial-1.3.0.CR9-sources.jar 33627 BLAKE2B 76a6d6656c456ef5b4a4acbb659f52280d63b48aea46ff4fd190f8a9b5852157e37ce511a1af87007b04f03401082dd5e9a0d540ba27ac02567e7e50f04ebc33 SHA512 23343b43d2d81fb3f9d22e82d04e3c215cf0357fe369ac316a602b4599f84602bdd38fd50c8378050b1d031db2ad31405fc38bc93ef7a9327d63a29dd73ee144
-EBUILD jboss-marshalling-serial-1.3.0.ebuild 680 BLAKE2B 67d59735454fb80be0880b4e38861c43481211c3e97fabf05d8b74149de226e2a53b887bb9e3b94285cde0e614bdc5a766807ff878dc9e964b8519af33386f4b SHA512 00d02d5681030591f937ea34ac709cbc44064ee6d1a7ef4670e21861d6f0c7e9e238160ad4dc46e242432f96de1e227c303a6dd259892414c073102525572a43
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jboss-marshalling-serial/jboss-marshalling-serial-1.3.0.ebuild b/dev-java/jboss-marshalling-serial/jboss-marshalling-serial-1.3.0.ebuild
deleted file mode 100644
index d62b7906fcb7..000000000000
--- a/dev-java/jboss-marshalling-serial/jboss-marshalling-serial-1.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 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
-
-DESCRIPTION="Serial protocol implementation for JBoss Marshalling"
-HOMEPAGE="https://jbossmarshalling.jboss.org/"
-SRC_URI="https://download.jboss.org/jbossmarshalling/${P}.CR9-sources.jar"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-CDEPEND="~dev-java/jboss-marshalling-${PV}:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7
-	app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="jboss-marshalling"
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar .
-}
diff --git a/dev-java/jboss-marshalling-serial/metadata.xml b/dev-java/jboss-marshalling-serial/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/jboss-marshalling-serial/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
-</pkgmetadata>
diff --git a/dev-java/jclasslib/Manifest b/dev-java/jclasslib/Manifest
index 4c283371eb4c..5f8bbd8964a4 100644
--- a/dev-java/jclasslib/Manifest
+++ b/dev-java/jclasslib/Manifest
@@ -1,4 +1,3 @@
 DIST jclasslib-3.1.tar.gz 4630493 BLAKE2B 2dbede05833a6f7ff0f32194ea91aeb071615ee8562541d1b5abc2fc61c3f393bd93f5e444110a6a72df161d488cf21551af8208b1f391951b5ae7002ceb6ef3 SHA512 5c44043eb30ab32110097ef6b52f459bf4d512db71efc79aae99fdb6b9db740a7be1e6a59f6e3a233a3b303933ed90fe482c6b9c81d76de93af6c9724aad41dc
-EBUILD jclasslib-3.1-r1.ebuild 791 BLAKE2B 5c915ada703c8188fa22c13846fcc85344140355a40361f9158dec090bcc3f6764405abb02502b84405fed5cb123b7aa2cdffeba80b14414cf73d43590fc4f04 SHA512 a499200886f6f024702da032545f31dc3f9ab24ac08135e8b3b1b98a7505ce466687825ff461806e8b261b4851ff9b853ad08aaaa66954681cbaf83fcb21097b
-EBUILD jclasslib-3.1.ebuild 785 BLAKE2B d2074d2243658320d3c4b18b0a57306b23e8f7d1a0d9aaf26c890b153bdb8d3edf1b044b33382da9acd7f429700b952c9260b57f2a955bff78bc14ceb0e1dd9e SHA512 339dde0b536f81c8a1d3de60571b16c0a22801d29c264f4d6a22e12e1fb936a5ff2464c68973dbc90d56c2079c2accdc2420ebb0d6a3b49047789a17defe3ad0
+EBUILD jclasslib-3.1-r1.ebuild 789 BLAKE2B 1a71e7babeebbb55abe6652fa120eed10e97ec49c1a4bebed026b98887781c6a89e43ae1feb056e7ad82ff33a82e80398b8a7f78ad80c721392f3a469dcb2bdc SHA512 ad7b08f1a8f8d77593e775e2066eacb64e0b9bcfe885116121a432f8f0e7bec2a63bc59ba66cdccb7cd13a409b72213ecde77c96972d18de4ea3f6974e0d0db8
 MISC metadata.xml 375 BLAKE2B a604e3c57ee7ec7fc9d48a15cbfeeec58ce11483275d250f5fbeb69d0343f41de2617770a2445c575ce0d66ff4619e4bd2e1a7911d117282e66ee5ea7bc5d9a4 SHA512 c3b644a00bf9a0c92cfdc04c4d03f3974dc151538f67925ab967b8e2e5ce8e3865129f01843cd2c55d23a85365e31d2bb526f6c4c2e4edca13381dabea29c786
diff --git a/dev-java/jclasslib/jclasslib-3.1-r1.ebuild b/dev-java/jclasslib/jclasslib-3.1-r1.ebuild
index 5234a552cfb2..49ed3261956c 100644
--- a/dev-java/jclasslib/jclasslib-3.1-r1.ebuild
+++ b/dev-java/jclasslib/jclasslib-3.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ingokegel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jclasslib/jclasslib-3.1.ebuild b/dev-java/jclasslib/jclasslib-3.1.ebuild
deleted file mode 100644
index e4554abb2b4a..000000000000
--- a/dev-java/jclasslib/jclasslib-3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java bytecode viewer"
-HOMEPAGE="https://github.com/ingokegel/jclasslib"
-SRC_URI="https://github.com/ingokegel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-src_install() {
-	java-pkg_dojar "build/${PN}.jar"
-
-	java-pkg_dolauncher "${PN}" \
-		--main org.gjt.jclasslib.browser.BrowserApplication
-
-	use doc && java-pkg_dohtml -r doc/*
-	use source && java-pkg_dosrc src/*
-}
-
-pkg_postinst() {
-	elog "jclasslib uses Firefox by default."
-	elog "Set the BROWSER environment at your discretion."
-}
diff --git a/dev-java/jcommander/Manifest b/dev-java/jcommander/Manifest
index 1842a931ec2f..5d99f5f4b075 100644
--- a/dev-java/jcommander/Manifest
+++ b/dev-java/jcommander/Manifest
@@ -1,3 +1,5 @@
 DIST jcommander-1.48.tar.gz 64544 BLAKE2B 29ed81d5f9a7e4ec193c8fa03cdd67481e9904898bee2730c585be6b6beb2e0ec37b31634513095b660655b8202c42077361318a83c1e016c9450d7d7ff30244 SHA512 1304bb14ecb89f9945e8219f3229941e556c7cccef52a2eb4e4663da9dbf9fa5ecec4914275a743fb7d90ca301153284dc76dd380903aac93db1507894d72a6e
+DIST jcommander-1.82.tar.gz 4433079 BLAKE2B 08111ae7a85202dc3a082db58f42ef5183b05cae827bc304ba426a3d02bf7a4123f84500e6ec5694578a7aa29c631cca692fe71d67e12a1107c57e1858be4dcf SHA512 1abcb54cec21e95a3e5fc952320a7fca1d480f9900992e686f66df49749b6eee79e18dc670f10cc05b0d2a4f0a72fae302568a51ff193788897878aefc3ff67b
 EBUILD jcommander-1.48-r1.ebuild 567 BLAKE2B 395bf3d9bbabaeb225183948d18c0e6b61ba522d45ea577918b6f332190726961c0fc5681dddb8acfbcce083ac8b42cda3e4871dce5440d21f6a28f9260a4f59 SHA512 9c859361f523fd45522e0c76a8cc0910f6ef867e5b58c8f7e2f2a1c027347a19e342d1b3f35a549d07f2fd37703270c13ad02ddb43b9e0cc41f4c5c573add039
+EBUILD jcommander-1.82.ebuild 1668 BLAKE2B e9377360229494b19614e68f4e0a2c5aef6f9d79e830c94dd05a9f1e9f46f22e0a45e818d0f4063bb548899ad65141fa61c538d64726cac8204b0d89e6f9dc14 SHA512 1a967f758cd25891d01e3df16551856af21511e40b350a548cba2ae28cf0b8797f7efd829687de0a546056777caf1de100df1cefb917952216994ee39b0cf082
 MISC metadata.xml 329 BLAKE2B 35efab95ec95b721d53463b4fe8d98358c632a76476f1648e2e1f33f7432b2fbf9d00199e4e53c047a91c90ac9e86e733089bf1c9dc69a9f2961d7cc8266b710 SHA512 c83a4611485d806ca1c1848db6605a8d4956956dd521e5b6171d98027324236e51a13c9032e76b462168d07bb74dc105fb9587ab91bd554845d733e668c9df32
diff --git a/dev-java/jcommander/jcommander-1.82.ebuild b/dev-java/jcommander/jcommander-1.82.ebuild
new file mode 100644
index 000000000000..845d94b587c7
--- /dev/null
+++ b/dev-java/jcommander/jcommander-1.82.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="testng"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Command line parsing framework for Java"
+HOMEPAGE="https://github.com/cbeust/jcommander"
+SRC_URI="https://github.com/cbeust/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? ( dev-java/jackson-annotations:2 )
+"
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+# ===============================================
+# Command line suite
+# Total tests run: 258, Failures: 3, Skips: 0
+# ===============================================
+#
+#  * ERROR: dev-java/jcommander-1.82::gentoo failed (test phase):
+#  *   Running TestNG failed.
+
+# https://bugs.gentoo.org/801694
+# Needs "java-util-2-runner-args.patch" from https://github.com/gentoo/gentoo/pull/21319#issuecomment-878128343
+JAVA_TEST_RUNNER_EXTRA_ARGS=( -verbose 3 -usedefaultlisteners true )
+
+JAVA_TEST_GENTOO_CLASSPATH="jackson-annotations-2,testng"
+JAVA_TEST_EXTRA_ARGS=( -Djava.io.tmpdir="${T}" )
+JAVA_TEST_SRC_DIR=( src/test/java )
+JAVA_TEST_RESOURCE_DIRS=( src/test/resources )
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_test() {
+	# because module java.base does not export sun.reflect.annotation to unnamed module @0x42bb2aee
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 17; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/sun.reflect.annotation=ALL-UNNAMED )
+	fi
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/jmh-core/Manifest b/dev-java/jmh-core/Manifest
index e71b13e4f500..6063b191afeb 100644
--- a/dev-java/jmh-core/Manifest
+++ b/dev-java/jmh-core/Manifest
@@ -1,3 +1,5 @@
 DIST jmh-core-1.21.tar.gz 615305 BLAKE2B 1a5cfe9784efe0cd7706382eaa89c8bcce0efcce3c2b802ce0772992dd16f0c6900a47d70b72d1c556584adb8afda442f49267ad4e0b53d04c20026979787210 SHA512 ac51d58d9b746157842a3bc9c4828bbff52c5882582e123e04b5ab6c4bfc1ff3cad1f6023ab1fe1eccfa68c73ffbd21b34388547bba544626af87092852ec166
+DIST jmh-core-1.35.tar.gz 645087 BLAKE2B ce33167a58c2eaf64c38148f27493c86ac9c0084cb58a438b49148b41d3e2db66d8a78e0be8a78db39aebf06fc0b5767be61100b22ce77e018ac8ca29c05c17f SHA512 53ce7300f5e10f1efcb639f0d4d01adad48cadc8daea2e00db34113e42b192e49a6a04cc2b5fd4d291ac81a73a5b30613d22390722d35f54139f14ebbb01013c
 EBUILD jmh-core-1.21.ebuild 900 BLAKE2B a28984306aa282e05bd15e2504784abf9ed577d716bcb809bc7a2296862f6f19b136130853106310d4b253961f8784c4689a8519298d55f349595da7c7d4a71a SHA512 513a204cbb9a868015a4339fdc8197061c0c5c389463bbc5ae16c19aff6fb05dd8cc53bd7dc5ecda08557e26b8403ba9e7db4e074c8b0bcd4032c73c957383d2
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
+EBUILD jmh-core-1.35.ebuild 1052 BLAKE2B 9605dc5b20b3a801467a9e9065ea1941cf1c9cce2ddc6cab46fff0301c7e93719e8120cd1f4d2903ed5f22452ec33b2b68912e5aa544294c5f96d6ecabfe8881 SHA512 ffbd63285086648396792fa1830952ad37b6d21d1acc1ca8ead4ec356612e3db03249291abbf6d228a0fead2188ac537ac2a39d379baddfe66b7d69735edfeda
+MISC metadata.xml 313 BLAKE2B d22d56f0a50e92707442c4105b6a15c5764d0827de13960a704e77a5601bdcbb3877259076bee09b89fe30aade126100f10f380384ef6f21519edfe652bc2f6d SHA512 db6dff306be1338649d63b17d05c25b758a8ab2fc33c2604996999b2f2b239b65b140ff5f9f68f64c15af9aa457cfc1a33aa511e7e16d96bf1f01a6c5b524cb9
diff --git a/dev-java/jmh-core/jmh-core-1.35.ebuild b/dev-java/jmh-core/jmh-core-1.35.ebuild
new file mode 100644
index 000000000000..0b99465b0067
--- /dev/null
+++ b/dev-java/jmh-core/jmh-core-1.35.ebuild
@@ -0,0 +1,42 @@
+# 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.openjdk.jmh:jmh-core:1.35"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Harness for building, running, and analysing nano/micro/milli/macro benchmarks"
+HOMEPAGE="https://openjdk.java.net/projects/code-tools/jmh/"
+SRC_URI="https://github.com/openjdk/jmh/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/commons-math:3
+	dev-java/jopt-simple:0"
+
+DEPEND=">=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/jmh-${PV}"
+
+JAVA_SRC_DIR="jmh-core/src/main/java"
+JAVA_RESOURCE_DIRS="jmh-core/src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="jmh-core/src/test/java"
+JAVA_TEST_RESOURCE_DIRS="jmh-core/src/test/resources"
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jmh-core/metadata.xml b/dev-java/jmh-core/metadata.xml
index 4221e170cbc0..09c955c1f8a5 100644
--- a/dev-java/jmh-core/metadata.xml
+++ b/dev-java/jmh-core/metadata.xml
@@ -5,4 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">openjdk/jmh</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 33869d85aea9..64a099a6d195 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,9 +1,10 @@
 AUX 4.2.2-build.xml.patch 819 BLAKE2B 5f411361cd566360206c996ff5c2c508e829e41bb56868dce428da1347ab91f7fc8e1230b6aca3e82806c80b23a038966f690a16f99b43b5b2594bca543cb606 SHA512 8d2e0552690c9282ce93e39aa489c1fd829e5e63e39c6e6db935b6b5e2308a3ee3cbe1a274ebf2ba59d9819dd4f618d89e22194a9f88dec0763d2a36cd3ca44e
 AUX 4.2.2-makefile-flags.patch 925 BLAKE2B 642982867b5c187345123725f5e19bccb363915aefc5ea6e69f02e9ca86efee1e5f466c7cb9abf1b2871a735c45f8b7adaf999e42a351e01e515ecdc6648387e SHA512 be29adfff3b92875b38cf9bb326d935a189555bbb10315412b2544b43698cf76132554df64f28a18d4910ef1c46daf8b0a2ef9db7a9bca1ab53c421504187e54
 AUX 5.10.0-build.xml.patch 3325 BLAKE2B 9beb22ee4976bbac29e9ff79f5efedbe21e8a7ef93a83a37320fe327574844efa8d1a5ec1c9948df4dc7934d2be9b5635c4ce2b639b2af12f1eb7fc9100beef6 SHA512 4d22a080f85f7cc533db62c66ae77b3b56062624361f40e71dc7e41a57ddaaded05ca30e85b670805165347aa42e179c76f7d5ec0b558ab07b7dadaef0cfa64f
-AUX 5.10.0-tests-exclude.patch 910 BLAKE2B a9d6c8d5a84e3fd456887d001a0c3d737039f3a1c6dcc54d4d91fc08ad130d0a8bc03ad327539aa6cd629bd1393b5d711da290b28f4a29f3e929b127880739db SHA512 222ce31b49eff19e4f5158d0c80dda2ed518817d2d681ee0f983cdd870c80fe030e65c5d008900184aa5f48f3980428f16fdefce59fea543a4aa5bfaf5bdc3a5
 DIST jna-4.2.2.tar.gz 58638853 BLAKE2B 3941202ad7839f748c65f1abf53a335f6de7959def06de27a30520457147af3f70f6de54d640718b8314f6e61ab61ee9b26c39812d5cb1f918b8ff714d6b902e SHA512 11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f
 DIST jna-5.10.0.tar.gz 106258319 BLAKE2B f5605fd91bacc1e900e835494c27b0fdb4ba91b0c04bad1757133bed5938603264ce9fba89c5ce7e4644456b752b934f6e205d0131659e77bf0c58c2b44c61cd SHA512 93e1ab659a60d711557eb93620bcbd05f3dbe9c739b256cfb647d8ac2a4038d0bc638c614b58339b2875017ac18b219a4ddeb0d92e5ca25fef2e326bc14ae256
+DIST jna-5.11.0.tar.gz 107424072 BLAKE2B 9f79a0b0e643c8213c159785814dffaeee2dc3b332647c5c887aa5a6e707be5241d392e75730b803b21362fcbdcee82d7049bcdfb7956039f1534e3cd8e170cf SHA512 0122b56c24125e5dea541bee71b43f127df50c8f90b2c240271c677a8d598d9640bb920bd3390856124e8b1bc89a9bd41d2b6c569ae7275f68a13c08fd07027d
 EBUILD jna-4.2.2-r3.ebuild 2140 BLAKE2B 02bf4fa0fddb60ea509a042244e6d450e0827b5002a01d55438028c3e9b67bde5be21bfd3ed11b0ce90faf7f19397bf6f1f6b890ac5a70d2dcc06e59ba63ba98 SHA512 e9b8ba2522bcd0582f8c29eaf7b8b66a687ddf3c28c07d13b8b2e0a9d666efeb7e51d399f57c26e6f178fcf0ae279e272455083663ecc729ef3b0ba4e8c2c885
-EBUILD jna-5.10.0.ebuild 2499 BLAKE2B 5592719659b88ffbd692db79e4144024a2d3eebfd19d76c7910b11a204d1900deb3a9d24f2eb0e51b472c2788672a355ee7be5313c569c467e21d223c351c79d SHA512 6a79910d2b189397d826e021d39a449dc445690e1e2c6d51472ce91cf86a9106a2e447aba7f6e8a2e271478ab2f4ed7c6c8624dc337d70d049f56d396ada78b5
+EBUILD jna-5.10.0.ebuild 2463 BLAKE2B e7d4f12b13feb036bc0b17613e74a87273c1872f9690e0aa8420e9f622e4153f920760d7a4257e11d6426d49717e4e72ba09a9c4af3b9ff5bc4bdaa14b394da1 SHA512 6d6288af5598eae79640ee0c2872f876046ca180fb24878898663b1f58619c609fc28fa93c3032fe30646b9739c666c5c0cbe9881326cfc0c95c016929da45e9
+EBUILD jna-5.11.0.ebuild 2464 BLAKE2B cafa1c0301a3c5e0135ae0b521f7e762547d2152ef28cac0573e2d66216893839402cc2bba2a8805ecaa75a12682ff2f83f7407f70ff7147e62ead149d36962b SHA512 33f2bcced4969921bf9d02df5d02412376678ec2a49c21379fc9cc48aca8f768b5d0ff4f4ae2a1cd57cf42a8335f5825c4e98edaebd962bd71e8527e9f75e16e
 MISC metadata.xml 463 BLAKE2B 9ead7422212fdd6bebd8ec6aabafcdedf0d32420d312a8a0f2cd701dc7eeb940a30e91d1dc0449899a6134e1cb96d47cf95cea5dc20b4974b3d8714c6c00f93b SHA512 1365756d0d98cd7e7bcee2a608a77f1ca95c9546567a0bb37ba0033eb997ef6ae37d86e79c7c7fdc0916cb515658f9a37924181efc3215d00c825b10f9f99b45
diff --git a/dev-java/jna/files/5.10.0-tests-exclude.patch b/dev-java/jna/files/5.10.0-tests-exclude.patch
deleted file mode 100644
index e608e2087f44..000000000000
--- a/dev-java/jna/files/5.10.0-tests-exclude.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2b50e2296c9c9961fd168abe285f773aecd6437a Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Thu, 6 Jan 2022 12:21:22 -0800
-Subject: [PATCH] Skip execution of test classes without any tests
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- build.xml | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/build.xml b/build.xml
-index ed104c2..9fb15ae 100644
---- a/build.xml
-+++ b/build.xml
-@@ -1388,6 +1388,9 @@ cd ..
-         <fileset dir="${test.src}" excludes="${tests.exclude-patterns}">
-           <patternset includes="${tests.include}"/>
-           <include name="${tests.platform}"/>
-+          <exclude name="com/sun/jna/DefaultMethodInvocationTest.java"/>
-+          <exclude name="com/sun/jna/ELFAnalyserTest.java"/>
-+          <exclude name="com/sun/jna/PrematureGCTest.java"/>
-           <exclude name="${tests.exclude}"/>
-         </fileset>
-       </batchtest>
--- 
-2.34.1
-
diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
index 3f90c302433e..1d15c940f056 100644
--- a/dev-java/jna/jna-5.10.0.ebuild
+++ b/dev-java/jna/jna-5.10.0.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	dev-java/ant-core:0
 	dev-java/asm:9
 	test? (
-		dev-java/ant-junit:0
+		dev-java/ant-junit4:0
 		dev-java/junit:4
 		dev-java/reflections:0
 	)
@@ -46,7 +46,6 @@ RDEPEND="
 DOCS=( README.md CHANGES.md OTHERS TODO )
 PATCHES=(
 	"${FILESDIR}/${PV}-build.xml.patch"
-	"${FILESDIR}/${PV}-tests-exclude.patch"
 	"${FILESDIR}/4.2.2-makefile-flags.patch"
 )
 
@@ -54,7 +53,7 @@ JAVA_ANT_REWRITE_CLASSPATH="true"
 JAVA_PKG_BSFIX_NAME="build.xml build-ant-tools.xml"
 EANT_BUILD_TARGET="jar contrib-jars"
 EANT_EXTRA_ARGS="-Dbuild-native=true -Dcompatibility=1.8 -Ddynlink.native=true"
-EANT_TEST_EXTRA_ARGS="-Djava.io.tmpdir=${T}"
+EANT_TEST_EXTRA_ARGS="-Djava.io.tmpdir=\"${T}\""
 EANT_TEST_GENTOO_CLASSPATH="animal-sniffer-annotations,reflections"
 
 pkg_setup() {
diff --git a/dev-java/jna/jna-5.11.0.ebuild b/dev-java/jna/jna-5.11.0.ebuild
new file mode 100644
index 000000000000..be8f367f117d
--- /dev/null
+++ b/dev-java/jna/jna-5.11.0.ebuild
@@ -0,0 +1,99 @@
+# 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="net.java.dev.jna:jna:5.11.0"
+
+inherit java-pkg-2 java-ant-2 toolchain-funcs
+
+DESCRIPTION="Java Native Access"
+HOMEPAGE="https://github.com/java-native-access/jna"
+SRC_URI="https://github.com/java-native-access/jna/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-2.1+ )"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+CDEPEND="
+	>=dev-libs/libffi-3.4:=
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	dev-java/animal-sniffer-annotations:0
+	dev-java/ant-core:0
+	dev-java/asm:9
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/junit:4
+		dev-java/reflections:0
+	)
+	${CDEPEND}
+	x11-libs/libXt
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+DOCS=( README.md CHANGES.md OTHERS TODO )
+PATCHES=(
+	"${FILESDIR}/5.10.0-build.xml.patch"
+	"${FILESDIR}/4.2.2-makefile-flags.patch"
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_PKG_BSFIX_NAME="build.xml build-ant-tools.xml"
+EANT_BUILD_TARGET="jar contrib-jars"
+EANT_EXTRA_ARGS="-Dbuild-native=true -Dcompatibility=1.8 -Ddynlink.native=true"
+EANT_TEST_EXTRA_ARGS="-Djava.io.tmpdir=\"${T}\""
+EANT_TEST_GENTOO_CLASSPATH="animal-sniffer-annotations,reflections"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+
+	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only \
+		animal-sniffer-annotations,ant-core,asm-9)"
+
+	# Any spaces in paths returned by toolchain-funcs and options like MAKEOPTS
+	# could cause trouble in EANT_EXTRA_ARGS when Java eclasses process the
+	# variable's value, so define them in ANT_OPTS instead
+	ANT_OPTS="-DCC='$(tc-getCC)'"
+	# Parallel build does not respect dependency relationships between objects
+	ANT_OPTS+=" -DEXTRA_MAKE_OPTS='${MAKEOPTS} -j1'"
+}
+
+src_prepare() {
+	default
+
+	# Eliminate build.xml's dependency on bundled native JARs
+	sed -i -e '/zipfileset src="${lib.native}/,+2d' build.xml ||
+		die "Failed to delete lines referencing bundled JARs in build.xml"
+
+	# Clean up bundled JARs and libffi
+	java-pkg_clean
+	rm -r native/libffi || die "Failed to remove bundled libffi"
+
+	java-pkg-2_src_prepare
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "build/${PN}-min.jar"
+	java-pkg_dojar "contrib/platform/dist/${PN}-platform.jar"
+	java-pkg_doso build/native-*/libjnidispatch.so
+	einstalldocs
+
+	use source && java-pkg_dosrc src/*
+	use doc && java-pkg_dojavadoc doc/javadoc
+}
diff --git a/dev-java/jopt-simple/Manifest b/dev-java/jopt-simple/Manifest
index 1d69d538a6d6..430c5ef2866d 100644
--- a/dev-java/jopt-simple/Manifest
+++ b/dev-java/jopt-simple/Manifest
@@ -1,5 +1,6 @@
 DIST jopt-simple-4.6.tar.gz 107082 BLAKE2B 622144647b24049861398cc99ca3cc268baae045f8ca23cdd5bddb2e656bc97d17397ae752ca9a6edc91b8486e1e55ce19ba335d2afadf6c6df4f858faf43a1e SHA512 c2f467521f6419f91206f6036d420671b02106beadff3fc51d1893e6f3f6302b8fcbb31957327b9e40cbfd7a7d55030e0c999d9570d7e29fe7a4375bab10ed76
 DIST jopt-simple-5.0.tar.gz 119502 BLAKE2B 975a0d338fa3154963954fd3b218c944dded023b3a2da59ee2671c73450a578dbf1aee8e52b9f715839e15c1937e0a493c4b37518b73038aa017e1d0ec1ca06a SHA512 f440c62cb307aad7cab64f091c82f78e11a117e60aaadf71883c149a622576531272de3d67859f6df093df658bb0bfb435d9bb33bc729bcda24dcc99d27369ff
 EBUILD jopt-simple-4.6-r1.ebuild 579 BLAKE2B 1c988774f4fb47b0f4e1b57aaf58820280dc7b819dbefa916b4f198e1861ccd0f01bbd0e17aeb850499bd0a26fa59350b44085840c9c39c314a367eb5471a9fb SHA512 c0714503fdfe7011347a08395769ba6261cc3d46a11a403fa1b08f3cabc4c508f829655951bedd8c1ad8aa2d15a484d7db381a89ebd8265c82f235d8e89ff7f6
+EBUILD jopt-simple-5.0-r1.ebuild 674 BLAKE2B df5e7739f16c175151f997de4f07fa9c1f87fb9a6b58d0ff4b4dfef7810f5060e5d05c0730ae67550b21bad0f58fd69736963f645232f5f6d6722a827585d75c SHA512 ece300b9f349bc08eb5901ef5b65e7c700e0eff7b78a2d54c2c215874a0586d48150ec24a6788b0df4b2a6ed1ce431b69919d6a2d191c59ad2ee2728294e7300
 EBUILD jopt-simple-5.0.ebuild 648 BLAKE2B 137db3a025327e0e9cc2c57c465f9f8734f523e350ad91263f33ffb3edb761ac99c9f84a897a60387694a61d5cb46c67dd12579dd68dca8321b5e70428ac1934 SHA512 3c2863dbcc4613fe33bdf4e3afac16d8f006e0c958315ad35cfbfb4428a519cf743a2532f8a831c37fc0a5bad7608daecd2aac27fc23588e4d8a95bdcf51903a
 MISC metadata.xml 321 BLAKE2B 1165369ebb01fa6f8d30370de45e8b6dbfb6bd57687593395213e2772bdd379a0f4adefa0901f23e79262c6803ea3544b0127fc1e5f5f2a00e3523ef26ad2ce9 SHA512 9306c4766bac17556a01b019139fcdbebdb08ee1f0b56adcf4ffb25805075ae2d5d5007659e897418da012ee05157cec8cdc119715bf88abd8a00a6a7661b89e
diff --git a/dev-java/jopt-simple/jopt-simple-5.0-r1.ebuild b/dev-java/jopt-simple/jopt-simple-5.0-r1.ebuild
new file mode 100644
index 000000000000..62a6e8d2b8bd
--- /dev/null
+++ b/dev-java/jopt-simple/jopt-simple-5.0-r1.ebuild
@@ -0,0 +1,30 @@
+# 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
+
+DESCRIPTION="A Java library for parsing command line options"
+HOMEPAGE="https://jopt-simple.github.io/jopt-simple/"
+SRC_URI="https://github.com/jopt-simple/jopt-simple/archive/jopt-simple-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-${PN}-01719a6"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+src_install() {
+	einstalldocs
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jrobin/Manifest b/dev-java/jrobin/Manifest
index 6abdd03c87d6..11da55c36cfb 100644
--- a/dev-java/jrobin/Manifest
+++ b/dev-java/jrobin/Manifest
@@ -1,4 +1,3 @@
 DIST jrobin-1.6.0-1.tar.gz 7340700 BLAKE2B 2db142423c3ad0006609b31fed38a4121e942f1253a5b6ed8b10f83c71c9b9fbf271346bad1f419f7337871cd4e61e59a4117de79a07715557335458944fccea SHA512 c5428906bf975f6c31f90185da3f0cbcaaff74d68e35e37b5e425340899fe01290d3d9813f1ecd60bd599512e3d62f635de290db9a9a1bd45292ac9c187b15c7
-EBUILD jrobin-1.6.0-r1.ebuild 1592 BLAKE2B ee87d6b590cdb056ddda0cd94c461e7f3260a62df371be8cf4c25e0f78abb911f44fe3371d89c1d6ffc5ea01395ae97b051cfc5644a0eefd2edd1a2748901ef5 SHA512 a6f70667b55ab8630e44d168c09252bab98f3c07a9764c082880f91081e79f7060b7a53f788c03dbbbf7e08ca0ade875e91f4b4f80ff3aebe1b9084d4a933402
-EBUILD jrobin-1.6.0-r2.ebuild 1724 BLAKE2B 165094d6048cb6a3f29e65a5b8eb6b62557cdfcce6b296e77ae9c0de07cb8d896b564528755c7d772d234b23ac2c075d7585f52721d837f7dc5a47228460ce47 SHA512 7bba4d9bd567192426b043b67eade26b58a629b5c3843ddf3576d0133cc2169c99307d98099d6ef1d837e5a65872db00401d86e1db15d447bdc5e8b04331d214
+EBUILD jrobin-1.6.0-r2.ebuild 1722 BLAKE2B 5b07e6ca9d891cc99031d89b0fcbb5453b6d9e22c12a17f963180fdc20e9e70e21a4506cfd312f2c7706d27e3f534c6b88f4797701d235a856fef2a8cb6d3d72 SHA512 24ddb33796aad0b772da6206dc6b2d0de3508664bbfab8ab5111973e45031eefc4bb995163d74aa4ad27665777c66d3afa1c347e96d4c27a7b531850171df890
 MISC metadata.xml 603 BLAKE2B eba31b8e000513e2a29e8e93e6a2405487d3665f4daa2fc0c7cf4e4e9fe6582441682374f5f06c2bdf19e8e64b276f9b85ee19c6923b629cd22f41c2b8d31037 SHA512 aa5eba1f7c5635afc0b288f20428cc03e5104bde59320abdb607bf0462ef34e6fdd58f3ab9253edc58181c53e82f273968b7bfabb3dc076af66021356cbde51c
diff --git a/dev-java/jrobin/jrobin-1.6.0-r1.ebuild b/dev-java/jrobin/jrobin-1.6.0-r1.ebuild
deleted file mode 100644
index 3b819e8ef465..000000000000
--- a/dev-java/jrobin/jrobin-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 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
-
-DESCRIPTION="JRobin is a 100% pure Java alternative to RRDTool"
-HOMEPAGE="http://www.jrobin.org/"
-SRC_URI="https://github.com/OpenNMS/${PN}/archive/${P}-1.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	test? (	dev-java/asm:4
-		>=dev-java/cglib-3.1:3
-		dev-java/easymock:3.2
-		dev-java/junit:4
-		dev-java/objenesis:0 )"
-
-S="${WORKDIR}/${PN}-${P}-1/src"
-JAVA_SRC_DIR="main/java"
-
-java_prepare() {
-	find "${WORKDIR}" -name "*.jar" -delete || die
-
-	# The tests need the resources in this directory for some reason.
-	mkdir -p test/java/target/classes || die
-	cd test/java/target/classes || die
-	ln -snf ../../../../main/resources/* . || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	jar uf "${PN}.jar" -C main/resources . || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher "${PN}-rrdtool" --main org.jrobin.cmd.RrdCommander
-}
-
-src_test() {
-	cd test/java || die
-
-	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars asm-4,cglib-3,easymock-3.2,junit-4,objenesis)"
-	local TESTS=$(find * -name "*Test.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
-
-pkg_postinst() {
-	elog "The rrdtool executable has been installed as ${PN}-rrdtool to"
-	elog "avoid conflicting with net-analyzer/rrdtool."
-}
diff --git a/dev-java/jrobin/jrobin-1.6.0-r2.ebuild b/dev-java/jrobin/jrobin-1.6.0-r2.ebuild
index 427e2dc13d7b..591a820c6055 100644
--- a/dev-java/jrobin/jrobin-1.6.0-r2.ebuild
+++ b/dev-java/jrobin/jrobin-1.6.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/OpenNMS/${PN}/archive/${P}-1.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index 694a2582cfe5..621559198740 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,5 +1,3 @@
-DIST json-20150729.zip 52114 BLAKE2B 8730eaa92002debf3563f1b07901118b2b5fb8754d5d35491ef7e4a7c8f208687a00ea2ab587e183d0d88af59f5527deb2a64e244b2668196f9f31a80099148f SHA512 ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c
 DIST json-20220320.tar.gz 229462 BLAKE2B 9d549e4e905e2a63985b0b2d9a6cfbf7483776799d6b907455356940b48242fda9344874f1625da06215991eae1cfa1e87f3f8f0a204807795ed50f3f9afdbc2 SHA512 1bcd99c69201ea6609a41ec1679467504cd129a8c5a9caede0829cd8eb70b0e59e504a4bc409f57e6b27091e11acbf6108830c6f1fe16919d0cb1daff643bdf0
-EBUILD json-20150729.ebuild 700 BLAKE2B 28d118fc07ab4f4bc52e00f43d36f49291fa69fc91304ee2d89df9c111e72a09f7eea10e659d06ac8eccd5c3a9d038d7ac57dca5f50fcf9d9246873bba6559c9 SHA512 112177c08691722e2b9e0d0bbcc11bbe68da87c281a4918ff6e4ef64160b7137ecb1187a697bf0f7c3db01acc9cc4baa79a67b7e9385af9cdbf5b3cd4036b26c
-EBUILD json-20220320.ebuild 1484 BLAKE2B 9da92b57c7ca603d4e81c2affe103f33ad2c52012782a256b9fbffd246f8b598bf720ed80afee7428a98cb80a12e63c5a18ede9686247a2c86f0c62d0a61b852 SHA512 64e2e83d134dff838139499715c7b8aedd5ead16086d9bf6ce2cdbdc2628ee29d4d68f736f8efdd271067d0d1cc99ade7bc3b5cf5494a9e8c81ea03235bb2141
+EBUILD json-20220320.ebuild 1482 BLAKE2B 36157695be78f2cce807513e2525c1446f32618596d6a181c83cd8d9c4ebc139eacb2c314325352e49dfb9ec36d1a508c8fd5664522b956172de289706f2ef55 SHA512 aa15265508c64bc0486b911766cf988b2a6d38a50ef4519c7a60690278d533e9bcc4fb9f04084999da2022882f90220bceabd400408c3253bba4fdcb5bca2076
 MISC metadata.xml 1083 BLAKE2B 9dfa3392b02d2bb6ae3198a884c154a52926de81aead27309fd0bbe25011a1b0ea89c0c7fa3694c56fee4cb339c2fd161384c9d7c780369cc3da4464d3abd40a SHA512 3d0f231f0e67e178f838474e6aa07e88dffc26e26261a49515124c3e68120d323cc1a790be017b082af8f27dd051121750c1e1829e7a2fc2714821caf9a8802b
diff --git a/dev-java/json/json-20150729.ebuild b/dev-java/json/json-20150729.ebuild
deleted file mode 100644
index a40b3e9d7189..000000000000
--- a/dev-java/json/json-20150729.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 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
-
-DESCRIPTION="Java implementation of the JavaScript Object Notation"
-HOMEPAGE="https://github.com/douglascrockford/JSON-java"
-SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip -> ${P}.zip"
-
-LICENSE="JSON"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-S="${WORKDIR}/JSON-java-${PV}"
-JAVA_SRC_DIR="src"
-
-java_prepare() {
-	chmod a-x *.java || die
-	mkdir -p src || die
-	mv *.java src || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README
-}
diff --git a/dev-java/json/json-20220320.ebuild b/dev-java/json/json-20220320.ebuild
index 0151873d71ab..86e62eab5ee3 100644
--- a/dev-java/json/json-20220320.ebuild
+++ b/dev-java/json/json-20220320.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.
 
 LICENSE="JSON"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 5221e2580e81..19b539c2610a 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -6,5 +6,6 @@ AUX jython-2.7_beta1-ant.patch 996 BLAKE2B ea81e5c330e1e2b45378d91baed45b7d60cdd
 AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 BLAKE2B 72fe6e0afe6346ed4af714485aa70cccc202aa9b8f4587df380697b54d55ce278a89685144620c4695acf212e3e4654b476865d54643b88dbfc2468b2c33fb98 SHA512 75b25d98d8df13d0b9947cbc70a7da59097b89731210504cc26ab18680b93d9ce2cd177480870f985a87d3634d9034b8d9f1bac2c431f4cfe09ab0b54db78b18
 AUX jython-2.7_beta2-maxrepeat-import.patch 457 BLAKE2B a55f47a16264544608ba9916d3f2ced081a4f47d260bab2eeeb5959ad1aaf1074a69bea4d8083383d039f541f6b379a141c81c4376a7f7cf324ce06ddeb84ab1 SHA512 e06ddb36805e2545f351d9d5df651fa90b0b39d340e4772cbb24910f1e1c999463a21fbe4a62c9cc73f9ccdc0047f8900e6300602cb8d5b70cef7cacf1bd46d0
 DIST jython-2.7.0-sources.jar 15371691 BLAKE2B 7e1c29f2a2c03b034e89bb9c3a8fdddbaef6a0191a7320c82b76e31b41336f3d99c1995b2e9864c033ec53629d45669ad460fb4a1433ea7bc6b0390919500a24 SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6
-EBUILD jython-2.7.0-r4.ebuild 4304 BLAKE2B 9ce5b05684c7783b879672eed0fda0773fea00305d77d890283575e2a17ed006ff578aff8286bf24e42580d6345e12e6d9da04e57869bef46335f2d023f5d2f1 SHA512 6cef3e75fb9aac56f970439b331ae91702257ed405106781913f4d1bab1c03a55017bf9366ba0c0f366f94cdd4a2958933af4640985bcd74460627460c094c7f
+EBUILD jython-2.7.0-r4.ebuild 4303 BLAKE2B e799c43f07df3c01ca6e2155c8201ae3c3151bf86e79f5b79a408395379adfd97e11bd9ded46199fc8e3aad174ab45ccf4bcb9dc90738491bbe66958f0d91147 SHA512 d76dc2820fdb18d6ca42ae4b4e2e0aa335abd5b3acd2e37726c6f0c166451f84b0f4f3edd59d4ceced3ade06fd65f6578bb29953b5b873dcd7668e1871437261
+EBUILD jython-2.7.0-r6.ebuild 4453 BLAKE2B 91f45695c95fcd42bacdd35fd3d4c1ff34de387046dc51a13ec9f7d5f2367dc9d4033b5110f55f0c5d1abed4cfdf25b820b630c28058d3b7806196d98e983653 SHA512 317dcd4ddd74d89ed8bbc62108d924c9a223f6e448a8f0148adf801151a46c9fedbb70bc370966245cc6f3f1838af603d8f6007a35673027eca1175001a82c60
 MISC metadata.xml 323 BLAKE2B 4c2b07b6a519fb3f1e4f7d0662e2488705d8ba2239a6cbd25b42aebd1bff1ca368105e1c5eee604915428c5b909ecc2547f6be4dfad126139a7f496bb276ae02 SHA512 de33eb0b1518ca8c0c9f8a44880946f491620bbcbfe0d5ebcb68dca71eba3965f0cf0ccd8c67128022c33845699222bd8b899c061cb5f7d7c0e09a4783fa3464
diff --git a/dev-java/jython/jython-2.7.0-r4.ebuild b/dev-java/jython/jython-2.7.0-r4.ebuild
index 9a24865883be..3da94ca9ebbe 100644
--- a/dev-java/jython/jython-2.7.0-r4.ebuild
+++ b/dev-java/jython/jython-2.7.0-r4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_P
 
 LICENSE="PSF-2"
 SLOT="2.7"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 
 CP_DEPEND="dev-java/antlr:3
diff --git a/dev-java/jython/jython-2.7.0-r6.ebuild b/dev-java/jython/jython-2.7.0-r6.ebuild
new file mode 100644
index 000000000000..7000a802e098
--- /dev/null
+++ b/dev-java/jython/jython-2.7.0-r6.ebuild
@@ -0,0 +1,156 @@
+# 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="org.python:jython:2.7.0"
+
+inherit java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="An implementation of Python written in Java"
+HOMEPAGE="https://www.jython.org"
+SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar"
+
+LICENSE="PSF-2"
+SLOT="2.7"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+CP_DEPEND="dev-java/antlr:3
+	dev-java/netty:0
+	dev-java/asm:9
+	dev-java/commons-compress:0
+	dev-java/guava:0
+	dev-java/jffi:1.2
+	dev-java/jline:2
+	dev-java/icu4j:70
+	dev-java/jnr-constants:0
+	dev-java/jnr-posix:3.0
+	dev-java/jnr-netdb:1.0
+	dev-java/stringtemplate:0
+	dev-java/xerces:2
+	java-virtuals/servlet-api:3.0"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	dev-java/ant-core:0
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit:0
+	)"
+BDEPEND="app-arch/unzip"
+
+S=${WORKDIR}
+
+RESTRICT="test"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" java"
+
+EANT_BUILD_TARGET="developer-build"
+EANT_TEST_EXTRA_ARGS="-Dpython.home=dist"
+
+# jdbc-informix and jdbc-oracle-bin (requires registration) aren't exposed.
+# Uncomment and add to CDEPEND if you want either of them
+#EANT_GENTOO_CLASSPATH+=",jdbc-informix"   EANT_EXTRA_ARGS+=" -Dinformix.present"
+#EANT_GENTOO_CLASSPATH+=",jdbc-oracle-bin" EANT_EXTRA_ARGS+=" -Doracle.present"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.2-distutils_scripts_location.patch
+	"${FILESDIR}"/${PN}-2.5.2-respect_PYTHONPATH.patch
+	"${FILESDIR}"/${PN}-2.7_beta1-ant.patch
+	"${FILESDIR}"/${PN}-2.7_beta1-dont-always-recompile-classes.patch
+	"${FILESDIR}"/${PN}-2.7_beta2-maxrepeat-import.patch
+	"${FILESDIR}"/${PN}-2.7.0-build.xml.patch
+	"${FILESDIR}"/CVE-2016-4000.patch
+)
+
+src_prepare() {
+	default
+
+	find \( -name '*.jar' -o -name '*.class' \
+		-o -name '*.pyc' -o -name '*.exe' \) -delete
+
+	# needed for launchertest
+	chmod +x tests/shell/test-jython.sh || die
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=833785
+	sed -e 's:\(CharMatcher.\)ASCII:\1ascii():' \
+		-i src/org/python/core/Py{,BaseCode,Unicode}.java || die
+
+	java-pkg-2_src_prepare
+}
+
+src_configure() {
+	# apparently this can cause problems
+	append-flags -fno-stack-protector
+
+	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-3.0)"
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only ant-core)"
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local instdir=/usr/share/${PN}-${SLOT}
+
+	java-pkg_newjar dist/${PN}-dev.jar
+
+	java-pkg_register-optional-dependency jdbc-mysql
+	java-pkg_register-optional-dependency jdbc-postgresql
+
+	insinto ${instdir}
+	doins -r dist/{Lib,registry}
+
+	dodoc ACKNOWLEDGMENTS NEWS README.txt
+
+	use doc && java-pkg_dohtml -r dist/Doc/javadoc
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples Demo/*
+
+	local java_args=(
+		-Dpython.home="${EPREFIX}"/usr/share/${PN}-${SLOT}
+		-Dpython.executable="${EPREFIX}"/usr/bin/jython${SLOT}
+		-Dpython.cachedir="\${HOME}/.jythoncachedir"
+	)
+
+	java-pkg_dolauncher jython${SLOT} \
+		--main org.python.util.jython \
+		--java_args "${java_args[*]}"
+
+	# we need a wrapper to help python_optimize
+	cat <<-EOF > "${T}"/jython
+		exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
+			-Dpython.home="${ED}${instdir}" \
+			-Dpython.cachedir="${T}/.jythoncachedir" \
+			-Duser.home="${T}" \
+			org.python.util.jython "\${@}"
+	EOF
+	chmod +x "${T}"/jython || die
+
+	local -x PYTHON="${T}"/jython
+	# we can't get the path from the interpreter since it does some
+	# magic that fails on non-installed copy...
+	_python_export jython${SLOT} EPYTHON
+
+	# compile tests (everything else is compiled already)
+	# we're keeping it quiet since jython reports errors verbosely
+	# and some of the tests are supposed to trigger compile errors
+	python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
+
+	# for python-exec
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto "/usr/share/jython-${SLOT}/Lib/site-packages"
+	python_domodule epython.py
+
+	# some of the class files end up with newer timestamps than the files they
+	# were generated from, make sure this doesn't happen
+	find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
+}
diff --git a/dev-java/kafka-clients/Manifest b/dev-java/kafka-clients/Manifest
index ee5722ea8242..5eb24782d901 100644
--- a/dev-java/kafka-clients/Manifest
+++ b/dev-java/kafka-clients/Manifest
@@ -1,3 +1,3 @@
 DIST kafka-1.1.1-src.tgz 6443963 BLAKE2B 721f9efb4bd2a1c605e1750a29a33f9939d346a1f81d380b980631d03a1dffcba2f435a91e9420a5876d2294f62c4e4ef39e951b0d37406c0b924f036947848d SHA512 26aa54fe5a761619fb748e4597dd2e3968a99c32d39312b56a83738df6df5e62052d7f883bf56cec25d1e31315d2ff856375fdc7f97a6029786abfa341769ecc
 EBUILD kafka-clients-1.1.1.ebuild 740 BLAKE2B 2f106e1388b02ab33e591281f2504d357e2ad080fd818bc82ff80c3b6c44e70a50260e7d9169fa4a94c43209a2367a5be12693f93180c7f842c2116a031749de SHA512 2c05add6e9527b8e352fe50950f93c90d402c0cf26362e5154051308e4e561dd478ea69b8765658143ea890cf4094db904c124d88cf15339a6cd09ed55a6ad18
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
+MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/kafka-clients/metadata.xml b/dev-java/kafka-clients/metadata.xml
index 952a4b9b605c..4221e170cbc0 100644
--- a/dev-java/kafka-clients/metadata.xml
+++ b/dev-java/kafka-clients/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
diff --git a/dev-java/leiningen-bin/Manifest b/dev-java/leiningen-bin/Manifest
index be867e3a63c5..252027a97864 100644
--- a/dev-java/leiningen-bin/Manifest
+++ b/dev-java/leiningen-bin/Manifest
@@ -1,5 +1,8 @@
 AUX leinrc 37 BLAKE2B 0c5df00ef323caebf53e52246ca87b066a1b6104fb03fc7e3548dba0947ecf53c33bf4e8215fc098212293915d9808b961c0df527f30d7f6316b4aff84bf3b69 SHA512 f948d5f355d43fdee6cf68d0dad39f53f72b341649869a6ca161f5d8c83bf30434ed03c51a7e01aaefa422ff4e93ca3db5680fd4c2af92f5393acde6e8aec7d0
 DIST leiningen-2.9.1-standalone.jar 14621704 BLAKE2B 51d3aca27c56dcdf1560271509e6c4868e387255af5f4e75f42755243b14949ef994cbee81f796a5a533089433fff59e9aff65d7e4e93df02e86fccfd47cf7f9 SHA512 4364aa2a071117049f97f95e020f75bfd0875c88475591d4e04100ac1b228137360a8b24c09877cd3400b7854bf9392b4e5d07ed7f7972e10e4ef5396d0db574
 DIST leiningen-2.9.1.sh 4511 BLAKE2B 66fd656c20ed9b109982840315951b062b1a3fbf0b2b76fc1b6ca612d4daa5d07480838f3f58ec1f1193ff29318323123b6f58bde390d4fb628566687ed39eab SHA512 044621254d31bee3bcdd3f6bd52e9c233a736e2e780edaa3af1d5a7a90424294efd25590c9d3a0606560b223b9e73c87c258fbbb626d2af1b39a400ba1aea86d
+DIST leiningen-2.9.8-standalone.jar 12834369 BLAKE2B 6c9bc9a2f990bb4959aa06f8f8b31c1084f0d2bad2e19c8343fb7e8a02acb6f6173737cbf36b028e113577ef26e380d7ace035316dee840c6da92512afa7ac0b SHA512 de4989bf31fe86bfb943d90b683dd17a7417c267e67ac8036967ed352e47a4361b8b6ec8378a1e6cf24fd8df51bcabb9578bc8f487d812c9fb5c2f5f476016cd
+DIST leiningen-2.9.8.sh 4555 BLAKE2B c876d19a4ba9a53d84c31874af442e57e6184ce1f7145512355a88b833d2d236bd73eef93f260d22b51e6200c5579c3721a8b6bcb16d516e503a98a2eaf26126 SHA512 58cba7d457c98546e530ad821273cb3f51445ed3191022d0963dd51683cb6b24d0f7d557da34313083b0df11a2c9885bf6d5bb073dea736731de95e8fbbca492
 EBUILD leiningen-bin-2.9.1.ebuild 1551 BLAKE2B 711f1bf3e8452e3def5e88ebe555533f87875670160ca44843647e0aef1b19d5117f6c7281ecf32fc626ff8c155a0b287cce2e5551ab794b21e6687bebeb9c3e SHA512 b57c0ad469d3b3bd2f1fb2fe0873c027106d699b30e7291607107f588a8f1283cf714b2d81fa2d8a8bd4f9a80d4e375be933e38d17e76ba64a81ff9fc633bf69
+EBUILD leiningen-bin-2.9.8.ebuild 1523 BLAKE2B 5ec541f1af1fb8789fc0dc93a1df3d18fca7648244af563d0892bb6cb5cf0e157c867eda345356063bbbea7006ad8ebb49fe9f3bf1ead650b836dae3bdf8e134 SHA512 07369b662ec871a47e696c803bfb58df02075035aaf0a61a26180cd5d5d54e91762587b1ef9a2019d83cf087319e6f6eb74428026d031206034385f18bd599fc
 MISC metadata.xml 303 BLAKE2B 3567c3889af4a644c925f03a220c329a207daeeca9437b8382ff777db620106cc807aadfaf6c157654c634dfa26c14fd654933aa5bd4b8027068fd6f67f1f241 SHA512 73c6a8fbd269fdf6a20f70aa0228314e3010461dad5c1b04f7b7c54d1cc3a2c7b475f180c6740cc9795b6d73fd39c7ce326ecf69768b1f11f2b264618711c1c3
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild
new file mode 100644
index 000000000000..f0bd5ee2ac4a
--- /dev/null
+++ b/dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_PNV="${MY_PN}-${PV}"
+
+DESCRIPTION="Automate Clojure projects without setting your hair on fire"
+HOMEPAGE="https://leiningen.org/"
+SRC_URI="
+	https://github.com/technomancy/${MY_PN}/releases/download/${PV}/${MY_PNV}-standalone.jar
+	https://raw.githubusercontent.com/technomancy/${MY_PN}/${PV}/bin/lein-pkg -> ${MY_PNV}.sh
+"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+
+RDEPEND=">=virtual/jre-1.8"
+DEPEND=">=virtual/jdk-1.8"
+
+RESTRICT="test"
+
+src_unpack() {
+	mkdir -p "${S}" || die "Can't mkdir ${S}"
+	cd "${S}"	|| die "Can't enter ${S}"
+	for file in ${A}; do
+		einfo "Copying ${file}"
+		cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
+	done
+}
+
+src_prepare() {
+	einfo "Copying leinrc"
+	cp "${FILESDIR}/leinrc" "${S}/" || die "Can't copy leinrc"
+	einfo "Patching leinrc"
+	sed -i "s^@@PN@@^${PN}^" "${S}/leinrc" || die "Can't patch leinrc"
+
+	einfo "Renaming lein-pkg"
+	# Rename generically to help user patching
+	mv "${S}/${MY_PNV}.sh" "${S}/lein" || die "Can't rename to lein"
+
+	einfo "Patching lein"
+	java-pkg_init_paths_
+	sed -i "s|^LEIN_JAR=.*$|LEIN_JAR=${EPREFIX}/${JAVA_PKG_JARDEST#/}/${PN}.jar|" "${S}/lein" \
+		|| die "Can't patch LEIN_JAR in lein"
+
+	default
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin "${S}/lein"
+	java-pkg_newjar "${MY_PNV}-standalone.jar"
+	insinto /etc
+	doins "${S}/leinrc"
+	fperms 0644 "/etc/leinrc"
+}
diff --git a/dev-java/log4j-api-java9/Manifest b/dev-java/log4j-api-java9/Manifest
index 4ea8478cae1a..5268fc35770a 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 1530 BLAKE2B 1f4431b6bd4a290ed6b3ca5c46330e033594d99a4478c69af4185d9233e5ae3f32fd801db629c3d2d56f0b0c7efc967bebe9c7e992378e06fbeffdabfced4ee3 SHA512 b164c370986f16efa0e87104f636d2bb6f5cfa2434cc552618f385c89f37f3bbe72e8879f4083ac8b6992d63124fb4399d6bf4ff06a0778796ffe146c1ff7f00
+EBUILD log4j-api-java9-2.17.1.ebuild 1537 BLAKE2B 5f0935472f66590fea9391683e78b8718a933a7a147929f64cfc52f7b8037d14e6e7e34d92a14d484ad1b290a6aac8cba7e9ed60fd426ba59f3e9715d85dc3c5 SHA512 978a40164d97dd28b746a5f683a62d0e7eb3a7a8bef9836079cf50ad8deea94c51650141878c99926548538b991757c91ceeb8075c0ce13d37d69b73de1cd2ed
 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 878a708b6dbb..0135b568e04c 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 ~ppc64 ~x86"
 
 # junit-jupiter is not available in ::gentoo
 RESTRICT="test"
diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest
deleted file mode 100644
index b7a2c7516982..000000000000
--- a/dev-java/log4j/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST log4j-1.2.17.tar.gz 2864448 BLAKE2B 233763dbe53f92b5408d3e278b291dff8a7d74657f367ec8b7c7ae1e685ddc0170783c8a5e4b48ec2590b6dda13f45e91bd66066f2c6b515e5d692caca31660b SHA512 7df8dca721f960b9fd22dd5f642dbe7d89167f167aa11604c5f9fe54d649a26dd05af88d7188b47abfb91d501535a4b3665dd84d7e0058ef77159713a10b5af8
-EBUILD log4j-1.2.17-r3.ebuild 1443 BLAKE2B 86775c41449ff2536ae73fd2c937654d2f08bc3cfab29d359bc91d3981e7e54037053a2a1c3cf6778c13e20da6d07029d58b82c59d196cf52426c077a30a26fc SHA512 818202c1ac5c3e8541a8df20089fb952ce85ab60b82b111025ccc15e34c16a8fecc74604fc3a65e566597accb5cba3432e75bac9a5c9325b5d4258440e0a4133
-MISC metadata.xml 366 BLAKE2B c587ea09c0a3a5cea9393a3870155319ed78fc743ecd2874e7db7d43d80b9421df956c52108c78da8880ee207f9349826f71e4ea5d3cbc649eff77f83766c2aa SHA512 1d5ba813fb5bf4586256586af92912079662400447f6e9f6154377b659d9d372ad26fd7916511d67cc3c627b5900e7e8dbcf41be917c09f2eff136199e1f39c0
diff --git a/dev-java/log4j/log4j-1.2.17-r3.ebuild b/dev-java/log4j/log4j-1.2.17-r3.ebuild
deleted file mode 100644
index ee8247958b42..000000000000
--- a/dev-java/log4j/log4j-1.2.17-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="log4j:log4j:1.2.17"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A low-overhead robust logging package for Java"
-SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz"
-HOMEPAGE="http://logging.apache.org/log4j/"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux"
-IUSE="javamail jms"
-
-CDEPEND="
-	javamail? ( dev-java/oracle-javamail:0 )
-	jms? ( java-virtuals/jms:0 )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-MY_P="apache-${P}"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="log4j.jar"
-EANT_EXTRA_ARGS="-Djaxp-present=true -Djmx-present=true"
-EANT_DOC_TARGET=""
-
-src_compile() {
-	if use javamail; then
-		EANT_GENTOO_CLASSPATH+="oracle-javamail"
-		EANT_EXTRA_ARGS+=" -Djavamail-present=true"
-	fi
-
-	if use jms; then
-		EANT_EXTRA_ARGS+=" -Djms-present=true -Djms.jar=$(java-pkg_getjars jms)"
-	fi
-
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_newjar dist/lib/${PN}-1.2.17.jar ${PN}.jar
-
-	if use doc; then
-		java-pkg_dohtml -r site/*
-		rm -fr "${ED}/usr/share/doc/${PF}/html/apidocs"
-		java-pkg_dojavadoc --symlink apidocs site/apidocs
-	fi
-
-	if use source; then
-		java-pkg_dosrc src/main/java/*
-	fi
-}
diff --git a/dev-java/log4j/metadata.xml b/dev-java/log4j/metadata.xml
deleted file mode 100644
index 4b4a9d327361..000000000000
--- a/dev-java/log4j/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-  <use>
-    <flag name="javamail">Build the SMTPAppender</flag>
-    <flag name="jms">Build the JMSAppender</flag>
-  </use>
-</pkgmetadata>
diff --git a/dev-java/logback-classic/Manifest b/dev-java/logback-classic/Manifest
index 846bd447ea91..265a6afb66b5 100644
--- a/dev-java/logback-classic/Manifest
+++ b/dev-java/logback-classic/Manifest
@@ -1,3 +1,3 @@
 DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
-EBUILD logback-classic-1.2.11.ebuild 3253 BLAKE2B 2c985e2abd3c2fda63d713b0c0c206597e4a91d1a0b86d4721f56cf7e66769332afdc97952836f83a6a290b02092df7a2a54cc9a9b4b6092f8252c9b789a24ac SHA512 45060ac3922b6f81f83e272f7e1ae3826d2fcae25c93b1304d534a5d015f26fb0d051df253f5ec06807c6bc04c27acdca69f31c9e00513df71cd248e0754f99b
+EBUILD logback-classic-1.2.11.ebuild 3253 BLAKE2B ca2e4d471073e0570b17c81a295574e4dc7192a9226e8bbbed2fc4de99717958bb16498912c35efd36446bdfadddd22b2e4cd4e681e173316e36e4969c7b3754 SHA512 e265a125363053545d2a3943da8e63154e7262ecfd2ecea222e7b42b2dc102bdd171e789bd24aa8614cf51166c467b0f7617e1d782d385714d3f3f14a5afd0b3
 MISC metadata.xml 413 BLAKE2B 3ae8c9f27dadfe978d070866e0c0368b89b8532f2aa6fbd3e3fab9e057320e1c6b5c2bc7367cc191e189acaa88384a0b86741d674d1cd711d4dd5ee8a29c9662 SHA512 7c2739ff8e878766487804fabcb39cda969c81e47af7fd51ffebfcb85dbdec10b7eef85b1d9c873561456e1592f6cdb8f82fbb4233abee1f43f323a1c10f9ba2
diff --git a/dev-java/logback-classic/logback-classic-1.2.11.ebuild b/dev-java/logback-classic/logback-classic-1.2.11.ebuild
index 3f695eaa57c2..7654edfce259 100644
--- a/dev-java/logback-classic/logback-classic-1.2.11.ebuild
+++ b/dev-java/logback-classic/logback-classic-1.2.11.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${P
 
 LICENSE="EPL-1.0 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # Common dependencies
 # POM: pom.xml
@@ -56,7 +56,7 @@ CP_DEPEND="
 # test? org.slf4j:slf4j-ext:1.7.32 -> >=dev-java/slf4j-ext-1.7.36:0
 # test? org.subethamail:subethasmtp:2.1.0 -> !!!groupId-not-found!!!
 
-# Restricting to jdk:1.8 
+# Restricting to jdk:1.8
 # src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java:20: error: cannot find symbol
 # import sun.reflect.Reflection;
 #                   ^
@@ -64,15 +64,15 @@ CP_DEPEND="
 DEPEND="
 	virtual/jdk:1.8
 	${CP_DEPEND}"
-# 	test? (
-# 		dev-java/dom4j:1
-# 		dev-java/assertj-core:2
-# 		dev-java/log4j-12-api:2
-# 		dev-java/logback-core:0
-# 		dev-java/mockito:4
-# 		dev-java/slf4j-api:0
-# 		dev-java/slf4j-ext:0
-# 	)
+#	test? (
+#		dev-java/dom4j:1
+#		dev-java/assertj-core:2
+#		dev-java/log4j-12-api:2
+#		dev-java/logback-core:0
+#		dev-java/mockito:4
+#		dev-java/slf4j-api:0
+#		dev-java/slf4j-ext:0
+#	)
 # "
 
 RDEPEND="
diff --git a/dev-java/logback-core/Manifest b/dev-java/logback-core/Manifest
index 4d3f1429e7d9..85db74d47e7b 100644
--- a/dev-java/logback-core/Manifest
+++ b/dev-java/logback-core/Manifest
@@ -1,3 +1,3 @@
 DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
-EBUILD logback-core-1.2.11.ebuild 3116 BLAKE2B 029c555827492da6f91ae7635f3b0328855574fd86f819098c3fce75766fbc6dd376f2b3462714816acfdddf91ad97c45f463384e84cda3e2a1ac9e1afcbd7e7 SHA512 2c403ae7ad23f7c249ff91893fff4045ede86a2fc02abc26f53cbf9f0a95788e5689f54fa2007ea2e7038da72be8d8cf4985bac05b64688efc69679ad35c6c7a
+EBUILD logback-core-1.2.11.ebuild 3126 BLAKE2B 00baf252dab2c7b59843bfeb79c4a7db0ecb47f40bf073988bb169f4a91b49ffbcd072f95e01424a43b6795aca16a7708cfb6696cf32802d83c8ac667299cae5 SHA512 83040133e8748920d3d6bf53f926166b02027368d1c3783d9d45e6d38739cbfde004e4ac852e9af317c8d64feb528b2f29836b309e556ab0dea15d032f6ab267
 MISC metadata.xml 413 BLAKE2B 3ae8c9f27dadfe978d070866e0c0368b89b8532f2aa6fbd3e3fab9e057320e1c6b5c2bc7367cc191e189acaa88384a0b86741d674d1cd711d4dd5ee8a29c9662 SHA512 7c2739ff8e878766487804fabcb39cda969c81e47af7fd51ffebfcb85dbdec10b7eef85b1d9c873561456e1592f6cdb8f82fbb4233abee1f43f323a1c10f9ba2
diff --git a/dev-java/logback-core/logback-core-1.2.11.ebuild b/dev-java/logback-core/logback-core-1.2.11.ebuild
index 82dafb0fa274..0cdfe7da5744 100644
--- a/dev-java/logback-core/logback-core-1.2.11.ebuild
+++ b/dev-java/logback-core/logback-core-1.2.11.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${P
 
 LICENSE="EPL-1.0 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 944fc9c585eb..06c505bdaabc 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -1,4 +1,3 @@
 DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
-EBUILD lucene-2.4.1-r2.ebuild 1802 BLAKE2B 71e720f396d65c1621d956d0536c3655a1530014861df0350dc506b7e03f2acd4f75ab70f0f7768ae867523ee49e1b7fac11095502fbba65d350ecf8223d1d41 SHA512 2551db0ac39d6ca7516b71e86202cef50e7784ee49f715f03703b205509e89983e735cc66ce3970abca9212390edbb06a948399310845e758855fb4764e2c985
-EBUILD lucene-2.4.1-r3.ebuild 2074 BLAKE2B 46e4ac4faf9de5e5a8017c80cb373e84cd4f9934b441f8ea57c5250f046a0f44b744bdf0057c198456c2f228d8e537efee1514b337962c7dce30e6b3a20b6694 SHA512 02dbcafbf53a6e2eba563ce9f0df44f327acd7732d1c293ad722d816918a8c14537f2b18d8af2572c539c04fec58169a6806619d7d6bf0d4c8bb1339d4d1df0f
+EBUILD lucene-2.4.1-r3.ebuild 2072 BLAKE2B 4b247db9d5730206b28ec413615a99a8d097c80085469e589e567c81eeb0f14143f9b3b276411083136bf91f6241a66802faf0805c13137dea010711dec10297 SHA512 d2bc9f55e5efe2f7b5a0af5a8f6731fff2b59f9322dcf0d86ea6e3b25eb914e944183a9216faf272c1ff8868d23a078862bf31aa6d82f4115916c4f5e87e5138
 MISC metadata.xml 235 BLAKE2B 5144dc07ec1e929d9a5734dc5c96258dbc8292cd9710c8deb32bdb3b585964b29e7f28563f2b71fc10e8601805c8d75549315d5997c5c0544bacfbd1c554c365 SHA512 da42efb5c9e4e199aa88b5ff4c2ba647284a3f82d251ddabd7e888ffb7e0efe68f6060aa06ebf8c059f3affdf275ee787566acb355ccbc9f072f9f7f3e28f729
diff --git a/dev-java/lucene/lucene-2.4.1-r2.ebuild b/dev-java/lucene/lucene-2.4.1-r2.ebuild
deleted file mode 100644
index b3f32a4fea35..000000000000
--- a/dev-java/lucene/lucene-2.4.1-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="https://lucene.apache.org"
-SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.4"
-KEYWORDS="amd64 x86"
-
-CDEPEND="
-	dev-java/javacc:0"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/junit:0
-		dev-java/ant-core:0
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-src_prepare() {
-	default
-	java-pkg_clean
-	sed -i -e '/-Xmax/ d' common-build.xml || die
-
-	# Portage marks shese files as bogus for some reason.
-	find . -type f -name instruction_arrow.png -exec rm -v {} \; || die
-}
-
-src_compile() {
-	# regenerate javacc files just because we can
-	# put javacc.jar on ant's classpath here even when <javacc> task
-	# doesn't use it - it's to fool the <available> test, first time
-	# it's useful not to have ignoresystemclasses=true...
-	ANT_TASKS="ant-core javacc" \
-		eant \
-		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib \
-		javacc
-	ANT_TASKS="none" \
-		eant \
-		-Dversion=${PV} \
-		jar-core \
-		jar-demo \
-		$(use_doc javadocs-core javadocs-demo)
-}
-
-src_test() {
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" \
-		ANT_TASKS="ant-junit" \
-		eant \
-		test-core
-}
-
-src_install() {
-	einstalldocs
-	java-pkg_newjar "build/${PN}-core-${PV}.jar" "${PN}-core.jar"
-	java-pkg_newjar "build/${PN}-demos-${PV}.jar" "${PN}-demos.jar"
-
-	if use doc; then
-		dodoc -r docs
-		java-pkg_dohtml -r build/docs/api
-	fi
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-2.4.1-r3.ebuild b/dev-java/lucene/lucene-2.4.1-r3.ebuild
index 762e6681fc1e..01cdd2a220ea 100644
--- a/dev-java/lucene/lucene-2.4.1-r3.ebuild
+++ b/dev-java/lucene/lucene-2.4.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="2.4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="
 	dev-java/javacc:0"
diff --git a/dev-java/lz4-java/Manifest b/dev-java/lz4-java/Manifest
index 7f55cf8059ad..199c63848b2c 100644
--- a/dev-java/lz4-java/Manifest
+++ b/dev-java/lz4-java/Manifest
@@ -4,4 +4,4 @@ AUX lz4-java-1.8.0-r1-Makefile 1528 BLAKE2B e3f8825785c329fc2c9a480dc5e7dbb00268
 AUX lz4-java-1.8.0-skip-ivy.patch 3236 BLAKE2B cae70a2600d8bc6f3e89e901728261d23102ec61ae35dfe678542953ecd5467f33d724154903dae3e7214c4c5bfcbf5b6956ae70f7806e270a9cb747b3661d47 SHA512 fd24db414b0944cac78e0b39014d9de38d694e958352d9dc4b83560c84c16790844f197a80bb4f90f084bb882406992ed72da5e54dc774122a347c2df2c76301
 DIST lz4-java-1.8.0.tar.gz 1069398 BLAKE2B 02ee363fc42eeeade01f04649416dd874513f4517264c6e1b6474d64e8b81e2ee9ff1f55e51b508608929e8d78cb30e98d929cc4a118c03f86b0e69bae237e8a SHA512 ae78748d984d2ede18018d5e9ae6aee0d5fe6ac8b56d717f863968cfad6e9f85b62305692345ba16002bee68278e87a0364aa98aeb92e2af6dc169e5d5b612d4
 EBUILD lz4-java-1.8.0-r1.ebuild 3162 BLAKE2B af48a8774cc7e0c67fbeea0b48383fc48b909d90cc05f03217846f082741416253dd215b073cb41cf1508b2b42eb7b22b45ba9191b8a739ce0276de078b40209 SHA512 0fd583fcfba0fb4760c263aec6a2d4cb3334c7c780c47ebee392ce3c78e4b6a1f0bc181a9d7470e49ce48e9bc72166bb785a522a29e4842fe640629fd5ed00e9
-MISC metadata.xml 313 BLAKE2B 08a0f9bbda1bcbc57ad87da568cb744824936147acbf6cc4d2693b957ebbf52454548d9f4ee568f7d1de864406c8a6af487cf6c8775d7cfa3f0a6029640d5d23 SHA512 1b33a50efd738cfbaf5fd163bbeb26736a0d4db2b1c68ff22d6d97931aa67043b2629900fcea3870afb99c6c6792db139361107f21dd87e75522287ae55c68f8
+MISC metadata.xml 314 BLAKE2B 029f69d900ca078525f401c897f9ebc3eb63d5fdbc201f8d42cadec684a66d1797fe4217ae4c8e874974fcfe74a2a1c024d7bf8bb165c8a9ec22ea103b11e5d7 SHA512 6a8817e187e78b1f175b35a07c9fa498f4b8af167a971320845148409ba352e5aa560cd907fb7e94336ebda07b7c7b5db407f0e9bdc94356e5d2090ee5f2fc9c
diff --git a/dev-java/lz4-java/metadata.xml b/dev-java/lz4-java/metadata.xml
index 576cd0ee41f1..0b61987a4768 100644
--- a/dev-java/lz4-java/metadata.xml
+++ b/dev-java/lz4-java/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
diff --git a/dev-java/microba/Manifest b/dev-java/microba/Manifest
index c7195b419d5e..e216c45bc865 100644
--- a/dev-java/microba/Manifest
+++ b/dev-java/microba/Manifest
@@ -1,5 +1,3 @@
 DIST microba-0.4.4.3.tar.gz 50106 BLAKE2B 15b7fe422f7d6aa92929a697ee2c12b2325c9cfcef6d43cc2f135b57a14d8a2a7c1a7b5b3de6bf8a7e1ed07ac275c26017430f776c435295e36109914aca090d SHA512 0191213d00fd0a6bd59a623fb0762eb589a5ac42c5c988a612c01781b30bcb6d86ce431f76687f5647889d54ad13b7f3fa2eec02ca81038f692d2cf25fa1aad1
-DIST microba-0.4.4.3.zip 89737 BLAKE2B 130f6a39f069b0b4e93f352b7fea10abd6eec23b7f0392ad15fa34c198b4dfb46a9b0208322b245f0934e2ff2260661934f958e6216a45c4c69573976f366a2c SHA512 17933578fe101053a1004a1aa0ef342ffa1dc1f2ea2d670fa8aa2523c7d8207bb79e54755e58d0b7ce5ba627ca3b348ac10870718622e818f4097a966acc0a10
-EBUILD microba-0.4.4.3-r1.ebuild 768 BLAKE2B 118819854bb185b357736387a7b016f30a9e2bbd768b93a8b129c2e06854414fb7ce21c08a84bed586f5e9419a7ebc867f878f34c35eb179a3e033a02eedd5b9 SHA512 57501fb0b7b526e150ac60f1d6ff9435500ee771348e63f6487e2d78b4ec7904fca664c9bfbcc91a02e7e9e479af483492c5ecdbb9ebc30528901aa61156cc16
-EBUILD microba-0.4.4.3-r2.ebuild 787 BLAKE2B d7d79c9da20168ae8d2744cf400584a6d716f9d833e2acaa85f78cdd3124ce18266485a5775c3925ee4dd5d7fd7fdbe515fa7046dda4132d004b3b54f5b0ced0 SHA512 91dae05e941174b3767ae91a1b7e572b52beee0c0938afd69c35cd8bdb271a8bd6b19ca790aa80ce80a99d794a9b30c7b6a40b4091eb2bbdbe01de4b68140798
+EBUILD microba-0.4.4.3-r2.ebuild 785 BLAKE2B 8bc33ec97e54573ad38f34aea29bea66de680e23cdf43ce33cceed13cf1d321fb6a681518078099570312d51917eac4c8e7fd5e8de94407efa749338161faac4 SHA512 f7b9acaef0b36fbd27ea4d02d5bc75a3c1fe1deddf901aaef32b5ad9931823920083de1eafdfec28b140cae2cfb5d893ec4c9b578aaf70af91011e2359a06b6c
 MISC metadata.xml 368 BLAKE2B 2b63a4d825225df05883aa88d19cfa39372812f28f8780870170b4121417b3f1d0d3b03ed2dfa2797154a6e96b4ae875029bbc8e7e862796d1e76799a1aa8214 SHA512 d5d5fe4b61a9b2f1e1cad3a8ccd658e96afbf8ff2b7aa9c962d2dc1d8106929d162f7dc4c52cea0ca64339aa212ac0a2b07b80b36bf94a34d1394360ed958e07
diff --git a/dev-java/microba/microba-0.4.4.3-r1.ebuild b/dev-java/microba/microba-0.4.4.3-r1.ebuild
deleted file mode 100644
index 02c622fbcd24..000000000000
--- a/dev-java/microba/microba-0.4.4.3-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Swing components for date operations and palettes"
-HOMEPAGE="https://github.com/tdbear/microba"
-SRC_URI="https://github.com/tdbear/${PN}/archive/${PV}.zip -> ${P}.zip"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CP_DEPEND="dev-java/jgraph:0"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src/main/java"
-
-DOCS=(
-	change.log.txt
-	readme.txt
-	README.md
-)
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar ${JAVA_SRC_DIR}
-}
-
-src_install() {
-	default
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/microba/microba-0.4.4.3-r2.ebuild b/dev-java/microba/microba-0.4.4.3-r2.ebuild
index 30212b3f2397..8692c84f479a 100644
--- a/dev-java/microba/microba-0.4.4.3-r2.ebuild
+++ b/dev-java/microba/microba-0.4.4.3-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/tdbear/microba"
 SRC_URI="https://github.com/tdbear/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CP_DEPEND="dev-java/jgraph:0"
 
diff --git a/dev-java/msv/Manifest b/dev-java/msv/Manifest
index 65cf717332d6..714a90d27e66 100644
--- a/dev-java/msv/Manifest
+++ b/dev-java/msv/Manifest
@@ -1,3 +1,3 @@
 DIST msv-core-2013.6.1-sources.jar 1011944 BLAKE2B 474d8a45bc5f16ec76dbe853a835b66cd1d733973ffad0dd5e0a653d349f075e22a72d29d91da312a9a133218f4187ece15fd66b19dc34bc00cdea72b95a5929 SHA512 3985451ff52e50957fdc22ef598edcd7b02495b834a53a048018064d1a6063d4554a7cb5d7752c2d265b852d17c7a55787d9b1ec2b580988ad005fcbc9c6eb8a
 EBUILD msv-20130601.ebuild 1417 BLAKE2B 31e1f539d89c0c831d68bf983c7ea8fc7073969742dfba4c25275a3b18e9f879e0878f375daf18f663ff4ce030fa6efcca6d54be6e786aafaeb651d76e19711a SHA512 46a52e0e6769fd968f94143635282f7f5b758cae3ba6ccb38180f4bd954f4ad48c6cc3c27b013a76003d757ee942658dc60263edd64ef7c26fee98cfd275c676
-MISC metadata.xml 401 BLAKE2B fbb5715feb77351d3edfb71b51f026f5c858300cb966a8d5cdfa4f3534c03e0de977703263015e5e60bc2928a2060e3da8684f5442f22c4e119e4d1616c82ac1 SHA512 cb176f670e860f0fb7612d313b9fe2fe1c00d5f08de531d7ef93f42204bb0dd537e6b51728b8e068cf571e24aaa7488441e0743724c8d54357f1aeee5ca10560
+MISC metadata.xml 402 BLAKE2B 183580e666df7bb2193670fcd9124b4f0a5e145ee753ef358178d55300c0b98da38d3ca354639feafb266968e1cd0a2d7c3f298bbb2c38ebbbfcd2ed5034830c SHA512 b7572f0eec97ab9efd709c4dd93911e36f3adb07b473b539986ed1933cbf598b6ee99b62a41a3aebc53fca6b2454a1a5cb68e45d67ae38d83315c2cba4722946
diff --git a/dev-java/msv/metadata.xml b/dev-java/msv/metadata.xml
index 5793ba043a01..a12324e097b7 100644
--- a/dev-java/msv/metadata.xml
+++ b/dev-java/msv/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>java@gentoo.org</email>
diff --git a/dev-java/netty/Manifest b/dev-java/netty/Manifest
index 81c6725f3e0f..8c76a1116395 100644
--- a/dev-java/netty/Manifest
+++ b/dev-java/netty/Manifest
@@ -1,3 +1,3 @@
 DIST netty-4.1.35.Final.tar.gz 2447958 BLAKE2B 133adc2b37d3e681d11ac2e0187c0f79bb7aeeb6c622a1bf6e66a35bb78cd5730eeeffccfb960948f2e1df5dfadaa44f62b6f354c03065493ae43e1399a5ba2e SHA512 c3ba4e34ae9d309118ff3517467ffc218136789b06287d747b57df08be84779dacf5e29b19157afecd759a3516bc346e434295291b3dd546f80c4ae7c3f0a3ca
-EBUILD netty-4.1.35.ebuild 5847 BLAKE2B 9eb13dc1652042c02f3f0289c795561e64a1294d30c1241e8614df3cd1403dc9ff1f3fd0b0e926d05d29606fea5eb75dacd69abbbd00e3320c4b41455cfb3a4b SHA512 c785c6074672fe662db2333f527491b88b021650f7e1a74f2facbb3f9f8d60974818002b4e32941fef46c83f8b88d6ed8b612ddc5f68ba88daa8d7aa48634a99
+EBUILD netty-4.1.35.ebuild 5857 BLAKE2B e49556f1ec09208ba8e06631a075d0763c11c7e30928520756653378a84e9e58b23c4f013bfc75a9fb984b34581317ea1afc89113ed630bc61ac793687f09b5f SHA512 1ad81114c4e8c7c5bfe30dff43b0b2d768280bac5f30216d8f07c10a9104199efacfe8a64c9c77064b6d5f47627f1ebd8878bf3e900b3c308edb224a0c1a6a87
 MISC metadata.xml 507 BLAKE2B 821a563701bddd615a49743269e82ef5f906d5f30d957accbba10cda171b3a8943911733247e05efc9c28b40fd75396e78c2b28c3297a74b15ea8b716dc50ad1 SHA512 5c237af46f2d99e807ad5d442c83af2d1bbd85f3d3ed71e5dc3595c91d2e8104e5025216911e74901817cfd495eb6e96e22248bd1a05c90018c7d13b99d1d494
diff --git a/dev-java/netty/netty-4.1.35.ebuild b/dev-java/netty/netty-4.1.35.ebuild
index 467f2b8746e0..16ffa4df654d 100644
--- a/dev-java/netty/netty-4.1.35.ebuild
+++ b/dev-java/netty/netty-4.1.35.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/netty/netty/archive/refs/tags/netty-${PV}.Final.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # We do not build the full range of modules provided by netty but only what
 # was available before in netty-common, netty-buffer and netty-transport.
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index f7a301fb2cc2..91e158934cfb 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,46 +1,46 @@
 AUX openjdk-bin-11.env.sh 503 BLAKE2B 7f7dcdb561612501020b6fa922ad43bab7635796ea2004812f0dbb245d182d9501ec4d4d7497c31728501887168d598aac4561a37f86d4111666fc5a5b4bb1ea SHA512 83a893610b636d0e9f8e13aa5727bddcef1257b37388392945cd137b1efcfd03a325b7b7e5e1437daa27fc373abd0ac675a77e406461818225c66a047e4acf97
 AUX openjdk-bin-17.env.sh 503 BLAKE2B 82823ed5e794188b43bff8bbd644c7796a621275051fd9f68e22b435c75ffb68602af82a8b79d2d76ffb8cd2f77380ecc70e38963ebc8e0e31c2fadcc0f10ce3 SHA512 79a89625c51d4d7f1eb9d976de678347055bbe025b32f76420c8b7fdd7a9f09bc7b57d5d54ee8db9e36be5f7d784cbadd2f1c26b3557936f85ef1d48d6e78c51
 AUX openjdk-bin-8.env.sh 712 BLAKE2B 0b59c28312a5c90e88445c300ae066cc4ed82035837cf47960f481e412848db6e109c87c5e7bd5282a945542f68fbfbe1135730f402768691bded10382acf55a SHA512 831c8993298141679e1aee567e40bebdde65c488279dc8f36565a108c8536a4817420a9721868fb610710dfb58a10b811d7e094ee07e88cfa033d9a347f99367
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.13_8.tar.gz 189667474 BLAKE2B e79c362e30a21871ed56b95a51d17bbcae4d16ccb9f1747c00615537aedaf6b43a675d2fe66638f95d06a7a6bec3c296c5c198ac4595707f434e228e899aec70 SHA512 317cce81d129f823a63d4f1a234826d28bb8e9799b5dcc9c0d6b84fc44d2bab9713875f08416c1db6ca5d8c23bdb63e7837fc640b5931940be365ea059e165d9
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.14_9.tar.gz 189849188 BLAKE2B e4d5d5d20b54642cec8941bbfb2a8523ed4f12185bed235d2dded02eca4ef6628ed5b8e36f614278ecad966b2c7cb4ab3b74d696b10718f56faf83834de424db SHA512 299478112d15b335d2cc802e8bcac3a00eb55cfedacbc0c62e462277dce10bfd45de789d760650171a064a574834b2c24e31e70914d63e82362da190e417105d
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.13_8.tar.gz 180757722 BLAKE2B b34bb2c2346609da20bc27db5e1dd0f7aa124ea9ac9e7501ce2a374b61596f96e950a7d69e675dad1dd16037183dbbd155089c6b10d965adff56f000ab19355b SHA512 88500ddbff3c58a69ec450428bfa1ade8e01056c926fbaf77d6908d08b24b0e0536a4d067f32cdb50fb6003cdcc2b22509c5478e080e748c001340334514c711
+DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.15_10.tar.gz 189998414 BLAKE2B 6cf30a34a8a3e040895763fbf740e370469ecb9f71ab0d10d7b3c313f922981dfdf2eddaa64badac92d45db1a9945ed1389f1794a434b366034d43af263bf57c SHA512 51a2fc7ddff7d64eadfb7e2f496c33176dbfceea2cdcd479528195ce00454d3d9bb5ad82714e59bdae8cf2cf7f75ce9f1dcb9c5d62aeffda9d1ec9ff0262e04a
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.14_9.tar.gz 180888469 BLAKE2B f5fb5a52c4f0b8c997d0a44122262e2754ab0a0adf369d095793ddf07b8189df7f9b2fa6503d5e765b7d0f792d98b88ea1ce7a23abde1c53dc42ffe90e077671 SHA512 a0e9d5aa5d1ccce23f1197e75e412c6a5369e30adcbe07e3c4c4f5b8448d88e0ea68455b42ac766ec825e0076a6d55d82ac745e0081c7ce4a79304f3d623940a
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.13_8.tar.gz 174991442 BLAKE2B 376fe73257f8518599be31262d83d1a01381cd9891fb45c18460bdf33c3569b3032206363593db5b7e3006b895ab855407a1938cbabed0fc58f3bcc86c650cb4 SHA512 d3ef319edc1f29b12e681c09e639cf296ff4e4890c81ecb2c8bb38ea2936f5425ae892420a53db5a0796b192f55a9a8c97b850d8bd400d6d7a8b3c4effc90f34
+DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.15_10.tar.gz 181012868 BLAKE2B b52d2330291ae8f8d74ba98b4679414e86c9018ad364bb27f09b5f192369c0b934654e5b4d8a07027e001da96fb89bd62a18ab5c1acea3c2cea2cc31e20a1481 SHA512 abe8469f5fa4f46f71e35785c6972b2901f003e311086352df6eff6911393c31c01ff965c74772656e2255e0bbb15eee6b761db472c886b60a8cda046fb46764
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.14_9.tar.gz 175127578 BLAKE2B ed7f55434b0273765c78c3efd8a5ae622e2fa7557334af74784f0e99936d489c3d191197fec251a4d8532c66727bdd9188344d3591cce623aa2553e79ee5da67 SHA512 bf4b3f18499420a44ed40fb2d751f294b5354d5b1d278725de97de9be7d2f37fbe5c281c50e33aceebd880d59d35de799454ca0a7bd382b5b3d8729286986d5b
+DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz 175250283 BLAKE2B 4b4fe6a5018cfa40ac71cfcf41c261887890e339d9e5f57aac55f494abb7a4e99263db151d85698690513caf670acfef29a83616e49d6f845e02cef024624fd6 SHA512 98adf9689782aa78d61f485e671c434cfdfae7ba92a7ce0c2401164250b7def2f881e201835e1ca2ab56a3ae4967c0923f4856171c2a4918f7190adf4b5e0bca
 DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.14_9.tar.gz 192425435 BLAKE2B 3e98f8819bf36aaee0ae009e97c7efa9a26dfc55b856e3d2d098d266621c97b5a8448331888e18eb5a8ea164875020db59cb9be61f3756fa87f9376c2b6e5f6b SHA512 667bc8e6d745c693e5e60e332f491fd485e3f4d99e1543d6e72f1b64956e56b4e6892f3a47e642809378f0a8a8dfaaa034ac96a0aa70b0b7fec51ec53bafbaa7
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8.tar.gz 192958006 BLAKE2B 441d396e0c43c78bb3802800f58779999dfa2275c4e0e0a048e28e3b99a41044b9c66904f1eba435cc22ab1bcf6d6d98723b8b090eefdece4d712279f36a74fa SHA512 abcbc5b781749e3c8fbcfb999e724d4862c03d60c78962d75d31b7cbc71124b04488872bc70f6a6642ec59b6d2289c391b564fc5fd7f465863f96dd4d2b5207d
+DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.15_10.tar.gz 193336087 BLAKE2B 0f61aba6b76b019ef7271dd92cd4b6db432318d629b5485e2f85a9ca586f1ce6b6d3e2c48486a4f3d90f8730e3fc7dd4f0975849f7c0f820812625556331db87 SHA512 360a349b34f2194498d0800145b54e5532b8a2137d7526a692a855a036d1cb6ef185bdeffaff63bb8cce71c7a0b10fee6acfb1024db8d2ec0cd485baa0683304
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.14_9.tar.gz 193109331 BLAKE2B d1f3031c479bc32e3d4d56fb914c33c9e19444ef3b4fd836c52623619872d11cea843904d1425cdbfde2181f41bc63d97c14a479a134ae7280b4b5e49f7789ff SHA512 27d1a8627e6e97d4830f2b8839a7f8455d1e0680853049eb1417f78c5b8e05dc2e8f48520770b422797021a169c80ddbb0c907a5e40e02a4d951a429c5a2c86f
-DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.13_8.tar.gz 190666788 BLAKE2B 9248072292727e6ac6d3f1783996c13ad7c78418da444d96e8df3c11ac1f2a7c047dcc16951dbabcfa0e46d7121c91e916940ef0749e982f20b6fc36be516d64 SHA512 603ddb6f01a556040e56a8f1d0769636295e2c1579f07d1f58828ab1db9634cc07cada66496a6144cc6de29469eedd02e6fa788961a9e4e6b5c7c6a5fd94839e
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz 193245074 BLAKE2B 0a559bd0513984c2bc93e31ab7afcb8f5fc152c9984d957359bf1901e46b25b25ddee81c4c8fc0f560e65b343f74e39c55a1af61526fceec0eb530309eb65383 SHA512 85b21da3ff777b6239df5534ee3539b256a1de5d02abf4f537bca38d2cbf8006b4130d8bde2e24835a8da7a651fc8852df2c5060d26b9d594927f4d609912554
 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.14_9.tar.gz 191414234 BLAKE2B abc031558434dc4f800ab2f3251f66cddd49f2296933ae34c58406a1780982693106fe6f37747e48365bd4b6c9f9dd20e0492ddcca62d7e2555df776297d6f96 SHA512 a306fbd6775f4186483e0403f593f599af95e295acc46cba44dd0758dfae8b6a7b1b6ef4581c2ecac1f18b5e98a84e3e3900fae6ca948b74aba2c62a63c00dee
-DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.1_12.tar.gz 188878354 BLAKE2B 4e2b4272ae91f12b8a4c7a3c1cf2eab250102ff1590c84f2f3612bc206337477284d63914dddcecd8dc259da1ddd08a1fc6e3c52a37b0cbb5ed0187456c2b24e SHA512 8289fb50b06f08c6288bcbab9e609a24744f123568a901b5ea4f2c1928bfdc236a9a9cfa572708c56f1f7f844b17562f9ddcb502b15df8ac8bc7d1ef758a741b
+DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.15_10.tar.gz 186328533 BLAKE2B 72f662e4aed529de853e47b848b46c15fade1a8c120f83b3409492801084114724f1d3875fedf1607133192ef5a612dbab828e578bff98adf1605fd990a24b21 SHA512 af69ea99e3d3b7ae84405190a12f788348162fd235aa5df8ce7ea3127d961e015b51cf70277aefa0e29a434ba10876812e997a063c5aaedafa460fc5451783c7
 DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz 188965124 BLAKE2B 659bf8518b3104e1fedd116cb9af8b0455d323ce883485f5e42cc9d1fb4d9bae5556757b309a7473559bd67c17a9aa0e0c51934e549141b25dcaeb9032a55b80 SHA512 5eadc730b39f6300be7b64a0a4e9d87873cdfa7b0a031923ddfab473affd5b22788a33e2f01412c99c2e42ffb2774cc655c732e7721a6fc02c2b34a42dc9088d
+DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.3_7.tar.gz 190142132 BLAKE2B e6b0fb199ba788a31b6238d3bc458216baf37f1517a449be63668c412dfe7662d644ffdb312194533d4af089ac2753c164059978d65eddd951bb98bfc108da87 SHA512 f406ae289659e902dd3314d40485c1f3b04915451794c2bebfb1eeda7c83dbf051c26461aec7fe07c1a43f5319f80044aefc99c9177e2a9ca0a31a9c9f06c157
 DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.2_8.tar.gz 182550014 BLAKE2B 24a7aae5c6d282a416c996f6b35ff5c92522ac7853d4cc3248a34f642029fb95b798de3159dcd7ee60a9952dd5ef2926a97c82df0708655044fb4faa6d82019f SHA512 50e27087804582a1b124a17762cf24272cbd24ae1d1bc443950bd91c88da220415ca429894bd1d1172cb39fdbff262470276a3b3e9043b5eabf550c05ee2438b
-DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.1_12.tar.gz 188832535 BLAKE2B 4ea2e209f7bebde4cfae439773b42cb9d4143eb5b61a5e69fba181946cd3a3dc977966ed14e24ce6b23066450e64bbf204b72b04562f7af381c765bb4ea31d53 SHA512 615806f02c108c08be70d975f3dc402fc2e30f9a961630fe6528eedb7a5ee76ac07851ada5264fe263453eaefc40aa1ded1cefa37d3455af78b04fdf9caf9a93
+DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.3_7.tar.gz 177467402 BLAKE2B 38b8508e81bcbaf90a1db9bfe3f804da9838cc43b6043c328d19523c83dc5d953465a1018a9054979163140a28f5e213815634005cf096f6932407e8f7ccf9a6 SHA512 0433dc839a98b810cad9fe0d98c46cabccec5ceb44fd5bc67fff0c27962f183a3814b9aab521768b578d8f11bda97934629bf9fce5c010cdc93c685b842566e7
 DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.2_8.tar.gz 188894874 BLAKE2B 9881d30cc0b4edc1c3a2d5978b08e820833e82c202f39ddf20600e56c596dc5b53d667eafdeb3048ed59a1d4e13f2ecfa136e123d8ae3f14ce43ece6ede9ab55 SHA512 708aa4a6912970ef6ea88ac3a4fcc04d4adaafcb207837dbe6c1f1e731e87faeb985fc8338a9d59f5637778be40690189c5c936ffb819265b558fc06bee99ddb
-DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.1_12.tar.gz 187718236 BLAKE2B a55eeb2651d6fbd83b579527761e246bc3babb3858b7c14823e0d512e308a65be1e35899206c1e2458db74ee2aaf4d69578b4045a13a35a0b3d6577d4821d137 SHA512 5179991d451f8736776de933aa44fa726217282da66236f373a0e47d815d03754f28588acf0aca55258ca1085d0e06f53627092bd0cff2c2b60eb6ff9c1df248
+DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.3_7.tar.gz 188309462 BLAKE2B e47b98ebcb661631732e3238ce3cd1630a0a2103d7e32beabb49d1a0ff216c34c0c39fac11a848474a36dd2c98f6724c58900e3026d04cb7e4f7f00adbe1fe18 SHA512 9158821b22633177866ac0a5c4ffd774d2d750adea2de2adce661060ab7d28cf67fc703eb9e0e200149fa03eb040a05dc45ac944dacd140e0d0fa06515584795
 DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.2_8.tar.gz 189073596 BLAKE2B 1303795dd08dedee8ea4723adaeaae4ab7ef28b81da0f5fd8b19ac5f027ec8f7edb67efe37ca47381a44b4a94223a36d37652a290c2f2cf9702520e01b700786 SHA512 beab26ef69c0ed07a14976c01dad4b2a4d708d04b22c86dabff7b87eaefd8e03f627c5c3388a0dbc55b10edaa14004bc0c44ea1fe3edb18e68cb23105d2ca44d
-DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.1_12.tar.gz 191355612 BLAKE2B 21c1459c58a10ed6a87a422e70fc4fa27a37a1ea4cbd121e237d82f9ec0991e7245193c5a44cd2826d502301166a48e2d3e7ac0015dcb9a1c3732f03210ff366 SHA512 30ce2ff05d46ea125fc17256420c8bf9dcc3afe802338cd62d0961e6588cf54663aee07c6d4d21fd0f363b58628ee34cf4f9cf622b6da970924aa94d47e6406a
+DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.3_7.tar.gz 190898839 BLAKE2B b5188190ab30393ff789724ca99ce89232d8a4d81c22205111da4cc60cc258fe5bee47a5550cf032937542d7fb677af0de9aebbe39fe20b4af223a6d7d3211e5 SHA512 e1f1ade72f12c21eef9d34d05e2a4a8228320138d0c626c4eb31431ac9d5e5123ec8ef24c168005e3bb3508537c826399122461a0ce8de1310ccab40d8d21145
 DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.2_8.tar.gz 191420670 BLAKE2B 901cd6f9e816e1eaa949c97a86d9cfa6d3265b33da483ac5a4ba87621b5a196c7c51305be19745f8aa504ee4471a583180bc36de5a6013ca59e4f0890ea8fa34 SHA512 e80c8f02a35587c9305a92ed20926e79b0bab6b2d0fa3fd62ef7825383f68567c38cb52d2cc82b5def219df1fe2dbb531d0973b3713d1ec18c06c6967a228f73
-DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz 191978211 BLAKE2B f0428e67c6f75bc204c8e7c74b25c73a270cff1889c0e3fdcc830f868bcddb58e6c9a480ba0313638a7edf56dd2e61e52b7c4f1dd9ad3643f3e70c9770141c93 SHA512 057fc5c4869bc9113c1a299b125c8bed47e4a841238b42fbd4b39adfd7bbbca0fa9efed7315a98303ff8f4000afd02baaa5b3169be6287d06edbfbbb44728538
+DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.3_7.tar.gz 191298712 BLAKE2B abcb97374d38cb7457139865617d7570627d390c0db47ed572048dbb9f35b7cf6cf1a7d973684607ce3f7477f9b03b85ba43b8b4447b04f9fe1bfe419a18d190 SHA512 4e69597c134f37db83b44fd86e13c25ded20d8a1b2d8e959b6ddee29e5cc8c2a7bfd449636399f2d7bf030d93b2a29236e614a1578f9bbd37ca7e12249dc80bc
 DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz 192041953 BLAKE2B 76b66b6571d50fd00c80bfdfd63023d070b7fb0f4ecacce86fcc10b651fa193a88ac8357e097d83ee4cfb982cd34b15cf4a9b59441066677d19a29073bee3666 SHA512 25ffa17e6d7c402e976823ac90d6fd6c4f07093c3766c6d48a7d1ecfe5908d6d73efe6f732af8fcb3f4f91b6daa0dd8f4a141ce7aae5fc12f0ed23a1c1e2ebb5
-DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.1_12.tar.gz 192449459 BLAKE2B 506d31e97c7be57a870e80e1beb0bfa72528cb0e5d006b0dc76667f6ef29624165375a91127e3cc934f3135298d748c43a5adcecb9a07c5d758998bbf6551837 SHA512 8d7afed31b37759ba426d412f70c36e380f0f472d850c9ba9e895e0ebd4a2cf9a7f6118526f0a30f6a1d9d880affca4e1ed9848125509ae97e32f506ad78f541
+DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.3_7.tar.gz 191514138 BLAKE2B 3e2d64cdf15c63f2f50148576bc8ed085ec808a28a07113910f7b04c5729a1a56840751da627d8012751a7b533f6730c3a9bb99914382caf82f63e5a65dad40a SHA512 144f1e1c0f9558bd0be0536b48b89081579d1232d75c00fcfb7be2460475a4eaf3a6ae89007e683fd6148b4ebf33c2d9492419db96090e07f4ae52afc71df861
 DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.2_8.tar.gz 192611208 BLAKE2B ef5e801d3d8b5ace125d62a96ec2b76faf5acf12acd94d3cf6c3f80c84abe9ae91b9e53a85d5f57ff69bd2596cfb5715808d73070c971a5ed8dddec2694a9d64 SHA512 c43075b14450de6763a66c0f73d7836ec880045cc84c1b8f1e72f9e3f1e3ba6057afff27cb3bdcadd89a52c75671ed7cf844299943ba8d3bf86e6c45386fa039
-DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u312b07.tar.gz 102144826 BLAKE2B b351fe3a82d8ef1e77314890a00c2920dbe5621bb524c4d4ed80b2f3a3b10853f91b0488ab42a5b1691ba66aa9de8eb0630b9325c3dc7fe6b071e2a95dad6bed SHA512 1b58c5453c473d798e5c4871212c484518b44038f81b32623668174fc47c4118120f770ebe3a21534b7f9e01c383a75cb558538e1e635f7c290686825b4ea78a
+DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.3_7.tar.gz 187277835 BLAKE2B 2a6766ae47281222a570485bbb67b10b78b2d17399a2fd76e254be3d30808a09002fe6fcf5814be044c4a95c3f791af4b45df9320cea5ec212f9db38329b1630 SHA512 00cb5c5628ef2fcbc44ffcb2f81b8cae8c57107df8c456b4f3bf6897269daebdbd9ce0fe78af686cebedbd2426fa85095b198d47578828404a1b046eb0cbca60
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u322b06.tar.gz 102170434 BLAKE2B 84755d791d6aea0b58de68f7ced3e023d7d5f705c99ece9cb91f77663643681ea22672bb1dae143475959374193b1bea1068c0a0f73df4e748430495993d1c5c SHA512 cda25392c8d51b720fac9022de0d7cfc1f496b9e5295b90ee6082e6787d483eaf32198092072b6fe9cadfec157a93f66290691b3d1476572ba2097ab5e70b33c
-DIST OpenJDK8U-jdk_arm_linux_hotspot_8u312b07.tar.gz 98364180 BLAKE2B 2b7cfffa33e9486637f9274f5a3138d6c1a53afa63d24ecb82aff4c0baa8b765003642c582c0191d0d229754dd9de64ab7cda4d81e9168df3d960baa44a5de9a SHA512 8b7273688a1ee28d0a2f918f2fe02586b8ff9e7962bbf8cd2973001594e627b1eef7a9f1893bf3bd3789fabe0058a916ac2d4d53c72cbd8d586e4e7c3217438e
+DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u332b09.tar.gz 102003248 BLAKE2B 75eb1dc4e09f868ca1a5f0ccc275e36992414e250c2815ab2a6e879942dfdd57a069d6d2cc79aee967c8d2077cecef6d65285cf870e70d22aebef607e906dbec SHA512 cf716f9a614932ccffeb8a7a2ee3a2f10543b31b8f6953933ba4785f386873fe00fee69061c70c26b55a6db13f26ba529f9953d7f3fce9b42172fe3b4e0eee52
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u322b06.tar.gz 98420081 BLAKE2B 77d735d6f07320d226cf575c84f3879d7dafb4fa4ce06c737e7bdaf4f731af323c3ed0bdbd66067200ef350c7b5202c75bdf7cdc2a538c54ef1058be54a9d57f SHA512 b355c813b2b382bb37c2ca34c01a631b6651e0559a864286c04518332c513d1f833f8441bed52ecc1e24074951a2e5149ce60c88fa2490165d43d0058efe073c
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u312b07.tar.gz 100571080 BLAKE2B 3a1c5c7488de740210758a34dcc34517c8d5310a9d17c1d251d0ad6d5e7a619595304479b88c807b5d0cd839f85f9b7c819d0dcc297a738052b337b3e962b457 SHA512 0b530ffd0c41fa71962072c70c0712b71573b9d1b66e9b23f6122b770bfa7cc42d8ca0c87a721bb8481104edd062b79ebc09a728f1977699b242b62cd546146b
+DIST OpenJDK8U-jdk_arm_linux_hotspot_8u332b09.tar.gz 98261468 BLAKE2B 7fe2b5c6178af88ebf390352f67acca7216af23d6015beb8e94215d1af82b41c2b8e8790c00b5fbf363837a98ddb051a6ebede5fe78f471f09331c1014bd85ec SHA512 17c9bdc892dc479bd7c5bef2ab3a6637cc499e1c257d6ddd541e7f372d6737d644920538e0c39e8aa7c905f0f1172429cc171d608bd337e872be7b399733b25e
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u322b06.tar.gz 100615206 BLAKE2B 8956f1ed38732aa8e9880396dce7c477370d128c1a957ba6d135676140f3e8bf233c6563dbcd2f63c2136454a398c49455a96f77224691ded7843f6cac027d1f SHA512 11975e73e6615bcb686703241b0f1589699edfc76a4de97e7066d4d93826dfb8c07a54b6ea3f8a70d231f98d4033c2fbb7741fbf0df374aa810f6cff8b5cda33
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u312b07.tar.gz 103016010 BLAKE2B 9e7b10497bb46a176016f4df6bfa5fa90905bffaaf9668ca39f30a01cccf78c04d1391aed304493159d5b520879762b7e284befdc11c5444b0edff6b363d9c3c SHA512 20ba919c6b4b2f1253b7a9119193f2ee6c16498ed15296ed5d4588284e635fbc53fa368180c1362cb5c3cc2f2446e96d5a752a96d64382ddf73b062319b1ef47
+DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u332b09.tar.gz 100484069 BLAKE2B 7e3b0186947f19094d88140304e756b7b2728560299f330c84ed8f9ac77c40fb046c2731d22c5d30e5d2837b878caccb19e8f1174f272c2fb29905db15500640 SHA512 adcfa446254c7de8b80f040e7f9960625c0314dabc8b457dee9d95216050f9aedc0c59528c29f7f1bc950c3ed0b713f3234dd9f9fb2a5bab7e706dbdb2eef42d
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz 103063877 BLAKE2B 9ca165707b4f02eeb5156a5379d246942eb06ffe4338490600e7a834c49c1199d46cd098bbcd8041e7c58107ccb657818e6ea37cdd39018a17a87e370c32665b SHA512 6ec164df1f95d2c8921b5d90c2dbd208107fa20e66d97e2920dbefd2b616214609392e36b885700bba14571d10848f412194db2f18206c1a21d16e6df7e29e53
-DIST OpenJDK8U-jdk_x64_mac_hotspot_8u312b07.tar.gz 107991615 BLAKE2B fb068abc6788c00d8ed51b0beb3a08c6dee80e3fe40bdd5ca79bbaf59159869a9b3234f1ac53321e988152293c938a13202fcd9e57ec133bbd2cde3f849a0fa6 SHA512 fc75b7fe2489ac6fcf7180407db3fa839ef1a0b5de2aedf4c9db902eeb3618e2e1d1436970fc7a002b111c6f6be6250e0e1e62dba28aba21b4c88fa8f765a92e
+DIST OpenJDK8U-jdk_x64_linux_hotspot_8u332b09.tar.gz 102918585 BLAKE2B 55d7ef116ee28f37ab1a96cb8ffe021d1784b208ad248e78d6f0a7f22429364364e00ef17fe6159fac2fde6a0765a20125db6ce17694992dbc9e3b3e054adddf SHA512 9f387fb8b872b65fc6a545151c185b9ad1aaac7ad7cffac4d2b936dedbca116a7d74e56754353ffa4caed394497ca659852f0e5e3803ead10f8fa95d562e28a8
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u322b06.tar.gz 108075347 BLAKE2B 89c81377516b737e1ce096b66c8460c86f77229c8a7021471e6c67ae738c99183dbe4e5d868de0de5251cca9eb5bcf888f88526a8390a56eb33bb6270038ebfb SHA512 5f9e6036ca72b015609c503b8446b79013dd4aac09349e3c65c9df0e91e2541f3672d867006cd1f236cdd8a60e16671c6e4423d5d6e85a5a31f6f97f1d168434
-EBUILD openjdk-bin-11.0.13_p8-r1.ebuild 3004 BLAKE2B e8c59082463b4418045bbe589bb7567f38e68d8a2e06efe6d65ab777e0260effa8c277a866d0c647e39ec018d9f9ac3b8e20f29d6af323e512e879d042c9c9bb SHA512 96c21cc30feb9fbebe6fb63846c50bc9a31e7382a90b32537935aa18ecc7a71e629339bcf99afa3e2974afed74d345da01a1a378eee8818ac23ea15421b24642
-EBUILD openjdk-bin-11.0.13_p8.ebuild 3003 BLAKE2B b5bf1a9ec3297e3d417c19f6c9a3cf9d7155694462e6b3f9378bc0af992232e9f8a79677675ea78257215a4a8833620f2053d2da0f969201f1a4898a5eff3f06 SHA512 7f9e47fdafb8d8a7ab5602cda247c6847d7b9b008561ae6590d9b074c31ead43d6ae604aaf827a5af65243ab317f6d4eef96afd5b9d6561386a162ee958e8f47
+DIST OpenJDK8U-jdk_x64_mac_hotspot_8u332b09.tar.gz 107924497 BLAKE2B f1f283b33f2e81a15f6ba01b7c2c63093b8a12dd0c9853ff9a2cea8d5352b6994266e8653135574f59a24da7294e602c5dd2fb3524065aa53e21b8313d3b0d33 SHA512 c7474e6a81d9e44e7c48388917de87733bfcb13c99a6d253ba180ac8b826ec79f1871d57dcc3e2edb4929f2687541156770c7568162a95389cdf1606d8e65397
 EBUILD openjdk-bin-11.0.14_p9-r1.ebuild 3185 BLAKE2B 40efb7b12aaea7fc35274e9fae8ad8130f6951a749e3dcccef5f824f9fe9d27c3af39db5990c66284b3ce77bc4d198036a306f0e382c393c4085a6a89cc50b93 SHA512 b1d2d56d7c202a3d1aa0e7f363f17e52abb8b3f8fadca6998b9257ca8507142fcdc8816ed0a096bd0acc1fa120925982c38153800806425965a43eac31f3c6ff
-EBUILD openjdk-bin-17.0.1_p12-r1.ebuild 3817 BLAKE2B 730195b2a13f8cf6fb77acc0620ee6a1bf0dec819c4a212483668a8db925d21589367c2e004929b00ee4c9409e5f56ab8b29735ddfb38da215acf76b71d22e3e SHA512 5d690859f283ffe6e15d10faa647b8e28cddd9feea9c6ffc062c9a3f23c9bb6185f13bd8f03fba2f5117fa19db76d1260460970f42ad1912e9c1c3ed2ef71957
+EBUILD openjdk-bin-11.0.15_p10.ebuild 3188 BLAKE2B 9fd7ce4ceb0821acf0a11acbd997578074f264786e6db048b89c8bf3d6af33825b981228a25991f5808d8e690e3d1d1dfeaf905fda5757d253e8a586388285fa SHA512 c40239ee1272f03edce613b7d9809a04defa23061fe68ab6badef1fc3da529236badd2f262e2b872c5c734fabaa24477d61804229472b4eec5af909f7647fbe6
 EBUILD openjdk-bin-17.0.2_p8.ebuild 3869 BLAKE2B ee11a32fa646f841c274a0bf872574dcfb4684da937c3423446cd44aaaef1230a8d979b62097b1718dc897bd6ae63aac82bcec7fe18c1d28cc4064222d5b0ff4 SHA512 4811b678d0884a2b6afdfb1d3daaced3b6c0db1c2b0686d4b4eaa7406b0daac6e5173ff52b982cf3f64e323757ba087109167de74ef5ffd69b7d6944b89083e9
-EBUILD openjdk-bin-8.312_p07-r1.ebuild 3038 BLAKE2B 1fc8d0830bd700d7866f54994c40665de60be274d0e5fa373e2dbbe417a84597435e1d6fea3fee269338036b5f047ba9916b025d883b23cb4b70408e4ef0401a SHA512 2717e11822ef00514783a0dc932a7c7212d70076385337f9c7b8bd4f00791dc1ce3d4168e0e662f9504fe276233eb3398461f1ae2a263f5c1720f568065aa9e8
-EBUILD openjdk-bin-8.312_p07.ebuild 3047 BLAKE2B e636d705075e18d16bdb5fab3c018db59af78afb52c189c21400990c11929bec7edba0592fc14e5b800bc0e898cbe13f352e3572426e7320b5d524e6c2cf4152 SHA512 406fc714f07b1e743fd3f5b0570c2a0f9805bacecbe2c97fdae8c8551dd51ad789dfa1ec51b23321801dbe1a0f44575af58485f2d6dc3662e7432b29d95ebd1d
+EBUILD openjdk-bin-17.0.3_p7.ebuild 3872 BLAKE2B b9d5dbf7d6a089352848e391db1edca76b9b4b715b569f24ba8bd088195444b3510d96c7ee7d05fab6a4bdce7d07a71c9bff8b8504ae120b44adb09ad84e5a72 SHA512 a256f3d72280d24013cdf4dee55edfd49cb7585609e2f15f1176883cec4e57a1b68ed648b7fa02d2ab17eca8c7f31ad486fbb07a67c3033ff218bc405e10a634
 EBUILD openjdk-bin-8.322_p06.ebuild 3035 BLAKE2B 96b42ec8bf943f975cd1767a666373e09592b0d3886e10cc546106aa941c0cc14ae1c1e86c8372e7bb134aab52b7bbb15fddc35678ff025e85f42c6c22feb7d7 SHA512 8d479ff64e2511d7bf0122e4a7b25fd429f523ce4153f02f057d8b05aa9d26626c9d80f67a8b9172834b8422901f8e8f68921bb3806b27064866c6b3768b3b57
+EBUILD openjdk-bin-8.332_p09.ebuild 3038 BLAKE2B b9fb841aa67a876f1d7e64cdffbeca2f6039ea3adf1ee98ccbf97675bc9fe798bbcf5670ec62959829894db484a9a7c1e6b634b0e43fb20c3429e03fe3a69818 SHA512 0afe526cf8b0f040e336ecdff4d30f951ecddd7f8c14b08b794c37e02bc0ca75ac96e7808e8098c44e9685b8a162f699f5082fe44ce1f0833d77cbfe99fb5984
 MISC metadata.xml 941 BLAKE2B 16002011c075cd453721b20649521e7370b0835939bf228e3a66cb6994b98d11ee2b0074bd9ead474c8787301d2be44a2c05d2d49c09b3f2767995153c37a69a SHA512 37681cf8ecc00361d9bc3ab5b26defae227a1d95aec0a5f51b39d412e1d4f62bc3c9db0c1296b394c02f81f0b8eb052ea85212eed0319991f372525c0bf26b09
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild
deleted file mode 100644
index 12b3337375bf..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2 toolchain-funcs
-
-abi_uri() {
-	local os=linux
-	case ${2} in
-		*-macos)    os=mac      ;;
-		*-solaris)  os=solaris  ;;
-	esac
-	echo "${2-$1}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri arm)
-	$(abi_uri aarch64 arm64)
-	$(abi_uri ppc64le ppc64)
-	$(abi_uri x64 amd64)
-	$(abi_uri x64 x64-macos)
-"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
-IUSE="alsa cups +gentoo-vm headless-awt selinux source"
-
-RDEPEND="
-	>=sys-apps/baselayout-java-0.1.0-r1
-	kernel_linux? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-		media-libs/harfbuzz
-		>=sys-libs/glibc-2.2.5:*
-		sys-libs/zlib
-		alsa? ( media-libs/alsa-lib )
-		cups? ( net-print/cups )
-		selinux? ( sec-policy/selinux-java )
-		!headless-awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			x11-libs/libXtst
-		)
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_unpack() {
-	default
-	if [[ ${A} == *_mac_* ]] ; then
-		mv -v "${S}/Contents/Home/"* "${S}" || die
-		rm -Rf "${S}/Contents"  # drop macOS executable
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED%/}/${dest#/}"
-
-	# on macOS if they would exist they would be called .dylib, but most
-	# importantly, there are no different providers, so everything
-	# that's shipped works.
-	if [[ ${A} != *_mac_* ]] ; then
-		# Not sure why they bundle this as it's commonly available and they
-		# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-		# also has an explicit dependency while Oracle seemingly dlopens it.
-		rm -vf lib/libfreetype.so || die
-
-		# prefer system copy # https://bugs.gentoo.org/776676
-		rm -vf lib/libharfbuzz.so || die
-
-		# Oracle and IcedTea have libjsoundalsa.so depending on
-		# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-		if ! use alsa ; then
-			rm -v lib/libjsound.* || die
-		fi
-
-		if use headless-awt ; then
-			rm -v lib/lib*{[jx]awt,splashscreen}* || die
-		fi
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym ../../../../etc/ssl/certs/java/cacerts \
-		"${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	# provide stable symlink
-	dosym "${P}" "/opt/${PN}-${SLOT}"
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild
index bc75e084b8ea..81cd7dd0c1fe 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild
@@ -6,14 +6,24 @@ EAPI=8
 inherit java-vm-2 toolchain-funcs
 
 abi_uri() {
+	local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/"
+	local musl=
 	local os=linux
+
 	case ${2} in
 		*-macos)    os=mac      ;;
 		*-solaris)  os=solaris  ;;
 	esac
+
+	if [[ ${3} == musl ]]; then
+		os=alpine-linux
+		musl=true
+	fi
+
 	echo "${2-$1}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
-		)"
+		${musl:+ elibc_musl? ( }
+			${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+		${musl:+ ) } )"
 }
 
 MY_PV=${PV/_p/+}
@@ -22,8 +32,9 @@ SLOT=${MY_PV%%[.+]*}
 SRC_URI="
 	$(abi_uri arm)
 	$(abi_uri aarch64 arm64)
-	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 amd64)
+	$(abi_uri x64 amd64 musl)
+	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 x64-macos)
 "
 
@@ -31,7 +42,7 @@ DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
-IUSE="alsa cups +gentoo-vm headless-awt selinux source"
+IUSE="alsa cups headless-awt selinux source"
 
 RDEPEND="
 	>=sys-apps/baselayout-java-0.1.0-r1
@@ -39,7 +50,8 @@ RDEPEND="
 		media-libs/fontconfig:1.0
 		media-libs/freetype:2
 		media-libs/harfbuzz
-		>=sys-libs/glibc-2.2.5:*
+		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
+		elibc_musl? ( sys-libs/musl )
 		sys-libs/zlib
 		alsa? ( media-libs/alsa-lib )
 		cups? ( net-print/cups )
@@ -104,8 +116,7 @@ src_install() {
 	fi
 
 	rm -v lib/security/cacerts || die
-	dosym ../../../../etc/ssl/certs/java/cacerts \
-		"${dest}"/lib/security/cacerts
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
 
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
@@ -113,7 +124,7 @@ src_install() {
 	# provide stable symlink
 	dosym "${P}" "/opt/${PN}-${SLOT}"
 
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
index bcac729452c5..ebe4afd00a4e 100644
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
@@ -30,18 +30,19 @@ MY_PV=${PV/_p/+}
 SLOT=${MY_PV%%[.+]*}
 
 SRC_URI="
-	$(abi_uri arm)
 	$(abi_uri aarch64 arm64)
-	$(abi_uri ppc64le ppc64)
+	$(abi_uri arm)
 	$(abi_uri x64 amd64)
 	$(abi_uri x64 amd64 musl)
+	$(abi_uri aarch64 arm64-macos)
+	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 x64-macos)
 "
 
 DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
 IUSE="alsa cups +gentoo-vm headless-awt selinux source"
 
 RDEPEND="
@@ -51,6 +52,7 @@ RDEPEND="
 		media-libs/freetype:2
 		media-libs/harfbuzz
 		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
+		elibc_musl? ( sys-libs/musl )
 		sys-libs/zlib
 		alsa? ( media-libs/alsa-lib )
 		cups? ( net-print/cups )
@@ -115,8 +117,7 @@ src_install() {
 	fi
 
 	rm -v lib/security/cacerts || die
-	dosym ../../../../etc/ssl/certs/java/cacerts \
-		"${dest}"/lib/security/cacerts
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
 
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.312_p07.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.312_p07.ebuild
deleted file mode 100644
index 6abd1ee29121..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-8.312_p07.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
-	local os=linux
-	case ${2} in
-		*-macos)    os=mac      ;;
-		*-solaris)  os=solaris  ;;
-	esac
-	echo "${2-$1}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_${os}_hotspot_${3-${MY_PV/-/}}.tar.gz
-		)"
-}
-
-# they have different tarball names for different arches...
-# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz
-# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
-SRC_URI="
-	$(abi_uri aarch64 arm64)
-	$(abi_uri arm)
-	$(abi_uri ppc64le ppc64)
-	$(abi_uri x64 amd64)
-	$(abi_uri x64 x64-macos)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
-
-IUSE="alsa cups examples headless-awt selinux source"
-
-RDEPEND="
-	>=sys-apps/baselayout-java-0.1.0-r1
-	kernel_linux? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-		>=sys-libs/glibc-2.2.5:*
-		sys-libs/zlib
-		alsa? ( media-libs/alsa-lib )
-		arm? ( dev-libs/libffi-compat:6 )
-		cups? ( net-print/cups )
-		selinux? ( sec-policy/selinux-java )
-		!headless-awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			x11-libs/libXtst
-		)
-	)
-"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}"
-
-src_unpack() {
-	default
-	# 753575
-	if use arm; then
-		mv -v "${S}"* "${S}" || die
-	elif [[ ${A} == *_mac_* ]] ; then
-		mv -v "${S}/Contents/Home/"* "${S}" || die
-		rm -Rf "${S}/Contents"  # drop macOS executable
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED%/}/${dest#/}"
-
-	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
-	# on macOS if they would exist they would be called .dylib, but most
-	# importantly, there are no different providers, so everything
-	# that's shipped works.
-	if [[ ${A} != *_mac_* ]] ; then
-		# this does not exist on arm64 hence -f
-		rm -fv jre/lib/*/libfreetype.so* || die
-
-		if ! use alsa ; then
-			rm -v jre/lib/*/libjsoundalsa.so* || die
-		fi
-
-		if ! use examples ; then
-			rm -vr sample || die
-		fi
-
-		if use headless-awt ; then
-			rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
-				{,jre/}bin/policytool bin/appletviewer || die
-		fi
-	fi
-
-	if ! use source ; then
-		rm -v src.zip || die
-	fi
-
-	rm -v jre/lib/security/cacerts || die
-	dosym ../../../../../etc/ssl/certs/java/cacerts \
-		"${dest}"/jre/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	# provide stable symlink
-	dosym "${P}" "/opt/${PN}-${SLOT}"
-
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.312_p07-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild
index 3144abff510b..03a1e6a2e354 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.312_p07-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild
@@ -26,8 +26,8 @@ SLOT="$(ver_cut 1)"
 DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 SRC_URI="
-	$(abi_uri aarch64 arm64)
 	$(abi_uri arm)
+	$(abi_uri aarch64 arm64)
 	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 amd64)
 	$(abi_uri x64 x64-macos)
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index c4eff1306287..b85f1bf54c06 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,9 +1,14 @@
-AUX openjdk-jre-bin-11.env.sh 516 BLAKE2B f54577d8964ef3f380f622352880e6b030a3063cf51d24c7d4ff3dabb05784b44c121fbbcc72b0c10493684c9a1784a436ce7b23fca9d15c292dda51961b1940 SHA512 4821ebb21a15517da3c7e6f5f61622fc67f26854bc412bb4081b53d829f00f37f37966ea69824fd33fded6f5b1149cab829651efcc578287251931cb27d2580c
+AUX openjdk-jre-bin-11.env.sh 447 BLAKE2B 3c0852310ee1b68533fb93eb72428f43a03732b54add6ca03dda9517e26b596e86d66a3bc81cb81d2b2e783f5195e028a816e8102faa3ae75059395d08a3a106 SHA512 02d13fa510c8de87cc1da81ddc600f05879b2c310077be78f89346e6c8ad592c41b719699f002a8764c24d791181d3860eee9e7bc830baeeb53415f9d5ca8e06
+AUX openjdk-jre-bin-17.env.sh 447 BLAKE2B 3c0852310ee1b68533fb93eb72428f43a03732b54add6ca03dda9517e26b596e86d66a3bc81cb81d2b2e783f5195e028a816e8102faa3ae75059395d08a3a106 SHA512 02d13fa510c8de87cc1da81ddc600f05879b2c310077be78f89346e6c8ad592c41b719699f002a8764c24d791181d3860eee9e7bc830baeeb53415f9d5ca8e06
 AUX openjdk-jre-bin-8.env.sh 678 BLAKE2B 9cc23ab6e5c7d9e27861e051ea68c074c23789d51e8094eff8c30715cc6df80dd4fa04b371b67b1101afdbaf9e244056816f2998ba100567bc70254c8f3b8a79 SHA512 43e71b9d83149ea622b35a13a7e7184dde9fcafc960e00e190f3e6668856f16443b9b42c40e428be6d24b73dd969f8ce6107e53755651aa7058f56b3632b9d9b
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.14_9.tar.gz 42435138 BLAKE2B 0f972a78221b74be4b8c87845f52d331eb6caf84eef06d291d0cd25ce4357b7072f938fd0390a9c54647d4ddcfe4c0184ddf84583e017e1bf78338b7939437bc SHA512 9ee64498d83d16cefc5a155393d9477bb78338d43a3b4b1699f4358644415a6be5601f7b2a87a82f2a95cafd6485b6db7b30bd0d21096110211b942e95deed64
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u312b07.tar.gz 41286015 BLAKE2B f555fee173b8af98f64cdd08b8141c823033473d8fa0601f8e69899bc6b82234ac33a6de45f87b2cd9457e22d500da9052209c45798d47ec3c4a34496b30d154 SHA512 36d07389e63e49ee16f1329aa7e0bd5b42b397f864f10080038017920fd2b178d5cd9dfaef157080ac020721d0e6e7b26b0277ab1cde69c20500fc34bab0e915
+DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.15_10.tar.gz 42471028 BLAKE2B a88fa041ffdcedabbcdadbb1eb4a0052456666ba779eb0f82bc27ea7f2923a1b2e538d14d5f615869e456b1bce48859211134c6bd9d31c2c082068686b68fd59 SHA512 a8a8a9c9f243aaf9b051bd0c35009ec96a28dcf47b53139dd59891a5ff2ced590e56961edb093cf67b8239d92a4b407f631b389fdff986fdb746316f420abf34
+DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.3_7.tar.gz 45971131 BLAKE2B dc8a358b10b0d3a6fac60f340ee5224c348aa4b2683e5f7b3396eaca180a12212260d45b8347b472f80671ef86a91f764727897146e4d36bc08b24c7920635fa SHA512 27da884a807c980386b7295f7ea5e253c03b497eff6e21e0cb35ea050552eaf9a3f71060cbd1a2f0cd6069a55ae00b43e46edcf09ab36c142587ea2ab781ad14
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz 41317897 BLAKE2B b96b39d4b3f7fe54f9b04698d4f24879ce617e61ade298b7de1472cb85fbf7d5f297f009c0e881a17bcdaf9baaf3187acef531b0ace97a1f2ab099811995c815 SHA512 4a3acc1330056011f0097aaca77858779e2c89d214598ef66736956984204b8de804549e42c51f8392806753f3d534d34ad93ef6df9f2f45a369e04f6a0694ac
-EBUILD openjdk-jre-bin-11.0.14_p9.ebuild 2020 BLAKE2B ede152b4e3c5ec4b1c6ddbd84aa88bcce55e87bb64a57cd7a938b3f31637e243865c60f0d59dbcea7723ecafdc90f23ab1b9997d1740964ecdf807dc1a9eb68b SHA512 08dca400daa7635cd744321d683e655c6f59a6f01897fa7e46389062b72bd08ddde42f99fa4fc0c79defd9d13e2675b675907abc08ba7c6ad8c8f0cf12a2b234
-EBUILD openjdk-jre-bin-8.312_p07-r1.ebuild 1847 BLAKE2B 3c7e883db3d886c57de3aefd89af687733c43ab63b9d260102d86a5992aa7432f763aae7108e7663107e9dbeed927485e211251f7bd64ed89b16c876374057de SHA512 06086af6d8b5e8ba7e290046ebf2e94055a273a3f8557ebb0272d41471cc26d1874f87f412bd722c19b8ff2955777edce3ee4b6ce7160607f5e9b77ac6bc3d73
+DIST OpenJDK8U-jre_x64_linux_hotspot_8u332b09.tar.gz 41336220 BLAKE2B 52eb9aa2623335bca7be71d1aca6b4292a029554ef9f9e0e1209a7fa0892931c37b670f9f90586d4ff3cd35540a3a7cb230f20789481836d20f04d4cfcc56596 SHA512 c62002aa1a28547b0b0cefea3f83af2cf6507002bf296b1b83bd04406f4c362f4c74940209ebbd3803513395bec7503882aac7f8d35dcbf6a6e02e9155a53cdd
+EBUILD openjdk-jre-bin-11.0.14_p9-r1.ebuild 2020 BLAKE2B ede152b4e3c5ec4b1c6ddbd84aa88bcce55e87bb64a57cd7a938b3f31637e243865c60f0d59dbcea7723ecafdc90f23ab1b9997d1740964ecdf807dc1a9eb68b SHA512 08dca400daa7635cd744321d683e655c6f59a6f01897fa7e46389062b72bd08ddde42f99fa4fc0c79defd9d13e2675b675907abc08ba7c6ad8c8f0cf12a2b234
+EBUILD openjdk-jre-bin-11.0.15_p10.ebuild 2021 BLAKE2B 7665a35bf44a845b502d1330d36d86e7d3164fd5d3433bd5d2080b0d9999e9cbbfd72edb18dd61405fb8b61b99d14479fe806ae8878eedb72c240f7b2673ac4f SHA512 5a9fb96346d6d9fc4c2334d02f6dfc343653cb72a272abd0fa74892d618c8d36d13726925d2090c0ee786a2676323016a9d20533a5d7dad47db90bf61731669c
+EBUILD openjdk-jre-bin-17.0.3_p7.ebuild 2021 BLAKE2B 7665a35bf44a845b502d1330d36d86e7d3164fd5d3433bd5d2080b0d9999e9cbbfd72edb18dd61405fb8b61b99d14479fe806ae8878eedb72c240f7b2673ac4f SHA512 5a9fb96346d6d9fc4c2334d02f6dfc343653cb72a272abd0fa74892d618c8d36d13726925d2090c0ee786a2676323016a9d20533a5d7dad47db90bf61731669c
 EBUILD openjdk-jre-bin-8.322_p06.ebuild 1832 BLAKE2B 31dd2783dad44148857303b74c82b556d1360338b80747f36fc19052c5091ba7106837777b6bfffb088b5c31fc4072529cdea994cfc35b4f56bc032d5830a000 SHA512 df9a819e9673d952422d9dcee7d1f901cde3982dae1e64ce4ddce39b28ae7eae96d1598718c311412d9727a977ad4ed1233e43c933564ef0e9afd7fc97817d56
+EBUILD openjdk-jre-bin-8.332_p09.ebuild 1833 BLAKE2B 3a7cf0e521421f430068e35e9e5817b7f50ea8036c8b2ef5f7708096f40baeed4d6eb9df93538c8eb3d949d477c553e8ce886409ee4581513c4e935fb672d29c SHA512 06250bf0e366cece0d0782a9f66b129990699819a7e6a1bdd4b6ca7fc8e1268ed26d4015f1c925ffb899d87226f8c7ae22787e08851e00a9e3050836ec44e70c
 MISC metadata.xml 896 BLAKE2B db8489d7738bb5444ee789ae0dc516941ece1b814ce4c4d0e12284e4027315aa20b141027ca6db8aae7ab6580d881e79bcb1b4dffa8a890f75da6d7177c7c279 SHA512 8833e637b8b935247972eaf7afbf3787cc17013080d9747defad4784ea89c2b147d0f2284327e9ade30100594a0d1e638f0ecd01f0375101372028dbfd0b31a3
diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh
index fced31b2be32..5ccace8029b9 100644
--- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh
+++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh
@@ -1,10 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 VERSION="Eclipse Temurin JRE ${PV}"
-JAVA_HOME="${EPREFIX}/opt/${P}"
-JDK_HOME="${EPREFIX}/opt/${P}"
-JAVAC="\${JAVA_HOME}/bin/javac"
+JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}"
 PATH="\${JAVA_HOME}/bin"
 ROOTPATH="\${JAVA_HOME}/bin"
 LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
@@ -13,4 +11,4 @@ PROVIDES_TYPE="JRE"
 PROVIDES_VERSION="${SLOT}"
 BOOTCLASSPATH=""
 GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
+ENV_VARS="JAVA_HOME PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh
new file mode 100644
index 000000000000..5ccace8029b9
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh
@@ -0,0 +1,14 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="Eclipse Temurin JRE ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
+MANPATH="\${JAVA_HOME}/man"
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH=""
+GENERATION="2"
+ENV_VARS="JAVA_HOME PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
index d7a2d14be024..d7a2d14be024 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.15_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.15_p10.ebuild
new file mode 100644
index 000000000000..a6f7f3ee248b
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.15_p10.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+		)"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+	$(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptopenjdk.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64"
+IUSE="alsa cups +gentoo-vm headless-awt selinux"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>net-libs/libnet-1.1
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}-jre"
+
+src_install() {
+	local dest="/opt/${PN}-${SLOT}"
+	local ddest="${ED}/${dest#/}"
+
+	# Not sure why they bundle this as it's commonly available and they
+	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+	# also has an explicit dependency while Oracle seemingly dlopens it.
+	rm -vf lib/libfreetype.so || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if use headless-awt ; then
+		rm -v lib/lib*{[jx]awt,splashscreen}* || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild
new file mode 100644
index 000000000000..a6f7f3ee248b
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+		)"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+	$(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptopenjdk.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64"
+IUSE="alsa cups +gentoo-vm headless-awt selinux"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>net-libs/libnet-1.1
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}-jre"
+
+src_install() {
+	local dest="/opt/${PN}-${SLOT}"
+	local ddest="${ED}/${dest#/}"
+
+	# Not sure why they bundle this as it's commonly available and they
+	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+	# also has an explicit dependency while Oracle seemingly dlopens it.
+	rm -vf lib/libfreetype.so || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if use headless-awt ; then
+		rm -v lib/lib*{[jx]awt,splashscreen}* || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.332_p09.ebuild
index ba4007f59544..d4b6279fcfac 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07-r1.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.332_p09.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 IUSE="alsa cups headless-awt selinux"
 
@@ -67,8 +67,7 @@ src_install() {
 	fi
 
 	rm -v lib/security/cacerts || die
-	dosym ../../../../../etc/ssl/certs/java/cacerts \
-		"${dest}"/lib/security/cacerts
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
 
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 40ea434b4b6e..d9f715915b5f 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -2,36 +2,23 @@ AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603bee
 AUX openjdk-17.env.sh 537 BLAKE2B 64ef0f37bc0fb1f20d5f30751727e8f70a0460ad5917a9aa0dd346732e0862ebe10ea48145d585aea45f3689c9d359ed3f983dbaafeaf9da4c5f306fac8db0fa SHA512 b6add3bd4cf296debcaa57c7e73c1469c2dab1450157259a70702098aaa40339b6927ac444116f62b9448806c88616049d4733b4d7d8b2ae6a1ec106c16a6a07
 AUX openjdk-8-insantiate-arrayallocator.patch 647 BLAKE2B b2403d842ace7198520a25bf7c2027e6d74b5d418b52321722b21cac866df883d47e53e4f5e040aed55a9cc4bf03b5a62d008a0877add6c649a41f6230d78a38 SHA512 4bf002ec25844f4e55b588d0516e658c548700d3bcae79be74bf75d9cf30cf9cd448767db36935924dd3b07f34d0cf087321cb35abb4943690353d11485ab0de
 AUX openjdk-8.env.sh 792 BLAKE2B efabd83be56cdbd06419267361b82278bd52bfce8df8f369b7b9cadac74196ad90b9ab83e3abe8ae73e5ac51c49236d24d7762450832236414f98c1f6d13d6b2 SHA512 acdf229fff329c79e2263bd433c953dd18fc0945a0ffb6428c7004baf0bedbe3a9503c22ba1e777e7598412dfa2d2d9255c9007ecd14b4590c558e6a52c48a9f
-DIST openjdk-11.0.13_p8.tar.gz 122738754 BLAKE2B 5a60bf4245bc1e3591f4ebdf83a441f95a97a50a72a774612e99792789cd81a9317471cdadf4541efbe9b1549c2738a3cd30d134d3ded8de6d58f8a67b2aebe6 SHA512 38bd1be54533e9eebe407e771b1ece86ead755d1f3f0199e425aa4ad3e8fe511b0024986b7ffc59c571faa3dad510956e98ab1a48cb184c9cf5353bb7512cb06
+DIST openjdk-11.0.14-riscv.patch.xz 279088 BLAKE2B f67cf5707246b22285de8217b68fb806e3c18b7289cb81428c0fe83c5a4dcd60233be10aaca0853ffb00ac24fa60cae1b1d60ed300ad6bff8b07e881bddf8650 SHA512 32bac5f0c0f5df883de344718586bf798db6c8a5738058ea5d4902f5a0a3fc841c1893dec3379a74b9468c1c37af5c31a3e296476549972d3f1305401354060d
 DIST openjdk-11.0.14_p9.tar.gz 122803178 BLAKE2B 521d7829b34fa4f9a143c51d61c339c8c7455f12c4f04eda4fdd687dafa842f2a1b1adfe2e897fecdfa4e1c3ee484ec0e3aaf38ab9246f20cd24e7185db6ba25 SHA512 3285d13ba0fbbfd4f1a676b0f099b0742527ff556edfc3387913b59b64126bdfecd2697d7ac83634ed7160adf46edca3b5b2c33d94e9dca068752da5b9d70837
-DIST openjdk-17.0.1_p12.tar.gz 104597561 BLAKE2B 9bae16c0c0b973017258076bf8597101538e7ef29cb16357b17b112ae1aa058b17d26f22057cf3d6638104dbd83f5c19b6bcd124f589fc100eae83f78dc1c269 SHA512 220d87a29e1a25b670d721c27069b601a48c833069cb252f81ee6de2ff65fef23fd76e689fc755940f7e457b2419ef93a15cbeca64db2a8798028729df876d25
+DIST openjdk-11.0.15_p10.tar.gz 122902351 BLAKE2B a2dabad415a92765d548b19261e22e2cd483a17b478c8ef98342b44e88b39b23d89d31aecc80f93b27fce8df50ba41f4e6e5f10b66035bbfc1e0c03fc4707a40 SHA512 9d9e631046769d3ad95229172f392649ef4162161eb2d6fa7371665619600a04db440e1b3d30c580e283ad2b6bd7580d1199fc854fad3cb962d79f18b2347c67
 DIST openjdk-17.0.2_p8.tar.gz 104741920 BLAKE2B 749b1699f1b4b2bb6ee1139ceb704ba3b3f3789770176e5f0dc4b1d5ce5c2887514fc3c256a64f2ad9bb017339c20ef10110f35b523ee1edcd62924e41f44f03 SHA512 8eeb8b56410178179cc95aa02b0bf827fac3fbf6242a905502a6594763be809a727e55e87866ac65be56c22d6f78ec0c483bdaab9411f07d4b160c49b06921fa
-DIST openjdk-8.312_p07.tar.bz2 460874 BLAKE2B 2230d45b74044c894d1c1d25e7354ab9cf3d4df82ef1f149c31e2a755220775f59c76178847f61b99fc0859522fef4106c696e807c70602f9138c5110bcd3ed2 SHA512 483503cf4a54b736a9cb17179246d0fc602450e15d7815d3897d2c5a056483187b96f09280f6bb0522044150eb6733777bbb3a9130e8e34b6f6c865cb306e5a8
+DIST openjdk-17.0.3_p7.tar.gz 104797560 BLAKE2B 025ff6be360c74288990622bce31769e5780f3f326b0eed2b78a776cc4df8bdf8cb99dfb0d7dd3f03f8558ca9a66acc5c5bd04b227ba4dffe18f8586a287b74b SHA512 3bebaaf0469cd6558a3f033b768005e880ec95d5bb2a24b8929d2f6a05f18ca9977b291ad49b220a904f661cf6b47780a1cfd776109ed11d4e34d5345be8f66c
 DIST openjdk-8.322_p06.tar.gz 88114268 BLAKE2B 206b8373bacd829682e9203d9fbb14240994b63b7ddb3675cd3380ee7a4ab9c9016cdcc278b63d3110652ad02587d3c7965bc9865fed6c9ddd720e79bb917c71 SHA512 877b56bb11daf7295bd08d2a310cb4dc0478ac7465d4e7f88ba9b9ab2715761b2e83d2e47fb03dc82ec1f1651c9c0772f048360e1f71c0f91a19bda4b46cbcfc
-DIST openjdk-aarch64-shenandoah-8.312_p07.tar.bz2 467870 BLAKE2B 5ed4301b942fd2757644d82b1eb8f212d27ae6c39a225fa739b6a665deb42ba85ebb3e95d8563a8031cd08e3fed9ce2fa2aa675e2d348bcbd16d5b82bff74d43 SHA512 157f53f096f7cdf9bc4af2200cf1bc5dea566a839beb59e2d21a8001e0dd1c6596e409b7e21b9484832c9826dbaec97c00f5e980926142c89117650e390ec63e
-DIST openjdk-aarch64-shenandoah-corba-8.312_p07.tar.bz2 1053490 BLAKE2B 47ee0c89deddb3aefef02d9a71a8d3bdfddd95977e57c70e2699a18c76bc1724b48609c106126527085bca8892a4b071d26d0d47c72cc0681757c8dacbb85c78 SHA512 49f27951b3b57c10ea996f2490a089e1eb28be4762d57962b6b2616020a3cca248ab61580c6f27842b9986eadcc1bcb208af543832fe839d6fd548a3f7a5a04a
-DIST openjdk-aarch64-shenandoah-hotspot-8.312_p07.tar.bz2 8802379 BLAKE2B 53a8fa582f002c19a50d6dea07aa9d21374b59cc0fb973ca84429191060ba60da609ea115d6249d835f7a945279073c896abb534f1b59ed3b5811b70dd8a6503 SHA512 b0b19a9277af9ab0f395367ba010d4574ae4e7d5a0f9c9c44c3222545642ec6a4342bd2caaa8f8db3ade23f4680b8cbfbb74b4cf4526622ce9eb4d16a3190fa5
-DIST openjdk-aarch64-shenandoah-jaxp-8.312_p07.tar.bz2 2727550 BLAKE2B c56530d3b227565ec7eb300dd15c7e00a0efcc745177f6adc23636f29bb1517357829efa998ed7614ded752b75b1a5ff74f3cc88876110b97ec564bf1b1d8254 SHA512 e40f271453fb8524d9da8ac6790e7f3d4cbf68e14b9216bf3dac2fd8c04d67bdd81144e027b9d9b0bec2516bf7fb5bb1ab5cbf1838d3c35f9c5479204980a69d
-DIST openjdk-aarch64-shenandoah-jaxws-8.312_p07.tar.bz2 2559773 BLAKE2B b3c065490fc4a7ea69d7e5b74fc7c3d971e661fbc398dd8fc46a76f992a6b32059afc266cf85bd54024f4c1e134ca6efb6b9cae3d7966a08be863ea44c3b9c1c SHA512 936b7fae3b2c2b2262c85ae4816839e7f3ef5ab361070e487ecb5d71d637bc6312d5b98abd3a52a29b7e02cf3fa9aab7447f5ca1ff19bcac6cb46c0e539cf32a
-DIST openjdk-aarch64-shenandoah-jdk-8.312_p07.tar.bz2 48837594 BLAKE2B 368caa0a628e3bd0d0343baf7ac6c8854f6998ea5b5f96594e99ac565293bfdbfe733acfdfd398964634ffaf4e0eef298dbed078b0a61626c97711764a45a0bb SHA512 8436daa785fba98ed2c23444673842dc28b18f114ebafd203bc01bd2295a9501c2391c2e51d0f589cd4112243eee2e18a8a71180b2aca3988c58a02f33d13d57
-DIST openjdk-aarch64-shenandoah-langtools-8.312_p07.tar.bz2 2403116 BLAKE2B 10c1ca4e78dfad90bf9b8d6745cda41605d5985eddfd8e4c3bfbfcb6458c5b5115813e9aa7b4aec148c4d82f268ab02ca6cef9e68bb902f1944858b6bb6b36d4 SHA512 2c9fc95cb19b1c3a4e7b9c2e305d9a285f1dedb7954cce365738e683c3a52eb7f4e3f3485b947860aee2fd6059b7d2b18e196cc1c585427c6b4b8299f6fc3105
-DIST openjdk-aarch64-shenandoah-nashorn-jdk8.312_p07.tar.bz2 2845057 BLAKE2B ff32686b27b767683ae0a670b2509291b6708d371b398cac854210132f555218b9189d3012cf9b45e0584f44425e09aefb8acbef95f1786787067f4d5275fdbe SHA512 71fad14ad6b7a75ee499bc0b3370e5beb22d5a7e32a02d54fc5dff1cf25ede51c3a8a04de6424947ddaa3b5d4a0d7f5a447ba073b62c5c86a49c0543cec3f374
+DIST openjdk-8.332_p09.tar.gz 88130953 BLAKE2B 9c7419851588dfbca92610f8fbb8b74fa7516282f82e8c7c37af88c776ba0c83a22fb3d4a1c2c2b98d44e394025217d095cff9c79fba53f9c5a32a43eb91ad70 SHA512 f6a717f77cc0e85bc2eb3c3c599d09e06a4004e4987a2caf0773b1197336722469e2abcca9d39c1f4c534d15cd77408d6405c9ee6edb3815bccd8e4872571aaa
 DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e
 DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f
+DIST openjdk-bootstrap-11.0.14_p9-riscv.tar.xz 104601676 BLAKE2B 5f976e8a626a829fae70ad6c007f10bfeff79e29c85d6c75fb2f5ff8984fd2a2bd44ee6e07958dbbdaaed761c6839d375e1b5ba6cffc63b02ad9e2c9178310db SHA512 580dec81626553fe3e7afd0f6385a733ba80a0502cf0f9e8bdc973048887290c9ab6171267d61d8838c4ece4de58c9ca8b78540bd52b1757495a27175057ec64
 DIST openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz 116557680 BLAKE2B d20e45a5a76e30ee60446993bf5dcf0fa10b8b668ebec637ea02b458a472c642f22740e18f28cbf9923ea4cceb17702115c038b13137442e5f0572477d37f12f SHA512 92e0343f493d094300911625a561f42c47402ca4cdbd2ac18414089e8ed8a50ca58f02ec1ef9a3dce017ab7af99a22ab465ddf732ab9e55728e2b146de56fba7
 DIST openjdk-bootstrap-17.0.1_p12-x86.tar.xz 111479904 BLAKE2B 17d33f8ee81c2846f417d8e7cd1429eb611e916a6b375c76127179dc6afc55b0254248360c892ce37a178fd553934d952ec8955ff5d0613eb66678b8ecefe917 SHA512 094bcc960801e5fd7e1c966c8101c195ac7fa5e222d9c8e79ca64f8a3e6812613c17a0356211e7dd831325fa11af88cc22ed56c434d65504f18dd4f4ceaedfdf
 DIST openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz 115353932 BLAKE2B 0cc4ab078085f094bbcc65448458d98a0f521e3b754c5118b1b4f957cfa00c24e896c811c2a477822c469ffcfe0de1ad6a8d0b7db23b0b09ae3b459eaf8c4fc8 SHA512 e30acd6c64a0095f4203129ecf2cff4c6b4293bc017457465d3abb746d280a2f5d89028eed22f7f3d236890d047149c7aa257e3b49593d7a6ab4dd6b777a7c26
-DIST openjdk-corba-8.312_p07.tar.bz2 1035097 BLAKE2B 38ae2cf2e61c44a42320b26f7bdea424066ee4568f2f3bbe6e7aa2d8b7aa927429d0b8c2cc757f580867df6c6e5dbe1270da5f91d9c52aa131e66c146a311caa SHA512 9035449c07e5fc9776b40e32de3e4f1c6efac482c14298671e5e719a1f9830fe9a20851dac3f9c6d6c0c8c387a7b44e40019570c1f054fd1d1f24e2f5cef5bfc
-DIST openjdk-hotspot-8.312_p07.tar.bz2 8559682 BLAKE2B 776acb83bc065885da90b26c88f0083c3bb7bb1f6dfd0585e37e58f185b5612f6501f2b26e1eeb7533d30f82faea7ccedeeee21dcf454a4e8fe951aca0406a1d SHA512 0c501d284bb22867391de0f8da8b098ca9309173ab6f7415d591d056a2d8859757aaa3da4a9c294dcc434a41771928a9f1edd8a69dad38ef7a9bcad793deeaa8
-DIST openjdk-jaxp-8.312_p07.tar.bz2 2686710 BLAKE2B acbfd2a7ebfdcfbfa1c4467dbc6778afbb2b8fab5c70381000b926645197c3bb5537a81574ed98960cae2fd0d70e50ca5976aabd0c49cf833c07f1f3b7935773 SHA512 da3fbd82ff05e48809cf6180d876f09764f5f97e4fc37c4352c7875ccd5bebe66cb51ff4565e6fcd67699ec5b5ae3eebc9c0a1510998697519cfc94d3d04df5f
-DIST openjdk-jaxws-8.312_p07.tar.bz2 2544672 BLAKE2B cdf1e2ca85a91163599d4ce9473983b80ab7bbdc07303b8d8ee02d0f83306c5bb6ed909d4af29378673959dd08cbf1ee0629282e812c38a660625677a68d59da SHA512 317e6c684e1034f8ebfa7230694d74d0b615d0c874b991745a234a55da3af15ef7f7a56769293274bd1b7677cee773878f414b2f6c0d61253af8f5ec3b3d82f5
-DIST openjdk-jdk-8.312_p07.tar.bz2 48705905 BLAKE2B 0e9849a58a05e300441e63702846ee2d76e461939c5eb9c458c29ddc9c854f5278d464e3cc98112976b2b34268fa5a628e21183b8ea117eb53a805494182ef22 SHA512 cda0fcb171fec3d652340475c91b2c9099d7cb951ca352122236648272e94ccdf153bdf616cb772185cd7c9300b6e6b10490082ed5887d83e368edbefe2a4f8f
-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 7767 BLAKE2B fc257c726bc2a3ef04711b84b28c0b14b5f291cdbeebcc31f9d9a8ece088c5d1c6cdd7cdef3bd803e8d35c625a993b0637b1164d034fcc6bf0ad9c83dc03e518 SHA512 1943350c5c12b71c2c06b2a9326c83506da54363562d2736c836e5c5d8239c6fab2a47a47378768c1ce7626eaeec8acb7d9a7b7f8934f4558e85cfea2ad2fc19
-EBUILD openjdk-17.0.1_p12.ebuild 7855 BLAKE2B cb7a7215afcd9382edd8053ea4182012d46743fdff5ba03ac4ff2f8750b454c352b25ec4ca04b0b3a5dcfeadf64cf24518ebf119a87cde7ca7f2c9a09bf39256 SHA512 5bc08b0e7707725dafd4165d8f7af2964981195d19fc95ae5465ab3f2907bd4c81d2ba2bfbf6eb42dd331dd8a9eb2c8c0584615146163669514a2c2773cf68df
+EBUILD openjdk-11.0.14_p9-r1.ebuild 8055 BLAKE2B d100d4a3cc2ea59157e222b696c578f446892314dd4e8c751f83de61f06fadd9756cdcf06b8c83c6e8a8be5a9da86b8fa97663e4911244edf29bc097ccfe879c SHA512 1cb47fb070aba8b32d226f54bddcd5a45e2a9d3824cc0bc8c66d48cc8f3bf8217392f5a1f0e1d8c153ab3e26ae57a7b56c5b5c2055e2b8803ab8df18caed8dd7
+EBUILD openjdk-11.0.15_p10.ebuild 8059 BLAKE2B 6c819f8d98d30fdf1585118914169a46281481e7397594fabc17c700f4c2a5bbe2c936cb7f29cbd540bb1a0ba29e6943c158c281e05f6eb9099f452949c82ca0 SHA512 3f7511e568ece0f016c585dbfcb3335db01744b9930387f1fca2dd924df494cd69636e11551558f5528ad69136c806125587efb6d8f98c7aee376fa078ab11a3
 EBUILD openjdk-17.0.2_p8.ebuild 9105 BLAKE2B 0510a231c319d95ba3c3ad411524956872184bb958993dce100e2b39c7654ddea8cd4842f9ece6d7da53efa54b06d165db3c15d4d69be08a676a5cd6d42978e1 SHA512 bc349ca6ab90f97cdaecf6bb0634b43a1b122c086a808c854613799ef896b61617736b82fac0a209c37fafbe54d329da546076cb077931f11112c5e2bc0e7863
-EBUILD openjdk-8.312_p07.ebuild 7399 BLAKE2B b07477683dd271a5c1cf0830137f9c846df5375666ac0d3863f3647f9c0ca3db3bce0e68e4f3931124a071e9b0fb81434733d034194cbee3a764056cfa2721fe SHA512 467b1479f425e9d36be216c24d2f226a2c4a1aec9947fedc73d0b4703e1efaad727c36c427c3010a78576db997d2975623d0209d11ba6adbd65e360265173c10
+EBUILD openjdk-17.0.3_p7.ebuild 9108 BLAKE2B fe1881517a0315fc971dea48716d5adf84a45c91d582a827748f2d9938fcb676628fc8d4749f6a1743c2b426d2b1d24e0b19f74d8cd34ccd12fd79904638c0f4 SHA512 1983c09d6ebe543138a87cdd34037651ae04cf6d14421aaed9cdd41423c88bd40e7afe645441e224f52f6acf3d78461c99d2b9f89b856cf55b9ce12f8622efcf
 EBUILD openjdk-8.322_p06.ebuild 5855 BLAKE2B 18c709101374aefadc63785c8930de08319deca6ea6ce7d54929dc269d571253bad6638317c1f33373678c3e58d39233e98d85b5610eb5bf2124d30314672c33 SHA512 ade8377a8efa05bb475cc251960cef4ebe7d068ab0e5f435fbede1530095490ae04f216346d759557635b8697f846d3ec03465853cf5aa9a397491e072ec7cf5
+EBUILD openjdk-8.332_p09.ebuild 5859 BLAKE2B fe046363d60b08ca2569669f74a2cc71552086c84fa24df81a937970c5b3d4521720472686caf043e9aa860020ecfaa55e652caacf9d4e02cd8bd88256387055 SHA512 99315a5ba5fa12b4b059cb4787928e8ae02f04cc83c5064597b510da35386408c469af700dc3c99c43cbac4221e23a10501ddb62cb5b1b192a1062b816bd5d66
 MISC metadata.xml 1506 BLAKE2B d56098f4ba9acb9bd5891247f5165beea69a802ae4fe57f6c0e4b54875efd73d3dafaa78f5c182e640028e31840aa6b9d16bafade717a469b4a43ccbe37cbef6 SHA512 84aa8b3bef355e93fea678612e9512ca2ce5df77efbf4f055589ff67387f0571e43eb5308b8c575eb09bf52b68e5fcc68fdd819a6781080755c3f6c24d6eb77d
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 1e00ec30c2ed..fa243d77955b 100644
--- a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
@@ -12,6 +12,7 @@ SLOT="${MY_PV%%[.+]*}"
 
 # variable name format: <UPPERCASE_KEYWORD>_XPAK
 PPC64_XPAK="11.0.13_p8" # big-endian bootstrap tarball
+RISCV_XPAK="11.0.14_p9" # lp64d bootstrap tarball
 X86_XPAK="11.0.13_p8"
 
 # Usage: bootstrap_uri <keyword> <version> [extracond]
@@ -35,12 +36,14 @@ SRC_URI="
 		-> ${P}.tar.gz
 	!system-bootstrap? (
 		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
+		$(bootstrap_uri riscv ${RISCV_XPAK})
 		$(bootstrap_uri x86 ${X86_XPAK})
 	)
+	riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.14-riscv.patch.xz )
 "
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 
 IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
 
@@ -146,6 +149,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	use riscv && eapply "${WORKDIR}"/openjdk-11.0.14-riscv.patch
 	default
 	chmod +x configure || die
 }
@@ -175,7 +179,6 @@ src_configure() {
 		--with-freetype="${XPAK_BOOTSTRAP:-system}"
 		--with-giflib="${XPAK_BOOTSTRAP:-system}"
 		--with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
-		--with-jvm-features=shenandoahgc
 		--with-lcms="${XPAK_BOOTSTRAP:-system}"
 		--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
 		--with-libpng="${XPAK_BOOTSTRAP:-system}"
@@ -193,6 +196,7 @@ src_configure() {
 		--enable-headless-only=$(usex headless-awt yes no)
 		$(tc-is-clang && echo "--with-toolchain-type=clang")
 	)
+	! use riscv && myconf+=( --with-jvm-features=shenandoahgc )
 
 	if use javafx; then
 		# this is not useful for users, just for upstream developers
diff --git a/dev-java/openjdk/openjdk-11.0.13_p8.ebuild b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild
index e7bcf7abf3cf..cb5035667c42 100644
--- a/dev-java/openjdk/openjdk-11.0.13_p8.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild
@@ -1,23 +1,56 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
+inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
 
 # we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
 # set build version properly
 MY_PV="${PV%_p*}-ga"
 SLOT="${MY_PV%%[.+]*}"
 
+# variable name format: <UPPERCASE_KEYWORD>_XPAK
+PPC64_XPAK="11.0.13_p8" # big-endian bootstrap tarball
+RISCV_XPAK="11.0.14_p9" # lp64d bootstrap tarball
+X86_XPAK="11.0.13_p8"
+
+# Usage: bootstrap_uri <keyword> <version> [extracond]
+# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
+# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
+bootstrap_uri() {
+	local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
+	local suff="tar.xz"
+	local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
+	local ver="${2:?${FUNCNAME[0]}: version not specified}"
+	local cond="${3-}"
+
+	# here be dragons
+	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })"
+}
+
 DESCRIPTION="Open source implementation of the Java programming language"
 HOMEPAGE="https://openjdk.java.net"
-SRC_URI="https://github.com/${PN}/jdk${SLOT}u-dev/archive/refs/tags/jdk-${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
+		-> ${P}.tar.gz
+	!system-bootstrap? (
+		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
+		$(bootstrap_uri riscv ${RISCV_XPAK})
+		$(bootstrap_uri x86 ${X86_XPAK})
+	)
+	riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.14-riscv.patch.xz )
+"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
 
-IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap pch selinux source systemtap"
+REQUIRED_USE="
+	javafx? ( alsa !headless-awt )
+	!system-bootstrap? ( jbootstrap )
+"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
@@ -63,15 +96,15 @@ DEPEND="
 	x11-libs/libXt
 	x11-libs/libXtst
 	javafx? ( dev-java/openjfx:${SLOT}= )
-	|| (
-		dev-java/openjdk-bin:${SLOT}
-		dev-java/openjdk:${SLOT}
+	system-bootstrap? (
+		|| (
+			dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
+			dev-java/openjdk:${SLOT}[gentoo-vm(+)]
+		)
 	)
 "
 
-REQUIRED_USE="javafx? ( alsa !headless-awt )"
-
-S="${WORKDIR}/jdk${SLOT}u-dev-jdk-${MY_PV}"
+S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
 
 # The space required to build varies wildly depending on USE flags,
 # ranging from 2GB to 16GB. This function is certainly not exact but
@@ -101,42 +134,28 @@ pkg_setup() {
 	JAVA_PKG_WANT_SOURCE="${SLOT}"
 	JAVA_PKG_WANT_TARGET="${SLOT}"
 
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
-		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
+	if use system-bootstrap; then
+		for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+			if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+				java-pkg-2_pkg_setup
+				return
+			fi
+		done
 	else
-		if [[ ${MERGE_TYPE} != "binary" ]]; then
-			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
-			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-			JDK_HOME=${JDK_HOME#*/}
-			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
-			export JDK_HOME
-		fi
+		[[ ${MERGE_TYPE} == "binary" ]] && return
+		local xpakvar="${ARCH^^}_XPAK"
+		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
 	fi
 }
 
 src_prepare() {
+	use riscv && eapply "${WORKDIR}"/openjdk-11.0.14-riscv.patch
 	default
 	chmod +x configure || die
 }
 
 src_configure() {
-	# Work around stack alignment issue, bug #647954. in case we ever have x86
+	# Work around stack alignment issue, bug #647954.
 	use x86 && append-flags -mincoming-stack-boundary=2
 
 	# Work around -fno-common ( GCC10 default ), bug #713180
@@ -151,17 +170,18 @@ src_configure() {
 
 	local myconf=(
 		--disable-ccache
+		--disable-precompiled-headers
 		--enable-full-docs=no
 		--with-boot-jdk="${JDK_HOME}"
 		--with-extra-cflags="${CFLAGS}"
 		--with-extra-cxxflags="${CXXFLAGS}"
 		--with-extra-ldflags="${LDFLAGS}"
-		--with-freetype=system
-		--with-giflib=system
-		--with-harfbuzz=system
-		--with-lcms=system
-		--with-libjpeg=system
-		--with-libpng=system
+		--with-freetype="${XPAK_BOOTSTRAP:-system}"
+		--with-giflib="${XPAK_BOOTSTRAP:-system}"
+		--with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
+		--with-lcms="${XPAK_BOOTSTRAP:-system}"
+		--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
+		--with-libpng="${XPAK_BOOTSTRAP:-system}"
 		--with-native-debug-symbols=$(usex debug internal none)
 		--with-vendor-name="Gentoo"
 		--with-vendor-url="https://gentoo.org"
@@ -171,11 +191,12 @@ src_configure() {
 		--with-version-pre=""
 		--with-version-string="${PV%_p*}"
 		--with-version-build="${PV#*_p}"
-		--with-zlib=system
+		--with-zlib="${XPAK_BOOTSTRAP:-system}"
 		--enable-dtrace=$(usex systemtap yes no)
 		--enable-headless-only=$(usex headless-awt yes no)
 		$(tc-is-clang && echo "--with-toolchain-type=clang")
 	)
+	! use riscv && myconf+=( --with-jvm-features=shenandoahgc )
 
 	if use javafx; then
 		# this is not useful for users, just for upstream developers
@@ -183,7 +204,7 @@ src_configure() {
 		# https://bugs.gentoo.org/822612
 		export LEGAL_EXCLUDES=mesa3d.md
 
-		local zip="${EPREFIX%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
+		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
 		if [[ -r ${zip} ]]; then
 			myconf+=( --with-import-modules="${zip}" )
 		else
@@ -191,11 +212,9 @@ src_configure() {
 		fi
 	fi
 
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		myconf+=( --enable-precompiled-headers )
-	else
-		myconf+=( --disable-precompiled-headers )
+	if use !system-bootstrap ; then
+		addpredict /dev/random
+		addpredict /proc/self/coredump_filter
 	fi
 
 	(
@@ -220,7 +239,7 @@ src_compile() {
 
 src_install() {
 	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}${dest#/}"
+	local ddest="${ED}/${dest#/}"
 
 	cd "${S}"/build/*-release/images/jdk || die
 
@@ -248,7 +267,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+	dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
 
 	# must be done before running itself
 	java-vm_set-pax-markings "${ddest}"
@@ -256,14 +275,14 @@ src_install() {
 	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
 	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
 
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_revdep-mask
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
 
 	if use doc ; then
 		docinto html
 		dodoc -r "${S}"/build/*-release/images/docs/*
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+		dosym8 -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
 	fi
 }
 
diff --git a/dev-java/openjdk/openjdk-17.0.1_p12.ebuild b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild
index 313ab34e7f6f..5e8f8d958a2a 100644
--- a/dev-java/openjdk/openjdk-17.0.1_p12.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild
@@ -1,21 +1,54 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
+EAPI=7
+
+inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+
+# variable name format: <UPPERCASE_KEYWORD>_XPAK
+ARM64_XPAK="17.0.2_p8" # musl bootstrap install
+PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball
+X86_XPAK="17.0.1_p12"
+
+# Usage: bootstrap_uri <keyword> <version> [extracond]
+# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
+# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
+bootstrap_uri() {
+	local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
+	local suff="tar.xz"
+	local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
+	local ver="${2:?${FUNCNAME[0]}: version not specified}"
+	local cond="${3-}"
+	[[ ${cond} == elibc_musl* ]] && local musl=yes
+
+	# here be dragons
+	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
+}
 
 MY_PV="${PV//_p/+}"
 SLOT="$(ver_cut 1)"
 
 DESCRIPTION="Open source implementation of the Java programming language"
 HOMEPAGE="https://openjdk.java.net"
-SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
+		-> ${P}.tar.gz
+	!system-bootstrap? (
+		$(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
+		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
+		$(bootstrap_uri x86 ${X86_XPAK})
+	)
+"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap pch selinux source systemtap"
+IUSE="alsa big-endian cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
+
+REQUIRED_USE="
+	javafx? ( alsa !headless-awt )
+	!system-bootstrap? ( jbootstrap )
+"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
@@ -61,14 +94,14 @@ DEPEND="
 	x11-libs/libXt
 	x11-libs/libXtst
 	javafx? ( dev-java/openjfx:${SLOT}= )
-	|| (
-		dev-java/openjdk-bin:${SLOT}
-		dev-java/openjdk:${SLOT}
+	system-bootstrap? (
+		|| (
+			dev-java/openjdk-bin:${SLOT}
+			dev-java/openjdk:${SLOT}
+		)
 	)
 "
 
-REQUIRED_USE="javafx? ( alsa !headless-awt )"
-
 S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
 
 # The space required to build varies wildly depending on USE flags,
@@ -115,11 +148,14 @@ pkg_setup() {
 		fi
 	done
 
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
+	if has_version dev-java/openjdk:${SLOT}; then
 		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
+	elif use !system-bootstrap ; then
+		local xpakvar="${ARCH^^}_XPAK"
+		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
 	else
 		if [[ ${MERGE_TYPE} != "binary" ]]; then
-			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+			JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT})
 			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
 			JDK_HOME=${JDK_HOME#*/}
 			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
@@ -149,18 +185,19 @@ src_configure() {
 
 	local myconf=(
 		--disable-ccache
+		--disable-precompiled-headers
 		--disable-warnings-as-errors
 		--enable-full-docs=no
 		--with-boot-jdk="${JDK_HOME}"
 		--with-extra-cflags="${CFLAGS}"
 		--with-extra-cxxflags="${CXXFLAGS}"
 		--with-extra-ldflags="${LDFLAGS}"
-		--with-freetype=system
-		--with-giflib=system
-		--with-harfbuzz=system
-		--with-lcms=system
-		--with-libjpeg=system
-		--with-libpng=system
+		--with-freetype="${XPAK_BOOTSTRAP:-system}"
+		--with-giflib="${XPAK_BOOTSTRAP:-system}"
+		--with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
+		--with-lcms="${XPAK_BOOTSTRAP:-system}"
+		--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
+		--with-libpng="${XPAK_BOOTSTRAP:-system}"
 		--with-native-debug-symbols=$(usex debug internal none)
 		--with-vendor-name="Gentoo"
 		--with-vendor-url="https://gentoo.org"
@@ -170,14 +207,14 @@ src_configure() {
 		--with-version-pre=""
 		--with-version-string="${PV%_p*}"
 		--with-version-build="${PV#*_p}"
-		--with-zlib=system
+		--with-zlib="${XPAK_BOOTSTRAP:-system}"
 		--enable-dtrace=$(usex systemtap yes no)
 		--enable-headless-only=$(usex headless-awt yes no)
 		$(tc-is-clang && echo "--with-toolchain-type=clang")
 	)
 
 	if use javafx; then
-		local zip="${EPREFIX%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
+		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
 		if [[ -r ${zip} ]]; then
 			myconf+=( --with-import-modules="${zip}" )
 		else
@@ -185,11 +222,9 @@ src_configure() {
 		fi
 	fi
 
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		myconf+=( --enable-precompiled-headers )
-	else
-		myconf+=( --disable-precompiled-headers )
+	if use !system-bootstrap ; then
+		addpredict /dev/random
+		addpredict /proc/self/coredump_filter
 	fi
 
 	(
@@ -214,7 +249,7 @@ src_compile() {
 
 src_install() {
 	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}${dest#/}"
+	local ddest="${ED}/${dest#/}"
 
 	cd "${S}"/build/*-release/images/jdk || die
 
@@ -242,7 +277,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
 
 	# must be done before running itself
 	java-vm_set-pax-markings "${ddest}"
diff --git a/dev-java/openjdk/openjdk-8.312_p07.ebuild b/dev-java/openjdk/openjdk-8.332_p09.ebuild
index 31cde0da51a6..3d08d57546ea 100644
--- a/dev-java/openjdk/openjdk-8.312_p07.ebuild
+++ b/dev-java/openjdk/openjdk-8.332_p09.ebuild
@@ -1,50 +1,23 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
+inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
 
-# we need latest -ga tag from hg, but want to keep build number as well
+# we need latest -ga tag from git, but want to keep build number as well
 # as _p component of the gentoo version string.
 
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)
-MY_PN_AARCH64="${PN}-aarch64-shenandoah"
-MY_PV_AARCH64="$(ver_rs 1 'u' 2 '-' ${PV/_p/-b})"
-MY_P_AARCH64="${MY_PN_AARCH64/#${PN}-}-jdk${MY_PV_AARCH64}"
-
-BASE_URI="https://hg.${PN}.java.net/jdk8u/jdk8u"
-AARCH64_URI="https://hg.${PN}.java.net/aarch64-port/jdk8u-shenandoah"
+MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)"
+SLOT="${PV%%[.+]*}"
 
 DESCRIPTION="Open source implementation of the Java programming language"
 HOMEPAGE="https://openjdk.java.net"
-SRC_URI="
-	!arm64? (
-		${BASE_URI}/archive/jdk${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-		${BASE_URI}/corba/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-corba-${PV}.tar.bz2
-		${BASE_URI}/hotspot/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-hotspot-${PV}.tar.bz2
-		${BASE_URI}/jaxp/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxp-${PV}.tar.bz2
-		${BASE_URI}/jaxws/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxws-${PV}.tar.bz2
-		${BASE_URI}/jdk/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jdk-${PV}.tar.bz2
-		${BASE_URI}/langtools/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-langtools-${PV}.tar.bz2
-		${BASE_URI}/nashorn/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-nashorn-${PV}.tar.bz2
-	)
-	arm64? (
-		${AARCH64_URI}/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-${PV}.tar.bz2
-		${AARCH64_URI}/corba/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-corba-${PV}.tar.bz2
-		${AARCH64_URI}/hotspot/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-hotspot-${PV}.tar.bz2
-		${AARCH64_URI}/jaxp/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-jaxp-${PV}.tar.bz2
-		${AARCH64_URI}/jaxws/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-jaxws-${PV}.tar.bz2
-		${AARCH64_URI}/jdk/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-jdk-${PV}.tar.bz2
-		${AARCH64_URI}/langtools/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-langtools-${PV}.tar.bz2
-		${AARCH64_URI}/nashorn/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-nashorn-jdk${PV}.tar.bz2
-	)
-"
+SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap pch selinux source"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
@@ -90,8 +63,14 @@ DEPEND="
 	)
 "
 
+BDEPEND="
+	virtual/pkgconfig
+"
+
 PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
 
+S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
+
 PATCHES=( "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch" )
 
 # The space required to build varies wildly depending on USE flags,
@@ -125,16 +104,6 @@ pkg_setup() {
 	java-pkg-2_pkg_setup
 }
 
-src_unpack() {
-	default
-	mv -v "jdk${SLOT}u"* "${P}" || die
-
-	local repo
-	for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do
-		mv -v "${repo}-"* "${P}/${repo}" || die
-	done
-}
-
 src_prepare() {
 	default
 
@@ -162,11 +131,15 @@ src_configure() {
 
 	local myconf=(
 			--disable-ccache
+			--disable-freetype-bundling
+			--disable-precompiled-headers
 			--enable-unlimited-crypto
 			--with-boot-jdk="${JDK_HOME}"
 			--with-extra-cflags="${CFLAGS}"
 			--with-extra-cxxflags="${CXXFLAGS}"
 			--with-extra-ldflags="${LDFLAGS}"
+			--with-freetype-lib="$( $(tc-getPKG_CONFIG) --variable=libdir freetype2 )"
+			--with-freetype-include="$( $(tc-getPKG_CONFIG) --variable=includedir freetype2)/freetype2"
 			--with-giflib=system
 			--with-jtreg=no
 			--with-jobs=1
@@ -184,13 +157,6 @@ src_configure() {
 			$(tc-is-clang && echo "--with-toolchain-type=clang")
 		)
 
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		myconf+=( --enable-precompiled-headers )
-	else
-		myconf+=( --disable-precompiled-headers )
-	fi
-
 	(
 		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
 		CFLAGS= CXXFLAGS= LDFLAGS= \
@@ -204,6 +170,8 @@ src_compile() {
 	local myemakeargs=(
 		JOBS=$(makeopts_jobs)
 		LOG=debug
+		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+		NICE= # Use PORTAGE_NICENESS, don't adjust further down
 		$(usex doc docs '')
 		$(usex jbootstrap bootcycle-images images)
 	)
@@ -212,7 +180,7 @@ src_compile() {
 
 src_install() {
 	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED%/}/${dest#/}"
+	local ddest="${ED}/${dest#/}"
 
 	cd "${S}"/build/*-release/images/j2sdk-image || die
 
@@ -237,7 +205,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
 
 	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
diff --git a/dev-java/opentest4j/Manifest b/dev-java/opentest4j/Manifest
index a1e155a43f66..5a5119aad11c 100644
--- a/dev-java/opentest4j/Manifest
+++ b/dev-java/opentest4j/Manifest
@@ -1,3 +1,3 @@
 DIST opentest4j-1.2.0.tar.gz 77616 BLAKE2B a331cc5e97d1e50b3b57e6aac926278d16f4d75067b4e4b25acb5ee25d4d4cd9d1f75c115155303ec63f5cb22b09ad1cbaa01d62620b350dd2c1d61541657b78 SHA512 cd98d976935de97d259ec4c04510334f2b56f8a32db2c97e0f20a2e3b99f119ffeb390589eb42d4594808d96194067871d5eaad6a40dd58af30b9f995b13ef08
-EBUILD opentest4j-1.2.0.ebuild 770 BLAKE2B b7a3aebc6fbd690895bd9b4e1a00d40a623d4159cf6a6c091e0b608b261582577e3d0f0b5dbb0e42c4aa40cbdd0d9b646223f96d5a8a77d72b243bbd7473375b SHA512 71963eebf8cf7ca1b911e2f63451337feb59f69be3dbf6652835f4f9fb9f379edebcb1a14eabccc4577e0ae0edb5bd16a07fddc53000f8e72ac26a8b2c2a19e2
-MISC metadata.xml 302 BLAKE2B ea077bd25f3dc10129d182bad603f229905bea89332134c5a8792983bc5d338452087844adc12a7a0c1496ebd2df6c1fa0fb4c55198cf84885ab2f1ba99bfc72 SHA512 b88e1884b81818b405494ce7eff1790d3e726c66a6a04fa4caf510c8178893f5afd31d867893b118051db4a06954b73b783341b5eb2b7e8779e76ddc520d9636
+EBUILD opentest4j-1.2.0.ebuild 766 BLAKE2B 8a010437e247e7598d8549d205ba1789c9dbd942c172504216900069854bfc1b43edfdb13246bf721dcb8d07b92480b34c62f1445753291ce03e6ddd57f4d580 SHA512 100dd0c35f45452781f565fc910a06c2e671d500ffaf1ba6109f1234f3a03cded416b74247d31bc0d85a4ca0e1b0206f9e86ff075fd2af46c45387b6751360f0
+MISC metadata.xml 303 BLAKE2B 07307ccd1ef1f074fa091ff02bdacfe83a3f3c0a2d79f7545821d5955834a83391d64d34dc8170cb5a4752302296e746393491f7b628a6936a3f0c2b85e09f29 SHA512 9760587d9dec49089d8ea86b7046d145e41075c6ae02af3be319e795272b3eeaef6540dfbb90564bb85d50974f44acd4bfd71d57956b1ff0e2e216220bf60f48
diff --git a/dev-java/opentest4j/metadata.xml b/dev-java/opentest4j/metadata.xml
index 0327a99ea474..04e41c0ed0f7 100644
--- a/dev-java/opentest4j/metadata.xml
+++ b/dev-java/opentest4j/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
diff --git a/dev-java/opentest4j/opentest4j-1.2.0.ebuild b/dev-java/opentest4j/opentest4j-1.2.0.ebuild
index 398dc826230c..cb2a9e6814fb 100644
--- a/dev-java/opentest4j/opentest4j-1.2.0.ebuild
+++ b/dev-java/opentest4j/opentest4j-1.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ota4j-team/opentest4j/archive/r${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/osgi-enterprise-api/Manifest b/dev-java/osgi-enterprise-api/Manifest
index 37edb0880681..6a6b370ed30d 100644
--- a/dev-java/osgi-enterprise-api/Manifest
+++ b/dev-java/osgi-enterprise-api/Manifest
@@ -1,3 +1,4 @@
 DIST osgi.enterprise-5.0.0.jar 479506 BLAKE2B 2bd53b50e469388d132a6d3ebd78d4040093f8c1d79299fd87412853d959f7559f04287567eeea47635fe287a3e9d3812ac9303a5d39ec35135ab3c58bd0b010 SHA512 0404c05afd8cb3ef8b826b0f08deeb03b0027ca99e091953d39ef69674809c5b899e0f2c8efb685df5fce070c2aafcf813e470fbb538d4ec3b480a8060351144
 EBUILD osgi-enterprise-api-5.0.0-r1.ebuild 813 BLAKE2B 1f31874e149fb8d148db2d4b6a2e6f3aa1e9b3d5f549d84df308962780cfd77dd9b3cbeb595858d25cba85c77898487c815940bfa2fa21b85ced0dddd758f880 SHA512 b35779fc555b4e7be83fa8bb8e17880350f33fd9a6e06d27fc1af6e6fb07a6e00b05deddbb203496aff6febe23a9fd51308de1b1d33c17ba19ce311286ac04b1
+EBUILD osgi-enterprise-api-5.0.0-r2.ebuild 758 BLAKE2B 8bdab9d1181006d7a1d548603450354d4397c9df0fcd4587e7955a1d695564a087b837c51ee51f7481fbaf4de600bf6b33cd08b0856e1e37462d689a864b872f SHA512 294c1ec615d4754f75edf50264d9a157c49fb5a10c43ddf8b78c6d9ed61b45b698eb8bc60d11662f550e3b8c1e501d981a7605677582051cb2cc5cf36caeac3e
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r2.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r2.ebuild
new file mode 100644
index 000000000000..17de5b1b0649
--- /dev/null
+++ b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r2.ebuild
@@ -0,0 +1,37 @@
+# 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
+
+DESCRIPTION="OSGi Enterprise Release 5 Companion Code"
+HOMEPAGE="http://www.osgi.org/Main/HomePage"
+SRC_URI="https://docs.osgi.org/download/r5/osgi.enterprise-${PV}.jar"
+
+LICENSE="Apache-2.0 OSGi-Specification-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RESTRICT="bindist"
+
+CP_DEPEND="dev-java/glassfish-persistence:0
+	dev-java/osgi-core-api:0
+	dev-java/tomcat-servlet-api:2.5"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+JAVA_SRC_DIR="OSGI-OPT/src"
+
+src_prepare() {
+	default
+	rm -r org || die
+}
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 703d4682239a..df6a330fc606 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,6 +1,6 @@
 DIST protobuf-3.17.3.tar.gz 5235236 BLAKE2B 2495e678c8f9436d4e5a30ccee8b6226125d418ac7ecf7df20b078a1a16c221cbccab7d846dcd56a90220c106617fa75c410a21b62612fedec378cd7e8571350 SHA512 b4030b4474cc5fb5a62501200725dd488e6e66e3ced4ed12ab4ee029fcfed305e92ec966adafbdd343afffd186908163849422b95eaa500e7e741ac325d01d12
 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
 EBUILD protobuf-java-3.17.3.ebuild 1451 BLAKE2B 4d08dcb9be366902af79f53bf8cb388ed2fd61192406ccca8089147f3854cef4e9d6824482dc2f35209cfe305e1ac69d1be790eeac87365aefd550c0a9d215ea SHA512 6804911a2b3167a7eb0889b4f7da071c97ec2b7aca9adb613679905f6ae3abb391caefbf3737a5ec30e7aef4ecd9a817df05b7ac16d95f893d4b6cce853cb89c
-EBUILD protobuf-java-3.19.3.ebuild 1454 BLAKE2B 493b90da2ef5874252e9876e6a8e760b5cef2f672bafbb0789b08b0fdfd7950e00ef78d744a3e85e673b46dff08b924761f4273cfad2519c9529e5c1febc279d SHA512 c8f40fba3ff4333dd4316f59fec5e1165bfabdff0e9d19ff4d79f1995c6bb2c4f0601a4e028f09237dd7e5574aec27177802dd2353ceb81454b2b7ec621cbba4
+EBUILD protobuf-java-3.19.3.ebuild 1451 BLAKE2B c0bad09302e1e52cff018223c055939e2d4335874f2be95e913705368926106c6967b5a98d7f0a392037060c040fd3116210f0d1de567dc17e66bfc252202e4b SHA512 a74e044d91db564a682f8d9b82fa73608fc10f2b0a917b1eb696375f5993e62cf03289a31b7e28aa27cbfdf027bf62160083ff39186d1f8333b52633ba5ed0fb
 EBUILD protobuf-java-9999.ebuild 1389 BLAKE2B e7a8e41fade60ff00e35c2cb29c185d68b2b5d41d99611f07eda97968c3b2f0d3e956304ae739a82cd386101dbd9936431483019b7bc38aad35d392674aa2bf4 SHA512 c0f3964bdde178cdf734318c9c5c42d5332401c276fa9513ec42e7729e8105b8129f89a53704f3b0622d831f96068501a131d47636aa95504a6d46df2e093f20
 MISC metadata.xml 548 BLAKE2B 2468487e12d536d67daebf5b7a21cd63a9c4af321a8979132e63d9b8394bf577e347f891326c73bfa6907e82ca355ea0d4ec40a37bb297db0da1e55a62b6ef33 SHA512 c0c2556fbf8821f3a75ed344daa59b4fc355029f96efb8f9784f54c819916adeb46b2c5d8c2e8d405dc58395c2f18b30cda69c6d406948a066bd1d78a55df80b
diff --git a/dev-java/protobuf-java/protobuf-java-3.19.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.19.3.ebuild
index e5e812ca84c2..594aff5cf66f 100644
--- a/dev-java/protobuf-java/protobuf-java-3.19.3.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.19.3.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/30"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index b9a03482df56..7ae296145c3e 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1,5 +1,4 @@
 AUX jflex-1.6.1.patch 680 BLAKE2B 2dba9bdba8ce77ebe28a608b505891ff49d51e9d7549bb17f21935ad9511fcdf4428a79b5243e5eb8cfb5747eaaaafb97eb6edca980ce337d37ed48772ff5ea5 SHA512 73e8067a31392a1975877470a2a239c9ca0913f807faa3e5c660bc2487dca9a46c1753ab86526e66581111fcded89229a4e9e3a16fa787ce3669ef6c07a28081
 DIST qdox-1.12.1.tar.gz 519833 BLAKE2B 83a732f1582b714cf943ede61bacc5216804c00cfbb642a479afb74739564f4fdbcd923dd7cb84a9626a97c5ad0a0f04895e0ae68252891cb25299e1fe1c9c72 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5
-EBUILD qdox-1.12.1-r2.ebuild 2225 BLAKE2B caf3e51d9d81e1a597092a5c20c2468266dda3559de0b07f948cd6026b983718941060f066a004464c4b177ec6a859139fd0549ff48dc82aff6fba24e8a60f90 SHA512 51a8c940ba702933bad4367de1f6a2a54d4d66710d3631529f61137ce27be1aaa0ce9dadb83005aa22331c241947637fe9a17a802923eef1002c0dad37051582
-EBUILD qdox-1.12.1-r3.ebuild 2176 BLAKE2B 768b1467779bb393d1db716aa3a1672507c8575d247bb1556d0569ce7063395422ced4eec92160fce27f6320cf87a7502909239362db4dc46b3b6b0f0ff541b5 SHA512 bc5017d33e50e5c04111f05862a2ed24c1d18f68f29f065c8f27a05c42943c118b2462e66be22f3294afa4043679afa54b8fb3f664e1affecd5b977492ec6cac
+EBUILD qdox-1.12.1-r3.ebuild 2172 BLAKE2B e7394846ea89da75fab13d32256319a3ef57638002e82caf3ff2c79043f3a02df8534f126b36ab077d883aa216364285e1346baa54a4c4ba60e064d40cac9095 SHA512 03c0d7f9e4571ac4cca4d6b69b12666f73144a42605e98d497ca3545b4d1012233df2979bd8662049b1be49e49dc93a5d84b7b383901ee49a52830d2c88674e0
 MISC metadata.xml 490 BLAKE2B 0074cd0a7da6af8028ff8bc8eba4b26f86d4ae5ea55da7a6fe0bfbcc73e779a9a6deeed0e82f95abc28324dcd1a89634b504d02265dea16ac26e576b6f29ace8 SHA512 039a450284a930e163cd9cd4c39c5ee6dd0a2f5678b5f77db7f809bbe0a141a564fa7232cbe3a428b31170068b1377cb953a8ccda4ee3b14b5ddb4d313180496
diff --git a/dev-java/qdox/qdox-1.12.1-r2.ebuild b/dev-java/qdox/qdox-1.12.1-r2.ebuild
deleted file mode 100644
index 2c9a64624663..000000000000
--- a/dev-java/qdox/qdox-1.12.1-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.thoughtworks.qdox:qdox:1.12.1"
-
-inherit java-pkg-2 java-ant-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
-	app-arch/unzip:0
-	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
-	java-pkg_register-ant-task
-
-	use source && java-pkg_dosrc src/java/com
-	use doc && java-pkg_dojavadoc javadoc
-}
diff --git a/dev-java/qdox/qdox-1.12.1-r3.ebuild b/dev-java/qdox/qdox-1.12.1-r3.ebuild
index b4f4cd178563..9f0982c09a7e 100644
--- a/dev-java/qdox/qdox-1.12.1-r3.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r3.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}-${PN}-${PV}"
 
diff --git a/dev-java/randomized-runner/Manifest b/dev-java/randomized-runner/Manifest
index 4961095e5ce5..46f06f53c364 100644
--- a/dev-java/randomized-runner/Manifest
+++ b/dev-java/randomized-runner/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD randomized-runner-2.7.9.ebuild 1931 BLAKE2B 09f6da01b65a81b92365db9196a2dbdf4e2246140350746c0c840adc572cb29021752955e407d271fbf60fd0e2e941a5753ea89afccf64b9ccb46ddb038d89e5 SHA512 7119d04a6d46368dd7e3e48de3c46f76a44feb1a1e20780fdac7a34e18c46ca53e0b3d6e0a39c4bc76fbb6b198f63a588221206454a1510d15cabc7085a51fca
+EBUILD randomized-runner-2.7.9.ebuild 1934 BLAKE2B c783f68a3b54df6d17059be6dd8b0aebfaca6156a82fc81b36c040a538ce82daa2965fbcf3d9701b3ade6ddeac6b0ffe7313f8e4517db3f2e09e6c265178c8f9 SHA512 c08ea9e7291fcdd6e8663058151a178d72ad40fea95b7e9e3d969bb6cdf16517cd3e1026fc0a753fd0a3c6685432f414ec171fec2673edeae8b1aeba03cb3fcc
 MISC metadata.xml 317 BLAKE2B 3da80829ccd32c18e7f9d05eaffee0f9433c2d0893363e911f1a0fb6d4260507ec4712c7035cdb2bd9d7b3fc7269d60f8346f2d82eb9bf7f3e25c03068ec1edd SHA512 f72fc2cfb58f31854ceb21c43f771b7eaf9b89d444e54179e54b2940ab7759f702640535f89b2101b65585ac8ea73d13c64583ae485608ab5a88e8f35f5a2a94
diff --git a/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild b/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
deleted file mode 100644
index acbb09778fb2..000000000000
--- a/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/randomizedtesting/randomizedtesting/archive/refs/tags/release/2.7.8.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild randomized-runner-2.7.8.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.7.8"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JUnit test runner and plugins for running JUnit tests with pseudo-randomness"
-HOMEPAGE="https://github.com/randomizedtesting/randomizedtesting/randomizedtesting-runner"
-SRC_URI="https://github.com/randomizedtesting/randomizedtesting/archive/refs/tags/release/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# junit:junit:4.12 -> >=dev-java/junit-4.12:4
-
-CDEPEND="
-	>=dev-java/junit-4.12:4
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? org.assertj:assertj-core:2.2.0 -> >=dev-java/assertj-core-2.3.0:2
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-	test? (
-		>=dev-java/assertj-core-2.3.0:2
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/randomizedtesting-release-${PV}/${PN}"
-
-JAVA_GENTOO_CLASSPATH="junit-4"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="assertj-core-2"
-JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/randomized-runner/randomized-runner-2.7.9.ebuild b/dev-java/randomized-runner/randomized-runner-2.7.9.ebuild
index 80a8dbc84563..a64ca2c3d78a 100644
--- a/dev-java/randomized-runner/randomized-runner-2.7.9.ebuild
+++ b/dev-java/randomized-runner/randomized-runner-2.7.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/randomizedtesting/randomizedtesting/archive/release/
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/reflections/Manifest b/dev-java/reflections/Manifest
index 77f5abe89f13..3477c1f89276 100644
--- a/dev-java/reflections/Manifest
+++ b/dev-java/reflections/Manifest
@@ -1,3 +1,5 @@
 DIST reflections-0.9.10-sources.jar 53049 BLAKE2B 23491098dc648206161d983148bf11a1c4523df0593c903f9dbf03672b481d85aabaed7733a5d829b7f334e51d53dadde3fd439e62f9873ceb11f49f40a2cfef SHA512 940b80ed43aa900177e6c3551980eafe10f7ea16a1e5c0d24fc8c1e29f1e0155aae83e24f60af10f9743449ed38d2d3b211f3668fafbd95a6a2cb9c5581f56bf
+DIST reflections-0.9.12.tar.gz 48235 BLAKE2B c82bd69f4433d8db738fcd32dd7fbf643984917622853b1886e15b906a91579de0193daf0fc1a9642c12d13de8236acf3e1f1409a18713b37c6e705a3cae34bd SHA512 8f8c7603ab73b599c6e2160f42b61c4e0eedef9981c06124bba0437d6636e7bf8a916784e266754562dc17f4d3ccf8df6c9ba707d1a7c38d97dc5eea9138064f
 EBUILD reflections-0.9.10-r1.ebuild 722 BLAKE2B 538624b2713ad75cb8ef54786e492e78eb41e422fc3c8152c58c2e179f09131801ceee214848d45a74f750c5ae57c26e98fb9de6b2b47c8c0fbefadb3ca06744 SHA512 a950aaf4c57532746fac766c12f897028d0486227e3effe5a79db71c53a283693df5ab80095a5e60d76ae11a3363357147246586594c91b9c32c8307a8933df3
+EBUILD reflections-0.9.12-r2.ebuild 3889 BLAKE2B eed33a289b430f9acfa2f756eab87bd040689bc84c5ab89788f0ad2b9bd8fdbbf22e00ceb90c8f23f0d358de0393e549d65c0035042c05b2d455522f3e1ceb3f SHA512 24cf7a49ad9e233b80a2cdf5a70ec3439f2f584f98d87d72859e70ee34e29bcd5ad8381ef6f376a2941673a2e1a71546272a13cc3c56f6820559c8908fea2ce7
 MISC metadata.xml 527 BLAKE2B 92b0ca46422b8b0107bef220664c0079db47a3c8f306f59d5b681b653e5bcb835a192c8018d719447ebc864ead58f3844340bf3f84ff5bbef0ab126b7d314efe SHA512 a7ad6c598f83a911b20f5b31573127433d2bd756ac15d4a29de907ce102a5fb77de2426035a8255125446128b8ef13ed1f9fa002bff285cddbaf9043bd71dddc
diff --git a/dev-java/reflections/reflections-0.9.12-r2.ebuild b/dev-java/reflections/reflections-0.9.12-r2.ebuild
new file mode 100644
index 000000000000..64c3642c4eff
--- /dev/null
+++ b/dev-java/reflections/reflections-0.9.12-r2.ebuild
@@ -0,0 +1,99 @@
+# 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/ronmamo/reflections/archive/0.9.12.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild reflections-0.9.12.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.reflections:reflections:0.9.12"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Reflections - a Java runtime metadata analysis"
+HOMEPAGE="https://github.com/ronmamo/reflections"
+SRC_URI="https://github.com/ronmamo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="WTFPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.google.code.gson:gson:2.8.6 -> >=dev-java/gson-2.8.8:2.6
+# org.dom4j:dom4j:2.1.1 -> >=dev-java/dom4j-2.1.3:1
+# org.javassist:javassist:3.26.0-GA -> !!!suitable-mavenVersion-not-found!!!
+# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
+# org.slf4j:slf4j-simple:1.7.24 -> >=dev-java/slf4j-simple-1.7.30:0
+
+CP_DEPEND="
+	dev-java/dom4j:1
+	dev-java/gson:2.9
+	dev-java/javassist:3
+	dev-java/slf4j-api:0
+	dev-java/slf4j-simple:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# javax.servlet:servlet-api:2.5 -> java-virtuals/servlet-api:2.5
+# POM: pom.xml
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="
+	dev-java/tomcat-servlet-api:2.5
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_CLASSPATH_EXTRA="tomcat-servlet-api-2.5"
+JAVA_SRC_DIR=( "src/main/java" )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR=( "src/test/java" )
+JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" )
+JAVA_TEST_EXCLUDES=(
+	# Upstream does not run this test
+	"org.reflections.TestModel"
+	# 1) testMethodParameterNames(org.reflections.ReflectionsCollectTest)
+	# org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
+	#         at org.reflections.Store.get(Store.java:39)
+	#         at org.reflections.Store.get(Store.java:61)
+	#         at org.reflections.Store.get(Store.java:46)
+	#         at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
+	#         at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
+	org.reflections.ReflectionsCollectTest
+	# 2) testMethodParameterNames(org.reflections.ReflectionsParallelTest)
+	# org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
+	#         at org.reflections.Store.get(Store.java:39)
+	#         at org.reflections.Store.get(Store.java:61)
+	#         at org.reflections.Store.get(Store.java:46)
+	#         at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
+	#         at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
+	org.reflections.ReflectionsParallelTest
+	# 3) testMethodParameterNames(org.reflections.ReflectionsTest)
+	# org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
+	#         at org.reflections.Store.get(Store.java:39)
+	#         at org.reflections.Store.get(Store.java:61)
+	#         at org.reflections.Store.get(Store.java:46)
+	#         at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
+	#         at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
+	org.reflections.ReflectionsTest
+	#
+	# https://github.com/ronmamo/reflections/issues/277#issuecomment-927152981
+	# scanner was not configured exception - this is a known issue in 0.9.12, a simple workaround is to
+	# check if the getStore() contains index for the scanner before querying. next version 0.10 fixes this.
+)
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/relaxng-datatype/Manifest b/dev-java/relaxng-datatype/Manifest
index 9475f0ecb0a8..660e4539f82c 100644
--- a/dev-java/relaxng-datatype/Manifest
+++ b/dev-java/relaxng-datatype/Manifest
@@ -1,3 +1,4 @@
 DIST relaxng-datatype-1.0.zip 74033 BLAKE2B 15b488e914cab28fb9ade71b491d961ffa4f683f66759e96cd53dcf69edd39d423b5562831698bb3e03191396c86a2a93369f14d278f3c55a90728031d1921d3 SHA512 712b99209e927e8929c46797cf3733993cc2740bfbafb458c518e5e130a7860a19dee45acd360a9d7179137f9340c3edeb514cacf501233cca515b38e60d6b79
 EBUILD relaxng-datatype-1.0-r2.ebuild 769 BLAKE2B c61b24730f52dd084a71f4b73e8a98799485d999ec475dde01d1e574934b71cfbd806af385c36dceb597ff8db83ad3431af28a3cc78571c858197753ac8b92c4 SHA512 eb96c8295349207944862348b12222ce8d14c15b05e0c109422b65410756f71cea24f8401a3847c5979879cacb14df529aaf6b426c0694ebb14c5e2f3d824eac
+EBUILD relaxng-datatype-1.0-r3.ebuild 762 BLAKE2B 187ca366dbb47f45ba21308811faaae5e017e800feffb0a37c58d1cee18748215038438b43d2e4d4d014c598ecbd17e28bb202c52d52df895165d11e603aa8e8 SHA512 c35c8ba4adf80b377fedca05d6d5da66ac1b8ab7f8e6bc10917c7b8e02324dfa6d2b7e47bf91073dc3e3b71adb72926e4f170b870bfe02a7b6f8274116bef954
 MISC metadata.xml 314 BLAKE2B 3c7bd8a6004758af05fccf02d2636fa62e2dea9e653c89600b37ce223d10c6f24b03df605db96ab55a5177994ee1eddca450df7a1d6e9fc86c50573c7da9e4a6 SHA512 eaa99aa2ba88d8a70bc38924266c1e33a264274ab13dbb88d9a73d278c03c872a56d8ed122cc4a44e84ef9436e6c016310c38ad05fa9976300018472b43780b8
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild
new file mode 100644
index 000000000000..5886aafc3e3f
--- /dev/null
+++ b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.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"
+
+MY_PN="relaxngDatatype"
+MY_P="${MY_PN}-${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Interface between RELAX NG validators and datatype libraries"
+HOMEPAGE="https://relaxng.org/"
+SRC_URI="mirror://sourceforge/relaxng/${MY_P}.zip -> ${P}.zip"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+LICENSE="BSD"
+SLOT="0"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	einstalldocs
+}
diff --git a/dev-java/saxon/Manifest b/dev-java/saxon/Manifest
index 3437a391ef33..fc77c65fa859 100644
--- a/dev-java/saxon/Manifest
+++ b/dev-java/saxon/Manifest
@@ -2,8 +2,6 @@ AUX 9.2-build.xml 2061 BLAKE2B fb4e505f9308caf2300b7a1159ff20a973576d974544b1be0
 AUX 9.2-edition.properties 74 BLAKE2B d468841c782fa7bf1b39cbeeac01d983a8d6891a13a97b2994496dd80e1c4e3cac893b35f813bccf4e0a877c7c3f1a6c5c12a9c6005b82efb2c42a70a49e93dc SHA512 2c95fc288bb35f68819edc95e8ce30f921b17196123ee7ce0c9908d210e8758c51204bc7dd222d6b7e4803dceb331bcd83120622fa2bcb6587d150a0f479ca02
 DIST saxon6-5-5.zip 3346162 BLAKE2B 63d49545d101c3b595ff3f3db6d781158b8a51862ccdc294e782ac0935010a841405fb21663bd35853042c53548991dfefa7f789be292fe8497a29253c87ee09 SHA512 2d76ab6da8fc8ca8502139f6b620d4c9e94732a520083480e3936f6bd0a9f069252a7a05df53dab49aabec505764b2ec4ca1b36022bb56df568883a0491f495a
 DIST saxonhe9-2-0-6source.zip 2942625 BLAKE2B 45f9cc12591ebb94076392b16edba52811d911c41f2f197ffe864e37c1ef478670ff276b7dc8dff316dcd2986f777b4cc2d43989e5d300510ee0edfe7e54103d SHA512 6c59c0cbed905cf561387acb54bb31f0a251432deb0edf498ec4f4d9955bbcc12d1765ace594090d3ccb0416e3e72349466e430bb4f799b51fd12ce8fc5a144e
-EBUILD saxon-6.5.5-r2.ebuild 880 BLAKE2B 2916359129a0460531c31e5b7d511ba1685bc685b569e5c76d342423b3ecf5c8a357840cf45f4e0d92cc3954ce7bb457da51dcd06cdc55d5fe4ba2657a2efabd SHA512 978932d30eb0374bd527e40bb6be7a27c59c64c60e105bd815778a40d1cddd6f99ad70ed35371fe00637878951797969db3fdb9b1e2f492612c1286ac2dad50e
-EBUILD saxon-6.5.5-r3.ebuild 995 BLAKE2B ad6be49a087782483cb99b00d3ea5ea7a531aab08efbf5bb7585b11ec3c6aaf982d6d8eff92037e99b8aa3a0b97e8736bd791743ebe13d86060e4a098e4f201e SHA512 143033c03b7937b53ab03387de72d4b9338b01b2af92807ab3c72e2e7a0fe5eb4a3413ecc14c5eee32f9c7da3a607eb37ba08d14bfae58b3d359d806698c13a4
-EBUILD saxon-9.2.0.6-r2.ebuild 1977 BLAKE2B da97c782b3c1654b5baf8833de0c5e007f40b55780cc02a4eef056991cf1d250c9f82237615642ba71c30acb7d3bb4146f0ad01c314070b058dcdc9b14ec03ac SHA512 88cd0d289c424aea55ca46abee3cfe6f16a9e73976a68c23c2c84431cdbe151cef36f476ab14c10ac8f7c47afb5ba023a4db5548c1a21fffece73b6cf7ddb5b6
-EBUILD saxon-9.2.0.6-r3.ebuild 1950 BLAKE2B de14cd32ee61d1c7016f276634b63d77b21eaff832c15cfe2d380c0769eeba04621a97cfa33d71a8ce3c3394930482f08fe69871b00028f6fafc691244313deb SHA512 fd1ed9458b8de7b9ea7e05bbb07b72a96162594350391eef5de212d5d933635cb392be466ccc56c0b147c4a0a578615b7d57c2099895b88a99921fcb0248288a
+EBUILD saxon-6.5.5-r3.ebuild 993 BLAKE2B 96ab5a23fc57bd1ece66cb1c8a851f6f67acefed4a58efd62f129ac06c2044377a0ab414e664359e4f17edce3359f26eb3ca391447a34fd1b68a97027a4e6df8 SHA512 dec6f8838700af7285308dd7bbeca3bdd36bb4b1feb7e82a697c48302d59b46aa2f2a87d6632cce852be900d44eacda5c62ae96ea67f0d6ba400a9ec37478f3b
+EBUILD saxon-9.2.0.6-r3.ebuild 1948 BLAKE2B b58f35ba01f73ea74fdb609535549d6b18face2ed0a338916efb8c06f26a4fb1c523717edfae4ef056d58908c0b34adebcc7111f910d15823fc7ea4c0f419941 SHA512 b27825c39664b21d23330bf9011d8b1f57543117dd58f28689aa2e642f6a03bf253e3504d684f1626835dac17581442ec5770f08885844ae373b3daa20c67eeb
 MISC metadata.xml 312 BLAKE2B 819738845b7b0a9a9fcc19e4997fdfdaf55b820253d58ea32b1fac35dab2b5760e4cdadd38607b54df2f3bc2b10eee0d747d59c6785ecb3f1b3ca3a68e428be7 SHA512 f798aabc41fc786a18b25c42ac3201b8f2d3e665397f53bc1988531f8ea75ce0d8517af43dadf6fac433d8f689f25dc7f6593c83d941feac5a2d14fe58c82fd1
diff --git a/dev-java/saxon/saxon-6.5.5-r2.ebuild b/dev-java/saxon/saxon-6.5.5-r2.ebuild
deleted file mode 100644
index e33a43038e65..000000000000
--- a/dev-java/saxon/saxon-6.5.5-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple versionator
-
-MY_P="${PN}$(replace_all_version_separators -)"
-
-DESCRIPTION="Set of tools for processing XML documents"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-HOMEPAGE="http://saxon.sourceforge.net/"
-
-LICENSE="MPL-1.1"
-SLOT="6.5"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/jdom:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="jdom"
-JAVA_ENCODING="ISO-8859-1"
-JAVA_SRC_DIR="src"
-
-src_unpack() {
-	unpack ${A}
-	unzip -qq source.zip -d src || die "failed to unpack"
-}
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_install() {
-	default
-	java-pkg-simple_src_install
-	use examples && java-pkg_doexamples samples
-}
diff --git a/dev-java/saxon/saxon-6.5.5-r3.ebuild b/dev-java/saxon/saxon-6.5.5-r3.ebuild
index 49603d408175..f104b7ae35ad 100644
--- a/dev-java/saxon/saxon-6.5.5-r3.ebuild
+++ b/dev-java/saxon/saxon-6.5.5-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/saxon/saxon6/${PV}/saxon${PV//./-}.zip"
 
 LICENSE="MPL-1.1"
 SLOT="6.5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CP_DEPEND="dev-java/jdom:0"
 
diff --git a/dev-java/saxon/saxon-9.2.0.6-r2.ebuild b/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
deleted file mode 100644
index 4332edc035b1..000000000000
--- a/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit versionator java-pkg-2 java-ant-2
-
-MY_PV="$(replace_all_version_separators -)"
-
-DESCRIPTION="A XSLT and XQuery Processor"
-HOMEPAGE="http://saxon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}he${MY_PV}source.zip"
-
-LICENSE="MPL-1.0"
-SLOT="9"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CDEPEND="
-	dev-java/xom:0
-	dev-java/jdom:0
-	dev-java/dom4j:1
-	dev-java/ant-core"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}"
-
-# prepare eclass variables
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
-
-src_prepare() {
-	default
-
-	# Fedora-inspired removal.
-
-	# deadNET.
-	rm -rv net/sf/saxon/dotnet || die
-
-	# Depends on XQJ (javax.xml.xquery).
-	rm -rv net/sf/saxon/xqj || die
-
-	# This requires a EE edition feature (com.saxonica.xsltextn).
-	rm -v net/sf/saxon/option/sql/SQLElementFactory.java || die
-
-	# <major>.<minor> version
-	local version="$(get_version_component_range 1-2)"
-
-	# generate build.xml with external javadoc links
-	sed -e "s:@JDK@:1.6:" \
-		-e "s:@JDOM@:1:" \
-		< "${FILESDIR}/${version}-build.xml" \
-		> "${S}/build.xml" \
-		|| die "build.xml generation failed!"
-
-	# prepare creates the dir for properties
-	eant prepare
-
-	# properties
-	cp -v \
-		"${FILESDIR}/${version}-edition.properties" \
-		"${S}/build/classes/edition.properties" || die
-}
-
-src_compile() {
-	local gcp="$(java-pkg_getjars dom4j-1,jdom,xom)"
-	gcp="${gcp}:$(java-pkg_getjars --build-only ant-core)"
-	eant -Dgentoo.classpath="${gcp}" jar $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar build/lib/${PN}.jar
-
-	java-pkg_dolauncher ${PN}${SLOT}-transform --main net.sf.saxon.Transform
-	java-pkg_dolauncher ${PN}${SLOT}-query --main net.sf.saxon.Query
-
-	java-pkg_register-ant-task
-
-	use doc && java-pkg_dojavadoc build/api
-
-	use source && java-pkg_dosrc src
-}
diff --git a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild b/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
index a1b75f2207b4..f2a12503a449 100644
--- a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe${PV/
 
 LICENSE="MPL-1.0"
 SLOT="9"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CDEPEND="
 	dev-java/xom:0
diff --git a/dev-java/slf4j-ext/Manifest b/dev-java/slf4j-ext/Manifest
index 2d4f4702d697..c5f4c4b3f854 100644
--- a/dev-java/slf4j-ext/Manifest
+++ b/dev-java/slf4j-ext/Manifest
@@ -1,3 +1,3 @@
 DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
 EBUILD slf4j-ext-1.7.36.ebuild 1885 BLAKE2B 2c2a73ab02c8d1aae8cd883b68020a6ce156dd8ee39bf456fed56131a3bfca476334fb1641e605b8d7c9b6be70103a8bf0e61ad8fc281d379afa94c0882c7066 SHA512 12cd4f52ca331c0c09b25c4ad1e4f6bf0f615bf04b8b6e49253e2307a361c3251e6acb2f0f49175d8c23d81a50db3eb81f8e901de83cf59cc50101c0e9693f83
-MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
+MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/slf4j-ext/metadata.xml b/dev-java/slf4j-ext/metadata.xml
index 37998bf40746..6ef2d50cf07e 100644
--- a/dev-java/slf4j-ext/metadata.xml
+++ b/dev-java/slf4j-ext/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>java@gentoo.org</email>
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index 41d05244861a..5852eead8646 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1,7 +1,4 @@
-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
-EBUILD snakeyaml-1.30.ebuild 3147 BLAKE2B 7ecb31f84c2f779f31e5cd3d22ab09a5e54dc77d1d6865adeffd8b59d4fa36614300d27acbf133c184a97c16cbafc81aa67851534549646e5171b16f70715097 SHA512 6784de89821f053ceb8f8164ad58bae8d4c89db74bef105aeb0c4e95839a59b15d6f3a23a4fc8accb8d2fc919cc16ed95ba463710574c84a7fe3b490bf9c1fbf
+EBUILD snakeyaml-1.30.ebuild 3143 BLAKE2B 3168587833152ded025e595d11391ada4fd9ffbca65429b3d59c23034103489190e02a56888372143ac32788c63ce39664c626f2855fd0603c0bdc6d5fce91bb SHA512 89a163deec9c2541d8358400f25d9b6793c2f2f150f4fb5cd7fd0aa90bba57fdb3fb4e359c552ba5c10ffb1d7e59719ff5a99496438b9e4b81dc1410734ff796
 MISC metadata.xml 548 BLAKE2B b9d917044a58addef7e75a2714a1a2f70c6ac4db0b30469b93c034b5aca8cd834652c5446b42c99e6785c222667c523b6325341e8f35be342622ad1486411ba6 SHA512 bfb8134a7351f7d0fe4a6433a4655ad8baa207641cb9939591209d05c3caf2d92593891b4b2dced236bb2186d3e410c54ba28682251c5d5f1d5d590e4e94ee61
diff --git a/dev-java/snakeyaml/files/snakeyaml-1.28-fix-test-check.patch b/dev-java/snakeyaml/files/snakeyaml-1.28-fix-test-check.patch
deleted file mode 100644
index fe903380fd61..000000000000
--- a/dev-java/snakeyaml/files/snakeyaml-1.28-fix-test-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java
-index e87f330..28c836b 100644
---- 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,8 @@ public class BillionLaughsAttackTest {
-             map.toString();
-             fail("Expected overflow");
-         } catch (Throwable e) {
--            assertTrue(e.getMessage().contains("heap"));
-+            final String message = e.getMessage();
-+            assertTrue(message == null || message.contains("heap"));
-         }
-     }
- 
diff --git a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
deleted file mode 100644
index 771b05ba5ef1..000000000000
--- a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 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/asomov/snakeyaml/get/snakeyaml-1.28.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild snakeyaml-1.28-r1.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.yaml:snakeyaml:1.28"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_COMMIT="b28f0b4d87c6"
-MY_P="asomov-snakeyaml-${MY_COMMIT}"
-
-DESCRIPTION="YAML 1.1 parser and emitter for Java"
-HOMEPAGE="https://bitbucket.org/asomov/snakeyaml"
-SRC_URI="https://bitbucket.org/asomov/${PN}/get/${P}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Compile dependencies
-# POM: pom.xml
-# test? commons-io:commons-io:2.5 -> >=dev-java/commons-io-2.4:1
-# 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.1:4
-# test? org.apache.commons:commons-lang3:3.4 -> >=dev-java/commons-lang-3.4:3.4
-# test? org.apache.velocity:velocity:1.6.2 -> >=dev-java/velocity-1.7:0
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		>=dev-java/commons-io-2.4:1
-		dev-java/commons-lang:3.6
-		>=dev-java/joda-time-2.10.10:0
-		>=dev-java/velocity-1.7:0
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-test-check.patch"
-)
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="commons-io-1,joda-time,junit-4,commons-lang-3.6,velocity"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
-	"examples.spring.TestEntityDescription"	# Invalid test class
-	"org.yaml.snakeyaml.constructor.TestBean1"	# Invalid test class
-	"org.yaml.snakeyaml.introspector.TestAnnotation"	# Invalid test class
-	"org.yaml.snakeyaml.introspector.TestBean"	# Invalid test class
-	"org.yaml.snakeyaml.ruby.TestObject"	# Invalid test class
-	"org.yaml.snakeyaml.issues.issue154.TestBean"	# Invalid test class
-	"org.yaml.snakeyaml.issues.issue193.TestYaml"	# Invalid test class
-
-	# initializationError(org.yaml.snakeyaml.constructor.TestBean)
-	# java.lang.IllegalArgumentException: Test class can only have one constructor
-	"org.yaml.snakeyaml.constructor.TestBean"
-
-	# testTemplate1(org.yaml.snakeyaml.emitter.template.VelocityTest)
-	# java.lang.NullPointerException
-	"org.yaml.snakeyaml.emitter.template.VelocityTest"
-
-	# yamlClassInYAMLCL(org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest)
-	# java.lang.ClassNotFoundException: org.yaml.snakeyaml.Yaml
-	"org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest"
-
-	"examples.spring.TestEntity"	# Invalid test class
-
-	"org.pyyaml.PyImportTest"	# No tests found in org.pyyaml.PyImportTest
-)
-
-src_prepare() {
-	default
-	java-utils-2_src_prepare
-}
-
-src_test() {
-	export EnvironmentKey1="EnvironmentValue1"
-	export EnvironmentEmpty=""
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/snakeyaml/snakeyaml-1.30.ebuild b/dev-java/snakeyaml/snakeyaml-1.30.ebuild
index 6ae8d5e2d63e..9ec4118119dc 100644
--- a/dev-java/snakeyaml/snakeyaml-1.30.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-1.30.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/stax2-api/Manifest b/dev-java/stax2-api/Manifest
index b266cce2a596..b0c37b30550f 100644
--- a/dev-java/stax2-api/Manifest
+++ b/dev-java/stax2-api/Manifest
@@ -1,3 +1,4 @@
 DIST stax2-api-4.2.1.tar.gz 128806 BLAKE2B 64254b0bbd269e5d62931280773e0e7e7915204ce41a86eb10a08e3d8d27691d48094e17a8deb0ca3fa916b413800d75969af05db1ba897277c0dae13771e3b4 SHA512 f6fada289e75db0c4c911d3f70e8b8167c96342390168c87563ab4e3e1498360d47c393407cd8ae670716fcb7e1c83d6a8d38364d00648ed380844cf08bdc063
+EBUILD stax2-api-4.2.1-r1.ebuild 1045 BLAKE2B bd6faef438c8c68879f579f459c926629d7d94912880d2d62a3287a54987743ce32774ed7891eff643ca7458953175a30743fccb61a42b7d17cd507037d42ba5 SHA512 6219dd8c9acedcd1b675197cc593dd21fffca45b83e9c344a3c7df702e2cb0aa5cb96ad3509d9153cb7895650a728e911688460b13e1cf7174084ca2f9e35be9
 EBUILD stax2-api-4.2.1.ebuild 1044 BLAKE2B bcd69c387fc42a8b474b408fec694d46def41c97b06d689d0748c9f399325d31c808301247b8fd0b4d4f596c3bb35e3d9a44ed1b90c5bbd0a3cdc836b851fb75 SHA512 9655f78987b664063072b6ad8f080555328192ffc401dc85a9d4e4d8265c940d7232f1ed76f3cab35cdfcb3369484c687504138eac6db0c95fc06b18d219ddcb
 MISC metadata.xml 534 BLAKE2B 53aec30f2ec738fa257cf67be461177475f4706f625a41ec72a51bcc97e16e8fe2ddad45f74e749230e7f668dbb6857d66409413ce462eb13cef793a955e94b2 SHA512 ed2bb40dbbe18087f3b1647878f072be88c57034c9af03cafb4ceebb9f11e84e9309c2a316299938ebbf2e872eed75de19ceb31efc88849b73b527918d540ba9
diff --git a/dev-java/stax2-api/stax2-api-4.2.1-r1.ebuild b/dev-java/stax2-api/stax2-api-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..9e3c9d842122
--- /dev/null
+++ b/dev-java/stax2-api/stax2-api-4.2.1-r1.ebuild
@@ -0,0 +1,35 @@
+# 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/stax2-api/archive/refs/tags/stax2-api-4.2.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild stax2-api-4.2.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.codehaus.woodstox:stax2-api:4.2.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="stax2 API is an extension to basic Stax 1.0 API"
+HOMEPAGE="https://github.com/FasterXML/stax2-api"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm arm64 ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.9:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( README.md release-notes/VERSION )
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+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 700deba5a560..7e63692cfebd 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,10 +1,7 @@
 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
+EBUILD stringtemplate-4.3.2.ebuild 3312 BLAKE2B 831ddaeb827e85e9749b13725bbdbc75f15a277b97ecd107839f988efa21becf70fc851ddb2b2e39f2478637798dc72c38495907565db908f91c06ce35f0d920 SHA512 32a4d5a7698c87d6e0e6a683b29ffc33500ee4f8d13543ad93f58e33853f58cfc9d963fdb8341371e31b64c858b958ac86db4e25281ccbdae740c2d8699f1f5e
 MISC metadata.xml 323 BLAKE2B 4b53767b7c81b78dfcfb69b4175baba46ee266cf145dff77dc855838f8b3209edf2fa1949b17aa88b284f0cc92d68250c0b64d4966253de734f1263d46b6b6be SHA512 9f7523f1186535db76c503816be7b41a6f58fb07469347d43acfbee68effdb5e748ebae3cc9cba2c9ac45b0c504b64eabd4947c48f040efa2d42f11328ae100c
diff --git a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
deleted file mode 100644
index 96b458d2cc14..000000000000
--- a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.antlr:ST4:4.3.1"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java template engine"
-HOMEPAGE="https://www.stringtemplate.org/"
-# Maven Central sources JAR for *.java sources pre-generated from *.g files;
-# the source generation requires antlr-tool-3.5, which depends on this package.
-# Tarball for the test suite and DOCS files
-SRC_URI="
-	https://repo1.maven.org/maven2/org/antlr/ST4/${PV}/ST4-${PV}-sources.jar
-	https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-CP_DEPEND="
-	dev-java/antlr-runtime:3.5
-"
-
-BDEPEND="
-	app-arch/unzip
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-	test? (
-		dev-java/antlr-tool:3.5
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-"
-
-S="${WORKDIR}"
-TARBALL_S="${S}/${PN}4-${PV}"
-
-JAVA_SRC_DIR="org"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,antlr-tool-3.5"
-JAVA_TEST_SRC_DIR="${TARBALL_S}/test"
-
-DOCS=( "${TARBALL_S}/"{CHANGES.txt,contributors.txt,README.md} )
-
-src_prepare() {
-	java-pkg_clean # Just in case Maven Central sources JAR contains binary
-	if use test; then
-		pushd "${TARBALL_S}" > /dev/null ||
-			die "Failed to enter directory storing tarball contents"
-		eapply "${FILESDIR}/${P}-BaseTest-javac-source-target.patch"
-		popd > /dev/null ||
-			die "Failed to leave directory storing tarball contents"
-	fi
-	java-pkg-2_src_prepare
-	# Some of these tests requires a graphical display.
-	rm -v "${JAVA_TEST_SRC_DIR}/org/stringtemplate/v4/test/TestEarlyEvaluation.java" || die
-}
-
-src_test() {
-	# Make sure no older versions of this slot are present in the classpath
-	# https://bugs.gentoo.org/834138#c4
-	local old_ver_cp="$(nonfatal java-pkg_getjars "${PN}-${SLOT}")"
-	local new_test_cp="$(\
-		java-pkg_getjars --with-dependencies "${JAVA_TEST_GENTOO_CLASSPATH}")"
-	new_test_cp="${new_test_cp//"${old_ver_cp}"/}"
-
-	# Some of the test cases require an absolute path to the JAR being tested
-	# against to be in the classpath, due to the fact that they call the 'java'
-	# command outside ${S} and reuse the classpath for the tests:
-	# https://github.com/antlr/stringtemplate4/blob/4.3.1/test/org/stringtemplate/v4/test/TestImports.java#L103
-	# https://github.com/antlr/stringtemplate4/blob/4.3.1/test/org/stringtemplate/v4/test/BaseTest.java#L174
-	new_test_cp="${S}/${JAVA_JAR_FILENAME}:${new_test_cp}"
-
-	# Use JAVA_GENTOO_CLASSPATH_EXTRA to set test classpath
-	local JAVA_TEST_GENTOO_CLASSPATH=""
-	[[ -n "${JAVA_GENTOO_CLASSPATH_EXTRA}" ]] &&
-		JAVA_GENTOO_CLASSPATH_EXTRA+=":"
-	JAVA_GENTOO_CLASSPATH_EXTRA+="${new_test_cp}"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs # https://bugs.gentoo.org/789582
-}
diff --git a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
index 1d0130c2b54f..760604d57456 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index d50e15344c54..ea206ab5f891 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,5 +1,5 @@
-DIST tomcat-native-1.2.31-src.tar.gz 428057 BLAKE2B 9e76c2c4c6e3721c36331f21026c00dda40e811ed34b6deb024f3511159c96ec624131aa3d9e0cc26fb97286bd9f0133d03d742fa5616d05ed18ecacb05d3d51 SHA512 2aaa93f0acf3eb780d39faeda3ece3cf053d3b6e2918462f7183070e8ab32232e035e9062f7c07ceb621006d727d3596d9b4b948f4432b4f625327b72fdb0e49
 DIST tomcat-native-1.2.32-src.tar.gz 429747 BLAKE2B 48fd1d93866cd4c4e610d54a65b429a31be27a90507bf28c547c2127218896646b385eb9741af3eba46d2dd3534b998352c7ab655dbb02dd8a646127e5bfaad3 SHA512 97587fdec8f12550003db44ae41cb864a16c08fc9362ca4c709b8090ead178d4f9d841436699b29496004b412a097ed5f56655f4fddfc5f4b6e333cbf890423e
-EBUILD tomcat-native-1.2.31.ebuild 1182 BLAKE2B 9a7261837690e5b5a1bc07019bcf27f1c34e9c08740ede80ce86e844132736515c4ce9f18e940509f67f8f85616b376806180901da445a57f1026ceb1c085a02 SHA512 75b69feb9bd93291cd8d834394c8344fd792205d28ab6e381f07f0139b241a27c32befd5f63b3db40fac5365d22f79024ee08e6b9b38d38d4702cbab5b1f064b
-EBUILD tomcat-native-1.2.32.ebuild 1183 BLAKE2B 72151cd98fadc6c5b01b6d41335aa922546a866e67959b85429941a3f14279a7008251b60e511d69a01d71cd0936366b247cd826d3a457176d5461a7afb97541 SHA512 372060e6f4641fe0886a9f1a43788722c12d49c6497d52c277f1edab3b31e59b1cefa38873dc77c60f03b81bfde5d3ca201b50c2e8f5696f0bd79dc2b216b306
+DIST tomcat-native-1.2.33-src.tar.gz 430359 BLAKE2B 2253907b5e3e0121ad520e1a5938cd8ceea55bd1403d320d382b959a0885c7e9374afb2b1828714d2f028dc0bfe6b6010d493e1e1b6d45942b4d27321d79614b SHA512 b9ffe0ecfd14482ed8c752caf2c28d880ab5fca1f5ea1d5b2a8330d26a14266406bdecda714644603ba2d4ca78c22ec5fc2341afd09172d073f21cf5a1099a0f
+EBUILD tomcat-native-1.2.32.ebuild 1182 BLAKE2B ae624184e321f4eae4a1c26f028e230af06bd37f12a26bf86a3b143f29869408c7371b3f296ddbece209c968de2fef24b416ad71cd22c36d499493400ed1df08 SHA512 91222f3794cda0de3532af0f9e5d564e53662de5c73537a3b8e787e09dde61d43f6c03bf516d389789a01c2396d9607c85e44255017af74a85af0d0abcee68c4
+EBUILD tomcat-native-1.2.33.ebuild 1183 BLAKE2B 72151cd98fadc6c5b01b6d41335aa922546a866e67959b85429941a3f14279a7008251b60e511d69a01d71cd0936366b247cd826d3a457176d5461a7afb97541 SHA512 372060e6f4641fe0886a9f1a43788722c12d49c6497d52c277f1edab3b31e59b1cefa38873dc77c60f03b81bfde5d3ca201b50c2e8f5696f0bd79dc2b216b306
 MISC metadata.xml 807 BLAKE2B 38715d09df2df7390b4f1bb3179d2d5cb65874f438ea434cc30e52aa8068ae9d9fb60f147f69cda6300cef97aeaa8eb950c55027f5cc3ca67f9afdaf0457b21a SHA512 fc6ae086e1855089491a9ba0b1abb007005a15eb85b5b213d8d36451ff10968dbd810f229795dc384e0e48ab1b9dabffacac333397c4b526c5490de5f99d7d5d
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.32.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.32.ebuild
index 1d527ab32b16..39a5c2b3e960 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.32.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.32.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Allows Tomcat to use certain native resources for better performanc
 HOMEPAGE="https://tomcat.apache.org/"
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="static-libs test"
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.31.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.33.ebuild
index fd32b6403ca4..1d527ab32b16 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.31.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.33.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit java-pkg-2 java-ant-2
 
@@ -9,7 +9,7 @@ DESCRIPTION="Allows Tomcat to use certain native resources for better performanc
 HOMEPAGE="https://tomcat.apache.org/"
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="static-libs test"
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 18d9c9f76c68..ca6b64182018 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,30 +1,24 @@
 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.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.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-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
 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 3016 BLAKE2B d4b281fb6a84e62b86e64cf5195c1942d1c403925471e1b2c218701424fc5ee32eecf63614db763062b12301bfdcfa2834b6699f3b1ec84f223f3acebb8ad895 SHA512 d4b047ee6bf2257d5d375a9ea2913a534b73607755908fd9663c12f996bbafef0a39169fe96c8f67eff63c2b6ef45f69e679090d94109de6da15a74367ef8feb
-EBUILD tomcat-servlet-api-10.0.20.ebuild 3018 BLAKE2B 7407df97c33c89d436e1d338f9c30a1dd2b2b0b90aad199e2e1d02a6a2d0360ef2f95f7b452d4b677d4daad016d5a27bc7a823e353355c7c28f6586117efa6e9 SHA512 7c08253ab8ec762c693902e17a0261023e9cbdd022b436944fd921b0969807bf79766d3ff6c951db1b9cae1580d073c6259d3d4688ae3a3ab88a8c3762cefc27
+EBUILD tomcat-servlet-api-10.0.18.ebuild 3015 BLAKE2B 8326a595c857ea61fb4c7c684de79a3255822ba0235f9734cfbc64240b9e4917033f242ed12be88efaf8498fcf306c4b8e2162462fbaf0df808fdb33c40f4219 SHA512 a530aeb1d78bb9cb95ec8cb54113668995d3d6989ae50ddeeb1bf220d1629198b6b5d5a1009826aa329d1174eb99cf5b7c2df33e789f01f61d33b7521353775f
+EBUILD tomcat-servlet-api-10.0.20.ebuild 3015 BLAKE2B 8326a595c857ea61fb4c7c684de79a3255822ba0235f9734cfbc64240b9e4917033f242ed12be88efaf8498fcf306c4b8e2162462fbaf0df808fdb33c40f4219 SHA512 a530aeb1d78bb9cb95ec8cb54113668995d3d6989ae50ddeeb1bf220d1629198b6b5d5a1009826aa329d1174eb99cf5b7c2df33e789f01f61d33b7521353775f
 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.76.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634
-EBUILD tomcat-servlet-api-8.5.77.ebuild 3003 BLAKE2B 808689f6bebb542b516e61b6e846d18d18bcea65407748d7cb54a5b4ad9fc211d318ebcf33cc31a99bfdbe9478b4a09078f1ad1b281aa3fc6f47f2f73f4eff23 SHA512 aaa0298aec1bf9bf4826a20f732041961b5f37caf2b8e568c8599e7cd5098c8384e81d4cd36d7475e13e2d3850f99b4da454f0ddc6ab062b9172c6bac2d74f63
-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 3010 BLAKE2B ee323ffb7c8627267f348f251816d2988d9aa1f6bf20a269c6c78d5a99eed65aea5d438bbdba59b8db82e3e4c32c245ab74643dd64004dc1f7a01d7bf7bb743d SHA512 6f0e8f52bcb8a474ef3938d8aea519e16b1f8f611dababfbc8e3f93ebd23d62bc8dfff4a407bc6065c894d312252faf23012de79e5f18980b3aeb3dcdd3b9267
-EBUILD tomcat-servlet-api-9.0.62.ebuild 3013 BLAKE2B 642b4fd0b2c0703f48dc9b0354dc9df887d149485ca538a9450ee2110cee17dc145be54538d27c21da079db942543cc7e7ffa4206cb3e2c8f755b2dbf0159012 SHA512 adb2ef89bfa5e7b111b0135ae318ea5989d0f5350ccaa23053108a1c53a17aa2b908eab00879c3e384edb22630dec79d582ed682ffd8fff6eba58470d77e977d
+EBUILD tomcat-servlet-api-8.5.77.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634
+EBUILD tomcat-servlet-api-8.5.78.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634
+EBUILD tomcat-servlet-api-9.0.60.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
+EBUILD tomcat-servlet-api-9.0.62.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
 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
deleted file mode 100644
index 440d44e0a658..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.17.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-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"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compile and package
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild
index 85932d9cf7d3..440d44e0a658 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.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.20.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.20.ebuild
index 5ed928878473..440d44e0a658 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.20.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
deleted file mode 100644
index 888295412849..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.76.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-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"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
-
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.77.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.77.ebuild
index e750432a83bb..888295412849 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.77.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.77.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.78.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.78.ebuild
index c6359840b613..888295412849 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.78.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
deleted file mode 100644
index f1c865a27bec..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.59.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-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"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
-
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild
index 7e30009f94dc..f1c865a27bec 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.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.62.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.62.ebuild
index 09fffd263372..f1c865a27bec 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.62.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
index 2b8045c3989d..f71480fcce19 100644
--- a/dev-java/univocity-parsers/Manifest
+++ b/dev-java/univocity-parsers/Manifest
@@ -1,4 +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 1005 BLAKE2B 54136375d3a47b43f600ccc96dc600ec6ab670046ee658235a47e72ec999b17b66a87c1fe33abf391bb4ee2d71b9c7cc05e8a0becb18f21ac61aa565b03306f1 SHA512 f876930c1c0b0ad5e45448ccb163e234be59a681dc2fbed4472a1f4483542ae0bc1724bea072d6fefe64019ac8cd62ecf7de1376790f5dd677cb3c033818f793
-MISC metadata.xml 562 BLAKE2B a15a9a3770842da39b54d159216f2aaa51d45034c85e88001a2be7132ba7d9723f15c0a4ff9a3a90aa1fd4748b36ed74ac51a4ef5d9bfcbaeb48f51d5c5fe06a SHA512 3999b470a7b5318086021ba8df7b47f545658b096e1151ef6b56a73623c43f3bf2a6da7a35dd4911de764068524b8bb9ee7d511ed3d5d8d44dd0a9e06129df06
+EBUILD univocity-parsers-2.9.1.ebuild 1001 BLAKE2B e279e5f7ef2928c09e34a9fa1c81d2a1fe4b69865a9ab5936e3b0599a441fa47520a7d23c5e8fc5fb862d400ca5cc27db92377fd188ddaf6f021a29b6a167651 SHA512 00bf368b3c760aaf6535f90667bac57e44d19a7a1b09d41ed18012b55aaa4da5831c602b2a0a9adeaeeb28b6dc2c6fa40c2db9f35a1c076c4bbf42c9667fd721
+MISC metadata.xml 563 BLAKE2B 06b896125c89616bdfb3319129ffa5bee987d73bed7ecc870ef48db920482529b944fae703e63093d511921f530af2ea466209166ebfd50ca31e2821699b3020 SHA512 4367b7035e745d340bb0ae565328e539db9bf45e8f8e4d2dec5bdd665deb8e1cd6da3db2d03444ac6344ddae1d972f137cc46d8f5bdfc0d3c8f873b009afe19a
diff --git a/dev-java/univocity-parsers/metadata.xml b/dev-java/univocity-parsers/metadata.xml
index 155f678863f2..04372c0a4571 100644
--- a/dev-java/univocity-parsers/metadata.xml
+++ b/dev-java/univocity-parsers/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
diff --git a/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild b/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild
index a202127995b9..58e46ec195a5 100644
--- a/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild
+++ b/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/uniVocity/univocity-parsers/archive/refs/tags/v${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/validation-api/Manifest b/dev-java/validation-api/Manifest
index febf5b96ead9..421588b3d79b 100644
--- a/dev-java/validation-api/Manifest
+++ b/dev-java/validation-api/Manifest
@@ -1,5 +1,5 @@
 DIST validation-api-1.0.0.GA-sources.jar 65220 BLAKE2B cee01d9979671bc2d64a22f21d608d50ddf6eca730a7c0d1fee3c4c05fab0af200153a48491b8d54a5a29b84a220f841c85264446117e25e89bd306bdd764843 SHA512 88bcde2fc9446b09cb24e73137cd16ed54953a6d93f33e8500ca196e4cec07ac03ebc446f4629291e6437d2f3757802236e56974cd3023bb25886e69e2330fc0
 DIST validation-api-1.1.0.jar 94671 BLAKE2B c28f6b2ca52094f33e82d2e7c71e52ef57c503c5d50f34646ee28a9f61ea7e4da7f494f41b5f8a34ce6108ca1b75fa2d0f08eb9aab15cf033e825afc2eefdf19 SHA512 aa15184ff004357f1cdee693008587a3aa180a8f24392847258672c4a2e5a537cf189049ef95febb1a87968a42223f7736e22e00fe9307678c117f7ab6b944a8
-EBUILD validation-api-1.0.0-r1.ebuild 587 BLAKE2B 1ed179648b714bbe5ff08da42f4765ae7815fdc8e3740f3d510ba60c4b659144fd02808f76baf62797c129433ba2db948d73b0d369b6c149867cd7c87669ed55 SHA512 bf0acfb024e931bcc07e1076a91d40736f36be26bb8910be28856f0964ee4a1e99fa9f7d2725c6d6e0165bb9e5bea102022883cb319182b3cb942662f690300e
-EBUILD validation-api-1.1.0-r1.ebuild 563 BLAKE2B f530bb1707a6b29d347a68cb9160493e9d5afea2bb60c19dcf3c5e25fab42e539bec572472981c11741663063d16114fc0bc9faa81ee5234a423491b726ab338 SHA512 323466c2e62862decf9d77285433b066fb0599585e5db2818d54345b8f7cbe2c4bf53aa82764abe6c52b7af924375b24b5c0b0733b73b4424676f3b0cbd63786
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
+EBUILD validation-api-1.0.0-r1.ebuild 539 BLAKE2B 2eb46d14555772c0181c639252d910179ba7917fd1535f6ce09184c238b23c4b3109b93f20e5b94f01baa8b7731835473bf34aa450b910005e8611596f3a7b23 SHA512 36a355a4d55438c1ffbbebbadb7f76897642dd475263830bbfc3a1202433a5af0557e4df704067cacf3e331ad6eaa20a19813e918dc611fb29eb52653345a459
+EBUILD validation-api-1.1.0-r1.ebuild 515 BLAKE2B 60665418083080f9af951a191d55443e562b6d98e9c99f21cc6e07bc6fb822e066f6b9552b1366cd30312babb0d2a6bded06ad7247aed4aaf27d1effdfb461c4 SHA512 8dfd0a0a3e533ac37b7a28d95552d834fac0c53d564bdb420395dff4af57a466b84be36e678dd0a9d5aa00637fda0f3fd29522e55711305b066d54a036f6783c
+MISC metadata.xml 333 BLAKE2B 6d2e9f632e3437764648efce2592d860443f7b111735f99e00c4cdbd30cab6e7e15331eb53e91a69210b31bccfdc30a971afdd86f7cf0a454398a47b329ca9cc SHA512 c21940ac74456a04e60b0c066e9fa0a8dad3389de817b1e52c7dec9afde96604e3786e554486e76887d107c04c9de4bad37fc73725593b80247810771cfdbb0b
diff --git a/dev-java/validation-api/metadata.xml b/dev-java/validation-api/metadata.xml
index 4221e170cbc0..8d626a41d89c 100644
--- a/dev-java/validation-api/metadata.xml
+++ b/dev-java/validation-api/metadata.xml
@@ -5,4 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">eclipse-ee4j/beanvalidation-api</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/validation-api/validation-api-1.0.0-r1.ebuild b/dev-java/validation-api/validation-api-1.0.0-r1.ebuild
index d7887694dca4..316ac36886b4 100644
--- a/dev-java/validation-api/validation-api-1.0.0-r1.ebuild
+++ b/dev-java/validation-api/validation-api-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Bean Validation (JSR-303) API"
-HOMEPAGE="http://fisheye.jboss.org/browse/Hibernate/beanvalidation/api/tags/v1_0_0_GA"
+HOMEPAGE="https://beanvalidation.org/"
 SRC_URI="https://repository.jboss.org/nexus/service/local/repo_groups/public/content/javax/validation/${PN}/${PV}.GA/${P}.GA-sources.jar"
 
 LICENSE="Apache-2.0"
diff --git a/dev-java/validation-api/validation-api-1.1.0-r1.ebuild b/dev-java/validation-api/validation-api-1.1.0-r1.ebuild
index 25f7a00c3bf0..1f63794e937b 100644
--- a/dev-java/validation-api/validation-api-1.1.0-r1.ebuild
+++ b/dev-java/validation-api/validation-api-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Bean Validation (JSR-303) API"
-HOMEPAGE="http://fisheye.jboss.org/browse/Hibernate/beanvalidation/api/tags/v1_0_0_GA"
+HOMEPAGE="https://beanvalidation.org/"
 SRC_URI="https://repo1.maven.org/maven2/javax/validation/${PN}/${PV}.Final/${P}.Final-sources.jar -> ${P}.jar"
 
 LICENSE="Apache-2.0"
diff --git a/dev-java/woodstox-core/Manifest b/dev-java/woodstox-core/Manifest
index 3c47d516e6a3..d8cea9441c1a 100644
--- a/dev-java/woodstox-core/Manifest
+++ b/dev-java/woodstox-core/Manifest
@@ -1,5 +1,3 @@
-DIST woodstox-core-6.2.7.tar.gz 5250524 BLAKE2B 3f5be53a459e8999cb53b3e89398bd94439815dd58cc30df7e1b71b9e98ef94b7704d04ae20401d39afff67210e423a4c5a148909a3a7ed750f7e0e24146c24a SHA512 0e2e11607c26d97509708523c4617d9e75fc529fbf5294b25deba5ca570797692e31e65621c77e7c4d9bdf0b3dee4b3c4fe0486a1e23d19dc41035d7d710668e
 DIST woodstox-core-6.2.8.tar.gz 5250255 BLAKE2B 69e45da9c7e09652ffc45b366359ae12954ad0450157d8639833d41600958d10ff1203502c926f0f23cd3e3d03dbc83378a9614e5eb19367fb60fad1232f4dd8 SHA512 c5af386891ab63fb2efc8510353e35c20fa157048631c809ed3d7e070b377ef5c21ffb1b7a0f9e597113db714ebc778951ac8a8e049c3d8291a89c3a0e7a044e
-EBUILD woodstox-core-6.2.7.ebuild 3569 BLAKE2B 1e9392272233dbe42a3cd4ae8735de1731526a35018ce6180a5049785e23e5735b930d250fdbeba57640af26584a51ddc17d2d073f8299188e4549b57c13c319 SHA512 58bdcc159675fd5bad2037e24e4fa694b4ca8a227a649f241f6d5acda4ca35f3b2f8f89cd15309c06f7c0e54bd32f3eb709a0ca11486ec5638e4de792048e01a
-EBUILD woodstox-core-6.2.8.ebuild 3021 BLAKE2B e9442b0ed14f543cb80e752c30c6d8b06b5847217b52472c4c6d42b2249e707ae650a2935d68131876c63e7d394078c8b8726e78e4f528111e1905559a5dfe67 SHA512 5e5031208a0bb7e4018945f56bfecfa358de928f95ef5206f6824aa386828504f80486b703cfdcfe0cee1ceb168076223246f99c344ac009dd2832b22ebeb1b9
+EBUILD woodstox-core-6.2.8-r1.ebuild 3010 BLAKE2B 3d26fc576b274efadbbb614c0b75309d5339dc6fa7eab5f467401365aeccd39c6dbc7ae625d1cfe0c4f9aac9baaa7407bcc98015ac0a6917476b5e05809676ca SHA512 23b4ce56d445aa7a47c6f4aa4be55e58170ec334c17466634601c0bf68a69d50327700803c6bc23af5260ff26e988f1c53b6aab57b9780fe0301a7063364377e
 MISC metadata.xml 308 BLAKE2B f2c06b12854fb8659cf5b265400a53de6b0b10753da1438362a410f7831cab326887b09fb23b9678fe4939a7d33480fcdc6f2295c975e4fed021e2597e5349ce SHA512 9cc92aafb6c2e2c0226d2f59675a381f311028d149a731c5dbbb388d7174a9f69d6b47fc49d3ed60f8fc7af84b0b999c4dea5eb13477c21024f75e90736ca0a3
diff --git a/dev-java/woodstox-core/woodstox-core-6.2.7.ebuild b/dev-java/woodstox-core/woodstox-core-6.2.7.ebuild
deleted file mode 100644
index be656d0b16aa..000000000000
--- a/dev-java/woodstox-core/woodstox-core-6.2.7.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/woodstox/archive/refs/tags/woodstox-core-6.2.7.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild woodstox-core-6.2.7.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.woodstox:woodstox-core:6.2.7"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An XML processor that implements Stax (JSR-173), SAX2 and Stax2 APIs"
-HOMEPAGE="https://github.com/FasterXML/woodstox"
-SRC_URI="https://github.com/FasterXML/woodstox/archive/refs/tags/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# net.java.dev.msv:msv-core:2013.6.1 -> !!!artifactId-not-found!!!
-# net.java.dev.msv:xsdlib:2013.6.1 -> >=dev-java/xsdlib-20090415:0
-# org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0
-# relaxngDatatype:relaxngDatatype:20020414 -> !!!groupId-not-found!!!
-
-CP_DEPEND="
-	dev-java/msv:0
-	dev-java/relaxng-datatype:0
-	dev-java/stax2-api:0
-	dev-java/xsdlib:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# org.apache.felix:org.osgi.core:1.4.0 -> !!!groupId-not-found!!!
-# POM: pom.xml
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	dev-java/osgi-core-api:0"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( LICENSE {README,SECURITY}.md release-notes/{CREDITS,VERSION} )
-
-S="${WORKDIR}/woodstox-${P}"
-
-JAVA_CLASSPATH_EXTRA="osgi-core-api"
-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: Tests run: 864, Failures: 0, Errors: 0, Skipped: 0
-	# "No tests found in ..."
-	wstxtest.vstream.BaseValidationTest
-	wstxtest.BaseWstxTest
-	stax2.vstream.BaseStax2ValidationTest
-	stax2.BaseStax2Test
-	stax2.wstream.BaseWriterTest
-	org.codehaus.stax.test.BaseStaxTest
-	org.codehaus.stax.test.wstream.BaseWriterTest
-	org.codehaus.stax.test.stream.BaseStreamTest
-	# "... has no public constructor"
-	wstxtest.stream.BaseStreamTest
-	wstxtest.wstream.BaseWriterTest
-	stax2.vwstream.BaseOutputTest
-	org.codehaus.stax.test.vstream.BaseVStreamTest
-	org.codehaus.stax.test.evt.BaseEventTest
-	# Upstream does not run these:
-	failing.TestBasicSax
-	failing.TestExtLocationInfo91
-	failing.TestRelaxNG
-	failing.TestW3CDefaultValues
-	failing.TestW3CDefaultValues
-	failing.TestW3CSchemaComplexTypes
-	failing.TestW3CSchemaTypes
-	failing.TestW3CSchemaTypes
-)
-
-src_prepare() {
-	default
-
-	#rc/moditect/module-info.java:32: error: package com.ctc.wstx.shaded.msv.relaxng_datatype does not exist
-	#    provides com.ctc.wstx.shaded.msv.relaxng_datatype.DatatypeLibraryFactory with com.ctc.wstx.shaded.msv_core.datatype.xsd.ngimpl.DataTypeLibraryImpl;
-	#                                                     ^
-	#src/moditect/module-info.java:32: error: package com.ctc.wstx.shaded.msv_core.datatype.xsd.ngimpl does not exist
-	#    provides com.ctc.wstx.shaded.msv.relaxng_datatype.DatatypeLibraryFactory with com.ctc.wstx.shaded.msv_core.datatype.xsd.ngimpl.DataTypeLibraryImpl
-	sed -e '/com.ctc.wstx.shaded.msv/d' \
-		-e '/org.codehaus.stax2.validation/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/woodstox-core/woodstox-core-6.2.8.ebuild b/dev-java/woodstox-core/woodstox-core-6.2.8-r1.ebuild
index d547050265ff..53a600676959 100644
--- a/dev-java/woodstox-core/woodstox-core-6.2.8.ebuild
+++ b/dev-java/woodstox-core/woodstox-core-6.2.8-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/woodstox/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
@@ -41,13 +41,13 @@ CP_DEPEND="
 # test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
 
 DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	dev-java/osgi-core-api:0"
 
 RDEPEND="${CP_DEPEND}
 	>=virtual/jre-1.8:*"
 
-DOCS=( LICENSE {README,SECURITY}.md release-notes/{CREDITS,VERSION} )
+DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION} )
 
 S="${WORKDIR}/woodstox-${P}"
 
diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index 5fd20ec46321..fe9c883b837f 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -1,3 +1,4 @@
 DIST xmlgraphics-commons-2.7-src.tar.gz 2021218 BLAKE2B a16dda389662a38d5ebf6cbd015ac5bf8154b5e2df9e36fd3a33987b04a4de08cc1ebc71e940c05793ef045249c68e7dbb54c418a7c6888020a800e039b0a188 SHA512 7d3993fc920767512f94edef3342757f0ffc9c9dbad80695fe3d77b0ec162380d9b467682ae41238e7ee719601709edb41b2dab06c385dfd9fa898577d8d2c22
+EBUILD xmlgraphics-commons-2.7-r1.ebuild 2099 BLAKE2B 29fb7aa42f6475cf5dceafe9b07b4ebdf0d713d666182e3b3e0ef6dd1e3b624e3ba98d917cfb5d74a46b42e797eff5f664364f6f4b206450a7b229cbc38354d5 SHA512 363ad46823ebd9fa7d218aa790ea429e97b3160478d85f866bec1a4345eb79d3f34e8809e1a6645f8a15d8743ce59f2bdca11a1985c771d4f706743b01f4436b
 EBUILD xmlgraphics-commons-2.7.ebuild 1820 BLAKE2B 3622f63c6571d09b621507b4f2a3e641e29f3e38a0bf1c6d6971d6c703518980c2d08de4e7f901b636c42890016150ed78a11f166957b940c77b6cfa8e3a8b73 SHA512 4a891359802ed69d9844415cdd3f7022a16fed7affe236ad807d68276d9b4b9cbcb9b888a9d94c8c4d3a45c0bd5eb22002aeca751882feaa82c09add7640070f
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
+MISC metadata.xml 328 BLAKE2B 0116b6e35d9f22341807f3da68bd8d38fc43447920207a08508c46796bf1ff9d2634f38002b22139b7142c912e531d27043f629f259ab2e87d12b8e590d4b92a SHA512 74979721cdcb0c26c82a27e23043487990f41691ea1dd6acf87fb4e403dc8a44402c9907d697ac3024d754b3c504c266d51753b3cad1e4e3a16d861758574a61
diff --git a/dev-java/xmlgraphics-commons/metadata.xml b/dev-java/xmlgraphics-commons/metadata.xml
index 6021501589e0..4dcc12913cbb 100644
--- a/dev-java/xmlgraphics-commons/metadata.xml
+++ b/dev-java/xmlgraphics-commons/metadata.xml
@@ -1,8 +1,11 @@
 <?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>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">apache/xmlgraphics-commons</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild
new file mode 100644
index 000000000000..2bc679b79fbe
--- /dev/null
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.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 pom.xml --download-uri mirror://apache/xmlgraphics/commons/source/2.7-src.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild xmlgraphics-commons-2.7.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.xmlgraphics:xmlgraphics-commons:2.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XML Graphics Commons"
+HOMEPAGE="https://xmlgraphics.apache.org/commons/"
+SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# commons-io:commons-io:1.3.2 -> >=dev-java/commons-io-2.11.0:1
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+
+CP_DEPEND="
+	dev-java/commons-io:1
+	dev-java/commons-logging:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
+# test? org.mockito:mockito-core:2.28.2 -> !!!suitable-mavenVersion-not-found!!!
+# test? xml-resolver:xml-resolver:1.2 -> >=dev-java/xml-commons-resolver-1.2:0
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/mockito:4
+		dev-java/xml-commons-resolver:0
+	)"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( NOTICE README )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4,xml-commons-resolver"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+# There are test failures, bug #832058
+JAVA_TEST_EXCLUDES=(
+	"org.apache.xmlgraphics.image.codec.tiff.TIFFImageEncoderTestCase"
+	"org.apache.xmlgraphics.image.loader.impl.ImageLoaderImageIOTestCase"
+	"org.apache.xmlgraphics.io.XmlSourceUtilTestCase"
+	"org.apache.xmlgraphics.ps.dsc.ListenerTestCase"
+	"org.apache.xmlgraphics.xmp.XMPParserTestCase"
+)
+
+src_install() {
+	java-pkg-simple_src_install
+	einstalldocs # https://bugs.gentoo.org/789582
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
committer	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
commit	752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree	330d16e6362a49cbed8875a777fe641a43376cd3 /dev-java
parent	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)