gentoo resync : 09.07.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-07-09 15:43:36 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-07-09 15:43:36 +0100
commit: 2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch)
tree: 8c816148bcbd22757d892089c989ae614eae4f5a /dev-java
parent: 0f558761aa2dee1017b4751e4017205e015a9560 (diff)
140 files changed, 1099 insertions, 1572 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 68a483afa5d6..5a6e916a7d6d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index b7b2a98dd881..5ef2f9c06738 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -3,5 +3,5 @@ AUX ecj-4.22 378 BLAKE2B d0d01286ef045eabeb70a82c9839a12758a5b942208262a1eae1abf
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
 EBUILD ant-eclipse-ecj-4.15-r1.ebuild 1265 BLAKE2B 10003921348e6a8c03eb7fb048fdaf391ecfcf2c9a8d45cff57491bc0bd4507462fbba41282c8998aa4b4b50792fc6d374052c1ef1019e4dab30e24f8ff853fa SHA512 2cac62f7e51e2086fcdfbbef59a2e794d165692683d993e6c8aa77f0fb3daf55f0c4c20c117a984edb70b268d2fac1c3742ab674a56e73778ecc4b434242e00a
-EBUILD ant-eclipse-ecj-4.22-r1.ebuild 1424 BLAKE2B d67bb537096dec426f442093b300cb28f8fad4bf55b729eac135c3887eeb7989dc5583557c2c8011faccc01a343cf4436979e90017442de170655258c5e25be9 SHA512 6e3a687ed637d80e27a02b81cb69a04e015823668d6cc36fcd1832dc7504966ff1ad142da9aa9289e69c066eee0865262da69ef1871538f75a974a8a446c1a70
+EBUILD ant-eclipse-ecj-4.22-r1.ebuild 1422 BLAKE2B a0b035a6386747d32ad2197ccb0e6eeb85a24b497236f5cf651dde1e39e81dd54746f4df6f9766e390c72a394b1d10e7cf4b40a86700a0875a59fe5ce469692b SHA512 739b38433d47dbd8e4d6bbf1c663d4001b33614c69c69d6bf146be0777624c55cff6c1d1c869dfa42ed6f8d325d5f8dbcd7eca9e77b18f7ecf89eeefd60f0ab8
 MISC metadata.xml 547 BLAKE2B 250bb477a3547d97e993539eb2965d6ff8a5085627c8a4ce221fc74704b1c824b1ba4a2891a850b820bd42c4ccf3e684af3035ccaf45cc595f0eac6b62da2a4a SHA512 e1283be49bebaf5bb03e55ead8336a046eff3c657e600dd1456690280e2ae2f9f4fb12987d7c1cfd192e41d8f8d40b36896a2d7430063d243f374e4aedc4ec77
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
index 786880f955b6..a2d55cda8ca1 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.eclipse.org/"
 SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.22"
 IUSE=""
 
diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
index daa308a059c3..085eee5f16f2 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD bcmail-1.71.ebuild 1434 BLAKE2B 6d574265df30b20c3dba3224719fa4b5d3e0c53206ae1d6e8abd3a8afa8ee3506f1546bca7e9e938b9f4cc09278456c6ffff43368cd59a8154b02955d5e59ed3 SHA512 f320b5836d3e44cda2d3bfe7bc5ba123a95a2f23916e6029cba69e779560f95a77b67563bc69a09d2ccc3da909152b89de45aea43706f3a050bb9f8e1fa5d83f
+EBUILD bcmail-1.71.ebuild 1430 BLAKE2B 19683850f07233ce075895df1c658e487d2c06e72f987edbc6a639a1eb36b6a62b218e7d7c2b39acd1d2da186f4d4e334a776ecff0192296003e02b3db5121c3 SHA512 9466d5acecbe4710a20fac17bc625221195c370b7e1e09c9eec6a0e1bebbca293a10a6d16ed714ba02df30bf1f73fee36723c550db9d63c78984f6afc2e13fee
 MISC metadata.xml 593 BLAKE2B 03a8a1bc9096f606d9e934b05910a5052df992a0e9f6412177aad141bae2bef648e4208e1b967e318f11e3e9a227d5783d0ce6880ef44952e238ff3831ca4200 SHA512 42de422b76ba5667882f973abfb9b482e9c0b9ac07c803be0ee9fc322c568d2cfa29e3fa56e0b57a4ed143a3645a484447dd981385b2ce49c5667f734d40c979
diff --git a/dev-java/bcmail/bcmail-1.69-r1.ebuild b/dev-java/bcmail/bcmail-1.69-r1.ebuild
deleted file mode 100644
index 3c07eddb70b3..000000000000
--- a/dev-java/bcmail/bcmail-1.69-r1.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
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.bouncycastle:bcmail-jdk15on:1.69"
-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/refs/tags/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-1.8:*"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.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"	# OK (106 tests)
-
-src_prepare() {
-	default
-	cd ../ || die
-	java-pkg_clean
-}
-
-src_install() {
-	default
-	einstalldocs
-	docinto html
-	dodoc -r ../docs
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/bcmail/bcmail-1.71.ebuild b/dev-java/bcmail/bcmail-1.71.ebuild
index bb13ff26b064..6d64d374d63a 100644
--- a/dev-java/bcmail/bcmail-1.71.ebuild
+++ b/dev-java/bcmail/bcmail-1.71.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 CDEPEND="
 	~dev-java/bcpkix-${PV}:0
diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest
index 87f0c71b59a4..6f614ae3318c 100644
--- a/dev-java/bcpg/Manifest
+++ b/dev-java/bcpg/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD bcpg-1.71.ebuild 1284 BLAKE2B ee5ad153c3f25f8ec93e3a88cff4afdcd543ec1274c94c8516ad71204307c0c515abdd9ad65e2d2743a4120ccbe045e0f18e830971e6f419896399c5474883f1 SHA512 1eba61d546763efe29d4dc1e4fbe20d2d2742bb039a64190dd195d95147b921e7d4972a07ed7ed8e44c9ee67acf3ca7b87d608f9cca34cee1f9b3744c2133328
+EBUILD bcpg-1.71.ebuild 1280 BLAKE2B 5c928e2def51669efc1881793fdaf5283612797b2a06c66ee4b0f967ea102957565bc29df62cb4389b5d0c64427e3ffbaca2640a5fcdf3a3e319e5d95d6573a3 SHA512 648ce8d3a9107b9538acc0813fcdf77116dd784fd075af8f6b94bedd4d7d8bbc4229a09fc84f9e1a56bcdad374d78ac064e013cbf3bba434c04e5d58671e1fd3
 MISC metadata.xml 521 BLAKE2B 76af9d5a734fef6cc73b43cf2f3cdf630fba2ff8deeaebe787b08b5b94f0bc1d7988ffb1d4820641c05d5fa139dfe0798aa7105e93142c835644760dbe52121e SHA512 4202d5ec7ba349c1cabafc474edf5cc5379c475d3a313b2a9ea90f1f7edf88d9a91b557042cfcf496f477b02a7f0b5e1ae61ded26f92bdfca15812fa34ee2133
diff --git a/dev-java/bcpg/bcpg-1.69.ebuild b/dev-java/bcpg/bcpg-1.69.ebuild
deleted file mode 100644
index 7e9f5e64e5f0..000000000000
--- a/dev-java/bcpg/bcpg-1.69.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.bouncycastle:bcpg-jdk15on:1.69"
-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/refs/tags/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-1.8:*"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.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_RESOURCE_DIRS="src/main/resources"	# Does not exist
-
-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"	# OK (19 tests)
-	"org.bouncycastle.openpgp.examples.test.AllTests"	# OK (6 tests)
-	"org.bouncycastle.gpg.test.AllTests"	# OK (1 test)
-)
-
-src_prepare() {
-	default
-	cd ../ || die
-	java-pkg_clean
-}
-
-src_install() {
-	default
-	einstalldocs
-	docinto html
-	dodoc -r ../docs
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/bcpg/bcpg-1.71.ebuild b/dev-java/bcpg/bcpg-1.71.ebuild
index 7854003f175f..8028aba31a23 100644
--- a/dev-java/bcpg/bcpg-1.71.ebuild
+++ b/dev-java/bcpg/bcpg-1.71.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 CDEPEND="~dev-java/bcprov-${PV}:0"
 DEPEND="${CDEPEND}
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
index cfeba047df3b..b4c2a3b42ff6 100644
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD bcpkix-1.71-r1.ebuild 3078 BLAKE2B ee7b23d5ba7f18ab15201d3b308d0a02507869e28fd1f77c71d400da9681988438deb90a977adfaed99d38eb9d54d82cb17eea5166d442920f73716d4c0c33b2 SHA512 ba7e8f697f2b4b793d47ea81b92af29526e2643719a97ba9afdc41b80f2e70cc3de968cf04239618d809a7e16460de3b2cf45173c3c1ffcee41fd1b7049fd907
+EBUILD bcpkix-1.71-r1.ebuild 3074 BLAKE2B 901a79ffdb3d3600548dbf009fc22a7f1792089a0854aa7853c5fce74563c6e82973946a5ab47fd8528b3e775b4fe3b6738fcee8b49273e78fe7404186c4da39 SHA512 e89367553ec992250775fb0006e8438348f89e4abe2e2cb8e640b6956277bda752dbd6e3821f0c9f1dff1b89d7d65b08cca20bc7cad24b6649231faa444f7f6e
 MISC metadata.xml 546 BLAKE2B 3e07f58b65f0148062a3f1b20c06d71ce1925cf7b91d167a07d21028f541cfbc69b8a78e914ea6b86598afb3f3ae7f841defa6e1b691fac5293f2cb6746c1f0c SHA512 137f6f4d3d26d90109102fa49e37a42ea3628104adaf65e0b93ca652abd1aa6392e3f76dbf342aa70706b734d8b7f262f2b826e3ce33ae35fa60c40e548bf89b
diff --git a/dev-java/bcpkix/bcpkix-1.69.ebuild b/dev-java/bcpkix/bcpkix-1.69.ebuild
deleted file mode 100644
index f719172983a9..000000000000
--- a/dev-java/bcpkix/bcpkix-1.69.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.bouncycastle:bcpkix-jdk15on:1.69"
-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/refs/tags/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
-	~dev-java/bcutil-${PV}:0
-	"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.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_RESOURCE_DIRS="src/main/resources"	# Does not exist
-
-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"
-
-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" # (16 tests) org.bouncycastle.est.ESTException: localhost.me: Temporary failure in name resolution HTTP Status Code: 0
-	"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
-}
-
-src_prepare() {
-	default
-	cd ../ || die
-	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/bcpkix-1.71-r1.ebuild b/dev-java/bcpkix/bcpkix-1.71-r1.ebuild
index 208e40ffb41e..bcf70c8d215a 100644
--- a/dev-java/bcpkix/bcpkix-1.71-r1.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.71-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+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
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index f4f1f59bfe3a..f7f6735f7e35 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD bcprov-1.71-r1.ebuild 3491 BLAKE2B 4543cbddc8afe392f7bd8840ca297284989a8698394df1db9c2886cdd1989f64a6c68f61ad879a70fadb2a10a8a9af9698653cb86d3e2fa34fd894974f5fd4d0 SHA512 f3c394e75f2f09dde4cd29cbe548cf99c221b3528a0e505d190641eb2d757272b4b6ec226cb5b1f4cfd78d8734b462388f5457186fdaf2d8495f3e19a9cdf815
+EBUILD bcprov-1.71-r1.ebuild 3487 BLAKE2B 18f58c8e846c25872ef20ddbaac6518cb25d1e91211e95e1f91811fd67087eba27f33e2e972186d84facc79226d04d320428fa6b7383fab2ceef3b5958d3f54d SHA512 ead220a5b7ae62374e5a67d95e86e2692017ddd2c85ffceeef2defe7df253ef982ccfbcbb0769f97a70275c2404db0c04dfd0a0c6d79aa4455f9f3f4d14b4d2a
 MISC metadata.xml 476 BLAKE2B b065e42576858847f7c1e2a8f27b836c59ca67f9514bae2077d884601e73fe7cf347beae0c31f2d4e795787bf22d9e7d575555cf0a1d1de2de36bd200fc4af0b SHA512 510131e9259fbe497800cc5ac8650a970e45013c398b4aa26a240c5ef66186fe594f9ff9d21258d7bb744aed1d5365ab462fa5abfec7ef48efbd15071789ea15
diff --git a/dev-java/bcprov/bcprov-1.69.ebuild b/dev-java/bcprov/bcprov-1.69.ebuild
deleted file mode 100644
index e3a5ab067c7d..000000000000
--- a/dev-java/bcprov/bcprov-1.69.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.bouncycastle:bcprov-jdk15on:1.69"
-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/refs/tags/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="app-arch/zip"
-
-DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.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"
-
-JAVA_TEST_RUN_ONLY=(
-	"org.bouncycastle.asn1.test.AllTests"	# OK (18 tests)
-	"org.bouncycastle.crypto.agreement.test.AllTests"	# OK (14 tests)
-	"org.bouncycastle.crypto.ec.test.AllTests"	# OK (1 test)
-	"org.bouncycastle.crypto.prng.test.AllTests" # OK (1 test)
-	"org.bouncycastle.crypto.test.AllTests"	# Time: 126.95 OK (6 tests)
-	"org.bouncycastle.jcajce.provider.test.AllTests"	# OK (29 tests)
-	"org.bouncycastle.jce.provider.test.AllTests"	# OK (1 test)
-	"org.bouncycastle.jce.provider.test.nist.AllTests"	# OK (283 tests)
-	"org.bouncycastle.jce.provider.test.rsa3.AllTests"	# OK (11 tests)
-	"org.bouncycastle.pqc.crypto.lms.AllTests"	# OK (17 tests)
-	"org.bouncycastle.pqc.crypto.test.AllTests"	# OK (81 tests)
-	"org.bouncycastle.pqc.jcajce.provider.test.AllTests"	# OK (89 tests)
-	"org.bouncycastle.util.encoders.test.AllTests"	# OK (15 tests)
-)
-
-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
-}
-
-src_prepare() {
-	default
-	cd ../ || die
-	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/bcprov-1.71-r1.ebuild b/dev-java/bcprov/bcprov-1.71-r1.ebuild
index 6863a4a66716..fbe5c65f3f19 100644
--- a/dev-java/bcprov/bcprov-1.71-r1.ebuild
+++ b/dev-java/bcprov/bcprov-1.71-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-
 
 LICENSE="BSD"
 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/bcutil/Manifest b/dev-java/bcutil/Manifest
index 75a19d0bf582..3bcb3678702f 100644
--- a/dev-java/bcutil/Manifest
+++ b/dev-java/bcutil/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD bcutil-1.71.ebuild 1296 BLAKE2B 4dbf5689690c86d8423eccb85a2dff565d6248ca235eeb79b6e414b49129f96ff7a9f5b95cb8e733fe719e8776886911d253f6ec69b1cb96b18f9d3cbccc9922 SHA512 df9eeafbc192dd8a948d67662c7724c17e8bae50fb48144a126a0ea98ff0874e1c69618d57a1e1a811a34d77e7935e23c0460057b99a3f5097a178eea29b2330
+EBUILD bcutil-1.71.ebuild 1292 BLAKE2B d7d4b54f874eef8c4af2230f40003c147ed08052ab64eb793a3900d428500fb4d7edcb15772f54490682ef564394ba0115623a3fef017e3b91a581c94eacadf0 SHA512 cf04d5ce377fa1c99078362efbb9ef74946ae2f7cfa333bd66d79c5d06dfd905b2e08914e7c47319971e162c415d0b2a5bec788a0aca8a3651377107144909be
 MISC metadata.xml 400 BLAKE2B 7b3239d613e5793ddd738c087d43a9d6f5b0744acf64103234e0f6628aa2296c6a5f86c9af1b980b715a5c58bdb11187a19e48a0cfbfa4f9f63231ee3396e01c SHA512 5754fab7fa105fad0b55babb33cda5e5b309f047bb6da3b7760bd8a3fab219209aa52a3078c43b194fe7a02cff8e5d8ead3e2ba9c74837ce0e604574b344ed16
diff --git a/dev-java/bcutil/bcutil-1.69.ebuild b/dev-java/bcutil/bcutil-1.69.ebuild
deleted file mode 100644
index 69a1a2711924..000000000000
--- a/dev-java/bcutil/bcutil-1.69.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.bouncycastle:bcutil-jdk15on:1.69"
-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/refs/tags/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-1.8:*"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.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_RESOURCE_DIRS="src/main/resources"	# Does not exist
-
-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"
-)
-
-src_prepare() {
-	default
-	cd ../ || die
-	java-pkg_clean
-}
-
-src_install() {
-	default
-	einstalldocs
-	docinto html
-	dodoc -r ../docs
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/bcutil/bcutil-1.71.ebuild b/dev-java/bcutil/bcutil-1.71.ebuild
index 7332092ef843..df97d23f0e69 100644
--- a/dev-java/bcutil/bcutil-1.71.ebuild
+++ b/dev-java/bcutil/bcutil-1.71.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 CDEPEND="~dev-java/bcprov-${PV}:0"
 DEPEND="${CDEPEND}
diff --git a/dev-java/byaccj/Manifest b/dev-java/byaccj/Manifest
index c0b01cebaf92..e209e0b7c43f 100644
--- a/dev-java/byaccj/Manifest
+++ b/dev-java/byaccj/Manifest
@@ -1,6 +1,5 @@
 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
+EBUILD byaccj-1.15-r3.ebuild 741 BLAKE2B 8711649e0ea1c58c0b2d7847d9cecc8cfb8560a3e7c0258f7efe6a026dd23adfd1db541e6f051f66a3b614caac235da1cc45c1e5b925ad574ad21483c2ff082c SHA512 9e87f18f4c1d972783773bedbc2c5cbe595ca3cbaa772e65840fb69d07ce41dd3c906848700e2999597b721e544803d3314a236880c039be8890c9b05e101da0
 MISC metadata.xml 313 BLAKE2B c5964ac48d194d9f970a09e692c7d1460eeed214ec359c1393116bac2f6b9112233f7e5f6d3f1152704e553760b203cbd355e50c34318fe89019b13548b8a20b SHA512 0e243b8c5993cb0ae9de0b5efe268ab1587c722b4de9d915d250fb63814f5169754b467a9db3e8b9cd6256e67418fe5e3d15da7e07c984fd400dad43e5b65796
diff --git a/dev-java/byaccj/byaccj-1.15-r2.ebuild b/dev-java/byaccj/byaccj-1.15-r2.ebuild
deleted file mode 100644
index ed88c9ebb229..000000000000
--- a/dev-java/byaccj/byaccj-1.15-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-IUSE=""
-
-S="${WORKDIR}/${PN}${PV}"
-
-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/byaccj-1.15-r3.ebuild b/dev-java/byaccj/byaccj-1.15-r3.ebuild
index 4db1ab8bbc03..9feb822145a5 100644
--- a/dev-java/byaccj/byaccj-1.15-r3.ebuild
+++ b/dev-java/byaccj/byaccj-1.15-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}${PV}"
 
diff --git a/dev-java/byte-buddy-agent/Manifest b/dev-java/byte-buddy-agent/Manifest
index c17e1049683a..1557ff735486 100644
--- a/dev-java/byte-buddy-agent/Manifest
+++ b/dev-java/byte-buddy-agent/Manifest
@@ -1,7 +1,4 @@
 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.10.ebuild 3900 BLAKE2B 683f9d03bfe04810f6b946b71039af441dd2835cbe7c37c532fbaaba3748d1b30f05dce7e2b8d4370b8e6d99c4070f242a97648e35a7e55205a9dbd33c9d90e1 SHA512 2927b9d5303df5250ef6380359c8fb3265e784003d10d41512e9aad02c2b3dad2250b53de61d620da9df0541885a2fe1a40c698f75d50fada7570ecf9ce709c4
-EBUILD byte-buddy-agent-1.12.8.ebuild 3928 BLAKE2B efbc2379d5631c28281ee48b064646d9bb329dd3cbd590fc688520a478220fb0faff9f31e8aa455450b90083039fb4378e029cce6071fade49111450b20581fc SHA512 f6b00b5f5dbd9d3cff386afd1067a807cd6842b2107e8586af2e371558a375a1fa0213c2b335adc83ca2a74b2b06ce427de752a8ca59748f18f3d005281d4cdf
+EBUILD byte-buddy-agent-1.12.10.ebuild 3896 BLAKE2B 026356551487c0b98673d48fcc48f98ff5407d8934e3be3b212b5e71e908baa4e08e5d7dffd3ff785b551fa0edc587a036db5d549cd1abffeeadd68d66c29389 SHA512 53a612eb49dc6ddc972e784b9e339866bd07cfe514691741dc904d4a51b8e34a5da7ddfbcc7a67d14a4cc6575ecd50a3669c3ca25e0832e5e3aea84508ceec70
 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
index 69968be0f8ce..dd14f79475bf 100644
--- 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
@@ -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-agent/byte-buddy-agent-1.12.8.ebuild b/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.8.ebuild
deleted file mode 100644
index 43c4d6ef258c..000000000000
--- a/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.8.ebuild
+++ /dev/null
@@ -1,87 +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 byte-buddy-agent-1.12.8.pom --download-uri https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.8/byte-buddy-agent-1.12.8-sources.jar --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-agent-1.12.8.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="net.bytebuddy:byte-buddy-agent:1.12.8"
-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://codeload.github.com/raphw/byte-buddy/tar.gz/byte-buddy-1.12.8 -> 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/Manifest b/dev-java/byte-buddy/Manifest
index 4901e01eecd6..6299c3ba969d 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,5 +1,3 @@
 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.10.ebuild 1379 BLAKE2B 020baaed6a9a41c258a410eb48f56af3759565e44f842d7e27d6bd157ff82f4f896934d846592ffb1971c488252bb14d4901fd6c0ca33c9cdb82526fc5e17e77 SHA512 95f1ae38608e69f77245191b7783978e39c09d9244ee8c0a64f58eab28ac499796f30cd45cc5696120cf18586441a1e2e936839ee4f9795af0f7956c7e48ab39
