gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /dev-java
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
348 files changed, 3117 insertions, 5561 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 6fc64a876c86..68a483afa5d6 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index d86fac3dee36..3e2b1ca8fbc4 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-core-1.10.9-r3.ebuild 4057 BLAKE2B 40a30d4699248c6a88f292a304e3a017e0a12d3b88622c24fd5dc69dfc2e7ab89a6f536c0d04475a2d67db491df321597f463cc930a58b7aba87dac66c40cd40 SHA512 f0c129658bdf6b0b0a68f6d6ce2163f497579876b0e8da5bcf931b4e2fe8b14eaddad502e139a824d21bfda078a4bfef8608fd428a8dcfed09d13b5fd23a6f18
+EBUILD ant-core-1.10.9-r5.ebuild 4094 BLAKE2B fcbf58c8c242aaf3c125eefe785bd3041b90c108a2bef12b8fa3dab358c61e42ee4413bc3feb53f777e82cc67ea8f1ba10e54e2d596f95c2e1a755580a8157a3 SHA512 f11799f16f731027274135aac9824b9ef97c8a8b4437524ef2b2aa42ad4beedccbd15dc197225215b2337d476be620aba006bdd602b231bf002b8c8df64dc774
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild b/dev-java/ant-core/ant-core-1.10.9-r5.ebuild
index 6ceeeb9e569f..f7540588ca05 100644
--- a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9-r5.ebuild
@@ -9,6 +9,7 @@ JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
 # Rewriting build.xml files for the testcases has no use at the moment.
 JAVA_PKG_BSFIX_ALL="no"
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.ant:ant:1.10.9"
 
 inherit java-pkg-2 java-ant-2 prefix
 
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 682eed797391..b7b2a98dd881 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,10 +1,7 @@
 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.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.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
+EBUILD ant-eclipse-ecj-4.22-r1.ebuild 1424 BLAKE2B d67bb537096dec426f442093b300cb28f8fad4bf55b729eac135c3887eeb7989dc5583557c2c8011faccc01a343cf4436979e90017442de170655258c5e25be9 SHA512 6e3a687ed637d80e27a02b81cb69a04e015823668d6cc36fcd1832dc7504966ff1ad142da9aa9289e69c066eee0865262da69ef1871538f75a974a8a446c1a70
 MISC metadata.xml 547 BLAKE2B 250bb477a3547d97e993539eb2965d6ff8a5085627c8a4ce221fc74704b1c824b1ba4a2891a850b820bd42c4ccf3e684af3035ccaf45cc595f0eac6b62da2a4a SHA512 e1283be49bebaf5bb03e55ead8336a046eff3c657e600dd1456690280e2ae2f9f4fb12987d7c1cfd192e41d8f8d40b36896a2d7430063d243f374e4aedc4ec77
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-r1.ebuild
index 1fc9f8bb2347..786880f955b6 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
@@ -26,7 +26,7 @@ CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
 RDEPEND="${CDEPEND}
 	>=virtual/jre-11:*"
 DEPEND="${CDEPEND}
-	>=virtual/jdk-11:*"
+	>=virtual/jdk-17:*"
 BDEPEND="app-arch/unzip"
 
 JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
deleted file mode 100644
index 8260b02e4de7..000000000000
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
+++ /dev/null
@@ -1,48 +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"
-
-inherit java-pkg-2 java-pkg-simple prefix
-
-DMF="R-${PV}-201509040015"
-
-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.5"
-IUSE=""
-
-CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
-	>=dev-java/ant-core-1.7"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.7"
-
-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/files/ecj-4.5 b/dev-java/ant-eclipse-ecj/files/ecj-4.5
deleted file mode 100644
index e0a0eb367f50..000000000000
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.5
+++ /dev/null
@@ -1,7 +0,0 @@
-JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.5"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.5*"
-SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8"
-SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8"
-ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.5,ant-eclipse-ecj-4.5"
-GENERATION="2"
diff --git a/dev-java/antlr-runtime/Manifest b/dev-java/antlr-runtime/Manifest
index b7f7f0217351..040391e13549 100644
--- a/dev-java/antlr-runtime/Manifest
+++ b/dev-java/antlr-runtime/Manifest
@@ -1,8 +1,6 @@
 AUX 4.9.3-test-fixes.patch 1399 BLAKE2B 719571607153951b6a44a7bed7c405b6e217f7a458667388d89ca15683342a5d9849155ad03771eb0f7d326af31fd0cf6e0ab9ddfbd385e189b33f0c842ab53e SHA512 b0aed6d54873ffd841ae5ac6ce1afb5d037fdde6e322903e250e46b38b84fd29ca87668f8b1f38a5c6b0ec4ad99953021d4260b67515158accbc37fd325e98eb
 DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127
-DIST antlr-runtime-3.5.2-sources.jar 206095 BLAKE2B 62b5ca08b13b80e1cdfe82d7354f75dcd3d82d7618bb2d20c4973c0b588d60cc034a8bc265d1cba6b3fc09f5583450a48948dc0beb86c4b13c6b9fdb32de37fd SHA512 fda8b0b1d6f779098c885360ea5f5e93eac5153f5bf761f3dbc954209b69b76edd21a8e4915bb9e567e5c095f1d173e19429bea34da9698bf241d17599858847
 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 1013 BLAKE2B ec560f7c28f1f4b90ddf1682c9cf20a9cff944efe05cae2d4b73c0b2265f1449c622ac69900ab74266713c22b54c221ff2144b0cceb4389b1686e3ed25482e3c SHA512 6ea6a2beb2cdd0b6ddda64c336286d0de8c2aa2641e87e8c9c8de0a170dd4e79b009170e4dd0dc46318f90b226ed9788782743c02529ef8e228396e68ac64a3b
+EBUILD antlr-runtime-3.5.3.ebuild 1012 BLAKE2B 723021a61b8d32a46ed45361177cd9e6ba7c970fb45972e24b9c9f16f0136026a8ba4d324228ab88241614ffd34b01bed7c9dbc6a64851ed5b491c03389d22e0 SHA512 12223e8ad797c926cbe2a7991c61fc71e756293dbe1eb636051a609fad43318682d62fee9280d3ab691a9e3196fd8ec95872620c2d7cb563f4441b3ea6cc0aa7
 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.2.ebuild b/dev-java/antlr-runtime/antlr-runtime-3.5.2.ebuild
deleted file mode 100644
index 036aa905f922..000000000000
--- a/dev-java/antlr-runtime/antlr-runtime-3.5.2.ebuild
+++ /dev/null
@@ -1,38 +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 antlr-runtime-3.5.2.pom --download-uri https://repo1.maven.org/maven2/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2-sources.jar --slot 3.5 --keywords "~amd64 ~arm ~arm64~ppc64 ~x86" --ebuild antlr-runtime-3.5.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.antlr:antlr-runtime:3.5.2"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="ANTLR 3 Runtime"
-HOMEPAGE="https://www.antlr3.org/"
-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"
-
-# Common dependencies
-# POM: ${P}.pom
-# org.antlr:stringtemplate:3.2.1 -> >=dev-java/stringtemplate-3.2.1:0
-
-CP_DEPEND="
-	>=dev-java/stringtemplate-3.2.1:0
-"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
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 a28985e8f7b6..5a2591a02713 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 a61e400ea0e6..e5d4bc7d9427 100644
--- a/dev-java/antlr-tool/Manifest
+++ b/dev-java/antlr-tool/Manifest
@@ -1,12 +1,8 @@
-AUX 3.5.2-test-fixes.patch 2093 BLAKE2B 4016d770a226f1fb86f7f6e630df38c0d2ed0b4a025991f6b88e88506d2a44838c17097fc4ad5f63e506a839ebce0fcfa8e57f22415f777b0bd4c37afc93a0b1 SHA512 dcdde9daabfb3379f85d831a594259b21e1cc0283f7f0972d42801cb144d6932fe5cccff576cc885614db3f9e07b98782c4932a03687658df35f698455588533
 AUX 4.9.3-test-fixes.patch 1399 BLAKE2B 719571607153951b6a44a7bed7c405b6e217f7a458667388d89ca15683342a5d9849155ad03771eb0f7d326af31fd0cf6e0ab9ddfbd385e189b33f0c842ab53e SHA512 b0aed6d54873ffd841ae5ac6ce1afb5d037fdde6e322903e250e46b38b84fd29ca87668f8b1f38a5c6b0ec4ad99953021d4260b67515158accbc37fd325e98eb
-DIST antlr-3.5.2.tar.gz 6927126 BLAKE2B 1907229549434dfea6ef1fa915137a2f733bd61f0a40aacb131689df619d1c92e125453ec3d1febc5d92da1841ffbde060af196cff1ca8fb6f4684600375e161 SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99
 DIST antlr-3.5.3.tar.gz 6752328 BLAKE2B 8ebd098c9475122cddcadd5991b9f882b7fda5868ad979b29c9f4dab97e39cd31e7fc943476c3a854f3e3aee9c1c56384b7fcc893f87548482af5d5d0839fd30 SHA512 c565e1ade7a62bb127df707015afded9a9cea54cbf5488730a327671c57e8718f93f76c4fa28edd856810cb9c7ccbcb27b53a7c8f7e3efc8169e64cfcc535a4c
 DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127
-DIST antlr-tool-3.5.2-sources.jar 957096 BLAKE2B 39b75824e129c8111f302eb71407a683c59e91e79a3fa13c5386c4ba4aa322e706deb10b36df3591ab0843faff5702091d543272ee85d63cd92cb36cc72e1ceb SHA512 50fece361b69299be0c0941e6fe2bfacfc39c0b3dad3320126a9a80cd0f053fbaa6332612e2bab2872db122025d6abfe4b35a4636ef1c101e9131bbd2cdf5e28
 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 1931 BLAKE2B e8dd37f1fe914ac96c7204d597b26b7db00a1fa226586708fc6e9a7bc53294a567bccaaf84d6ea4a324ec438feee596f5e3977a3d537636a25b978bbe8bc68b1 SHA512 ecfd086168aba2362f8af0f7a388d6dd599a485c58852dd328c12892fa708bb82e54e56f47557bfed2553c57667df67cd42b0d5ba503d8bbfa4df62fa874989b
+EBUILD antlr-tool-3.5.3.ebuild 1930 BLAKE2B 93c9336366335265de79b8a9e98e0af6dfd095e4b868709c3f77121ad926c89802264c8be11aead224d726670b81dfad554f1563b8e121583202834c9beaca1d SHA512 d0b1b534c005d13c55eff047a9041268b80feee9b91dea3099d5335b1293bdecea4d33aa2ccbd42aa7367a22187c1ab0cf5bbb858c0f68ac13a2056b9526fc79
 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.2.ebuild b/dev-java/antlr-tool/antlr-tool-3.5.2.ebuild
deleted file mode 100644
index b6a32d34d18f..000000000000
--- a/dev-java/antlr-tool/antlr-tool-3.5.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Artifact ID for antlr-tool is 'antlr'
-# https://github.com/antlr/antlr3/blob/3.5.2/tool/pom.xml#L4
-MAVEN_ID="org.antlr:antlr:3.5.2"
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="${PN%-tool}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The ANTLR 3 tool"
-HOMEPAGE="https://www.antlr3.org/"
-# Maven Central sources JAR for *.java sources pre-generated from *.g files;
-# the source generation requires this package itself.
-# Tarball for resources, the test suite, and DOCS files
-SRC_URI="
-	https://repo1.maven.org/maven2/org/antlr/antlr/${PV}/${MY_P}-sources.jar -> ${P}-sources.jar
-	https://github.com/antlr/antlr3/archive/${PV}.tar.gz -> ${MY_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"
-
-CP_DEPEND="
-	~dev-java/antlr-runtime-${PV}:${SLOT}
-	dev-java/stringtemplate:4
-"
-
-BDEPEND="
-	app-arch/unzip
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-"
-
-S="${WORKDIR}"
-TARBALL_S="${S}/${MY_PN}3-${PV}"
-
-JAVA_SRC_DIR="org"
-JAVA_RESOURCE_DIRS=( "${TARBALL_S}/tool/src/main/resources" )
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="${TARBALL_S}/tool/src/test/java"
-
-DOCS=( "${TARBALL_S}/tool/CHANGES.txt" )
-
-src_prepare() {
-	java-pkg_clean
-	eapply -p0 "${FILESDIR}/${PV}-test-fixes.patch"
-	java-pkg-2_src_prepare
-
-	# Some tests fail under Java 8 in ways that probably aren't limited
-	# to the tests. This is bad but upstream is never going to update
-	# 3.5. At the time of writing, we only use it to build 4 anyway.
-	rm -v "${JAVA_TEST_SRC_DIR}/org/antlr/test/"Test{DFAConversion,SemanticPredicates,TopologicalSort}.java || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs # https://bugs.gentoo.org/789582
-}
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 15acdcf47e32..8e2844054251 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/files/3.5.2-test-fixes.patch b/dev-java/antlr-tool/files/3.5.2-test-fixes.patch
deleted file mode 100644
index f2609ac1f0b5..000000000000
--- a/dev-java/antlr-tool/files/3.5.2-test-fixes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestAttributes.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestAttributes.java
---- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestAttributes.java	2014-03-25 11:47:54.000000000 +0000
-+++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestAttributes.java	2015-10-02 22:42:56.921263410 +0100
-@@ -2131,7 +2132,7 @@
- 		assertEquals(expecting, found);
- 	}
- 
--	@Test public void testRuleLabelOnTwoDifferentRulesTemplate() throws Exception {
-+	@org.junit.Ignore @Test public void testRuleLabelOnTwoDifferentRulesTemplate() throws Exception {
- 		String grammar =
- 			"grammar T;\n"+
- 				"options {output=template;}\n"+
-diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java
---- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java	2014-03-25 11:47:54.000000000 +0000
-+++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java	2015-10-02 22:43:07.303105023 +0100
-@@ -339,7 +340,7 @@
- 		assertEquals("b:alt 2 a:alt 1\n", found);
- 	}
- 
--	@Test public void testSynPredWithOutputTemplate() throws Exception {
-+	@org.junit.Ignore @Test public void testSynPredWithOutputTemplate() throws Exception {
- 		// really just seeing if it will compile
- 		String grammar =
- 			"grammar T;\n" +
-diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestTreeParsing.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestTreeParsing.java
---- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestTreeParsing.java	2014-03-25 11:47:54.000000000 +0000
-+++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestTreeParsing.java	2015-10-02 22:41:32.235554776 +0100
-@@ -141,7 +142,7 @@
- 		assertEquals("alt 1\n", found);
- 	}
- 
--	@Test public void testTemplateOutput() throws Exception {
-+	@org.junit.Ignore @Test public void testTemplateOutput() throws Exception {
- 		String grammar =
- 			"grammar T;\n" +
- 			"options {output=AST;}\n" +
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index c6db48e4e6c2..81767619e381 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -3,12 +3,10 @@ AUX 3.2-test-fixes.patch 10294 BLAKE2B e2bed0bc4acd8c7de9eacfa6755f81db2cab78fb2
 DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34a78522828c2ffc3c481c14b9c7784f0a9997a61f6faedde5b6d1fe12214cfd84fb274f7065f3ffe6a44abf1c SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d
 DIST antlr-3.2.jar 1928009 BLAKE2B 9c56b0142abdb7d0caabebbae12618a665f91001e2f472519549a65b8601b81fcca485898c7420087a7b631351eb26e4b98589d7284960efcc3c65155919fd2a SHA512 25a61404c4b41e48eeaed49d41122f9400092248a10eb776d75ce3513295870eca1acc4b06c74925284a27cc64ca0506e34de39fb91996f09727cc5cc72dd9a6
 DIST antlr-3.2.tar.gz 837320 BLAKE2B 3addcfed45e67a7f8f3841a890be418626d93229dc326fe4670c6b145a457203a26f01723695573692c65bb6c376349a8d8cd852b339b1f6da7b71a52e14bb4f SHA512 8984221cd89253c033a4596dd56cd51b297393a53b4682f5ab401172745d343371bf0d45417fa286ce972add1b4e474f1f3091fa1345158dbfc040702d61607c
-DIST antlr-3.5.2.tar.gz 6927126 BLAKE2B 1907229549434dfea6ef1fa915137a2f733bd61f0a40aacb131689df619d1c92e125453ec3d1febc5d92da1841ffbde060af196cff1ca8fb6f4684600375e161 SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99
 DIST antlr-3.5.3.tar.gz 6752328 BLAKE2B 8ebd098c9475122cddcadd5991b9f882b7fda5868ad979b29c9f4dab97e39cd31e7fc943476c3a854f3e3aee9c1c56384b7fcc893f87548482af5d5d0839fd30 SHA512 c565e1ade7a62bb127df707015afded9a9cea54cbf5488730a327671c57e8718f93f76c4fa28edd856810cb9c7ccbcb27b53a7c8f7e3efc8169e64cfcc535a4c
 DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127
 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 1613 BLAKE2B 8f4f55c7946a48127ce629e7aaec265cde92ed0174aa569403821bce0cc230dff5da4fa13167d24b42086256c4dcacdd0842a173dd9118b5924c0b36a401dea1 SHA512 31a22d538a8e5b900c51c26220afa43398acc962ccdcd2ca1aa2b3c3b71ba369e1968cbc830948e495932c73d2d7d36d4d0da2e143846fec57a86416eb812ae1
+EBUILD antlr-3.5.3.ebuild 1612 BLAKE2B 88db289b80bbdd3c8262995a01bc26124f97b37210dffbf63936968e3c530e5f263fd6d6d8c7d12250b8fe416466b307d3cf5769abf8612a1ef9b50b1f9e78a3 SHA512 7bb06cdf7d8647b41ce6e4e617fd2e8ece1a783832a4e10958fd591c3b111ebcefbcebed2f10ce97d68ccbe9ae7ee0838f20131f6e3b4b6c306689b3b0b0d321
 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.2-r2.ebuild b/dev-java/antlr/antlr-3.5.2-r2.ebuild
deleted file mode 100644
index 3dc31c7456f2..000000000000
--- a/dev-java/antlr/antlr-3.5.2-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2
-
-DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="https://www.antlr3.org/"
-# Reuse tarball for DOCS files
-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"
-
-CP_DEPEND="
-	~dev-java/antlr-runtime-${PV}:${SLOT}
-	~dev-java/antlr-tool-${PV}:${SLOT}
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-"
-
-S="${WORKDIR}/${PN}3-${PV}"
-
-DOCS=( contributors.txt README.txt )
-
-src_compile() {
-	:
-}
-
-src_install() {
-	java-pkg_regjar "$(java-pkg_getjar antlr-runtime-3.5 antlr-runtime.jar)"
-	java-pkg_regjar "$(java-pkg_getjar antlr-tool-3.5 antlr-tool.jar)"
-
-	java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.Tool
-	einstalldocs # https://bugs.gentoo.org/789582
-}
-
-pkg_postinst() {
-	# If upgrading from a version of this slot that installs JARs,
-	# display a message about submodule split
-	local changed_ver="3.5.2-r2"
-	local should_show_msg
-	for replaced_ver in ${REPLACING_VERSIONS}; do
-		if ver_test "${replaced_ver}" -lt "${changed_ver}"; then
-			should_show_msg=1
-			break
-		fi
-	done
-	[[ "${should_show_msg}" ]] || return
-	elog "Since version ${changed_ver}, ${PN}-${SLOT} no longer installs JARs."
-	elog "Please find the JARs from files installed by submodule packages"
-	elog "antlr-runtime-${SLOT} and antlr-tool-${SLOT}."
-}
diff --git a/dev-java/antlr/antlr-3.5.3.ebuild b/dev-java/antlr/antlr-3.5.3.ebuild
index 541574a8f149..7751c1fad885 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/asm/Manifest b/dev-java/asm/Manifest
index 5b096201100f..c62585d40d4d 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,8 +1,6 @@
 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
+EBUILD asm-9.3.ebuild 1580 BLAKE2B 13b2f9d3b02654e705ada53d6b25e0d8696f744adbe43cd3e75d0cd6e60f312538d79b381071920fb6707d2a84c7fc737728966076504d0b052950df628fa5e7 SHA512 87abca9f037edb1a196610ddb88f603d652919662f55baf3bbb84438b8511fce9690175ef493c4afce2227bcb3af928e6dca50ab53ba6752d77715db85cf270b
 MISC metadata.xml 1231 BLAKE2B c61d8566d1a337e99616013267474cf4fc92afdfed38f1c2183d41980528fd1b8994bd6ce5a06b4fa85f54819d560379bb1b505c62f26f7421bd1965cbcf7244 SHA512 c0b4d632146cab80755c18a6e15e9e9673c7adc60addac523bbf98e8fb0f771b526fbaa65906914984d27658a7ee390e90d164e855f5bc5601bfef7b89d902a2
diff --git a/dev-java/asm/asm-9.2.ebuild b/dev-java/asm/asm-9.2.ebuild
deleted file mode 100644
index 62a729090a5a..000000000000
--- a/dev-java/asm/asm-9.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.ow2.asm:asm:9.2"
-
-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"
-RESTRICT="test"
-
-CDEPEND=""
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm/asm-9.3.ebuild b/dev-java/asm/asm-9.3.ebuild
index 1f60fa7df080..08fac0e70b42 100644
--- a/dev-java/asm/asm-9.3.ebuild
+++ b/dev-java/asm/asm-9.3.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~x64-macos"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 9cb153a3263a..2f66b50e5ff9 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,6 +1,5 @@
 AUX batik-1.14-modules 461 BLAKE2B a22123561682c3990ad289ca888453b876bb1a4de03b435445758386297cb8e1058db777d4c79941a407c4b95ad8623a6450dc8ba0acf71f66b25a666ab7695c SHA512 19ec52318a76f16122e0740bb8f744e6b669537ad75f44931c1cf64c407a1d11b6eba4ea4b0e0e37ec5402e9ff99b76e8ae0e5b65f529f6ad56e30625cb7b77e
 AUX batik-squiggle.desktop 177 BLAKE2B 7f4fbc31f31f6ddbdb7802ad4ea6b87c21b39b83cec2caf5f8b68634693b05c66e3f7da6d2cf69f5da6defa2d44fa4c5a0eba4af13308b8f18fb666be86b1d40 SHA512 7e7be90a0a779752cf04bbb1e702f5f3ca773129f7dfebcc3352e55f81cad2d65f6067e07c075f730b7f11235529804856fc226703b5e213216bc110dd978d8e
 DIST batik-src-1.14.tar.gz 17647867 BLAKE2B 9385e77e739ece921012310a53953a6e258a5d748987e85dd20783ca248ae55619db6472b7590a45fe40a1b51c693478a37a7dbe1a958b42392c525e5f228815 SHA512 689c52f58f8f0456c89bd18745d2d92e7590b9054bea71b96be87d44977057d583e78504cbf14afc3e0c585d2383dac3009c7c421de868c847db045e921da8fb
-EBUILD batik-1.14-r1.ebuild 5215 BLAKE2B ef6d32420076d58c4973cd981fa71d448868dd8facb7b0213adb439f44886ae0e95a32a01ed533dce70940fab561ceecff9099e1530b1bdc978f2ef15e2bebab SHA512 5458ace08f1f2c2165607507c7684238769a4c0ecf9c3a52a8ca5abbbe5f8632512146efd32b7be83eb171d99dc8db8e98a75cca74b145d7e09852fff2710a1f
-EBUILD batik-1.14.ebuild 5255 BLAKE2B 941c89a89636efafbcc3607a1d5103d458f3acba4ae1806b7a4df24b3e5b53e081a5a5d8e5deb7fc3ce845be7723cc751ad2733a50e9e6680579eb5db4deb7ce SHA512 c8da33549a8cb656214403dc1b30914cd82f325daccb518f5b024c5036e12e28de8ec2b70fc61cec259a0ae85ea9894f30539bce1639369f68cdca6d4f279ad1
+EBUILD batik-1.14-r1.ebuild 5212 BLAKE2B 3d4b50a16f0e0e940fa0a7074abbce4824f703d50d3099af157ebdeb3d8147fb7f016b105837e044a836a79fbe96a0e48d8948c1669d0e46d8a64065eed69835 SHA512 39bddd9d287ed85594924148da66586dd9d42e91bce2a18337826494e16846080524b7845266a32675cd8a5891b41c6f1540beb958d1fb3eb07533fcbfb9a6f1
 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
index 97c0d8183481..1a978d257f26 100644
--- a/dev-java/batik/batik-1.14-r1.ebuild
+++ b/dev-java/batik/batik-1.14-r1.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.14.ebuild b/dev-java/batik/batik-1.14.ebuild
deleted file mode 100644
index 74222ffb9dd1..000000000000
--- a/dev-java/batik/batik-1.14.ebuild
+++ /dev/null
@@ -1,191 +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 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.3
-	dev-java/xmlgraphics-commons:2
-"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( {CHANGES,NOTICE,README} )
-
-S="${WORKDIR}/batik-${PV}"
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_compile() {
-
-	# We loop over the modules list and compile the jar files.
-	while read module ; do \
-
-		echo "compiling $module"
-
-		JAVA_SRC_DIR=""
-		JAVA_RESOURCE_DIRS=""
-		JAVA_JAR_FILENAME="$module.jar"
-		JAVA_MAIN_CLASS=""
-
-		# Not all of the modules have resources.
-		if [[ -d $module/src/main/resources ]]; then \
-			JAVA_RESOURCE_DIRS="$module/src/main/resources"
-		fi
-
-		# Don't let sed die on modules without MainClass.
-		JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' $module/pom.xml )
-
-		# Some modules don't have source code.
-		if [[ -d $module/src/main/java/org ]]; then \
-			JAVA_SRC_DIR="$module/src/main/java"
-			java-pkg-simple_src_compile
-		else
-			# This case applies to batik-rasterizer.
-			if [[ -d $module/src/main/resources/org ]]; then \
-				jar -cfe $module.jar "${JAVA_MAIN_CLASS}" -C "$module/src/main/resources" . || die
-			# Else for batik-rasterizer-ext, batik-squiggle and batik-squiggle-ext
-			else
-				jar -cfe $module.jar "${JAVA_MAIN_CLASS}" -C . README || die
-				zip -d $module.jar "README"
-			fi
-		fi
-
-		JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar"
-
-		rm -fr target || die
-
-	# Modules batik-rasterizer-ext and batik-squiggle-ext, upstream puts their jar files in the extensions
-	# directory, see batik-extension/src/main/resources/org/apache/batik/extensions/README.txt
-	# We keep them in the mudules list for later but omit them by 'grep -v'.
-	# The same for batik-test-old which depends on fop-transcoder-allinone which itself depends on batik.
-	# batik-1.14-modules is the "Reactor Build Order" extracted from the output of "mvn dependency:tree".
-	done < <(grep -v '\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' "${FILESDIR}"/batik-1.14-modules)
-
-	if use doc; then
-
-		JAVA_SRC_DIR=""
-		JAVA_JAR_FILENAME="ignoreme.jar"
-
-		while read module ; do \
-
-			# Some modules don't have source code
-			if [[ -d $module/src/main/java/org ]]; then \
-				JAVA_SRC_DIR+=( "$module/src/main/java" )
-			fi
-
-		done < "${FILESDIR}"/batik-1.14-modules
-
-		java-pkg-simple_src_compile
-	fi
-}
-
-src_test() {
-
-	JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-
-	while read module ; do \
-
-		echo "testing $module"
-
-		JAVA_TEST_SRC_DIR=""
-		JAVA_TEST_RESOURCE_DIRS=""
-		JAVA_TEST_RUN_ONLY=""
-
-		if [[ -d $module/src/test/resources ]]; then \
-			JAVA_TEST_RESOURCE_DIRS="$module/src/test/resources"
-		fi
-
-		# https://github.com/apache/xmlgraphics-batik/blob/refs/tags/batik-1_14/batik-util/pom.xml#L74-L75
-		if [[ $module == batik-util ]]; then \
-			JAVA_TEST_RUN_ONLY="org.apache.batik.util.Base64TestCases"
-		fi
-
-		if [[ -d $module/src/test/java/org ]]; then \
-			JAVA_TEST_SRC_DIR="$module/src/test/java"
-			java-pkg-simple_src_test
-		fi
-
-	done < <(grep -v '\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' "${FILESDIR}"/batik-1.14-modules)
-}
-
-src_install() {
-	einstalldocs
-	domenu "${FILESDIR}"/batik-squiggle.desktop
-	doicon batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/init.svg
-
-	while read module ; do \
-
-		JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' $module/pom.xml )
-
-		java-pkg_dojar $module.jar
-
-		# Add a launcher if the module has a MainClass.
-		if [[ -n "${JAVA_MAIN_CLASS}" ]]; then \
-			java-pkg_dolauncher "$module-${SLOT}" --main "${JAVA_MAIN_CLASS}"
-		fi
-
-		# Some modules don't have source code
-		if [[ -d $module/src/main/java/org ]]; then \
-
-			if use source; then
-				java-pkg_dosrc "$module/src/main/java/*"
-			fi
-
-		fi
-
-	done < <(grep -v '\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' "${FILESDIR}"/batik-1.14-modules)
-
-	local java_policy_file="${JAVA_PKG_SHAREPATH}/etc/${PN}.policy"
-	insinto "$(dirname "${java_policy_file}")"
-	newins - "$(basename "${java_policy_file}")" <<- _EOF_
-		grant codeBase "file:${EPREFIX}${JAVA_PKG_JARDEST}/-" {
-			permission java.security.AllPermission;
-		};
-	_EOF_
-	java-pkg_register-environment-variable \
-		gjl_java_args \
-		"-Djava.security.policy=file:${EPREFIX}${java_policy_file}"
-
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
index 75e46c9865ad..daa308a059c3 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -1,3 +1,5 @@
 DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
+DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
 EBUILD bcmail-1.69-r1.ebuild 1478 BLAKE2B c3a707b73c57d7528cd86c5621fe14fd65e1d412b6735884a95c3f868f72cedaf4a8edacaf915c4f992ed0bd6c1089a949198f0f1893fefffa7b22b6fbdbbb11 SHA512 e845293b7b79c796d5c433971e2a4dbb185b3930fc048915ae84e2f2631af396454b3b8b2029d04289dba96f2db6c2460dcc1d943dc8db8ddea4219313e31da7
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
+EBUILD bcmail-1.71.ebuild 1434 BLAKE2B 6d574265df30b20c3dba3224719fa4b5d3e0c53206ae1d6e8abd3a8afa8ee3506f1546bca7e9e938b9f4cc09278456c6ffff43368cd59a8154b02955d5e59ed3 SHA512 f320b5836d3e44cda2d3bfe7bc5ba123a95a2f23916e6029cba69e779560f95a77b67563bc69a09d2ccc3da909152b89de45aea43706f3a050bb9f8e1fa5d83f
+MISC metadata.xml 593 BLAKE2B 03a8a1bc9096f606d9e934b05910a5052df992a0e9f6412177aad141bae2bef648e4208e1b967e318f11e3e9a227d5783d0ce6880ef44952e238ff3831ca4200 SHA512 42de422b76ba5667882f973abfb9b482e9c0b9ac07c803be0ee9fc322c568d2cfa29e3fa56e0b57a4ed143a3645a484447dd981385b2ce49c5667f734d40c979
diff --git a/dev-java/bcmail/bcmail-1.71.ebuild b/dev-java/bcmail/bcmail-1.71.ebuild
new file mode 100644
index 000000000000..bb13ff26b064
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.71.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"
+MAVEN_ID="org.bouncycastle:bcmail-jdk18on:1.71"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
+SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CDEPEND="
+	~dev-java/bcpkix-${PV}:0
+	~dev-java/bcprov-${PV}:0
+	~dev-java/bcutil-${PV}:0
+	dev-java/jakarta-activation:1
+	dev-java/javax-mail:0
+	"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-11:*"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( ../{README,SECURITY}.md )
+HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
+
+S="${WORKDIR}/bc-java-r${PV/./rv}/mail"
+
+JAVA_GENTOO_CLASSPATH="bcpkix,bcprov,bcutil,jakarta-activation-1,javax-mail"
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"src/main/jdk1.9"	# https://bugs.gentoo.org/797634
+)
+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_RUN_ONLY="org.bouncycastle.mail.smime.test.AllTests"
+
+src_prepare() {
+	default
+	java-pkg_clean ..
+}
+
+src_install() {
+	default
+	einstalldocs
+	docinto html
+	dodoc -r ../docs
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/bcmail/metadata.xml b/dev-java/bcmail/metadata.xml
index 4221e170cbc0..97fff009c2d8 100644
--- a/dev-java/bcmail/metadata.xml
+++ b/dev-java/bcmail/metadata.xml
@@ -5,4 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<longdescription>
+		The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols. This jar contains S/MIME APIs for JDK 1.8 and up. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. The JavaMail API and the Java activation framework will also be needed.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest
index a8d83dd5a4c2..87f0c71b59a4 100644
--- a/dev-java/bcpg/Manifest
+++ b/dev-java/bcpg/Manifest
@@ -1,3 +1,5 @@
 DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
+DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
 EBUILD bcpg-1.69.ebuild 1415 BLAKE2B b4c064bdad6b5c2a2d9102f3fec361a71a9b52f29ee0d78be6839dc9ba4b89de9eb4a0b272dad84041e1910ed58a8c6c852094f965b1c32ba1e89ea407a09508 SHA512 f52fc87fec7482ba4e6206cda2f52200b4c00228031ebfe482a56b32f76aaa813ca6ea491b040d8ac424432cb7934e78e98f6deab6c844605c7cc226f761f17d
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
+EBUILD bcpg-1.71.ebuild 1284 BLAKE2B ee5ad153c3f25f8ec93e3a88cff4afdcd543ec1274c94c8516ad71204307c0c515abdd9ad65e2d2743a4120ccbe045e0f18e830971e6f419896399c5474883f1 SHA512 1eba61d546763efe29d4dc1e4fbe20d2d2742bb039a64190dd195d95147b921e7d4972a07ed7ed8e44c9ee67acf3ca7b87d608f9cca34cee1f9b3744c2133328
+MISC metadata.xml 521 BLAKE2B 76af9d5a734fef6cc73b43cf2f3cdf630fba2ff8deeaebe787b08b5b94f0bc1d7988ffb1d4820641c05d5fa139dfe0798aa7105e93142c835644760dbe52121e SHA512 4202d5ec7ba349c1cabafc474edf5cc5379c475d3a313b2a9ea90f1f7edf88d9a91b557042cfcf496f477b02a7f0b5e1ae61ded26f92bdfca15812fa34ee2133
diff --git a/dev-java/bcpg/bcpg-1.71.ebuild b/dev-java/bcpg/bcpg-1.71.ebuild
new file mode 100644
index 000000000000..7854003f175f
--- /dev/null
+++ b/dev-java/bcpg/bcpg-1.71.ebuild
@@ -0,0 +1,58 @@
+# 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.bouncycastle:bcpg-jdk18on:1.71"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
+SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CDEPEND="~dev-java/bcprov-${PV}:0"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-11:*"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( ../{README,SECURITY}.md )
+HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
+
+S="${WORKDIR}/bc-java-r${PV/./rv}/pg"
+
+JAVA_GENTOO_CLASSPATH="bcprov"
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"src/main/jdk1.9"	# https://bugs.gentoo.org/797634
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_RUN_ONLY=(
+	"org.bouncycastle.openpgp.test.AllTests"
+	"org.bouncycastle.openpgp.examples.test.AllTests"
+	"org.bouncycastle.gpg.test.AllTests"
+)
+
+src_prepare() {
+	default
+	java-pkg_clean ..
+}
+
+src_install() {
+	default
+	einstalldocs
+	docinto html
+	dodoc -r ../docs
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/bcpg/metadata.xml b/dev-java/bcpg/metadata.xml
index 4221e170cbc0..3cbf364f100a 100644
--- a/dev-java/bcpg/metadata.xml
+++ b/dev-java/bcpg/metadata.xml
@@ -5,4 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<longdescription>
+		The Bouncy Castle Java API for handling the OpenPGP protocol. This jar contains the OpenPGP API for JDK 1.8 and up. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
index 92ec3d9465c8..cfeba047df3b 100644
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@@ -1,3 +1,5 @@
 DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
+DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
 EBUILD bcpkix-1.69.ebuild 2556 BLAKE2B 842dfda2673810899cc1a164924b97f142214ab7f34164a87bfc2b16360e688a082a5bc09aca36765086d2b42b0f6e499fd10c2f31e8a63d72742a4afeb7859a SHA512 fdff8b61adafbf1eff91ff020c8042c0f332f53e66be300e73eadb9efe30cf57f28468a64a9a9b13842305db4219757a9d6349e2fae26b98dd9611ed7ba7f89e
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
+EBUILD bcpkix-1.71-r1.ebuild 3078 BLAKE2B ee7b23d5ba7f18ab15201d3b308d0a02507869e28fd1f77c71d400da9681988438deb90a977adfaed99d38eb9d54d82cb17eea5166d442920f73716d4c0c33b2 SHA512 ba7e8f697f2b4b793d47ea81b92af29526e2643719a97ba9afdc41b80f2e70cc3de968cf04239618d809a7e16460de3b2cf45173c3c1ffcee41fd1b7049fd907
+MISC metadata.xml 546 BLAKE2B 3e07f58b65f0148062a3f1b20c06d71ce1925cf7b91d167a07d21028f541cfbc69b8a78e914ea6b86598afb3f3ae7f841defa6e1b691fac5293f2cb6746c1f0c SHA512 137f6f4d3d26d90109102fa49e37a42ea3628104adaf65e0b93ca652abd1aa6392e3f76dbf342aa70706b734d8b7f262f2b826e3ce33ae35fa60c40e548bf89b
diff --git a/dev-java/bcpkix/bcpkix-1.71-r1.ebuild b/dev-java/bcpkix/bcpkix-1.71-r1.ebuild
new file mode 100644
index 000000000000..208e40ffb41e
--- /dev/null
+++ b/dev-java/bcpkix/bcpkix-1.71-r1.ebuild
@@ -0,0 +1,116 @@
+# 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.bouncycastle:bcpkix-jdk18on:1.71"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple check-reqs
+
+DESCRIPTION="Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
+SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# 1) testSANMismatchIP(org.bouncycastle.est.test.TestHostNameAuthorizer)
+# org.bouncycastle.est.ESTException: localhost.me: Temporary failure in name resolution HTTP Status Code: 0
+PROPERTIES="test_network"
+RESTRICT="test"
+
+CDEPEND="
+	~dev-java/bcprov-${PV}:0
+	~dev-java/bcutil-${PV}:0
+	"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-11:*"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( ../{README,SECURITY}.md )
+HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
+
+S="${WORKDIR}/bc-java-r${PV/./rv}/pkix"
+
+JAVA_GENTOO_CLASSPATH="bcprov,bcutil"
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"src/main/jdk1.9"	# https://bugs.gentoo.org/797634
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/../core/src/test/data"
+
+# There was 1 failure:
+# 1) testSimpleTests(org.bouncycastle.cert.test.AllTests)
+# junit.framework.AssertionFailedError: CertTest:
+# CertTest: 9 failed - exception java.security.InvalidKeyException: cannot identify EdDSA public key
+#         at junit.framework.Assert.fail(Assert.java:57)
+#         at junit.framework.TestCase.fail(TestCase.java:223)
+#         at org.bouncycastle.cert.test.AllTests.testSimpleTests(AllTests.java:30)
+#
+# FAILURES!!!
+# Tests run: 474,  Failures: 1
+JAVA_TEST_RUN_ONLY=(
+	"org.bouncycastle.cert.cmp.test.AllTests"
+	"org.bouncycastle.cert.crmf.test.AllTests"
+	"org.bouncycastle.cert.ocsp.test.AllTests"
+	"org.bouncycastle.cert.path.test.AllTests"
+#	"org.bouncycastle.cert.test.AllTests"
+	"org.bouncycastle.cms.test.AllTests"
+	"org.bouncycastle.dvcs.test.AllTests"
+	"org.bouncycastle.eac.test.AllTests"
+	"org.bouncycastle.est.test.AllTests"
+	"org.bouncycastle.mime.test.AllTests"
+	"org.bouncycastle.mozilla.test.AllTests"
+	"org.bouncycastle.openssl.test.AllTests"
+	"org.bouncycastle.operator.test.AllTests"
+	"org.bouncycastle.pkcs.test.AllTests"
+	"org.bouncycastle.tsp.test.AllTests"
+)
+
+# https://bugs.gentoo.org/823347
+check_env() {
+	if use test; then
+		# this is needed only for tests
+		CHECKREQS_MEMORY="2048M"
+		check-reqs_pkg_pretend
+	fi
+}
+
+# https://bugs.gentoo.org/823347
+pkg_pretend() {
+	check_env
+}
+
+# https://bugs.gentoo.org/823347
+pkg_setup() {
+	check_env
+	java-pkg-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	java-pkg_clean ..
+}
+
+# https://bugs.gentoo.org/823347
+src_test() {
+	JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}"
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default
+	einstalldocs
+	docinto html
+	dodoc -r ../docs
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/bcpkix/metadata.xml b/dev-java/bcpkix/metadata.xml
index 4221e170cbc0..40c8ee28be10 100644
--- a/dev-java/bcpkix/metadata.xml
+++ b/dev-java/bcpkix/metadata.xml
@@ -5,4 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<longdescription>
+		The Bouncy Castle Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation. This jar contains APIs for JDK 1.8 and up. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index aaa1cc15f6eb..f4f1f59bfe3a 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -1,3 +1,5 @@
 DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
+DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
 EBUILD bcprov-1.69.ebuild 2754 BLAKE2B 189ff7bfda398f16df34cfc644024a5287dd51fa2c5e2c0919ed4cc2ae2df9083d7c0efb604402156e58292589ef6c8eb631ade1d497db9943623178155a8689 SHA512 72828c651c1deaf67721d0515feab2821876810fe29554bf0cadb09a5274115f10ba2df1f3b4b2bb93ab205dfb6e7182275dbccd19931902186c84464abb8324
-MISC metadata.xml 482 BLAKE2B 0afc6ceb6e81b57040e44020b919d226bd8d9ae3eb64bb4955a31c23f929712db16c0c2245dad2dbd7750ec20d0794af53ba05fc7411cf19445daee331b1f21d SHA512 1c342946be63fe9caf6905074d8590b60c1044ef8a6b89714a33b8e97f3ab70409748a697453d23f7b8d3c27ccf14dc8f3be84fb36cc5f810c30b54ce6118b06
+EBUILD bcprov-1.71-r1.ebuild 3491 BLAKE2B 4543cbddc8afe392f7bd8840ca297284989a8698394df1db9c2886cdd1989f64a6c68f61ad879a70fadb2a10a8a9af9698653cb86d3e2fa34fd894974f5fd4d0 SHA512 f3c394e75f2f09dde4cd29cbe548cf99c221b3528a0e505d190641eb2d757272b4b6ec226cb5b1f4cfd78d8734b462388f5457186fdaf2d8495f3e19a9cdf815
+MISC metadata.xml 476 BLAKE2B b065e42576858847f7c1e2a8f27b836c59ca67f9514bae2077d884601e73fe7cf347beae0c31f2d4e795787bf22d9e7d575555cf0a1d1de2de36bd200fc4af0b SHA512 510131e9259fbe497800cc5ac8650a970e45013c398b4aa26a240c5ef66186fe594f9ff9d21258d7bb744aed1d5365ab462fa5abfec7ef48efbd15071789ea15
diff --git a/dev-java/bcprov/bcprov-1.71-r1.ebuild b/dev-java/bcprov/bcprov-1.71-r1.ebuild
new file mode 100644
index 000000000000..6863a4a66716
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.71-r1.ebuild
@@ -0,0 +1,111 @@
+# 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.bouncycastle:bcprov-jdk18on:1.71"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple check-reqs
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
+SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/zip"
+
+DOCS=( ../{README,SECURITY}.md )
+HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
+
+S="${WORKDIR}/bc-java-r${PV/./rv}/prov"
+
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"../core/src/main/java"	# package org.bouncycastle.asn1 does not exist
+	"src/main/jdk1.9"	# https://bugs.gentoo.org/797634
+)
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR=( "src/test/java" "../core/src/test/java" )
+JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" "../core/src/test/resources" )
+
+JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/../core/src/test/data"
+
+# Depending on vm_version 11 or 17 there are 2 different errrors
+# 1) testJCE(org.bouncycastle.jce.provider.test.SimpleTestTest)
+# junit.framework.AssertionFailedError: index 29 KeyStore: Exception: java.security.KeyStoreException: BKS-V1 not found
+#         at junit.framework.Assert.fail(Assert.java:57)
+#         at junit.framework.TestCase.fail(TestCase.java:223)
+#         at org.bouncycastle.jce.provider.test.SimpleTestTest.testJCE(SimpleTestTest.java:26)
+#
+# 1) testJCE(org.bouncycastle.jce.provider.test.SimpleTestTest)
+# junit.framework.AssertionFailedError: index 9 BlockCipher: IDEA/PGPCFB/NoPadding failed encryption - java.io.IOException: javax.crypto.ShortBufferException: output buffer too short for input.
+#         at junit.framework.Assert.fail(Assert.java:57)
+#         at junit.framework.TestCase.fail(TestCase.java:223)
+#         at org.bouncycastle.jce.provider.test.SimpleTestTest.testJCE(SimpleTestTest.java:26)
+JAVA_TEST_RUN_ONLY=(
+	"org.bouncycastle.asn1.test.AllTests"
+	"org.bouncycastle.crypto.agreement.test.AllTests"
+	"org.bouncycastle.crypto.ec.test.AllTests"
+	"org.bouncycastle.crypto.prng.test.AllTests"
+	"org.bouncycastle.crypto.test.AllTests"
+	"org.bouncycastle.jcajce.provider.test.AllTests"
+#	"org.bouncycastle.jce.provider.test.AllTests"	# bug #827146
+	"org.bouncycastle.jce.provider.test.nist.AllTests"
+	"org.bouncycastle.jce.provider.test.rsa3.AllTests"
+	"org.bouncycastle.pqc.crypto.lms.AllTests"
+	"org.bouncycastle.pqc.crypto.test.AllTests"
+	"org.bouncycastle.pqc.jcajce.provider.test.AllTests"
+	"org.bouncycastle.util.encoders.test.AllTests"
+)
+
+check_env() {
+	if use test; then
+		# this is needed only for tests
+		CHECKREQS_MEMORY="2048M"
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_env
+}
+
+pkg_setup() {
+	check_env
+	java-pkg-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	java-pkg_clean ..
+}
+
+src_test() {
+	JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}"
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default
+	einstalldocs
+	docinto html
+	dodoc -r ../docs
+
+	# These files are not present in the upstream jar but are used for tests
+	# Removing them from the jar file after testing
+	zip --delete "${S}"/bcprov.jar \
+		"org/bouncycastle/pqc/crypto/ntru/*" \
+		"org/bouncycastle/pqc/math/ntru/*" \
+		|| die "cleaning after tests failed"
+
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/bcprov/metadata.xml b/dev-java/bcprov/metadata.xml
index b5ad9ebd01ee..1a34130e2c63 100644
--- a/dev-java/bcprov/metadata.xml
+++ b/dev-java/bcprov/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<longdescription>
-		"The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. This jar contains JCE provider and lightweight API for the Bouncy Castle Cryptography APIs for JDK 1.5 to JDK 1.8."
+		The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. This jar contains JCE provider and lightweight API for the Bouncy Castle Cryptography APIs for JDK 1.8 and up.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/bcutil/Manifest b/dev-java/bcutil/Manifest
index d886d9bae76c..75a19d0bf582 100644
--- a/dev-java/bcutil/Manifest
+++ b/dev-java/bcutil/Manifest
@@ -1,3 +1,5 @@
 DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
+DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
 EBUILD bcutil-1.69.ebuild 1344 BLAKE2B 58f67dc29b82749f8aa3177184704216626b9e68105555783a3bbb82f24a1e7bd913ca97a9291e076a68dd96078462e9e1757d1d7d2b81dae03473fda1ac616f SHA512 59eec044a0a16d9899a1d472184f98afd131c879251910f8130f2446123d531140f9ee6a2cfdab22f7cc7fab69e6b4f91456f91f27cd693c6c91a8382290b984
-MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
+EBUILD bcutil-1.71.ebuild 1296 BLAKE2B 4dbf5689690c86d8423eccb85a2dff565d6248ca235eeb79b6e414b49129f96ff7a9f5b95cb8e733fe719e8776886911d253f6ec69b1cb96b18f9d3cbccc9922 SHA512 df9eeafbc192dd8a948d67662c7724c17e8bae50fb48144a126a0ea98ff0874e1c69618d57a1e1a811a34d77e7935e23c0460057b99a3f5097a178eea29b2330
+MISC metadata.xml 400 BLAKE2B 7b3239d613e5793ddd738c087d43a9d6f5b0744acf64103234e0f6628aa2296c6a5f86c9af1b980b715a5c58bdb11187a19e48a0cfbfa4f9f63231ee3396e01c SHA512 5754fab7fa105fad0b55babb33cda5e5b309f047bb6da3b7760bd8a3fab219209aa52a3078c43b194fe7a02cff8e5d8ead3e2ba9c74837ce0e604574b344ed16
diff --git a/dev-java/bcutil/bcutil-1.71.ebuild b/dev-java/bcutil/bcutil-1.71.ebuild
new file mode 100644
index 000000000000..7332092ef843
--- /dev/null
+++ b/dev-java/bcutil/bcutil-1.71.ebuild
@@ -0,0 +1,57 @@
+# 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.bouncycastle:bcutil-jdk18on:1.71"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java APIs for ASN.1 extension and utility APIs used to support bcpkix and bctls"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
+SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CDEPEND="~dev-java/bcprov-${PV}:0"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-11:*"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( ../{README,SECURITY}.md )
+HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
+
+S="${WORKDIR}/bc-java-r${PV/./rv}/util"
+
+JAVA_GENTOO_CLASSPATH="bcprov"
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"src/main/jdk1.9"	# https://bugs.gentoo.org/797634
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_RUN_ONLY=(
+	"org.bouncycastle.asn1.util.test.AllTests"
+	"org.bouncycastle.oer.test.AllTests"
+)
+
+src_prepare() {
+	default
+	java-pkg_clean ..
+}
+
+src_install() {
+	default
+	einstalldocs
+	docinto html
+	dodoc -r ../docs
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/bcutil/metadata.xml b/dev-java/bcutil/metadata.xml
index 75321cfb5598..8f66cc0abd4b 100644
--- a/dev-java/bcutil/metadata.xml
+++ b/dev-java/bcutil/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 	</maintainer>
+	<longdescription>
+		The Bouncy Castle Java APIs for ASN.1 extension and utility APIs used to support bcpkix and bctls. This jar contains APIs for JDK 1.8 and up.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/boot-bin/Manifest b/dev-java/boot-bin/Manifest
deleted file mode 100644
index a0a900ce4254..000000000000
--- a/dev-java/boot-bin/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX boot 259 BLAKE2B 4e2b95f13d06d60f4ab06aaf6121281cc7164e4943ce77fd4320b165451abb985ce396ccbc7586facf7613c627e07196b2c7ca4f66619c25c60796a8fa7c8368 SHA512 9858dcc8d99d5266a053ad525c2e23ea9826ea982e54dd9621fcc5769cbe38143030c005673f1394163d52c5c94dfadf1973cdcd1fb763dee67a6ae13298db7a
-DIST boot-2.8.3-CHANGES.md 28286 BLAKE2B 56ce0ba83292d1b0a9b22b34e3ac89a4f203ff7b20b3a9a0ca092e4594cb8430574d04ff15ec50dc431f4a32ebbcbe2651010abc48c46a241fff5147d1449297 SHA512 cab01416dcbd642953fa32ae5d8255722f61860752a32e7a4a55f0d5730363e305c5549e63777e3e032f2d098864cfa16b62889c66fe9aa481778ad7a0249e80
-DIST boot-2.8.3-README.md 19164 BLAKE2B cb2d63e332d427cd235868f9b25aa5b7baaa41ebbf1447c029019e2d4aa872eed26e79c027f06b201e21e0a1522d42fed57bf5eae5de683baf4a62e2c10b739a SHA512 2557f8ae6893ae6f3c576e8325f11edac5e4e91c45e3864957784092e8154aaa30f1a5de8acb52bb90e7c3ad034f2e9703e4b5aac2d621cbd885e8bbb102cc04
-DIST boot-2.8.3.jar 20940394 BLAKE2B 398264e467dc14c7df49dd75e4197ebd755e1afdc6ae8877de30cd72d35c0bf56a83b64573ec3aa976ae63fcffe9c371b0789bc0f95e43bbb509ff19cc305ee9 SHA512 039c8ed3320871a1227240ad8d0aac07cbb41e65096d71b9547733c49f02febff6ac5ed15cda744c7fbc0ee4830908597f0c3c8288d4d059c603057db24bd1db
-EBUILD boot-bin-2.8.3.ebuild 2205 BLAKE2B c70ab468bc348812512dddb4f8dac6d7583fa25b7aa7766c49f84aa8df96370ba0a271473c012d4c6bfc9ed62c7a3a5620dea23b465c325c113e5e8dbbe54001 SHA512 1011596dc08d84f1598eb646bfef0eec623efdb7683992380a0aaab8ab12df661a19e17cc9e765b064e6338d327d3a9afc84ef146de0debedb26f4376766bb77
-MISC metadata.xml 295 BLAKE2B 87d34cf3eec917508fa40b0442698ec2887fa6f518e91bd8c70c70222a4cec4d6b4933992713fa72140c04fa174b0fafa42f12dc41210f0f57ffcfc00f71b757 SHA512 37877f947a9879629e426cef5bbc50ecf3527be6a4fb987a021d459bf2738fe4af0b2db24adbfac8e99c0dfa3f1bfb10cb7d2e2721b2b6cd39e5953d97cf90ab
diff --git a/dev-java/boot-bin/boot-bin-2.8.3.ebuild b/dev-java/boot-bin/boot-bin-2.8.3.ebuild
deleted file mode 100644
index 58fcb200f386..000000000000
--- a/dev-java/boot-bin/boot-bin-2.8.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_PNV="${MY_PN}-${PV}"
-GITHUB_USER="boot-clj"
-
-DESCRIPTION="Build tooling for Clojure"
-HOMEPAGE="https://boot-clj.com/"
-SRC_URI="
-	https://github.com/${GITHUB_USER}/${MY_PN}/releases/download/${PV}/${MY_PN}.jar -> ${MY_PNV}.jar
-	https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/README.md -> ${MY_PNV}-README.md
-	https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/CHANGES.md -> ${MY_PNV}-CHANGES.md
-"
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.7"
-DEPEND=">=virtual/jdk-1.7"
-
-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 boot shell-script"
-	cp "${FILESDIR}/boot" "${S}/" || die "Can't copy boot"
-
-	for file in "README.md" "CHANGES.md"; do
-		einfo "Renaming ${MY_PNV}-${file} to ${file}"
-		mv "${S}/${MY_PNV}-${file}" "${S}/${file}" || die "Can't rename ${MY_PNV}-${file} to ${file}"
-	done
-
-	java-pkg_init_paths_
-
-	sed -i "s|@@JAVA_PKG_SHAREPATH@@|${JAVA_PKG_SHAREPATH}|g" "${S}/boot" || die "Can't patch JAVA_PKG_SHAREPATH path in boot"
-	sed -i "s|@@JAVA_PKG_JARDEST@@|${JAVA_PKG_JARDEST}|g" "${S}/boot" || die "Can't patch JAVA_PKG_JARDEST path in boot"
-	sed -i "s|@@PN@@|${PN}|g" "${S}/boot" || die "Can't patch PN in boot"
-
-	default
-}
-
-src_compile() { :; }
-
-src_install() {
-	dobin "${S}/boot"
-	dodoc "${S}/README.md"
-	dodoc "${S}/CHANGES.md"
-
-	java-pkg_newjar "${S}/${MY_PNV}.jar"
-}
-
-pkg_postinst() {
-	einfo "This package will still download a whole lot of its own runtime"
-	einfo "dependencies the first time you run it."
-	einfo ""
-	einfo "This currently can't be helped and is expected behaviour for a"
-	einfo "java based development toolkit"
-	einfo ""
-	einfo "You may also need to nuke ~/.boot/boot.properties to get the"
-	einfo "updated mechanics, and for boot --version to behave correctly"
-	einfo "due to upstreams per-user/per-project version-locking mechanisms"
-}
diff --git a/dev-java/boot-bin/files/boot b/dev-java/boot-bin/files/boot
deleted file mode 100644
index 8d53ebd338a8..000000000000
--- a/dev-java/boot-bin/files/boot
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-source @@JAVA_PKG_SHAREPATH@@/package.env
-jarpath="@@JAVA_PKG_JARDEST@@/@@PN@@.jar"
-declare -a "options=($BOOT_JVM_OPTIONS)"
-self="${BASH_SOURCE[0]}"
-exec ${BOOT_JAVA_COMMAND:-java} "${options[@]}" -Dboot.app.path="$jarpath" -jar "$jarpath" "$@"
-
diff --git a/dev-java/byaccj/Manifest b/dev-java/byaccj/Manifest
index 994a75dc99a5..c0b01cebaf92 100644
--- a/dev-java/byaccj/Manifest
+++ b/dev-java/byaccj/Manifest
@@ -1,4 +1,6 @@
 AUX Makefile 2003 BLAKE2B e57447ec26975954239e92509fa1491fb31235a150d56db7fdefbd4fb61bd53e13df5d0b6157843c094ff8b691de00515e92fdf4c95c9ea6e71fc122c4d27efb SHA512 d48f81fcf89ca5f6524572b75dcde4866cea5f434059233c234a664f56e80c0daadc8f314711cb9c55430a947cc9dbf48f4a0bead0433da5b333f5fd73fcbc68
+AUX byaccj-1.15-implicit-function-declaration.patch 451 BLAKE2B e6f601d34a94c62c9a673857eac1b6fbf375a2154102e5ae9cb312133da41b693a77a8c3fdbea2e2d222385f2575eaa78a3923f79f32b1a3958c6a52e7dccbda SHA512 fcb1743c65341e81a3fcaa970eeca3313daf8eb5547b6f9852d87278e8e4a5c16add33b88bb593379068002f2b498cdb88506bc6fb97ccf6b9f37e26c347857d
 DIST byaccj1.15_src.tar.gz 53646 BLAKE2B a57cdb85253f2ea8485c05687222cf99912494841cdfb6deb13d80d49f87a3dd8f1eb3350bf2501c7c86b70a198415e339019930301bd8d2a770e10ca9bb850f SHA512 6423ecca70d21dd0c1dd8366361f6c4420536e099090b18738013fbb6e8e0710ee739e51dfd7f603a64f8761f48cdd1d8dc7844d1b5ec6b792535254d290addc
 EBUILD byaccj-1.15-r2.ebuild 674 BLAKE2B 2a8ac5a59ffc24078ffccdd726a06adddf5da882c2db44008c11eb193d21464395bec9d1c6a521a180b05429c038897c557cd6d76cdf6403af0fac9ce549d749 SHA512 af73b399fa6c1eb54442b4596afe51b47814916fd75605b298d41a880c191306a117465336287893b164a9ce79608cfa8b200252876c9de878aa37c952db0f0c
+EBUILD byaccj-1.15-r3.ebuild 745 BLAKE2B 54ab8b57ad67bb8b19a7c35abae3bb7e2d5c72d46f6793bbf5e077535560255db214c8818c3fc887635f3bb0b478993de9944bd8d55dc03a99afc76732fb65ca SHA512 b6005ffc96d01ec5220b93b994b5892a7a0d415f66ba58d0aea98e9d161af57d73f62a774d1087540468326ba22444cc970149d995e4ebdeb628bfd954ac00bd
 MISC metadata.xml 313 BLAKE2B c5964ac48d194d9f970a09e692c7d1460eeed214ec359c1393116bac2f6b9112233f7e5f6d3f1152704e553760b203cbd355e50c34318fe89019b13548b8a20b SHA512 0e243b8c5993cb0ae9de0b5efe268ab1587c722b4de9d915d250fb63814f5169754b467a9db3e8b9cd6256e67418fe5e3d15da7e07c984fd400dad43e5b65796
diff --git a/dev-java/byaccj/byaccj-1.15-r3.ebuild b/dev-java/byaccj/byaccj-1.15-r3.ebuild
new file mode 100644
index 000000000000..4db1ab8bbc03
--- /dev/null
+++ b/dev-java/byaccj/byaccj-1.15-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A java extension of BSD YACC-compatible parser generator"
+HOMEPAGE="http://byaccj.sourceforge.net/"
+MY_P="${PN}${PV}_src"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.15-implicit-function-declaration.patch
+)
+
+src_compile() {
+	cp "${FILESDIR}/Makefile" src/Makefile || die
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" -C src linux
+}
+
+src_install() {
+	newbin src/yacc.linux "${PN}"
+	dodoc docs/ACKNOWLEDGEMEN
+}
diff --git a/dev-java/byaccj/files/byaccj-1.15-implicit-function-declaration.patch b/dev-java/byaccj/files/byaccj-1.15-implicit-function-declaration.patch
new file mode 100644
index 000000000000..5f5bb58db13e
--- /dev/null
+++ b/dev-java/byaccj/files/byaccj-1.15-implicit-function-declaration.patch
@@ -0,0 +1,15 @@
+main.c: In function ‘done’:
+main.c:88:43: error: implicit declaration of function -Werror=implicit-function-declaration
+   88 |   if (action_file) { fclose(action_file); unlink(action_file_name); }
+      |                                           ^~~~~~
+--- a/src/main.c
++++ b/src/main.c
+@@ -2,6 +2,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++#include <unistd.h>
++
+ #ifndef __WIN32__  /*rwj  --  make portable*/
+ #include <signal.h>
+ #else
diff --git a/dev-java/byte-buddy-agent/Manifest b/dev-java/byte-buddy-agent/Manifest
index af1db7391d78..c17e1049683a 100644
--- a/dev-java/byte-buddy-agent/Manifest
+++ b/dev-java/byte-buddy-agent/Manifest
@@ -1,4 +1,7 @@
+DIST byte-buddy-1.12.10.tar.gz 149932619 BLAKE2B dce562c72fce2b4c6f7d7b49192297929c6828b5157db81825199eb6636a6aadfa27240cf69e6ebfef7e809b35aec0037461ec4b30c7633cb700f55458238058 SHA512 5f8c9e94e3661978e51134a65842e376b96acfe25e940c565a2647bec54bb7c40b12501b590019270ce470efc4ca8f4dd0a7ffe7c6d5d2854b768c28c84920a6
 DIST byte-buddy-1.12.8.tar.gz 149928045 BLAKE2B f1fceaea236a7d625739547556cd3775629250ab0cf6ead0643002895d432f06b84bdf193de3d4aa88de8cfdd3ff38a4aa1340076be918c0e5e0c217072cb8e0 SHA512 dffe3f557d29b9c0ac16e8314e2a1fc2b089bda000d5c1307ad2d8808f149f3bef90daa0f8dcc9815d255fc11824b28708b6fddfe942ea8f24ca61f9ea73a1d9
+DIST byte-buddy-agent-1.12.10-sources.jar 204651 BLAKE2B f3e0db8e6c8f3380ee3bfd8969555c331689990b97e91206567c01ffbaabc58eeb25b0879e792ebce1044afa8d3b5596830349d9c233ab1af84d13213e046f4d SHA512 8569531e5f5343378037cd9740bdc42b91becb9adaf0f2cacbdcb0e5ccafb3e47fce9c7b71d8d8d8df1c7373ffd44d798b8b164136d87913faed1e19474f803d
 DIST byte-buddy-agent-1.12.8-sources.jar 204430 BLAKE2B fe62b36fccc1000b63cf4fdc9a0eda0b767baedbb795ed55d28068ca9bd01f10b47e28edb2ee2d0fccd28e82f531f882091386b9c58f2ca929e17e89f996876a SHA512 576cad5aec60bb1623faf6f2460e9550aab392124579a0ed467128c3cdbc20fb0c4e51dfaa8d56c8f2f314bcc494068aae5c199a0551cbfce053633a2ffb5bd2
-EBUILD byte-buddy-agent-1.12.8.ebuild 3932 BLAKE2B 4a909157bcd91623ccfe21e78d19e6d1ca0f74dd51b6eea0f8b0c36af4a9f3261292a9efc13d48e984f0611c44591b9bd54fc68d69be9dfcb39a4cf7800259b2 SHA512 15428934f7ba40f4dfa27296e52dc3e38ae9995339019662f3ba2b685b4dfdcbfaed7f0f40f26ded47c0b80c0d120927a3635d288513859113daf1c7ee8553a3
+EBUILD byte-buddy-agent-1.12.10.ebuild 3900 BLAKE2B 683f9d03bfe04810f6b946b71039af441dd2835cbe7c37c532fbaaba3748d1b30f05dce7e2b8d4370b8e6d99c4070f242a97648e35a7e55205a9dbd33c9d90e1 SHA512 2927b9d5303df5250ef6380359c8fb3265e784003d10d41512e9aad02c2b3dad2250b53de61d620da9df0541885a2fe1a40c698f75d50fada7570ecf9ce709c4
+EBUILD byte-buddy-agent-1.12.8.ebuild 3928 BLAKE2B efbc2379d5631c28281ee48b064646d9bb329dd3cbd590fc688520a478220fb0faff9f31e8aa455450b90083039fb4378e029cce6071fade49111450b20581fc SHA512 f6b00b5f5dbd9d3cff386afd1067a807cd6842b2107e8586af2e371558a375a1fa0213c2b335adc83ca2a74b2b06ce427de752a8ca59748f18f3d005281d4cdf
 MISC metadata.xml 298 BLAKE2B 914c744490ae973853ca6466984c1037b03e9fca047e413a4c6981122c796312f56510069c6ac3c7cbc4ade7f45d480b4aa6ad0dbeb5e9c19e552aa136308626 SHA512 6483fd3b6cf22d595b2d925d81b5450f1bbe5b0b371bf4bd221a7433d9eeec5824c2dc644a77cb4206a6bcc017172f764f050eda9dd6f479fe408d491b325f5a
diff --git a/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.10.ebuild b/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.10.ebuild
new file mode 100644
index 000000000000..69968be0f8ce
--- /dev/null
+++ b/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.10.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom byte-buddy-agent-1.12.10.pom --download-uri https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.10/byte-buddy-agent-1.12.10.jar --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-agent-1.12.10.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="net.bytebuddy:byte-buddy-agent:1.12.10"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM"
+HOMEPAGE="https://bytebuddy.net/"
+SRC_URI="https://repo1.maven.org/maven2/net/bytebuddy/${PN}/${PV}/${P}-sources.jar
+	test? ( https://github.com/raphw/byte-buddy/archive/byte-buddy-${PV}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: ${P}.pom
+# com.google.code.findbugs:findbugs-annotations:3.0.1 -> >=dev-java/findbugs-annotations-3.0.1:0
+# com.google.code.findbugs:jsr305:3.0.2 -> >=dev-java/jsr305-3.0.2:0
+# net.java.dev.jna:jna:5.8.0 -> >=dev-java/jna-5.10.0:4
+# net.java.dev.jna:jna-platform:5.8.0 -> !!!artifactId-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	dev-java/findbugs-annotations:0
+	dev-java/jna:4
+	test? ( dev-java/mockito:4 )
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+JAVA_CLASSPATH_EXTRA="findbugs-annotations,jna-4"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+# 1) testSystemProperties(net.bytebuddy.agent.VirtualMachineAttachmentTest)
+# java.lang.reflect.InvocationTargetException
+# --
+# Caused by: java.lang.UnsatisfiedLinkError: Native library (com/sun/jna/linux-x86-64/libjnidispatch.so) not found in resource path (target/test-classes:byte-buddy-agent.jar:/usr/share/findbugs-annotations/lib/findbugs-annotations.jar:/usr/share/jna-4/lib/jna.jar:/usr/share/jna-4/lib/jna-platform.jar:/usr/share/jsr305/lib/jsr305.jar:/usr/share/junit-4/lib/junit.jar:/usr/share/mockito-4/lib/mockito.jar:/usr/share/hamcrest-core-1.3/lib/hamcrest-core.jar:/usr/share/byte-buddy/lib/byte-buddy.jar:/usr/share/byte-buddy-agent/lib/byte-buddy-agent.jar:/usr/share/objenesis/lib/objenesis.jar:/usr/share/opentest4j/lib/opentest4j.jar:/usr/share/junit-4/lib/junit.jar:/usr/share/hamcrest-core-1.3/lib/hamcrest-core.jar)
+#         at com.sun.jna.Native.loadNativeDispatchLibraryFromClasspath(Native.java:1059)
+# --
+# 2) testAgentProperties(net.bytebuddy.agent.VirtualMachineAttachmentTest)
+# java.lang.reflect.InvocationTargetException
+# --
+# Caused by: java.lang.NoClassDefFoundError: Could not initialize class com.sun.jna.Native
+#         at net.bytebuddy.agent.VirtualMachine$ForHotSpot$Connection$ForJnaPosixSocket$Factory.<init>(VirtualMachine.java:879)
+# --
+# 3) testMultipleProperties(net.bytebuddy.agent.VirtualMachineAttachmentTest)
+# java.lang.reflect.InvocationTargetException
+# --
+# Caused by: java.lang.NoClassDefFoundError: Could not initialize class com.sun.jna.Native
+#         at net.bytebuddy.agent.VirtualMachine$ForHotSpot$Connection$ForJnaPosixSocket$Factory.<init>(VirtualMachine.java:879)
+# --
+# 4) testAttachment(net.bytebuddy.agent.VirtualMachineAttachmentTest)
+# java.lang.reflect.InvocationTargetException
+# --
+# Caused by: java.lang.NoClassDefFoundError: Could not initialize class com.sun.jna.Native
+#         at net.bytebuddy.agent.VirtualMachine$ForHotSpot$Connection$ForJnaPosixSocket$Factory.<init>(VirtualMachine.java:879)
+# --
+# FAILURES!!!
+# Tests run: 51,  Failures: 4
+JAVA_TEST_EXCLUDES="net.bytebuddy.agent.VirtualMachineAttachmentTest"
+
+src_prepare() {
+	default
+	mkdir -p "src/main/java" || die
+	mv "net" "src/main/java" || die
+	if use test; then
+		mv "byte-buddy-byte-buddy-${PV}/byte-buddy-agent/src/test" "src" || die
+	fi
+}
diff --git a/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.8.ebuild b/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.8.ebuild
index 050af69691a8..43c4d6ef258c 100644
--- a/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.8.ebuild
+++ b/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.8.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://repo1.maven.org/maven2/net/bytebuddy/${PN}/${PV}/${P}-sources.j
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: ${P}.pom
diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index 13b96bf3db5a..4901e01eecd6 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,3 +1,5 @@
+DIST byte-buddy-1.12.10-sources.jar 1331398 BLAKE2B 8732ac81514de40d3d2ffd67ddca05ab9b8a5d0a7f240ee4591fd02b41f410f9e834f389aa898829fbae6082e14a090f87052f537b2b6293c7f8f98d4a5d0583 SHA512 15cb4330598d9259afa29aac0317f8e0e003eb76fb26052bba0714ad30453db721938be7d46fcc6a0c7bbe124bffe68dfee6fcf11a3e4030e99ef01d0ae3d461
 DIST byte-buddy-1.12.8-sources.jar 1327088 BLAKE2B b20101a8e2f68c795ef102b8f2d581c1ebf223dee2170b675f0959bfe547c2793bf79c7e9508b405e43f3561f48423b980ed2e87c6297999a7d1257df4d6524e SHA512 a99d69be07049f4ed162566111c6524a9dd90af459d994a5e917596b5787b74aa88d67a8db7651008558ad687dccbefd0ee87207c6b28ab0660e02abdb43f9c6
-EBUILD byte-buddy-1.12.8.ebuild 1374 BLAKE2B 780becc5c6170b88a4d0f04e7a91764bcac5eb2a293a42cf094df34d32b84d39044b2f8a4c3c31b837d6d4264f9a19216ae935f159f606bac334859700715f4b SHA512 499c064697baf6f468fae2d847cc4568090c20091c105a420974b40c76550b8bc29c82eb2cc76015a07ff76e5ebdd3902db242987c2dd27946a83ff94d482274
+EBUILD byte-buddy-1.12.10.ebuild 1379 BLAKE2B 020baaed6a9a41c258a410eb48f56af3759565e44f842d7e27d6bd157ff82f4f896934d846592ffb1971c488252bb14d4901fd6c0ca33c9cdb82526fc5e17e77 SHA512 95f1ae38608e69f77245191b7783978e39c09d9244ee8c0a64f58eab28ac499796f30cd45cc5696120cf18586441a1e2e936839ee4f9795af0f7956c7e48ab39
+EBUILD byte-buddy-1.12.8.ebuild 1370 BLAKE2B c4a45f20932a34eb9123b9ce80180a0753a37852552a032ec054b6a495f3d881038a2675345bfa38a25b0cc8d2d7d845767ed709cd9cfa1aeebb54bca09bd1e3 SHA512 8d63a24aff2825156ed64ec484fad185ba4f9d22ae2afbfec9ff8737ab3a5e8300bcef0210b83f31b89ea281d969058d5727cd0f9a56415ff2e3b1505387dced
 MISC metadata.xml 440 BLAKE2B ef73e69de33dc6bbea38c81b8744fad5ce4764644d9cc6168d7c0f175856e30c3a577ffc597f25f8caf26bacfd80663b55eddde047a346fcb582d883269233b9 SHA512 b27c92e768c2783c90c8b4693c3265a9533a09abe76b2b3bd54e3865d270eed91414fcd89513bc30feb0243ea21f63d354b907b74eb18e98f899811101a6c956
diff --git a/dev-java/byte-buddy/byte-buddy-1.12.10.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.10.ebuild
new file mode 100644
index 000000000000..4df6e466f7f0
--- /dev/null
+++ b/dev-java/byte-buddy/byte-buddy-1.12.10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom byte-buddy-1.12.10.pom --download-uri https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.12.10/byte-buddy-1.12.10-sources.jar --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.10.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="net.bytebuddy:byte-buddy:1.12.10"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Byte Buddy is a Java library for creating Java classes at run time"
+HOMEPAGE="https://bytebuddy.net/"
+SRC_URI="https://repo1.maven.org/maven2/net/bytebuddy/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: ${P}.pom
+# com.google.code.findbugs:findbugs-annotations:3.0.1 -> >=dev-java/findbugs-annotations-3.0.1:0
+# com.google.code.findbugs:jsr305:3.0.2 -> >=dev-java/jsr305-3.0.2:0
+# net.java.dev.jna:jna:5.8.0 -> >=dev-java/jna-5.10.0:4
+# net.java.dev.jna:jna-platform:5.8.0 -> !!!artifactId-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	dev-java/findbugs-annotations:0
+	>=dev-java/jna-5.10.0:4
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+JAVA_CLASSPATH_EXTRA="findbugs-annotations,jna-4"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
diff --git a/dev-java/byte-buddy/byte-buddy-1.12.8.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.8.ebuild
index 3b658b7e1137..a25c51f399f4 100644
--- a/dev-java/byte-buddy/byte-buddy-1.12.8.ebuild
+++ b/dev-java/byte-buddy/byte-buddy-1.12.8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/net/bytebuddy/${PN}/${PV}/${P}-sources.j
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: ${P}.pom
diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
index 28d0f8d4ee0d..e7599a630540 100644
--- a/dev-java/commons-cli/Manifest
+++ b/dev-java/commons-cli/Manifest
@@ -1,5 +1,3 @@
-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
+EBUILD commons-cli-1.5.0.ebuild 1238 BLAKE2B ff00a5f32b33c14ed0359c2213ff6b1a2601be8bf2511f4f9e6b56e518f8be515cc6a400e5f718a2123f14b6d0e761ddc286dc1647c25e50dba93565aad5a4cd SHA512 ba1a83a2848c1bee51782a32f9ac3a01f274bb52ef3264eac799d5cd6a48ebe96939e0c0b4be2121665aa1c93beaead053c4cc40d37259e8a2d817b7ceb8565c
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/commons-cli/commons-cli-1.4.ebuild b/dev-java/commons-cli/commons-cli-1.4.ebuild
deleted file mode 100644
index cfe05d27ae26..000000000000
--- a/dev-java/commons-cli/commons-cli-1.4.ebuild
+++ /dev/null
@@ -1,43 +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"
-MAVEN_ID="commons-cli:commons-cli:1.4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java library for working with the command line arguments and options"
-HOMEPAGE="http://commons.apache.org/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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.7"
-
-DEPEND=">=virtual/jdk-1.7
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${P}-src"
-JAVA_SRC_DIR="src/main/java"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc CONTRIBUTING.md NOTICE.txt README.md RELEASE-NOTES.txt
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4)"
-	local TESTS=$(find * -name "*Test.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/commons-cli/commons-cli-1.5.0.ebuild b/dev-java/commons-cli/commons-cli-1.5.0.ebuild
index 8fb0198774dc..5edf37d89a77 100644
--- a/dev-java/commons-cli/commons-cli-1.5.0.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.5.0.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND=">=virtual/jre-1.8:*"
 
diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
index e1eff5398b62..97e503a7aa5c 100644
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -1,3 +1,6 @@
+AUX commons-daemon-1.3.1-Make.patch 508 BLAKE2B a7645b93b44f15b4ebb9a0864a3c467999bcb0becf006f2806f897a26435140017384fb8cf14151e3a7b969c9397c4047f47e2a35f53904a9a013d5f085ab04c SHA512 f01c485a0832aef27b1fa6b681c7f66096a0206d6e75e702e32bd6131eb1ea4d85fb363d12eb6d29c386d2af773ca0ff17f14ea7a6ebc8469e641b0760e9a82f
 DIST commons-daemon-1.2.4-src.tar.gz 281929 BLAKE2B 877f1c31024a2f3e4796abdd11059bd636444f5c856b998a39761fb0b221467e986586fef43463a4d01b4d4f7a562f9f8c658b94a124cd356b0a70cc185c0030 SHA512 36e9cb3153ca763bfaaa71575a1584610254f1ce4c0f666ff7bbc628311405430536413525c9c777e4364eea62a247fb084750d837e84a62d9fce92a61909d56
+DIST commons-daemon-1.3.1-src.tar.gz 287642 BLAKE2B 02e85a5534af7f804a0374789506ee25ee8313987c68153974aa938b983745ae44d579f17deb362764d1a03b04bc552115bd69ef28b4f7d3bbb06f3bb4199814 SHA512 b810ac152f8296d980a4fb3786eff9d147b234dc2377df5fe1bded0824c694c9e82a7ef50b0a63c3e6432dfc4684a3aa2ce8d583aacb740bd4664c3dfb8b8f16
 EBUILD commons-daemon-1.2.4.ebuild 1457 BLAKE2B 23a03bb678cbdf4f897f56e4058241bd7e97228fffc152f568dd7f96e889d1cfe032d06be13ed97d74b345f3c6412d18cf1a322d7c8a31cc0581cf86e9dd0338 SHA512 64b4f7eb81eb75719138513dfa8ab2e26623443bf264201bff0b1c4d81ee764ce79e267515e54ba6767650f5818b68cbbd0678d99037042e5941f7c5d652d8f4
+EBUILD commons-daemon-1.3.1.ebuild 1562 BLAKE2B 8e8c3682b31e078cad4ae0ac7cf7b0bd4d8305a6f18ae28851ed4a49d18492514aebc0a402c7e16cfb40a0dbe6a3a78a22858c982ec7c8ebe4dd4c56f8cd7ba7 SHA512 106a2392838629feda046d9ae75e7e287d52d8a84bac4d26783b5b8e0094763421e9419bdf88242e76b0bbb682f6172b080b2cebbd38cdf35c829419d3207476
 MISC metadata.xml 530 BLAKE2B 313ae727a7149cfaa5e962b1daa4831e77b5f168d8f8d7f2b1242b8fa36f9d2f0460541ec53b8e81cbfae209e3c5e57f5dc5895e881acb61ce9118110aace98b SHA512 738ded66dfc479b30f4c1b6aae4052a4a2de5bf68aa9001a6a1f8fb29203a17b3fe10e52c7f5d26b1de313a74b3713cd22db259a584875f8f91391437cea53e0
diff --git a/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild b/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild
new file mode 100644
index 000000000000..f739750e8965
--- /dev/null
+++ b/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild
@@ -0,0 +1,65 @@
+# 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/commons/daemon/source/commons-daemon-1.2.4-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-daemon-1.2.4.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="commons-daemon:commons-daemon:1.3.1"
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple toolchain-funcs
+
+DESCRIPTION="Tools to allow Java programs to run as UNIX daemons"
+HOMEPAGE="https://commons.apache.org/proper/commons-daemon/"
+SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+PATCHES=( "${FILESDIR}/commons-daemon-1.3.1-Make.patch" )
+DOCS=( {CONTRIBUTING,README}.md {HOWTO-RELEASE,NOTICE,RELEASE-NOTES}.txt )
+HTML_DOCS=( PROPOSAL.html )
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
+
+# There is only org/apache/commons/daemon/SimpleDaemon.java
+# which is not even run upstream ( mvn test ).
+# JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+# JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	pushd src/native/unix || die
+		./configure
+		emake AR="$(tc-getAR)"
+	popd
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+
+	dobin src/native/unix/jsvc
+}
diff --git a/dev-java/commons-daemon/files/commons-daemon-1.3.1-Make.patch b/dev-java/commons-daemon/files/commons-daemon-1.3.1-Make.patch
new file mode 100644
index 000000000000..001be15a2815
--- /dev/null
+++ b/dev-java/commons-daemon/files/commons-daemon-1.3.1-Make.patch
@@ -0,0 +1,21 @@
+--- a/src/native/unix/Makedefs.in
++++ b/src/native/unix/Makedefs.in
+@@ -17,6 +17,7 @@
+ 
+ # @author  Pier Fumagalli <mailto:pier.fumagalli@eng.sun.com>
+ 
++AR = @AR@
+ CC = @CC@
+ CFLAGS = @CFLAGS@
+ CPPFLAGS = @CPPFLAGS@
+--- a/src/native/unix/native/Makefile.in
++++ b/src/native/unix/native/Makefile.in
+@@ -31,7 +31,7 @@ OBJS =  arguments.o \
+ all: jsvc libservice.a
+ 
+ libservice.a: $(OBJS)
+-	ar cr libservice.a $(OBJS)
++	${AR} cr libservice.a $(OBJS)
+ 	$(RANLIB) libservice.a
+ 
+ jsvc: jsvc-unix.o libservice.a
diff --git a/dev-java/commons-jxpath/Manifest b/dev-java/commons-jxpath/Manifest
deleted file mode 100644
index 4bbe31178302..000000000000
--- a/dev-java/commons-jxpath/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST commons-jxpath-1.3-src.tar.gz 285339 BLAKE2B c0127ff90c51b7ba69c12072689cc7ca5b969fa29e4793839bef3200b0dc3fbb529c89e21877daa4def4386f94298e43054828d4b4b05be3671e38d9f728d3d0 SHA512 a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152
-EBUILD commons-jxpath-1.3-r5.ebuild 1788 BLAKE2B 2d23caef7b4c7b06c2bf159d4e9d8816e4593d4e303f42a0693d6faa8877d8647e6dc5728dffac01a485de737f9f69d65a2ee0e497c69b575baac899991a79ef SHA512 5cc043334288a3a42f2644b1591f61fc3ce0b8dbdb30294944b451de6e7406527f4f45a700212abdf46d8fca20d8a426e6c68d5bb9119e8a7d3631f1cc201672
-MISC metadata.xml 463 BLAKE2B 1b7774556b00869ef427316f8ce3465dfaa4a666ac45e35099054c09c8956743ead7e1f3483169ac15c9bc208e9d72b0abee49d7103db93f8ae8462f3ae2408a SHA512 a703759ea4165486b35c1ce02dfc35ad5cf5899af03c1bc0580288ae51b931c0fd12da6a741a42d365bf452ed1d56f4296fd6afcebc6c490ce7e48f9234087d7
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild
deleted file mode 100644
index af6d503a2289..000000000000
--- a/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild
+++ /dev/null
@@ -1,62 +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 mirror://apache/commons/jxpath/source/commons-jxpath-1.3-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-jxpath-1.3-r5.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="commons-jxpath:commons-jxpath:1.3"
-# Tests depend on mockrunner-jdk1.3-j2ee1 which we don't have
-# JAVA_TESTING_FRAMEWORKS="junit"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds"
-HOMEPAGE="https://commons.apache.org/jxpath/"
-SRC_URI="mirror://apache/commons/jxpath/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# commons-beanutils:commons-beanutils:1.7.0 -> >=dev-java/commons-beanutils-1.9.4:1.7
-# jdom:jdom:1.0 -> !!!groupId-not-found!!!
-
-CP_DEPEND="
-	dev-java/commons-beanutils:1.7
-	dev-java/jdom:0
-	java-virtuals/servlet-api:3.0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# javax.servlet:jsp-api:2.0 -> !!!groupId-not-found!!!
-# javax.servlet:servlet-api:2.4 -> !!!groupId-not-found!!!
-# xerces:xercesImpl:2.4.0 -> >=dev-java/xerces-2.12.0:2
-# xml-apis:xml-apis:1.3.04 -> !!!groupId-not-found!!!
-# POM: pom.xml
-# test? com.mockrunner:mockrunner-jdk1.3-j2ee1.3:0.4 -> !!!groupId-not-found!!!
-# test? junit:junit:3.8.1 -> >=dev-java/junit-3.8.2:0
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	dev-java/xerces:2"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( {LICENSE,NOTICE}.txt )
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_CLASSPATH_EXTRA="xerces-2"
-JAVA_SRC_DIR="src/java"
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/commons-jxpath/metadata.xml b/dev-java/commons-jxpath/metadata.xml
deleted file mode 100644
index f918f7019466..000000000000
--- a/dev-java/commons-jxpath/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>
-	<longdescription>
-		A Java-based implementation of XPath 1.0 that, in addition to XML processing, can inspect/modify Java object graphs (the library's explicit purpose) and even mixed Java/XML structures.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-java/conversant-disruptor/Manifest b/dev-java/conversant-disruptor/Manifest
index e9b5aaeb2861..cb82f9c1427f 100644
--- a/dev-java/conversant-disruptor/Manifest
+++ b/dev-java/conversant-disruptor/Manifest
@@ -1,3 +1,5 @@
 DIST conversant-disruptor-1.2.19.tar.gz 171364 BLAKE2B 2ac7a42835f22ae7361f156b9cb9853cea39b757c9869847b9b4c526e3e04e46ae8b7ca90c1c38bd3fa57f6925bfc95767235fb4640e7ecf1e62044973b53932 SHA512 f475507e2ab2e4260ec04b699c42115fa917f3df9dc67bbf944c96441e58fff1ab8ba63beb97dbc77d3b76f65b6b116d84b17a1eb4b40d58dedbc029e81e39ee
+DIST conversant-disruptor-1.2.20.tar.gz 171469 BLAKE2B 5c43a5ffad0dacf07605cab6bba2ab1d44f7204d1e24405a4f8f8b09a3edbee79bc5ae4ba28a0a8cb1440db15b6ec0143e3348c0ff42b4256c1267e87d36fefc SHA512 1e483642213a3780d24cd7b801d6d5d274df9bac075f88bdfc8026173d87e4b332e7cb6c174dc804d27670b89dc9abab3a6f93b663dfbbb3ecc4631266351f0f
 EBUILD conversant-disruptor-1.2.19-r1.ebuild 1291 BLAKE2B 2bc5ca4d984836415961f6060911a76e0bf3fb11347d4076726c5f55eab5abdb524b7116f7dca48a4f5d7333b76d9c76a635e769e7c548ba196aa1d2ad18e5e2 SHA512 089076214d1aace12c37068bb9e6ecea208a2642786fffb9ef05f0b26712af564a990d5b168eeaf371b18caeedf93f855c626ca61a172fc7bd9eafe86180ece7
+EBUILD conversant-disruptor-1.2.20.ebuild 1728 BLAKE2B 73115f85ec62257036ba79ad2b1d853adc88ee05e788c31455aead312dc7434a6f8b60d8924f8749ee1652b379fe27e6ed7225df5eec9a1c81999405f82236da SHA512 780957599d3eff1ae70441ef4ab71cfaa02ea2736e9cc6650ae973ffeab8f0fe69c89e12cc8699e9b853a845e755b08a39f2a4ebb464d8233928f495b370a44c
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild b/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild
new file mode 100644
index 000000000000..bd781a7c57e0
--- /dev/null
+++ b/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild
@@ -0,0 +1,62 @@
+# 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/conversant/disruptor/archive/1.2.20.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild conversant-disruptor-1.2.20.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.conversantmedia:disruptor:1.2.20"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Conversant Disruptor - very high throughput Java BlockingQueue"
+HOMEPAGE="https://github.com/conversant/disruptor"
+SRC_URI="https://github.com/conversant/disruptor/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+# test? org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.36:0
+
+DEPEND="
+	>=virtual/jdk-11:*
+	test? (
+		dev-java/slf4j-api:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/disruptor-${PV}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,slf4j-api"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+	# Using the defaults of java-pkg-simple would exclude
+	# AbstractWaitingConditionTest and AbstractConditionTest
+	# which both are run by "mvn test".
+	pushd src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * -name "*Test.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/easymock/Manifest b/dev-java/easymock/Manifest
index 5d673f0f4ac1..72b23f7ace0b 100644
--- a/dev-java/easymock/Manifest
+++ b/dev-java/easymock/Manifest
@@ -1,4 +1,4 @@
 AUX 3.3.1-r1-no-android.patch 590 BLAKE2B 1fd2493bc0208516421c31adead309adfaad4b30a137739a082588f38b8d85933258718aca277f8f863f468c2775ec1c4ce107948b7d10cc8a4fc8b07cb47383 SHA512 ba9fcb6c5922869511f421b9f1c005c7656840762fac0d9aecf87b5db615dd181bae24d9ce491191c2a7ee8a863ebf14aaf42f94e40d40d8f2192ad4296ece7f
 DIST easymock-3.3.1.tar.gz 624460 BLAKE2B bb5a472aef6c162d3afe5b66edef4891cc48fe6698c1f1eccc7f45f1883ff7f940b0479af5c0dd61b3354b41225ca50f191ba54b92479362a0074ddf3dbb5b43 SHA512 93fefd458a42b6c13d85ab1df768bf906620f052eea88116e93578374a5086eb8b27d8731e82b689dc3d73699e45d03b718c7d8bf2a430ac4a6a717365e52a9a
-EBUILD easymock-3.3.1-r1.ebuild 1482 BLAKE2B 9595c52ff955029bdc1307295542dfce4043c74f163bd8245061906c88f46dda600e3f67c7270df5bdf5dee80e0d188b9ad798c780b2b4ca137dba9fc0409960 SHA512 3a91785460b0995c82874a0d013050a0477d2d186e31ff9a65763a4e12b3510149c398391d7448e0abc9b7626d11b8d4aed4b83dc0be9a60d1b6b7594e2d4a42
+EBUILD easymock-3.3.1-r1.ebuild 1979 BLAKE2B 2ab812d03cb65011e77c86e61b40ee8bd08f2a13b509befef1c7fd5a84eb874e00561a947aafbde1659e0f263a58d0e5ad79761257237e9f7ff529921bcbedad SHA512 c4015af4854cd0543d1b0a178a0ceb983e26ca6479a5a902b03aa52d485651c98f582f3d2f653b4adf7db10155925a3116f94e5962dd593c26c421103d3ed935
 MISC metadata.xml 487 BLAKE2B a24b4adf994d9fe7aa7db824ee499c476d971c7d4265a6a502644d0dd498e87bbecf1b50fa3a0b53a27e1b7d9e91a1c67bafaa783d173435228f0c36a740df12 SHA512 dba708a8b66d470df4378efc4e0ceba8bd896132f3d086f7751ca9409a47e04a24fc5f98255264b44711efd960810bf491c657975acec72bfb863ba603bc64ee
diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild b/dev-java/easymock/easymock-3.3.1-r1.ebuild
index 26eb0db0b3c8..8a7db3b2235f 100644
--- a/dev-java/easymock/easymock-3.3.1-r1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1-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
@@ -58,3 +58,14 @@ src_prepare() {
 	# cannot find symbol   o = ProxyBuilder.forClass(ArrayList.class)
 	rm easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java || die
 }
+
+src_test() {
+	# ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain) throws
+	# java.lang.ClassFormatError accessible: module java.base does not "opens java.lang" to unnamed module @66da75e4
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 17; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+	fi
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index a16a8e359205..ba4a295cf3b7 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,7 +1,5 @@
 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.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
+EBUILD eclipse-ecj-4.22-r1.ebuild 1695 BLAKE2B b2b32ae1ab916157ace35130eb2819272804c3473c9f9d422000591febc82a96579e0724b8f74901af6eb6a26945c7365edc20d73ddb398ccea63f90a0a47b6c SHA512 93ccf992f4e343964e1fd7f41079616217720e949922494c91de55547f10eef41589fe283e428ecacb78c4fb85ac56a409cf2afea016abeb0d2fbd4a4e4dadc7
 MISC metadata.xml 646 BLAKE2B 644ff172a0719eb9a8669ea6c472adeace597f2c9baef893707c366d1aa86d04a92c4873abe2894e8405c0198c7588f4f7110df11b520f22afd20cb0a018d9f3 SHA512 c611a29d9e2f37b25cbfb631e1292832aab4c78122b26fca2b5689b4aa7337ed87b3dd17a95ee5aacfeae6d57f9400c6ef79479b190df072eadcdcbefc38edf7
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
index 12eec977d83f..82bd5d06ebf2 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
@@ -25,7 +25,7 @@ COMMON_DEP="
 RDEPEND="${COMMON_DEP}
 	>=virtual/jre-11:*"
 DEPEND="${COMMON_DEP}
-	>=virtual/jdk-11:*
+	>=virtual/jdk-17:*
 	app-arch/unzip"
 PDEPEND="
 	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
deleted file mode 100644
index 2aed82b6859b..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
+++ /dev/null
@@ -1,68 +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-pkg-simple
-
-MY_PN="ecj"
-DMF="R-${PV}-201509040015"
-
-DESCRIPTION="Eclipse Compiler for Java"
-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"
-SLOT="4.5"
-IUSE="+ant"
-
-COMMON_DEP="
-	app-eselect/eselect-java"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.7
-	app-arch/unzip"
-PDEPEND="
-	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
-
-JAVA_JAR_FILENAME="${MY_PN}.jar"
-
-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/eclipsito/Manifest b/dev-java/eclipsito/Manifest
deleted file mode 100644
index 27bdcaef7244..000000000000
--- a/dev-java/eclipsito/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST eclipsito-20180510.tar.gz 66661 BLAKE2B 0cd1879314eaf4acfcb26cd37f27c50208263cc584d15cb19cfee4d75b29e925d7840be6f39fdf2b6aa05d26f1497284d2d772f9a42ea81398aeec9b1ebad029 SHA512 420cc4ed44fc80065452b39350625f5621175e0bd2aae1ba38a409134bd92af23b492c01f826234431fec68e09eecdf47d61a06f02338e5998c2c5cad44fd142
-EBUILD eclipsito-20180510.ebuild 681 BLAKE2B 404b3a40ef34e50257862b090fcfc2e0594973a281093e5c8490d3863ef37d903c90a6173cfe8ff658c498e6584b7f25d0d958d541ac33e0a0e2efac3b039588 SHA512 31e5c2b5aa681cec97f58b15712af417b133897eb583580e751b802acb9f4c7b8f7b4abb11885ea267bc62401aa18cc98335b51e066ae3d2887f37a684dbe427
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/eclipsito/eclipsito-20180510.ebuild b/dev-java/eclipsito/eclipsito-20180510.ebuild
deleted file mode 100644
index 2c5cf97ca604..000000000000
--- a/dev-java/eclipsito/eclipsito-20180510.ebuild
+++ /dev/null
@@ -1,28 +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"
-
-COMMIT="0eb2fbb739898f55265027c2796f77fbee9f4ab2"
-
-inherit java-pkg-2 java-pkg-simple vcs-snapshot
-
-DESCRIPTION="A small subset of Eclipse core libraries for modular applications"
-HOMEPAGE="https://github.com/bardsoftware/eclipsito"
-SRC_URI="https://github.com/bardsoftware/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8"
-
-S="${WORKDIR}/${P}/org.bardsoftware.${PN}"
-
-src_prepare() {
-	default
-	rm -r src/org/bardsoftware/test || die
-}
diff --git a/dev-java/eclipsito/metadata.xml b/dev-java/eclipsito/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/eclipsito/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/fastinfoset/Manifest b/dev-java/fastinfoset/Manifest
new file mode 100644
index 000000000000..924143fb8a25
--- /dev/null
+++ b/dev-java/fastinfoset/Manifest
@@ -0,0 +1,3 @@
+DIST fastinfoset-2.1.0.tar.gz 304643 BLAKE2B 07d571d46dd31bbd1fb9a4aac457b7a2b3e9278a41a9b072790a2da56adccbba92cdfd7dde95d976d92c7fa38476448c3dd6e77366338fdce3e63f334e5823d4 SHA512 807926fe90f97a72e5d6f8abcbad8639b424d7938ab2afc7dc8107070db216167aada859acd041ba17566a33e277330d9ee51bdc10d16aa19a6ea07d4ae858aa
+EBUILD fastinfoset-2.1.0.ebuild 1299 BLAKE2B 486d884ced50005bbf36dcd60fdb82c4dba9180668c41aefbe3d3416b4a2c5af75bce8bd074def5c0e3dc5445dc82edc7c305a0ff360274e6736619ce5c88cf4 SHA512 b51fe6dc1d12db631e62f0a4a667e289efd5d2799b7b31af7aceb40a24a8984a1d25c4636dc24e1e2b7a85f347027fd13af32a7c182974854364b8d954a744b0
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/fastinfoset/fastinfoset-2.1.0.ebuild b/dev-java/fastinfoset/fastinfoset-2.1.0.ebuild
new file mode 100644
index 000000000000..6cf8d07641ca
--- /dev/null
+++ b/dev-java/fastinfoset/fastinfoset-2.1.0.ebuild
@@ -0,0 +1,46 @@
+# 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-fi/archive/2.1.0.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild fastinfoset-2.1.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.sun.xml.fastinfoset:FastInfoset:2.1.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Open Source implementation of the Fast Infoset Standard for Binary XML"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jaxb-impl/FastInfoset"
+SRC_URI="https://github.com/eclipse-ee4j/jaxb-fi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+HTML_DOCS=( docs/{index,ReleaseNotes}.html )
+
+S="${WORKDIR}/jaxb-fi-${PV}/${PN}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/glassfish-jms-api/metadata.xml b/dev-java/fastinfoset/metadata.xml
index 4221e170cbc0..75321cfb5598 100644
--- a/dev-java/glassfish-jms-api/metadata.xml
+++ b/dev-java/fastinfoset/metadata.xml
@@ -3,6 +3,5 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
-		<name>Java</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/fec/Manifest b/dev-java/fec/Manifest
index a4403b4ac696..35ffa2c6063e 100644
--- a/dev-java/fec/Manifest
+++ b/dev-java/fec/Manifest
@@ -3,5 +3,5 @@ AUX fec-1.0.4-libfec8path.patch 1091 BLAKE2B 4e19c8615b20694f26d3ee5bd83e33ec342
 AUX fec-1.0.4-remove-concurrent-util-imports.patch 3146 BLAKE2B 8716fcc73a5e1030d12709c12d15adb2462c40da5ab896806e4dc8b572fc6d952b6b09c550f1ba4511a84b9a75306804b67526ee34fac33d2f3d4bf453c807f9 SHA512 592cfd6502a000cc1ac02e534e5436cb3d621855cc682a4588a5fd6f17c8d7f4811743fa9dbcd30851221ba55ab2adb188f6dc9e32f8735651edd28e032803a6
 AUX fec-1.0.4-soname.patch 790 BLAKE2B 852ef6ec83d42a15bfb1d67b05364d15c3027a8579d5e90dab4dec4cc99273383d89f5d5174ec8a6e2ab3cb09986d3fd60f39aedec6ae2da3f893325f88756c4 SHA512 1586fc0408274fff7eb3ba2cd95cfac8a94dad9981e2e01e8e11642692d2a27068936b673364c9c2cc70ca848d364648a66c728dc41d85c605a25b7fe79e2ec3
 DIST fec-1.0.4.tar.gz 449406 BLAKE2B 132bb87ff0da35b9a1830d014c46fb82209b344d159b88c6dbf36c706de668cdb2dfc10894690009e9a47f461100beaf9cf25ad1c75a3b18194e5499457bcb6b SHA512 0244de5e44ab108e921c6ca4cf341ce7b3ba807a76d24b768cfe3de71ffd525c9ebf389f9981e7eaa83fec301a65ba60ef4f51c5b3befa6c7af42b793d430343
-EBUILD fec-1.0.4-r4.ebuild 1515 BLAKE2B a6e489336bf2a0437de321dd5a48aa0477787a017965f599e41b47eff208108914803ae4f18f2eec13d272d2e71a325228e9ac10b98354c9c25a37747eed9fd6 SHA512 42eee0911b3ab09205ef96874a32a17adc28d3fa8fd876cb0cc375681507cc778ec1aa1c1e258c109225de7209d1052e9bee2c136df394a0a384005c6b800b68
-MISC metadata.xml 435 BLAKE2B f15bf1cf8797a940aef17b1a72884aad2859be1790129554172bbeec7ea0e2f68da81c0e5362cc7d94302bb9090bc1d0960d608335bc1a88168a3607ccb0d191 SHA512 13f1c5f833c69547926d60f4f9325624db5e82ea9b01900b00d48b38079e0cd8b1d038f6a69d784d78fa3cafa6f23e7ce57b78812b91154e0850466c2daf2ab9
+EBUILD fec-1.0.4-r4.ebuild 1520 BLAKE2B a1846cba9b90bd18f86adda3de5bf4b68162c97b9c6b103fc19465d51a37f6722a2f39f6478b2dc0e3422ce55eca256afb9d874ba9e5398c531fc823c51bf1e4 SHA512 2d4796ed6269e9e91c36391f237ad3353192c257d24a8219d7b17b98811e150aad49d88a1de169280c2a5f273890e49233d116a1c602d5b99ea0aabf5eebe667
+MISC metadata.xml 354 BLAKE2B 4f8e98f361320eebf410ee6724cf73016585ab2736fa9bd55c8e1b0067b231df81cc9112b7e2480de5b07a429b39c97098693e95e2bbc7bf226e74467fc3cbf1 SHA512 57a36f5db74544720c9a899af7720db5f234a1c93967145c3394c466ad4516440702b45db4c4191a57acc4393fb2d7fca2d5d697d563ac67fcd8032dc51e8375
diff --git a/dev-java/fec/fec-1.0.4-r4.ebuild b/dev-java/fec/fec-1.0.4-r4.ebuild
index 98864fd2a92e..307a2d9ef365 100644
--- a/dev-java/fec/fec-1.0.4-r4.ebuild
+++ b/dev-java/fec/fec-1.0.4-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 
 CDEPEND="dev-java/log4j-12-api:2"
 
diff --git a/dev-java/fec/metadata.xml b/dev-java/fec/metadata.xml
index 12515a707d6b..9ec6a4a58c78 100644
--- a/dev-java/fec/metadata.xml
+++ b/dev-java/fec/metadata.xml
@@ -9,7 +9,4 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="bitbucket">onionnetworks</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-java/findbugs-annotations/Manifest b/dev-java/findbugs-annotations/Manifest
index e7c612858d57..8f64bba5621d 100644
--- a/dev-java/findbugs-annotations/Manifest
+++ b/dev-java/findbugs-annotations/Manifest
@@ -1,3 +1,3 @@
 DIST findbugs-annotations-3.0.1-sources.jar 25170 BLAKE2B aebd9acccae5d4fe209aa9393fb35868a67096889375eab5817eeb6b6cabe950e1a3479826c921254fa1faeaaa8231095b5ef88dc2f83fa3b6ca2a76a1572b42 SHA512 bf77991bcbad1dd3e072c65df36d7714cf2f2967a01ed9e8435b6b40c925d905fc879c83303a227cffa5c3db4c960c9c6813ebb520f5d1c0f178f27710075d43
-EBUILD findbugs-annotations-3.0.1.ebuild 1125 BLAKE2B 137c3f4b5ba506cedafd0f42a8d91250544d17c1f0ee8af0d89264596766abea6fc70d237d919d22f8e68098836db1bd83c66137d17d8923b5adfead499c9a2d SHA512 6bab9193745e4811ba8c5334adc7614c2bc70fe148ce3eb6733e8d1252b9cca91528b501b299f429e21fc7a2779a23d4a1ffcee57e179725f9a6f3a63367c09b
+EBUILD findbugs-annotations-3.0.1.ebuild 1121 BLAKE2B 087e2edd3b1014c08afdf3c913ff8782e3a203eba179cb9c64807207088a753faf7cfcfdd97e6d9c9dfca17b9ab6c759cd949c0aca50819d0e34025e0eadd838 SHA512 432b6d72861de271826e993d47d1c6982d1b1ca67033117924657e39cabe9383f4cccf36799b370d864fe8040aef813c29c978c59a8b24fcd7918d1cdb7a70d6
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild b/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild
index 22b9af5b27f8..5270eda74562 100644
--- a/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild
+++ b/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/google/code/findbugs/${PN}/${PV}/${P
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: ${P}.pom
diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
index 2ad57a9ac4f2..214bd963afa2 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -1,6 +1,8 @@
 DIST DejaVuSansMono.ttf 317336 BLAKE2B c80f50cea451963a75c66160596b67655afb19c9ea0d61b8a5cd38b81c66bdd89a24872d293fa8752b1ce0bb828d63caf91e682c283312d5828218943c63c095 SHA512 1af1ce3e6d34a0b89c93072d8646e92cceb45b276389d2dd0d84457ec1193394d2bcc49bf3ce99c9c6b2658cd1337fc40ee5c61957f74cd45dbc3d51b6aef417
 DIST NotoEmoji-Regular.ttf 418804 BLAKE2B e94f7b1d5bced052ff3f15a32ecce8f0f1dc2ef19565d3bcaa75b82676fbf0efeaa6efa1d25edf352b577acce17a45c6f0e7be1550c46a8c2ab6cef208cd6f11 SHA512 51b01ab0794be9f92c59679f6d56d4ce09ed959daeb9ec945bb837eb15a82ab302e83b29aab1972ac9cb648f7196a5f5ff4488a4622b36bedbc9cd0cab6dc3de
+DIST NotoSansSC-Regular.otf 8481960 BLAKE2B 3eee2c1e6be5e013d2ed679ccb361221e3e410150c7dc32d570382355e80e540c71be9009ece9951eea2379fb08fc05d8bcd65e941677660c55b450d660e8b03 SHA512 cbdd317d16099d24736457eef631353c7830a1a3c132b01f2cdc1e6a0c21a78e3b1fe8479b3f40179e7630a15cc23a093775bb22d521dba39376bb367d497b21
+DIST OpenSans-Regular.pfb 100962 BLAKE2B ff906c67a79df9d8deb9736f7439ba5429b72940b6a6fa49751fdea88adef70a3b57f28b2c31014da3206efe601095a8caeb98382fb36f8544afd0bec5cce355 SHA512 2787fcecc0feb1c9e6ff0d8de6193658413863e44eaab572751ca7e6c3b369c0a9731f4952cb0821f307760f0422f77c5f0d3fe7df6b054643fb39423e8d70ee
 DIST SourceSansProBold.otf 104072 BLAKE2B 2c6538ed97cca04a6a38a1bcca7def6c9e923f0e7a773c2715d50ca1a526b1ff683bc6544155b1e170fb828c3923d6b22cdf7017f9da9de164523f328c1cc187 SHA512 28a044a2685fbc8da7810d9ac7b6b93a95542d504d7d8e671f009b8ebb2f5b70c974be7ea78974b188d8e6ab17d65b08f276c054927857315d5aad26f6fe36fc
-DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
-EBUILD fontbox-2.0.24.ebuild 1762 BLAKE2B 483d3d83508a4db99f14ef171c480b4c06d262a913b967922ab223975636e8176165ae65dc38c01c97e3b1c61264d4bd53d367cb63530eeefd542eea9e4cc851 SHA512 72917eac46cbc8be4636a35dbd2b8ccebe3c9fd271895be79e20a309b8ebef3373974dd5fb6cccf5f4d3c45689274497f4d3997615ece8f2680eb0fcad504e1c
+DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
+EBUILD fontbox-2.0.26.ebuild 1959 BLAKE2B aec4115a79052a22fdf2c82604a75c9af57e01aaf10dc4fcb640f9959f8553f68775c25d15ff16a18a907b13765fe4f405e086c99627c72918d05a3b507221de SHA512 e09fdd42a7ef24a11a6714c11717f65e80f5329b4b9073928fbc4cf91f2bbd240ce8959f087e59dd741f8b4d0dcd7cfab8e436ad6fe6100a206f16f65a7d085b
 MISC metadata.xml 571 BLAKE2B 1ffa3f19fb3e5035c5a73503ce6abbeb02de7ea42fb74e21eecb30aa3827085802644b797f197f35d9001d86ec969b0cc6cbdaa634ab0d003fa65bd03c3d09ab SHA512 e1b958bb3eff6c3428581dd3851b8857048e81df192b87ad91fc61d3074a4ebf88dfecf6310ac96a3da6ba6b96d476ef1e258781e36b8f0c5cbf3110d5608f8e
diff --git a/dev-java/fontbox/fontbox-2.0.24.ebuild b/dev-java/fontbox/fontbox-2.0.26.ebuild
index ee8d0a7099de..693dc662a08d 100644
--- a/dev-java/fontbox/fontbox-2.0.24.ebuild
+++ b/dev-java/fontbox/fontbox-2.0.26.ebuild
@@ -1,13 +1,13 @@
-# 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 pdfbox-2.0.24/fontbox/pom.xml --download-uri https://downloads.apache.org/pdfbox/2.0.24/pdfbox-2.0.24-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild fontbox-2.0.24.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/pdfbox/2.0.26/pdfbox-2.0.26-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild fontbox-2.0.26.ebuild
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:fontbox:2.0.24"
+MAVEN_ID="org.apache.pdfbox:fontbox:2.0.26"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
@@ -19,26 +19,27 @@ SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip
 		https://issues.apache.org/jira/secure/attachment/12684264/SourceSansProBold.otf
 		https://issues.apache.org/jira/secure/attachment/12896461/NotoEmoji-Regular.ttf
 		https://issues.apache.org/jira/secure/attachment/12809395/DejaVuSansMono.ttf
+		https://issues.apache.org/jira/secure/attachment/13036376/NotoSansSC-Regular.otf
+		http://mirrors.ctan.org/fonts/opensans/type1/OpenSans-Regular.pfb
 	)"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pdfbox-${PV}/${PN}/pom.xml
 # commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
 
-CDEPEND="dev-java/commons-logging:0"
-DEPEND="${CDEPEND}
+CP_DEPEND="dev-java/commons-logging:0"
+DEPEND="${CP_DEPEND}
 	>=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
+RDEPEND="${CP_DEPEND}
 	>=virtual/jre-1.8:*"
 BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/pdfbox-${PV}/${PN}"
 
-JAVA_GENTOO_CLASSPATH="commons-logging"
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
 
@@ -47,11 +48,15 @@ JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_RESOURCE_DIRS="src/test/resources"
 
 src_test() {
-	mkdir --parents target/pdfs || die
-	cp "${DISTDIR}"/DejaVuSansMono.ttf \
-		"${DISTDIR}"/NotoEmoji-Regular.ttf \
+	mkdir --parents target/{pdfs,fonts} || die
+	cp \
 		"${DISTDIR}"/SourceSansProBold.otf \
+		"${DISTDIR}"/NotoEmoji-Regular.ttf \
+		"${DISTDIR}"/DejaVuSansMono.ttf \
+		"${DISTDIR}"/NotoSansSC-Regular.otf \
 		"target/pdfs" || die
+	cp "${DISTDIR}"/OpenSans-Regular.pfb \
+		"target/fonts" || die
 
 	java-pkg-simple_src_test
 }
diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
deleted file mode 100644
index 704055cc3f6a..000000000000
--- a/dev-java/gcj-jdk/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX javac.in 1739 BLAKE2B ff167bfba594dbfb71dd1d09e41ce502ebfcc598fbcef0794cb967c00894745f8b16412adc7b4afbd167878defa29351e99b30a71b4377987c5c8a692f404e30 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb
-EBUILD gcj-jdk-5.4.0-r1.ebuild 3726 BLAKE2B aabad7193016c3035c3d75c338606e865d084deb7e75f509728ecf31206455bc8b4c79130cf40a9f266a102aa329dae9bc914a86a58863912a7e336457708f40 SHA512 3019ade48332e0313aae1f4fc12f1aebde7a6734a8c7966dbc3d34b70a81aff1aa8e37173bdc2d249316ee13010928e64c8f0ae00df3adc3a73bd5eae41fdb78
-MISC metadata.xml 618 BLAKE2B 8c34bb7bf54ab875e221c5f5965b6280e2a0ad2656866248551124dd4cd0e3ff7f52033c033853e7d0e75c181d8aaa9206fb23e13fcd39e150d4ae97c07b4e27 SHA512 d81596b685e2a7155f0d3578af2ebcdf164a3622d34eb1eb2c6d1d2ad53fd770b6a24f4cc1132d474b4efa711ea74675d9a3356263b5a9e5afcbc5112a399823
diff --git a/dev-java/gcj-jdk/files/javac.in b/dev-java/gcj-jdk/files/javac.in
deleted file mode 100644
index 8eeda68c7a5e..000000000000
--- a/dev-java/gcj-jdk/files/javac.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-use constant NO_DUP_ARGS => qw(-source -target -d -encoding);
-use constant STRIP_ARGS => qw(-Werror -implicit:none -J-Xbootclasspath/p:);
-
-my $ECJ_WARNINGS="-nowarn";
-
-my ( @bcoption, @source15, @target15, @cp );
-push @bcoption, '-bootclasspath', '@RT_JAR@:@TOOLS_JAR@'
-    unless grep {$_ eq '-bootclasspath'} @ARGV;
-push @source15, '-source', '1.5'
-    unless grep {$_ eq '-source'} @ARGV;
-push @target15, '-target', '1.5'
-    unless grep {$_ eq '-target'} @ARGV;  
-push @cp, '-cp', '.'
-    unless grep {$_ =~ '\-c(p|lasspath)'} @ARGV or $ENV{CLASSPATH};
-my @ecj_parms = ($ECJ_WARNINGS, @bcoption, @source15, @target15, @cp);
-
-# Work around ecj's inability to handle duplicate command-line
-# options and unknown javac options.
-sub gen_ecj_opts
-{
-    my @new_args = @{$_[0]};
-
-    for my $opt (NO_DUP_ARGS) 
-    {
-	my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
-	if (@indices > 1) {
-	    shift @indices;    # keep last instance only
-	    splice @new_args, $_, 2 for @indices;
-	}
-    }
-
-    for my $opt (STRIP_ARGS) 
-    {
-	my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
-	splice @new_args, $_, 1 for @indices;
-    }
-
-    return \@new_args;
-}
-
-sub split_vm_args
-{
-    my @new_args = @{$_[0]};
-
-    my @vm_args = map { substr $_, 2 } grep $_ =~ /^-J/, @new_args;
-    my @javac_args = grep $_ !~ /^-J/, @new_args;
-
-    return (\@vm_args, \@javac_args);
-}
-
-my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV ));
-my @CLASSPATH = ('@ECJ_JAR@');
-push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
-$ENV{"CLASSPATH"} = join ':', @CLASSPATH;
-exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
diff --git a/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
deleted file mode 100644
index 37dbdee58fb6..000000000000
--- a/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x86-linux"
-SLOT="0"
-IUSE="awt"
-
-API_DIFF_PV="4.9.2"
-
-# perl is needed for javac wrapper
-RDEPEND="
-	dev-java/ecj-gcj:*
-	dev-lang/perl
-	~sys-devel/gcc-${PV}[awt?,gcj]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gcc_version=${PV}
-	local gccbin=$(gcc-config -B ${gcc_version})
-	gccbin=${gccbin#"${EPREFIX}"}
-	local gcclib=$(gcc-config -L ${gcc_version} | cut -d':' -f1)
-	gcclib=${gcclib#"${EPREFIX}"}
-	local gcjhome="/usr/$(get_libdir)/${P}"
-	local gcjprefix="${EPREFIX}${gcjhome}"
-	local gccchost="${CHOST}"
-	local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*)
-	gcjlibdir=${gcjlibdir#"${EPREFIX}"}
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gccbin}/gij ${gcjhome}/bin/java
-	dosym ${gccbin}/gij ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dodir ${gcjhome}/jre/lib/${libarch}/server
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	use awt && dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}/include
-
-	exeinto ${gcjhome}/bin
-	sed -e "s#@JAVA@#${gcjprefix}/bin/java#" \
-		-e "s#@ECJ_JAR@#${EPREFIX}/usr/share/eclipse-ecj/ecj.jar#" \
-		-e "s#@RT_JAR@#${gcjprefix}/jre/lib/rt.jar#" \
-		-e "s#@TOOLS_JAR@#${gcjprefix}/lib/tools.jar#" \
-		"${FILESDIR}"/javac.in \
-	| newexe - javac
-	assert
-
-	java-vm_install-env
-}
-
-pkg_postinst() {
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 or 1.6 APIs."
-	ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${API_DIFF_PV}.html"
-	ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${API_DIFF_PV}.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at https://gcc.gnu.org/bugzilla/"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "IcedTea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-}
diff --git a/dev-java/gcj-jdk/metadata.xml b/dev-java/gcj-jdk/metadata.xml
deleted file mode 100644
index 068b6d95f843..000000000000
--- a/dev-java/gcj-jdk/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>gnu_andrew@member.fsf.org</email>
-		<name>Andrew John Hughes</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="awt">Install AWT libraries, needed by some GUIs (not needed to build icedtea)</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-java/gin/Manifest b/dev-java/gin/Manifest
index 20f3fc1d86ec..72202f3821f6 100644
--- a/dev-java/gin/Manifest
+++ b/dev-java/gin/Manifest
@@ -1,3 +1,3 @@
-DIST google-gin-2.1.2.zip 5495552 BLAKE2B 3e07fc2e8f2e93872cb022dc57d5b06cfb81cfd855e8027fbcc312e2b95e0c8c35a783c6deb842fd1f40ae8c94e5c120f463c36e20d873a415ef62b0e717f490 SHA512 eb661760078d2053dd1f6cf0d96e9c2895c7d7fd805c14f4da63c28801b8aabb6a9cf6baff020bee3830a3ba1451bdf44d53d41cae1d720bded06f7d013d59c0
-EBUILD gin-2.1.2.ebuild 1546 BLAKE2B 3bd59051fcdc0c81327d26f98787bf5901157c3ed1b7de107112e1fe4ec0c54728f08fa3284178bcff148bf2ce7882edec3fcc6aa6e2f4c1904687c5cc1220f8 SHA512 6f9c19ffee1a5b679c0076f5a659b6bb104c5b5645ff9ffa69786e314be006d300b0f121517af992a9997913c25d6fb9d3f7fd690b9a308913f674c73f301350
+DIST gin-2.1.2.tar.gz 4100895 BLAKE2B ba9dcd333d51460f8e108253b7a5aeb92fa521b7d2b5133285917dc398264f581b1384b7e002b4d2ac677edc0e62a43b8718e02514ea942d90e2836dd5c66c40 SHA512 cfd11497d358217e3e6e0a024f461bd8fbd23cb39262c447c2729799b9aa3252967f866da9253c03de72a5dc43ee5cf1e7f6353f388b296af33e1e7be2bb8ddd
+EBUILD gin-2.1.2-r1.ebuild 1410 BLAKE2B 4ad93d027fb520cfa668ecef793aefc47279a59571dd0e228112f334a64fa2da653a4194b6fab315918cf0dcb0fbd9bd5b9e561c1c5577b66e545f05447a83fd SHA512 74c6b60f4f99a5417d64d165ec1ffae91a13837d32da6ced45826fa9631e4ebea64dec46867c051bad83568caaaefd7e3c6f5e0810cc74df30e0c75ee156e47b
 MISC metadata.xml 558 BLAKE2B cb07a9fc7ce134d0fea0e27f2ed6a21841941ec25d44bde79f45544c2bcfccdb07743e73f0c0739f79407d7c80adbf40896a892db1bf83e418c9c2a2b720b004 SHA512 42341ae8cf2734bbf7d4e7bcb8920bae12b1616c789f7aca54957396f488ad63a22faad67f90dbe340f6545b6df5938edcc21ef92db6a78168c17f14e7b2864c
diff --git a/dev-java/gin/gin-2.1.2.ebuild b/dev-java/gin/gin-2.1.2-r1.ebuild
index a13c8f0e9aa6..43bf6656dd6e 100644
--- a/dev-java/gin/gin-2.1.2.ebuild
+++ b/dev-java/gin/gin-2.1.2-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
@@ -7,14 +7,10 @@ JAVA_PKG_IUSE="source"
 
 inherit java-pkg-2 java-ant-2
 
-MY_PN="google-gin"
-MY_P="${MY_PN}-${PV}"
-
-GIN_COMMIT="d62089f5b6ea33d842ab4646b51583c65a8be36b"
-
 DESCRIPTION="Google Gin (GWT INjection)"
 HOMEPAGE="https://gwtplus.github.io/google-gin/"
-SRC_URI="https://github.com/gwtplus/google-gin/archive/${GIN_COMMIT}.zip -> ${MY_P}.zip"
+SRC_URI="https://github.com/gwtplus/google-gin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
 RESTRICT="mirror"
 SLOT="2.1"
 LICENSE="Apache-2.0"
@@ -32,8 +28,7 @@ RDEPEND="
 		>=virtual/jre-1.8:*"
 DEPEND="
 		${CDEPEND}
-		>=virtual/jdk-1.8:*"
-BDEPEND="app-arch/unzip"
+		virtual/jdk:1.8"
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 EANT_BUILD_XML="build.xml"
@@ -44,7 +39,7 @@ EANT_GENTOO_CLASSPATH="
 		validation-api-1.0
 "
 
-S="${WORKDIR}/${MY_PN}-${GIN_COMMIT}"
+S="${WORKDIR}/google-gin-${PV}"
 
 JAVA_RM_FILES=(
 	trunk/lib/aopalliance.jar
diff --git a/dev-java/glassfish-jms-api/Manifest b/dev-java/glassfish-jms-api/Manifest
deleted file mode 100644
index e46387be80c9..000000000000
--- a/dev-java/glassfish-jms-api/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST glassfish-v2ur2-b04-src.zip 39817113 BLAKE2B 4aeb0df44f838c91fa8dd52e2a4985e86457f75cec3cd5d527de54f672afcd2824cefaad9d9e67c5ce096515e389bb2fc0874d76ce2ec86a956233f2c3508439 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8
-EBUILD glassfish-jms-api-1.1.2.2.04-r2.ebuild 1113 BLAKE2B ffe8983a19460d08a366d11a116a847b5d9c04eafaa80bbd3428cf14113e57a869666313480d891d417bc28b98cab1dfaf57b95ff360909c647948ac7acbf30e SHA512 ed4f3ebc16bef4f7e5d970433b3f3959fee9f3cc1d13c1b115af883a1e57a9a09e59dc9978978ec18bea6cf705447c3ba5a270980114302cfb0b9a566f8bf32d
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04-r2.ebuild b/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04-r2.ebuild
deleted file mode 100644
index 3b528fd9f0b8..000000000000
--- a/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Transaction API"
-HOMEPAGE="https://glassfish.dev.java.net/"
-MAJOR=v$(ver_cut 3-4)
-MAJOR=${MAJOR/./ur}
-MY_PV=${MAJOR}-b$(ver_cut 5)
-MY_PN=${PN/-//}
-ZIP="glassfish-${MY_PV}-src.zip"
-SRC_URI="https://download.java.net/javaee5/${MAJOR}/promoted/source/${ZIP}"
-
-LICENSE="|| ( CDDL GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-BDEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${MY_PN}
-
-src_unpack() {
-	unzip -q "${DISTDIR}/${ZIP}" "${MY_PN}/*" "glassfish/bootstrap/*" \
-		|| die "unpacking failed"
-}
-
-EANT_BUILD_TARGET="all"
-EANT_EXTRA_ARGS="-Djavaee.jar=${S}/${PN}.jar"
-EANT_DOC_TARGET=""
-
-src_compile() {
-	java-pkg-2_src_compile
-	if use doc; then
-		javadoc -d javadoc -sourcepath src/java -subpackages javax || die "javadoc failed"
-	fi
-}
-src_install() {
-	java-pkg_dojar *.jar
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/java/javax
-}
diff --git a/dev-java/glazedlists/Manifest b/dev-java/glazedlists/Manifest
deleted file mode 100644
index 89011f85660e..000000000000
--- a/dev-java/glazedlists/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST glazedlists-1.8.0.zip 1169436 BLAKE2B 3784881079165832a321616e51a344a1c9a7378b8f903e883367739b559b5e3b9e7871d3bee4c6979eb7ce5ded9606fb45bf25310b7314f8dbbb500a8bf9ff93 SHA512 3fc3f339a248a8aad897409d752464d60b504474ae1e4d99fa7fbb41d767928137711d5d9979154b53d677e42746e2df2dfefdc71fa4a8017ec70ab23dc4b6a5
-EBUILD glazedlists-1.8.0-r2.ebuild 563 BLAKE2B fc0a5b10d98f364476bdfd52cbd9b7dd98a5218ab8287ff569d05b6dbf4e7ae492678eb54d68dbd78724303f5a7e5a8ddb94c6c1d6c61786d05cd243b4d1c41d SHA512 40ec986e403883279236e31e3aa680585e1f4a561fdac61fcf4c9438ad556881f5f2b420c0694e53f9747e74be4b8e63dc52e94e7e9dc19f6a7d886ce10b8a62
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/glazedlists/glazedlists-1.8.0-r2.ebuild b/dev-java/glazedlists/glazedlists-1.8.0-r2.ebuild
deleted file mode 100644
index 57554793d894..000000000000
--- a/dev-java/glazedlists/glazedlists-1.8.0-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A toolkit for list transformations"
-HOMEPAGE="http://www.glazedlists.com/"
-SRC_URI="http://java.net/downloads/${PN}/${P}/${P}-source_java15.zip -> ${P}.zip"
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	>=virtual/jdk-1.8:*"
-
-BDEPEND="
-	app-arch/unzip"
-
-JAVA_SRC_DIR="source"
-
-JAVA_ENCODING="ISO-8859-1"
diff --git a/dev-java/glazedlists/metadata.xml b/dev-java/glazedlists/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/glazedlists/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-jaf/Manifest b/dev-java/gnu-jaf/Manifest
index 1f807d9a0d3f..13b34d383ec2 100644
--- a/dev-java/gnu-jaf/Manifest
+++ b/dev-java/gnu-jaf/Manifest
@@ -1,4 +1,3 @@
 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
+EBUILD gnu-jaf-1.1.2-r1.ebuild 708 BLAKE2B a466fe4eafaf5298d4360ffea82bcb6b58cdc3fe545e2a9afa3a22f800bf2a19f401e0003b6e9de9a4b97b86384aa4c25d46cdb32b81efc5e54bb4fd47c3f0b7 SHA512 81dab6f13f54deea40497db67e1459abe57e371b6f9d7ffb8e0fd77fce422c5a5f7cb23f44949543830ed965941390df1900bd9745706f56b041e368fd58f8fb
 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
index 6c4ef7d1e74d..6835f9c1d704 100644
--- a/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild
+++ b/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
deleted file mode 100644
index 4af0a6d691ba..000000000000
--- a/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 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="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 807cacbe8c5d..385db3937fa4 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -2,14 +2,10 @@ DIST gradle-bin-6.8.3.zip 150631445 BLAKE2B 935a6631167481e289ac5a468b822ffeec20
 DIST gradle-bin-7.1.1.zip 154838841 BLAKE2B 0a0ad08101f0c5fa7c0cb2a4c9ad6e53320cc6214fe1a139f390b73d9aa656ebfaf90c21816d57964f37e9cad51faed21f82f55b7e24fcf0f5a3ffd861c990ad SHA512 95cc2de9b7c3d6019d7780b17238ff8f0db14c9a1e494b391c84d75619eb3064322bb2c56fa9127b0a5681c94b32283090a15b06fefeccdb95a1f8fb9e58c75c
 DIST gradle-bin-7.2.zip 157058280 BLAKE2B 918213df58ac2afbd075c74588f60676cd7dc99030834828138c621348ac1abd368e0b54c2f6937cbfc9533e55e310b46cf841c92dcb1039b898c6f456032d38 SHA512 6ccc79f08afdc20b3d5abf876c3cabb69114d1ab4285cdb77158cd8c5e09207589edefb6c79f2bcffe4629a38c6b9e2f473de42dab29a24310965bc5816b907d
 DIST gradle-bin-7.3.3.zip 158875257 BLAKE2B 94f86e06da3eae4a9522d35a28577d033d64ce1bc2f36d0f5c1992e9b92ec311d25bd98bbeaf4b8a9869f22d93e14c88952e12166e436a0a6c206541d1f967aa SHA512 03f2bdd77202788cd43bb3e3a6390340f4d083d69ade5a53e0163204fb85307f5bbbbf4e04077c6ae558bc36ab3c478674f941079bc14a8344f55631fbba1490
-DIST gradle-bin-7.4.1.zip 159312495 BLAKE2B 591ab6af118d8fac7d0ead1a040ed4e69b8f84d18807fc4fb88778a58917a31d2111f2c140f7d723523a2411b6e57e7682ba94bd9043c948bafb1de7c2c066ff SHA512 bd2bc3570537e0878186a81eecee2c8578b2f7ea76a23b1f49de9cd0e70529a591f42c2d1433f29eddfab87f25d986a6c48b52e66396653153f20785f39aa977
 DIST gradle-bin-7.4.2.zip 159315974 BLAKE2B c7c8dbe82d22dec699d1997a781f3a66110c9910dfe67df2304c48cead96c130ca072550b8c5fa2362744cd2ea3c9723c45a6ecf6e0737fe3c9b7e286b44f4ae SHA512 2e1d05486baa9661d5c8ffead2df87874a66f6cfc958ee6840432b89d221d8b0af9e3cad3675766f5413d12aa61c5b5fb0dd82f4164e5da3022865eba9ceadbf
-DIST gradle-bin-7.4.zip 159248291 BLAKE2B db9dde35d0c285afb8b30d08ee1a509660d7bf169530d734b1bffd0dbf22fec0360b12a78588e5f8b6180669678868f86e73950bf9bfd110ac1f24a73b3d2549 SHA512 9742efccd6539325f6cb3929f794afaf8f55763b9a09cccea8d6a84c55b8e0bf350ddf10d59e9a5271b9320719ade57e2e4c0b9bac5faf0afcb0304c75728cc9
 EBUILD gradle-bin-6.8.3.ebuild 1107 BLAKE2B 349fbd166d7051019a6861ff9b4cf3551b4da9931beb867b55ccdf74094a477bd2e4607763de59d037b7e48d33ae6ffe033853cfc6baf54f1c3ffb878dacd1a2 SHA512 29a5b48b85ea22e5446e210d2ca05e4bdef13f89607b7fb19e8463f478554b08edb68b0ccbe6002b5c1600a25a01507c3297aad9ac608c6cc9880473f8d61a93
 EBUILD gradle-bin-7.1.1.ebuild 1107 BLAKE2B 349fbd166d7051019a6861ff9b4cf3551b4da9931beb867b55ccdf74094a477bd2e4607763de59d037b7e48d33ae6ffe033853cfc6baf54f1c3ffb878dacd1a2 SHA512 29a5b48b85ea22e5446e210d2ca05e4bdef13f89607b7fb19e8463f478554b08edb68b0ccbe6002b5c1600a25a01507c3297aad9ac608c6cc9880473f8d61a93
 EBUILD gradle-bin-7.2.ebuild 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb67d911d143ee6711150c3e7d69c9c55f7ab0bf44b554935539ee20d0c945a4f10c914a2bcb471d2c3be4d249346 SHA512 3cfcbdf0bea512bb3e82053ad824953b5d95d7954796ea6f1846d46d8812e7b482608f1c8e60d30982127e05ad5fd29ae660965afd9176c872618dade74c821e
 EBUILD gradle-bin-7.3.3.ebuild 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb67d911d143ee6711150c3e7d69c9c55f7ab0bf44b554935539ee20d0c945a4f10c914a2bcb471d2c3be4d249346 SHA512 3cfcbdf0bea512bb3e82053ad824953b5d95d7954796ea6f1846d46d8812e7b482608f1c8e60d30982127e05ad5fd29ae660965afd9176c872618dade74c821e
-EBUILD gradle-bin-7.4.1.ebuild 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb67d911d143ee6711150c3e7d69c9c55f7ab0bf44b554935539ee20d0c945a4f10c914a2bcb471d2c3be4d249346 SHA512 3cfcbdf0bea512bb3e82053ad824953b5d95d7954796ea6f1846d46d8812e7b482608f1c8e60d30982127e05ad5fd29ae660965afd9176c872618dade74c821e
 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.1.ebuild b/dev-java/gradle-bin/gradle-bin-7.4.1.ebuild
deleted file mode 100644
index fe6f492c7e4e..000000000000
--- a/dev-java/gradle-bin/gradle-bin-7.4.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-IUSE="doc"
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2
-
-MY_PN=${PN%%-bin}
-MY_P="${MY_PN}-${PV/_rc/-rc-}"
-
-DESCRIPTION="A project automation and build tool with a Groovy based DSL"
-SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
-HOMEPAGE="https://www.gradle.org/"
-
-LICENSE="Apache-2.0"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-eselect/eselect-gradle"
-BDEPEND="app-arch/unzip"
-RDEPEND="
-	${DEPEND}
-	>=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local gradle_dir="/usr/share/${PN}-${SLOT}"
-
-	if use source; then
-		java-pkg_dosrc src
-	fi
-
-	docinto html
-	dodoc -r docs/release-notes.html
-	if use doc; then
-		dodoc -r docs/{dsl,userguide}
-		java-pkg_dojavadoc docs/javadoc
-	fi
-
-	insinto "${gradle_dir}"
-	doins -r bin/ lib/
-	fperms 755 "${gradle_dir}/bin/gradle"
-	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
-}
-
-pkg_postinst() {
-	eselect gradle update ifunset
-}
-
-pkg_postrm() {
-	eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-7.4.ebuild b/dev-java/gradle-bin/gradle-bin-7.4.ebuild
deleted file mode 100644
index fe6f492c7e4e..000000000000
--- a/dev-java/gradle-bin/gradle-bin-7.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-IUSE="doc"
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2
-
-MY_PN=${PN%%-bin}
-MY_P="${MY_PN}-${PV/_rc/-rc-}"
-
-DESCRIPTION="A project automation and build tool with a Groovy based DSL"
-SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
-HOMEPAGE="https://www.gradle.org/"
-
-LICENSE="Apache-2.0"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-eselect/eselect-gradle"
-BDEPEND="app-arch/unzip"
-RDEPEND="
-	${DEPEND}
-	>=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local gradle_dir="/usr/share/${PN}-${SLOT}"
-
-	if use source; then
-		java-pkg_dosrc src
-	fi
-
-	docinto html
-	dodoc -r docs/release-notes.html
-	if use doc; then
-		dodoc -r docs/{dsl,userguide}
-		java-pkg_dojavadoc docs/javadoc
-	fi
-
-	insinto "${gradle_dir}"
-	doins -r bin/ lib/
-	fperms 755 "${gradle_dir}/bin/gradle"
-	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
-}
-
-pkg_postinst() {
-	eselect gradle update ifunset
-}
-
-pkg_postrm() {
-	eselect gradle update ifunset
-}
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index 0a09227d582a..9288b91dfa79 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1,5 +1,5 @@
 DIST gson-2.8.8-sources.tar.gz 393941 BLAKE2B ebdd1088a069eea58e5ea4e2eddea0d42064c53f7284778b1b7217c8bc7abeb7e14350e19d838af1d94f78c5c38aca6de0f37674b022f0e528ed65eef803c3f1 SHA512 f90ad679c99c5e9a6ee9e397e59ab1d7d94a9c82366902b808addc40ebbab101fdba7fc83e4666c4f35e52d8b127e6f901e65072a7de210496466074dcd043c5
 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
+EBUILD gson-2.9.0-r1.ebuild 2095 BLAKE2B 71415fd6ec715372eddec83dd7ee27e84ba2bbf06d9e0cd206d3ebbccbcd8c90ea310befb4730da41a495609903049aef94bbd0d24125a6c0cc3e7f37b31f34a SHA512 217c6663d07526a44e9c23ffee344c3fd87653da8c14b359f7bb927eb78e564071c7678e55bf28c6b6baf4f019c2046365fffa1041d022c67af1814b71b98436
 MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504
diff --git a/dev-java/gson/gson-2.9.0-r1.ebuild b/dev-java/gson/gson-2.9.0-r1.ebuild
index 655185099b31..b6821636dfbf 100644
--- a/dev-java/gson/gson-2.9.0-r1.ebuild
+++ b/dev-java/gson/gson-2.9.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PN}-parent-${PV}.tar.gz -> ${
 
 LICENSE="Apache-2.0"
 SLOT="2.9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	virtual/jdk:11
diff --git a/dev-java/guava-testlib/Manifest b/dev-java/guava-testlib/Manifest
index f37ee9ad367e..9bd5c8b445af 100644
--- a/dev-java/guava-testlib/Manifest
+++ b/dev-java/guava-testlib/Manifest
@@ -1,3 +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
+EBUILD guava-testlib-30.1.1.ebuild 1986 BLAKE2B 5b61182607c6996a2e8aee2e42aecdd7599f31b3fb48eddb081a90309ca80d7545ca3e97adbc06524a112567559192d00bd875ba388238973411af666fa833af SHA512 db0d1758354bb210d6460be7ab17c9aa306d05509ed5416d0318d6c5e70727c9090818c6624a35a6c16c12b2119227c5e14f9b5e8ae526dba5c2676a44699718
 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
index 49c1e1b3aca3..24c89a665ecc 100644
--- a/dev-java/guava-testlib/guava-testlib-30.1.1.ebuild
+++ b/dev-java/guava-testlib/guava-testlib-30.1.1.ebuild
@@ -18,10 +18,10 @@ SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # error: package com.google.common.truth does not exist
-RESRTICT="test"
+RESTRICT="test"
 
 # Common dependencies
 # POM: ${PN}
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
index a09d04b172c1..f71ed9d64328 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1,6 +1,3 @@
-DIST guava-20.0.tar.gz 2522092 BLAKE2B 2ca76a71d0c169b80bfaa3e9847b2e465c57aabc0a67622a69519808fa8455146228747dc20e999ebc20ef7cd5fec1cfa82f6c025e9378011619cfedbc2c7d6c SHA512 e89eee8e66502f208878af286c660393712b12fb37647ec70719ca7c5184686c8dc5fc59d45c1813d792ecad9421e2c077dab075f76b1907c04f9f6e80567ac9
 DIST guava-30.1.1.tar.gz 5404546 BLAKE2B 818ef4b17c4f0c8e92c327f046434a3bb428ac35d6e95edd6d6be558c755d138a8ac7f8ad2032073cad131890d8f838e896fff84ba217f8305be8bd65c619a48 SHA512 23b30d886a3200b8f998897ca7bc424b2d223a4fecb03ab644e08a989a85f008e30ef093055e6305c4148a1eb8919c407e35d19f492c5b189830bd115e9484f2
-EBUILD guava-20.0-r1.ebuild 848 BLAKE2B 9eabed972891b3e2284c3133181fab6188ddfd0ab3988cf6ee5391d028bb8e762d5e6faf947f734e5f732f1a9f424daba4d0f2cf72344e936d93eccdea5df95e SHA512 c4be9028b341fbf960f160e94839af2b2d2672bbfd191336d7d8aa8fb4462086eba3e4f4fc6415451b590200853bd1d31f09d44b02635dacd4e73c5886ec6d75
-EBUILD guava-20.0.ebuild 845 BLAKE2B 0df28f19f6916d03bb9624755c88bb8c5d3a6706e8aedab3dfb49c2a7d0d449040875aa5a554388ca716f6d221f78eb4d5d329b89c4bedfa1fa05d81d7eb6744 SHA512 31cc84e2b174b988b2b5449cdeb629360e7e17d6cdfae350f7929c9756dcc7cb3fd387cbd9ad069971f09afc833608b001bca9421986efa526715e9bc4537156
 EBUILD guava-30.1.1.ebuild 1820 BLAKE2B 120c69dac6a1b6e2452f15173645d4b1b43b04411bf5979a67e17cf241e53dd98e27b88151f6ada7f4bea5018d66c57603d99338d2ac6d07ba799d8b925ebf87 SHA512 4c4760e49e08fc5dd474e1ca9763b1d8a63f094d0bbc47a1c0356f9bbb7a20d75f1fb75d945b3d3a970da1434dc7c88440adf28b78f2c94f567295140bea4704
 MISC metadata.xml 589 BLAKE2B 36b17e71aeb533194b87a9101d730b3f233c23b175b65216bdeecfcbf1bc7ac0936b7b284cdb40a30573d630d34a9bf7c2ca966b26bef4a3e7c5d6e90a1075a5 SHA512 0b8556db4fe43dc25f7604dd98ebb01fb4318c8a861ca25a5d7db76fef4b076c2eb2a67b801807233ad950cfb0d70b438af3f9e84f408060a168d9897158c6eb
diff --git a/dev-java/guava/guava-20.0-r1.ebuild b/dev-java/guava/guava-20.0-r1.ebuild
deleted file mode 100644
index 91ac8943a4bd..000000000000
--- a/dev-java/guava/guava-20.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.google.guava:guava:20.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A collection of Google's core Java libraries"
-HOMEPAGE="https://github.com/google/guava"
-SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="${PV%.*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-CP_DEPEND="
-	dev-java/animal-sniffer-annotations:0
-	dev-java/error-prone-annotations:0
-	dev-java/jsr305:0
-"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	dev-java/j2objc-annotations:0"
-
-S="${WORKDIR}/${P}/${PN}"
-JAVA_SRC_DIR="src"
-
-src_configure() {
-	JAVA_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only j2objc-annotations)
-}
diff --git a/dev-java/guava/guava-20.0.ebuild b/dev-java/guava/guava-20.0.ebuild
deleted file mode 100644
index b81b0b0497d0..000000000000
--- a/dev-java/guava/guava-20.0.ebuild
+++ /dev/null
@@ -1,36 +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"
-MAVEN_ID="com.google.guava:guava:20.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A collection of Google's core Java libraries"
-HOMEPAGE="https://github.com/google/guava"
-SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="${PV%.*}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="
-	dev-java/animal-sniffer-annotations:0
-	dev-java/error-prone-annotations:0
-	dev-java/jsr305:0
-"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.7"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.7
-	dev-java/j2objc-annotations:0"
-
-S="${WORKDIR}/${P}/${PN}"
-JAVA_SRC_DIR="src"
-
-src_configure() {
-	JAVA_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only j2objc-annotations)
-}
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index d7f782a6c6b6..338102bdc6cf 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1,5 +1,3 @@
-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
+EBUILD guice-5.1.0.ebuild 2278 BLAKE2B 90567214c17a2e34c10ae83432e5f2cdd031ee325dcc381114df2c3b6c4bfbd3727b51bc37a722c27b5a3ab4f9fc621bc259aba3d1c03d8b4d21ef25442dc911 SHA512 7a1efdf154ccd4d96dc4c574fd9657a3863966706477b56be1bc71679829c25e69f87c9facca30a80d420b0ecacb066329746731d49f8f2064a41f4092f1413a
 MISC metadata.xml 371 BLAKE2B 2960f7040449f39cf4371b64df2a64fadfb000d042ccc4560d23cdc0f92cc4c55718a155990db42f7d1eebf1d8b5702e5094cca9bcb0e3e01cccf37e6509889d SHA512 522b9d8b6b85e48e522663cf9b93ee077b2adeb073795d5adb4df81935518dc8e712e85e2a4fc56e4ae1a0656ccc0b35831038afed7d65b880b80d1bffcbbec8
diff --git a/dev-java/guice/guice-4.1.ebuild b/dev-java/guice/guice-4.1.ebuild
deleted file mode 100644
index a73ec4a039fc..000000000000
--- a/dev-java/guice/guice-4.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A lightweight dependency injection framework for Java 5 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"
-RESTRICT="test"
-
-CP_DEPEND="dev-java/aopalliance:1
-	>=dev-java/asm-5:4
-	>=dev-java/cglib-3.1:3
-	dev-java/guava:20
-	dev-java/javax-inject:0"
-
-RDEPEND=">=virtual/jre-1.7
-	${CP_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
-	${CP_DEPEND}"
-
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_prepare() {
-	default
-
-	# Where could we get this FREAKIN jar?
-	java-pkg_clean ! -name "bnd-*.jar"
-}
-
-src_compile() {
-	EANT_BUILD_TARGET="compile manifest" java-pkg-2_src_compile
-	jar cfm ${PN}.jar build/META-INF/MANIFEST.MF -C build/classes . || die
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	dodoc {CONTRIBUTING,README}.md
-	use source && java-pkg_dosrc core/src/*
-}
diff --git a/dev-java/guice/guice-5.1.0.ebuild b/dev-java/guice/guice-5.1.0.ebuild
index dd9bb5373e8d..e1ee08998250 100644
--- a/dev-java/guice/guice-5.1.0.ebuild
+++ b/dev-java/guice/guice-5.1.0.ebuild
@@ -18,7 +18,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Most of the test dependencies are missing in Gentoo.
 RESTRICT="test"
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index 06d4fe6f2161..b5ab8acbe6d8 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -1,9 +1,6 @@
 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
+EBUILD icedtea-web-1.8.8-r1.ebuild 3562 BLAKE2B 51ebd18df92231794ed8b27fce03752de8e27f8908885b773f139c2be46dd0c510a6a33c19a7127a96b959c85d33373714e6bab78ae9e892d9422881667ae8d7 SHA512 6a649a6210120a49d37ecf8637ea928403c0673a1860e7499b979fbafa99cafba7f66eb3fe0565bffb77d532903fbffb94c81e13afbae14f020339e0d1a29ca9
 MISC metadata.xml 470 BLAKE2B ae3861fd34b819ef3889a6ca4f56702608b20fd74e4c856d934d8094649d2c19703010c0fc581154f77e6f82ec19b99fcb670b3bc16530c194a6e590084b8ccd SHA512 8911c14a652c2e24e0679263f040452513e4e018623169760953accedee778c6bab255ad78e07f43617907d4c6d8524f1493beaf48507d9743ee37d4aecea24d
diff --git a/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild
deleted file mode 100644
index caabab18f661..000000000000
--- a/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-README_GENTOO_SUFFIX="-r2"
-CRATES="dunce-0.1.1"
-
-inherit autotools bash-completion-r1 cargo 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/jdk:1.8
-	virtual/pkgconfig
-	virtual/rust
-	doc? ( sys-devel/bc )
-"
-
-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.
-	local myconf=(
-		--disable-native-plugin
-		--program-transform-name='s/^javaws$/itweb-javaws/'
-		--with-java="${EPREFIX}/usr/bin/java"
-		--with-jdk-home="${EPREFIX}/etc/java-config-2/current-system-vm"
-		--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
-	rm -v "${ED}/usr/bin/itw-modularjdk.args" || die
-	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/icedtea-web/icedtea-web-1.8.8-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
index 238bb9080267..186bb18591b3 100644
--- a/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="doc"
 
 # tests require ton of java deps we don't have packaged/working
diff --git a/dev-java/icedtea-web/icedtea-web-1.8.8.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.8.ebuild
deleted file mode 100644
index 563512e65b91..000000000000
--- a/dev-java/icedtea-web/icedtea-web-1.8.8.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-README_GENTOO_SUFFIX="-r2"
-CRATES="dunce-0.1.1"
-
-inherit autotools bash-completion-r1 cargo 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/jdk:1.8
-	virtual/pkgconfig
-	virtual/rust
-	doc? ( sys-devel/bc )
-"
-
-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.
-	local myconf=(
-		--disable-native-plugin
-		--program-transform-name='s/^javaws$/itweb-javaws/'
-		--with-java="${EPREFIX}/usr/bin/java"
-		--with-jdk-home="${EPREFIX}/etc/java-config-2/current-system-vm"
-		--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
-	rm -v "${ED}/usr/bin/itw-modularjdk.args" || die
-	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/istack-commons-runtime/Manifest b/dev-java/istack-commons-runtime/Manifest
new file mode 100644
index 000000000000..2859eafc9297
--- /dev/null
+++ b/dev-java/istack-commons-runtime/Manifest
@@ -0,0 +1,3 @@
+DIST jaxb-istack-commons-istack-commons-runtime-4.1.1.tar.gz 66161 BLAKE2B 07103ec616d23e14a5f61c4bb7ef9dce042f0df678db44f035b48c74eb7930f251d8b7fd8ce36c9bae7a7ef8ce213c62587dad2547518ba4638faf102ef651cd SHA512 b119b2c3582f5cbbd5793e0eb0a00c199c93119f3c18e34c57f8753b3a7008b9b93de58fd62df94d6cbedd698488616a80c334fda3d5038078e3858229f995cf
+EBUILD istack-commons-runtime-4.1.1.ebuild 1519 BLAKE2B 234100c13f56ea5df7a05ad20e9c2f560f50d92abeeb403858b14a3f635b2c37ce10f5385828039468bbf619141cd656045e03fce0a7a3f56c21bc5c265a4981 SHA512 bb7ff0f6837069c27c36f897a012a7965498e77a4e6d06ef4702aef455fa7491afe68bb413903a61255fae94334bc0593420f5b9cb663b3bcc052e240a0a0b44
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1.ebuild b/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1.ebuild
new file mode 100644
index 000000000000..49b1f7559700
--- /dev/null
+++ b/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom runtime/pom.xml --download-uri https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/4.1.1.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jaxb-istack-commons-runtime-4.1.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.sun.istack:istack-commons-runtime:4.1.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="istack common utility code"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j/istack-commons/"
+SRC_URI="https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/${PV}.tar.gz -> jaxb-istack-commons-${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: runtime/pom.xml
+# jakarta.activation:jakarta.activation-api:2.1.0 -> >=dev-java/jakarta-activation-api-2.1.0:2
+# POM: runtime/pom.xml
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	dev-java/jakarta-activation-api:2
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/jaxb-istack-commons-${PV}/istack-commons"
+
+JAVA_CLASSPATH_EXTRA="jakarta-activation-api-2"
+JAVA_SRC_DIR="runtime/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="runtime/src/test/java"
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/oracle-javamail/metadata.xml b/dev-java/istack-commons-runtime/metadata.xml
index 4221e170cbc0..75321cfb5598 100644
--- a/dev-java/oracle-javamail/metadata.xml
+++ b/dev-java/istack-commons-runtime/metadata.xml
@@ -3,6 +3,5 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
-		<name>Java</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jackson-annotations/Manifest b/dev-java/jackson-annotations/Manifest
index 075ebba98e0f..26dbe3f648d9 100644
--- a/dev-java/jackson-annotations/Manifest
+++ b/dev-java/jackson-annotations/Manifest
@@ -1,4 +1,5 @@
 DIST jackson-annotations-2.13.2.tar.gz 1983139 BLAKE2B 511f62548ad3daa4aad265502e5c5e63cf3d60186b96f96ab2ebb3a904a8cca9e5eadfa31ac2fee1a8ce62c7ba51b4a722e9e46c9bbc390291048b0a852b8f30 SHA512 b024b5bff985a6104a122c58735249f3c3fa8e9ddb678283d876ff3750b72872bac13258456cca18828cda65e03eee85a9ef816f924fdbbec211fd03c7652439
-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
+DIST jackson-annotations-2.13.3.tar.gz 1984205 BLAKE2B c577fcdcb40c44cf1cb08ebe467318ca4e4fff9fdeaf756360ef202275a48b5f5a93135439567261651b5731f523588f0c29a17c05ba6d03fec0f19ed19d9c5b SHA512 c00aec542c8ddea999fb60536cb2cab3edbf4f1d20b29e404d62add54a22546ca195ab7faeda4a2cd1d3a827f10420ccafe1dfb0065742f46aecfc2d00f2c1fc
+EBUILD jackson-annotations-2.13.2-r1.ebuild 1402 BLAKE2B 548af705f47014f0708f3589371963feeb95c78064bd10abf795404a63b8b18164eadc24350fbefe4e35af1676c981531c9618cdd78b135228d02300bc0f4306 SHA512 7e880816698679bc136680bafed450fdb6fc76e2a9011415f6d41f12aaf08145d8a6f7d44a1bdfd4c4c35cfb9685637ee734b0823671e447fcce538c4181d095
+EBUILD jackson-annotations-2.13.3.ebuild 1404 BLAKE2B 72f2cfbf0c4056d11d33bc80d2cd050f9545237e4f80bf394b57f81effcad9ec9b3bd728d0cb38de2809b809f0f8ff5ed89c66b914726a5c63356c5c3e2ca19e SHA512 2023e9f5d52b79842148d875103fbab673a3dd029074ea6c889b73e6e01035ad75f01c2224d87751763101164a736e9737c5f617ae6ddd96b34fb714033ea968
 MISC metadata.xml 341 BLAKE2B 1a6bf9fc13afb0c6d95cb0752f40474fff4135031e2771f3c0555cd7961e23ea7c026d6cf905acb505ceb2aa4fad01ea5dfac310004b51828b1383dd9a44f9bb SHA512 51655fad0847b2bbc92ed31310c155f26edf6dc41da35cbe239c99eea205a054f6bf7a7839201b8f8fb397110b50935d7c069f3baa7650970580a0c9ef156f12
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.2-r1.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.2-r1.ebuild
index ebc4e66b08e7..8b5a3ffeee49 100644
--- a/dev-java/jackson-annotations/jackson-annotations-2.13.2-r1.ebuild
+++ b/dev-java/jackson-annotations/jackson-annotations-2.13.2-r1.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-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.3.ebuild
index c2835290b469..efcf510776c4 100644
--- a/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild
+++ b/dev-java/jackson-annotations/jackson-annotations-2.13.3.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-annotations/archive/jackson-annotations-2.13.2.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-annotations-2.13.2.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.13.3.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-annotations-2.13.3.ebuild
 
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-annotations:2.13.2"
+MAVEN_ID="com.fasterxml.jackson.core:jackson-annotations:2.13.3"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
@@ -18,9 +18,9 @@ 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=( README.md release-notes/VERSION-2.x )
diff --git a/dev-java/jackson-core/Manifest b/dev-java/jackson-core/Manifest
index bd94be2730ae..0bf7cd2ead9c 100644
--- a/dev-java/jackson-core/Manifest
+++ b/dev-java/jackson-core/Manifest
@@ -1,4 +1,5 @@
 DIST jackson-core-2.13.2.tar.gz 12267420 BLAKE2B 4acaef320fbd08bd3d3ae835eb4a96771b1f25aade7433e4c87beac0f6e365e641eea8c70ed7d3884159bd6990286b80891b57ac967ee292ee639cb2b56b66e1 SHA512 8e424ea255a6cd78c550300b0ff18d5e63945a3608dab2803211da2df5eb99fbd249779b2d051569b421c393e073d88a21b01c02a25b9647bcc8545f2d8cc1ee
-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
+DIST jackson-core-2.13.3.tar.gz 12268319 BLAKE2B 8053988b060cd625670c643d9ba12d9ceae72dffa583bfc78e87044ac723c78bc44dfbdbaca0331098116a43b273dac844721a9e44ba1a536cc457f841d89b56 SHA512 9e7a9ec54073fa6faac36914c496df38bb6c201a37ade2b32306561b71e1b78a0ec4f48b006d4fb10cbde21979a16d117706b59338ada7aedcb593ba5c31ea52
+EBUILD jackson-core-2.13.2-r1.ebuild 2085 BLAKE2B 2b1f0ac60f7e5af2798d3964a0326dcaefb80afe44ffed6d821c71b8987464904af24f79d1a1295d16994bccd01a8ddfd60c8d1d556250704c25b0c4030237b5 SHA512 d2f77b838b807187845c92c5fc5ce0f72fb74cd7177b6dc75db8ce551187b7d8be74a86617c9fb0b9850ed6bf4110330a5ed2c0c1e0300b4575ba36aecf8df31
+EBUILD jackson-core-2.13.3.ebuild 2088 BLAKE2B e2d8f488ce8282c4fe96d8e895bcaf1340cac587eb4be35e6b5af9698802329191e454039e4ef85d61fd1b51cb8ed0746bde20321deb53c723b14cc7e3adc4e7 SHA512 49561fc9962129259afe03022024ded0dfc04193f8684f82fbe1fa1507b7f7c5334d74e4e7afebedcf9d352d9a1cc3882e7dbb66400f9cddd84fc3767cd7cfe3
 MISC metadata.xml 312 BLAKE2B b1beb51833c35e3ab2191a3c722768a34ec6cbf3ee240d67381b5137aabc0bb8be862f32638f35c1ba84a75498bb66303223c1d43b7d48c8bfe143ee837d6338 SHA512 b85d17092438f67523cf8c3c861de1183e061f55620342239bd662e5e90058f82fb501ba24bf2c1de6ebbe512ae4559d4b746a575261cbf2feb142e120118372
diff --git a/dev-java/jackson-core/jackson-core-2.13.2-r1.ebuild b/dev-java/jackson-core/jackson-core-2.13.2-r1.ebuild
index 9892ac01a0ed..d93bfdb9fb35 100644
--- a/dev-java/jackson-core/jackson-core-2.13.2-r1.ebuild
+++ b/dev-java/jackson-core/jackson-core-2.13.2-r1.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-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jackson-core/jackson-core-2.13.2.ebuild b/dev-java/jackson-core/jackson-core-2.13.3.ebuild
index e156fbe67bdc..657905868708 100644
--- a/dev-java/jackson-core/jackson-core-2.13.2.ebuild
+++ b/dev-java/jackson-core/jackson-core-2.13.3.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-core/archive/jackson-core-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-core-2.13.2.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-core/archive/jackson-core-2.13..tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-core-2.13.333.ebuild
 
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-core:2.13.2"
+MAVEN_ID="com.fasterxml.jackson.core:jackson-core:2.13.3"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
@@ -18,9 +18,9 @@ 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=( README.md release-notes/{CREDITS-2.x,VERSION-2.x} )
diff --git a/dev-java/jackson-databind/Manifest b/dev-java/jackson-databind/Manifest
index 50f7618b401a..5c851ce71c25 100644
--- a/dev-java/jackson-databind/Manifest
+++ b/dev-java/jackson-databind/Manifest
@@ -1,5 +1,5 @@
 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.2.2.ebuild 2687 BLAKE2B 2021205cc19d6f806ee43df675d01d3938a8495b993da4e9913039bda46f97b28ee2bda45613c461a303549bdbebde418e19ab13af1736960f04d98e4f578d6b SHA512 cd6947dcca14f2bda538996a12292d1e7604bacd86a91bf9c310d93093ba981131b64d674877bb63dc26edf3e563607406cc7b4d566f7d904a2677cdaff35de9
-EBUILD jackson-databind-2.13.2.ebuild 2678 BLAKE2B 73a94733e41321a63d6efce8626d35dbf57fccca30739983e555f1f34103cd223f61b7288522165d6e3e4031d64b4976367bbf698c28cdfb40469b4d926f790f SHA512 1f4a50f7d904ecf1c1c4e40c17cf6835ff49d9d102a270034054e965c1a7881ffd91c71c94ea10b2c6b80c12fe2bb119320cc1a1827f754afce5e1172649f902
+DIST jackson-databind-2.13.3.tar.gz 48056095 BLAKE2B 04751cd99eae3bbf3c3a30993506f05b47a85782f52e2cf51f50de9bcb5e9c3718d6ba6105667226272d644dcac6aeeb3ce06dc7ae737adf0392a7a7eafef2aa SHA512 785db6cab20ee74ff90815b8a1afedcbf10f13f60c336a61c20513757cbcde80c073d5f4dc60d390a72600a2b5719cca22b4c71220707dd4edd67dd87f6a7ac9
+EBUILD jackson-databind-2.13.2.2.ebuild 2683 BLAKE2B cd06eb72c55748afbea1396f9d901282cf68821c8ba21ab043a2c53217c5a50bb8d17b765a0ab9bd2eb9fc217bbe1cb7e361e2bcd24431c2cff1b970fad6729a SHA512 e5fa3f32c2dd426bba241ea8dc324776d1faedc867d362e2c12dc9a22b0b9ddfa2765a537574b7edda3262537dd9d679d088dc27fc515d11bf48a71783437e5c
+EBUILD jackson-databind-2.13.3.ebuild 2677 BLAKE2B b9915371133b04a82d59a491d25dba51d73aceea563ccc1fc31819f310224c3ac6381b31a121a65ec7e98793637188b87a52196490d060151ebca264e7ad9b28 SHA512 02c2d32c147891833e12b1bab5ffffda3cd9fc11d4c93907a4c40e377fffadf63e341941ac561c4cb161cb3f635245db7b4646d1093a35c9aa070ffb9c41b899
 MISC metadata.xml 316 BLAKE2B 06c857b21b1c39450aefd3a56ee67e0a9c57ce28f434e0af285397bf9c0a73801983b71415c1dd3ee1b53e9b1bf855d81b204559ccfe5bda7cf0703975a8420e SHA512 3308a8e0872865b0da8c3c5720364f786764d6cb751b6ad465dc450338b8c3f672b8266ab957a27609363d507b7f711ccb0edb921388a8f50cba73424fc85253
diff --git a/dev-java/jackson-databind/jackson-databind-2.13.2.2.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.2.2.ebuild
index 6cf6a5d4464d..8b602e5bcb47 100644
--- a/dev-java/jackson-databind/jackson-databind-2.13.2.2.ebuild
+++ b/dev-java/jackson-databind/jackson-databind-2.13.2.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-databind/jackson-databind-2.13.2.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.3.ebuild
index 9500e3416646..6a34f6927b74 100644
--- a/dev-java/jackson-databind/jackson-databind-2.13.2.ebuild
+++ b/dev-java/jackson-databind/jackson-databind-2.13.3.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-databind/archive/jackson-databind-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-databind-2.13.2.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.13.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-databind-2.13.3.ebuild
 
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-databind:2.13.2"
+MAVEN_ID="com.fasterxml.jackson.core:jackson-databind:2.13.3"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
@@ -18,19 +18,19 @@ 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.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-annotations:2.13.3 -> >=dev-java/jackson-annotations-2.13.3:2
+# com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
 
 CP_DEPEND="
-	~dev-java/jackson-annotations-2.13.2:2
-	~dev-java/jackson-core-2.13.2:0
+	~dev-java/jackson-annotations-${PV}:2
+	~dev-java/jackson-core-${PV}:0
 "
 
 # Compile dependencies
@@ -42,7 +42,7 @@ CP_DEPEND="
 # test? org.powermock:powermock-module-junit4:2.0.0 -> !!!groupId-not-found!!!
 
 DEPEND="
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	${CP_DEPEND}"
 #	test? (
 #		!!!groupId-not-found!!!
diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
index 1b6b2b626481..f00f3deea55e 100644
--- a/dev-java/jackson-dataformat-xml/Manifest
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -1,4 +1,6 @@
 DIST jackson-dataformat-xml-2.13.2.tar.gz 3201222 BLAKE2B c4db7ae5f3f3fc41bb3890337cc2cf6f1fe4dd65e96bff336d0c21e19758ca797497affbd189b731518a164fa8ad7f40c07e1c64ab3250ac438f1d4bf122a6ce SHA512 048550c465a83e0e5b72313d601eace9d817572a7d331d37ac48af51d5e0ef8d52cccadb1412c27d4ebd28b222b7707a0bfba114e10168d233e4c4e9f8d2fd1f
-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
+DIST jackson-dataformat-xml-2.13.3.tar.gz 3201473 BLAKE2B 90f6b98325e3ae43e7ba560b077ee8fc8e5ad5004fd23b7c10a2c2a3ec7a674b700b80766690d2442820f87698fa5e33c440c2aa12cd521b7566e78eca50bbaa SHA512 52e26e1a398d90f75ef61d074ed1d149b9f13555f1878703b3148ed008f29f8802586a6020f3c1427a748a73b9a4ca56d86ffd769cf6cb7317a69e039345eefa
+EBUILD jackson-dataformat-xml-2.13.2-r1.ebuild 3894 BLAKE2B 4f434f5e3d3ae85ed54c775973c6cb5f5767c2a9e5bc33918af5212fb970eee445902845c0b32ff73f80bfc8ddd58820ce994fb7c8cd6a9f214fe5b776dc97ee SHA512 6f74638693506f4e76c4f91c8adefe8eb8e239c7480b6408d06a267ede82cb703184a1256339a2042bfc8aae01b4a74413c1c7e5091358fc1830724e9e08feb7
+EBUILD jackson-dataformat-xml-2.13.3-r1.ebuild 3896 BLAKE2B e1302ea9708b24ddd1d7a37adb4a09c736940dd7be95f74a10a7f9c1442ee505e2398e491919a468097c4c46be9d5c86c09a27de9ac89a7cedf0e41811e54fa0 SHA512 7b2e0e3ccae805a68c9cc2ee88cb8413929e8c6d4ef238533adcef6568fc9bfe2f8b2cd1aa795ba1b9035093ff28f40707cd1dcfac7609ce647fbe76cce41418
+EBUILD jackson-dataformat-xml-2.13.3.ebuild 3894 BLAKE2B fd9c43e80882a30d7adfed83ca121d9cb540b98a142e0b44859f0a5216f330ef0240c6d3bd5d8c67d308b2888c9ae2646e81469bac12356f4bbd21fc12664fdb SHA512 852056549ed81f58dd3860758f12cf2aecce63b87b88e13b5cdaf71c64cb759fa45e5d416626055a44f13e55f2c7c253e3ee4f4e450930b6767a6d2647ab35ae
 MISC metadata.xml 487 BLAKE2B 0e5e73be66b890aab37fce8ccd162c168c7cff415c418a30f5cdcc76624499633abfd366f86ece75de208b981a03364566659e37c2b3a34ad90a01f3577a707a SHA512 b920c1d3b8d8f6023df6c100ba4b36282c7cbfdad4a4690055d70cd3dac8d0da91f236a38565bee798342dd94c49cf2c9ce125282a7e5fd818321e28d288b3f1
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2-r1.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2-r1.ebuild
index da444ab5520e..fc200932a64b 100644
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2-r1.ebuild
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2-r1.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-xml/jackson-dataformat-xml-2.13.3-r1.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3-r1.ebuild
new file mode 100644
index 000000000000..457511639ea4
--- /dev/null
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-xml-2.13.3.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Data format extension for Jackson"
+HOMEPAGE="https://github.com/FasterXML/jackson-dataformat-xml"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.fasterxml.jackson.core:jackson-annotations:2.13.3 -> >=dev-java/jackson-annotations-2.13.3:2
+# com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0
+# com.fasterxml.woodstox:woodstox-core:6.2.7 -> >=dev-java/woodstox-core-6.2.8:0
+# org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0
+
+CP_DEPEND="
+	~dev-java/jackson-annotations-${PV}:2
+	~dev-java/jackson-core-${PV}:0
+	~dev-java/jackson-databind-${PV}:0
+	>=dev-java/stax2-api-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.3 -> >=dev-java/jackson-module-jakarta-xmlbind-2.13.3:0
+# test? com.sun.xml.stream:sjsxp:1.0.2 -> >=dev-java/sjsxp-1.0.2:0
+# test? jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}
+	test? (
+		~dev-java/jackson-module-jakarta-xmlbind-${PV}:0
+		dev-java/jaxb-api:4
+		dev-java/sjsxp:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( README.md release-notes/{CREDITS,VERSION}-2.x )
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="jackson-module-jakarta-xmlbind,sjsxp,jaxb-api-4,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	sed -e 's:@package@:com.fasterxml.jackson.dataformat.xml:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
+		-e "s:@projectartifactid@:${PN}:g" \
+		"${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java" || die
+}
+
+src_test() {
+	pushd src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * -name "*Test*.java" \
+			! -wholename "**/failing**/*.java" \
+			! -name "*TestBase.java" )
+	popd
+
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+
+	# The same failure under openjdk-17 occurs upstream (running 'mvn test')
+
+	# 1) testCollection(com.fasterxml.jackson.dataformat.xml.lists.ListAsObjectTest)
+	# com.fasterxml.jackson.databind.exc.InvalidDefinitionException: Failed to call `setAccess()` on Field 'first' due to
+	# `java.lang.reflect.InaccessibleObjectException`, problem: Unable to make field transient java.util.LinkedList$Node
+	# java.util.LinkedList.first accessible: module java.base does not "opens java.util" to unnamed module @42bb2aee
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge "17" ; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
+	fi
+
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3.ebuild
index c5854f85e438..2c613fbdaa52 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.3.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/jackson-dataformat-xml-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-xml-2.13.2.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-xml-2.13.3.ebuild
 
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.2"
+MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.3"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
@@ -18,33 +18,33 @@ 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.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
+# com.fasterxml.jackson.core:jackson-annotations:2.13.3 -> >=dev-java/jackson-annotations-2.13.3:2
+# com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0
+# com.fasterxml.woodstox:woodstox-core:6.2.7 -> >=dev-java/woodstox-core-6.2.8:0
 # org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0
 
 CP_DEPEND="
 	~dev-java/jackson-annotations-${PV}:2
 	~dev-java/jackson-core-${PV}:0
 	~dev-java/jackson-databind-${PV}:0
-	dev-java/stax2-api:0
+	>=dev-java/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.2 -> >=dev-java/jackson-module-jakarta-xmlbind-2.13.2:0
+# test? com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.3 -> >=dev-java/jackson-module-jakarta-xmlbind-2.13.3:0
 # test? com.sun.xml.stream:sjsxp:1.0.2 -> >=dev-java/sjsxp-1.0.2:0
 # test? jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3
 # test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
 
 DEPEND="
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	${CP_DEPEND}
 	test? (
 		~dev-java/jackson-module-jakarta-xmlbind-${PV}:0
diff --git a/dev-java/jackson-dataformat-yaml/Manifest b/dev-java/jackson-dataformat-yaml/Manifest
index 8a7f9a17babc..aca94d91f3f2 100644
--- a/dev-java/jackson-dataformat-yaml/Manifest
+++ b/dev-java/jackson-dataformat-yaml/Manifest
@@ -1,4 +1,5 @@
 DIST jackson-dataformats-text-2.13.2.tar.gz 3528945 BLAKE2B 5dc38706b714121478e82b2f4bc0b3831fa84708b708c08c20d4744c4fc7130149d8dace5c20437514ce9431b1c39183f4d283717f4ad5876fac3651c53ea096 SHA512 1101aabc4b3b652ff90c23186fada6391db9cb4cb5ec6ba9ff78cd91b73ef3b632f38027e192d739d8e47f7ed2726ac03d8c3a1d20d416dfaac3b50ca11abb67
-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
+DIST jackson-dataformats-text-2.13.3.tar.gz 3528981 BLAKE2B 98593f45e663905c15ab5cb37152c95d69a0121515990fac0c66f640d93af83cd51802e2856a4e8df6b82c0121ac4fcd20774fd6a3841e019e1da56c599ed9a9 SHA512 77fad3e6ab5ad55d3a46ffaee3482e9f0dbfa36ce67d5ad31e0b7cde667536387f1dce5bc8296733a28efb09f423785aca7291d9ba85a67ca2b94ef4c8766d7f
+EBUILD jackson-dataformat-yaml-2.13.2-r1.ebuild 2664 BLAKE2B e7e368a3c5b1cb4b73860121127c57b4f21eee4341de035df8cfa72df952724701958609438439cf464b80d343a0b98383a25a4a6661c684d2402aff6725b420 SHA512 719b514aaa346e42ef0c3833e975025ce5dbb6887a6aa5b031471803d2d68306d5de6972677fe014f0dc2b570738329a1d6bd6904216c5dfece650186cf4ae01
+EBUILD jackson-dataformat-yaml-2.13.3.ebuild 2664 BLAKE2B d3e04f13a436fe73566bc431e47cf40f7bbef077c41a7f6f5475ccd34fc941d42058df1d687283b9ea982f0c32956043465f73e40f9c4fba65eac22a05859aee SHA512 b6df3010b1c2829076e45042509b6216b6b7bfdd6147d49d9a5acf74b558266cdb98cba8eeadbabba936fda57f8096b4c53625d89381d8a135cb600e273b9b54
+MISC metadata.xml 398 BLAKE2B 35f92ae137b3d4f6528c3987d1f9a4e8a1492688a687b4fb133b9ac5c02e6dcbde37807569463d8eebf26c078f55199e5848efcd6e11104599e5895044b61d8d SHA512 621d9b0635a22bed22305b4a7724e96beefdb57ff6b2553612f3e4feeeef080d02bc48dd0fcf3cbb3a2f4723c89bf8824f18adff1501fd3876c73e4e85fa20f1
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2-r1.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2-r1.ebuild
index 139c808cdee6..9c11a644ec61 100644
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2-r1.ebuild
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2-r1.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-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild
index a324875e0e97..5e75be3da4be 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.3.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-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
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-2.13.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-yaml-2.13.3.ebuild
 
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2"
+MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
@@ -18,12 +18,12 @@ 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
-# 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.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0
 # org.yaml:snakeyaml:1.30 -> >=dev-java/snakeyaml-1.30:0
 
 CP_DEPEND="
@@ -33,7 +33,7 @@ CP_DEPEND="
 "
 
 DEPEND="
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	${CP_DEPEND}
 "
 
diff --git a/dev-java/jackson-dataformat-yaml/metadata.xml b/dev-java/jackson-dataformat-yaml/metadata.xml
index ff11baa0e7b6..bc9ae704cd03 100644
--- a/dev-java/jackson-dataformat-yaml/metadata.xml
+++ b/dev-java/jackson-dataformat-yaml/metadata.xml
@@ -5,6 +5,7 @@
 		<email>java@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">https://github.com/FasterXML/jackson-dataformats-text/issues</remote-id>
+		<remote-id type="github">FasterXML/jackson-dataformats-text</remote-id>
+		<bugs-to>https://github.com/FasterXML/jackson-dataformats-text/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jackson-module-jakarta-xmlbind/Manifest b/dev-java/jackson-module-jakarta-xmlbind/Manifest
index 5468474998c7..bf51cb75043f 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/Manifest
+++ b/dev-java/jackson-module-jakarta-xmlbind/Manifest
@@ -1,4 +1,6 @@
 DIST jackson-module-jakarta-xmlbind-2.13.2.tar.gz 2146359 BLAKE2B 242d148b1945745f2578a751cf7aec7764000e3400fbc63d9c4b5b9ee029c77868b97590c922c3900e8b3800271176099d4928f3d63936c6b9e5e2326321616b SHA512 ea8d6a230f736cc0429e8d9a8883609074dc7e723bb01bdecbb49a665fc8f879b3f2da906c1d9816d6675a38479943a8b5e6fa1b67d495bbf882262808bce10b
-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
+DIST jackson-module-jakarta-xmlbind-2.13.3.tar.gz 2145569 BLAKE2B 13864e4272d40e8425232482a67a2bc720ff294e93ec623589bd0b7286e2c63c2b724bc1033eb19437cdea23db0b11142380715fc300c32e8af9dba22eeed407 SHA512 2807a9e1d3531f3553a2ab6bb64e0ece2809ca9d2facae320dbd38efe0797cdc7ab11e9b284122d75a98a50eda9bc0cfb0f098ca0921e3bf67a0e38b5252a14d
+EBUILD jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild 2793 BLAKE2B 74c68733494b6ddec21d334f52e166df316db33e7c0d15a580d2cfd61676c12abe1abb58a98043ef2804c5f847c28d39aa8387c091f61741de6ec93919aa3f3c SHA512 c6f9c14be15c0d58771d2695508ea590fdc50384ff592642a5fa7c6cfa3eda2b24da22ae255f7c34f026886e46387aefaa7e3e0aed0b278d1fcf3f93702c89a8
+EBUILD jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild 2888 BLAKE2B d8c0b8adb7576aa03a4a3999308ae374bfc67ef9c9ddde6b092372fcb759848852de520b0c699cf238d8ac98c673ceb661c95ba8e25e666a8a82456c6b44981e SHA512 516ca0ae25dd319c66057256e8ff35fd96b32a8e6c9b89299e5515070d852ec6b5cfbad053ccb980a617bbc89afc4b483379646498f0be566c024cf34ec43e87
+EBUILD jackson-module-jakarta-xmlbind-2.13.3.ebuild 2766 BLAKE2B d442d46c8941dd0f061dc86ed2276369be83a47eddd5dc8982f29d6cf04d54a83f3f82f39fa3b13b0b490d85acc3e7b7d2ebf2c9accfebe60cdb02f2c2b64613 SHA512 ba7133da91b84f82000d4395db83b6824f3e024cefd9243a55f4afd838dd681d61d37b5ffe2744502849269418d27aa3b49150681c8a57a959af3d72598cc431
 MISC metadata.xml 506 BLAKE2B 4e62bddea5ad8f7e6b73de9a173dbc8416b309caf4e4f9801496712f1cc88bdab646d237e48c3f55c99d95c198056b6642cf19070805f694b3a8e996e9bd0528 SHA512 96825b1a8ec0808f4dfa4a2482a1c184acab23d624ab178be8df496c67ff3ca5cd7cf012e6e7017721a3355a6ff3265d6f76734a655bfb261d3530781825f5d5
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild
index bc1ab00b11a4..729776debe50 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2-r1.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/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild
new file mode 100644
index 000000000000..b063ac9c72df
--- /dev/null
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-module-jakarta-xmlbind-2.13.3.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Support for using Jakarta XML Bind (aka JAXB 3.0) annotations"
+HOMEPAGE="https://github.com/FasterXML/jackson-modules-base"
+SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.fasterxml.jackson.core:jackson-annotations:2.13.3 -> >=dev-java/jackson-annotations-2.13.3:2
+# com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0
+# com.sun.activation:jakarta.activation:2.0.1 -> >=dev-java/jakarta-activation-2.0.1:2
+# jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3
+
+CP_DEPEND="
+	~dev-java/jackson-annotations-${PV}:2
+	~dev-java/jackson-core-${PV}:0
+	~dev-java/jackson-databind-${PV}:0
+	dev-java/jakarta-activation:1
+	dev-java/jaxb-api:4
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+# test? org.glassfish.jaxb:jaxb-runtime:3.0.1 -> !!!groupId-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}
+	test? (
+		dev-java/jaxb-runtime:4
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/jackson-modules-base-jackson-modules-base-${PV}/jakarta-xmlbind/"
+
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="jaxb-runtime-4,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+JAVA_TEST_EXCLUDES=(
+	# Upstream does not run these 
+	com.fasterxml.jackson.module.jakarta.xmlbind.failing.TestUnwrapping
+	com.fasterxml.jackson.module.jakarta.xmlbind.failing.TestXmlID3
+)
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	sed -e 's:@package@:com.fasterxml.jackson.module.jakarta.xmlbind:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.module:g' \
+		-e "s:@projectartifactid@:jackson-module-jakarta-xmlbind-annotations:g" \
+		"${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jakarta/xmlbind/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jakarta/xmlbind/PackageVersion.java" || die
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/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.3.ebuild
index 18d572895a82..baf70d9cdfe8 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.3.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-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
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-module-jakarta-xmlbind-2.13.3.ebuild
 
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.2"
+MAVEN_ID="com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.3"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
@@ -18,16 +18,16 @@ 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"
 
 # Common dependencies
 # POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.2 -> >=dev-java/jackson-annotations-2.13.2:2
-# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.2 -> >=dev-java/jackson-databind-2.13.2:0
+# com.fasterxml.jackson.core:jackson-annotations:2.13.3 -> >=dev-java/jackson-annotations-2.13.3:2
+# com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3: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
 
@@ -35,7 +35,7 @@ CP_DEPEND="
 	~dev-java/jackson-annotations-${PV}:2
 	~dev-java/jackson-core-${PV}:0
 	~dev-java/jackson-databind-${PV}:0
-	dev-java/jakarta-activation-api:1
+	dev-java/jakarta-activation:1
 	dev-java/jaxb-api:3
 "
 
@@ -45,7 +45,7 @@ CP_DEPEND="
 # test? org.glassfish.jaxb:jaxb-runtime:3.0.1 -> !!!groupId-not-found!!!
 
 DEPEND="
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	${CP_DEPEND}"
 #	test? (
 #		!!!groupId-not-found!!!
@@ -56,8 +56,6 @@ RDEPEND="
 	>=virtual/jre-1.8:*
 	${CP_DEPEND}"
 
-DOCS=( ../README.md )
-
 S="${WORKDIR}/jackson-modules-base-jackson-modules-base-${PV}/jakarta-xmlbind/"
 
 JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
diff --git a/dev-java/jakarta-mail-api/Manifest b/dev-java/jakarta-mail-api/Manifest
new file mode 100644
index 000000000000..e0449c291768
--- /dev/null
+++ b/dev-java/jakarta-mail-api/Manifest
@@ -0,0 +1,3 @@
+DIST jakarta-mail-api-2.1.0.tar.gz 1072862 BLAKE2B dcfe0cbbd777dfe2bb703ddc67803402a6a617f6956822e574b7f9b01f2541d0e06eacb3cd192b08205a6ff8151c7a93ad0db758a7df0eec0085e3964a3f88b8 SHA512 38d3e0476073b4faa732e6840d251f9ec90c42a7558b1ac628e83dfdad65f74c8cb3f87b6e1964f15354b5bcfee7fce2d0bdee20fa49073985db0e4401bc7627
+EBUILD jakarta-mail-api-2.1.0.ebuild 2497 BLAKE2B 492a848f5e18e91ecf3fd8e38c7edb3925abda6542a03a1fe2237b53580b4439f1cf03eb380544c926ce874a0bb08e27c9367c8fdd7bee6717a1e0e87b66b26f SHA512 3b3c0c4c7ee605d794cadea092fa0ac52a8003c3d4aeb2e6cf9374737cd9c40f688cbfff1c13557c18a5009465d3c75118ed34495c288f2c9c1f8051f47f97a1
+MISC metadata.xml 461 BLAKE2B aee5455f74a9b1f4befdfca703827933b8684cddb067d08298f6c5697c7d958d421be7e23d48e72979420d42b6d77d1880ad96a6bb6630010b2696f145be5839 SHA512 e13f30a91e3e0f825fe9f32c26747af78c3592eb4b08bfd86f40ba346f1d1f9d66c2ae77d49be884b142885d637af52f1922806262719e4c67ea19d077cfbbbe
diff --git a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0.ebuild b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0.ebuild
new file mode 100644
index 000000000000..796d357d7e17
--- /dev/null
+++ b/dev-java/jakarta-mail-api/jakarta-mail-api-2.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 pom.xml --download-uri https://github.com/eclipse-ee4j/mail/archive/2.1.0.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jakarta-mail-api-2.1.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="jakarta.mail:jakarta.mail-api:2.1.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Mail API 2.1 Specification API"
+HOMEPAGE="https://eclipse-ee4j.github.io/mail/"
+SRC_URI="https://github.com/eclipse-ee4j/mail/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="amd64 arm64 ppc64 x86"
+
+# Probably caused by --module-path missing @${test_sources}
+
+# warning: [options] system modules path not set in conjunction with -source 9
+# src/test/java/module-info.java:24: error: package is empty or does not exist: jakarta.mail.event
+#     exports jakarta.mail.event;
+#                         ^
+# src/test/java/module-info.java:29: error: cannot find symbol
+#     uses jakarta.mail.Provider;
+#                      ^
+#   symbol:   class Provider
+#   location: package jakarta.mail
+# src/test/java/module-info.java:30: error: cannot find symbol
+#     uses jakarta.mail.util.StreamProvider;
+#                           ^
+#   symbol:   class StreamProvider
+#   location: package jakarta.mail.util
+# src/test/java/module-info.java:32: error: cannot find symbol
+#     provides jakarta.mail.util.StreamProvider with jakarta.mail.util.DummyStreamProvider;
+#                               ^
+#   symbol:   class StreamProvider
+#   location: package jakarta.mail.util
+# 4 errors
+RESTRICT="test"
+
+# Common dependencies
+# POM: pom.xml
+# jakarta.activation:jakarta.activation-api:2.1.0 -> >=dev-java/jakarta-activation-api-2.1.0:2.1
+
+CP_DEPEND=">=dev-java/jakarta-activation-api-2.1.0:2"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-11:*
+	test? (
+		dev-java/angus-activation:0
+	)"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/mail-${PV}/api"
+
+JAVA_SRC_DIR="src/main/"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,angus-activation"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+	default
+	java-pkg_clean ..
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/sun-jms/metadata.xml b/dev-java/jakarta-mail-api/metadata.xml
index cfecd6d03c93..bb9bcf723eb6 100644
--- a/dev-java/sun-jms/metadata.xml
+++ b/dev-java/jakarta-mail-api/metadata.xml
@@ -3,11 +3,11 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
-		<name>Java</name>
 	</maintainer>
 	<longdescription>
-		The Java Message Service (JMS) API is a messaging standard that
-		allows application components to create, send, receive, and read
-		messages.
+		Jakarta Mail defines a platform-independent and protocol-independent framework to build mail and messaging applications.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">eclipse-ee4j/mail</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/janino/Manifest b/dev-java/janino/Manifest
index 1f3cc5e6cdb9..66375ed5fae1 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 2450 BLAKE2B bb333aa06465cde9ad61f34642a7753f48603cb7328fdb9bf0ab888bdcdc24f6fb642621e65a6a46fb9d4db08cde39fe6b1542c754b14d5f73f490e8575a1217 SHA512 2bdeb13ed634e0af780c9e9ce236e88996ffa184477fd3813383e771b0243223950fb0fe4c25200c56086eb1243a552ba6913c1d3ec7eccdada2413c6fc688dc
+DIST janino-3.1.7.tar.gz 1747439 BLAKE2B 6e42a9d5cc079c2cf17b76c1d76420ff3fa0027b54736f23e0aa2c5062f4dad19c1ac7efa678fa06cee369a01125a64a4ee32e4120e60ecd8a56d47aa4f69503 SHA512 541925fc10f5fbefde45e60cec1925e3d6f5b7244a6b9de251b5483224bee05c16182e2bf137a00349cbdb6c209ce18b2203ca066e5a7a1f146efa255f5f7799
+EBUILD janino-3.1.7.ebuild 2531 BLAKE2B ae499ba288a32289cc580df385fb0ad4c5c8a91a3cc6438dacf7c27f1fbbf9ed777dbbbfd75e7e092d0f453a396cdd45803b8cc5087b039b265a48c8244cfec1 SHA512 f8a736543205c5f471196d02cd01af3b5746118f091ee12e024ce2b2d8c4438d6bcfab5476c1c3a75c37a89e95811e9a39d947ad629f3eab3402c1dd8614ed4f
 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.7.ebuild
index 1da22362d3d2..46f3e8c96ec4 100644
--- a/dev-java/janino/janino-3.1.6.ebuild
+++ b/dev-java/janino/janino-3.1.7.ebuild
@@ -2,32 +2,36 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom janino/pom.xml --download-uri https://codeload.github.com/janino-compiler/janino/tar.gz/v3.1.6 --slot 0 --keywords "~amd64" --ebuild JANjanino-3.1.6.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom janino/pom.xml --download-uri https://github.com/janino-compiler/janino/archive/refs/tags/v3.1.7.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild janino-3.1.7.ebuild
 
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.codehaus.janino:janino:3.1.6"
+MAVEN_ID="org.codehaus.janino:janino:3.1.7"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="An embedded compiler for run-time compilation purposes"
 HOMEPAGE="https://janino-compiler.github.io/janino/"
-SRC_URI="https://codeload.github.com/janino-compiler/janino/tar.gz/v${PV} -> ${P}.tar.gz"
+SRC_URI="https://github.com/janino-compiler/janino/archive/v3.1.7.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
-# POM: janino/pom.xml
-# org.codehaus.janino:commons-compiler:3.1.6 -> !!!groupId-not-found!!!
+# POM: ${PN}/pom.xml
+# org.codehaus.janino:commons-compiler:3.1.7 -> !!!artifactId-not-found!!!
+
+CDEPEND="
+	!!!artifactId-not-found!!!
+"
 
 # Compile dependencies
-# POM: janino/pom.xml
-# org.apache.ant:ant:1.10.9 -> !!!groupId-not-found!!!
-# POM: janino/pom.xml
+# POM: ${PN}/pom.xml
+# org.apache.ant:ant:1.10.11 -> !!!suitable-mavenVersion-not-found!!!
+# POM: ${PN}/pom.xml
 # test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
 
 DEPEND="
diff --git a/dev-java/japitools/Manifest b/dev-java/japitools/Manifest
deleted file mode 100644
index 4bd772076567..000000000000
--- a/dev-java/japitools/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST japitools-0.9.7.tar.gz 92537 BLAKE2B 00dd8f7586cbf08aab0bfce9eda477d37798dae17f5d517b1e6ba091604cc2eb6216bd9a9f84be9ccec147cc4f366172a86d8b53f276a3dc33f414ea67d74d2b SHA512 28e2ecb76d8b180134904ec7aef5b15c60b02be32ef2519886eb38bb468f80ab59abb7ce27752ddbd380a3ef580e8435a983cc17797f3147933894786fd8e52d
-EBUILD japitools-0.9.7-r4.ebuild 897 BLAKE2B 1b51b53ee6bed382ad5edb6bdc20389ab95e116a3586aa56e04fbfcc0514e6d8a44d02fa2e6175020c98179cb4263d849e8e9ff9429689c4b0eabe6ad678f050 SHA512 14179276f3df2934ac8eaafc136808ec0e56a00da3ba6c7ebac55fd600344329b8b5f4481776ef0ec683bd7b620cc2a445aeac80e7a76d383983f32ab7a00f2f
-MISC metadata.xml 567 BLAKE2B b2708614db117a409694d033fa1895381f9a62f2dd01acac756d98c2c6457eafb59a349e47147df193791b9860370956d0a0d9046510e0986c5113e7bdf54b58 SHA512 6a4b16ac1d7820549c7bdf084cad7a9b634cbdcab12648a24b3bc890e0cc3f795ce308bcde644483eff6c4903551e68fbe248537fb79e461cb7fc5c067e3a920
diff --git a/dev-java/japitools/japitools-0.9.7-r4.ebuild b/dev-java/japitools/japitools-0.9.7-r4.ebuild
deleted file mode 100644
index a8dd8eb2d0b6..000000000000
--- a/dev-java/japitools/japitools-0.9.7-r4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 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="Java API compatibility testing tools"
-HOMEPAGE="http://sab39.netreach.com/japi/"
-SRC_URI="http://www.kaffe.org/~stuart/japi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="test"
-
-CDEPEND="dev-java/ant-core:0"
-
-RDEPEND="
-	dev-lang/perl
-	${CDEPEND}
-	>=virtual/jre-1.7"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.7"
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="ant-core"
-JAVA_SRC_DIR="src"
-
-src_prepare() {
-	default
-
-	rm bin/*.bat || die
-	sed -e "s:\.\./share/java:../share/${PN}/lib:" -i bin/* \
-		|| die "Failed to correct the location of the jar file in perl scripts."
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	dobin bin/*
-
-	java-pkg-simple_src_install
-	java-pkg_register-ant-task
-}
diff --git a/dev-java/japitools/metadata.xml b/dev-java/japitools/metadata.xml
deleted file mode 100644
index 947d3ed7e975..000000000000
--- a/dev-java/japitools/metadata.xml
+++ /dev/null
@@ -1,16 +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>
-
-<longdescription>
-Japitools consists of two simple tools designed to test for compatibility
-between Java APIs. They were originally designed for testing free implementations
-of Java itself for compatibility with Sun's JDK, but they can also be used for
-testing backward compatibility between versions of any API.
-</longdescription>
-
-</pkgmetadata>
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index e30fb8485229..35ca21d6e659 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,4 +1,4 @@
 AUX javacc-4.0-javadoc.patch 420 BLAKE2B 8f26c37e26f8967cf527a6f7f4b6c5396bffb5cde4cf9aad292217d41e614800cac438b92971e0c942f71ace4f551db30bae873e83ecdcf2ee7940153fca50bf SHA512 e20554696a27137b7f9c086f7d8c4854742fa1e14ad84e2157cecebdc65f2fb6726a0eaaff7bf3f1113a6fade51c5825b86641b61b917a4fcdd96663a8830438
 DIST javacc-5.0src.tar.gz 810123 BLAKE2B 6833e79a33c7ae8b28902d1c372162a2f9e326629f0d4c1936a8c3638d3aa3f6bd5713aca8398ba5f1ff963fe585eb683fcd3009602ee592ba79692c8ba0f3d6 SHA512 91896a0affac1c4fd00a093a731dfd02bda548d1a4d83e1077ed36a67f4f9deab0ce9f2d0212fd4c08ab00065d3029533adbafbc026a22ca071285093bd3bba6
-EBUILD javacc-5.0-r4.ebuild 1406 BLAKE2B a14d39d675a7eec5ae330c6aeabf80b2f9980bcc589470a30dfe17bfa762f09cec0a967eee0a153cd10d276dd440761d14273602e1835d0f6bf12c459f3afb7d SHA512 7c043d24cbc0eea4c96b20bb9944471685256d7f8ba1c95c9d27772cdacb6bf6a9e68d8e16fbba6d92061f97dc1c9aee41b89f881f64558909f564f95ec050a4
+EBUILD javacc-5.0-r4.ebuild 1414 BLAKE2B 71b2f49568204c15af879bbed88c0c887f7c77e2439928e2b337baa35f278ac1ed8a6b88e0c1726220908043d4d50568b9c47d6059659f0a0ed02be4584690cc SHA512 2a9ce39a8d89771dafd05fe269ac64dc868b7069ccfcacf7d8b931d6cca888ae43bbc6c57d1ee7db6509cad96bc8274e8b3026e44bb41731bc0f2cfe472ca49a
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/javacc/javacc-5.0-r4.ebuild b/dev-java/javacc/javacc-5.0-r4.ebuild
index 0df7bc24b7f8..f63c12eccf55 100644
--- a/dev-java/javacc/javacc-5.0-r4.ebuild
+++ b/dev-java/javacc/javacc-5.0-r4.ebuild
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc examples source test"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
-HOMEPAGE="https://javacc.java.net/"
+HOMEPAGE="https://javacc.github.io/javacc/"
 SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest
index 425bec062390..04a734b9287f 100644
--- a/dev-java/javahelp/Manifest
+++ b/dev-java/javahelp/Manifest
@@ -1,4 +1,3 @@
 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
+EBUILD javahelp-2.0.05_p20170719-r1.ebuild 1675 BLAKE2B 0c59fde199d25bdcb85ea6eab3b8c49ba18328bd07323262d19aaaee0ec7fe9b1203ddb807f4fc765e007873043081adf21940189c0d4c6cb34e53f70fd48251 SHA512 e873859d2f6bfbf531dd231bde326fbf151b1fba085c1156a497447456b837b82acb62b65bd99850124ab8044b2d848c650c48d5cf2c2456055f32f2c2b4478a
 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
index bfedce9fba1b..d617465487ec 100644
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 CDEPEND="java-virtuals/servlet-api:2.4"
 
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
deleted file mode 100644
index 4761d095147b..000000000000
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/jaxb-api/Manifest b/dev-java/jaxb-api/Manifest
index b7e53fc7c9ef..125149fb1794 100644
--- a/dev-java/jaxb-api/Manifest
+++ b/dev-java/jaxb-api/Manifest
@@ -1,7 +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
+DIST jaxb-api-4.0.0.tar.gz 543827 BLAKE2B 12a113126290fdf46270d2713d88836e8f5d01059127747a343816a10deb45ecc8c8dc8cf2cf7e2b71754977900645d4fef6e08fa8c47f583945fea34bc62357 SHA512 eb4eab396b894ab801433e0e31f93a4980f3913176a1960591a69e4fd55f10f316a7edb712df323c59f7dc9ca6cebacb7257be06aec72446059dd8b93c6de175
+EBUILD jaxb-api-2.3.3-r1.ebuild 1531 BLAKE2B 8c3fe2631bb4c08cec81d96f8ae1a632740eee3e822e5ba16d703f8f792e594834175d2681eeedc28647d5c3f49947fc405bc57b915441203bb113419f31d948 SHA512 90a9f418a8c15a21d88076370bda6b757648fdfbbcd9c1eaf137de7f0d72d0aff7f6b326919f0f14f668e006d28c0a9fc0b60f594b252050f9032f681b1767f6
+EBUILD jaxb-api-3.0.1-r1.ebuild 1116 BLAKE2B 0699bde40ccb4198c76f1df7c6de9be8e4f7d555a66e733c05d5942677cb208598b47aa73f2a3691a3b5c5ef6c19ff5e9e37135eb648f87628b39a6e11ed1138 SHA512 d93aba658f98491ba3d9f8d6a24fc1831848096f93ea5c6500dbac61b431087eedb18c16e943a43bd26846e8bb45e1ae5f7dfcbbdf87b146c869cdcda83e0dc3
+EBUILD jaxb-api-4.0.0.ebuild 1022 BLAKE2B 2aa8ff74a22096e18772d380bf6d76fea9feee4bca84600855de5c2342ca62f2105261ec39ebda7be2da0c4e8177607b1fcf92d46878f7d7d6dd044924bff3e1 SHA512 b6532ee64d244aac60500a0e08c236f900121397438b6e1150beb817b82cefa2e7264844e8c81581ed0b73a967984a06b988d3b3119f6a95af25e2610ad04d49
 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
index 8e24eccaf3cd..179eb6a32e3c 100644
--- a/dev-java/jaxb-api/jaxb-api-2.3.3-r1.ebuild
+++ b/dev-java/jaxb-api/jaxb-api-2.3.3-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="EPL-1.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jaxb-api/jaxb-api-2.3.3.ebuild b/dev-java/jaxb-api/jaxb-api-2.3.3.ebuild
deleted file mode 100644
index 9fa240685dea..000000000000
--- a/dev-java/jaxb-api/jaxb-api-2.3.3.ebuild
+++ /dev/null
@@ -1,59 +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/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=7
-
-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/refs/tags/${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-1.8:*"
-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_test() {
-	# Suppress tests for vm_version 1.8 (too many test failures)
-	# see https://bugs.gentoo.org/796995
-	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-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
index 6b3427db5392..9167a5edd809 100644
--- a/dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild
+++ b/dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild
@@ -12,12 +12,12 @@ 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"
+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="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild b/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild
deleted file mode 100644
index 857f9ebaa6e0..000000000000
--- a/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild
+++ /dev/null
@@ -1,40 +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/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/refs/tags/${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-1.8:*"
-
-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/jaxb-api/jaxb-api-4.0.0.ebuild b/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild
new file mode 100644
index 000000000000..a49e2c851b71
--- /dev/null
+++ b/dev-java/jaxb-api/jaxb-api-4.0.0.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="jakarta.xml.bind:jakarta.xml.bind-api:4.0.0"
+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="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="dev-java/jakarta-activation:2"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-11:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="api/src/main/java"
+JAVA_RESOURCE_DIRS="api/src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="jaxb-api-test/src/test/java"
+JAVA_TEST_RESOURCE_DIRS="jaxb-api-test/src/test/resources"
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jaxb-runtime/Manifest b/dev-java/jaxb-runtime/Manifest
new file mode 100644
index 000000000000..5a41a7f809c1
--- /dev/null
+++ b/dev-java/jaxb-runtime/Manifest
@@ -0,0 +1,3 @@
+DIST jaxb-ri-4.0.0.tar.gz 1739184 BLAKE2B a85a12fdca0b6eff8664894d65e2f82d30491e20050fde2ca828fa3c2c79ce2e158fca5ce6d0ae2cb2a00859abc0c9e9d49321c0943b862fd603a9e732f29dc4 SHA512 766a58d5107a88c19a99014b737b7b14a510b928dd26991adfe902073614923690c1e5a231834ec4a200a10adf9505b27179b8d84cf09dbb09292341c328e743
+EBUILD jaxb-runtime-4.0.0.ebuild 3314 BLAKE2B fd7c5aa639ff12d7b2f19702e3d92113369ac74f3027caad750e71739611a64ee067cf811916b4bc1502655c98748945aa43e6fa028af356a239aa3070a82a31 SHA512 c8506d511c249761aa5cbdf079b19354e2ce5639726e49bfc5b825db37faae0b000d029fc5639159c4de765f119d6cc5834bdeb97dc9d29536786b0875f37cc9
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/jaxb-runtime/jaxb-runtime-4.0.0.ebuild b/dev-java/jaxb-runtime/jaxb-runtime-4.0.0.ebuild
new file mode 100644
index 000000000000..0f4c1c55c97d
--- /dev/null
+++ b/dev-java/jaxb-runtime/jaxb-runtime-4.0.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom runtime/impl/pom.xml --download-uri https://github.com/eclipse-ee4j/jaxb-ri/archive/4.0.0-RI.tar.gz --slot 4 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxb-runtime-4.0.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.glassfish.jaxb:jaxb-runtime:4.0.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JAXB (JSR 222) Reference Implementation"
+HOMEPAGE="https://eclipse-ee4j.github.io/jaxb-ri/"
+SRC_URI="https://github.com/eclipse-ee4j/jaxb-ri/archive/${PV}-RI.tar.gz -> jaxb-ri-${PV}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: runtime/impl/pom.xml
+# com.sun.xml.fastinfoset:FastInfoset:2.1.0 -> !!!groupId-not-found!!!
+# org.glassfish.jaxb:jaxb-core:4.0.0 -> !!!groupId-not-found!!!
+# org.jvnet.staxex:stax-ex:2.1.0 -> !!!groupId-not-found!!!
+
+CP_DEPEND="
+	dev-java/fastinfoset:0
+	dev-java/jaxb-stax-ex:0
+"
+
+DEPEND="
+	dev-java/istack-commons-runtime:0
+	dev-java/jaxb-api:4
+	>=virtual/jdk-11:*
+	${CP_DEPEND}
+"
+
+# reason: '<>' with anonymous inner classes is not supported in -source 8
+#   (use -source 9 or higher to enable '<>' with anonymous inner classes)
+RDEPEND="
+	>=virtual/jre-11:*
+	${CP_DEPEND}"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/jaxb-ri-${PV}-RI/jaxb-ri"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+src_compile() {
+	einfo "Compiling txw-runtime"
+	JAVA_SRC_DIR="txw/runtime/src/main/java"
+	JAVA_JAR_FILENAME="txw-runtime.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":txw-runtime.jar"
+	rm -r target || die
+
+	einfo "Compiling core"
+	JAVA_SRC_DIR="core/src/main/java"
+	JAVA_RESOURCE_DIRS="core/src/main/resources"
+	JAVA_JAR_FILENAME="core.jar"
+	JAVA_CLASSPATH_EXTRA="istack-commons-runtime,jaxb-api-4"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":core.jar"
+	rm -r target || die
+
+	einfo "Compiling runtime"
+	JAVA_SRC_DIR="runtime/impl/src/main/java"
+	JAVA_RESOURCE_DIRS="runtime/impl/src/main/resources"
+	JAVA_JAR_FILENAME="runtime.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":runtime.jar"
+	rm -r target || die
+
+	if use doc; then
+		einfo "Compiling javadocs"
+		rm {core,runtime/impl}/src/main/java/module-info.java || die
+		JAVA_SRC_DIR=(
+			"txw/runtime/src/main/java"
+			"core/src/main/java"
+			"runtime/impl/src/main/java"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+#	einfo "Testing txw-runtime"
+#	JAVA_TEST_SRC_DIR="txw/runtime/src/test/java"
+#	java-pkg-simple_src_test
+
+	einfo "Testing core"
+	JAVA_TEST_SRC_DIR="core/src/test/java"
+	JAVA_TEST_RESOURCE_DIRS="core/src/test/resources"
+	java-pkg-simple_src_test
+
+	einfo "Testing runtime"
+	JAVA_TEST_SRC_DIR="runtime/impl/src/test/java"
+	JAVA_TEST_RESOURCE_DIRS=()
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	einstalldocs
+
+	java-pkg_dojar "txw-runtime.jar"
+	java-pkg_dojar "core.jar"
+	java-pkg_dojar "runtime.jar"
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+
+	if use source; then
+		java-pkg_dosrc "txw/runtime/src/main/java/*"
+		java-pkg_dosrc "core/src/main/java/*"
+		java-pkg_dosrc "runtime/impl/src/main/java/*"
+	fi
+}
diff --git a/dev-java/xjavac/metadata.xml b/dev-java/jaxb-runtime/metadata.xml
index 4221e170cbc0..75321cfb5598 100644
--- a/dev-java/xjavac/metadata.xml
+++ b/dev-java/jaxb-runtime/metadata.xml
@@ -3,6 +3,5 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
-		<name>Java</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jaxb-stax-ex/Manifest b/dev-java/jaxb-stax-ex/Manifest
new file mode 100644
index 000000000000..b01b9a8bdb2d
--- /dev/null
+++ b/dev-java/jaxb-stax-ex/Manifest
@@ -0,0 +1,3 @@
+DIST jaxb-stax-ex-2.1.0.tar.gz 28683 BLAKE2B 774f7420f996eb52abc9db56753f0fc492164ed12f4ddffacad8f801ac759666e6dcae85cf24ce1231df4d49d5b5084278d2cac0c5c129302ec973c215408782 SHA512 f81dcb4870800c4799e716254b84e57a15ef36a9e6a8502da7ee2711aad67765595674fccc1c4d9d4e8865c642dfadd694f8849d4e98c4e9f2368cb940deb38d
+EBUILD jaxb-stax-ex-2.1.0.ebuild 1500 BLAKE2B 5af4074e598d332c85e9a6386e944f69938b605597a5fee41ba0733ddd48c539c09a6f879ab4a7356292bacb1be0379bfe05a72a5fb83f8510aeb35bb1645c32 SHA512 8fb0e65392faa12ea72b76dd3409a8550b0d757e851ddccb09e04b3435e51c3fbbbf73a3dba7f440a9db5e239db9aac1b1f5141388a9cad073691194ab4e786b
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0.ebuild b/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0.ebuild
new file mode 100644
index 000000000000..d3f278e69c31
--- /dev/null
+++ b/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0.ebuild
@@ -0,0 +1,58 @@
+# 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-stax-ex/archive/2.1.0.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jaxb-stax-ex-2.1.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jvnet.staxex:stax-ex:2.1.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Extensions to JSR-173 StAX API."
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j/stax-ex"
+SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# jakarta.activation:jakarta.activation-api:2.1.0 -> >=dev-java/jakarta-activation-api-2.1.0:2
+
+CP_DEPEND="
+	dev-java/jakarta-activation-api:2
+"
+
+# Compile dependencies
+# POM: pom.xml
+# jakarta.xml.bind:jakarta.xml.bind-api:4.0.0 -> !!!suitable-mavenVersion-not-found!!!
+# POM: pom.xml
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	dev-java/jaxb-api:4
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_CLASSPATH_EXTRA="jaxb-api-4"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/boot-bin/metadata.xml b/dev-java/jaxb-stax-ex/metadata.xml
index a09f5177d45a..75321cfb5598 100644
--- a/dev-java/boot-bin/metadata.xml
+++ b/dev-java/jaxb-stax-ex/metadata.xml
@@ -4,7 +4,4 @@
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">boot-clj/boot</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jbitcollider-core/Manifest b/dev-java/jbitcollider-core/Manifest
index 1f89d2fc01b5..7d404e084499 100644
--- a/dev-java/jbitcollider-core/Manifest
+++ b/dev-java/jbitcollider-core/Manifest
@@ -1,3 +1,3 @@
 DIST jBitcollider-0.8.zip 1192489 BLAKE2B cf30002394c83b6748d1a24f92148da46fdb1e84dc14f3b673ed8d3bd6ff2719b5530c890f21cc9e7af9a4553cfbb9cb606799606ea88b40e5b96e768b1c11cc SHA512 272e9e0e6e66d3ac9d17e17d8fcbed82b508e512c5cdada7f18c2920597f31ae5968509c9814c5530ee7c5bea9f3d1b049b922d55056637642bcb515b890a9f7
-EBUILD jbitcollider-core-0.8-r1.ebuild 924 BLAKE2B e029cdaf5eeb58e8929284f1d493d4b213debff82b1cde3ddcd71a040dec969edbaac7edfc49482069ec4b88869fcb4de748a4aa2fcdd191e2b8cfb3433badc9 SHA512 35abcb35aa222c32f25714a02adb016532b72fab26eda46122d0a49388afa0e6ee2dbf963f9d33a5e3aad124339fb6516fd39258ee7b6d8ada6cdb4265a80cd7
+EBUILD jbitcollider-core-0.8-r1.ebuild 929 BLAKE2B 5744fa3836d53e65f9731c20e41c6f8240d46cfc33ec18e4a8460e9567d647dadc83f90cdaeadb475853b014fb9ccec5bcc0c33271dc5b04c93f03aee532eed7 SHA512 c75408c81d7f97bd0c85188de2e10852a5122c61d2fce2b025b70e8b91871afa50166b9c20f90fd24ae20af90c5eb9fbfafe78e101cb736653885e3447efb79f
 MISC metadata.xml 338 BLAKE2B 787c1e3f66a6eec73b791ba2170fc0e0b13e3981ebbeb60ff44d14dd8c0ab553470d0e8edd1a2e3b40cec31c75e43e291535f822589f6c8027dfafdbc0922b65 SHA512 380f59c51c03094dc8324913c9c6bb4de8953bb4a14d3162c46c202c31d2d964cdd6ceaf9a685b33d48d19f6812a5fee80f5df68dabd23d084009fbac1be22b9
diff --git a/dev-java/jbitcollider-core/jbitcollider-core-0.8-r1.ebuild b/dev-java/jbitcollider-core/jbitcollider-core-0.8-r1.ebuild
index 07c846c70b04..ff91c2b70398 100644
--- a/dev-java/jbitcollider-core/jbitcollider-core-0.8-r1.ebuild
+++ b/dev-java/jbitcollider-core/jbitcollider-core-0.8-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
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/project/bitcollider/jBitcollider%20%28Java%29/${PV
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jboss-marshalling/Manifest b/dev-java/jboss-marshalling/Manifest
deleted file mode 100644
index 91c6f559557a..000000000000
--- a/dev-java/jboss-marshalling/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jboss-marshalling-1.3.0.CR9-sources.jar 174155 BLAKE2B 1c1a25910eb9d9d40f4f3cbb8bb6d7d59272e4806a39b602e1e336269eb3fa95d83a89b46967919d2e02b5647f43e42495f36777d82e706f1853b717f3e0e44e SHA512 d7a1ae24ec50acf20f8150cf6e741a846e9a5837f9d8e4c06d8429793f69b95a7c03449ba5a6debb00bd22b596b6f801e25e0f38ccce7ac25cafd601e2ef7058
-EBUILD jboss-marshalling-1.3.0-r2.ebuild 570 BLAKE2B 98bc3a7c86530889609c73cccce03d779ec191b5023f9728986345d7042000c2599b959cc36b1916569d919d061bb366063cf96bda66ad59cca0a73ad3275329 SHA512 5ae16dae3313e96a176a4acee874b6671e8db46b41f21b47d93cec03d91396d5b8069d0d5e9dd2b24ee8cd062a4c27dcb2d1e60da18c53ba61e1c663006d2ab8
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jboss-marshalling/jboss-marshalling-1.3.0-r2.ebuild b/dev-java/jboss-marshalling/jboss-marshalling-1.3.0-r2.ebuild
deleted file mode 100644
index c1c838957a5d..000000000000
--- a/dev-java/jboss-marshalling/jboss-marshalling-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,26 +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 java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Compatible alternative to the JDK serialization API"
-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-modules:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7"
-
-JAVA_GENTOO_CLASSPATH="jboss-modules"
diff --git a/dev-java/jboss-marshalling/metadata.xml b/dev-java/jboss-marshalling/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/jboss-marshalling/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/jcommander/Manifest b/dev-java/jcommander/Manifest
index 5d99f5f4b075..2e0b15eaaf3c 100644
--- a/dev-java/jcommander/Manifest
+++ b/dev-java/jcommander/Manifest
@@ -1,5 +1,3 @@
-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
+EBUILD jcommander-1.82.ebuild 1664 BLAKE2B 2f8a41a1c5142ad2449bf2eccfbd5d0fb50afbfaba2f5e98f282a55dd96b608546a8226f05d0b463be8855d6e22c1e652263407855eb89649da898bb3797dba3 SHA512 e14edea1c5882e1c4fd17c1162238c9ab55ac3503b0a2224b0fcc535b05cae9381121cc55969113818b94ffa28725e1c8ab2339f267a2539b197f523581ea147
 MISC metadata.xml 329 BLAKE2B 35efab95ec95b721d53463b4fe8d98358c632a76476f1648e2e1f33f7432b2fbf9d00199e4e53c047a91c90ac9e86e733089bf1c9dc69a9f2961d7cc8266b710 SHA512 c83a4611485d806ca1c1848db6605a8d4956956dd521e5b6171d98027324236e51a13c9032e76b462168d07bb74dc105fb9587ab91bd554845d733e668c9df32
diff --git a/dev-java/jcommander/jcommander-1.48-r1.ebuild b/dev-java/jcommander/jcommander-1.48-r1.ebuild
deleted file mode 100644
index b8ff1a494676..000000000000
--- a/dev-java/jcommander/jcommander-1.48-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Command line parsing framework for Java"
-HOMEPAGE="https://github.com/cbeust/jcommander"
-SRC_URI="https://github.com/cbeust/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${PN}-${P}"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	rm -rf src/test || die
-}
diff --git a/dev-java/jcommander/jcommander-1.82.ebuild b/dev-java/jcommander/jcommander-1.82.ebuild
index 845d94b587c7..b859e3a9c46a 100644
--- a/dev-java/jcommander/jcommander-1.82.ebuild
+++ b/dev-java/jcommander/jcommander-1.82.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest
index fad97b34190d..0797b6493e94 100644
--- a/dev-java/jctools-core/Manifest
+++ b/dev-java/jctools-core/Manifest
@@ -1,3 +1,5 @@
+DIST jctools-3.1.0.tar.gz 4204148 BLAKE2B 88f8f5395470072571de64ee3d696e90c1fbf22a6e9c1424463bfb8b497dd3d47f8d0fcc9a039acec8380ac52a3d445789257d5a1071e49e6963c59d156065e2 SHA512 bf69387732dea043e6e5fa44fe60a5f80ef5ae9d32ebb39ac16353e5bd82502b3b6e5564a8bd9f3b8ad073a95ff984ae55133884ebeea9d0b9a777c488af2a74
 DIST jctools-core-2.0.2.tar.gz 4136573 BLAKE2B 6ca4c276422b24b18256b35606b6e59e8be53b77fe0b757e4f46dc4e0bdab0ea8fbb8c58e84794c689aa1df29a80aa847b6baf7cda430f2657720ecb5d60e99f SHA512 734905d6847664a08557fa9807766bfe2cd57e9562f1dc0d908c9fffc627c1cb7576ac079715004da9a1f2ee958c8373caf60c110ef3de8f7da5bb04775f6f7f
 EBUILD jctools-core-2.0.2.ebuild 2134 BLAKE2B 394965b73740c75bf5578c02fdc035efa3e719501fa7452ae6da7e0d51bb11994def69e379623900c315de47a4e8147d1dd5cc6acaccda5b2188c174fb115f9d SHA512 6e5f6f1514a9bdbdff75dba29ca34553dd2d781c134579670195edbc70d702d34411b069ef353d81390dba47f23b81bfc960ca973b9eb75de68ba2ddd8d56695
+EBUILD jctools-core-3.1.0.ebuild 2190 BLAKE2B eedf0a9b0f38250300922f544d150162174e14c7e386b2631f1a30172e4110f5f239827e1deddee2b6b43615927ee71b3aaa3f1e3514c291b3e3ce55a1921857 SHA512 1648d0273bd79bbe45c20748b19e5d6aa9c5178f5c063e2dc07a07e34ba5180237194826b7240abccb3d901c42f2d12f40b25092ad75f1e5282664c6475dd4b2
 MISC metadata.xml 305 BLAKE2B 4ac1a7216894d3a7be6d9b4bbc034c2cb571ce0e9ec4f401eb4921f9c56b00296494be04d33b052d7f89684ac9a8d9b80385f7b33d7cb0a92b2ddb4bcc323835 SHA512 3ce5145f2b40c8a5bc7cd89c14ce33d6d194809ab70bec23c0726636ed516693f3cfdfe231e79fc1e3f3591ad950ff27f2632545fd69213a878be1b27d6f1f9d
diff --git a/dev-java/jctools-core/jctools-core-3.1.0.ebuild b/dev-java/jctools-core/jctools-core-3.1.0.ebuild
new file mode 100644
index 000000000000..834d6fa686a6
--- /dev/null
+++ b/dev-java/jctools-core/jctools-core-3.1.0.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 https://github.com/JCTools/JCTools/archive/v3.1.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jctools-core-3.1.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jctools:jctools-core:3.0.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Concurrency Tools Core Library"
+HOMEPAGE="https://jctools.github.io/JCTools/"
+SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? com.google.guava:guava-testlib:21.0 -> >=dev-java/guava-testlib-30.1.1:0
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+# test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!!
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? (
+		dev-java/guava-testlib:0
+		dev-java/hamcrest-library:1.3
+	)"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{README,RELEASE-NOTES}.md )
+
+S="${WORKDIR}/JCTools-${PV}/jctools-core"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,hamcrest-library-1.3,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+# Using the defaults of java-pkg-simple would skip more than half the number of tests.
+src_test() {
+	# These tests would fail and are not run by "mvn test".
+	# "org.jctools.queues.MpqSanityTest"
+	# "org.jctools.queues.QueueSanityTest"
+	# "org.jctools.queues.ScQueueRemoveTest"
+	# "org.jctools.util.TestUtil"
+	pushd src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			\( -name "*Test*.java" \
+			-o -name "nbsi_tester.java" \
+			-o -name "nbhs_tester.java" \)\
+			! -name "MpqSanityTest.java" \
+			! -name "QueueSanityTest.java" \
+			! -name "ScQueueRemoveTest.java" \
+			! -name "TestUtil.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/jdbc-mssqlserver/Manifest b/dev-java/jdbc-mssqlserver/Manifest
deleted file mode 100644
index eb75a6f4e6cf..000000000000
--- a/dev-java/jdbc-mssqlserver/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mssql-jdbc-6.2.2.jre8.jar 825389 BLAKE2B 3b3290e80652e1085729f7a3391bea7f3542af6598ea855c6e1430fef2b12009dbfccc761d347491ea85c22d2acfa12d5a55e79b44f23306b6c4f4b6a5aa2ebb SHA512 e381fe9444c706a8a019c5006fe5d238065c20387d3c5b9a4c632ff30033596cea26036b804fc4f6610ad1418bb7d94b024871c7deb865028f5770ffca353d49
-EBUILD jdbc-mssqlserver-6.2.2.ebuild 530 BLAKE2B 16bd266a4b9d91e5564725345f6111cb9fbdce0822e7717281f88230407f5aa9161ec75d5fc1f52d2b12207c6fc381948d828aaf1225c59571adcd43cbd9d01d SHA512 ffcb2821a2ce4bf670360e07550930b4655f3ec57827e0932f87e224d74fb93b950bd29b91a0d6bc2e5fd52e30801380fab6d7ff9ecba1f6b4448a5c553fad57
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-6.2.2.ebuild b/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-6.2.2.ebuild
deleted file mode 100644
index 4dbbc416dc05..000000000000
--- a/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-6.2.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 versionator
-
-DESCRIPTION="JDBC driver for Microsoft SQL Server"
-HOMEPAGE="https://github.com/Microsoft/mssql-jdbc"
-SRC_URI="https://github.com/Microsoft/mssql-jdbc/releases/download/v${PV}/mssql-jdbc-${PV}.jre8.jar"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-SLOT="4.2"
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	java-pkg_newjar "${DISTDIR}/${A}"
-}
diff --git a/dev-java/jdbc-mssqlserver/metadata.xml b/dev-java/jdbc-mssqlserver/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/jdbc-mssqlserver/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/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
index c6450faa7f25..2e5802225ca4 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -1,5 +1,7 @@
 AUX jdbc-postgresql-9.4_p1201-remove-osgi.patch 1629 BLAKE2B f358ab6ac9296ade9eb7603dc03367f984622207c259df68c3029464197b47e052b69a369889e174cc0543d51a1d07c4134e8530bab0e80de4d5f38e79557486 SHA512 dcb831f6828980b5ada1158cb80c2e5c8d6921b24b69cd0f40faec9b8d41bdaa468ca995e4a804282b816ab8b0120e371e5f21a2aff7fee6068f13affc6b097a
 AUX jdbc-postgresql-9.4_p1204-remove-sspi.patch 6853 BLAKE2B 243b64279b501b417a5570d41010decd4edb55ca11a14c1a927698ee3795b2d7e7fc9c5c6fcd95b6210bd26c3938795fcbbce1b1c4dafe259197b0db8eb60701 SHA512 17d6a1514fc824008c8f0464c4af30d038a379ade44120dc24d8f9a4f495393c6e75e82f8e9da1e51c6d22c2301ec83a842d0db6e22842661b4dda97b8335dc6
+DIST postgresql-jdbc-42.4.0.src.tar.gz 966868 BLAKE2B 0a8bffcfbba4ddedcbd77717b6bca2f4e7cd9fe4597c6edb5a2ac8fbea788c692377ae713723aa7342895f857aff7eca0825eedd36cff69f3760b11cbb7b666c SHA512 816967923f54d5c2ad856e3ae2612987fa52234acc6b487f492d56614ac241d9542abd40a1f868ad6d895a45de28f7a0d586f8486dc719600238bcc3ef40819a
 DIST postgresql-jdbc-9.4-1206.src.tar.gz 2029837 BLAKE2B b222a0b2f8f99becaf0ae350407fafeb23d9d4bdb130c17996373b4211e0d56d1a76bc5737401dc6fc6618d2a891943d096b0f60f0770ff6ce859ade3e7a178d SHA512 b16816f1afd3ee5986fca197bd7608c2e2f334054e41a8c541c47985827f4f59d7691d23983bdac01c85fc364cd001c991ac6b4e8567429b9d1f4161388dd6bd
+EBUILD jdbc-postgresql-42.4.0.ebuild 2022 BLAKE2B c7586ee5558289d9439b9e1e94aff7fe510fdd288d8ee20b8576499cbdf6e4088d0c982735c28687aa870a819cd81797b384f9aeb443c6328cdce250121f5f64 SHA512 a1b7e9a991ebaab20f91661f874e550dfac7977defaa0d8a626a90b924afdb4a4fa7c9865d6323ae8734f7c247cb6dbf42bcf9e9ee2a47998d94df5a4e8a1fdd
 EBUILD jdbc-postgresql-9.4_p1206-r1.ebuild 3412 BLAKE2B 96f494807dcc52edbe1475d49af9a951873ad01647f44132ae0c370d84b9cd623091a2177ed99d25dec3a78252ea57c1e31b98da68ba6eb9e301cd2e8ea319b7 SHA512 bd1a037439f9e6995fe525a5a5ee6b2f89ff727e1741c92d9798676960aa6777c1d80d0046cac6557291a700c6a10c9de46729b0f878f20af5d55aac19d274e4
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.0.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.0.ebuild
new file mode 100644
index 000000000000..9ebc3e1125bf
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.0.ebuild
@@ -0,0 +1,59 @@
+# 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://jdbc.postgresql.org/download/postgresql-jdbc-42.4.0.src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jdbc-postgresql-42.4.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.postgresql:postgresql:42.4.0"
+# We don't have junit-vintage and junit-jupiter.
+#	JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java JDBC 4.2 (JRE 8+) driver for PostgreSQL database"
+HOMEPAGE="https://github.com/pgjdbc/pgjdbc"
+SRC_URI="https://jdbc.postgresql.org/download/postgresql-jdbc-${PV}.src.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.ongres.scram:client:2.1 -> !!!groupId-not-found!!!
+# uk.org.webcompere:system-stubs-jupiter:1.2.0 -> !!!groupId-not-found!!!
+
+CP_DEPEND="dev-java/scram:0"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
+# test? org.junit.jupiter:junit-jupiter-api:5.6.0 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-engine:5.6.0 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-params:5.6.0 -> !!!groupId-not-found!!!
+# test? org.junit.vintage:junit-vintage-engine:5.6.0 -> !!!groupId-not-found!!!
+# test? se.jiderhamn:classloader-leak-test-framework:1.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}/postgresql-${PV}-jdbc-src"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+#	JAVA_TEST_GENTOO_CLASSPATH="junit-4,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+#	JAVA_TEST_SRC_DIR="src/test/java"
+#	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 004f1df8258a..a6b8e25f5dfb 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,6 +1,5 @@
-AUX build-xml-2.patch 1528 BLAKE2B f9ba4714bfe2ad46019c71655128512c639b8dfb54f53ed0e279b4b0d346df6fba33e0f7cafbced54e7b8ac16ed542d2a8cd57bb351ea5db5fa0764da51201a5 SHA512 08c8414a04d849ad8f70519a94ff4a29b7557354903ac38ed1b3e6213a4b996fe235ce36b11b869da13692d0e644ef5afc810dd23736afa9c22cabaf70bd3e8a
-DIST JDOM-2.0.6.tar.gz 8344114 BLAKE2B 0b9a568fe4de1fb9afc5a547d75aa1d3556bf497c76e3d32d1ebd7658634ea02e4fafa3c6261b64d9b803fc6e78ae013fb8a366bcbd5024e8ab0aced83f58e33 SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1
+DIST JDOM-2.0.6.1.tar.gz 8368301 BLAKE2B b9d5d8e611b9a0505c9576f2c4a2243eddd8a171bbe44d83440edf44154cae80138ddca8a0bceb3124a6825111d30641a28d645507a1bacad6a8cb9ad1dbccdd SHA512 c09b422b0635a478cb70e57e4c35bc7f505f6a2730be813d6e63c053814581e4dc3fdf431b945394c30ab37a8fb83fd103767f8de84d28bef79e95e2c37518e1
 DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
 EBUILD jdom-1.1.3-r1.ebuild 1252 BLAKE2B 1f13d6f90843dd28a886d5b8158d33602239d6fe7540655166a7bf8aa6f3201cb9a3700a7a1ea669c04a7aa8a94432ed6b8e6c1df5a3b1ed36243ec1bb3d0f1d SHA512 bf245f0d9e759c1c0ebe8937d980e391480687eb53ba0234e5f7b02f124b4a55b61bf6001d391da7fbb58de4a82d7ec90b9bd63a101d869e1d96c14d43a792a6
-EBUILD jdom-2.0.6-r5.ebuild 1374 BLAKE2B e317fd9ddda54ad8b1302b2cbdb77b32b8a0be05b0644634b1a00605f5a3b97332735ac6f978d618ef66baca93b684fb357fd97e3f03e7f0ac208467e9513e44 SHA512 64fd4bdb5771f313e2e4a9a8054e092c9f21041fc2c3438e6dff319138533362473f891bfba4f30c6c4dc64db6bc39f6ab42a445a8679bc3d6c25645b62daf16
-MISC metadata.xml 319 BLAKE2B 6c782c87fce5298ecd5e22b1a92556ea712547d51c7bf8df320cc93dc1dee0b38746973bb804dd4fe419c71f1f85b7533d291d60e5426e81175b0ed740d4ca96 SHA512 2852437e9162284cf7ab5cf0738fa79f37b4b15113898a2fd5ef4f68ef3abe564aa85029232a22de261a39672d55d7d3bc471d19d844adb42ee9337b5599c3ec
+EBUILD jdom-2.0.6.1.ebuild 2142 BLAKE2B 1a2adb4054650e2f62173cf6843031da74429b76da6b6390c60e4a873561fd626e572da0e87eed65b9c3d78c6224603b0be8772313db151d55b2190dd9e1ad22 SHA512 8758a72cc650a113ebe7e18155315c183513363aaa1abff4d7ee0d55c181901701ca80625b7b8633ee97057ff111dd850eaf3461800983e972cb082c8caabe55
+MISC metadata.xml 870 BLAKE2B 4f720a44e7f3d2c808e81aeebcdb11963cbdc590d61d9edd4ea5794913096b84ad463726071f66848a26d7a6209c466db4a00253793c08d7fc848fc780da1763 SHA512 516809ec60e2c6763949ddac1cd2cce46a52973c3be148a6153b0941787d4a798699206367ba26e707f1e671a5f851b00281b84b18592b3ece442bc4129aafaf
diff --git a/dev-java/jdom/files/build-xml-2.patch b/dev-java/jdom/files/build-xml-2.patch
deleted file mode 100644
index 420f9eff1993..000000000000
--- a/dev-java/jdom/files/build-xml-2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/build.xml	2015-02-15 02:58:04.000000000 +0000
-+++ b/build.xml	2015-08-27 23:11:09.807800249 +0100
-@@ -267,7 +267,7 @@
- 		</javac>
- 	</target>
- 	
--	<target name="compile" depends="compile.core, compile.junit, compile.contrib, compile.samples"
-+	<target name="compile" depends="compile.core, compile.contrib, compile.samples"
- 	 		description="Compiles all JDOM code (core, samples, junit, contrib)" />
- 
- 	<!-- =================================================================== -->
-@@ -296,7 +296,7 @@
- 	<!-- =================================================================== -->
- 	<!-- Creates the jars                                           -->
- 	<!-- =================================================================== -->
--	<target name="jars" depends="compile, javadoc"
-+	<target name="jars" depends="compile"
- 	    description="Builds the Jars">
- 		<fixcrlf srcdir="." includes="**/*.bat" excludes="build*.*" eol="crlf"/>
- 		<fixcrlf srcdir="." includes="**/*.sh" excludes="build*.*" eol="lf"/>
-@@ -320,6 +320,7 @@
- 			<fileset dir="${contrib.build}" includes="**/*" />
- 			<fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
- 		</jar>
-+<!--
- 		<jar jarfile="${package}/${jarbase}-junit.jar" >
- 			<fileset dir="${junit.build}" includes="**/*" />
- 			<fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
-@@ -332,6 +333,7 @@
- 			<fileset dir="${contrib.src}" includes="**/*" />
- 		</jar>
- 	    	    
-+-->
- 	</target>
- 	
- 	<target name="androidtests" depends="jars">
diff --git a/dev-java/jdom/jdom-2.0.6-r5.ebuild b/dev-java/jdom/jdom-2.0.6-r5.ebuild
deleted file mode 100644
index 772c36da6de7..000000000000
--- a/dev-java/jdom/jdom-2.0.6-r5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="JDOM-${PV}"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-
-LICENSE="Apache-1.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-java/iso-relax:0
-	dev-java/jaxen:1.2
-	dev-java/xalan:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="jars"
-EANT_TEST_TARGET="junit"
-EANT_GENTOO_CLASSPATH="iso-relax,jaxen-1.2,xalan"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/build-xml-2.patch"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-
-	# Remove Android stuff to avoid junit RDEPEND.
-	rm -vr contrib/src/java/org/jdom2/contrib/android || die
-}
-
-src_install() {
-	java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??.jar ${PN}.jar
-	java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??-contrib.jar ${PN}-contrib.jar
-
-	dodoc {CHANGES,COMMITTERS,README,TODO}.txt
-	use doc && java-pkg_dojavadoc build/apidocs
-	use source && java-pkg_dosrc {contrib,core}/src/java/*
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/jdom/jdom-2.0.6.1.ebuild b/dev-java/jdom/jdom-2.0.6.1.ebuild
new file mode 100644
index 000000000000..5cbdaa66520d
--- /dev/null
+++ b/dev-java/jdom/jdom-2.0.6.1.ebuild
@@ -0,0 +1,97 @@
+# 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.jdom:jdom2:2.0.6.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java-based solution for accessing, manipulating, and outputting XML data"
+HOMEPAGE="http://www.jdom.org"
+SRC_URI="https://github.com/hunterhacker/jdom/archive/${PN^^}-${PV}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# FAILURES!!!
+# Tests run: 1887,  Failures: 23
+RESTRICT="test"
+
+CP_DEPEND="
+	dev-java/iso-relax:0
+	dev-java/jaxen:1.2
+	dev-java/xalan:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		dev-java/xerces:2
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/jdom-JDOM-${PV}"
+
+JAVA_TEST_SRC_DIR="test/src/java"
+JAVA_TEST_RESOURCE_DIRS="test/src/resources"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,xerces-2"
+
+src_prepare() {
+	default
+	java-pkg_clean
+
+	# Remove Android stuff to avoid junit RDEPEND.
+	rm -vr contrib/src/java/org/jdom2/contrib/android || die
+
+	# There are resources in JAVA_TEST_SRC_DIR
+	cp -r test/src/{java,resources}/org || die
+	# Remove .java files from JAVA_TEST_RESOURCE_DIRS
+	find test/src/resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed"
+}
+
+src_compile() {
+	JAVA_SRC_DIR="core/src/java"
+	JAVA_JAR_FILENAME="jdom.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":jdom.jar"
+	rm -rf target || die
+
+	JAVA_SRC_DIR="contrib/src/java"
+	JAVA_RESOURCE_DIRS="contrib/src/resources"
+	JAVA_JAR_FILENAME="jdom-contrib.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":jdom-contrib.jar"
+	rm -rf target || die
+
+	if use doc; then
+		JAVA_SRC_DIR=()
+		JAVA_SRC_DIR=(
+			"core/src/java"
+			"contrib/src/java"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg_dojar "jdom.jar"
+	java-pkg_dojar "jdom-contrib.jar"
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+	if use source; then
+		java-pkg_dosrc "core/src/java/*" "contrib/src/java/*"
+	fi
+}
diff --git a/dev-java/jdom/metadata.xml b/dev-java/jdom/metadata.xml
index 129b89aa2cb9..8495676e21fd 100644
--- a/dev-java/jdom/metadata.xml
+++ b/dev-java/jdom/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<remote-id type="github">hunterhacker/jdom</remote-id>
 	</upstream>
+	<longdescription>
+		JDOM is a Java-oriented object model which models XML documents.  It provides a Java-centric means of generating and manipulating XML documents. While JDOM interoperates well with existing standards such as the Simple API for XML (SAX) and the Document Object Model (DOM), it is not an abstraction layer or enhancement to those APIs. Rather, it seeks to provide a robust, light-weight means of reading and writing XML data without the complex and memory-consumptive options that current API offerings provide.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/jempbox/Manifest b/dev-java/jempbox/Manifest
deleted file mode 100644
index 85e5cfb0e29a..000000000000
--- a/dev-java/jempbox/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX jempbox-1.7.1_maven-build.xml 10502 BLAKE2B 041be81aaf3b81969ad26926a3f2eac7b4655c17b3ba925b6ec2b16ddf49bcf7d87fc32655e3e357f274acc16a052afbc8010c6e0fc06f8e51770d68478e2efd SHA512 230436b03ddd8146f6aca41b26f54c0beba208eed9836aaf12e1326de75f226572e473e28c3d313c49a53266d3a827ee62097a49849d1782c546fe9e8bc1d269
-DIST pdfbox-1.7.1-src.zip 9167805 BLAKE2B f9e02d1540eaf7e4bb748906e56887494d81eecc88685fa9d758cb50712a530528573f4a7e5f816b4ff57d664a416b35444517d840c9b37239ec1e2b5a62b5a1 SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0
-EBUILD jempbox-1.7.1-r1.ebuild 879 BLAKE2B cc8af982e8a9870cc9c5dd18be0d497caefbdc99b65eeeffbfe767f4dfd210eb2708e2a23059c8b9da1762a5fc0dba30de5e7cf410c22ce1f3fe50514531c596 SHA512 de17be28ded6bec6b87500a3a67be02787261208330d7e08548b420ea5e6d0b43177102b54bfacbcb47d0adf599ed38fa03e2070dc2fcc88668f8fd8749150c9
-MISC metadata.xml 315 BLAKE2B de9e830a0b7df749781680b1bb238926c941bb74735bca87e3c7f86c3df770a2cf07ca5c02a2f67aabe08d3cd5c63d1dd0cbdd7cbd3ea88af4931dd642f2203f SHA512 35509d678d085949efe654ecd2c3c6f725dee0fe49d2ef0de0ce51bc9720f46c7d79f4440b8f6b677dbdcfe8c98ee37bf2ffe463a78218c7a0af2d0b218afd2a
diff --git a/dev-java/jempbox/files/jempbox-1.7.1_maven-build.xml b/dev-java/jempbox/files/jempbox-1.7.1_maven-build.xml
deleted file mode 100644
index 453f9f69f665..000000000000
--- a/dev-java/jempbox/files/jempbox-1.7.1_maven-build.xml
+++ /dev/null
@@ -1,247 +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 4:32 PM                        -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="jempbox-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="jempbox-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>
-  </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/jempbox/jempbox-1.7.1-r1.ebuild b/dev-java/jempbox/jempbox-1.7.1-r1.ebuild
deleted file mode 100644
index 12e0360d573b..000000000000
--- a/dev-java/jempbox/jempbox-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN=pdfbox
-
-DESCRIPTION="An open source Java library for parsing font files"
-HOMEPAGE="https://pdfbox.apache.org/"
-SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
-
-LICENSE="BSD"
-SLOT="1.7"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.8"
-DEPEND="
-	>=virtual/jdk-1.8
-	app-arch/unzip
-	test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
-
-src_prepare() {
-	default
-
-	cp -v "${FILESDIR}"/${P}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-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/jempbox/metadata.xml b/dev-java/jempbox/metadata.xml
deleted file mode 100644
index 006ce0bbb200..000000000000
--- a/dev-java/jempbox/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">apache/pdfbox</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 7c4b6bc4b1c0..648eb8dfdba8 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,9 +1,12 @@
 AUX jffi-1.2.8-junit-4.11.patch 700 BLAKE2B 4533e3a8d6a5921b1e39ea20c9b4dcbbc66d08a3d0ce2494ed22e5af753f0cbfbc5fa064f19877816e2cc44c666c48aa5a1f8be44fe8dcc7a9368f033acf8828 SHA512 9cc2d41665ec3c2271d6c1c2e66dbfb506922a290e906df51fa66c61c918e1835dcb93313077fac92a8a622f132dfee08cf3b79ebce0be3a4b104c1cbcda5ea9
 AUX jffi-1.2.8-makefile.patch 1451 BLAKE2B bd6ae6ba8f509880e33e603eb98d8a8dca2786c2440bea6cc27c736caaf26170cfb4cd17af83d72d2c09c8ec70e65ef820bc990e9617c14fa5979e9e571e7d19 SHA512 b31031f4039cbd5ff7083321c17e8d5459c56b01c6cc2be3a45b81b2a3ee8f40b1ac0a2bd5df390887fae2026b4c87c1be060d0b01a3b2acf28950f1a06cd253
 AUX jffi-1.3.6-GNUmakefile.patch 740 BLAKE2B baeea64e4fadd0d76aa9d4a38fe48115365a3dd1bb9aecbf4e5c9f676de2e8928896e6423437190ccd01e38fd1a32c254ebd1f6a8965215e957b3b8f973628fb SHA512 315272b6a4762d5df76f5dbaef1a542c6a1808166883b245b85c9813ad665d9e30298693ddf079c10770f7757c75bb7ecd7c6ca73c3bb6444d2597a8a06124e3
+AUX jffi-1.3.8-GNUmakefile.patch 805 BLAKE2B 9c9c1f8daeca9527dd364c303311554004ed6f0b7964bfa68f004bfd6f3aa39fb817d88afc82c4710226c25d752c55c2e43002fe7557d6c7c705a60bf4903543 SHA512 f1ff970c7dd8630a8fcadb1689034a28dd407f3c7efc4df4b6dad2c458da55e71f8b646bed4e11dab089c28c7af0e6eacc067ab68c0ddd856a1102b235cd02b7
 AUX jffi_maven-build.xml 11287 BLAKE2B 01ef4db6fef9d963bd52e0c15317ae836b629d9b22987c2d69a393d5513ab60bf2b062a083bb5b1a04301493c982f3926d5c9225972f7861e4ad668c9fc7a1f1 SHA512 56ebbb915d359f3eacf170d08fc1cf30f6efe900c91df0259a1fb69c6873ae839df829227b55e1538b4435387a82ec3e774180cfb531eb747e05a562aa7b97c7
 DIST jffi-1.2.9.tar.gz 1952668 BLAKE2B 320329b02ee9e93153fc334b73a6216da74ac2d924a64c8a1569f1f1507e1196d0b922f7d158ea91f6bc7164979b2ac12de239adbe98664a3708dd29c8d40f96 SHA512 2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4
 DIST jffi-1.3.6.tar.gz 3187269 BLAKE2B 87a98c752440e336948923e73e2756cb0f88cbb111775f7fcc176152c60a050dad2b8d312bf0e6cda9e499b06fa64f6eda0659a6635010cb2da6ade4471225b9 SHA512 0259e59daa438572e94737efc126ab631be5f92e9ac2bf2bfdcdf92bcf9709ef930d68250b7fcaee3126a97c705c112d02bdfb0a800e8eb3b3f2fde6381f7a9f
+DIST jffi-1.3.9.tar.gz 3193992 BLAKE2B bcd2dba3f9528c293aebb13a8fbd0b2fd7afcbae0cc5fa231f7e8ab190b834adc9e3f40bfc1211d0019a34a9edbaf8810f44b88f3c44b1e3b8065b2b80ccc6dc SHA512 21bf6997c64c0764c1fe86c9ab9b854037241489789f443a3337253ecc95100c94723a57165c85eed7a6c3837b8c04751af4a1fb5873a9c9fcd9a4535b68fc10
 EBUILD jffi-1.2.9-r1.ebuild 3008 BLAKE2B 1a6a1edc45678bdc3f8593a09fe1083988248f1b254b420bc1bed913b49626d6fff2023dbbe3481d7ac572b7bd73132593b9b3e0ef714821f2aaa22de537a0a6 SHA512 b7921f24dec2f0b18a44dbd57eef94deb4cd55d759d62b45f6d3a42004b3e7b82d4531f3a98a983936738d8576451a21ea4f849bcdaf46d945d6bf0747786a41
 EBUILD jffi-1.3.6.ebuild 2454 BLAKE2B 0e988a67b31d18e96b6c0d8f550770c14bcefe22732ad989e567fa39bfc96e06f07d00771fc6228f3d3f0e122c1c06a4ea3d2a5ec45b74ab0b79ba3800ea24f0 SHA512 5314575e00a311389ccd290b20fe73852dd46769777de3278c748d2ec39c79ded428f157b36339273220d503e7ca810c15dfa3661b9ef778550c747a549847fb
+EBUILD jffi-1.3.9.ebuild 2420 BLAKE2B 5e0fb583444f7e19625b477be14590cb546949f26b4d1581348814ed935ff7d8d8644d4b60dcf62a4207500d2fa74de9c8c7703d9729fb201c4179e66e472ef9 SHA512 eb4064384ddbd847632e0b3ac106f54ab9c3e2b13eea72c99c090e077f923707017c6534be8290d4e3e17ef26af343650caed329a6484fc0c9d1cece68bde7c3
 MISC metadata.xml 320 BLAKE2B 4b1ac90322eb9faf01b397b7b4eea9167648abf3a89693a3bb28b27f5015b03c20c3b1b7843509686c8a827be8d4ea37f40fdf6ddaae418eec2dfa3b1797ffae SHA512 0daa4f9c85c906fdbd2fb652257c4d8ff52d88738e8e37e6bed49fdee6bb8aecefcd06e39fbe1262a3a0af73d2e1f4cfc8d0fc56b109bc686975ed41e54a68c9
diff --git a/dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch b/dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch
new file mode 100644
index 000000000000..0e42b385e7b7
--- /dev/null
+++ b/dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch
@@ -0,0 +1,28 @@
+diff --git a/jni/GNUmakefile b/jni/GNUmakefile
+index cfe570a..c8bbb51 100755
+--- a/jni/GNUmakefile
++++ b/jni/GNUmakefile
+@@ -278,7 +278,7 @@ debug:
+ 	@echo "OBJS=$(OBJS)"
+ 
+ $(LIBJFFI):  $(OBJS) $(LIBFFI_LIBS)
+-	$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS)
++	$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS) $(LIBFFI_LIBS)
+ 	$(STRIP) $@
+ ifeq ($(OS), darwin)
+ 	codesign -s - $@
+@@ -287,10 +287,14 @@ endif
+ $(BUILD_DIR)/%.o : $(SRC_DIR)/%.c $(wildcard $(JFFI_SRC_DIR)/*.h)
+ 	@mkdir -p $(@D)
+ 	@$(CCACHE) $(CC) $(CFLAGS) -c $< -o $@
++	mkdir -p $(@D)
++	$(CCACHE) $(CC) $(CFLAGS) -c $< -o $@
+ 
+ $(BUILD_DIR)/%.o : $(SRC_DIR)/%.S $(wildcard $(JFFI_SRC_DIR)/*.h)
+ 	@mkdir -p $(@D)
+ 	@$(CC) $(CFLAGS) -o $@ -c $<
++	mkdir -p $(@D)
++	$(CC) $(CFLAGS) -o $@ -c $<
+ 
+ $(OBJS) : $(LIBFFI)
+ 
diff --git a/dev-java/jffi/jffi-1.3.9.ebuild b/dev-java/jffi/jffi-1.3.9.ebuild
new file mode 100644
index 000000000000..f946f5fb5408
--- /dev/null
+++ b/dev-java/jffi/jffi-1.3.9.ebuild
@@ -0,0 +1,97 @@
+# 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/jnr/jffi/archive/jffi-1.3.9.tar.gz --slot 1.3 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jffi-1.3.9.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.jnr:jffi:1.3.9"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Foreign Function Interface"
+HOMEPAGE="https://github.com/jnr/jffi"
+SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.3"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=( "${FILESDIR}"/jffi-1.3.8-GNUmakefile.patch )
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+# https://github.com/jnr/jffi/blob/b6ad5c066a6346072ea04f8ffa8177204aadcb13/build.xml#L26
+JAVA_TEST_EXTRA_ARGS="-Djffi.library.path=${S}/build/jni -Djffi.boot.library.path=${S}/build/jni"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	default
+	cat > src/main/java/com/kenai/jffi/Version.java <<-EOF
+		package com.kenai.jffi;
+		import java.lang.annotation.Native;
+		public final class Version {
+			private Version() {}
+			@Native
+			public static final int MAJOR = $(ver_cut 1);
+			@Native
+			public static final int MINOR = $(ver_cut 2);
+			@Native
+			public static final int MICRO = $(ver_cut 3);
+		}
+	EOF
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# generate headers
+	mkdir -p build/jni
+	javac -h build/jni -classpath target/classes \
+		${JAVA_SRC_DIR}/com/kenai/jffi/{Foreign,ObjectBuffer,Version}.java \
+		|| die
+
+	#build native library.
+	local args=(
+		SRC_DIR=jni
+		JNI_DIR=jni
+		BUILD_DIR=build/jni
+		VERSION=$(ver_cut 1-2)
+		USE_SYSTEM_LIBFFI=1
+		CCACHE=
+		-f jni/GNUmakefile
+	)
+	emake "${args[@]}"
+}
+
+src_test() {
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+	# https://github.com/jnr/jffi/issues/60
+	LC_ALL=C java-pkg-simple_src_test
+}
+
+src_install() {
+	default
+
+	local libname=".so"
+	java-pkg_doso build/jni/lib${PN}-$(ver_cut 1-2)${libname}
+
+	# must be after _doso to have JAVA_PKG_LIBDEST set
+	cat > boot.properties <<-EOF
+		jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
+	EOF
+	jar -uf ${PN}.jar boot.properties || die
+
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jgraph/Manifest b/dev-java/jgraph/Manifest
deleted file mode 100644
index 094d714a87d7..000000000000
--- a/dev-java/jgraph/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jgraph-5.12.0.4.jar 3460750 BLAKE2B 0d2c50673eb652e4335a2d4fe9edcd93745595302c9ce674e8bb05ceab5edcb6b4a190e4d4da14bdb552ca7d35421473d0931addb02c2d1326d81eb442c372d1 SHA512 0832afeb28c4d5abb9288de4e1b74eefc432bb98f622e71f0d192bf9f01741feb406ba0473b923e0cb93401120c1456a00eec4653355c37bff7e9e1863e81b5d
-EBUILD jgraph-5.12.0.4-r1.ebuild 560 BLAKE2B 9c7a70b78d4aa9272c4436437907958bc372b7d0d2f607d1c5a514fc5ec4b05846b835d0797661ce8f82c8f23844162e72f9ba498a2c73a13382803c0f1428e1 SHA512 307f806e3b697dd8c5d90d62da09a9a1b49fb1ee573cad8f973894ae3f145d8ad26e7fa139cfae9d1f3920b272fba695b5e5bb117c3becbae4c2366820f5e999
-MISC metadata.xml 313 BLAKE2B d0edccd8783f91c67c743d45713b38b66affd63d9ea8a4e80b80109416c67ee4a7a04bcfac5e9d3b11a023c1a9d299d374faad2c06957a908d647275f23295db SHA512 bb4fc36cc6709fd20efce32997dd1074f3657a84ff5a79057a5a7753b0deaba20fb11b28ae76e5fa0cd0d5b8bcae335ad3ea70444d766939e5482d4b9ea346cc
diff --git a/dev-java/jgraph/jgraph-5.12.0.4-r1.ebuild b/dev-java/jgraph/jgraph-5.12.0.4-r1.ebuild
deleted file mode 100644
index 1681ab0b8efb..000000000000
--- a/dev-java/jgraph/jgraph-5.12.0.4-r1.ebuild
+++ /dev/null
@@ -1,35 +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
-
-DESCRIPTION="Open-source graph component for Java"
-SRC_URI="mirror://gentoo/${P}.jar"
-HOMEPAGE="https://www.jgraph.com"
-IUSE="doc examples source"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-DOCS=( README WHATSNEW LICENSE ChangeLog )
-
-S="${WORKDIR}"
-
-JAVA_SRC_DIR="src"
-
-src_prepare() {
-	default
-
-	java-pkg_clean
-}
diff --git a/dev-java/jgraph/metadata.xml b/dev-java/jgraph/metadata.xml
deleted file mode 100644
index 061fc28567ec..000000000000
--- a/dev-java/jgraph/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="sourceforge">jgraph</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/jmh-core/Manifest b/dev-java/jmh-core/Manifest
index 6063b191afeb..3831c59d83a0 100644
--- a/dev-java/jmh-core/Manifest
+++ b/dev-java/jmh-core/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD jmh-core-1.35.ebuild 1052 BLAKE2B 9605dc5b20b3a801467a9e9065ea1941cf1c9cce2ddc6cab46fff0301c7e93719e8120cd1f4d2903ed5f22452ec33b2b68912e5aa544294c5f96d6ecabfe8881 SHA512 ffbd63285086648396792fa1830952ad37b6d21d1acc1ca8ead4ec356612e3db03249291abbf6d228a0fead2188ac537ac2a39d379baddfe66b7d69735edfeda
+EBUILD jmh-core-1.35.ebuild 1048 BLAKE2B fe5eeef561b7008eb0598ba15bc6112b560326dbe7d43f9b8248c7c4e3f47b6297fc3024a3d229fbe406595ba45e228188c3eec8a321265be616b4f998535874 SHA512 dfd5a29d3dfee9ff404ecaa50860c5177a0e63686d37f2266afdb71800e3716f36bd6102f535d4812d7edbd25b2f08b072cd1aeb3f0e4130e8c683b1fd6deb68
 MISC metadata.xml 313 BLAKE2B d22d56f0a50e92707442c4105b6a15c5764d0827de13960a704e77a5601bdcbb3877259076bee09b89fe30aade126100f10f380384ef6f21519edfe652bc2f6d SHA512 db6dff306be1338649d63b17d05c25b758a8ab2fc33c2604996999b2f2b239b65b140ff5f9f68f64c15af9aa457cfc1a33aa511e7e16d96bf1f01a6c5b524cb9
diff --git a/dev-java/jmh-core/jmh-core-1.21.ebuild b/dev-java/jmh-core/jmh-core-1.21.ebuild
deleted file mode 100644
index 8d9d4c30c7d3..000000000000
--- a/dev-java/jmh-core/jmh-core-1.21.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Hash of tag, download not available via ${PV}
-MY_PN="jmh"
-MY_PV="f25ae8584db1"
-
-JAVA_PKG_IUSE="doc source"
-
-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://hg.openjdk.java.net/code-tools/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# jopt *must* be 4.6, see https://mail.openjdk.java.net/pipermail/jmh-dev/2016-October/002395.html
-CP_DEPEND="
-	dev-java/asm:4
-	dev-java/junit:4
-	dev-java/commons-math:3
-	dev-java/jopt-simple:4.6"
-
-DEPEND=">=virtual/jdk-1.7
-	${CP_DEPEND}"
-
-RDEPEND=">=virtual/jre-1.7
-	${CP_DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}/${PN}"
diff --git a/dev-java/jmh-core/jmh-core-1.35.ebuild b/dev-java/jmh-core/jmh-core-1.35.ebuild
index 0b99465b0067..6d518ed16c03 100644
--- a/dev-java/jmh-core/jmh-core-1.35.ebuild
+++ b/dev-java/jmh-core/jmh-core-1.35.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CP_DEPEND="
 	dev-java/commons-math:3
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 64a099a6d195..1f968935aea8 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,10 +1,8 @@
-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
-DIST jna-4.2.2.tar.gz 58638853 BLAKE2B 3941202ad7839f748c65f1abf53a335f6de7959def06de27a30520457147af3f70f6de54d640718b8314f6e61ab61ee9b26c39812d5cb1f918b8ff714d6b902e SHA512 11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f
+AUX 5.11.0-makefile-flags.patch 1183 BLAKE2B 81c465ed4929586787bfa68016a8fe61cf082a8a5e59f5905b3bfae4900f68246cf3ad9c023ba7390c4bed4e38b109d4664e6a4f9759c8247714a65c72a0b357 SHA512 cb71b1af9af8b34d2ec8253ee7543614474527b0bc69ce9ee70e89a8738d423e45928f477de659bf141aad8b0401067fbbc58b50b580077afca40b32e0aa8db4
 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 2463 BLAKE2B e7d4f12b13feb036bc0b17613e74a87273c1872f9690e0aa8420e9f622e4153f920760d7a4257e11d6426d49717e4e72ba09a9c4af3b9ff5bc4bdaa14b394da1 SHA512 6d6288af5598eae79640ee0c2872f876046ca180fb24878898663b1f58619c609fc28fa93c3032fe30646b9739c666c5c0cbe9881326cfc0c95c016929da45e9
-EBUILD jna-5.11.0.ebuild 2464 BLAKE2B cafa1c0301a3c5e0135ae0b521f7e762547d2152ef28cac0573e2d66216893839402cc2bba2a8805ecaa75a12682ff2f83f7407f70ff7147e62ead149d36962b SHA512 33f2bcced4969921bf9d02df5d02412376678ec2a49c21379fc9cc48aca8f768b5d0ff4f4ae2a1cd57cf42a8335f5825c4e98edaebd962bd71e8527e9f75e16e
-MISC metadata.xml 463 BLAKE2B 9ead7422212fdd6bebd8ec6aabafcdedf0d32420d312a8a0f2cd701dc7eeb940a30e91d1dc0449899a6134e1cb96d47cf95cea5dc20b4974b3d8714c6c00f93b SHA512 1365756d0d98cd7e7bcee2a608a77f1ca95c9546567a0bb37ba0033eb997ef6ae37d86e79c7c7fdc0916cb515658f9a37924181efc3215d00c825b10f9f99b45
+EBUILD jna-5.10.0.ebuild 2459 BLAKE2B 86b61d92ab01caeb641565650fff5e9024ef39f163fccbcbdf2f167b6bb198e952ab21f2650031f85c9ca7436f7a3690a28d28957c58547c080eac12fd235d64 SHA512 408ef249df31976f88baf7ff7222796a402c0ed94154b280eb3c5333b8deee30fe4c22709e2bdbffa3b40e3196ea8b6c39c547fc76ae16c489caefcc2734766f
+EBUILD jna-5.11.0.ebuild 2490 BLAKE2B c97633d35bcaa3de72948587a4b56fea5a92a691428f20ba52da2a5111f36f4788e3a55c96b7b06df0c2445e0e34b005505229bfddfdf5d1ef02ccbb8e8b6a31 SHA512 2ed6e9dfeb73b9acc059597a28f59f03c3a93d70a35ee206c5a57c7c987c26c7d1889ea112b6c5d4bc7a0017e2ac6d145abb785aef98825b1b40f184a69ebc0d
+MISC metadata.xml 321 BLAKE2B c39a2036ee429d7d2dd70a9481ae84e86dd94d428be06668800b57a32910af90019d644276fb3466ab7ae5ec5a53ab6599ba8e16770ffad5d10730df6926f326 SHA512 aa6b45e487d69fda26d85ad22900da9085aaa3c1fac1b7c2b0ce22199f35d833640a3d9513dc8efc6ae49b6c00f42a3581ca325e67b3e14e8a72742799addece
diff --git a/dev-java/jna/files/4.2.2-build.xml.patch b/dev-java/jna/files/4.2.2-build.xml.patch
deleted file mode 100644
index de49c24b1912..000000000000
--- a/dev-java/jna/files/4.2.2-build.xml.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/build.xml	2016-03-16 14:37:28.000000000 +0000
-+++ b/build.xml	2016-04-16 22:22:27.692967205 +0100
-@@ -320,7 +320,9 @@
-       <pathelement path="${build}/${jar}"/>
-       <pathelement path="${test.classes}"/>
-       <pathelement path="${build}/${testjar}"/>
-+      <!--
-       <pathelement path="lib/clover.jar"/>
-+      -->
-       <path refid="test.libs"/>
-     </path>
-   </target>
-@@ -909,8 +911,10 @@
-     <mkdir dir="${build}/jws"/>
-     <copy todir="${build}/jws" file="${build}/${jar}"/>
-     <copy todir="${build}/jws" file="${build}/${testjar}"/>
-+    <!--
-     <copy todir="${build}/jws" file="lib/junit.jar"/>
-     <copy todir="${build}/jws" file="lib/clover.jar"/>
-+    -->
-     <jar jarfile="${build}/jws/jnidispatch.jar">
-       <fileset dir="${build.native}" includes="*jnidispatch.*"/>
-     </jar>
diff --git a/dev-java/jna/files/5.11.0-makefile-flags.patch b/dev-java/jna/files/5.11.0-makefile-flags.patch
new file mode 100644
index 000000000000..4a84abebf45d
--- /dev/null
+++ b/dev-java/jna/files/5.11.0-makefile-flags.patch
@@ -0,0 +1,34 @@
+--- a/native/Makefile
++++ b/native/Makefile
+@@ -81,7 +81,7 @@ LIBPFX=lib
+ LIBSFX=.so
+ ARSFX=.a
+ JNISFX=$(LIBSFX)
+-CC=gcc
++CC?=gcc
+ LD=$(CC)
+ LIBS=
+ # Default to Sun recommendations for JNI compilation
+@@ -94,10 +94,10 @@ CFLAGS_EXTRA=
+ COUT=-o $@
+ CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include
+ CDEFINES=-D_REENTRANT
+-PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses
+-CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
++PCFLAGS=-Wall -Wno-unused -Wno-parentheses
++CFLAGS+= $(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
+        -DJNA_JNI_VERSION='"$(JNA_JNI_VERSION)"' -DCHECKSUM='"$(CHECKSUM)"'
+-LDFLAGS=-o $@ -shared
++LDFLAGS+= -o $@ -shared
+ ifeq ($(DYNAMIC_LIBFFI),true)
+ CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo)
+ LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi)
+@@ -108,7 +108,7 @@ endif
+ # Avoid bug in X11-based 1.5/1.6 VMs; dynamically load instead of linking
+ # See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6539705
+ #LIBS=-L"$(LIBDIR)" -ljawt
+-STRIP=strip -x
++STRIP?=strip -x
+ # end defaults
+ 
+ # Android build (cross-compile) requires the android NDK.
diff --git a/dev-java/jna/jna-4.2.2-r3.ebuild b/dev-java/jna/jna-4.2.2-r3.ebuild
deleted file mode 100644
index 2950dfd0edbf..000000000000
--- a/dev-java/jna/jna-4.2.2-r3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="net.java.dev.jna:jna:4.2.2"
-
-inherit java-pkg-2 java-ant-2 toolchain-funcs
-
-DESCRIPTION="Java Native Access (JNA)"
-HOMEPAGE="https://github.com/java-native-access/jna"
-SRC_URI="https://github.com/java-native-access/jna/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="4"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="+awt +nio-buffers test"
-
-REQUIRED_USE="test? ( awt nio-buffers )"
-
-# The tests stall immediately on some systems (not current stable?) when
-# the sandbox is active but pass successfully otherwise. Chewi has not
-# been able to determine why. This began in 4.2.0 as 4.1.0 worked
-# fine. Someone bisect it please. :)
-RESTRICT="test"
-
-CDEPEND="dev-libs/libffi:="
-DEPEND="${CDEPEND}
-	virtual/jdk:1.8
-	x11-libs/libXt
-	test? (
-		dev-java/ant-junit:0
-		dev-java/guava:20
-		dev-java/javassist:3
-		dev-java/reflections:0
-	)"
-RDEPEND="${CDEPEND}
-	virtual/jre:1.8"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-build.xml.patch
-	"${FILESDIR}"/${PV}-makefile-flags.patch
-)
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="native jar contrib-jars"
-EANT_EXTRA_ARGS="-Ddynlink.native=true"
-EANT_TEST_EXTRA_ARGS="-Dheadless=true -Djava.io.tmpdir=${T}"
-EANT_TEST_GENTOO_CLASSPATH="guava-20,javassist-3,reflections"
-
-src_prepare() {
-	default
-
-	# delete bundled jars and copy of libffi
-	# except native jars because build.xml needs them all
-	find ! -path "./lib/native/*" -name "*.jar" -delete || die
-	rm -r native/libffi || die
-
-	if ! use awt ; then
-		sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_JAWT/g" native/Makefile || die
-	fi
-
-	if ! use nio-buffers ; then
-		sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_NIO_BUFFERS/g" native/Makefile || die
-	fi
-
-	java-pkg-2_src_prepare
-}
-
-src_configure() {
-	tc-export CC
-}
-
-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
-
-	use source && java-pkg_dosrc src/*
-	use doc && java-pkg_dojavadoc doc/javadoc
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
index 1d15c940f056..4e08475cbb53 100644
--- a/dev-java/jna/jna-5.10.0.ebuild
+++ b/dev-java/jna/jna-5.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/java-native-access/jna/archive/refs/tags/${PV}.tar.g
 
 LICENSE="|| ( Apache-2.0 LGPL-2.1+ )"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 BDEPEND="
 	virtual/pkgconfig
diff --git a/dev-java/jna/jna-5.11.0.ebuild b/dev-java/jna/jna-5.11.0.ebuild
index be8f367f117d..44173ced3c04 100644
--- a/dev-java/jna/jna-5.11.0.ebuild
+++ b/dev-java/jna/jna-5.11.0.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 DOCS=( README.md CHANGES.md OTHERS TODO )
 PATCHES=(
 	"${FILESDIR}/5.10.0-build.xml.patch"
-	"${FILESDIR}/4.2.2-makefile-flags.patch"
+	"${FILESDIR}/5.11.0-makefile-flags.patch"
 )
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
@@ -65,7 +65,7 @@ pkg_setup() {
 	# 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)'"
+	ANT_OPTS="-DCC='$(tc-getCC)' -DSTRIP='$(tc-getSTRIP)'"
 	# Parallel build does not respect dependency relationships between objects
 	ANT_OPTS+=" -DEXTRA_MAKE_OPTS='${MAKEOPTS} -j1'"
 }
diff --git a/dev-java/jna/metadata.xml b/dev-java/jna/metadata.xml
index 6a68a977dd25..3966f68718c9 100644
--- a/dev-java/jna/metadata.xml
+++ b/dev-java/jna/metadata.xml
@@ -5,10 +5,6 @@
     <email>java@gentoo.org</email>
     <name>Java</name>
   </maintainer>
-  <use>
-    <flag name="awt">Enables support for Java AWT</flag>
-    <flag name="nio-buffers">Enables support for NIO buffers</flag>
-  </use>
   <upstream>
     <remote-id type="github">twall/jna</remote-id>
   </upstream>
diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest
index fd3489644c1e..785c93b3dc1d 100644
--- a/dev-java/jnr-ffi/Manifest
+++ b/dev-java/jnr-ffi/Manifest
@@ -1,7 +1,9 @@
 AUX jnr-ffi-2.0.2-junit48.patch 467 BLAKE2B 1f1e76e18f425e1a38dfc0b1788239329a58fb9944958045877115d375c65437660a2fa114cec2bbc3ad3b74b94d38a6b34d6ea142ec0aa12f9ba88638d14894 SHA512 e7b5bb64d65b432a028fa709e4e050feccd4f3023fa6d940f89a2ef67f489f8eeb6dfb87c08eb056f47f4a5019c875225013ca559eb065cca105d54f51b5e884
 AUX jnr-ffi_maven-build.xml 11211 BLAKE2B 94c92f033d7cb90db11123846cffb1e7532d197eaa739cac6da256159fe030c1d90d57e991a292d9f1511e57800a37d6791037afd72349529e045a6db6572c1b SHA512 612b793b664b71e1a1b924aabe2da16c6b0b70947640b3d5b6d6994ffecfd7c0b30991b3a2bb711130052870dd63b9d41f43a54221e52017510119c5d3e4f359
 DIST jnr-ffi-2.0.2.tar.gz 170707 BLAKE2B fc4f1dcea51939b6098b980b4962380e58ba590ea9d4cdba7823c1372bd645d985ae25d8ebf1f0b575a0e4b5c192e5595094076d3cd44e4bb3c077dd838c170f SHA512 80a932408f5ceaf19fd7a399b786aa0d7b9251ea144bc2755bcf3cdc3aea85615a1faa001bbcd3072bc0eead2aaa30d0bbead5f96c82c4b9e455c1ed1379b4c0
+DIST jnr-ffi-2.2.12.tar.gz 285324 BLAKE2B 32e866654b901ded7cdc82999d79873d49bd9d3599d265e9d029e7cf8ce1895f9e830a1af75b8c149c3debc5f3d256f6241d706ecbd94277ce1fa49a2868885c SHA512 420adb647c5d0547f0b18e4f8a21096da9aaebbdf0e50761ec1fd6be64ad29649c7af4d6daf0a8c4c38e02a05e0df836de6fdb7776f10c02d8bfd447a11882b3
 DIST jnr-ffi-2.2.8-sources.tar.gz 261959 BLAKE2B 16f7b89c88a61fa07da65d4e5287258f96550b93898bb7313ddd62d1f002276da86aca2c79874eccb466eaebcad5181ff33539996a6558b6d79ce9280cf9c0a9 SHA512 15187d90f15ad82cb6cac0617806ab7d0322bfcb4f44523f2272f93f19ec115625806c9d450bffaa57db32c70906328c8edc905046465b0ec3eb6ff52e500b42
 EBUILD jnr-ffi-2.0.2-r1.ebuild 1479 BLAKE2B 10de36e96180e2943bcf200bc49961c5258cb7dabcaf1536e79bdb2c0c5f58cc023d0c09e591746c889fc86e012c1337ef8a66c6ee8c181e1415a30ebc8869c0 SHA512 0d18e65d626dbcdd69c6f47d21e7505112e3ff98633137c3035d6e5e32536a5a36aed2a333a1f3d34e7da58b4f0e6a2225a6d7f88c3c58a23640170f4a48c9c3
+EBUILD jnr-ffi-2.2.12.ebuild 1197 BLAKE2B 676089352b579fd664b31e342e40d19fb8cffe9be91402e3927668193bdd5798011900b3e82802fd0822614df498365cd12b8984e78ae0326774a08a5ea07317 SHA512 08c4411c3eef1430739ed22e79ae1180a448b22781a9fcb8aa96da8b45ee4fe4f48deb39111f08913fa3e44cfd19c545800e740c1791865e05607430f9cdf8c1
 EBUILD jnr-ffi-2.2.8.ebuild 2061 BLAKE2B dfe1bbdfe2a63a55194bb6352c7de05806ce619ea534d5df55a2bdad30a671a15d366937805f02d4c45a488415621d56276381cd6e6a21173ab0b020a2b288e2 SHA512 ad64a7f90f45a157c9e42eeb6ce4d27a58570354cd1b7dcf92cb4e510390911f67b0014ac0af3ee7653e584ef9b64bbdf265d5cd64ab3f45c54b47305739285d
 MISC metadata.xml 323 BLAKE2B 377b6cae0335bb1d1160c22d684541576023a02984183c468689418ea3a1b2c6520a95ec7d18e86ea1b6c426d44d40bf6debea926c03c9c321d82dfc8874ee6e SHA512 f7503b3bbfc40eeda0e00cacd5a84723f17fdae5657594b8f44c9b7e7e059b6eeb23d034baab20aaeb554e35721a73ad1c0cac30aa67845a4e842f30348b79d6
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
new file mode 100644
index 000000000000..97e586145250
--- /dev/null
+++ b/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
@@ -0,0 +1,47 @@
+# 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/jnr/jnr-ffi/archive/jnr-ffi-2.2.12.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jnr-ffi-2.2.12.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.github.jnr:jnr-ffi:2.2.12"
+# We don't have junit-jupiter yet
+# JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A library for invoking native functions from java"
+HOMEPAGE="https://github.com/jnr/jnr-ffi"
+SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/asm:9
+	>=dev-java/jffi-1.3.8:1.3
+	dev-java/jnr-a64asm:2
+	dev-java/jnr-x86asm:1.0
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!"
+# JAVA_TEST_SRC_DIR="src/test/java"
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jnr-netdb/Manifest b/dev-java/jnr-netdb/Manifest
index 25701e3af5ad..6779501195f7 100644
--- a/dev-java/jnr-netdb/Manifest
+++ b/dev-java/jnr-netdb/Manifest
@@ -1,4 +1,6 @@
 AUX jnr-netdb_maven-build.xml 9637 BLAKE2B 0ee947467fc1c8e07d2b98fb29a70de5244e4a92895018f8eb4860413a2c96ab6d5599f1eb39a45f4c43a09e1d6d0c7c1737416f7afbd205d397da17a257d3e5 SHA512 befe514fd332f5eb6495404b0f0d8edc428be34a1745b16dd2a20d2b859d251670e549036099884a810e3b5da0c6a4d311b6b0691409cae1b6c14d20ee763d24
 DIST jnr-netdb-1.1.4.tar.gz 648347 BLAKE2B 08953f93fe4a6146dfc77c463e07a8b9f6e784ffc26165d7409a623756733a7598b4d0a3fa55302b5f9b01c870cee3062f310c74e20f6a8a11ff1b41d38a0d7a SHA512 949a744b1d443cde564a2582baf7b4323c721417f32a45fd7413f791823cac5877bef62ed0d3079345631b908a581a1acf83dd00a926f87ebbd8e61d38a20195
+DIST jnr-netdb-1.2.0.tar.gz 649059 BLAKE2B 660074d3a0d201784bddb259796ee4bb87a3579d6ffffcb5c3bf171d34e525c768c8c9282d8a99c250282d108011c0cf4bc9b8cf32dc7f3edc7e0a2b1cbaf9d4 SHA512 6eeb21d42b1eb7c0beed4f263c3440c7e5ae15f76365fb189fc8727c824e01d92662564ae641e1233ec0df68f6761c3c31a8a61891de59a524c213959bd32856
 EBUILD jnr-netdb-1.1.4-r1.ebuild 1150 BLAKE2B 6b00dfe46c10602181bfeebd86b05cc1b0846f4c56703585c2e815be7d10cce09f3b8ded293f5cb9438164b846db13db993b9cc04a63b697f46b2a8f435f060a SHA512 af5c04260d6bcf0aac9e4f236c3b2a5bab0dbb457f12abee4c5f009c8545ba7104b6c8561daa6ac885c6b84527e43faa042791a2099f6fb0fabc8fa50fc8ac10
+EBUILD jnr-netdb-1.2.0.ebuild 851 BLAKE2B 6640a026fe39372853e6b173d557f44caa9c0e6795da16d552ed769fc64a242928926596bf673d769d83de5ede240ee3c5fd66d10bba6edf7dc8e4600b3c3b2d SHA512 d441f417d72d94760fd9c21d46edd3caaf766aebd45979fbfa27fa16447d4fa17844f5d7877b148941452ee0f49d147dfa72f3b4b637aac765c8ff3a25a996bf
 MISC metadata.xml 662 BLAKE2B 64087950d504c3f16ef8466aaae35c567e2fdb1547346e99e537dd9ac1535c4ad209af80425993dce4a52287ad9960dfac6dbc923faa66e5ebc3328b9ccaae70 SHA512 458c722c132eb5b69a970dffe25ab6bc3e71f7d9fc77639d5b46dcb37aff851a2cffed0a62fdce6ce2192fb3da52d6781597367fb95d1fd794935a4e469b86f6
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild
new file mode 100644
index 000000000000..e45ee7a9304b
--- /dev/null
+++ b/dev-java/jnr-netdb/jnr-netdb-1.2.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"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Network services database access for java"
+HOMEPAGE="https://github.com/jnr/jnr-netdb"
+SRC_URI="https://github.com/jnr/jnr-netdb/archive/jnr-netdb-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/jnr-ffi:2"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest
index 29451d3945c3..e34cf0da5d5c 100644
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@@ -1,4 +1,7 @@
+AUX jnr-posix-3.1.15-FileTest.patch 1520 BLAKE2B 7c9fc379977e98b01e2978f8e185942ce10d1641b7a58fac1d88ea9b3267c693ce5271da4584c2bd17805733060e408c89c98fd50d5a323071be36ad6f5a8507 SHA512 75e8fbaf976b5b548647b00502464b994c5f49929ccd767bb136d47f78eea0e4c7cde06f94b9e7ba86aad9334ee2d975a32e34ef4f332fbd2697b121566ea5b7
 AUX jnr-posix_maven-build.xml 11760 BLAKE2B ec75beb884ccb81dc28c38db22e64953a6f536726105e2fec5cd38f7be2286091054026d6cf77471d03f5095c44087d8f7fe9d3065d31df26b018988a843fe39 SHA512 ab3f6b00e08cd7fff5f44df1c2a0eb9e73d3ad7400e6e708dcd1432b6ad122bfb0b8dac6417eb67a02d0fc2d19477d81287d2b202275676826081610d3e27d8e
 DIST jnr-posix-3.0.10.tar.gz 85912 BLAKE2B b87ff78ccf10718bd1faf9e308421ba3ab5e90dee5e244fb1b7f53592da8ad98973cc50e6469bcea59e1202ee82b3f77522eb95e23584ff70cc66099ef1c4266 SHA512 a282c164b0b9ace8aba508a48d08d53beb0ddcd4baf5389412941a1e1430d75df9bdd35935a6982d4bb1910c0fdad55910ba028b1b5388c55e19a6c4ed2ba6a1
+DIST jnr-posix-3.1.15.tar.gz 120573 BLAKE2B 8035308440e444876d8d955ec3dd0b9d41f770436b53f964795a183ed7bd676dda8787c37425c488af2aa0accc948b86d1773e7e97ee5bcdaf209383dfda24a6 SHA512 6c8cd6d43c509ef7c16901d02983b823464b3437019233021398b2a9dfc85923db87c585e2f8248f080447a990e308feff25bbbf2a7261019dcae66c22e14a91
 EBUILD jnr-posix-3.0.10-r1.ebuild 1295 BLAKE2B f9ad7d57774afd7dfba2f22a774d2539332e474a85ffb0f601ba734127fb99644ea1e1912f245707d9b5d5e432d46d241d175f4fde7e9b168dc2f74b21aa52f8 SHA512 1ac23f843d6a1d3c5520fa464f6284573403e8b361eddb29647a81a938cc22e602508c1f04dc2a887042f99f0b0f8d21c1c4776c3dc14fcc25b306cfee296494
+EBUILD jnr-posix-3.1.15.ebuild 1928 BLAKE2B 3dd5624b4ec8060b6e2c3110fa92336a0bc97fdb656442672c964e55919114194d86d521bec62889f0ef821ba5e5694c0c99373ab6a010a7a253c3a1954c9dd3 SHA512 345f9c78d85c2f8bb4cea31d043a931371c3018b9df7a67ea7c695ae6e88ed80b00a6642c1803f382beb6524ff3c66ca014e2c7f26fa01f5743b8734d158ae26
 MISC metadata.xml 325 BLAKE2B f40ca825a92205c1ef0e0be2e72c859b680593c0f852aec73c3d84356a9927f5f536ffcec7b7a365353ac56489677d7881f9f27431abc56cdf9cc24550493097 SHA512 ff2bae0526d5ae082ad290411e7d3cd95a197918e4d834a531cab016ff9a718197a27fb2c7a4f7426bb44a5b295e164a72dd36f5fac800bc20388fde0f52e0a4
diff --git a/dev-java/jnr-posix/files/jnr-posix-3.1.15-FileTest.patch b/dev-java/jnr-posix/files/jnr-posix-3.1.15-FileTest.patch
new file mode 100644
index 000000000000..eba2a6fc450a
--- /dev/null
+++ b/dev-java/jnr-posix/files/jnr-posix-3.1.15-FileTest.patch
@@ -0,0 +1,48 @@
+diff --git a/src/test/java/jnr/posix/FileTest.java b/src/test/java/jnr/posix/FileTest.java
+index afadb07..7eb8af7 100644
+--- a/src/test/java/jnr/posix/FileTest.java
++++ b/src/test/java/jnr/posix/FileTest.java
+@@ -8,6 +8,7 @@ import jnr.ffi.Pointer;
+ import jnr.posix.util.Platform;
+ import org.junit.BeforeClass;
+ import org.junit.Test;
++import org.junit.Ignore;
+ 
+ import java.io.*;
+ import java.nio.ByteBuffer;
+@@ -215,7 +216,7 @@ public class FileTest {
+         dir.delete();
+     }
+     
+-    @Test
++    @Ignore @Test
+     public void flockTest() throws Throwable {
+         if (!Platform.IS_WINDOWS) {
+             File tmp = File.createTempFile("flockTest", "tmp");
+@@ -236,7 +237,7 @@ public class FileTest {
+         }
+     }
+ 
+-    @Test
++    @Ignore @Test
+     public void dupTest() throws Throwable {
+         File tmp = File.createTempFile("dupTest", "tmp");
+         RandomAccessFile raf = new RandomAccessFile(tmp, "rw");
+@@ -303,7 +304,7 @@ public class FileTest {
+         }
+     }
+ 
+-    @Test
++    @Ignore @Test
+     public void fcntlDupfdWithArgTest() throws Throwable {
+         if (!Platform.IS_WINDOWS) {
+             File tmp = File.createTempFile("dupTest", "tmp");
+@@ -327,7 +328,7 @@ public class FileTest {
+         }
+     }
+ 
+-    @Test
++    @Ignore @Test
+     public void closeTest() throws Throwable {
+         File tmp = File.createTempFile("closeTest", "tmp");
+         int fd = getFdFromDescriptor(JavaLibCHelper.getDescriptorFromChannel(new RandomAccessFile(tmp, "rw").getChannel()));
diff --git a/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild b/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild
new file mode 100644
index 000000000000..5e4a34bbddea
--- /dev/null
+++ b/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild
@@ -0,0 +1,65 @@
+# 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/jnr/jnr-posix/archive/jnr-posix-3.1.15.tar.gz --slot 3.0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jnr-posix-3.1.15.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.jnr:jnr-posix:3.1.15"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Common cross-project/cross-platform POSIX APIs"
+HOMEPAGE="https://github.com/jnr/jnr-posix"
+SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
+
+LICENSE="EPL-2.0 GPL-2 LGPL-2.1"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	>=dev-java/jnr-ffi-2.2.12:2
+	dev-java/jnr-constants:0
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-11:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+	JAVA_TEST_EXCLUDES=(
+		# https://github.com/jnr/jnr-posix/blob/jnr-posix-3.1.15/pom.xml#L185
+		# <exclude>**/windows/*Test.java</exclude>
+		"jnr.posix.windows.WindowsFileTest"
+		"jnr.posix.windows.WindowsHelpersTest"
+		# Next 3 tests need to run separately, otherwise would fail.
+		"jnr.posix.GroupTest"
+		"jnr.posix.NlLanginfoTest"
+		"jnr.posix.SpawnTest"
+	)
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if [[ "${vm_version}" -ge "17" ]] ; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+		# Some tests in jnr.posix.FileTest fail with jdk-17
+		eapply "${FILESDIR}/jnr-posix-3.1.15-FileTest.patch"
+	fi
+	java-pkg-simple_src_test
+	JAVA_TEST_RUN_ONLY="jnr.posix.SpawnTest"
+	java-pkg-simple_src_test
+	JAVA_TEST_RUN_ONLY="jnr.posix.NlLanginfoTest"
+	java-pkg-simple_src_test
+	JAVA_TEST_RUN_ONLY="jnr.posix.GroupTest"
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/jopt-simple/Manifest b/dev-java/jopt-simple/Manifest
index 430c5ef2866d..e524fdac08b4 100644
--- a/dev-java/jopt-simple/Manifest
+++ b/dev-java/jopt-simple/Manifest
@@ -1,6 +1,5 @@
-DIST jopt-simple-4.6.tar.gz 107082 BLAKE2B 622144647b24049861398cc99ca3cc268baae045f8ca23cdd5bddb2e656bc97d17397ae752ca9a6edc91b8486e1e55ce19ba335d2afadf6c6df4f858faf43a1e SHA512 c2f467521f6419f91206f6036d420671b02106beadff3fc51d1893e6f3f6302b8fcbb31957327b9e40cbfd7a7d55030e0c999d9570d7e29fe7a4375bab10ed76
+DIST jopt-simple-5.0.4.tar.gz 120388 BLAKE2B b9eec360f9399a40fa8fe33f14708c14a45689eb78efcdf99f27d666168d67f2670b4aa5bd6e7f26ddff72565107f1359214c808281918947d66874bde237b86 SHA512 ae4274bb4b3e2584dc6fb4370c4d63f9b95e63ff2cd124f92f8ad6e3a4a3dd91cd9e9b70ac423a560d52039508549a5319bb23035215b4a191c4fdc0f0e082d5
 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
+EBUILD jopt-simple-5.0-r1.ebuild 670 BLAKE2B 8318f5e1197a08f46ab18b595a8c6c793a3904fc429fd57591b276475260670109d6aa6e9adbdff3b08c3a8f21bce0e183e8a892074136c8e491afdcb51be64f SHA512 920c41331bf2881a1fc422c835797e49008195442b1909a768895e436442041d917fde26548f6cec64972de3e581a54e5ad3ac5c8ec419b8d212a94074a6d99c
+EBUILD jopt-simple-5.0.4.ebuild 665 BLAKE2B cc79f672c7b3516da09dacd7590f2b2bf98237ed379aef54f2dcbdc13ec781d0cde92b901d3ced9b4232a41da1aa26c634a0f0f5981279d3e3b42da27a7fe47b SHA512 3ae65a4f809c4034477ed826ba1281acce209fd40482ee794b53c02dfa09c461aec24b63e106819ed4d9d38985c3e49dee7f0cb82f1516781404fabe63721d15
+MISC metadata.xml 325 BLAKE2B 361e959a1e7ec6eaa2473534dfcfee9d2372b74fa7573ccceac813d161fff0117020c340f67f86af9387bf874878376b5fc10262c78efc382e8d558e5cf80f65 SHA512 e786dcf5cd44b2472a2e68baf7a077cf65a4bfe003ce959ed50262a47a1a02e1b929fcf690f968ab22b88e8032ff50c391df61b6b45c84c0b738918f7a139a52
diff --git a/dev-java/jopt-simple/jopt-simple-5.0-r1.ebuild b/dev-java/jopt-simple/jopt-simple-5.0-r1.ebuild
index 62a6e8d2b8bd..71f7f89dab11 100644
--- a/dev-java/jopt-simple/jopt-simple-5.0-r1.ebuild
+++ b/dev-java/jopt-simple/jopt-simple-5.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jopt-simple/jopt-simple/archive/jopt-simple-${PV}.ta
 LICENSE="MIT"
 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/jopt-simple/jopt-simple-4.6-r1.ebuild b/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild
index 131323ebb6b1..f6331ef9f35c 100644
--- a/dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild
+++ b/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild
@@ -9,15 +9,22 @@ 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/refs/tags/jopt-simple-${PV}.tar.gz"
+SRC_URI="https://github.com/jopt-simple/jopt-simple/archive/jopt-simple-${PV}.tar.gz"
 
 LICENSE="MIT"
-SLOT="4.6"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
 
+S="${WORKDIR}/${PN}-${P}"
+
 JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
 
-S="${WORKDIR}/${PN}-${PN}-8808a39"
+src_install() {
+	einstalldocs
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jopt-simple/jopt-simple-5.0.ebuild b/dev-java/jopt-simple/jopt-simple-5.0.ebuild
deleted file mode 100644
index 763a855732f2..000000000000
--- a/dev-java/jopt-simple/jopt-simple-5.0.ebuild
+++ /dev/null
@@ -1,33 +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"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java library for parsing command line options"
-HOMEPAGE="https://pholser.github.com/jopt-simple"
-SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="amd64 ppc64 x86"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8"
-
-S="${WORKDIR}/${PN}-${PN}-01719a6"
-
-JAVA_SRC_DIR="src/main/java"
-
-src_prepare() {
-	default
-	rm -v pom.xml || die
-}
-
-src_install() {
-	einstalldocs
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jopt-simple/metadata.xml b/dev-java/jopt-simple/metadata.xml
index 40ac5a240070..eede771ba474 100644
--- a/dev-java/jopt-simple/metadata.xml
+++ b/dev-java/jopt-simple/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">pholser/jopt-simple</remote-id>
+		<remote-id type="github">jopt-simple/jopt-simple</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jsr250/Manifest b/dev-java/jsr250/Manifest
deleted file mode 100644
index 27d226eea0cc..000000000000
--- a/dev-java/jsr250/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jsr250-1.2.jar 42311 BLAKE2B 9b5868fcbee673b1c3a535e8cd28c7b8896be087906a0db37f4a6d585ce6d1bb7be6d028adfc0e233c28581960a59ed8da18960c21053410a74c4af11ced66a6 SHA512 bf6e816958a74009e6aa13d03530c1ee4520ac756305544958669bd6fd0fd1de0ec036855260dea9c7a3f86a10f88a866a7cd1d86a52856097d1f1ea3ec92d63
-EBUILD jsr250-1.2.ebuild 541 BLAKE2B cecc59e414fbd441254b69950b30d1865e9332f3bbae584dc5b43572707b52c7f3948d52a68975b4ab201124904693422d807f84e6821f9f4563663fc21fe629 SHA512 14225476185524f5dc18f92b83d80905ae3fd4000ed1eb5907e79f009dfdfb17618612ea516de4d3376cf357c27bbbd4cd97bfdabb5e100b79aeefd95364d59a
-MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/jsr250/jsr250-1.2.ebuild b/dev-java/jsr250/jsr250-1.2.ebuild
deleted file mode 100644
index 95b2ac491d76..000000000000
--- a/dev-java/jsr250/jsr250-1.2.ebuild
+++ /dev/null
@@ -1,19 +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"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JSR 250 Common Annotations"
-HOMEPAGE="https://jcp.org/en/jsr/detail?id=250"
-SRC_URI="https://repo1.maven.org/maven2/javax/annotation/javax.annotation-api/${PV}/javax.annotation-api-${PV}-sources.jar -> ${P}.jar"
-
-LICENSE="|| ( CDDL GPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux"
-
-RDEPEND=">=virtual/jre-1.7"
-DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/jsr250/metadata.xml b/dev-java/jsr250/metadata.xml
deleted file mode 100644
index 6ef2d50cf07e..000000000000
--- a/dev-java/jsr250/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/junitparams/Manifest b/dev-java/junitparams/Manifest
index 9d64e80d9f61..9bee21aab251 100644
--- a/dev-java/junitparams/Manifest
+++ b/dev-java/junitparams/Manifest
@@ -1,4 +1,4 @@
 AUX junitparams-1.1.1-test.patch 1894 BLAKE2B 8c2aacc726a9d5ac733971f20aa06ab21e1ac31cfa14cf23e11b0541777f22291417710f944fd3f6554791ea8deae022e42ea0af5177f6d97a542d55f510b8d4 SHA512 cae119b7c22b65e42a252d70bc92ad05cae568b2257d9640a498bc7cb15e3917f32c9fafd6b06ded8f739b4825c1662a8c4625114aab1252f4adf58cf52f1f34
 DIST junitparams-1.1.1.tar.gz 96180 BLAKE2B 0b12d61841d13c893d90f1a28e6b881930a66a9359b368b601a9ee9ced1fa82ff17c9142610e1ed122684e454b86a46d9d2cf451544a900b0a86399484df141c SHA512 77e25bff2f821e8be4f3747c58e550b728aace1dac4ac98f0cd8f99235d6a2b0129e61d7f90063d5f85dd3dd4b0e5d0614e3591633bdcf5dfa452c62a114acae
 EBUILD junitparams-1.1.1.ebuild 1655 BLAKE2B 37bd6c3c987ed19e92df2df16e4d60b1e54eeac60a2344672a8baf93c414e1e877f38a4f9a42a43b5b91b0f50340ee5d138c94b0bad8186dcfc8a43cebc61371 SHA512 6b4f66f8203a55aa81fd033e56df032dd985394cbd9774f4f9067f9b05fa868ff5ef4bfd8a9f65f56e4e6b891badf25ab98c5c44e0d693c3f72ce7261ac61a2d
-MISC metadata.xml 442 BLAKE2B 7a6a750afa6b576a816badcc1c2f8df3e8066676e72d0458c7c8b4e9b58efb7d57e0eaf2f8a790c50ad0c842cb2687264111976fc92cf43cea4d25f8ec8e0a03 SHA512 818d6c35bfe1dfca311b337511b143e54adf567d5e547906489662930edb51e70eda67bcc55a0d7a98b39cff7e6fa1320a0e2096116510f59380ca198c25ea41
+MISC metadata.xml 437 BLAKE2B 67db2ff59007450448d4de713df69f7999909a2070c093bd65f994d98fedcb92aa7b262d1da757e19c401fd8380acd234469a3b8abc9a70d412aaf1059699efa SHA512 02fcfa155548a74dbf633c5ac5fd69a3bf6303b202e16dd96948c58d22bd05cc2575cd8a82b51b961b20c4f0b65ba41cda63d5981ff652c1000c5d6912de5f31
diff --git a/dev-java/junitparams/metadata.xml b/dev-java/junitparams/metadata.xml
index e2f1912e2a31..8d7346cf8e03 100644
--- a/dev-java/junitparams/metadata.xml
+++ b/dev-java/junitparams/metadata.xml
@@ -5,7 +5,7 @@
 		<email>java@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">Pragmatists/JUnitParams/tags</remote-id>
+		<remote-id type="github">Pragmatists/JUnitParams</remote-id>
 		<doc>https://github.com/Pragmatists/JUnitParams/wiki</doc>
 		<bugs-to>https://github.com/Pragmatists/JUnitParams/issues</bugs-to>
 	</upstream>
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 19b539c2610a..4f7918c23752 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -6,6 +6,5 @@ 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 4303 BLAKE2B e799c43f07df3c01ca6e2155c8201ae3c3151bf86e79f5b79a408395379adfd97e11bd9ded46199fc8e3aad174ab45ccf4bcb9dc90738491bbe66958f0d91147 SHA512 d76dc2820fdb18d6ca42ae4b4e2e0aa335abd5b3acd2e37726c6f0c166451f84b0f4f3edd59d4ceced3ade06fd65f6578bb29953b5b873dcd7668e1871437261
-EBUILD jython-2.7.0-r6.ebuild 4453 BLAKE2B 91f45695c95fcd42bacdd35fd3d4c1ff34de387046dc51a13ec9f7d5f2367dc9d4033b5110f55f0c5d1abed4cfdf25b820b630c28058d3b7806196d98e983653 SHA512 317dcd4ddd74d89ed8bbc62108d924c9a223f6e448a8f0148adf801151a46c9fedbb70bc370966245cc6f3f1838af603d8f6007a35673027eca1175001a82c60
+EBUILD jython-2.7.0-r6.ebuild 4449 BLAKE2B 0bd29ed489b2132082f09bb91077092ed158eb0ca85d592b0e336a1ea56393f4f6001f4a4cc04627e816e65866fdd593ed0f5c0c967a87bbd1053f33be1b83d1 SHA512 d7f5e41ef217b5b56570fb1188f48e636a73b86216ac8d7472c9c9fe120d6fb9b3ff361aad09c66848ba1c34668102279f012823d2c5ab8f9ff351b27d313c15
 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
deleted file mode 100644
index 3da94ca9ebbe..000000000000
--- a/dev-java/jython/jython-2.7.0-r4.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="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-transport:0
-	dev-java/asm:9
-	dev-java/commons-compress:0
-	dev-java/guava:20
-	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
-
-	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/jython/jython-2.7.0-r6.ebuild b/dev-java/jython/jython-2.7.0-r6.ebuild
index 7000a802e098..d2b1a1703775 100644
--- a/dev-java/jython/jython-2.7.0-r6.ebuild
+++ b/dev-java/jython/jython-2.7.0-r6.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/leiningen-bin/Manifest b/dev-java/leiningen-bin/Manifest
index 252027a97864..2e5d5f51da09 100644
--- a/dev-java/leiningen-bin/Manifest
+++ b/dev-java/leiningen-bin/Manifest
@@ -1,8 +1,5 @@
 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
+EBUILD leiningen-bin-2.9.8.ebuild 1521 BLAKE2B 4a5bc3ba083467e263825305cf7cc0a336e68bdb164b4aac65dbbb47c56c54919f84f4128abf561db2572409dbebbce4f0da1bc314f1c9520785039cda1a6b97 SHA512 83768c69278eb4c08991a4e441f358e74b24c3cf1711a7b3c3b7d5fcd50b9ad35c03386f650ebb74126801057c8d8d16d9df8bf8f0bebfc5ffa42ae7ffe40583
 MISC metadata.xml 303 BLAKE2B 3567c3889af4a644c925f03a220c329a207daeeca9437b8382ff777db620106cc807aadfaf6c157654c634dfa26c14fd654933aa5bd4b8027068fd6f67f1f241 SHA512 73c6a8fbd269fdf6a20f70aa0228314e3010461dad5c1b04f7b7c54d1cc3a2c7b475f180c6740cc9795b6d73fd39c7ce326ecf69768b1f11f2b264618711c1c3
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.9.1.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.9.1.ebuild
deleted file mode 100644
index 9ce40e8c97b8..000000000000
--- a/dev-java/leiningen-bin/leiningen-bin-2.9.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-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.zip -> ${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/leiningen-bin/leiningen-bin-2.9.8.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild
index f0bd5ee2ac4a..182f3392805f 100644
--- a/dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild
+++ b/dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm64 ~x86 ~x64-macos"
 
 RDEPEND=">=virtual/jre-1.8"
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/log4j-12-api/Manifest b/dev-java/log4j-12-api/Manifest
index be1cfaa6103b..b6567519434f 100644
--- a/dev-java/log4j-12-api/Manifest
+++ b/dev-java/log4j-12-api/Manifest
@@ -1,5 +1,3 @@
-DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
 DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
-EBUILD log4j-12-api-2.17.1.ebuild 3114 BLAKE2B 7562325f5e69a7214ba566703a02a25e68711c97586d86bc9890a7130ae7c866c593cc57bfe17b7054a71a195fcd24749a5ed4b0a6bff25bd10bbd67e4e9d47f SHA512 b3132797dd6e578b5c560a97181b7ed4793564067d4164315eb537f417a195c36b64c3ad571d90e665ccf85e97ca79f172480533f048851c2ea84bb64a1d3fb4
-EBUILD log4j-12-api-2.17.2.ebuild 3245 BLAKE2B 89db0cdfbb308eabb2d516ae8cc2ab5daa03db1fd2907cf845dc3d07e90688595a6d9ef200a9034335642f1b93ced5c0b7773649a289fe9f01ffcf205a0a6b3b SHA512 52fe2d2c24d09f8f071276bd071600d19fc9a80f2094e159bd3822b737bd228e53d261844895fc3fe94898e03dc20fc1ba9ab56a8e7c24234500a5905e8c59f5
+EBUILD log4j-12-api-2.17.2.ebuild 3241 BLAKE2B 70ea7a1af7385a6e9197d98b743ab2e0c48350e7f3fa5fbd93600b5d3586f3fc2daf947d8bfdea57ffc9c74c78634f6020989488c466dc8403ccfb4db0fe3199 SHA512 1a770758d425819e6e37dbf5a902255adccf23372c8d054ae8e2e8b5dbbde6184809ea9899f9d65bdbc8b7323c3af45aec2a944780a03b608adbdf89c279d450
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild b/dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild
deleted file mode 100644
index fff8bf02ece8..000000000000
--- a/dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild
+++ /dev/null
@@ -1,85 +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 log4j-1.2-api/pom.xml --download-uri mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-12-api-2.17.1.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.logging.log4j:log4j-1.2-api:2.17.1"
-JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Apache Log4j 1.x Compatibility API"
-HOMEPAGE="https://logging.apache.org/log4j/2.x/"
-SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# We don't have junit-vintage and junit-jupiter
-RESTRICT="test"
-
-# Common dependencies
-# POM: log4j-1.2-api/pom.xml
-# org.apache.logging.log4j:log4j-api:2.17.1 -> >=dev-java/log4j-api-2.17.1:2
-# org.apache.logging.log4j:log4j-core:2.17.1 -> >=dev-java/log4j-core-2.17.1:2
-
-CP_DEPEND="
-	~dev-java/log4j-api-${PV}:2
-	~dev-java/log4j-core-${PV}:2
-"
-
-# Compile dependencies
-# POM: log4j-1.2-api/pom.xml
-# org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.1.Final -> >=dev-java/jboss-jms-api-1.0.1:1.1
-# POM: log4j-1.2-api/pom.xml
-# test? com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.12.4 -> >=dev-java/jackson-dataformat-xml-2.13.0:0
-# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
-# test? org.apache.felix:org.apache.felix.framework:5.6.12 -> !!!groupId-not-found!!!
-# test? org.apache.logging.log4j:log4j-api:2.17.1 -> >=dev-java/log4j-api-2.17.1:2
-# test? org.apache.logging.log4j:log4j-core:2.17.1 -> >=dev-java/log4j-core-2.17.1:2
-# test? org.apache.velocity:velocity:1.7 -> !!!artifactId-not-found!!!
-# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-engine:5.7.2 -> !!!groupId-not-found!!!
-# test? org.junit.vintage:junit-vintage-engine:5.7.2 -> !!!groupId-not-found!!!
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	dev-java/jboss-jms-api:1.1"
-#	test? (
-#		!!!artifactId-not-found!!!
-#		!!!groupId-not-found!!!
-#		>=dev-java/commons-io-2.11.0:1
-#		>=dev-java/jackson-dataformat-xml-2.13.0:0
-#		~dev-java/log4j-api-${PV}:2
-#		~dev-java/log4j-core-${PV}:2
-#	)
-#"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md LICENSE.txt )
-
-S="${WORKDIR}/apache-log4j-${PV}-src"
-
-JAVA_CLASSPATH_EXTRA="jboss-jms-api-1.1"
-JAVA_SRC_DIR="log4j-1.2-api/src/main/java"
-JAVA_RESOURCE_DIRS=(
-	"log4j-1.2-api/src/main/resources"
-)
-
-#	JAVA_TEST_GENTOO_CLASSPATH="jackson-dataformat-xml,commons-io-1,!!!groupId-not-found!!!,log4j-api-2,log4j-core-2,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
-#	JAVA_TEST_SRC_DIR="log4j-1.2-api/src/test/java"
-#	JAVA_TEST_RESOURCE_DIRS=(
-#		"log4j-1.2-api/src/test/resources"
-#	)
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/log4j-12-api/log4j-12-api-2.17.2.ebuild b/dev-java/log4j-12-api/log4j-12-api-2.17.2.ebuild
index d18971755058..744dbf26acb1 100644
--- a/dev-java/log4j-12-api/log4j-12-api-2.17.2.ebuild
+++ b/dev-java/log4j-12-api/log4j-12-api-2.17.2.ebuild
@@ -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 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # We don't have junit-vintage and junit-jupiter
 RESTRICT="test"
diff --git a/dev-java/log4j-api/Manifest b/dev-java/log4j-api/Manifest
index 354bd5b0a36a..4c7d47d5f021 100644
--- a/dev-java/log4j-api/Manifest
+++ b/dev-java/log4j-api/Manifest
@@ -1,5 +1,3 @@
-DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
 DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
-EBUILD log4j-api-2.17.1.ebuild 3342 BLAKE2B c3547005b8a23ed6bdf9414dcdf556d3a8f9894aefa0a6d918ffbde75da4ff1386ce8996281678593b0b931508612d45f2efdf3041e79d9c799b5648c84476c4 SHA512 881b89b9ee72ab0005fd75a2f9ef802bcc1e70e647ca378c6cf4f100d403b432c2125bf000ebbcbb79a0bcefcef6df810efa080da45c6bb2e9850a17075ee9aa
-EBUILD log4j-api-2.17.2.ebuild 2902 BLAKE2B 02cd5c720fe7eaf30a9e7b934173c436661616b1d105e06f1f0bbc6b625a03c07f24f30d2662306818635e0780565b7c157395568810daf5d9369ffa70470e74 SHA512 8c16c4aa1874590879170494c36c4346ad982fb59dcd775114f60978c1855548df7d4e104264be3aa17eb7dca8f85cbe29a903dc270959c63ef6e5bb7776a7ca
+EBUILD log4j-api-2.17.2.ebuild 2898 BLAKE2B 30b05532f1b879f095a3ea735077818fcfce91be99de9d47d547e842d0c8500e67d3f0051e046cf88c13dbde0d7f226b6fdb5266844936a662dc9775c46aa997 SHA512 4f42101df7321f37a28185156d93998f4cc5b67a7007fd17dbc84a8a87b2a50667d080304fee57f248617c047cafd7178ae569975555269266a11d46bfa6b2a6
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-api/log4j-api-2.17.1.ebuild b/dev-java/log4j-api/log4j-api-2.17.1.ebuild
deleted file mode 100644
index dde9ca78860f..000000000000
--- a/dev-java/log4j-api/log4j-api-2.17.1.ebuild
+++ /dev/null
@@ -1,82 +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 log4j-api/pom.xml --download-uri mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-2.17.1.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.logging.log4j:log4j-api:2.17.1"
-JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Apache Log4j API"
-HOMEPAGE="https://logging.apache.org/log4j/2.x/"
-SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# junit-{jupiter,vintage} is not available in ::gentoo
-RESTRICT="test"
-
-# Compile dependencies
-# POM: ${PN}/pom.xml
-# org.osgi:org.osgi.core:4.3.1 -> >=dev-java/osgi-core-api-5.0.0:0
-# POM: ${PN}/pom.xml
-# test? com.fasterxml.jackson.core:jackson-core:2.12.4 -> >=dev-java/jackson-core-2.13.0:0
-# test? com.fasterxml.jackson.core:jackson-databind:2.12.4 -> >=dev-java/jackson-databind-2.13.0:0
-# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
-# test? org.apache.felix:org.apache.felix.framework:5.6.12 -> !!!groupId-not-found!!!
-# test? org.apache.maven:maven-core:3.6.3 -> !!!groupId-not-found!!!
-# test? org.assertj:assertj-core:3.20.2 -> !!!suitable-mavenVersion-not-found!!!
-# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-engine:5.7.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-migrationsupport:5.7.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-params:5.7.2 -> !!!groupId-not-found!!!
-# test? org.junit.vintage:junit-vintage-engine:5.7.2 -> !!!groupId-not-found!!!
-
-DEPEND=">=virtual/jdk-1.8:*
-	dev-java/osgi-core-api:0"
-#	test? (
-#		!!!groupId-not-found!!!
-#		!!!suitable-mavenVersion-not-found!!!
-#		>=dev-java/commons-lang-3.12.0:3.6
-#		>=dev-java/jackson-core-2.13.0:0
-#		>=dev-java/jackson-databind-2.13.0:0
-#	)
-#"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md LICENSE.txt )
-
-S="${WORKDIR}/apache-log4j-${PV}-src"
-
-JAVA_CLASSPATH_EXTRA="osgi-core-api"
-JAVA_SRC_DIR="${PN}/src/main/java"
-JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
-
-#	JAVA_TEST_GENTOO_CLASSPATH="jackson-core,jackson-databind,commons-lang-3.6,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!suitable-mavenVersion-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
-#	JAVA_TEST_SRC_DIR="${PN}/src/test/java"
-#	JAVA_TEST_RESOURCE_DIRS=(
-#		"${PN}/src/test/resources"
-#	)
-
-#	src_prepare() {
-#		default
-#		mkdir -p log4j-api/src/main/resources/META-INF/versions/9 || die
-#		pushd log4j-api/src/main/resources/META-INF/versions/9 || die
-#			jar -xf "$(java-pkg_getjar --build-only log4j-api-java9-2 log4j-api-java9.jar)" \
-#				org/apache/logging/log4j/util module-info.class || die
-#			rm org/apache/logging/log4j/util/{PrivateSecurityManagerStackTraceUtil,PropertySource}.class || die
-#		popd || die
-#	}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/log4j-api/log4j-api-2.17.2.ebuild b/dev-java/log4j-api/log4j-api-2.17.2.ebuild
index 5de77360899f..3713bdff3a94 100644
--- a/dev-java/log4j-api/log4j-api-2.17.2.ebuild
+++ b/dev-java/log4j-api/log4j-api-2.17.2.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 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # junit-{jupiter,vintage} is not available in ::gentoo
 RESTRICT="test"
diff --git a/dev-java/log4j-core/Manifest b/dev-java/log4j-core/Manifest
index 1ba12e438b32..7cdbe4bcfe8b 100644
--- a/dev-java/log4j-core/Manifest
+++ b/dev-java/log4j-core/Manifest
@@ -1,5 +1,4 @@
-DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
 DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
-EBUILD log4j-core-2.17.1-r1.ebuild 8262 BLAKE2B 2f2014a50da0d4d488773cd2fb07bc83dc101c300b490ffd12f19b9fbdc415898398f9eb841b71d7e1691a19c107bcf3a4cd7bf0d23c9a78135e3ad990722c18 SHA512 599aee21fc409744a86ba3a8e98002fdf7cac966f6042174272870c8bb2aa634177bda8e85b2b1bc3cf2ffb433757514d9b732916e03e2cda5597c081facccf8
-EBUILD log4j-core-2.17.2.ebuild 8554 BLAKE2B 9d69df78d6e5f21ed33c2d3ad75629f12785487347a89ecbb19c4eebfe358eec733ca65df2c81b72fd35797eb2ca2797305ac8320852e1c79af5cc10d01c18b2 SHA512 8d1999563336f21fb7bb748bf4b7723bf0bc1c4f8d0f0342b631dc350dc0f35951ffa55741f69960476bfe12ea529ffbb2eb289150ed0db895d22fceb0bb4104
+EBUILD log4j-core-2.17.2-r1.ebuild 8554 BLAKE2B e4eaf3b001f8c949478aef1e13b7d04d91d5a97108df0d9da886adfdf1730d1a8e34ff10ce0eb27e174ea358d11ddb617865ab49e3b19eed972ad47c94447793 SHA512 0563585afeba69ca1ed5ef393b9ec5a1c1b7110b467595d7e6d62ac8182011a3bada70b2ad8abdd308ff9dc547278fe25cd111cec52e139f25e13347deeed1d1
+EBUILD log4j-core-2.17.2.ebuild 8550 BLAKE2B 429e7da14c9aef21fb613522f9a240ae9f731f776a5c1c0b894da7b8f3176f6d7c0ec0dd83ff63c66520e4ecf0c1511bbf94ce58a979fb71f4aa5b4bec262903 SHA512 a13d5761ceabf1c307f82f715e9c71ba2d68135859fdc5c3419e572d2ca293f0c2bf1efbc61b0a0d55dc054b60678d9f1c9b79cf29cb668b7eb187b137036dc6
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-core/log4j-core-2.17.1-r1.ebuild b/dev-java/log4j-core/log4j-core-2.17.2-r1.ebuild
index d8b17937938b..4ba81d46a2d7 100644
--- a/dev-java/log4j-core/log4j-core-2.17.1-r1.ebuild
+++ b/dev-java/log4j-core/log4j-core-2.17.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 log4j-core/pom.xml --download-uri mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-core-2.17.1.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom log4j-core/pom.xml --download-uri mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-core-2.17.2.ebuild
 
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.logging.log4j:log4j-core:2.17.1"
+MAVEN_ID="org.apache.logging.log4j:log4j-core:2.17.2"
 # JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
 
 inherit java-pkg-2 java-pkg-simple
@@ -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 ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # We don't have junit-vintage and junit-jupiter
 RESTRICT="test"
@@ -26,20 +26,20 @@ RESTRICT="test"
 # Common dependencies
 # POM: ${PN}/pom.xml
 # com.conversantmedia:disruptor:1.2.15 -> >=dev-java/conversant-disruptor-1.2.19:0
-# com.fasterxml.jackson.core:jackson-core:2.12.4 -> >=dev-java/jackson-core-2.13.0:0
-# com.fasterxml.jackson.core:jackson-databind:2.12.4 -> >=dev-java/jackson-databind-2.13.0:0
-# com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.12.4 -> >=dev-java/jackson-dataformat-xml-2.13.0:0
-# com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.4 -> >=dev-java/jackson-dataformat-yaml-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-core:2.13.1 -> >=dev-java/jackson-core-2.13.2:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.1 -> >=dev-java/jackson-databind-2.13.2:0
+# com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.1 -> >=dev-java/jackson-dataformat-xml-2.13.2:0
+# com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.1 -> >=dev-java/jackson-dataformat-yaml-2.13.2:0
+# com.fasterxml.woodstox:woodstox-core:6.2.8 -> >=dev-java/woodstox-core-6.2.8:0
 # com.lmax:disruptor:3.4.4 -> >=dev-java/lmax-disruptor-3.4.4:0
-# com.sun.mail:javax.mail:1.6.2 -> >=dev-java/javax-mail-1.6.2:0
+# com.sun.mail:javax.mail:1.6.2 -> !!!suitable-mavenVersion-not-found!!!
 # org.apache.commons:commons-compress:1.21 -> >=dev-java/commons-compress-1.21:0
 # org.apache.commons:commons-csv:1.9.0 -> >=dev-java/commons-csv-1.9.0:0
 # org.apache.kafka:kafka-clients:1.1.1 -> >=dev-java/kafka-clients-1.1.1:0
-# org.apache.logging.log4j:log4j-api:2.17.1 -> >=dev-java/log4j-api-2.17.1:2
-# org.fusesource.jansi:jansi:2.3.4 -> >=dev-java/jansi-2.4.0:2
+# org.apache.logging.log4j:log4j-api:2.17.2 -> >=dev-java/log4j-api-2.17.2:2
+# org.fusesource.jansi:jansi:2.4.0 -> >=dev-java/jansi-2.4.0:2
 # org.jctools:jctools-core:1.2.1 -> >=dev-java/jctools-core-2.0.2:0
-# org.slf4j:slf4j-api:1.7.25 -> >=dev-java/slf4j-api-1.7.30:0
+# org.slf4j:slf4j-api:1.7.35 -> >=dev-java/slf4j-api-1.7.36:0
 # org.zeromq:jeromq:0.4.3 -> >=dev-java/jeromq-0.5.2:0
 
 CP_DEPEND="
@@ -53,7 +53,7 @@ CP_DEPEND="
 	dev-java/jakarta-activation-api:1
 	dev-java/jansi:2
 	dev-java/javax-mail:0
-	dev-java/jctools-core:0
+	dev-java/jctools-core:3
 	dev-java/jeromq:0
 	dev-java/kafka-clients:0
 	dev-java/lmax-disruptor:0
@@ -70,38 +70,40 @@ CP_DEPEND="
 # test? ch.qos.logback:logback-classic:1.2.3 -> !!!groupId-not-found!!!
 # test? ch.qos.logback:logback-core:1.2.3 -> !!!groupId-not-found!!!
 # test? com.github.tomakehurst:wiremock:2.26.3 -> !!!groupId-not-found!!!
-# test? com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.0.1 -> !!!groupId-not-found!!!
+# test? com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0 -> !!!groupId-not-found!!!
 # test? com.h2database:h2:1.4.200 -> !!!groupId-not-found!!!
 # test? commons-codec:commons-codec:1.15 -> >=dev-java/commons-codec-1.15:0
 # test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
 # test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
 # test? log4j:log4j:1.2.17 -> >=dev-java/log4j-1.2.17:0
-# test? net.javacrumbs.json-unit:json-unit:2.27.0 -> !!!groupId-not-found!!!
+# test? net.javacrumbs.json-unit:json-unit:2.32.0 -> !!!groupId-not-found!!!
 # test? org.apache-extras.beanshell:bsh:2.0b6 -> >=dev-java/bsh-2.0_beta6:0
-# test? org.apache.activemq:activemq-broker:5.16.3 -> !!!groupId-not-found!!!
+# test? org.apache.activemq:activemq-broker:5.16.4 -> !!!groupId-not-found!!!
 # test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
 # test? org.apache.felix:org.apache.felix.framework:5.6.12 -> !!!groupId-not-found!!!
-# test? org.apache.logging.log4j:log4j-api:2.17.1 -> >=dev-java/log4j-api-2.17.1:2
-# test? org.apache.maven:maven-core:3.6.3 -> !!!groupId-not-found!!!
-# test? org.awaitility:awaitility:4.0.3 -> !!!groupId-not-found!!!
-# test? org.codehaus.groovy:groovy-dateutil:3.0.8 -> !!!groupId-not-found!!!
-# test? org.codehaus.groovy:groovy-jsr223:3.0.8 -> !!!groupId-not-found!!!
-# test? org.codehaus.plexus:plexus-utils:3.4.0 -> !!!groupId-not-found!!!
+# test? org.apache.logging.log4j:log4j-api:2.17.2 -> >=dev-java/log4j-api-2.17.2:2
+# test? org.apache.maven:maven-core:3.8.4 -> !!!groupId-not-found!!!
+# test? org.awaitility:awaitility:4.1.1 -> !!!groupId-not-found!!!
+# test? org.codehaus.groovy:groovy-dateutil:3.0.9 -> !!!groupId-not-found!!!
+# test? org.codehaus.groovy:groovy-jsr223:3.0.9 -> !!!groupId-not-found!!!
+# test? org.codehaus.plexus:plexus-utils:3.4.1 -> !!!groupId-not-found!!!
 # test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
 # test? org.hamcrest:hamcrest:2.2 -> !!!artifactId-not-found!!!
-# test? org.hdrhistogram:HdrHistogram:2.1.9 -> !!!groupId-not-found!!!
+# test? org.hdrhistogram:HdrHistogram:2.1.12 -> !!!groupId-not-found!!!
 # test? org.hsqldb:hsqldb:2.5.2 -> !!!groupId-not-found!!!
 # test? org.jmdns:jmdns:3.5.7 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-engine:5.7.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-params:5.7.2 -> !!!groupId-not-found!!!
-# test? org.junit.vintage:junit-vintage-engine:5.7.2 -> !!!groupId-not-found!!!
-# test? org.mockito:mockito-core:3.11.2 -> !!!suitable-mavenVersion-not-found!!!
-# test? org.mockito:mockito-junit-jupiter:3.11.2 -> !!!artifactId-not-found!!!
-# test? org.slf4j:slf4j-ext:1.7.25 -> !!!artifactId-not-found!!!
-# test? org.springframework:spring-test:5.3.13 -> !!!groupId-not-found!!!
+# test? org.junit-pioneer:junit-pioneer:1.6.1 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.platform:junit-platform-commons:1.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
+# test? org.mockito:mockito-core:4.3.1 -> !!!suitable-mavenVersion-not-found!!!
+# test? org.mockito:mockito-junit-jupiter:4.3.1 -> !!!artifactId-not-found!!!
+# test? org.slf4j:slf4j-ext:1.7.35 -> >=dev-java/slf4j-ext-1.7.36:0
+# test? org.springframework:spring-test:5.3.15 -> !!!groupId-not-found!!!
 # test? org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0
-# test? org.xmlunit:xmlunit-core:2.8.3 -> !!!groupId-not-found!!!
-# test? org.xmlunit:xmlunit-matchers:2.8.3 -> !!!groupId-not-found!!!
+# test? org.xmlunit:xmlunit-core:2.9.0 -> !!!groupId-not-found!!!
+# test? org.xmlunit:xmlunit-matchers:2.9.0 -> !!!groupId-not-found!!!
 # test? org.zapodot:embedded-ldap-junit:0.8.1 -> !!!groupId-not-found!!!
 
 DEPEND="${CP_DEPEND}
@@ -119,6 +121,7 @@ DEPEND="${CP_DEPEND}
 #		>=dev-java/commons-logging-1.2:0
 #		>=dev-java/log4j-1.2.17:0
 #		~dev-java/log4j-api-${PV}:2
+#		>=dev-java/slf4j-ext-1.7.36:0
 #		>=dev-java/xz-java-1.9:0
 #	)
 #"
@@ -127,15 +130,13 @@ RDEPEND="
 	>=virtual/jre-1.8:*
 	${CP_DEPEND}"
 
-DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md LICENSE.txt )
+DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
 
 S="${WORKDIR}/apache-log4j-${PV}-src"
 
 JAVA_CLASSPATH_EXTRA="jboss-jms-api-1.1,osgi-core-api"
 JAVA_SRC_DIR="${PN}/src/main/java"
-JAVA_RESOURCE_DIRS=(
-	"${PN}/src/main/resources"
-)
+JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
 
 #	JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,commons-codec,commons-io-1,commons-logging,log4j,!!!groupId-not-found!!!,bsh,!!!groupId-not-found!!!,commons-lang-3.6,!!!groupId-not-found!!!,log4j-api-2,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!suitable-mavenVersion-not-found!!!,!!!artifactId-not-found!!!,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,xz-java,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
 #	JAVA_TEST_SRC_DIR="${PN}/src/test/java"
@@ -156,9 +157,11 @@ src_compile() {
 		"${JAVA_GENTOO_CLASSPATH},${JAVA_CLASSPATH_EXTRA}")"
 	# Just in case java-pkg-simple.eclass changes the path in the future
 	mkdir -p "${classes}" || die "Failed to create directory for classes"
+	local sources_list_file="${T}/sources.lst"
+	find "${JAVA_SRC_DIR}" -type f -name "*.java" > "${sources_list_file}" || die
 	ejavac -d "${classes}" -cp "${classpath}" \
 		-proc:only -processor "${processor}" \
-		$(find "${JAVA_SRC_DIR}" -name "*.java")
+		@"${sources_list_file}"
 	# Update the JAR to include the serialized plugin listing file
 	local jar="$(java-config -j)"
 	"${jar}" -uf "${JAVA_JAR_FILENAME}" -C "${classes}" . ||
diff --git a/dev-java/log4j-core/log4j-core-2.17.2.ebuild b/dev-java/log4j-core/log4j-core-2.17.2.ebuild
index ff6f6cff8753..019860e2e92a 100644
--- a/dev-java/log4j-core/log4j-core-2.17.2.ebuild
+++ b/dev-java/log4j-core/log4j-core-2.17.2.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 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # We don't have junit-vintage and junit-jupiter
 RESTRICT="test"
diff --git a/dev-java/logback-classic/Manifest b/dev-java/logback-classic/Manifest
index 265a6afb66b5..da7a2b09a7e9 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 ca2e4d471073e0570b17c81a295574e4dc7192a9226e8bbbed2fc4de99717958bb16498912c35efd36446bdfadddd22b2e4cd4e681e173316e36e4969c7b3754 SHA512 e265a125363053545d2a3943da8e63154e7262ecfd2ecea222e7b42b2dc102bdd171e789bd24aa8614cf51166c467b0f7617e1d782d385714d3f3f14a5afd0b3
+EBUILD logback-classic-1.2.11.ebuild 3249 BLAKE2B e1e2f1a125b97138cd71b6ef1f90447108f6b2ef92f9285d1aaa3d7bbad79684890c22f927fbf5d0a33c195c8420fe40ba60c35b8f3cf6340f1cf161bd38e996 SHA512 b702fd612f7e2a7275aa2578a3d59ced338ad31b6af91cb63bf12912c49e9bbc118d3e25e25a446c4b8ac2a0ec1b8c5f0ad70c1a0b53bc9a661dd2834c964c72
 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 7654edfce259..2759bdc02256 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 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/logback-core/Manifest b/dev-java/logback-core/Manifest
index 85db74d47e7b..5e84a7c66ddb 100644
--- a/dev-java/logback-core/Manifest
+++ b/dev-java/logback-core/Manifest
@@ -1,3 +1,4 @@
+AUX logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch 799 BLAKE2B 5ed73567f9ef6f6fb08c1f9d6fff43e71a22760a31bddcc454a75c62d26b50bad46510f6c748c019ab90e69e6e6007ee3de2507104f956b4c24b658716a6b6ed SHA512 5214fab891a28e02b6748a307e1741207c16dbf0f9fbfcef86f1303c2ab15714348a1f1750965ee928ed422ffa7261f0bc7340756805ba196fe86dce66039ae5
 DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
-EBUILD logback-core-1.2.11.ebuild 3126 BLAKE2B 00baf252dab2c7b59843bfeb79c4a7db0ecb47f40bf073988bb169f4a91b49ffbcd072f95e01424a43b6795aca16a7708cfb6696cf32802d83c8ac667299cae5 SHA512 83040133e8748920d3d6bf53f926166b02027368d1c3783d9d45e6d38739cbfde004e4ac852e9af317c8d64feb528b2f29836b309e556ab0dea15d032f6ab267
+EBUILD logback-core-1.2.11.ebuild 3571 BLAKE2B 1a57d13feba258d96db96f632056abe972f464cf2194a996b8550681a7b09896c8e80ddec34b660cd9239809567a360b53b6ebc7d6e7ef284785a673dff364af SHA512 f45a45c16eb7297b9f15bd68233715c36ec4c683e672d8c74ce3ff2c9457a1aacef857661506e60752cf6dde6ad35156684b5483c5b679ff89238b9ec4e52b2c
 MISC metadata.xml 413 BLAKE2B 3ae8c9f27dadfe978d070866e0c0368b89b8532f2aa6fbd3e3fab9e057320e1c6b5c2bc7367cc191e189acaa88384a0b86741d674d1cd711d4dd5ee8a29c9662 SHA512 7c2739ff8e878766487804fabcb39cda969c81e47af7fd51ffebfcb85dbdec10b7eef85b1d9c873561456e1592f6cdb8f82fbb4233abee1f43f323a1c10f9ba2
diff --git a/dev-java/logback-core/files/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch b/dev-java/logback-core/files/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch
new file mode 100644
index 000000000000..9423f26e9a1a
--- /dev/null
+++ b/dev-java/logback-core/files/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch
@@ -0,0 +1,24 @@
+--- a/src/test/java/ch/qos/logback/core/AsyncAppenderBaseTest.java
++++ b/src/test/java/ch/qos/logback/core/AsyncAppenderBaseTest.java
+@@ -18,6 +18,7 @@
+ import static org.junit.Assert.assertTrue;
+ 
+ import org.junit.Before;
++import org.junit.Ignore;
+ import org.junit.Test;
+ 
+ import ch.qos.logback.core.helpers.NOPAppender;
+@@ -281,10 +282,13 @@ public void verifyInterruptionFlagWhenStopping_NOT_INTERUPPTED() {
+     }
+     
+     
++    // In JDK non started threads can be interrupted
++    @Ignore
+     @Test
+     public void verifyInterruptionOfWorkerIsSwallowed() {
+         asyncAppenderBase.addAppender(delayingListAppender);
+         asyncAppenderBase.start();
++        Thread.yield();
+         asyncAppenderBase.stop();
+         assertFalse(asyncAppenderBase.worker.isInterrupted());
+     }
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 0cdfe7da5744..954b29679ba8 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 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
@@ -70,6 +70,13 @@ src_prepare() {
 	sed \
 		-e 's:org.mockito.Matchers:org.mockito.ArgumentMatchers:' \
 		-i 'src/test/java/ch/qos/logback/core/net/AbstractSocketAppenderIntegrationTest.java' || die
+
+	# Ignore test failing under Java 16
+	# See https://github.com/qos-ch/logback/commit/d6a8200cea6d960bf6832b9b95aed64e87474afb
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if [[ "${vm_version}" -ge "17" ]] ; then
+		eapply "${FILESDIR}/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch"
+	fi
 }
 
 src_test() {
@@ -84,10 +91,11 @@ src_test() {
 	pushd src/test/java || die
 		local JAVA_TEST_RUN_ONLY=$(find * \
 			-name "*Test.java" \
-			! -name "**/All*Test.java" \
-			! -name "**/PackageTest.java" \
+			! -wholename "**/All*Test.java" \
+			! -wholename "**/PackageTest.java" \
 			! -name "AbstractAppenderTest.java" \
 			! -name "AbstractPatternLayoutBaseTest.java" \
+			! -name "AbstractSocketAppenderIntegrationTest.java" \
 			)
 		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
 		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
@@ -97,6 +105,7 @@ src_test() {
 	local vm_version="$(java-config -g PROVIDES_VERSION)"
 	if [[ "${vm_version}" -ge "17" ]] ; then
 		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
 	fi
 	java-pkg-simple_src_test
 }
diff --git a/dev-java/lzma/Manifest b/dev-java/lzma/Manifest
index bf05909c73d4..ce6eb8fe9c7d 100644
--- a/dev-java/lzma/Manifest
+++ b/dev-java/lzma/Manifest
@@ -1,3 +1,3 @@
 DIST lzma1900.7z 1082692 BLAKE2B 88aca3f3225d589c9b1b0fbf4c196db8e6e8df362f926736a45e1f80d302c132b25537203b0a903da9de5f3b0398b10901f126cf6905fcbdf0a57ee894e74b6d SHA512 60532483249d86960d5c481dc88ebeafabb7e435afb6188bc26f38177b8534ef3da83317d6920d99103d4f10a8dcdb624489ea5ddad8e0c8732bab1bb4ebd7eb
-EBUILD lzma-19.00.ebuild 518 BLAKE2B 47217532304bb643d1e79ac70886963f90bd7abd824814e799a751daa7132f732347917b164c8f524334e5035dcd6dbba5cb21af4b3d967ffa9a875385beb4bc SHA512 febef15d5607555ebd5651718a897432f0ab7ba5e7115ea3051afdc773eab5f3ea3fd2a9ae95dd10a312da083514baf2fd4d0c97b7a2e36f67c87f16ff8a612c
+EBUILD lzma-19.00.ebuild 523 BLAKE2B 800430948b6d2979e1b87b699c230f2aa69de989dfd78a689598a27fea5defb72b2320d579370078c1d019fe87572ab0e9a091a83f11c3665a213c8269c9b98c SHA512 8e2b854955b02dcc843ea8aaa405f07942c0384fbe9f9a589282738560af318eba6075e8859850f194f8987ab6cf937a9197d4e68689419606598c295cb36627
 MISC metadata.xml 432 BLAKE2B 998874250825748d38aff4d525a9aaceab9cf55299f8fc3960fb0bfedeafc82fee0a9c2570d262678e5fb7949400673fe10b4d9f43a5a02aa1d02907f2d7a57a SHA512 0bfa574b8bea1f0e6f0f29331fdc6caa379729ff27e603af6bf20a895dcdfd233830dd35d2a14c032abd5c5d8feae101747aa344a9e2d08ec1eb3d98daa36939
diff --git a/dev-java/lzma/lzma-19.00.ebuild b/dev-java/lzma/lzma-19.00.ebuild
index f986151ee26b..a9e4fa05a9af 100644
--- a/dev-java/lzma/lzma-19.00.ebuild
+++ b/dev-java/lzma/lzma-19.00.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
@@ -12,7 +12,7 @@ SRC_URI="https://www.7-zip.org/a/${PN}${PV/./}.7z"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/lzmajio/Manifest b/dev-java/lzmajio/Manifest
index 8f566fedd387..ed2e743b5c0e 100644
--- a/dev-java/lzmajio/Manifest
+++ b/dev-java/lzmajio/Manifest
@@ -1,3 +1,3 @@
 DIST lzmajio-0.95.tar.gz 20790 BLAKE2B e24a5f4778bb135ce3ab519dfc8357cf3abc04d564b8d365f7cbad579be7ff86b4d24156720954bab882d7ade8e5145e533fd477c1925f6a9353c90dd5a2e511 SHA512 65736a66ec8f5eb63688edda912718f4e9b0518c68b0b1eed3df26e7b6bb15728024c637b4cf40f6ab52168c913cce91bd7cafefca7515e0f3e386738cedc6e5
-EBUILD lzmajio-0.95-r3.ebuild 678 BLAKE2B 1bb87f4ac91fe656a1cdc92a98ac05f80059979c97216499304b6cb6e76eccbaf54dbc15d03f9b48dc8a948068153fba71645cdff16d9c34eca99941b18b3d1c SHA512 8b8e93ddad6762c96ae5905c7fac347c31f51d4d8ade61612b7a42fd3d0cec592c482f5f79404c59231496e90f80a25c31c1316a4ad048e2abdb64ddd1bb346b
+EBUILD lzmajio-0.95-r3.ebuild 683 BLAKE2B f197ad5789668a07c95eb8c636fb4ce14d160894ac66169f491487d35df36870b673ad16fe6d74792901bf08b9cb383a7b241f714117ad6277b21dcb392f90fa SHA512 c0bb3ead68e1450c4cbcc84bf8a171999e029fca980bba4eb86c2eef59b78ffcbb8876137f964542deed0f2b0fa8bc0e6a601ca43edcb50e7e08cb4c0e5a2bfe
 MISC metadata.xml 355 BLAKE2B 45e5688e8e9af78304f1e5b5c499e6416551c805c67f009bd4cfaa2d3bdfaa76da736176e1508d0b91549bf9b402dd5c4b87daa94853eea4d473ee086af3fa0a SHA512 5e5c0b1b6841cd69152cca661eaa68c5ea91bd5954d5a3e831fe82470acd63acaa2ac43ed7797c0af4b2932a2dd1e78b633de4e24ab02c744c2c33f4b920f16d
diff --git a/dev-java/lzmajio/lzmajio-0.95-r3.ebuild b/dev-java/lzmajio/lzmajio-0.95-r3.ebuild
index 31377db31345..cded6e645d67 100644
--- a/dev-java/lzmajio/lzmajio-0.95-r3.ebuild
+++ b/dev-java/lzmajio/lzmajio-0.95-r3.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 @@ SRC_URI="https://github.com/league/${P}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 
 CDEPEND="dev-java/lzma:0"
 
diff --git a/dev-java/maven-hawtjni-plugin/Manifest b/dev-java/maven-hawtjni-plugin/Manifest
deleted file mode 100644
index a7d6e8e7bc04..000000000000
--- a/dev-java/maven-hawtjni-plugin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hawtjni-project-1.15.tar.gz 1606236 BLAKE2B 52357dbefde43ec82cf218ada90642d118ebaa6a6be173cc1f4f48377fda95b902f0a90dfb60822c02c144b9bf13d0800c94d67cc2f9c76e607bbbb80a80898e SHA512 1a93658bf8621c770cf97b546c6a5c0cf1821b06cb16dbc872ad0c830c599d3947ffe56b4cca16217a510d4e929ebcfc5eabdf4ad4364f5225b53d22c7d48abb
-EBUILD maven-hawtjni-plugin-1.15.ebuild 672 BLAKE2B b5fbdc5de6030a166226ac53142a97e550c9fd8f04a58aa93d1c8955db62aa332530d2d56727641d0c2cd272760ada4dd3e0ee8c5d7077ae6029219b5fc8f4f4 SHA512 602719139510376d7669ae2f3eb1685922cd8e3444d57133f4c61bcc99cdecdcefed68aa0bfa4cbee1d0dd60072016368ded1784602c7d43de3fd8d892b0a080
-MISC metadata.xml 320 BLAKE2B 7757d5b1061f862aa94550b7f1ba7f01d6478c7a91bb532c1475140f479187fd034c7ac6e798b7f0f9e2622b87815388c74cceb83c7a6ff34714d71c8fe7a1e9 SHA512 954cb066c2961bece31c2078d6974170e1443b68fd5a2aa04369c6e3144c4e85439fbb9d2e33c40ff6fc7c665d895093d12fba93a39eb6eab8394f80661f6641
diff --git a/dev-java/maven-hawtjni-plugin/maven-hawtjni-plugin-1.15.ebuild b/dev-java/maven-hawtjni-plugin/maven-hawtjni-plugin-1.15.ebuild
deleted file mode 100644
index 4a5d1926aec1..000000000000
--- a/dev-java/maven-hawtjni-plugin/maven-hawtjni-plugin-1.15.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2
-
-MY_P="hawtjni-project-${PV}"
-
-DESCRIPTION="Maven plugin for the HawtJNI code generator (resources only)"
-HOMEPAGE="https://github.com/fusesource/hawtjni"
-SRC_URI="https://github.com/fusesource/hawtjni/archive/${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}/hawtjni-${MY_P}/${PN}"
-
-src_compile() {
-	touch ${PN}.jar || die # jar won't create on update.
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-}
diff --git a/dev-java/maven-hawtjni-plugin/metadata.xml b/dev-java/maven-hawtjni-plugin/metadata.xml
deleted file mode 100644
index 9f7478f1a2a5..000000000000
--- a/dev-java/maven-hawtjni-plugin/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">fusesource/hawtjni</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/mersennetwister/Manifest b/dev-java/mersennetwister/Manifest
index 473e3f4d41f1..7d40383b24b4 100644
--- a/dev-java/mersennetwister/Manifest
+++ b/dev-java/mersennetwister/Manifest
@@ -1,3 +1,3 @@
 DIST mersennetwister-0_pre23765.tar.bz2 4974 BLAKE2B 3a609f7319f365234ebac8ae7b9accd447b9a506cf7cbf45c59bb2c44099e3ee780ea7754db91f96ff6f33fa84f65f20acda58d058aba30345114808ca90e65d SHA512 3c3b970da3ddc3a0b7fda299916781551867b6ce3c8ecb1f89670783d4d51e2681b07c6b2dfc15e11a03c8b949f4880b0bf1511dde2cb4ad0600688809d38e46
-EBUILD mersennetwister-0_pre23765-r2.ebuild 486 BLAKE2B 4ab02c58c13e73e6c93e376c7bf929d76a103ba79a5fa5a546c7d1eda7618598dbe5ec97210e4d7c6b2a83a101ddefa546e7b5d1f3bf1b510ce9bc6a4f29142e SHA512 648876fc20e62b3d3cc88fcf3d8b24158e0adc17948462c58b26e28ff5f0fc3d22d5adc46371bd5341d0b8764bd2d7c4f7a79d754d837713e0c0aef305c5a14f
+EBUILD mersennetwister-0_pre23765-r2.ebuild 491 BLAKE2B c5db63ef7fc84584dc2547251e44e6509e2871ce0e6a8ff05899b0a43670043fdc8fcf11649b8ffcf381c7b3105d2ce053249235fbbe5489027282c56ea16153 SHA512 b09fdb99269d72db9aa775e1c20d814bc33662e878a17cfcf35bde98d99dbdbdf033a72dc9c83315e371c55b9c02c1f9505fd92fe5d46317d3a360786a6a34ed
 MISC metadata.xml 353 BLAKE2B c417f3c4e9fb900fe5c4874caf3bc7c0a4e816fd8064ac8eba8c624c4864bee28c9160478ec688e4e447fef35dd8a2f2ed971ea6717cbed73ce85e35facbfdd3 SHA512 4baca3ed7dd47cb5a78222c3d35b0f66439d937fd3629a8784f20bae379539bc01436e5ec2e26fe0b568472faee3d545e9a06089b062ea34e79ea58cecdd86ec
diff --git a/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild b/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild
index c1723884aece..58940b98dde0 100644
--- a/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild
+++ b/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/microba/Manifest b/dev-java/microba/Manifest
deleted file mode 100644
index e216c45bc865..000000000000
--- a/dev-java/microba/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST microba-0.4.4.3.tar.gz 50106 BLAKE2B 15b7fe422f7d6aa92929a697ee2c12b2325c9cfcef6d43cc2f135b57a14d8a2a7c1a7b5b3de6bf8a7e1ed07ac275c26017430f776c435295e36109914aca090d SHA512 0191213d00fd0a6bd59a623fb0762eb589a5ac42c5c988a612c01781b30bcb6d86ce431f76687f5647889d54ad13b7f3fa2eec02ca81038f692d2cf25fa1aad1
-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/metadata.xml b/dev-java/microba/metadata.xml
deleted file mode 100644
index 64b71aea2968..000000000000
--- a/dev-java/microba/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>
-	<upstream>
-		<remote-id type="sourceforge">microba</remote-id>
-		<remote-id type="github">tdbear/microba</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/microba/microba-0.4.4.3-r2.ebuild b/dev-java/microba/microba-0.4.4.3-r2.ebuild
deleted file mode 100644
index 8692c84f479a..000000000000
--- a/dev-java/microba/microba-0.4.4.3-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Swing components for date operations and palettes"
-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"
-
-CP_DEPEND="dev-java/jgraph:0"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-
-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/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index b9e52933ac0c..98623b1094f2 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,9 +1,3 @@
-DIST mill-bin-0.10.0 65538437 BLAKE2B 1c3583e34a0bea381b6368acf00936adaace5cf3a959e710cde3ab08509b7de237d46ee0fb9266a34e0f746d6c9c052337a6d8dddb4d3ba990710c131f0ea11d SHA512 fd8a8c79672275de9bc4ab74791484dd1c91b5382990d993794b1bde59b24a2e331422a1210010a9acb6c4a29bf168ba0564f7767413acb4d6867e9ea14d2c33
-DIST mill-bin-0.10.1 67217004 BLAKE2B 4df576762b86e909b2fdbab49e5f8025d73ea0f6b60e25c6d1ec0b55acd91af44c5fbeb5088ea7e0138c4e418e36e60eaf2248b6867a7936aa6612749101f46f SHA512 0fd727aa0bd2f67536ef7155a5f57166bcd13b2fccf0d9b03c3081b8ce9ab1e7290b5705b52aad7e993a4bc0421ea6d57f94d76c0f240ce41df9e05e61dce940
-DIST mill-bin-0.10.2 67225385 BLAKE2B d3ec7f45344312fb3097142aebcbf7ccbafa1f2e2aeccd4b83c83b6dc4f90b5e7feeeb994dad930accee546106b2580bf37acc38dd83c9efb599e8b79b2ce8e3 SHA512 79b71bbbe4a05e314495cd97ae2fc926d35d5ba7134c8ff48c09a8fd0fe826b824dd8ccd7e27089acd84b0673acfcbebcf3ef77ac4d3b3d8a6b117244b1a80f5
-DIST mill-bin-0.10.3 67435545 BLAKE2B 1a57f2eaa7af6dd66a2cf46bd653a678d1b81f7cf1c12a99ecbe35f3279241873ea200445cfcd95e43ae4c1d80cdfc202c7c03db562ddf48c39840c804a42877 SHA512 c758d06df4be61986d8bd24d9939eac09bf5080f50b9a2baeb34ff6ff37d699226ed7d65b8facb51edd6f4a8d246333a96a1181e1e641a1127f48ed3d88ff3c1
-EBUILD mill-bin-0.10.0.ebuild 480 BLAKE2B 975ae40b61d1aee9e011cd04fddac1b6adfb788cfb6218648284330e1d936611b73473e82383524e4be1a4ce6bff26bcc047bfb1ab9c67c9c646a85d892bdff4 SHA512 1625db9ae485f31f37033d30c5de765850f77a57d22f772645c38de7077f87431d41826241e108b9f8deab2d8e04bea4b98e7aeaba35a13ca1693888b6d1e67f
-EBUILD mill-bin-0.10.1.ebuild 482 BLAKE2B bd450dd8e02ed513d1d9a2546220e91556ccdc46a515bd41ca1450f9f36c602e25a36830c65211dcf87946b1dd028a474c84638e3f1039d83b4cc048b7100e33 SHA512 0c47890e11f7b3d2fcfb1469213dcb2f7103ff7f3460968dee8d4ce54bb0fe7efd80e0604a5a6ed5cbfb0c47fe68f43b02b6c653ea2401707bb9f318a6ddfddc
-EBUILD mill-bin-0.10.2.ebuild 482 BLAKE2B bd450dd8e02ed513d1d9a2546220e91556ccdc46a515bd41ca1450f9f36c602e25a36830c65211dcf87946b1dd028a474c84638e3f1039d83b4cc048b7100e33 SHA512 0c47890e11f7b3d2fcfb1469213dcb2f7103ff7f3460968dee8d4ce54bb0fe7efd80e0604a5a6ed5cbfb0c47fe68f43b02b6c653ea2401707bb9f318a6ddfddc
-EBUILD mill-bin-0.10.3.ebuild 482 BLAKE2B bd450dd8e02ed513d1d9a2546220e91556ccdc46a515bd41ca1450f9f36c602e25a36830c65211dcf87946b1dd028a474c84638e3f1039d83b4cc048b7100e33 SHA512 0c47890e11f7b3d2fcfb1469213dcb2f7103ff7f3460968dee8d4ce54bb0fe7efd80e0604a5a6ed5cbfb0c47fe68f43b02b6c653ea2401707bb9f318a6ddfddc
+DIST mill-bin-0.10.4 68195230 BLAKE2B 922604123641ea130da1fbc30e6fdbf768479cdee61f8ca9443f4a96f2d9a3608c2377741716c2f942c29cf40c10f23f3cd24255221d7095060c89c5cde7b8f3 SHA512 2141159fd88866ba3c3abf05af0d7b2bbd89b901a16a29e51b6baefbb94fe68afc4b5c83cf18d289279dbb142b47eadd5ec225a72059be9fa6fc0594b0c130af
+EBUILD mill-bin-0.10.4.ebuild 480 BLAKE2B 975ae40b61d1aee9e011cd04fddac1b6adfb788cfb6218648284330e1d936611b73473e82383524e4be1a4ce6bff26bcc047bfb1ab9c67c9c646a85d892bdff4 SHA512 1625db9ae485f31f37033d30c5de765850f77a57d22f772645c38de7077f87431d41826241e108b9f8deab2d8e04bea4b98e7aeaba35a13ca1693888b6d1e67f
 MISC metadata.xml 464 BLAKE2B b60279b753026e5ba2247448a3e009a02b1d017cd3269fbf518783dc7f0a59adfdea03201123891d113da14f9d5a3cafd66628d71037064387086b622412994f SHA512 d7eeb833078c86092aaebc30a92d5029aea2ecbd1274c0f8eb86bc9015bf1bd1a2ab91b50ee0fc9816a661ace9635f4c06e9dcfb9d0bf1402b6f94867eb4e505
diff --git a/dev-java/mill-bin/mill-bin-0.10.1.ebuild b/dev-java/mill-bin/mill-bin-0.10.1.ebuild
deleted file mode 100644
index e8485c57dfd6..000000000000
--- a/dev-java/mill-bin/mill-bin-0.10.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN%-bin}
-
-DESCRIPTION="A Java/Scala build tool"
-HOMEPAGE="https://com-lihaoyi.github.io/mill/"
-SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	newbin "${DISTDIR}"/${P} ${MY_PN}
-}
diff --git a/dev-java/mill-bin/mill-bin-0.10.2.ebuild b/dev-java/mill-bin/mill-bin-0.10.2.ebuild
deleted file mode 100644
index e8485c57dfd6..000000000000
--- a/dev-java/mill-bin/mill-bin-0.10.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN%-bin}
-
-DESCRIPTION="A Java/Scala build tool"
-HOMEPAGE="https://com-lihaoyi.github.io/mill/"
-SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	newbin "${DISTDIR}"/${P} ${MY_PN}
-}
diff --git a/dev-java/mill-bin/mill-bin-0.10.3.ebuild b/dev-java/mill-bin/mill-bin-0.10.3.ebuild
deleted file mode 100644
index e8485c57dfd6..000000000000
--- a/dev-java/mill-bin/mill-bin-0.10.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN%-bin}
-
-DESCRIPTION="A Java/Scala build tool"
-HOMEPAGE="https://com-lihaoyi.github.io/mill/"
-SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	newbin "${DISTDIR}"/${P} ${MY_PN}
-}
diff --git a/dev-java/mill-bin/mill-bin-0.10.0.ebuild b/dev-java/mill-bin/mill-bin-0.10.4.ebuild
index 4b4375e44bc5..4b4375e44bc5 100644
--- a/dev-java/mill-bin/mill-bin-0.10.0.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.10.4.ebuild
diff --git a/dev-java/mimepull/Manifest b/dev-java/mimepull/Manifest
deleted file mode 100644
index 657f29265733..000000000000
--- a/dev-java/mimepull/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mimepull-1.9.6.jar 68382 BLAKE2B a59c4837dd82fa2a1e67e653870ead62c6db6ede03690eb483724d2a9bdb588e34145eff604b372a417cda12a1f4074741630e47b3acd81f438145c938d04578 SHA512 528eb77d6edbbfb1b1d8aebb617f9d20c84b9c18f7ab763163ea136c3898319519bbfa8a8e204bd0697a4eac9b964eaf3fb2ee214555efcb3da152ebf467ae64
-EBUILD mimepull-1.9.6-r2.ebuild 483 BLAKE2B 7b6e313d2c2a2c22f1614e5cc763f67df0cd11e97baeb8c3b2d6bc233d6d7589e15bcef64a4b2c7b49272c60c67ae54bd3fc5a6bba3b60ad9862437902902472 SHA512 b6032922753ed84bc7a0b5cb10e58925a7fb282a230acfa3d7958a5ed5a042f69375c61cd707c6ba84b63b0af553dfb6ac2acaf1902aac158a5643a6fbba888d
-MISC metadata.xml 574 BLAKE2B f2c996ad8b3e45ec0c21519cf4e38e9caa0b7e3923c7ee4246caa54caae535fb03ad54b5dfcb7eb1d7ec552e6174ed63f15ef4226b97bc02dfa079bf00774c69 SHA512 ffbfaabc3d28a733ca2d5313d2c9a920f4ef3b8208fabe6190580c4bfe10a984a786e20ec89fe5f81eb454483242cfd1af4478bc1ea9f7173ee36c9c5fb9c03e
diff --git a/dev-java/mimepull/metadata.xml b/dev-java/mimepull/metadata.xml
deleted file mode 100644
index 264d6a6ccdcf..000000000000
--- a/dev-java/mimepull/metadata.xml
+++ /dev/null
@@ -1,14 +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>
-	<longdescription lang="en">
-		This provides a streaming API to access attachments parts in a MIME message.
-		Often times, a large MIME message cannot be loaded into memory. Hence the
-		whole message or attachment parts are written to a file system and access to
-		the attachment parts is provided using those files.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-java/mimepull/mimepull-1.9.6-r2.ebuild b/dev-java/mimepull/mimepull-1.9.6-r2.ebuild
deleted file mode 100644
index 87dee3af3282..000000000000
--- a/dev-java/mimepull/mimepull-1.9.6-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Pull API for parsing MIME messages"
-HOMEPAGE="http://java.net/projects/mimepull"
-SRC_URI="https://repo1.maven.org/maven2/org/jvnet/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.7"
-
-RDEPEND="
-	>=virtual/jre-1.7"
diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest
index 4e1ed65cee79..9416dd57ee54 100644
--- a/dev-java/mockito/Manifest
+++ b/dev-java/mockito/Manifest
@@ -1,5 +1,9 @@
 DIST mockito-1.9.5.zip 6453870 BLAKE2B b577c4a82f03b5c345462ecc10e9fe25c03836d08d57d633d95a1eaba17f52d4306603f50f332df360d0a4880c85c65bad4503503df0acad8f7b437694a2b887 SHA512 93768992c74fbc2e2653b46b3afb526ab816b9c707cb5f9608564299ffd206e256182be146c590b4777a624379f576d7117ed7d43b11f8d2974e87c402eede51
 DIST mockito-4.4.0.tar.gz 1030274 BLAKE2B 41b64456b8bf083f69889fdf7fb891a0bb790af8eb897fd0ba5ceca47050944fec102c33badcf6a68621a9fadc33439405b9ca307794f865637c3143c474ba3d SHA512 f0f4c3f585aad63a357d8b8f924124961e7fffdf95607945ae073ab32a05be6ff08794d3edfc60dea21b65ef7c827a4872315c2372d6a9aa822cf8700a08025f
+DIST mockito-4.6.0.tar.gz 1030497 BLAKE2B 0afc0f5874acbd290312a7eee2ce8b9f7d1a83da12338ff8851e02cd6a9ed0c99bfc109fade5ddfec5f9a5277ffaa0d04c53a726c31082dc53b512a2e551473b SHA512 18f76788e610ca169cf6b4eefd0fdd78c333b920122115d816d1f2ab94f0a84d5a9fd0d00d41d1c34e592c5634f7ac55f7f491061b7992d18aa69f3fc62561b6
+DIST mockito-4.6.1.tar.gz 1031362 BLAKE2B 52768ead8770c701f5e5b698f9c35e8e189b57979d90b231b434aba57f6f1f167e5f1491eec53280ce29410add31ac41e81b3637257f58709162cc3c5307ed27 SHA512 f16454f3baba2e55a6da229d7719359357b2641cf4abaf3c0e5f5cac6999325ac4a9c08d815a02939c1ef62831745162935bb8d03177a27b0d972600a92fc1f7
 EBUILD mockito-1.9.5-r2.ebuild 892 BLAKE2B 5efb72fdf28d793ad9cfd14ee41b58b4ef9d9bdd21b638657ea9ea77444443a68e51177a992b2f3f48e13c56ab68a3821368fd6eb287182d2f60ada628cf6ff0 SHA512 44e08dcbe481a4bcf964227cf2c741403aa799ef98065b7f8f490451d15daa286f01cc944546875cfbc92844427ad2ccb305e44ed5dfa06fa5f04e673146c8a1
-EBUILD mockito-4.4.0.ebuild 1238 BLAKE2B 1e7ec3663d07e3eaa70b452a8f91fe19dc3a357e7d2203fd0464d6773d4b4b0b577f0494af57af86c2c767c5edb8c633e2a65c3b54be54cd6577c331e4560732 SHA512 f9054dce19d3ba277c00c937296df0e454b96cfb92c22e4771811ed4e80ee12c60db38f1a6cc7b75b7a3153f30a460d2cd848ff7caa535c1869db733ecfeb407
-MISC metadata.xml 369 BLAKE2B 020d7c2b9c3074a24bb20151033dcf3deec8c5b27b9aa42da5d1aec9e25a8e405ff13d79fe3491110f22dba9ab7840305a65f523ac35a6882f5c6b9b18cbce13 SHA512 699c652ccd5437fa7449fc8433d3760a9b515db6bdc692ca88166757abbe8330cda485cd8c545cd95c844507400bfc7a1576310275609cf0100bd245ff8a8ca8
+EBUILD mockito-4.4.0.ebuild 1234 BLAKE2B 3b0d2fb7e8632c09c532d0a47b199bbf5159c855854d4ecaf36b72804e39bad146a38c5966e30a2199458e296a750a14357175f9b3be79e09ac6f1f1f1a226b6 SHA512 adfb0bf0c83078cd8a9bca1917c99f3128c0b8e876359a170d5d16f15cbfb3805484dd42acc8b63a76bfd8b9dd49d5f2b90cd30c6e4ffe74265d74089a09818e
+EBUILD mockito-4.6.0.ebuild 1237 BLAKE2B d1617ef96068aa664e3f1b75ff6d9128682c36c6a20c0aa1f291a283a5ccd63c45809bbf0a80271f2a6179ea44a04e437e611578e98a648c768bd750f861f1db SHA512 1f99f9ddb864787c3c6d9c7c613d24f61475122f7da98869a65bc0978f3bb1a48de118389c862a7368b6ed7af5523cdf8f216e44e31b683eaa183316c7225778
+EBUILD mockito-4.6.1.ebuild 957 BLAKE2B 3894338d4b760bcdb9e3394122a5bc581e234eb3241af9415804f1af2d0a97ad10292663973374f4185d25eac5309b502d214ae95dc96b7c853601bfd1bdb169 SHA512 f5203b10e1f2a8389923d14ca3926b4dfdb4aa76a12428d3d6e88d37286614be5fecd887d39637b2f1c45fa35ea55017392e6abb39eb159640d50b99c11968b3
+MISC metadata.xml 317 BLAKE2B 209b27a429c1fdeca71c1e215f8fc43bfc66c961b1a3ad3dfcda16d5ea1df51e54cea248f4f152966aa1f91059b91c21fb734c6995f8033150dbda5e1813d121 SHA512 1f7be64d432b4004d2bbf1ec2c6776ec8618875356ea0308b8409f322d48bf3440d692732406ddb3fa7a273c9754c4cc5a6f6cd9808348d0ba8beb7159887a5b
diff --git a/dev-java/mockito/metadata.xml b/dev-java/mockito/metadata.xml
index cb23ba0fb054..a48a1160ecfd 100644
--- a/dev-java/mockito/metadata.xml
+++ b/dev-java/mockito/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="google-code">mockito</remote-id>
 		<remote-id type="github">mockito/mockito</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/mockito/mockito-4.4.0.ebuild b/dev-java/mockito/mockito-4.4.0.ebuild
index f8a554b3ba6b..676fcb4d2985 100644
--- a/dev-java/mockito/mockito-4.4.0.ebuild
+++ b/dev-java/mockito/mockito-4.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://codeload.github.com/mockito/mockito/tar.gz/v${PV} -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: ${PN}-core-${PV}.pom
diff --git a/dev-java/mockito/mockito-4.6.0.ebuild b/dev-java/mockito/mockito-4.6.0.ebuild
new file mode 100644
index 000000000000..f586f9b27a4f
--- /dev/null
+++ b/dev-java/mockito/mockito-4.6.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Tests not enabled, wants junit-jupiter.
+# "${S}/settings.gradle.kts"
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.mockito:mockito-core:4.6.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Mockito mock objects library core API and implementation"
+HOMEPAGE="https://github.com/mockito/mockito"
+SRC_URI="https://github.com/mockito/mockito/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: ${PN}-core-${PV}.pom
+# net.bytebuddy:byte-buddy:1.12.8 -> >=dev-java/byte-buddy-1.12.8:0
+# net.bytebuddy:byte-buddy-agent:1.12.8 -> >=dev-java/byte-buddy-agent-1.12.8:0
+
+CP_DEPEND="
+	dev-java/byte-buddy:0
+	dev-java/byte-buddy-agent:0
+	dev-java/junit:4
+	dev-java/objenesis:0
+	dev-java/opentest4j:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+# Runtime dependencies
+# POM: ${PN}-core-${PV}.pom
+# org.objenesis:objenesis:3.2 -> >=dev-java/objenesis-3.2:0
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	einstalldocs # https://bugs.gentoo.org/789582
+}
diff --git a/dev-java/mockito/mockito-4.6.1.ebuild b/dev-java/mockito/mockito-4.6.1.ebuild
new file mode 100644
index 000000000000..6b2aaec5f590
--- /dev/null
+++ b/dev-java/mockito/mockito-4.6.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Tests not enabled, wants junit-jupiter.
+# "${S}/settings.gradle.kts"
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.mockito:mockito-core:4.6.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Mockito mock objects library core API and implementation"
+HOMEPAGE="https://github.com/mockito/mockito"
+SRC_URI="https://github.com/mockito/mockito/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/byte-buddy:0
+	dev-java/byte-buddy-agent:0
+	dev-java/objenesis:0
+	dev-java/opentest4j:0
+"
+
+DEPEND="
+	dev-java/junit:4
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/${P}"
+
+JAVA_CLASSPATH_EXTRA="junit:4"
+JAVA_SRC_DIR="src/main/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	einstalldocs # https://bugs.gentoo.org/789582
+}
diff --git a/dev-java/netty/Manifest b/dev-java/netty/Manifest
index 8c76a1116395..9a8eca0d8af1 100644
--- a/dev-java/netty/Manifest
+++ b/dev-java/netty/Manifest
@@ -1,3 +1,4 @@
 DIST netty-4.1.35.Final.tar.gz 2447958 BLAKE2B 133adc2b37d3e681d11ac2e0187c0f79bb7aeeb6c622a1bf6e66a35bb78cd5730eeeffccfb960948f2e1df5dfadaa44f62b6f354c03065493ae43e1399a5ba2e SHA512 c3ba4e34ae9d309118ff3517467ffc218136789b06287d747b57df08be84779dacf5e29b19157afecd759a3516bc346e434295291b3dd546f80c4ae7c3f0a3ca
-EBUILD netty-4.1.35.ebuild 5857 BLAKE2B e49556f1ec09208ba8e06631a075d0763c11c7e30928520756653378a84e9e58b23c4f013bfc75a9fb984b34581317ea1afc89113ed630bc61ac793687f09b5f SHA512 1ad81114c4e8c7c5bfe30dff43b0b2d768280bac5f30216d8f07c10a9104199efacfe8a64c9c77064b6d5f47627f1ebd8878bf3e900b3c308edb224a0c1a6a87
+EBUILD netty-4.1.35-r1.ebuild 5857 BLAKE2B 90e00e4ad92865522a5bc5a070aabb8f0980a49ea884d03dcb8af57c3310dabdded6d38b3d7bc403cfa2cb3a59abbf0e57c9c6ea58f2262a3d570d53fb9d2c6f SHA512 9049cfe4ecdacd07d3663df68c5f67aea1655154468ffd835efc9415034573e252f0b1a24089458550bc7e02ea45ac75e4661203e954974b72bf753af9a726ba
+EBUILD netty-4.1.35.ebuild 5853 BLAKE2B a6f9664df891175234eb940606a8232a32ac7dbec4e6a2522bfabd0cc30cdfe7126e7c000f05460ba62791e9402c6bf2791b28180ce6844017fc9efa525db048 SHA512 2e5ddf7410b4f26b7559fd192dcc3242ccc4f84470a09abbc8a387a4c7a56fa2c62abf07619a83b82b8f10937d7589cde4e508ba61b18df9f9d1ca8dac0d74a3
 MISC metadata.xml 507 BLAKE2B 821a563701bddd615a49743269e82ef5f906d5f30d957accbba10cda171b3a8943911733247e05efc9c28b40fd75396e78c2b28c3297a74b15ea8b716dc50ad1 SHA512 5c237af46f2d99e807ad5d442c83af2d1bbd85f3d3ed71e5dc3595c91d2e8104e5025216911e74901817cfd495eb6e96e22248bd1a05c90018c7d13b99d1d494
diff --git a/dev-java/netty/netty-4.1.35-r1.ebuild b/dev-java/netty/netty-4.1.35-r1.ebuild
new file mode 100644
index 000000000000..fdac02193f25
--- /dev/null
+++ b/dev-java/netty/netty-4.1.35-r1.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom common/pom.xml --download-uri https://codeload.github.com/netty/netty/tar.gz/netty-4.1.35.Final --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild netty-4.1.35.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="io.netty:netty:4.1.35.Final"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Async event-driven framework for high performance network applications"
+HOMEPAGE="https://netty.io/"
+SRC_URI="https://github.com/netty/netty/archive/refs/tags/netty-${PV}.Final.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+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.
+# Further modules might be added to the array.
+NETTY_MODULES=(
+	"common"
+	"resolver"
+	"buffer"
+	"transport"
+)
+
+# Common dependencies
+# POM: common/pom.xml
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+# log4j:log4j:1.2.17 -> >=dev-java/log4j-1.2.17:0
+# org.apache.logging.log4j:log4j-api:2.6.2 -> >=dev-java/log4j-api-2.17.1:2
+# org.jctools:jctools-core:2.1.1 -> !!!suitable-mavenVersion-not-found!!!
+# org.slf4j:slf4j-api:1.7.21 -> >=dev-java/slf4j-api-1.7.32:0
+
+# "Failed to load class org.slf4j.impl.StaticLoggerBinder"
+# Using slf4j-simple instead of slf4j-api solves it.
+# https://www.slf4j.org/codes.html
+CP_DEPEND="
+	dev-java/commons-logging:0
+	dev-java/jctools-core:3
+	dev-java/log4j-12-api:2
+	dev-java/slf4j-simple:0
+"
+
+# Compile dependencies
+# POM: common/pom.xml
+# test? ch.qos.logback:logback-classic:1.1.7 -> !!!groupId-not-found!!!
+# test? io.netty:netty-build:25 -> !!!artifactId-not-found!!!
+# test? io.netty:netty-dev-tools:4.1.35.Final -> !!!artifactId-not-found!!!
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.logging.log4j:log4j-core:2.6.2 -> >=dev-java/log4j-core-2.17.1:2
+# test? org.hamcrest:hamcrest-library:1.3 -> >=dev-java/hamcrest-library-1.3:1.3
+# test? org.javassist:javassist:3.20.0-GA -> !!!groupId-not-found!!!
+# test? org.mockito:mockito-core:2.18.3 -> >=dev-java/mockito-4.4.0:4
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		dev-java/javassist:3
+		dev-java/hamcrest-library:1.3
+		dev-java/logback-classic:0
+		dev-java/log4j-core:2
+		dev-java/mockito:4
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/netty-netty-${PV}.Final"
+
+JAVA_TEST_GENTOO_CLASSPATH="hamcrest-library-1.3,javassist-3,junit-4,logback-classic,log4j-core-2,mockito-4"
+
+# There were 12 failures:
+# 1) testCompositeDirectBuffer(io.netty.buffer.ByteBufAllocatorTest)
+# java.lang.InstantiationException
+#         at java.base/jdk.internal.reflect.InstantiationExceptionConstructorAccessorImpl.newInstance(InstantiationExceptionConstructorAccessorImpl.java:48)
+#
+# FAILURES!!!
+# Tests run: 10015,  Failures: 12
+
+# There was 1 failure:
+# 1) initializationError(io.netty.channel.BaseChannelTest)
+# org.junit.runners.model.InvalidTestClassError: Invalid test class 'io.netty.channel.BaseChannelTest':
+#   1. The class io.netty.channel.BaseChannelTest is not public.
+#   2. Test class should have exactly one public constructor
+#   3. No runnable methods
+#
+# FAILURES!!!
+# Tests run: 10277,  Failures: 1
+
+JAVA_TEST_EXCLUDES=(
+	"io.netty.buffer.ByteBufAllocatorTest"
+	"io.netty.channel.BaseChannelTest"
+)
+
+src_prepare() {
+	default
+
+	sed \
+		-e 's:verifyZeroInteractions:verifyNoInteractions:' \
+		-i buffer/src/test/java/io/netty/buffer/UnpooledTest.java \
+		-i transport/src/test/java/io/netty/channel/CompleteChannelFutureTest.java || die
+
+	# transport/src/test/java/io/netty/channel/PendingWriteQueueTest.java:262: error: reference to assertEquals is ambiguous
+	#         assertEquals(1L, channel.readOutbound());
+	#         ^
+	#   both method assertEquals(long,long) in Assert and method assertEquals(Object,Object) in Assert match
+	rm transport/src/test/java/io/netty/channel/PendingWriteQueueTest.java || die
+}
+
+src_compile() {
+	local module
+	# We loop over the modules list and compile the jar files.
+	for module in "${NETTY_MODULES[@]}"; do
+		JAVA_SRC_DIR=()
+		JAVA_RESOURCE_DIRS=()
+		JAVA_MAIN_CLASS=""
+
+		JAVA_SRC_DIR=(
+			"$module/src/main/java"
+			"$module/src/module"
+		)
+
+		# Not all of the modules have resources.
+		if [[ -d $module/src/main/resources ]]; then \
+			JAVA_RESOURCE_DIRS="$module/src/main/resources"
+		fi
+
+		JAVA_JAR_FILENAME="$module.jar"
+
+		einfo "Compiling netty-${module}"
+		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 "${NETTY_MODULES[@]}" ; do
+			# Some modules don't have source code
+			if [[ -d $module/src/main/java/io ]]; then \
+				JAVA_SRC_DIR+=( "$module/src/main/java" )
+			fi
+
+		done
+
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+	local module
+	for module in "${NETTY_MODULES[@]}"; do
+		JAVA_TEST_SRC_DIR="$module/src/test/java"
+		JAVA_TEST_RESOURCE_DIRS=()
+
+		# Not all of the modules have test resources.
+		if [[ -d $module/src/test/resources ]]; then \
+			JAVA_TEST_RESOURCE_DIRS="$module/src/test/resources"
+		fi
+
+		einfo "Testing netty-${module}"
+		java-pkg-simple_src_test
+	done
+}
+
+src_install() {
+	einstalldocs # https://bugs.gentoo.org/789582
+
+	local module
+	for module in "${NETTY_MODULES[@]}"; do
+		JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' $module/pom.xml )
+		java-pkg_dojar $module.jar
+
+		# 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
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+}
diff --git a/dev-java/netty/netty-4.1.35.ebuild b/dev-java/netty/netty-4.1.35.ebuild
index 16ffa4df654d..a59641a77cb8 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 ~arm ~arm64 ~ppc64 ~x86"
+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 91e158934cfb..0058f9cff8f7 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,46 +1,25 @@
 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.14_9.tar.gz 189849188 BLAKE2B e4d5d5d20b54642cec8941bbfb2a8523ed4f12185bed235d2dded02eca4ef6628ed5b8e36f614278ecad966b2c7cb4ab3b74d696b10718f56faf83834de424db SHA512 299478112d15b335d2cc802e8bcac3a00eb55cfedacbc0c62e462277dce10bfd45de789d760650171a064a574834b2c24e31e70914d63e82362da190e417105d
 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_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_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_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 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_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_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_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_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_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 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_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_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_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_linux_hotspot_8u332b09.tar.gz 102918585 BLAKE2B 55d7ef116ee28f37ab1a96cb8ffe021d1784b208ad248e78d6f0a7f22429364364e00ef17fe6159fac2fde6a0765a20125db6ce17694992dbc9e3b3e054adddf SHA512 9f387fb8b872b65fc6a545151c185b9ad1aaac7ad7cffac4d2b936dedbca116a7d74e56754353ffa4caed394497ca659852f0e5e3803ead10f8fa95d562e28a8
-DIST OpenJDK8U-jdk_x64_mac_hotspot_8u322b06.tar.gz 108075347 BLAKE2B 89c81377516b737e1ce096b66c8460c86f77229c8a7021471e6c67ae738c99183dbe4e5d868de0de5251cca9eb5bcf888f88526a8390a56eb33bb6270038ebfb SHA512 5f9e6036ca72b015609c503b8446b79013dd4aac09349e3c65c9df0e91e2541f3672d867006cd1f236cdd8a60e16671c6e4423d5d6e85a5a31f6f97f1d168434
 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-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-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
+EBUILD openjdk-bin-11.0.15_p10.ebuild 3182 BLAKE2B 7a69eea6d0fe18d082089da07e380642b1a96ee24d880359add46f561ceba1d09bc5832a83c608151b9532d79b527692fb40885644f82d3dbd3ec2c2fc5114c1 SHA512 9c81f9719bf9ad90e0c4def9268366b8a4b047737d2fd7b20e3e11ccbf2c7cbb23a35b49856798d16ce2b58eb7b051bc4cf9269fc8c3892a1d8fea2eaf2c570c
+EBUILD openjdk-bin-17.0.3_p7.ebuild 3242 BLAKE2B 61c0fb7383d50fce196696510825ee9f351220b559a485b11662b19db3180e1861db96afee6d4205ed5444147fb546263b8bcac49669c05055419e4281b4564f SHA512 ebdcbcf5a3592397cec79eb66ac1c2c1ae68d18e402c274ee861d2c5c69c4ac1ad64d3114efabab6f54e6e6f76f18d981a5f9a179802e56685ef4f6f4a96cbfb
+EBUILD openjdk-bin-8.332_p09.ebuild 3033 BLAKE2B 80676ac6890b24143dd2cdd49f0f308921dcfaed61b4ac89fad69125aa7e3c51b73400bd32411d62805a170ab494511e35e444e30608cc726ac602a4404010b1 SHA512 6555e6b3dd707622012f14bf96576d493e150ea8a2f9c0eb75bd90d1f4d4319e8d9e4ebde6b0f785be538c1fac85a76fd11d24dd9b3debbb353e8decfffd5636
 MISC metadata.xml 941 BLAKE2B 16002011c075cd453721b20649521e7370b0835939bf228e3a66cb6994b98d11ee2b0074bd9ead474c8787301d2be44a2c05d2d49c09b3f2767995153c37a69a SHA512 37681cf8ecc00361d9bc3ab5b26defae227a1d95aec0a5f51b39d412e1d4f62bc3c9db0c1296b394c02f81f0b8eb052ea85212eed0319991f372525c0bf26b09
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild
deleted file mode 100644
index 2a69b6b5e04c..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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}? (
-		${musl:+ elibc_musl? ( }
-			${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
-		${musl:+ ) } )"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri arm)
-	$(abi_uri aarch64 arm64)
-	$(abi_uri x64 amd64)
-	$(abi_uri x64 amd64 musl)
-	$(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"
-IUSE="alsa cups 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
-		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 )
-		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 -r /etc/ssl/certs/java/cacerts "${dest}"/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
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild
index 81cd7dd0c1fe..1bb314be9d5d 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild
@@ -27,7 +27,7 @@ abi_uri() {
 }
 
 MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
+SLOT=$(ver_cut 1)
 
 SRC_URI="
 	$(abi_uri arm)
@@ -41,7 +41,7 @@ SRC_URI="
 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 headless-awt selinux source"
 
 RDEPEND="
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild
deleted file mode 100644
index 69156e432327..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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}? (
-		${musl:+ elibc_musl? ( }
-			${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
-		${musl:+ ) } )"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri aarch64 arm64)
-	$(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"
-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
-		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 )
-		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 -r /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
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break"
-		ewarn "many java ebuilds as they are not ready for openjdk-${SLOT}"
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
index ebe4afd00a4e..1ad02aaacb18 100644
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
@@ -27,7 +27,7 @@ abi_uri() {
 }
 
 MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
+SLOT=$(ver_cut 1)
 
 SRC_URI="
 	$(abi_uri aarch64 arm64)
@@ -42,7 +42,7 @@ SRC_URI="
 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="
@@ -133,16 +133,4 @@ src_install() {
 
 pkg_postinst() {
 	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break"
-		ewarn "many java ebuilds as they are not ready for openjdk-${SLOT}"
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
 }
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild
deleted file mode 100644
index 1c0861a84f55..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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 arm)
-	$(abi_uri aarch64 arm64)
-	$(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.332_p09.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild
index 03a1e6a2e354..aad1888ca56b 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild
@@ -21,7 +21,7 @@ abi_uri() {
 # 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)"
+SLOT=$(ver_cut 1)
 
 DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
@@ -34,7 +34,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
 
 IUSE="alsa cups examples headless-awt selinux source"
 
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index b85f1bf54c06..104cfe866c92 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -7,8 +7,8 @@ DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.3_7.tar.gz 45971131 BLAKE2B dc8a358b1
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz 41317897 BLAKE2B b96b39d4b3f7fe54f9b04698d4f24879ce617e61ade298b7de1472cb85fbf7d5f297f009c0e881a17bcdaf9baaf3187acef531b0ace97a1f2ab099811995c815 SHA512 4a3acc1330056011f0097aaca77858779e2c89d214598ef66736956984204b8de804549e42c51f8392806753f3d534d34ad93ef6df9f2f45a369e04f6a0694ac
 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-11.0.15_p10.ebuild 2020 BLAKE2B ede152b4e3c5ec4b1c6ddbd84aa88bcce55e87bb64a57cd7a938b3f31637e243865c60f0d59dbcea7723ecafdc90f23ab1b9997d1740964ecdf807dc1a9eb68b SHA512 08dca400daa7635cd744321d683e655c6f59a6f01897fa7e46389062b72bd08ddde42f99fa4fc0c79defd9d13e2675b675907abc08ba7c6ad8c8f0cf12a2b234
+EBUILD openjdk-jre-bin-17.0.3_p7.ebuild 2020 BLAKE2B ede152b4e3c5ec4b1c6ddbd84aa88bcce55e87bb64a57cd7a938b3f31637e243865c60f0d59dbcea7723ecafdc90f23ab1b9997d1740964ecdf807dc1a9eb68b SHA512 08dca400daa7635cd744321d683e655c6f59a6f01897fa7e46389062b72bd08ddde42f99fa4fc0c79defd9d13e2675b675907abc08ba7c6ad8c8f0cf12a2b234
 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
+EBUILD openjdk-jre-bin-8.332_p09.ebuild 1832 BLAKE2B 31dd2783dad44148857303b74c82b556d1360338b80747f36fc19052c5091ba7106837777b6bfffb088b5c31fc4072529cdea994cfc35b4f56bc032d5830a000 SHA512 df9a819e9673d952422d9dcee7d1f901cde3982dae1e64ce4ddce39b28ae7eae96d1598718c311412d9727a977ad4ed1233e43c933564ef0e9afd7fc97817d56
 MISC metadata.xml 896 BLAKE2B db8489d7738bb5444ee789ae0dc516941ece1b814ce4c4d0e12284e4027315aa20b141027ca6db8aae7ab6580d881e79bcb1b4dffa8a890f75da6d7177c7c279 SHA512 8833e637b8b935247972eaf7afbf3787cc17013080d9747defad4784ea89c2b147d0f2284327e9ade30100594a0d1e638f0ecd01f0375101372028dbfd0b31a3
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
index a6f7f3ee248b..d7a2d14be024 100644
--- 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
@@ -21,7 +21,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa cups +gentoo-vm headless-awt selinux"
 
 RDEPEND="
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
index a6f7f3ee248b..d7a2d14be024 100644
--- 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
@@ -21,7 +21,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa cups +gentoo-vm headless-awt selinux"
 
 RDEPEND="
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.332_p09.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.332_p09.ebuild
index d4b6279fcfac..f337effa4a4f 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.332_p09.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"
 
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index d9f715915b5f..b568df030486 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -3,11 +3,9 @@ AUX openjdk-17.env.sh 537 BLAKE2B 64ef0f37bc0fb1f20d5f30751727e8f70a0460ad5917a9
 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.14-riscv.patch.xz 279088 BLAKE2B f67cf5707246b22285de8217b68fb806e3c18b7289cb81428c0fe83c5a4dcd60233be10aaca0853ffb00ac24fa60cae1b1d60ed300ad6bff8b07e881bddf8650 SHA512 32bac5f0c0f5df883de344718586bf798db6c8a5738058ea5d4902f5a0a3fc841c1893dec3379a74b9468c1c37af5c31a3e296476549972d3f1305401354060d
-DIST openjdk-11.0.14_p9.tar.gz 122803178 BLAKE2B 521d7829b34fa4f9a143c51d61c339c8c7455f12c4f04eda4fdd687dafa842f2a1b1adfe2e897fecdfa4e1c3ee484ec0e3aaf38ab9246f20cd24e7185db6ba25 SHA512 3285d13ba0fbbfd4f1a676b0f099b0742527ff556edfc3387913b59b64126bdfecd2697d7ac83634ed7160adf46edca3b5b2c33d94e9dca068752da5b9d70837
 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-17.0.3-riscv.patch.xz 296268 BLAKE2B 5c3b43f160009144636becd6aae19559e8f03e4d6461f89c1b6c472e63c6f4c2c6064bb3dc24c825814e7d6cc927f66fe96793bd2c71a80e2b535eec0f685278 SHA512 1c2de73051a665ada6a12bb6f92f18b1d9366990cea403063d20937ac97c288f923746a0d094273ad7f7238cef1ebe1790c0f0ffe7e7acc07ad08ebc6a7ea085
 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-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
@@ -15,10 +13,8 @@ DIST openjdk-bootstrap-11.0.14_p9-riscv.tar.xz 104601676 BLAKE2B 5f976e8a626a829
 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
-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-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
+DIST openjdk-bootstrap-17.0.3_p7-riscv.tar.xz 113344052 BLAKE2B 69ae326c600ecf1840a0874b1e26545779434b979e195a3bc7975615f873cd9ffce324f291e56a2800edc304447845baec774b2a08964afde274bd8e0dd3f704 SHA512 4a483faa32b26758f6fae605fdb3d3b77814c627a3a560e91ca88e2d36a88543a53f019a59b5a6456b87ca671e8b7129d5766210bd5cd52125cb3a040ec2a23f
+EBUILD openjdk-11.0.15_p10.ebuild 8055 BLAKE2B b7ee4a2829c09ff6e3dc5e4f3bbe4c5b7886abb7acd0af79a64b2597e6f1086fcf85f4a4d1b2f9b677ee57e513891360b422bb253fd5b020cbdc57b3e4e39223 SHA512 f6d2df498dbb520c5d36bb66f6efb21248779d17af56472067ec0ebe6d66aa9f78cb15407ecb407f57606337d65c1f4e8b44b7252e8052ba05a6eeac28bda3da
+EBUILD openjdk-17.0.3_p7.ebuild 8776 BLAKE2B 7ca888ca4072ab64c95e423db4493d56752bb9278232ac240e23f45a6139eb0d27410616f966ee95b3438b832e5382ff3e984a71cb64f32bd3c91cc0181b9f1c SHA512 76ca1ca4232057e36e6b16c866837d97b0215bc81c77f23f94c363229af95c30e17b8ef08f4da78a94733e3aae34403d0fed54a8ce5722eee0e514985ce9b83a
+EBUILD openjdk-8.332_p09.ebuild 5855 BLAKE2B 18c709101374aefadc63785c8930de08319deca6ea6ce7d54929dc269d571253bad6638317c1f33373678c3e58d39233e98d85b5610eb5bf2124d30314672c33 SHA512 ade8377a8efa05bb475cc251960cef4ebe7d068ab0e5f435fbede1530095490ae04f216346d759557635b8697f846d3ec03465853cf5aa9a397491e072ec7cf5
 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
deleted file mode 100644
index fa243d77955b..000000000000
--- a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/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 ~riscv x86"
-
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
-
-REQUIRED_USE="
-	javafx? ( alsa !headless-awt )
-	!system-bootstrap? ( jbootstrap )
-"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	media-libs/harfbuzz:=
-	media-libs/libpng:0=
-	media-libs/lcms:2=
-	sys-libs/zlib
-	virtual/jpeg:0=
-	systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	javafx? ( dev-java/openjfx:${SLOT}= )
-	system-bootstrap? (
-		|| (
-			dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
-			dev-java/openjdk:${SLOT}[gentoo-vm(+)]
-		)
-	)
-"
-
-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
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${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
-		[[ ${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.
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Work around -fno-common ( GCC10 default ), bug #713180
-	append-flags -fcommon
-
-	# Strip some flags users may set, but should not. #818502
-	filter-flags -fexceptions
-
-	# Enabling full docs appears to break doc building. If not
-	# explicitly disabled, the flag will get auto-enabled if pandoc and
-	# graphviz are detected. pandoc has loads of dependencies anyway.
-
-	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="${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"
-		--with-vendor-bug-url="https://bugs.gentoo.org"
-		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-		--with-vendor-version-string="${PVR}"
-		--with-version-pre=""
-		--with-version-string="${PV%_p*}"
-		--with-version-build="${PV#*_p}"
-		--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
-		# build system compares mesa version in md file
-		# https://bugs.gentoo.org/822612
-		export LEGAL_EXCLUDES=mesa3d.md
-
-		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
-		if [[ -r ${zip} ]]; then
-			myconf+=( --with-import-modules="${zip}" )
-		else
-			die "${zip} not found or not readable"
-		fi
-	fi
-
-	if use !system-bootstrap ; then
-		addpredict /dev/random
-		addpredict /proc/self/coredump_filter
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-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 product-images)
-	)
-	emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/jdk || die
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	# must be done before running itself
-	java-vm_set-pax-markings "${ddest}"
-
-	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
-	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
-	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/*
-		dosym8 -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild
index cb5035667c42..c9dc36e2d7bd 100644
--- a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild
@@ -43,7 +43,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~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"
 
@@ -130,6 +130,8 @@ pkg_setup() {
 	openjdk_check_requirements
 	java-vm-2_pkg_setup
 
+	[[ ${MERGE_TYPE} == "binary" ]] && return
+
 	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
 	JAVA_PKG_WANT_SOURCE="${SLOT}"
 	JAVA_PKG_WANT_TARGET="${SLOT}"
@@ -142,7 +144,6 @@ pkg_setup() {
 			fi
 		done
 	else
-		[[ ${MERGE_TYPE} == "binary" ]] && return
 		local xpakvar="${ARCH^^}_XPAK"
 		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
 	fi
diff --git a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
deleted file mode 100644
index 501c0e15b4d2..000000000000
--- a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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/${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 ~x86"
-
-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=
-	media-libs/giflib:0/7
-	media-libs/harfbuzz:=
-	media-libs/libpng:0=
-	media-libs/lcms:2=
-	sys-libs/zlib
-	virtual/jpeg:0=
-	systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	javafx? ( dev-java/openjfx:${SLOT}= )
-	system-bootstrap? (
-		|| (
-			dev-java/openjdk-bin:${SLOT}
-			dev-java/openjdk:${SLOT}
-		)
-	)
-"
-
-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
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	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 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 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
-	fi
-}
-
-src_prepare() {
-	default
-	chmod +x configure || die
-}
-
-src_configure() {
-	# Work around stack alignment issue, bug #647954. in case we ever have x86
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Work around -fno-common ( GCC10 default ), bug #713180
-	append-flags -fcommon
-
-	# Strip some flags users may set, but should not. #818502
-	filter-flags -fexceptions
-
-	# Enabling full docs appears to break doc building. If not
-	# explicitly disabled, the flag will get auto-enabled if pandoc and
-	# graphviz are detected. pandoc has loads of dependencies anyway.
-
-	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="${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"
-		--with-vendor-bug-url="https://bugs.gentoo.org"
-		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-		--with-vendor-version-string="${PVR}"
-		--with-version-pre=""
-		--with-version-string="${PV%_p*}"
-		--with-version-build="${PV#*_p}"
-		--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"
-		if [[ -r ${zip} ]]; then
-			myconf+=( --with-import-modules="${zip}" )
-		else
-			die "${zip} not found or not readable"
-		fi
-	fi
-
-	if use !system-bootstrap ; then
-		addpredict /dev/random
-		addpredict /proc/self/coredump_filter
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-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 product-images)
-	)
-	emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/jdk || die
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	# must be done before running itself
-	java-vm_set-pax-markings "${ddest}"
-
-	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_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}"
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break"
-		ewarn "many java ebuilds as they are not ready for openjdk-${SLOT}"
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
-	fi
-}
diff --git a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild
index 5e8f8d958a2a..d7196756904f 100644
--- a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild
@@ -8,6 +8,7 @@ inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing
 # 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
+RISCV_XPAK="17.0.3_p7"
 X86_XPAK="17.0.1_p12"
 
 # Usage: bootstrap_uri <keyword> <version> [extracond]
@@ -37,13 +38,15 @@ SRC_URI="
 		$(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
 		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
 		$(bootstrap_uri x86 ${X86_XPAK})
+		$(bootstrap_uri riscv ${RISCV_XPAK})
 	)
+	riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-17.0.3-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 gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap 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 )
@@ -128,6 +131,8 @@ pkg_setup() {
 	openjdk_check_requirements
 	java-vm-2_pkg_setup
 
+	[[ ${MERGE_TYPE} == "binary" ]] && return
+
 	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
 	JAVA_PKG_WANT_SOURCE="${SLOT}"
 	JAVA_PKG_WANT_TARGET="${SLOT}"
@@ -154,17 +159,16 @@ pkg_setup() {
 		local xpakvar="${ARCH^^}_XPAK"
 		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
 	else
-		if [[ ${MERGE_TYPE} != "binary" ]]; then
-			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*}
-			export JDK_HOME
-		fi
+		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*}
+		export JDK_HOME
 	fi
 }
 
 src_prepare() {
+	use riscv && eapply "${WORKDIR}"/openjdk-17.0.3-riscv.patch
 	default
 	chmod +x configure || die
 }
@@ -213,6 +217,8 @@ src_configure() {
 		$(tc-is-clang && echo "--with-toolchain-type=clang")
 	)
 
+	use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" )
+
 	if use javafx; then
 		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
 		if [[ -r ${zip} ]]; then
@@ -298,16 +304,4 @@ src_install() {
 
 pkg_postinst() {
 	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break"
-		ewarn "many java ebuilds as they are not ready for openjdk-${SLOT}"
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
-	fi
 }
diff --git a/dev-java/openjdk/openjdk-8.322_p06.ebuild b/dev-java/openjdk/openjdk-8.322_p06.ebuild
deleted file mode 100644
index 5af7952e09b3..000000000000
--- a/dev-java/openjdk/openjdk-8.322_p06.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-
-# 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)"
-SLOT="${PV%%[.+]*}"
-
-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"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	sys-libs/zlib
-"
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	|| (
-		dev-java/openjdk-bin:${SLOT}
-		dev-java/icedtea-bin:${SLOT}
-		dev-java/openjdk:${SLOT}
-		dev-java/icedtea:${SLOT}
-	)
-"
-
-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,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# new warnings in new gcc https://bugs.gentoo.org/685426
-	sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
-		hotspot/make/linux/makefiles/gcc.make || die
-
-	chmod +x configure || die
-}
-
-src_configure() {
-	# general build info found here:
-	#https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
-
-	# Work around stack alignment issue, bug #647954.
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Work around -fno-common ( GCC10 default ), bug #706638
-	append-flags -fcommon
-
-	# Strip some flags users may set, but should not. #818502
-	filter-flags -fexceptions
-
-	tc-export_build_env CC CXX PKG_CONFIG STRIP
-
-	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
-			--with-num-cores=1
-			--with-update-version="$(ver_cut 2)"
-			--with-build-number="b$(ver_cut 4)"
-			--with-milestone="fcs" # magic variable that means "release version"
-			--with-vendor-name="Gentoo"
-			--with-vendor-url="https://gentoo.org"
-			--with-vendor-bug-url="https://bugs.gentoo.org"
-			--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-			--with-zlib=system
-			--with-native-debug-symbols=$(usex debug internal none)
-			$(usex headless-awt --disable-headful '')
-			$(tc-is-clang && echo "--with-toolchain-type=clang")
-		)
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		CONFIG_SHELL="${EPREFIX}/bin/bash"
-		econf "${myconf[@]}"
-	)
-}
-
-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)
-	)
-	emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/j2sdk-image || die
-
-	if ! use alsa; then
-		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	# build system does not remove that
-	if use headless-awt ; then
-		rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
-		{,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v src.zip || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	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}"
-	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/docs/*
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-	einfo "JavaWebStart functionality provided by icedtea-web package"
-}
diff --git a/dev-java/openjdk/openjdk-8.332_p09.ebuild b/dev-java/openjdk/openjdk-8.332_p09.ebuild
index 3d08d57546ea..5af7952e09b3 100644
--- a/dev-java/openjdk/openjdk-8.332_p09.ebuild
+++ b/dev-java/openjdk/openjdk-8.332_p09.ebuild
@@ -16,7 +16,7 @@ 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"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source"
 
 COMMON_DEPEND="
diff --git a/dev-java/oracle-javamail/Manifest b/dev-java/oracle-javamail/Manifest
deleted file mode 100644
index 9c2aa6b68fc2..000000000000
--- a/dev-java/oracle-javamail/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST oracle-javamail-1.5.6.zip 1812631 BLAKE2B 9fd43058b10726db9359c4b59fd42226da329268ec4974a510940a4e7d6bd16afc3a3a73b6ee17914cd5d3577c42ddf22f29bc93e2ca185660ea03196ed2bd28 SHA512 3fde7901f5975f4a58d675d94e397bf1a169db227b138bfd684c0e2d0f6522ea1c8e2a5425b23fc08775a6824a9e9e68b2d6e6312f20c53af127f00a897363e2
-EBUILD oracle-javamail-1.5.6-r1.ebuild 1356 BLAKE2B 4c0f25dfd8d7613c448283a0cf5f5f6715690cbd44ce2a0f53a7d2daf5eebf39593ec2c4d89b915e227bc4cb80d1c189dc2ac88f6868bdb1a8b3af1a5ac81035 SHA512 743f97c0b99206bead63cb404773eee300553f1601d0186946dd0b8159614a3dddbfe7697ab5086e8ddd737f8cbf304f640cb51748c060f72fe9c719a804602b
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
deleted file mode 100644
index c5dc1412ea9e..000000000000
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
+++ /dev/null
@@ -1,50 +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"
-MAVEN_ID="com.sun.mail:javax.mail:1.5.6"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A Java-based framework to build multiplatform mail and messaging applications"
-HOMEPAGE="https://java.net/projects/javamail/pages/Home"
-SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-${PV}-src.zip -> ${P}.zip"
-
-# either of these
-LICENSE="CDDL GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
-	app-arch/unzip
-	virtual/jdk:1.8
-"
-
-RDEPEND="virtual/jre:1.8"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	default
-
-	# build.xml expects it here
-	mkdir -p legal/src/main/resources/META-INF || die
-	cp mail/src/main/resources/META-INF/LICENSE.txt \
-		legal/src/main/resources/META-INF || die
-}
-
-EANT_DOC_TARGET="docs"
-EANT_EXTRA_ARGS="-Dspec.dir=doc/spec"
-JAVA_PKG_BSFIX="off" #https://bugs.gentoo.org/698954
-
-src_install() {
-	java-pkg_dojar target/release/mail.jar
-
-	dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt
-	dohtml -r doc/release/{*.html,images}
-
-	use doc && java-pkg_dojavadoc target/release/docs/javadocs
-	use source && java-pkg_dosrc mail/src/main/java
-}
diff --git a/dev-java/osgi-compendium/Manifest b/dev-java/osgi-compendium/Manifest
index b62ca8379727..9531af77db45 100644
--- a/dev-java/osgi-compendium/Manifest
+++ b/dev-java/osgi-compendium/Manifest
@@ -1,3 +1,3 @@
 DIST osgi.cmpn-4.3.1.jar 741615 BLAKE2B 6f6058c07fd7744f0369d05cdf607b4d4fe51bbdf567c6a6c951413b0627eb1dbb6e56f65641a8472198d0aedca378da4715c26ebe05aa4e7ef80adb1020175f SHA512 803e929b4b7cfee13a3ffa2c60ad03775afd8409c972bf26e3f79abc590466c2d885bdc339d9af2a3e8fda9cdf082d23a298362ac37935b0ede0719dee27e9f9
-EBUILD osgi-compendium-4.3.1-r2.ebuild 871 BLAKE2B 20f2cd1d7ce730734be4234a1d29cddc5c7c5b99e751d2ae385d13fc2490f48c94452f311b39c9c1610866a9787fc5b4cf918ddd10ffcdffa3f5aec14e0f2878 SHA512 fc9cb03f738d0d95a02a9635b172e4e9b95ed8c6cbb5cfe7f7be313ffd63c664d4863911324512c363acba0217bc8a912800f6262d898d842fb89754cbbccb56
+EBUILD osgi-compendium-4.3.1-r3.ebuild 739 BLAKE2B 83864aadf4daea0a63c24a3bbbec5970f6a6ef80128da9022b0187d347d9c2ef54e8bbda08210c19d9fbff660f46bb84d016236361541aa6fda15bd22e009447 SHA512 3e9758cde8207ee0f141d0d8bfae0831ae7611e004a80be402c9b1537e4be65939937965827cb1cc86657aadfa927a9745113d8db2fe2c0c9833008bb3e61d02
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.ebuild b/dev-java/osgi-compendium/osgi-compendium-4.3.1-r3.ebuild
index 609e01017aa2..42efea848da4 100644
--- a/dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.ebuild
+++ b/dev-java/osgi-compendium/osgi-compendium-4.3.1-r3.ebuild
@@ -1,42 +1,36 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="OSGi Service Platform Compendium API (Companion Code)"
-HOMEPAGE="http://wiki.osgi.org/wiki/Release_4.3"
-SRC_URI="https://osgi.org/download/r4v43/osgi.cmpn-${PV}.jar"
+HOMEPAGE="https://docs.osgi.org"
+SRC_URI="https://docs.osgi.org/download/r4v43/osgi.cmpn-${PV}.jar"
 
-LICENSE="Apache-2.0 OSGi-Specification-2.0"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
-CDEPEND="dev-java/glassfish-persistence:0
+CP_DEPEND="
+	dev-java/glassfish-persistence:0
 	dev-java/osgi-core-api:0
 	dev-java/osgi-foundation:0
 	dev-java/tomcat-servlet-api:4.0"
 
-DEPEND="${CDEPEND}
+DEPEND="${CP_DEPEND}
 	>=virtual/jdk-1.8:*"
 
-RDEPEND="${CDEPEND}
+RDEPEND="${CP_DEPEND}
 	>=virtual/jre-1.8:*"
 
 BDEPEND="app-arch/unzip"
 
 JAVA_SRC_DIR="OSGI-OPT/src"
 
-JAVA_GENTOO_CLASSPATH="
-	osgi-core-api
-	osgi-foundation
-	glassfish-persistence
-	tomcat-servlet-api-4.0
-"
-
 src_prepare() {
 	default
 	rm -r org || die
diff --git a/dev-java/osgi-enterprise-api/Manifest b/dev-java/osgi-enterprise-api/Manifest
index 6a6b370ed30d..e030b8b6b358 100644
--- a/dev-java/osgi-enterprise-api/Manifest
+++ b/dev-java/osgi-enterprise-api/Manifest
@@ -1,4 +1,3 @@
 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
+EBUILD osgi-enterprise-api-5.0.0-r2.ebuild 754 BLAKE2B 00cbfe85b047c25f5be7c837199ce70fabcd4954c94aa351d640dcd47e40052266540bbe4202d7831bc3a63f3f9cbe14ffbb5b4df9863cd6cd75e3574000c95d SHA512 e83ee8ad3b215a1214078a513ae9a776e86d8076cba381608ab06b15bfb8939631cd1a595748a0d21222473069e5a093c198060b47e73cbe894c806cd80e1c6f
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild
deleted file mode 100644
index 7de7a8540382..000000000000
--- a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild
+++ /dev/null
@@ -1,38 +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"
-
-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"
-
-CDEPEND="dev-java/glassfish-persistence:0
-	dev-java/osgi-core-api:0
-	java-virtuals/servlet-api:2.5"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*
-	app-arch/unzip"
-
-JAVA_SRC_DIR="OSGI-OPT/src"
-
-JAVA_GENTOO_CLASSPATH="glassfish-persistence,osgi-core-api,servlet-api-2.5"
-
-src_prepare() {
-	default
-	rm -r org || die
-}
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
index 17de5b1b0649..8845f1f234e1 100644
--- 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
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 RESTRICT="bindist"
 
diff --git a/dev-java/pdfbox/Manifest b/dev-java/pdfbox/Manifest
index d43750b24130..81b55e2d089a 100644
--- a/dev-java/pdfbox/Manifest
+++ b/dev-java/pdfbox/Manifest
@@ -33,11 +33,12 @@ DIST PDFBOX-4423-000746.pdf 574613 BLAKE2B 01f139d1c9b9e60d5e3be184b6289a4c50f03
 DIST PDFBOX-4490.pdf 283351 BLAKE2B 4abac1974e9fc7ca0ede73d5c388125794760a32b24fbb245799f92bebf3cc37a6f0fb8e38fa282d39d0aa00093b829e924d90560b90562033958c270d07dec2 SHA512 5ae7f232c47c13ed31997eb2c368e7deb1013c1321d70bf79369f8d709b33406191d94c21a5d27b4c4bb48241bafd9328a0a6d2d093d4e540d5044e9503bd099
 DIST PDFBOX-4517-cryptfilter.pdf 2157 BLAKE2B 69fea4396c05d977dcb7bc5c29143ad3a64fc45331dd8ddd660e3d557d222d56a548b3b24bb0141e8c8e8b6a5dfee2a3f83fa48a2b39fd448b9209204b3e4d9f SHA512 ed55a65bad6f91104846d28e9e7dcb18b11efbf980a74781350551428bbaecba375d9e22af02edf0f91263c7f668e93ec7c52d397898b7640c2d60e7dd3ae940
 DIST PDFBOX-4750.pdf 333223 BLAKE2B 86e9191142b725a338c750d2f1cd25e3b65957160638e64ecdedc1a26f343709765b99fc15381e6a5045a60aa3d59cf6ff427599b89c03a6aface38e356a36da SHA512 add66ca86b5eb3bfd44fd8c273a81695586d76f6e630b714d4b8db6db5aee5b80e7a6d47b9863a42506773c2c0ee2181469d5cd717dba185b70ef5db7ffb80b9
+DIST PDFBOX-4831.pdf 708821 BLAKE2B b4b31a0c5685222b7dc4e9c3e1fbe5c72c6ee3b7ea4ac74727c10e04cc10a8c96ae82c7163d82a3003d69105d5990cefbb481d3c42be3bc69ca0a9c15db4d8b2 SHA512 cb13ce2ca64fa446b9d840444f6d363f0d826a55e4dae1c2de094aaee4dd92df192ec375ff6ca0ee50c5cdd52b634b9b838431d7aa6b852de02504c3fd95531a
 DIST PDFBOX-5196-lotus.jpg 48292 BLAKE2B 9f9a02acb481349acc65266ab6529d40e9493fa0c6f5181aa46757ca2a3d29d519e7de2ea95c8288cd3f25f362a3fe7695e81fe0b653984ee267d2b5cc112e51 SHA512 37c73b41d1e00d66717c3715e6c45724c3f163d3d5b045c67e90c3713746d39eef96b4f0e6f368d0679d4c73d02ca01cfe5141d8a526e46ea15a4579ea1e75a2
 DIST genko_oc_shiryo1.pdf 124896 BLAKE2B c3a9921afb052ee4fe5080a1f1e66d991e3041ff90bd26d42bf3a9116f05e81fb5bb51449411527c3c3193072854482cf4616bf57cad1ac7d774044fce26f13d SHA512 71888e06a0323ac6196c5942c5961f76f8a4d8c6913114aaa9e215f43112cfa5f1b741b7c801e794dc44e62c2d34bfaafe89267a4c7de753e4da1481b35820f3
 DIST ipag00303.zip 4295310 BLAKE2B b68dd7dd7a7320894d782350c4598572c31d6ef492f9572adc2aac20ca98b5c5027995c0169bf815bc1e3a64d635b0e2d4e378b749e034f2fe718bcb7901d40a SHA512 59535137c649a2f8bdbb463cd716426811a6003a65883ca6e45bb0af1d526b3889af0fba3a353e90bc8d373cd32b90a27ff9ff6916ecbccb42e922c09e9b046a
 DIST ipagp00303.zip 4295877 BLAKE2B e096303106029daaedae9befb003f70c2c7d00b858f89f5f8fffb9fc73679e63ec0dde8e0304cad2c611aa74d3cf1bfea56b9ac35e6838953d38b028654f5434 SHA512 26d0a9bfba7f5457a98b0bf45a4a6b081bca4140047a0886625691231459f8c81a6cdbe523e9abcbd45fd7caed21d78f1baf3a2cf9167320f6b79be3d697cb5b
 DIST n019003l.pfb 79155 BLAKE2B 2995cd6e35de2d49cc6d4a5f6c7461396b23e14c6403cd7aecedbd5cec904fd0c42a114c4c5f5079fd1fad306dd8ddba649a13424ec5183395fb0fc1cbe2abb9 SHA512 8eafe21ffa6f3d7d0a50e9f4e5bcdeb727e804b552d74e65b709e778c9ed4605e5aa63743be285f0bc17ad162768583fec4196e1d1146d98f8703359247f22d0
-DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
-EBUILD pdfbox-2.0.24.ebuild 13576 BLAKE2B 3e6bf956546262a8dc4b379b8951e88d562d56285c639d7a542ab18691645d9b10305f3d72a6f42193779f83aa0b409475a8dc9414bd41894d992d758291f4da SHA512 f28c63fb29b6ec5195d85493ba57e1e4cc08ebb9d0a8ce617c1adfb65e8dafe7f20d480174fcc2402cd6f1ac15288d280c22982c60de1bac084f2cd98c278e6f
+DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
+EBUILD pdfbox-2.0.26.ebuild 10950 BLAKE2B f1bd5fb508bfecf592c84b9e2a4c089d13985c7bad2e28741c13e87ce4867adddecc943452c9b37bff22e1b89793a71af6dc3c29d0005df2643673ef536ecb64 SHA512 5e70a5ef5e6eccd9d75732aee6a143760eccede1dc3810059257175d1c986e10e196d2659d07220ae680a7e24ad1baeb1e99bb66fb624990793fdce297b27fb9
 MISC metadata.xml 782 BLAKE2B 96e76863aeaf1791f4a7a44aeb49df8b5a9bf91ac0d8d69e5642128df590456a2d38c64c84e8b50c917d3361bbaeb880a1b7744b994db9eee5ca8d250d765d6a SHA512 d7d47cc9eb182780424161f2a136cdec74bbe0cf4d63f52bfc77df8ad4fadc2bb9f3bd7b1ccff667d25928b4e0bc4a979b725ce77f1dff244585713ca40f88cc
diff --git a/dev-java/pdfbox/pdfbox-2.0.24.ebuild b/dev-java/pdfbox/pdfbox-2.0.26.ebuild
index c2ae65ec701b..97b9ade34c7d 100644
--- a/dev-java/pdfbox/pdfbox-2.0.24.ebuild
+++ b/dev-java/pdfbox/pdfbox-2.0.26.ebuild
@@ -1,13 +1,13 @@
-# 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 pdfbox-2.0.24/pdfbox/pom.xml --download-uri https://downloads.apache.org/pdfbox/2.0.24/pdfbox-2.0.24-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild pdfbox-2.0.24.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/pdfbox/2.0.26/pdfbox-2.0.26-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild pdfbox-2.0.26.ebuild
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:pdfbox:2.0.24"
+MAVEN_ID="org.apache.pdfbox:pdfbox:2.0.26"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
@@ -55,6 +55,7 @@ SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip
 		https://issues.apache.org/jira/secure/attachment/12911053/n019003l.pfb
 		https://issues.apache.org/jira/secure/attachment/12949710/032163.jpg -> PDFBOX-4184-032163.jpg
 		https://issues.apache.org/jira/secure/attachment/13025718/lotus.jpg -> PDFBOX-5196-lotus.jpg
+		https://issues.apache.org/jira/secure/attachment/13002695/13._Korona_szallo_vegzes_13.09.26.eredeti.pdf -> PDFBOX-4831.pdf
 	)"
 
 LICENSE="Apache-2.0"
@@ -72,16 +73,12 @@ RESTRICT="test"
 # org.bouncycastle:bcmail-jdk15on:1.64 -> >=dev-java/bcmail-1.68:0
 # org.bouncycastle:bcprov-jdk15on:1.64 -> >=dev-java/bcprov-1.68:0
 
-CDEPEND="
+CP_DEPEND="
 	dev-java/bcmail:0
 	dev-java/bcprov:0
 	dev-java/commons-logging:0
 	~dev-java/fontbox-${PV}:0
-	tools? (
-		dev-java/java-diff-utils:0
-		dev-java/junit:4
-		dev-java/mockito:0
-	)"
+"
 
 # Compile dependencies
 # POM: ${P}/${PN}/pom.xml
@@ -92,22 +89,22 @@ CDEPEND="
 # test? org.apache.pdfbox:jbig2-imageio:3.0.3 -> >=dev-java/jbig2-imageio-3.0.3:0
 # test? org.mockito:mockito-core:3.10.0 -> !!!suitble-mavenVersion-not-found!!!
 
-DEPEND="${CDEPEND}
+DEPEND="${CP_DEPEND}
 	>=virtual/jdk-1.8:*
 	test? (
 		dev-java/jai-imageio-core:0
 		dev-java/jai-imageio-jpeg2000:0
 		dev-java/java-diff-utils:0
 		dev-java/jbig2-imageio:0
-		dev-java/mockito:0
+		dev-java/mockito:4
 	)"
 
-RDEPEND="${CDEPEND}
+RDEPEND="${CP_DEPEND}
 	>=virtual/jre-1.8:*"
 
 BDEPEND="app-arch/unzip"
 
-DOCS=( {README.md,{LICENSE,NOTICE,RELEASE-NOTES}.txt} )
+DOCS=( README.md {NOTICE,RELEASE-NOTES}.txt )
 
 PATCHES=(
 	# adds @Ignore annotation to
@@ -119,43 +116,16 @@ PATCHES=(
 S="${WORKDIR}/${P}"
 
 JAVA_GENTOO_CLASSPATH_EXTRA="pdfbox.jar:pdfbox-debugger.jar"
-JAVA_GENTOO_CLASSPATH="commons-logging,fontbox,bcmail,bcprov"
-JAVA_TEST_GENTOO_CLASSPATH="jai-imageio-core,jai-imageio-jpeg2000,java-diff-utils,jbig2-imageio,junit-4,mockito"
+JAVA_TEST_GENTOO_CLASSPATH="jai-imageio-core,jai-imageio-jpeg2000,java-diff-utils,jbig2-imageio,junit-4,mockito-4"
 
 JAVA_TEST_EXCLUDES=(
 	# excluded upstream according to
-	# https://github.com/apache/pdfbox/blob/8876e8e1a0adbf619cef4638cc3cea073e3ca484/pdfbox/pom.xml#L123
+	# https://github.com/apache/pdfbox/blob/2.0.26/pdfbox/pom.xml#L123
 	"org.apache.pdfbox.rendering.TestPDFToImage"
 
-	# 1) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testIsSetDirect (java.lang.InstantiationException
-	# 2) warning(junit.framework.TestSuite$1
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testAccept (java.lang.InstantiationException
-	# 3) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testGetCOSObject (java.lang.InstantiationException
+	# Causing test failures. Upstream does not run these tests.
 	"org.apache.pdfbox.cos.TestCOSBase"
-
-	# 4) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testFloatValue (java.lang.InstantiationException
-	# 5) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testGet (java.lang.InstantiationException
-	# 6) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testInvalidNumber (java.lang.InstantiationException
-	# 7) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testLongValue (java.lang.InstantiationException
-	# 8) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testIntValue (java.lang.InstantiationException
-	# 9) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testLargeNumber (java.lang.InstantiationException
-	# 10) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testDoubleValue (java.lang.InstantiationException
-	# 11) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testIsSetDirect (java.lang.InstantiationException
-	# 12) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testAccept (java.lang.InstantiationException
-	# 13) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testGetCOSObject (java.lang.InstantiationException
-	"org.apache.pdfbox.cos.TestCOSNumber"	# Tests run: 10,  Failures: 10
+	"org.apache.pdfbox.cos.TestCOSNumber"
 )
 
 src_prepare() {
@@ -163,50 +133,45 @@ src_prepare() {
 }
 
 src_compile() {
+	einfo "Compiling pdfbox"
 	JAVA_SRC_DIR="pdfbox/src/main/java"
 	JAVA_RESOURCE_DIRS="pdfbox/src/main/resources"
 	JAVA_JAR_FILENAME="pdfbox.jar"
 	java-pkg-simple_src_compile
 
-	JAVA_SRC_DIR="debugger/src/main/java"
-	JAVA_RESOURCE_DIRS="debugger/src/main/resources"
-	JAVA_JAR_FILENAME="pdfbox-debugger.jar"
-	java-pkg-simple_src_compile
-
 	if use tools; then
-		JAVA_GENTOO_CLASSPATH+=" java-diff-utils,junit-4,mockito"
+		einfo "Compiling debugger"
+		JAVA_SRC_DIR="debugger/src/main/java"
+		JAVA_RESOURCE_DIRS="debugger/src/main/resources"
+		JAVA_JAR_FILENAME="pdfbox-debugger.jar"
+		java-pkg-simple_src_compile
+
+		einfo "Compiling pdfbox-tools"
 		JAVA_SRC_DIR="tools/src/main/java"
 		JAVA_RESOURCE_DIRS=""
 		JAVA_JAR_FILENAME="pdfbox-tools.jar"
 		java-pkg-simple_src_compile
 	fi
 
-	JAVA_SRC_DIR=(
-		"${S}/pdfbox/src/main/java"
-		"${S}/debugger/src/main/java"
-	)
-	if use tools; then
-		JAVA_SRC_DIR+=( "${S}/tools" )
+	if use doc; then
+		einfo "Compiling javadocs"
+		JAVA_SRC_DIR=(
+			"${S}/pdfbox/src/main/java"
+			"${S}/debugger/src/main/java"
+		)
+		if use tools; then
+			JAVA_SRC_DIR+=( "${S}/tools/src/main/java" )
+		fi
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
 	fi
-	JAVA_JAR_FILENAME="ignoreme.jar"
-	java-pkg-simple_src_compile
 }
 
 src_test() {
+	einfo "Testing pdfbox"
 	JAVA_TEST_SRC_DIR="pdfbox/src/test/java"
 	JAVA_TEST_RESOURCE_DIRS="pdfbox/src/test/resources"
 
-	# There was 1 failure
-	# 1) testIsEmbeddingPermittedMultipleVersions(org.apache.pdfbox.pdmodel.font.TestFontEmbedding)
-	# java.lang.ExceptionInInitializerError
-	# Caused by: java.lang.reflect.InaccessibleObjectException: Unable to make protected final java.lang.Class java.lang.ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain) throws java.lang.ClassFormatError accessible: module java.base does not "opens java.lang" to unnamed module @4dc690f9
-	# FAILURES!!!
-	# Tests run: 586,  Failures: 1
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if [[ "${vm_version}" == "17" ]] ; then
-		JAVA_TEST_EXCLUDES+=( "org.apache.pdfbox.pdmodel.font.TestFontEmbedding" )
-	fi
-
 	# tests failed with S="${WORKDIR}/${P}"
 	find pdfbox/src/test/ -type f -exec sed -i 's:src/test/resources:pdfbox/src/test/resources:' {} + || die
 
@@ -245,6 +210,7 @@ src_test() {
 		"${DISTDIR}"/PDFBOX-4338.pdf \
 		"${DISTDIR}"/PDFBOX-4339.pdf \
 		"${DISTDIR}"/genko_oc_shiryo1.pdf \
+		"${DISTDIR}"/PDFBOX-4831.pdf \
 		"target/pdfs" || die
 
 	mkdir target/fonts || die
@@ -263,6 +229,7 @@ src_test() {
 	rm -r target/test-classes || die # avoid to run previous tests again
 
 	if use tools; then
+		einfo "Testing pdfbox-tools"
 		find tools/src/test/ -type f -exec sed -i 's:src/test/resources:tools/src/test/resources:' {} + || die
 		JAVA_TEST_SRC_DIR="tools/src/test/java"
 		JAVA_TEST_RESOURCE_DIRS="tools/src/test/resources"
@@ -275,8 +242,8 @@ src_install() {
 	default
 
 	java-pkg_dojar "pdfbox.jar"
-	java-pkg_dojar "pdfbox-debugger.jar"
 	if use tools; then
+		java-pkg_dojar "pdfbox-debugger.jar"
 		java-pkg_dojar "pdfbox-tools.jar"
 		java-pkg_dolauncher ${PN} --main org.apache.pdfbox.tools.PDFBox
 	fi
@@ -286,6 +253,9 @@ src_install() {
 	fi
 
 	if use source; then
-		java-pkg_dosrc "${S}/pdfbox" "${S}/debugger" "${S}/tools"
+		java-pkg_dosrc \
+			"${S}/pdfbox/src/main/java/*" \
+			"${S}/debugger/src/main/java/*" \
+			"${S}/tools/src/main/java/*"
 	fi
 }
diff --git a/dev-java/reflections/Manifest b/dev-java/reflections/Manifest
index 3477c1f89276..edfdfd223eff 100644
--- a/dev-java/reflections/Manifest
+++ b/dev-java/reflections/Manifest
@@ -1,5 +1,4 @@
-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
+EBUILD reflections-0.9.12-r2.ebuild 3885 BLAKE2B 20409316f8cc31dee09a80882d4baa59bacd0b92356b5e434d56ece38bdccebab4cabe82749735d5f6e5bf9f1b037d733bf03664c7389dd5ef0d3fa4f272994a SHA512 c915f76e25958e775bc378976e88c5a10e09c507a5b188be2442f3aa73fa3c928e78d9f4fdce8b2ab4ad30b67a568c011be1a3b1378ebe2edd760097b33d8102
+EBUILD reflections-0.9.12-r3.ebuild 3888 BLAKE2B 93b01b5e15609df55da1513e444d15c62dd0c396a454544d9c89298a685ac4ab2bcf71d05d1971213aeea21978d11d648681b6ff703150be64a8ad2be5133ebd SHA512 99491f84d078ab37579ea2dad793d2e2b791cad0bab7e942fa9ab68cb6252bffa5e46e59bbb5e98d02dc488520f3154ff7544cb85cb9adfbb81f385da8ade9fb
 MISC metadata.xml 527 BLAKE2B 92b0ca46422b8b0107bef220664c0079db47a3c8f306f59d5b681b653e5bcb835a192c8018d719447ebc864ead58f3844340bf3f84ff5bbef0ab126b7d314efe SHA512 a7ad6c598f83a911b20f5b31573127433d2bd756ac15d4a29de907ce102a5fb77de2426035a8255125446128b8ef13ed1f9fa002bff285cddbaf9043bd71dddc
diff --git a/dev-java/reflections/reflections-0.9.10-r1.ebuild b/dev-java/reflections/reflections-0.9.10-r1.ebuild
deleted file mode 100644
index e51003333934..000000000000
--- a/dev-java/reflections/reflections-0.9.10-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 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
-
-DESCRIPTION="Java runtime metadata analysis"
-HOMEPAGE="https://github.com/ronmamo/reflections"
-SRC_URI="http://search.maven.org/remotecontent?filepath=org/${PN}/${PN}/${PV}/${P}-sources.jar"
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="dev-java/commons-vfs:2
-	dev-java/dom4j:1
-	dev-java/gson:2.6
-	dev-java/guava:20
-	dev-java/javassist:3
-	dev-java/jsr305:0
-	dev-java/slf4j-api:0
-	dev-java/tomcat-servlet-api:3.1"
-
-RDEPEND=">=virtual/jre-1.7
-	${CP_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
-	${CP_DEPEND}
-	app-arch/unzip"
diff --git a/dev-java/reflections/reflections-0.9.12-r2.ebuild b/dev-java/reflections/reflections-0.9.12-r2.ebuild
index 64c3642c4eff..f55973dea4e9 100644
--- a/dev-java/reflections/reflections-0.9.12-r2.ebuild
+++ b/dev-java/reflections/reflections-0.9.12-r2.ebuild
@@ -18,7 +18,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/reflections/reflections-0.9.12-r3.ebuild b/dev-java/reflections/reflections-0.9.12-r3.ebuild
new file mode 100644
index 000000000000..bcec9edaeaee
--- /dev/null
+++ b/dev-java/reflections/reflections-0.9.12-r3.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-11:*
+	${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 660e4539f82c..9ed980eb1f4e 100644
--- a/dev-java/relaxng-datatype/Manifest
+++ b/dev-java/relaxng-datatype/Manifest
@@ -1,4 +1,3 @@
 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
+EBUILD relaxng-datatype-1.0-r3.ebuild 758 BLAKE2B 726072e839e86eca4f30a3724bcffed7ce847f303225d2470cb6402924e8f7c1f259bfb6112602e80f8398fb20c2d7cade39e4d7ada6585f7ca10e7812f9050b SHA512 62dffd6aeedcaefc42206eec82649577a52bcfb2b3fe094ddab4adeda5ec35d88d6b755bb819afe78c921c0d84012c7aa02464eca67932e71c1dcc7814b85657
 MISC metadata.xml 314 BLAKE2B 3c7bd8a6004758af05fccf02d2636fa62e2dea9e653c89600b37ce223d10c6f24b03df605db96ab55a5177994ee1eddca450df7a1d6e9fc86c50573c7da9e4a6 SHA512 eaa99aa2ba88d8a70bc38924266c1e33a264274ab13dbb88d9a73d278c03c872a56d8ed122cc4a44e84ef9436e6c016310c38ad05fa9976300018472b43780b8
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild
deleted file mode 100644
index c7357a9ad076..000000000000
--- a/dev-java/relaxng-datatype/relaxng-datatype-1.0-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=6
-
-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="
-	app-arch/unzip
-	>=virtual/jdk-1.7
-"
-RDEPEND=">=virtual/jre-1.7"
-
-DOCS=( README.txt )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs
-}
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild
index 5886aafc3e3f..082bf9631a73 100644
--- a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild
+++ b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/dev-java/saslprep/Manifest b/dev-java/saslprep/Manifest
new file mode 100644
index 000000000000..391729b5e067
--- /dev/null
+++ b/dev-java/saslprep/Manifest
@@ -0,0 +1,3 @@
+DIST saslprep-1.1-sources.jar 3735 BLAKE2B 4a2058856f0fa01a6f8ef05ca930d875825653f34c3d2b0bb81d658cb363fc5d4268a212d14e23ce60c666a1482de78e13483605c39783c81a971b148055464c SHA512 63badd75f5444af0077629dcf3f95a7c39d3e12f159a50748f54c36d2aa2cef90887c099d0c89007796174d48da0d25cc93db8ccf07660a8803e3edbbb92da05
+EBUILD saslprep-1.1.ebuild 625 BLAKE2B 429e3d024ebacfa0e9cca917f83d23faf0a6706b003b6dc393746cefb4efbf1bf429afec4f1c501f71af33cd0afa690f6e2ca68f5c4f033b4b0f554224c56e95 SHA512 ca9eec87f8e463b6c0aa72ffb82ce3e4254102363996054496428e286b00674ed9d723b35f79c8d5e33e8586c9c6fde455439fc1a8fc6c44c463b8e6048bb2c3
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/saslprep/metadata.xml b/dev-java/saslprep/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/saslprep/metadata.xml
@@ -0,0 +1,7 @@
+<?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>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/saslprep/saslprep-1.1.ebuild b/dev-java/saslprep/saslprep-1.1.ebuild
new file mode 100644
index 000000000000..c39194d7d0fe
--- /dev/null
+++ b/dev-java/saslprep/saslprep-1.1.ebuild
@@ -0,0 +1,23 @@
+# 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="com.ongres.stringprep:saslprep:1.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SASLprep: Stringprep Profile for User Names and Passwords"
+HOMEPAGE="https://gitlab.com/ongresinc/stringprep"
+SRC_URI="https://repo1.maven.org/maven2/com/ongres/stringprep/saslprep/${PV}/saslprep-${PV}-sources.jar"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*
+	dev-java/stringprep:0"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_CLASSPATH_EXTRA="stringprep"
diff --git a/dev-java/sbt-bin/Manifest b/dev-java/sbt-bin/Manifest
index 78f06600af4a..42f8ae8b269e 100644
--- a/dev-java/sbt-bin/Manifest
+++ b/dev-java/sbt-bin/Manifest
@@ -1,5 +1,3 @@
 DIST sbt-1.3.10.tgz 57609786 BLAKE2B 35285d141d8ad38a8e15cc3dd18947fa34dbe307ce1fbdd267a0902ff7f5757a0ab80d56eb241c8bea79c4a13c270efb65a552a039416a6f571b6cd214739819 SHA512 93832c0eec51422d6db63078c722578cbad21e4611ca868e835471fb988ad225e8abdea47c6dcf6e19117db9598bc75296100d9dc7ba0d605b70adc592efb925
-DIST sbt-1.3.2.tgz 51817549 BLAKE2B ccb362b8cec867c64a04eba48982a9d339250d3ab51afb72fbbb7fe29406c6565d386ab0e02887007922f4134481b4ee764b63eb69300d7aa06dffd43a91a225 SHA512 2402f781962b80a46c63ac3aba0b2bb2b55ae509bb6b591d840385765dbf73cb6e5b40c12e6b95db2d8f4e77caeda32aad5a701a6439bde41ca3166d50f4b9b2
-EBUILD sbt-bin-1.3.10.ebuild 813 BLAKE2B d00c029d68699063403f6b46234abea3cad869a7107f0bfd23ccfc82ef471ed34a81f0e4a50ef8bc961b64b6ba3b4b7dfdd171e1f82b0e332d2f46007dd287cc SHA512 203b4d72770ac17a1544d04e7756e9f3ca8dd0b6b1ac0f7562b99af23e06505871e47edf3557bfdc23f7db945a191a90e2d981a80ec97d7857cfb0dd9853dd92
-EBUILD sbt-bin-1.3.2.ebuild 812 BLAKE2B 5915524b93b06daaf5cbc7aa7e553f206633e5e3ba2088706b10a55572045a824221153051e4d053db1ed2eb123b7b5f0cd01efa20e481df8691849f3af69ea0 SHA512 80dd0c5afd13564fd6b80088ded2854ebd5c1b9c5b8ad3d09bf30ec3410d213b3218eae564fd3f604204b77d4342b27dde60963ff69a0214c636731c09543e42
+EBUILD sbt-bin-1.3.10.ebuild 812 BLAKE2B d6f0207d2ddf3a573bbda5e6bd3e071ba2953945d815a4f3b664bd61555e27f026ce8b7b37936aee758704d4a40f3e943133c50dd1f3e698fc06958186c35d42 SHA512 70d7292450bc03317fd89a1c28e5fecc75eb4252612041ad3a86b32daae2786cab46c7b7d276381e426f20383de048d1cd4854b18943b4926b9551e76ed19f25
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/sbt-bin/sbt-bin-1.3.10.ebuild b/dev-java/sbt-bin/sbt-bin-1.3.10.ebuild
index 493d2abf7d76..68c3ba963b1d 100644
--- a/dev-java/sbt-bin/sbt-bin-1.3.10.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-1.3.10.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sbt/sbt/releases/download/v${PV}/${PN/-bin}-${PV}.tg
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=virtual/jre-1.7
diff --git a/dev-java/sbt-bin/sbt-bin-1.3.2.ebuild b/dev-java/sbt-bin/sbt-bin-1.3.2.ebuild
deleted file mode 100644
index 21e538c44abb..000000000000
--- a/dev-java/sbt-bin/sbt-bin-1.3.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-DESCRIPTION="sbt, a build tool for Scala"
-HOMEPAGE="https://scala-sbt.org"
-SRC_URI="https://github.com/sbt/sbt/releases/download/v${PV}/${PN/-bin}-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=virtual/jre-1.7
-	!dev-java/sbt"
-
-src_unpack() {
-	default
-	mv "${WORKDIR}/sbt" "${S}" || die
-}
-
-src_prepare() {
-	default
-	java-pkg_init_paths_
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	local dest="${JAVA_PKG_SHAREPATH}"
-
-	rm -v bin/sbt.bat || die
-	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
-		bin/sbt || die
-
-	insinto "${dest}/lib"
-	doins bin/*
-
-	insinto "${dest}"
-	doins -r conf
-
-	fperms 0755 "${dest}/lib/sbt"
-	dosym "${dest}/lib/sbt" /usr/bin/sbt
-}
diff --git a/dev-java/sbt/Manifest b/dev-java/sbt/Manifest
index 67b9fb6f8ece..58078ac69b0f 100644
--- a/dev-java/sbt/Manifest
+++ b/dev-java/sbt/Manifest
@@ -9,5 +9,5 @@ DIST sbt-0.13.18.tar.gz 952783 BLAKE2B 31648c2cbbeb5d57db03c10bd4ac25344ae2d0351
 DIST sbt-launch-0.13.13.jar 1210231 BLAKE2B 754abad78cec4f6b040fb63dcb62e549768174b22cf3f9ab7d2419736d4f09b53863cf645b38d7d534deb1c6e897f55d8b1b5fa82462ca9d906c410d22c0c198 SHA512 78e7ce21c610e83a532b04491e13d53b4193205328adce473252d523fe0ca0f3892dba900f01ff6e28d94a17c3ba1ebbe7d85fd6ce9900c48263bc4816da37ef
 DIST sbt-launch-0.13.18.jar 1210278 BLAKE2B b3c03f0c823576db51eda51a494edeb771f7ab762afe74fa95f19a4581d80cfdf3c6d6bfacd76e195de34f420912d18b505b74414fbc02550c9331fe4b3e07e3 SHA512 2b1e27f8d873ee45cc168ab19f6e82421d6896116c7b7af60974b97f41edd034fa008e668c83f83d2ce3a501986674821d8a427ccbcda291c8c33b576d64921b
 EBUILD sbt-0.13.13.ebuild 5670 BLAKE2B 0447138d640ae8ee54ae7818c78c34ba7f6ed1b9535be53241308a7803f18c732d6d6f041d7d35baadf670b4f6df14e2dc87c526f47d08ac2309521382265a3b SHA512 6851e0463519ced88b12ba0d23018b1e36209a37ec65f11c5d0210b74ee403346eef1c3335dd33a240398dc985229ca2fc3c1fce82cca5430cbe4662421f2068
-EBUILD sbt-0.13.18.ebuild 4906 BLAKE2B 6da77c96279fa3e0f0c5752131b489c62a4f2cecb6ea2642a47778728b5f8aac1cf7ba822900e1e7167c0daae35bbe53b794c9048bd183defc39f99a723f8bf3 SHA512 e6e4f703bc4d745da98e854d55d592a8147bb3775c07e2b71605c26bc95b600be0bb55b05ea033cce9bec9ee386daccc96cf3ab94ee7dedf26f2bc3994bd5480
+EBUILD sbt-0.13.18-r1.ebuild 5029 BLAKE2B 6461b4bab798cdb9ad7d829e172d4e1d3ffb9d9218320f85587308ab8bf719ece07e873701becbe83087d0d5c17d74d3c801b5648df00a5a1cd80470377cf8ad SHA512 3226e2f1336a2e0d9135145210f9d2af2173bef59fd04646e33cc94db8e149d04ad6c5459a9514ddd99496cd600008225bc371b6666e9739972b174649daac66
 MISC metadata.xml 526 BLAKE2B d06c4612bc3b5973953ff1a80c565bf0daad172b1de8ec2856c811bbe4a98d14386139c5d1f5987f2360226f2b7a5665263730fa0789bc8999704270fc57952c SHA512 36c893290862eaf30eb3e53e3bd6b3593fdbc03c2a72c171a8fa5c913ab2e5836c69d0259c0d6d256dacaa6e97590c778980a0e46a9c71f9c2131619f047b8b4
diff --git a/dev-java/sbt/sbt-0.13.18.ebuild b/dev-java/sbt/sbt-0.13.18-r1.ebuild
index 4262d767d5b3..38c010dd588e 100644
--- a/dev-java/sbt/sbt-0.13.18.ebuild
+++ b/dev-java/sbt/sbt-0.13.18-r1.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
 
@@ -17,18 +17,20 @@ SRC_URI="
 		https://github.com/sbt/sbt/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.xz
 		https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.xz
-		http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${PV}/${L_PN}.jar -> ${L_P}.jar
+		https://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${PV}/${L_PN}.jar -> ${L_P}.jar
 	)
 	binary? (
-		https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz
+		https://dev.gentoo.org/~gienah/distfiles/${P}-gentoo-binary.tar.xz
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="binary"
 
+# Restrict to jdk:1.8
+# Missing dependency 'object java.lang.Object in compiler mirror', bug #831297
 DEPEND="
-	>=virtual/jdk-1.8:*
+	virtual/jdk:1.8
 "
 
 RDEPEND="
@@ -41,7 +43,7 @@ RESTRICT="test"
 # Note: to bump sbt, some things to try are:
 # 1. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.xz
 # https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.xz and
-# binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz )
+# binary? ( https://dev.gentoo.org/~gienah/distfiles/${P}-gentoo-binary.tar.xz )
 # from SRC_URI
 # 2. Comment the sbt publishLocal line in src_compile.
 # 3. try:
@@ -122,10 +124,11 @@ src_prepare() {
 src_compile() {
 	if ! use binary; then
 		einfo "=== sbt compile ..."
+		local vm_version="$(java-config -g PROVIDES_VERSION)"
 		"${WORKDIR}/${L_P}/sbt" -Dsbt.log.noformat=true compile || die
-		einfo "=== sbt publishLocal with jdk $(java-pkg_get-vm-version) ..."
+		einfo "=== sbt publishLocal with jdk ${vm_version} ..."
 		cat <<- EOF | "${WORKDIR}/${L_P}/sbt" -Dsbt.log.noformat=true || die
-			set every javaVersionPrefix in javaVersionCheck := Some("$(java-pkg_get-vm-version)")
+			set every javaVersionPrefix in javaVersionCheck := Some("${vm_version}")
 			publishLocal
 		EOF
 	fi
diff --git a/dev-java/scram/Manifest b/dev-java/scram/Manifest
new file mode 100644
index 000000000000..e4daee228243
--- /dev/null
+++ b/dev-java/scram/Manifest
@@ -0,0 +1,3 @@
+DIST scram-2.1.tar.gz 64263 BLAKE2B 59b71ee0faa32d2478e38e4275b7c83efb3f7a3ede0c068a8c0a6fe970248d22b539c50b97127b1b757839758d119b395fedd85d85425bd019e0972c2df20ef4 SHA512 e0757b306db03c56f03fa0907e46693337854c152a321cae1b109a1c16b0cb5be2482a92d64a420432a3ea31371990cbac444f965abde89c04083005b30012ef
+EBUILD scram-2.1.ebuild 2582 BLAKE2B 2260829df18b1bde2d26721ff76df575771a472f2e7515a8228f86694197256cbad1f5ee579a6a42ae268bcd4e9009cac633c38f07bd69bb71c9a6069265af8a SHA512 d6ef2ae8d603c659ad8dbb5be0670d4a2da33323949849c8b2047d0f191cdb0e3be3fee28ce45f4d21a0e5c23982fc03f4e508279e9fdc7cb2614bcfdac16ea1
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/scram/metadata.xml b/dev-java/scram/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/scram/metadata.xml
@@ -0,0 +1,7 @@
+<?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>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/scram/scram-2.1.ebuild b/dev-java/scram/scram-2.1.ebuild
new file mode 100644
index 000000000000..a3af5e23f1dd
--- /dev/null
+++ b/dev-java/scram/scram-2.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom common/pom.xml --download-uri https://gitlab.com/ongresinc/scram/-/archive/2.1/scram-2.1.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild scram-2.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.ongres.scram:common:2.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Implementation of the Salted Challenge Response Authentication Mechanism"
+HOMEPAGE="https://gitlab.com/ongresinc/scram"
+SRC_URI="https://gitlab.com/ongresinc/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: common/pom.xml
+# com.ongres.stringprep:saslprep:1.1 -> >=dev-java/stringprep-2.0:0
+
+CP_DEPEND="
+	dev-java/saslprep:0
+"
+
+# Compile dependencies
+# POM: common/pom.xml
+# com.google.code.findbugs:annotations:3.0.1 -> !!!artifactId-not-found!!!
+# com.google.code.findbugs:jsr305:3.0.1 -> >=dev-java/jsr305-3.0.2:0
+# POM: common/pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	dev-java/findbugs-annotations:0
+	dev-java/jsr305:0
+	test? ( dev-java/stringprep:0 )
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( CHANGELOG NOTICE README.md )
+
+S="${WORKDIR}/${P}"
+
+JAVA_CLASSPATH_EXTRA="findbugs-annotations,jsr305"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,stringprep"
+
+src_compile() {
+	einfo "Compiling module common"
+	JAVA_SRC_DIR="common/src/main/java"
+	JAVA_JAR_FILENAME="common.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":common.jar"
+	rm -r target || die
+
+	einfo "Compiling module client"
+	JAVA_SRC_DIR="client/src/main/java"
+	JAVA_JAR_FILENAME="client.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":client.jar"
+	rm -r target || die
+
+	if use doc; then
+		einfo "Compiling javadocs"
+		JAVA_SRC_DIR=(
+			"common/src/main/java"
+			"client/src/main/java"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+	einfo "Testing module common"
+	JAVA_TEST_SRC_DIR="common/src/test/java"
+	java-pkg-simple_src_test
+
+	einfo "Testing module cwclientcommon"
+	JAVA_TEST_SRC_DIR="client/src/test/java"
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default
+	java-pkg_dojar "common.jar"
+	java-pkg_dojar "client.jar"
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+	if use source; then
+		java-pkg_dosrc "common/src/main/java/*"
+		java-pkg_dosrc "client/src/main/java/*"
+	fi
+}
diff --git a/dev-java/spin/Manifest b/dev-java/spin/Manifest
deleted file mode 100644
index 73e38c6b7e0a..000000000000
--- a/dev-java/spin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST spin-1.5-all.zip 482286 BLAKE2B d1b1de891290ed465f2886bea046d9aa106626be91e5ac37dcd795bb0ef5e558b3d81b1e86cfb168d660f4c2884d321d560bece50645822a0334848225c6638b SHA512 ce1fad3b138781359d472727b186722d6f1f23b7002dd1ada294efd80b3a9caf5de15207cdd682fcbfcafa85c63895c7dd9683fefb5ce5b09cc4115ae3733466
-EBUILD spin-1.5-r2.ebuild 3049 BLAKE2B c93e50ea27af69cea44a6b34ef6afc72eee4b49eabb5a85f0d966828c760e4e354cb6aa8e71c7d7a71ace9e23cab2ad4815031e7a0d5fdbbf04677ee308c9e58 SHA512 496cc013453570add3ffbe23ea5800fe8e43416a31007034ed9c2b401b4f0062aee915cbb98c3e65ac954fc8f35569a889b6d5cd5a6f41420edce80e09a4faa4
-MISC metadata.xml 311 BLAKE2B 4b74521bd09bf6dc5cc23756c20b979e6bd0def2976e74cc5ed62dca4482e460bbd43c98517828a0396abce3623cf16cffff230c8a92015a9d9894196f9480ef SHA512 fa0bd5bc4452ece5f45815567016bb38b79c420ea5050f66aca8062839360d0c4e563f56316ff1f98e02e088b3a7e15d8bfd583c94fb494df643d24ba3b7fb90
diff --git a/dev-java/spin/metadata.xml b/dev-java/spin/metadata.xml
deleted file mode 100644
index 9f47c959bca9..000000000000
--- a/dev-java/spin/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="sourceforge">spin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/spin/spin-1.5-r2.ebuild b/dev-java/spin/spin-1.5-r2.ebuild
deleted file mode 100644
index a8557a83ef98..000000000000
--- a/dev-java/spin/spin-1.5-r2.ebuild
+++ /dev/null
@@ -1,93 +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 mirror://sourceforge/project/spin/spin/v1.5/spin-1.5-all.zip --slot 0 --keywords "~amd64 ~x86" --ebuild spin-1.5-r2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="spin:spin:1.5"
-JAVA_TESTING_FRAMEWORKS="junit"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Transparent threading solution for non-freezing Swing applications."
-HOMEPAGE="http://spin.sourceforge.net"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/v${PV}/${P}-all.zip"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# cglib:cglib-nodep:2.1_3 -> !!!artifactId-not-found!!!
-
-CP_DEPEND="
-	dev-java/cglib:3
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-BDEPEND="app-arch/unzip"
-
-DOCS=( license.txt )
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/java"
-
-src_test() {
-	# 1) testEDTNotBlockedDuringInvocation(spin.off.SpinOffTest)java.lang.Error:
-	# Unable to make void java.awt.EventDispatchThread.pumpEvents(java.awt.Conditional) accessible:
-	# module java.desktop does not "opens java.awt" to unnamed module @42bb2aee
-
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -ge "17" ; then
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.desktop/java.awt=ALL-UNNAMED )
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
-	fi
-
-	# There was 1 error:
-	# 1) testNonAccessibleInterface(spin.JDKProxyFactoryTest)java.awt.HeadlessException
-	#         at java.desktop/java.awt.GraphicsEnvironment.checkHeadless(GraphicsEnvironment.java:166)
-	#         at java.desktop/java.awt.Window.<init>(Window.java:553)
-	#         at java.desktop/java.awt.Frame.<init>(Frame.java:428)
-	#         at java.desktop/java.awt.Frame.<init>(Frame.java:393)
-	#         at java.desktop/javax.swing.JFrame.<init>(JFrame.java:180)
-	#         at spin.JDKProxyFactoryTest$1.<init>(JDKProxyFactoryTest.java:44)
-	#         at spin.JDKProxyFactoryTest.testNonAccessibleInterface(JDKProxyFactoryTest.java:44)
-	#         at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	#         at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
-	#         at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-
-	# JAVA_TEST_RUN_ONLY="spin.JDKProxyFactoryTest"
-	# java-pkg-simple_src_test
-
-	JAVA_TEST_RUN_ONLY="spin.CGLibProxyFactoryTest"
-	java-pkg-simple_src_test
-
-	JAVA_TEST_RUN_ONLY="spin.off.AWTReflectDispatcherTest"
-	java-pkg-simple_src_test
-
-	JAVA_TEST_RUN_ONLY="spin.off.SpinOffTest"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/stax2-api/Manifest b/dev-java/stax2-api/Manifest
index b0c37b30550f..fedd0db547e5 100644
--- a/dev-java/stax2-api/Manifest
+++ b/dev-java/stax2-api/Manifest
@@ -1,4 +1,3 @@
 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
+EBUILD stax2-api-4.2.1-r1.ebuild 1044 BLAKE2B 3d7f079bbb50533be2ca0ef920d8f2e2aa6e0b79c350304be8c57007dd13f2d7d6f9ef77b9b8e0d6ec6633e497908d98e14e37f43aaec5f2d4dd9a638c53569c SHA512 b4f1f7e57e5042b8d138ed922e68ebf2bd4b857acfdf5736fc0b7f1b13d31d22a865289e4ffbe95c4468c712bd66e604da7d14fd0d2ab6f4a0b5318203cb0e8d
 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
index 9e3c9d842122..7f8730949f16 100644
--- a/dev-java/stax2-api/stax2-api-4.2.1-r1.ebuild
+++ b/dev-java/stax2-api/stax2-api-4.2.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/refs/tags/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.9:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/stax2-api/stax2-api-4.2.1.ebuild b/dev-java/stax2-api/stax2-api-4.2.1.ebuild
deleted file mode 100644
index e0db485cf34e..000000000000
--- a/dev-java/stax2-api/stax2-api-4.2.1.ebuild
+++ /dev/null
@@ -1,35 +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/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.8:*"
-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/stringprep/Manifest b/dev-java/stringprep/Manifest
new file mode 100644
index 000000000000..bd28ea8f1a0f
--- /dev/null
+++ b/dev-java/stringprep/Manifest
@@ -0,0 +1,3 @@
+DIST stringprep-1.1-sources.jar 23229 BLAKE2B f347262c7b3a7632c94111226333e964b51a3bb8af357b79a62e1f457c5fccd845cb2d232f8d3cca4fc149c2341b962724397eff53224ade10f492a17298a00c SHA512 88cec43ad19a7a2a6194a62999fecb35e17ff04127d72fb0990f4003e41af1d3a5aeb8b2cc3c0c87165cdcb005963faf244f05d78c6f00aac0ab1835d336e565
+EBUILD stringprep-1.1.ebuild 573 BLAKE2B 944a926975ac77a0a38de0a612ddb5fb7eab2011c26977a29200fa22dc5d82b64034c828603549cbec033674a2968513641c3a4d8bc9b98c7670f91fe47536ad SHA512 19f203d301d088397d68dbf83bd8b7c80f994762f0fd173bbc1decd1834901ceecc27aaa34d09801863c946acdfb2b559319157db0fe18bb37af9f3ce4616f1d
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/stringprep/metadata.xml b/dev-java/stringprep/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/stringprep/metadata.xml
@@ -0,0 +1,7 @@
+<?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>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/stringprep/stringprep-1.1.ebuild b/dev-java/stringprep/stringprep-1.1.ebuild
new file mode 100644
index 000000000000..60e5348f25e1
--- /dev/null
+++ b/dev-java/stringprep/stringprep-1.1.ebuild
@@ -0,0 +1,20 @@
+# 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="com.ongres.stringprep:stringprep:1.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SASLprep: Stringprep Profile for User Names and Passwords"
+HOMEPAGE="https://gitlab.com/ongresinc/stringprep"
+SRC_URI="https://repo1.maven.org/maven2/com/ongres/stringprep/stringprep/${PV}/stringprep-${PV}-sources.jar"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/sun-jms/Manifest b/dev-java/sun-jms/Manifest
deleted file mode 100644
index 59234099501a..000000000000
--- a/dev-java/sun-jms/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jms-1_1-fr-apidocs.zip 361922 BLAKE2B 75342eaeb56ba329948a226f48304e0a520e83f7284d5d8b46b981531b7f8c78283e38b2a488177349aaabb70276fd4ca09bc86993800906aea1469a6549f318 SHA512 ac2c7925b7f5bd3918f0c69a7b18dfa2a15f58243aef7cb429c0571ea218860fc146fd355c905e17310072263f64385b9010eafb1050158f42f498d7f21dfe1d
-EBUILD sun-jms-1.1-r3.ebuild 1383 BLAKE2B 49651a405e48318f28436a6a213af699074fcf012a475fa5ceb2fce92ee592cb904621db79bb7eb41ef0f71d8ec057a49f61a463fd7bceed30d13cbe112d0078 SHA512 c08b0034bd75e5f9833e532be25ef5273e001709c840cb35eadff213c99afa132c25d80b610eb5c240b1e739820f7fef905ecc7d53e73e738ea72f4c7ae330d9
-MISC metadata.xml 421 BLAKE2B f35dd48eb5e3109e51af6636ef2f25b2a0960c15b64c9f32357a5686ac5881ff4267e91c21436c1aa9a2928ccd4cacda0fe5d5bf911bc0092bd4a66b1c1fcfa3 SHA512 e9bb11b1e56d0f9d2bae54e814c381b9bd2ddb76e923be1de575a20579fd1289f0a7d9a68010bad2eccce48075fdcf769255b19512f061c43161e5af87d2d3b9
diff --git a/dev-java/sun-jms/sun-jms-1.1-r3.ebuild b/dev-java/sun-jms/sun-jms-1.1-r3.ebuild
deleted file mode 100644
index 3772dd7778f5..000000000000
--- a/dev-java/sun-jms/sun-jms-1.1-r3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-DOWNLOAD_PAGE="http://download.oracle.com/otndocs/jcp/7542-jms-1.1-fr-doc-oth-JSpec/"
-At="jms-${PV/./_}-fr-apidocs.zip"
-
-DESCRIPTION="The Java Message Service (JMS) API"
-HOMEPAGE="https://www.oracle.com/java/technologies/java-message-service.html"
-SRC_URI="${At}"
-
-LICENSE="sun-bcla-jms"
-SLOT=0
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND=" >=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
-
-RESTRICT="bindist fetch"
-
-S="${WORKDIR}/${PN//sun-/}${PV}"
-
-pkg_nofetch() {
-	einfo
-	einfo " Due to license restrictions, we cannot fetch the"
-	einfo " distributables automagically."
-	einfo
-	einfo " 1. Visit ${DOWNLOAD_PAGE}"
-	einfo " 2. Accept the License Agreement"
-	einfo " 3. Download ${At}"
-	einfo " 4. Move the file to your DISTDIR directory"
-	einfo
-}
-
-src_prepare() {
-	default
-	rm -v lib/*.jar || die
-}
-
-src_compile() {
-	mkdir build || die
-	cd src/share || die
-	ejavac -nowarn -d "${S}"/build $(find . -name "*.java") || die
-	if use doc ; then
-		mkdir "${S}"/api || die
-		javadoc -d "${S}"/api -quiet javax.jms || die
-	fi
-
-	cd "${S}" || die
-	jar cf jms.jar -C build . || die
-}
-
-src_install() {
-	java-pkg_dojar jms.jar
-	use doc && java-pkg_dohtml -r api
-}
diff --git a/dev-java/testng/Manifest b/dev-java/testng/Manifest
index a75e17309227..05945caf737a 100644
--- a/dev-java/testng/Manifest
+++ b/dev-java/testng/Manifest
@@ -1,4 +1,3 @@
 DIST testng-6.9.10.tar.gz 6271781 BLAKE2B 5b77f4b1d9bfdca6749a1d33f465a30bcd9ab9dd9fc37abf8148301c24d6bf287224d9886c0f681deac54e12f9460139ce2a2058b3d160c05cf8fcb9f7808373 SHA512 ed9ad1ced20904ab261d2a233f3fa43ee1ea31778e992cdd27459811b256a6998d8385dd01ff72821133208a1fbd72aa3599a4b8bc0eb4d7b696d34593f9567e
-EBUILD testng-6.9.10-r1.ebuild 1779 BLAKE2B 5cf66631e1d4ef2f41e5c4b160bf48ee5e8d6e552ade55f23e8d6cc38494b6288a92ae7252d19c7d46159d9f8b65f0c7bde834464ac8b6f999a1375ec36d3269 SHA512 a30bcb691a62567705ab7e523cd93109938c9b1261f31e2898e353216c1f7078b78baab8fc35cfce555957dd78cddb8a5cdea42a4a21608b84b8b6fc83f27dd0
-EBUILD testng-6.9.10.ebuild 1767 BLAKE2B 1669906b5f329a3be9f79e923cd4cf14e387ca2c6ceae961db89f4f3fd5b06fd67ed6222ee47710d9b68fc4c2dd77a0f92026f9305ea1d5815380ade542e3573 SHA512 ed934c76af7cace171fb6c7717a09703faca5c6ee1ba9a2a0b2a6c1e12d91b40da209e53e06608662111495dd530e7022bf4aa9c343b75c31d445d5d85026e61
+EBUILD testng-6.9.10-r1.ebuild 1775 BLAKE2B 3cadbbe7936ff93d9c27c9d7f92678a461b33dd19ad994b32d82bad86cebdd4aefb575da42f27bcb0da5f41c63a79195573c029fed143db03954b2e0bc4862f8 SHA512 d59e8f4762615b2365dd5d9ca1a4432246f4d142a760a586fca58402ae741b30fe93ca84a53caab154cfa73fb1f30636171b1f5cd6990f60a6ca5f1dcf251cbc
 MISC metadata.xml 315 BLAKE2B f3779acd8d9bdbe1e65e6fd147aafd16773a99db420ea47fffa6f8501e0160341cafc9f46d72a860de2bffe572c721177f9c5afdd320b991784ad8e6935c7674 SHA512 108fd9d1659bcd11c414264f52f42b60a7287962aad427f7773971fffbbf9b7d97cefb9a39b64c8d12e00d04cb1188d36031a2d7c94aa57929503299636c6616
diff --git a/dev-java/testng/testng-6.9.10-r1.ebuild b/dev-java/testng/testng-6.9.10-r1.ebuild
index 93be01d33c9d..03d59cd025a7 100644
--- a/dev-java/testng/testng-6.9.10-r1.ebuild
+++ b/dev-java/testng/testng-6.9.10-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Testing framework inspired by JUnit and NUnit with new features"
 HOMEPAGE="https://testng.org/"
 SRC_URI="https://github.com/cbeust/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="test" # Occasionally fail or run *REALLY* slowly.
diff --git a/dev-java/testng/testng-6.9.10.ebuild b/dev-java/testng/testng-6.9.10.ebuild
deleted file mode 100644
index c644e8005e27..000000000000
--- a/dev-java/testng/testng-6.9.10.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Testing framework inspired by JUnit and NUnit with new features"
-HOMEPAGE="https://testng.org/"
-SRC_URI="https://github.com/cbeust/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="test" # Occasionally fail or run *REALLY* slowly.
-
-CDEPEND="dev-java/bsh:0
-	dev-java/guice:4
-	dev-java/junit:4
-	dev-java/ant-core:0
-	dev-java/snakeyaml:0
-	dev-java/jcommander:0"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7
-	test? ( dev-java/assertj-core:2 )"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="ant-core,bsh,guice-4,jcommander,junit-4,snakeyaml"
-
-java_prepare() {
-	java-pkg_clean ! -path "./src/*"
-
-	cp -v src/generated/java/org/testng/internal/VersionTemplateJava \
-	   src/main/java/org/testng/internal/Version.java || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_test() {
-	local DIR=src/test/java
-	local RES=src/test/resources
-	local CP=${PN}.jar:$(java-pkg_getjars --with-dependencies "${JAVA_GENTOO_CLASSPATH},assertj-core-2")
-
-	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
-	java -cp "${RES}:${DIR}:${CP}" -Dtest.resources.dir=${RES} org.testng.TestNG -listener test.invokedmethodlistener.MyListener src/test/resources/testng.xml || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${PN} --main org.testng.TestNG
-	java-pkg_register-ant-task
-
-	dodoc {ANNOUNCEMENT,CHANGES,TODO}.txt
-
-	if use doc; then
-		docinto html
-		dodoc -r doc
-	fi
-}
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index ea206ab5f891..e9cb1edab379 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,5 +1,5 @@
-DIST tomcat-native-1.2.32-src.tar.gz 429747 BLAKE2B 48fd1d93866cd4c4e610d54a65b429a31be27a90507bf28c547c2127218896646b385eb9741af3eba46d2dd3534b998352c7ab655dbb02dd8a646127e5bfaad3 SHA512 97587fdec8f12550003db44ae41cb864a16c08fc9362ca4c709b8090ead178d4f9d841436699b29496004b412a097ed5f56655f4fddfc5f4b6e333cbf890423e
 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
+DIST tomcat-native-1.2.34-src.tar.gz 435320 BLAKE2B 7b4f3feb36c1e4db36a67db835ab70169e64173674b0089fe844cd40b99b1a3a87c8b9f774b0df55689f1ad1e30b5606e8056a3e1707c929dcdbb8f25cc9e47e SHA512 03b167fdfaa16db6a0f3acd849b9dfed33aedad2316de6a2aba57b6b11ef4055790e8d96a66f14e6d5ce2200fafdf80b3e8ca0e8f206e4f28de841d8b217787f
+EBUILD tomcat-native-1.2.33.ebuild 1182 BLAKE2B ae624184e321f4eae4a1c26f028e230af06bd37f12a26bf86a3b143f29869408c7371b3f296ddbece209c968de2fef24b416ad71cd22c36d499493400ed1df08 SHA512 91222f3794cda0de3532af0f9e5d564e53662de5c73537a3b8e787e09dde61d43f6c03bf516d389789a01c2396d9607c85e44255017af74a85af0d0abcee68c4
+EBUILD tomcat-native-1.2.34.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.33.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.33.ebuild
index 1d527ab32b16..39a5c2b3e960 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.33.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.33.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.32.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.34.ebuild
index 39a5c2b3e960..1d527ab32b16 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.32.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.34.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-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index ca6b64182018..0dc4654a4b1a 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,24 +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.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-10.0.21-src.tar.gz 6109792 BLAKE2B c650a2e0cb8c6424d98539eaa802c788ff212b014e614123841a806fc9845a953911b5964f67cfc8c1f2ce33dfe627636b5af2f1eaa4b4c985ef4b78d0d831bf SHA512 925bb61ca8b6432e4aef5d5088838e811dbfc0a7b6190354b6ffd957d4ebf145ac1bf4a919b368def0cf63c86c28caf78faf78b190a6e54e085cbf4f108836a1
+DIST apache-tomcat-10.0.22-src.tar.gz 6115322 BLAKE2B 6a9d2e6896fa266b4d75627f85ffa4f132c3cf30db24a331ef2d279e4c618aa817981a963c54148cbcd01af0d502ecf2c4c0f4debdb301f202ea748ea2572a66 SHA512 2d26828a1c44876feb4746186090866784f2a136d8120eb3dc106af7cc4cb95e94c6cbb51a3d4a14ea7159cd3351f4bd475153864e43d7e192296b5382c93a83
 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.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.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.18.ebuild 3015 BLAKE2B 8326a595c857ea61fb4c7c684de79a3255822ba0235f9734cfbc64240b9e4917033f242ed12be88efaf8498fcf306c4b8e2162462fbaf0df808fdb33c40f4219 SHA512 a530aeb1d78bb9cb95ec8cb54113668995d3d6989ae50ddeeb1bf220d1629198b6b5d5a1009826aa329d1174eb99cf5b7c2df33e789f01f61d33b7521353775f
-EBUILD tomcat-servlet-api-10.0.20.ebuild 3015 BLAKE2B 8326a595c857ea61fb4c7c684de79a3255822ba0235f9734cfbc64240b9e4917033f242ed12be88efaf8498fcf306c4b8e2162462fbaf0df808fdb33c40f4219 SHA512 a530aeb1d78bb9cb95ec8cb54113668995d3d6989ae50ddeeb1bf220d1629198b6b5d5a1009826aa329d1174eb99cf5b7c2df33e789f01f61d33b7521353775f
+DIST apache-tomcat-8.5.79-src.tar.gz 5983349 BLAKE2B 8be7a268462c7edfd31636f2790ae83b8dbc16b8c0193f6a02f9f8591ffa9c91683b2042038661a0254fdab66f740b7ab99c1e6f11f0bd1245a836def9011533 SHA512 198f3eefe8445c050a98cf6d69597c17eee76158534c18a636f2285143c0cd248b939b8233618438330aedcd936d76505a064842619b077d8c2fa43244c7a8ff
+DIST apache-tomcat-8.5.81-src.tar.gz 5988747 BLAKE2B 569e1564cf6f5419aaa0d66a2497852021a244af1a858ad943b45e1c36939011a78edd83c717f346e4327278b95b95535e5c57bdd71af5662e052abc02528f49 SHA512 a9261e2a92e122f0f7f547d0b4e083d6c15cdb4d1ad750bdb3c9e3a597a1c4c1bb0f5dd7ad92f41ce18d15ac7fee47acc2cdd59e588b872f173467864120e581
+DIST apache-tomcat-9.0.63-src.tar.gz 6167222 BLAKE2B b608c61fa0584927f4a0ba1d945a41aa626f9441305855bcd2f613fa339fee8be5fbf1b85d96efe94ea5da7dbde2721761ea91d66a66ca11dc8195e33dd572e8 SHA512 9be4b85e2c39702fc4c80b285d7df1d192ab5024452c75d77e1072438a3051dd3056d080cab4834cc9682fd641a8c9ee0484a16b8d21008b944a870016fb04f3
+DIST apache-tomcat-9.0.64-src.tar.gz 6174208 BLAKE2B 3ec55872dc73279202faae10b4825ca8cd4f5d2763c43778445b2f1aee27ed1cd765e7345276735359e3a40779eaf2ef8f9120eaca8d38af07cbbcd0584078b4 SHA512 7e01a979d41f7d73204b7a7ae5a85b0094626bf64bcfa3a52f1fc46989369d504b6dd49718084ee0a10af775cab488aae1e18ce05eb2b527800e2a693c7b6386
+EBUILD tomcat-servlet-api-10.0.21.ebuild 3021 BLAKE2B 5a7b1fc041750ed25e2b2ebd91a46d422b8b84455814a95f0ecc4b13634e8df876a1cc95e4f6318380392feb80f8a748bfe21898e18169ddb05eea7a0f086c2f SHA512 da77418b28127f4d7e05f691f835e7eb01a59e2f33daf15ecc2f76ccbc1f136e7b446d14104d9cbc62f9d251f926dc698e8051b877c61f4adbce45c51b21822a
+EBUILD tomcat-servlet-api-10.0.22.ebuild 3018 BLAKE2B 7407df97c33c89d436e1d338f9c30a1dd2b2b0b90aad199e2e1d02a6a2d0360ef2f95f7b452d4b677d4daad016d5a27bc7a823e353355c7c28f6586117efa6e9 SHA512 7c08253ab8ec762c693902e17a0261023e9cbdd022b436944fd921b0969807bf79766d3ff6c951db1b9cae1580d073c6259d3d4688ae3a3ab88a8c3762cefc27
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802e96cdb2d431778dced5de495f7ed2c665ff079300b37e658b3cad133c99bda92505eaf8add6c3e582d00ccdad61ebc4097c80 SHA512 7a571e537319eee86a34070e5e8e2baa722238fff2a57bea51a9e9ca746ec43ef07c7864a7235ef3ab33560b111c8d4971b8e4848f1e54f2719ed162857a7437
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2549a23f359648d8df6f69399be2c821eb55426fd9cdaa284aa3d474bf26a3cbed649d0e46ccf0a2334f8430e0927d35a72d8dbf SHA512 0ad484e1c808864d96daec646c5a14857f87ae097388f02631687a199c12888581edf24ff2e992a3b48ed0d4f5f5e954960673519705f4885004a46bd47dca78
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
-EBUILD tomcat-servlet-api-8.5.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
+EBUILD tomcat-servlet-api-8.5.79.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634
+EBUILD tomcat-servlet-api-8.5.81.ebuild 3006 BLAKE2B ffed57a50da25f7e5ba64026f6ed77a530f09b54f548a6e4ec99cc2f97313ed3c527a43f91e39d4b89d3ff016146ca9cfdfef22fcb9206914261afaa214e2bbb SHA512 8927451e4d1c067b17b758fbdf21c17f63fcf7e135b31e0f0b67e471dc0aa5eec0a10fc0e31f091a29614343b856cfff50e3a063674b9b1613edcd696793626d
+EBUILD tomcat-servlet-api-9.0.63.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
+EBUILD tomcat-servlet-api-9.0.64.ebuild 3013 BLAKE2B 642b4fd0b2c0703f48dc9b0354dc9df887d149485ca538a9450ee2110cee17dc145be54538d27c21da079db942543cc7e7ffa4206cb3e2c8f755b2dbf0159012 SHA512 adb2ef89bfa5e7b111b0135ae318ea5989d0f5350ccaa23053108a1c53a17aa2b908eab00879c3e384edb22630dec79d582ed682ffd8fff6eba58470d77e977d
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.21.ebuild
index 440d44e0a658..0d28b0e15cd3 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.21.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 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-10.0.20.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.22.ebuild
index 440d44e0a658..5ed928878473 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.22.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.77.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.79.ebuild
index 888295412849..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.79.ebuild
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.81.ebuild
index 888295412849..c6359840b613 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.81.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.60.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.63.ebuild
index f1c865a27bec..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.63.ebuild
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.64.ebuild
index f1c865a27bec..09fffd263372 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.64.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/wsdl4j/Manifest b/dev-java/wsdl4j/Manifest
index a22dc82f7f5d..a6560e100fb1 100644
--- a/dev-java/wsdl4j/Manifest
+++ b/dev-java/wsdl4j/Manifest
@@ -1,5 +1,7 @@
 AUX 1.6.2-tests-sandbox.patch 548 BLAKE2B aba74bdc87f3a35b46a80e20968e926f604a2dc13bfd48569f62fc72b7c8e2bbcb5df33af712c19a548a8c9668195cc340be92fa60e21ab36b0ab0c089de1d23 SHA512 bed0bcf00856309d8f628d4a41774a112bd26c651e9fdfa00af3113d780f430e6b50213fe0f743b486aafb78f11cdd924c4dd8eef64300715a8e88c64c11368b
 DIST jwsdltck-bin-1.2.zip 599377 BLAKE2B 0f99dc93a1b22019c572fe55585ee285c72e1dabcecc5cf93fa635b12a39a43686f0ff704a0c9ea25c682a882c4580fd82cf2015a9d4417dd28bc87d0b32a670 SHA512 a8f86d9895c588d752d266413e77c2a8db241e9cf9c199909f2e9d1d1b3b1b03eaa6b5841c62b0e7a7c779089eb6721797fdb4f2db841789a6a19884bd48711b
 DIST wsdl4j-src-1.6.2.zip 172400 BLAKE2B 96fa6a9098993ba20a277004515a4cd29bae84450b86398ceb1dc7835f14f17b39e5daf87d557b4378860c9d24e5928a80bb30b2d953fdc8fcae7d97ae8454f5 SHA512 55d0b8eb6a08cecd4a48223a9f29fe6ed0e00ec4dca99f44a04882efdba448601bb7dadcaa347e32e3ff5bb9e3334503d6666ca2a6276c7bb48b80acea57b751
+DIST wsdl4j-src-1.6.3.zip 173137 BLAKE2B 85ffe7a53b281307cd2d7072f611aa7ecbc10a5e13125f44f0dc934218b8d31ad15438adfc46a89431a5fc1ac68d4896c2415a95ee87c227d74babe664202e4f SHA512 eb5e16b0b51530a27b12aae5d897384d2a03db2e4df70f23ab435af5e8444f828dacfdb0ab0807a9e0b3423eebb165eea8790c129a173d376fc929a1c222be6e
 EBUILD wsdl4j-1.6.2-r1.ebuild 1376 BLAKE2B cb0628a913a4d93b32f8d2db8e59757bf31500ebfc7bbf7899e2f08e60e82ecfef6609dba997ec17aeaa9a96782326e3055e8a7808c52d9257010249d0cc53cb SHA512 32e0c7d1cd69884104ae305d7dd3e24e92fbb6f26c7e2eda07ba4ddc814f700b8c8986a8cfadc89bd4b57203b6219abcc2db30104ec929677036e63153303e00
-MISC metadata.xml 315 BLAKE2B 56dc646e9b7c4b648c7402c9ff7748b94409ab0a6c6e647be5e57c95c75df38ea3c1f500fd4dccc8ac36026f035cc5514f810b9787af6317b1aae4fbf056c28c SHA512 effacd54f59821dbda6550f490cd95baffdb89aecdc018291e05431eefe216c7af3e5590e80b1e4ea499f50c8e1a692db3bd82716d4389d46b8295e5b3c16483
+EBUILD wsdl4j-1.6.3.ebuild 599 BLAKE2B 60af9fd15e0fadeec0ef848404f314a9b4dffa58c193e7ceb82820cb9a5a17f6b0f51d3ca4b65f608df5ffeb437e9a257a96b04e890750c145b8bcfec4b39a49 SHA512 e15ab20d9f011a3009be198610a84679e2e61a5c98659c0163ac47fa9e9231072842adb867e89a9b7be75d10350758a1c340a4296ec3df253bd8f31cff5fe65f
+MISC metadata.xml 313 BLAKE2B aabc90f625441d1325eb089a25545ba18a7e323c758d183b8e5ca2c1531c12f33e71404209f8c7c70713cb9ecfac806ce1d59aceb34b21c1c83f44b409433f5d SHA512 13071d1d4f65f3e9ce63df3e7b15289167c9bd83b0a83df6b40faec8da89a69d271f83e22ceff5e003ca230259a986c96cf5765a94ec5c03d6cffac3ef4632ce
diff --git a/dev-java/wsdl4j/metadata.xml b/dev-java/wsdl4j/metadata.xml
index 5f130b9b7282..85df5402cc46 100644
--- a/dev-java/wsdl4j/metadata.xml
+++ b/dev-java/wsdl4j/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">jwsdltck</remote-id>
+		<remote-id type="sourceforge">wsdl4j</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild b/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild
new file mode 100644
index 000000000000..3be69a6a39f3
--- /dev/null
+++ b/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild
@@ -0,0 +1,26 @@
+# 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="Web Services Description Language for Java Toolkit (WSDL4J)"
+HOMEPAGE="https://wsdl4j.sourceforge.net"
+TCK_V="1.2"
+SRC_URI="mirror://sourceforge/project/wsdl4j/WSDL4J/${PV}/wsdl4j-src-${PV}.zip"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+JAVADOC_ARGS="-source 8"
+
+S="${WORKDIR}/${P//./_}"
+
+JAVA_SRC_DIR="src"
diff --git a/dev-java/xjavac/Manifest b/dev-java/xjavac/Manifest
deleted file mode 100644
index 3c281108fd5f..000000000000
--- a/dev-java/xjavac/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xjavac-2.4.0.tar.gz 2472 BLAKE2B 4693c2fa74a2951909ff6dc55638e7f3de19fecf82bcfeba0abfeaff82f941ea9d02dde3de969e850da9c5bfc98684b0a34be391d6db6c3fe12de0a734137afd SHA512 6a12c605f6f455f20981214d1ce8ed752070ae2b268e9279692a3b05921c84857636055d9c4d7b1de92bafbaa4b528f36983dc2eca0ca883a7fa340320e503a0
-EBUILD xjavac-2.4.0.ebuild 645 BLAKE2B f78be55559af898741e28726abfa119e249ab2657dac51f542b8168998defc6b8cf646d8110c3557ca907495dd07c49f85b01d7b2a8caa1cb988e45359ff9ca0 SHA512 56cd2cb327833f68284b3e1921daa78bdae26402bcfb9cceccee85571e05ea482ccb37244bca39f5cb06b97da55a73d25fafea9cc5df394e28e7718ce72cec8a
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/xjavac/xjavac-2.4.0.ebuild b/dev-java/xjavac/xjavac-2.4.0.ebuild
deleted file mode 100644
index 552ee4b12b4d..000000000000
--- a/dev-java/xjavac/xjavac-2.4.0.ebuild
+++ /dev/null
@@ -1,29 +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
-
-DESCRIPTION="Xerses Java Parser"
-HOMEPAGE="https://xerces.apache.org/xerces-j"
-SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-CDEPEND="dev-java/ant-core:0"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.7"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.7"
-
-JAVA_GENTOO_CLASSPATH="ant-core"
diff --git a/dev-java/xml-commons-external/Manifest b/dev-java/xml-commons-external/Manifest
index 1ae2ddb0b172..46cb0623f428 100644
--- a/dev-java/xml-commons-external/Manifest
+++ b/dev-java/xml-commons-external/Manifest
@@ -1,5 +1,3 @@
-DIST xml-commons-external-1.3.04.tar.bz2 659665 BLAKE2B b7f51fab7162b905142c5256f1d03d519b4ab387edf8b4c3d738ac138cf6ad71f29fd568c99423f840be6eb02bb50e89cfab3c729d2d5071d8a66e30836d8f5e SHA512 8bc71a0850e751ae4a5057833d57b2235734facbae43c733b0a9d86e5be99af016b737f12f5566c736f71374a709dee9954089db8fbeff4fb4cbb236a9fd6abb
 DIST xml-commons-external-1.4.01.jar 656529 BLAKE2B c51ca760c23759d4f4ad11fcb44caa1cb0bcb2785d9095ed56dba9b0d5fe57370a9d9aaeed5a8e0c1fa67918237ce693590bac791200add2e85155ab87ffe40b SHA512 f00773eec613453d0e1b7b0857b01c51d1926079f38e172953c4ef0350f063439acc8b5967f947c8d15a73e5d53e8887c3bf30122d5f7c553bcef349e5a8cb9a
-EBUILD xml-commons-external-1.3.04-r1.ebuild 1176 BLAKE2B 9ecd949cbe8aa224da80696219c7d43896ea673fc18f33653b138cdf60475b1a6b05186134b8ece5877db98b6788c132f7e7757d587a4f87e4cc1dbb9e604871 SHA512 3bcb0344160d994a5233703239cc667999ef4f12fcbd9bd2e03fc7a4986adca1a9c0815968645664ac25e0d04357381537f0f21f91b1a6349a72ab7070927731
 EBUILD xml-commons-external-1.4.01-r2.ebuild 803 BLAKE2B 35740156a5cc1b08281c2f8f21addaf2cf60f1535818f7a711c8167da736d3fc492a2875048058a7dd19d0e62d0f9c67e61b4fa34095ee70b5da941c88604db0 SHA512 598b497716bf1be8de87dc702d867012137ad376427d9561c67b0ebeca3ed85feb966c4cfb54f783f5f04e14ad5bdfcef4e7518612f1f338a779e92262564559
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.3.04-r1.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.3.04-r1.ebuild
deleted file mode 100644
index 02ca57c136ba..000000000000
--- a/dev-java/xml-commons-external/xml-commons-external-1.3.04-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="xml-apis:xml-apis-ext:1.3.04"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Externally-defined set of standard interfaces, namely DOM, SAX, and JAXP"
-HOMEPAGE="https://xml.apache.org/commons/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-# upstream source tar.gz is missing build.xml and other stuff, so we get it like this
-# svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_3_04/java/external/ xml-commons-external-1.3.04
-# tar cjf xml-commons-external-1.3.04.tar.bz2 xml-commons-external-1.3.04
-
-LICENSE="Apache-2.0"
-SLOT="1.3"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source"
-
-DEPEND="
-	>=virtual/jdk-1.8"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-src_install() {
-	java-pkg_dojar build/xml-apis.jar build/xml-apis-ext.jar
-
-	dodoc NOTICE README.*
-
-	if use doc; then
-		java-pkg_dojavadoc build/docs/javadoc
-		java-pkg_dohtml -r build/docs/dom
-	fi
-	use source && java-pkg_dosrc src/javax src/org
-}
diff --git a/dev-java/xml-commons-resolver/Manifest b/dev-java/xml-commons-resolver/Manifest
index 99df7a1a372f..1b24caf6f237 100644
--- a/dev-java/xml-commons-resolver/Manifest
+++ b/dev-java/xml-commons-resolver/Manifest
@@ -1,3 +1,4 @@
 DIST xml-commons-resolver-1.2.tar.gz 262701 BLAKE2B 54258372fb2d08dd08777bb8355b13c26f426d843e47c6790a6174f82998b9a20bc1bfb8073c5bab8c4d521db54600c8eb3ffdb6c03ce6091073ada655e7c6b2 SHA512 0c91057da3198fc488c7b2c20afb029aa4441ad979159c378d532b02caa294d27e730ae2f9857062af5e3815a603a6110c5441dd3fe6b36c342a78beac3c8a6f
 EBUILD xml-commons-resolver-1.2-r2.ebuild 838 BLAKE2B 80c9b8e63c333b12e016db4c0259de39d04acc722a3773ec66189b5aaea5609afd4ddce367c3248d93111ff864795d536975070ca5a0752eb7ff8d1004f4e01b SHA512 ee1f023f3d694f541f0028aca315d3d9bc1a75afc2e24581021676490d2c320a971244a818f3950b888c8e005928dcd6ff77d15f78a446cb7f9cb8a967125dd5
+EBUILD xml-commons-resolver-1.2-r3.ebuild 1111 BLAKE2B 50ba5d4751a150cbcd7fef6f8e2e1252b58083fbc45bbe238e9ea3905286eda0aa2683c179fe13aeb969a61a5a7f686b14e4e8847722262bb0a961e9c0f0df46 SHA512 c105c62c991bc4fcb6a70ec49b69468b2bd05539d7f7585b22072f563d242bb43b7e86d76e9d5c9f84e3d5f33c55642b398a6d8c0fcc1a8f79114420ac472556
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r3.ebuild b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r3.ebuild
new file mode 100644
index 000000000000..df851d6671ae
--- /dev/null
+++ b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r3.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"
+MAVEN_ID="xml-resolver:xml-resolver:1.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An XML Entity and URI Resolver"
+HOMEPAGE="https://xerces.apache.org/xml-commons/components/resolver/"
+SRC_URI="mirror://apache/xerces/xml-commons/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( KEYS LICENSE.resolver.txt NOTICE-resolver.txt )
+HTML_DOCS=( docs/resolver{,-release-notes}.html )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+JAVA_RESOURCE_DIRS="resources"
+JAVA_MAIN_CLASS="org.apache.xml.resolver.apps.resolver"
+
+src_prepare() {
+	default
+	java-pkg_clean
+	rm -rv src/org/apache/xml/resolver/tests || die
+	mkdir -p resources/org/apache/xml/resolver || die
+	mv etc resources/org/apache/xml/resolver || die
+}
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index fe9c883b837f..13ce0b49fc27 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -1,4 +1,3 @@
 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
+EBUILD xmlgraphics-commons-2.7-r1.ebuild 2095 BLAKE2B 58a8aa16af88bd0cb888efa1e79b21c9601b09e2d6fc408da27062270dddd0ed41c37c6451050bcdc05fbedbe12d89f09cb5142f4dd62cb1aa57e44135ab1126 SHA512 30e5b801298c0bce4e6aed077226fdbc9cd4c558a24046a552b5df2372926c0906a3d3f15a6c4cfe3c98ce797d60042202fe63e19c493b5a8ebfb55583de2ec3
 MISC metadata.xml 328 BLAKE2B 0116b6e35d9f22341807f3da68bd8d38fc43447920207a08508c46796bf1ff9d2634f38002b22139b7142c912e531d27043f629f259ab2e87d12b8e590d4b92a SHA512 74979721cdcb0c26c82a27e23043487990f41691ea1dd6acf87fb4e403dc8a44402c9907d697ac3024d754b3c504c266d51753b3cad1e4e3a16d861758574a61
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild
index 2bc679b79fbe..967964f74e06 100644
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild
deleted file mode 100644
index da5532327d1f..000000000000
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild
+++ /dev/null
@@ -1,66 +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 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"
-
-# Tests don't even compile with that old mockito version.
-RESTRICT="test"
-
-# 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:0
-		dev-java/xml-commons-resolver:0
-	)"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( LICENSE NOTICE README )
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,xml-commons-resolver"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/xmpbox/Manifest b/dev-java/xmpbox/Manifest
index 31c15b2e0c76..94e6735d2db8 100644
--- a/dev-java/xmpbox/Manifest
+++ b/dev-java/xmpbox/Manifest
@@ -1,3 +1,3 @@
-DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
-EBUILD xmpbox-2.0.24.ebuild 1787 BLAKE2B d8b899ad760cccea3df9635e6208a5dbfcd6fb5857b603c15d0519673188d2200f2b2499c5b1ba1d86c89aa38532551fc1ce554c71777349c0a457fef621bcd8 SHA512 b6bfd7171448049a706826da3d3c6577e1a801104a7d6d2a1c087295649f16adaaf1c47d197752592d4d216fa5bacf6965f6786721425a0cc01b41ec2bb3596b
-MISC metadata.xml 519 BLAKE2B 49b3df59011f9aeb072d3e42abbc7955b3b49198c2be44684d629d47d69a9c48cee8e2b6e48e3983c9d1c06cd9070149b3472716fde75ff3ec110f3d35237b68 SHA512 45f490395e7eb8e0f4bcaf452ec1ac2839232c3f4028e7c3d98d0ae292112ec3290f4d59270343df5ef6f9cc5cc4138a4ec9488656dd19de9501eb226b400566
+DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
+EBUILD xmpbox-2.0.26.ebuild 1707 BLAKE2B 775bfd44df6055da28f3256d411035d98de8d247199ad3c0b3e63f2a030937dde311e08bc24433c21a6aa8e6e1856b15bf302f175190f06ee60559751938d31c SHA512 600198cbc3142f6e29ceb07843016d29863c4d98de95aafd1dc72480b6c36aedd655b7002311c05d4e7a4d985373ddbf9da5dbc2a3281cc3f1b9a4f9bbcfb9f3
+MISC metadata.xml 597 BLAKE2B af69fd45c044a79514701234978475dbd127d305667a831a88ef2ba2fc2e8fe903c77ddfa7e179466e004467da1002cc56f310628c1e69adbcfa40fbe485110b SHA512 baf1c43dc731ac2cc2f5a6e099b4334f06d352d1324e78b1cea4b3d839c55ca36cf368b6cf4f6b5bb41fb0be9c35e1c41546ff93141e7316d84ff9f94074efa9
diff --git a/dev-java/xmpbox/metadata.xml b/dev-java/xmpbox/metadata.xml
index 838ea475ab48..6c39d66c1f9a 100644
--- a/dev-java/xmpbox/metadata.xml
+++ b/dev-java/xmpbox/metadata.xml
@@ -4,6 +4,9 @@
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">apache/pdfbox</remote-id>
+	</upstream>
 	<longdescription>
 		The Apache XmpBox library is an open source Java tool that implements Adobe's XMP(TM) specification. It can be used to parse, validate and create xmp contents. It is mainly used by subproject preflight of Apache PDFBox. XmpBox is a subproject of Apache PDFBox.
 	</longdescription>
diff --git a/dev-java/xmpbox/xmpbox-2.0.24.ebuild b/dev-java/xmpbox/xmpbox-2.0.26.ebuild
index f7c6fc51fc26..2782e6957f22 100644
--- a/dev-java/xmpbox/xmpbox-2.0.24.ebuild
+++ b/dev-java/xmpbox/xmpbox-2.0.26.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://ftp.halifax.rwth-aachen.de/gentoo/distfiles/cc/pdfbox-2.0.24-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild xmpbox-2.0.24.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/pdfbox/2.0.26/pdfbox-2.0.26-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild xmpbox-2.0.26.ebuild
 
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:xmpbox:2.0.24"
+MAVEN_ID="org.apache.pdfbox:xmpbox:2.0.26"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
@@ -40,11 +40,8 @@ RDEPEND="${CP_DEPEND}
 
 BDEPEND="app-arch/unzip"
 
-DOCS=( README.txt )
-
 S="${WORKDIR}/pdfbox-${PV}/${PN}"
 
-JAVA_CLASSPATH_EXTRA="jaxb-api-2"
 JAVA_SRC_DIR="src/main/java"
 
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /dev-java
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)