gentoo resync : 16.01.2021

author: V3n3RiX <venerix@koprulu.sector> 2022-01-16 20:27:28 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-01-16 20:27:28 +0000
commit: 2fd57282f0262ca084e05b0f2c63fbada395d02b (patch)
tree: 4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /dev-java
parent: c3bc61051d7f12b4c682efa7a5460bbc8815649e (diff)
122 files changed, 812 insertions, 1601 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index baa05a2e8122..f1ae5e89fb5d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/angus-activation/Manifest b/dev-java/angus-activation/Manifest
index 9b311600bbb1..3a316f6825aa 100644
--- a/dev-java/angus-activation/Manifest
+++ b/dev-java/angus-activation/Manifest
@@ -1,3 +1,3 @@
 DIST angus-activation-1.0.0.tar.gz 26068 BLAKE2B 45151d8d0bc3c2b1835d2ceab62e9d4ab5294dcfbbf606d3298013f0dd5f27a7bbe950effbd053a6e54ec1179884870c167e8967b3536dd79902dbda506bb8c8 SHA512 e6e7b32f1aab8d293d5855a3e6b155922c18aeddf13b3daab6928c1b95b4af6dd292c5670351a70870723bc80a58ef4366e8b4fe40c5f5b995266751bccfdef6
-EBUILD angus-activation-1.0.0.ebuild 1318 BLAKE2B c7be66e41af57493208a8beb28be646f14c14f75f34ce33968ed33c2cbe898b4a093d307a709078178aedc72f5d7f408b2a528705e481aaa24b4fe51bc72a127 SHA512 07f30cbc9230307e11fb5add71cf5c170d072c1859aa4865b4f5b3ada886bb1322c6bc3e45ba6f47c5c7cefa229577a04feac0dd089353034e4e11be7435810b
+EBUILD angus-activation-1.0.0.ebuild 1320 BLAKE2B edd03c0bf4a99b55c80645c8ad76516e06c507988c7d959e60ba2cdc5de32392f67399406288c2212f9e225712bce51f2440573cb79d684700054bc4d5e41dfa SHA512 1baff59164c1f5c07645ec3b4002d27db586ddf7c5c52af1b099442bd2de3246488adf47add06cc4013bcb9c641265f22d062859e44208ebc8dc615e8c53eb6c
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/angus-activation/angus-activation-1.0.0.ebuild b/dev-java/angus-activation/angus-activation-1.0.0.ebuild
index 20dddabd6c04..5b1f08a8969d 100644
--- a/dev-java/angus-activation/angus-activation-1.0.0.ebuild
+++ b/dev-java/angus-activation/angus-activation-1.0.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://github.com/eclipse-ee4j/${PN}/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index e47e1b9d293d..4b3b4a462a55 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,4 +1,3 @@
-AUX 1.4.1-javadoc.patch 500 BLAKE2B 9954ccef76c45a403d444a730986c15d9fc5c6106908a209691a04c1e3b24af21eddccf217c46120cc2c89eabe0cfe277fe245b7e174974de29ec2bd5affca2b SHA512 e50463fb7bb7ffd493ad212cf2fbdef89e454de48521c6903ddbd9c7ba1a799172cf36265c6131e3a81136c0872977c63e654b7ce2913aac3672357718b8f93f
 DIST apache-ivy-2.5.0-src.tar.gz 2719181 BLAKE2B 71c47e3493beac8de1bc4e8c86ae18383938265dd2803a1c4b9ad466306227dab9eeca256516ff94064d902d0694b4f0b35ce152c5f64b95b876e47289b25833 SHA512 59d9458345e3a51e8f527258ba26ebe2cf5cf257401c52fb5f75aced0da5f7bf36f8aa0f202bbc0cf029d1d49bd6634f7cb8b65ccc828eb55ff7084430879268
 EBUILD ant-ivy-2.5.0.ebuild 8495 BLAKE2B a78606e6844fe8c7c584695aec2f8c4d1a2d5a7d60fbba7e4e097a2715be9d1ec5cea5d282a0b95c3ae4fb0a06f5aea9768111c48d0d8e17f283c27db9efdc77 SHA512 95b72255d71bbb6e0d773f5d519f19ed8bcaaff2f907052f28d3cd7f7cd848e550c5b8d4c39537c61df14d5d51895f4dead1f4c9707c4629f45ad4970e1974e5
 MISC metadata.xml 853 BLAKE2B deb1f7bed1e2828ff976d7a325fdd193fd099d911849bb53320e2093dd9030056b71858ad24bad3308570bf8ef6cf9c4a1d542ce47417683d484327de3a76d0c SHA512 960bc190397b3b2264dbd62b6487c383d11bbe73460ba76791d720fe4f78713158917b45b7e437707ef63dd87c0863caa333b0a9089b66b521792748a52085a1
diff --git a/dev-java/ant-ivy/files/1.4.1-javadoc.patch b/dev-java/ant-ivy/files/1.4.1-javadoc.patch
deleted file mode 100644
index 4a0b47d8a714..000000000000
--- a/dev-java/ant-ivy/files/1.4.1-javadoc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur ivy-1.4.1.old/build.xml ivy-1.4.1/build.xml
---- ivy-1.4.1.old/build.xml	2007-09-04 02:44:23.000000000 +0300
-+++ ivy-1.4.1/build.xml	2007-09-04 02:44:53.000000000 +0300
-@@ -245,9 +245,7 @@
- 	</target>
- 	
- 	<target name="javadoc">
--		<javadoc destdir="${javadoc.build.dir}">
--			<fileset dir="${src.dir}"/>
--		</javadoc>
-+		<javadoc destdir="${javadoc.build.dir}" sourcepath="${src.dir}" />
- 	</target>
- 
- 	<target name="get-dxml" description="download dxml doc file from web site">
diff --git a/dev-java/boot-bin/Manifest b/dev-java/boot-bin/Manifest
index bbc7eaa7082f..a0a900ce4254 100644
--- a/dev-java/boot-bin/Manifest
+++ b/dev-java/boot-bin/Manifest
@@ -1,10 +1,6 @@
 AUX boot 259 BLAKE2B 4e2b95f13d06d60f4ab06aaf6121281cc7164e4943ce77fd4320b165451abb985ce396ccbc7586facf7613c627e07196b2c7ca4f66619c25c60796a8fa7c8368 SHA512 9858dcc8d99d5266a053ad525c2e23ea9826ea982e54dd9621fcc5769cbe38143030c005673f1394163d52c5c94dfadf1973cdcd1fb763dee67a6ae13298db7a
-DIST boot-2.7.1-CHANGES.md 20380 BLAKE2B 84a57834b78b752b6be051aa9513ad3360cc81b1311248892b3f61760c181a2c53083da8c61eeae2930b2501b95b71dd74bfededa2325806a83abbb0ef0f35e3 SHA512 5f8b9866dcb5e784caee89c7a0569d6a2392cda19aa498d15eaa8d4ea054900bdc0dff950ca60f6c62f0cd262373a3cd0760c755b805d952bc96838de135aeb8
-DIST boot-2.7.1-README.md 16071 BLAKE2B de0f5168f1b4151ffc76bf02343a1d965ba418e90255d04ef8c6c0c30e32d1927042ed24d1e5e1e6dad3b9dc0e893bf7656a3cfc279f6e690a5c7587a3930897 SHA512 395b6fec79bd1299f4d84fda4ba3d0db0b54c9c591c7ffd2c3c0f239f5f1bade31bf6eb1b924d6e58775fb6d412417d251d77356698d54c93c3ee31b64c9652a
-DIST boot-2.7.1.jar 8388320 BLAKE2B a5af7ee5468cd6db1c955fd7a1726da6bc370ff8fb2b38312c42b9b6577c9605cfd472f86878c8706e50a1523f9e8789e7b92aa7244f2ce0450b7447cd8d5aa8 SHA512 d8101ba2c3a2bdec655f0fcea95a3cb33aee90c9471f6cd31f465c3716cb3f6d9027b7ec0c1c7cd277f8b43cbc0fd69d2e164fa33b112bba94d4d3245caafb3c
 DIST boot-2.8.3-CHANGES.md 28286 BLAKE2B 56ce0ba83292d1b0a9b22b34e3ac89a4f203ff7b20b3a9a0ca092e4594cb8430574d04ff15ec50dc431f4a32ebbcbe2651010abc48c46a241fff5147d1449297 SHA512 cab01416dcbd642953fa32ae5d8255722f61860752a32e7a4a55f0d5730363e305c5549e63777e3e032f2d098864cfa16b62889c66fe9aa481778ad7a0249e80
 DIST boot-2.8.3-README.md 19164 BLAKE2B cb2d63e332d427cd235868f9b25aa5b7baaa41ebbf1447c029019e2d4aa872eed26e79c027f06b201e21e0a1522d42fed57bf5eae5de683baf4a62e2c10b739a SHA512 2557f8ae6893ae6f3c576e8325f11edac5e4e91c45e3864957784092e8154aaa30f1a5de8acb52bb90e7c3ad034f2e9703e4b5aac2d621cbd885e8bbb102cc04
 DIST boot-2.8.3.jar 20940394 BLAKE2B 398264e467dc14c7df49dd75e4197ebd755e1afdc6ae8877de30cd72d35c0bf56a83b64573ec3aa976ae63fcffe9c371b0789bc0f95e43bbb509ff19cc305ee9 SHA512 039c8ed3320871a1227240ad8d0aac07cbb41e65096d71b9547733c49f02febff6ac5ed15cda744c7fbc0ee4830908597f0c3c8288d4d059c603057db24bd1db
-EBUILD boot-bin-2.7.1-r1.ebuild 1980 BLAKE2B c626d2e61da534cf609ae071af780de777a57aed1d0982307fd3716ecb1bb94140100406eeb051948c21376ddac094c69fac0afc0c8fcc9449b9d159e5276346 SHA512 b0e9544e321bdcf4ce4da591f3feda095918c9953c6563d74754d4fbb294714420e642410bd242ece229663e3f1c8d6c307a926d1443a93c0af8966bdc5026a0
-EBUILD boot-bin-2.8.3.ebuild 2207 BLAKE2B 9f90d83f019fd08510235c4d1df8249464c5bbfdfe04e8034f17fdd66e37766607ccd20d0eaf577da0c7c6ed86607406a9f572c4ef591e4be1f78daf55137bd0 SHA512 0d50b45ebd341e6dc8ad66ac35143926b9227d4d1348daa26180098d22abe359d4b5ed91a2933c43372860a4ddcc9ca606d9f1860366a32f9ef58faa173740a1
+EBUILD boot-bin-2.8.3.ebuild 2205 BLAKE2B c70ab468bc348812512dddb4f8dac6d7583fa25b7aa7766c49f84aa8df96370ba0a271473c012d4c6bfc9ed62c7a3a5620dea23b465c325c113e5e8dbbe54001 SHA512 1011596dc08d84f1598eb646bfef0eec623efdb7683992380a0aaab8ab12df661a19e17cc9e765b064e6338d327d3a9afc84ef146de0debedb26f4376766bb77
 MISC metadata.xml 295 BLAKE2B 87d34cf3eec917508fa40b0442698ec2887fa6f518e91bd8c70c70222a4cec4d6b4933992713fa72140c04fa174b0fafa42f12dc41210f0f57ffcfc00f71b757 SHA512 37877f947a9879629e426cef5bbc50ecf3527be6a4fb987a021d459bf2738fe4af0b2db24adbfac8e99c0dfa3f1bfb10cb7d2e2721b2b6cd39e5953d97cf90ab
diff --git a/dev-java/boot-bin/boot-bin-2.7.1-r1.ebuild b/dev-java/boot-bin/boot-bin-2.7.1-r1.ebuild
deleted file mode 100644
index 53777ba1edb0..000000000000
--- a/dev-java/boot-bin/boot-bin-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_PNV="${MY_PN}-${PV}"
-GITHUB_USER="boot-clj"
-
-DESCRIPTION="Build tooling for Clojure"
-HOMEPAGE="https://boot-clj.com/"
-SRC_URI="
-	https://github.com/${GITHUB_USER}/${MY_PN}/releases/download/${PV}/${MY_PN}.jar -> ${MY_PNV}.jar
-	https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/README.md -> ${MY_PNV}-README.md
-	https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/CHANGES.md -> ${MY_PNV}-CHANGES.md
-"
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.7"
-DEPEND=">=virtual/jdk-1.7"
-
-RESTRICT="test"
-
-src_unpack() {
-	mkdir -p "${S}" || die "Can't mkdir ${S}"
-	cd "${S}"	|| die "Can't enter ${S}"
-	for file in ${A}; do
-		einfo "Copying ${file}"
-		cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
-	done
-}
-
-src_prepare() {
-	einfo "Copying boot shell-script"
-	cp "${FILESDIR}/boot" "${S}/" || die "Can't copy boot"
-
-	for file in "README.md" "CHANGES.md"; do
-		einfo "Renaming ${MY_PNV}-${file} to ${file}"
-		mv "${S}/${MY_PNV}-${file}" "${S}/${file}" || die "Can't rename ${MY_PNV}-${file} to ${file}"
-	done
-
-	java-pkg_init_paths_
-
-	sed -i "s|@@JAVA_PKG_SHAREPATH@@|${JAVA_PKG_SHAREPATH}|g" "${S}/boot" || die "Can't patch JAVA_PKG_SHAREPATH path in boot"
-	sed -i "s|@@JAVA_PKG_JARDEST@@|${JAVA_PKG_JARDEST}|g" "${S}/boot" || die "Can't patch JAVA_PKG_JARDEST path in boot"
-	sed -i "s|@@PN@@|${PN}|g" "${S}/boot" || die "Can't patch PN in boot"
-
-	default
-}
-
-src_compile() { :; }
-
-src_install() {
-	dobin "${S}/boot"
-	dodoc "${S}/README.md"
-	dodoc "${S}/CHANGES.md"
-
-	java-pkg_newjar "${S}/${MY_PNV}.jar"
-}
-
-pkg_postinst() {
-	einfo "This package will still download a whole lot of its own runtime"
-	einfo "dependencies the first time you run it."
-	einfo ""
-	einfo "This currently can't be helped and is expected behaviour for a"
-	einfo "java based development toolkit"
-}
diff --git a/dev-java/boot-bin/boot-bin-2.8.3.ebuild b/dev-java/boot-bin/boot-bin-2.8.3.ebuild
index 03e79137c50c..58fcb200f386 100644
--- a/dev-java/boot-bin/boot-bin-2.8.3.ebuild
+++ b/dev-java/boot-bin/boot-bin-2.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -18,7 +18,7 @@ SRC_URI="
 "
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.7"
 DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest
index b82229f7057d..9e8e05088005 100644
--- a/dev-java/bsf/Manifest
+++ b/dev-java/bsf/Manifest
@@ -1,5 +1,5 @@
 AUX bsf-2.4.0-PyJavaInstance.patch 1650 BLAKE2B ceb772a69d454d1d85e05486d28d13824724813e7875f731a165aaf97bdd7f0c006baa927e849f82de7fa16228c3de5847f8d59013142f8df4823a951b42c785 SHA512 7946622658473ef4cf6b5921f58d224f7378cb00c345a748653306d2648a89b5ab3ed68786d09bbb170b95dc657f7f55501013c854536d6dfd6b38e6a1f3963e
 AUX bsf-2.4.0-build-properties.xml 1984 BLAKE2B 6db0c1ca7f899e95a0728d61b79ef6c0a1320ee747b5479c9c50a7bd258dc7fee0b6b569e3813f323cbc694d405f9af1d269dd5370ac82e6eca2bde5072d905d SHA512 d262daec432d7a22c217e24089f22e4c349be0487fd00a2e6992e77770a3699e7e2b5977e2108455d7f73c31b372d6a73febdff2856e256f93b25f3781e11679
 DIST bsf-src-2.4.0.tar.gz 299749 BLAKE2B 41f3cfe77b1ccf6b78493df7f5f288b397234b3236977c4b7d2e6c85b330e40319474419f560eefa1632da4d0524593b8c3e0c66cd27b852749b1405c20df5a6 SHA512 a1e7564fd14abbf725fee75c4b0ba5f92d7eada0e242ad05897753bb4afe639d859c42cae1d684e8dd9151409d4cc68e1a422a70bc74d8016144cc30d03a2d43
-EBUILD bsf-2.4.0-r2.ebuild 2698 BLAKE2B 3e2b237106053f6c4b6c0233db52cbf52047da922a735326002a7aa5c34d200e8ffca1ae55af96c61653952c512092984f4495521ca9ce1f384b0da43bb7fe03 SHA512 fcb46d75d6c93320198f28ac6878348a7459c1704bf3c4cbbab484ce04c7b1286b99ea2f876ff566942fabe2d5b005c89b3aa8910adc33f6c5a86ae3c48c808c
+EBUILD bsf-2.4.0-r2.ebuild 2703 BLAKE2B 21733021922b517a7de471aa3688899d169e3accffe5859cfa16d08844f2ef0c91ad658e7b1439d2ea95a5dab9f83f0ada0db63b865beb351286274ac1269ad0 SHA512 52c57333a2bc951dcc37de9d0ef113b671f0e52a9e9c2d4cd459b9cc0f54e241adcb51b6a4196c3331d855665fb3537afcf9e88a5672fee72101ba8c9eac4d2d
 MISC metadata.xml 904 BLAKE2B 6e791ca9562cd211b97a13c79701155efa8b58be87f9af9c076017da0ca9f406a2ccc673eefb1d56db9cb2b9481fc77b01e9f762a98bd858199883ac06fde17e SHA512 36cd9c82eaa80842fae4c0f51ca63611d6a2b7a5724d755d0651edf069a67dcad3ce13789ca07cf2be353efb1c8b3a04e367be548925e29507155235749af66b
diff --git a/dev-java/bsf/bsf-2.4.0-r2.ebuild b/dev-java/bsf/bsf-2.4.0-r2.ebuild
index 44f085f30322..a6d049b54c10 100644
--- a/dev-java/bsf/bsf-2.4.0-r2.ebuild
+++ b/dev-java/bsf/bsf-2.4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ HOMEPAGE="http://commons.apache.org/bsf/"
 SRC_URI="mirror://apache/jakarta/bsf/source/${PN}-src-${PV}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # If you add new ones, add them to ant-apache-bsf too for use dependencies
 IUSE="javascript python tcl"
diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index c643668cb4ec..3d71472de586 100644
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -1,3 +1,3 @@
 DIST bsh-2.0b6.tar.gz 1720334 BLAKE2B 7ade7d35ac66dad8c79dd2cb541c8851b321601bc6239f4d82e6b37269fdefc5cfa5efd1198f58030bb9dcc4712b42c1ca07071f0b042a59ebdbc4168e472fb0 SHA512 3d4458153f5e2a3b30d9afd79f0fe28862effa8e490fd1649d435c03bf90b060c255949a49780afee95069da4e8e8d2e4e2c5d979908370a525b3ca9a396458c
-EBUILD bsh-2.0_beta6-r1.ebuild 1309 BLAKE2B 0200601f12be8d68adc3f52b45ee6eb2fdadd0a8090e26e3f622e88beef2ccfc2a5c4a282834c73d707cc1b2a892790034cb9bbf43b52d6764cdc3508ad5e6b1 SHA512 c11a495b297f05a44a7551e11e0284a354a1795af5d6e3c1a0040b6d7b892e0049a97aae268e9f49d758bd76e4ba0cb0786fa4c11f1d32c79ff401e2aa5c9e86
+EBUILD bsh-2.0_beta6-r1.ebuild 1363 BLAKE2B cc838347fd0951d3e5fc26e473d6fb1febea04080bb85f30aee9bb33bc48f4e1784d55f73e81e47dc726ae4b200ef4c997765c96e9c062b9835effec40d0b310 SHA512 6ec85dc3b5cfe11e32821ed5f62cf63f06a9adf88978140c21846b5659d89bb3767e0e5e47d8cafd26d448a69f3865fc8548dff49740a3049bc72820b8d50695
 MISC metadata.xml 331 BLAKE2B faccf5565dc11dfae5b8874e970f2d055f49319264c1c2d11a685659cd5c0dacbd2f915c8e45d376e8b210dac6221e172909f62be63030e4e257157feface3bb SHA512 bce4790cca3f4c4c883c1befc7d2dcabb1456dd88fef57cd2ffb25f45f9505f921a428c830d17c0ca92f876d921d56684bf7bce3bbe277c33ddd19fb03118381
diff --git a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
index e0000a5f8a81..ead3b203a195 100644
--- a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache-extras.beanshell:bsh:2.0b6"
 
 inherit java-pkg-2 java-ant-2
 
@@ -18,7 +19,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/c3p0/Manifest b/dev-java/c3p0/Manifest
index d4891ce38ba0..a2749b3540da 100644
--- a/dev-java/c3p0/Manifest
+++ b/dev-java/c3p0/Manifest
@@ -1,3 +1,5 @@
 DIST c3p0-0.9.5.1.src.tgz 839657 BLAKE2B b8cf89ecb5b3766852355cdeb234698b0d1d8327233152e2e51ddcfe4a6e3be5f0fe4cc12a70d0df90d8ead90b3506b405f267f83bbb4a2a0ea1ac9d86051c64 SHA512 1843696d48e68f6120a68c42f0eb60c342ed8d1ddcc1d78c500d85c3d7e5e48358d100ecb1e0efa192aba34c5d9221437d53c2a968a42b797ff84bc12db4a724
+DIST c3p0-0.9.5.5.src.tgz 869069 BLAKE2B 6e1349d1cd02647a7c2424b8e89a8c21cfd8faefd26b7e05ee9e2da1a1a501b2b3102b142eef52f56dea672408d683a6f47b4c89b25d529a578c4b1fe4aa819c SHA512 fa96b5d0042442c773309090b9cf8f0db8e16f334e321ac952afb198ca06cd66f6f7162369f22a439a0e6b45b1ffcddf540af53804f223844d7a5465213bece1
 EBUILD c3p0-0.9.5.1.ebuild 1138 BLAKE2B 7004df7dc46daa60676e330eb4d55db11710cfc5d63a376c6156e2099d384d7e6d88aa960b5096aa235086f4f275d97717332b9f823947942113027265c1ea9d SHA512 41cffb39931a0def7f702c761754ec6ec569ebf77b59092b2b5718e0564921c6554f4b7807b7f8562bab12e7a1cb760843a4dae3dab086690371df8bb35ebff6
+EBUILD c3p0-0.9.5.5.ebuild 1305 BLAKE2B 31e6d6f907dfda103ba8895c0826f0ce4c65f2f0d71b127962158999cdf874ed27c951ff011e747d3cf5e23bd78c85b5bec2b8031714d6e5f25cf1f9f57500b7 SHA512 1804f7d80922dae4be47d92b70bc70ce3295ebcdf8c61b3c27a96bf74f13b903c26f7db8c739c7dc8fb1f90709cd7884d835759386093082609386a15651821f
 MISC metadata.xml 311 BLAKE2B 94e12506ba1bdd92ded65a3ceb8421881aa0a2bce4a93affc09208ff35b942e10ebc855833056e118fbf3e3d4b04e653b3de9ed2d45266191bd580040fdfbe69 SHA512 d4d0cd654557b0ea5d850a8af90db536b3893d2221aba93449559abd2469725e853e5f1ac4bcd67629f1f5be253106eb0a3d1a53b9da144256a01bd7264b6cfe