-EBUILD byte-buddy-1.12.8.ebuild 1370 BLAKE2B c4a45f20932a34eb9123b9ce80180a0753a37852552a032ec054b6a495f3d881038a2675345bfa38a25b0cc8d2d7d845767ed709cd9cfa1aeebb54bca09bd1e3 SHA512 8d63a24aff2825156ed64ec484fad185ba4f9d22ae2afbfec9ff8737ab3a5e8300bcef0210b83f31b89ea281d969058d5727cd0f9a56415ff2e3b1505387dced
+EBUILD byte-buddy-1.12.10.ebuild 1375 BLAKE2B 3d215a54ae80086b7e1a3f1a523546131c3a24db57106d13ef3d7f010a78e6a316bd01e10619c3b00c5a8fea84cad6cd942bca132b5e5fee9716d4645655fb0f SHA512 8e299b9c4ca17244c695e69ea50e7e40dbe6ef3eae116363c080ca4c3d4cae01411a1af9eb253973be3b50c1d51d78eb33d2ecc5c518a6a93ff21b93ac8c7d22
 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
index 4df6e466f7f0..482eea806388 100644
--- a/dev-java/byte-buddy/byte-buddy-1.12.10.ebuild
+++ b/dev-java/byte-buddy/byte-buddy-1.12.10.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/byte-buddy/byte-buddy-1.12.8.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.8.ebuild
deleted file mode 100644
index a25c51f399f4..000000000000
--- a/dev-java/byte-buddy/byte-buddy-1.12.8.ebuild
+++ /dev/null
@@ -1,48 +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 byte-buddy-1.12.8.pom --download-uri https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.12.8/byte-buddy-1.12.8-sources.jar --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.8.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="net.bytebuddy:byte-buddy:1.12.8"
-
-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/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
index 97e503a7aa5c..dbe031efc216 100644
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -1,6 +1,4 @@
 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
+EBUILD commons-daemon-1.3.1.ebuild 1559 BLAKE2B fc04c3bff7ab689fafc90dcc7e90b3ae34a1d4662d7ee597ce9616a5191b628c4581e69df342970ddd3fb2e9a278d2bcb23a944fda72db3e045d192ca052433d SHA512 7518da1a0efa66f76d9f601429329e690f2447f60903d0c520de07be7a366045c282bc9998d0aa5d9443352702fff5549534cbbc70339dc0729f077a49f337ec
 MISC metadata.xml 530 BLAKE2B 313ae727a7149cfaa5e962b1daa4831e77b5f168d8f8d7f2b1242b8fa36f9d2f0460541ec53b8e81cbfae209e3c5e57f5dc5895e881acb61ce9118110aace98b SHA512 738ded66dfc479b30f4c1b6aae4052a4a2de5bf68aa9001a6a1f8fb29203a17b3fe10e52c7f5d26b1de313a74b3713cd22db259a584875f8f91391437cea53e0
diff --git a/dev-java/commons-daemon/commons-daemon-1.2.4.ebuild b/dev-java/commons-daemon/commons-daemon-1.2.4.ebuild
deleted file mode 100644
index 8eb3ed4a1335..000000000000
--- a/dev-java/commons-daemon/commons-daemon-1.2.4.ebuild
+++ /dev/null
@@ -1,59 +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/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.2.4"
-# 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:*
-"
-
-DOCS=( {CONTRIBUTING,README}.md {HOWTO-RELEASE,LICENSE,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_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/commons-daemon-1.3.1.ebuild b/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild
index f739750e8965..baa152a4895a 100644
--- a/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index ba4a295cf3b7..5a27a65baf32 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,5 +1,5 @@
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
 EBUILD eclipse-ecj-4.15.ebuild 1737 BLAKE2B de3aff3c46cf68494920930ffbf337cc79864d1adaef1c603f1c9ea8ce168823e8ba772a0a616c77ab7dafc596e37687e6460db89ee61c4127c41ed739b2d914 SHA512 6a0bd08a4aac020bc4f299907777d40673128798bd093b3bc03602aa86bb7c3436d7400ba0dc31c58ff0703d6357ac691f909dd2358a773e0b548139d251a8e7
-EBUILD eclipse-ecj-4.22-r1.ebuild 1695 BLAKE2B b2b32ae1ab916157ace35130eb2819272804c3473c9f9d422000591febc82a96579e0724b8f74901af6eb6a26945c7365edc20d73ddb398ccea63f90a0a47b6c SHA512 93ccf992f4e343964e1fd7f41079616217720e949922494c91de55547f10eef41589fe283e428ecacb78c4fb85ac56a409cf2afea016abeb0d2fbd4a4e4dadc7
+EBUILD eclipse-ecj-4.22-r1.ebuild 1693 BLAKE2B 4b19af6eef3b9626b1451391c09836c764232352071cac79e82064c2a4a9be93b6f689845f38e8ff2c191c81e7a3a230f7927cd1fdb19115a99265f1720dbe5d SHA512 27e74aee2c6c828ed686ef17a82976f3ec6841d878384af29b10c8ee91792446153603cd8e5383b669564122f334310846ce7a72d592b2361ac02a60e64b65d4
 MISC metadata.xml 646 BLAKE2B 644ff172a0719eb9a8669ea6c472adeace597f2c9baef893707c366d1aa86d04a92c4873abe2894e8405c0198c7588f4f7110df11b520f22afd20cb0a018d9f3 SHA512 c611a29d9e2f37b25cbfb631e1292832aab4c78122b26fca2b5689b4aa7337ed87b3dd17a95ee5aacfeae6d57f9400c6ef79479b190df072eadcdcbefc38edf7
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
index 82bd5d06ebf2..c98b01d949da 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.eclipse.org/"
 SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.22"
 IUSE="+ant"
 
diff --git a/dev-java/hamcrest/Manifest b/dev-java/hamcrest/Manifest
new file mode 100644
index 000000000000..e645e22c9a71
--- /dev/null
+++ b/dev-java/hamcrest/Manifest
@@ -0,0 +1,4 @@
+AUX hamcrest-2.2-java-11.patch 6356 BLAKE2B 4950e452b7e785e575db862902c2deda6fd46575de46e5d429df116e642c9e95077a710f3e74069ec39d6eba177c498580cd81ac398a7f1395b6a9e278dcbf17 SHA512 d8240e2be33bb7594b570da8224f149ddbc36e55249b9e4ced0d03e2851d781a34b1763b8022b59345b90c0033f25c0d4a8a4e03b124abf08c183b30aa8eb556
+DIST hamcrest-2.2.tar.gz 603615 BLAKE2B b367fcb13be3314655e29e9196f3ae202200335801ea5bd8f97b5cd845bf7ecb39c4910b10e49938a373aa7897b62bc0935780490386bde1993add5b943b1eaf SHA512 8120e4f4ad83ff41b8b8ede1fe0817eb8fce6f13072e932aff7fc8c9f64689698753ae47b9f024922d5ab0a5bf7bb88b9e1998064d69a58b8c418ab89200e66a
+EBUILD hamcrest-2.2.ebuild 1164 BLAKE2B e40aa25739a6710f96f4b62890fe89436bfc29241ba9b75ce889a4b1bbc1b9eeb751350b5ddbf241a79c135be7f4a348468ed65ffc41bc82f67cee8abaabd324 SHA512 0ef16472e93bdc4bf636f05c77114f22dacd14ade33e696390d7d1e252970284b3b6950b9747f58e9e6013fe2f52c1ac2ba14f4f83004bce31d7323812ff7fdf
+MISC metadata.xml 303 BLAKE2B b415b83e9cd87ea6d0c58b8096930a08d4f3732068be492e201820cfef6599045327972bdc36d5936fc2f04c49b5c82c16b64b808edc882f863047989c94256e SHA512 97de5ee8a7aa583829434d5768522c3d73cebbc70a44874cafc87f0827d595d01b6b545b9709ec24f034e3c62527627828c6c0b0ac158cc6a7c4a633bb26748f
diff --git a/dev-java/hamcrest/files/hamcrest-2.2-java-11.patch b/dev-java/hamcrest/files/hamcrest-2.2-java-11.patch
new file mode 100644
index 000000000000..83d8ddea9108
--- /dev/null
+++ b/dev-java/hamcrest/files/hamcrest-2.2-java-11.patch
@@ -0,0 +1,127 @@
+diff --git a/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
+index fc968e0..3bbc36e 100644
+--- a/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
++++ b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
+@@ -67,7 +67,7 @@ public class ArrayMatching {
+    */
+   @SafeVarargs
+   public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
+-      return arrayContainingInAnyOrder(asList(itemMatchers));
++      return arrayContainingInAnyOrder((List<Matcher<? super E>>) asList(itemMatchers));
+   }
+ 
+   /**
+diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
+index 7e72a62..35ff806 100644
+--- a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
++++ b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
+@@ -59,7 +59,7 @@ public class IsArrayContainingInAnyOrder<E> extends TypeSafeMatcher<E[]> {
+      *     a list of matchers, each of which must be satisfied by an entry in an examined array
+      */
+     public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
+-        return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
++	return arrayContainingInAnyOrder((List<Matcher<? super E>>) Arrays.asList(itemMatchers));
+     }
+ 
+     /**
+diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
+index c046914..312543f 100644
+--- a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
++++ b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
+@@ -73,7 +73,7 @@ public class IsArrayContainingInOrder<E> extends TypeSafeMatcher<E[]> {
+      *     the matchers that must be satisfied by the items in the examined array
+      */
+     public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatchers) {
+-        return arrayContaining(asList(itemMatchers));
++	return arrayContaining((List<Matcher<? super E>>) asList(itemMatchers));
+     }
+ 
+     /**
+diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
+index d6a9a33..6b4e39e 100644
+--- a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
++++ b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
+@@ -98,7 +98,7 @@ public class IsIterableContainingInAnyOrder<T> extends TypeSafeDiagnosingMatcher
+      */
+     @SafeVarargs
+     public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(Matcher<? super T>... itemMatchers) {
+-        return containsInAnyOrder(Arrays.asList(itemMatchers));
++	return containsInAnyOrder((List<Matcher<? super T>>) Arrays.asList(itemMatchers));
+     }
+ 
+     /**
+diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
+index 0657768..383c552 100644
+--- a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
++++ b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
+@@ -99,7 +99,7 @@ public class IsIterableContainingInRelativeOrder<E> extends TypeSafeDiagnosingMa
+      */
+     @SafeVarargs
+     public static <E> Matcher<Iterable<? extends E>> containsInRelativeOrder(Matcher<? super E>... itemMatchers) {
+-        return containsInRelativeOrder(asList(itemMatchers));
++        return containsInRelativeOrder((List<Matcher<? super E>>) asList(itemMatchers));
+     }
+ 
+     /**
+diff --git a/hamcrest/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest/src/main/java/org/hamcrest/core/AllOf.java
+index b8c3faa..e7e2550 100644
+--- a/hamcrest/src/main/java/org/hamcrest/core/AllOf.java
++++ b/hamcrest/src/main/java/org/hamcrest/core/AllOf.java
+@@ -4,6 +4,7 @@ import org.hamcrest.Description;
+ import org.hamcrest.DiagnosingMatcher;
+ import org.hamcrest.Matcher;
+ 
++import java.util.List;
+ import java.util.Arrays;
+ 
+ /**
+@@ -56,6 +57,6 @@ public class AllOf<T> extends DiagnosingMatcher<T> {
+      */
+     @SafeVarargs
+     public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) {
+-        return allOf(Arrays.asList(matchers));
++        return allOf((List<Matcher<? super T>>) Arrays.asList(matchers));
+     }
+ }
+diff --git a/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
+index 7a22c22..ba52275 100644
+--- a/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
++++ b/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
+@@ -3,6 +3,7 @@ package org.hamcrest.core;
+ import org.hamcrest.Description;
+ import org.hamcrest.Matcher;
+ 
++import java.util.List;
+ import java.util.Arrays;
+ 
+ /**
+@@ -46,6 +47,6 @@ public class AnyOf<T> extends ShortcutCombination<T> {
+      */
+     @SafeVarargs
+     public static <T> AnyOf<T> anyOf(Matcher<? super T>... matchers) {
+-        return anyOf(Arrays.asList(matchers));
++        return anyOf((List<Matcher<? super T>>) Arrays.asList(matchers));
+     }
+ }
+diff --git a/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java b/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
+index e37efce..3ca6f96 100644
+--- a/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
++++ b/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
+@@ -57,7 +57,7 @@ public class CombinableMatcher<T> extends TypeSafeDiagnosingMatcher<T> {
+         this.first = matcher;
+     }
+     public CombinableMatcher<X> and(Matcher<? super X> other) {
+-      return new CombinableMatcher<>(first).and(other);
++      return new CombinableMatcher<X>(first).and(other);
+     }
+   }
+ 
+@@ -76,7 +76,7 @@ public class CombinableMatcher<T> extends TypeSafeDiagnosingMatcher<T> {
+         this.first = matcher;
+     }
+     public CombinableMatcher<X> or(Matcher<? super X> other) {
+-      return new CombinableMatcher<>(first).or(other);
++      return new CombinableMatcher<X>(first).or(other);
+     }
+   }
+ }
diff --git a/dev-java/hamcrest/hamcrest-2.2.ebuild b/dev-java/hamcrest/hamcrest-2.2.ebuild
new file mode 100644
index 000000000000..6b0b18d4b6b5
--- /dev/null
+++ b/dev-java/hamcrest/hamcrest-2.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom hamcrest-2.2.pom --download-uri https://github.com/hamcrest/JavaHamcrest/archive/v2.2.tar.gz --slot 0 --keywords "~amd64" --ebuild hamcrest-2.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.hamcrest:hamcrest:2.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Core API and libraries of hamcrest matcher framework."
+HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
+SRC_URI="https://github.com/${PN}/JavaHamcrest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+PATCHES=( "${FILESDIR}"/hamcrest-2.2-java-11.patch )
+
+DOCS=( {CHANGES,README}.md )
+
+S="${WORKDIR}/JavaHamcrest-${PV}"
+
+JAVA_SRC_DIR="hamcrest/src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="hamcrest/src/test/java"
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/hamcrest/metadata.xml b/dev-java/hamcrest/metadata.xml
new file mode 100644
index 000000000000..27becd4fbc1d
--- /dev/null
+++ b/dev-java/hamcrest/metadata.xml
@@ -0,0 +1,10 @@
+<?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>
+	<upstream>
+		<remote-id type="github">hamcrest/JavaHamcrest</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jackson-annotations/Manifest b/dev-java/jackson-annotations/Manifest
index 26dbe3f648d9..51ab3c2c9345 100644
--- a/dev-java/jackson-annotations/Manifest
+++ b/dev-java/jackson-annotations/Manifest
@@ -1,5 +1,3 @@
-DIST jackson-annotations-2.13.2.tar.gz 1983139 BLAKE2B 511f62548ad3daa4aad265502e5c5e63cf3d60186b96f96ab2ebb3a904a8cca9e5eadfa31ac2fee1a8ce62c7ba51b4a722e9e46c9bbc390291048b0a852b8f30 SHA512 b024b5bff985a6104a122c58735249f3c3fa8e9ddb678283d876ff3750b72872bac13258456cca18828cda65e03eee85a9ef816f924fdbbec211fd03c7652439
 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
+EBUILD jackson-annotations-2.13.3.ebuild 1402 BLAKE2B f3e9f95e8f598a5b273be9727bbe03e6680b064185006458730bf943068b8efed951c326d16901986deb50be9a642b787321ae5caf4fa7ce59db22c10cc886a9 SHA512 bd3991128d6edbc1cbeaefd0ea88b56c4c00dd29472514de71626a3759ac66f348377a920b56b4ecae4df51d579fc9294c04acbdb9f729c31bea8db9e61a1bf5
 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
deleted file mode 100644
index 8b5a3ffeee49..000000000000
--- a/dev-java/jackson-annotations/jackson-annotations-2.13.2-r1.ebuild
+++ /dev/null
@@ -1,43 +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/jackson-annotations/archive/jackson-annotations-2.13.2.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-annotations-2.13.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-annotations:2.13.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Core annotations used for value types, used by Jackson data binding package."
-HOMEPAGE="https://github.com/FasterXML/jackson-annotations"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( README.md release-notes/VERSION-2.x )
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_EXCLUDES=(
-	# 1) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: No tests found in com.fasterxml.jackson.annotation.TestBase
-	com.fasterxml.jackson.annotation.TestBase
-)
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.3.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.3.ebuild
index efcf510776c4..13397eeb87c4 100644
--- a/dev-java/jackson-annotations/jackson-annotations-2.13.3.ebuild
+++ b/dev-java/jackson-annotations/jackson-annotations-2.13.3.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-core/Manifest b/dev-java/jackson-core/Manifest
index 0bf7cd2ead9c..f7eb6f93e694 100644
--- a/dev-java/jackson-core/Manifest
+++ b/dev-java/jackson-core/Manifest
@@ -1,5 +1,3 @@
-DIST jackson-core-2.13.2.tar.gz 12267420 BLAKE2B 4acaef320fbd08bd3d3ae835eb4a96771b1f25aade7433e4c87beac0f6e365e641eea8c70ed7d3884159bd6990286b80891b57ac967ee292ee639cb2b56b66e1 SHA512 8e424ea255a6cd78c550300b0ff18d5e63945a3608dab2803211da2df5eb99fbd249779b2d051569b421c393e073d88a21b01c02a25b9647bcc8545f2d8cc1ee
 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
+EBUILD jackson-core-2.13.3.ebuild 2086 BLAKE2B 1b69c3b0de10a0c8ca84f7a199a326ccfb2740d1e2e7ee454ac1168310623b26b9a70967ff7ea8390707f3402404b9d30044f4a1a75b07e3a09b3bd202404b89 SHA512 f793d30d514a016db0008fd4df7bf1cd02a27d2dc153906625f61a41c611f610b540126f64ef1858b547799f7740e8f43979188cdb086ae3edc07bf4d66b280b
 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