diff --git a/dev-java/c3p0/c3p0-0.9.5.5.ebuild b/dev-java/c3p0/c3p0-0.9.5.5.ebuild
new file mode 100644
index 000000000000..fd97f8c6e6d3
--- /dev/null
+++ b/dev-java/c3p0/c3p0-0.9.5.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Tests require an existing running SQL server and 'junit.jar.file' property
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JDBC drivers with JNDI-bindable DataSources"
+HOMEPAGE="https://www.mchange.com/projects/c3p0/"
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
+LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+
+CP_DEPEND="
+	dev-java/log4j:0
+	dev-java/mchange-commons:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/${P}.src"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_prepare() {
+	java-pkg_clean
+	java-pkg-2_src_prepare
+	java-pkg_jar-from --into lib/ log4j
+	java-pkg_jar-from --into lib/ mchange-commons
+
+	# Test sources interfere with Javadoc generation on JDK 11
+	# Remove since the tests will never be run
+	rm -r src/java/com/mchange/v2/c3p0/test ||
+		die "Failed to remove unused test sources"
+}
+
+src_install() {
+	java-pkg_newjar "build/${P}.jar"
+	einstalldocs
+
+	use doc && java-pkg_dojavadoc build/apidocs
+	use examples && java-pkg_doexamples src/java/com/mchange/v2/c3p0/example
+	use source && java-pkg_dosrc src/java/com/mchange/v2
+}
diff --git a/dev-java/commons-vfs/Manifest b/dev-java/commons-vfs/Manifest
index fd527fe8866e..ba442f674b50 100644
--- a/dev-java/commons-vfs/Manifest
+++ b/dev-java/commons-vfs/Manifest
@@ -1,5 +1,5 @@
 AUX commons-vfs-2.0-build.xml 14505 BLAKE2B adcdc22f6d65d5c98676bde1598d0cfe48c903aa919f0426a699051e6b2a3060a46f87ee33f26579de7b3cdf822f749712234dd1b6482130d3f195b77d606a1e SHA512 a8ec511906b80562ac3f8a8c791703ce06f6fd0861ea5a29684e60716a2dff67ec5f497e11959a3f989fcc538f6c3f6dfebfa0fdaeb316965a2c30ee50001eab
 AUX commons-vfs-2.0-incompatibility.patch 2323 BLAKE2B d14a91d06c0b831026260f348c17c82b2725ffcbe00125146f0268d0ec5a95e87175ed23e35143c73654cfa5b14a34930adf01a48f9fc8c280cb3233308f9a77 SHA512 46287b86d2ba9b6d1a9aa3fb90fc0a64724e3862cbb534bdea39c384d4733f037ebf764ea3e6a8ffaccabe343af99097cbe9ba5eb115fef5029757b78cd4e98d
 DIST commons-vfs-2.0-src.tar.gz 335255 BLAKE2B 01c8bba3340487672682af5c6b341ab1e8335070a9b711b5c85cca659854d05881a0ff10c4b168497e3a75867a7225740edc6e56019e55c499256401fb0a53c5 SHA512 433828b9eba73df14dbedaa4037e3da1c69bf1892553c1ae4d213ba864e4ee579e0c7799f39e3cb4ec087d7c9223f54442be46de9c4916d7b7ff8a51214d6346
-EBUILD commons-vfs-2.0-r2.ebuild 1636 BLAKE2B 1072b8df885429082c5ab3636b26a798e4c1ee312659b36b56e2896368e7947381d22aec088e02d4c894ae87db64e533600943f565a5247e5c07dc2899a7cd4b SHA512 3890e9a204479f47289aed252dd6a1f184258e5fe5554d735bdf8133b4d16df1f283b16b03bd6addad6cd3d7bb29aab9d4b8a8adc88a60508d432d919ba22dd7
+EBUILD commons-vfs-2.0-r2.ebuild 1641 BLAKE2B 7d0ec57fd61727980e50d8754d67b1e850222831af371ff127cb6064c618843e71d45d3fde7841cc06bd42aaee079168050f91c7f4cef9025e6fe83f8b4b3ccd SHA512 e677a6cf8b6ada494616eb254fb76f764955b3ccbd3dfabd6f024b861d2e5230e7e150101a52715c933356d55d8212c508d4353bb29ec822385fd8aa2357f2a7
 MISC metadata.xml 523 BLAKE2B c4cba3c890c33ac78a1266a0127d5ff394be884b99d243bcd2eff5516abdb2aefe861f244ffa741b30211c3527be774b3c15ae86c93aee6caf9bc60fe2e7b2de SHA512 c647d90719e4581dfefbf7dfb215136ab94e0b25a069e222dbfe50e90c5ad06ac7052a0ccfc41d82ad423c3d0fe2e410b1473ffd396e833d5581e44176e2b233
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild
index b51818e45eb5..fe0f75906de0 100644
--- a/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild
+++ b/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/vfs/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND="
 	dev-java/ant-core:0
diff --git a/dev-java/cpptasks/Manifest b/dev-java/cpptasks/Manifest
index a3afc38d2e75..c9bf087ebe3b 100644
--- a/dev-java/cpptasks/Manifest
+++ b/dev-java/cpptasks/Manifest
@@ -1,3 +1,5 @@
+AUX cpptasks-1.0_beta5-test-classpath.patch 1070 BLAKE2B eacc916610026d4eb25fe7a217ce23e6ca485400e9f90c8ac37a4fb614fd0ac59d622161f79854b664db0e1cc48d047655479d817fcade448952d4c231d33860 SHA512 4ce1d06f6cb1a32ff8807f9e9ad8deddef26d4ea6ed6b2826d80e3ca16c491ecefb0c850ad9a958fdae3cdbd764852ab3a5f0ad66464b928f4c12061e3cb3e73
 DIST cpptasks-1.0b5.tar.gz 902930 BLAKE2B 02cc20ea8e4316f7d0572cd147868219f1cfa326fd87d2edbea8a9b81c88f83173a373a88149bc2da55099bb9a0ac4d1f8927a6c708e6a5640b56220dbdba006 SHA512 620d16e60cdd4d8a09efe6c5889ec1beb20d38df3a7ebf337de546cd60881b4c22a08f24374e7dac02dbbb3b23defbb740a70f1d0ff59212496e631251f0e32c
-EBUILD cpptasks-1.0_beta5.ebuild 1073 BLAKE2B bd8f1f109f6b759054cea5712ecccc32a824782b5a5504152d2d7aaa944fc8a9bfb5f5fccd788f49df87639859f5852284717171395ffae295a19599f3b7322e SHA512 311f5b5ffb5cc8bdb5a64ddbba2af248d68b4017c84dbb2dbd149dc20c21a6f94049cd4d5e2af84ad7c49ece0b249f49dfcccdc33fc064a0a68f9baef5f4245f
+EBUILD cpptasks-1.0_beta5-r1.ebuild 1259 BLAKE2B 9b087463e02110d1ba06782702f7590269fbcfe281159221d840b65f3ebd2615d7958e7fe1756928072f468a13f84cf88e47b7f2eaf3ad36e98ab5126eabc3ad SHA512 6f4f83a1ee8d704703c52514e14528a25e7d9d3eb0e086c07c434da479727eca7da9ac68faced4276704d3b3f42db04911c278fcfd2f044a2b874371a1aee289
+EBUILD cpptasks-1.0_beta5.ebuild 1085 BLAKE2B bf55abda854a6d085fa2787b0eccbbb6abef4c97c2675e80bf91b3aa09509314ba2943d4a9bd427010f190006273d79c4d1269f0fb2bbff058ccc1ae0955be70 SHA512 cc8dc1a06d7a7efae982e6f02e97050eec498d1ccf950d9041f4320deaa712487608c920d0ec492d756649f55032000237704aed24676b28e60659148bbc546d
 MISC metadata.xml 318 BLAKE2B 53f5719585c7a4f0479017c4410975aefadcedd17db45949c351329e28761f05ebd89ef0557505a9a3ae03967b9baefe3e2c5b1edf0116a10434755a8d76fbe3 SHA512 b89f13a465ae0f1cad3352319206dc922badf513f63af878b118577e1f6da322b824dd14ca9220cf10aa5c5463c30399f001395a36c45c3b69228a375be379ee
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild
new file mode 100644
index 000000000000..f754a3db0200
--- /dev/null
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Ant-tasks to compile various source languages and produce executables"
+HOMEPAGE="http://ant-contrib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ant-contrib/ant-contrib/${P/_/-}/${P/_beta/b}.tar.gz"
+S="${WORKDIR}/${P/_beta/b}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+CP_DEPEND="
+	dev-java/ant-core:0
+	dev-java/xerces:2
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_BUILD_TARGET="jars"
+EANT_TEST_TARGET="run-tests -Djunit-available=true"
+EANT_DOC_TARGET="javadocs -Dbuild.javadocs=build/api"
+
+src_prepare() {
+	java-pkg_clean
+	use test && eapply "${FILESDIR}/${P}-test-classpath.patch"
+	java-pkg-2_src_prepare
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/lib/${PN}.jar
+
+	java-pkg_register-ant-task
+
+	dodoc NOTICE
+	use doc && java-pkg_dojavadoc build/api
+	use examples && java-pkg_doexamples src/samples/*
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
index c0dade630289..e72710bc3451 100644
--- a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_beta/b}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 CDEPEND="
 	dev-java/ant-core:0
diff --git a/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch b/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch
new file mode 100644
index 000000000000..02754ce7f1ed
--- /dev/null
+++ b/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch
@@ -0,0 +1,33 @@
+From 732e296e780633e3dce1bace28a4abae04f506c7 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sat, 15 Jan 2022 10:58:28 -0800
+Subject: [PATCH] Prevent test classpath from being overwritten by
+ java-ant-2.eclass
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ build.xml | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index ed3a0f7..24a3114 100644
+--- a/build.xml
++++ b/build.xml
+@@ -176,8 +176,12 @@
+            deprecation="false"
+            target="${javac.target}"
+            source="${javac.source}"
+-           optimize="false"
+-           classpath="${build.lib}/${name}.jar;${java.class.path}"/>
++           optimize="false">
++        <classpath>
++            <pathelement location="${build.lib}/${name}.jar" />
++            <pathelement location="${java.class.path}" />
++        </classpath>
++    </javac>
+     <jar jarfile="${tests.build.lib}/${name}_test.jar">
+             <fileset dir="." includes="NOTICE LICENSE"/>
+             <fileset dir="${tests.build.classes}"/>
+-- 
+2.34.1
+
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index eb22c6f2af35..1e1b851a001b 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -1,9 +1,5 @@
 AUX dom4j-2.1.3-xpp3-add-removeAttribute.patch 1847 BLAKE2B 08e1bc056f0982c4fb30782321724137870afd81d1d9158cd6a2179fb50b8c77cec3e5c2e7e2d97072cd60122e7b5ad3b8a8107f7d85e99fda7ab06dd0f276bd SHA512 7c0da264384436bd3565d098059faac6ea0ac3a75d1bd21a22fa51dc9e77027c4acf0efccc0e1cfc7a4bed191e65d25eb4fc4b6fdb10f315202b1c93f0c15be4
-DIST dom4j-1.6.1-java5.patch.bz2 2900 BLAKE2B cdd7dc901f5292af3ef7f0ea200c3d22bbc8c0adc27606da3c8fbadc44625b114c995321723dca331f0b23d5248e1f9177f0def2f4138eebcbd4aaac0495d4dd SHA512 38da606d77b62976366cd089e5194a922e348ec396e7b9af4dceb0a536c47f66e0900cfa59c91df04aade6076630077a8f88c713b9c20224d69316109b293a96
-DIST dom4j-1.6.1.tar.gz 9687211 BLAKE2B 3daa3729ea071aa87c7c1e1e2b91f1635109774dd2bd564a85265a0286f1369373084b945409d9d5213d66a7e14224033d42c58d80125b7982eef8961eb29248 SHA512 95c5a7105a81734f77b4bf27f8bb0af116bf43d8ad5297a0902a6687a54109a87dffe2953cf430d14947cdaa590aa0fdf083b46a91d1d98d48431cfae4459d94
 DIST dom4j-2.1.3.tar.gz 565918 BLAKE2B d6f8c9ae22f84086491ca7e60e5498edda727b219b4fe019da8f62a441dc3cea86ecf0554e32f8e717e21234b8ef8e2905946ab3722462f1fa748ad7e68e9e20 SHA512 8c4d7b4f2dd1b3f806e0d5103101998a094c31e9a4912539dcee32f24b35452c7f0d72c5f4cf55f8a8c9a416fee7284f9bca43ae56b0e66104b2b54fdb49ad96
 DIST jaxen-1.2.0.jar 232455 BLAKE2B 6bd16e8ac34f3af1b9d61218dc6a29862178516cfbb98c6834bf6db846b537e44b48db6ff578b3d67d32c3e2b142e44440a2fdcc6dc06a6ea427b04e6bf1f370 SHA512 cad582fc12d0741e9e6fd7e0cf80a50feb04f5ef42043df96f8a5b78476c77695d8b43836d2241f76b35676ea759921edd25eaeb2c04ec916eb138aa2901ce5f
-EBUILD dom4j-1.6.1-r8.ebuild 1907 BLAKE2B c2802e3270130c27a14cbcd02dfb9228f73e29f39f9866521af5f870396e43a0745836c2279f16b8f4452bed47f2529ac9cb488aa7fe982602affd9ef5fc2f00 SHA512 843e5b3a520ab7ed50fe1ec926b34d5ef114c2dd5d3d7813f12fbd00c018ba791f98294aa300b8042bd6659c31e2e25ee407710c0f9e8a36f79eba7a4e3c603f
-EBUILD dom4j-1.6.1-r9.ebuild 1900 BLAKE2B 314238d8a36167053c0b148c429206b042b5fa14929edd7c92741131596fc24f39e668d165abcb26ea3b5b14363777f725a30893e2395ee57564a875b6cc2306 SHA512 30dab95cdb84bae7a4873be00f1d37f8f412a31f19748a02370071a94407c7d0de1dcdcaaee67aad7d1e024db24218b88d206d373e781b5d2e18154dab051cb1
-EBUILD dom4j-2.1.3.ebuild 2245 BLAKE2B aa4c05813def4d1d4bd051427c2fe9518e619abed07a8078df3b07519f6f1fa61a8987c02e89c9952e58a80568046fd26312d741d1e336bdc9dc1342c57cfc72 SHA512 a9d3be0f1cdbfca6995ad9682f9c0372c29427bb34383a8c15e8b7da829c554913930cdf03a60e312a04835649334247b592f744c8ac652d0df35287573b59f6
+EBUILD dom4j-2.1.3.ebuild 2250 BLAKE2B e49e599471e8bb71cdf607dcde2d8899a55f9a5ba3b1f7a3b2a51562c0379c77a31bea78e15f3d933b2a89a6044270ff0681606f0cd5ef6193460b3d8d28d874 SHA512 fd60f6eab2ce00a1b66a08ee3f20ddb1e490c1fd15bfe15b23eccd914eac01dc31916eaf81fa19854fb3fe116dbd57ec46cac1accd6ba908951bdc4c10bde19d
 MISC metadata.xml 715 BLAKE2B c04caaffea1283ffce1b0057504dc0f1962cdab8c5f17ec933699b1731d75799ce969ee41b75f004d64de46b0be92cc36bd7147d4e06d1f53245a570264be0a8 SHA512 23834e036c2ff56e52bc5f7d2b4eb357dc438fd44245bf30bf2c2946a50b7872f07b2651df2ed4772235cf1457928c71fc1d993c6a7e9229e247fc15a279a456
diff --git a/dev-java/dom4j/dom4j-1.6.1-r8.ebuild b/dev-java/dom4j/dom4j-1.6.1-r8.ebuild
deleted file mode 100644
index cc77ae8243da..000000000000
--- a/dev-java/dom4j/dom4j-1.6.1-r8.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="XML Java library"
-HOMEPAGE="https://dom4j.github.io/"
-SRC_URI="
-	mirror://sourceforge/dom4j/${P}.tar.gz
-	mirror://gentoo/${P}-java5.patch.bz2"
-
-LICENSE="dom4j"
-SLOT="1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-CDEPEND="
-	dev-java/xpp2:0
-	dev-java/xpp3:0
-	dev-java/xsdlib:0
-	dev-java/relaxng-datatype:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-# restricted to jdk 1.8 because it needs javax.xml.bind
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-java/xalan:0
-		dev-java/ant-junit:0
-		dev-java/junitperf:0
-	)
-	virtual/jdk:1.8"
-
-PDEPEND="dev-java/jaxen:1.1"
-
-# Add missing methods to compile on Java 5 #137970
-PATCHES=( "${WORKDIR}/${P}-java5.patch" )
-
-JAVA_RM_FILES=(
-	src/test/org/dom4j/bean/BeansTest.java
-	src/test/org/dom4j/io/StaxTest.java
-	src/test/org/dom4j/rule/RuleTest.java
-	src/test/org/dom4j/ThreadingTest.java
-	src/test/org/dom4j/io/XPP3ReaderTest.java
-)
-
-src_prepare() {
-	default
-
-	# Circular deps with jaxen #212993
-	find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
-
-	rm -v "${JAVA_RM_FILES[@]}" || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-EANT_BUILD_TARGET="clean package"
-EANT_GENTOO_CLASSPATH="relaxng-datatype,xpp2,xpp3,xsdlib"
-EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen-1.1-beta-6.jar"
-EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf,xalan"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar "build/${PN}.jar"
-	java-pkg_register-dependency jaxen-1.1
-	use doc && java-pkg_dojavadoc build/doc/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/dom4j/dom4j-1.6.1-r9.ebuild b/dev-java/dom4j/dom4j-1.6.1-r9.ebuild
deleted file mode 100644
index 717d7ddf29b2..000000000000
--- a/dev-java/dom4j/dom4j-1.6.1-r9.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="XML Java library"
-HOMEPAGE="https://dom4j.github.io/"
-SRC_URI="
-	mirror://sourceforge/dom4j/${P}.tar.gz
-	mirror://gentoo/${P}-java5.patch.bz2"
-
-LICENSE="dom4j"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-CDEPEND="
-	dev-java/xpp2:0
-	dev-java/xpp3:0
-	dev-java/xsdlib:0
-	dev-java/relaxng-datatype:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-# restricted to jdk 1.8 because it needs javax.xml.bind
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-java/xalan:0
-		dev-java/ant-junit:0
-		dev-java/junitperf:0
-	)
-	virtual/jdk:1.8"
-
-PDEPEND="dev-java/jaxen:1.2"
-
-# Add missing methods to compile on Java 5 #137970
-PATCHES=( "${WORKDIR}/${P}-java5.patch" )
-
-JAVA_RM_FILES=(
-	src/test/org/dom4j/bean/BeansTest.java
-	src/test/org/dom4j/io/StaxTest.java
-	src/test/org/dom4j/rule/RuleTest.java
-	src/test/org/dom4j/ThreadingTest.java
-	src/test/org/dom4j/io/XPP3ReaderTest.java
-)
-
-src_prepare() {
-	default
-
-	# Circular deps with jaxen #212993
-	find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
-
-	rm -v "${JAVA_RM_FILES[@]}" || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-EANT_BUILD_TARGET="clean package"
-EANT_GENTOO_CLASSPATH="relaxng-datatype,xpp2,xpp3,xsdlib"
-EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen.jar"
-EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf,xalan"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar "build/${PN}.jar"
-	java-pkg_register-dependency jaxen-1.2
-	use doc && java-pkg_dojavadoc build/doc/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/dom4j/dom4j-2.1.3.ebuild b/dev-java/dom4j/dom4j-2.1.3.ebuild
index 9cf6e22f8633..69be8c48e9fc 100644
--- a/dev-java/dom4j/dom4j-2.1.3.ebuild
+++ b/dev-java/dom4j/dom4j-2.1.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:
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/version-${PV}.tar.gz -
 
 LICENSE="dom4j"
 SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="jaxen"
 
 CDEPEND="
diff --git a/dev-java/gnu-jaf/Manifest b/dev-java/gnu-jaf/Manifest
index 02831e1d3fae..dca4539a113e 100644
--- a/dev-java/gnu-jaf/Manifest
+++ b/dev-java/gnu-jaf/Manifest
@@ -1,5 +1,5 @@
 DIST activation-1.1.1.tar.gz 157018 BLAKE2B e9135b4c0996601c7963a46363e8ede3ba81e83e532637a92d83c89586eb52bd11be84ee37f5e8f31e372564f7c14aac4123726ba20712f5cef89a1e4bcd01f3 SHA512 d323644df13a4572bf1c10e7175c1c4cfa3078483886bba7b308989c215a23e12939b054124dbaf0437a4c5fdcb551b4e2189c09afc078218963389e4b3c3b7d
 DIST activation-1.1.2.tar.gz 290644 BLAKE2B 15ec89a5c757bb134b9ec71e384a80dea5394b9b6463ca1fe44e2e622993fa8809231379b262b0a54595c32451a49ef508bea45ce82120138efe07d81939a817 SHA512 26534f7bb47daddf97b850ab74fc8ef2c5bd62d12cfb96e28e235071af7dcfc7761fa15f2d8f3a2d194f035665cef127812b7476af6cc81f6d6374f1fa725584
 EBUILD gnu-jaf-1.1.1-r1.ebuild 736 BLAKE2B 7bd012d21fbfc76e25906aa9a1ea8012b758ef4a8877349a8b31eeea99ad1e6ef893da92b02fed8ad6e4bd144a99182bb97fe4d1663eb5747b8e051615943ad4 SHA512 1f789fcaeea02de0faa50ec70fef2498aca541aec2d2d51f7067b6e9155b7810284bb892d0ac2ba50508a615958db7d8764f1508b3720028d48f916eea623eca
-EBUILD gnu-jaf-1.1.2.ebuild 710 BLAKE2B 26c96725f10a506d787bd8a76645fcde629ee0aab5f62c778e35cf1e0e14b00945a83d3f31478b3a3d6625de1edb048793b2e7ef8f7446aa7924e57839452604 SHA512 937ae18d484177f855223c4d8bd1a0f8c3505b885d6f110b42af9070ecdf8baaa869f7c1e35160e9ac533847fc32376cda65db0c86d84a3681b94c6fd3c3d913
+EBUILD gnu-jaf-1.1.2.ebuild 705 BLAKE2B 8f226eb61fd6e4626ae94207d29d3f9499d38cb55e6e55408265c97b7f085d8dee5fb8e81cea30258443fbe1cd8b9c3912c95adc93d0bb9f65f0543c64423559 SHA512 33fb09bdec5829d7f1e0071ae5e7f96ad5803ab4d98c2e37d8ee58f233c8e17e6e21e83f5f19426fb8d38f2a9036cacdc43d46a29075eb33038a4dbafd19d05e
 MISC metadata.xml 1073 BLAKE2B 34bda1c508acadfec823c9e621452efd7184f5b8b6491d85fce1c4286a983914511e8fe160afb09d71161a1564de0a6e6bcaa7fa85c3a74b65e7e72d117379c9 SHA512 ce26ee9c2e7eb00599548ac00130c7e3485c45f63d7dc040b69267a417d53f0a56fbd1a3d481d69bb26e3f332c8ff0fefac6cc4a0bbaf226f06fd712397e0dab
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
index a51b85e9f953..6d6fbdfc459a 100644
--- a/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
+++ b/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8"
 RDEPEND=">=virtual/jre-1.8"
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 1e94f208ab8d..7f5654cf7669 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -13,5 +13,5 @@ DIST icedtea-3.21-shenandoah-3.21.0.tar.xz 7295776 BLAKE2B c139711d81ccf593a93f7
 DIST icedtea-3.21.0.tar.xz 1574548 BLAKE2B 55dca04bf55a272a92f161a96a1cabe7c0e1f46289d95d74e9253c4da45d8df00e292e5d806118805241ea5c4b914643e380b05ad7996d850a8e5eebd7a2959a SHA512 874f91f3c3311d7017efb91aaff4e2fb660f55c58a626bcf5b120b7158df15e9b94abda7cd28f9620ad76c50bfa89cc8c1d251c193404c0db51ff1430167b018
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
-EBUILD icedtea-3.21.0.ebuild 12378 BLAKE2B e0f4e68d717b9ab68117334e43544f3b1dc6514d996df0dc7e75ee7fdf2c924a58482612a758661f702993e5173a654c80b5c17a0da7bd966d99a9904359f604 SHA512 b6e6de29afdc873d44381a89acaa2b4a130bea924147287142d74cfe0ea8b495a438bcefac04e5e389f328f1c60ee6259522ca13ada398b1b4428addb54e1b56
+EBUILD icedtea-3.21.0.ebuild 12377 BLAKE2B b0de8d83c4d27525ddc3df1b3732a541204a800ac5ae3c5e1b57dc00bd294999700d1ce3acccaeaa23ee02845a4676657a995101e3c3cea6187cc2605fca9a76 SHA512 45aebe12b9d20367c54c8125f6b905c7ab60c74e2bd6151aaf38302b724cedb3dcf93ca9b2afac9e63f9b2081f4b777d720752c2566ca4e184c53527ff96c184
 MISC metadata.xml 2109 BLAKE2B d6573077ef923e08d04d92d3e81d79efd4b2996c26e36b9f356a806e2891d235883deacd64308d0659dde87a6c891a8a0b81706e93353fd3a7a280a03acb4956 SHA512 49970666bdfad586f8f11e779cb765df60f0e224844852ae6740fe781033b39526c6d2cd458752bc7c2dc5072c518330d7ed533df59948cd4b87399a4b2f24ad
diff --git a/dev-java/icedtea/icedtea-3.21.0.ebuild b/dev-java/icedtea/icedtea-3.21.0.ebuild
index b4f4020fce29..9e6737770814 100644
--- a/dev-java/icedtea/icedtea-3.21.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.21.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
 
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
@@ -69,7 +69,7 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 M
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 IUSE="+alsa cacao +cups doc examples +gtk headless-awt
-	jamvm +jbootstrap kerberos pax-kernel +pch
+	jamvm +jbootstrap kerberos pax-kernel pch
 	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-java/jackrabbit-webdav/Manifest b/dev-java/jackrabbit-webdav/Manifest
index 5b3089c9e719..42d64f03a3d5 100644
--- a/dev-java/jackrabbit-webdav/Manifest
+++ b/dev-java/jackrabbit-webdav/Manifest
@@ -3,7 +3,7 @@ AUX jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch 700 BLAKE2B f3c54d
 AUX jackrabbit-webdav-2.10.1-build.xml 17644 BLAKE2B c878975d2f1ffe74752b36873d0625c73605469e5d8a1287568b461fe402e4a91ea0f2c6334514d526a011dbe4311b0b49439d508c9ea99e127cad49abe6ebee SHA512 5b22661e3d36d227edb618b553671964be14f34dd245f1749caf9b6f3c9981fdc9fad11659ae98cdd5fb3b343b6bc450478d3655054b055f7ffb3663378b7a8a
 DIST jackrabbit-2.10.1-src.zip 13437021 BLAKE2B 3542bbe5f7c8ab8feb585fecdaca028a4908eb664d01cb9fb32156c71756973671969b1141e796fbc165f7f6f305db25f74d36657e4d86dac6766e4d79b888dd SHA512 c371ff941054f3a916f43f7020f0aebd8146422835a75ab2ad9f9f716c4ef0a94b3b962f9b6e4fadef87b9e82e8143b4ece27280714a4eb71a6b0a38c47d48e9
 DIST jackrabbit-2.21.7-src.zip 13532529 BLAKE2B ea3ebf687e29b58e75840d6f5665da8abcb474dbaa353c0caf6a8d1cb1de6c6347830cbe0b6c91259fd496eeff834278874b64306da85a7e0c82ab71dd0b1c34 SHA512 254e151ed7e814ff8b4df985814ace12316a9dc56e87f4ba6236986ac2364936d3b15327f50ebc1b9fa7ac9bbed067924148436cc8ac31a7ef91d11faecb4678
-EBUILD jackrabbit-webdav-2.10.1-r1.ebuild 1286 BLAKE2B baa4addf5b9f6f476cd4188676756df7a5e688e4f0943649bc366550fe7e0f465a32cc69329f7bc02b06d80a4ed69a45a2ff064e14f6ac8326ca7b04cf27be5f SHA512 eddf6393b3ba679a1410b31a88d8bd8ee55fd5aefadff80330b2add888288526a4ce95f285408defc1d1efd64f2e4cda8afe51617ff0b23798ab61c8d960db2f
+EBUILD jackrabbit-webdav-2.10.1-r2.ebuild 1340 BLAKE2B 07024d9b55a48a7a57c44f911d1570e188b4968666a000fd336aebf2d7fc2cc846dae4e943d0063c8386c2273b52c5a44a8095d4ed235fe8b3d84e5bdb09deb2 SHA512 5c2d5a1bda66e4e370cf6e7b030c29fff01f2d3d30687d6cdb08ff1b6d2c1069f8adb264d62262053e767039b640804f1bb527b8588c6c99eb862d3b1669a9f1
 EBUILD jackrabbit-webdav-2.10.1.ebuild 1279 BLAKE2B 1d2eb70b66d3ce9f30ab90467af0a78ed6a251559c581a19ce74d4846b8c21eddace72fdb0aba0e1b919563180d040c9b70f16b0c66d7597274fbdcde027f8cf SHA512 09aa64702b82c18b124f7f41eb5de6480dffcfc7e6503877a428c4dbc40ecae72a1d1e41c5b7aeb3cf50185aa918716432128a092929a184af5421253145da00
-EBUILD jackrabbit-webdav-2.21.7.ebuild 2075 BLAKE2B 68e90450e3f9f5ea9e93dcb1bbf93b42e9a12c456b08acbe64b592b9196e69c0a43f18cfe574e8839e1adc0c86180d391f85d45a3467d0ed5b7a671f4060b557 SHA512 11571376f7c2951c783a5c3c7ad5654deaed7501d4b7afc7f7cc6c21f1b5ea9282eeba01e3d77fcc9acd7561ffa1112e174702c8e849c140bb4e1987ca954387
+EBUILD jackrabbit-webdav-2.21.7.ebuild 2082 BLAKE2B 87576a5edaa1ee1a2ba080d5e97663e468425e2be50bae6816eb8a3096f40272541625b805d8d181dd9cdab4101245bd9123cf2ba5c514879fd9ee973e4655d9 SHA512 f6122353276b1f8ef8b754dea98b09dc01b9cf5ddac97c996b2da31dc54329b256972fc29a0cb6534dfb7313d7236b56543b0e3aa0ddd9774ca5042f06a9f2c6
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r1.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r1.ebuild
deleted file mode 100644
index 70c88912c147..000000000000
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="${PN/-*/}"
-
-DESCRIPTION="Fully conforming implementation of the JRC API (specified in JSR 170 and 283)"
-HOMEPAGE="http://jackrabbit.apache.org/"
-SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
-
-CDEPEND="dev-java/bndlib:0
-	dev-java/slf4j-api:0
-	dev-java/slf4j-nop:0
-	dev-java/commons-httpclient:3
-	java-virtuals/servlet-api:2.3"
-
-DEPEND=">=virtual/jdk-1.8:*
-	${CDEPEND}
-	test? ( dev-java/ant-junit:0 )"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}"
-
-BDEPEND="app-arch/unzip"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
-	bndlib
-	commons-httpclient-3
-	servlet-api-2.3
-	slf4j-api
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-OutputContextImplTest.java.patch
-	"${FILESDIR}"/${P}-CSRFUtilTest.java.patch
-)
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-EANT_TEST_GENTOO_CLASSPATH="
-	${EANT_GENTOO_CLASSPATH}
-	slf4j-nop
-"
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-}
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild
new file mode 100644
index 000000000000..108db165b5f0
--- /dev/null
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN/-*/}"
+
+DESCRIPTION="Fully conforming implementation of the JRC API (specified in JSR 170 and 283)"
+HOMEPAGE="https://jackrabbit.apache.org/"
+SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
+
+CP_DEPEND="dev-java/bndlib:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-nop:0
+	dev-java/commons-httpclient:3
+	java-virtuals/servlet-api:2.3"
+
+DEPEND=">=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+BDEPEND="app-arch/unzip"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS=( "src/main/resources" )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" )
+
+src_test() {
+	# Run only tests that would be executed by Maven as in ${S}/pom.xml:79
+	JAVA_TEST_RUN_ONLY=$(find "${JAVA_TEST_SRC_DIR}" -name "*TestAll.java" \
+		-exec realpath --relative-to="${JAVA_TEST_SRC_DIR}" {} \;)
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild
index 327150492a77..76bd9541226d 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/jackrabbit/${PV}/jackrabbit-${PV}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jackson-annotations/Manifest b/dev-java/jackson-annotations/Manifest
index 790e4f9644f6..f3bff0170201 100644
--- a/dev-java/jackson-annotations/Manifest
+++ b/dev-java/jackson-annotations/Manifest
@@ -1,3 +1,5 @@
+DIST jackson-annotations-2.13.0.tar.gz 1819614 BLAKE2B edb0a0e7586033a61722fda22bbb13f1ed119bd6af63931572396a4ee3f19f66fb20d750742b53d68a4159d11863b612d8e802b42b0359d90700dc6c03c8793e SHA512 e24fd9dfd6b7e3a7ee37cd41c30a073ec9b2d64dacfa47f7418643615b0ed145f8b1ac3e889b0f411412b74661b36ed352d89a62edebc8f2e07aeeed5d283c2f
 DIST jackson-annotations-2.9.10.tar.gz 57322 BLAKE2B 85e3ac040e3adc986fa7b2a1892bb536ff2b46415af9390a6ec4e59bc9770b2bced4fd80edffc7b2083853b0b1bb5022dde137fda7e9920ec27e3fa54858e5fc SHA512 27c28e9453570aab4758031d406bfc8b8ba0eb443dcd0a884d6098840e5b577b2628288daf10e9de6ce5d1e4da2f4b8e4ec36a6559233e012725a906c4da21b9
+EBUILD jackson-annotations-2.13.0.ebuild 1435 BLAKE2B 5410d036b1abc6470deff38a922d4fb93692e9bde7901282cc81a362fb38f96844c68f9d19d354e6545324335de8525736e748cf313fd2b5d82366a1a9214d1a SHA512 1ce5ef124e378286e1a8f73c05766dcc2eca6221dc8d0e0b335152fba11aaf6d3459f854a0f72b405589e5fefe960880d2bfdcbb8110655250a55556fe30bc69
 EBUILD jackson-annotations-2.9.10.ebuild 1063 BLAKE2B de11416bbf9be0341af53dcf611353c2b51ee5ac73ce7549ab5ab28e6e17385028bc4fcc617e7f9c5dc24d22edf8a984f275fd65131d24ddd610231ab6a48c7a SHA512 05165dd349526129b1619d4f54bf1641b68a9573a2978161e1ee99fc49462616d7d06b1d5c25f58fcd59c3e93868ab6969f2c63b7e5107c0f10b3f286e44b50e
 MISC metadata.xml 341 BLAKE2B 1a6bf9fc13afb0c6d95cb0752f40474fff4135031e2771f3c0555cd7961e23ea7c026d6cf905acb505ceb2aa4fad01ea5dfac310004b51828b1383dd9a44f9bb SHA512 51655fad0847b2bbc92ed31310c155f26edf6dc41da35cbe239c99eea205a054f6bf7a7839201b8f8fb397110b50935d7c069f3baa7650970580a0c9ef156f12
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild
new file mode 100644
index 000000000000..91338cc24cc9
--- /dev/null
+++ b/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild
@@ -0,0 +1,43 @@
+# 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/FasterXML/jackson-annotations/archive/refs/tags/jackson-annotations-2.13.0.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-annotations-2.13.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.jackson.core:jackson-annotations:2.13.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Core annotations used for value types, used by Jackson data binding package."
+HOMEPAGE="https://github.com/FasterXML/jackson-annotations"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( LICENSE 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/jakarta-activation-api/Manifest b/dev-java/jakarta-activation-api/Manifest
index b40ccfc27af4..c706048306f9 100644
--- a/dev-java/jakarta-activation-api/Manifest
+++ b/dev-java/jakarta-activation-api/Manifest
@@ -1,7 +1,5 @@
-DIST jakarta-activation-2.0.1.tar.gz 133807 BLAKE2B 3b793fc767601cc1406482facb0456efd1f784371dff602e71f579a2c74f8e66affed384c8ce3b6aa7c2abfcb5cb0ff5f781ea109829c03f645099fb52016e21 SHA512 51e60d851b9f2027944ab24b248b3c7c19028a504ccf5f92a61495ffa65176df78c63c25e91de4a22d6aa9a1989db274f419f91693a21f052875635b8b21bad1
 DIST jakarta-activation-2.1.0.tar.gz 118833 BLAKE2B ad4b23405b412eb31ffe6fa9ebb62e5f3d21f721908bec6607d1e236b1aa36a5fbc5d721db879210b99a236a3ead4e6b89854f311b4593f32bc537f0d37638a0 SHA512 6552789b3bc590b241250387e07fd9973f2ba210544baf5e5c272ce9824ddc568dd186d2db2b28d89698b68c6505d8263d8aa5ceedf1a12a2d8fc94d648cc8fa
 DIST jakarta-activation-api-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
 EBUILD jakarta-activation-api-1.2.2.ebuild 1590 BLAKE2B ba56e982f02880249e8a1cd29da6b83d3e8cf0d6ed78675da877cca54067f70f0d1e5655c2e83b759db7968740bffaea1ed124ff2ff1f8ff82533a4af68f19aa SHA512 a762af840f87fbb91659e96aad528f0fb2b3163f8579ec154a1c997ad9f5569d751cbf38653396cbd84d47e7f89e7df8f0b4ddb32a11dbc98ed6eca293d360ec
-EBUILD jakarta-activation-api-2.0.1-r1.ebuild 1554 BLAKE2B 1a21f77cfb5bf7a881a459e4f2bc5fe7674e924579c585cf37dd3432eb04840072209f6475fe0299c31125e6be3d1ac20e303030ed78a568535167ac4c3d8012 SHA512 0253f8930c4b1a6c7308e5a8d61dddcff04abcf62477889a1c97d259f23b2d0fa8525ef92e9f0552233a7c3fc9b0cfdbf06c807b83b9e6f2b37302fe3a4ec528
-EBUILD jakarta-activation-api-2.1.0.ebuild 1066 BLAKE2B 907d27532becffb23593908da6fd85e03923de18d032c13c8f62ca4976f39fac181bea5b36a5de0785d3f8f61be9dfb3a09fb31b8b7cc8e62afaddc7d855a380 SHA512 6617679916c43dc48681214dff8289f237b7f9cfd3aa49b1254bbc908d68c57cd0165b19691a89565d6344b29917f2d7983dafefc9a199e8eab01aa513e8e5a2
+EBUILD jakarta-activation-api-2.1.0.ebuild 1062 BLAKE2B 09c650e668080f9fa97a80ef94667b20d7db41ab097245f676e2f3863d5d2f97a54d2536ec1681b9251c23942fa374e902b29e8ac2ab7675f8f11efac2e8a660 SHA512 500afa3a79e46e13a9a62b3ff7cc24f1306b4cf608016210c6f30f272edd38ba2da1033399cf62371418160d51940cac65f1d55926e6c39433b44f7ea82f8beb
 MISC metadata.xml 362 BLAKE2B bfda62be71a4c85153713dd7e8546ce32c783612d2810046280cb9bdb86f3e2187000254c12b040bdb9fd91ac29a7dd910a9d99022fae851402944eebb428b8f SHA512 61b83467d9f5636bbd8c1e4bd4a553de3e36173db5c572d1d499c41615c7a3ffc83a2d8db1e6ee1551602534deba745edfc0394659b61f4dd3c252d84c196c06
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild
deleted file mode 100644
index aa778d2687d5..000000000000
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/2.0.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-2.0.1.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="jakarta.activation:jakarta.activation-api:2.0.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Jakarta Activation API jar"
-HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="app-arch/zip"
-
-DOCS=( ../{CONTRIBUTING,LICENSE,NOTICE,README}.md )
-
-S="${WORKDIR}/jaf-${PV}/activation"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-src_prepare() {
-	default
-	# these files are not present in the upstream jar
-	find ${JAVA_RESOURCE_DIRS} -name "*.default" -delete || die "Failed to delete *.default files"
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	# we remove implementation classes from the api
-	zip -d ${PN}.jar "com/*" || die "Failed to remove implementation classes"
-}
-
-src_install() {
-	default
-	# we remove the implementation sources so that they don't land in sources
-	rm -fr ${JAVA_SRC_DIR}/com || "Failed to delete implementation sources"
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0.ebuild
index 5677cb497fbf..b7c470c56a1e 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0.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://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> j
 
 LICENSE="EPL-1.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jakarta-activation/Manifest b/dev-java/jakarta-activation/Manifest
index 69d79450abaf..8aa9b5cea278 100644
--- a/dev-java/jakarta-activation/Manifest
+++ b/dev-java/jakarta-activation/Manifest
@@ -1,3 +1,5 @@
 DIST jakarta-activation-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
+DIST jakarta-activation-2.0.1.tar.gz 133807 BLAKE2B 3b793fc767601cc1406482facb0456efd1f784371dff602e71f579a2c74f8e66affed384c8ce3b6aa7c2abfcb5cb0ff5f781ea109829c03f645099fb52016e21 SHA512 51e60d851b9f2027944ab24b248b3c7c19028a504ccf5f92a61495ffa65176df78c63c25e91de4a22d6aa9a1989db274f419f91693a21f052875635b8b21bad1
 EBUILD jakarta-activation-1.2.2.ebuild 1609 BLAKE2B ea8344052807a8d93da556279f8fef6a42a99317be98ccab2cb8e18d7834d04f4fe54821b9511ada0506b36979b2af4720860e858955590af578080aefcff750 SHA512 27a2dd8955cf3ed76927da79ae25b3d738b14fac05cda428ecb2527d00c146ff36281d2b02bd219de068e58a3ab1e307d2f2a1d7adfbe567fc75ac23289872c5
+EBUILD jakarta-activation-2.0.1.ebuild 929 BLAKE2B 1afae6b92e5196ac330b64c5100d49ef3da5c4eb1801d92893b6411c1691432ae34d9887fa3a0099b62827bcf2cfbd722be26b55917e94a9fac989854f739fd2 SHA512 fcf28e13812fe6497668799359611dda757032dc570a226d5709cf146fe91fc6e11b0ae2b0446fd8960be423bf2f92b173458cb5a24c77d7a975edb146cb2702
 MISC metadata.xml 362 BLAKE2B bfda62be71a4c85153713dd7e8546ce32c783612d2810046280cb9bdb86f3e2187000254c12b040bdb9fd91ac29a7dd910a9d99022fae851402944eebb428b8f SHA512 61b83467d9f5636bbd8c1e4bd4a553de3e36173db5c572d1d499c41615c7a3ffc83a2d8db1e6ee1551602534deba745edfc0394659b61f4dd3c252d84c196c06
diff --git a/dev-java/jakarta-activation/jakarta-activation-2.0.1.ebuild b/dev-java/jakarta-activation/jakarta-activation-2.0.1.ebuild
new file mode 100644
index 000000000000..42ca41812176
--- /dev/null
+++ b/dev-java/jakarta-activation/jakarta-activation-2.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/2.0.1.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-2.0.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.sun.activation:jakarta.activation:2.0.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Activation"
+HOMEPAGE="https://github.com/eclipse-ee4j/jaf/jakarta.activation"
+SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/jaf-${PV}/activation"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS=(
+	"src/main/resources"
+)
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index 1b53884c6ba0..880314dd575f 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,4 +1,3 @@
 DIST javassist-3.18.2.tar.gz 1179428 BLAKE2B cc7dfebca2e47576f902e6249c1efb65c18823e75ba3698c2d94541bdc910b9b7547e8619c1f19a84c158771230ddd112ddb0445ed97cd64810beacf3468a1ba SHA512 67f22a70584eba31088d63b7862f0f7872a6a7ec57f4397b95044695af75be005e86aa5a5f20fe8e650c2178a9b63b4b922accf940b46ceb1c8e7ce9c51798ca
 EBUILD javassist-3.18.2-r1.ebuild 1028 BLAKE2B 9bc9eccea4e5d896eddbbad826a95504d54cc4b352189b3dd0ad6a56dfc34641e3e800dc99aa2348c565e03fee46534b3ad19633283670380a0bdf44a635cce0 SHA512 75eb795cd8a27728e57fc168c78fb1b2aaa5d2666432690e1e20690b64a955a6471aacba04101dc2c80f1dd4afd68ebe00e9c176d1b6bce412032ff173cefbb3
-EBUILD javassist-3.18.2.ebuild 1000 BLAKE2B 26fa128fb46bb3746bdc9efb3556329b78f612bf5d419eed5719ba0e98d2e2314a9cc2e325ba0c9100265d756b5b53857f03a6540afd2dc4d7740b154a23b7f5 SHA512 ae7b080aac74f5973431125e8351aba6c533743d1df0e157ba624523efb8628eef3824261161d6091c6cba14683767145721f750dd3523d62799b38fa9806a81
 MISC metadata.xml 377 BLAKE2B 4503d9387a65e6f722a3694870c9a9b36a2a1ccc09a2635372d386484a4113c507ade595283ee1f77038517f87814e923bb2f342e226eabb900abb9fdea9b407 SHA512 159f9374d2b9ce20eb531961e35dff0cf90b93eac4a929d1c4cf85242b50bac082ee3bd6dab5cae10dd9cd50a19b7af650df379e27d3238f12794b75ddcbeeb8
diff --git a/dev-java/javassist/javassist-3.18.2.ebuild b/dev-java/javassist/javassist-3.18.2.ebuild
deleted file mode 100644
index 6aa16a6c6f67..000000000000
--- a/dev-java/javassist/javassist-3.18.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source examples"
-MAVEN_ID="javassist:javassist:3.18.2"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Javassist makes Java bytecode manipulation simple"
-HOMEPAGE="http://www.csg.is.titech.ac.jp/~chiba/javassist/"
-SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga_build.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}-rel_${PV//./_}_ga_build"
-
-EANT_DOC_TARGET="javadocs"
-JAVA_ANT_REWRITE_CLASSPATH=y
-EANT_NEEDS_TOOLS="yes"
-
-java_prepare() {
-	find -name "*.jar" -delete || die
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	dohtml Readme.html
-	use doc && java-pkg_dojavadoc html
-	use source && java-pkg_dosrc src/main/javassist
-	use examples && java-pkg_doexamples sample/*
-}
diff --git a/dev-java/jaxb-api/Manifest b/dev-java/jaxb-api/Manifest
index 3d091da5e4b8..026fbf3a6ad3 100644
--- a/dev-java/jaxb-api/Manifest
+++ b/dev-java/jaxb-api/Manifest
@@ -1,3 +1,5 @@
 DIST jaxb-api-2.3.3.tar.gz 193025 BLAKE2B 1cf4461fdc67cc05ee43e880c254290b9dbe8a40b1dc39444d8fb6656698876a4bb16c679ee551ec7baa95c07eaf83e2fe5638a71eafbb158805c14c38888cb8 SHA512 37d6705fc1563f0d35a215e2f176473ee5e817a4a3017afe22042a4235c86b8556ea1fb23210d07ca7ea3cd1e0a3271daa4be8c9652cfe92ce2898f1381de3bf
+DIST jaxb-api-3.0.1.tar.gz 420695 BLAKE2B 70da435e75f6fcb155d57ee20659897d7d1a72dc38e77f0348eaa767b56e2c5fbb7df88c3b0c794cfc7eaad3d839550a197288dab59520a63562f083388764c0 SHA512 16d62a1fd6045a57f1d215227ce75860340c286eb0986b1086a0312dbc8ca8119b25533c42fe54f367231ec1c34795fec6a9355417f71ce826ee28d5fb6cf9fe
 EBUILD jaxb-api-2.3.3.ebuild 1786 BLAKE2B 677c14dcf9c7b350c71ee541ca2f3c873bfbd4dcbe06e6e2ae6242574612b78cfb62459286f2747c55b57168a1b1b5e1a77c336a85a7b057fb5aa3cb237a7dca SHA512 50e54d9ba94020606b0074a4da951c8d487c1c5e884c4d585880a73824a014b5188b275537d09954a3e1aa225424b0d0bfb55a77f0813f0562dcf85aab956139
+EBUILD jaxb-api-3.0.1.ebuild 1157 BLAKE2B 7503b4e5a067ffbd769871b9a6da0f64d2aada65d323f3b32fccb34f3bc721aaae8a395904ff6ae45779f1b4097afc58566e4464a5479e6e6c765f311aafd2b5 SHA512 7c5724a4a1e8ba36298957487539869d95f4b35fbed46e7ae1e388bb704cab29e92b931bff28a2b4c6ace11708e7f45ffa3b6b9e56d98e708dbcb6a6a1bed7ef
 MISC metadata.xml 372 BLAKE2B 989cc55b0f2734eaffc192a47e27d159a4dcb39b4383c9a19d5a331e2f30d136e7db69e67533d1e6823433ddadd08d127372fa4be0bbf20971dcd9d4d3eade82 SHA512 75fbacfd6c24164733c2382ffef0e56545b304af647880c10f1de7ac599062fed293f9f907097fcb0afe566b370cc9e74887d8450af6f196ca34087e4e0c8153
diff --git a/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild b/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild
new file mode 100644
index 000000000000..1588cd3601b4
--- /dev/null
+++ b/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/eclipse-ee4j/jaxb-api/archive/refs/tags/3.0.1.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxb-api-3.0.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.xml.bind:jakarta.xml.bind-api:3.0.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta XML Binding API"
+HOMEPAGE="https://github.com/eclipse-ee4j/jaxb-api/jakarta.xml.bind-api"
+SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.sun.activation:jakarta.activation:2.0.1 -> >=dev-java/jakarta-activation-2.0.1:2
+
+CDEPEND="dev-java/jakarta-activation:2"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${P}/${PN}"
+
+JAVA_GENTOO_CLASSPATH="jakarta-activation-2"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS=(
+	"src/main/resources"
+)
diff --git a/dev-java/jibx/Manifest b/dev-java/jibx/Manifest
deleted file mode 100644
index 22ac5e1de94e..000000000000
--- a/dev-java/jibx/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST jibx-1.1.5.zip 6788994 BLAKE2B 0b579e6eb9f6037c92dce3acbec4e9fd5a6aec179cb0f4ecf935ff0bbfb525c4c317d79d21683c3ea6136256b69f5aa9250851802c8eaccf14f3dff9f5ad8aa6 SHA512 13c3a43a53746e9146d1240d73d1948b3c03ead55aa0e79158c2700a385b0dfba0e31122efd11446c1a46c2b3f85235035dc198c6b3acf2fcefa88b2a0683cc7
-DIST jibx-bind-1.2.6-sources.jar 450003 BLAKE2B 01dac23fe19f59f634bbf4c78c5f8bbdd5f61cb20e3fdc0d7a08d18614220b84b0512624019e29d3c2c2500c2d7278613260ce70601f8aaa0a863cbca38dff6a SHA512 8a93aed76d00c465f4fa1d4929bbecc37497b05d7e094b68745bd740bf06cfe87919f3c02b83311766852845e763a2ed51f9ed1d543d03921dea1b67526e7668
-DIST jibx-extras-1.2.6-sources.jar 61737 BLAKE2B 4a9a5f3d2f0490b7322a911bf245e9081c1aeea112908014a64dd32792a5ae2519b5a2d1f29119774ad4d9947ff6ed30304f401a984d677619837139fa4ad4bf SHA512 355e387f92766e2cdd8686e9ed26e80584c668ca6c670532f8f24ae758bc4713cfd505890f0ea634b3380f41429725e2ca719652700b0dc3562d5966b108b3ed
-DIST jibx-run-1.2.6-sources.jar 194660 BLAKE2B 4a5cafab6ed7a75e88151c141bd1b41cad12523c353fe7803de3a0d334c186a86884bb3969b6a0ae17a50f48a360368043b6bf8a2f2a00181650da9f15ecca2b SHA512 623ef57cc411464fe1b936d9795ba982fb221334ad8ea8448afa73d9c229a2b3dacde1ee424864d1c12830d59ca2e9431d54b5cb0d1e8273b4fd6fbc47a3cf5a
-EBUILD jibx-1.1.5-r3.ebuild 1076 BLAKE2B 52407c457b23258303dd72bba618292555575666cb4475d63fe8334ad4082ea9a7c4ccc3f07ac551f8f956f86579df0c0f598b42cb236305df5ff171ef43138a SHA512 0d3a204b03c633640ace73b550d211c01062cee0b7685e0bc749c12bf25b43b5ba86620b62c3e9707aea64a8fca52773ac9f97e933559a91613f048b86911188
-EBUILD jibx-1.2.6-r1.ebuild 946 BLAKE2B 308dc784ea0ffc8d7e52e2f42e03a0b2eb83d245e4a5fadbcfa676e3908f8ec5e7f044fd6efb169d5879647a86352770bf430eb814086b569c718a3ae4ef1da0 SHA512 6faf8fe868e26f2dffad68482f9faaa31425532a6ed1b0b4084659c04d840d6526b9daa3f5135fe0885d2fc607516a4a32e19031000d0ecfd70e4c2f17f5b91a
-MISC metadata.xml 311 BLAKE2B fbbc7a5453b1db8f1d6ee420eb7bb461ab1cd147e4dcea9abad7bb9d2a934823fd24a26595ffcd42c272885c08c56379a11f83b0917e23c26f4bd6d6363a9127 SHA512 06706bd507c820804fcdfef2f05148e6c2ec53c03cd0398728e9b2e2f6eb106cde586b6da275d48592dcd20a7a7a1b56368f22e240701befcdea27e017dd613b
diff --git a/dev-java/jibx/jibx-1.1.5-r3.ebuild b/dev-java/jibx/jibx-1.1.5-r3.ebuild
deleted file mode 100644
index 26e71325f618..000000000000
--- a/dev-java/jibx/jibx-1.1.5-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 versionator
-
-MY_PV=$(replace_all_version_separators '_')
-
-DESCRIPTION="JiBX: Binding XML to Java Code"
-HOMEPAGE="http://jibx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.zip -> ${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-CDEPEND="
-	dev-java/bcel:0
-	dev-java/xpp3:0
-	dev-java/dom4j:1
-	dev-java/ant-core:0"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( changes.txt docs/binding.dtd docs/binding.xsd )
-HTML_DOCS=( readme.html docs starter tutorial )
-
-EANT_BUILD_TARGET="small-jars"
-EANT_BUILD_XML="build/build.xml"
-
-src_prepare() {
-	default
-	java-pkg_clean
-	java-pkg_jar-from --into lib ant-core,bcel,dom4j-1,xpp3
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/lib/${PN}*.jar
-	use source && java-pkg_dosrc build/src/* build/extras/*
-	einstalldocs
-}
diff --git a/dev-java/jibx/jibx-1.2.6-r1.ebuild b/dev-java/jibx/jibx-1.2.6-r1.ebuild
deleted file mode 100644
index bc637548228c..000000000000
--- a/dev-java/jibx/jibx-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bind XML to Java code"
-HOMEPAGE="http://jibx.sourceforge.net/"
-SRC_URI="
-	https://repo1.maven.org/maven2/org/${PN}/${PN}-extras/${PV}/${PN}-extras-${PV}-sources.jar
-	https://repo1.maven.org/maven2/org/${PN}/${PN}-bind/${PV}/${PN}-bind-${PV}-sources.jar
-	https://repo1.maven.org/maven2/org/${PN}/${PN}-run/${PV}/${PN}-run-${PV}-sources.jar
-"
-
-LICENSE="BSD"
-SLOT="1.2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-CDEPEND="
-	dev-java/bcel:0
-	dev-java/xpp3:0
-	dev-java/jdom:0
-	dev-java/dom4j:1
-	dev-java/log4j:0
-	dev-java/joda-time:0
-	dev-java/ant-core:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
-	joda-time
-	ant-core
-	dom4j-1
-	log4j
-	jdom
-	bcel
-	xpp3
-"
diff --git a/dev-java/jibx/metadata.xml b/dev-java/jibx/metadata.xml
deleted file mode 100644
index 69bf0a60204c..000000000000
--- a/dev-java/jibx/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">jibx</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 297aa5739ba5..33869d85aea9 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,5 +1,9 @@
 AUX 4.2.2-build.xml.patch 819 BLAKE2B 5f411361cd566360206c996ff5c2c508e829e41bb56868dce428da1347ab91f7fc8e1230b6aca3e82806c80b23a038966f690a16f99b43b5b2594bca543cb606 SHA512 8d2e0552690c9282ce93e39aa489c1fd829e5e63e39c6e6db935b6b5e2308a3ee3cbe1a274ebf2ba59d9819dd4f618d89e22194a9f88dec0763d2a36cd3ca44e
 AUX 4.2.2-makefile-flags.patch 925 BLAKE2B 642982867b5c187345123725f5e19bccb363915aefc5ea6e69f02e9ca86efee1e5f466c7cb9abf1b2871a735c45f8b7adaf999e42a351e01e515ecdc6648387e SHA512 be29adfff3b92875b38cf9bb326d935a189555bbb10315412b2544b43698cf76132554df64f28a18d4910ef1c46daf8b0a2ef9db7a9bca1ab53c421504187e54
+AUX 5.10.0-build.xml.patch 3325 BLAKE2B 9beb22ee4976bbac29e9ff79f5efedbe21e8a7ef93a83a37320fe327574844efa8d1a5ec1c9948df4dc7934d2be9b5635c4ce2b639b2af12f1eb7fc9100beef6 SHA512 4d22a080f85f7cc533db62c66ae77b3b56062624361f40e71dc7e41a57ddaaded05ca30e85b670805165347aa42e179c76f7d5ec0b558ab07b7dadaef0cfa64f
+AUX 5.10.0-tests-exclude.patch 910 BLAKE2B a9d6c8d5a84e3fd456887d001a0c3d737039f3a1c6dcc54d4d91fc08ad130d0a8bc03ad327539aa6cd629bd1393b5d711da290b28f4a29f3e929b127880739db SHA512 222ce31b49eff19e4f5158d0c80dda2ed518817d2d681ee0f983cdd870c80fe030e65c5d008900184aa5f48f3980428f16fdefce59fea543a4aa5bfaf5bdc3a5
 DIST jna-4.2.2.tar.gz 58638853 BLAKE2B 3941202ad7839f748c65f1abf53a335f6de7959def06de27a30520457147af3f70f6de54d640718b8314f6e61ab61ee9b26c39812d5cb1f918b8ff714d6b902e SHA512 11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f
+DIST jna-5.10.0.tar.gz 106258319 BLAKE2B f5605fd91bacc1e900e835494c27b0fdb4ba91b0c04bad1757133bed5938603264ce9fba89c5ce7e4644456b752b934f6e205d0131659e77bf0c58c2b44c61cd SHA512 93e1ab659a60d711557eb93620bcbd05f3dbe9c739b256cfb647d8ac2a4038d0bc638c614b58339b2875017ac18b219a4ddeb0d92e5ca25fef2e326bc14ae256
 EBUILD jna-4.2.2-r3.ebuild 2140 BLAKE2B 02bf4fa0fddb60ea509a042244e6d450e0827b5002a01d55438028c3e9b67bde5be21bfd3ed11b0ce90faf7f19397bf6f1f6b890ac5a70d2dcc06e59ba63ba98 SHA512 e9b8ba2522bcd0582f8c29eaf7b8b66a687ddf3c28c07d13b8b2e0a9d666efeb7e51d399f57c26e6f178fcf0ae279e272455083663ecc729ef3b0ba4e8c2c885
+EBUILD jna-5.10.0.ebuild 2499 BLAKE2B 5592719659b88ffbd692db79e4144024a2d3eebfd19d76c7910b11a204d1900deb3a9d24f2eb0e51b472c2788672a355ee7be5313c569c467e21d223c351c79d SHA512 6a79910d2b189397d826e021d39a449dc445690e1e2c6d51472ce91cf86a9106a2e447aba7f6e8a2e271478ab2f4ed7c6c8624dc337d70d049f56d396ada78b5
 MISC metadata.xml 463 BLAKE2B 9ead7422212fdd6bebd8ec6aabafcdedf0d32420d312a8a0f2cd701dc7eeb940a30e91d1dc0449899a6134e1cb96d47cf95cea5dc20b4974b3d8714c6c00f93b SHA512 1365756d0d98cd7e7bcee2a608a77f1ca95c9546567a0bb37ba0033eb997ef6ae37d86e79c7c7fdc0916cb515658f9a37924181efc3215d00c825b10f9f99b45
diff --git a/dev-java/jna/files/5.10.0-build.xml.patch b/dev-java/jna/files/5.10.0-build.xml.patch
new file mode 100644
index 000000000000..242845bfd356
--- /dev/null
+++ b/dev-java/jna/files/5.10.0-build.xml.patch
@@ -0,0 +1,55 @@
+diff --git a/build.xml b/build.xml
+index ed104c2..cd8895c 100644
+--- a/build.xml
++++ b/build.xml
+@@ -182,9 +182,9 @@
+ 
+   <target name="-prepare-anttools">
+       <subant antfile="build-ant-tools.xml" buildpath="${basedir}"></subant>
+-      <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${build}/ant-tools:$lib/asm-8.0.1.jar" />
+-      <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${build}/ant-tools:lib/asm-8.0.1.jar" />
+-      <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${build}/ant-tools:lib/asm-8.0.1.jar" />
++      <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${build}/ant-tools:${gentoo.classpath}" />
++      <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${build}/ant-tools:${gentoo.classpath}" />
++      <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${build}/ant-tools:${gentoo.classpath}" />
+   </target>
+ 
+   <target name="-dynamic-properties" depends="-prepare-anttools">
+@@ -385,7 +385,9 @@
+       <pathelement path="${build}/${jar}"/>
+       <pathelement path="${test.classes}"/>
+       <pathelement path="${build}/${testjar}"/>
++      <!--
+       <pathelement path="lib/clover.jar"/>
++      -->
+       <path refid="test.libs"/>
+     </path>
+   </target>
+@@ -1265,8 +1267,10 @@ cd ..
+     <mkdir dir="${build}/jws"/>
+     <copy todir="${build}/jws" file="${build}/${jar}"/>
+     <copy todir="${build}/jws" file="${build}/${testjar}"/>
++    <!--
+     <copy todir="${build}/jws" file="lib/junit.jar"/>
+     <copy todir="${build}/jws" file="lib/clover.jar"/>
++    -->
+     <jar jarfile="${build}/jws/jnidispatch.jar" createUnicodeExtraFields="never" encoding="UTF-8">
+       <fileset dir="${build.native}" includes="*jnidispatch.*"/>
+     </jar>
+diff --git a/contrib/platform/build.xml b/contrib/platform/build.xml
+index 47fa8ed..a623ce6 100644
+--- a/contrib/platform/build.xml
++++ b/contrib/platform/build.xml
+@@ -115,9 +115,9 @@
+ 
+     <target name="-prepare-anttools">
+         <subant antfile="build-ant-tools.xml" buildpath="${basedir}/../../"></subant>
+-        <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" />
+-        <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" />
+-        <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" />
++        <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" />
++        <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" />
++        <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" />
+     </target>
+ 
+     <macrodef name="build-manifest">
diff --git a/dev-java/jna/files/5.10.0-tests-exclude.patch b/dev-java/jna/files/5.10.0-tests-exclude.patch
new file mode 100644
index 000000000000..e608e2087f44
--- /dev/null
+++ b/dev-java/jna/files/5.10.0-tests-exclude.patch
@@ -0,0 +1,27 @@
+From 2b50e2296c9c9961fd168abe285f773aecd6437a Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Thu, 6 Jan 2022 12:21:22 -0800
+Subject: [PATCH] Skip execution of test classes without any tests
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ build.xml | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/build.xml b/build.xml
+index ed104c2..9fb15ae 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1388,6 +1388,9 @@ cd ..
+         <fileset dir="${test.src}" excludes="${tests.exclude-patterns}">
+           <patternset includes="${tests.include}"/>
+           <include name="${tests.platform}"/>
++          <exclude name="com/sun/jna/DefaultMethodInvocationTest.java"/>
++          <exclude name="com/sun/jna/ELFAnalyserTest.java"/>
++          <exclude name="com/sun/jna/PrematureGCTest.java"/>
+           <exclude name="${tests.exclude}"/>
+         </fileset>
+       </batchtest>
+-- 
+2.34.1
+
diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
new file mode 100644
index 000000000000..3f90c302433e
--- /dev/null
+++ b/dev-java/jna/jna-5.10.0.ebuild
@@ -0,0 +1,100 @@
+# 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-junit: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}/${PV}-tests-exclude.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/jnr-netdb/Manifest b/dev-java/jnr-netdb/Manifest
index c7469767f175..25701e3af5ad 100644
--- a/dev-java/jnr-netdb/Manifest
+++ b/dev-java/jnr-netdb/Manifest
@@ -1,4 +1,4 @@
 AUX jnr-netdb_maven-build.xml 9637 BLAKE2B 0ee947467fc1c8e07d2b98fb29a70de5244e4a92895018f8eb4860413a2c96ab6d5599f1eb39a45f4c43a09e1d6d0c7c1737416f7afbd205d397da17a257d3e5 SHA512 befe514fd332f5eb6495404b0f0d8edc428be34a1745b16dd2a20d2b859d251670e549036099884a810e3b5da0c6a4d311b6b0691409cae1b6c14d20ee763d24
 DIST jnr-netdb-1.1.4.tar.gz 648347 BLAKE2B 08953f93fe4a6146dfc77c463e07a8b9f6e784ffc26165d7409a623756733a7598b4d0a3fa55302b5f9b01c870cee3062f310c74e20f6a8a11ff1b41d38a0d7a SHA512 949a744b1d443cde564a2582baf7b4323c721417f32a45fd7413f791823cac5877bef62ed0d3079345631b908a581a1acf83dd00a926f87ebbd8e61d38a20195
-EBUILD jnr-netdb-1.1.4-r1.ebuild 1145 BLAKE2B ded7e835a1ae0763beb9acfa31e8ef93ae50e961e60a71ed72ad47a79956f32e1edec5ab8ff414700a43444695c34bb83394f8a0e0f3a4be4d4cfdaccd57111f SHA512 554c04ac2e66a4a498e4e7c12391639213c6c5a34a9c21b6aa08c8e84732134da0d20381a94526acc9e17b1b962177e25ec32d253aadeae81c7b4265425b3754
+EBUILD jnr-netdb-1.1.4-r1.ebuild 1150 BLAKE2B 6b00dfe46c10602181bfeebd86b05cc1b0846f4c56703585c2e815be7d10cce09f3b8ded293f5cb9438164b846db13db993b9cc04a63b697f46b2a8f435f060a SHA512 af5c04260d6bcf0aac9e4f236c3b2a5bab0dbb457f12abee4c5f009c8545ba7104b6c8561daa6ac885c6b84527e43faa042791a2099f6fb0fabc8fa50fc8ac10
 MISC metadata.xml 662 BLAKE2B 64087950d504c3f16ef8466aaae35c567e2fdb1547346e99e537dd9ac1535c4ad209af80425993dce4a52287ad9960dfac6dbc923faa66e5ebc3328b9ccaae70 SHA512 458c722c132eb5b69a970dffe25ab6bc3e71f7d9fc77639d5b46dcb37aff851a2cffed0a62fdce6ce2192fb3da52d6781597367fb95d1fd794935a4e469b86f6
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
index d4570936987a..2a7af0818eb5 100644
--- a/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
+++ b/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 COMMON_DEP="
 	dev-java/jnr-ffi:2"
diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest
index 9c37f69146b6..29451d3945c3 100644
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@@ -1,4 +1,4 @@
 AUX jnr-posix_maven-build.xml 11760 BLAKE2B ec75beb884ccb81dc28c38db22e64953a6f536726105e2fec5cd38f7be2286091054026d6cf77471d03f5095c44087d8f7fe9d3065d31df26b018988a843fe39 SHA512 ab3f6b00e08cd7fff5f44df1c2a0eb9e73d3ad7400e6e708dcd1432b6ad122bfb0b8dac6417eb67a02d0fc2d19477d81287d2b202275676826081610d3e27d8e
 DIST jnr-posix-3.0.10.tar.gz 85912 BLAKE2B b87ff78ccf10718bd1faf9e308421ba3ab5e90dee5e244fb1b7f53592da8ad98973cc50e6469bcea59e1202ee82b3f77522eb95e23584ff70cc66099ef1c4266 SHA512 a282c164b0b9ace8aba508a48d08d53beb0ddcd4baf5389412941a1e1430d75df9bdd35935a6982d4bb1910c0fdad55910ba028b1b5388c55e19a6c4ed2ba6a1
-EBUILD jnr-posix-3.0.10-r1.ebuild 1290 BLAKE2B 086170dad7dc6fc3d913f16a62b4f5e5fff5d9b8bbe5ba699fbf0ac4d05cc33989d115a0b50259ffa759b373b463b4311fd87fe65cb9573610568fcdb52ca0e5 SHA512 8ecbfe33063041a813cb1977d3347fa7023ffef74e61f3eefe24be1652d8e9f9909ee67d63641fb5dc94a10fddfce40c5e11f1aca11441137da7a69f89f6e4a9
+EBUILD jnr-posix-3.0.10-r1.ebuild 1295 BLAKE2B f9ad7d57774afd7dfba2f22a774d2539332e474a85ffb0f601ba734127fb99644ea1e1912f245707d9b5d5e432d46d241d175f4fde7e9b168dc2f74b21aa52f8 SHA512 1ac23f843d6a1d3c5520fa464f6284573403e8b361eddb29647a81a938cc22e602508c1f04dc2a887042f99f0b0f8d21c1c4776c3dc14fcc25b306cfee296494
 MISC metadata.xml 325 BLAKE2B f40ca825a92205c1ef0e0be2e72c859b680593c0f852aec73c3d84356a9927f5f536ffcec7b7a365353ac56489677d7881f9f27431abc56cdf9cc24550493097 SHA512 ff2bae0526d5ae082ad290411e7d3cd95a197918e4d834a531cab016ff9a718197a27fb2c7a4f7426bb44a5b295e164a72dd36f5fac800bc20388fde0f52e0a4
diff --git a/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild b/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
index 287e02e6d650..8e1f57eabfc9 100644
--- a/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
+++ b/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
 SLOT="3.0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 CDEPEND="dev-java/jnr-constants:0
 	dev-java/jnr-ffi:2"
diff --git a/dev-java/jrrd/Manifest b/dev-java/jrrd/Manifest
deleted file mode 100644
index 657e78c76eb8..000000000000
--- a/dev-java/jrrd/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX jrrd-1.0.1-javacflags.patch 263 BLAKE2B d20065e16d2648c6be5718a40b0ec164ee66f644b611f932ee379470d993062038a9ba3cbfd5cac09a2da909c4aab1c1d1fe66407548f67b05e9791385627b1b SHA512 1c1475647f7535c359b1a686295edffddb9a1b2d53529f51e9a17d0d7e5de2a39846e56e9e4eb3441519b05da645052ed177b3d2e7a2779f6385ec5ace0609ba
-DIST jrrd-1.0.1.tar.gz 320476 BLAKE2B c8f2a16bd9e3d1dc53e6523e7b936ea65e23852feb69af917df9fcb40fe63a69335faf0bb476779f1e618ad44dabfec52f890232a8d85d8d5aa5c901c739bb6f SHA512 f794f052af32544e17d5aef58c7acb068f442c85e991d7f11c25119d94edb4aebb75f744df53caa64f4fd1e9f900f9018a82790a77dcac48e071b13833a8cced
-EBUILD jrrd-1.0.1-r2.ebuild 797 BLAKE2B c91de90bca8f7a0c333354a8b8e3715c24f762538cfd4c8098da9d7abe2965d8fc6c4740437bb6f647add90045706bf76ac72a6db78fbb6b4f7a02c70abb5886 SHA512 baac4ac46d64c1edbb8c69a1386962392e033557e4175041746a31f9a4586812228fb1e82f9a3be916a50f8ccf11fc40b6e8510c395a0bb9dd558ed9733c3741
-MISC metadata.xml 314 BLAKE2B 0e8e8de27bbf380abad306f9b91cdcabeb7d8eddcf396fcff12e2c407f0c6be89e64b919e72f86ee8b2127821032f31a027ab61577c6e98dba42f7d590cfaf08 SHA512 baae98409fce5a1dfc748d14ae1d853aa61b6cb3add22b2cf9d69ded33fe6d5b46cc61ffc52fe7a5d53db0c83eba633711c9e8e505cce8e0fa5028598439e0df
diff --git a/dev-java/jrrd/files/jrrd-1.0.1-javacflags.patch b/dev-java/jrrd/files/jrrd-1.0.1-javacflags.patch
deleted file mode 100644
index b211ec1f3cbe..000000000000
--- a/dev-java/jrrd/files/jrrd-1.0.1-javacflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am	(revision 7413)
-+++ b/Makefile.am	(working copy)
-@@ -15,7 +15,7 @@
- 
- .java.class:
- 	-mkdir -p $(classdir)
--	$(JAVAC) -d $(classdir) $<
-+	$(JAVAC) $(JAVACFLAGS) -d $(classdir) $<
- 
- rrd_jinterface.c: org_opennms_netmgt_rrd_rrdtool_Interface.h
- 
diff --git a/dev-java/jrrd/jrrd-1.0.1-r2.ebuild b/dev-java/jrrd/jrrd-1.0.1-r2.ebuild
deleted file mode 100644
index 286cb6ffdc32..000000000000
--- a/dev-java/jrrd/jrrd-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit autotools java-pkg-2
-
-DESCRIPTION="Java Interface to Tobias Oetiker's RRDtool"
-
-SRC_URI="mirror://sourceforge/opennms/${P}.tar.gz"
-HOMEPAGE="http://www.opennms.org/"
-KEYWORDS="amd64 x86"
-LICENSE="GPL-2"
-
-SLOT="0"
-
-CDEPEND="net-analyzer/rrdtool"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-PATCHES=( "${FILESDIR}/${P}-javacflags.patch" )
-
-src_configure() {
-	econf
-}
-
-src_compile() {
-	emake -j1
-	use doc && ejavadoc -d javadoc $(find org -name "*.java")
-}
-
-src_install() {
-	java-pkg_newjar "${S}/${PN}.jar"
-	java-pkg_doso .libs/*.so
-	use source && java-pkg_dosrc org
-	use doc && java-pkg_dojavadoc javadoc
-}
diff --git a/dev-java/jrrd/metadata.xml b/dev-java/jrrd/metadata.xml
deleted file mode 100644
index 3c7cf2b9bec7..000000000000
--- a/dev-java/jrrd/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">opennms</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/jsr305/Manifest b/dev-java/jsr305/Manifest
index 40d505ea928d..fa0eaaf7fc3b 100644
--- a/dev-java/jsr305/Manifest
+++ b/dev-java/jsr305/Manifest
@@ -1,4 +1,4 @@
 DIST jsr305-3.0.2.jar 18102 BLAKE2B fa6c40a63eb3e4683ae70612058420a905428b9ac9b920b2f7f4024579a5ff6fcffa576d50a616ed585b4896cbba87f4496273b860930f047184cf5df77004d0 SHA512 02327071dde09470c8cd0fe39405263146d7e86b15312bc3f909c6a6fa9b11c730bdb833b6cdbdf1aee0c6553e519cecd0257a296947f94636650e88cd8c5b79
-EBUILD jsr305-3.0.2-r1.ebuild 516 BLAKE2B 1e6d71e3a0794ac6c029ae827101456f7e9e2d6a43517315820f10f1db031c95e707e45af719da048a267d4ab1ec01dd9b85c47a73ab8789b51fa530affdcefa SHA512 a006e6d286a0856c853eb4025e5a37e5102fcb19914ad05355bbe73aeb7377eec553fda46bddb937a824fa9557908c0a96552105c3ab1233e342e6fbc71b30be
+EBUILD jsr305-3.0.2-r1.ebuild 521 BLAKE2B 15c5a1debaab56264a59c23036f063d88de4d3073cd9073bfe71bf9f85c24240bd9088efa7e07c9af22d7cad00fe74995955712ec8f4c38c92c8d0e5b53d1eec SHA512 fa4059c90426c8c422f7d4be83aaf1306fefe54468a7dabba86ca252db3fba2fa61a0011a9cd196fe55a317939e7e22bddfabff005a0983f34d9bd2527fbfc72
 EBUILD jsr305-3.0.2.ebuild 513 BLAKE2B 79d4c6f14f63091c21a709d7829f3fa49351a6953c81b30ff028beb34f2cc60144804f15f4fd63055b2c98c548d169f1997391f567618ff32c8bdb1d37c6b2a0 SHA512 6a08283a0dc7209b71ce0a2aff1bd151d3f82c9aa8b2060ccdcc00a7164042f213b2d441c874792ed7f0d102fe1250a3ea50c115205c2589c0656cadf8629842
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/jsr305/jsr305-3.0.2-r1.ebuild b/dev-java/jsr305/jsr305-3.0.2-r1.ebuild
index 50cee08b8834..c8e7a9887dec 100644
--- a/dev-java/jsr305/jsr305-3.0.2-r1.ebuild
+++ b/dev-java/jsr305/jsr305-3.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="http://central.maven.org/maven2/com/google/code/findbugs/${PN}/${PV}/${
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 91ce455ae8d2..2ceee8cb0b37 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -6,5 +6,5 @@ AUX jython-2.7_beta1-ant.patch 996 BLAKE2B ea81e5c330e1e2b45378d91baed45b7d60cdd
 AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 BLAKE2B 72fe6e0afe6346ed4af714485aa70cccc202aa9b8f4587df380697b54d55ce278a89685144620c4695acf212e3e4654b476865d54643b88dbfc2468b2c33fb98 SHA512 75b25d98d8df13d0b9947cbc70a7da59097b89731210504cc26ab18680b93d9ce2cd177480870f985a87d3634d9034b8d9f1bac2c431f4cfe09ab0b54db78b18
 AUX jython-2.7_beta2-maxrepeat-import.patch 457 BLAKE2B a55f47a16264544608ba9916d3f2ced081a4f47d260bab2eeeb5959ad1aaf1074a69bea4d8083383d039f541f6b379a141c81c4376a7f7cf324ce06ddeb84ab1 SHA512 e06ddb36805e2545f351d9d5df651fa90b0b39d340e4772cbb24910f1e1c999463a21fbe4a62c9cc73f9ccdc0047f8900e6300602cb8d5b70cef7cacf1bd46d0
 DIST jython-2.7.0-sources.jar 15371691 BLAKE2B 7e1c29f2a2c03b034e89bb9c3a8fdddbaef6a0191a7320c82b76e31b41336f3d99c1995b2e9864c033ec53629d45669ad460fb4a1433ea7bc6b0390919500a24 SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6
-EBUILD jython-2.7.0-r4.ebuild 4292 BLAKE2B eed667f0e6c069444978bc4ba013b321f11ce9e73cab284c1ac95d1cbed5dc66358ebce85382703ab2ce7b8752ac4976e01861f1f245dec55d013780d616ce13 SHA512 c5b73640dc31a4b72d2ff54213921747770bdff7a9ce35969c5bfa000ccafe62480b53ae2fb1c6d3089764fac77d652f023ad889922a90af372113349e64bba8
+EBUILD jython-2.7.0-r4.ebuild 4332 BLAKE2B 4229853c93a65766d19b08ed58e73534e8116c9f915ea9eba7293f422a27af00713d6c566b0cdd1952b9dfcc41127242b356916c217f1ad3a25859dea99eb99a SHA512 6930f9c5d28ccc356c9853caa4cbcc7de8c9e27ce395c164652202d71f3a94bc007d5850ad0b9527b41e71a85222566c4754f26b25c23bbf0705ef1df752ee37
 MISC metadata.xml 323 BLAKE2B 4c2b07b6a519fb3f1e4f7d0662e2488705d8ba2239a6cbd25b42aebd1bff1ca368105e1c5eee604915428c5b909ecc2547f6be4dfad126139a7f496bb276ae02 SHA512 de33eb0b1518ca8c0c9f8a44880946f491620bbcbfe0d5ebcb68dca71eba3965f0cf0ccd8c67128022c33845699222bd8b899c061cb5f7d7c0e09a4783fa3464
diff --git a/dev-java/jython/jython-2.7.0-r4.ebuild b/dev-java/jython/jython-2.7.0-r4.ebuild
index 06257d2dd02c..c24d236dc549 100644
--- a/dev-java/jython/jython-2.7.0-r4.ebuild
+++ b/dev-java/jython/jython-2.7.0-r4.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.python:jython:2.7.0"
 
 inherit java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
 
@@ -16,7 +17,7 @@ SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_P
 
 LICENSE="PSF-2"
 SLOT="2.7"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 
 CP_DEPEND="dev-java/antlr:3
diff --git a/dev-java/libreadline-java/Manifest b/dev-java/libreadline-java/Manifest
deleted file mode 100644
index 1829ed1eda79..000000000000
--- a/dev-java/libreadline-java/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX libreadline-java-0.8.0-gmake.patch 367 BLAKE2B 149491acf9d5383fe095a8533b6ffcfc966f3aeb2382d8ac1e4d03b1f8388c1d0d5a2475e83cc2c827fdc8e308b3536b98934c6adbe789100fefed4be3797d3e SHA512 2d91eb76dc14e37ea9b7b0a4e3aa87ae22b8fbf6ef4ad958318f6ecc0aaff331f6d5563c11c59fbafa0a1b36f30ed5c41850f4badaf7830ddd64d24d8569fa4c
-AUX libreadline-java-0.8.0-respect-flags.patch 651 BLAKE2B e8c4fe1901fb87b5f8b7fa9faa21e5446385e029aa034a482b883df174c0889c65ca09d7f34a7728d7dc2d8fc90ea3373f8dcb16f740befe5b9183481ed32844 SHA512 b3419484c6732d3396ae90fba0c77bec656bb705d63c8ec2bd999222c8e687d6fbecebfa10bcb91c8780e6ffa922e2d58318978073f382c4b7601cd569ec7abd
-AUX termcap-to-ncurses.patch 502 BLAKE2B 4695fdfcb2329e8f2ba555fc06be7e9b3d1039509e046aa1059e8bd954840f641d1b0f8be7dff04850ef5dd54435a204cfe468e778f4767f1a8c6ddf1391cef1 SHA512 a7d157fe3455b10641ea15285ab610a1ef3d4c8b8906408e9caa483f8453c96143e02dcdd193bb11514a4e4c1e53c810de5346e88ea843ad39166a624c33f8f9
-DIST libreadline-java-0.8.0.tar.gz 77122 BLAKE2B cd25c3aea6189d0d48a10c26ad2f359e7f22533fd4a22d22b8491fd19c2d12c0fda6c8f1b8908bd66be8094efb374a51c6877eb89835360c4a2be8d9107d1336 SHA512 16bbb01a4852244387d63d8d5a7203e2862f235d8a68b436f33b586c7a6ea5297d1fabfa910c54bc33cfdc43b5dfe80e9eb4828b80196a974410c90387c3d1f2
-EBUILD libreadline-java-0.8.0-r5.ebuild 1264 BLAKE2B 496df754a1a4e06fb0e3f5fecc99459178a510e5b935d4dd6ac619f27050239b24f1c8680f1b4e71075cc9e1e1672480c75f64abd517ed4ec92c5b9843583833 SHA512 d7d62621f63661971ca6256dd278f7ce80c69dc6496d45aee46a4840034458ff723e53a58afb92b3eb43ebc6604aac1f590ba0071535687e06be271ef661caaf
-MISC metadata.xml 320 BLAKE2B 2bd0d1c0fed3e404aa3046a37d3a5575b7b3c04d6108ca5f039edd31a19df3f02d5a337f3b1dfc82463d2dfe816db53b31aced60cc894a833a00f2c69e58f97b SHA512 492d7ea973a27f3864b8386b5464f0a21e54b689c34cddba54c75199b0b523dec5237581fa06fde57724a0b04c8b4a4475dfc9b87e28e7477968c8db23f1b0d1
diff --git a/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch b/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch
deleted file mode 100644
index 34a01e48ae55..000000000000
--- a/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/native/Makefile
-+++ b/src/native/Makefile
-@@ -69,13 +69,13 @@ all: $(T_LIBS) 
- lib: $(ROOTDIR)/$(LIB_PRE)$(TG).$(LIB_EXT)
- 
- JavaReadline:
--	make TG=$@ lib
-+	$(MAKE) TG=$@ lib
- 
- JavaEditline:
--	make TG=$@ lib
-+	$(MAKE) TG=$@ lib
- 
- JavaGetline:
--	make TG=$@ lib
-+	$(MAKE) TG=$@ lib
- 
- $(ROOTDIR)/$(LIB_PRE)$(TG).$(LIB_EXT): $(OBJECTS)
- ifeq (MSC,$(WIN32))
diff --git a/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch b/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch
deleted file mode 100644
index 9af21ba83d4b..000000000000
--- a/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/src/native/Makefile b/src/native/Makefile
-index 679adb7..a1f2a6a 100644
---- a/src/native/Makefile
-+++ b/src/native/Makefile
-@@ -51,11 +51,11 @@ JavaEditline_LIBS = -ledit -ltermcap
- ifeq (cygwin,$(WIN32))
- JavaGetline_LIBS = -lcygwin
- endif
--CC = gcc
-+CC ?= gcc
- OBJ_EXT := o
- LIB_PRE := lib
- LIB_EXT := so
--CFLAGS=-fPIC -DPOSIX
-+CFLAGS += -fPIC -DPOSIX
- endif
- 
- 
-@@ -97,7 +97,7 @@ ifeq (CYGWIN,$(WIN32))
- 	$(CC) -W1,$(ROOTDIR)/lib$(TG).exp -o $@ \
- 		$(OBJECTS) -W1,-e,_readline_init@12
- else
--	$(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
-+	$(CC) -shared $(LDFLAGS) $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
- endif
- endif
- 
diff --git a/dev-java/libreadline-java/files/termcap-to-ncurses.patch b/dev-java/libreadline-java/files/termcap-to-ncurses.patch
deleted file mode 100644
index 256cf6573da1..000000000000
--- a/dev-java/libreadline-java/files/termcap-to-ncurses.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/native/Makefile.org	2004-09-07 16:43:16.703100016 +0200
-+++ b/src/native/Makefile	2004-09-07 16:43:28.804919625 +0200
-@@ -45,8 +45,8 @@
- CFLAGS=-DWIN32=$(WIN32) -D__IBMC__
- else
- INCLUDES          = -I $(JAVAINCLUDE) -I $(JAVANATINC)
--LIBPATH           = -L/usr/lib/termcap 
--JavaReadline_LIBS = -lreadline -ltermcap -lhistory
-+LIBPATH           = 
-+JavaReadline_LIBS = -lreadline -lncurses -lhistory
- JavaEditline_LIBS = -ledit -ltermcap
- ifeq (cygwin,$(WIN32))
- JavaGetline_LIBS = -lcygwin
diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild
deleted file mode 100644
index 7df017e7b4cf..000000000000
--- a/dev-java/libreadline-java/libreadline-java-0.8.0-r5.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"
-
-inherit java-pkg-2 eutils
-
-DESCRIPTION="A JNI-wrapper to GNU Readline"
-HOMEPAGE="http://java-readline.sourceforge.net/"
-SRC_URI="mirror://sourceforge/java-readline/${P}-src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-CDEPEND="sys-libs/ncurses:0="
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-
-DEPEND="
-	virtual/jdk:1.8
-	${CDEPEND}"
-
-RESTRICT="test"
-
-# 1: See bug #157387 reported upstream.
-# 2: Respect CC CFLAGS LDFLAGS, see bugs #336302 #296741.
-PATCHES=(
-	"${FILESDIR}/termcap-to-ncurses.patch"
-	"${FILESDIR}/${P}-gmake.patch"
-	"${FILESDIR}/${P}-respect-flags.patch"
-)
-
-DOCS=( ChangeLog NEWS README README.1st TODO )
-
-src_prepare() {
-	default
-
-	# See bug #157390.
-	sed -i "s/^\(JC_FLAGS =\)/\1 $(java-pkg_javac-args)/" Makefile || die
-}
-
-src_compile() {
-	emake -j1
-	if use doc; then
-		# src/org/gnu/readline/Readline.java is completely bogus and generate a
-		# truckload of errors. Let's call make without catching anything. :(
-		make -j1 apidoc
-	fi
-}
-
-src_install() {
-	java-pkg_doso *.so
-	java-pkg_dojar *.jar
-	use source && java-pkg_dosrc src/*
-	use doc && java-pkg_dojavadoc api
-}
diff --git a/dev-java/libreadline-java/metadata.xml b/dev-java/libreadline-java/metadata.xml
deleted file mode 100644
index 7b73f81973fb..000000000000
--- a/dev-java/libreadline-java/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">java-readline</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/mchange-commons/Manifest b/dev-java/mchange-commons/Manifest
index b237f4a7bf48..acec986b79ae 100644
--- a/dev-java/mchange-commons/Manifest
+++ b/dev-java/mchange-commons/Manifest
@@ -1,3 +1,5 @@
+DIST mchange-commons-0.2.10.tar.gz 218657 BLAKE2B f073aac7a560c31ea71c4114c5128de55d4b384c9579f649e0ca28c1257be64d22bce406b241f3b7665c5ec0e4cdc64c079c0f27f328e54803612abae43aef42 SHA512 098712b3b61d74a832699b6c92c75fdb243260400c1180511b5299a25553660750261ff8c2cf322350afd3d4b84fdf9900c26123b56add0f772e26e4f3ed8d7b
 DIST mchange-commons-java-0.2.10.zip 773768 BLAKE2B abfcc70e109431afcc514e80a2dc3585a90de07f8cb800d0a9807b72ad10f0488ad0a8b7a641c3de7a91029e3d6b25590985df85e592d90d0af42728389d7e28 SHA512 8196cd4476c3dea55355ba11cc2f801602235de3a977d75eff3835dacaf612647adc0e595e0bf77a6313adcd718d143d08ecf6fd5aa0e6638a419cf1f107c3a9
+EBUILD mchange-commons-0.2.10-r1.ebuild 807 BLAKE2B f0c69fadee10ef03e35d1349ea7183d8cdd95c628cadae5f788550687f2743c4d5a6a49cdeae1c393613c774ab068cc8ca4c7bc7e7c01e7358b085da3e17e129 SHA512 09a9efdafe38296488b74de2ef42ecb324ca80e67f0222a24b2d6c33168b0eec05256effa5480ccd89563e2958ea927fac07b84cca52e1f0260c71694a827b82
 EBUILD mchange-commons-0.2.10.ebuild 775 BLAKE2B db834708c256a68a2c40460920c153e5c29c7c51bbc37143f61226893d0f31074437f148574680dc71dd4dd2a381b7357ecaefdb8bba8ec7af0272a6445bbcff SHA512 53445826420dbfbfbe553f3e6460c58012b9a79ee0fd28173e79c4ce4ff1c571947133b56e4a71159b69ca868cd5837a3b1585426064b520b649523460411584
 MISC metadata.xml 341 BLAKE2B 12a8c6400c7e33d2c48d1421066d1f653f0ad0055743be43fe646824a111c879d9e94baea50a6837e4b58584e06d733d83070e60ce92e12957878265edfc8266 SHA512 9a31c179d0086aa0b461544594472f6ecae3fb0c4aa1585c8dcf49ab20f5b9dd1aa48e435cc1195d5f5509ece1a231a644264e4c91ceefc6bf87d99c2566122a
diff --git a/dev-java/mchange-commons/mchange-commons-0.2.10-r1.ebuild b/dev-java/mchange-commons/mchange-commons-0.2.10-r1.ebuild
new file mode 100644
index 000000000000..bbae432a3666
--- /dev/null
+++ b/dev-java/mchange-commons/mchange-commons-0.2.10-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN}-java"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="a library of arguably useful Java utilities"
+HOMEPAGE="https://github.com/swaldman/mchange-commons-java"
+SRC_URI="https://github.com/swaldman/${MY_PN}/archive/refs/tags/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+IUSE="doc source"
+
+CDEPEND="
+	dev-java/log4j:0
+	dev-java/slf4j-api:0
+	dev-java/typesafe-config:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/zip
+	>=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+JAVA_SRC_DIR="src/main"
+
+JAVA_GENTOO_CLASSPATH="
+	log4j
+	slf4j-api
+	typesafe-config"
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index ee58d0068d41..4445a16e03b1 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,5 +1,7 @@
 DIST 0.9.10-assembly 63268137 BLAKE2B a87553608f9269e529227b4bb13bfca32cf82f3feb7b947dd849d66e86721f390d1862df897184306d84251b635ecd089e1e817244ee6e241a7ebab6c60fe1fc SHA512 dd551aac47b99d7a33f7900f80ac16eba60d1a93f68c87329f3faee8d219102424e19de899b78619568e55f09f2b081948bd21356179d608847c722157a55208
 DIST 0.9.11-assembly 63268510 BLAKE2B 2594800c42d23d3a91ec5b676e968200bb0a5f8e26a4163f05e6badd1377b593fa3b091f63bfca2b7cf3263fefa9d9bace5882b9a1061631f71ba647b65edeeb SHA512 3d6e67e1a301761209a83f3a12fbd692f5589af919ef4e30fe9017ef49a3ba5ff66a00ee372c184ab1d35932f014513c7fd4c7221463ecbc878efea0323c2920
+DIST mill-bin-0.10.0 65538437 BLAKE2B 1c3583e34a0bea381b6368acf00936adaace5cf3a959e710cde3ab08509b7de237d46ee0fb9266a34e0f746d6c9c052337a6d8dddb4d3ba990710c131f0ea11d SHA512 fd8a8c79672275de9bc4ab74791484dd1c91b5382990d993794b1bde59b24a2e331422a1210010a9acb6c4a29bf168ba0564f7767413acb4d6867e9ea14d2c33
+EBUILD mill-bin-0.10.0.ebuild 482 BLAKE2B bd450dd8e02ed513d1d9a2546220e91556ccdc46a515bd41ca1450f9f36c602e25a36830c65211dcf87946b1dd028a474c84638e3f1039d83b4cc048b7100e33 SHA512 0c47890e11f7b3d2fcfb1469213dcb2f7103ff7f3460968dee8d4ce54bb0fe7efd80e0604a5a6ed5cbfb0c47fe68f43b02b6c653ea2401707bb9f318a6ddfddc
 EBUILD mill-bin-0.9.10.ebuild 462 BLAKE2B 0b33b8aea299741600f108c52c46408ec29442b91cc81716a5c7d7c07face2135d51a9ba107e71711528f9971588d2bd1959aceeeb44ba68b477a7008d027c88 SHA512 de66509bb517bbdb36f1b1fb6c9f64871ace3a859e7d33b552a27685f341ffb95ae3360830ece8fdea7521a2dcf6fbdbba7a1f88aff65eb01644e40fe558f2a3
 EBUILD mill-bin-0.9.11.ebuild 463 BLAKE2B 76b3ea412b568cc70308b150c92a97792c3eb49cf9c94caa850d92732f658de051633ad228cd9292a5bea24106340bf1a1306f8517e62d7384d4273d5e6a6d99 SHA512 93dfb789423caa0d06876350adcd789b48e79ad2b6722972f509c67366eb03f69010f6700b629d0632b3cdaf0c813776dabcf13e1c1be2274aceb6ba246c58dd
 MISC metadata.xml 246 BLAKE2B efcbb4db7ac6eb97dc4625930f11c2d780be8fb04e89f2a6d7ef4a853f07b59b3058542d61769f3185b626f35bbe09bd6ee9e34323cef4239f1241dc3ff160ca SHA512 92d34b6d6b6116064cbdd8c79bba97e2f60f56a078c70efbbe87c9cd90cb96bf4522fcf437075bf30417e2ef20f696e6cd4e586203e85a00269aca13f1fb23be
diff --git a/dev-java/mill-bin/mill-bin-0.10.0.ebuild b/dev-java/mill-bin/mill-bin-0.10.0.ebuild
new file mode 100644
index 000000000000..e8485c57dfd6
--- /dev/null
+++ b/dev-java/mill-bin/mill-bin-0.10.0.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/netty-buffer/Manifest b/dev-java/netty-buffer/Manifest
index b694acd579c6..c2f70d24a234 100644
--- a/dev-java/netty-buffer/Manifest
+++ b/dev-java/netty-buffer/Manifest
@@ -1,3 +1,4 @@
 DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
+EBUILD netty-buffer-4.0.36-r1.ebuild 2407 BLAKE2B 07c5964301e29d90c755e2c89146f3717fd6ad3d7f8a589637b643478fc16552121047a37abc24f8e3a7f2b492c166d6e8c72449ffa59c85e0191b9ba286fe0c SHA512 ae9862f62ca1ef0c9630da502b27c97e751af7948d7288c64be458fcb9650a5e68bef83c0b701b4d64dbd6d8ac4de6ce3ecb46dfeba1515949f3e211ed7f96a6
 EBUILD netty-buffer-4.0.36.ebuild 1269 BLAKE2B 909d89bf881f11adde18514d4596cd5e76a2fe07f4bb850ef57ead6c7ef74b3ce85f9bff67ade45e795b1b607ece8bcb912ba4f5090827c630d6cb917c30b595 SHA512 2b0f7dc60868f8d6a0b0181b58602efbb2b56c6862808a82ccfcae9a4a10a2a4647ecea17405a8eb0c01add98369fd7a6441a3124aa38afd367e1e5d7e8887cf
 MISC metadata.xml 323 BLAKE2B de4c9f6ab6a8f2e4243cb7ea8d3e96a08e9a99b579d7996601094ca1bba95c4331fec32c42c4fa42defb8de1f5ed3bf9e52cc3ac3ca9e6a0bec6a55c3edf3d3a SHA512 99c3bb74ad41a72119dbccfaf446e9d13fd1002204188c363531a68e4434fb01a9f2ab0158ad359cea6163f3791759e8fa5b7b2c8cb7268212776d912840b89a
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.36-r1.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.36-r1.ebuild
new file mode 100644
index 000000000000..f69a3ee3a00d
--- /dev/null
+++ b/dev-java/netty-buffer/netty-buffer-4.0.36-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/netty/netty/archive/refs/tags/netty-4.0.36.Final.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild netty-buffer-4.0.36.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="io.netty:netty-buffer:4.0.36.Final"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit check-reqs java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Async event-driven framework for high performance network applications"
+HOMEPAGE="https://netty.io/"
+SRC_URI="https://github.com/netty/netty/archive/refs/tags/netty-${PV}.Final.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# io.netty:netty-common:4.0.36.Final -> !!!groupId-not-found!!!
+
+CP_DEPEND="dev-java/netty-common:0"
+
+# Compile dependencies
+# POM: pom.xml
+# test? ch.qos.logback:logback-classic:1.0.13 -> !!!groupId-not-found!!!
+# test? io.netty:netty-build:22 -> !!!groupId-not-found!!!
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+# test? org.easymock:easymock:3.2 -> >=dev-java/easymock-3.3.1:3.2
+# test? org.easymock:easymockclassextension:3.2 -> !!!artifactId-not-found!!!
+# test? org.hamcrest:hamcrest-library:1.3 -> >=dev-java/hamcrest-library-1.3:1.3
+# test? org.javassist:javassist:3.19.0-GA -> !!!groupId-not-found!!!
+# test? org.jmock:jmock-junit4:2.6.0 -> !!!groupId-not-found!!!
+# test? org.mockito:mockito-core:1.10.8 -> !!!suitable-mavenVersion-not-found!!!
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/easymock:3.2
+		dev-java/hamcrest-library:1.3
+	)"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( ../{CONTRIBUTING,README}.md ../{LICENSE,NOTICE}.txt )
+
+S="${WORKDIR}/netty-netty-${PV}.Final/buffer/"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,easymock-3.2,hamcrest-library-1.3"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+check_env() {
+	if use test; then
+		# this is needed only for tests
+		# https://bugs.gentoo.org/829822
+		CHECKREQS_MEMORY="2048M"
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_env
+}
+
+pkg_setup() {
+	check_env
+}
+
+src_test() {
+	JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}"
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/netty-common/Manifest b/dev-java/netty-common/Manifest
index fcb6f435246f..41aae878bb20 100644
--- a/dev-java/netty-common/Manifest
+++ b/dev-java/netty-common/Manifest
@@ -1,4 +1,4 @@
 DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
-EBUILD netty-common-4.0.36-r1.ebuild 1983 BLAKE2B ae0ae050a9a955247ff4f269bcbe9141d6de1400725aae106109cff5cdc98450cbd3721586fe5dda972b030ad0004c1edca3928d53b264f2d8b629010efe7780 SHA512 87903e87630ec96c46594e969405b95ed495238172682ecb0299d56ae084d8f0a03e0bc09c0ecbec4c1b4c85e516b53fd35ff21d9474b8bf558ae17fbb3a2c42
+EBUILD netty-common-4.0.36-r1.ebuild 1985 BLAKE2B c7cf7c00ae6c9e38070f469fdd3b15941b3f9d2e52282602dbecd4c923ce847417cafa7af247145fff8eed8fe82208e61a9f56283ed82c061a11953e7afa29d7 SHA512 eea2879c06b4d2eb695cb9f24a1275d2b78408a986a5f845fdaa1174c8bb50ab3807f78ff3ed9ba0d01403bb1086ee8c4fc9eb0e777f8910b615a1d8c97692aa
 EBUILD netty-common-4.0.36.ebuild 1604 BLAKE2B 1fd6224706f910a51e93b64603e2866912893b0083bdcb1ac4a4171a5bf2e12b772663120c8aa80e167478f3c40c5d76ba44609f2760e31e33463e6e169e2626 SHA512 ac48ea4c6910645f0db1831f41f49ed7ed304ce26267c3311fede9d70b3694f55438d2cd207a48aade49148d7412afde4eb79529c971ac7a4552da9f4f344742
 MISC metadata.xml 323 BLAKE2B de4c9f6ab6a8f2e4243cb7ea8d3e96a08e9a99b579d7996601094ca1bba95c4331fec32c42c4fa42defb8de1f5ed3bf9e52cc3ac3ca9e6a0bec6a55c3edf3d3a SHA512 99c3bb74ad41a72119dbccfaf446e9d13fd1002204188c363531a68e4434fb01a9f2ab0158ad359cea6163f3791759e8fa5b7b2c8cb7268212776d912840b89a
diff --git a/dev-java/netty-common/netty-common-4.0.36-r1.ebuild b/dev-java/netty-common/netty-common-4.0.36-r1.ebuild
index 064d971361f7..dadd4d4a6f1e 100644
--- a/dev-java/netty-common/netty-common-4.0.36-r1.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.36-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ HOMEPAGE="https://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="test"
 
 # Same test failures as before the revbump still occur. See https://bugs.gentoo.org/827221
diff --git a/dev-java/netty-transport/Manifest b/dev-java/netty-transport/Manifest
index 078be393beb6..186a3c82bc3a 100644
--- a/dev-java/netty-transport/Manifest
+++ b/dev-java/netty-transport/Manifest
@@ -1,3 +1,3 @@
 DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
-EBUILD netty-transport-4.0.36.ebuild 1723 BLAKE2B 6dfc802c227911e4e39eff9de476e819f1375f7f10be4cd7b4e1dc7ebcdf1401b0053e82b98da14c2a3179f19972a803cb2e81fa26996fcc156f40d968e4d545 SHA512 dd641a60a42809a3d1671e7c244cdf0fbcfc227cfdb635f8572c288404765a99540d2ff12e52286221a5097c2ffa4170f0e93ffcdc65e3910ebeb5a8da5081bd
+EBUILD netty-transport-4.0.36.ebuild 1728 BLAKE2B 91fac677251c251c8ab028cf33f7be732aa23cf803327a133dbf0e259404bfb07cb21814d9584151ffb95224b01cb5581dbb15ed1d190cad94d44eac26e641fc SHA512 e2e91bd50ebdae0ca49583cc32fa401bbf91293aa0b6f7598d5fbd22256b9e1ca3f35baa50d8fed47fabede0a53ee357d9e49a3db72459977bf239bb653bdbfa
 MISC metadata.xml 323 BLAKE2B de4c9f6ab6a8f2e4243cb7ea8d3e96a08e9a99b579d7996601094ca1bba95c4331fec32c42c4fa42defb8de1f5ed3bf9e52cc3ac3ca9e6a0bec6a55c3edf3d3a SHA512 99c3bb74ad41a72119dbccfaf446e9d13fd1002204188c363531a68e4434fb01a9f2ab0158ad359cea6163f3791759e8fa5b7b2c8cb7268212776d912840b89a
diff --git a/dev-java/netty-transport/netty-transport-4.0.36.ebuild b/dev-java/netty-transport/netty-transport-4.0.36.ebuild
index 508745f154f5..7939e8969570 100644
--- a/dev-java/netty-transport/netty-transport-4.0.36.ebuild
+++ b/dev-java/netty-transport/netty-transport-4.0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,7 +14,7 @@ HOMEPAGE="https://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/objenesis/Manifest b/dev-java/objenesis/Manifest
index f97b3a92b40d..2449301b7351 100644
--- a/dev-java/objenesis/Manifest
+++ b/dev-java/objenesis/Manifest
@@ -1,3 +1,3 @@
 DIST objenesis-3.2.tar.gz 123629 BLAKE2B d875224d7a9fcf6173787edaca35f58f72d6c85ee443831be8050170ba826e8a155c7983c62ef5d01a1bb8331943dd6da5cb50eefb87cc0c7d3db540b01fcac3 SHA512 8f0bf9449191bce1823be0cbae85438edf595bde0483bb2fb4415a880b6715ae60826473bd5ee15789a7d0638932878dbdaaf7b42a6d582aa7bbf09124e97e3b
-EBUILD objenesis-3.2.ebuild 1218 BLAKE2B b587e53f84b1de8c6aa3dcabfde9b232995c17c56280296d6dfaa3ea66bdfeabad58f014e0fecb04907030a597918aa31dbc8d66412186c86a02ca9acb99dacf SHA512 bb0242348a6f925926d27977106ca7b13b42b576f72b5995ee4688e460140a615bfe7684473047e6f39103915af5a3f0fb223f8e33498477307043aa95781559
+EBUILD objenesis-3.2.ebuild 1209 BLAKE2B 5dd9a097b3bdf8b84af29c6f5944ddd9b338eb9138fe9f3f4605fb6acc33d1ba7553bf47d6a82b02ca75fb682c1079c8a62a2e3a3e11de6b196ed44347b89139 SHA512 30892a8275f87b6a2c3101d1391da7c1991f1e5110e427a519521af57d287ad632c0879c6ca869d54b00de643350443984da3352a932b21c7983e352b2cab614
 MISC metadata.xml 386 BLAKE2B 1015a40cbff1c5726a54996b8e0387b287ad70fbe45f732f399f4ef90c1839f0bfd0531139d9a304232fd6a49decd4bf287f746993ee7a1258b8bd3b920f2483 SHA512 e293fd7928f753745c69bb0357cc8140574c632d9a35e353df7dbbbc524855db423ac0cfc505b7bef2f98875cf5c05ed1144251702a0b932b6e1630d4be7ec95
diff --git a/dev-java/objenesis/objenesis-3.2.ebuild b/dev-java/objenesis/objenesis-3.2.ebuild
index 025759df7ed1..b752785e109c 100644
--- a/dev-java/objenesis/objenesis-3.2.ebuild
+++ b/dev-java/objenesis/objenesis-3.2.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:
@@ -13,7 +13,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A library for instantiating Java objects"
-HOMEPAGE="http://objenesis.org/objenesis"
+HOMEPAGE="http://objenesis.org/"
 SRC_URI="https://github.com/easymock/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 7a5a5c60462a..11aa7e77e6ad 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -17,8 +17,8 @@ DIST OpenJDK8U-jdk_arm_linux_hotspot_8u312b07.tar.gz 98364180 BLAKE2B 2b7cfffa33
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u312b07.tar.gz 100571080 BLAKE2B 3a1c5c7488de740210758a34dcc34517c8d5310a9d17c1d251d0ad6d5e7a619595304479b88c807b5d0cd839f85f9b7c819d0dcc297a738052b337b3e962b457 SHA512 0b530ffd0c41fa71962072c70c0712b71573b9d1b66e9b23f6122b770bfa7cc42d8ca0c87a721bb8481104edd062b79ebc09a728f1977699b242b62cd546146b
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u312b07.tar.gz 103016010 BLAKE2B 9e7b10497bb46a176016f4df6bfa5fa90905bffaaf9668ca39f30a01cccf78c04d1391aed304493159d5b520879762b7e284befdc11c5444b0edff6b363d9c3c SHA512 20ba919c6b4b2f1253b7a9119193f2ee6c16498ed15296ed5d4588284e635fbc53fa368180c1362cb5c3cc2f2446e96d5a752a96d64382ddf73b062319b1ef47
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u312b07.tar.gz 107991615 BLAKE2B fb068abc6788c00d8ed51b0beb3a08c6dee80e3fe40bdd5ca79bbaf59159869a9b3234f1ac53321e988152293c938a13202fcd9e57ec133bbd2cde3f849a0fa6 SHA512 fc75b7fe2489ac6fcf7180407db3fa839ef1a0b5de2aedf4c9db902eeb3618e2e1d1436970fc7a002b111c6f6be6250e0e1e62dba28aba21b4c88fa8f765a92e
-EBUILD openjdk-bin-11.0.13_p8-r1.ebuild 3620 BLAKE2B 343cd234fdaec2108ead00f219789f8415e8a1a5e9a4614d924cabe2ca5b0c379264fe574da4717c0b36bb4afbec02161f019c2f9a48ad3d340c9b31678c1f65 SHA512 f9f00739fdee5d8647e1c68a2bd7ce42a27b4cc3d41b3b27d1252f2372d9ba45d4301c71742bdd089ba1f6eb3702094cddca2d288d03328e173d19d51cd37586
-EBUILD openjdk-bin-11.0.13_p8.ebuild 3617 BLAKE2B 2bb109caa07d44bdaea3c8cfc8d71e7f3f37980a99ad2c99b2fa793442cc154cb5e3f61e9ceba1a3bb400ad2b8fbe5a3bfd2bc6afd350efd3e3bf7918ba5e387 SHA512 c199f61d9991087b6b0a3b6935f88cff625997aa0246127ea3cdd65bc14611b50bfcd7a3d16d5cd7778f7a20ce7a153aae7763e9457b0a43b68f7e26f88ad330
+EBUILD openjdk-bin-11.0.13_p8-r1.ebuild 3006 BLAKE2B 070db1650cf3f936d4a264f6d759a3daa81afb66101b85d75a0002629aeb42416589b766190a050ec0e3ae14cdce95eae7ed0c66e9cd76359d96b7b08270b703 SHA512 cc99c01de85c794bc0f6519f9e942c0515d822e7628679e858feca2b10a3204def8ce510f8262d5d32a91e29bce91d412f839d215ea3de4738374acc09d408d3
+EBUILD openjdk-bin-11.0.13_p8.ebuild 3003 BLAKE2B b5bf1a9ec3297e3d417c19f6c9a3cf9d7155694462e6b3f9378bc0af992232e9f8a79677675ea78257215a4a8833620f2053d2da0f969201f1a4898a5eff3f06 SHA512 7f9e47fdafb8d8a7ab5602cda247c6847d7b9b008561ae6590d9b074c31ead43d6ae604aaf827a5af65243ab317f6d4eef96afd5b9d6561386a162ee958e8f47
 EBUILD openjdk-bin-17.0.1_p12-r1.ebuild 3819 BLAKE2B eaea576eaa4ffe4486e8fb0f3b48e3f584aad925e48ea5466f08367b83ac7e77ef8fe97ff04fecd3b7e57595445f51b3658baaf1c87e7a627f5341ef364f840c SHA512 b883e19d4075b247ad9ed251987e376d7dcafebef8e45c99a78eaaed1ad65b4e13dacb5f171a2aea8e521fac4c63c9f106ce1e05b3a1a224312146a0235ef210
 EBUILD openjdk-bin-17.0.1_p12.ebuild 3822 BLAKE2B 46e746cd152d9d389b8b50e0e07ec89ed77c3c040a5441678403f392888197cd838ffdce0c5f3621a3b3811fc71ac5dd72d9fcd723ddb6a5a880dbd8a6ab4836 SHA512 151d8aad48b04f137f95eccf213919ac702cf3e11c96ad78aeaafe8e9e9724508a4f81ca03522ad9c3095c1b40deb4c6a49bac3434c206bb65b64ea77bf21a68
 EBUILD openjdk-bin-8.312_p07-r1.ebuild 3040 BLAKE2B 90208fa931daca30a7e54e2929b64c9400b414b22120b9dc39ca18bbea880eb5b88189c274f1f9c050c06542fad39563d8d69309dd6c5d7b8dde3c74306a91f6 SHA512 4b0a2b496b89c669421331f078a5c5f26bbc2f5ef3dd00efc4c9837d6bc243dd764118d16fb9d8d88be4e428bd6b3ff0d3da4eeff665abcb37784817a8734e79
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild
index 95bcdeba00a6..dabdb239f42e 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -121,16 +121,4 @@ src_install() {
 
 pkg_postinst() {
 	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break"
-		ewarn "many java ebuilds as they are not ready for openjdk-11"
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
 }
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild
index 1fd28021ae50..12b3337375bf 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -121,16 +121,4 @@ src_install() {
 
 pkg_postinst() {
 	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break"
-		ewarn "many java ebuilds as they are not ready for openjdk-11"
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
 }
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 58593d6c69f3..7b392c84c56c 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,15 +1,10 @@
 AUX openjdk-jre-bin-11.env.sh 513 BLAKE2B b7dfc571fda637776479ca4f8a8f0eb1fa0f03f453b48e0079670aa20f5a5bc83ed73194508aeda596a62805e5a6273b4668b870d6b7aaa99ddc72498e384c54 SHA512 dfc012876174108b768d6fbd9deaf8b9e20965c2b5dfc2ea4ded556597c0ee4807537f7b29ca1e6f92ba800313457844299fab770b833d8b3a5b3d576369411f
 AUX openjdk-jre-bin-8.env.sh 675 BLAKE2B 66fb3b2690af2cb8bfb959bdd6edf66e130cd5e2c8968c96aa8d6cd09e01d193c6ab9973803e97105da4cb573b4221528d1cc830e044feac1b2c8ebe9f17d405 SHA512 ad361aeea566fd23fc21a607c9cdf63b164ad9d38a63fa01f435640af90e49cdb6562cb64409ab873a6603def04f8ecfc164340988c1a0660e8c6bdda500cd9d
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz 42432277 BLAKE2B 18138eb163db4609790286cfe7bc951da9ea244eed50bafa10e5d84ec43e7a80ebc2f759f3e1547b9d785b1a6d560b5399a0449a8fe301e19625c2b98abba928 SHA512 5b8c1c16c5faa467bbb35a1d1e694afc50b0c2dbbe77abb29620f30602187a1a903f60169e2b691dcc81b6d902ed5a17239318f27765f19351281209befb0e96
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.12_7.tar.gz 42400222 BLAKE2B 4cb727bac0a68f2b7461569d96fb4b5b6f9d0d915edf1e869cc72ed9a0bcd977f365923f1b23031e15cba4ac46d336f011bcd5f2230454b436e839cc5e1371b8 SHA512 662a65f2d601b537f3b05d06cb1785d341d519c24cd86f2a4ef8886919d7793be363da1bb8833cb81c6bc4f2e1456cc0f34e5831c6ac80924a93002c2f156691
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.13_8.tar.gz 42404190 BLAKE2B 5825d8edcb890c4447354414fd5ad6a153fd7b5a36082607a0b41430c8a9be52dec025cb0c388adcc80877c23c389e031c0451d3e109312c0fc9878410633444 SHA512 41f84fb17afe142264a1e10612e67c201b090feda86858a257fe02fc4f4b65b61397e23585f3d9334e1ee407aea11b5b1affb734a2823f3cf749507d1e54ec4d
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz 41355668 BLAKE2B 761358d7e5dd9c96ed13d7302ea5f39719f044a37add7fcadb76ed799d41b17faee014c9e4bec3ce388d4a6965e2c14dd4ddf029baa6dd1f5f84cde7e7b1fcd5 SHA512 fd63dceddcd32b0f48b6d35c14ab3165f2b45152fdbc2bcaf833ed2624d833592cf1001627029fd04f9b77a033e2d4e993830d54c2e7c08adde5cd7a684447fd
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u302b08.tar.gz 41249161 BLAKE2B 643c8cdb50e6d7ff24bdda2fb8e99d0ee33dcf550313db879bcc4661d85b715de4e6e01b979e92005208b004ad1d6e0641e328dfacb81f70541a759f022826a8 SHA512 e435cf0d9e5a8edb26ada1568a6a041b685bd92302ddc60be73acc02aa1aaa43fda08d327d456749405866a0d1e3feaded2796d8a0db65fa650a9e60520bcb96
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u312b07.tar.gz 41286015 BLAKE2B f555fee173b8af98f64cdd08b8141c823033473d8fa0601f8e69899bc6b82234ac33a6de45f87b2cd9457e22d500da9052209c45798d47ec3c4a34496b30d154 SHA512 36d07389e63e49ee16f1329aa7e0bd5b42b397f864f10080038017920fd2b178d5cd9dfaef157080ac020721d0e6e7b26b0277ab1cde69c20500fc34bab0e915
-EBUILD openjdk-jre-bin-11.0.11_p9.ebuild 2659 BLAKE2B bb9e36d5912be413bd89340832029a5cf1f4d88cd053986a9e49f0215c8b9e2e528078acd751e580b978d42724c66550cf9d046f3c4cd902e50e12cee0abfcf7 SHA512 d8220b1f36b6aff13b9c0279110a06f9344cced376fa8e2ce3ed91fb21a23c95e4be0f0fe1f4f4d060782a372472f87e0da4c2d8536644013662412e14c7296c
-EBUILD openjdk-jre-bin-11.0.12_p7.ebuild 2654 BLAKE2B 83bff5854cb15ae586350e0383f24f6042d87c34576396cab523b607650604233fc0a3a77230d752eded39316d5764bc264494803df58c410a606c9d1a416d98 SHA512 408f1be2b1bf1289108f903f8d154d128cc7102ac8c27f8bf2b6f27b4c9d034cce196a97893043508679dc336e8a7915b5d48052c8b89e83fe9490d49a062c84
-EBUILD openjdk-jre-bin-11.0.13_p8-r1.ebuild 2655 BLAKE2B b6c947d4e94aa029c49dd07bfe94850a7f73a941067bc96f3565995e793387b22a8962a6de269e29b9be51887e12886d745d5793b27ea85777757e55b177fccc SHA512 b8ff4a5808efeb7c16eae05616441011cb316d0c88c48fd35da2336154fd030b3057f81fe4e9ae9285145d2eeba6aee16abcc5482c459d65508677e8b32966f5
-EBUILD openjdk-jre-bin-11.0.13_p8.ebuild 2655 BLAKE2B 1fc88a11362ccd870ca6011e50ce7bddb90967f392acfeadd0a04050fd8a541a845c79196f48d731914c4380ab51c0fb8091a89f228901946b8a0901ff2950fa SHA512 336dcc92c9d6dfbc44f68689df6effd9d8971df0a42bbdcae88c5cc6be510a2697d36e26648e01248cfad2cdf024e767d9dd52929450795da139f3719d41314a
+EBUILD openjdk-jre-bin-11.0.13_p8-r1.ebuild 2098 BLAKE2B 18782bb34e1c628e683b65df62b0771640eb8a73101b3ab9d40bb5cbb22084c37008f5af5b3f9ff9c160a0eb94b4e4b9a5349d38c37a6af74eb1a0eae220bbb3 SHA512 55907f551e9e25d735cabfff43d61ed9e9f2fa2e241639a814d6fc18e6eecae957ca04190e85b9343f4a9de335ee63ee717d397280b15e748531a6ff2ecb6dae
 EBUILD openjdk-jre-bin-8.292_p10.ebuild 1864 BLAKE2B 1fed435abcd6dc7aac2c71336162c3e4a77117a2387a9bc6ad80bdd60dcdd8f83648701b47baba0a782927ec11f7af78c157067b597f5dd24fdbefccacf93cf7 SHA512 5105f215171f50d0ea487cdc371be630047bc74155012e0a509822a4b55739820b5668511c05611417d9c0c30d6cdaebb26228dcac73ce4fc785d66ac2b9a8a1
 EBUILD openjdk-jre-bin-8.302_p08.ebuild 1859 BLAKE2B 6abad72cdb322bb1c52714b999085eca3a92c7269194e8c03efe1be93c0de274b6e50d72c5c0b804267c074eb76bf9e438ac3c2c565812bd8af8da6157a3e8a6 SHA512 07bc482870ba9810e54aa1e25deeb91f10391e93984ce0fa8321a45965c53324929a6db0374b78037f4d8420d32bf1be755fe80e3258b039da4a7c0bfb96495c
 EBUILD openjdk-jre-bin-8.312_p07-r1.ebuild 1850 BLAKE2B ea4be8535567c81e028316bc42261e396b58de2f3d7717f56ace1d549292349f0b2393fafd49086c6925dde67ca6e9a0c419eb9369819b3449426814fd44d263 SHA512 1eea3c96d83d71178d1914a9234d6652fbb8837f44415091586f2f774a1572654d6cd7faf80002f6fd660f6657ecf208e48143fc161e02cb459dd1e46892d431
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.11_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.11_p9.ebuild
deleted file mode 100644
index 441b2550e44a..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.11_p9.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-IUSE="alsa cups +gentoo-vm headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED%/}/${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	# provide stable symlink
-	dosym "${P}" "/opt/${PN}-${SLOT}"
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JRE must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.12_p7.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.12_p7.ebuild
deleted file mode 100644
index 9b85185774b8..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.12_p7.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-IUSE="alsa cups +gentoo-vm headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED%/}/${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	# provide stable symlink
-	dosym "${P}" "/opt/${PN}-${SLOT}"
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JRE must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8-r1.ebuild
index 57f5b0dac68d..163859345679 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8-r1.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -83,15 +83,4 @@ src_install() {
 
 pkg_postinst() {
 	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JRE must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
 }
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8.ebuild
deleted file mode 100644
index 92fa295b7789..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-IUSE="alsa cups +gentoo-vm headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED%/}/${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	# provide stable symlink
-	dosym "${P}" "/opt/${PN}-${SLOT}"
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JRE must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 58dbd04e3942..1730407d2db2 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -20,7 +20,7 @@ DIST openjdk-jaxws-8.312_p07.tar.bz2 2544672 BLAKE2B cdf1e2ca85a91163599d4ce9473
 DIST openjdk-jdk-8.312_p07.tar.bz2 48705905 BLAKE2B 0e9849a58a05e300441e63702846ee2d76e461939c5eb9c458c29ddc9c854f5278d464e3cc98112976b2b34268fa5a628e21183b8ea117eb53a805494182ef22 SHA512 cda0fcb171fec3d652340475c91b2c9099d7cb951ca352122236648272e94ccdf153bdf616cb772185cd7c9300b6e6b10490082ed5887d83e368edbefe2a4f8f
 DIST openjdk-langtools-8.312_p07.tar.bz2 2403774 BLAKE2B 2eaaf2d23b0d31d566b95075f1e00a8ec01617a48bd860b927fc56f56c0ec1e4232c1d2e316b9b13bf563b89ecc6464bf1e49a86eda1a31d998dbbc85e1fa542 SHA512 b77d8b1864e121a838023da424b0910903cc2b11cd9669e61c0ced84e1210d4902b2a0b97031e6646f26b01f1120d72b6f3382c6aee4d25fcd2d8e4605b8b4ff
 DIST openjdk-nashorn-8.312_p07.tar.bz2 2848133 BLAKE2B 4e416ddb38aafb97796233adda615525fb6e583428cdf0b25fd285276b3bef81682d3a607122aa8724dd9ec2ef0890b889ef809aa8f72cb03ac5bc9bfce9192e SHA512 411ac87cf1e8c889330b3fc41ce8cd8ed70c553d079dd46349813b02b171a22c2421075cc6391e46a866ee802df874cf1a6ff3e7dfba20e73564380be24ae843
-EBUILD openjdk-11.0.13_p8.ebuild 8113 BLAKE2B e1d69fa6d069b9670ab22c047d00e1c63c77f6313e5e3642150f2ed7c85dda480f748bcc88e27ccff0b34d9b9cf122529fe92e087228b2b1563eb4c29da6cfb4 SHA512 206cb6c0dafb2d410d98e5316d66bca9a47f1db12b4d6159ce9aa334e560727694d7e600be77b1df0acaba53e022816734483bbbde6c28e67370481d38bb4efc
-EBUILD openjdk-17.0.1_p12.ebuild 7856 BLAKE2B 068fee5fbb84db490521cf628614a24f796f485d8ed6d5b5e6d45d6e1607c4e1a1b2838d888a8e02cf1f7af9ac8232d76ddcb3790850851e60c6743195457541 SHA512 55edabf0d9bc980c8ea6d56e4fce65ce911cc02d7bc9793658cd72e31d5d7e0da4b96e3acff8cbbff67c776dccd78f95da90268e4fecda34779afcf40a369a67
-EBUILD openjdk-8.312_p07.ebuild 7400 BLAKE2B ad43ad78fb789a080b35a78d932ede47359f2c810122982d23c6974f1d491ecf229a04b454518e8356a5d606c7c59e4d8ea35535d00399985570bdbb526f07a0 SHA512 d520d183f5341f78c0332bf18a9acc8f70bb27cdaee8344c9b18313c0c990d94f06b252c5f11be5666d561bfa452d74ca100dc647eafa967ae280b49ee26267b
+EBUILD openjdk-11.0.13_p8.ebuild 7470 BLAKE2B 51487f24150b411a085a022f83f539c11e2532b82afafc76f03a15a6ff96b3b04d3ce9078a3cde6b2c91ffcedf55dac2976eb00bdbb0ad4352c7a428df4d5956 SHA512 644cdae2f094d080eb27054a4f2b7fc3dfb6a540567a15e1c07d0cf0540dead5a97f7751747e2d4db2ed9e860611f19bd958eb4732c2db0d95c5119d61df8a34
+EBUILD openjdk-17.0.1_p12.ebuild 7855 BLAKE2B cb7a7215afcd9382edd8053ea4182012d46743fdff5ba03ac4ff2f8750b454c352b25ec4ca04b0b3a5dcfeadf64cf24518ebf119a87cde7ca7f2c9a09bf39256 SHA512 5bc08b0e7707725dafd4165d8f7af2964981195d19fc95ae5465ab3f2907bd4c81d2ba2bfbf6eb42dd331dd8a9eb2c8c0584615146163669514a2c2773cf68df
+EBUILD openjdk-8.312_p07.ebuild 7399 BLAKE2B b07477683dd271a5c1cf0830137f9c846df5375666ac0d3863f3647f9c0ca3db3bce0e68e4f3931124a071e9b0fb81434733d034194cbee3a764056cfa2721fe SHA512 467b1479f425e9d36be216c24d2f226a2c4a1aec9947fedc73d0b4703e1efaad727c36c427c3010a78576db997d2975623d0209d11ba6adbd65e360265173c10
 MISC metadata.xml 1433 BLAKE2B f1c32727711519e4f3ecbaf9f9be6c025b467d93e2423bb5e6d9f3644242ad8f356204e7a804b0fccb56a3df5b9283cce305e82b19659a1c39bffc6b65676316 SHA512 cee169279a8c13fd3bfbc89eb1e0ecdda9a34214d001cf941f08abf89516f224e1532e916bbdb6597c56bd6a1df18ede2c4bb18e54c5e4ad67be70250f836fb5
diff --git a/dev-java/openjdk/openjdk-11.0.13_p8.ebuild b/dev-java/openjdk/openjdk-11.0.13_p8.ebuild
index 9a2b30aa4483..e7bcf7abf3cf 100644
--- a/dev-java/openjdk/openjdk-11.0.13_p8.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.13_p8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}/jdk${SLOT}u-dev/archive/refs/tags/jdk-${MY_PV}
 LICENSE="GPL-2"
 KEYWORDS="amd64 ~arm arm64 ppc64"
 
-IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
+IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap pch selinux source systemtap"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
@@ -269,16 +269,4 @@ src_install() {
 
 pkg_postinst() {
 	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break"
-		ewarn "many java ebuilds as they are not ready for openjdk-11"
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
-	fi
 }
diff --git a/dev-java/openjdk/openjdk-17.0.1_p12.ebuild b/dev-java/openjdk/openjdk-17.0.1_p12.ebuild
index 6472dfd14950..313ab34e7f6f 100644
--- a/dev-java/openjdk/openjdk-17.0.1_p12.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.1_p12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.t
 LICENSE="GPL-2"
 KEYWORDS="amd64 ~arm arm64 ppc64"
 
-IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
+IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap pch selinux source systemtap"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
diff --git a/dev-java/openjdk/openjdk-8.312_p07.ebuild b/dev-java/openjdk/openjdk-8.312_p07.ebuild
index 6ee82279c9fc..31cde0da51a6 100644
--- a/dev-java/openjdk/openjdk-8.312_p07.ebuild
+++ b/dev-java/openjdk/openjdk-8.312_p07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -44,7 +44,7 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1)"
 KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap +pch selinux source"
+IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap pch selinux source"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
diff --git a/dev-java/oracle-javamail/Manifest b/dev-java/oracle-javamail/Manifest
index 6827c0a56692..9c2aa6b68fc2 100644
--- a/dev-java/oracle-javamail/Manifest
+++ b/dev-java/oracle-javamail/Manifest
@@ -1,3 +1,3 @@
 DIST oracle-javamail-1.5.6.zip 1812631 BLAKE2B 9fd43058b10726db9359c4b59fd42226da329268ec4974a510940a4e7d6bd16afc3a3a73b6ee17914cd5d3577c42ddf22f29bc93e2ca185660ea03196ed2bd28 SHA512 3fde7901f5975f4a58d675d94e397bf1a169db227b138bfd684c0e2d0f6522ea1c8e2a5425b23fc08775a6824a9e9e68b2d6e6312f20c53af127f00a897363e2
-EBUILD oracle-javamail-1.5.6-r1.ebuild 1315 BLAKE2B 25b78259ed0a8c7c65ee5dbdeb36b1965b18cc301d40c34bafda6a5f8c62fb96647fec6a367ccae1e7c1eeea2c679c15c73428b68544ad2e101afaf8852f2993 SHA512 f774febcdc5cea9ecb01af6ead62830aceaa99f38637276f52b39715ae36e08400910e96c6d24f69770c11f0829b2f387e6bef2d9ce2db9f22b88610433a6fa6
+EBUILD oracle-javamail-1.5.6-r1.ebuild 1356 BLAKE2B 4c0f25dfd8d7613c448283a0cf5f5f6715690cbd44ce2a0f53a7d2daf5eebf39593ec2c4d89b915e227bc4cb80d1c189dc2ac88f6868bdb1a8b3af1a5ac81035 SHA512 743f97c0b99206bead63cb404773eee300553f1601d0186946dd0b8159614a3dddbfe7697ab5086e8ddd737f8cbf304f640cb51748c060f72fe9c719a804602b
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
index f56700c34bec..c5dc1412ea9e 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.sun.mail:javax.mail:1.5.6"
 
 inherit java-pkg-2 java-ant-2
 
diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index 7bd9a1736636..782df16172a7 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1,6 +1,6 @@
 AUX jflex-1.6.1.patch 680 BLAKE2B 2dba9bdba8ce77ebe28a608b505891ff49d51e9d7549bb17f21935ad9511fcdf4428a79b5243e5eb8cfb5747eaaaafb97eb6edca980ce337d37ed48772ff5ea5 SHA512 73e8067a31392a1975877470a2a239c9ca0913f807faa3e5c660bc2487dca9a46c1753ab86526e66581111fcded89229a4e9e3a16fa787ce3669ef6c07a28081
 DIST qdox-1.12.1.tar.gz 519833 BLAKE2B 83a732f1582b714cf943ede61bacc5216804c00cfbb642a479afb74739564f4fdbcd923dd7cb84a9626a97c5ad0a0f04895e0ae68252891cb25299e1fe1c9c72 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5
 DIST qdox-1.6.3.jar 63731 BLAKE2B 77d117f0f76f531f9320b5eb3650db315aab838d5d79a9df8997649b498b375db3fb0c694ea8b5911512097dd2325554d7599bed51a978e38af6fa55600d7c24 SHA512 0b05620809e3830c7e12c289cd4765f96d845adabc1f09497993bd9f39852784f454eb4aff1deecb325608a5773e86fbb1f5863e0f25387805472b59b46cf965
-EBUILD qdox-1.12.1-r2.ebuild 2180 BLAKE2B 56dc79ef274fcdd857eedaa49386831e091a2d095f67a7967a207b0f98c7fa3d5c5afeb54df8e086b50c858f6f3cae70d52e41f8cb915ba646af2bb540a5d04c SHA512 585e5c92a4cf237cdb5a8e5da7a6fae018b27b2479b34895a0dc1d2813b66b164ac22946f617319da492ffd0d03042d0cd16a827d02b938eb2914db134c795e0
+EBUILD qdox-1.12.1-r2.ebuild 2225 BLAKE2B caf3e51d9d81e1a597092a5c20c2468266dda3559de0b07f948cd6026b983718941060f066a004464c4b177ec6a859139fd0549ff48dc82aff6fba24e8a60f90 SHA512 51a8c940ba702933bad4367de1f6a2a54d4d66710d3631529f61137ce27be1aaa0ce9dadb83005aa22331c241947637fe9a17a802923eef1002c0dad37051582
 EBUILD qdox-1.6.3-r2.ebuild 687 BLAKE2B e4cb8a16f5f5c116b7d4a6247b5c9a8aae67ea29725a25c8d6a6ee5e3bbdd19140d1ed4b33c32d6c5c0c81deb4b7d391e04af784eb3f0ca26d6458b061a9a72c SHA512 e154d9ae1c0528d248e24ffb3063dee953be8f3b69e93ff1331f2d111f61c7337210a2421192027066307caa6341f307e50b0bee4f41d29047736ee6d05c2913
 MISC metadata.xml 490 BLAKE2B 0074cd0a7da6af8028ff8bc8eba4b26f86d4ae5ea55da7a6fe0bfbcc73e779a9a6deeed0e82f95abc28324dcd1a89634b504d02265dea16ac26e576b6f29ace8 SHA512 039a450284a930e163cd9cd4c39c5ee6dd0a2f5678b5f77db7f809bbe0a141a564fa7232cbe3a428b31170068b1377cb953a8ccda4ee3b14b5ddb4d313180496
diff --git a/dev-java/qdox/qdox-1.12.1-r2.ebuild b/dev-java/qdox/qdox-1.12.1-r2.ebuild
index 39a712868027..2c9a64624663 100644
--- a/dev-java/qdox/qdox-1.12.1-r2.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.thoughtworks.qdox:qdox:1.12.1"
 
 inherit java-pkg-2 java-ant-2
 
diff --git a/dev-java/reflections/Manifest b/dev-java/reflections/Manifest
index 9f112562f3da..ce76e953b1d8 100644
--- a/dev-java/reflections/Manifest
+++ b/dev-java/reflections/Manifest
@@ -1,3 +1,3 @@
 DIST reflections-0.9.10-sources.jar 53049 BLAKE2B 23491098dc648206161d983148bf11a1c4523df0593c903f9dbf03672b481d85aabaed7733a5d829b7f334e51d53dadde3fd439e62f9873ceb11f49f40a2cfef SHA512 940b80ed43aa900177e6c3551980eafe10f7ea16a1e5c0d24fc8c1e29f1e0155aae83e24f60af10f9743449ed38d2d3b211f3668fafbd95a6a2cb9c5581f56bf
-EBUILD reflections-0.9.10-r1.ebuild 711 BLAKE2B dab8db016ae8cc42201c6b1198f71ba0e567aa81eaad43947a8fbac8abf88378fae22215d761607d57fccf02dbf980497bd4f3974d2d47409ef52af2e3100880 SHA512 cbdab46e939a7cb84f59fbc336ca3e9f6171c7a0ec7f359da8477f8e3b5f0e22ff492a31e60eacc55fe2207bd2dd5cea66ae92aeb1a383dd4dae72063e92f86c
+EBUILD reflections-0.9.10-r1.ebuild 723 BLAKE2B df08df148a9e1cac1453e06613cc2889df1caecbec01d98a779ec328a8898509527ef638613a0fa63b0f5fefe9bda7e121f03d9d3ba032177adeba3b5530f54e SHA512 4a8aa2bd801760a394822127b5b2eb30b9d544de358d65cbe1f16ba2806402212f03b9a89610ce32af50604cfbc782200bc485259c61485a7f195c1e009712f5
 MISC metadata.xml 527 BLAKE2B 92b0ca46422b8b0107bef220664c0079db47a3c8f306f59d5b681b653e5bcb835a192c8018d719447ebc864ead58f3844340bf3f84ff5bbef0ab126b7d314efe SHA512 a7ad6c598f83a911b20f5b31573127433d2bd756ac15d4a29de907ce102a5fb77de2426035a8255125446128b8ef13ed1f9fa002bff285cddbaf9043bd71dddc
diff --git a/dev-java/reflections/reflections-0.9.10-r1.ebuild b/dev-java/reflections/reflections-0.9.10-r1.ebuild
index 96d59257f1f7..98a87c203fcc 100644
--- a/dev-java/reflections/reflections-0.9.10-r1.ebuild
+++ b/dev-java/reflections/reflections-0.9.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/ronmamo/reflections"
 SRC_URI="http://search.maven.org/remotecontent?filepath=org/${PN}/${PN}/${PV}/${P}-sources.jar"
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 CP_DEPEND="dev-java/commons-vfs:2
 	dev-java/dom4j:1
diff --git a/dev-java/rhino/Manifest b/dev-java/rhino/Manifest
index ad8f957b8095..d017f921c657 100644
--- a/dev-java/rhino/Manifest
+++ b/dev-java/rhino/Manifest
@@ -1,4 +1,4 @@
 AUX rhino-1.7.7-testsrc-build.xml.patch 1414 BLAKE2B c96d595d6c0bcd0225f8df9ac63e28a68cd6045b0f5395a13826fd7b7c7bce01ccc6963e58e2a07e41cd3c138de92cabd2627163cb16b5b2c21bc4f91b4a7eac SHA512 f7fa8d77a584399e6049414ed46b138c14f984148b6dda6e20e376c4312295728de24f31331d20c2b1dc62f81c8d9bd8732227ad64fcf430f2ba721b8de490fe
 DIST Rhino1_7_7_RELEASE.zip 6059127 BLAKE2B 431885bf287da524cfc82e6594802c93e75d48177b4056e9b893d7c852c3c3b30291d616a140981e520fdebacf5cbc8b802a6137f0e29a369f1d01cc771c6b77 SHA512 ce89b6a153d62dd459a86360c67d6db4b05922d8ab49a8d45ccb0deb0f639cd819f0ad75cb4929eda6b7f0fd6ddb5879a4035de6968283317bfd0e93d2bb744e
-EBUILD rhino-1.7.7-r1.ebuild 2048 BLAKE2B 49665d6459ad3c5ad9307e1c8233d1ff514629d51931bda111424b47844d56f160ec6682970205fc8e52241b90c1cc3dfc4bed5fa35ac8fd5b22a2a86a034c02 SHA512 2384afcb7de09ffadb3f480bd64be455b2756659e216cdac59bfc1ee703ace63249ff0391a0489859f1784d0ad9517a6d6304c5e366398bfc0477d1a4c201207
+EBUILD rhino-1.7.7-r1.ebuild 2084 BLAKE2B e943aa034cf71150da32db6af5301d5a094564715a3e2ae660e91abb50563e47eac6b5d9003a03e7bf8cd37c3184409f7cd005772a2131aea6cdbe3d88ad3a5c SHA512 c04269f891908b81b38da033eb111941cc6248ff3308ceb3d75c5d6f3a36eebe42547cb0df8fc5fa014ade8277e713b262f8bcfbce6c24fdfd898470f19b120d
 MISC metadata.xml 510 BLAKE2B 9b51ffca1a744e3a725e3966e25e60744e50fac1dfad6099ee24c4c1a671b986c777979ee9307e928a2adb132e6e8ab21dae8e358d160b93286d6827a209f76a SHA512 612798c48a62f7bbfe40219643d9ddcf0658384b50f0fc8bc511c054870c81a94e60636a533b647c89e5233dc900e0f8899b17d0e831f89423909073cb7e0c0e
diff --git a/dev-java/rhino/rhino-1.7.7-r1.ebuild b/dev-java/rhino/rhino-1.7.7-r1.ebuild
index 0ed1121c184c..656ddd97e01f 100644
--- a/dev-java/rhino/rhino-1.7.7-r1.ebuild
+++ b/dev-java/rhino/rhino-1.7.7-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 JAVA_PKG_IUSE="doc examples source test"
+MAVEN_ID="org.mozilla:rhino:1.7.7"
+
 inherit java-pkg-2 java-ant-2 versionator
 
 # rhino -> Rhino
diff --git a/dev-java/sac/Manifest b/dev-java/sac/Manifest
index da1a14230950..47214a210d66 100644
--- a/dev-java/sac/Manifest
+++ b/dev-java/sac/Manifest
@@ -1,4 +1,5 @@
 DIST sac-1.3.zip 163617 BLAKE2B d52ae09cfa7a60afb66ebebb395a93f2e69fb0fc2cdec3153b34350339d179c1621f9cb613889664e008a1ed9d121520431df13938b5d8d9d722e40da01eeb12 SHA512 e179d2e672f1e9e134c4bec92742410bcf2c5d423e5d236856bb53e849d7fcdb2bb09518796d30862685a9ab2344bfeea9b4c7f3c3dd4a1007c8056e120c87b9
 EBUILD sac-1.3-r2.ebuild 573 BLAKE2B 99b41c787f0a257b68041bbcc3d5861ab40df88fdeb8cc1a0448dfc05705d8099df924df16eb49456547e61e9d0d8f271daae4ca19624a6499866989f10726ab SHA512 a679ac0fd19c578d74df57aee5e348ddcb897e832651905133c3174974712ef2cdb1031d5398d1bbd1f42ed2dfbff144550914a373e532eb5fdf2912879a76dd
 EBUILD sac-1.3-r3.ebuild 551 BLAKE2B 23f3e04eadcefc1bbcedb7e07414efa71b9452b1f1e3900c40feb43f0501035ccccb6de4d5abc505637dcbd9272ccf72cfcf665f7c08405cc8f59d669a3b04b3 SHA512 b2432e4a3b92c7c11ab5d6ec8237d91ad9a4f68ee63790b8b09bbbbbfa73b50ba89dc7b20bc929239c90e69416f94a5a7f6e436300cdb62276c347d93ae5c44f
+EBUILD sac-1.3-r4.ebuild 626 BLAKE2B 9edb1e8c2ae54d09d4e2c66bac17d4f37bd4e6a0eb6ac0bc14e8522593bef8d3d895854b06a08578d65612bb14ff37a5154d273995ab7beb78ddecd3027a79ca SHA512 5256325c67c83055bd2182b7a6d676adc16d7d60c56f012479edc8c5392c610bcac330f0a923a487a225c1d3d0ce34701e59b354cf19c6bd3f4a0e8d0e069d6c
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/sac/sac-1.3-r4.ebuild b/dev-java/sac/sac-1.3-r4.ebuild
new file mode 100644
index 000000000000..3ce936aea711
--- /dev/null
+++ b/dev-java/sac/sac-1.3-r4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.w3c.css:sac:1.3"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SAC is a standard interface for CSS parser"
+HOMEPAGE="https://www.w3.org/Style/CSS/SAC/"
+SRC_URI="https://www.w3.org/2002/06/sacjava-${PV}.zip -> ${P}.zip"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DEPEND="
+	app-arch/zip
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="
+	>=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="org"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
diff --git a/dev-java/slf4j-log4j12/Manifest b/dev-java/slf4j-log4j12/Manifest
deleted file mode 100644
index 5f844c1b714e..000000000000
--- a/dev-java/slf4j-log4j12/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
-EBUILD slf4j-log4j12-1.7.30.ebuild 2000 BLAKE2B fb2d9e89ccfc18581fa98e602532ea3086d74ce6a8b42c438f5396152d42fe28832cbc7508194b5aa5b031abde8133c729b895306db2354e8950f7d8bb34ebce SHA512 80a141c03b23b4652f07489a8a8dcf76a635c32daab75b28873362dc37737d1642da68b625cae56b3aeeb20bfa9587068c6650205b8f7bf11b15f0e45047937c
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/slf4j-log4j12/metadata.xml b/dev-java/slf4j-log4j12/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/slf4j-log4j12/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.30.ebuild b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.30.ebuild
deleted file mode 100644
index cd3336b11a69..000000000000
--- a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.30.ebuild
+++ /dev/null
@@ -1,73 +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 slf4j-v_1.7.30/slf4j-log4j12/pom.xml --download-uri https://github.com/qos-ch/slf4j/archive/refs/tags/v_1.7.30.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild slf4j-log4j12-1.7.30.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.slf4j:slf4j-log4j12:1.7.30"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="SLF4J LOG4J-12 Binding"
-HOMEPAGE="https://www.slf4j.org"
-SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf4j-${PV}-sources.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-# slf4j-v_1.7.30/slf4j-log4j12/src/test/java/org/slf4j/impl/Log4j12MultithreadedInitializationTest.java:35: error: cannot find symbol
-# import org.slf4j.helpers.MultithreadedInitializationTest;
-#                         ^
-#   symbol:   class MultithreadedInitializationTest
-RESTRICT="test"
-
-# Common dependencies
-# POM: slf4j-v_${PV}/${PN}/pom.xml
-# log4j:log4j:1.2.17 -> >=dev-java/log4j-1.2.17:0
-# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
-
-CDEPEND="
-	>=dev-java/log4j-1.2.17:0
-	>=dev-java/slf4j-api-1.7.30:0
-"
-
-# Compile dependencies
-# POM: slf4j-v_${PV}/${PN}/pom.xml
-# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
-# test? org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-	test? (
-		>=dev-java/slf4j-api-1.7.30:0
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}"
-
-JAVA_GENTOO_CLASSPATH="log4j,slf4j-api"
-JAVA_SRC_DIR="slf4j-v_${PV}/${PN}/src/main/java"
-JAVA_RESOURCE_DIRS=(
-	"slf4j-v_${PV}/${PN}/src/main/resources"
-)
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,slf4j-api"
-JAVA_TEST_SRC_DIR="slf4j-v_${PV}/${PN}/src/test/java"
-JAVA_TEST_RESOURCE_DIRS=(
-	"slf4j-v_${PV}/${PN}/src/test/resources"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest
index 8ab4d1121fc1..98475bac6676 100644
--- a/dev-java/snappy/Manifest
+++ b/dev-java/snappy/Manifest
@@ -1,10 +1,6 @@
-AUX 1.0.3_rc3-gentoo.patch 407 BLAKE2B d49edbd556a7f7645e42b14f2284342a9b2036a6a891d7a9b46068c59d938dd6aa18503357b015de87a92d9ea74898bc2d7e49df91224285b90ca10760923b6e SHA512 026299b83596c93618c92dc5d1b02cd982e179fc9a65ddedcf482fdbd63c9a3a8fbe85e76590fc1dc67183c6dd332226ab7868e777e63dbf930d92b53a444c7e
-AUX 1.0.3_rc3-unbundle-snappy.patch 1823 BLAKE2B 8f412141c8db63fceaf6dec1e2d6dadc57c448a818a73304b0a76d9917f1d7f43d10eaffb8c29ae9b91e14561a701b9f3cb76ad75872db47776861195e7af22a SHA512 ddc823700111bf2f8635c6ec7291ad3665506fd24d9e5263bc46681cfd3d34e604397848a9b78929107d7de3bae0c3802bc8bb642dbac1f4984565d04cb71115
 AUX 1.1.0.1-gentoo.patch 407 BLAKE2B 1ee8af08605bfcf4b61b23784da9fdb7f116536742db4d0a6dda2b04c10115fb989c488632b495496899c2e7547549b997f120b96a7add64311584e0595d4763 SHA512 0e12de9c8b1c86791b43565312a12c50036cd501c5eea5bf45a09408121b99d79f58a1047acd26202afbac246f1264dfa86da785705f83f9db1356d824c9e40f
 AUX 1.1.0.1-unbundle-snappy.patch 1780 BLAKE2B 972bb8ed77fea8de8627bd15c9abc633def05cbcc696ff198ced852584c5dafb6abd89bba73afa7406f1fea008f1098b1ccd4951f0d59c6570583dd6c22c673a SHA512 75553615c0d6c5a24c14820b09021c225c89fcf2c680eabb27957cf45f3796344745f546939d0b98d78aca192c3cd23bfe7836f6f1c7a0b03748f084579b65df
 AUX 1.x-build.xml 8496 BLAKE2B 0ab98a4149d0d7b294efec29374c59af8599362fa40d04737d50d1106157d8e604e17ce06c9180c2d9ca2b612cb5d025a111fe620739f7109a0c384ae940d4dc SHA512 ed47379879bab5cbaa4111616c3cca526725e4fa3d8d42da72d19a21738cc42826e37756a181e6d541f27aa4abe7f2353be90c51f4d89d04413501e6ccdb4cb0
-DIST snappy-java-1.0.3_rc3.tar.gz 5466748 BLAKE2B a58847aa56d05659bcf53f0f7a6ba9c52611784bc6a8cc40d5838309e94c72bba8c8a1a27ca5249a223823a8cc1267dabeb12f369dae71999f55d5a64a111948 SHA512 eae4551d929f951be204218926cdea773a337ad584bd6fe49083526430a4e1ea80b395a627ecebc861232d36d2ec9034f2ebccac885da13e93fb74846298ba64
 DIST snappy-java-1.1.0.1.tar.gz 4909520 BLAKE2B 65daf3d01f1cb46dd0d51609e2d95fc954d56e41fbb2d22e9eca24fad16a6d4ba16083e633fb13e68dacf6c2fb0d10ec6fb1e6dcdda6dc611b58b172710fcd62 SHA512 32d0afce880ecccd814f7738eb375a13bd533998c73d79908964061337730ad76fb4794f78fd1fcdc4a4562db57cbc4c6f912d9f3351b1d75b12ce3224ec387e
-EBUILD snappy-1.0.3_rc3.ebuild 1451 BLAKE2B 12d41c164386a228231b3483f8dc6024a7430af3f55a4ea34339c7da98d19ce7eb8c57ee7a2171aef7b96e420f86d7d3b29dadfb74ecd9c27b1e054e34308f77 SHA512 268de9c4e6a5edbd07cb48dab62da2120187d359e16496457859a7e2772c1add9236c4b4bec3d64f28153b9a7db0d90594d2d3aac8e871e048c7373e4b09f271
 EBUILD snappy-1.1.0.1.ebuild 1697 BLAKE2B 303375436532cd1e63fb71b70230f072f7678519b39415e11137cd040ab0562e4fa850c980b0c7c9c343e63ef8aedf1da9311f33ffbecbbd72ba725e79b5bf86 SHA512 3f7c40dd83d8a7205640663a14f8ef31f7944000d8011019690a7c37b4fdb32e6c541139cdae2ac67ba02f666d61c98351cc08aeff6816803bdb3c2f7433b86d
 MISC metadata.xml 320 BLAKE2B 5e3039edeec0b66e6b896158777909fdfed881f06def61b5e3424baeb51ea898cb3cb273e6ddc939b7efea88860a945b5f29da513be22ee6b601551a6e02170a SHA512 c2e9282ce950b419588d080145e85e63e6491500edce141678a4aaae65a43d945694ad992dd4d485c94748e26ac225e58177fcff11db3430035b837741ec45af
diff --git a/dev-java/snappy/files/1.0.3_rc3-gentoo.patch b/dev-java/snappy/files/1.0.3_rc3-gentoo.patch
deleted file mode 100644
index 58a17b0dbd04..000000000000
--- a/dev-java/snappy/files/1.0.3_rc3-gentoo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Makefile b/Makefile
-index a9d5cdc..8026741 100644
---- a/Makefile
-+++ b/Makefile
-@@ -44,8 +44,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/
- 
- 
- $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
--	$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
--	$(STRIP) $@
-+	$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy $(LDFLAGS)
- 
- clean-native: 
- 	rm -rf $(SNAPPY_OUT)
diff --git a/dev-java/snappy/files/1.0.3_rc3-unbundle-snappy.patch b/dev-java/snappy/files/1.0.3_rc3-unbundle-snappy.patch
deleted file mode 100644
index 4885e7b5df80..000000000000
--- a/dev-java/snappy/files/1.0.3_rc3-unbundle-snappy.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b67855a..a9d5cdc 100644
---- a/Makefile
-+++ b/Makefile
-@@ -7,7 +7,8 @@ all: snappy
- 
- SNAPPY_OUT:=$(TARGET)/$(snappy)-$(os_arch)
- SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(VERSION).tar.gz 
--SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
-+#SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
-+SNAPPY_CC:=
- SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(VERSION)
- SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC))
- SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) SnappyNative.o)
-@@ -30,7 +31,8 @@ jni-header: $(SRC)/org/xerial/snappy/SnappyNative.h
- $(SRC)/org/xerial/snappy/SnappyNative.h: $(SRC)/org/xerial/snappy/SnappyNative.java
- 	$(JAVAH) -classpath $(TARGET)/classes -o $@ org.xerial.snappy.SnappyNative
- 
--$(SNAPPY_SRC): $(SNAPPY_UNPACKED)
-+$(SNAPPY_SRC):
-+# $(SNAPPY_UNPACKED)
- 
- $(SNAPPY_OUT)/%.o : $(SNAPPY_SRC_DIR)/%.cc
- 	@mkdir -p $(@D)
-@@ -42,7 +44,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/
- 
- 
- $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
--	$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) 
-+	$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
- 	$(STRIP) $@
- 
- clean-native: 
-@@ -57,15 +59,15 @@ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
- 
- snappy-jar-version:=snappy-java-$(shell $(JAVA) -jar lib/silk-weaver.jar find 'project(artifactId, version)' pom.xml | grep snappy-java | awk '{ print $$2; }')
- 
--native: $(SNAPPY_UNPACKED) $(NATIVE_DLL) 
--snappy: $(TARGET)/$(snappy-jar-version).jar
-+native: $(NATIVE_DLL) 
-+snappy: native
- 
- $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME) 
- 	@mkdir -p $(@D)
- 	cp $< $@
- 	@mkdir -p $(NATIVE_TARGET_DIR)
- 	cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME)
--
-+	cp $< $(TARGET)
- 
- $(TARGET)/$(snappy-jar-version).jar: native $(NATIVE_DLL)
- 	$(MVN) package -Dmaven.test.skip=true
diff --git a/dev-java/snappy/snappy-1.0.3_rc3.ebuild b/dev-java/snappy/snappy-1.0.3_rc3.ebuild
deleted file mode 100644
index 3d2afabf6e0d..000000000000
--- a/dev-java/snappy/snappy-1.0.3_rc3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="${PN}-java"
-MY_PV="${PV/_rc/-rc}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Snappy compressor/decompressor for Java"
-HOMEPAGE="https://github.com/xerial/snappy-java/"
-SRC_URI="https://github.com/xerial/${MY_PN}/archive/${MY_P}.tar.gz -> ${PN}-java-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="dev-java/osgi-core-api:0
-	app-arch/snappy"
-
-DEPEND=">=virtual/jdk-1.6
-	test? (
-		dev-java/junit:4
-		dev-java/xerial-core:0
-	)
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="osgi-core-api"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,xerial-core"
-EANT_TEST_ANT_TASKS="ant-junit"
-
-java_prepare() {
-	cp "${FILESDIR}"/1.x-build.xml "${S}"/build.xml || die
-	rm -r "${S}"/src/main/resources/org/xerial/snappy/native/ || die
-	epatch "${FILESDIR}"/${PV}-unbundle-snappy.patch
-	epatch "${FILESDIR}"/${PV}-gentoo.patch
-}
-
-src_compile() {
-	emake
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_doso "${S}"/target/libsnappyjava.so
-	java-pkg_dojar "${S}/target/${PN}.jar"
-
-	use source && java-pkg_dosrc "${S}"/src/main/java/*
-	use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/testng/Manifest b/dev-java/testng/Manifest
index 81147d3aef15..86130cde2844 100644
--- a/dev-java/testng/Manifest
+++ b/dev-java/testng/Manifest
@@ -1,3 +1,3 @@
 DIST testng-6.9.10.tar.gz 6271781 BLAKE2B 5b77f4b1d9bfdca6749a1d33f465a30bcd9ab9dd9fc37abf8148301c24d6bf287224d9886c0f681deac54e12f9460139ce2a2058b3d160c05cf8fcb9f7808373 SHA512 ed9ad1ced20904ab261d2a233f3fa43ee1ea31778e992cdd27459811b256a6998d8385dd01ff72821133208a1fbd72aa3599a4b8bc0eb4d7b696d34593f9567e
-EBUILD testng-6.9.10.ebuild 1762 BLAKE2B f4436fd42eb5fef15913748c55b2b485cc6b490631f79e17036aade2663d048507d337144012f8ec802468198e646a70cc19078c109c98bac33d1993a64c9e5e SHA512 f7f4a6ffa7039aba759c4050d0555de96f693e4b3af11e2a6a302da4e11e500654e9907014a54d9fcf8881ca17ee7c7518085219832e87148e88bd2c8382444b
+EBUILD testng-6.9.10.ebuild 1767 BLAKE2B 1669906b5f329a3be9f79e923cd4cf14e387ca2c6ceae961db89f4f3fd5b06fd67ed6222ee47710d9b68fc4c2dd77a0f92026f9305ea1d5815380ade542e3573 SHA512 ed934c76af7cace171fb6c7717a09703faca5c6ee1ba9a2a0b2a6c1e12d91b40da209e53e06608662111495dd530e7022bf4aa9c343b75c31d445d5d85026e61
 MISC metadata.xml 315 BLAKE2B f3779acd8d9bdbe1e65e6fd147aafd16773a99db420ea47fffa6f8501e0160341cafc9f46d72a860de2bffe572c721177f9c5afdd320b991784ad8e6935c7674 SHA512 108fd9d1659bcd11c414264f52f42b60a7287962aad427f7773971fffbbf9b7d97cefb9a39b64c8d12e00d04cb1188d36031a2d7c94aa57929503299636c6616
diff --git a/dev-java/testng/testng-6.9.10.ebuild b/dev-java/testng/testng-6.9.10.ebuild
index 2811d9a49c6b..c644e8005e27 100644
--- a/dev-java/testng/testng-6.9.10.ebuild
+++ b/dev-java/testng/testng-6.9.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ DESCRIPTION="Testing framework inspired by JUnit and NUnit with new features"
 HOMEPAGE="https://testng.org/"
 SRC_URI="https://github.com/cbeust/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="test" # Occasionally fail or run *REALLY* slowly.
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index faa34fff9d77..bb207574c684 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,22 +1,18 @@
 AUX 2.5-build-r1.xml 3084 BLAKE2B 6eb6025444ad6b2af035217bc7c1410a1238e25eaafdfdfe4ac706137791b329b05a28f56f77c57fa8de30b77d457e912208068b97bf6b8fbee7d7af168d07a5 SHA512 1bf5789c683896ffde160f96dc6fcb2ef58dd645a208b3d8e08863fd176337ae81e4d29535bb18df909cfe233576f25d93c35ad1072fca3a79b19e784638f5fb
 AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1e0b8193fa80d70a776c0cf24b2eee585cf77292bc2112b60075414a4d05ebe16dc26eb3c2976a44420774 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41
 AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
-DIST apache-tomcat-10.0.13-src.tar.gz 6070494 BLAKE2B f588dc6fac49b07dcdd70958ed477cc9e5e4f5c76f56d41e4baf654b8b7e4be80432b3a4510fdb030855940d3e93045c0f54adde277bec2fe1152b43a96c6f85 SHA512 91993c9236af381cc7ae6f96126d0fba30c2d082ad88b816b151fb847373d93d527de5784dd1e2295adb6cfbb5fd591e8a9cab0c1b1ef96ba54b8b3ec0f91e9e
 DIST apache-tomcat-10.0.14-src.tar.gz 6074341 BLAKE2B e6607773aebb5b5279720cbcf667e9f82d752833a323dd611d411bcb48d6b0f42a98b9120d2bf29bb53e563f7f421194e92a41c89dadff76db2f6aaa171af64b SHA512 13614a410ecb7d5d1e4e6cc0e5dab9fe21809a8a70b3f42d5b0f75a2006d098857395858cdfacbe84349f73c1ce7eecca59c1bdeac809f434df8ae3f4cff46c1
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
 DIST apache-tomcat-8.5.73-src.tar.gz 5973026 BLAKE2B d3d275b7462a3bd2ce9ce03869e09e42ec0da064eb764cf8168b8d003431d075952f15c083b5486e006629ec1f9dade154b0fceb20f2584168b36599c3c5485b SHA512 6190d78e2dd5d478131443807e464821a337c5c6c24ee91953fece377ad1c758339ce1588a7a5e90443ababac239b45e4aaa0422d68cba988d7c3da5fe95d1c6
-DIST apache-tomcat-9.0.55-src.tar.gz 6136319 BLAKE2B ac49abc3198bcc2fed1310839d0c9a30b5aefb7c0a679c3bb69f7aadd82b32b7d523cc24bdd55ba9edc363e181fc93c323944ebd5801ed2b9d38e8d1b3486d4f SHA512 abfb1824387045fc6b5a5077179149e6c348c0deae933e8766c60cbf92466f5e8883ebe4cc260c23ece6d3975ab2e25f7cdde58f9dd83dfdd22cab33c967b28c
 DIST apache-tomcat-9.0.56-src.tar.gz 6138381 BLAKE2B 5e49287531fcb9bcb80ba124ed83fc3acbf3406b53424c3be5c2b3fb04da86785ba9e3ef89283c3ebb88bc8aadf8211328608edf068f0d7733c2f0ec0401d7ce SHA512 43332241fda149f9da107496cc6b812e38544c9043c567e3fe11ee01b5abfbd02b6a377c3f6090902048bd9dc67746cdc65d59f03bd0de68c05e0955bfe018c5
-EBUILD tomcat-servlet-api-10.0.13.ebuild 3015 BLAKE2B d00f9dd42643a5ac88e522cc7c8b6dae88a11b59189d5424d248859d2223432af20ad966f9173a7419cee39eeb7b4bb04dbef9b261eacfe3e1f3fbeda6500820 SHA512 479cad183a31ab15d32d24d125aa00e472d8264656ba6013f383fcc6163ffdc79307bd10ed991620b1e4c60e102337d4cbb6dd3111e2e9761c6fa02df3b2bd43
-EBUILD tomcat-servlet-api-10.0.14.ebuild 3018 BLAKE2B 27dd8444f63e6842aa42a05fc47f9e5af713ff0dce2bf027d86525b0d268ce8853e666cbc80048673b6cd8d7fc0d6c65b5fb042ba1304ed81e13efd5369bf627 SHA512 8fc3ebd3ca8082de85d97af1bfd67771893f50fbf33d74a5a6251051825efd70836e8cdefe184a31f587fa65aaccdebfc4a9e57a9c9e671b522ac53d8de264e6
+EBUILD tomcat-servlet-api-10.0.14.ebuild 3015 BLAKE2B 8326a595c857ea61fb4c7c684de79a3255822ba0235f9734cfbc64240b9e4917033f242ed12be88efaf8498fcf306c4b8e2162462fbaf0df808fdb33c40f4219 SHA512 a530aeb1d78bb9cb95ec8cb54113668995d3d6989ae50ddeeb1bf220d1629198b6b5d5a1009826aa329d1174eb99cf5b7c2df33e789f01f61d33b7521353775f
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1008 BLAKE2B 982a481d22749c6b7a68688ae81a12235bc3eee0a2a54fe0afc1791970c30186342f1541d080102fe06fbbc58305ed5ce86b4ed3458fdc2218c23503294e022e SHA512 26c604a85510835c146df1ed62ac97de9e9721388692f8e818949bdc9907e4d76b2077c785ae45b04774d493a147411d9ab1fb529a39c6c71b9b68970e468cb2
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1419 BLAKE2B e512a93e76e7e675606f112baad26f0c5013654293bf0a95085d255911c444b8ede5f0c283237810e025a9877dd41ae7285c57e0ce781ab434f29a98d3f58122 SHA512 d64b2289bdd50b8e320bc2927580080e70b532c25ffd4743342401527c4e90b7db2b6ffec35598d4e6e9e426880f7b0e10ccffc711ae05c06043586f06972ee2
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 25cca0a5612b56c0c2999c574f3ae6b00f5940eca3d39e6378e5d2686d8fc6a75b728d0609dc3443a38a3edef641825c8862f17693b2920403369eb99d4c2371 SHA512 033a9bbd48a76792d9c00f5bda4c32d9c808484cde33c62206d2753b665f6d99c7668b95f2cf3e4337bcbbd00478de78d98623443be50e84c67e3d9382f44e1d
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
 EBUILD tomcat-servlet-api-8.5.73.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
-EBUILD tomcat-servlet-api-9.0.55.ebuild 3009 BLAKE2B 6a687dee6eeb283532ccffe1e29c248755c2aa639d7a716b21b6097a99c2bdca62fc6b1acf017cff5de27d2a7e91037f2b1212d6bbb5699b3ba9f1b04f9d909e SHA512 e330e8959e3d3d2d7f3639160065e35963515df5bb886672c4359c26562fc2fab9d77ff40c8fb23e6ecdf9a67adcf1ee77f69da8fed681b7b2e0acc67d02b945
-EBUILD tomcat-servlet-api-9.0.56.ebuild 3013 BLAKE2B 2d9e24eb17a9dee04bd8e4c9bb8af8fd7fdb1d372b145bdb42bef7444a0011be5d194d80ced06702d384b981ca4aad59bece95f47b713d034d320e257879b57c SHA512 0d0a2e328117552fa6df0edd1edd3e0feb7b1d69a12631d850c86738025a1a4c8a4277bb7b968d50508028b2750901771878c22e6fddd8e5235f20491a59359f
+EBUILD tomcat-servlet-api-9.0.56.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.13.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.13.ebuild
deleted file mode 100644
index e360880764ab..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.13.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="5.0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compile and package
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.14.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.14.ebuild
index 7366df4ba5ad..440d44e0a658 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.14.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.55.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.55.ebuild
deleted file mode 100644
index 4811db9874c5..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.55.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="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
-
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.56.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.56.ebuild
index 65f8feefd348..f1c865a27bec 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.56.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.56.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/xalan/Manifest b/dev-java/xalan/Manifest
index 66e4e4c89dbb..64bbab1d703b 100644
--- a/dev-java/xalan/Manifest
+++ b/dev-java/xalan/Manifest
@@ -1,4 +1,4 @@
 DIST xalan-j_2_7_2-bin.zip 17740075 BLAKE2B 244fd71011fa957ff1988dbbb58e40af4ad218aafbd92f2a6ec305d59ec0fb221a283442b24e4290f6d2e853cfad39d689c1397b4d18f34f4c94403610079328 SHA512 ae2be0bfc5e794b159c2d16718275a6ce6e8f63d681e2d13875f233d334a37aba872206c6c1f70565698ceaf4c66261c7df6db6c524e6e8da5dafe2f17cefddf
 DIST xalan-j_2_7_2-src.tar.gz 8416261 BLAKE2B be67c9f2f7ec1140965dc148aea94347e60a2969deb1fac5834c1458d10b3dca91b448a44ed6ebbbb227e4f04780ce0142e812cd99d8862a4cbbf5e8e2af4cb3 SHA512 2f1fa105b3cb8082594e3121a245464e1b7c15464b1ead2d10e306e51ef61ded5d7fcd70c034fa46f41c4a8c14316e376cc14d8045c8aadfce80f2e4bd1b61d8
-EBUILD xalan-2.7.2-r1.ebuild 1804 BLAKE2B 232fc0f7afdaf42e099c6d96af1123f88a53a66f061bb0966604b38818d7189efa3d3c8e37e1378a3ac0310ae46b12ac918495cc943fa1084b25cef8496a241f SHA512 ba00767a262f80fb54498cc47661bf605e9f0d72c30cd7c6d4370d29a1bfa69a31c558a32ffa3948f07e2609bb06cbd89e701c1bef8e6740958fca1a5b7dd598
+EBUILD xalan-2.7.2-r1.ebuild 1833 BLAKE2B 1e38d3c135a004e958b4163d6e761828ce3f60035b8a66b57e0eca3f4fdee81fa6b764bc20e900c51b3354b068ec37411da08730d1733ebda99a86ed5fd464a2 SHA512 bd191467077a2e0ccd769655ac7a0d8506169bf592538bfb1292348f4f02c7a47df1886a11c81b5407883969b9386d4bd645301d4870c5639c247571175e9731
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/xalan/xalan-2.7.2-r1.ebuild b/dev-java/xalan/xalan-2.7.2-r1.ebuild
index 332cb5588c95..9d2ccaa630dc 100644
--- a/dev-java/xalan/xalan-2.7.2-r1.ebuild
+++ b/dev-java/xalan/xalan-2.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,6 +8,7 @@ EAPI=7
 # Apache StyleBook, which is long dead though it is bundled here.
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="xalan:xalan:2.7.2"
 
 inherit java-pkg-2 java-ant-2
 
diff --git a/dev-java/xml-commons-external/Manifest b/dev-java/xml-commons-external/Manifest
index fbbb2cfbbedd..f11a276be129 100644
--- a/dev-java/xml-commons-external/Manifest
+++ b/dev-java/xml-commons-external/Manifest
@@ -1,5 +1,5 @@
 DIST xml-commons-external-1.3.04.tar.bz2 659665 BLAKE2B b7f51fab7162b905142c5256f1d03d519b4ab387edf8b4c3d738ac138cf6ad71f29fd568c99423f840be6eb02bb50e89cfab3c729d2d5071d8a66e30836d8f5e SHA512 8bc71a0850e751ae4a5057833d57b2235734facbae43c733b0a9d86e5be99af016b737f12f5566c736f71374a709dee9954089db8fbeff4fb4cbb236a9fd6abb
 DIST xml-commons-external-1.4.01.jar 656529 BLAKE2B c51ca760c23759d4f4ad11fcb44caa1cb0bcb2785d9095ed56dba9b0d5fe57370a9d9aaeed5a8e0c1fa67918237ce693590bac791200add2e85155ab87ffe40b SHA512 f00773eec613453d0e1b7b0857b01c51d1926079f38e172953c4ef0350f063439acc8b5967f947c8d15a73e5d53e8887c3bf30122d5f7c553bcef349e5a8cb9a
-EBUILD xml-commons-external-1.3.04-r1.ebuild 1136 BLAKE2B 11a888f3719764a06ea3c6ad0d7ac5732410e8b67c3e4a431386e9e969d30104a5f02131fe2005f091b26df2f3a996366be5c82519b867ee66143ce118f3a015 SHA512 32e690d333a743c4ba1ea36763edb0510f8d8e9a43ba0272164e42df3a35d11e495d357ff7955bcc0dbe670957aa9224f21fda4fe6f084a2d37f082f9ea7d73a
-EBUILD xml-commons-external-1.4.01-r2.ebuild 741 BLAKE2B 31917e3062b14189e5024a98a104fe447d8f431b2427e65cefee60b2a41d5d1e3582886048ad1f3792e3b599ca810189463389eb39f58d5fc27843fc9b54fdb6 SHA512 9a5121fefe8d3850b7086a3bdd714c38e2ce9e14425103fab8e91ab8d15b7754bbf11a0a698d461be7e90ba01b007be56783f2de3dd4f678c4e5408bf5cac5d4
+EBUILD xml-commons-external-1.3.04-r1.ebuild 1176 BLAKE2B 9ecd949cbe8aa224da80696219c7d43896ea673fc18f33653b138cdf60475b1a6b05186134b8ece5877db98b6788c132f7e7757d587a4f87e4cc1dbb9e604871 SHA512 3bcb0344160d994a5233703239cc667999ef4f12fcbd9bd2e03fc7a4986adca1a9c0815968645664ac25e0d04357381537f0f21f91b1a6349a72ab7070927731
+EBUILD xml-commons-external-1.4.01-r2.ebuild 777 BLAKE2B 128d9741d7d328eef9495af7d34fd160dcb6e32e369a7dfd660f52bc72df62fe48a8b53e47441f8ff8733043bebfa7aff91f5e93af423816339214032e97a726 SHA512 60da15652a5aed745ee0f13aca803048cf803f3c307842acb9778746b4a728b7d78f109baa997b03935e4d4aee1aceddd454eead4b2670846bf6badf51ba08e2
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.3.04-r1.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.3.04-r1.ebuild
index e4bb6a5f39e4..02ca57c136ba 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.3.04-r1.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.3.04-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="xml-apis:xml-apis-ext:1.3.04"
 
 inherit java-pkg-2 java-ant-2
 
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild
index 76a70dc51431..ace9a08b3555 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="xml-apis:xml-apis:1.4.01"
 
 inherit java-pkg-2 java-pkg-simple
author	V3n3RiX <venerix@koprulu.sector>	2022-01-16 20:27:28 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-01-16 20:27:28 +0000
commit	2fd57282f0262ca084e05b0f2c63fbada395d02b (patch)
tree	4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /dev-java
parent	c3bc61051d7f12b4c682efa7a5460bbc8815649e (diff)