deleted file mode 100644
index d93bfdb9fb35..000000000000
--- a/dev-java/jackson-core/jackson-core-2.13.2-r1.ebuild
+++ /dev/null
@@ -1,69 +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/jackson-core/archive/jackson-core-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-core-2.13.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-core:2.13.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Core Jackson processing abstractions (Streaming API), implementation for JSON"
-HOMEPAGE="https://github.com/FasterXML/jackson-core"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( README.md release-notes/{CREDITS-2.x,VERSION-2.x} )
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_prepare() {
-	default
-
-	sed -e 's:@package@:com.fasterxml.jackson.core.json:g' \
-		-e "s:@projectversion@:${PV}:g" \
-		-e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
-		-e 's:@projectartifactid@:jackson-core:g' \
-		"${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java.in" \
-		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java" || die
-
-	java-pkg-2_src_prepare
-}
-
-src_test() {
-	pushd src/test/java || die
-		local JAVA_TEST_RUN_ONLY=$(find * -name "*Test*.java" \
-			! -wholename "**/failing**/*.java" \
-			! -wholename "**/testsupport**/*.java" \
-			! -wholename "perf**/*.java" \
-			! -name "*TestBase.java" \
-			! -name "*BaseTest.java" \
-			)
-	popd
-
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-core/jackson-core-2.13.3.ebuild b/dev-java/jackson-core/jackson-core-2.13.3.ebuild
index 657905868708..e25ceed85a1a 100644
--- a/dev-java/jackson-core/jackson-core-2.13.3.ebuild
+++ b/dev-java/jackson-core/jackson-core-2.13.3.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-databind/Manifest b/dev-java/jackson-databind/Manifest
index 5c851ce71c25..09e4cdef9a86 100644
--- a/dev-java/jackson-databind/Manifest
+++ b/dev-java/jackson-databind/Manifest
@@ -1,5 +1,3 @@
-DIST jackson-databind-2.13.2.2.tar.gz 48061394 BLAKE2B c67b0a23c5fcff881d91ddec14877a5ec16c13eebfc76b34c1666bc9ebc73f573d279d1951ff2be96c612fa87281e08332047bb6c75df73184249b7ebb552d16 SHA512 0c3550aa3ada1c5fcd2f19076670c7ddffde59542b10fa270d1c7bd54d7866f0f10c256738ed76815af55c8531f7553f8b977c461fe710f759811b0ffa660245
 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
+EBUILD jackson-databind-2.13.3.ebuild 2675 BLAKE2B 99fa6669fa6749115b81c20add20b3c0d15dcf651ef508cabc1ef3eaa9f0a1f3cde300f94744405feb38833d34bd0fd0e15ff67276302dd3ae44705b76bab00b SHA512 7ea0d52d689f2d4d6477c45921d803d53d58d469e425be587dd6a279112becc2324186d87641e4f7d1b97e210b35e26527c61198c908503e6fa5d7fe8c32eed7
 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
deleted file mode 100644
index 8b602e5bcb47..000000000000
--- a/dev-java/jackson-databind/jackson-databind-2.13.2.2.ebuild
+++ /dev/null
@@ -1,83 +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/jackson-databind/archive/jackson-databind-2.13.2.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-databind-2.13.2.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-databind:2.13.2.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="General data-binding functionality for Jackson: works on core streaming API"
-HOMEPAGE="https://github.com/FasterXML/jackson-databind"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Dependencies like powermock-{core,module-junit4,api-mockito2} are not available in ::gentoo
-RESTRICT="test"
-
-# Common dependencies
-# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.2 -> >=dev-java/jackson-annotations-2.13.2:2
-# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
-
-CP_DEPEND="
-	~dev-java/jackson-annotations-2.13.2:2
-	~dev-java/jackson-core-2.13.2:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? javax.measure:jsr-275:0.9.1 -> !!!groupId-not-found!!!
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
-# test? org.powermock:powermock-api-mockito2:2.0.0 -> !!!groupId-not-found!!!
-# test? org.powermock:powermock-core:2.0.0 -> !!!groupId-not-found!!!
-# test? org.powermock:powermock-module-junit4:2.0.0 -> !!!groupId-not-found!!!
-
-DEPEND="
-	>=virtual/jdk-11:*
-	${CP_DEPEND}"
-#	test? (
-#		!!!groupId-not-found!!!
-#	)
-#"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION}-2.x )
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-#	JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,junit-4,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
-#	JAVA_TEST_SRC_DIR="src/test/java"
-#	JAVA_TEST_RESOURCE_DIRS=(
-#		"src/test/resources"
-#	)
-
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	sed -e 's:@package@:com.fasterxml.jackson.databind.cfg:g' \
-		-e "s:@projectversion@:${PV}:g" \
-		-e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
-		-e "s:@projectartifactid@:${PN}:g" \
-		"${JAVA_SRC_DIR}/com/fasterxml/jackson/databind/cfg/PackageVersion.java.in" \
-		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/databind/cfg/PackageVersion.java" || die
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-databind/jackson-databind-2.13.3.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.3.ebuild
index 6a34f6927b74..f6673fd7ebe7 100644
--- a/dev-java/jackson-databind/jackson-databind-2.13.3.ebuild
+++ b/dev-java/jackson-databind/jackson-databind-2.13.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Dependencies like powermock-{core,module-junit4,api-mockito2} are not available in ::gentoo
 RESTRICT="test"
diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
index f00f3deea55e..ef4508acf7e6 100644
--- a/dev-java/jackson-dataformat-xml/Manifest
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -1,6 +1,4 @@
-DIST jackson-dataformat-xml-2.13.2.tar.gz 3201222 BLAKE2B c4db7ae5f3f3fc41bb3890337cc2cf6f1fe4dd65e96bff336d0c21e19758ca797497affbd189b731518a164fa8ad7f40c07e1c64ab3250ac438f1d4bf122a6ce SHA512 048550c465a83e0e5b72313d601eace9d817572a7d331d37ac48af51d5e0ef8d52cccadb1412c27d4ebd28b222b7707a0bfba114e10168d233e4c4e9f8d2fd1f
 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
+EBUILD jackson-dataformat-xml-2.13.3.ebuild 3892 BLAKE2B 46afcafa1c09722bd77b5c7bbc33c586deb219c9f35c561efe50067a6fac3e580c3c0c5f6678dd3052b2e3048055fd55e4e062b1b44beacc9a0a05e9cb33f060 SHA512 56f33b35d344dace59ceefbb25a14059f5dfe90723695066b300b0cb1b997a6d86258b3d869238a604a6f1d352aecdbdc9fec6b6b3c742b9e48070f55b44839d
 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
deleted file mode 100644
index fc200932a64b..000000000000
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2-r1.ebuild
+++ /dev/null
@@ -1,110 +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/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-xml-2.13.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Data format extension for Jackson"
-HOMEPAGE="https://github.com/FasterXML/jackson-dataformat-xml"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.2 -> >=dev-java/jackson-annotations-2.13.2:2
-# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.2 -> >=dev-java/jackson-databind-2.13.2:0
-# com.fasterxml.woodstox:woodstox-core:6.2.7 -> >=dev-java/woodstox-core-6.2.7:0
-# org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0
-
-CP_DEPEND="
-	~dev-java/jackson-annotations-${PV}:2
-	~dev-java/jackson-core-${PV}:0
-	~dev-java/jackson-databind-${PV}.2:0
-	>=dev-java/stax2-api-4.2.1-r1:0
-	dev-java/woodstox-core:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.2 -> >=dev-java/jackson-module-jakarta-xmlbind-2.13.2:0
-# test? com.sun.xml.stream:sjsxp:1.0.2 -> >=dev-java/sjsxp-1.0.2:0
-# test? jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="
-	>=virtual/jdk-11:*
-	${CP_DEPEND}
-	test? (
-		~dev-java/jackson-module-jakarta-xmlbind-${PV}:0
-		dev-java/jaxb-api:3
-		dev-java/sjsxp:0
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( README.md release-notes/{CREDITS,VERSION}-2.x )
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="jackson-module-jakarta-xmlbind,sjsxp,jaxb-api-3,junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	sed -e 's:@package@:com.fasterxml.jackson.dataformat.xml:g' \
-		-e "s:@projectversion@:${PV}:g" \
-		-e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
-		-e "s:@projectartifactid@:${PN}:g" \
-		"${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java.in" \
-		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java" || die
-}
-
-src_test() {
-	pushd src/test/java || die
-		local JAVA_TEST_RUN_ONLY=$(find * -name "*Test*.java" \
-			! -wholename "**/failing**/*.java" \
-			! -name "*TestBase.java" )
-	popd
-
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-
-	# The same failure under openjdk-17 occurs upstream (running 'mvn test')
-
-	# 1) testCollection(com.fasterxml.jackson.dataformat.xml.lists.ListAsObjectTest)
-	# com.fasterxml.jackson.databind.exc.InvalidDefinitionException: Failed to call `setAccess()` on Field 'first' due to
-	# `java.lang.reflect.InaccessibleObjectException`, problem: Unable to make field transient java.util.LinkedList$Node
-	# java.util.LinkedList.first accessible: module java.base does not "opens java.util" to unnamed module @42bb2aee
-
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -ge "17" ; then
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
-	fi
-
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3.ebuild
index 2c613fbdaa52..4cf94ba87a41 100644
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3.ebuild
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jackson-dataformat-yaml/Manifest b/dev-java/jackson-dataformat-yaml/Manifest
index aca94d91f3f2..379d33ddfbfb 100644
--- a/dev-java/jackson-dataformat-yaml/Manifest
+++ b/dev-java/jackson-dataformat-yaml/Manifest
@@ -1,5 +1,3 @@
-DIST jackson-dataformats-text-2.13.2.tar.gz 3528945 BLAKE2B 5dc38706b714121478e82b2f4bc0b3831fa84708b708c08c20d4744c4fc7130149d8dace5c20437514ce9431b1c39183f4d283717f4ad5876fac3651c53ea096 SHA512 1101aabc4b3b652ff90c23186fada6391db9cb4cb5ec6ba9ff78cd91b73ef3b632f38027e192d739d8e47f7ed2726ac03d8c3a1d20d416dfaac3b50ca11abb67
 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
+EBUILD jackson-dataformat-yaml-2.13.3.ebuild 2662 BLAKE2B 377c33938b5dbb8cefdeb46b5d3bd609cce89cf2e5a140a11087f941085ad97ded9436c7ba30e1680c3edccc79bff51e95e29d71ca664a470e4b8c9bfb8ed0a8 SHA512 f5c29bad8fc54a83f43baee06627b3259d3d0fdcadd1d3a6eebf56cb4905e4e9e1510e853d4c60e3772aaeeffdc5009cf181aad69def21dc7d6d5a4c810e990a
 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
deleted file mode 100644
index 9c11a644ec61..000000000000
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2-r1.ebuild
+++ /dev/null
@@ -1,79 +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/jackson-dataformats-text/archive/jackson-dataformats-text-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-yaml-2.13.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Support for reading and writing YAML-encoded data via Jackson abstractions"
-HOMEPAGE="https://github.com/FasterXML/jackson-dataformats-text"
-SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.2 -> >=dev-java/jackson-databind-2.13.2:0
-# org.yaml:snakeyaml:1.30 -> >=dev-java/snakeyaml-1.30:0
-
-CP_DEPEND="
-	~dev-java/jackson-core-${PV}:0
-	~dev-java/jackson-databind-${PV}.2:0
-	dev-java/snakeyaml:0
-"
-
-DEPEND="
-	>=virtual/jdk-11:*
-	${CP_DEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( README.md release-notes/{CREDITS,VERSION} )
-
-S="${WORKDIR}/jackson-dataformats-text-jackson-dataformats-text-${PV}/yaml"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_EXCLUDES=(
-	# Upstream's usual exclude pattern: "**/failing**/*.java"
-	com.fasterxml.jackson.dataformat.yaml.failing.ObjectIdWithTree2Test
-	com.fasterxml.jackson.dataformat.yaml.failing.PolymorphicWithObjectId25Test
-	com.fasterxml.jackson.dataformat.yaml.failing.SimpleGeneration215Test
-)
-
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-
-	sed -e 's:@package@:com.fasterxml.jackson.dataformat.yaml:g' \
-		-e "s:@projectversion@:${PV}:g" \
-		-e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
-		-e "s:@projectartifactid@:${PN}:g" \
-		"${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java.in" \
-		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java" || die
-
-	# dev-java/snakeyaml-1.30 does not provide module-info
-	sed -e '/snakeyaml;/d' -i src/moditect/module-info.java || die
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild
index 5e75be3da4be..8dd76fc9caca 100644
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-d
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jackson-module-jakarta-xmlbind/Manifest b/dev-java/jackson-module-jakarta-xmlbind/Manifest
index bf51cb75043f..73709f34d1b4 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/Manifest
+++ b/dev-java/jackson-module-jakarta-xmlbind/Manifest
@@ -1,6 +1,4 @@
-DIST jackson-module-jakarta-xmlbind-2.13.2.tar.gz 2146359 BLAKE2B 242d148b1945745f2578a751cf7aec7764000e3400fbc63d9c4b5b9ee029c77868b97590c922c3900e8b3800271176099d4928f3d63936c6b9e5e2326321616b SHA512 ea8d6a230f736cc0429e8d9a8883609074dc7e723bb01bdecbb49a665fc8f879b3f2da906c1d9816d6675a38479943a8b5e6fa1b67d495bbf882262808bce10b
 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
+EBUILD jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild 2887 BLAKE2B d9bb5e20dc00fdb7ca4e1bf21411b58f811ae111ba81dc12fe529ba574afa35e26acaf4193f1b8842bc26afaa8dcad54093b1252b544b5b052a516eae37c99a4 SHA512 25169f33ff9bbc6a71f38061e7bf3104956f7580f61265262e4782b826cb3fedf5521f417141e62e23f73bda7548aa57cad8399bca7b1ee44140b1aa9e3453af
+EBUILD jackson-module-jakarta-xmlbind-2.13.3.ebuild 2764 BLAKE2B 3578793a466d23ce53a544473448cd07af8e8b11f0fcf1c46064cb5157ab32db0b1ff14319e556fcc9f8e94209086c9ce2e9033ee4c5abe09a2be3e6d12f0295 SHA512 71ff738d7f4002890519c4f9c768da1c777691ca2a9b115a65b0291f22e22931add058df89a0f1a0d7f3748d9a4166fc248080ce2025cb28b36e4c098339e4c7
 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
deleted file mode 100644
index 729776debe50..000000000000
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild
+++ /dev/null
@@ -1,83 +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/jackson-modules-base/archive/jackson-modules-base-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-module-jakarta-xmlbind-2.13.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Support for using Jakarta XML Bind (aka JAXB 3.0) annotations"
-HOMEPAGE="https://github.com/FasterXML/jackson-modules-base"
-SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# We don't have jaxb-runtime:3.0.1
-RESTRICT="test"
-
-# Common dependencies
-# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.2 -> >=dev-java/jackson-annotations-2.13.2:2
-# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.2 -> >=dev-java/jackson-databind-2.13.2:0
-# com.sun.activation:jakarta.activation:2.0.1 -> >=dev-java/jakarta-activation-2.0.1:2
-# jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3
-
-CP_DEPEND="
-	~dev-java/jackson-annotations-${PV}:2
-	~dev-java/jackson-core-${PV}:0
-	~dev-java/jackson-databind-${PV}.2:0
-	dev-java/jakarta-activation-api:1
-	dev-java/jaxb-api:3
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
-# test? org.glassfish.jaxb:jaxb-runtime:3.0.1 -> !!!groupId-not-found!!!
-
-DEPEND="
-	>=virtual/jdk-11:*
-	${CP_DEPEND}"
-#	test? (
-#		!!!groupId-not-found!!!
-#	)
-#"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( ../README.md )
-
-S="${WORKDIR}/jackson-modules-base-jackson-modules-base-${PV}/jakarta-xmlbind/"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-# JAVA_TEST_GENTOO_CLASSPATH="junit-4,!!!groupId-not-found!!!"
-# JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	sed -e 's:@package@:com.fasterxml.jackson.module.jakarta.xmlbind:g' \
-		-e "s:@projectversion@:${PV}:g" \
-		-e 's:@projectgroupid@:com.fasterxml.jackson.module:g' \
-		-e "s:@projectartifactid@:jackson-module-jakarta-xmlbind-annotations:g" \
-		"${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jakarta/xmlbind/PackageVersion.java.in" \
-		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jakarta/xmlbind/PackageVersion.java" || die
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/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
index b063ac9c72df..394536c89255 100644
--- 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
@@ -62,7 +62,7 @@ JAVA_TEST_GENTOO_CLASSPATH="jaxb-runtime-4,junit-4"
 JAVA_TEST_SRC_DIR="src/test/java"
 
 JAVA_TEST_EXCLUDES=(
-	# Upstream does not run these 
+	# Upstream does not run these
 	com.fasterxml.jackson.module.jakarta.xmlbind.failing.TestUnwrapping
 	com.fasterxml.jackson.module.jakarta.xmlbind.failing.TestXmlID3
 )
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild
index baf70d9cdfe8..b8c68c4cebaa 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.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/jai-imageio-core/Manifest b/dev-java/jai-imageio-core/Manifest
index 400ee7538e8a..aeec3ef3d065 100644
--- a/dev-java/jai-imageio-core/Manifest
+++ b/dev-java/jai-imageio-core/Manifest
@@ -1,3 +1,3 @@
 DIST jai-imageio-core-1.4.0.tar.gz 1542191 BLAKE2B 3dc8de7cd8e375eb3b4e5a6524e0280bf295ffb0d29b2989a35789f8974f27a6ba50f1b3b82c88af0992cf6ce7b5fba28e38f2892b3ac34b2c20d7245035f2ec SHA512 20d361cbb040b692717acad56d12034ff695859f125acbac080092fb0423f5338bfbd9a39a968b67712f4f0a62cc02a51dc9e2cffbb886efb379c8a923a11ad8
-EBUILD jai-imageio-core-1.4.0.ebuild 1187 BLAKE2B 91dc9cbddf1d039a337440064595c65de6c5a7a2dbbe8f30cb442401c143da3f72390efe85d7dbbc977c679d1dd51d69caedf8d8f53fdffe2d07eda5f7ff39ad SHA512 b5f600d7895280ddc3999b8e4b0171097ce9480e1c28641ac8a7b7f3b0165b1c097ecda956af956aec3d252a5fcc1d94c5071da9db5030a609b1361e4eeab8a3
+EBUILD jai-imageio-core-1.4.0.ebuild 1186 BLAKE2B dd78134daad3839673bffec23fec90f7d15aacd60cf3e3a0de36e0a5f84fe018a0f4046e91e30dbda4f041c87496f73d4e56cf05a3f2910bf357cd69e5788567 SHA512 263d459098de73ba45febbf29bd1278df7f354987eba2bd01dfd23701cfdf9de95c71dc66a6150333f41f4cf0e1700f8fea8f8cac41416504b85a2884264430d
 MISC metadata.xml 681 BLAKE2B 09959f37fefc097c2c070264edb589bd08746952b4a662dbd53467ba3e1926ac612f8fd7e94182d6b8c866bd5c359e150463679dd23636ee42088f00cbfb4ca2 SHA512 caf76afd6bea207df2d6429d6cc35e53ad34d6b0834fdc74d2197ec06fbb403fc81c9c0a111d8987cffb72e7a75c25f30d95f6ac3362637c17ced1849fe33fb7
diff --git a/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild b/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild
index 0799775bdcb7..cf43149a135d 100644
--- a/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild
+++ b/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.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
 
 # Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jai-imageio/${PN}/archive/refs/tags/${P}.tar.gz"
 
 LICENSE="Sun-BSD-no-nuclear-2005"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jai-imageio-jpeg2000/Manifest b/dev-java/jai-imageio-jpeg2000/Manifest
index 11d4dfbada64..a5fbad367768 100644
--- a/dev-java/jai-imageio-jpeg2000/Manifest
+++ b/dev-java/jai-imageio-jpeg2000/Manifest
@@ -1,3 +1,3 @@
 DIST jai-imageio-jpeg2000-1.4.0.tar.gz 499964 BLAKE2B 219b53d2264f819ed808495e5c559e8350f965ba100696f28e817ef27cf458fe2b05401957d81a3f4f208f59888a0607b72e4529fdfd37c6763cd1b8da1f2f5d SHA512 6c1129f735d1e6578e8feb233fe5462a62f503979d7afad9942acd749b39714e352df6133fad0b99f4fd84af82de10efbf91196eb0cc9d40c080c9546948f4eb
-EBUILD jai-imageio-jpeg2000-1.4.0.ebuild 1458 BLAKE2B c16ba258258042599f29cff6ce2252700bdb6f0c724b61863b71443b5fb87bdf7fedc121705dad82c7e5e48ff84638b5d96b62f72f4970446336931b0e56f3a7 SHA512 267d21c77c41f546c61c9a94f89a2b548ae9f588956cebabc266238244ecec74df0675cff7ac99752292fdb31a69bc7abd28de876b9e41b53cbf0efb372b7e92
+EBUILD jai-imageio-jpeg2000-1.4.0.ebuild 1457 BLAKE2B eaf3bb756d4a6fde46f6c0f86fb97c8c08080a8729bbe643206987f6e574b73b3cbe72132bdb132d13d87b0f48df7fccaecc4a5f98fe396e2e5643bb3fbc9ef8 SHA512 cae68485fcf6a1303efb3d89bb4a74273e43581ff47f87ddc06247a811b1d571b11bdf24181f01058639c953afc5969b986e67946b22ecfc3b3224ca17b6f9e1
 MISC metadata.xml 681 BLAKE2B 389c7956920b5a7a8e01a397fbbb02def0e4c5fef40eeea907268af108db06b5ab4237648d57bfa4a76ba950d1009f68dce6aef1d86bbe841f352421887e1a3b SHA512 69fec59eaad0e346d5a601fdbdab0988381225680118423d69ee214216dc4975f1ba1664dcb383269bba2da229eafbe96f76497dcce87a30c6b63945684df140
diff --git a/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild b/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild
index b5ed9e69920b..d6111d3e33ce 100644
--- a/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild
+++ b/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.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
 
 # Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jai-imageio/${PN}/archive/refs/tags/${P}.tar.gz"
 
 LICENSE="Sun-BSD-no-nuclear-2005"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 # Common dependencies
 # POM: ${PN}-${P}/pom.xml
diff --git a/dev-java/jakarta-mail-api/Manifest b/dev-java/jakarta-mail-api/Manifest
index e0449c291768..43d68071f513 100644
--- a/dev-java/jakarta-mail-api/Manifest
+++ b/dev-java/jakarta-mail-api/Manifest
@@ -1,3 +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
+EBUILD jakarta-mail-api-2.1.0.ebuild 2502 BLAKE2B 8a1b180c3314aedf822d1342c3fd393d5f6148284d5bea3e6d09627ddf12757124406354d2908003cab8fc6ebca3ddbef740b39d45c2abd3cc6cd1f583df6a56 SHA512 1afcb6e0c78e8bcbc72b64b476c592e45edcdedff930c34a1ba8bd792b4176a330fe42bf2763b668c6da05571aba88a4d973b47ae8e0ed23230de5f03eda180d
 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
index 796d357d7e17..42176c20e111 100644
--- 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
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/mail/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Probably caused by --module-path missing @${test_sources}
 
diff --git a/dev-java/java-diff-utils/Manifest b/dev-java/java-diff-utils/Manifest
index 28cb43e9cf57..bc9b1512ede2 100644
--- a/dev-java/java-diff-utils/Manifest
+++ b/dev-java/java-diff-utils/Manifest
@@ -1,3 +1,3 @@
 DIST java-diff-utils-1.3.0-sources.jar 35161 BLAKE2B 365b2b3a8701a7bf63b1fc8c34f8a54d7a5f67b3b485e91ea3489303de821d5ac08aac4e2b13d140b045b6b45393d293a825e92e800cd34c3b84a17442d548bc SHA512 16426c13fde20c606ac5dc01b4ee368d10360c45c4569879c94d30ac41aba372e9865a7b5db3a68067ea26bdade538eeea4e3e38900f8627beb21d7e48968e62
-EBUILD java-diff-utils-1.3.0.ebuild 975 BLAKE2B 0af07d882b2bf1f016cf70cc115521dc1f1eb194183671e4cdfa69a79618890c2826cf7943c430fc80a9dcafaa1ffb6d8a6315dfc74fd3051d83844be3f8e8c1 SHA512 7e8ced54d212239df0850629002da28a48b4ea95895a02c4c5f940a76f2f2303b93e21392fa78206b22a51a748f9afaf31f8e0032867fc0a8cb8eecb60cd9a2e
+EBUILD java-diff-utils-1.3.0.ebuild 974 BLAKE2B 9982ede579ca2fe6578df3844a86c237d61276678f9b37ed0c5bb3afab2311a0396c8101aa7374085572e4cc49dc73b3be896b5bc8c50a1eefcaeda25d9ff461 SHA512 af4f3e6cc0a72e2719604650f90347760e3c778995e96d5b03bd2522bdbe4a39c881415e4873baa73b61fc8bc835578f01ea67e54a9790a9cdd8004becbf56e7
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild b/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild
index 944684c4b192..aa0b2dd5d3db 100644
--- a/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild
+++ b/dev-java/java-diff-utils/java-diff-utils-1.3.0.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
 
 # Skeleton command:
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/googlecode/${PN}/diffutils/${PV}/dif
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index 63fe429cab9d..c40b9c138786 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -2,5 +2,7 @@ AUX java-service-wrapper-3.5.25-as-needed.patch 7061 BLAKE2B e3dd530192faff52f05
 AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1260 BLAKE2B 6d48e0ea2537343f76d6c7114c99aba4a9887bfba1b184076f8fae636f3888c8494251d6022946f2632ea24d1cb8b03030caa9de71ae21b8a7f1fc3e9acacf64 SHA512 1581a01ec1e4a352d86939e43e659c86fe8f99420e67ded44ed8ec42462b35a540b7763a8d1c055d8710dae422b8163d8ff650df016779f68ec6672cd8fc1150
 AUX java-service-wrapper-3.5.25-testsuite.patch 463 BLAKE2B aa5f7e4e298265afd227d2eb0edede37650bb8dfa1c7a8e9a18109f34eabfb5ddc7b9db67c2922403b0448997cc96d8e83c96b62974b25da22a624d91dc500cf SHA512 c058363d17e0594ccce355183358d016acf8ec06dd88ff3dc3b360d143cd56fd1a70b5d7d9f5bf774451ea0eed5a78752c8b3fcc32422a1a97d52eb43e057e91
 DIST wrapper_3.5.25_src.tar.gz 556678 BLAKE2B bead95eb2feebe0c22f8c66ca948185c320a979e498fb5156de576d443ba6e3375efb6244a66db6af101fa7dc459d983b51631fc237ad4578505be47059cf2c7 SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4
+DIST wrapper_3.5.50_src.tar.gz 779253 BLAKE2B 64863e408c2147014946f869bbd98775d1d23d4cd63ef562167f40191febf87cc72697a55fe2ec6a5d085f3df4897cc4485f4ed88a3ee3a7f7930215448972f7 SHA512 403deec1bcc70a93ce0b0749bf2d5bc27a4a540d07785bc3ac83b38257cc5e8247a784f646770c96ac318f22d30c463dafb2f002720041b93443b292d6669c09
 EBUILD java-service-wrapper-3.5.25-r2.ebuild 1407 BLAKE2B e05a6930c0ee852a43df15a7cadc1011663ab8db7849e45461a3d0fd1db43b379e254f1fcae482451a85c067eed0c851fe923c7dbd0c6785cb3adce9d92b9953 SHA512 60b08f6ce759bb8a724b1c50d5dd1e5aa8ca76ce95602dfae7c21d6567d9ff9719d5528e0d715842158f2f2f7c4f3147b7f646247cd4538e42eb0954ae98c705
+EBUILD java-service-wrapper-3.5.50.ebuild 2095 BLAKE2B e8fb40273b4db4dd36935d366afa1514ca7de5a44ad4a2105f64ab26bf34c8218758b0d372e67d336b9db4280e22dc14252a089313f439c704b9adeb3132d789 SHA512 f5aac4acfee76373395daf2ea6b343b1ec7f648e2f8e8e5dd13f9319dc9c06456ccfef76219441edf60b39826e6afc15422c25e37ad6b716f080067783e7699b
 MISC metadata.xml 640 BLAKE2B 1ced5abe1a0ff9b141f3a6020cd6352b02cf228524b694f36bedb7ef91a892ee471235b36e81e03fbe98eee6f28f680821b15501447b58c8788129eaf8e6b39a SHA512 4d9eb54f0328aa00380b40a0ead3fc43e552b71e8d4b5279341d5249a9615c3c161ca19295d6f586c43708f9e29aaf3799799243dd277c8822b95d7c1f82afd1
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
new file mode 100644
index 000000000000..f4dc6ef8ecd2
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+inherit java-pkg-2 java-pkg-simple toolchain-funcs java-ant-2
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon"
+HOMEPAGE="https://wrapper.tanukisoftware.com"
+SRC_URI="https://download.tanukisoftware.com/wrapper/${PV}/wrapper_${PV}_src.tar.gz"
+
+LICENSE="tanuki-community"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/junit:4
+		dev-util/cunit
+	)
+"
+BDEPEND="virtual/jdk"
+
+S="${WORKDIR}/wrapper_${PV}_src"
+
+JAVA_SRC_DIR="src/java/"
+JAVA_JAR_FILENAME="wrapper.jar"
+JAVA_TEST_SRC_DIR="src/test"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+src_prepare() {
+	default
+
+	# replaces as-needed.patch
+	sed -i \
+		-e 's/gcc -O3/$(CC)/g' \
+		-e 's/ -pthread/ $(CFLAGS) $(LDFLAGS) -pthread/g' \
+		-e 's/ -shared/ $(LDFLAGS) -shared/g' \
+		-e 's/$(TEST)\/testsuite/testsuite/g' \
+		src/c/Makefile-*.make || die
+
+	cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make"
+	java-pkg-2_src_prepare
+
+	# enable tests on all platforms
+	grep "testsuite_SOURCE" "src/c/Makefile-linux-x86-64.make" | tee -a src/c/Makefile-*.make || die
+	if use test; then
+		echo 'all: testsuite' | tee -a src/c/Makefile-*.make
+		assert
+	fi
+}
+
+src_compile() {
+	tc-export CC
+
+	pushd "${T}" || die
+	echo 'public class GetArchDataModel{public static void main(String[] args){System.out.println(System.getProperty("sun.arch.data.model"));}}' \
+		> GetArchDataModel.java || die
+	ejavac GetArchDataModel.java
+	local BITS
+	BITS="$(java GetArchDataModel)" || die "Failed to identify sun.arch.data.model property"
+	popd || die
+	eant -Dbits="${BITS}" compile-c
+
+	java-pkg-simple_src_compile
+}
+
+src_test() {
+	src/c/testsuite --basic || die
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_doso lib/libwrapper.so
+
+	dobin bin/wrapper
+	dodoc README*.txt
+	dodoc doc/revisions.txt
+}
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index 880314dd575f..072b244da5aa 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,3 +1,5 @@
 DIST javassist-3.18.2.tar.gz 1179428 BLAKE2B cc7dfebca2e47576f902e6249c1efb65c18823e75ba3698c2d94541bdc910b9b7547e8619c1f19a84c158771230ddd112ddb0445ed97cd64810beacf3468a1ba SHA512 67f22a70584eba31088d63b7862f0f7872a6a7ec57f4397b95044695af75be005e86aa5a5f20fe8e650c2178a9b63b4b922accf940b46ceb1c8e7ce9c51798ca
+DIST javassist-3.29.0.tar.gz 1290728 BLAKE2B 21543fe4d81cc46fa8d6530e8b5b821df64af31404831d15255fe7d362fe40de39451f4e6a264986ce7b8fdb16116c3266a522caf24a2df6a91cc7203354e070 SHA512 9487d4b6e1d7981360f768f2ebe7e8313c103752cc458eb454fffcf6714f62952cc772e920ee663e89cd51cd6a2669993f5595e682ec74313799eff32144541c
 EBUILD javassist-3.18.2-r1.ebuild 1028 BLAKE2B 9bc9eccea4e5d896eddbbad826a95504d54cc4b352189b3dd0ad6a56dfc34641e3e800dc99aa2348c565e03fee46534b3ad19633283670380a0bdf44a635cce0 SHA512 75eb795cd8a27728e57fc168c78fb1b2aaa5d2666432690e1e20690b64a955a6471aacba04101dc2c80f1dd4afd68ebe00e9c176d1b6bce412032ff173cefbb3
-MISC metadata.xml 377 BLAKE2B 4503d9387a65e6f722a3694870c9a9b36a2a1ccc09a2635372d386484a4113c507ade595283ee1f77038517f87814e923bb2f342e226eabb900abb9fdea9b407 SHA512 159f9374d2b9ce20eb531961e35dff0cf90b93eac4a929d1c4cf85242b50bac082ee3bd6dab5cae10dd9cd50a19b7af650df379e27d3238f12794b75ddcbeeb8
+EBUILD javassist-3.29.0.ebuild 1995 BLAKE2B 3156102029db6e1a485bc3425f43549c026849f438d5e974a66c8a78ac73eca8c36b562b1edb6cc005f2e088f0ed6eb8385107523e2a701a67f38536f371f9eb SHA512 4659ed0839689127e20604aa70ad44d38200661eac574fe6373e9f6f9e7a7a5e87757a3a6d1a9b01a53b3115da72932ace439c4c24fde937684dbb71bcc519e8
+MISC metadata.xml 551 BLAKE2B c2f226813733db484e082189bb9420fa19eea8d5f95f751cf42305f110dc6b8a6e07370d9e3bca4be9dfac71333c86e95fb5e3f48543ca0041c2e2a4d96808b0 SHA512 b6b193720397459d3133bed6d0e93973084375684f1df77f93703f9cadf06e0a23e2798a13edf70c67642a656d5e5ef24aef2c032c71b65bc215622dbe42c1e2
diff --git a/dev-java/javassist/javassist-3.29.0.ebuild b/dev-java/javassist/javassist-3.29.0.ebuild
new file mode 100644
index 000000000000..712141e86f6e
--- /dev/null
+++ b/dev-java/javassist/javassist-3.29.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jboss-javassist/javassist/archive/rel_3_29_0_ga.tar.gz --slot 3 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild javassist-3.29.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.javassist:javassist:3.29.0-GA"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A class library for editing bytecodes in Java."
+HOMEPAGE="https://www.javassist.org"
+SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+# Tests run: 431,  Failures: 6
+# Cannot solve those test failures. Using "mvn test" they all pass.
+# https://bugs.gentoo.org/856364
+RESTRICT="test"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:[4.13.1,) -> >=dev-java/junit-4.13.2:4
+# test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!!
+
+DEPEND="
+	!test? (
+		>=virtual/jdk-8:*
+	)
+	test? (
+		>=virtual/jdk-11:*
+		dev-java/hamcrest-library:1.3
+	)
+"
+
+# https://github.com/jboss-javassist/javassist/blob/rel_3_29_0_ga/pom.xml#L156-L157
+RDEPEND=">=virtual/jre-8:*"
+
+S="${WORKDIR}/${PN}-rel_${PV//./_}_ga"
+
+JAVA_NEEDS_TOOLS=1
+JAVA_SRC_DIR="src/main"
+JAVA_MAIN_CLASS="javassist.CtClass"
+
+JAVA_TEST_GENTOO_CLASSPATH="hamcrest-library-1.3,junit-4"
+JAVA_TEST_SRC_DIR="src/test"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+# https://github.com/jboss-javassist/javassist/blob/rel_3_29_0_ga/pom.xml#L166-L168
+# <include>javassist/JvstTest.java</include>
+JAVA_TEST_RUN_ONLY="javassist.JvstTest"
+
+src_prepare() {
+	default
+	java-pkg_clean javassist.jar
+	sed -e 's:\.\./\.\./::' -i src/test/javassist/JvstTest{4,Root}.java || die
+}
+
+src_test() {
+	default
+	einfo "Testing"
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/javassist/metadata.xml b/dev-java/javassist/metadata.xml
index 56e992840bfc..ff67a27c5ef0 100644
--- a/dev-java/javassist/metadata.xml
+++ b/dev-java/javassist/metadata.xml
@@ -9,4 +9,7 @@
 		<remote-id type="sourceforge">jboss</remote-id>
 		<remote-id type="github">jboss-javassist/javassist</remote-id>
 	</upstream>
+	<longdescription>
+		Javassist (JAVA programming ASSISTant) makes Java bytecode manipulation simple. It is a class library for editing bytecodes in Java.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/javax-jms-api/Manifest b/dev-java/javax-jms-api/Manifest
new file mode 100644
index 000000000000..c939d40d6c9b
--- /dev/null
+++ b/dev-java/javax-jms-api/Manifest
@@ -0,0 +1,3 @@
+DIST javax-jms-api-2.0.3-RELEASE.tar.gz 162689 BLAKE2B cd59e263f649d30dcd4a117c95943c2fca4141822dc23f425286d142849c2be99a0e866f4f3439917a2a09c722a74b067025e34053f1afa7ee8654cca253d54c SHA512 64f492c17eb84a61e23da53755ce074c5c957204651a391f7e879992f8b781d6b8afbfc7f13898f1e5f5dcb384b3ae31807b4acde111f587703d5d8bc08b5063
+EBUILD javax-jms-api-2.0.3.ebuild 935 BLAKE2B 42b7ff1168098844a3e1d09ca846858224452dec567a8dbe0d512f4dbf3edc66632e07d525bb342a7c8cf74c74334c2599911e3f8adfe87acd26999995ab669f SHA512 2c0b92a4eef5886150945d016e0948d45908d6497011d58d8f56b7aa4cf1f3c2a215e291683369ba1e9023e63716ae39bc7ea793f7b8b0f1c109e3078d2c83a6
+MISC metadata.xml 421 BLAKE2B 3eecb079a69adae1b0afce5a8c9a71d8743a25f7b288fba28492686eaa9b7a8209c0c70671d16f7f8e1338584de8346a22e833bc723b0f03dc0c39639e51ec6e SHA512 63640ebed9ed18b5b2ea95e729186bab6ccf2fb98a00a833b6eb828d5fc4a9f59865d1469a4c7157ef2c1f11b6bedcf83bff8ace9ade33992b66869a89c90182
diff --git a/dev-java/javax-jms-api/javax-jms-api-2.0.3.ebuild b/dev-java/javax-jms-api/javax-jms-api-2.0.3.ebuild
new file mode 100644
index 000000000000..95b4a86c8724
--- /dev/null
+++ b/dev-java/javax-jms-api/javax-jms-api-2.0.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom api/pom.xml --download-uri https://github.com/jakartaee/messaging/archive/2.0.3-RELEASE.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild javax-jms-api-2.0.3.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.jms:jakarta.jms-api:2.0.3"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Messaging"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jms"
+SRC_URI="https://github.com/jakartaee/messaging/archive/${PV}-RELEASE.tar.gz -> ${P}-RELEASE.tar.gz"
+
+LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( NOTICE.md README.md )
+
+S="${WORKDIR}/messaging-${PV}-RELEASE"
+
+JAVA_SRC_DIR="api/src/main/java"
diff --git a/dev-java/javax-jms-api/metadata.xml b/dev-java/javax-jms-api/metadata.xml
new file mode 100644
index 000000000000..ca6cf7f390be
--- /dev/null
+++ b/dev-java/javax-jms-api/metadata.xml
@@ -0,0 +1,10 @@
+<?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>
+	<longdescription>
+		Jakarta Messaging describes a means for Java applications to create, send, and receive messages via loosely coupled, reliable asynchronous communication services.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/jbig2-imageio/Manifest b/dev-java/jbig2-imageio/Manifest
index 66851a88687d..beba65fcd986 100644
--- a/dev-java/jbig2-imageio/Manifest
+++ b/dev-java/jbig2-imageio/Manifest
@@ -1,3 +1,3 @@
 DIST jbig2-imageio-3.0.3-src.zip 2079380 BLAKE2B bb05f81bfdef00b1a0ffcb7a2df2617fe5f5a83957249266917e775ceab57282ee289aedb198c6639201e85df83e89b8cfe8cf2d865fff863d1f2a5acd439721 SHA512 5350b4ce89af72eea5069f6ea5fc830238e4df711712506405aaf0e14546a1b07155b8c5225b47f0d40ce2821032426a2987adbe0df63c536cae4fb319b5c700
-EBUILD jbig2-imageio-3.0.3.ebuild 1318 BLAKE2B 92c39e2aad97be10d8e0e6c1b54811a45fb16a6373dbf0575d5878d1cfb48fd6ff89530874e0a9b10f34e3b07e56743a93d595071a1b3d28cd9543d04854e978 SHA512 ee6f3713703154aa1fc93d9320bda4410763e5896bf6d69688432af4667e03efd5c08a782f600b0436b3d85b1d5ab85d8a6931cdb03b713cfa93f46585615066
+EBUILD jbig2-imageio-3.0.3.ebuild 1317 BLAKE2B 51fbfb2ce30ff015aeaedd3c55c311cb8a7834d179d04cbf6bfad7baef7f8db345c10433335d075eda016f1a0eed2bb7d281a55bf59c2f86d4b8ac4e9caa7040 SHA512 4b2ab00fc9735686e87ddb2d0beffd4c2ac68ada4f9ade113fa11058e7177f1fbc5ba23f75aca1ed73ab0235ea81a7ff74d5d30e1c17e3f70120694d0adda82c
 MISC metadata.xml 498 BLAKE2B 8e21370981fdf284e4f73713f774238e44f5fe80c3e703435f08892f6d695dcc30fa68e0c2251095a125a7046ac57d437b54f9283baf5affe9595ddbdcae9ae5 SHA512 c46df10aade5c4a3f09e5a0aac99d93a1b9b52c85b3efb6579fc3b4344856f2c6c1634113b6b5a7b03b316c417f458ead74441e0a84ecb58a84b28ae4d00b081
diff --git a/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild b/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild
index 759a268c26fd..24e6a4482fb5 100644
--- a/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild
+++ b/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.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
 
 # Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="https://downloads.apache.org/pdfbox/${PN}/${PV}/${P}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest
index 0797b6493e94..4558e976c860 100644
--- a/dev-java/jctools-core/Manifest
+++ b/dev-java/jctools-core/Manifest
@@ -1,5 +1,7 @@
 DIST jctools-3.1.0.tar.gz 4204148 BLAKE2B 88f8f5395470072571de64ee3d696e90c1fbf22a6e9c1424463bfb8b497dd3d47f8d0fcc9a039acec8380ac52a3d445789257d5a1071e49e6963c59d156065e2 SHA512 bf69387732dea043e6e5fa44fe60a5f80ef5ae9d32ebb39ac16353e5bd82502b3b6e5564a8bd9f3b8ad073a95ff984ae55133884ebeea9d0b9a777c488af2a74
+DIST jctools-3.3.0.tar.gz 4214717 BLAKE2B c9c5f5897ebf8bb7ac439b969f372c45b7652517cbc5369c07fe80d11f779eebe7fe5ffb5d93a18fe3df5d9ca9adf3cee7268c8c6ed962fccb4d84f5b0451c4b SHA512 ce212abacca6137a133f7a4e94370442d00bf73794fa7b9ce440631701a9a2fca31c4dda05e2a768fcf28f75e84f2a7f318a936e429c7f4ed20daa7b79d11a4a
 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
+EBUILD jctools-core-3.3.0.ebuild 1997 BLAKE2B 02c25bc251787f5b99e4ac4ed460e0875d187a388929ba42a522f491e6948110cb4788b969dd9af94e11679b8368188cc4c7fc3777554764ad0dcb3bead1630d SHA512 020fae13b989f623b512f42a51050279ef056a5d65defcddf7e80edfc47dec5e6e45a1ebfbbf4db6bbaef590b853678f14de6e3233cc42640e3ef928170ef2db
 MISC metadata.xml 305 BLAKE2B 4ac1a7216894d3a7be6d9b4bbc034c2cb571ce0e9ec4f401eb4921f9c56b00296494be04d33b052d7f89684ac9a8d9b80385f7b33d7cb0a92b2ddb4bcc323835 SHA512 3ce5145f2b40c8a5bc7cd89c14ce33d6d194809ab70bec23c0726636ed516693f3cfdfe231e79fc1e3f3591ad950ff27f2632545fd69213a878be1b27d6f1f9d
diff --git a/dev-java/jctools-core/jctools-core-3.3.0.ebuild b/dev-java/jctools-core/jctools-core-3.3.0.ebuild
new file mode 100644
index 000000000000..4fe5ac01487c
--- /dev/null
+++ b/dev-java/jctools-core/jctools-core-3.3.0.ebuild
@@ -0,0 +1,64 @@
+# 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.3.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jctools-core-3.3.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jctools:jctools-core:3.3.0"
+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"
+
+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() {
+	# org.jetbrains.kotlinx.lincheck is not yet packaged
+	rm -r src/test/java/org/jctools/maps/linearizability_test || die
+	# 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
+	# OK (7226 tests)
+}
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 648eb8dfdba8..ebaadd35f2ef 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -8,5 +8,5 @@ DIST jffi-1.3.6.tar.gz 3187269 BLAKE2B 87a98c752440e336948923e73e2756cb0f88cbb11
 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
+EBUILD jffi-1.3.9.ebuild 2417 BLAKE2B c8bacff9935a8e6b44a857486c3b605a4c0a3210c50a0e309161593707654a930e68dbce87fe190bd2678c0576ae6e24078ed0f0af501c95c9ea446650705a3a SHA512 8b6ce9c691dd7f99c33a37999c9d12de082d3d64c1239cae7bf0f16308ec9a9dd4c014e8e203fc4c74dfc694f2b84d389d8cb34c3a634bc6d53b0ef4dcfafaf6
 MISC metadata.xml 320 BLAKE2B 4b1ac90322eb9faf01b397b7b4eea9167648abf3a89693a3bb28b27f5015b03c20c3b1b7843509686c8a827be8d4ea37f40fdf6ddaae418eec2dfa3b1797ffae SHA512 0daa4f9c85c906fdbd2fb652257c4d8ff52d88738e8e37e6bed49fdee6bb8aecefcd06e39fbe1262a3a0af73d2e1f4cfc8d0fc56b109bc686975ed41e54a68c9
diff --git a/dev-java/jffi/jffi-1.3.9.ebuild b/dev-java/jffi/jffi-1.3.9.ebuild
index f946f5fb5408..d74a2940741e 100644
--- a/dev-java/jffi/jffi-1.3.9.ebuild
+++ b/dev-java/jffi/jffi-1.3.9.ebuild
@@ -18,7 +18,7 @@ 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"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 1f968935aea8..643e687367c1 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,8 +1,6 @@
 AUX 4.2.2-makefile-flags.patch 925 BLAKE2B 642982867b5c187345123725f5e19bccb363915aefc5ea6e69f02e9ca86efee1e5f466c7cb9abf1b2871a735c45f8b7adaf999e42a351e01e515ecdc6648387e SHA512 be29adfff3b92875b38cf9bb326d935a189555bbb10315412b2544b43698cf76132554df64f28a18d4910ef1c46daf8b0a2ef9db7a9bca1ab53c421504187e54
 AUX 5.10.0-build.xml.patch 3325 BLAKE2B 9beb22ee4976bbac29e9ff79f5efedbe21e8a7ef93a83a37320fe327574844efa8d1a5ec1c9948df4dc7934d2be9b5635c4ce2b639b2af12f1eb7fc9100beef6 SHA512 4d22a080f85f7cc533db62c66ae77b3b56062624361f40e71dc7e41a57ddaaded05ca30e85b670805165347aa42e179c76f7d5ec0b558ab07b7dadaef0cfa64f
 AUX 5.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-5.10.0.ebuild 2459 BLAKE2B 86b61d92ab01caeb641565650fff5e9024ef39f163fccbcbdf2f167b6bb198e952ab21f2650031f85c9ca7436f7a3690a28d28957c58547c080eac12fd235d64 SHA512 408ef249df31976f88baf7ff7222796a402c0ed94154b280eb3c5333b8deee30fe4c22709e2bdbffa3b40e3196ea8b6c39c547fc76ae16c489caefcc2734766f
-EBUILD jna-5.11.0.ebuild 2490 BLAKE2B c97633d35bcaa3de72948587a4b56fea5a92a691428f20ba52da2a5111f36f4788e3a55c96b7b06df0c2445e0e34b005505229bfddfdf5d1ef02ccbb8e8b6a31 SHA512 2ed6e9dfeb73b9acc059597a28f59f03c3a93d70a35ee206c5a57c7c987c26c7d1889ea112b6c5d4bc7a0017e2ac6d145abb785aef98825b1b40f184a69ebc0d
+EBUILD jna-5.11.0.ebuild 2486 BLAKE2B bcc2fa0cb0fcf7d3d13c675e6589d68f89a83edcd7ef9e825f775935bc75a64adf984dddbc00ca0bda061d32f8cffe4f52c3163c46d84b8eec9d15866a8e0ac1 SHA512 d17b7bedc6bcff581f5af6147c7e819d9457771250b07366ebb98bfb02d37fe8a2a2db2573bbcb9bbc2e3f1d14e4d299a770f659fe9b1b04ab799735fe60c126
 MISC metadata.xml 321 BLAKE2B c39a2036ee429d7d2dd70a9481ae84e86dd94d428be06668800b57a32910af90019d644276fb3466ab7ae5ec5a53ab6599ba8e16770ffad5d10730df6926f326 SHA512 aa6b45e487d69fda26d85ad22900da9085aaa3c1fac1b7c2b0ce22199f35d833640a3d9513dc8efc6ae49b6c00f42a3581ca325e67b3e14e8a72742799addece
diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
deleted file mode 100644
index 4e08475cbb53..000000000000
--- a/dev-java/jna/jna-5.10.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="net.java.dev.jna:jna:5.10.0"
-
-inherit java-pkg-2 java-ant-2 toolchain-funcs
-
-DESCRIPTION="Java Native Access"
-HOMEPAGE="https://github.com/java-native-access/jna"
-SRC_URI="https://github.com/java-native-access/jna/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-2.1+ )"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-CDEPEND="
-	>=dev-libs/libffi-3.4:=
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	dev-java/animal-sniffer-annotations:0
-	dev-java/ant-core:0
-	dev-java/asm:9
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/junit:4
-		dev-java/reflections:0
-	)
-	${CDEPEND}
-	x11-libs/libXt
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}
-"
-
-DOCS=( README.md CHANGES.md OTHERS TODO )
-PATCHES=(
-	"${FILESDIR}/${PV}-build.xml.patch"
-	"${FILESDIR}/4.2.2-makefile-flags.patch"
-)
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_PKG_BSFIX_NAME="build.xml build-ant-tools.xml"
-EANT_BUILD_TARGET="jar contrib-jars"
-EANT_EXTRA_ARGS="-Dbuild-native=true -Dcompatibility=1.8 -Ddynlink.native=true"
-EANT_TEST_EXTRA_ARGS="-Djava.io.tmpdir=\"${T}\""
-EANT_TEST_GENTOO_CLASSPATH="animal-sniffer-annotations,reflections"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only \
-		animal-sniffer-annotations,ant-core,asm-9)"
-
-	# Any spaces in paths returned by toolchain-funcs and options like MAKEOPTS
-	# could cause trouble in EANT_EXTRA_ARGS when Java eclasses process the
-	# variable's value, so define them in ANT_OPTS instead
-	ANT_OPTS="-DCC='$(tc-getCC)'"
-	# Parallel build does not respect dependency relationships between objects
-	ANT_OPTS+=" -DEXTRA_MAKE_OPTS='${MAKEOPTS} -j1'"
-}
-
-src_prepare() {
-	default
-
-	# Eliminate build.xml's dependency on bundled native JARs
-	sed -i -e '/zipfileset src="${lib.native}/,+2d' build.xml ||
-		die "Failed to delete lines referencing bundled JARs in build.xml"
-
-	# Clean up bundled JARs and libffi
-	java-pkg_clean
-	rm -r native/libffi || die "Failed to remove bundled libffi"
-
-	java-pkg-2_src_prepare
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar "build/${PN}-min.jar"
-	java-pkg_dojar "contrib/platform/dist/${PN}-platform.jar"
-	java-pkg_doso build/native-*/libjnidispatch.so
-	einstalldocs
-
-	use source && java-pkg_dosrc src/*
-	use doc && java-pkg_dojavadoc doc/javadoc
-}
diff --git a/dev-java/jna/jna-5.11.0.ebuild b/dev-java/jna/jna-5.11.0.ebuild
index 44173ced3c04..0d53024ae379 100644
--- a/dev-java/jna/jna-5.11.0.ebuild
+++ b/dev-java/jna/jna-5.11.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/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest
index 785c93b3dc1d..c2c2b597d1dc 100644
--- a/dev-java/jnr-ffi/Manifest
+++ b/dev-java/jnr-ffi/Manifest
@@ -2,8 +2,6 @@ AUX jnr-ffi-2.0.2-junit48.patch 467 BLAKE2B 1f1e76e18f425e1a38dfc0b1788239329a58
 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
+EBUILD jnr-ffi-2.2.12.ebuild 1194 BLAKE2B 7be4c141653d10a73ba094287ea631f7c4d81a996ac28663253812fbcaabef5a356e3cf267fabc09b152cfb332fcd4fee55e142d63fd0b47db9fd842f7a6f0e5 SHA512 68499cf6632bc7f1f3a25f0baad8a3bc8ed015c7ee0d982197f65e5acd39093414bd5c870e9ef5b45cf91284fc9671c93b13db476a6b2e97e676ad654a3464bc
 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
index 97e586145250..aec229af6305 100644
--- a/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 CP_DEPEND="
 	dev-java/asm:9
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.2.8.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.2.8.ebuild
deleted file mode 100644
index e577aeebbf63..000000000000
--- a/dev-java/jnr-ffi/jnr-ffi-2.2.8.ebuild
+++ /dev/null
@@ -1,63 +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/jnr/jnr-ffi/archive/refs/tags/jnr-ffi-2.2.8.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jnr-ffi-2.2.8.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.github.jnr:jnr-ffi:2.2.8"
-# no junit-jupiter in ::gentoo
-# 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/refs/tags/${P}.tar.gz -> ${P}-sources.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# com.github.jnr:jffi:1.3.6 -> >=dev-java/jffi-1.3.6:1.2
-# com.github.jnr:jnr-a64asm:1.0.0 -> >=dev-java/jnr-a64asm-1.0.0:2
-# com.github.jnr:jnr-x86asm:1.0.2 -> >=dev-java/jnr-x86asm-1.0.2:1.0
-# org.ow2.asm:asm:9.2 -> >=dev-java/asm-9.2:9
-# org.ow2.asm:asm-analysis:9.2 -> >=dev-java/asm-analysis-9.2:`ver_cut 1`
-# org.ow2.asm:asm-commons:9.2 -> >=dev-java/asm-commons-9.2:`ver_cut 1`
-# org.ow2.asm:asm-tree:9.2 -> >=dev-java/asm-tree-9.2:`ver_cut 1`
-# org.ow2.asm:asm-util:9.2 -> >=dev-java/asm-util-9.2:`ver_cut 1`
-
-CDEPEND="
-	dev-java/asm:9
-	dev-java/asm-analysis:9
-	dev-java/asm-commons:9
-	dev-java/asm-tree:9
-	dev-java/asm-util:9
-	>=dev-java/jffi-1.3.6:1.2
-	dev-java/jnr-a64asm:2
-	dev-java/jnr-x86asm:1.0
-"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-# Runtime dependencies
-# POM: pom.xml
-# com.github.jnr:jffi:1.3.6 -> >=dev-java/jffi-1.3.6:1.2
-
-RDEPEND="
-	${CDEPEND}>=virtual/jre-1.8:*
-	>=dev-java/jffi-1.3.6:1.2"
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_GENTOO_CLASSPATH="jffi-1.2,jnr-a64asm-2,jnr-x86asm-1.0,asm-9,asm-analysis-9,asm-commons-9,asm-tree-9,asm-util-9,jffi-1.2"
-# no junit-jupiter in ::gentoo
-JAVA_SRC_DIR="src/main/java"
-
-# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!"
-# JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/jnr-netdb/Manifest b/dev-java/jnr-netdb/Manifest
index 6779501195f7..ab80f05cf9ae 100644
--- a/dev-java/jnr-netdb/Manifest
+++ b/dev-java/jnr-netdb/Manifest
@@ -2,5 +2,5 @@ AUX jnr-netdb_maven-build.xml 9637 BLAKE2B 0ee947467fc1c8e07d2b98fb29a70de5244e4
 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
+EBUILD jnr-netdb-1.2.0.ebuild 848 BLAKE2B 276fcbd57b00142e429eeaae6e240ab92a45d1975b6983cbe27064920d46c1aef09152f442e71e92a6695e19f7e8acc129cb8b8fba14ad20dfab3b31dfcb2569 SHA512 d2a3ee67d086dab3e1e5e33c393fec41557e7610acfb376b0d1897ebf7c1583f65fff70b080eb7bb74bcd0821e6edf1593e971eafccd1ce089cc90e4e830e6af
 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
index e45ee7a9304b..03d46d9a7634 100644
--- a/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild
+++ b/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 CP_DEPEND="
 	dev-java/jnr-ffi:2"
diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest
index e34cf0da5d5c..7a4b549a5e00 100644
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@@ -3,5 +3,5 @@ AUX jnr-posix_maven-build.xml 11760 BLAKE2B ec75beb884ccb81dc28c38db22e64953a6f5
 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
+EBUILD jnr-posix-3.1.15.ebuild 1925 BLAKE2B f628e12409417907e9151f2b1f0f13e1b86377d37bdafabe8cb93d318bc8dcb3a00da31944d22f0257f23627d0e7f24dc98c4e07122eaa89e4ff55bb2aaa31fb SHA512 38ed70a57b2fd9fd3673968e8508e4a7f902faebe543ae3a086dc2a67d0c6058ab4c369143e6565f7b4a5eff00399a3f0864de90069fa7d5ef29973f09f83c1c
 MISC metadata.xml 325 BLAKE2B f40ca825a92205c1ef0e0be2e72c859b680593c0f852aec73c3d84356a9927f5f536ffcec7b7a365353ac56489677d7881f9f27431abc56cdf9cc24550493097 SHA512 ff2bae0526d5ae082ad290411e7d3cd95a197918e4d834a531cab016ff9a718197a27fb2c7a4f7426bb44a5b295e164a72dd36f5fac800bc20388fde0f52e0a4
diff --git a/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild b/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild
index 5e4a34bbddea..3f90b95f3507 100644
--- a/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild
+++ b/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild
@@ -18,7 +18,7 @@ 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"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 CP_DEPEND="
 	>=dev-java/jnr-ffi-2.2.12:2
diff --git a/dev-java/jopt-simple/Manifest b/dev-java/jopt-simple/Manifest
index e524fdac08b4..85d6e99399bc 100644
--- a/dev-java/jopt-simple/Manifest
+++ b/dev-java/jopt-simple/Manifest
@@ -1,5 +1,3 @@
 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-5.0-r1.ebuild 670 BLAKE2B 8318f5e1197a08f46ab18b595a8c6c793a3904fc429fd57591b276475260670109d6aa6e9adbdff3b08c3a8f21bce0e183e8a892074136c8e491afdcb51be64f SHA512 920c41331bf2881a1fc422c835797e49008195442b1909a768895e436442041d917fde26548f6cec64972de3e581a54e5ad3ac5c8ec419b8d212a94074a6d99c
-EBUILD jopt-simple-5.0.4.ebuild 665 BLAKE2B cc79f672c7b3516da09dacd7590f2b2bf98237ed379aef54f2dcbdc13ec781d0cde92b901d3ced9b4232a41da1aa26c634a0f0f5981279d3e3b42da27a7fe47b SHA512 3ae65a4f809c4034477ed826ba1281acce209fd40482ee794b53c02dfa09c461aec24b63e106819ed4d9d38985c3e49dee7f0cb82f1516781404fabe63721d15
+EBUILD jopt-simple-5.0.4.ebuild 661 BLAKE2B 76175e54c2aae2d3d376dbef38b83319beb13d27100871fe523dc26fc30ab9907e5ceff4b0e385d5330a0f19646805d97f6c64b6acc2c4c4bc4597a0837e3592 SHA512 61f4adf6229d554b85ce0d0bfd53a651ab5a9dfee8b36b6f75faf606ed2bd8976fee2d73f0c6c4363b5652377b873626facce1d3d56e68ec87cd5ca32a4ffb7c
 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
deleted file mode 100644
index 71f7f89dab11..000000000000
--- a/dev-java/jopt-simple/jopt-simple-5.0-r1.ebuild
+++ /dev/null
@@ -1,30 +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 Java library for parsing command line options"
-HOMEPAGE="https://jopt-simple.github.io/jopt-simple/"
-SRC_URI="https://github.com/jopt-simple/jopt-simple/archive/jopt-simple-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${PN}-${PN}-01719a6"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-src_install() {
-	einstalldocs
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild b/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild
index f6331ef9f35c..1ac84e768ee5 100644
--- a/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild
+++ b/dev-java/jopt-simple/jopt-simple-5.0.4.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"
 
 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 b6567519434f..6c27c3cf74fe 100644
--- a/dev-java/log4j-12-api/Manifest
+++ b/dev-java/log4j-12-api/Manifest
@@ -1,3 +1,5 @@
 DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
+DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
 EBUILD log4j-12-api-2.17.2.ebuild 3241 BLAKE2B 70ea7a1af7385a6e9197d98b743ab2e0c48350e7f3fa5fbd93600b5d3586f3fc2daf947d8bfdea57ffc9c74c78634f6020989488c466dc8403ccfb4db0fe3199 SHA512 1a770758d425819e6e37dbf5a902255adccf23372c8d054ae8e2e8b5dbbde6184809ea9899f9d65bdbc8b7323c3af45aec2a944780a03b608adbdf89c279d450
+EBUILD log4j-12-api-2.18.0.ebuild 3320 BLAKE2B ae4bdb3b14a33e565191f76db644893153728b699bba388fce253d13257a232615a3dc49c3e2e767070dfe500f785622c53bb993757bfb1d9156ad421d04cd4e SHA512 5153ec3290d0a43453c4f9c164e95cb206566491f0f4f491550918e3e910bf2bfcf486c1309a02c841dbd553f896f7619c6de65c0e385c190328371c67bfc749
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-12-api/log4j-12-api-2.18.0.ebuild b/dev-java/log4j-12-api/log4j-12-api-2.18.0.ebuild
new file mode 100644
index 000000000000..cb01db0c5062
--- /dev/null
+++ b/dev-java/log4j-12-api/log4j-12-api-2.18.0.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 log4j-1.2-api/pom.xml --download-uri mirror://apache/logging/log4j/2.18.0/apache-log4j-2.18.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-12-api-2.18.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.logging.log4j:log4j-1.2-api:2.18.0"
+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.18.0 -> >=dev-java/log4j-api-2.18.0:2
+# org.apache.logging.log4j:log4j-core:2.18.0 -> >=dev-java/log4j-core-2.18.0:2
+
+CP_DEPEND="
+	~dev-java/log4j-api-${PV}:2
+	~dev-java/log4j-core-${PV}:2
+"
+
+# Compile dependencies
+# POM: log4j-1.2-api/pom.xml
+# javax.jms:javax.jms-api:2.0.1 -> !!!groupId-not-found!!!
+# POM: log4j-1.2-api/pom.xml
+# test? com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.3 -> >=dev-java/jackson-dataformat-xml-2.13.3:0
+# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
+# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
+# test? org.apache.felix:org.apache.felix.framework:7.0.5 -> !!!groupId-not-found!!!
+# test? org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2
+# test? org.apache.logging.log4j:log4j-core:2.18.0 -> >=dev-java/log4j-core-2.18.0:2
+# test? org.apache.velocity:velocity:1.7 -> !!!artifactId-not-found!!!
+# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
+# test? org.mockito:mockito-core:4.4.0 -> >=dev-java/mockito-4.4.0:4
+# test? oro:oro:2.0.8 -> >=dev-java/jakarta-oro-2.0.8:2.0
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	dev-java/javax-jms-api:0
+"
+#	test? (
+#		!!!artifactId-not-found!!!
+#		!!!groupId-not-found!!!
+#		>=dev-java/commons-io-2.11.0:1
+#		>=dev-java/jackson-dataformat-xml-2.13.0:0
+#		~dev-java/log4j-api-${PV}:2
+#		~dev-java/log4j-core-${PV}:2
+#	)
+#"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
+
+S="${WORKDIR}/apache-log4j-${PV}-src"
+
+JAVA_CLASSPATH_EXTRA="javax-jms-api"
+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,commons-lang-3.6,!!!groupId-not-found!!!,log4j-api-2,log4j-core-2,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,mockito-4,jakarta-oro-2.0"
+#JAVA_TEST_SRC_DIR="log4j-1.2-api/src/test/java"
+#JAVA_TEST_RESOURCE_DIRS=(
+#	"log4j-1.2-api/src/test/resources"
+#)
diff --git a/dev-java/log4j-api/Manifest b/dev-java/log4j-api/Manifest
index 4c7d47d5f021..882d399dbdd3 100644
--- a/dev-java/log4j-api/Manifest
+++ b/dev-java/log4j-api/Manifest
@@ -1,3 +1,5 @@
 DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
+DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
 EBUILD log4j-api-2.17.2.ebuild 2898 BLAKE2B 30b05532f1b879f095a3ea735077818fcfce91be99de9d47d547e842d0c8500e67d3f0051e046cf88c13dbde0d7f226b6fdb5266844936a662dc9775c46aa997 SHA512 4f42101df7321f37a28185156d93998f4cc5b67a7007fd17dbc84a8a87b2a50667d080304fee57f248617c047cafd7178ae569975555269266a11d46bfa6b2a6
+EBUILD log4j-api-2.18.0.ebuild 3011 BLAKE2B 2981cbb7fe50bef0598d822b3f31e972a3015ad354ea12cb2d928879576e8e4f6a5ce0986ce27d13ff5394aa2530b9a98f816c1a32c78d28b0ccfce8830bf87a SHA512 f5b89636cbfea13f9b999488808e5080851a04c195cc0bb9a9c7f5ea00cd91723476b88f9f3466ce8f74c04ec41bf5e932468a09495d448dcf8cdd0858b673b9
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-api/log4j-api-2.18.0.ebuild b/dev-java/log4j-api/log4j-api-2.18.0.ebuild
new file mode 100644
index 000000000000..b46220565365
--- /dev/null
+++ b/dev-java/log4j-api/log4j-api-2.18.0.ebuild
@@ -0,0 +1,71 @@
+# 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.18.0/apache-log4j-2.18.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-2.18.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.logging.log4j:log4j-api:2.18.0"
+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:6.0.0 -> >=dev-java/osgi-core-8.0.0:0
+# POM: ${PN}/pom.xml
+# test? com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
+# test? com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3: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:7.0.5 -> !!!groupId-not-found!!!
+# test? org.apache.maven:maven-core:3.8.5 -> !!!groupId-not-found!!!
+# test? org.assertj:assertj-core:3.23.1 -> !!!suitable-mavenVersion-not-found!!!
+# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
+# test? org.junit-pioneer:junit-pioneer:1.6.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-migrationsupport:5.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
+# test? uk.org.webcompere:system-stubs-jupiter:2.0.1 -> !!!groupId-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	dev-java/osgi-core:0
+"
+#		test? (
+#			!!!groupId-not-found!!!
+#			!!!suitable-mavenVersion-not-found!!!
+#			>=dev-java/commons-lang-3.12.0:3.6
+#			>=dev-java/jackson-core-2.13.3:0
+#			>=dev-java/jackson-databind-2.13.3:0
+#		)
+#	"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
+
+S="${WORKDIR}/apache-log4j-${PV}-src"
+
+JAVA_CLASSPATH_EXTRA="osgi-core"
+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!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+#	JAVA_TEST_SRC_DIR="${PN}/src/test/java"
+#	JAVA_TEST_RESOURCE_DIRS=(
+#		"${PN}/src/test/resources"
+#	)
diff --git a/dev-java/log4j-core/Manifest b/dev-java/log4j-core/Manifest
index 7cdbe4bcfe8b..a9973e414311 100644
--- a/dev-java/log4j-core/Manifest
+++ b/dev-java/log4j-core/Manifest
@@ -1,4 +1,6 @@
 DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
+DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
 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
+EBUILD log4j-core-2.18.0.ebuild 8539 BLAKE2B 6675a0dfe0463d16058f52eb9715ff4f5535156f8c66df0b8c63c5c44b429a6e109779196759136a93c4d1dff0938e68b84251289cef9599314a4f49c2ecf479 SHA512 0ef6883a0b7a8526408537b57fad56d4bed7bcf21448979ea36572953fd4c72d17f5aa2b7ba335878f9fb8ee10caefdf75f22355757a032e95654fc15b32eacd
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-core/log4j-core-2.18.0.ebuild b/dev-java/log4j-core/log4j-core-2.18.0.ebuild
new file mode 100644
index 000000000000..c89b20c08cd1
--- /dev/null
+++ b/dev-java/log4j-core/log4j-core-2.18.0.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom log4j-core/pom.xml --download-uri mirror://apache/logging/log4j/2.18.0/apache-log4j-2.18.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-core-2.18.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.logging.log4j:log4j-core:2.18.0"
+# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Apache Log4j Implementation"
+HOMEPAGE="https://logging.apache.org/log4j/2.x/"
+SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# We don't have junit-vintage and junit-jupiter
+RESTRICT="test"
+
+# Common dependencies
+# POM: ${PN}/pom.xml
+# com.conversantmedia:disruptor:1.2.15 -> >=dev-java/conversant-disruptor-1.2.19:0
+# com.fasterxml.jackson.core:jackson-core:2.13.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.jackson.dataformat:jackson-dataformat-xml:2.13.3 -> >=dev-java/jackson-dataformat-xml-2.13.3:0
+# com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3 -> >=dev-java/jackson-dataformat-yaml-2.13.3: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
+# 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.18.0 -> >=dev-java/log4j-api-2.18.0:2
+# org.fusesource.jansi:jansi:2.4.0 -> >=dev-java/jansi-2.4.0:2
+# org.jctools:jctools-core:3.3.0 -> !!!suitable-mavenVersion-not-found!!!
+# org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0
+# org.zeromq:jeromq:0.5.2 -> >=dev-java/jeromq-0.5.2:0
+
+CP_DEPEND="
+	dev-java/commons-compress:0
+	dev-java/commons-csv:0
+	dev-java/conversant-disruptor:0
+	dev-java/jackson-core:0
+	dev-java/jackson-databind:0
+	dev-java/jackson-dataformat-xml:0
+	dev-java/jackson-dataformat-yaml:0
+	dev-java/jansi:2
+	dev-java/javax-mail:0
+	dev-java/jctools-core:3
+	dev-java/jeromq:0
+	dev-java/kafka-clients:0
+	dev-java/lmax-disruptor:0
+	~dev-java/log4j-api-${PV}:2
+	dev-java/slf4j-api:0
+	dev-java/woodstox-core:0
+"
+
+# Compile dependencies
+# POM: ${PN}/pom.xml
+# javax.activation:javax.activation-api:1.2.0 -> !!!groupId-not-found!!!
+# javax.jms:javax.jms-api:2.0.1 -> !!!groupId-not-found!!!
+# javax.mail:javax.mail-api:1.6.2 -> !!!groupId-not-found!!!
+# org.osgi:org.osgi.core:6.0.0 -> >=dev-java/osgi-core-8.0.0:0
+# POM: ${PN}/pom.xml
+# test? ch.qos.logback:logback-classic:1.2.11 -> >=dev-java/logback-classic-1.2.11:0
+# test? ch.qos.logback:logback-core:1.2.11 -> >=dev-java/logback-core-1.2.11:0
+# test? com.github.tomakehurst:wiremock:2.26.3 -> !!!groupId-not-found!!!
+# test? com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0 -> !!!groupId-not-found!!!
+# test? com.h2database:h2:2.1.214 -> !!!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? 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.17.1 -> !!!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:7.0.5 -> !!!groupId-not-found!!!
+# test? org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2
+# test? org.apache.maven:maven-core:3.8.5 -> !!!groupId-not-found!!!
+# test? org.awaitility:awaitility:4.2.0 -> !!!groupId-not-found!!!
+# test? org.codehaus.groovy:groovy-dateutil:3.0.10 -> !!!groupId-not-found!!!
+# test? org.codehaus.groovy:groovy-jsr223:3.0.10 -> !!!groupId-not-found!!!
+# test? org.codehaus.plexus:plexus-utils:3.4.2 -> !!!groupId-not-found!!!
+# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
+# test? org.hamcrest:hamcrest:2.2 -> >=dev-java/hamcrest-2.2:0
+# test? org.hsqldb:hsqldb:2.5.2 -> !!!groupId-not-found!!!
+# test? org.jmdns:jmdns:3.5.7 -> !!!groupId-not-found!!!
+# test? org.junit-pioneer:junit-pioneer:1.6.2 -> !!!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.4.0 -> >=dev-java/mockito-4.4.0:4
+# test? org.mockito:mockito-junit-jupiter:4.4.0 -> !!!artifactId-not-found!!!
+# test? org.slf4j:slf4j-ext:1.7.36 -> >=dev-java/slf4j-ext-1.7.36:0
+# test? org.springframework:spring-test:5.3.20 -> !!!groupId-not-found!!!
+# test? org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0
+# test? org.xmlunit:xmlunit-core:2.9.0 -> !!!groupId-not-found!!!
+# test? org.xmlunit:xmlunit-matchers:2.9.0 -> !!!groupId-not-found!!!
+# test? org.zapodot:embedded-ldap-junit:0.8.1 -> !!!groupId-not-found!!!
+
+DEPEND="${CP_DEPEND}
+	dev-java/jakarta-activation-api:1
+	dev-java/jakarta-mail-api:0
+	dev-java/javax-jms-api:0
+	dev-java/osgi-core-api:0
+	>=virtual/jdk-1.8:*"
+#	test? (
+#		!!!artifactId-not-found!!!
+#		!!!groupId-not-found!!!
+#		>=dev-java/bsh-2.0_beta6:0
+#		>=dev-java/commons-codec-1.15:0
+#		>=dev-java/commons-io-2.11.0:1
+#		>=dev-java/commons-lang-3.12.0:3.6
+#		>=dev-java/commons-logging-1.2:0
+#		>=dev-java/hamcrest-2.2:0
+#		>=dev-java/log4j-api-2.18.0:2
+#		>=dev-java/logback-classic-1.2.11:0
+#		>=dev-java/logback-core-1.2.11:0
+#		>=dev-java/mockito-4.4.0:4
+#		>=dev-java/slf4j-ext-1.7.36:0
+#		>=dev-java/xz-java-1.9:0
+#	)
+#"
+
+# Runtime dependencies
+# POM: ${PN}/pom.xml
+# com.sun.mail:javax.mail:1.6.2 -> !!!artifactId-not-found!!!
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
+
+S="${WORKDIR}/apache-log4j-${PV}-src"
+
+JAVA_CLASSPATH_EXTRA="jakarta-activation-api-1,jakarta-mail-api,javax-jms-api,osgi-core-api"
+JAVA_SRC_DIR="${PN}/src/main/java"
+JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
+
+#JAVA_TEST_GENTOO_CLASSPATH="logback-classic,logback-core,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,commons-codec,commons-io-1,commons-logging,!!!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!!!,hamcrest,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,mockito-4,!!!artifactId-not-found!!!,slf4j-ext,!!!groupId-not-found!!!,xz-java,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+#JAVA_TEST_SRC_DIR="${PN}/src/test/java"
+#JAVA_TEST_RESOURCE_DIRS=(
+#	"${PN}/src/test/resources"
+#)
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# Process the @Plugin annotation used on Log4j 2 built-in plugins
+	# to generate a serialized plugin listing file
+	# https://logging.apache.org/log4j/2.x/manual/plugins.html
+	local processor="org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor"
+	local classes="target/classes"
+	local classpath="${JAVA_JAR_FILENAME}:$(\
+		java-pkg_getjars --build-only --with-dependencies \
+		"${JAVA_GENTOO_CLASSPATH},${JAVA_CLASSPATH_EXTRA}")"
+	# Just in case java-pkg-simple.eclass changes the path in the future
+	mkdir -p "${classes}" || die "Failed to create directory for classes"
+	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}" \
+		@"${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}" . ||
+		die "Failed to update JAR"
+}
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index 98623b1094f2..f463dfec8dee 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,3 +1,5 @@
 DIST mill-bin-0.10.4 68195230 BLAKE2B 922604123641ea130da1fbc30e6fdbf768479cdee61f8ca9443f4a96f2d9a3608c2377741716c2f942c29cf40c10f23f3cd24255221d7095060c89c5cde7b8f3 SHA512 2141159fd88866ba3c3abf05af0d7b2bbd89b901a16a29e51b6baefbb94fe68afc4b5c83cf18d289279dbb142b47eadd5ec225a72059be9fa6fc0594b0c130af
+DIST mill-bin-0.10.5 65096167 BLAKE2B 756970782a3abd67a03337824bb54c887758968c8f98cbeadbeb6e84277a5318c737e920b8e3f9025dcc01c81440f62f61e415b5a343f8c36b06bffe66bdb0ec SHA512 151be733fb5438fbad4e1e2b7c6918a38743f1f494652d2d3b11a5d1b67ff3dff40f62b1e71784f5ff22045f45f7e9390a9b4eb6377814cbcfa5cc1e337b0666
 EBUILD mill-bin-0.10.4.ebuild 480 BLAKE2B 975ae40b61d1aee9e011cd04fddac1b6adfb788cfb6218648284330e1d936611b73473e82383524e4be1a4ce6bff26bcc047bfb1ab9c67c9c646a85d892bdff4 SHA512 1625db9ae485f31f37033d30c5de765850f77a57d22f772645c38de7077f87431d41826241e108b9f8deab2d8e04bea4b98e7aeaba35a13ca1693888b6d1e67f
+EBUILD mill-bin-0.10.5.ebuild 482 BLAKE2B bd450dd8e02ed513d1d9a2546220e91556ccdc46a515bd41ca1450f9f36c602e25a36830c65211dcf87946b1dd028a474c84638e3f1039d83b4cc048b7100e33 SHA512 0c47890e11f7b3d2fcfb1469213dcb2f7103ff7f3460968dee8d4ce54bb0fe7efd80e0604a5a6ed5cbfb0c47fe68f43b02b6c653ea2401707bb9f318a6ddfddc
 MISC metadata.xml 464 BLAKE2B b60279b753026e5ba2247448a3e009a02b1d017cd3269fbf518783dc7f0a59adfdea03201123891d113da14f9d5a3cafd66628d71037064387086b622412994f SHA512 d7eeb833078c86092aaebc30a92d5029aea2ecbd1274c0f8eb86bc9015bf1bd1a2ab91b50ee0fc9816a661ace9635f4c06e9dcfb9d0bf1402b6f94867eb4e505
diff --git a/dev-java/mill-bin/mill-bin-0.10.5.ebuild b/dev-java/mill-bin/mill-bin-0.10.5.ebuild
new file mode 100644
index 000000000000..e8485c57dfd6
--- /dev/null
+++ b/dev-java/mill-bin/mill-bin-0.10.5.ebuild
@@ -0,0 +1,26 @@
+# 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/mockito/Manifest b/dev-java/mockito/Manifest
index 9416dd57ee54..f15755d0229e 100644
--- a/dev-java/mockito/Manifest
+++ b/dev-java/mockito/Manifest
@@ -1,9 +1,7 @@
 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 1234 BLAKE2B 3b0d2fb7e8632c09c532d0a47b199bbf5159c855854d4ecaf36b72804e39bad146a38c5966e30a2199458e296a750a14357175f9b3be79e09ac6f1f1f1a226b6 SHA512 adfb0bf0c83078cd8a9bca1917c99f3128c0b8e876359a170d5d16f15cbfb3805484dd42acc8b63a76bfd8b9dd49d5f2b90cd30c6e4ffe74265d74089a09818e
-EBUILD mockito-4.6.0.ebuild 1237 BLAKE2B d1617ef96068aa664e3f1b75ff6d9128682c36c6a20c0aa1f291a283a5ccd63c45809bbf0a80271f2a6179ea44a04e437e611578e98a648c768bd750f861f1db SHA512 1f99f9ddb864787c3c6d9c7c613d24f61475122f7da98869a65bc0978f3bb1a48de118389c862a7368b6ed7af5523cdf8f216e44e31b683eaa183316c7225778
+EBUILD mockito-4.6.0.ebuild 1233 BLAKE2B ce75b72ffe49e4d7e8d39614cbb78a60d90c4cae3874d5b432e66e16f8f28af3d3cf034114ca15e573c5f36de45d5bad98c58f2311af84d2484b286beef587ba SHA512 80cdd01513906a21fcb008ee9d5ba00a177b11fe14a4cbfa9d1ef6cb714e81c21271bab98345318d1ca3ddf81a16af6504963f6a8c1f457b174750609f7ca5bd
 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/mockito-4.4.0.ebuild b/dev-java/mockito/mockito-4.4.0.ebuild
deleted file mode 100644
index 676fcb4d2985..000000000000
--- a/dev-java/mockito/mockito-4.4.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.4.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://codeload.github.com/mockito/mockito/tar.gz/v${PV} -> ${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.0.ebuild b/dev-java/mockito/mockito-4.6.0.ebuild
index f586f9b27a4f..64fd58db303e 100644
--- a/dev-java/mockito/mockito-4.6.0.ebuild
+++ b/dev-java/mockito/mockito-4.6.0.ebuild
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: ${PN}-core-${PV}.pom
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 0058f9cff8f7..3c8cb25ce0b1 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,6 +1,5 @@
-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
+AUX openjdk-bin-8.env.sh 607 BLAKE2B 447575fc213003930ba6d6bbbd7cda0d53f53b16e3679fcb13d219cccf3525c7dfda755c79826b4d3c7b238502ed5ecaf4c8514971e576c756f4fc168fd9a0d2 SHA512 4cfbe2dddc89408824621bbd2036afa2966d550e6e189a8835f78b46fe91305221d8fa46219e9c53c83c9f73d83cdb1208bc78a46b9115041511b97b70abbf1b
+AUX openjdk-bin.env.sh 398 BLAKE2B b83d85e2a4e0dbeb24b8c21fb442a8964e55eaf01125cd52f5c930cd67b95b7d1744362cbefe436e4f4115f0b7600860200d8f134b241b6b60ffae6b807b476b SHA512 2c2f753a05154d17a7c324e61d3e4513119050f44d2a8d0aea5c6e2542e9989a955689a97d47fc1d5c710a056f2ccc7b239e3eed3b2d516df6b2aa7450c44613
 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.15_10.tar.gz 181012868 BLAKE2B b52d2330291ae8f8d74ba98b4679414e86c9018ad364bb27f09b5f192369c0b934654e5b4d8a07027e001da96fb89bd62a18ab5c1acea3c2cea2cc31e20a1481 SHA512 abe8469f5fa4f46f71e35785c6972b2901f003e311086352df6eff6911393c31c01ff965c74772656e2255e0bbb15eee6b761db472c886b60a8cda046fb46764
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz 175250283 BLAKE2B 4b4fe6a5018cfa40ac71cfcf41c261887890e339d9e5f57aac55f494abb7a4e99263db151d85698690513caf670acfef29a83616e49d6f845e02cef024624fd6 SHA512 98adf9689782aa78d61f485e671c434cfdfae7ba92a7ce0c2401164250b7def2f881e201835e1ca2ab56a3ae4967c0923f4856171c2a4918f7190adf4b5e0bca
@@ -19,7 +18,7 @@ DIST OpenJDK8U-jdk_arm_linux_hotspot_8u332b09.tar.gz 98261468 BLAKE2B 7fe2b5c617
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u332b09.tar.gz 100484069 BLAKE2B 7e3b0186947f19094d88140304e756b7b2728560299f330c84ed8f9ac77c40fb046c2731d22c5d30e5d2837b878caccb19e8f1174f272c2fb29905db15500640 SHA512 adcfa446254c7de8b80f040e7f9960625c0314dabc8b457dee9d95216050f9aedc0c59528c29f7f1bc950c3ed0b713f3234dd9f9fb2a5bab7e706dbdb2eef42d
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u332b09.tar.gz 102918585 BLAKE2B 55d7ef116ee28f37ab1a96cb8ffe021d1784b208ad248e78d6f0a7f22429364364e00ef17fe6159fac2fde6a0765a20125db6ce17694992dbc9e3b3e054adddf SHA512 9f387fb8b872b65fc6a545151c185b9ad1aaac7ad7cffac4d2b936dedbca116a7d74e56754353ffa4caed394497ca659852f0e5e3803ead10f8fa95d562e28a8
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u332b09.tar.gz 107924497 BLAKE2B f1f283b33f2e81a15f6ba01b7c2c63093b8a12dd0c9853ff9a2cea8d5352b6994266e8653135574f59a24da7294e602c5dd2fb3524065aa53e21b8313d3b0d33 SHA512 c7474e6a81d9e44e7c48388917de87733bfcb13c99a6d253ba180ac8b826ec79f1871d57dcc3e2edb4929f2687541156770c7568162a95389cdf1606d8e65397
-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-11.0.15_p10.ebuild 3174 BLAKE2B 0b8853c57d4526e116d72e690c0d6e0e9187a8230a64ab03f3e6c4a92b629bae8072bee50f78fd2061d7e49624e140fd3ff1c3230486c5e510dc2ae7203d2f39 SHA512 2558eb3aba44ee55dc3594352ef9236b4c2d31ffd06e6202551a3ab012481a5277bdf5c3dbea9069a2cbc57bfc415c3200f7855c74533b98d93ac1ff105bec23
+EBUILD openjdk-bin-17.0.3_p7.ebuild 3234 BLAKE2B 33af600b0c89a48e6d230ac33f8638592b21884f1fe43084c5accb962846d7e8fde3d726892a7316521c96777563008f4247996053afd72148c0f1b50ecd4d82 SHA512 9bfb031cb553df1ec7d685c427c45d41c0370da05523a969f2e37f4f9ef015aec144361e3e1a7f9d05e82d32ffd66fdd9d7b4033c85fa2698fe61851ed0b76ba
 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/files/openjdk-bin-17.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh
deleted file mode 100644
index f6d25d57c4a1..000000000000
--- a/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="Eclipse Temurin JDK ${PV}"
-JAVA_HOME="${EPREFIX}/opt/${P}"
-JDK_HOME="${EPREFIX}/opt/${P}"
-JAVAC="\${JAVA_HOME}/bin/javac"
-PATH="\${JAVA_HOME}/bin"
-ROOTPATH="\${JAVA_HOME}/bin"
-LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
-MANPATH=""
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="${SLOT}"
-BOOTCLASSPATH=""
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh
index fe1b484edfa1..9bb340ba4db4 100644
--- a/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh
+++ b/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh
@@ -1,6 +1,3 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
 VERSION="Eclipse Temurin JDK ${PV}"
 JAVA_HOME="${EPREFIX}/opt/${P}"
 JDK_HOME="${EPREFIX}/opt/${P}"
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh b/dev-java/openjdk-bin/files/openjdk-bin.env.sh
index 073e66f7ee9c..64619f60c7c5 100644
--- a/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh
+++ b/dev-java/openjdk-bin/files/openjdk-bin.env.sh
@@ -1,6 +1,3 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
 VERSION="Eclipse Temurin JDK ${PV}"
 JAVA_HOME="${EPREFIX}/opt/${P}"
 JDK_HOME="${EPREFIX}/opt/${P}"
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 1bb314be9d5d..eb2458b279a2 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
@@ -124,7 +124,7 @@ src_install() {
 	# provide stable symlink
 	dosym "${P}" "/opt/${PN}-${SLOT}"
 
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
index 1ad02aaacb18..bba49ad388a3 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
@@ -125,7 +125,7 @@ src_install() {
 	# provide stable symlink
 	dosym "${P}" "/opt/${PN}-${SLOT}"
 
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.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-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 104cfe866c92..3f190521a608 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,14 +1,13 @@
-AUX openjdk-jre-bin-11.env.sh 447 BLAKE2B 3c0852310ee1b68533fb93eb72428f43a03732b54add6ca03dda9517e26b596e86d66a3bc81cb81d2b2e783f5195e028a816e8102faa3ae75059395d08a3a106 SHA512 02d13fa510c8de87cc1da81ddc600f05879b2c310077be78f89346e6c8ad592c41b719699f002a8764c24d791181d3860eee9e7bc830baeeb53415f9d5ca8e06
-AUX openjdk-jre-bin-17.env.sh 447 BLAKE2B 3c0852310ee1b68533fb93eb72428f43a03732b54add6ca03dda9517e26b596e86d66a3bc81cb81d2b2e783f5195e028a816e8102faa3ae75059395d08a3a106 SHA512 02d13fa510c8de87cc1da81ddc600f05879b2c310077be78f89346e6c8ad592c41b719699f002a8764c24d791181d3860eee9e7bc830baeeb53415f9d5ca8e06
-AUX openjdk-jre-bin-8.env.sh 678 BLAKE2B 9cc23ab6e5c7d9e27861e051ea68c074c23789d51e8094eff8c30715cc6df80dd4fa04b371b67b1101afdbaf9e244056816f2998ba100567bc70254c8f3b8a79 SHA512 43e71b9d83149ea622b35a13a7e7184dde9fcafc960e00e190f3e6668856f16443b9b42c40e428be6d24b73dd969f8ce6107e53755651aa7058f56b3632b9d9b
+AUX openjdk-jre-bin-8.env.sh 573 BLAKE2B 02f032b60578e95a5f370afce4bec7aef12262b5f87c854a4ffc3844a4db5e88abcfb6e7539152b05e447eedb99c58e0a5944ffc2af82c10b5b0f04e447ea1ef SHA512 79bf447ffb50782348396ed1a64737f0a4adacfc21ef70d5f652db782e9492cde89f2ba740c28b6465eb4a6c32a483b2f50daaee784a03ff3d371e843f712fe5
+AUX openjdk-jre-bin.env.sh 342 BLAKE2B 194a81416378ac4729fc333f40c210bb33dea66cfc2b6a5341aab048c63f2c7c9a7bf9c45f10f5d23e2d7dd99cde80b03e79a79c30d08b6be90d6d8d6e850ec2 SHA512 6690285c5fa3866731ef28e0ff2153395e94a3e37837bf334ebea8fb132915a37002d70457810dbddbcaff78d5404f14818735ab6a722456780add4ad9efdafd
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.14_9.tar.gz 42435138 BLAKE2B 0f972a78221b74be4b8c87845f52d331eb6caf84eef06d291d0cd25ce4357b7072f938fd0390a9c54647d4ddcfe4c0184ddf84583e017e1bf78338b7939437bc SHA512 9ee64498d83d16cefc5a155393d9477bb78338d43a3b4b1699f4358644415a6be5601f7b2a87a82f2a95cafd6485b6db7b30bd0d21096110211b942e95deed64
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.15_10.tar.gz 42471028 BLAKE2B a88fa041ffdcedabbcdadbb1eb4a0052456666ba779eb0f82bc27ea7f2923a1b2e538d14d5f615869e456b1bce48859211134c6bd9d31c2c082068686b68fd59 SHA512 a8a8a9c9f243aaf9b051bd0c35009ec96a28dcf47b53139dd59891a5ff2ced590e56961edb093cf67b8239d92a4b407f631b389fdff986fdb746316f420abf34
 DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.3_7.tar.gz 45971131 BLAKE2B dc8a358b10b0d3a6fac60f340ee5224c348aa4b2683e5f7b3396eaca180a12212260d45b8347b472f80671ef86a91f764727897146e4d36bc08b24c7920635fa SHA512 27da884a807c980386b7295f7ea5e253c03b497eff6e21e0cb35ea050552eaf9a3f71060cbd1a2f0cd6069a55ae00b43e46edcf09ab36c142587ea2ab781ad14
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz 41317897 BLAKE2B b96b39d4b3f7fe54f9b04698d4f24879ce617e61ade298b7de1472cb85fbf7d5f297f009c0e881a17bcdaf9baaf3187acef531b0ace97a1f2ab099811995c815 SHA512 4a3acc1330056011f0097aaca77858779e2c89d214598ef66736956984204b8de804549e42c51f8392806753f3d534d34ad93ef6df9f2f45a369e04f6a0694ac
 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 2020 BLAKE2B ede152b4e3c5ec4b1c6ddbd84aa88bcce55e87bb64a57cd7a938b3f31637e243865c60f0d59dbcea7723ecafdc90f23ab1b9997d1740964ecdf807dc1a9eb68b SHA512 08dca400daa7635cd744321d683e655c6f59a6f01897fa7e46389062b72bd08ddde42f99fa4fc0c79defd9d13e2675b675907abc08ba7c6ad8c8f0cf12a2b234
-EBUILD openjdk-jre-bin-17.0.3_p7.ebuild 2020 BLAKE2B ede152b4e3c5ec4b1c6ddbd84aa88bcce55e87bb64a57cd7a938b3f31637e243865c60f0d59dbcea7723ecafdc90f23ab1b9997d1740964ecdf807dc1a9eb68b SHA512 08dca400daa7635cd744321d683e655c6f59a6f01897fa7e46389062b72bd08ddde42f99fa4fc0c79defd9d13e2675b675907abc08ba7c6ad8c8f0cf12a2b234
+EBUILD openjdk-jre-bin-11.0.14_p9-r1.ebuild 2012 BLAKE2B 9fe6d8bad9d14ff1c5a559fa4d0f1b5f59548058049f4886eb6a94ddc5708218c6fa7dd3c23454999d8acc5b2fa13dacb0ac6682c4ae630c2bb743066551034d SHA512 6cb229e2488081126a870842bd7d2fc4bea0a894746db28dc883f210e2c3bc76bdd073ac539617daec12553d98ce2b64a4b9cae343052609f5690c6f2c76224b
+EBUILD openjdk-jre-bin-11.0.15_p10.ebuild 2012 BLAKE2B 9fe6d8bad9d14ff1c5a559fa4d0f1b5f59548058049f4886eb6a94ddc5708218c6fa7dd3c23454999d8acc5b2fa13dacb0ac6682c4ae630c2bb743066551034d SHA512 6cb229e2488081126a870842bd7d2fc4bea0a894746db28dc883f210e2c3bc76bdd073ac539617daec12553d98ce2b64a4b9cae343052609f5690c6f2c76224b
+EBUILD openjdk-jre-bin-17.0.3_p7.ebuild 2012 BLAKE2B 9fe6d8bad9d14ff1c5a559fa4d0f1b5f59548058049f4886eb6a94ddc5708218c6fa7dd3c23454999d8acc5b2fa13dacb0ac6682c4ae630c2bb743066551034d SHA512 6cb229e2488081126a870842bd7d2fc4bea0a894746db28dc883f210e2c3bc76bdd073ac539617daec12553d98ce2b64a4b9cae343052609f5690c6f2c76224b
 EBUILD openjdk-jre-bin-8.322_p06.ebuild 1832 BLAKE2B 31dd2783dad44148857303b74c82b556d1360338b80747f36fc19052c5091ba7106837777b6bfffb088b5c31fc4072529cdea994cfc35b4f56bc032d5830a000 SHA512 df9a819e9673d952422d9dcee7d1f901cde3982dae1e64ce4ddce39b28ae7eae96d1598718c311412d9727a977ad4ed1233e43c933564ef0e9afd7fc97817d56
 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/files/openjdk-jre-bin-17.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh
deleted file mode 100644
index 5ccace8029b9..000000000000
--- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="Eclipse Temurin JRE ${PV}"
-JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}"
-PATH="\${JAVA_HOME}/bin"
-ROOTPATH="\${JAVA_HOME}/bin"
-LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
-MANPATH="\${JAVA_HOME}/man"
-PROVIDES_TYPE="JRE"
-PROVIDES_VERSION="${SLOT}"
-BOOTCLASSPATH=""
-GENERATION="2"
-ENV_VARS="JAVA_HOME PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh
index e3f380e33c60..091a43a4efc9 100644
--- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh
+++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh
@@ -1,6 +1,3 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
 VERSION="Eclipse Temurin JRE ${PV}"
 JAVA_HOME="${EPREFIX}/opt/${P}"
 JDK_HOME="${EPREFIX}/opt/${P}"
diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin.env.sh
index 5ccace8029b9..3d5130c67fd2 100644
--- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh
+++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin.env.sh
@@ -1,6 +1,3 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
 VERSION="Eclipse Temurin JRE ${PV}"
 JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}"
 PATH="\${JAVA_HOME}/bin"
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
index d7a2d14be024..ae3ecf2e8fe9 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
@@ -72,7 +72,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_install-env "${FILESDIR}"/${PN}.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-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 d7a2d14be024..ae3ecf2e8fe9 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
@@ -72,7 +72,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_install-env "${FILESDIR}"/${PN}.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-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 d7a2d14be024..ae3ecf2e8fe9 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
@@ -72,7 +72,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_install-env "${FILESDIR}"/${PN}.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/Manifest b/dev-java/openjdk/Manifest
index b568df030486..500583b7d464 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,7 +1,6 @@
-AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
-AUX openjdk-17.env.sh 537 BLAKE2B 64ef0f37bc0fb1f20d5f30751727e8f70a0460ad5917a9aa0dd346732e0862ebe10ea48145d585aea45f3689c9d359ed3f983dbaafeaf9da4c5f306fac8db0fa SHA512 b6add3bd4cf296debcaa57c7e73c1469c2dab1450157259a70702098aaa40339b6927ac444116f62b9448806c88616049d4733b4d7d8b2ae6a1ec106c16a6a07
 AUX openjdk-8-insantiate-arrayallocator.patch 647 BLAKE2B b2403d842ace7198520a25bf7c2027e6d74b5d418b52321722b21cac866df883d47e53e4f5e040aed55a9cc4bf03b5a62d008a0877add6c649a41f6230d78a38 SHA512 4bf002ec25844f4e55b588d0516e658c548700d3bcae79be74bf75d9cf30cf9cd448767db36935924dd3b07f34d0cf087321cb35abb4943690353d11485ab0de
-AUX openjdk-8.env.sh 792 BLAKE2B efabd83be56cdbd06419267361b82278bd52bfce8df8f369b7b9cadac74196ad90b9ab83e3abe8ae73e5ac51c49236d24d7762450832236414f98c1f6d13d6b2 SHA512 acdf229fff329c79e2263bd433c953dd18fc0945a0ffb6428c7004baf0bedbe3a9503c22ba1e777e7598412dfa2d2d9255c9007ecd14b4590c558e6a52c48a9f
+AUX openjdk-8.env.sh 687 BLAKE2B 4bb851545955fafa6a4b08f2589fa9a5441ef37484eb21ac5db06cde111d325903e70b5b7473659973a0bab972386c8f33ded1da57858fdca325cfa29b1122f5 SHA512 a43fc0fcf57108350235d47d6da65a12fb9f77f12f6163c649ceceacb3317c6a25516efa060efe129b74138a529945163343e5a7d1de2b7af36f6580054ed5e5
+AUX openjdk.env.sh 432 BLAKE2B 8779a373af2f9e52473cb5e3bc2bbcb7fa83c6d09382d498466888dd322299adc1b736c6e3723fa68e92a80067599228b3511cc2826e1ebc3c5845a7a2f62fa3 SHA512 e6604a88fb857945a618e4b7735d49dbc23bdd4c6fb70fc5753470e9c1047825208a40fe25107bcde95f290656b44f92e1667ebc414454cbae2e71f16fec5fbd
 DIST openjdk-11.0.14-riscv.patch.xz 279088 BLAKE2B f67cf5707246b22285de8217b68fb806e3c18b7289cb81428c0fe83c5a4dcd60233be10aaca0853ffb00ac24fa60cae1b1d60ed300ad6bff8b07e881bddf8650 SHA512 32bac5f0c0f5df883de344718586bf798db6c8a5738058ea5d4902f5a0a3fc841c1893dec3379a74b9468c1c37af5c31a3e296476549972d3f1305401354060d
 DIST openjdk-11.0.15_p10.tar.gz 122902351 BLAKE2B a2dabad415a92765d548b19261e22e2cd483a17b478c8ef98342b44e88b39b23d89d31aecc80f93b27fce8df50ba41f4e6e5f10b66035bbfc1e0c03fc4707a40 SHA512 9d9e631046769d3ad95229172f392649ef4162161eb2d6fa7371665619600a04db440e1b3d30c580e283ad2b6bd7580d1199fc854fad3cb962d79f18b2347c67
 DIST openjdk-17.0.3-riscv.patch.xz 296268 BLAKE2B 5c3b43f160009144636becd6aae19559e8f03e4d6461f89c1b6c472e63c6f4c2c6064bb3dc24c825814e7d6cc927f66fe96793bd2c71a80e2b535eec0f685278 SHA512 1c2de73051a665ada6a12bb6f92f18b1d9366990cea403063d20937ac97c288f923746a0d094273ad7f7238cef1ebe1790c0f0ffe7e7acc07ad08ebc6a7ea085
@@ -14,7 +13,7 @@ DIST openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz 116557680 BLAKE2B d20e45a5a76e30e
 DIST openjdk-bootstrap-17.0.1_p12-x86.tar.xz 111479904 BLAKE2B 17d33f8ee81c2846f417d8e7cd1429eb611e916a6b375c76127179dc6afc55b0254248360c892ce37a178fd553934d952ec8955ff5d0613eb66678b8ecefe917 SHA512 094bcc960801e5fd7e1c966c8101c195ac7fa5e222d9c8e79ca64f8a3e6812613c17a0356211e7dd831325fa11af88cc22ed56c434d65504f18dd4f4ceaedfdf
 DIST openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz 115353932 BLAKE2B 0cc4ab078085f094bbcc65448458d98a0f521e3b754c5118b1b4f957cfa00c24e896c811c2a477822c469ffcfe0de1ad6a8d0b7db23b0b09ae3b459eaf8c4fc8 SHA512 e30acd6c64a0095f4203129ecf2cff4c6b4293bc017457465d3abb746d280a2f5d89028eed22f7f3d236890d047149c7aa257e3b49593d7a6ab4dd6b777a7c26
 DIST openjdk-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
+EBUILD openjdk-11.0.15_p10-r1.ebuild 8089 BLAKE2B 2a0923de32ada4c7d18a4b27eaf6ae069ec732a82d220e944728f06aced1511fcc70b418e2f47209d1f7fd7f74e4aaa2d8553d39d56e767124a46653a8d726b5 SHA512 e7c1c9896d697105add1830d0652f516f13d0d242fe601fbf8041ed6454d1bd582c976a5e3dd9a1fc5069ae8b095272514b9f427ebd1c400e6792e25585cd959
+EBUILD openjdk-17.0.3_p7-r1.ebuild 8778 BLAKE2B 78a9389bd10fda105320e0adcb99c8282dc71678b073b4d5487d8cc36a1d14c1a345d6d94e40854f01ecfd41c34fe253328aeab556f2c38fde93696fe04cf612 SHA512 94c1729ca78b1791ac78c97780c850bbc1ed6ade0c1179cb2a6844bdbb0f3a5584022ffe65bc41c1dd5d7c41994931abc89bf52e5cc20af218fc697e02b5136b
+EBUILD openjdk-8.332_p09.ebuild 5854 BLAKE2B a769adb453189ebfa6befc3927152b134da1b2619f27d3d967d6c9db2f1ce64e24e175c2de7b0dd00c0804853df6580a78929f0f43ab515d3442828659a53aaf SHA512 5341416b0c67668ac713373cdbbe2dc7869e9b816175ff357ac086ead1495c89826662a3b662720923f6222b8051677a70a23df2150b9f48831f25a6005e9b5c
 MISC metadata.xml 1506 BLAKE2B d56098f4ba9acb9bd5891247f5165beea69a802ae4fe57f6c0e4b54875efd73d3dafaa78f5c182e640028e31840aa6b9d16bafade717a469b4a43ccbe37cbef6 SHA512 84aa8b3bef355e93fea678612e9512ca2ce5df77efbf4f055589ff67387f0571e43eb5308b8c575eb09bf52b68e5fcc68fdd819a6781080755c3f6c24d6eb77d
diff --git a/dev-java/openjdk/files/openjdk-17.env.sh b/dev-java/openjdk/files/openjdk-17.env.sh
deleted file mode 100644
index 7db6461bf48f..000000000000
--- a/dev-java/openjdk/files/openjdk-17.env.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="OpenJDK ${PV}"
-JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
-JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
-JAVAC="\${JAVA_HOME}/bin/javac"
-PATH="\${JAVA_HOME}/bin"
-ROOTPATH="\${JAVA_HOME}/bin"
-LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
-MANPATH=""
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="${SLOT}"
-BOOTCLASSPATH=""
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk/files/openjdk-8.env.sh b/dev-java/openjdk/files/openjdk-8.env.sh
index 8f863e4c869a..cc0bc80b474b 100644
--- a/dev-java/openjdk/files/openjdk-8.env.sh
+++ b/dev-java/openjdk/files/openjdk-8.env.sh
@@ -1,6 +1,3 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
 VERSION="OpenJDK ${PV}"
 JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
 JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
diff --git a/dev-java/openjdk/files/openjdk-11.env.sh b/dev-java/openjdk/files/openjdk.env.sh
index 96c4be79c33f..287c0578b7c2 100644
--- a/dev-java/openjdk/files/openjdk-11.env.sh
+++ b/dev-java/openjdk/files/openjdk.env.sh
@@ -1,6 +1,3 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
 VERSION="OpenJDK ${PV}"
 JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
 JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
diff --git a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild b/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild
index c9dc36e2d7bd..4b7612e1259b 100644
--- a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild
@@ -59,7 +59,7 @@ COMMON_DEPEND="
 	media-libs/libpng:0=
 	media-libs/lcms:2=
 	sys-libs/zlib
-	virtual/jpeg:0=
+	media-libs/libjpeg-turbo:0=
 	systemtap? ( dev-util/systemtap )
 "
 
@@ -138,14 +138,11 @@ pkg_setup() {
 
 	if use system-bootstrap; then
 		for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-			if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+			if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
 				java-pkg-2_pkg_setup
 				return
 			fi
 		done
-	else
-		local xpakvar="${ARCH^^}_XPAK"
-		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
 	fi
 }
 
@@ -156,6 +153,11 @@ src_prepare() {
 }
 
 src_configure() {
+	if ! use system-bootstrap; then
+		local xpakvar="${ARCH^^}_XPAK"
+		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
+	fi
+
 	# Work around stack alignment issue, bug #647954.
 	use x86 && append-flags -mincoming-stack-boundary=2
 
@@ -276,7 +278,7 @@ src_install() {
 	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_install-env "${FILESDIR}"/${PN}.env.sh
 	java-vm_revdep-mask
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
 
diff --git a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild b/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild
index d7196756904f..226b675fbd2f 100644
--- a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild
@@ -60,7 +60,7 @@ COMMON_DEPEND="
 	media-libs/libpng:0=
 	media-libs/lcms:2=
 	sys-libs/zlib
-	virtual/jpeg:0=
+	media-libs/libjpeg-turbo:0=
 	systemtap? ( dev-util/systemtap )
 "
 
@@ -147,33 +147,33 @@ pkg_setup() {
 
 	local vm
 	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+		if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
 			java-pkg-2_pkg_setup
 			return
 		fi
 	done
+}
+
+src_prepare() {
+	use riscv && eapply "${WORKDIR}"/openjdk-17.0.3-riscv.patch
+	default
+	chmod +x configure || die
+}
 
+src_configure() {
 	if has_version dev-java/openjdk:${SLOT}; then
-		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
+		export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT}
 	elif use !system-bootstrap ; then
 		local xpakvar="${ARCH^^}_XPAK"
 		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
 	else
-		JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT})
+		JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
 		[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
 		JDK_HOME=${JDK_HOME#*/}
-		JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+		JDK_HOME=${BROOT}/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
-}
 
-src_configure() {
 	# Work around stack alignment issue, bug #647954. in case we ever have x86
 	use x86 && append-flags -mincoming-stack-boundary=2
 
@@ -283,7 +283,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+	dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
 
 	# must be done before running itself
 	java-vm_set-pax-markings "${ddest}"
@@ -291,7 +291,7 @@ src_install() {
 	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
 	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
 
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh
 	java-vm_revdep-mask
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
 
diff --git a/dev-java/openjdk/openjdk-8.332_p09.ebuild b/dev-java/openjdk/openjdk-8.332_p09.ebuild
index 5af7952e09b3..a375e49ff167 100644
--- a/dev-java/openjdk/openjdk-8.332_p09.ebuild
+++ b/dev-java/openjdk/openjdk-8.332_p09.ebuild
@@ -161,7 +161,7 @@ src_configure() {
 		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
 		CFLAGS= CXXFLAGS= LDFLAGS= \
 		CONFIG_SITE=/dev/null \
-		CONFIG_SHELL="${EPREFIX}/bin/bash"
+		CONFIG_SHELL="${BROOT}/bin/bash"
 		econf "${myconf[@]}"
 	)
 }
@@ -205,7 +205,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+	dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
 
 	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
diff --git a/dev-java/osgi-annotation/Manifest b/dev-java/osgi-annotation/Manifest
new file mode 100644
index 000000000000..62ab6e107817
--- /dev/null
+++ b/dev-java/osgi-annotation/Manifest
@@ -0,0 +1,3 @@
+DIST osgi-annotation-8.1.0.jar 35775 BLAKE2B 404b78ead0693c2c5ade4dc9415f6b3f80d8a58933a466845bfbb6b2fb0dd4a479ad1cf392a12a18dc951755089e60dbc5f3a20a60ecbbeb23a7224b1c1ae9d2 SHA512 cfddedf01b873f51b8b0b129dfbfae547645eed3d8c2b59b6d940f9163c0809876fc0043f7b66e764215aab8136737e3c969d0d495e33330e8ae82b4c35c3132
+EBUILD osgi-annotation-8.1.0.ebuild 655 BLAKE2B 4d398d88d4150abfb3c12da22a4ac3f916ae6dd1a5dfc5ae33d659b61bbb27013fdc5c3f611e5771f5eb1fdb02fec2b653e96e34d9f0bf0024ae9b555dc48ea4 SHA512 b0f5fe5b54c76a1254def3a2ecf29f0f98b309fe2b22789af17e2d0e88f6e7932a71702bb1726a9324089ab021bc7a7d36d69d3348b997d1e2bb791d2a3edd2f
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/osgi-annotation/metadata.xml b/dev-java/osgi-annotation/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/osgi-annotation/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/osgi-annotation/osgi-annotation-8.1.0.ebuild b/dev-java/osgi-annotation/osgi-annotation-8.1.0.ebuild
new file mode 100644
index 000000000000..4c5826cb0bc6
--- /dev/null
+++ b/dev-java/osgi-annotation/osgi-annotation-8.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.osgi:osgi.annotation:8.1.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OSGi Annotation Release 8, Annotations for use in compiling bundles"
+HOMEPAGE="https://www.osgi.org"
+SRC_URI="https://docs.osgi.org/download/r$(ver_cut 1)/${PN/-/.}-${PV}.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+BDEPEND="app-arch/unzip"
+
+JAVA_SRC_DIR="OSGI-OPT/src"
+
+src_prepare() {
+	default
+	java-pkg_clean org
+}
diff --git a/dev-java/osgi-core/Manifest b/dev-java/osgi-core/Manifest
new file mode 100644
index 000000000000..aa892b66d4a8
--- /dev/null
+++ b/dev-java/osgi-core/Manifest
@@ -0,0 +1,3 @@
+DIST osgi-core-8.0.0.jar 556893 BLAKE2B 36c923ed2a0c590690d1fae112b56984ac16aab7ab0ce46b715aad8fc7b75f0846d640121ced62c626adb1b442c0cb524df37cb82339e9405db6abc7b67c64d9 SHA512 0161f91ecb8ad102731c71ce73f96b99174b5bce2f216770226860cff8a3fcd12abec828399077a835b6765ed9bf9ec29be618de8d2a85b40d6250c00bab4404
+EBUILD osgi-core-8.0.0.ebuild 700 BLAKE2B a8b1a44745df5f9b4ad1f26ebb1f2b28841d81aba521a69121a6b0d155470d943767cafbbd3d037eff631522ecffa05803da916f2cab9b98400e4412479c2c50 SHA512 906b1f71e52c8c05eb11ded146cc6478d3669f6f1ef33168af9a2fce68d0c43d54914187da447dd9b6af999080591008ae7b9379de546576c825564c6af16a01
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/osgi-core/metadata.xml b/dev-java/osgi-core/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/osgi-core/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/osgi-core/osgi-core-8.0.0.ebuild b/dev-java/osgi-core/osgi-core-8.0.0.ebuild
new file mode 100644
index 000000000000..5a9c45902f89
--- /dev/null
+++ b/dev-java/osgi-core/osgi-core-8.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.osgi:osgi.core:8.0.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OSGi Service Platform Core API (Companion Code)"
+HOMEPAGE="https://www.osgi.org"
+SRC_URI="https://docs.osgi.org/download/r$(ver_cut 1)/${PN/-/.}-${PV}.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DEPEND="
+	dev-java/osgi-annotation:0
+	>=virtual/jdk-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+JAVA_CLASSPATH_EXTRA="osgi-annotation"
+JAVA_SRC_DIR="OSGI-OPT/src"
+
+src_prepare() {
+	default
+	java-pkg_clean org
+}
diff --git a/dev-java/osgi-enterprise-api/Manifest b/dev-java/osgi-enterprise-api/Manifest
index e030b8b6b358..cfeb82a149e7 100644
--- a/dev-java/osgi-enterprise-api/Manifest
+++ b/dev-java/osgi-enterprise-api/Manifest
@@ -1,3 +1,3 @@
 DIST osgi.enterprise-5.0.0.jar 479506 BLAKE2B 2bd53b50e469388d132a6d3ebd78d4040093f8c1d79299fd87412853d959f7559f04287567eeea47635fe287a3e9d3812ac9303a5d39ec35135ab3c58bd0b010 SHA512 0404c05afd8cb3ef8b826b0f08deeb03b0027ca99e091953d39ef69674809c5b899e0f2c8efb685df5fce070c2aafcf813e470fbb538d4ec3b480a8060351144
-EBUILD osgi-enterprise-api-5.0.0-r2.ebuild 754 BLAKE2B 00cbfe85b047c25f5be7c837199ce70fabcd4954c94aa351d640dcd47e40052266540bbe4202d7831bc3a63f3f9cbe14ffbb5b4df9863cd6cd75e3574000c95d SHA512 e83ee8ad3b215a1214078a513ae9a776e86d8076cba381608ab06b15bfb8939631cd1a595748a0d21222473069e5a093c198060b47e73cbe894c806cd80e1c6f
+EBUILD osgi-enterprise-api-5.0.0-r2.ebuild 731 BLAKE2B 94046964b7c1366dd905ea998ed7ffd2bb41b73dbe20817bc2a66565e7c5b79c9ea18eae9c5b98030e40fe67c19ca4691b2f48ff320974e21e73ee7ec31df200 SHA512 dc97f6aeafbd54deb4939b80a94d1e8a1d4335f0fc0abfee2ae858fd0707504159e1b37095dd7e3502fe57adae4d05d9dd94c76eddd9e28274aa905b1dc21b08
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r2.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r2.ebuild
index 8845f1f234e1..e80121b1a1e2 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
@@ -11,7 +11,7 @@ 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"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
diff --git a/dev-java/pdfbox/Manifest b/dev-java/pdfbox/Manifest
index 81b55e2d089a..efa37b8fb3cd 100644
--- a/dev-java/pdfbox/Manifest
+++ b/dev-java/pdfbox/Manifest
@@ -40,5 +40,5 @@ DIST ipag00303.zip 4295310 BLAKE2B b68dd7dd7a7320894d782350c4598572c31d6ef492f95
 DIST ipagp00303.zip 4295877 BLAKE2B e096303106029daaedae9befb003f70c2c7d00b858f89f5f8fffb9fc73679e63ec0dde8e0304cad2c611aa74d3cf1bfea56b9ac35e6838953d38b028654f5434 SHA512 26d0a9bfba7f5457a98b0bf45a4a6b081bca4140047a0886625691231459f8c81a6cdbe523e9abcbd45fd7caed21d78f1baf3a2cf9167320f6b79be3d697cb5b
 DIST n019003l.pfb 79155 BLAKE2B 2995cd6e35de2d49cc6d4a5f6c7461396b23e14c6403cd7aecedbd5cec904fd0c42a114c4c5f5079fd1fad306dd8ddba649a13424ec5183395fb0fc1cbe2abb9 SHA512 8eafe21ffa6f3d7d0a50e9f4e5bcdeb727e804b552d74e65b709e778c9ed4605e5aa63743be285f0bc17ad162768583fec4196e1d1146d98f8703359247f22d0
 DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
-EBUILD pdfbox-2.0.26.ebuild 10950 BLAKE2B f1bd5fb508bfecf592c84b9e2a4c089d13985c7bad2e28741c13e87ce4867adddecc943452c9b37bff22e1b89793a71af6dc3c29d0005df2643673ef536ecb64 SHA512 5e70a5ef5e6eccd9d75732aee6a143760eccede1dc3810059257175d1c986e10e196d2659d07220ae680a7e24ad1baeb1e99bb66fb624990793fdce297b27fb9
+EBUILD pdfbox-2.0.26.ebuild 10949 BLAKE2B 49db375f1f781700a9e2df91dca92d1ddd72362380b23e864fe2be798abca98e9b8b15e148c4b968a1992252b7914fa843f11ee25b39214b97042ec81568ac11 SHA512 3e3f68c8eae5058863ba3f3e873c15bce59c5c28a542fb0486a4014fbded704eab14db04fecbcba7d10e7f61d7a061ebfc7b873880b0b45b2ec991ff0ab2c9ab
 MISC metadata.xml 782 BLAKE2B 96e76863aeaf1791f4a7a44aeb49df8b5a9bf91ac0d8d69e5642128df590456a2d38c64c84e8b50c917d3361bbaeb880a1b7744b994db9eee5ca8d250d765d6a SHA512 d7d47cc9eb182780424161f2a136cdec74bbe0cf4d63f52bfc77df8ad4fadc2bb9f3bd7b1ccff667d25928b4e0bc4a979b725ce77f1dff244585713ca40f88cc
diff --git a/dev-java/pdfbox/pdfbox-2.0.26.ebuild b/dev-java/pdfbox/pdfbox-2.0.26.ebuild
index 97b9ade34c7d..13e5a7c7f68f 100644
--- a/dev-java/pdfbox/pdfbox-2.0.26.ebuild
+++ b/dev-java/pdfbox/pdfbox-2.0.26.ebuild
@@ -60,7 +60,7 @@ SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="+tools"
 
 PROPERTIES="test_network"
diff --git a/dev-java/rxtx/Manifest b/dev-java/rxtx/Manifest
index a7a70333c158..bb53d99f8750 100644
--- a/dev-java/rxtx/Manifest
+++ b/dev-java/rxtx/Manifest
@@ -1,11 +1,13 @@
 AUX lockfiled.xinetd 202 BLAKE2B 38ecf8d5faadf521d5253e60183d13c3040a88035d5e039e11515e876a0ee80799d3fd31a736fb9176ae88b5e58ea40e2fff1beadb593770f2a4774acc10e32c SHA512 5ad71db04f2cc44348572876079b9548a3aafb84aa53aa6f6d422468c54911cc149cae94743d86eaf7dc62a1cc1479b95893dfa0909367778f20e1ad72b99fea
 AUX rxtx-2.1-7r2-lfd.diff 497 BLAKE2B 1e74708071d4645e0444d4ac2bffb8b952f17723d1ce98a784a75c5e1f1d22f2472ebbe0aa16c40b830be0255bd04b8d3a13ffe8d54b4d787e3a03e4d07f4be9 SHA512 fd06c021ad496036556f979e783864d6d88d1a0c039396eefacc569d66e6942b08b246970be640c73c0c2d209aa0c3247db61bdc19a99066789d4f4d0e4d390e
 AUX rxtx-2.1-7r2-nouts.diff 3583 BLAKE2B a92f5459ec2309f941ca7f8c3437a1c392da06972d4511905c73e1676fab4ad772a9d22aa3d639095798def629cba794f93add6e67878fff8441f628063ce421 SHA512 c7c6c11785089d321ee9680f4b67c590fe0c3cc0f031196eb71831ef7f319867fb156912c0c934a751d5d9e97774d6c26cab5c710055e919e97bcf39a789787d
+AUX rxtx-2.1-7r2-ppcioh.diff 422 BLAKE2B 818bf8cf360267ed84ac7d7a4aa6ea6bc5c67c1af78b7c3db2c32f0a7f858661e5499f130f4c837fc48f5064f12d8d69ba083244e66686e0285fdd120f76700e SHA512 c7cbe130dbb9757f6a542f495589bfaeb0fbf77a03a4034bcb25366931df2dab9ef958cf7527b35e711ca874e0e196735eb49582f4de0268b04b2c4cba4974d5
+AUX rxtx-2.1-7r2-ttyPZ.diff 893 BLAKE2B 2004bf1e5d52f62cae6407630d646d00addac73bda39eafc961c94e42baf62b910ead703772747ba77207ec4f7e6d8773e5636a49903471b0fd19acedd24c801 SHA512 5f9452a2e681d903ef07c4ff0abe99917260a857c59d5b24808389a6154134f296e68d7a2bbe629200d95a2948b24d53da371cfb407f1fa88c0020600df6bab1
 AUX rxtx-2.2_pre2-add-ttyACM.patch 328 BLAKE2B 93e5ddca58bf3886c1ed7d34ef6e718d844eb067b55d9ff4fde7faa083735b135a853ebad7f9baf9ce1877fbc5cc3ce9bbd88b342aac4f040a2c0b6045629b99 SHA512 c81ae4e3f6fe09722709b6a9ae09fd3a300c9ef94641a3aa9f821b6fd4e4c28f15e9f672d2bfe6b51715f9e6b2caa5f637be20a76027cb31098062f60a0b0d0f
 AUX rxtx-2.2_pre2-fix-for-java-10+.patch 1825 BLAKE2B 5ae56268cf4e98ec78f91c4e65d17c0bccefcc297b7f34354d4de972038f894f4aa14493c8f40f4ba0ef89c93865e4384494195e93b2c2083d4612b13f54ac65 SHA512 61a1d5ced0f25cd5cd7eea7e4da57eeb933f59919c3b1137a27cf69195d08c9ad0f2d7d0a52748df2daf280c9abd5bdd4f610783b8ccaccd480b02ef1d0a8555
 AUX rxtx-2.2_pre2-fix-invalid-javadoc.patch 8268 BLAKE2B f5b40ce1dbdfa2a1ec98ad6c886a932ddfea7157ff5a2e21f7c56c32e50dfe9b220e033ced0e41f94b0432669d042eebb37dc23e0b1084127f5376fb8f1faaa1 SHA512 a86dbc331e6c3a697f09a517abdebbf450ecffdd0a90dd0b539a4ea7ccda366655e1efd626d8fd503d58a9e221be9a01ad44ac37327316149d8d0e2fb6923802
 AUX rxtx-2.2_pre2-format-security.patch 2480 BLAKE2B 5e19b8ae5d49c094a8faa84c2cd5eca513bb309836fc8f1544e142ccab5b9a53f05771f2412b2953cae3f13e1c96d8d84e1f4a1f4dfdcc3719947d5ec182cec8 SHA512 c0ed0d34c04cfe87b134c55c819af65017c30e38cce00eedd146d70bb7e3a304b92b8fa8c11f3ab9076701f71f7370b28a902c7e3fee18f46f5a6a2aea3ed66a
 AUX rxtx-2.2_pre2-limits.patch 272 BLAKE2B 8f49c4a9dbf852f444a742ab3b2b5c846d3d0035307415dd3b4ba34bf3a37179e82d63e04eeb3b553e678fcfc5d0cc3ab0651fdcbf6be20228e35d13db3bf1b0 SHA512 0e4d5b8e622515c75613aeb8c5e4fc1786f1c05ef2619b65c4b1060776933172479957b9f9a15195c79f10c90a1802956eac32cd60939b9b0a15540901e62180
 DIST rxtx-2.2pre2.zip 1491209 BLAKE2B fe115833ee89cfe9a3ae58117ac4a4326e8f79e6fdc0528cb8dd2824e231c862e4b421c94784059e4cf03f6cc93a32636444916a5c8cebe002da470b460bf23b SHA512 cd94bd08bc8b5689fc9a0e539f17645f530a3a280998e9838a2e4c8b3386f2b00a592ab41c07bd720eadf26fddb324bf80d8f7b9ecb35ea8507120c16048f514
-EBUILD rxtx-2.2_pre2-r2.ebuild 2650 BLAKE2B 2095d6555f375b9d1ee75538abb734c719785516047727b5d929de1c00a2fa8b03fe57522560c38074212a7ba7742f607c22f621269da38b3d00de910217f778 SHA512 323bb50e9c3a636fdbd4018391c4feea544e9d3f4f6458ec4a9b6868c882ce4e9ca79bf8685395bd03be111be8a7689d649a5a561ca4f8c6864ebfb61ce70bec
+EBUILD rxtx-2.2_pre2-r2.ebuild 2752 BLAKE2B 4b8ec7df31ef7fce2cedd4b82722f1702205bbcebf55fe7656570ae9108f0f26d59c9a996d08a7b6f7b447a7c9a213b5b5876f1c8e58a6cc0d6134b863deb4d8 SHA512 85e77dc19acc5bac48e58a10a03309b36733927e73693c071c19fcb12dd76c2bc1a858dbc0e43b8b640ce65e585efac0c0935ebdd9dc67e0bf3af2307c32b4fd
 MISC metadata.xml 334 BLAKE2B b86a021232d18fba74442a66f689351c6440a1cca9be38d526ec2c9e65fa634f1cb265177d974bdf6b6f764c1df9531f75346f69ac071de6ed3f880eb09a3f44 SHA512 cb51df875f3ab1e39a5141ffe2cf79fed88339a9bf2bcb747be78b5986035dd5925fccd120cdb54ab8ab4e0371eda1cb9412f141bcc7583cb55f7bcf85a3683a
diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-ppcioh.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-ppcioh.diff
new file mode 100644
index 000000000000..2f3f5d623ca9
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.1-7r2-ppcioh.diff
@@ -0,0 +1,16 @@
+diff --git a/src/RawImp.c b/src/RawImp.c
+index 077f30e..813fcf9 100644
+--- a/src/RawImp.c
++++ b/src/RawImp.c
+@@ -99,10 +99,8 @@
+ #	include <linux/serial.h>
+ #	include <linux/version.h>
+ #endif
+-#ifndef __APPLE__  /* dima */
+-#ifndef PPC
++#if !defined(__APPLE__) && !defined(PPC) && !defined(__powerpc__) && !defined(__powerpc64__)  /* dima */
+ #include <sys/io.h>
+-#endif /* PPC */
+ #endif /* dima */
+ 
+ extern int errno;
diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-ttyPZ.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-ttyPZ.diff
new file mode 100644
index 000000000000..b8fa3edf5016
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.1-7r2-ttyPZ.diff
@@ -0,0 +1,20 @@
+diff --git a/src/gnu/io/RXTXCommDriver.java b/src/gnu/io/RXTXCommDriver.java
+index 3dce198..954b102 100644
+--- a/src/gnu/io/RXTXCommDriver.java
++++ b/src/gnu/io/RXTXCommDriver.java
+@@ -576,6 +576,7 @@ public class RXTXCommDriver implements CommDriver
+ 						String[] Temp = {
+ 						"ttyS", // linux Serial Ports
+ 						"ttySA", // for the IPAQs
++						"ttyPZ", // for G4/G5 RackMac
+ 						"ttyUSB", // for USB frobs
+ 						"rfcomm",       // bluetooth serial device
+ 						"ttyircomm", // linux IrCommdevices (IrDA serial emu)
+@@ -608,6 +609,7 @@ public class RXTXCommDriver implements CommDriver
+ 							// linux ISI serial card
+ 						"ttyMX",// linux Moxa Smart IO cards
+ 						"ttyP", // linux Hayes ESP serial card
++						"ttyPZ", // linux PPC/PPC64 Zilog serial ports
+ 						"ttyR", // linux comtrol cards
+ 							// linux Specialix RIO serial card
+ 						"ttyS", // linux Serial Ports
diff --git a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
index 16874cfaeefa..2d39447cb63b 100644
--- a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
+++ b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://rxtx.qbang.org/"
 SRC_URI="ftp://ftp.qbang.org/pub/rxtx/${MY_P}.zip"
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="lfd"
 
 RDEPEND=">=virtual/jre-1.8:*
@@ -39,6 +39,8 @@ src_prepare() {
 
 	eapply -p0 "${FILESDIR}/${PN}-2.1-7r2-lfd.diff"
 	eapply -p0 "${FILESDIR}/${PN}-2.1-7r2-nouts.diff"
+	eapply "${FILESDIR}/${PN}-2.1-7r2-ppcioh.diff"
+	eapply "${FILESDIR}/${PN}-2.1-7r2-ttyPZ.diff"
 	eapply -p0 "${FILESDIR}/${P}-limits.patch"
 	eapply "${FILESDIR}/${P}-add-ttyACM.patch"
 	eapply "${FILESDIR}/${P}-format-security.patch"
diff --git a/dev-java/xml-commons-resolver/Manifest b/dev-java/xml-commons-resolver/Manifest
index 1b24caf6f237..7afe56d750fc 100644
--- a/dev-java/xml-commons-resolver/Manifest
+++ b/dev-java/xml-commons-resolver/Manifest
@@ -1,4 +1,3 @@
 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
+EBUILD xml-commons-resolver-1.2-r3.ebuild 1107 BLAKE2B 3fe189d061a76aecbd9a9b48537352a2200de560501093ec9a286bded92de841588aa1a7c729540842d162fa5592a3cacf94f192109de7c00a92a4598942d404 SHA512 f76ef0d77b2fbf50a218f1b95af11757fd07dac9ab3fac672215f8b25d6772ff10bfbd54a0e9ab4aab7eb2048f3240cebe090dcb91a46e10716b16d485c080d2
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r2.ebuild b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r2.ebuild
deleted file mode 100644
index 65f5894d45ab..000000000000
--- a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r2.ebuild
+++ /dev/null
@@ -1,35 +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"
-JAVA_SRC_DIR="src"
-MAVEN_ID="xml-resolver:xml-resolver:1.2"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An XML Entity and URI Resolver"
-HOMEPAGE="http://xml.apache.org/commons/"
-SRC_URI="mirror://apache/xml/commons/${P}.tar.gz"
-S="${WORKDIR}/${P}"
-
-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 )
-
-src_prepare() {
-	default
-	java-pkg_clean
-	rm -rv src/org/apache/xml/resolver/tests || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs
-}
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
index df851d6671ae..23e2253efc56 100644
--- 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
@@ -14,7 +14,7 @@ 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"
+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:*"
diff --git a/dev-java/xsdlib/Manifest b/dev-java/xsdlib/Manifest
index 1e0a349da2e1..3c4b433cf658 100644
--- a/dev-java/xsdlib/Manifest
+++ b/dev-java/xsdlib/Manifest
@@ -1,3 +1,5 @@
+DIST xsdlib-2013.6.1-sources.jar 274740 BLAKE2B 356c3e6005c26a1b63ea016a523140d93bb8c6a4c1952d60f5a881c92dd013e1691451be96e31b7c96c48e1f182e0224bceb712e230bb008ad97732a8e9ffdb6 SHA512 a4e308fae6a1116158ddbebfad0570f6cf1f840acb72de8bdd9414b363da78edf6aea2349f4ac7511b774a494f9e4c17c309f86aefc39b30421a1c86945302b0
 DIST xsdlib.20090415.zip 914126 BLAKE2B 7f8dc45c590606ece1775d08634f87bb7cd392c69c66204073d4867f925cf7159fe14b43cde6d59a72da90ab284d9a3adc0c4d6aa117ea5143eff8efc5bf6534 SHA512 479b20bb24c32f7a8bf548689cb6d7efc99e36d7f887d9e33b34b2e4707d74149ae1e312f7166a90acbd44422248729d6158a55d710616b656eb628cafc1e3f2
 EBUILD xsdlib-20090415-r1.ebuild 1194 BLAKE2B f1229a0275c91114f42476ae8e58c2792451b0a656f32f890fad2c05337ea36cf4714ab55aee0a37e71090c28f6631128ae610d6acac758b444d733e7318e050 SHA512 1d204071ae5193ac531c695784639cf1b18db853265aed676517eacb9e4469a0efe6b3df3d4d0db4a6e24ae38c0972dd04719d6f481560880d257dfa6ddda564
+EBUILD xsdlib-2013.6.1.ebuild 920 BLAKE2B a4c7fa253716a28ac78518472f84ca7682c80188e4cadfd802479513a3a20bb9f5b21263a263632e7e71b7b98aff60c457eb6fae7f5824987706037dd595cd0a SHA512 87f0acf3c483014e7c9b65395d22aa12c137dd4b9a3837a12ef1eda5098acf64c1701b7e3d6e1d6a6b956ece116af17bb9fdfa0319ac7252ac6dc03e9277978e
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/xsdlib/xsdlib-2013.6.1.ebuild b/dev-java/xsdlib/xsdlib-2013.6.1.ebuild
new file mode 100644
index 000000000000..986f5e46081a
--- /dev/null
+++ b/dev-java/xsdlib/xsdlib-2013.6.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="net.java.dev.msv:xsdlib:2013.6.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Sun XML Datatypes Library"
+HOMEPAGE="http://msv.java.net/"
+SRC_URI="https://repo1.maven.org/maven2/net/java/dev/msv/xsdlib/${PV}/xsdlib-${PV}-sources.jar"
+
+LICENSE="BSD Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="dev-java/relaxng-datatype:0"
+BDEPEND="app-arch/unzip"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+S="${WORKDIR}"
+
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+	default
+	mkdir resources || die
+	cp -r com resources || die
+	find "${JAVA_RESOURCE_DIRS}" -type f ! -name '*.properties' -exec rm -rf {} + || die
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-07-09 15:43:36 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-07-09 15:43:36 +0100
commit	2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch)
tree	8c816148bcbd22757d892089c989ae614eae4f5a /dev-java
parent	0f558761aa2dee1017b4751e4017205e015a9560 (diff)