gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /dev-java
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
578 files changed, 6001 insertions, 10430 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 3abb09037fe2..ff2d8d1cc973 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/airline/Manifest b/dev-java/airline/Manifest
deleted file mode 100644
index d54d8d74bd51..000000000000
--- a/dev-java/airline/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dev-java-airline-0.7.tar.gz 40489 BLAKE2B 507ee6cb7757d16c5b015269a61ff1b176898ae820eecb7d8cad0d9aacad5b8ab732c197b9c0ef71a62b06e98d6ad9e9637a3f36b9b065a7861c9f0cb3f28d7f SHA512 5c9bd29de0e48c94552daf4206a9a894abe5f67ea955217c487095167ed25db2e38b1d0d297322ed2901cb1615d0067e526e10c0d7a0842bbf540d2ab4cbafea
-EBUILD airline-0.7-r1.ebuild 788 BLAKE2B dd8cce48396228c8c1322ec3b9feeaa5adc960e293410ecef15e82e132a98a6f705f35066f29d651d8bef93f89532dcb76305723b8eb3974af56256064edfecb SHA512 f610d1a54bc7491e5c8ca51396e0d691cd6a32991a96632de967891e42092b1b0ddc23f7caa50c1bf662a64b5151a440c2bd9c0bc9c79fecf444f8109a7f28a6
-MISC metadata.xml 317 BLAKE2B cf9f82fa0db1896e9576514724d0cb58a77f8d23d18fb396eeb0a5ecdfe1c3ce26d8a0930132d366cbddf041387d2726f4afe5065f19fc78a5d55927322d267d SHA512 eb3decfaf0a1a8d2d0e1b7f846e00d0d27bdb24d94e5ec98aee1c1686fcfc686d50cccdcfe176bb3d833512ddf6f0c23364b6f9793cd9cd72acc074410ecceb2
diff --git a/dev-java/airline/airline-0.7-r1.ebuild b/dev-java/airline/airline-0.7-r1.ebuild
deleted file mode 100644
index acbb765ec82f..000000000000
--- a/dev-java/airline/airline-0.7-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java annotation-based framework for parsing Git like command line structures"
-HOMEPAGE="https://github.com/airlift/airline/"
-# Renaming to avoid conflict with app-vim/airline:
-SRC_URI="https://github.com/airlift/${PN}/archive/${PV}.tar.gz -> ${CATEGORY}-${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CP_DEPEND="dev-java/guava:20
-	dev-java/javax-inject:0
-	dev-java/jsr305:0"
-
-DEPEND=">=virtual/jdk-1.7
-	${CP_DEPEND}"
-
-RDEPEND=">=virtual/jre-1.7
-	${CP_DEPEND}"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src/main/java"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.md
-}
diff --git a/dev-java/airline/metadata.xml b/dev-java/airline/metadata.xml
deleted file mode 100644
index fd33ef434bc6..000000000000
--- a/dev-java/airline/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">airlift/airline</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/ant-apache-log4j/Manifest b/dev-java/ant-apache-log4j/Manifest
index 2dc09964c85e..c16979e7e73a 100644
--- a/dev-java/ant-apache-log4j/Manifest
+++ b/dev-java/ant-apache-log4j/Manifest
@@ -1,4 +1,5 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
+EBUILD ant-apache-log4j-1.10.9-r1.ebuild 395 BLAKE2B 0d68c72d4fa5a3f28bed9c87a513a8134ca75b4c0631e9f853e60ed9d94cbb9eddef7f291223f0ec7e9956add0bce78fa6322d11ac889f0a8410e0155f96d9cb SHA512 ea4d0f9a2f50029650930166303d1545ce91833b60c09c50c4aec8b4300b8437a34cc7db484b0b4250d87dacd6038159c141a6ded0f2fb09ddea94e47a093716
 EBUILD ant-apache-log4j-1.10.9.ebuild 388 BLAKE2B 4c25ff0efc34bff1fd224d7dea4fb3216b0a1f7c42796edbcdee9eb2bfbca95c441a52fee03dc381a5999905048f5092813db9b359e82ee8ff1423f30c0ad927 SHA512 a9925cb6bd56d0aeb25a398f3640d9867048b1555f9f7970f4294e8eee3cdb4ad0d1747ca4a1fde48346ddf51d1d6a58df8c02125554612cda6eddbd9966fe7c
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
new file mode 100644
index 000000000000..89617f7176fe
--- /dev/null
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME="log4j-12-api-2"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="dev-java/log4j-12-api:2"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 20d29c22da0a..a9053371d965 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,5 +1,5 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-core-1.10.9-r2.ebuild 4184 BLAKE2B 8dcd76c074ca62e965c8b1409ec98f9d777753b8dc3ed797aa3cc033159ce3e3473c20548131d57ea5ae8d54100279dea4ba5516429ad0e8f1a539baa047e420 SHA512 ed42bfe69d3b4ff4e69e74253ebeb338d662a413c7761808df45ad62cba0afb83d531212bcb297d45fc11c8a0e877c3bb7ca1a1da53782265a2b23cd7280dfdc
+EBUILD ant-core-1.10.9-r3.ebuild 4061 BLAKE2B 45d5aeaa00d77df364d15c62cb7c6eb3a032c2f9abbd4136d16534b2b480c3b3f446bc5217c8fbbfcff9295f2de5cdb3fa664e8dad615b963b497c499958588a SHA512 70d0bbdb182cfa4521211842138c31db2ead843a464997ad7cce461fc7957f935468927d6183563cbfcf4f9c8bd9794cd969f79a946c694ebb41ff3147a22ab0
 EBUILD ant-core-1.10.9.ebuild 2743 BLAKE2B 5cfca20522c55dd4894f3ab31d027d68343b363fff462bc4cc0acfcebc4f2f0552676ce8c10caed56577cc87325f3ac91f63d74a4c6b30b8a34243cdbe248e7d SHA512 cd338b8e765ee7081d49d8ccb21c5353a49c4af9f6600a7ff103252edadb093da33348e5b4695b69eb4bb4417a01bb265685f4c7b746e88bd41d4018544d91cc
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-core/ant-core-1.10.9-r2.ebuild b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
index d43683dda998..5e02bb8b0df4 100644
--- a/dev-java/ant-core/ant-core-1.10.9-r2.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
@@ -23,12 +23,9 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-# Some dependencies for building Javadoc are unavailable on these architectures
-REQUIRED_USE="doc? ( !arm !arm64 )"
-
 CDEPEND=">=virtual/jdk-1.8:*"
 DEPEND="${CDEPEND}
-	doc? ( !arm? ( !arm64? (
+	doc? (
 		dev-java/bcel:0
 		dev-java/bsf:2.3
 		dev-java/commons-logging:0
@@ -38,13 +35,13 @@ DEPEND="${CDEPEND}
 		dev-java/jakarta-oro:2.0
 		dev-java/jdepend:0
 		dev-java/jsch:0
-		dev-java/log4j:0
+		dev-java/log4j-12-api:2
 		dev-java/javax-mail:0
 		dev-java/sun-jai-bin:0
 		dev-java/xalan:0
 		dev-java/xml-commons-resolver:0
 		dev-java/xz-java:0
-	) ) )"
+	)"
 RDEPEND="${CDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
@@ -106,7 +103,7 @@ src_compile() {
 			jakarta-regexp-1.4
 			jdepend
 			jsch
-			log4j
+			log4j-12-api-2
 			javax-mail
 			sun-jai-bin
 			xalan
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index b35fef8675ac..71b7551da274 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,19 +1,16 @@
 AUX ecj-4.10 342 BLAKE2B c69e9a66c9239e7ff4b7b35a4dcddec7cdec02ccf782862a0428e7e4d720dc22a931b58d40db5027e186a6129d0598702d9a95b1fc85ac38957ab6769377054b SHA512 c5ed672288d957ff52d6b44e2758dd589aba050e5915ebc1be92c112ef91c7506051893ac03f08115e9a75e16f91a68d26837e8e8e1e84c6bdb5fd8f4b953474
 AUX ecj-4.13 348 BLAKE2B 8c591be42a3f2fbe414ca7f8ea3546d99bf5bf88c65a802992ddf7eed4da4642f245215b44b64e1781de33550f48459a5288feb58fd079214a59f5d3a4537c51 SHA512 2a318687de82cdd314e5a7036a59ee6638d4983c8cd1458574fba01eedd589fa265b5ebefd1bdb4a9d0e0488d39fcc71e164598d66d9423431b4293b068de8fa
 AUX ecj-4.15 354 BLAKE2B e8ddbe928140e99fa36f0e4937cf1e9bf06bc3660ffdfba91099b35e4effaae3df1cb582a3cc8e9b26415d129d3c7e6b43f69e80f714ec1770ff593aebe4d5a8 SHA512 a8c159538a280ddc3616dce8fe6d1677ac45d7a72b27c23c85224a1d7e3acbb73912f2013be99b075f7b91e7ab52b4d871280246f1af56cf3718e3ce24b8ccc0
-AUX ecj-4.21 372 BLAKE2B 49bc78d97c7daedcc314ee8db84871527ae6147b3e8d54c1cbb9f66917615090b6f487cf3aa1773743f7d1a3ae9d2be0c784b5111fcd07e340f5122176af8876 SHA512 5d81f895793db33405acd5c1572e733ed142cd6dedf0e3c5e10c0747e94f872b61254d1ed610d91c100ce1a6d2eebcaf2e8cfa2fb822fc5247f28449e2d89109
-AUX ecj-4.4 314 BLAKE2B 9855d136e85d003ef85e2b0e854d0ea6d29ee37e4221ca612d1ed6c51f89e6f2268f9082dd946468119129240166394122f54618e1a6a799dded0eeb9f0046cc SHA512 a0023e61ed3b1174e7ab7ebc9eb2bc42e9df6a23e5010ede6c2456eca60c4f4a9e11633fcc6438824fe1db4c881499b5f384715c19381411460e78e78ddca678
+AUX ecj-4.22 378 BLAKE2B d0d01286ef045eabeb70a82c9839a12758a5b942208262a1eae1abf49dc2b9a8397de773a75fafb821cfc5e65d16203d7969982275b8cd0b8941be9ccca5d200 SHA512 f687c6105029f6b46191277e88a6d16b9d814bca5dfb9ddc6dcc306db49a97052e04be8aeb52b82a9e512645b4eb47614ec046f53b398de19e0e27405314baa2
 AUX ecj-4.5 322 BLAKE2B 2941d70de68459d2bea21ae10680dbbee7888e156753e2bb7bae89b4c2aa41e453106b6ab0ae3660790cf70799550e09fd612a8736b0ac07a3859cdc25446e86 SHA512 d46976eb709a65e1d01af6b48d095325daf10a1ee4ff5da22de12593a253ba21e9550538ff13d1b7844fdb2604462d28133011301ba6a69cab83b2de7c7324f2
 DIST ecjsrc-4.10.jar 2036945 BLAKE2B cf9e50e53dac970a0b6b1231024a4efdc9adc92e02585aa4767c6511b367b32eefaf6fb3461c3c5c8160cf7205c0f708af0c433f4636b5a49caf637ba60fa092 SHA512 e85cacf6d2e21d464ff0226eac12bab8388df7a1413cb16d2982e255eb7369341792562f5080354279be0643c08fd80564a8eb2d8f59b72c8443c02577e4e1ee
 DIST ecjsrc-4.13.jar 2074963 BLAKE2B d74caf3b81543ac12497148a477dcd99fb6d14bd1d601b9e2baa0fb82d12f1211533f5ee909465b190c780ac18f1fbc1f8e12c22cddfce10501923effd7a4cc1 SHA512 f7e49b29e8aa80d627230059c9aba3f1e1fe3824bfd43eac962331d545471df5af0ac49b489aa3795e79e161101a3c6406b29f71a06143914f241916ae6953a9
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
-DIST ecjsrc-4.21.jar 2264087 BLAKE2B 2e5da35829a8a7f907e154dbb093bb496e799088d1d4694c7c9b8ceb5bac9affaac4c4fb3a347bdb49afde7f0143220d1ac27ea4ab369770150e316cf56bae9a SHA512 ab940d18f1d5fcbeef3b903a7d719ce6b1dd900d87be08f7a916d6a7d65d8b83b44332dea1642c8d75e2baac3ba8dc27faef659e365cee5f500db99aa9675ce7
-DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
+DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
 EBUILD ant-eclipse-ecj-4.10-r1.ebuild 1248 BLAKE2B 717f74dc7cb1b13d18eac10ffc03db609a90d7a7db908b02475295e2595bef41049dc32b2384012e2d01be90df8937aa13d1620c77fcd3f38c95f5db499064fc SHA512 41b887ad6b860053405f7b4ed11f7a66f7cb9cafc898ee4e4b1680afea411327b291412b1d33d1dab5de6ee1eb6a1c6464d21bdf8859463a8f6d110dbd660149
 EBUILD ant-eclipse-ecj-4.13.ebuild 1253 BLAKE2B 97cbbb46a34ba3b400299517102a7d932f8f3b9114ae028ec65d7b2a30e663721db924fe78f993494244df2da88c908358afdf5210984668ebe4fa076775dbb7 SHA512 a8f641a3305ee1220786ff9a82597f4a21a0b2664633d60cd42d5aa9d98b24cf7e7bd63b4c828515191d127177b9645535dd7c275ad5c2b1a9ce723a003188ee
-EBUILD ant-eclipse-ecj-4.15-r1.ebuild 1266 BLAKE2B 91e0bab867d845e389e632cc5e8f022880427f8d62f9f1e437a53c3f75f5589ad4baf0f426adf7458d8143484705a2c6f197e326629505191d55b45e07f134b7 SHA512 df2930273cb0d7f0577727d84c15fcb352d6bb9f1fe2765e4980c9eb6f2a866116b37a51ab561161cb12e5cbe58d5ff683db0fa3ce584003065d51ffd03d428d
-EBUILD ant-eclipse-ecj-4.21.ebuild 1279 BLAKE2B 7207d92f341c3a8172df5e8b177e5d21503ce7af90a664c87fffa20f8e25dc352d04f7ca98c2a1d09cfb9755fa7d58350efbb7fb57daf52a2c9b98158bf9d0f2 SHA512 e96b498e8668eb8b82352f07fea65ad63c177539ba4fde0684b84c883bc40fe1c3e3c3b54eb81d0b4cead1b26d12c2f13ae3ebd1de701c71685002faad9fb56e
-EBUILD ant-eclipse-ecj-4.4.2.ebuild 1246 BLAKE2B 442e1a0d37606743e6536018d5918cea9f7764847bf2550963a76e2bb097492101ddf28f30604929cad7bcbe9c2ee7b5981a4b441a61c95b37d79a71383c5b9a SHA512 8cf0b12134b7c52b4dfc8a0bf946ca20a39eaf459e29f01a6ef24ac25de659b33af7322a6d3d679a989df6f6139543492ff53e43afcbfdf2e2341053f7716a9d
+EBUILD ant-eclipse-ecj-4.15-r1.ebuild 1265 BLAKE2B 6176f4208828b43831ebcf6a9cb552fdc815fd17aa28e44ea155738ff68584361f83894b6b22d69cb776f425b9f2a144caa554883551ad596a46e3e8d43fc285 SHA512 f177439d504325d9cf25302d873c92bd1f53ad4418ee08fc5b4b84aedcd8f89831584a833c5944a2d7c44df85ad8a047eeebce1025b494722232fe871ca6bd8f
+EBUILD ant-eclipse-ecj-4.22.ebuild 1422 BLAKE2B a61913fa08c0ead3742a7699624a7aae99e428f72996b370765db1ef7952adb96b1000f528e1f5d5ac13e97070ced630d67762bd0be1ad63f84f29839705eac7 SHA512 57fc3e388f5f71a5bd5a01b4891d4192d7297faba5c5f991e9298070d572ed135bb4d0fd201df861696c863547880691aff58529bd924803f62382bb369b646a
 EBUILD ant-eclipse-ecj-4.5.1.ebuild 1247 BLAKE2B 43d30d904d98149ab9d91ea66c3c0a53837010572de25c7b0e0bfdd8b0f4c230c4385c8b156a1a2cf3b77b1e9282c813a448934515953a300da76c4a20788880 SHA512 39e4e0870c2fa5151c77cac1b60a929f4959d68012219d584e8aa395a1983140f86775328f872694addd69ef6a25283265a4dec526bb224eb5335a5f5d6292e8
 MISC metadata.xml 547 BLAKE2B 250bb477a3547d97e993539eb2965d6ff8a5085627c8a4ce221fc74704b1c824b1ba4a2891a850b820bd42c4ccf3e684af3035ccaf45cc595f0eac6b62da2a4a SHA512 e1283be49bebaf5bb03e55ead8336a046eff3c657e600dd1456690280e2ae2f9f4fb12987d7c1cfd192e41d8f8d40b36896a2d7430063d243f374e4aedc4ec77
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
index 8dfdbb8d8264..5957b5aefbe2 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.15"
 IUSE=""
 
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.21.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild
index 0b394b88d26a..21b3dfc5b0d8 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.21.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple prefix
 
-DMF="R-${PV}-202109060500"
+DMF="R-${PV}-202111241800"
 
 DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
 HOMEPAGE="http://www.eclipse.org/"
@@ -15,19 +15,18 @@ SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV
 
 LICENSE="EPL-1.0"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT=$(ver_cut 1-2)
+SLOT="4.22"
 IUSE=""
 
-CDEPEND="
-	~dev-java/eclipse-ecj-${PV}:${SLOT}
-	dev-java/ant-core:0
-"
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+	dev-java/ant-core:0"
+# though technically both could be set to 1.8 and it would
+# compile using jdk 11+, it would not compile using jdk 1.8
+# because eclipse ecj has min jdk 11
 RDEPEND="${CDEPEND}
-	>=virtual/jre-11:*
-"
+	>=virtual/jre-11:*"
 DEPEND="${CDEPEND}
-	>=virtual/jdk-11:*
-"
+	>=virtual/jdk-11:*"
 BDEPEND="app-arch/unzip"
 
 JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
deleted file mode 100644
index 72245b3883f7..000000000000
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple prefix
-
-DMF="R-${PV}-201502041700"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT="4.4"
-IUSE=""
-
-CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
-	>=dev-java/ant-core-1.7"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
-
-java_prepare() {
-	# Remove everything but the Ant component.
-	find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
-
-	rm build.xml || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	insinto /usr/share/java-config-2/compiler
-	doins "${FILESDIR}/ecj-${SLOT}"
-	eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
-}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.21 b/dev-java/ant-eclipse-ecj/files/ecj-4.22
index 1db5895e6426..5bbcc318d9ba 100644
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.21
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.22
@@ -1,7 +1,7 @@
-JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.21"
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.22"
 PACKAGE="=dev-java/ant-eclipse-ecj-4.21*"
-SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16"
-SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17"
 ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.15,ant-eclipse-ecj-4.21"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.22,ant-eclipse-ecj-4.22"
 GENERATION="2"
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.4 b/dev-java/ant-eclipse-ecj/files/ecj-4.4
deleted file mode 100644
index 36fef918e57b..000000000000
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.4
+++ /dev/null
@@ -1,7 +0,0 @@
-JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.4"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.4*"
-SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7"
-SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7"
-ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.4,ant-eclipse-ecj-4.4"
-GENERATION="2"
diff --git a/dev-java/ant-javamail/Manifest b/dev-java/ant-javamail/Manifest
index 5a6fd0da69d8..36364d8dc858 100644
--- a/dev-java/ant-javamail/Manifest
+++ b/dev-java/ant-javamail/Manifest
@@ -1,5 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-javamail-1.10.9-r1.ebuild 511 BLAKE2B 7df30d50b3881fed6f85d3a4cb721f6076f17c65cbe85668efbe1460ebcec484b4d0e28f1b94c305a58446568ae3510702718805501c9e9bd4264906258cc34e SHA512 eb4a58ec4762aa1c99d3be44b9252eaf832e754dc5eade459de6f6c533ac86ebc46f7be899ac048d1aea0742f80ba6df7e11e00cd433f01e77844e2c44c16ed8
-EBUILD ant-javamail-1.10.9.ebuild 518 BLAKE2B 6f4246e708ddb2b3de9971dccca451957f90d4d3ef09214b782ed31e6375a3dabfa729a262abc4388a67d210b3c7657a45697722da9e99fa8e29b557de92f846 SHA512 8959fc1ef8b032140cef7ccb356a907b6a935a3811bc6ccb26781754520103652cd0b39e7077e3251bafaabd91d37280ff47265cc5ab71e83163363a917bbf24
+EBUILD ant-javamail-1.10.9-r1.ebuild 508 BLAKE2B 5ff3f8f4e795476d6a08a89b2391ad330c575f62c7357f2a31fcdd2ffc617ec66cd24beeeec59b1dfb95714aa66b51b10bc385bc6aa5bb8704558c7ba5f83b6f SHA512 1fb691049f12c3b5d463558941aba878c326c8b1cacd418f04043d9243dad8ee52a1ecc0d7179bbb39ba22f2b57c30b9e99a19eb1b4004828e77579b037931e1
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild
index 4168b32358bc..b48933c6f765 100644
--- a/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild
+++ b/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME=( "gnu-jaf-1" "javax-mail" )
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # needs some classes from javax.activation.* which are not in jdk 11
 DEPEND="virtual/jdk:1.8
diff --git a/dev-java/ant-javamail/ant-javamail-1.10.9.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.9.ebuild
deleted file mode 100644
index 5619e69090d8..000000000000
--- a/dev-java/ant-javamail/ant-javamail-1.10.9.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME=( "gnu-jaf-1" "oracle-javamail" )
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# needs some classes from javax.activation.* which are not in jdk 11
-DEPEND="virtual/jdk:1.8
-	dev-java/gnu-jaf:1
-	dev-java/oracle-javamail:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/antlr-runtime/Manifest b/dev-java/antlr-runtime/Manifest
index d4e17964331a..c0cc4328b691 100644
--- a/dev-java/antlr-runtime/Manifest
+++ b/dev-java/antlr-runtime/Manifest
@@ -1,3 +1,5 @@
+DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127
 DIST antlr-runtime-3.5.2-sources.jar 206095 BLAKE2B 62b5ca08b13b80e1cdfe82d7354f75dcd3d82d7618bb2d20c4973c0b588d60cc034a8bc265d1cba6b3fc09f5583450a48948dc0beb86c4b13c6b9fdb32de37fd SHA512 fda8b0b1d6f779098c885360ea5f5e93eac5153f5bf761f3dbc954209b69b76edd21a8e4915bb9e567e5c095f1d173e19429bea34da9698bf241d17599858847
-EBUILD antlr-runtime-3.5.2.ebuild 1016 BLAKE2B 9a6e1c257499efad2c9c25488ef5e3707c863ce5660888763b9f29e7c5fec55fb26b698bfe791440fe42356dc3f0262294f7afa70105ae328096e136772a3e68 SHA512 bd128a0a0a6e7746154cb9e1da027f7a35a77941d35e263852859a0b080e9710bed143cb86e8c2ceb00db4af72885fddfb8d34a238c2aef8da87535a98d95f61
+EBUILD antlr-runtime-3.5.2.ebuild 1012 BLAKE2B 4bca36c4491f8e88fd31a8c270737d868b30465e7068db823a354e9dd0d611b19799101cdf448581e4551740f88f70708451f92c93ee9443eb6aab5b6c75e8b7 SHA512 1517b4284e15876a4a4c6dde04ea45410bb20b95f6a5d86c49f6c545bf48d774fcba54ff65a41ed585f440fe2e1f30fc96ab1b29061740e18727f4fd7b35b7d6
+EBUILD antlr-runtime-4.9.3.ebuild 929 BLAKE2B af9f6572ff15703e27f59e03cf151c0dc4c06bcfbcb95cb6a75b7d3162e9d538c502adc03d0bcc148bd56d0b1b3d636c8ab94a22058b91b7467538fbb7093581 SHA512 a577027d78dd7b091187f018e39444db8083417cb8d9beb273ef03862c7fe26de2a1422b2caae9bb62d1bbda194146f67a61091a4ff279f8703cd061cfc353cc
 MISC metadata.xml 402 BLAKE2B 8a48b0d50a6356a3bf1f8f2545269d5d21b75af4ba38b07dea53d5660216a8580f5c87b58dc6c235c79f7b5d15f7e4f6925105a2402f557413cf942d21153686 SHA512 26faab37f0c4c1c44000705ee08ec536c6503b70d972b353fcebbd48236688f3d7b5604b2db55753a9b38ac5b86a2d214a937cc68676e1356bec00045cacfe2b
diff --git a/dev-java/antlr-runtime/antlr-runtime-3.5.2.ebuild b/dev-java/antlr-runtime/antlr-runtime-3.5.2.ebuild
index 27593c24d267..036aa905f922 100644
--- a/dev-java/antlr-runtime/antlr-runtime-3.5.2.ebuild
+++ b/dev-java/antlr-runtime/antlr-runtime-3.5.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/antlr/${PN}/${PV}/${P}-sources.jar"
 
 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: ${P}.pom
diff --git a/dev-java/antlr-runtime/antlr-runtime-4.9.3.ebuild b/dev-java/antlr-runtime/antlr-runtime-4.9.3.ebuild
new file mode 100644
index 000000000000..31d041e6a974
--- /dev/null
+++ b/dev-java/antlr-runtime/antlr-runtime-4.9.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Without annotation processing using runtime-testsuite/processors,
+# the tests are bound to fail.  However, the annotation processor
+# has been dropped from the 'master' branch as of January 2022, so
+# when updating this package to a new upstream version, please
+# check if it is possible to enable the tests and pass them.
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.antlr:antlr4-runtime:4.9.3"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN%-runtime}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="ANTLR 4 Runtime"
+HOMEPAGE="https://www.antlr.org/"
+SRC_URI="https://github.com/antlr/antlr4/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${MY_PN}4-${PV}"
+
+JAVA_SRC_DIR="runtime/Java/src"
diff --git a/dev-java/antlr-tool/Manifest b/dev-java/antlr-tool/Manifest
index b2db4e7789c5..b2ee337367d6 100644
--- a/dev-java/antlr-tool/Manifest
+++ b/dev-java/antlr-tool/Manifest
@@ -1,5 +1,9 @@
 AUX 3.5.2-test-fixes.patch 2093 BLAKE2B 4016d770a226f1fb86f7f6e630df38c0d2ed0b4a025991f6b88e88506d2a44838c17097fc4ad5f63e506a839ebce0fcfa8e57f22415f777b0bd4c37afc93a0b1 SHA512 dcdde9daabfb3379f85d831a594259b21e1cc0283f7f0972d42801cb144d6932fe5cccff576cc885614db3f9e07b98782c4932a03687658df35f698455588533
+AUX 4.9.3-test-fixes.patch 1399 BLAKE2B 719571607153951b6a44a7bed7c405b6e217f7a458667388d89ca15683342a5d9849155ad03771eb0f7d326af31fd0cf6e0ab9ddfbd385e189b33f0c842ab53e SHA512 b0aed6d54873ffd841ae5ac6ce1afb5d037fdde6e322903e250e46b38b84fd29ca87668f8b1f38a5c6b0ec4ad99953021d4260b67515158accbc37fd325e98eb
 DIST antlr-3.5.2.tar.gz 6927126 BLAKE2B 1907229549434dfea6ef1fa915137a2f733bd61f0a40aacb131689df619d1c92e125453ec3d1febc5d92da1841ffbde060af196cff1ca8fb6f4684600375e161 SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99
+DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127
 DIST antlr-tool-3.5.2-sources.jar 957096 BLAKE2B 39b75824e129c8111f302eb71407a683c59e91e79a3fa13c5386c4ba4aa322e706deb10b36df3591ab0843faff5702091d543272ee85d63cd92cb36cc72e1ceb SHA512 50fece361b69299be0c0941e6fe2bfacfc39c0b3dad3320126a9a80cd0f053fbaa6332612e2bab2872db122025d6abfe4b35a4636ef1c101e9131bbd2cdf5e28
-EBUILD antlr-tool-3.5.2.ebuild 1983 BLAKE2B 9bda797c081b361738b42c6092f567bcee6673479cdfd9e1324b4d15c97f1c4dc1135a4db57f41705804294560cc5f4b708056ecf6502cc9a111ad236ee6aaa0 SHA512 dc692632192d2998c28488574ad4478247d12efeb1744389750a2583ecb0988c75b851df4c0e5dc4cdf12fa0a64df39a011f215491fa7cc38744156d061624cc
-MISC metadata.xml 314 BLAKE2B 44614e69318b15302910048bed9f1a4acd92a1eb737e1861563d855aeec4e6f8f1a201f0bcbc039420a820e17f15d7deef68fb54b104d0c621def437c0457da3 SHA512 d03626431b434fe0b4fbbaaf7c860fd55390a1511c1f93f95747cc6a058795f166b73846b038bba3e843b6afdde2655ac3b7776a33276230efbaaa6d7b469d84
+DIST antlr-tool-4.9.3-sources.jar 961749 BLAKE2B 294c7ba6dff9a1039d3e570d7d49f46a564302d1e7a25ac9f662a2c293cbabadd6a5a4a94d026c4e5fcca37c407e104956badbd1cbbf71b957e464dc67cf823e SHA512 7d70e80714b673eb8301def5e66a7133b2ac477e3cc219e37877ef9df673e0599a1148a8c1929ca8eab081d4e7375c9079241765a1f38832b21cfe8608ef4429
+EBUILD antlr-tool-3.5.2.ebuild 1979 BLAKE2B 8a50f774daf5cf0f89963b1ca66444dff7e5f23b087c9049d065cceedf4c64fca5a2ee7d2f8ad6fe24367b97f467808bef8123e0b579d2c3e9398a056fb4cf3b SHA512 4fba8468420a8bfaea0800d3269cbb7ffe75465571d6523b118d40088e43eb723f0af78ff1cdace480d9c57313528011d6518767004c123d4060522b03f05781
+EBUILD antlr-tool-4.9.3.ebuild 3753 BLAKE2B 761078ed141755b481e74bc16685b731371afe062e93e0f60f44ed72a7491836d507d86306ad96208fafd693a76fea4d802a5818d66d85fdaf10d8857774f9d7 SHA512 676f88674a0b05b5b4a20172a5dfeab54a329f274a0e23c8e2b0f02fc740a1ba284db401f99d6388c92a687490eaa478ca99578a8d99a6f1c9245d764b25557a
+MISC metadata.xml 366 BLAKE2B 134ea633a45f3e33d57f4761afb1ff2d7f7778d06d66ff6e2e77a0c5777d48e8009697f64a4d50780b84b6672f352f4714a2b61d206cd158fcddd50902485caa SHA512 5b0bb774c494f1e7bbc486732abcea66922e65cd209df3d9fa090d71dabbc9aae59d437c340a5d78941d730388c95554fa80fb9852c8c0ceed05c9197d236301
diff --git a/dev-java/antlr-tool/antlr-tool-3.5.2.ebuild b/dev-java/antlr-tool/antlr-tool-3.5.2.ebuild
index 214b8c4d199c..b6a32d34d18f 100644
--- a/dev-java/antlr-tool/antlr-tool-3.5.2.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-3.5.2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}
diff --git a/dev-java/antlr-tool/antlr-tool-4.9.3.ebuild b/dev-java/antlr-tool/antlr-tool-4.9.3.ebuild
new file mode 100644
index 000000000000..835e4633d53d
--- /dev/null
+++ b/dev-java/antlr-tool/antlr-tool-4.9.3.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Artifact ID for antlr-tool is 'antlr4'
+# https://github.com/antlr/antlr4/blob/4.9.3/tool/pom.xml#L14
+MAVEN_ID="org.antlr:antlr4:4.9.3"
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN%-tool}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="The ANTLR 4 grammar compiler"
+HOMEPAGE="https://www.antlr.org/"
+# Maven Central sources JAR for tool/src/org/antlr/v4/unicode/UnicodeData.java,
+# which requires string-template-maven-plugin to generate; tarball for the rest
+SRC_URI="
+	https://github.com/antlr/antlr4/archive/${PV}.tar.gz -> ${MY_P}.tar.gz
+	https://repo1.maven.org/maven2/org/antlr/antlr4/${PV}/antlr4-${PV}-sources.jar -> ${P}-sources.jar
+"
+
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+	~dev-java/antlr-runtime-${PV}:${SLOT}
+	dev-java/antlr-runtime:3.5
+	dev-java/jakarta-json-api:1
+	dev-java/icu4j:70
+	dev-java/stringtemplate:4
+	dev-java/treelayout:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	dev-java/antlr-tool:3.5
+	test? (
+		dev-java/jol-core:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/${MY_PN}4-${PV}"
+
+JAVA_SRC_DIR=(
+	tool/src
+	../src/org # For UnicodeData.java
+)
+JAVA_RESOURCE_DIRS=( tool/resources )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,jol-core"
+JAVA_TEST_SRC_DIR=(
+	tool-testsuite/test
+	# The runtime test suite is used as a library for tool test suite
+	runtime-testsuite/{annotations,test}
+)
+JAVA_TEST_RESOURCE_DIRS=(
+	# Some resources are mixed with test source files
+	"${JAVA_TEST_SRC_DIR[0]}"
+)
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	MY_JAVA="$(java-config -J)"
+}
+
+src_prepare() {
+	java-pkg_clean
+	eapply "${FILESDIR}/${PV}-test-fixes.patch"
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	ebegin "Generating ANTLR 3 parsers"
+	"${MY_JAVA}" -cp "$(java-pkg_getjars \
+		--build-only --with-dependencies antlr-tool-3.5)" \
+		org.antlr.Tool $(find "${JAVA_SRC_DIR[@]}" -name "*.g") ||
+		die "Failed to generate ANTLR 3 parsers"
+	java-pkg-simple_src_compile
+}
+
+src_test() {
+	# Build classpath for tests
+	local test_deps=(
+		"${JAVA_TEST_GENTOO_CLASSPATH}"
+		antlr-runtime-${SLOT}
+		antlr-runtime-3.5
+		jakarta-json-api-1
+		icu4j-70
+		stringtemplate-4
+		treelayout
+	)
+	local CP="${S}/${JAVA_JAR_FILENAME}"
+	for test_dep in "${test_deps[@]}"; do
+		CP+=":$(java-pkg_getjars --with-dependencies "${test_dep}")"
+	done
+	for res_dir in "${JAVA_TEST_RESOURCE_DIRS[@]}"; do
+		CP+=":${res_dir}"
+	done
+
+	ebegin "Generating ANTLR 4 parsers for tests"
+	pushd runtime-testsuite/test > /dev/null ||
+		die "Failed to enter runtime test source directory"
+	g4_files=( $(find * -name "*.g4") )
+	for file in "${g4_files[@]}"; do
+		java_pkg="${file%/*.g4}"
+		java_pkg="${java_pkg//\//.}"
+		"${MY_JAVA}" -cp "${CP}" org.antlr.v4.Tool \
+			-visitor -package "${java_pkg}" "${file}" ||
+			die "Failed to generate ANTLR 4 parser from ${file}"
+	done
+	popd > /dev/null || die "Failed to leave runtime test source directory"
+
+	# Compile Java test sources
+	local classes="target/classes"
+	ejavac -d "${classes}" -cp "${CP}" \
+		$(find "${JAVA_TEST_SRC_DIR[@]}" -name "*.java")
+
+	# Create a list of tests to run
+	pushd "${JAVA_TEST_SRC_DIR[0]}" > /dev/null ||
+		die "Failed to enter test source directory for ${PN}"
+	local TESTS=$(find * -type f \
+		\( -name "Test*.java" -o -name "*Test.java" \) \
+		-not -name "BaseJavaToolTest.java" # No runnable methods
+	)
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+	popd > /dev/null || die "Failed to leave test source directory for ${PN}"
+
+	ejunit4 -classpath "${classes}:${CP}" ${TESTS}
+}
diff --git a/dev-java/antlr-tool/files/4.9.3-test-fixes.patch b/dev-java/antlr-tool/files/4.9.3-test-fixes.patch
new file mode 100644
index 000000000000..9cb6884ba194
--- /dev/null
+++ b/dev-java/antlr-tool/files/4.9.3-test-fixes.patch
@@ -0,0 +1,26 @@
+From 3eabbddff69dcbcaf9a59f407cc8bef4be8e215b Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Thu, 3 Feb 2022 11:51:53 -0800
+Subject: [PATCH] Use 1.8 as javac -source/-target for running tests on Java 17
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ .../test/org/antlr/v4/test/runtime/java/BaseJavaTest.java       | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/BaseJavaTest.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/BaseJavaTest.java
+index cc03bdc11..82061135e 100644
+--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/BaseJavaTest.java
++++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/BaseJavaTest.java
+@@ -137,7 +137,7 @@ public class BaseJavaTest extends BaseRuntimeTestSupport implements RuntimeTestS
+ 			fileManager.getJavaFileObjectsFromFiles(files);
+ 
+ 		Iterable<String> compileOptions =
+-			Arrays.asList("-g", "-source", "1.6", "-target", "1.6", "-implicit:class", "-Xlint:-options", "-d", getTempDirPath(), "-cp", getTempDirPath() + PATH_SEP + CLASSPATH);
++			Arrays.asList("-g", "-source", "1.8", "-target", "1.8", "-implicit:class", "-Xlint:-options", "-d", getTempDirPath(), "-cp", getTempDirPath() + PATH_SEP + CLASSPATH);
+ 
+ 		JavaCompiler.CompilationTask task =
+ 			compiler.getTask(null, fileManager, null, compileOptions, null,
+-- 
+2.34.1
+
diff --git a/dev-java/antlr-tool/metadata.xml b/dev-java/antlr-tool/metadata.xml
index ad571d3247b8..61e37d49ba13 100644
--- a/dev-java/antlr-tool/metadata.xml
+++ b/dev-java/antlr-tool/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">antlr/antlr4</remote-id>
 		<remote-id type="github">antlr/antlr3</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 13c699aeb189..96f8c3b66e92 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -1,19 +1,12 @@
 AUX 3.2-java-8.patch 1318 BLAKE2B f7cf19e6da346c50ed066782905fffeac9b9f42c9988bc3ba0d18bc434fecfaa6d4ad3e74d2c84c87854716435be4a596c47b919ce42b310e48dc70d184bc7f5 SHA512 70c9dc23ec64ba75bfcfc0597544b13c2c35c523c6f2c9d82dbc54a44c30a5432a56b6193db74ca9c3d92235bdadc5427857c364abc4df79ffdc1d2b55221d32
 AUX 3.2-test-fixes.patch 10294 BLAKE2B e2bed0bc4acd8c7de9eacfa6755f81db2cab78fb20518a51051d5a38fb33e25442e5e39ced3a94b525f3dcb5d0bad4c640c3df9da5b431efdf6d76764b11c5bd SHA512 0af15f7e315182f54c65ebcd298ebc02d6715f2233996d0effe7f44eb433e73ed7a33ee12e96d29f72b4437cead864c99150fee60c3c1740b6451619396be72b
-AUX 3.5.2-test-fixes.patch 2093 BLAKE2B 4016d770a226f1fb86f7f6e630df38c0d2ed0b4a025991f6b88e88506d2a44838c17097fc4ad5f63e506a839ebce0fcfa8e57f22415f777b0bd4c37afc93a0b1 SHA512 dcdde9daabfb3379f85d831a594259b21e1cc0283f7f0972d42801cb144d6932fe5cccff576cc885614db3f9e07b98782c4932a03687658df35f698455588533
 DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34a78522828c2ffc3c481c14b9c7784f0a9997a61f6faedde5b6d1fe12214cfd84fb274f7065f3ffe6a44abf1c SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d
 DIST antlr-3.2.jar 1928009 BLAKE2B 9c56b0142abdb7d0caabebbae12618a665f91001e2f472519549a65b8601b81fcca485898c7420087a7b631351eb26e4b98589d7284960efcc3c65155919fd2a SHA512 25a61404c4b41e48eeaed49d41122f9400092248a10eb776d75ce3513295870eca1acc4b06c74925284a27cc64ca0506e34de39fb91996f09727cc5cc72dd9a6
 DIST antlr-3.2.tar.gz 837320 BLAKE2B 3addcfed45e67a7f8f3841a890be418626d93229dc326fe4670c6b145a457203a26f01723695573692c65bb6c376349a8d8cd852b339b1f6da7b71a52e14bb4f SHA512 8984221cd89253c033a4596dd56cd51b297393a53b4682f5ab401172745d343371bf0d45417fa286ce972add1b4e474f1f3091fa1345158dbfc040702d61607c
-DIST antlr-3.5.2-complete.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0 SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
 DIST antlr-3.5.2.tar.gz 6927126 BLAKE2B 1907229549434dfea6ef1fa915137a2f733bd61f0a40aacb131689df619d1c92e125453ec3d1febc5d92da1841ffbde060af196cff1ca8fb6f4684600375e161 SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99
-DIST antlr-4.5.1-complete.jar 1478820 BLAKE2B 7f6ab8d1bad6b75ede4930fe594a3302bd2bdeac8426d65d0a16610a8da4dd3bda23db68b7feafc90449bda5032115ad0f0dbe7c376c4095cb4ccac3e7a70e84 SHA512 1109087c44706694d75a7f88f6ce96e8653467d5721505db747e7e70a4f40a24469b1fb3ffcb327819bba1548b0025412e46a11a41e329b0ecf847cb1094238c
-DIST antlr-4.5.1.tar.gz 6158475 BLAKE2B 17cf84a60393c786d8b8addd93b87998178cea55f2a6bcc4ca244655a6d2aacc15226111b00fc0a8a6424f8a7c6eb3bfa49172e3b2149714a5c0c6ad69943cd9 SHA512 949306b0ee87a0c002664ee7ac0f32c43385c501b4e28f181417559ce09b07cc12a8441c3bb81f8a72feba3d4ccc693a3c03bcccad7fc81223cddb19e10468a9
-DIST antlr-4.5.3-complete.jar 1485121 BLAKE2B 84d41b17bd30dfad7a79e9759802c76d986299cc592c7b2c859225ed00989bb2709b14635ee40c8ecfe79e2441ecb697b2d17b7e6e789a7549868b93a3876f77 SHA512 53dcadf3007c9bdbeb391ea72fb9bab7c086fa0b9d1d93b83050b2ebb726c2f52743b5ba944c68f6da513d915ab5e8721676d74d823c32484928ccad2a28f1e4
-DIST antlr-4.5.3.tar.gz 6760401 BLAKE2B d436b4a964c527e230912a0ba23146af199478570cf5491eadeb5025e814642658cc71d71e6a09b5df3cc18e9b8991abf930cab70677d117a112e0922e046e07 SHA512 d0e61baebb338e5e4e8eaf87aa6ef52a568ec51bc86bc07acf8f82be0c173ea4f0f85978dfd034c2642505888c0849663f6b6fb030c4c19e0571f29277fb54f7
+DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127
 EBUILD antlr-2.7.7-r9.ebuild 1151 BLAKE2B c5e4df7a9ddc43f3e1b490dbc9e05d252cfef1350a96ef9d4f8cf01dff06953e949a192d5bd36ba80d0315f33e32d91cab07176a4f0d5e7f368088342751891d SHA512 faf7da062bfbd5558d29d9d4fa2036f1cba91d4921e2b83ea3bf30f966a41536de0d657ef14ec19e45c8ed460e28778bc90e55edc4940b3331eac5ea2e3d4056
 EBUILD antlr-3.2-r1.ebuild 3249 BLAKE2B d0c72e2b8052f426e5c001f2860d7af1ca1c1bc213451507fbab4ea6570e3045e1c55307dc1b1dd0820d97d16347ae794d93b64e1b9049976c3b02f56b2ff29d SHA512 5f21e8ab24d2040299e7638d74a2f764a165c31c36128c07414960c317d1895804bc79dffe2c6ea760b21cd1e4a27aa01a8ebb44c4ef21dfae42edc51e4a6080
-EBUILD antlr-3.5.2-r1.ebuild 3022 BLAKE2B 6f3a8b1716d3206391d5f657f732ee1ffe9a02075560afb39ba33b452b03f70b75d953ead0b09a8fd0e96262ef470a39cdb9f852be2e31cfede284d2982d3b0d SHA512 9f19d2fa54a8cfcd0c3d7bc8d6fb0d23886435e0ca6b78da5db97a84598224d9e1a5b68db2d4a4521a3afa60f1e4faa15085d17507e87abe3cfff17417302f74
-EBUILD antlr-3.5.2-r2.ebuild 1608 BLAKE2B fadedd1d088db569aad09256c054e5b49c47d3356037e50e018346ee20b08ccd98805cde1aadec086e680004c8c3c3c8eb26bda303529a8a2b647ba3d3d56c9b SHA512 4f72f00bb7660d89b222d1fa3db088563f3ca8357ccb7cb1e59bb1ccfd0dda930d8077a13e98f92952080570197e3bd3d88fb53615249a15340d67adbca7c553
-EBUILD antlr-4.5.1.ebuild 2467 BLAKE2B 176f21576d433466f221190f71bb27a7600904efef43d182a025698e30420345b244f5c2e353d49fb25937bceca683aa30e18d5ee3b0b44c5f89baf1e8bc742c SHA512 74174f4ee6fe803c4e243be51562339e530934a6aed38a8024ed687fbc888b2f01c942558e8de90d42f28a5ae0801d95b148497310304466686c087cd4eb8d7a
-EBUILD antlr-4.5.3-r1.ebuild 2521 BLAKE2B 439d098a1ae5b7238d89f896723418a212ca4fc1c59ab4da70ede8f3d245fe63befc4ae1c81c8c41a5a1aa351b643e56be916cff04d213aad8ef044483a5ce2c SHA512 35fb47714fc1187138706791bee5f352c3c8df99a1e4efbce67df358a311d531be27c4a4214c2e7c114667e5de656b0130e45cfe2cbf47662c08aedaf6e83c10
+EBUILD antlr-3.5.2-r2.ebuild 1604 BLAKE2B 8e9c84841818f52589ca22790f7e61c5c8b78b018e1f78dfa45b0bc3245f3c1a10a48f5fa96f1a45c6b5a2d1640ebe24683bd41d705f18e9ddab41a0ee0da5bc SHA512 46ff86ab7b47a783b8080ab7957fda04d8765da069d2e5daed6e9a39b921ed9bc56c21b32807b29ebdb3240282515e355a8ec3ec5d0e15a1ca5fbe997c9a7199
+EBUILD antlr-4.9.3.ebuild 1640 BLAKE2B 408eb5fda7d1598621e34462f177fd641ad36d8e7906e508227377eeea2dd7e55ad3cb71af2a603de6a38cb0da85065ee7b71db42af4309c3ee251e10f5c4bd0 SHA512 485130449328d364975926fc0374e0ed9e12ca2c7d619c9d1af0daaa3dd5879a491bb953d41ffe84ef653702863f7da950b38766414ce9e1823fa1c909ce3174
 MISC metadata.xml 314 BLAKE2B 997f9c85d72f9b4cae21a3ecd063374f769f369d66ce8531fb158a17b9408ae3d35f117386acd08b89c16d5e0e8130b26ddada87b448529bf41a02deb5c1cdf2 SHA512 ad99513f6581ce95415e908eeba185cd4b6d03a8297e99735c7e79bf3dca1fa0c61a7ae03e47d8ba7429269a29558fae7321583b4f7d328e1da6a091237d9fde
diff --git a/dev-java/antlr/antlr-3.5.2-r1.ebuild b/dev-java/antlr/antlr-3.5.2-r1.ebuild
deleted file mode 100644
index 0c83334bc403..000000000000
--- a/dev-java/antlr/antlr-3.5.2-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="https://www.antlr3.org/"
-SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://www.antlr3.org/download/${P}-complete.jar" # Prebuilt version needed.
-LICENSE="BSD"
-SLOT="3.5"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-java/stringtemplate:4"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${PN}3-${PV}"
-JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar"
-JAVA_GENTOO_CLASSPATH="stringtemplate-4"
-PATCHES=(
-	"${FILESDIR}/${PV}-test-fixes.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	default
-
-	java-pkg_clean
-
-	# This requires StringTemplate v3 and is only needed for
-	# output=template. Nothing in the tree currently needs that and the
-	# dependency situation is already hairy enough as it is.
-	rm -v runtime/Java/src/main/java/org/antlr/runtime/tree/DOTTreeGenerator.java || die
-
-	# Some tests have to be removed as a result.
-	rm -v tool/src/test/java/org/antlr/test/Test{RewriteTemplates,Templates}.java || die
-
-	# Some tests fail under Java 8 in ways that probably aren't limited
-	# to the tests. This is bad but upstream is never going to update
-	# 3.5. At the time of writing, we only use it to build 4 anyway.
-	if java-pkg_is-vm-version-ge 1.8; then
-		rm -v tool/src/test/java/org/antlr/test/Test{DFAConversion,SemanticPredicates,TopologicalSort}.java || die
-	fi
-}
-
-src_compile() {
-	cd "${S}/runtime/Java/src/main" || die
-	JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile
-
-	cd "${S}/tool/src/main" || die
-	java -jar "${DISTDIR}/${P}-complete.jar" $(find antlr3 -name "*.g") || die
-	JAVA_JAR_FILENAME="${S}/${PN}-tool.jar" java-pkg-simple_src_compile
-	java-pkg_addres "${S}/${PN}-tool.jar" resources
-}
-
-src_install() {
-	java-pkg_dojar ${PN}-{runtime,tool}.jar
-	java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.Tool
-	use doc && java-pkg_dojavadoc runtime/Java/src/main/target/api
-}
-
-src_test() {
-	cd tool/src/test/java || die
-	local CP=".:${S}/${PN}-runtime.jar:${S}/${PN}-tool.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
-
-	local TESTS=$(find * -name "Test*.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -classpath "${CP}" $(find -name "*.java")
-
-	# ejunit automatically adds all registered subdependencies to the
-	# classpath, which is annoying in this case because of the cyclic
-	# dependency on stringtemplate. It will blow up when trying to find
-	# antlr-3.5 on the system before it is installed. The easiest but
-	# somewhat ugly way to avoid this is to unset JAVA_PKG_DEPEND_FILE.
-	JAVA_PKG_DEPEND_FILE= ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/antlr/antlr-3.5.2-r2.ebuild b/dev-java/antlr/antlr-3.5.2-r2.ebuild
index c085043de3e4..3dc31c7456f2 100644
--- a/dev-java/antlr/antlr-3.5.2-r2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}
diff --git a/dev-java/antlr/antlr-4.5.1.ebuild b/dev-java/antlr/antlr-4.5.1.ebuild
deleted file mode 100644
index 4c411e077bb3..000000000000
--- a/dev-java/antlr/antlr-4.5.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="https://www.antlr.org/"
-SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-java/antlr:3.5
-	dev-java/stringtemplate:4
-	dev-java/treelayout:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/hamcrest-core:1.3
-		dev-java/junit:4
-	)"
-
-S="${WORKDIR}/${PN}4-${PV}"
-JAVA_GENTOO_CLASSPATH="stringtemplate-4,treelayout"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-java_prepare() {
-	java-pkg_clean
-}
-
-src_configure() {
-	# TODO: Make java-config accept a jar@package query.
-	JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar:$(java-pkg_getjar antlr-3.5 antlr-runtime.jar)"
-}
-
-src_compile() {
-	cd "${S}/runtime/Java/src"
-	local G PKG
-
-	for G in $(find * -name "*.g4"); do
-		PKG="${G%/*}"
-		PKG="${PKG//\//.}"
-		java -jar "${DISTDIR}/${P}-complete.jar" -package "${PKG}" "${G}" || die
-	done
-
-	JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile
-
-	cd "${S}/tool/src"
-	antlr3.5 $(find -name "*.g") || die
-	JAVA_JAR_FILENAME="${S}/${PN}-tool.jar" java-pkg-simple_src_compile
-	java-pkg_addres "${S}/${PN}-tool.jar" ../resources
-}
-
-src_install() {
-	java-pkg_dojar ${PN}-{runtime,tool}.jar
-	java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.v4.Tool
-	use doc && java-pkg_dojavadoc runtime/Java/src/target/api
-	use source && java-pkg_dosrc runtime/Java/src/org tool/src/org
-}
-
-junit_suite() {
-	cd "${S}/$1-testsuite/test" || die
-	local CP=".:${S}/runtime-testsuite/test:${S}/${PN}-tool.jar:$(java-pkg_getjars hamcrest-core-1.3,junit-4,${JAVA_GENTOO_CLASSPATH}):${JAVA_GENTOO_CLASSPATH_EXTRA}"
-
-	local TESTS=$(find ${2:-*} -name "Test*.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -classpath "${CP}" $(find ${2:-*} -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
-
-src_test() {
-	# Only run Java runtime tests as we haven't built other languages.
-	junit_suite runtime org/antlr/v4/test/runtime/java
-	junit_suite tool
-}
diff --git a/dev-java/antlr/antlr-4.5.3-r1.ebuild b/dev-java/antlr/antlr-4.5.3-r1.ebuild
deleted file mode 100644
index b9cfe8237899..000000000000
--- a/dev-java/antlr/antlr-4.5.3-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-MAVEN_ID="org.antlr:antlr4:4.5.3"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="https://www.antlr.org/"
-SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
-
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-java/antlr:3.5
-	dev-java/stringtemplate:4
-	dev-java/treelayout:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/hamcrest-core:1.3
-		dev-java/junit:4
-	)"
-
-S="${WORKDIR}/${PN}4-${PV}"
-JAVA_GENTOO_CLASSPATH="stringtemplate-4,treelayout"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_configure() {
-	# TODO: Make java-config accept a jar@package query.
-	JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar:$(java-pkg_getjar antlr-3.5 antlr-runtime.jar)"
-}
-
-src_compile() {
-	cd "${S}/runtime/Java/src"
-	local G PKG
-
-	for G in $(find * -name "*.g4"); do
-		PKG="${G%/*}"
-		PKG="${PKG//\//.}"
-		java -jar "${DISTDIR}/${P}-complete.jar" -package "${PKG}" "${G}" || die
-	done
-
-	JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile
-
-	cd "${S}/tool/src"
-	antlr3.5 $(find -name "*.g") || die
-	JAVA_JAR_FILENAME="${S}/${PN}-tool.jar" java-pkg-simple_src_compile
-	java-pkg_addres "${S}/${PN}-tool.jar" ../resources
-}
-
-src_install() {
-	java-pkg_dojar ${PN}-{runtime,tool}.jar
-	java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.v4.Tool
-	use doc && java-pkg_dojavadoc runtime/Java/src/target/api
-	use source && java-pkg_dosrc runtime/Java/src/org tool/src/org
-}
-
-junit_suite() {
-	cd "${S}/$1-testsuite/test" || die
-	local CP=".:${S}/runtime-testsuite/test:${S}/${PN}-tool.jar:$(java-pkg_getjars hamcrest-core-1.3,junit-4,${JAVA_GENTOO_CLASSPATH}):${JAVA_GENTOO_CLASSPATH_EXTRA}"
-
-	local TESTS=$(find ${2:-*} -name "Test*.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -classpath "${CP}" $(find ${2:-*} -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
-
-src_test() {
-	# Only run Java runtime tests as we haven't built other languages.
-	junit_suite runtime org/antlr/v4/test/runtime/java
-	junit_suite tool
-}
diff --git a/dev-java/antlr/antlr-4.9.3.ebuild b/dev-java/antlr/antlr-4.9.3.ebuild
new file mode 100644
index 000000000000..be89da27f17e
--- /dev/null
+++ b/dev-java/antlr/antlr-4.9.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+DESCRIPTION="A parser generator for many languages"
+HOMEPAGE="https://www.antlr.org/"
+# Reuse tarball for DOCS
+SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+	~dev-java/antlr-runtime-${PV}:${SLOT}
+	~dev-java/antlr-tool-${PV}:${SLOT}
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/${PN}4-${PV}"
+
+DOCS=( CHANGES.txt CONTRIBUTING.md contributors.txt README.md doc )
+
+src_compile() {
+	:
+}
+
+src_install() {
+	java-pkg_regjar "$(java-pkg_getjar "antlr-runtime-${SLOT}" antlr-runtime.jar)"
+	java-pkg_regjar "$(java-pkg_getjar "antlr-tool-${SLOT}" antlr-tool.jar)"
+
+	java-pkg_dolauncher "${PN}${SLOT}" --main org.antlr.v4.Tool
+	einstalldocs # https://bugs.gentoo.org/789582
+}
+
+pkg_postinst() {
+	# If upgrading from a version of this slot that installs JARs,
+	# display a message about submodule split
+	local changed_ver="4.9.3"
+	local should_show_msg
+	for replaced_ver in ${REPLACING_VERSIONS}; do
+		if ver_test "${replaced_ver}" -lt "${changed_ver}"; then
+			should_show_msg=1
+			break
+		fi
+	done
+	[[ "${should_show_msg}" ]] || return
+	elog "Since version ${changed_ver}, ${PN}-${SLOT} no longer installs JARs."
+	elog "Please find the JARs from files installed by submodule packages"
+	elog "antlr-runtime-${SLOT} and antlr-tool-${SLOT}."
+}
diff --git a/dev-java/antlr/files/3.5.2-test-fixes.patch b/dev-java/antlr/files/3.5.2-test-fixes.patch
deleted file mode 100644
index f2609ac1f0b5..000000000000
--- a/dev-java/antlr/files/3.5.2-test-fixes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestAttributes.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestAttributes.java
---- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestAttributes.java	2014-03-25 11:47:54.000000000 +0000
-+++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestAttributes.java	2015-10-02 22:42:56.921263410 +0100
-@@ -2131,7 +2132,7 @@
- 		assertEquals(expecting, found);
- 	}
- 
--	@Test public void testRuleLabelOnTwoDifferentRulesTemplate() throws Exception {
-+	@org.junit.Ignore @Test public void testRuleLabelOnTwoDifferentRulesTemplate() throws Exception {
- 		String grammar =
- 			"grammar T;\n"+
- 				"options {output=template;}\n"+
-diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java
---- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java	2014-03-25 11:47:54.000000000 +0000
-+++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java	2015-10-02 22:43:07.303105023 +0100
-@@ -339,7 +340,7 @@
- 		assertEquals("b:alt 2 a:alt 1\n", found);
- 	}
- 
--	@Test public void testSynPredWithOutputTemplate() throws Exception {
-+	@org.junit.Ignore @Test public void testSynPredWithOutputTemplate() throws Exception {
- 		// really just seeing if it will compile
- 		String grammar =
- 			"grammar T;\n" +
-diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestTreeParsing.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestTreeParsing.java
---- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestTreeParsing.java	2014-03-25 11:47:54.000000000 +0000
-+++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestTreeParsing.java	2015-10-02 22:41:32.235554776 +0100
-@@ -141,7 +142,7 @@
- 		assertEquals("alt 1\n", found);
- 	}
- 
--	@Test public void testTemplateOutput() throws Exception {
-+	@org.junit.Ignore @Test public void testTemplateOutput() throws Exception {
- 		String grammar =
- 			"grammar T;\n" +
- 			"options {output=AST;}\n" +
diff --git a/dev-java/aopalliance/Manifest b/dev-java/aopalliance/Manifest
index 295c792fa62f..9bf9c160ebf7 100644
--- a/dev-java/aopalliance/Manifest
+++ b/dev-java/aopalliance/Manifest
@@ -1,4 +1,3 @@
 DIST aopalliance-1.0-gentoo.tar.bz2 4203 BLAKE2B 193ef51f8670a0e659ff7d43e909629168c3840f205368ab31a00b07e1e0bd81c8fec2a0429dd4d2932dd7bc6f582c54708c4f118ad697b4f3b41ab999a322c7 SHA512 6761933b9c127af9773f518df89a905fd67696964837b8cb841664f16564bc879dcfbd5f47dcf85e999d4dd64561a3b46edac1c639471d3ee9be3237d9064187
-EBUILD aopalliance-1.0-r2.ebuild 895 BLAKE2B 200a570504d976e00e71628347e07de347e910a7d24819722216eca6cc3838ffad2698544a63374793575a971c5179aa5e0883778799a35e772260889303242b SHA512 586f72046802e5cb7f05409771d0278a637754d12351b3a927c0bd9b8191a3886b60a56276c3813e8b6f3e840a64117fa57cf77bed9de870a8de9a9848be107f
-EBUILD aopalliance-1.0-r3.ebuild 912 BLAKE2B 1e2ed6550659bb5dc08a0ddb2fd9c04b7d6972be722ff5296dbdf20a78abc48f7241f3685d5c2dc194a1a139f83aaa6a0f3e22df8d1ea96630b251446c68c01b SHA512 c567f707b29a49c00ef1656611116e21f5f4730fa79e5c69e3c00677fb0310622f93c15bf354647ef4b42f390ee536d99b46d0a5f3f6aa614705cee00d017f22
+EBUILD aopalliance-1.0-r3.ebuild 908 BLAKE2B d0997356ff3d8d988579fd7307d8960d0ca43477e8053ff81c46224095f7ecca881aa682968345118c8c3edd099b61373a508447dd2511107a5078535d5ad867 SHA512 d44957e3d52ecc4cf5a733791ff8c842685d7d97b1cd71fe84f7a9b8e9a55637fac9ded5f386758191ea4e065b1e4094b70ccb591f9f8e14055ca523ab89f184
 MISC metadata.xml 318 BLAKE2B 8f8307ee22954f2e845092c05b3552d9320a1ccb8421787a5373cbc0123e76ce2dacc93cfd6b83cec87b85927c95a674b28b81811ebd2223b78a1988c7904e4c SHA512 4307e863e3fabedc9971ae68ad8f1c46c2bef00e7daea5fc928c623caeb09424150b1f724dda149d755a7af1ddf22db065160e3dd11dc86b51ec32f6846d4d8d
diff --git a/dev-java/aopalliance/aopalliance-1.0-r2.ebuild b/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
deleted file mode 100644
index b34aaa747a1d..000000000000
--- a/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Aspect-Oriented Programming (AOP) Alliance classes"
-SRC_URI="mirror://gentoo/${P}-gentoo.tar.bz2"
-#SRC_URI="mirror://gentoo/${P}.tar.bz2"
-# Tarball creation:
-# cvs -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance login
-# cvs -z3 -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance export -r interception_1_0 aopalliance
-# tar cjvf aopalliance-1.0-gentoo.tar.bz2 aopalliance
-HOMEPAGE="http://aopalliance.sourceforge.net/"
-LICENSE="public-domain"
-SLOT="1"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux"
-
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main"
-
-java_prepare() {
-	rm build.xml || die
-}
diff --git a/dev-java/aopalliance/aopalliance-1.0-r3.ebuild b/dev-java/aopalliance/aopalliance-1.0-r3.ebuild
index bff2fa46d712..9c7c1638e2f2 100644
--- a/dev-java/aopalliance/aopalliance-1.0-r3.ebuild
+++ b/dev-java/aopalliance/aopalliance-1.0-r3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://aopalliance.sourceforge.net/"
 LICENSE="public-domain"
 SLOT="1"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux"
 
 IUSE=""
 
diff --git a/dev-java/appframework/Manifest b/dev-java/appframework/Manifest
deleted file mode 100644
index fb9285811746..000000000000
--- a/dev-java/appframework/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX appframework-1.03-fix-imports.patch 859 BLAKE2B a42eaa58f066d831ec50d07e356d7b29a31b6e3b60686b8c17a808af210fce56f731b791c42fca50cd829a7a5ae7274168e25aeeb921ca03714aa7badb70e814 SHA512 9fcf414f952d19b78d26eceee80ea8367491e29c26ef195593c54eaeeba296f9874adedca0a119197cde56a7be48955c8b6a4e78a6440c7100120354b15b1541
-DIST appframework-1.03.zip 413438 BLAKE2B 8f7c397e1d1f8fcfd62b648648650f0a736615317ec37fbc2f8a9c2834e3e18b4a754f89f1b6d94836e2f775010135b740dd474d10ff13e3e115f554380060fb SHA512 7d24329361f0d5f2225a7248ba30b1f0db364efd93e0581e1f10d0f8e2b6354f9d578d585ff1a08b27846dfae0b805b0f609711234be616b3f0a065dc1801309
-EBUILD appframework-1.03-r5.ebuild 916 BLAKE2B 7bf95c011766f287bd7c47de8b59f7b9c0de323c25054761ea132e194d5cffd1f60be2781111b9cd6a29f5efa88b9a02e6dbe71e39c07422466f00bce5134587 SHA512 86d9b9e9e20f3001c65389444312c748a89b9fd0d9d9c43e76cfa3ed957a9bd8570a853638e089b0332f2f16b1be899e0e1bd7b64186e911f026492c2ce55703
-MISC metadata.xml 981 BLAKE2B ecfd1f606f33dfd52efdb5013327e40bd4d5cc6bc71fa0cc3f773e3bfcd6e045a77b7658c94267fcfeefb84fa2512a9d1f3ff3117562a6d0b404a946ae72c976 SHA512 f89f4fd3fbf414a54e071737d11338c4431fa74da95e936eb2c32c85ee23bc3642f56e7da1c29e565ffe792adb2b3807fbeabd3902c884e295fc9277ac8f589c
diff --git a/dev-java/appframework/appframework-1.03-r5.ebuild b/dev-java/appframework/appframework-1.03-r5.ebuild
deleted file mode 100644
index 5d1988117424..000000000000
--- a/dev-java/appframework/appframework-1.03-r5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="AppFramework"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Set of Java classes to build desktop applications easily"
-HOMEPAGE="https://java.net/projects/appframework"
-SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${MY_P}-src.zip -> ${P}.zip"
-
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/jnlp-api:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="jnlp-api"
-
-JAVA_SRC_DIR="src"
-
-PATCHES=( "${FILESDIR}/${P}-fix-imports.patch" )
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	java-pkg_clean
-	mv src/examples "${S}" || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/appframework/files/appframework-1.03-fix-imports.patch b/dev-java/appframework/files/appframework-1.03-fix-imports.patch
deleted file mode 100644
index 3e5a958597e2..000000000000
--- a/dev-java/appframework/files/appframework-1.03-fix-imports.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/org/jdesktop/application/Task.java	2017-03-28 11:24:05.988108949 +0000
-+++ b/src/org/jdesktop/application/Task.java	2017-03-28 11:24:09.433122008 +0000
-@@ -15,8 +15,8 @@
- import java.util.concurrent.TimeUnit;
- import java.util.logging.Level;
- import java.util.logging.Logger;
--import org.jdesktop.swingworker.SwingWorker;
--import org.jdesktop.swingworker.SwingWorker.StateValue;
-+import javax.swing.SwingWorker;
-+import javax.swing.SwingWorker.StateValue;
- 
- 
- /**
---- a/src/org/jdesktop/application/TaskMonitor.java	2017-03-28 11:24:18.988158228 +0000
-+++ b/src/org/jdesktop/application/TaskMonitor.java	2017-03-28 11:24:31.895207149 +0000
-@@ -9,7 +9,7 @@
- import java.util.Iterator;
- import java.util.LinkedList;
- import java.util.List;
--import org.jdesktop.swingworker.SwingWorker.StateValue;
-+import javax.swing.SwingWorker.StateValue;
- 
- 
- /**
diff --git a/dev-java/appframework/metadata.xml b/dev-java/appframework/metadata.xml
deleted file mode 100644
index 385b3a1b0ae9..000000000000
--- a/dev-java/appframework/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription lang="en">
-		The JSR-296  Swing Application Framework prototype implementation is a small set of Java classes that simplify building desktop applications. The prototype provides infrastructure that's common to most desktop applications:
-
-		* Application lifecyle, notably GUI startup and shutdown.
-		* Support for managing and loading resources, like strings, formatted messages, images, colors, fonts, and other types common to desktop applications.
-		* Support for defining, managing, and binding Actions, including Actions that run asynchronously (in the "background").
-		* Persistent session state: support for automatically and selectively saving GUI state from one run of an application to the next.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-java/args4j/Manifest b/dev-java/args4j/Manifest
deleted file mode 100644
index 466728285242..000000000000
--- a/dev-java/args4j/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST args4j-2.32-sources.jar 65381 BLAKE2B 6fe8d2bc9a8d564dbd324f64b9b528df6d52d721e1cb02b15352d9f2b2b0e02c70cdb64fbd1d3314a23ec38435f4dca49f7bff88c069de4cf45071f3d3a744e0 SHA512 97b48a133f6e3348e17a653aa15d92e0bc240e689615c22321573f7f82f01f22cffe43ef7b24f72a9a52cfb91ab6601463567b18f634fcc64362ea366456a12f
-DIST args4j-2.33-sources.jar 65430 BLAKE2B c1c4c38beac5d9de4bcc444953098d4b6745678332bd3203fffc5982fcaf81062bbd87814321fb3e3c1750d695d2f96e4c7c6e3674c491701dccf1a294b67189 SHA512 5cfdff97bc95c07dbea1f83a48f8a61edf4758c9284cd6b510ab0a628724561226b10d3a0d6bdeee71e7115cbcf8fa53858f40ad8ee40e614e882d734f881014
-EBUILD args4j-2.32.ebuild 452 BLAKE2B b75f30e390c9e01b490c972af13053cf4802ee42f0ec58e70f8517e83b5ea82d3a85b271883da0b2395bef4c36d6783a85af0f0462bc1503ddbb222706005010 SHA512 2241a68052a565ec463092711a4857847a2d42be39676b3f187122d3a7249f9997834d7ede149d6d0d2a134149b1cbca19204e1352b87217c308214b7f9312f9
-EBUILD args4j-2.33.ebuild 435 BLAKE2B 3920414785df9ae2e0c4a858889a33b603bc2609852d42528b22867aba57a2841af8f8b18290daef8fdc8d34651872b50e4e233f0a78be539ceeb57e97ea918a SHA512 607f9bca5426b7b7cb74ad66924d1582cdc8cc20a8eed14ff61b91fd16d9b7853e534593b2a695500842ed9d1205fa374b49e6857a387640cba084e9f487dc44
-MISC metadata.xml 313 BLAKE2B 415fa2b10e5f4e699d037ea1b631c69e844e224e46c5198c59a00f5f47389bd1831b40a09ac2a3b4ce9de2c6046479ccb722ca79ab23a91a7de184f2987898fe SHA512 6c8f28a7b9714cd850ab61a5dea7a2c063543f849eadab82b3370d15748daf4d6ede3728084c52b3e39a9da9edb2ab0343f3a930fff148fd6ead0bb1cb360d02
diff --git a/dev-java/args4j/args4j-2.32.ebuild b/dev-java/args4j/args4j-2.32.ebuild
deleted file mode 100644
index be60edae23d1..000000000000
--- a/dev-java/args4j/args4j-2.32.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="args4j is a Java command line arguments parser"
-HOMEPAGE="http://args4j.kohsuke.org/"
-SRC_URI="http://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="CDDL"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.7"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip"
diff --git a/dev-java/args4j/args4j-2.33.ebuild b/dev-java/args4j/args4j-2.33.ebuild
deleted file mode 100644
index 7d1a85dfca1a..000000000000
--- a/dev-java/args4j/args4j-2.33.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="args4j is a Java command line arguments parser"
-HOMEPAGE="http://args4j.kohsuke.org/"
-SRC_URI="http://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="CDDL"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=virtual/jre-1.7"
-
-DEPEND="
-	>=virtual/jdk-1.7"
diff --git a/dev-java/args4j/metadata.xml b/dev-java/args4j/metadata.xml
deleted file mode 100644
index 817b60b7fa52..000000000000
--- a/dev-java/args4j/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="person">
-	<email>monsieurp@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/avalon-framework/Manifest b/dev-java/avalon-framework/Manifest
index c9670e43ca79..0a989519a404 100644
--- a/dev-java/avalon-framework/Manifest
+++ b/dev-java/avalon-framework/Manifest
@@ -2,4 +2,5 @@ AUX 4.2.0-enum.patch 1086 BLAKE2B 1489abf0aa325060472d55762bc2014bac3c1d5571fddb
 AUX build.xml 1838 BLAKE2B aa6ad2f58ef4bc96837c5f616376e2bc6dca2b338d0bdbff575b4ba0e45381e18d96c3266769fa23af60888d1baeb86e9456abb091f08cf92a54389e579a05d4 SHA512 a6dafeac52a7e7421c6e97972407b7b5424a8e35bae66153c52b92419c038d0cf31a049619b843ece7f26bcb1fbd675ea36475857609820ab6c66d03d4f8da2b
 DIST avalon-framework-4.2.0-src.tar.gz 68887 BLAKE2B da71631548bf725315c57439c5db017107d4dac529fbfdd59f68da6b97faa8b9a78fc5d89b05ccd05c7ec68b2de05d286ece6654137278b3e8873c78c65adf6c SHA512 b53dc20ecec058ef0b35a626bea6e04f85f6ae8b3645d7dc5c33c194db49b42071093cd305ef718f925b948ec1b885b2a0d8bec534592f97dc48d6e93db45671
 EBUILD avalon-framework-4.2.0-r3.ebuild 1034 BLAKE2B 6f97f20a75af8a5da7d3b7e910f88ab4e6f3e00032d33985bcaa7104e5597ec0c93132e7b8ca109a1b78674e2590e95009c2bcf10d23b9c50d8a501e475b6d85 SHA512 f32de74236a950982e1fa4ea78d2441ea196d5f9c37dbd4797639ef2fafbd162285b2c0d93e1eba7434a6aa491942a384db9bea54e4fb5f7c3099b6882b62bc0
+EBUILD avalon-framework-4.2.0-r4.ebuild 1152 BLAKE2B baef58b5bac5a738c5d8c8652707f96619c71ef0e1d23fa00a0f1a8ab309d66359cf6d9b83e77e46c3612767929421f3ded7fe3922a2e96559b2d0d8d768b659 SHA512 ca95fcefad094b03a120db91beca9f4865d9b7f92eb0fc88c7bac8e0dc2db128926a3bdb058565ca0fe2dcbd2aeb0efc74ec074fc56976abf9404d51c00b49fc
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r4.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r4.ebuild
new file mode 100644
index 000000000000..2b623e3cd005
--- /dev/null
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+# The tests themselves are JUnit 3 tests, but using
+# junit-4 here causes 61 additional tests to be run
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Avalon Framework"
+HOMEPAGE="https://avalon.apache.org/"
+SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+
+CP_DEPEND="
+	dev-java/avalon-logkit:2.0
+	dev-java/log4j-12-api:2
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		dev-java/junit:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}/4.2.0-enum.patch" )
+DOCS=( NOTICE.TXT )
+
+JAVA_SRC_DIR=( {api,impl}/src/java )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_SRC_DIR=( {api,impl}/src/test )
+
+src_prepare() {
+	default # https://bugs.gentoo.org/780585
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	einstalldocs # https://bugs.gentoo.org/789582
+}
diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest
index 9d55d7cbf0cb..05999de5bcd1 100644
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -1,5 +1,5 @@
 AUX avalon-logkit-2.1-java7.patch 1155 BLAKE2B 8e5a7756fed565d23cb7d9265171ad7c42c7c1a1f1f81284461aaad1d85718d77a7767f51d8e5cc7a3724c2a0b15dabc541d1c6c8fbfad670fe56765ac3beda4 SHA512 155bd7d65a2eb59528067605f1c40b1f176228af2fbc11f6560ad929cf5344d74ba79bbd58c7cb35b6065c74ec4e579cea590c0cc23082979d79cd70ce8414e7
 DIST avalon-logkit-2.1-src.tar.gz 60218 BLAKE2B 1c35b38a22d95cffabb19e099d42697adf7aa6ad471f6cb62e02a30b6612c8405b9f7473ca61ea4f7f9c1f3b1ece6ee68f7ec711b79672330db3ac9e57642e0d SHA512 9977a3a172ca4fb5c3ad1f623ff109214f71900d2e244f175cc5d140f5f9993caca7e5ca3220728f18a1d6242d11a48990f9ce0150c36b7a9bb10a7a6d5a905a
-EBUILD avalon-logkit-2.1-r10.ebuild 1439 BLAKE2B 76428d98b1fbf65aecc143cb91016d219f642f9f7b9fd3d0f72ca767a46ff1da523b0632187003090ab13e235da7b8ca45c73d717cfac57a9bf0f7fa47b633e7 SHA512 70b417449e861e5dfb2a84765f8a89565243a9522da2a47cc652caae7d4e7fe75e1a4aacc085285c60e4e3756bcfd40378b33d2f207bc875893bf2b3d02edf63
+EBUILD avalon-logkit-2.1-r12.ebuild 2951 BLAKE2B 7e2ee819e01521f04dfd4f0dfec456273a24997f5f48df2a1671ea18836b74fa700c958f7beea3c08cdef34dd6876f5987527d3ceecd78447cd3a6e48e0de714 SHA512 6d283bb31bbc8b1a13ec0838d88583d4504f6824ee8c9379a0b267587dea8e0952b60acd3f1d709ea2c78bca2c2f452124e3426da449b2bc7ede61a497ef27bb
 EBUILD avalon-logkit-2.1-r9.ebuild 1445 BLAKE2B 87d3271023f53f5e275c18ae926768186de5122d9b548d26153117c7decadfe47d1b34c384915a03eb118e4215296b417ea2002b6e9c82a7b49c336f1b70d9a0 SHA512 bbd130e50d2da2fa59735aeff1a88bc46599236f3cfb7531d1f63a84d26f27d0066502a63c40fb910022f042b1b5d70e7d200a9071d1398309023ec59c22dc60
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r10.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r10.ebuild
deleted file mode 100644
index a79ee489bd88..000000000000
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r10.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-# NB: this project is dead and we should look into removing it from the tree.
-# Take a look at the homepage.
-DESCRIPTION="Easy-to-use Java logging toolkit"
-HOMEPAGE="https://avalon.apache.org/closed.html"
-SRC_URI="https://archive.apache.org/dist/excalibur/avalon-logkit/source/avalon-logkit-${PV}-src.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-LICENSE="Apache-2.0"
-SLOT="2.0"
-IUSE=""
-
-CDEPEND="
-	dev-java/log4j:0
-	java-virtuals/jms:0
-	dev-java/javax-mail:0
-	java-virtuals/servlet-api:3.0"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/ant-junit:0
-	)"
-
-src_prepare() {
-	default
-	# Doesn't like 1.6 / 1.7 changes to JDBC
-	eapply "${FILESDIR}/${P}-java7.patch"
-
-	java-ant_ignore-system-classes
-
-	java-ant_xml-rewrite \
-		-f build.xml \
-		-c -e available \
-		-a classpathref \
-		-v 'build.classpath' || die
-
-	java-pkg_filter-compiler jikes
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_GENTOO_CLASSPATH="javax-mail,jms,log4j,servlet-api-3.0"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r12.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r12.ebuild
new file mode 100644
index 000000000000..fadec3b6862a
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r12.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+# NB: this project is dead and we should look into removing it from the tree.
+# Take a look at the homepage.
+# As of February 2022, dev-java/commons-logging is the only consumer of this
+# package besides dev-java/avalon-framework.  However, commons-logging is still
+# used by many other consumers and does not have an updated version that do not
+# depend on this package.
+DESCRIPTION="Easy-to-use Java logging toolkit"
+HOMEPAGE="https://avalon.apache.org/closed.html"
+SRC_URI="https://archive.apache.org/dist/excalibur/avalon-logkit/source/avalon-logkit-${PV}-src.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+LICENSE="Apache-2.0"
+SLOT="2.0"
+
+CP_DEPEND="
+	dev-java/javax-mail:0
+	dev-java/jboss-jms-api:1.1
+	dev-java/log4j-12-api:2
+	java-virtuals/servlet-api:3.0"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/ant-junit:0
+	)"
+
+src_prepare() {
+	default
+
+	# Unfortunately, LogFactor5 support is no longer provided by the Log4j 1.x
+	# bridge in Log4j 2.  But it seems that LogFactor5 merely consists of a
+	# Swing-based GUI that is neither checked by this package's tests nor used
+	# by reverse dependencies in ::gentoo.  If virtually nobody would use
+	# LogFactor5, components in this package pertaining to it could be simply
+	# removed to make the migration to Log4j 2 feasible.
+	# http://people.apache.org/~carnold/log4j/docs/x/logging-log4j-1.2.10/docs/lf5/overview.html
+	rm -rv src/java/org/apache/log/output/lf5 ||
+		die "Failed to remove support for stale LogFactor5 project"
+
+	# Doesn't like 1.6 / 1.7 changes to JDBC
+	eapply "${FILESDIR}/${P}-java7.patch"
+
+	java-ant_ignore-system-classes
+
+	java-ant_xml-rewrite \
+		-f build.xml \
+		-c -e available \
+		-a classpathref \
+		-v 'build.classpath' || die
+
+	java-pkg_filter-compiler jikes
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_ENCODING="UTF-8"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "target/${P}.jar"
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
+
+pkg_postinst() {
+	# Display a message about LogFactor5 support drop upon first install
+	# or upgrade from a version before the drop
+	local changed_ver="2.1-r11"
+	local should_show_msg replaced_ver
+	[[ -z "${REPLACING_VERSIONS}" ]] && should_show_msg=1 # First install
+	for replaced_ver in ${REPLACING_VERSIONS}; do
+		if ver_test "${replaced_ver}" -lt "${changed_ver}"; then
+			should_show_msg=1
+			break
+		fi
+	done
+	[[ "${should_show_msg}" ]] || return
+	ewarn "Due to migration to Log4j 2, this package has to drop LogFactor5"
+	ewarn "support. As a result, the org.apache.log.output.lf5 Java package"
+	ewarn "is not available in the JAR installed by this package."
+}
diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
index 3b4bba8c7e51..75e46c9865ad 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -1,4 +1,3 @@
 DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
-EBUILD bcmail-1.69-r1.ebuild 1482 BLAKE2B f93ee55d305b3c6b865a49d0b67c988bbe99be8cdb019969b3c4805620d978c576538eb2f098e38b0c33af8d3f42fdc994f525aea43adac85f01e357749e44ba SHA512 e50df18b18f8c933d619fcb1eb2ad2de3dc29a506b70d42b54d828fa54b77c3ff1b7c4a547a2113e3938d5d8e2e482e7845aa6079d4b40f729cb110a48811242
-EBUILD bcmail-1.69.ebuild 1488 BLAKE2B e82deb8acd2b93c38e56a259df2f16748944ccc15baa196d192cdbc3659e7deb3b0d93073bd595ae02642c82efd8e80f6dd212279958a10f0be8f4ab5386b6d0 SHA512 7b4e3031902879a51d84df5b7c0a07d97fb408a1ebeed2fc857c85eb1520eb4824bb6e1e630f87c20fba37d9ec3434f70958e5d99bc260b2ce9c528aee11c8c3
+EBUILD bcmail-1.69-r1.ebuild 1478 BLAKE2B c3a707b73c57d7528cd86c5621fe14fd65e1d412b6735884a95c3f868f72cedaf4a8edacaf915c4f992ed0bd6c1089a949198f0f1893fefffa7b22b6fbdbbb11 SHA512 e845293b7b79c796d5c433971e2a4dbb185b3930fc048915ae84e2f2631af396454b3b8b2029d04289dba96f2db6c2460dcc1d943dc8db8ddea4219313e31da7
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/bcmail/bcmail-1.69-r1.ebuild b/dev-java/bcmail/bcmail-1.69-r1.ebuild
index 0eabcf7e3584..3c07eddb70b3 100644
--- a/dev-java/bcmail/bcmail-1.69-r1.ebuild
+++ b/dev-java/bcmail/bcmail-1.69-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 CDEPEND="
 	~dev-java/bcpkix-${PV}:0
diff --git a/dev-java/bcmail/bcmail-1.69.ebuild b/dev-java/bcmail/bcmail-1.69.ebuild
deleted file mode 100644
index 25ae15aa892a..000000000000
--- a/dev-java/bcmail/bcmail-1.69.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.bouncycastle:bcmail-jdk15on:1.69"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols"
-HOMEPAGE="https://www.bouncycastle.org/java.html"
-SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-CDEPEND="
-	~dev-java/bcpkix-${PV}:0
-	~dev-java/bcprov-${PV}:0
-	~dev-java/bcutil-${PV}:0
-	dev-java/jakarta-activation:1
-	dev-java/oracle-javamail:0
-	"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.html )
-
-S="${WORKDIR}/bc-java-r${PV/./rv}/mail"
-
-JAVA_GENTOO_CLASSPATH="bcpkix,bcprov,bcutil,jakarta-activation-1,oracle-javamail"
-JAVA_SRC_DIR=(
-	"src/main/java"
-	"src/main/jdk1.9"	# https://bugs.gentoo.org/797634
-)
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_RUN_ONLY="org.bouncycastle.mail.smime.test.AllTests"	# OK (106 tests)
-
-src_prepare() {
-	default
-	cd ../ || die
-	java-pkg_clean
-}
-
-src_install() {
-	default
-	einstalldocs
-	docinto html
-	dodoc -r ../docs
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/bndlib/Manifest b/dev-java/bndlib/Manifest
index ab424ac72398..ba02a60603a9 100644
--- a/dev-java/bndlib/Manifest
+++ b/dev-java/bndlib/Manifest
@@ -1,3 +1,3 @@
 DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e
-EBUILD bndlib-2.1.0-r1.ebuild 1643 BLAKE2B 98b1872ba1f16616da9c5559a99b9c672f8cf9f2da19fdc740ead5ab5a18e7bb46743939d9d39a3e0572e66971c829d443036668a04a44d9360c1ebe5992c4f1 SHA512 3df940c0cc59eabc1f96ffdf3b6847a36f5c124670c53f6138d7a959d3d5b9ed75b7d184021ffbacd4e8428381669ca0901c4ac9a53c278694bbc501f3346539
+EBUILD bndlib-2.1.0-r1.ebuild 1642 BLAKE2B 948acbc0eb4e1057bb3194eb752f130075f8ab4c0f028a2bf539278c8541418da0e334ee1a200adc22c54253a7f381fbfb5ae1afff63d7659a00816e73dd0c86 SHA512 a0482c53b21aa4739c484228b7497f84530c619777aa158386f7896daa046be3cd3ab3dc2248b1efc0ca51d3e01d5537dc66e4e2e69819603aa1fa6b4412be0a
 MISC metadata.xml 324 BLAKE2B 4abc17608a568a12af96dc0ddb7b82d55341ad891537e120633fd8517e09a339d805325988f3208050cde9b20aeb0a4dcab95e55ba13c66854a0d90b0e54551c SHA512 e9e23c794433024b0888c2d5859120c0ef39cd6b55df99035c3ea1761280bd4287fdeb4aaf8ff067bab1bea80dcdcc9060f74b43b1a6a004bad87eb69a9bd3c3
diff --git a/dev-java/bndlib/bndlib-2.1.0-r1.ebuild b/dev-java/bndlib/bndlib-2.1.0-r1.ebuild
index 553e5e626d54..f78e091b0744 100644
--- a/dev-java/bndlib/bndlib-2.1.0-r1.ebuild
+++ b/dev-java/bndlib/bndlib-2.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CDEPEND="dev-java/libg:0
 	dev-java/osgi-compendium:0
diff --git a/dev-java/c3p0/Manifest b/dev-java/c3p0/Manifest
index 0a5b5c074274..4a6d85b0a896 100644
--- a/dev-java/c3p0/Manifest
+++ b/dev-java/c3p0/Manifest
@@ -1,3 +1,4 @@
 DIST c3p0-0.9.5.5.src.tgz 869069 BLAKE2B 6e1349d1cd02647a7c2424b8e89a8c21cfd8faefd26b7e05ee9e2da1a1a501b2b3102b142eef52f56dea672408d683a6f47b4c89b25d529a578c4b1fe4aa819c SHA512 fa96b5d0042442c773309090b9cf8f0db8e16f334e321ac952afb198ca06cd66f6f7162369f22a439a0e6b45b1ffcddf540af53804f223844d7a5465213bece1
+EBUILD c3p0-0.9.5.5-r1.ebuild 1323 BLAKE2B 5cde191eaedc48e18707bc8435fbae52d08e6ef926f2183e11267f7e0f66ae0ff54a2ae3d379eb9810e2fd18bd07c3bb391442492e59cc46d260559c79ed5df9 SHA512 debcdd2ffaf4d734c2566a4b715f7fa71fa6ef9a07641673a8198900059c7efba1da43bbd6bcec4a918473ef80576365e3d064b1ae9876883a6e740d8ce8d47c
 EBUILD c3p0-0.9.5.5.ebuild 1304 BLAKE2B 12e0e9d144e0e14582e0ca37c40e4df33d746377697942d62dbeb5811cc76991e7c33d8c59f3dc4b1cdbff48fbf58a10336734932c412156a31e2fe3db8cda0a SHA512 b822c1570529ab43716475125273364df68f973f82155dc1d486b5ac234b68b7fbc7ad00288d7e0b78522fb3137794f509728265b4b6780aec227fc82ffac757
 MISC metadata.xml 311 BLAKE2B 94e12506ba1bdd92ded65a3ceb8421881aa0a2bce4a93affc09208ff35b942e10ebc855833056e118fbf3e3d4b04e653b3de9ed2d45266191bd580040fdfbe69 SHA512 d4d0cd654557b0ea5d850a8af90db536b3893d2221aba93449559abd2469725e853e5f1ac4bcd67629f1f5be253106eb0a3d1a53b9da144256a01bd7264b6cfe
diff --git a/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild b/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild
new file mode 100644
index 000000000000..daecaa205752
--- /dev/null
+++ b/dev-java/c3p0/c3p0-0.9.5.5-r1.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-12-api:2
+	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-12-api-2
+	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/cal10n/Manifest b/dev-java/cal10n/Manifest
new file mode 100644
index 000000000000..9846f9fd65e6
--- /dev/null
+++ b/dev-java/cal10n/Manifest
@@ -0,0 +1,3 @@
+DIST cal10n-0.8.1.tar.gz 358264 BLAKE2B 1561d2ea7309e470b5bf5990d166af1974ddbfc766ee14101bef33d3b41e5d18bcadbe1ba769eb028d6a41c43b7498c29118a5d7c7b4a93bd55d0a9db5d42eb4 SHA512 882146cddcc8489f08c7354b2029448cc084932fbb6c448271dbfc9ddb11740744bfe161a4e4d58071fc010bc3891d094681584a7a559514d443dcceedafbca2
+EBUILD cal10n-0.8.1.ebuild 3473 BLAKE2B a70ec82aad9db833b632f467f70ebf7a515ed540d1ef5a0fe0f3dfb44b509c426f7743d2d05175bcab696cb2cb2cc883d0c45f179a9b3ebdbcc784dfa267d9da SHA512 8876562daf2a1eab67e451678fc9ab195a3635a4305895b7bcbab0797633298ca5c0b2c0e826cf8d3231b085bcdc6affb0918a443ccbfe4eddbcae91763e3a99
+MISC metadata.xml 314 BLAKE2B 9a158ffea633bbed9cd2f7d24c6783bed4c200214d8ab6b7463b7093f9aab9e545cd86a8723d89b7466172e4d50be85acd800ef5f48ec407e773256e35454071 SHA512 6e703050f8faa8ed9c3b4b8b85cb503876ac1b9cf06ff248b70dd4416f06803110f54ba412fcd5cb5ebea38a6aff8d1369520539decfb5a5c75d34442812a1c6
diff --git a/dev-java/cal10n/cal10n-0.8.1.ebuild b/dev-java/cal10n/cal10n-0.8.1.ebuild
new file mode 100644
index 000000000000..94c911a1b711
--- /dev/null
+++ b/dev-java/cal10n/cal10n-0.8.1.ebuild
@@ -0,0 +1,67 @@
+# 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="ch.qos.cal10n:cal10n-api:0.8.1"
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="java library for writing localized messages using resource bundle"
+HOMEPAGE="http://cal10n.qos.ch/"
+SRC_URI="https://github.com/qos-ch/cal10n/archive/v_${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/cal10n-v_${PV}/${PN}-api"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+# There are compilation errors in test phase:
+# warning: Supported source version 'RELEASE_5' from annotation processor 'ch.qos.cal10n.verifier.processor.CAL10NAnnotationProcessor' less than -source '8'
+# src/test/java/ch/qos/cal10n/util/Fruit.java:30: error: Failed to locate resource bundle [fruits] for locale [fr] for enum type [ch.qos.cal10n.util.Fruit]
+# public enum Fruit {
+#        ^
+# src/test/java/ch/qos/cal10n/util/Fruit.java:30: error: Failed to locate resource bundle [fruits] for locale [en] for enum type [ch.qos.cal10n.util.Fruit]
+# public enum Fruit {
+#        ^
+# src/test/java/ch/qos/cal10n/sample/Minimal.java:34: error: Missing or empty @LocaleData annotation in enum type [ch.qos.cal10n.sample.Minimal]. See http://cal10n.qos.ch/codes.html#missingLDAnnotation
+# public enum Minimal {
+#        ^
+# src/test/java/ch/qos/cal10n/sample/Labels.java:9: error: Missing or empty @LocaleData annotation in enum type [ch.qos.cal10n.sample.Labels]. See http://cal10n.qos.ch/codes.html#missingLDAnnotation
+# public enum Labels {
+#        ^
+# src/test/java/ch/qos/cal10n/sample/Host.java:8: error: Missing or empty @LocaleData annotation in enum type [ch.qos.cal10n.sample.Host.OtherColors]. See http://cal10n.qos.ch/codes.html#missingLDAnnotation
+#   public enum OtherColors {
+#          ^
+# src/test/java/ch/qos/cal10n/sample/Furnitures.java:33: error: Failed to locate resource bundle [furnitures] for locale [en_UK] for enum type [ch.qos.cal10n.sample.Furnitures]
+# public enum Furnitures {
+#        ^
+# src/test/java/ch/qos/cal10n/sample/Countries.java:33: error: Key [CH] present in enum type [ch.qos.cal10n.sample.Countries] but absent in resource bundle named [countries] for locale [en]
+# public enum Countries {
+#        ^
+# src/test/java/ch/qos/cal10n/sample/Countries.java:33: error: Key [BR] present in resource bundle named [countries] for locale [en] but absent in enum type [ch.qos.cal10n.sample.Countries]
+# public enum Countries {
+#        ^
+# src/test/java/ch/qos/cal10n/sample/Countries.java:33: error: Key [CH] present in enum type [ch.qos.cal10n.sample.Countries] but absent in resource bundle named [countries] for locale [fr]
+# public enum Countries {
+#        ^
+# src/test/java/ch/qos/cal10n/sample/Countries.java:33: error: Key [CN] present in enum type [ch.qos.cal10n.sample.Countries] but absent in resource bundle named [countries] for locale [fr]
+# public enum Countries {
+#        ^
+# src/test/java/ch/qos/cal10n/sample/Countries.java:33: error: Key [BR] present in resource bundle named [countries] for locale [fr] but absent in enum type [ch.qos.cal10n.sample.Countries]
+# public enum Countries {
+#        ^
+# 11 errors
+
+# JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+# JAVA_TEST_SRC_DIR="src/test/java"
+# JAVA_TEST_RESOURCE_DIRS="src/test/resources"
diff --git a/dev-java/cal10n/metadata.xml b/dev-java/cal10n/metadata.xml
new file mode 100644
index 000000000000..846277cea474
--- /dev/null
+++ b/dev-java/cal10n/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">qos-ch/cal10n</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/cdi-api/Manifest b/dev-java/cdi-api/Manifest
deleted file mode 100644
index e1fa8094cde1..000000000000
--- a/dev-java/cdi-api/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST cdi-api-1.2-sources.jar 139331 BLAKE2B 40b1982610fbf4e4785410552055ef0e0b80aca3fb8bc1bcf25a31e2456b5ba5cc1ca28ab29ca8c33859c4400785a429074b2c8e3a40cb4fc8c90ae79473d95c SHA512 b24a16cc208cd865f561ecdc7590ddcdb08c2e83f8fea75eefa0e52598461cc98c804dfeeacb360278ddfbf5508e72f381b1379e19efe91f3c89b0e255b3cb9a
-DIST cdi-api-1.2.jar 139331 BLAKE2B 40b1982610fbf4e4785410552055ef0e0b80aca3fb8bc1bcf25a31e2456b5ba5cc1ca28ab29ca8c33859c4400785a429074b2c8e3a40cb4fc8c90ae79473d95c SHA512 b24a16cc208cd865f561ecdc7590ddcdb08c2e83f8fea75eefa0e52598461cc98c804dfeeacb360278ddfbf5508e72f381b1379e19efe91f3c89b0e255b3cb9a
-EBUILD cdi-api-1.2-r1.ebuild 862 BLAKE2B 72cda82a641fd6738ba2fd8253ac8d307577d7139156b63e18f13594f89c72a15e61b900dbd04ae4898219076927f05a5b25bdf11454e03f1f78c2fff5cd49dc SHA512 a4223293c3954f729c185e0cae6ef14509ed238581be7d03427180b9d8704a4994f6d8791dbcc80deb5682e8aeacd377c960a6c3ddaa531ce5e44d0fc3f42a97
-EBUILD cdi-api-1.2.ebuild 792 BLAKE2B 854a44596165cb8b172018c9a78c974fa0cb72ee658b62b33cb0052f80a8da8e1648a61b36e60996f54ec9927df9a95b3017f1793e3a3657cd282a6df986d1bc SHA512 00365e5a23362cb1084cdfc7c760df5c191ad7945f7a491c2d89eea23a70e0e59ca3a26c57532db82befa623f09c3d3c49daf21c5860cf4201f06dc1bc0fe343
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/cdi-api/cdi-api-1.2-r1.ebuild b/dev-java/cdi-api/cdi-api-1.2-r1.ebuild
deleted file mode 100644
index bdf05ea4ffb4..000000000000
--- a/dev-java/cdi-api/cdi-api-1.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Contexts and Dependency Injection for the Java EE platform"
-HOMEPAGE="http://www.cdi-spec.org/"
-SRC_URI="https://repo1.maven.org/maven2/javax/enterprise/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-CDEPEND="
-	dev-java/javax-inject:0
-	dev-java/tomcat-servlet-api:3.0
-	dev-java/glassfish-interceptor-api:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="javax-inject,tomcat-servlet-api-3.0,glassfish-interceptor-api"
-
-JAVA_SRC_DIR="javax"
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres "${PN}.jar" . -name "*.xsd"
-}
diff --git a/dev-java/cdi-api/cdi-api-1.2.ebuild b/dev-java/cdi-api/cdi-api-1.2.ebuild
deleted file mode 100644
index 5d3e5e09d79a..000000000000
--- a/dev-java/cdi-api/cdi-api-1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Contexts and Dependency Injection for the Java EE platform"
-HOMEPAGE="http://www.cdi-spec.org/"
-SRC_URI="https://repo1.maven.org/maven2/javax/enterprise/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="1.2"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-CDEPEND="dev-java/javax-inject:0
-	dev-java/glassfish-interceptor-api:0
-	dev-java/tomcat-servlet-api:3.0"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-JAVA_SRC_DIR="src"
-
-JAVA_GENTOO_CLASSPATH="javax-inject,tomcat-servlet-api-3.0,glassfish-interceptor-api"
-
-java_prepare() {
-	mkdir src || die
-	mv * src
-}
diff --git a/dev-java/cdi-api/metadata.xml b/dev-java/cdi-api/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/cdi-api/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest
index 85c359876d9d..659bbef75151 100644
--- a/dev-java/cglib/Manifest
+++ b/dev-java/cglib/Manifest
@@ -1,3 +1,4 @@
 DIST cglib-RELEASE_3_3_0.tar.gz 151490 BLAKE2B d7ca4cc9ea6dad9f7a827c784ad13f93e8f31c817c5a0182a86b2ba759ccd3dfbec88d5178507599cd08a97a1ef13ba4880cab016b68b92dda3358bfb0a751c0 SHA512 635dcdb10a8fe83887a1dc8cf12844fe61b73a12fb530bf84d6ac53f75b0103820d76518cbc0d93d63dba86d13929f0df4dbae3b4943a402cf9f2af76f44161a
+EBUILD cglib-3.3.0-r1.ebuild 2080 BLAKE2B 99f585d8c06c9f2c19cf01f807eaa9da1826f58da7d91b207170ae1f4e5229c2bdbb98bd06dded6077fda98e89569fc8f3061eba0315d6374a2ee17aaf81aeed SHA512 19e265bfa2f1a17d3386012d8a5c4fb40d775ba6f2af901e8e62373958e85ade8408e395a381cf6af53e6365e567c1d383aff3540f071cd4730af8c61ac3af15
 EBUILD cglib-3.3.0.ebuild 1488 BLAKE2B c0547570011c4dc76a9fe6a769499dd806278bb1ff7c70b4cd2cb388915f44d103bc5f4d1e3f26dcbf5251db68fe86ae4d86a19e4a814c5c2db40a29a72f1137 SHA512 984fa1a2fe01a3add9b9fe3f616a2a416356a43e499a76f8a5b21d738660ab184384e97de2391cdaaa9e4e28d6bb83f5258577715363e58a13a6dd8445c036cd
 MISC metadata.xml 663 BLAKE2B b64f3da3e4d1dd5ac67867d982f124244f81c03e91b5d7140ee1b16a0fd0250751d41debf9a228150569b7e750929942d011afb0872e3e5098e6106639e0ee3b SHA512 d05d3d71c2511c289c2d1cd4ba638cdc488ee5ea5a8a0da8145929befb41c3efa64f672f12584974239039536c68051f7665730221364ffd20fb8f301672db42
diff --git a/dev-java/cglib/cglib-3.3.0-r1.ebuild b/dev-java/cglib/cglib-3.3.0-r1.ebuild
new file mode 100644
index 000000000000..26ae3e989c16
--- /dev/null
+++ b/dev-java/cglib/cglib-3.3.0-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# doc USE flag is not in IUSE as the docs does not compile because of errors
+JAVA_PKG_IUSE="examples source test"
+MAVEN_ID="cglib:cglib:3.3.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PV=RELEASE_${PV//./_}
+MY_P=cglib-${MY_PV}
+
+DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library"
+HOMEPAGE="https://github.com/cglib/cglib"
+SRC_URI="https://github.com/cglib/cglib/archive//${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CDEPEND="dev-java/ant-core:0
+	dev-java/asm:9
+"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+S="${WORKDIR}"
+
+JAVA_GENTOO_CLASSPATH="asm-9 ant-core"
+JAVA_SRC_DIR="${MY_P}/${PN}/src/main/java"
+JAVA_RESOURCE_DIRS="${MY_P}/${PN}/src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="${MY_P}/${PN}/src/test/java"
+JAVA_TEST_EXCLUDES=(
+	"net.sf.cglib.CodeGenTestCase"		# not a test class
+	"net.sf.cglib.TestAll"
+	"net.sf.cglib.TestGenerator"		# not a test class
+	"net.sf.cglib.proxy.TestEnhancer"	# broken tests
+	"net.sf.cglib.proxy.TestInterceptor"	# not a test class
+	"net.sf.cglib.reflect.TestFastClass"	# broken tests
+)
+
+src_test() {
+	# Caused by: net.sf.cglib.core.CodeGenerationException:
+	# java.lang.reflect.InaccessibleObjectException-->Unable to make protected final java.lang.Class
+	# java.lang.ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain)
+	# throws java.lang.ClassFormatError accessible: module java.base does not "opens java.lang" to unnamed module @42bb2aee
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge "17" ; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+	fi
+
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	use examples && java-pkg_doexamples --subdir samples ${MY_P}/cglib-sample/src/main/java
+}
diff --git a/dev-java/checker-framework-qual/Manifest b/dev-java/checker-framework-qual/Manifest
index be2b7a465d50..05f213142d1b 100644
--- a/dev-java/checker-framework-qual/Manifest
+++ b/dev-java/checker-framework-qual/Manifest
@@ -1,3 +1,3 @@
 DIST checker-framework-3.14.0.tar.gz 7788010 BLAKE2B e05647b7a551cb1e53c32ea65c1d5a28ed7a968310223664704722c58b6df188e80581df383937fef6ebed5042e7234281b55069fde1f4cb34853495c4e2fbff SHA512 14be47e823ba67b6fcb7a8033632a2dd56341bd0d2a56c7501b50eab5e471622372eb4b62f4e78e33be019c15f44d075d146ece98fa3316e7cb24346db98c238
-EBUILD checker-framework-qual-3.14.0.ebuild 730 BLAKE2B 7c5a9f44f407f711082ecbeeec31986b621e956ea5801d76b120492f7e87b0a6d9e49b661b2b48e71f9c31cc272a64519119d3725990fc8f544e81a665a61f33 SHA512 8f7bf0fc2ea189945c2db6525c831c8fbe1c84222f46c8cd857a21132352f9d9c32fde781de6e5c6d43a58ec1e95e2450524ffda84b270aa0c24f2f500749546
+EBUILD checker-framework-qual-3.14.0.ebuild 731 BLAKE2B 57d49bd7011c294925573f2e71a225ae0b6ac054af1cb0b4da0fb2f363063df33d5372e6dde14b946740c18d95c62210f511a02591931c4ac4a9544ead1c8f97 SHA512 6f6a6b2965218142daa81ccc3435d9f53a7dfbd1cd9d1eab8afe26f0601075f611abc831ac6dc4e3d6ab48f7cd927d76fd8683f80e8f533d6c9bb236e3305716
 MISC metadata.xml 559 BLAKE2B cfdff3f58c4318542e3dd6ac9c98c826607441b11506ab0c2b0357701908c02a5b9e4496550fd81ffeed8b853598885230bf36118b4d36a49f191dfd83bece6d SHA512 fc19ef762da9b61820497c0febb3c5213c661aed64630f8235d06c895588743fa22dbe27930afe2790ee88c32e4744b4f4c44993ca0e251f98add7f5e66ee042
diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild
index a83640e7e91d..57becae21d2e 100644
--- a/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild
+++ b/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://checkerframework.org/"
 SRC_URI="https://codeload.github.com/typetools/${MY_PN}/tar.gz/refs/tags/${MY_P} -> ${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/cofoja/Manifest b/dev-java/cofoja/Manifest
deleted file mode 100644
index 9ce6fe67cfed..000000000000
--- a/dev-java/cofoja/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST cofoja-1.2.zip 229127 BLAKE2B b668a731bb86b38caaa599a723dbf34b42781a1c86afc8f905631a98f48fc8d94593d23eea24a53488019cd8f87f094256a7f1f3eda69f5dfb71340ca1bb8d63 SHA512 d6d73d32adaceaeb4c34600c0761f272d4917d276eb654a3e43ad368bc77eae26e9d5b90cb93f7ae073b6dad81eece129337e3c2d52daf7bb3dbc0577dcc2e7e
-DIST cofoja-1.3.tar.gz 104211 BLAKE2B 82c84a4cd0ce788c88f97256a47228512776113e7587c79518dd9d64618a3f92d45b97db25b33105160ee7f51c65518cdd086cafba2d89db3189c3c5dfd8b842 SHA512 c82e3b08ed193715e29a3b0b966ff38e17f73b24384f364946f1f00af0c376ce537d16fe0d0430f4c314f86ea5b46238ae0fa94d79d350c727f143d33f418d8e
-EBUILD cofoja-1.2.ebuild 807 BLAKE2B 9b7464d91cd5303f1a9cb64acc3cd59441d4a5afcfdbe5f4369cbc19fbf4fdae06f405bec0317095a9a4a9d5d81b2a9475936bd718575a866f0910e590bb55e2 SHA512 62642aa7711c2a6745b2f31343a57d888d2c36245b0d27488d2a641982744c87c5009f38777d65d75d75687ca46656685ae47508d1e080b7008bd900164f6a1b
-EBUILD cofoja-1.3.ebuild 806 BLAKE2B 002dea46fc7e71b0ca3e1ee806de0329bb7a6e60ca652a272a603b4abd19710d712273421d7bb36efc09aa7858bfd8103810abbda884f26b5b0a191da707a0f5 SHA512 c191b3059c17888691f4f29993b90da49f34bcc6c1c097b694e11db898fee6483b8944652bcc98d0555db256abf307a5c5e834cf7929040b7c41af785301b54b
-MISC metadata.xml 481 BLAKE2B 887ef2316c35c5c0d89161efb9f2834ba61015f9d876095735ded75a59192d472539304599450c8eecc7eb90be785f534254ac9492f2b514f452b5b613aa58fc SHA512 7e00ea4d30056fa0842ebd5e1a074f2441dfcd96bb1bc882e7e21812f2d06190e41e9ed4b7fa65426a41cfa896f4017ad3235f451be2276d09450906555d0ea2
diff --git a/dev-java/cofoja/cofoja-1.2.ebuild b/dev-java/cofoja/cofoja-1.2.ebuild
deleted file mode 100644
index 9848bd6a3251..000000000000
--- a/dev-java/cofoja/cofoja-1.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Contracts for Java"
-HOMEPAGE="https://github.com/nhatminhle/cofoja"
-SRC_URI="https://github.com/nhatminhle/${PN}/archive/v${PV}.zip -> ${P}.zip"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT="test"
-
-CDEPEND="dev-java/asm:4"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	source? ( app-arch/zip )
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="asm-4"
-JAVA_SRC_DIR="src/com/google/java/contract"
-
-# Relies on a bunch of classes in jsr308,
-# spec we don't have packaged in Gentoo.. yet.
-JAVA_RM_FILES=(
-	src/com/google/java/contract/core/apt/JavacUtils.java
-)
diff --git a/dev-java/cofoja/cofoja-1.3.ebuild b/dev-java/cofoja/cofoja-1.3.ebuild
deleted file mode 100644
index 654d5541a289..000000000000
--- a/dev-java/cofoja/cofoja-1.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Contracts for Java"
-HOMEPAGE="https://github.com/nhatminhle/cofoja"
-SRC_URI="https://github.com/nhatminhle/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="test"
-
-CDEPEND="dev-java/asm:4"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="asm-4"
-JAVA_SRC_DIR="src/com/google/java/contract"
-
-src_prepare() {
-	default
-
-	# Relies on a bunch of classes in jsr308,
-	# spec we don't have packaged in Gentoo.. yet.
-	rm -v src/com/google/java/contract/core/apt/JavacUtils.java || die
-}
diff --git a/dev-java/cofoja/metadata.xml b/dev-java/cofoja/metadata.xml
deleted file mode 100644
index 8a071cbab976..000000000000
--- a/dev-java/cofoja/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="google-code">cofoja</remote-id>
-		<remote-id type="github">nhatminhle/cofoja</remote-id>
-	</upstream>
-	<maintainer type="person">
-		<email>monsieurp@gentoo.org</email>
-		<name>Patrice Clement</name>
-	</maintainer>
-<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/colt/Manifest b/dev-java/colt/Manifest
deleted file mode 100644
index 8ea091563cb5..000000000000
--- a/dev-java/colt/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX colt-1.2.0-benchmark-no-deprecation.patch 1180 BLAKE2B 748b1d14c0982ceb1d703cbf7dd478428c406afb0ae34ed22faf10fc93b97c36ff9d6764ac4b57057eabe4e85984fa5a650b9c65d24e0420e99a81046a67b1b9 SHA512 523a887bc104062a22ecb4e4350c1c8a4a0be642490b98770943b20e6e8e747d95657d10d042198516b2fd830feb0987ff3473b8ab83278ad3db57d29e9239c7
-AUX colt-1.2.0-remove-concurrent-util-imports.patch 6924 BLAKE2B 9ceaed0b61e0e8510d49c2151b9c42f2f125f42592ab98e8fd95812e0af572a8675b18642d103add8dbbec003683fe0d8b32e942a613a46245f3595a1c0827aa SHA512 86b568d66b342ede74dc3207268675c8f91b6b3dcc622486d649ba6a0a283de8b20a46f4ac16da8d90d89b4af603b1c8378b990866123e8e4b8b4e3733be4a36
-DIST colt-1.2.0.tar.gz 2545695 BLAKE2B be5a1e2ca50650a3dfe003855801350f4b01b931b11b59f41e635c4daeb011b7a761a7db8532168157bfbfac5a4473a39e0b49698d9ccd32e0099149dd7d4adb SHA512 a5e88e0cf671faeb336241d120daeb1ad90f1e2061827d06c0c2dc507cd3ae2ab45f2b80451aaedca0f5a8b3de66c13533178e3b6352ed8b2df886d25a924ce0
-EBUILD colt-1.2.0-r3.ebuild 1055 BLAKE2B b86752fc0929982fbd53b96eee06bc23bf89bcd9dd4b6131574e2692d754b3f78d5aedb7711958d4f26a1e73153875e9862a5ab587fda6259cae3c1184766a88 SHA512 7eb72ee23d2bee8f26f68a221479509939dad488a4c375c8660c3b3cf424b538c887f8874ba3e63d5edeff5044e0725082a1d98d284b46d9c608b694188b6581
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/colt/colt-1.2.0-r3.ebuild b/dev-java/colt/colt-1.2.0-r3.ebuild
deleted file mode 100644
index 24cb77f19188..000000000000
--- a/dev-java/colt/colt-1.2.0-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-ant-2 epatch
-
-DESCRIPTION="Java Libraries for High Performance Scientific and Technical Computing"
-SRC_URI="http://dsd.lbl.gov/~hoschek/colt-download/releases/${P}.tar.gz"
-HOMEPAGE="http://www-itg.lbl.gov/~hoschek/colt/"
-
-LICENSE="colt"
-IUSE=""
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-S="${WORKDIR}/${PN}"
-
-EANT_BUILD_TARGET="javac jar"
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-# [0]: I don't know but it must be useful.
-# [1]: Monkey patch manually some classes to get rid of the
-# oswego.edu.concurrent.util imports.
-PATCHES=(
-	"${FILESDIR}/${P}-benchmark-no-deprecation.patch"
-	"${FILESDIR}/${P}-remove-concurrent-util-imports.patch"
-)
-
-java_prepare() {
-	epatch "${PATCHES[@]}"
-	java-pkg_clean
-}
-
-src_install() {
-	java-pkg_dojar "lib/${PN}.jar"
-
-	dohtml README.html
-	use doc && java-pkg_dojavadoc doc/api
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/colt/files/colt-1.2.0-benchmark-no-deprecation.patch b/dev-java/colt/files/colt-1.2.0-benchmark-no-deprecation.patch
deleted file mode 100644
index 2617dc49ad57..000000000000
--- a/dev-java/colt/files/colt-1.2.0-benchmark-no-deprecation.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/cern/colt/matrix/impl/BenchmarkMatrix2D.java	2005-12-13 00:57:28.000000000 -0600
-+++ src/cern/colt/matrix/impl/BenchmarkMatrix2D.java	2005-12-13 01:20:09.000000000 -0600
-@@ -331,6 +331,8 @@
- 	cern.colt.Timer timer1 = new cern.colt.Timer();
- 	cern.colt.Timer timer2 = new cern.colt.Timer();
- 
-+   cern.jet.math.Functions F = cern.jet.math.Functions.functions;
-+
- 	long size = (((long)rows)*columns)*runs;
- 
- 	DoubleMatrix2D  matrix = null;
-@@ -344,7 +346,8 @@
- 	//if (kind.equals("sparse")) ((SparseDoubleMatrix2D)matrix).elements.hashCollisions = 0;
- 	for (int i=0; i<runs; i++) {
- 		timer1.start();
--		cern.colt.matrix.doublealgo.Transform.mult(matrix, 3);
-+		//cern.colt.matrix.doublealgo.Transform.mult(matrix, 3);
-+      matrix.assign(F.mult(3));
- 		timer1.stop();
- 	}
- 	timer1.display();
-@@ -366,7 +369,8 @@
- 	//if (kind.equals("sparse")) ((SparseDoubleMatrix2D)matrix).elements.hashCollisions = 0;
- 	for (int i=0; i<runs; i++) {
- 		timer2.start();
--		cern.colt.matrix.doublealgo.Transform.mult(matrix,3);
-+		// cern.colt.matrix.doublealgo.Transform.mult(matrix,3);
-+      matrix.assign(F.mult(3));
- 		timer2.stop();
- 	}
- 	timer2.display();
diff --git a/dev-java/colt/files/colt-1.2.0-remove-concurrent-util-imports.patch b/dev-java/colt/files/colt-1.2.0-remove-concurrent-util-imports.patch
deleted file mode 100644
index 2cfbef761baf..000000000000
--- a/dev-java/colt/files/colt-1.2.0-remove-concurrent-util-imports.patch
+++ /dev/null
@@ -1,210 +0,0 @@
---- src/cern/colt/matrix/linalg/SmpBlas.java.orig	2015-10-07 22:23:44.969486000 +0000
-+++ src/cern/colt/matrix/linalg/SmpBlas.java	2015-10-07 22:29:15.475486000 +0000
-@@ -10,7 +10,8 @@
- 
- import cern.colt.matrix.DoubleMatrix1D;
- import cern.colt.matrix.DoubleMatrix2D;
--import EDU.oswego.cs.dl.util.concurrent.FJTask;
-+
-+import java.util.concurrent.ForkJoinTask;
- /**
- Parallel implementation of the Basic Linear Algebra System for symmetric multi processing boxes.
- Currently only a few algorithms are parallelised; the others are fully functional, but run in sequential mode.
-@@ -198,7 +199,7 @@
- 	
- 	// set up concurrent tasks
- 	int span = width/noOfTasks;
--	final FJTask[] subTasks = new FJTask[noOfTasks];
-+	final ForkJoinTask[] subTasks = new ForkJoinTask[noOfTasks];
- 	for (int i=0; i<noOfTasks; i++) {
- 		final int offset = i*span;
- 		if (i==noOfTasks-1) span = width - span*i; // last span may be a bit larger
-@@ -217,24 +218,30 @@
- 			CC = C.viewPart(offset,0,span,p);
- 		}
- 				
--		subTasks[i] = new FJTask() { 
-+		subTasks[i] = new ForkJoinTask() { 
- 			public void run() { 
- 				seqBlas.dgemm(transposeA,transposeB,alpha,AA,BB,beta,CC); 
- 				//System.out.println("Hello "+offset); 
- 			}
-+
-+      public boolean exec() { return true; }
-+      public void setRawResult(Object o) {}
-+      public Object getRawResult() {return null;}
- 		};
- 	}
- 	
- 	// run tasks and wait for completion
--	try { 
--		this.smp.taskGroup.invoke(
--			new FJTask() {
--				public void run() {	
--					coInvoke(subTasks);	
--				}
--			}
--		);
--	} catch (InterruptedException exc) {}
-+  this.smp.taskGroup.invoke(
-+          new ForkJoinTask() {
-+              public void run() {	
-+                  invokeAll(subTasks);	
-+              }
-+
-+              public boolean exec() { return true; }
-+              public void setRawResult(Object o) {}
-+              public Object getRawResult() {return null;}
-+          }
-+          );
- }
- public void dgemv(final boolean transposeA, final double alpha, DoubleMatrix2D A, final DoubleMatrix1D x, final double beta, DoubleMatrix1D y) {
- 	/*
-@@ -271,7 +278,7 @@
- 	
- 	// set up concurrent tasks
- 	int span = width/noOfTasks;
--	final FJTask[] subTasks = new FJTask[noOfTasks];
-+	final ForkJoinTask[] subTasks = new ForkJoinTask[noOfTasks];
- 	for (int i=0; i<noOfTasks; i++) {
- 		final int offset = i*span;
- 		if (i==noOfTasks-1) span = width - span*i; // last span may be a bit larger
-@@ -280,24 +287,30 @@
- 		final DoubleMatrix2D AA = A.viewPart(offset,0,span,n);
- 		final DoubleMatrix1D yy = y.viewPart(offset,span);
- 				
--		subTasks[i] = new FJTask() { 
-+		subTasks[i] = new ForkJoinTask() { 
- 			public void run() { 
- 				seqBlas.dgemv(transposeA,alpha,AA,x,beta,yy); 
- 				//System.out.println("Hello "+offset); 
- 			}
-+
-+      public boolean exec() { return true; }
-+      public void setRawResult(Object o) {}
-+      public Object getRawResult() {return null;}
- 		};
- 	}
- 	
- 	// run tasks and wait for completion
--	try { 
--		this.smp.taskGroup.invoke(
--			new FJTask() {
--				public void run() {	
--					coInvoke(subTasks);	
--				}
--			}
--		);
--	} catch (InterruptedException exc) {}
-+  this.smp.taskGroup.invoke(
-+          new ForkJoinTask() {
-+              public void run() {	
-+                  invokeAll(subTasks);	
-+              }
-+
-+              public boolean exec() { return true; }
-+              public void setRawResult(Object o) {}
-+              public Object getRawResult() {return null;}
-+          }
-+          );
- }
- public void dger(double alpha, DoubleMatrix1D x, DoubleMatrix1D y, DoubleMatrix2D A) {
- 	seqBlas.dger(alpha,x,y,A);
-@@ -369,9 +382,6 @@
- /**
-  * Prints various snapshot statistics to System.out; Simply delegates to {@link EDU.oswego.cs.dl.util.concurrent.FJTaskRunnerGroup#stats}.
-  */
--public void stats() {
--	if (this.smp!=null) this.smp.stats();
--}
- private double xsum(DoubleMatrix2D A) {
- 	double[] sums = run(A,true,
- 		new Matrix2DMatrix2DFunction() {
---- src/cern/colt/matrix/linalg/Smp.java.orig	2015-10-07 21:08:19.443486000 +0000
-+++ src/cern/colt/matrix/linalg/Smp.java	2015-10-07 22:28:24.722486000 +0000
-@@ -9,12 +9,13 @@
- package cern.colt.matrix.linalg;
- 
- import cern.colt.matrix.DoubleMatrix2D;
--import EDU.oswego.cs.dl.util.concurrent.FJTask;
--import EDU.oswego.cs.dl.util.concurrent.FJTaskRunnerGroup;
-+import java.util.concurrent.ForkJoinTask;
-+import java.util.concurrent.ForkJoinPool;
-+
- /*
- */
- class Smp {
--	protected FJTaskRunnerGroup taskGroup; // a very efficient and light weight thread pool
-+	protected ForkJoinPool taskGroup; // a very efficient and light weight thread pool
- 
- 	protected int maxThreads;	
- /**
-@@ -24,41 +25,39 @@
- 	maxThreads = Math.max(1,maxThreads);
- 	this.maxThreads = maxThreads;
- 	if (maxThreads>1) {
--		this.taskGroup = new FJTaskRunnerGroup(maxThreads);
-+		this.taskGroup = new ForkJoinPool(maxThreads);
- 	}
- 	else { // avoid parallel overhead
- 		this.taskGroup = null;
- 	}
- }
--/**
-- * Clean up deamon threads, if necessary.
-- */
--public void finalize() {
--	if (this.taskGroup!=null) this.taskGroup.interruptAll();
--}
- protected void run(final DoubleMatrix2D[] blocksA, final DoubleMatrix2D[] blocksB, final double[] results, final Matrix2DMatrix2DFunction function) {
--	final FJTask[] subTasks = new FJTask[blocksA.length];
-+	final ForkJoinTask[] subTasks = new ForkJoinTask[blocksA.length];
- 	for (int i=0; i<blocksA.length; i++) {
- 		final int k = i;
--		subTasks[i] = new FJTask() { 
-+		subTasks[i] = new ForkJoinTask() { 
- 			public void run() {
- 				double result = function.apply(blocksA[k],blocksB != null ? blocksB[k] : null);
- 				if (results!=null) results[k] = result; 
- 				//System.out.print("."); 
- 			}
-+      public boolean exec() { return true; }
-+      public void setRawResult(Object o) {}
-+      public Object getRawResult() {return null;}
- 		};
- 	}
- 
- 	// run tasks and wait for completion
--	try { 
--		this.taskGroup.invoke(
--			new FJTask() {
--				public void run() {	
--					coInvoke(subTasks);	
--				}
--			}
--		);
--	} catch (InterruptedException exc) {}
-+  this.taskGroup.invoke(
-+          new ForkJoinTask() {
-+              public void run() {	
-+                  invokeAll(subTasks);	
-+              }
-+              public boolean exec() { return true; }
-+              public void setRawResult(Object o) {}
-+              public Object getRawResult() {return null;}
-+          }
-+          );
- }
- protected DoubleMatrix2D[] splitBlockedNN(DoubleMatrix2D A, int threshold, long flops) {
- 	/*
-@@ -186,10 +185,4 @@
- 	}
- 	return blocks;
- }
--/**
-- * Prints various snapshot statistics to System.out; Simply delegates to {@link EDU.oswego.cs.dl.util.concurrent.FJTaskRunnerGroup#stats}.
-- */
--public void stats() {
--	if (this.taskGroup!=null) this.taskGroup.stats();
--}
- }
diff --git a/dev-java/colt/metadata.xml b/dev-java/colt/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/colt/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/commons-beanutils/Manifest b/dev-java/commons-beanutils/Manifest
index a189a5b4002d..63eb1dc29f73 100644
--- a/dev-java/commons-beanutils/Manifest
+++ b/dev-java/commons-beanutils/Manifest
@@ -1,3 +1,3 @@
 DIST commons-beanutils-1.9.4-src.tar.gz 412606 BLAKE2B 213a2ad4d976ed4c55c9a73c0970a656e2f03efcba886369c8be164e04618937ad636ce7ffa6aa7b981e9595b24e4cbacc2bc632268bbfede8172091ef6eb4ff SHA512 6f3d30d02b9a66cf20509bd868c6e2dadb44bb27da1e6b9af7275675e0f3826845a5d4005509dd1eb77a5b2937820c4770a3753daaab072785dcdab0caa69e73
-EBUILD commons-beanutils-1.9.4-r1.ebuild 4621 BLAKE2B f0359f6b08f91b29150eadca12ef3425aafaf2130d123997ca781256d2ad7619e0091f99240d8cb565645534640433c57b909ec4d21abe07e6eab4973926f2aa SHA512 85f13f5878b7f842524d13d041700777dd09aa1cb65bed19c9a87e729d3be5702dc5a25deaa00e9ae31b7f33d068306725c71af28f60c6d9412ae652a788574d
+EBUILD commons-beanutils-1.9.4-r1.ebuild 4632 BLAKE2B 7af9444c86099385097cda169be0d64d80076dbd564fe95bf950a6b6c812578c21666f4b9d970bab6bb3465a4947188468b3f7e99b6c0020e456185175afb64a SHA512 9ecb0a383526c4fac98594799ca0d1cecf4b88b656cc90c26b5884aa2ee3db27eccd8f8160286573537410c8e331cf8f74ac18d8e798fb8aa23189562e4592e1
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild
index 96eda55d0e0b..a4b3175fa186 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/beanutils/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.7"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index 596730d607d9..6d1245fdad74 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -1,8 +1,6 @@
 AUX commons-collections-3.2.2-fixes.patch 9913 BLAKE2B 0582b3c2e06275ddc75fdaf051ef5fec6cb6c95b3ffae77b08bd093e3b3e7a140e040c20a9be24e06d03a492325db94c21e69a4ae9fcb4e8099ee7bc30059b70 SHA512 88850bd1db483348d5c35c593e79f38de46f362aa124dea91e47940b9eeadef7d9ae9e7d34978d55bc4e51091c34ae862b33ca4710c71ffdc92840c2429b05f1
 DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7edd7c9b50060413880d41dcb28c01cf05f7e00a9f5e1560012c3c3c763162412282db9512bc2b64a5788f210c5c8866943d912dafb SHA512 2e8ef638f07515b028a3e7e97851fcf1d9023a2c188e211bd1e936f35d3d91c2885adf3b1103ad17dfb7aeea6e7a67ce7826ee346a8a29c1aa7c6b0cf14e9230
 DIST commons-collections-4.4-src.tar.gz 703008 BLAKE2B f4a0e858eb7412bdd431894f923a4731685ceb2463bee002401d8048cc40534f002ec0291aa67297e061a50b624d3de8f64e227f513ab1f3620e38d1d6858255 SHA512 2110e73eda97ca52a886cb708f21d8609a83655861594f3b6eb7a15b777d42eeeefc5d3b28ffc6ecc5e4f0b3fd5407f80019c2ce006f970f55455ef33eee47ee
-DIST commons-collections4-4.1-src.tar.gz 704671 BLAKE2B dea1b630168373013ca937c9b02414b92845fdd9ddf7a22a05c4d7f8d30ff26d73f3a2d399d7a4c026f8ec43a282120fdf3d3cb1042a311c3b490ffed1774e30 SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b
-EBUILD commons-collections-3.2.2.ebuild 1390 BLAKE2B 5ac882bdfc9217661bb1b0fb6ee29d9098b5106113226d93e38b0c5896c8659e39938f402d3b7c9e560266b8258996162480426be59bbac4ef75728303f0958a SHA512 a1405eaddbcb95664550eb5961581c92292606616181374b8f3c9e9d287d08f20cabbb1e86c07da2907f903c71c1487a6e3ea53c5c4b2731f872591555a21f94
-EBUILD commons-collections-4.1-r1.ebuild 1267 BLAKE2B 9183580e99a30c85c61ad045bde305a5e43ede963c38aa0b33bb7ab052e240291845a3ebdbc9553228ff58d5432122879ebd7b6f4af2e9a2c05666061c85adcd SHA512 2218be50d5e2d00e1a2c1783d46b9ac159c7f72dabffa506d50df8f0ed4e669a908544fb7afaa4b0404867cf931cea14960ce7cc28a769afe6a2c736e71307bf
-EBUILD commons-collections-4.4.ebuild 2067 BLAKE2B 202afbbdbc645dcec318d99cbb8e8a1db304dc17334e7c37537f44c97c3e8f85b21d646612062fbf83ae375202ffce08facfa1db314dfc3919270f04d2cee2e4 SHA512 c3f36ada36f4547ad4ffa61c6e0e7eba4e43885d81ffd6fb643393f0ba2f6304dec6c20fb62cf8fb2c6e8ceeb1a117b24eeb5b1cc823ae94ec04f1c851122deb
+EBUILD commons-collections-3.2.2.ebuild 1389 BLAKE2B 1190300af0c8b7dfca7edb662a7c9314111a95ab56de0eaaa93fd0f26e21475181befd7fc41dc3b064c41e85c17ab95562afa6170ab53c4e288903caaaedf2f0 SHA512 a1881fd133e1efba964a2fd3d60575fbe88da634b0e41d8ba3244e306ad63c54db5be60e284cfb0ff34a72067bbe73a11ed2aaab60468896afc9c10172559196
+EBUILD commons-collections-4.4.ebuild 2063 BLAKE2B 76df1c1b3ed4906d090b37e85e121b17c940874e6202db0a5af683349cc1113e8de23429a1fd79924dbdcef6e2e1e832329ec16340a6a91d255d34f8fc4db8a6 SHA512 1eda617730964949d02621787efa47a87652f7d757b4678b00e05cca4cc4ba10266eeb62209db63ce5ec745502110dd6e9ec1e1a801f49ccfcf6065b68d8a248
 MISC metadata.xml 388 BLAKE2B 11018df0e1c7417ebbc68b44642701ad88c8add20c233cceafb84c41b56cd7e3d2f0004406ba6286babd78493dda13171c1c3b0a1a7b563289d2c4c58921bda6 SHA512 28a72920d0c97f0caae41ba74a55602e25c953d2c510e0e4d72a8c7482abe7855b587fa85efbc51c9262472b90ae35a88732d33744a101d288ec8afa8fff4ae2
diff --git a/dev-java/commons-collections/commons-collections-3.2.2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
index e205323f6cdc..3e6fe5ecf537 100644
--- a/dev-java/commons-collections/commons-collections-3.2.2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
deleted file mode 100644
index 228b947a439d..000000000000
--- a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.commons:commons-collections4:4.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-SLOT="4"
-MY_P="${PN}${SLOT}-${PV}"
-
-DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
-HOMEPAGE="https://commons.apache.org/collections/"
-SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=virtual/jdk-1.8
-	test? (
-		dev-java/easymock:3.2
-		dev-java/junit:4
-	)"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}-src"
-
-JAVA_SRC_DIR="src/main/java"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc RELEASE-NOTES.txt
-	docinto html
-	dodoc {DEVELOPERS-GUIDE,PROPOSAL}.html
-}
-
-src_test() {
-	local DIR=src/test/java
-	local CP="${DIR}:${DIR}/../resources:${PN}.jar:$(java-pkg_getjars easymock-3.2,junit-4)"
-	local TESTS=$(find ${DIR} -name "*Test.java" ! -name "Abstract*" ! -name "BulkTest.*")
-	TESTS="${TESTS//src\/test\/java\/}"
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/commons-collections/commons-collections-4.4.ebuild b/dev-java/commons-collections/commons-collections-4.4.ebuild
index 994cf13e94df..b843e427b13b 100644
--- a/dev-java/commons-collections/commons-collections-4.4.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/commons-csv/Manifest b/dev-java/commons-csv/Manifest
index d13984b857f0..c178c4045b59 100644
--- a/dev-java/commons-csv/Manifest
+++ b/dev-java/commons-csv/Manifest
@@ -1,3 +1,3 @@
 DIST commons-csv-1.9.0-sources.tar.gz 36975991 BLAKE2B b2e2091556f3766968dbe660e4059f491eedc458d3c15c0372770d144737ab3ddcc78ff36f674759bde8aa9690e4bbe14866f8546e1de3b67498736678650697 SHA512 4610197fbbf1b3fb3ff19ff8f5ee0ffe945c34c05e3db71b89156bf17aa7f6b2816ddace85457fec82cb22337f777e08eac5984d7299e702b537f0d242d368d8
-EBUILD commons-csv-1.9.0.ebuild 1660 BLAKE2B fac0bf3a678bf60cfe427349d6eb4a109c5fee7e0593b17e532ac839306c9277e3b23ca8e69d95155d7b328efe11eb6d24b41c2eef957dd51ec10df4bf8a55b0 SHA512 029751f9905e372e8aa64ef737d4ae51e6e5f491d646bd1cc36d854b22fb3fa8c85605ff9db9d909e3c996aa43a8a966e46d361dc54dd180b57f6f7829f1b7ec
+EBUILD commons-csv-1.9.0.ebuild 1671 BLAKE2B 1aa68ad72ab34b26025eab8761ced46a338c81fd62fee03f951419f1cdc0a63948dbe3425e11911c299ac4630497260c465dc5af07f727e223104983e6c3e851 SHA512 f2763296deba093fb1134efff8228a986a47e920023043a881cd3ac45e166642867d14247ffcfeaf5b0ef050b0f0f535fc9c363e356fcbcfcfdd658a2439b24d
 MISC metadata.xml 416 BLAKE2B 193c84e7cdd7d31c475be29d0f00c44f86dba7226d4c9d3de052b9ecc8e2dae8fe9b402cdd797b04d714253591b39b3f858be13caf0584b1e67f6756cbae7bce SHA512 9c3695f3b80d8efb699cf1f1b8801aa173480a71604abdcc8cf3d093f9631fbf0ef2c6cfbf22ae106831b0b58747219184966904b9c3622c1ce424d4325e18b6
diff --git a/dev-java/commons-csv/commons-csv-1.9.0.ebuild b/dev-java/commons-csv/commons-csv-1.9.0.ebuild
index 8860918b9973..43f3489184f5 100644
--- a/dev-java/commons-csv/commons-csv-1.9.0.ebuild
+++ b/dev-java/commons-csv/commons-csv-1.9.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:
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-csv/"
 SRC_URI="mirror://apache/commons/csv/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # missing test deps
 RESTRICT="test"
diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
index 81b79f7a03bb..e1eff5398b62 100644
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -1,5 +1,3 @@
-DIST commons-daemon-1.0.15-src.tar.gz 291128 BLAKE2B af874e6a0852c2dc5c84fcbf5e1e443fb880a306b19054263d06e8d83a9b0866a52f2950c457315d80031a58250ec75284fc7839df82b7555b1ff3bd92e67810 SHA512 f20cc8796978fb09b6ecc8d99bb3c8b271b097d74c1f99b286cde213631e7f50a4104f5db2c354f9624ba8b037502d81e327c581b38253b9b216aa2172016e40
-DIST commons-daemon-1.1.0-src.tar.gz 298028 BLAKE2B 5e8a0719467523438559472270ac7038ecce040f2a5a8ea8704e181557df726b9c09267b57336d9659dcb3528fecb8ac61937ef3d56e5cb12b562b88b5f6f218 SHA512 a370085a991cd6b121fcfb49822660dfc0aac19f164677dd2e6373750c1a526ef5a10334a8e075fd965c038198f6638b9e9130b5b13256f4a23a6c5a29959701
-EBUILD commons-daemon-1.0.15.ebuild 1232 BLAKE2B 78bc104748e2134d37d137570be7cc16191060ea0c4df790563219de67e085a89e5d4bce0b0b5b6ea30bce39afc57066bae8c56451faf1c265228bd3e998e397 SHA512 05a543c150095c0125c3651632884945439f26d4959ff9dbbc503be461615362f3b9e24208c2b2faef72c73ffac6c848884478e8b7f2b2c8dcb4665196f03c83
-EBUILD commons-daemon-1.1.0.ebuild 1197 BLAKE2B fc07b31feb931246022a5633b253407d9cb9f8e9ae00b7f11b62b4efa4435ad9ed2ac430fb76f5955386d8d9f99419e107e37af7be2f9021c136732231936784 SHA512 60a4f508609fc201099ef8b8341c384ab1a5411ef4c6e9fda6e2586b87cc901eb83341154c5b7c9ad63f26861382aaa7a0eb520858236f74037322b7dea399a8
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
+DIST commons-daemon-1.2.4-src.tar.gz 281929 BLAKE2B 877f1c31024a2f3e4796abdd11059bd636444f5c856b998a39761fb0b221467e986586fef43463a4d01b4d4f7a562f9f8c658b94a124cd356b0a70cc185c0030 SHA512 36e9cb3153ca763bfaaa71575a1584610254f1ce4c0f666ff7bbc628311405430536413525c9c777e4364eea62a247fb084750d837e84a62d9fce92a61909d56
+EBUILD commons-daemon-1.2.4.ebuild 1457 BLAKE2B 23a03bb678cbdf4f897f56e4058241bd7e97228fffc152f568dd7f96e889d1cfe032d06be13ed97d74b345f3c6412d18cf1a322d7c8a31cc0581cf86e9dd0338 SHA512 64b4f7eb81eb75719138513dfa8ab2e26623443bf264201bff0b1c4d81ee764ce79e267515e54ba6767650f5818b68cbbd0678d99037042e5941f7c5d652d8f4
+MISC metadata.xml 530 BLAKE2B 313ae727a7149cfaa5e962b1daa4831e77b5f168d8f8d7f2b1242b8fa36f9d2f0460541ec53b8e81cbfae209e3c5e57f5dc5895e881acb61ce9118110aace98b SHA512 738ded66dfc479b30f4c1b6aae4052a4a2de5bf68aa9001a6a1f8fb29203a17b3fe10e52c7f5d26b1de313a74b3713cd22db259a584875f8f91391437cea53e0
diff --git a/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
deleted file mode 100644
index e97f26dfb42d..000000000000
--- a/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit autotools java-pkg-2 java-ant-2
-
-DESCRIPTION="Tools to allow Java programs to run as UNIX daemons"
-SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz"
-HOMEPAGE="http://commons.apache.org/daemon/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-CDEPEND="kernel_linux? ( sys-libs/libcap )"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	source? ( app-arch/zip )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}-src"
-
-java_prepare() {
-	cd "${S}/src/native/unix" || die
-	sed -i "s/powerpc/powerpc|powerpc64/g" support/apsupport.m4 || die
-	eautoconf
-}
-
-src_configure() {
-	java-ant-2_src_configure
-	cd "${S}/src/native/unix" || die
-	default
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-	cd "${S}/src/native/unix" || die
-	default
-}
-
-src_install() {
-	dobin src/native/unix/jsvc
-	java-pkg_newjar dist/*.jar
-
-	dodoc README RELEASE-NOTES.txt *.html src/native/unix/CHANGES.txt
-	use doc && java-pkg_dohtml -r dist/docs/*
-	use examples && java-pkg_doexamples src/samples
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/commons-daemon/commons-daemon-1.1.0.ebuild b/dev-java/commons-daemon/commons-daemon-1.1.0.ebuild
deleted file mode 100644
index e7677061981d..000000000000
--- a/dev-java/commons-daemon/commons-daemon-1.1.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit autotools java-pkg-2 java-ant-2
-
-DESCRIPTION="Tools to allow Java programs to run as UNIX daemons"
-SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz"
-HOMEPAGE="https://commons.apache.org/daemon/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-CDEPEND="kernel_linux? ( sys-libs/libcap )"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}-src"
-
-src_prepare() {
-	default
-	cd "${S}/src/native/unix" || die
-	sed -i "s/powerpc/powerpc|powerpc64/g" support/apsupport.m4 || die
-	eautoconf
-}
-
-src_configure() {
-	java-ant-2_src_configure
-	cd "${S}/src/native/unix" || die
-	default
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-	cd "${S}/src/native/unix" || die
-	default
-}
-
-src_install() {
-	dobin src/native/unix/jsvc
-	java-pkg_newjar dist/*.jar
-
-	dodoc README RELEASE-NOTES.txt PROPOSAL.html
-	use doc && java-pkg_dohtml -r dist/docs/*
-	use examples && java-pkg_doexamples src/samples
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/commons-daemon/commons-daemon-1.2.4.ebuild b/dev-java/commons-daemon/commons-daemon-1.2.4.ebuild
new file mode 100644
index 000000000000..8eb3ed4a1335
--- /dev/null
+++ b/dev-java/commons-daemon/commons-daemon-1.2.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/daemon/source/commons-daemon-1.2.4-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-daemon-1.2.4.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="commons-daemon:commons-daemon:1.2.4"
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple toolchain-funcs
+
+DESCRIPTION="Tools to allow Java programs to run as UNIX daemons"
+HOMEPAGE="https://commons.apache.org/proper/commons-daemon/"
+SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( {CONTRIBUTING,README}.md {HOWTO-RELEASE,LICENSE,NOTICE,RELEASE-NOTES}.txt )
+HTML_DOCS=( PROPOSAL.html )
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
+
+# There is only org/apache/commons/daemon/SimpleDaemon.java
+# which is not even run upstream ( mvn test ).
+# JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+# JAVA_TEST_SRC_DIR="src/test/java"
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	pushd src/native/unix || die
+		./configure
+		emake AR="$(tc-getAR)"
+	popd
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+
+	dobin src/native/unix/jsvc
+}
diff --git a/dev-java/commons-daemon/metadata.xml b/dev-java/commons-daemon/metadata.xml
index 6021501589e0..4818627a6525 100644
--- a/dev-java/commons-daemon/metadata.xml
+++ b/dev-java/commons-daemon/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		Apache Commons Daemon software is a set of utilities and Java support classes for running Java applications as server processes. These are commonly known as 'daemon' processes in Unix terminology (hence the name). On Windows they are called 'services'
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/commons-digester/Manifest b/dev-java/commons-digester/Manifest
index 0b82c2810a20..f7954941deee 100644
--- a/dev-java/commons-digester/Manifest
+++ b/dev-java/commons-digester/Manifest
@@ -1,12 +1,5 @@
-AUX 1.8.1-build.xml-jar-target.patch 1099 BLAKE2B e1ce425c943ebb36dd73447aa7d41c3fad20d22c75bc0d63d4137dd8be0afbeed4cf30a6ad48b24e5f3c9c1c018ce091c2a4d107aff8c62c161895c2bb78fcb8 SHA512 f28fd46608ca3817739ac4cdb07bf57ec28e0ebb22c3d086ef36567b44bb595b040dc27bb57a89f55568b8e4966b627f18829171908c14b4cced99787fc623c5
-AUX commons-digester-2.1-build.xml 12816 BLAKE2B 7309479a61897c3ecc28e6394714c1fb4691035f2f57f64f8dcccfab407a681e4ca2076ddf2cd783ec3bb0b726d38033b63c10444169d029fe39613ab0760c4c SHA512 f42f80e68e8b6d31b07add393e1adc1714278e9e8e6ccab08dfb6a131bdafeab1ae5c5859e81dabc5acff88d2151093d82a3e089293f653bcab307451839c0ef
-DIST commons-digester-1.8.1-src.tar.gz 303266 BLAKE2B 618885c812a9bf40c080bc5736b8b4be4e18fe4d2f732d2a44d39369ae6cf3beb3af0cf500da3d103d7aa8c18b41b84d06907b6fc90f7f10d30840d6cfc83012 SHA512 0a39069662b4792d4856b79b5cedc2b44cb70303a19045d21c233d45ae4dde9e80662bd242a381e759d7cdb5adaf0b9fa6206bb8397b53348fa9eac12e9a4e96
 DIST commons-digester-2.1-src.tar.gz 304060 BLAKE2B 2360f6f8ab77b20ad6b4058e0437aa792bf3886ddec2e09b6db259bc142c070965ce066ef224e92fb91614075631a2af1358ae4b4fc065fe9118e1d2559bb9bb SHA512 6bdb63431ed1e17f5e8ba24951762750a0e59b70c76eabecbf13f5fe6974864825456beed615c8f2c16f9a2f1404f2e56bdbc3ba335656c3661d5f368c708b88
 DIST commons-digester-3.2.tar.gz 324555 BLAKE2B 7b8bdaa70eeafb069e9ecbfe697ab86f5167ae3b9933e8aa306f0080de0ec99d12bd023067678b7b904329178f553fd6d4d98141ab329154a1c27385b33e449f SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad
-DIST commons-digester3-3.2-src.tar.gz 324555 BLAKE2B 7b8bdaa70eeafb069e9ecbfe697ab86f5167ae3b9933e8aa306f0080de0ec99d12bd023067678b7b904329178f553fd6d4d98141ab329154a1c27385b33e449f SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad
-EBUILD commons-digester-1.8.1-r2.ebuild 1324 BLAKE2B 2cef18509056f371eb658b67e4a9eff75d6eae6e197eaaf8887a674850399d4f58543913e43113e35e9a5dc2da1ad8397b84711713d82158d6a0fe07ad895117 SHA512 0ac87e54cb3e3ecd4872c9df9ea2bc2174ca8a52922582575ec0006e6e484e6e7e3c878525705de4ba42a58d36fe9235f47065d8837c44c905d8b03ce4481a81
-EBUILD commons-digester-2.1-r1.ebuild 1310 BLAKE2B 3e8e5971648240771f5031f90991ee20a5009f42c81ac7cd72f7145331212bf19dba9688ce501081562f08cb01b4bd5510d77ab37638d047d5d6803374e6cc24 SHA512 86db8e1e6fbcc76f64f90f20e14efb30cb29427525147204f6edcb845b90082ba53f0e46f3db4d6a751105c0429da672bbb943b256bafb6a859efb520e63130a
-EBUILD commons-digester-2.1-r2.ebuild 1994 BLAKE2B 9cdff6f6e00f6cc706c02d50d7cacca8aa6ad01e929aa78aa2c8521decdef9d45ee87bd053a6749d2e6ffb7b80250b5d98f52213c80b0dc25a28368041ff1d2f SHA512 261a0882d8f16eba2c2a3b42b5c19ce3ccd8e3f7690a5e7c36327b9f11ad628b59c6ab6723e87e492d1ac471e04fcf59d91a5ba5601a1842e478bb97da6831a2
-EBUILD commons-digester-3.2-r2.ebuild 1336 BLAKE2B 4f9b7003b2c7b09cd21d79f0f2fb2e0f970a85c48d502e9921ae2e55883edeb5008630bde20f6428b2d91583527a73b8d9630603a608ea06120797631d909c4b SHA512 4325436fc97d1378b011ab7bde10a6187b8e7e0ef7b305e28d531780bc36225f8838bd5aeb5e7dde2c8da5031e97ff68da4f6932c2bdfa685ba836afe2ea5a75
-EBUILD commons-digester-3.2-r3.ebuild 2384 BLAKE2B 26b082902710279cf3b185f928a6a903cee6bec2206fccd1396d81e0ef981d7274388e52eaaf498e223e4537086314da05ceae6832e75935e39cba6af0295845 SHA512 ce7ee2520094c7eeb3b5914f100503f5450ed4c74706cc7634484c7c21971566f8de563812946b5dada35f79f2bcb737b55bff21593252648fea6d0fd2a29d6a
+EBUILD commons-digester-2.1-r2.ebuild 1991 BLAKE2B 2f97f8099b4669c8f5a68ad17b5b5aa21fbd491f098cb69350ef3b405448e23c3d830516943b42e6776b8f9038a45fbc3bf51065d6de4f2d473827b9069daf5d SHA512 ea2e7788cbf1164457e1dce9dae443196fdaedc59ff1f5edfc1db31a62a6c771b51ebe606e0ab75a6294893b72ea8a10bdb3289beaa77c4da01f22d5ddd02f90
+EBUILD commons-digester-3.2-r3.ebuild 2381 BLAKE2B 6110eebe1e85e84244c69696d8d8711a873303b33cd3af6f0942bcbb1d11d764f7df46b333fd08462725915266fc81aa5cfd89239629b9ba8f15ccc4c8261f3b SHA512 1476892c5b07b7606599955bf87f9591f3672cdd64d47f26ec38cd935d253a6ddb043334a6ec22d44cae2c4908e642633ead1785a2dcb7fb55f23e96187f95ff
 MISC metadata.xml 482 BLAKE2B 2c8b9ab044dd5e95d9f17fcb0e284c7d8ed87727fa891bc6c15414b8db928346e8af71222bb3e6daec5ce682cfe72c7f315aa55d1dd5d55531554ab7d4ddc863 SHA512 31bd4dd9999a412986ac2dcc5cccffd7dd1f36ce8bf148f93dd35115da003c2663a0f5994a3e2a44ad537c26ee534294c80697f986737c02f434b3646e8f7c40
diff --git a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
deleted file mode 100644
index 7fef273f04d0..000000000000
--- a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit epatch java-pkg-2 java-ant-2
-
-MY_P="${P}-src"
-DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
-HOMEPAGE="http://commons.apache.org/digester/"
-SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-CDEPEND="dev-java/commons-beanutils:1.7
-	>=dev-java/commons-collections-2.1:0
-	>=dev-java/commons-logging-1.0.2:0"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)
-	${CDEPEND}"
-
-S="${WORKDIR}/${P}-src"
-
-# don't rewrite build.xml in examples
-JAVA_PKG_BSFIX_ALL="no"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-collections,commons-logging"
-
-java_prepare() {
-	epatch "${FILESDIR}/${PV}-build.xml-jar-target.patch"
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar "dist/${PN}.jar"
-
-	dodoc RELEASE-NOTES.txt
-
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/org
-	use examples && java-pkg_doexamples src/examples
-}
diff --git a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
deleted file mode 100644
index 0533f4f8b685..000000000000
--- a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-MAVEN_ID="commons-digester:commons-digester:2.1"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${P}-src"
-
-DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
-HOMEPAGE="http://commons.apache.org/digester/"
-SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.1"
-KEYWORDS="amd64 ppc64 x86"
-
-CDEPEND="dev-java/commons-beanutils:1.7
-	>=dev-java/commons-collections-2.1:0
-	>=dev-java/commons-logging-1.0.2:0"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-collections,commons-logging"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${PN}.jar
-
-	dodoc RELEASE-NOTES.txt
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/org
-	use examples && java-pkg_doexamples src/examples
-}
diff --git a/dev-java/commons-digester/commons-digester-2.1-r2.ebuild b/dev-java/commons-digester/commons-digester-2.1-r2.ebuild
index 7db4511aecd1..2999e8c31357 100644
--- a/dev-java/commons-digester/commons-digester-2.1-r2.ebuild
+++ b/dev-java/commons-digester/commons-digester-2.1-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2.1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/commons-digester/commons-digester-3.2-r2.ebuild b/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
deleted file mode 100644
index f30609298a34..000000000000
--- a/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}3-${PV}-src"
-
-DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
-HOMEPAGE="http://commons.apache.org/digester/"
-SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.2"
-KEYWORDS="amd64 ppc64 x86"
-
-CDEPEND="dev-java/cglib:3
-	dev-java/commons-beanutils:1.7
-	>=dev-java/commons-logging-1.0.2:0"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	test? (
-		dev-java/junit:4
-		dev-java/ant-junit:0
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-logging,cglib-3"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}-2.1-build.xml build.xml || die
-
-	# Doesn't work.
-	rm -v src/test/java/org/apache/commons/digester3/Digester153TestCase.java
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${PN}.jar
-
-	dodoc RELEASE-NOTES.txt
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/org
-	use examples && java-pkg_doexamples src/examples
-}
diff --git a/dev-java/commons-digester/commons-digester-3.2-r3.ebuild b/dev-java/commons-digester/commons-digester-3.2-r3.ebuild
index 45e85fb373f2..14a7ba03b87c 100644
--- a/dev-java/commons-digester/commons-digester-3.2-r3.ebuild
+++ b/dev-java/commons-digester/commons-digester-3.2-r3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/digester/source/${PN}3-${PV}-src.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="3.2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # 1) atomWithNamespaceParse(org.apache.commons.digester3.xmlrules.SetNamespaceURITestCase)
 # java.net.UnknownHostException: commons.apache.org
diff --git a/dev-java/commons-digester/files/1.8.1-build.xml-jar-target.patch b/dev-java/commons-digester/files/1.8.1-build.xml-jar-target.patch
deleted file mode 100644
index ec523a011458..000000000000
--- a/dev-java/commons-digester/files/1.8.1-build.xml-jar-target.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- build.xml.orig	2009-02-15 21:06:33.000000000 +0100
-+++ build.xml	2009-02-15 21:07:25.000000000 +0100
-@@ -117,6 +117,7 @@
-     <pathelement location="${jaxp.jaxp.jar}"/>
-     <pathelement location="${jaxp.parser.jar}"/>
-     <pathelement location="${commons-beanutils.jar}"/>
-+    <pathelement location="${commons-collections.jar}" />
-     <pathelement location="${commons-logging.jar}"/>
-     <pathelement location="${junit.jar}"/>
-   </path>
-@@ -140,6 +141,7 @@
-     <pathelement location="${junit.jar}"/>
-     <pathelement location="${jaxp.jaxp.jar}"/>
-     <pathelement location="${jaxp.parser.jar}"/>
-+    <pathelement location="${commons-collections.jar}" />
-     <pathelement location="${commons-beanutils.jar}"/>
-     <pathelement location="${commons-logging.jar}"/>
-   </path>
-@@ -256,7 +258,7 @@
-     </javadoc>
-   </target>
- 
--  <target name="jar" depends="compile, test"
-+  <target name="jar" depends="compile"
-    description="Create commons-digester.jar">
-     <mkdir      dir="${dist.home}"/>
-     <jar    jarfile="${dist.home}/commons-${component.name}.jar"
diff --git a/dev-java/commons-digester/files/commons-digester-2.1-build.xml b/dev-java/commons-digester/files/commons-digester-2.1-build.xml
deleted file mode 100644
index 505df88a8abc..000000000000
--- a/dev-java/commons-digester/files/commons-digester-2.1-build.xml
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 8/12/13 6:51 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="commons-digester-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="commons-digester"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="."/>
-  <property name="maven.build.resourceDir.1" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-  </path>
-  <path id="build.test.classpath">
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           encoding="iso-8859-1" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <mkdir dir="${maven.build.outputDir}/META-INF"/>
-    <copy todir="${maven.build.outputDir}/META-INF">
-      <fileset dir="${maven.build.resourceDir.0}">
-        <include name="NOTICE.txt"/>
-        <include name="LICENSE.txt"/>
-      </fileset>
-    </copy>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.1}">
-        <include name="**/*.dtd"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           encoding="iso-8859-1" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}">
-        <include name="**/*.xml"/>
-        <include name="**/*.xsd"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/TestBean.java"/>
-          <exclude name="**/TestRule.java"/>
-          <exclude name="**/TestRuleSet.java"/>
-          <exclude name="**/Test*$*.java"/>
-		      <exclude name="**/*Abstract*.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/TestBean.java"/>
-          <exclude name="**/TestRule.java"/>
-          <exclude name="**/TestRuleSet.java"/>
-          <exclude name="**/Test*$*.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             encoding="iso-8859-1" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             source="1.5" 
-             linksource="true" 
-             breakiterator="false">
-      <link href="http://java.sun.com/javase/6/docs/api/"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/commons-beanutils/commons-beanutils/1.8.3"/>
-    <get src="http://repository.apache.org/snapshots/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar" 
-         dest="${maven.repo.local}/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar" 
-         dest="${maven.repo.local}/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/commons-logging/commons-logging/1.1.1"/>
-    <get src="http://repository.apache.org/snapshots/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" 
-         dest="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" 
-         dest="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.8.1"/>
-    <get src="http://repository.apache.org/snapshots/junit/junit/4.8.1/junit-4.8.1.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.8.1/junit-4.8.1.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index c7ea3554c0b8..83dfee5a0cee 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,6 +1,6 @@
 AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12404 BLAKE2B 294ef11924310e2e63865018843faf199521f619e0859cc2c857d8a9fb038fbc44d88b06cf2df44b05cc6891c9e9d1bba5898071a873fc0dd774427afb0a2de2 SHA512 af18eeb48d8da55fc63526a528b88f626d9fad2369a6a8f570fe2dfee76384a5d86a9bab4883e557a1acd0a866859c4bd075476f9cfaff8e8465de6db0f2848d
 DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490
 DIST httpcomponents-client-4.5.13-src.tar.gz 824131 BLAKE2B 1507c81749a92afcf8b170b606761236d71b02d8b8b257d753a0f09abbdc297057df39661e827dee52804a2138de7d201b2a837418cbec21085fd3ffd558b51c SHA512 421e413fb2206fa95b6428ff067cdf2b440d2d3d4503cc3ca9bcf70ccd8ed1b8273ec4fe0703e6a8cd7612940b7ed966d9f163dbfeb8bf699ae2a8b2e0866d05
-EBUILD commons-httpclient-3.1-r2.ebuild 1692 BLAKE2B 387a399a8cdda70f20c5fed073db09f3657d6850734d24707b3707ef8881dd34d2280936251dfff137f45e2c1ce62923799885bfe4da92bc0549a5edba1179ec SHA512 8099177fb45a52f9f1e6acde6b1063a1ac1e6f235ca3efb0f8599cd2e28daf96080c24ebea8fa5659585819d2571baa6057dd08c732850d48bbaf52799225a21
+EBUILD commons-httpclient-3.1-r2.ebuild 1709 BLAKE2B 73b08779a549b7f3ba8e5961e9db672aa69ebdd89e7998f389763fe8c70a57f40ec8bd83b343f17670e1934038a4699ae443451071b4b24f21ff6b33118dbbc5 SHA512 9b5a9f39c2e2856e1778cb04db68d12211d1d0bd789f94d7ac3dfb5eeec1803d5ede3b93087a0af092824fea3e916aad5d05b3e606c02e2994318cdac615d4a0
 EBUILD commons-httpclient-4.5.13-r1.ebuild 2234 BLAKE2B 193917142633805b8663f25a95b103ebe7fd498fd640cf51e5e70828786e92dcb7d6e3f4da100cd0485dca2f57bc78dc4ef0668e7d44d1485c907313f9d8ced1 SHA512 137bca4b83f20d955b4c0c90edd2ab4896c3a10c8d22db9d082246479400a1429f2d4d2dcc8fa96568e33d6386241e3e45e4a4c21b63d84ac257052749c3fd90
 MISC metadata.xml 457 BLAKE2B aa9b78ee94c6ac0cd435c142183612524e588138764dcf4ea6b2474925f5238983ebbcf75ba32d78e42b62f3751e042785291f00cd9a6453c9711b4110ce04a5 SHA512 46da6fef35f122be653de8ff6f87048475dae83e8853a05210e403f239ce3823caafca0e26aa503377ccfd9c5616f4f69d4d3b483b9adb7b512351d85be5f531
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
index f74e7fa80a51..6e82213d770d 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
@@ -9,11 +9,11 @@ MAVEN_ID="commons-httpclient:commons-httpclient:3.1"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="The Jakarta Commons HttpClient library"
-HOMEPAGE="https://hc.apache.org/"
+HOMEPAGE="https://hc.apache.org/httpclient-legacy/"
 SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # doesn't work with IBM JDK, bug #176133
diff --git a/dev-java/commons-jexl/Manifest b/dev-java/commons-jexl/Manifest
deleted file mode 100644
index f678829cefea..000000000000
--- a/dev-java/commons-jexl/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 1.1-test-target.patch 607 BLAKE2B 93abe546683310bb4ac0937a4a1ee9ebe8f7f72e5e21bc6c9fbec16d2bf0c90a1b9e7cb53fa95a77bd759c7caf6f0148ace69a7d381e7c66324ebfe18480eefb SHA512 cd01b044ca4e4671b6419ea17cd6a316ab7ff709a08d2999d8b34881b814a48470fe495b2d6c468a5738f1284dbe9e1aabc8d5effbc0a86f210f9757893a3668
-AUX 2.1.1-build.xml 5742 BLAKE2B 900957b362f993314f47b09cbfd2f86c641b685be795c837e8af676a632b28b6638debaffe6208fc62b87d7f9df7bfb701ce69aaeb6b0c0602b25e1a78e9c16b SHA512 f19df3e608bdb85681e90e3e331b1920e9c9be2fa43da38cb9eecc9c569d0254ed5a75dd10962442477e076495bf63e902204f49545140a86c5392a4c6bd78ad
-DIST commons-jexl-1.1-src.tar.gz 128030 BLAKE2B 9694077640cf54e9621a2860fbfa5eae8c7135447e39b64147180db1b859f68b2fe610f161ceca71a432fe2216ebac2386e00ea3ba7e27bd687736a5aa39e95c SHA512 d403e945060385c4546cf173af9ec4a795c074a9b56aacdf16f301b875c9f78b47a91fdfb84059805a082466d8a4a371bcb6ef6336e6ba806272ad8e2cce9e13
-DIST commons-jexl-2.1.1-src.tar.gz 208559 BLAKE2B 031095ab8549f295e99048873ebc5eee2ebce2e79bdef28afec4ea3adef051cc397ca8740b3d9c2a2c02c51555b3ab3b7c79c0222368fdf6c652e4ed2369d7e4 SHA512 259c0956bb10f102cb3d860b1c99d3d2b2bc5d705e4160f743fa774640ed8c1ee6f3aad518a8a69e8f94a164b21cb2ae26e47cd3e81e92a086a3c3f753befacb
-EBUILD commons-jexl-1.1-r1.ebuild 1078 BLAKE2B 727e179bebc5d3faf9c80e8b2727ea8467379298eba7bfae4816cedc741ba9db4af3e51f3fd06617bf692c3382397c9701d471b0f7a85893c895dd6d5ea3d614 SHA512 7dd8da0a0204cedf3ef025d0a43721fe9262d66ad5204a03ff98702c2fb9f3e5eb6c9ec2137b32d950569056032375136404149c4910c3fea1f45e15df0806ad
-EBUILD commons-jexl-2.1.1.ebuild 1563 BLAKE2B 7cae693c0acd225a5e318d0ac191ff24d955ed3cf16ba0ba75f596af07682d32af75331db21017746b16dd61a4527f3bbe31f95f55f1cc72bed4b5bca3e38b27 SHA512 f0a13af541986aa9bb54148d88716f2e8fdb4ed2ce17eca0d163c71e8cc1cca7cab1412ddc768ddc505417e03703bb9a1a5ea177aeefa3c58f54586614c7c266
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
deleted file mode 100644
index 25ef0baa46ac..000000000000
--- a/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Expression language engine, can be embedded in applications and frameworks"
-HOMEPAGE="http://commons.apache.org/jexl/"
-SRC_URI="mirror://apache/jakarta/commons/jexl/source/${P}-src.tar.gz"
-
-CDEPEND="dev-java/commons-logging
-		dev-java/junit:0"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	test? ( dev-java/ant-junit )
-	${CDEPEND}"
-
-LICENSE="Apache-2.0"
-SLOT="1.0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${WORKDIR}/${P}-src"
-
-java_prepare() {
-	# https://issues.apache.org/jira/browse/JEXL-31
-	epatch "${FILESDIR}/${PV}-test-target.patch"
-
-	mkdir -p target/lib && cd target/lib
-	java-pkg_jar-from junit junit.jar
-	java-pkg_jar-from commons-logging
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}*.jar
-	dodoc RELEASE-NOTES.txt
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc "${S}"/src/java/*
-}
diff --git a/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild b/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
deleted file mode 100644
index 56f6b9d70a55..000000000000
--- a/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Expression language engine, can be embedded in applications and frameworks"
-HOMEPAGE="http://commons.apache.org/jexl/"
-SRC_URI="mirror://apache/commons/jexl/source/${P}-src.tar.gz"
-
-CDEPEND="dev-java/commons-logging:0"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	>=dev-java/javacc-5
-	test? ( dev-java/ant-junit:0 )
-	${CDEPEND}"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 x86"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="commons-logging"
-
-# Dubious tests.
-JAVA_RM_FILES=(
-	src/test/java/org/apache/commons/jexl2/ArithmeticTest.java
-)
-
-java_prepare() {
-	cp "${FILESDIR}"/${PV}-build.xml build.xml || die
-
-	# these two calls is what the "jjtree-javacc" goal in the pom.xml does
-	jjtree -OUTPUT_DIRECTORY="${S}/src/main/java/org/apache/commons/jexl2/parser/" \
-		src/main/java/org/apache/commons/jexl2/parser/Parser.jjt \
-		|| die "Code generation via jjtree failed"
-	javacc -OUTPUT_DIRECTORY="${S}/src/main/java/org/apache/commons/jexl2/parser/" \
-		src/main/java/org/apache/commons/jexl2/parser/Parser.jj \
-		|| die "Parser.java code generation via javacc failed"
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	dodoc RELEASE-NOTES.txt NOTICE.txt
-	use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
-	use source && java-pkg_dosrc "${S}"/src/main/java/*
-}
diff --git a/dev-java/commons-jexl/files/1.1-test-target.patch b/dev-java/commons-jexl/files/1.1-test-target.patch
deleted file mode 100644
index 54a3d3e9bce0..000000000000
--- a/dev-java/commons-jexl/files/1.1-test-target.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur commons-jexl-1.1-src.old/build.xml commons-jexl-1.1-src/build.xml
---- commons-jexl-1.1-src.old/build.xml	2006-12-26 19:39:18.000000000 +0200
-+++ commons-jexl-1.1-src/build.xml	2006-12-26 19:39:34.000000000 +0200
-@@ -62,7 +62,7 @@
-       </fileset>
-     </copy>
-   </target>
--  <target name="jar" description="o Create the jar" depends="compile,test">
-+  <target name="jar" description="o Create the jar" depends="compile">
-     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}" manifest="src/conf/MANIFEST.MF">
-     </jar>
-   </target>
diff --git a/dev-java/commons-jexl/files/2.1.1-build.xml b/dev-java/commons-jexl/files/2.1.1-build.xml
deleted file mode 100644
index d0bf54ef3571..000000000000
--- a/dev-java/commons-jexl/files/2.1.1-build.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="commons-jexl-from-maven" default="package" basedir=".">
-	<property file="${user.home}/.m2/maven.properties" />
-	<property file="maven-build.properties" />
-
-	<property name="maven.build.finalName" value="commons-jexl" />
-	<property name="maven.build.dir" value="target" />
-	<property name="maven.build.outputDir" value="${maven.build.dir}/classes" />
-	<property name="maven.build.srcDir.0" value="src/main/java" />
-	<property name="maven.build.resourceDir.0" value="src/main/resources" />
-	<property name="maven.build.resourceDir.1" value="." />
-	<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes" />
-	<property name="maven.build.testDir.0" value="src/test/java" />
-	<property name="maven.build.testResourceDir.0" value="src/test/resources" />
-	<property name="maven.build.testResourceDir.1" value="." />
-	<property name="maven.test.reports" value="${maven.build.dir}/test-reports" />
-	<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site" />
-
-	<property name="maven.repo.local" value="${user.home}/.m2/repository" />
-	<property name="maven.settings.offline" value="false" />
-	<property name="maven.settings.interactiveMode" value="true" />
-
-	<path id="build.classpath"/>
-	<path id="build.test.classpath" />
-
-	<target name="clean" description="Clean the output directory">
-		<delete dir="${maven.build.dir}" />
-	</target>
-
-	<target name="compile" description="Compile the code">
-		<mkdir dir="${maven.build.outputDir}" />
-		<javac destdir="${maven.build.outputDir}" encoding="iso-8859-1" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.5" verbose="false" fork="false" source="1.5">
-			<src>
-				<pathelement location="${maven.build.srcDir.0}" />
-			</src>
-			<classpath refid="build.classpath" />
-		</javac>
-		<copy todir="${maven.build.outputDir}">
-			<fileset dir="${maven.build.resourceDir.0}" />
-		</copy>
-		<mkdir dir="${maven.build.outputDir}/META-INF" />
-	</target>
-
-	<target name="compile-tests" depends="compile" description="Compile the test code" unless="maven.test.skip">
-		<mkdir dir="${maven.build.testOutputDir}" />
-		<javac destdir="${maven.build.testOutputDir}" encoding="iso-8859-1" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.5" verbose="false" fork="false" source="1.5">
-			<src>
-				<pathelement location="${maven.build.testDir.0}" />
-			</src>
-			<classpath>
-				<path refid="build.test.classpath" />
-				<pathelement location="${maven.build.outputDir}" />
-			</classpath>
-		</javac>
-		<mkdir dir="${maven.build.testOutputDir}/META-INF" />
-	</target>
-
-	<target name="test" depends="compile-tests, junit-missing" unless="junit.skipped" description="Run the test cases">
-		<mkdir dir="${maven.test.reports}" />
-		<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-			<sysproperty key="basedir" value="." />
-			<formatter type="xml" />
-			<formatter type="plain" usefile="false" />
-			<classpath>
-				<path refid="build.test.classpath" />
-				<pathelement location="${maven.build.outputDir}" />
-				<pathelement location="${maven.build.testOutputDir}" />
-			</classpath>
-			<batchtest todir="${maven.test.reports}" unless="test">
-				<fileset dir="${maven.build.testDir.0}">
-					<include name="**/*Test.java" />
-					<exclude name="**/*Abstract*Test.java" />
-				</fileset>
-			</batchtest>
-			<batchtest todir="${maven.test.reports}" if="test">
-				<fileset dir="${maven.build.testDir.0}">
-					<include name="**/${test}.java" />
-					<exclude name="**/*Abstract*Test.java" />
-				</fileset>
-			</batchtest>
-		</junit>
-	</target>
-
-	<target name="test-junit-present">
-		<available classname="junit.framework.Test" property="junit.present" />
-	</target>
-
-	<target name="test-junit-status" depends="test-junit-present">
-		<condition property="junit.missing">
-			<and>
-				<isfalse value="${junit.present}" />
-				<isfalse value="${maven.test.skip}" />
-			</and>
-		</condition>
-		<condition property="junit.skipped">
-			<or>
-				<isfalse value="${junit.present}" />
-				<istrue value="${maven.test.skip}" />
-			</or>
-		</condition>
-	</target>
-
-	<target name="junit-missing" depends="test-junit-status" if="junit.missing">
-		<echo>=================================== WARNING ===================================</echo>
-		<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-		<echo>===============================================================================</echo>
-	</target>
-
-	<target name="javadoc" description="Generates the Javadoc of the application">
-		<javadoc sourcepath="${maven.build.srcDir.0}" packagenames="*" destdir="${maven.reporting.outputDirectory}/apidocs" access="protected" old="false" verbose="false" encoding="iso-8859-1" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" charset="ISO-8859-1" source="1.5" linksource="true" breakiterator="false">
-		</javadoc>
-	</target>
-
-	<target name="package" depends="compile,test" description="Package the application">
-		<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" compress="true" index="false" basedir="${maven.build.outputDir}" excludes="**/package.html">
-		</jar>
-	</target>
-
-	<target name="jar" depends="package" description="Builds the jar for the application" />
-
-	<target name="test-offline">
-		<condition property="maven.mode.offline">
-			<equals arg1="${maven.settings.offline}" arg2="true" />
-		</condition>
-	</target>
-</project>
diff --git a/dev-java/commons-jexl/metadata.xml b/dev-java/commons-jexl/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/commons-jexl/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/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index a087ee5da93f..ce4a24c4f92d 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -1,5 +1,5 @@
 DIST commons-lang-2.6-src.tar.gz 564032 BLAKE2B 9d72b0426f2146eaa8498a6601edf80dbf45a16ef5ee14cf4ed87130e6d3732d5c713f25f44c10435baa1357f61a271acb88483915968aaf645d1ceaa318c601 SHA512 4a30ed153f93fe6616a28974721bdf005d064203ef8a3dd375d6c1176647c0cdbd29cfde2a580e2c8d26bfa4655be6be7025b8ccae94086dcd816676c5cf8e87
 DIST commons-lang-3.12.0-sources.tar.gz 1072858 BLAKE2B d6b7ee9ef165e60f61d8d0dfaaf38919877f2edc6742cd58b2b70d379e807e75d9dc24e19f23db1b174d1797d6ef0af7700d686dd835d7a40bf2b2a91346e215 SHA512 80d1b960ae0b02859be329ea60d68cef33f3c7be7ec19752b3c9cfef442adef480878317ce2cfa309a27e662e2c72cab22023eaa3702e27970a1e5d55ca43f57
-EBUILD commons-lang-2.6-r2.ebuild 940 BLAKE2B 7099bc7cf2c34f571689352f915f53d1f0279cf925a31b1ae890acf55bcf7f9b321d6bce0c001e9a128c79cf9dc7412858a2008352d9d051b3e29653922a87a4 SHA512 dc3ce86ceae7d667572578748ad0e831091ed10e1706901e580232eb03489fb1c67b7cdd31495f6ef6fd140b1ef2e278a4554b051473482022ea8b1df1e1d0e2
+EBUILD commons-lang-2.6-r2.ebuild 944 BLAKE2B 3e48c9e0f1393b951f2b78d4c65c2a75839395307607d9bb0e6a0ca0329ae6333c2ea2cb4c86ff900e417fb171ffc805eddcd8f4841f1d1ce6edeb39f96914ee SHA512 fd49eac5d1bdd683c18349b5f9702f7af27efb4bf3e6ad7cfab066cc2a87dc31b515d819b2a0ae566a49af16180cfb836d0c07ae6215582cc61bba7f1102b253
 EBUILD commons-lang-3.12.0.ebuild 1041 BLAKE2B 02381abbcbe5d8d96a61f07ff790a0f17a3c572b13daaee9da2596036be717dbe0c024cf2669771810fcf5a467580d15e3fdace6e0cbb29db732bbae2bc222a4 SHA512 70b53a8ad37fe32132c11789b8cb6f89e8abe38737a5f6c77e42377fd2650026a8d64e7b7eeec639b9a864ff38398d12c848bee5d3beb1f0b2cc35bb62750e10
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/commons-lang/commons-lang-2.6-r2.ebuild b/dev-java/commons-lang/commons-lang-2.6-r2.ebuild
index 4e9a61a966be..cdb5a083002e 100644
--- a/dev-java/commons-lang/commons-lang-2.6-r2.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/commons/lang/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.1"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 DEPEND="virtual/jdk:1.8
 	test? (
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 424d3c98d053..e91f96123618 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -2,4 +2,5 @@ AUX commons-logging-1.2-gentoo.patch 825 BLAKE2B 154927ebbda77a76007fe9b448fc280
 AUX commons-logging-1.2-servletapi.patch 1783 BLAKE2B 5f8bc256542335b5d955d998ef2ee49d8becca46b367ba0ac1152f68ea4fccc226afcd2475331cf292c3f0f11471052e6917c9508a6737c6482c556c2ec87363 SHA512 bf2f0aca771b7278f2d80ae3c149492040c137c1ab190513fd9894fad315f75e4b0423f65a5ffaff04faed3f7256728b5f474cfbe0aefc2a53d60337a6344d39
 DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
 EBUILD commons-logging-1.2-r3.ebuild 2428 BLAKE2B ec1bb9560770cce42e810c9be98cb90f29951f15b4d86856806b33364b7a0137fb44c886c8b1d8929ace6a62f94cff08da22673846d8650f3d511a7e329d29e9 SHA512 8787240bdaccc05b6ef2dd5ce717a4f4bd5224f37ac8cab943fec9c5ca31c7a11f55e229d4ead8d4f568cfe06f4d15281ceb7c15757cd86c0f04272b1e19206e
+EBUILD commons-logging-1.2-r5.ebuild 4166 BLAKE2B 5938a00e5a813dcb68e396d45b0134609ba6bab577246639d5c9dae017882ee94bff0eb77d5616a496a555552e29ab6eecc3169b2549dbea85aec73bf842dd90 SHA512 23ebef4dbe7770c814afe134c750a9cfd664429339ca75d00611211341afcccbf72fafc2ea18212af3a85655158bd6e6dc107665a2b4bdb4cf57eb65cfae82c5
 MISC metadata.xml 552 BLAKE2B ec2efc6f1e5e694ae68d977b40387ecdf6bff5fd184a4a5cd7c65830108d82522e5951a9b9868f4e94b08ec00c1901f43cd027f328b49cffc90ca971fb041026 SHA512 89c4f003ea15a5201ba713ca1819b9ea35d65c27e4106e6bc8e3806f1667f95b3e96c7b76c77b8545ded8abbb3955f6cf96dea11eeaea7740696bb01a933e077
diff --git a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild b/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
new file mode 100644
index 000000000000..f93740de50e1
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
@@ -0,0 +1,122 @@
+# 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="commons-logging:commons-logging:1.2"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
+HOMEPAGE="https://commons.apache.org/logging/"
+SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="avalon-framework avalon-logkit log4j servletapi test"
+REQUIRED_USE="doc? ( avalon-framework avalon-logkit log4j servletapi )"
+RESTRICT="!test? ( test ) !servletapi? ( test )"
+
+CDEPEND="
+	avalon-logkit? ( dev-java/avalon-logkit:2.0 )
+	avalon-framework? ( dev-java/avalon-framework:4.2 )
+	log4j? (
+		dev-java/log4j-12-api:2
+		dev-java/log4j-api:2
+		dev-java/log4j-core:2
+	)
+	servletapi? ( dev-java/tomcat-servlet-api:4.0 )"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*
+	test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${P}-src"
+
+EANT_BUILD_TARGET="compile"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
+
+DOCS=( RELEASE-NOTES.txt PROPOSAL.html )
+
+src_prepare() {
+	default
+
+	eapply "${FILESDIR}/${P}-gentoo.patch"
+	# patch to make the build.xml respect no servletapi
+	eapply "${FILESDIR}/${P}-servletapi.patch"
+
+	# bug #208098
+	echo "jdk.1.4.present=true" > build.properties || die
+
+	if use avalon-framework; then
+		echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties || die
+	fi
+	if use avalon-logkit; then
+		echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties || die
+	fi
+	if use log4j; then
+		# log4j12.jar can only contain path to one single file because
+		# build.xml decides whether the Log4JLogger should be built with
+		# <available file="${log4j12.jar}" property="log4j12.present"/>,
+		# and a value that contains multiple file paths will cause the
+		# test to return a negative result.  However, classes from multiple
+		# Log4j 2 JARs are needed to compile the sources.  So, we combine
+		# them into a single JAR on the go.
+		# https://bugs.gentoo.org/834036
+		mkdir -p "${T}/log4j-2" ||
+			die "Failed to create temporary directory for Log4j 2 classes"
+		pushd "${T}/log4j-2" > /dev/null ||
+			die "Failed to enter temporary directory for Log4j 2 classes"
+
+		local jar="$(java-config -j)"
+		local dep
+		for dep in log4j-{12-api,api,core}; do
+			# Assuming SLOT="2" for Log4j 2 dependencies
+			"${jar}" -xf "$(java-pkg_getjar "${dep}-2" "${dep}.jar")" ||
+				die "Failed to extract files from ${dep}-2 installed on system"
+		done
+		"${jar}" -cf log4j-2.jar . || die "Failed to create JAR for Log4j"
+
+		popd > /dev/null ||
+			die "Failed to leave temporary directory for Log4j 2 classes"
+
+		echo "log4j12.jar=${T}/log4j-2/log4j-2.jar" >> build.properties || die
+	fi
+
+	if use servletapi; then
+		echo "servletapi.jar=$(java-pkg_getjar tomcat-servlet-api-4.0 servlet-api.jar)" >> build.properties || die
+	fi
+}
+
+src_install() {
+	local pkg=org.apache.commons.logging
+	java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\""
+	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
+	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
+
+	einstalldocs
+	use doc && java-pkg_dojavadoc target/docs/
+	use source && java-pkg_dosrc src/main/java/org
+}
+
+src_test() {
+	# Do not run Log4j tests because these tests use an Appender to verify
+	# logging correctness.  The log4j-12-api bridge no longer supports using an
+	# Appender for verifications since the methods for adding an Appender in
+	# the bridge "are largely no-ops".  This means an Appender's state would
+	# never be changed by log4j-12-api after new messages are logged.  The test
+	# cases, however, expect changes to the Appender's state in such an event,
+	# so they would fail with log4j-12-api.
+	# https://logging.apache.org/log4j/log4j-2.8/log4j-1.2-api/index.html
+	sed -i -e "/^log4j12\.jar=/d" build.properties ||
+		die "Failed to skip Log4j tests by modifying build.properties"
+	java-pkg-2_src_test
+}
diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest
index 9e42d28a8090..f5f8c7555cc4 100644
--- a/dev-java/commons-net/Manifest
+++ b/dev-java/commons-net/Manifest
@@ -1,3 +1,3 @@
 DIST commons-net-3.8.0.jar 437325 BLAKE2B 92bdbf2f95cc54f6a791a9de0a56878fe12b6d956d47a4116ae21df35f3dcc4d7b10f5c03c081fc7012a06416f5f9f6555060784bfe22ec9c8d70b17ee7ea215 SHA512 a16ed8c2966541cc052fe963338efcc6f9c42ccd6fefe246547e66d9f46c35cf42bc6d13cb983a1829a378ebd7a676bcb812acbc3aa0ed30e6fa206748dae620
-EBUILD commons-net-3.8.0.ebuild 652 BLAKE2B a6e45b2383a1e7344939503ba537e1119a0ce66706444bf15845949ead7ff02ee6d891f886ce4a363996c303f1750924c22c0f882c9fe28c253b9704821521e8 SHA512 8249536d1f4becf5a089a65bc1389b84e6c13bf1b0bf48d320edbd5785ff7aa7b6cd981eb489916965ea5bfb3b890aeda05777eae62316ed1e1b6d9f74e84ea4
+EBUILD commons-net-3.8.0.ebuild 651 BLAKE2B 337169f22e210a515ff4db7f0c96c2da698fd22750f1c2f1170150b8f38efdbd779666a6c02403556f5263ccb1e0795a5b7af81b7448c36b862fe5825ffda6d3 SHA512 6e62d9b6e9606cd94be5a0ec0131010b28f30ddcb87aa2af593bc7af700d9d1de8182fa73694baba21ec35f9a011fb4797b5a5d0270296667d76a26611931d31
 MISC metadata.xml 393 BLAKE2B 344ccb7c8387f2d977c30219cefde70b31255c859898f243ecfde94643641474047299f2438a4067f70cd77ace99fb754ff6dfc2ccdedd2772081870f1444d8f SHA512 75b957e0f6a08377b402e23f49b081ed9add10ff7b3a5d9f52009d48ef4f8d49bb78f48310b93a579b29857562af2d5261f5b4fe4405edd566c1f320ec729046
diff --git a/dev-java/commons-net/commons-net-3.8.0.ebuild b/dev-java/commons-net/commons-net-3.8.0.ebuild
index 6fdab25bad01..f05db9b3a131 100644
--- a/dev-java/commons-net/commons-net-3.8.0.ebuild
+++ b/dev-java/commons-net/commons-net-3.8.0.ebuild
@@ -18,4 +18,4 @@ RDEPEND=">=virtual/jre-1.8:*"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/commons-vfs/Manifest b/dev-java/commons-vfs/Manifest
index ba442f674b50..a5272bf137cc 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 1641 BLAKE2B 7d0ec57fd61727980e50d8754d67b1e850222831af371ff127cb6064c618843e71d45d3fde7841cc06bd42aaee079168050f91c7f4cef9025e6fe83f8b4b3ccd SHA512 e677a6cf8b6ada494616eb254fb76f764955b3ccbd3dfabd6f024b861d2e5230e7e150101a52715c933356d55d8212c508d4353bb29ec822385fd8aa2357f2a7
+EBUILD commons-vfs-2.0-r2.ebuild 1640 BLAKE2B f4a42735f3579ed2990a2b645f21fa077b4068360f8197d6ded419b805998ed5f75d544ec96406ad479de6c678ba8d7e1b88078c4f04d7a030c96c6a5d3b51c6 SHA512 c8cbd5003f15bc27a9f384b4517cc6912a208586d53d66305198d63a505f263370478771fc2d70c440654256afa7d226b13ef5bbaa9bf61807531480d14a2231
 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 fe0f75906de0..6a24d0bb811e 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 ~arm ~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/conversant-disruptor/Manifest b/dev-java/conversant-disruptor/Manifest
new file mode 100644
index 000000000000..13d658a0eaa9
--- /dev/null
+++ b/dev-java/conversant-disruptor/Manifest
@@ -0,0 +1,3 @@
+DIST conversant-disruptor-1.2.19.tar.gz 171364 BLAKE2B 2ac7a42835f22ae7361f156b9cb9853cea39b757c9869847b9b4c526e3e04e46ae8b7ca90c1c38bd3fa57f6925bfc95767235fb4640e7ecf1e62044973b53932 SHA512 f475507e2ab2e4260ec04b699c42115fa917f3df9dc67bbf944c96441e58fff1ab8ba63beb97dbc77d3b76f65b6b116d84b17a1eb4b40d58dedbc029e81e39ee
+EBUILD conversant-disruptor-1.2.19.ebuild 1292 BLAKE2B 83cec59db360ef0071f6f73dbd7ee8e456a790ef779184b3636277589b688746822c2de7bc9c5014eacca135c6b50a4587f2bd679a55265fbd39ae630345446c SHA512 2264cd76056eef7de35c51d2d682a29fcb7c639c61562fc43e2d2e7fb8e9b9069fc6573677e93553faf8c2517e6acb515406fadc8ea64decbe584f332fc9faf1
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/conversant-disruptor/conversant-disruptor-1.2.19.ebuild b/dev-java/conversant-disruptor/conversant-disruptor-1.2.19.ebuild
new file mode 100644
index 000000000000..29858069b4b0
--- /dev/null
+++ b/dev-java/conversant-disruptor/conversant-disruptor-1.2.19.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom disruptor-1.2.19/pom.xml --download-uri https://github.com/conversant/disruptor/archive/refs/tags/1.2.19.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild conversant-disruptor-1.2.19.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.conversantmedia:disruptor:1.2.19"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Conversant Disruptor - very high throughput Java BlockingQueue"
+HOMEPAGE="https://github.com/conversant/disruptor"
+SRC_URI="https://github.com/conversant/disruptor/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Compile dependencies
+# POM: disruptor-${PV}/pom.xml
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
+# test? org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/slf4j-api:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/disruptor-${PV}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,slf4j-api"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/glassfish-servlet-api/metadata.xml b/dev-java/conversant-disruptor/metadata.xml
index 4221e170cbc0..75321cfb5598 100644
--- a/dev-java/glassfish-servlet-api/metadata.xml
+++ b/dev-java/conversant-disruptor/metadata.xml
@@ -3,6 +3,5 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
-		<name>Java</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/cortado/Manifest b/dev-java/cortado/Manifest
index 0df1b0ca5d50..ce7e16c4cb2b 100644
--- a/dev-java/cortado/Manifest
+++ b/dev-java/cortado/Manifest
@@ -1,3 +1,4 @@
 DIST cortado-0.6.0.tar.gz 233854 BLAKE2B 54ace339a6038b46bbf2d993eb911f1845f8717dcf4eeaae0fcd807488a0293bb6618fe72ffa5bc425dc9f7d47f5362ff55168191aab15dbed59547f7c1d72dd SHA512 56113259da05a73f4d4e7aca92d031fa934987ad3607a69b31666c9e452330a95728e7780c45d825ddeb9c0815ace479d7a55df0e68a50e63a76ddf5602c76da
 EBUILD cortado-0.6.0-r1.ebuild 734 BLAKE2B 07a8b8685ffa611ff2bd577457b8a42b09422a9f445ef4bae52edf920a1fa5a65f3af43cbdf76c673797c71c83792ec717507b6a2b4f08f220b4e91eac588df6 SHA512 f8c0690ecd8789fd2c4010abe713a1860e7db4651f4493c27d5ebe02308308dbebe57019d60c20041343a0bded91e3ee48f63573cb6ef1958c9a7743beca895d
+EBUILD cortado-0.6.0-r2.ebuild 922 BLAKE2B 83542958dcf904da1087a3ca5b363fb2a751ef64c82a52403fd795618415bf746ecf5ba36a3f7babe182dcd5a85a1aff9fc7ab5a1de163b8111c52cc9a694d8b SHA512 8156c9dca71b4bde8e0e50c0cc551f30b56d5467174a487a894482e96a2d44435baecfd8a909bd37dc528026345517f02c927d267451b0104db5865f8ef0b8e8
 MISC metadata.xml 1039 BLAKE2B 2c718f02922e15112d22a0f9289787c129f7bca4b2d448e31a42edd961b2d238f3e7bb4f24a11a5e029d40fae48c521fb904891f32fc7e80140d51bff1a10925 SHA512 f4a9cb54e8b282812f1e73db192a575ca0cee2827c049ca1585a04c4b2f12557ec3df8b530f95dcf6af056fd7b50a733d29a09eb9b8c4d373ebccd3467a5fd80
diff --git a/dev-java/cortado/cortado-0.6.0-r2.ebuild b/dev-java/cortado/cortado-0.6.0-r2.ebuild
new file mode 100644
index 000000000000..fc6c3c123ab1
--- /dev/null
+++ b/dev-java/cortado/cortado-0.6.0-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Multimedia framework for Java written by Fluendo"
+HOMEPAGE="https://www.theora.org/cortado/"
+SRC_URI="https://downloads.xiph.org/releases/cortado/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc64 ~x86"
+
+# Package 'sun.audio' seems to have moved to 'javax.sound'.
+# More work would be needed.  Presently we restrict to jdk:1.8
+DEPEND="virtual/jdk:1.8"
+RDEPEND=">=virtual/jre-1.8:*"
+
+EANT_BUILD_TARGET="stripped"
+
+src_prepare() {
+	default
+	cat > scripts/get-revision <<-EOF || die
+		#!/bin/sh
+		echo ${PV}
+	EOF
+
+#	sed -e '/import/s/sun.audio/javax.sound/' \
+#		-i src/com/fluendo/plugin/AudioSinkSA.java || die
+}
+
+src_install() {
+	java-pkg_newjar "output/dist/applet/${PN}-ovt-stripped-${PV}.jar"
+	dodoc ChangeLog HACKING NEWS README RELEASE TODO
+}
diff --git a/dev-java/cpptasks/Manifest b/dev-java/cpptasks/Manifest
index 4be6a6bfda8a..a97f5b7256db 100644
--- a/dev-java/cpptasks/Manifest
+++ b/dev-java/cpptasks/Manifest
@@ -1,5 +1,4 @@
 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-r1.ebuild 1306 BLAKE2B 38bb43db3acd2066491481a6fd5beff358cc99974e3bab281ca1697566bdace56b2509f50a4d630e2b07389b53deb6bc03d833e7c9b9e29a1701660740051e7f SHA512 4f776b751b9c2cd22f9f6e82a3f286ed2da4d81687fbe089e7f86cfda41a28db8121a906d8e8d740f9232ffb261d42142a96c4f10971143d4e029bf460af2085
-EBUILD cpptasks-1.0_beta5.ebuild 1085 BLAKE2B bf55abda854a6d085fa2787b0eccbbb6abef4c97c2675e80bf91b3aa09509314ba2943d4a9bd427010f190006273d79c4d1269f0fb2bbff058ccc1ae0955be70 SHA512 cc8dc1a06d7a7efae982e6f02e97050eec498d1ccf950d9041f4320deaa712487608c920d0ec492d756649f55032000237704aed24676b28e60659148bbc546d
+EBUILD cpptasks-1.0_beta5-r1.ebuild 1302 BLAKE2B ae0c062ef9ccbcb1c9af7ad35cd31a48e5c925d1dc7a2557d3cd2eff4ecabcaf0b052d181ed0f5810a3cd6ed1aa97daa3e273ed9f0212e4477c3b97d0978111e SHA512 e194312ce4f012548907e6d95d65eb261fe2d3a5f92fcaa68cd1bd76ce340ab04d485c156e79bdc59d975ddbdd375c5a3575fa1e9fe85ab0d8505764677d804d
 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
index d2302a4b865a..38a0c3f54a50 100644
--- a/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_beta/b}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CP_DEPEND="
 	dev-java/ant-core:0
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
deleted file mode 100644
index e72710bc3451..000000000000
--- a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
+++ /dev/null
@@ -1,47 +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 examples"
-
-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"
-
-CDEPEND="
-	dev-java/ant-core:0
-	dev-java/xerces:2"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_BUILD_TARGET="jars"
-EANT_DOC_TARGET="javadocs -Dbuild.javadocs=build/api"
-EANT_GENTOO_CLASSPATH="ant-core,xerces-2"
-
-src_prepare() {
-	default
-	find -name '*.jar' -exec rm -v {} + || die
-}
-
-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/cssparser/Manifest b/dev-java/cssparser/Manifest
deleted file mode 100644
index 9d6f6dfa9bed..000000000000
--- a/dev-java/cssparser/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST cssparser-0.9.25.jar 256517 BLAKE2B 5281f70dd4e293aaf4aad44efc46107372756b03962057df8701947ec71478c40ace0728099122a0166e902a00075d7d89e6e93b50d8bc16d7f563a3553ad9c2 SHA512 94dffa2ff1edc01c183d2de4f77f106a9409ec5d1e68e9af4f3cd427b76c9d80c942a4d312c3e40ef5c8bd444975eedba173bf0eb730cf517a818dd69421a7bb
-DIST cssparser-0.9.26.jar 256518 BLAKE2B 9f92aa366711b91ca90e1efa48e05c15e9ed877f8ae5346506bb727373ea334c6fec58b67f5df4e7e01467b4d1aa571ef47c8f2ae83e7fada4bc6d9d100e1d78 SHA512 c8e9c3c1cdf8d6fc29227693f28a11397b63cc46cf88083298e0613cc7f79c558dbc71760799fc214aecc5ed8ccdd966f0518085abe08deacf088b445579a8b8
-EBUILD cssparser-0.9.25.ebuild 526 BLAKE2B 05384d781bd99bbfc191faccef066dd7a0ed90ccfaa49ef77e1f77ee4f117e6850dd1c5481bef718d6eae58f98893213135023a8ef183ce1f7ef3544b28ac5a4 SHA512 19abcc2a991321bf3c334110db5a1de38a48da60490f50123741a6032ac9ead32b45a1ac37eda8e14729bdc9256291ebc4f371a39a772c1130dd546b9a8e9c1c
-EBUILD cssparser-0.9.26.ebuild 526 BLAKE2B 05384d781bd99bbfc191faccef066dd7a0ed90ccfaa49ef77e1f77ee4f117e6850dd1c5481bef718d6eae58f98893213135023a8ef183ce1f7ef3544b28ac5a4 SHA512 19abcc2a991321bf3c334110db5a1de38a48da60490f50123741a6032ac9ead32b45a1ac37eda8e14729bdc9256291ebc4f371a39a772c1130dd546b9a8e9c1c
-MISC metadata.xml 397 BLAKE2B 1036e90d3dd73398162a8912f2177dce36876ff1687944a92bd7cfda6bcaa0e4e69f0e7f1256ecda9c6c11948f3a53e2ac61a208853342f8dfaa1d3c63262e71 SHA512 2122199add93359edf8471a25e3794785bc4b8c207e5a57a4c1011f4837901f6e4600427f5de7ae4137805d996b5937a6186251c41d89e1b1aca71d64639aff1
diff --git a/dev-java/cssparser/cssparser-0.9.25.ebuild b/dev-java/cssparser/cssparser-0.9.25.ebuild
deleted file mode 100644
index 6b38a3223d5f..000000000000
--- a/dev-java/cssparser/cssparser-0.9.25.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="API for parsing CSS 2 in Java"
-HOMEPAGE="http://cssparser.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar -> ${P}.jar"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/sac:0"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-JAVA_GENTOO_CLASSPATH="sac"
diff --git a/dev-java/cssparser/cssparser-0.9.26.ebuild b/dev-java/cssparser/cssparser-0.9.26.ebuild
deleted file mode 100644
index 6b38a3223d5f..000000000000
--- a/dev-java/cssparser/cssparser-0.9.26.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="API for parsing CSS 2 in Java"
-HOMEPAGE="http://cssparser.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar -> ${P}.jar"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/sac:0"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-JAVA_GENTOO_CLASSPATH="sac"
diff --git a/dev-java/cssparser/metadata.xml b/dev-java/cssparser/metadata.xml
deleted file mode 100644
index 46991d94b0b7..000000000000
--- a/dev-java/cssparser/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>monsieurp@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">cssparser</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/dnsjava/Manifest b/dev-java/dnsjava/Manifest
deleted file mode 100644
index 4628dae0fccc..000000000000
--- a/dev-java/dnsjava/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 2.1.6-no-network-tests.patch 1354 BLAKE2B 3990543ea76ae8c2a485b6444e75ceff4abcb7eebb400eabb04b9ccd21560649478a54586c65bd97a4372c2d861d2f2064f2de6e2b3cb48dbdfde0864dd76d58 SHA512 3170ab2f64fdddff5fba26d32b0ce43f08fbef333e14ad1e1b7490e0227cd549febac4506ac5536d96f7f9316ea92d333fb5aee2f82131f90a922e52571ec1d0
-DIST dnsjava-2.1.8.tar.gz 460532 BLAKE2B 761e99643710aca3aebc50972504284c388685dee12b3fc1fcbe6e4a8698762833dab725ff61395aee2b0292d0f71004eb2247c899c87d01dcc938e4283d31c1 SHA512 d38be6d52b275906b66468cd375ebd46c0d669de2fd06a50253631589a7dd6fbf4e92d4b20778dacd9f19cd489df013e4d42bc16c935581dcaa370ac9ce3c55b
-EBUILD dnsjava-2.1.8.ebuild 941 BLAKE2B b2e2962b8e1e29d3bccab5a1f6741986601f7e67b1cd82bb42e1c40f8d36cdf2daf186d730782f82e0b071d8686ba362fd020e7191b05f6c0cb3a1d6525910c1 SHA512 b474e9e3f840f60c4188ba3792360e1e61a5bc195c38c573c57a9ba7de02fb6fd011708ac41a440f54747b08c769a927fd106fc2e66ff3d83ed760b8cdbc5151
-MISC metadata.xml 766 BLAKE2B 79dfad7e25f67c8356b3be945c0d613964a19d6d72e0d305a1ac44cb295a8e816653aff1335a4d84ebf5d2f6489527326ec23ef8500e242db62200377bbb220f SHA512 59e4373a10426c449a5e904d277d36177fa9eaddf894c72a8f0c84948b1670ae7e2005ae24852d329caf27bad257a81da6315196040221ad8e4f00d4015ad7d8
diff --git a/dev-java/dnsjava/dnsjava-2.1.8.ebuild b/dev-java/dnsjava/dnsjava-2.1.8.ebuild
deleted file mode 100644
index 7b127612cd30..000000000000
--- a/dev-java/dnsjava/dnsjava-2.1.8.ebuild
+++ /dev/null
@@ -1,50 +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 test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="An implementation of DNS in Java"
-HOMEPAGE="http://www.dnsjava.org/"
-SRC_URI="http://www.dnsjava.org/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="test"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)"
-
-EANT_BUILD_TARGET="jar"
-EANT_DOC_TARGET="docs"
-EANT_TEST_TARGET="run_tests"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_TEST_GENTOO_CLASSPATH="junit"
-EANT_GENTOO_CLASSPATH_EXTRA="${P}.jar"
-
-src_prepare() {
-	default
-	java-pkg_clean
-	#epatch "${FILESDIR}"/*.patch
-}
-
-src_install() {
-	java-pkg_newjar "${P}.jar"
-
-	einstalldocs
-	use doc && java-pkg_dojavadoc doc
-	use source && java-pkg_dosrc org/
-}
-
-src_test() {
-	EANT_ANT_TASKS="ant-junit" java-pkg-2_src_test
-}
diff --git a/dev-java/dnsjava/files/2.1.6-no-network-tests.patch b/dev-java/dnsjava/files/2.1.6-no-network-tests.patch
deleted file mode 100644
index 1ea9d3929db0..000000000000
--- a/dev-java/dnsjava/files/2.1.6-no-network-tests.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/dnsjava-2.1.6/tests/org/xbill/DNS/AddressTest.java b/dnsjava-2.1.6/tests/org/xbill/DNS/AddressTest.java
-index 451b262..7ce8029 100644
---- a/dnsjava-2.1.6/tests/org/xbill/DNS/AddressTest.java
-+++ b/dnsjava-2.1.6/tests/org/xbill/DNS/AddressTest.java
-@@ -272,16 +272,19 @@ public class AddressTest extends TestCase
- 
-     public void test_getByName() throws UnknownHostException
-     {
-+/*
- 	InetAddress out = Address.getByName("128.145.198.231");
- 	assertEquals("128.145.198.231", out.getHostAddress());
- 
- 	out = Address.getByName("serl.cs.colorado.edu");
- 	assertEquals("epic.cs.colorado.edu", out.getCanonicalHostName());
- 	assertEquals("128.138.201.71", out.getHostAddress());
-+*/
-     }
- 
-     public void test_getByName_invalid() throws UnknownHostException
-     {
-+/*
- 	try {
- 	    Address.getByName("example.invalid");
- 	    fail("UnknownHostException not thrown");
-@@ -294,10 +297,12 @@ public class AddressTest extends TestCase
- 	}
- 	catch( UnknownHostException e ){
- 	}
-+*/
-     }
- 
-     public void test_getAllByName() throws UnknownHostException
-     {
-+/*
- 	InetAddress[] out = Address.getAllByName("128.145.198.231");
- 	assertEquals(1, out.length);
- 	assertEquals("128.145.198.231", out[0].getHostAddress());
-@@ -353,5 +358,6 @@ public class AddressTest extends TestCase
- 	}
- 	catch( UnknownHostException e ){
- 	}
-+*/
-     }
- }
diff --git a/dev-java/dnsjava/metadata.xml b/dev-java/dnsjava/metadata.xml
deleted file mode 100644
index 892663a9b36e..000000000000
--- a/dev-java/dnsjava/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>
-		dnsjava is an implementation of DNS in Java. It supports all defined record 
-		ypes (including the DNSSEC types), and unknown types. It can be used for queries,
-		zone transfers, and dynamic updates. It includes a cache which can be used by
-		clients, and a minimal implementation of a server. It supports TSIG authenticated
-		messages, partial DNSSEC verification, and EDNS0.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">https://sourceforge.net/projects/dnsjava/</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/ecj-gcj/Manifest b/dev-java/ecj-gcj/Manifest
deleted file mode 100644
index 8461068d30ef..000000000000
--- a/dev-java/ecj-gcj/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ecj-gcj.in 840 BLAKE2B ec5a8f37428c4e9a133898b534eec0d70559dc4bbe1b3aa8ad825bb172c8fbf3e167cee72f7df9a64847d2b299aa53254874f296567df96deb84aaaaa0f6dcd0 SHA512 7ed6620090643f31f33762a1fe8f0024518bb808bf8aa2e8bfc8f9c0475e41f699670939bfa945a48aa5f5fad61b557a9e315c2781103717c2a6a1bd67a048a1
-DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
-EBUILD ecj-gcj-4.4.2.ebuild 2433 BLAKE2B 9606ed88b77a1903a31d191a489c4229bc0982beff5584d5ea2c52146ee473fa42a0881a7ad47bee7fcfc6444de47184fbefcd8dd1fec1d928239fdd4c0a05e6 SHA512 7e84f812d8549a2893acd7494cc5004100810244debf556591029cecfddb3e8c69a232b951e8d3bccebc4932c14ac6155ea2f37fbf758a12baf5db246776b6c7
-MISC metadata.xml 404 BLAKE2B f436c3f0a6e8d7a72fdfb8c667ddabd5b98145ae24225db92bcfe9b8ca78753083e078f4749f00c98013992365ab33f8dec6dbd1cde4e5e3aa575879abe870fa SHA512 6ca335423c0efa5b08d053642bf87a285ddff99129612161afce9d4950915d52b420e3ab8b36cfcdfd7bf3f5ac3d880d4533083ededf442668473f44e77dbe08
diff --git a/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild b/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
deleted file mode 100644
index 9f3ec5665c73..000000000000
--- a/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2 prefix toolchain-funcs
-
-MY_PN="ecj"
-DMF="R-${PV}-201502041700"
-
-DESCRIPTION="Subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
-
-LICENSE="EPL-1.0"
-SLOT="4.4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+native"
-
-RDEPEND="sys-devel/gcc:*[gcj]
-	app-eselect/eselect-java"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	!dev-java/eclipse-ecj:3.5[gcj]"
-
-JAVA_PKG_WANT_SOURCE=1.6
-JAVA_PKG_WANT_TARGET=1.6
-
-MY_PS="${MY_PN}-${SLOT}"
-S="${WORKDIR}"
-
-java_prepare() {
-	# We don't need the ant adapter here
-	rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-	rm -r org/eclipse/jdt/internal/antadapter || die
-
-	# upstream build.xml excludes this
-	rm META-INF/eclipse.inf || die
-
-	# these java6 specific classes cannot compile with gcj
-	rm -r org/eclipse/jdt/internal/compiler/{apt,tool}/ || die
-}
-
-src_compile() {
-	local gccbin=$(gcc-config -B)
-	local gcj="${gccbin}/gcj"
-
-	find org/ -name "*.java" > sources.lst || die
-
-	einfo "bootstrapping ${MY_PN} with gcj ..."
-	"${gcj}" -w -C -fsource=${JAVA_PKG_WANT_SOURCE} -d bootstrap @sources.lst || die
-
-	einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..."
-	"${gccbin}/gij" -cp bootstrap:. org.eclipse.jdt.internal.compiler.batch.Main -nowarn $(java-pkg_javac-args) @sources.lst || die
-	find org/ META-INF/ -type f ! -name "*.java" -exec "${gccbin}/gjar" cf ${MY_PN}.jar {} + || die
-
-	if use native; then
-		einfo "building native ${MY_PS} library, patience needed ..."
-		"${gcj}" ${CFLAGS} ${LDFLAGS} -findirect-dispatch -shared -fPIC -Wl,-Bsymbolic \
-			-o ${MY_PS}.so ${MY_PN}.jar || die
-	fi
-}
-
-src_install() {
-	java-pkg_dojar ${MY_PN}.jar
-
-	sed -e "s|@SLOT@|${SLOT}|" \
-		"${FILESDIR}/${PN}.in" \
-		> "${T}"/${PN}-${SLOT} || die
-	eprefixify "${T}/${PN}-${SLOT}"
-	dobin  "${T}/${PN}-${SLOT}"
-
-	use native && dolib.so ${MY_PS}.so
-}
-
-pkg_postinst() {
-	if use native; then
-		local dbtool="$(gcc-config -B)/gcj-dbtool"
-
-		"${dbtool}" -a $("${dbtool}" -p) \
-			"${EROOT}usr/share/${PN}-${SLOT}/lib/ecj.jar" \
-			"${EROOT}usr/$(get_libdir)/${MY_PN}-${SLOT}.so"
-	fi
-
-	einfo "To select between slots of ECJ..."
-	einfo " # eselect ecj"
-
-	eselect ecj update ${PN}-${SLOT}
-}
-
-pkg_postrm() {
-	eselect ecj update
-}
diff --git a/dev-java/ecj-gcj/files/ecj-gcj.in b/dev-java/ecj-gcj/files/ecj-gcj.in
deleted file mode 100644
index 4f838d5de240..000000000000
--- a/dev-java/ecj-gcj/files/ecj-gcj.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# /usr/bin/gij was installed by gcj-jdk in the past and is now handled by
-# gcc-config, fall back to gcc-config to locate the binary should the
-# symlink/wrapper-binary not yet exists.
-GIJ_BIN="@GENTOO_PORTAGE_EPREFIX@/usr/bin/gij"
-if [[ ! -f ${GIJ_BIN} ]]; then
-	GIJ_BIN="$(gcc-config -B)/gij"
-fi
-if [[ ! -f ${GIJ_BIN} ]]; then
-	echo "gij not found! check that gcc is compiled with gcj flag"
-	exit 1
-fi
-# calling java-config would be an unnecessary slowdown here
-
-# we need to append user CLASSPATH otherwise it will be overriden by the -classpath parameter
-# this breaks e.g. bootstrap of ant-core
-ecj_cp="@GENTOO_PORTAGE_EPREFIX@/usr/share/ecj-gcj-@SLOT@/lib/ecj.jar"
-if [[ -n "${CLASSPATH}" ]]; then
-	ecj_cp="${ecj_cp}:${CLASSPATH}"
-fi
-
-${GIJ_BIN} -classpath "${ecj_cp}" org.eclipse.jdt.internal.compiler.batch.Main "${@}"
diff --git a/dev-java/ecj-gcj/metadata.xml b/dev-java/ecj-gcj/metadata.xml
deleted file mode 100644
index 9437e2146b86..000000000000
--- a/dev-java/ecj-gcj/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>
-<use>
-	<flag name="native">Build a native binary along with the jar. Provides faster execution time, but needs about 1G memory and some patience to compile.</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index fb15ba74fcb1..ebffa2f8ff7c 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,13 +1,11 @@
 DIST ecjsrc-4.10.jar 2036945 BLAKE2B cf9e50e53dac970a0b6b1231024a4efdc9adc92e02585aa4767c6511b367b32eefaf6fb3461c3c5c8160cf7205c0f708af0c433f4636b5a49caf637ba60fa092 SHA512 e85cacf6d2e21d464ff0226eac12bab8388df7a1413cb16d2982e255eb7369341792562f5080354279be0643c08fd80564a8eb2d8f59b72c8443c02577e4e1ee
 DIST ecjsrc-4.13.jar 2074963 BLAKE2B d74caf3b81543ac12497148a477dcd99fb6d14bd1d601b9e2baa0fb82d12f1211533f5ee909465b190c780ac18f1fbc1f8e12c22cddfce10501923effd7a4cc1 SHA512 f7e49b29e8aa80d627230059c9aba3f1e1fe3824bfd43eac962331d545471df5af0ac49b489aa3795e79e161101a3c6406b29f71a06143914f241916ae6953a9
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
-DIST ecjsrc-4.21.jar 2264087 BLAKE2B 2e5da35829a8a7f907e154dbb093bb496e799088d1d4694c7c9b8ceb5bac9affaac4c4fb3a347bdb49afde7f0143220d1ac27ea4ab369770150e316cf56bae9a SHA512 ab940d18f1d5fcbeef3b903a7d719ce6b1dd900d87be08f7a916d6a7d65d8b83b44332dea1642c8d75e2baac3ba8dc27faef659e365cee5f500db99aa9675ce7
-DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
+DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
 EBUILD eclipse-ecj-4.10.ebuild 1678 BLAKE2B 933c353919c86dd1d1a8adff7604bb42a35ed0de363134d8a3169dfefd91c90f6827a0bd661371515da6b9a63fd55745578dd70c50e808ccb29f1e5e1ffa4fb1 SHA512 2bd4398ccc15505ef35081e5afce5302001a0eec585c8c5463b233922e3faf234fc982293d873b4c181785f23b883993e157555202c0e2c1f823b68aa844f87f
 EBUILD eclipse-ecj-4.13-r2.ebuild 1738 BLAKE2B fc8b94e3d55e1a72473c9723b496fef18a5122af2f94c34ed52c929fce8be6703d2a4c8f99ef836a896bbc0c7e6e93d5675db2588f79beb9551e918b251c5864 SHA512 5a4e6e40cd35e1d815f2eb83ca15ad638d5f931a3ad1539147aa716dbae82a89763b51ffcd59490ceee6e80846475ce550654acb45cac5444be1835b080b8ea5
-EBUILD eclipse-ecj-4.15.ebuild 1738 BLAKE2B 2b1eea89420428e432bf7a834f47a04836d491d6dd8049d466c02027cfe9faf83f3a3a5e0e63109e674e600711034e3bec790ee92fc74be5d3ed9944d16a473c SHA512 672d74a8f2a29b1f4d6d3ecd0de797bc08e5e680d6369c9968204a26447fd672abe3980aaa36ba76d53193c6da3d1b8d8c38a39eb2c77cba4a1adcbcdd495db1
-EBUILD eclipse-ecj-4.21.ebuild 1705 BLAKE2B 481cb4f2b95c130f481e9246d91bf0a63c1cb23d0c5cf780473c83fe3401bebb30edb2e125f909725c40c0d3b087ef42090fc4bf41dc35a791a4c12b3df5cf91 SHA512 450f30fc7a3ee77ec65b1f2fdec7129160744e37f4925433dec71bc7af61b7980c863f75576b39632f26cb01e224bdf0b28422c7055751378140862c2fae9228
-EBUILD eclipse-ecj-4.4.2-r1.ebuild 1361 BLAKE2B 3f2fea077ce628cb057ee841d6a19b06f9b56344c085a5fd7533fa084d3f7cf92a5ac6edc31632e31c470852f742b383cc913371e927d59aabfbb38e42496f6e SHA512 9a870d4ce61c4a5ed3f9c0e9b7b75f0006a1649269849a08a5b5b809f980abb3773be37338564578e4fc8ee8921e231c93b5cfc0f72e99f71190c7a91ff86eef
+EBUILD eclipse-ecj-4.15.ebuild 1737 BLAKE2B 8f0cf422581ddadc232cad2edb41a3ccc35d3390e99e02caf498b0b50334ef95e70a022c090bbd23fd67b3cd62c5871c3e89801e9b9c6a1c2a3d67e306b7068b SHA512 fd63c0a189d4e2d928674814ba7e681a7f83569937004c28785acb5d7c969db49fc8538c3ca093431e2a3067b432d2889f6e205bc53bec9d07db2302206fe0c4
+EBUILD eclipse-ecj-4.22.ebuild 1693 BLAKE2B 85963cd268d50412c1e185f762b94b040a1d29b3d0c352e155006e5f65d14b7133ab8853e47a86b7c4e45016e9921430671953a21efa7128e6fd3dbbe91be27f SHA512 d644260970dfa5f767962c39d47d513188fa46f09fb8aaa2adcdd63c1e1b3d7f1848c504aaeedb05b83d9d703b096c62604cb0706a482e98344603360b769436
 EBUILD eclipse-ecj-4.5.1.ebuild 1628 BLAKE2B 19a0422c19a19998e199dae7170e3b89954d412e62523ec4742fbf514015afdfe01a9c932b044dfd4f6971a96ba1bf3bf98697732b677f567c3d2a83368d575e SHA512 ba5ded5ba46b10e1467c42ad8f63f67f065acd08f3e39541e3794e97a0f8974edc1d4e3eff474916922b83e8fd9656cba6f34b67c3febc4ea15bf08c933ca2ff
 MISC metadata.xml 646 BLAKE2B 644ff172a0719eb9a8669ea6c472adeace597f2c9baef893707c366d1aa86d04a92c4873abe2894e8405c0198c7588f4f7110df11b520f22afd20cb0a018d9f3 SHA512 c611a29d9e2f37b25cbfb631e1292832aab4c78122b26fca2b5689b4aa7337ed87b3dd17a95ee5aacfeae6d57f9400c6ef79479b190df072eadcdcbefc38edf7
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
index 0ddd9051340a..8e6af419fbc2 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.15.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
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.15"
 IUSE="+ant"
 
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.21.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild
index 918e7574efde..e9f4bee64891 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.21.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple
 
 MY_PN="ecj"
-DMF="R-${PV}-202109060500"
+DMF="R-${PV}-202111241800"
 
 DESCRIPTION="Eclipse Compiler for Java"
 HOMEPAGE="http://www.eclipse.org/"
@@ -16,23 +16,19 @@ SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src
 
 LICENSE="EPL-1.0"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT=$(ver_cut 1-2)
+SLOT="4.22"
 IUSE="+ant"
 
 COMMON_DEP="
 	app-eselect/eselect-java
-	dev-java/ant-core:0
-"
+	dev-java/ant-core:0"
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-11:*
-"
+	>=virtual/jre-11:*"
 DEPEND="${COMMON_DEP}
 	>=virtual/jdk-11:*
-"
+	app-arch/unzip"
 PDEPEND="
-	app-arch/unzip
-	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )
-"
+	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
 
 JAVA_JAR_FILENAME="${MY_PN}.jar"
 JAVA_GENTOO_CLASSPATH="ant-core"
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
deleted file mode 100644
index ea7d04f5d41a..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="ecj"
-DMF="R-${PV}-201502041700"
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT="4.4"
-IUSE="+ant"
-
-COMMON_DEP="
-	app-eselect/eselect-java"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.6
-	app-arch/unzip"
-PDEPEND="
-	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
-
-JAVA_JAR_FILENAME="${MY_PN}.jar"
-
-java_prepare() {
-	# These have their own package.
-	rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-	rm -r org/eclipse/jdt/internal/antadapter || die
-
-	rm build.xml || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
-		org.eclipse.jdt.internal.compiler.batch.Main
-}
-
-pkg_postinst() {
-	einfo "To select between slots of ECJ..."
-	einfo " # eselect ecj"
-
-	eselect ecj update ecj-${SLOT}
-}
-
-pkg_postrm() {
-	eselect ecj update
-}
diff --git a/dev-java/emma/Manifest b/dev-java/emma/Manifest
index 5fb17123eb62..d72f34962000 100644
--- a/dev-java/emma/Manifest
+++ b/dev-java/emma/Manifest
@@ -1,5 +1,4 @@
 AUX emma-2.0.5312-java15api.patch 841 BLAKE2B b3a03a2f309303e0966703204a66980081778ca261b7ed82d8471ce3a295e4b5f8af0d6a8547f01150930a7c3378f8472ccef3ccb9382b74d9782e246530bc93 SHA512 cd485a0bd9bb157f9a0e420bd3bd8863ae5b1127401b8ff8944459c04fa2f5a7e6b008d9f86affe25cb24cf007d9dfe780f843745c6fcdfcfe1f734e9bb8fd23
 DIST emma-2.0.5312-src.zip 421109 BLAKE2B bca287d7cdd61902fd156eac80596db07801e8dabd342d7cc68d3e0b4c0ff7b4de2b14d8b01d3521a291f7401ddc0ead67db6f9c601b26669ce9265bc28e0209 SHA512 d99b7ff1c4682a97f714f74cc6142bb766cde47bcb33932dc466f1e505e836883f01faa0a959dad77c0837fca3ae744754e0fcdc34d7a8d14720b0b7ce90ee4b
-EBUILD emma-2.0.5312-r3.ebuild 1039 BLAKE2B b2de84bac7d81c2af8a0ccd6cbc7df2ef24671d32e76ea768026a2f38f01599c0ddc3b4f152af084d2c7f4d121e083c74951df52a37af79717a20b3dda053c77 SHA512 6f0ee5d7c95a68765a83ef268ffac1b5d8f05ba7a2c270332e7f86ca929274cf7359f5abb29a9b75c00b6d4d41202a70b15f1c46ba40db3168c5305f40320475
-EBUILD emma-2.0.5312-r4.ebuild 1081 BLAKE2B e41af9bdce0beb1047eb07426bc1e43210a6e4121b0137df125b042a09d1d79b326ec8b8551873ab5b40a60fe4fc495f4b02ce1917a6cf1d23cb1e878531fea3 SHA512 ebd081024dc67609c0908ec00047532a95df9d859c2824ca409bbc7765d565887715699d75c5ad3beb433ab5b58195bc04c0957e2c46abe515bc71f2f345be27
+EBUILD emma-2.0.5312-r4.ebuild 1077 BLAKE2B b6d34c9723b82b2b3ec0a3627e66f956a3b176b1d5b7d8a76ded455e5a9dea9f5d5679c7cca9fb4a53965f51e5b1fdb6d39227c1f143695f3dd8a428c03fca1c SHA512 e9521a424929f3039a60ad1b700d80b48944d2ba5a4997d45fb7c4e942c571262564f75de80dbcd5a8329c92d8434cb5a30aa1d5905a74628e09b7a11468c4f4
 MISC metadata.xml 860 BLAKE2B 9e3723bdb2d6d82a4b6882e6e495367b94717dcc6b62154fa76a275bb39bd8418d0a748c990b28e9c21ef7a7c4703d6a80374cbeae69f7655e36f57110433d7f SHA512 2de0835234df8151fc96f57a6662357589eed19f6b528f4e9084633a79c60bc0e82dfb0447e5398f0f810fe481c278e75220f14fce5a26c65aeb6e0dbe43883a
diff --git a/dev-java/emma/emma-2.0.5312-r3.ebuild b/dev-java/emma/emma-2.0.5312-r3.ebuild
deleted file mode 100644
index 08620ee93566..000000000000
--- a/dev-java/emma/emma-2.0.5312-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Free Java code coverage tool"
-HOMEPAGE="http://emma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-IUSE="+launcher"
-
-CDEPEND="
-	dev-java/ant-core
-	launcher? ( !sci-biology/emboss )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-EANT_BUILD_TARGET="build"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-java15api.patch"
-	# bcp mangling unneccessary for 1.4+ and breaks with IBM 1.6 - bug #220463
-	sed -e '/bootclasspathref/d' -e '/extdirs/d' -i build.xml || die
-}
-
-src_install() {
-	java-pkg_dojar "dist/${PN}.jar"
-	java-pkg_dojar "dist/${PN}_ant.jar"
-	java-pkg_register-ant-task
-
-	use launcher && java-pkg_dolauncher ${PN} --main emmarun
-
-	# One of these does not have java sources
-	use source && java-pkg_dosrc */*/com 2> /dev/null
-}
diff --git a/dev-java/emma/emma-2.0.5312-r4.ebuild b/dev-java/emma/emma-2.0.5312-r4.ebuild
index 5e00f2ec4a50..0ea013aa1a3e 100644
--- a/dev-java/emma/emma-2.0.5312-r4.ebuild
+++ b/dev-java/emma/emma-2.0.5312-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 IUSE="+launcher"
 
diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest
index f9fb64872215..308293215c90 100644
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@@ -1,5 +1,3 @@
-DIST error-prone-2.0.14.tar.gz 677991 BLAKE2B e247249b385b4d5ff46cd9faaeb88b7c2053204c17a2a81846c554e2eb95389a17ca340f02dbab187f7b9e297fb13c030912e49bfbe5b29c7158391b1a7c50da SHA512 0bf2c869638e03fea5395e2b84a690c42df320903e48a171537e68a60ae7a47a8a83de07fa0a8dfb03340c035878b4380fd6677ba3bf1d13eeffcfaee4e63658
 DIST error-prone-2.7.1.tar.gz 1576363 BLAKE2B a204a6a0dfcc88e06ff4f9288764c33c72e1d0c692ba20ce34a1440025abbb96d510129e335a475ffecc037806c72a0e1a85f0ad55a5ee4402d7b731eabd057b SHA512 2e8ff78b2fc65a0a53244711a3b5dd3d42cd09c0c9cca8dde5c814ee3e9dbc6e2c44f8bdb778111c93cd867f9b85b8afae4fd0551eda9326c0a9b1aa1dcaaf92
-EBUILD error-prone-annotations-2.0.14.ebuild 606 BLAKE2B 2358c936d84ca4a9d05a1472fdef821f7f5d76f029fe630c320f865513281b2e6d984026e6ed54ebe470a40c6cf77a87e2e1e5b5c14fb4db5db1a9111c4db2ee SHA512 2b3fa928f1931785c0516cc4c54331800e0319c9efc15f31e5be4908d28fbbbfa4f1eeecab93663f5e6979759d0e85adf2019e5fb569184fe9ae88afb3bf5aab
-EBUILD error-prone-annotations-2.7.1.ebuild 932 BLAKE2B efd3e8a8d8e79d09c569da66aeea11589fe84380d7d3abbe166db4b65f9329c2abc3bb329407510bb193d60851ffa530c7bcc6a6a1b73b490190f2b3dd04b09b SHA512 7ed32107d31f20790255fa13d451b76022bb57420abebcf626d87eef1456290792e37ddf0cadd2d0376f0fa236541a06e2506e5a8d3e1c2dd127783dba7dfdff
+EBUILD error-prone-annotations-2.7.1.ebuild 928 BLAKE2B f49580ddc370cb985d8be8d33dd141324776ac6cd60ba6883711c9908703927f3a0f4afab60207c5f93490373c1f84959ea46c6a93fc7bee8eee131a0edec566 SHA512 54a0b82ed79a85dff80670fc45b54eafacdb480e774f1ee4652b0c03da22df7c07cc61a6bdbbc8413ce0d1bc6e1235a4038160e54cce496649aae9edc712c2da
 MISC metadata.xml 320 BLAKE2B 2e99f822caa8b83ed1ababb800cd9d3b1c8027e5623bc4498a475b7e0e72943c2140ec07c42a1d967472186094a0933fcc82b5cbfe45d1111f0fec9924e161dc SHA512 c47744406f133d3553b5982f0a7f690ca4bb360e76e633c30015489bb6489ee74629f4d6cd1986558932acc7b18449cd9840f9080f71d682cc6fbf97981cbf21
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild
deleted file mode 100644
index f5eb3a09a961..000000000000
--- a/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN%-annotations}"
-MY_P="${MY_PN}-${PV}"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java annotations for the Error Prone static analysis tool"
-HOMEPAGE="http://errorprone.info"
-SRC_URI="https://github.com/google/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_P}/annotations"
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.7.1.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.7.1.ebuild
index 4c854a1d49ac..2e15db67603f 100644
--- a/dev-java/error-prone-annotations/error-prone-annotations-2.7.1.ebuild
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.7.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://errorprone.info"
 SRC_URI="https://codeload.github.com/google/${MY_PN}/tar.gz/v${PV} -> ${MY_P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/failureaccess/Manifest b/dev-java/failureaccess/Manifest
index 8d2f08003bab..b7ca5218e01a 100644
--- a/dev-java/failureaccess/Manifest
+++ b/dev-java/failureaccess/Manifest
@@ -1,3 +1,3 @@
 DIST guava-30.1.1.tar.gz 5404546 BLAKE2B 818ef4b17c4f0c8e92c327f046434a3bb428ac35d6e95edd6d6be558c755d138a8ac7f8ad2032073cad131890d8f838e896fff84ba217f8305be8bd65c619a48 SHA512 23b30d886a3200b8f998897ca7bc424b2d223a4fecb03ab644e08a989a85f008e30ef093055e6305c4148a1eb8919c407e35d19f492c5b189830bd115e9484f2
-EBUILD failureaccess-30.1.1.ebuild 922 BLAKE2B 09c7b52bcb0cbcf75b943094681c351fedefe73f181affe88aacfd4c7b26443e5052399036bf767572b1500c60b1f6e20a575a9cf03a2d8a74a11e03bc7d62f8 SHA512 56a42a4f7dacb75af71a9f65445f154476896e6a034a6b51d4a10ee9f9af24ac03e0a9c1ae7628558ecb4c3ac340047e60c84e97f5dcdc30f653c93de7b0c5b5
+EBUILD failureaccess-30.1.1.ebuild 923 BLAKE2B 7fd0e0ffce118d7c192426e1f9cc42bd722b52baa9ab672eff9087cbe932863b9bc069f04cbd8145ddc3510e4d1d09dc099d8543611f01c589940b815cd48308 SHA512 fd29d92b59be9fcecca2316224a0573ed744136742a2a92ce7b89cc5106c83088056535ec7b70c2a3121bc5b30727b556ac822322ec9c2f63d4e3e0569196f3c
 MISC metadata.xml 755 BLAKE2B af0cc772ea1dab11a52db3dad6ea865af7cfcda4189778c444810dc03162db63baa1a48379bc16b603669bbb7fbc7ed29db47fbefca65887cb8e05d9f1d87e03 SHA512 caeefc4d01c0e0864858fc7a2c50526df15c27a3ff39f3dd577e508d79893eba8c4849aa685ffcd35382b685b298e0626d44bddc62e960274c43e129abd70ece
diff --git a/dev-java/failureaccess/failureaccess-30.1.1.ebuild b/dev-java/failureaccess/failureaccess-30.1.1.ebuild
index fb3c8c35a826..15e1ef59ea52 100644
--- a/dev-java/failureaccess/failureaccess-30.1.1.ebuild
+++ b/dev-java/failureaccess/failureaccess-30.1.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/google/guava/failureaccess"
 SRC_URI="https://codeload.github.com/google/guava/tar.gz/refs/tags/v${PV} -> ${MY_P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/fec/Manifest b/dev-java/fec/Manifest
index 4f3b56a15341..18129d0a22db 100644
--- a/dev-java/fec/Manifest
+++ b/dev-java/fec/Manifest
@@ -4,4 +4,5 @@ AUX fec-1.0.4-remove-concurrent-util-imports.patch 3146 BLAKE2B 8716fcc73a5e1030
 AUX fec-1.0.4-soname.patch 790 BLAKE2B 852ef6ec83d42a15bfb1d67b05364d15c3027a8579d5e90dab4dec4cc99273383d89f5d5174ec8a6e2ab3cb09986d3fd60f39aedec6ae2da3f893325f88756c4 SHA512 1586fc0408274fff7eb3ba2cd95cfac8a94dad9981e2e01e8e11642692d2a27068936b673364c9c2cc70ca848d364648a66c728dc41d85c605a25b7fe79e2ec3
 DIST fec-1.0.4.tar.gz 449406 BLAKE2B 132bb87ff0da35b9a1830d014c46fb82209b344d159b88c6dbf36c706de668cdb2dfc10894690009e9a47f461100beaf9cf25ad1c75a3b18194e5499457bcb6b SHA512 0244de5e44ab108e921c6ca4cf341ce7b3ba807a76d24b768cfe3de71ffd525c9ebf389f9981e7eaa83fec301a65ba60ef4f51c5b3befa6c7af42b793d430343
 EBUILD fec-1.0.4-r3.ebuild 1483 BLAKE2B 59340c027d79d5a9eaf0d1a4d6b6234396a8b113f8a8365b16148fdfdc90c34b4874a2b69eb00bebc6b52a58ad6d82a615557030dfb86714654b5a3f86056b42 SHA512 69c55282ec66e0bd2907408ec431e8650c2bdb116c4d2e906ac9caccd00f362e7001a450c4b675421cd0667f1aa627a37beacac5d6bd9dded92be3c071285eab
+EBUILD fec-1.0.4-r4.ebuild 1517 BLAKE2B 1b580e3a6f0b3a0032d6ba304d3314e7920d9a2dec5d7943aedb6a7f8913ab5910bda4d0e359a5890ab8b622633af270dc3c5477a23b34af27ec4da1541fa890 SHA512 41e0094963ffda6ce3bb31f4a02f27315fc333a2a4968c4155edb33bb316586d53d3fb6b0ee18d5a90b68fc18d98af18a949261e57dea71c070117e9c1c1fc98
 MISC metadata.xml 435 BLAKE2B f15bf1cf8797a940aef17b1a72884aad2859be1790129554172bbeec7ea0e2f68da81c0e5362cc7d94302bb9090bc1d0960d608335bc1a88168a3607ccb0d191 SHA512 13f1c5f833c69547926d60f4f9325624db5e82ea9b01900b00d48b38079e0cd8b1d038f6a69d784d78fa3cafa6f23e7ce57b78812b91154e0850466c2daf2ab9
diff --git a/dev-java/fec/fec-1.0.4-r4.ebuild b/dev-java/fec/fec-1.0.4-r4.ebuild
new file mode 100644
index 000000000000..29f4fada481c
--- /dev/null
+++ b/dev-java/fec/fec-1.0.4-r4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+JAVA_PKG_IUSE="doc source"
+
+inherit flag-o-matic toolchain-funcs java-pkg-2 java-ant-2
+
+DESCRIPTION="Forward Error Correction library in Java"
+HOMEPAGE="https://bitbucket.org/onionnetworks/"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/log4j-12-api:2"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}-libfec8path.patch"
+	"${FILESDIR}"/"${P}-build.patch"
+	"${FILESDIR}"/"${P}-soname.patch"
+	"${FILESDIR}"/"${P}-remove-concurrent-util-imports.patch"
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
+EANT_GENTOO_CLASSPATH="log4j-12-api-2"
+EANT_BUILD_TARGET="jars"
+
+# There seems to be unit tests, but they are in such a state.
+RESTRICT="test"
+
+src_prepare() {
+	# Apply patches.
+	default
+
+	# In fact, we'll wipe tests altogether.
+	rm -rf tests || die
+
+	# Get rid of bundled jars.
+	java-pkg_clean
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+	einfo "Sucessfully compiled Java classes!"
+
+	cd "${S}"/src/csrc || die
+	append-flags -fPIC
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)"
+	einfo "Sucessfully compiled C files!"
+}
+
+src_install() {
+	java-pkg_newjar "lib/onion-${PN}.jar" "${PN}.jar"
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/com
+	dolib.so src/csrc/libfec{8,16}.so
+}
diff --git a/dev-java/felix-bundlerepository/Manifest b/dev-java/felix-bundlerepository/Manifest
deleted file mode 100644
index 9a740417125f..000000000000
--- a/dev-java/felix-bundlerepository/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX felix-bundlerepository-1.6.6-build.xml 9293 BLAKE2B 601e91d713369c89b0e511b8dc7deaf077f118c4d3b41cecff3cdc0bcff72655bc13cf0c9f6c68c99f5900efa6cc5bbd83d621a362c469a293f8972b6155d16e SHA512 23b17058603ab1ceac2af7b88d83d112406036cde05350f9f2d750705040ba9d885c54904dab8c29ee8ffdc506e46cff7eab80d19145a80e437f96034b745414
-DIST org.apache.felix.bundlerepository-1.6.6-source-release.tar.gz 163337 BLAKE2B 9eb4a568de9ffac0f744675a5a4c5f84563054931204575fc447af5c33a5cda124b305beb82c45a44a9764a3a26dd985aaf91e5066f68d32fb79c4e60c70a42a SHA512 a457dacf0b15a54aad9290a3620b4dee503bb7d06eac1e2e9b151613caafdd53b104e8266b10321d04d0fb400df6f9f2131ed03f48bf166205903aa69f260b46
-EBUILD felix-bundlerepository-1.6.6.ebuild 1140 BLAKE2B 5a228484e9ad8d0b5dfe5f69d310283fe707d3b236ce2460a143f61bbb26eee7edc936c53bac660b94466ef8060078823a917b023f6cebcf51930e495580387d SHA512 1a88cbcbc814194830fc54a9e2cce61feb1db710b7453c101dad520980ef60b42383a1c801d4acd6614e47acfc2ce1053c3a92dcb9ef348a7a87d65b5093b805
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/felix-bundlerepository/felix-bundlerepository-1.6.6.ebuild b/dev-java/felix-bundlerepository/felix-bundlerepository-1.6.6.ebuild
deleted file mode 100644
index 52bc02a0e8d1..000000000000
--- a/dev-java/felix-bundlerepository/felix-bundlerepository-1.6.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="Felix Bundle Repository"
-HOMEPAGE="http://felix.apache.org/"
-LICENSE="Apache-2.0"
-
-MY_PN="org.apache.felix.bundlerepository"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://apache/felix/${MY_P}-source-release.tar.gz"
-SLOT="0"
-KEYWORDS="amd64"
-
-CDEPEND="
-	dev-java/kxml:2
-	dev-java/xpp3:0
-	dev-java/felix-shell:0
-	dev-java/felix-utils:0
-	dev-java/osgi-core-api:0
-	dev-java/osgi-obr:0
-"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-
-	sed -i 's/bestVersion.compareTo(v)/bestVersion.compareTo((Version) v)/g' \
-		src/main/java/org/apache/felix/bundlerepository/impl/ResolverImpl.java \
-		|| die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="osgi-core-api,felix-utils,felix-shell,xpp3,kxml-2,osgi-obr"
-
-src_install() {
-	mv target/{${MY_P},${PN}}.jar || die
-
-	java-osgi_dojar target/${PN}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
-}
diff --git a/dev-java/felix-bundlerepository/files/felix-bundlerepository-1.6.6-build.xml b/dev-java/felix-bundlerepository/files/felix-bundlerepository-1.6.6-build.xml
deleted file mode 100644
index 0c7398178af1..000000000000
--- a/dev-java/felix-bundlerepository/files/felix-bundlerepository-1.6.6-build.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.apache.felix.bundlerepository-from-maven" default="package" basedir=".">
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-  <property name="maven.build.finalName" value="org.apache.felix.bundlerepository-1.6.6"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.resourceDir.1" value="."/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.utils/1.1.0/org.apache.felix.utils-1.1.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/felix/org.osgi.service.obr/1.0.2/org.osgi.service.obr-1.0.2.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/felix/org.osgi.core/1.0.1/org.osgi.core-1.0.1.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.shell/1.4.1/org.apache.felix.shell-1.4.1.jar"/>
-    <pathelement location="${maven.repo.local}/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/codehaus/woodstox/woodstox-core-asl/4.0.7/woodstox-core-asl-4.0.7.jar"/>
-    <pathelement location="${maven.repo.local}/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
-    <pathelement location="${maven.repo.local}/org/codehaus/woodstox/stax2-api/3.0.1/stax2-api-3.0.1.jar"/>
-    <pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.utils/1.1.0/org.apache.felix.utils-1.1.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/felix/org.osgi.service.obr/1.0.2/org.osgi.service.obr-1.0.2.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/felix/org.osgi.core/1.0.1/org.osgi.core-1.0.1.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.shell/1.4.1/org.apache.felix.shell-1.4.1.jar"/>
-    <pathelement location="${maven.repo.local}/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/codehaus/woodstox/woodstox-core-asl/4.0.7/woodstox-core-asl-4.0.7.jar"/>
-    <pathelement location="${maven.repo.local}/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
-    <pathelement location="${maven.repo.local}/org/codehaus/woodstox/stax2-api/3.0.1/stax2-api-3.0.1.jar"/>
-    <pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"/>
-  </path>
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.3" 
-           verbose="false" 
-           fork="false" 
-           source="1.3">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}"/>
-    </copy>
-    <mkdir dir="${maven.build.outputDir}/META-INF"/>
-    <copy todir="${maven.build.outputDir}/META-INF">
-      <fileset dir="${maven.build.resourceDir.1}">
-        <include name="changelog.txt"/>
-      </fileset>
-    </copy>
-  </target>
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.3" 
-           verbose="false" 
-           fork="false" 
-           source="1.3">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-    </jar>
-  </target>
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-</project>
diff --git a/dev-java/felix-bundlerepository/metadata.xml b/dev-java/felix-bundlerepository/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/felix-bundlerepository/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/felix-gogo-runtime/Manifest b/dev-java/felix-gogo-runtime/Manifest
deleted file mode 100644
index b65bd8a71d04..000000000000
--- a/dev-java/felix-gogo-runtime/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX felix-gogo-runtime-0.10.0-build.xml 13681 BLAKE2B 00e73e0f0d429ee6bdff5c9d18c4a6cc277fa7d766de6c0c7cdbe24533fc587aad6afe3ac94aabacf6b1ae0985bc4606901d38bd6b08eeb26fa62f93d08bd03c SHA512 8faf5c3474adfb26aeb4f1cf1edb67c68ac8e8dddad2740cb3e9fe92ab72f374b97a4f4b18f4eac8aaffbbf4cf0e626baec82e417a95135fca2a0df7f0ac8ecd
-AUX felix-gogo-runtime-0.10.0-event-properties-to-map.patch 1072 BLAKE2B 526ee7ecc501589b08d194d5c10e766780cefadb58d8078ef9d854eb2238caabc1b18f6e9af1833f26f81c5969b491f7f35351971df7e15804bfab60f5ba0150 SHA512 b34bdb55d733cde8ccef446632fae9b6cc7022b72e8ff79b023fe713f2bc31a60f839af223bfc517e0cf4d290ee7b239c70cd009a17b9ed8c48b866e56534a66
-DIST org.apache.felix.gogo.runtime-0.10.0-project.tar.gz 69837 BLAKE2B 3ffd6cc308b3125ee8cd467945ca58a9fcf3125d32b23f68065fa7a9266210d186ebf3aba354f64a9d2c38a176ac7a5767e4349707a56dcbd77831eb24df928c SHA512 a71100796e400103cf9d46fcdb7bf45b5d1d180328db27900915c1771650297c9135589dc91e4c2194634b4312ea7c064b71496a7e11e9a3393bdc6eeb70e03d
-EBUILD felix-gogo-runtime-0.10.0.ebuild 1038 BLAKE2B e49ee0a5d05835f4e17d22240817186d47aa35938f92996cd03b5985589f1514fa1b8277176e91df93877bed7dad579b343615578238c78fab89d69d81bbf43d SHA512 f505d46386cebc725779c63745db4f2be6d806e891dd063f72f7434fe83c7efca0209c98e188ea48571751518326fabaa149a4640f1ee9fd29d7404fa39642ab
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild b/dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild
deleted file mode 100644
index f6a9d2f071d3..000000000000
--- a/dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="Felix Gogo Runtime"
-HOMEPAGE="http://felix.apache.org/site/apache-felix-gogo.html"
-LICENSE="Apache-2.0"
-
-MY_PN="org.apache.felix.gogo.runtime"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://apache/felix/${MY_P}-project.tar.gz"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND=">=virtual/jdk-1.6
-	dev-java/osgi-compendium:0
-	dev-java/osgi-core-api:0"
-
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-
-	epatch "${FILESDIR}"/${P}-event-properties-to-map.patch
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_compile() {
-	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only osgi-core-api osgi-core-api.jar):$(java-pkg_getjar --build-only osgi-compendium osgi-compendium.jar)"
-
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-osgi_newjar "${S}"/target/${MY_P}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
-}
diff --git a/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-build.xml b/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-build.xml
deleted file mode 100644
index 4bcd4c42ad62..000000000000
--- a/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-build.xml
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 5/13/13 1:33 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="org.apache.felix.gogo.runtime-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="org.apache.felix.gogo.runtime-0.10.0"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.resourceDir.1" value="."/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar"/>
-    <pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
-    <pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <mkdir dir="${maven.build.outputDir}/META-INF"/>
-    <copy todir="${maven.build.outputDir}/META-INF">
-      <fileset dir="${maven.build.resourceDir.1}">
-        <include name="LICENSE*"/>
-        <include name="NOTICE*"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0"/>
-    <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar" 
-         dest="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar" 
-         dest="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0"/>
-    <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
-         dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
-         dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.5"/>
-    <get src="http://repository.apache.org/snapshots/junit/junit/4.5/junit-4.5.jar" 
-         dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.5/junit-4.5.jar" 
-         dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/easymock/easymock/2.4"/>
-    <get src="http://repository.apache.org/snapshots/org/easymock/easymock/2.4/easymock-2.4.jar" 
-         dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/easymock/easymock/2.4/easymock-2.4.jar" 
-         dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/mockito/mockito-all/1.7"/>
-    <get src="http://repository.apache.org/snapshots/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
-         dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
-         dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-event-properties-to-map.patch b/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-event-properties-to-map.patch
deleted file mode 100644
index ae2e67cf3abe..000000000000
--- a/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-event-properties-to-map.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java	2013-05-13 13:40:57.071766332 +0200
-+++ src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java.2	2013-05-13 13:41:30.725096685 +0200
-@@ -18,7 +18,7 @@
-  */
- package org.apache.felix.gogo.runtime.activator;
- 
--import java.util.Properties;
-+import java.util.HashMap;
- 
- import org.apache.felix.gogo.api.CommandSessionListener;
- import org.apache.felix.service.command.CommandSession;
-@@ -43,8 +43,8 @@
-     public void beforeExecute(CommandSession session, CharSequence command) {
-         EventAdmin admin = (EventAdmin) tracker.getService();
-         if (admin != null) {
--            Properties props = new Properties();
--            props.setProperty("command", command.toString());
-+            HashMap<String, String> props = new HashMap<String, String>();
-+            props.put(new String("command"), command.toString());
-             Event event = new Event("org/apache/felix/service/command/EXECUTING", props);
-             admin.postEvent(event);
-         }
diff --git a/dev-java/felix-gogo-runtime/metadata.xml b/dev-java/felix-gogo-runtime/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/felix-gogo-runtime/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/felix-shell/Manifest b/dev-java/felix-shell/Manifest
deleted file mode 100644
index 612c2c118faf..000000000000
--- a/dev-java/felix-shell/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX felix-shell-1.4.3-build.xml 13813 BLAKE2B 02e67a5a77e62124d299356f718347d4d246732f5b85b87a6e3095dab333536639e770bc1828b00b6767e107cef2dca6cfcf296e9136d1078e3346c094bb8ea8 SHA512 324f9a3d1de17756eeff2ed520e3e4639ed371785b3cf422387b75d4dd6790e893d6467308c44b5157a56577a6714c271c6168a9737d7326600f3944fcd4d6be
-DIST org.apache.felix.shell-1.4.3-source-release.tar.gz 75190 BLAKE2B 338658ec6b490bfca2ce6d15089810f8db421ea89a5931201d3ae8de71e7181dead6b811f4ffcf4b876f92362e375715b34dd73e982969a022eae5248a64e562 SHA512 fe1b3927789a18626715e52a634fa069fdd1505f425a48d76ec6abbb181f511ff5a3af176c70f634241830b185d32cd7eb71a271d62a754366141cd959cb54a4
-EBUILD felix-shell-1.4.3.ebuild 1178 BLAKE2B 49cdb2fb88de93e5d96839d65abd16420672f66a5a8181ac13166bfaf41c2d9dced543b245177068323a7369b9f60773d8286f2b08ed54f14da6a0429215a29a SHA512 df389381783d8702f67783b2a1e7c5f9e7a38f540c8377bcc9fecb97b829d78ff864b320b3239352a0472aae711563a468b3cd96779faaf18c8f869713d6e166
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/felix-shell/felix-shell-1.4.3.ebuild b/dev-java/felix-shell/felix-shell-1.4.3.ebuild
deleted file mode 100644
index 2b1ce8e60499..000000000000
--- a/dev-java/felix-shell/felix-shell-1.4.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="Felix Shell"
-HOMEPAGE="http://felix.apache.org/"
-LICENSE="Apache-2.0"
-
-MY_PN="org.apache.felix.shell"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://apache/felix/${MY_P}-source-release.tar.gz"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND=">=virtual/jdk-1.6
-	dev-java/felix-gogo-runtime:0
-	dev-java/felix-utils:0
-	dev-java/osgi-compendium:0
-	dev-java/osgi-core-api:0"
-
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_compile() {
-	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only osgi-core-api osgi-core-api.jar):$(java-pkg_getjar --build-only osgi-compendium osgi-compendium.jar):$(java-pkg_getjar --build-only felix-gogo-runtime felix-gogo-runtime.jar):$(java-pkg_getjar --build-only felix-utils felix-utils.jar)"
-
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	mv "${S}"/target/{${MY_P},${PN}}.jar || die
-
-	java-osgi_dojar "${S}"/target/${PN}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
-}
diff --git a/dev-java/felix-shell/files/felix-shell-1.4.3-build.xml b/dev-java/felix-shell/files/felix-shell-1.4.3-build.xml
deleted file mode 100644
index 6bab51781bd1..000000000000
--- a/dev-java/felix-shell/files/felix-shell-1.4.3-build.xml
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 5/13/13 2:41 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="org.apache.felix.shell-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="org.apache.felix.shell-1.4.3"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.resourceDir.1" value="."/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
-    <pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.3" 
-           verbose="false" 
-           fork="false" 
-           source="1.3">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}"/>
-    </copy>
-    <mkdir dir="${maven.build.outputDir}/META-INF"/>
-    <copy todir="${maven.build.outputDir}/META-INF">
-      <fileset dir="${maven.build.resourceDir.1}">
-        <include name="changelog.txt"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.3" 
-           verbose="false" 
-           fork="false" 
-           source="1.3">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0"/>
-    <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar" 
-         dest="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar" 
-         dest="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0"/>
-    <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
-         dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
-         dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.0"/>
-    <get src="http://repository.apache.org/snapshots/junit/junit/4.0/junit-4.0.jar" 
-         dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.0/junit-4.0.jar" 
-         dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/easymock/easymock/2.4"/>
-    <get src="http://repository.apache.org/snapshots/org/easymock/easymock/2.4/easymock-2.4.jar" 
-         dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/easymock/easymock/2.4/easymock-2.4.jar" 
-         dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/mockito/mockito-all/1.7"/>
-    <get src="http://repository.apache.org/snapshots/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
-         dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
-         dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/felix-shell/metadata.xml b/dev-java/felix-shell/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/felix-shell/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/felix-utils/Manifest b/dev-java/felix-utils/Manifest
deleted file mode 100644
index c08ff38f1a8d..000000000000
--- a/dev-java/felix-utils/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX felix-utils-1.2.0-build.xml 13825 BLAKE2B 2a3e33af5ecc743605ea5b23bc28c64a235c1d7bc090a321731eda1c4c61b1430ba21fabeb6124220998f9412330b3897dd673e902bc513a9ef79e4befff227c SHA512 0494ca015f38daf3b96758adaba1de71ec82b7ba811507e8b7acf33ff887484481251d6868d98c0b70535f1a5874941d457bf43fb3f8139d698ce3f5ce4ed1da
-AUX felix-utils-1.2.0-java-fixes.patch 1673 BLAKE2B 74f07e3238cc36f1982fed225cde1e9ea26419cd5e0f20ab357857ffa5580b8aa30eee4e945b52723ec54505bfe7d32c02a8c507ec6ab4d2518f3073e2e961cc SHA512 7256b8b9979536d1bc587726f3f4f71d56ec0ed3ba9cbc1229eea2c4d2c0883636bfa4498a59a076b9a06cd21b9fbb2f1ef293425454d3cb3dcb62d9d103cd33
-DIST org.apache.felix.utils-1.2.0-source-release.tar.gz 36109 BLAKE2B 5c7032986ce2e859236fcf9c9d4eefeb03c7bd8bad579c6e37423434f9095f8817d980cb5ddaaa2056632fe4ce9469f2fd955233fdbac7d48cd0fe0502b04904 SHA512 4b3a16abc92963c16c363791423483c14eb02792cc65d58a884777c6be25b05a226492280cf2f77183ad5b86cb5710076a118a58af34f6c717273bfdf93bc171
-EBUILD felix-utils-1.2.0.ebuild 1139 BLAKE2B fd9a0395b6c3235360303cc28ca487cac9a151e0b853e851e5c6be40b959a1320f7268fcb7bc58bd059d7baa22c7510cfc6707d3162b304591e2974c783e0470 SHA512 506c46a344dd788740f5d70927c3c5e97bd76ae52a4df47265277c2f40c7df287dc9fb91cbbc48f72a282bb6cdaee9e9f597904f94c25dbfb7b3086cef95ea63
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/felix-utils/felix-utils-1.2.0.ebuild b/dev-java/felix-utils/felix-utils-1.2.0.ebuild
deleted file mode 100644
index 67872db2be2c..000000000000
--- a/dev-java/felix-utils/felix-utils-1.2.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="Felix Utils"
-HOMEPAGE="http://felix.apache.org/"
-LICENSE="Apache-2.0"
-
-MY_PN="org.apache.felix.utils"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://apache/felix/${MY_P}-source-release.tar.gz"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND=">=virtual/jdk-1.6
-	dev-java/felix-gogo-runtime:0
-	dev-java/osgi-compendium:0
-	dev-java/osgi-core-api:0"
-
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-
-	epatch "${FILESDIR}"/${P}-java-fixes.patch
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_compile() {
-	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only osgi-core-api osgi-core-api.jar):$(java-pkg_getjar --build-only osgi-compendium osgi-compendium.jar):$(java-pkg_getjar --build-only felix-gogo-runtime felix-gogo-runtime.jar)"
-
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	mv "${S}"/target/{${MY_P},${PN}}.jar || die
-
-	java-osgi_dojar "${S}"/target/${PN}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
-}
diff --git a/dev-java/felix-utils/files/felix-utils-1.2.0-build.xml b/dev-java/felix-utils/files/felix-utils-1.2.0-build.xml
deleted file mode 100644
index cfe95ef2c6cf..000000000000
--- a/dev-java/felix-utils/files/felix-utils-1.2.0-build.xml
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 5/13/13 2:09 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="org.apache.felix.utils-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="org.apache.felix.utils-1.2.0"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.resourceDir.1" value="."/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
-    <pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="jsr14" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <mkdir dir="${maven.build.outputDir}/META-INF"/>
-    <copy todir="${maven.build.outputDir}/META-INF">
-      <fileset dir="${maven.build.resourceDir.1}">
-        <include name="changelog.txt"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="jsr14" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0"/>
-    <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar" 
-         dest="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar" 
-         dest="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0"/>
-    <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar" 
-         dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar" 
-         dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.0"/>
-    <get src="http://repository.apache.org/snapshots/junit/junit/4.0/junit-4.0.jar" 
-         dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.0/junit-4.0.jar" 
-         dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/easymock/easymock/2.4"/>
-    <get src="http://repository.apache.org/snapshots/org/easymock/easymock/2.4/easymock-2.4.jar" 
-         dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/easymock/easymock/2.4/easymock-2.4.jar" 
-         dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/mockito/mockito-all/1.7"/>
-    <get src="http://repository.apache.org/snapshots/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
-         dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
-         dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/felix-utils/files/felix-utils-1.2.0-java-fixes.patch b/dev-java/felix-utils/files/felix-utils-1.2.0-java-fixes.patch
deleted file mode 100644
index a973ca56a862..000000000000
--- a/dev-java/felix-utils/files/felix-utils-1.2.0-java-fixes.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/src/main/java/org/apache/felix/utils/filter/FilterImpl.java	2012-06-12 08:56:50.000000000 +0200
-+++ b/src/main/java/org/apache/felix/utils/filter/FilterImpl.java	2013-05-13 14:25:58.601527069 +0200
-@@ -25,6 +25,7 @@
- import java.security.AccessController;
- import java.security.PrivilegedAction;
- import java.util.*;
-+import java.util.Map.Entry;
- 
- import org.apache.felix.utils.version.VersionTable;
- import org.osgi.framework.Filter;
-@@ -111,6 +111,19 @@
-         converted = conv;
-     }
- 
-+    @Override
-+    public boolean matches(Map<String, ?> map)
-+    {
-+        Map nonGenericMap = new HashMap();
-+
-+        for(Entry<String, ?> entry : map.entrySet())
-+        {
-+            nonGenericMap.put(entry.getKey(), entry.getValue());
-+        }
-+
-+        return match0(nonGenericMap);
-+    }
-+
- 
-     /**
-      * Filter using a service's properties.
-@@ -575,13 +587,13 @@
-                 switch (operation) {
-                     case APPROX :
-                     case EQUAL : {
--                        return ((Version) value1).compareTo(converted) == 0;
-+                        return ((Version) value1).compareTo((Version) converted) == 0;
-                     }
-                     case GREATER: {
--                        return ((Version) value1).compareTo(converted) >= 0;
-+                        return ((Version) value1).compareTo((Version) converted) >= 0;
-                     }
-                     case LESS: {
--                        return ((Version) value1).compareTo(converted) <= 0;
-+                        return ((Version) value1).compareTo((Version) converted) <= 0;
-                     }
-                 }
-             } else {
diff --git a/dev-java/felix-utils/metadata.xml b/dev-java/felix-utils/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/felix-utils/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/fontbox/Manifest b/dev-java/fontbox/Manifest
index f4c1f8da48ca..ae869655a0cb 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -5,5 +5,6 @@ DIST SourceSansProBold.otf 104072 BLAKE2B 2c6538ed97cca04a6a38a1bcca7def6c9e923f
 DIST fontbox-1.7.1.zip 9167805 BLAKE2B f9e02d1540eaf7e4bb748906e56887494d81eecc88685fa9d758cb50712a530528573f4a7e5f816b4ff57d664a416b35444517d840c9b37239ec1e2b5a62b5a1 SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0
 DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
 EBUILD fontbox-1.7.1-r1.ebuild 971 BLAKE2B 5d0a36f8cca1a5793386111563cf793a57c665f903c467c8a244dcfbe6986b59072661fbee1b363d1d0aaff1dc1f921d016c0723a3237a722ae9b05227c1fc0b SHA512 44d237b4a9e505dc45ff2bd0afbd4cbe8452ffc66e7b6155dfe3ecc00dedd1467e8a5870d429ad494cd48d8437461dcedeaa5c68f2fb02f613363c5134abc2d5
+EBUILD fontbox-1.7.1-r2.ebuild 1003 BLAKE2B 3cc7534d254e21227874680898102e8ac524f0ecd5b806fa81987a2232425630ea70034316862438dc2ef2a98b6f3c6c664f9aa567415f96b8b68bf827c72a06 SHA512 199cd68e15fed122b8540e925cca177d8616d71f5df742e04889b688b8ada63712811a87987919fcfc8c18eca26fb0bf6678a423083cb390b700d60dd9fdec94
 EBUILD fontbox-2.0.24.ebuild 1762 BLAKE2B 483d3d83508a4db99f14ef171c480b4c06d262a913b967922ab223975636e8176165ae65dc38c01c97e3b1c61264d4bd53d367cb63530eeefd542eea9e4cc851 SHA512 72917eac46cbc8be4636a35dbd2b8ccebe3c9fd271895be79e20a309b8ebef3373974dd5fb6cccf5f4d3c45689274497f4d3997615ece8f2680eb0fcad504e1c
 MISC metadata.xml 571 BLAKE2B 1ffa3f19fb3e5035c5a73503ce6abbeb02de7ea42fb74e21eecb30aa3827085802644b797f197f35d9001d86ec969b0cc6cbdaa634ab0d003fa65bd03c3d09ab SHA512 e1b958bb3eff6c3428581dd3851b8857048e81df192b87ad91fc61d3074a4ebf88dfecf6310ac96a3da6ba6b96d476ef1e258781e36b8f0c5cbf3110d5608f8e
diff --git a/dev-java/fontbox/fontbox-1.7.1-r2.ebuild b/dev-java/fontbox/fontbox-1.7.1-r2.ebuild
new file mode 100644
index 000000000000..f2a8f156229d
--- /dev/null
+++ b/dev-java/fontbox/fontbox-1.7.1-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="pdfbox"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="An open source Java library for parsing font files"
+HOMEPAGE="https://pdfbox.apache.org/"
+SRC_URI="https://archive.apache.org/dist/pdfbox/${PV}/${MY_P}-src.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="1.7"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~x64-macos"
+
+RDEPEND="
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)"
+
+BDEPEND="
+	app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}/${PN}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+
+src_prepare() {
+	default
+	cp -v "${FILESDIR}/${P}-build.xml" build.xml || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/org
+}
diff --git a/dev-java/freehep-graphics2d/Manifest b/dev-java/freehep-graphics2d/Manifest
deleted file mode 100644
index 85626ea6f622..000000000000
--- a/dev-java/freehep-graphics2d/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST freehep-chartable-converter-plugin-2.2.1.tar.gz 18159 BLAKE2B 3b0c166c00fb2fa86fbb13adf8855ac21907d7397bb62997457e8528c7fd2d88657f7bdd4c820e4561e4303a36730b3826806e0cbc76506d49f27d0a4d528996 SHA512 4caac8b83b9efdee59e2a801bb001fdf7bab144bb5734bdb89ef3e1163bc9ffd05b2c8c59d611665573c432045a854fba28eb4d24260baea5286b34ae298add1
-DIST freehep-vectorgraphics-2.4.tar.gz 4118379 BLAKE2B c8a5840ebab43398a6f87f97855a38f843b0e05267f5446b5f22a0c0124c98717c00801fe93ef3b541b2c53d07176ab1319a27ad26ed177b6dded11e3fa2e7bb SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382
-EBUILD freehep-graphics2d-2.4.ebuild 2141 BLAKE2B 214249b8dc2096a95d1611faff0ed8a4cbfd7142c2eb01e104e06b1a1bc8e614e60a5ce980b326858082c1ffb50f6543d13683e040abf0a2a48499c62f498921 SHA512 aa2621a52d1203044b0872eb3b55afbde6489044e57ef460d1a1c501e9e30bb9976c12b63afccac949188eda216010e707eef140d5fa5b7c7c1e6bcde0a313e7
-MISC metadata.xml 332 BLAKE2B b068badae4c159eb9fae77c3780edd8cb8dc6462750c4dd144f21e6534d173d65b05948ab2827beb407387f44c70474437d8536c11f6c1b776642c3c6374b5f6 SHA512 2c2eb1120fcad20dc8cc98aaa56d07bbf415cbd28198d292f6fb5c038d1944ce1ae29b38ff79a7382264f7fc06eb0ad8eb55448731bdb9643ec8b99337d0df4a
diff --git a/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild b/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild
deleted file mode 100644
index 9b6f57c388c4..000000000000
--- a/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CHARTABLE_PN="freehep-chartable-converter-plugin"
-CHARTABLE_P="${CHARTABLE_PN}-2.2.1"
-
-MY_PN="freehep-vectorgraphics"
-MY_P="${MY_PN}-${PV}"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP Graphics 2D Library"
-HOMEPAGE="http://java.freehep.org/"
-SRC_URI="https://github.com/freehep/${MY_PN}/archive/${MY_P}.tar.gz
-	https://github.com/freehep/${CHARTABLE_PN}/archive/${CHARTABLE_P}.tar.gz"
-LICENSE="Apache-2.0 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="~dev-java/freehep-graphicsbase-${PV}:${SLOT}"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7
-	test? ( dev-java/junit:4 )"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}/${PN}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="freehep-graphicsbase"
-
-src_compile() {
-	# This package uses a custom Maven plugin to generate some
-	# sources. We're not using Maven but we can run it manually. We
-	# could package the plugin separately but it's not used elsewhere.
-
-	local SRC ENC CP="${WORKDIR}"/${CHARTABLE_PN}-${CHARTABLE_P}/src/main/java CLASS=org/freehep/graphics2d/font/encoding/CharTableConverter
-	ejavac "${CP}/${CLASS}.java"
-
-	for SRC in src/main/encoding/{Expert,Symbol,Zapfdingbats}.utf-16; do
-		ebegin "Converting ${SRC}"
-		java -cp "${CP}" ${CLASS} ${JAVA_SRC_DIR} org.freehep.graphics2d.font ${SRC} || die
-		eend $?
-	done
-
-	SRC=src/main/encoding/Latin.utf-16
-
-	for ENC in ISO MAC WIN PDF STD; do
-		ebegin "Converting ${SRC} (${ENC})"
-		java -cp "${CP}" ${CLASS} ${JAVA_SRC_DIR} org.freehep.graphics2d.font ${SRC} ${ENC} || die
-		eend $?
-	done
-
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	local DIR=src/test/java
-	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
-	local TESTS=$(find ${DIR} -name "Test*.java")
-	TESTS="${TESTS//src\/test\/java\/}"
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/freehep-graphicsio-tests/Manifest b/dev-java/freehep-graphicsio-tests/Manifest
deleted file mode 100644
index ec6405c11309..000000000000
--- a/dev-java/freehep-graphicsio-tests/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST freehep-vectorgraphics-2.4.tar.gz 4118379 BLAKE2B c8a5840ebab43398a6f87f97855a38f843b0e05267f5446b5f22a0c0124c98717c00801fe93ef3b541b2c53d07176ab1319a27ad26ed177b6dded11e3fa2e7bb SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382
-EBUILD freehep-graphicsio-tests-2.4.ebuild 1189 BLAKE2B c90904819a9fd86af093596f93bd95c2e5c29fd1a73ef481ae3e10c12252014677c4d251e16e032024eb23067aa5ab310f3cf0e36a2444de63fc4bed1dd652bb SHA512 5d9a5d27759c477e26f1ad4f08843393cdbd22b480e24df55151b77dbed37fd16b84831e119ab2a1f19a69e77892345667ec92168a0834a377da821017397225
-MISC metadata.xml 332 BLAKE2B b068badae4c159eb9fae77c3780edd8cb8dc6462750c4dd144f21e6534d173d65b05948ab2827beb407387f44c70474437d8536c11f6c1b776642c3c6374b5f6 SHA512 2c2eb1120fcad20dc8cc98aaa56d07bbf415cbd28198d292f6fb5c038d1944ce1ae29b38ff79a7382264f7fc06eb0ad8eb55448731bdb9643ec8b99337d0df4a
diff --git a/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.4.ebuild b/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.4.ebuild
deleted file mode 100644
index 6a523d03f9ac..000000000000
--- a/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="freehep-vectorgraphics"
-MY_P="${MY_PN}-${PV}"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP GraphicsIO Test Library"
-HOMEPAGE="http://java.freehep.org/"
-SRC_URI="https://github.com/freehep/${MY_PN}/archive/${MY_P}.tar.gz"
-LICENSE="Apache-2.0 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT}
-	~dev-java/freehep-graphicsbase-${PV}:${SLOT}
-	~dev-java/freehep-graphicsio-${PV}:${SLOT}
-	dev-java/freehep-io:0
-	dev-java/junit:4"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}/${PN}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="freehep-graphics2d,freehep-graphicsbase,freehep-graphicsio,freehep-io,junit-4"
-
-java_prepare() {
-	# Avoid additional deps for "extra" tests.
-	sed -i -r "/Test(Histogram|ScatterPlot)/d" \
-		${JAVA_SRC_DIR}/org/freehep/graphicsio/test/TestSuite.java || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
diff --git a/dev-java/freehep-graphicsio/Manifest b/dev-java/freehep-graphicsio/Manifest
deleted file mode 100644
index d11e71100e99..000000000000
--- a/dev-java/freehep-graphicsio/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST freehep-vectorgraphics-2.4.tar.gz 4118379 BLAKE2B c8a5840ebab43398a6f87f97855a38f843b0e05267f5446b5f22a0c0124c98717c00801fe93ef3b541b2c53d07176ab1319a27ad26ed177b6dded11e3fa2e7bb SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382
-EBUILD freehep-graphicsio-2.4.ebuild 1340 BLAKE2B 6858ef4757d0748dd8190f7eb4e984dd221d9895ee2dbfc0b1aac2b2c2c1b2e296c93a8b44103f7b54ea9240c0c92624d77d9b7b834d183d9f91fc45f3c19ab6 SHA512 dac3e5f955700eed2ce0207f1d83d740767cff56d21dd6a70d99f119fa832fb594e5322141ebf61f9cd98356ccf31df0f6bf103c8951a1907ed043a0d333f153
-MISC metadata.xml 332 BLAKE2B b068badae4c159eb9fae77c3780edd8cb8dc6462750c4dd144f21e6534d173d65b05948ab2827beb407387f44c70474437d8536c11f6c1b776642c3c6374b5f6 SHA512 2c2eb1120fcad20dc8cc98aaa56d07bbf415cbd28198d292f6fb5c038d1944ce1ae29b38ff79a7382264f7fc06eb0ad8eb55448731bdb9643ec8b99337d0df4a
diff --git a/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild b/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild
deleted file mode 100644
index 9e6123138882..000000000000
--- a/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="freehep-vectorgraphics"
-MY_P="${MY_PN}-${PV}"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP GraphicsIO Base Library"
-HOMEPAGE="http://java.freehep.org/"
-SRC_URI="https://github.com/freehep/${MY_PN}/archive/${MY_P}.tar.gz"
-LICENSE="Apache-2.0 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT}
-	~dev-java/freehep-graphicsbase-${PV}:${SLOT}
-	dev-java/freehep-io:0"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7
-	test? ( dev-java/junit:4 )"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}/${PN}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="freehep-graphics2d,freehep-graphicsbase,freehep-io"
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_test() {
-	local DIR=src/test/java
-	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
-	local TESTS=$(find ${DIR} -name "*Test.java")
-	TESTS="${TESTS//src\/test\/java\/}"
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/freehep-graphicsio/metadata.xml b/dev-java/freehep-graphicsio/metadata.xml
deleted file mode 100644
index 496b6e6faccc..000000000000
--- a/dev-java/freehep-graphicsio/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">freehep/freehep-vectorgraphics</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/glassfish-persistence/Manifest b/dev-java/glassfish-persistence/Manifest
index d748f861feb3..0a3f72426e5c 100644
--- a/dev-java/glassfish-persistence/Manifest
+++ b/dev-java/glassfish-persistence/Manifest
@@ -1,4 +1,4 @@
 AUX glassfish-persistence-1.0-python2.7-sax-parser.patch 286 BLAKE2B 49667ba4e41eadfea73fc8b53cf61f5fafd4654292ecd1b2e2b653411d252b1ff8bc40e6c9e0cd8fdd1375ba86a358495415a68ff1466f857d96cfd90ce5605a SHA512 ba7c32d86991407d45a86d640d95007cc47dcd28c74f441e38840206093653dc31e4824d4986cd9cd60d44fba0c1f4365f9348a9362529531fa9410e9fd5cad1
 DIST glassfish-9_0-b48-src.zip 35162972 BLAKE2B ff96f2135c6bbdc60eadab6a6bd60b623ac1a3635e4465591ee75f6c1229e83f9f6424b46e42eb333eb6edd3ba1aba51897ab80ca5bd5c754e516a27a03381d9 SHA512 512ccd1c89a1bbd88ca1e45b1e60693bd3c4a6c6ffa19376febb786eb73556f27bc0ce4f0e760d6d80b0711206f6701e7c7da70ef3a5e0084ad0482246506a48
-EBUILD glassfish-persistence-1.0-r2.ebuild 834 BLAKE2B 033850b92e9bbe0d2bba4352fa6fbb36076b92129f9eb3ae1b425d96dc21362587a0730782032f170fe2778ff6ec3e369c6d48d943aa6867729bd52ec8fdd098 SHA512 fe6c03a0d33f9fc0f7edce144dddb058b2319425d62f3f9cfa5004016264552cc09286d161ab71991bbc83e3f5de0a5e38c50a51c3d11048af3c4e798592970b
+EBUILD glassfish-persistence-1.0-r2.ebuild 833 BLAKE2B ca274775fecc50ec5d13e7f3212e5e69cef48ef06144514502a4f902d92980ed24a0a5d1fa93164a7f82fbf6d7713d07c809ad9003129cf47d769232516f657d SHA512 f8344595a246db5c3fc74b357bb578d5a4940da4a5e9a146272c4337e33f5e94d1d0611e7a9b56d6c43df5428d64f9ead6289b7016714ac462a255a7ca324114
 MISC metadata.xml 215 BLAKE2B 869610e21e1baac019fc79b7072721c201f4e3f0c6a65712d93e69131505f6ee0aab3ed48890073238645280b22edf2078b56dd4ba7edb593952f9ee2b2ff1e0 SHA512 aa3da8e5bf0b257d555c610b3dee82560e6fce192024e99eb63932511f25aceb24e3541f01c495771f3f54c299286c35672c8658cd5e577d6ae5927486a125a2
diff --git a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild
index ec68669476a5..9bfaadee8841 100644
--- a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild
+++ b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 BDEPEND="app-arch/unzip"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/glassfish-servlet-api/Manifest b/dev-java/glassfish-servlet-api/Manifest
deleted file mode 100644
index fe264c174ff7..000000000000
--- a/dev-java/glassfish-servlet-api/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST javax.servlet-3.1.1-sources.jar 211576 BLAKE2B 5f416fe8f37e1d7b2c6fb43084b21217383157772030e7ec20df0d0326c8d50f881048057a5defd089c1ec199716bf290fb8f78099239b2df145a2dfff60b04e SHA512 7f152a389481e0381f041d97a6774a3e762a86b2a8a5413901c472fc2882b9cabd141dd85b46b8a7006cbe677c29c4caee09f3fc934afae857a6c1362efdc7bc
-EBUILD glassfish-servlet-api-3.1.1.ebuild 608 BLAKE2B 97d0fe7e2d7e3f8ac14b8622c25e378466b1e1d446d6df13e61303ea72c1b36b423738e7ac61fbac542a89c369486c4d5b4ffdc8c211f325179f26c668f677d7 SHA512 68b2bc37b97ee02a51967976f06f72a32b70f6ddce3cc16500287f4721ca48d24dc7be21007edac3afe0ae040865560e26f408bbaead24dccb94a0b9b1285d1e
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild b/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild
deleted file mode 100644
index 6c68b0fc5c67..000000000000
--- a/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="javax.servlet"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Glassfish reference implementation of Servlet API 2.5 and JSP API 2.1"
-HOMEPAGE="https://glassfish.dev.java.net/javaee5/webtier/webtierhome.html"
-SRC_URI="http://central.maven.org/maven2/org/glassfish/javax.servlet/${PV}/${MY_P}-sources.jar"
-LICENSE="CDDL"
-SLOT="3.1.1"
-KEYWORDS="amd64 ~ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/glassfish-transaction-api/Manifest b/dev-java/glassfish-transaction-api/Manifest
deleted file mode 100644
index 29217cd5453b..000000000000
--- a/dev-java/glassfish-transaction-api/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST glassfish-v2ur2-b04-src.zip 39817113 BLAKE2B 4aeb0df44f838c91fa8dd52e2a4985e86457f75cec3cd5d527de54f672afcd2824cefaad9d9e67c5ce096515e389bb2fc0874d76ce2ec86a956233f2c3508439 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8
-EBUILD glassfish-transaction-api-1.1.2.2.04-r1.ebuild 889 BLAKE2B f9b056253d4603ecf69ed0bbea21e975e65d7ba5ede613050c32a60a0621b4f6b483a5558d89fb875152e8868f2147749f8c82c54508807e313dc3da10d9058e SHA512 2337115e6caefa96faeda8430f037e95826ef0a18fe3bc843122ee0c49d958c4197aeb1edff2c183c954533d1d98f8032a68dbb908e28b651b8ed3a06c9fb4ce
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild b/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild
deleted file mode 100644
index b8002d2c97ba..000000000000
--- a/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild
+++ /dev/null
@@ -1,40 +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 versionator java-pkg-2 java-pkg-simple
-
-MAJOR=v$(get_version_component_range 3-4)
-MAJOR=$(replace_version_separator 1 ur ${MAJOR})
-MY_PV=${MAJOR}-b$(get_version_component_range 5)
-MY_PN=${PN/-//}
-ZIP="glassfish-${MY_PV}-src.zip"
-
-DESCRIPTION="Java Transaction API"
-HOMEPAGE="https://glassfish.dev.java.net/"
-
-SRC_URI="http://download.java.net/javaee5/${MAJOR}/promoted/source/${ZIP}"
-
-LICENSE="|| ( CDDL GPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_unpack() {
-	default
-	unzip \
-		-q -o -f \
-		"${DISTDIR}/${ZIP}" \
-		"${MY_PN}/*" "glassfish/bootstrap/*" || die "unpacking failed"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/glassfish-xmlrpc-api/Manifest b/dev-java/glassfish-xmlrpc-api/Manifest
index 0dba03601b86..c6393024fa46 100644
--- a/dev-java/glassfish-xmlrpc-api/Manifest
+++ b/dev-java/glassfish-xmlrpc-api/Manifest
@@ -1,4 +1,3 @@
 DIST glassfish-xmlrpc-api-1.1.1.tar.xz 35180 BLAKE2B 6121f16400b0aab16c7926636ebcefbd9e363bc5c1d76fde575da468179e32a54722d9ac6d14582a8947c3f990dda50f209c8e09223ea684e0477984fbdcf597 SHA512 7de8d5959c0f9f09cca6a169d4e4293fca378aa497389e9a9a0af953b698322b9bbae6288b8cba2cd34abf58a0d0f4272294dcdf201a84ba5cc14d426843daa8
-EBUILD glassfish-xmlrpc-api-1.1.1-r1.ebuild 835 BLAKE2B f9c321b935777dc351966bb596c330f6d12cfbfc0360050ef85f7f7a505fe1b67f4523fdbaefb279f115373e6925c856cffd8fc1a0ce8e15bafa6fc0e2dfcc03 SHA512 89c7b38bccf58fc1525397c355fea0e1787e9d3c09c53fae0f8b571f247d9d88865543eb2a511884fc5d9105274d41c609d0431b08a946251bb392e497260a3a
-EBUILD glassfish-xmlrpc-api-1.1.1.ebuild 802 BLAKE2B 4ffe7e89ee09908477759d19e0b9510f378c9d901f502d17d286ae2d27ba28d77416a5e28cb0944dedf86e91f5b791a36dfea04789c4ff734c1a9614dc11ec9b SHA512 f60e1c459c13a4f9e5978d9915d0b966fb0b614ae65005fdc6b099604c87f8792010f6850440b3a2e483ed5c551cf052eab6addbd915a3f2e96b0e478dc42f4f
+EBUILD glassfish-xmlrpc-api-1.1.1-r1.ebuild 833 BLAKE2B c59a31039d321a89ae80e9ded2c9df58b070b8ba9e84cc03007f28ed26ee7f84e3f94173128f018141da1b49e843717aa9e77d2da784ea4d84c3f5490ca02c5e SHA512 dea7a5fe352c0386d52186eb216ed580a4cb12fb2fc8da3a1affc53df2ed7d75733fcd3249dd536fb6864723a031881b2385a12237f7d3875e62ee59d3725116
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1-r1.ebuild b/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1-r1.ebuild
index 71dc46ecd5a2..e7e9196b2364 100644
--- a/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1-r1.ebuild
+++ b/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CP_DEPEND="
 	dev-java/jakarta-xml-soap-api:1
diff --git a/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild b/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild
deleted file mode 100644
index 555477389da7..000000000000
--- a/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-TOMEE_PV="1.5.2"
-
-DESCRIPTION="Project GlassFish XML RPC API"
-HOMEPAGE="https://glassfish.java.net/"
-SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="java-virtuals/servlet-api:3.0"
-
-DEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.7
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="servlet-api-3.0"
-JAVA_PKG_BSFIX_NAME="maven-build.xml"
-
-src_install() {
-	java-pkg_newjar target/javax.xml.rpc-api-${PV}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/javax
-}
diff --git a/dev-java/glazedlists/Manifest b/dev-java/glazedlists/Manifest
index 55648e0d9e72..89011f85660e 100644
--- a/dev-java/glazedlists/Manifest
+++ b/dev-java/glazedlists/Manifest
@@ -1,3 +1,3 @@
 DIST glazedlists-1.8.0.zip 1169436 BLAKE2B 3784881079165832a321616e51a344a1c9a7378b8f903e883367739b559b5e3b9e7871d3bee4c6979eb7ce5ded9606fb45bf25310b7314f8dbbb500a8bf9ff93 SHA512 3fc3f339a248a8aad897409d752464d60b504474ae1e4d99fa7fbb41d767928137711d5d9979154b53d677e42746e2df2dfefdc71fa4a8017ec70ab23dc4b6a5
-EBUILD glazedlists-1.8.0-r1.ebuild 562 BLAKE2B 1149a1b88af2d560608c27ae7056cb045422645121b7ac8b42430232d8660bf9bd36fa0fc2abfe8dfc700942ebf798073bc53b951b82b1dc5e79ee39fa7019d2 SHA512 1f213795706916bc791025ad93cf1a00265288c97909bffc728883d13b0e897f0e983bd43b099454f68a1ead8e39fab82b0b486d83b8126906c5fbd412acd16a
+EBUILD glazedlists-1.8.0-r2.ebuild 563 BLAKE2B fc0a5b10d98f364476bdfd52cbd9b7dd98a5218ab8287ff569d05b6dbf4e7ae492678eb54d68dbd78724303f5a7e5a8ddb94c6c1d6c61786d05cd243b4d1c41d SHA512 40ec986e403883279236e31e3aa680585e1f4a561fdac61fcf4c9438ad556881f5f2b420c0694e53f9747e74be4b8e63dc52e94e7e9dc19f6a7d886ce10b8a62
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/glazedlists/glazedlists-1.8.0-r1.ebuild b/dev-java/glazedlists/glazedlists-1.8.0-r2.ebuild
index d2517cd89f51..57554793d894 100644
--- a/dev-java/glazedlists/glazedlists-1.8.0-r1.ebuild
+++ b/dev-java/glazedlists/glazedlists-1.8.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
@@ -16,11 +16,13 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8:*"
 
 DEPEND="
-	>=virtual/jdk-1.6
-	source? ( app-arch/zip )"
+	>=virtual/jdk-1.8:*"
+
+BDEPEND="
+	app-arch/unzip"
 
 JAVA_SRC_DIR="source"
 
diff --git a/dev-java/gnu-regexp/Manifest b/dev-java/gnu-regexp/Manifest
index 4f7823621fb9..102f8751d92a 100644
--- a/dev-java/gnu-regexp/Manifest
+++ b/dev-java/gnu-regexp/Manifest
@@ -1,3 +1,3 @@
 DIST gnu-regexp-1.1.4.tar.gz 164741 BLAKE2B b6183e8b12d283616d55112e0cbc8ca9de069c75b793066066606d2e824c4cd182de1e65c6529bc323a58717a7a72d4a97dc303d5a4572dfc53613c2a06adcad SHA512 4397ecd2a485f67213ee74e1c942a1bfd1af5f261f964546cb3c7bc32fe88702a557d717f07d2a4d7d1db2d684ddc4191c120b35b44d1a68a126f7b81d8b0331
-EBUILD gnu-regexp-1.1.4-r3.ebuild 851 BLAKE2B bb37fac5256b1be346feec991f3214c41162dcbc38e19a6ed49455bd3c8eb9e57573d08d26e4ae1ae8f599afec736b63cec51418717839edf4e588bba2368e69 SHA512 d261dcbea41fc374088b78410923d62c65a462168cca1c26b7a85b361cfcb247c51e6d3d38585911e319322e8ce8926a12bbe7b829dd3746f7496bdc7352c1ed
+EBUILD gnu-regexp-1.1.4-r4.ebuild 811 BLAKE2B 383a00d5d4d30e1b86f0522b7bac9d773743a4696a31a24f54c62e6c3df26e9ce3e216842defeba72a620ca9e00c0fa41ee5ebf263e241ff4a1965727dad96f1 SHA512 17f6a6e502b46262d3bdeebd193fea8bebf12d182951ae535871eb88f830191bb66ac6f2d7ddb6f4930d8ee2cafb6fa4951f6cdae18d27ac60bb0bc046228e32
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r4.ebuild
index a5e84dd6cc24..c10584cf3013 100644
--- a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild
+++ b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
@@ -16,17 +16,16 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="1"
 KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
 
 CDEPEND="dev-java/java-getopt:1"
 
 RDEPEND="
 	${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8:*"
 
 DEPEND="
 	${CDEPEND}
-	>=virtual/jdk-1.6
+	>=virtual/jdk-1.8:*
 	source? ( app-arch/zip )"
 
 S="${WORKDIR}/${MY_P}"
@@ -35,10 +34,6 @@ JAVA_SRC_DIR="src"
 
 JAVA_GENTOO_CLASSPATH="java-getopt-1"
 
-java_prepare() {
-	java-pkg_clean
-}
-
 src_compile() {
 	java-pkg-simple_src_compile
 	java-pkg_addres "${PN}.jar" src -name "*.properties"
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index c4c79dadaf82..264189e024b1 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -2,8 +2,12 @@ DIST gradle-bin-6.8.3.zip 150631445 BLAKE2B 935a6631167481e289ac5a468b822ffeec20
 DIST gradle-bin-7.1.1.zip 154838841 BLAKE2B 0a0ad08101f0c5fa7c0cb2a4c9ad6e53320cc6214fe1a139f390b73d9aa656ebfaf90c21816d57964f37e9cad51faed21f82f55b7e24fcf0f5a3ffd861c990ad SHA512 95cc2de9b7c3d6019d7780b17238ff8f0db14c9a1e494b391c84d75619eb3064322bb2c56fa9127b0a5681c94b32283090a15b06fefeccdb95a1f8fb9e58c75c
 DIST gradle-bin-7.2.zip 157058280 BLAKE2B 918213df58ac2afbd075c74588f60676cd7dc99030834828138c621348ac1abd368e0b54c2f6937cbfc9533e55e310b46cf841c92dcb1039b898c6f456032d38 SHA512 6ccc79f08afdc20b3d5abf876c3cabb69114d1ab4285cdb77158cd8c5e09207589edefb6c79f2bcffe4629a38c6b9e2f473de42dab29a24310965bc5816b907d
 DIST gradle-bin-7.3.3.zip 158875257 BLAKE2B 94f86e06da3eae4a9522d35a28577d033d64ce1bc2f36d0f5c1992e9b92ec311d25bd98bbeaf4b8a9869f22d93e14c88952e12166e436a0a6c206541d1f967aa SHA512 03f2bdd77202788cd43bb3e3a6390340f4d083d69ade5a53e0163204fb85307f5bbbbf4e04077c6ae558bc36ab3c478674f941079bc14a8344f55631fbba1490
+DIST gradle-bin-7.4.1.zip 159312495 BLAKE2B 591ab6af118d8fac7d0ead1a040ed4e69b8f84d18807fc4fb88778a58917a31d2111f2c140f7d723523a2411b6e57e7682ba94bd9043c948bafb1de7c2c066ff SHA512 bd2bc3570537e0878186a81eecee2c8578b2f7ea76a23b1f49de9cd0e70529a591f42c2d1433f29eddfab87f25d986a6c48b52e66396653153f20785f39aa977
+DIST gradle-bin-7.4.zip 159248291 BLAKE2B db9dde35d0c285afb8b30d08ee1a509660d7bf169530d734b1bffd0dbf22fec0360b12a78588e5f8b6180669678868f86e73950bf9bfd110ac1f24a73b3d2549 SHA512 9742efccd6539325f6cb3929f794afaf8f55763b9a09cccea8d6a84c55b8e0bf350ddf10d59e9a5271b9320719ade57e2e4c0b9bac5faf0afcb0304c75728cc9
 EBUILD gradle-bin-6.8.3.ebuild 1107 BLAKE2B 349fbd166d7051019a6861ff9b4cf3551b4da9931beb867b55ccdf74094a477bd2e4607763de59d037b7e48d33ae6ffe033853cfc6baf54f1c3ffb878dacd1a2 SHA512 29a5b48b85ea22e5446e210d2ca05e4bdef13f89607b7fb19e8463f478554b08edb68b0ccbe6002b5c1600a25a01507c3297aad9ac608c6cc9880473f8d61a93
 EBUILD gradle-bin-7.1.1.ebuild 1107 BLAKE2B 349fbd166d7051019a6861ff9b4cf3551b4da9931beb867b55ccdf74094a477bd2e4607763de59d037b7e48d33ae6ffe033853cfc6baf54f1c3ffb878dacd1a2 SHA512 29a5b48b85ea22e5446e210d2ca05e4bdef13f89607b7fb19e8463f478554b08edb68b0ccbe6002b5c1600a25a01507c3297aad9ac608c6cc9880473f8d61a93
-EBUILD gradle-bin-7.2.ebuild 1109 BLAKE2B 670747ab94b68c37bcee23bd71de58ebdb599794b25227bf56c37a55f3a72ba5f41e0df7afd88c119a26cef7c0953846c6ad797b89d1b60e980c962b2a144bb5 SHA512 e4dba16bfab419d884478c41e8ba6d005d099fa536d436df884c4237d404c9ced6038cffc38fa0727a2e72090627e81af96cbf685bb7029425eca8d13838a56b
-EBUILD gradle-bin-7.3.3.ebuild 1109 BLAKE2B 670747ab94b68c37bcee23bd71de58ebdb599794b25227bf56c37a55f3a72ba5f41e0df7afd88c119a26cef7c0953846c6ad797b89d1b60e980c962b2a144bb5 SHA512 e4dba16bfab419d884478c41e8ba6d005d099fa536d436df884c4237d404c9ced6038cffc38fa0727a2e72090627e81af96cbf685bb7029425eca8d13838a56b
+EBUILD gradle-bin-7.2.ebuild 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb67d911d143ee6711150c3e7d69c9c55f7ab0bf44b554935539ee20d0c945a4f10c914a2bcb471d2c3be4d249346 SHA512 3cfcbdf0bea512bb3e82053ad824953b5d95d7954796ea6f1846d46d8812e7b482608f1c8e60d30982127e05ad5fd29ae660965afd9176c872618dade74c821e
+EBUILD gradle-bin-7.3.3.ebuild 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb67d911d143ee6711150c3e7d69c9c55f7ab0bf44b554935539ee20d0c945a4f10c914a2bcb471d2c3be4d249346 SHA512 3cfcbdf0bea512bb3e82053ad824953b5d95d7954796ea6f1846d46d8812e7b482608f1c8e60d30982127e05ad5fd29ae660965afd9176c872618dade74c821e
+EBUILD gradle-bin-7.4.1.ebuild 1109 BLAKE2B 219b535d3339d37bf485fe2c96715433912e0c3bc75cc9f0aaaee9f86f01b7cfe557d4ff65a9ad72c40a048eff551a8ac4f455cad993d51bfcd49e953379270e SHA512 6c42e222620593e1a5d906334ac36efce86b3a82d667048833e74eae62207544f3ce9b9fd59b81078426d03b934ee8e2c94e463f77a184b9b4a08e271a96dabf
+EBUILD gradle-bin-7.4.ebuild 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb67d911d143ee6711150c3e7d69c9c55f7ab0bf44b554935539ee20d0c945a4f10c914a2bcb471d2c3be4d249346 SHA512 3cfcbdf0bea512bb3e82053ad824953b5d95d7954796ea6f1846d46d8812e7b482608f1c8e60d30982127e05ad5fd29ae660965afd9176c872618dade74c821e
 MISC metadata.xml 356 BLAKE2B fa5433b47d358144596ec5c02ea3d766d13561cbf383a2dcb492ca66f9ebae593e12534630edf229ee6e136f336a0ff091dedeb67e155cb43bd219284fd1f4d3 SHA512 d8e58592957b0707bb016273f8209e3ba975a907a691b60d610e8ef4204a62ed89e4475b8b198659afb9f9b654b71c0f52eb3ce7a00e46fa17831da69dc24470
diff --git a/dev-java/gradle-bin/gradle-bin-7.2.ebuild b/dev-java/gradle-bin/gradle-bin-7.2.ebuild
index dfbd1549205b..fe6f492c7e4e 100644
--- a/dev-java/gradle-bin/gradle-bin-7.2.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-7.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
 
 EAPI=7
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.gradle.org/"
 
 LICENSE="Apache-2.0"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="app-eselect/eselect-gradle"
 BDEPEND="app-arch/unzip"
diff --git a/dev-java/gradle-bin/gradle-bin-7.3.3.ebuild b/dev-java/gradle-bin/gradle-bin-7.3.3.ebuild
index dfbd1549205b..fe6f492c7e4e 100644
--- a/dev-java/gradle-bin/gradle-bin-7.3.3.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-7.3.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
 
 EAPI=7
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.gradle.org/"
 
 LICENSE="Apache-2.0"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="app-eselect/eselect-gradle"
 BDEPEND="app-arch/unzip"
diff --git a/dev-java/gradle-bin/gradle-bin-7.4.1.ebuild b/dev-java/gradle-bin/gradle-bin-7.4.1.ebuild
new file mode 100644
index 000000000000..bec8bc49d5c4
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-7.4.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+IUSE="doc"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
+HOMEPAGE="https://www.gradle.org/"
+
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-eselect/eselect-gradle"
+BDEPEND="app-arch/unzip"
+RDEPEND="
+	${DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local gradle_dir="/usr/share/${PN}-${SLOT}"
+
+	if use source; then
+		java-pkg_dosrc src
+	fi
+
+	docinto html
+	dodoc -r docs/release-notes.html
+	if use doc; then
+		dodoc -r docs/{dsl,userguide}
+		java-pkg_dojavadoc docs/javadoc
+	fi
+
+	insinto "${gradle_dir}"
+	doins -r bin/ lib/
+	fperms 755 "${gradle_dir}/bin/gradle"
+	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
+}
+
+pkg_postinst() {
+	eselect gradle update ifunset
+}
+
+pkg_postrm() {
+	eselect gradle update ifunset
+}
diff --git a/dev-java/gradle-bin/gradle-bin-7.4.ebuild b/dev-java/gradle-bin/gradle-bin-7.4.ebuild
new file mode 100644
index 000000000000..fe6f492c7e4e
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-7.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+IUSE="doc"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
+HOMEPAGE="https://www.gradle.org/"
+
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="amd64 x86"
+
+DEPEND="app-eselect/eselect-gradle"
+BDEPEND="app-arch/unzip"
+RDEPEND="
+	${DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local gradle_dir="/usr/share/${PN}-${SLOT}"
+
+	if use source; then
+		java-pkg_dosrc src
+	fi
+
+	docinto html
+	dodoc -r docs/release-notes.html
+	if use doc; then
+		dodoc -r docs/{dsl,userguide}
+		java-pkg_dojavadoc docs/javadoc
+	fi
+
+	insinto "${gradle_dir}"
+	doins -r bin/ lib/
+	fperms 755 "${gradle_dir}/bin/gradle"
+	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
+}
+
+pkg_postinst() {
+	eselect gradle update ifunset
+}
+
+pkg_postrm() {
+	eselect gradle update ifunset
+}
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
index b3b6d0dc56b0..a09d04b172c1 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -2,5 +2,5 @@ DIST guava-20.0.tar.gz 2522092 BLAKE2B 2ca76a71d0c169b80bfaa3e9847b2e465c57aabc0
 DIST guava-30.1.1.tar.gz 5404546 BLAKE2B 818ef4b17c4f0c8e92c327f046434a3bb428ac35d6e95edd6d6be558c755d138a8ac7f8ad2032073cad131890d8f838e896fff84ba217f8305be8bd65c619a48 SHA512 23b30d886a3200b8f998897ca7bc424b2d223a4fecb03ab644e08a989a85f008e30ef093055e6305c4148a1eb8919c407e35d19f492c5b189830bd115e9484f2
 EBUILD guava-20.0-r1.ebuild 848 BLAKE2B 9eabed972891b3e2284c3133181fab6188ddfd0ab3988cf6ee5391d028bb8e762d5e6faf947f734e5f732f1a9f424daba4d0f2cf72344e936d93eccdea5df95e SHA512 c4be9028b341fbf960f160e94839af2b2d2672bbfd191336d7d8aa8fb4462086eba3e4f4fc6415451b590200853bd1d31f09d44b02635dacd4e73c5886ec6d75
 EBUILD guava-20.0.ebuild 845 BLAKE2B 0df28f19f6916d03bb9624755c88bb8c5d3a6706e8aedab3dfb49c2a7d0d449040875aa5a554388ca716f6d221f78eb4d5d329b89c4bedfa1fa05d81d7eb6744 SHA512 31cc84e2b174b988b2b5449cdeb629360e7e17d6cdfae350f7929c9756dcc7cb3fd387cbd9ad069971f09afc833608b001bca9421986efa526715e9bc4537156
-EBUILD guava-30.1.1.ebuild 1819 BLAKE2B cc291cec8e7b233fc0cd30ac433249910ea885ff4aa1c957cad2933ef56e3df9d74ee1c9ff5db91305e35585521266bfe4da822b2f0307bcefbb35cf3b0760d4 SHA512 aca5a2e9eb40b7bfcd6ea9bc893935d6aefbf11c111664a957dc9c82fdd83690ad6ac39efb6b8bdbd91cf79486e3f8a8e0f3b75276f4d74fdf1d2acecb9eb647
+EBUILD guava-30.1.1.ebuild 1820 BLAKE2B 120c69dac6a1b6e2452f15173645d4b1b43b04411bf5979a67e17cf241e53dd98e27b88151f6ada7f4bea5018d66c57603d99338d2ac6d07ba799d8b925ebf87 SHA512 4c4760e49e08fc5dd474e1ca9763b1d8a63f094d0bbc47a1c0356f9bbb7a20d75f1fb75d945b3d3a970da1434dc7c88440adf28b78f2c94f567295140bea4704
 MISC metadata.xml 589 BLAKE2B 36b17e71aeb533194b87a9101d730b3f233c23b175b65216bdeecfcbf1bc7ac0936b7b284cdb40a30573d630d34a9bf7c2ca966b26bef4a3e7c5d6e90a1075a5 SHA512 0b8556db4fe43dc25f7604dd98ebb01fb4318c8a861ca25a5d7db76fef4b076c2eb2a67b801807233ad950cfb0d70b438af3f9e84f408060a168d9897158c6eb
diff --git a/dev-java/guava/guava-30.1.1.ebuild b/dev-java/guava/guava-30.1.1.ebuild
index 339f4b0e446b..8b858ee7d259 100644
--- a/dev-java/guava/guava-30.1.1.ebuild
+++ b/dev-java/guava/guava-30.1.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/google/guava"
 SRC_URI="https://codeload.github.com/google/guava/tar.gz/v${PV} -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/httpcomponents-client/Manifest b/dev-java/httpcomponents-client/Manifest
new file mode 100644
index 000000000000..e34fc2d26c47
--- /dev/null
+++ b/dev-java/httpcomponents-client/Manifest
@@ -0,0 +1,3 @@
+DIST httpcomponents-client-4.5.13-src.tar.gz 824131 BLAKE2B 1507c81749a92afcf8b170b606761236d71b02d8b8b257d753a0f09abbdc297057df39661e827dee52804a2138de7d201b2a837418cbec21085fd3ffd558b51c SHA512 421e413fb2206fa95b6428ff067cdf2b440d2d3d4503cc3ca9bcf70ccd8ed1b8273ec4fe0703e6a8cd7612940b7ed966d9f163dbfeb8bf699ae2a8b2e0866d05
+EBUILD httpcomponents-client-4.5.13-r1.ebuild 2237 BLAKE2B 219a200df3588666a745ed83474edde7e2e253503ab2d6fc496ca0fef96621c19d4bf7060a63f24b6bd99cda9b56041fb8d7fc3c2d7fcd202bc44d9582494e72 SHA512 c9300c81ecaf4af3239e8e8d46dd09fa69520da01ccb353b51ae15ce5178364233292dc35f3f4ee8bba66fb53dcceb4cf7b0390414b62ff613b1bc27e3653748
+MISC metadata.xml 310 BLAKE2B b068de1d99141665479706b2ee3af6195a1eb34cb7a063d2dd51434b4a5c6bbff26a06c94436fd352fd079cfa9ac6a9364cbf379991e803d771c04bdb9e12294 SHA512 26ec17ca1d7ccc803139a9f17dc51ef9cdf8e0bc697f0442c1718dd1807460add3d0560cd8f10ba2234f8e32990b922428b5903c0acfcd7d5e815dc9ba11280d
diff --git a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild
new file mode 100644
index 000000000000..651201475e47
--- /dev/null
+++ b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom httpcomponents-client-4.5.13/httpclient/pom.xml --download-uri https://github.com/apache/httpcomponents-client/archive/refs/tags/rel/v4.5.13.tar.gz --slot 4 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-httpclient-4.5.13.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.httpcomponents:httpclient:4.5.13"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache HttpComponents Client"
+HOMEPAGE="https://hc.apache.org/httpcomponents-client"
+SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: httpcomponents-client-${PV}/httpclient/pom.xml
+# commons-codec:commons-codec:1.11 -> >=dev-java/commons-codec-1.15:0
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+# org.apache.httpcomponents:httpcore:4.4.13 -> >=dev-java/httpcore-4.4.14:0
+
+CDEPEND="
+	dev-java/commons-codec:0
+	dev-java/commons-logging:0
+	dev-java/httpcore:0
+"
+
+# Compile dependencies
+# POM: httpcomponents-client-${PV}/httpclient/pom.xml
+# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
+# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/hamcrest-core:1.3
+		dev-java/mockito:0
+	)"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt )
+
+S="${WORKDIR}/httpcomponents-client-${PV}/httpclient"
+
+JAVA_GENTOO_CLASSPATH="commons-codec,commons-logging,httpcore"
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"src/main/java-deprecated"
+)
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,hamcrest-core-1.3"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# Tests run: 929,  Failures: 1
+	# javax.net.ssl.SSLHandshakeException: Remote host terminated the handshake
+	"org.apache.http.conn.ssl.TestSSLSocketFactory"
+)
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/trove/metadata.xml b/dev-java/httpcomponents-client/metadata.xml
index 83ddc126139e..6e6add67bb12 100644
--- a/dev-java/trove/metadata.xml
+++ b/dev-java/httpcomponents-client/metadata.xml
@@ -3,9 +3,8 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
-		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">trove4j</remote-id>
+		<remote-id type="github">apache/httpcomponents-client</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/icedtea-sound/Manifest b/dev-java/icedtea-sound/Manifest
index 5dcf589524aa..2192893e27c4 100644
--- a/dev-java/icedtea-sound/Manifest
+++ b/dev-java/icedtea-sound/Manifest
@@ -1,3 +1,4 @@
 DIST icedtea-sound-1.0.1.tar.xz 1515308 BLAKE2B 4d9939e1bc0e0b331b032c3a54244960d61354d6b85b83cbbce1aeb96f2748906d5bd0936b36e2aacac526bd7927dbc0686a47a0dd0f41568ca86e3805b943ea SHA512 505d02f5ce885d4c7638cde8042a686aa3651de9072d325db6fefb8c5bd3d7de73253b27162555396e827a65f50aeed8326e99099757d5efe18d14ccebc1c07a
+EBUILD icedtea-sound-1.0.1-r1.ebuild 848 BLAKE2B d3227c3644b321b00334650f2d5bc356c2fd595b73d5a150ce0bdf95789a53b1b9d83122d238d4cad1a5274ec74937caef917e72952ec1b925814e055aec924b SHA512 3009a3f4ff6912b653affcefa77db641ae0c9e77051482a7c276447370ad5a7cde89c64d969e185e3f224c311c100e16754f8050d5945a6e19dfe3dd4508a023
 EBUILD icedtea-sound-1.0.1.ebuild 882 BLAKE2B f99da70389da19d3bb85e7562e818ceb900524e90b3ad250285834c2a7c3c0146c8e80b9436538166fc51cdeaf76e352d356ace0943dcb37503cb57d07f78409 SHA512 8f88bbd9d26a34067d4fce8c7fed64c4c3c84b7d6470cd4fc7a178b7bade00da3debcb62ba4157aaa8cc561b00e136a8d6eafaea7898c1c453c1850d1adac7b6
 MISC metadata.xml 383 BLAKE2B a8ad98d91ffcf88637ec7ca5e0634a0ddb1d03f0af1f6f1fce5fed2a166dc57b264284afa71cf473a121ab4cbb1ff75c36f730cdc4c1af7760e94aeae7f488a5 SHA512 ad4a47c9c3fbd92438837e90d25e5de2a7bb94669ddcf22e6787b9ee7d59925a6da3c3483d712a6cabd6555f48613717cd9da491f8ee7b0e09f76ba6e5a4e379
diff --git a/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild b/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..23bc227e0ef0
--- /dev/null
+++ b/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild
@@ -0,0 +1,42 @@
+# 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)
+
+EAPI=8
+
+inherit java-pkg-2
+
+DESCRIPTION="Plugins for javax.sound"
+HOMEPAGE="https://icedtea.classpath.org"
+SRC_URI="https://icedtea.classpath.org/download/source/${P}.tar.xz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="+doc"
+
+COMMON_DEP="
+	virtual/jdk:1.8
+	>=media-sound/pulseaudio-0.9.11"
+RDEPEND="${COMMON_DEP}"
+DEPEND="${COMMON_DEP}"
+BDEPEND="app-arch/zip"
+
+pkg_setup() {
+	JAVA_PKG_WANT_SOURCE="1.8"
+	JAVA_PKG_WANT_TARGET="1.8"
+
+	java-pkg-2_pkg_setup
+}
+
+src_configure() {
+	econf --with-jdk-home="${JAVA_HOME}" \
+		$(use_enable doc docs) \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+}
+
+src_compile() {
+	default
+}
diff --git a/dev-java/jackrabbit-webdav/Manifest b/dev-java/jackrabbit-webdav/Manifest
index 42d64f03a3d5..e59491573c70 100644
--- a/dev-java/jackrabbit-webdav/Manifest
+++ b/dev-java/jackrabbit-webdav/Manifest
@@ -1,9 +1,6 @@
-AUX jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch 678 BLAKE2B a240957e24b0e0961d680b4868dafe0fc4b337cb96a6eaed9bd0a23099d4e5d47757a846776abee196941514b329de5b08ef42219edbb8f2ae4b26f210efbd04 SHA512 00e7e1e102f3d518a6c0ed088ba286b84ae5991a73fe01bdc353fe0550289a95b69f7fc69b46b1423f6b42ea51e4b38b02d266bd9abb6663881a53223dd6cb9a
-AUX jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch 700 BLAKE2B f3c54de43be927bf53c07bf29af744449864b43684e8e32bc8f6e7c40efd4cd5b6cb09b953d83c02147e96dd4548d2b285b3658f7ec3edeaac62c33e49d40f9c SHA512 f7f26b207be3f9fc19a1226ed01e5774de7411fe440a450459dbfc20b19db77e29e40adb3e5e18f72b637c51774baae4a26d024d43ea785715c0c89b91c1c46e
-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-r2.ebuild 1340 BLAKE2B 07024d9b55a48a7a57c44f911d1570e188b4968666a000fd336aebf2d7fc2cc846dae4e943d0063c8386c2273b52c5a44a8095d4ed235fe8b3d84e5bdb09deb2 SHA512 5c2d5a1bda66e4e370cf6e7b030c29fff01f2d3d30687d6cdb08ff1b6d2c1069f8adb264d62262053e767039b640804f1bb527b8588c6c99eb862d3b1669a9f1
-EBUILD jackrabbit-webdav-2.10.1.ebuild 1279 BLAKE2B 1d2eb70b66d3ce9f30ab90467af0a78ed6a251559c581a19ce74d4846b8c21eddace72fdb0aba0e1b919563180d040c9b70f16b0c66d7597274fbdcde027f8cf SHA512 09aa64702b82c18b124f7f41eb5de6480dffcfc7e6503877a428c4dbc40ecae72a1d1e41c5b7aeb3cf50185aa918716432128a092929a184af5421253145da00
+EBUILD jackrabbit-webdav-2.10.1-r2.ebuild 1336 BLAKE2B 29fe4d5a86ec6cbd57037c32cd5dcad29df07d323b7805d373671cfffefaea588cea0d1ca37e166acf9db4d085dff0d11c61b6f8ef15075ddd293cda28aee5a1 SHA512 d64d1b4c323cdc147cc5dc171f06bf674a6fb5035147936177698f63c2ed401d3b53e0d96222aa5a34b724af16fa9732c7d786736c73318b227a64db9033b180
+EBUILD jackrabbit-webdav-2.21.7-r1.ebuild 2091 BLAKE2B 2e18caad07fec96b7801460c1db441a357d19fc357344de37718c87b586fcdfc653002c6d0c048674092eb44e04d9f6313dabe10aa2de5ebeb5e242675ccd481 SHA512 1dbced75f1be447f4fd14ed88402fec60d2a30f16cce802a83e6a61c496aef8c77155c86d4ebd95354a107171eec7bab6c4354b29565747c191e9b486a8c50eb
 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/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch
deleted file mode 100644
index 8417f31cfceb..000000000000
--- a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java.orig	2015-07-03 09:36:45.804000000 +0000
-+++ b/src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java	2015-07-03 09:36:59.498000000 +0000
-@@ -281,6 +281,18 @@
-         public void removeAttribute(String name) {
- 
-         }
-+        public int getRemotePort() {
-+            return 0;
-+        }
-+        public String getLocalName() {
-+            return null;
-+        }
-+        public String getLocalAddr() {
-+            return null;
-+        }
-+        public int getLocalPort() {
-+            return 0;
-+        }
-         public Locale getLocale() {
-             return null;
-         }
diff --git a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch
deleted file mode 100644
index 9f132b817a12..000000000000
--- a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java.orig	2015-07-03 09:26:48.578000000 +0000
-+++ b/src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java	2015-07-03 09:27:34.109000000 +0000
-@@ -40,6 +40,13 @@
-             public void setHeader(String name, String value) {
-                 assertTrue(Long.parseLong(value) > Integer.MAX_VALUE);
-             }
-+            @Override
-+            public void setCharacterEncoding(String name) {
-+            }
-+            @Override
-+            public String getContentType() {
-+                return null;
-+            }
-         };
- 
-         OutputContext ctx = new OutputContextImpl(response, null);
diff --git a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-build.xml b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-build.xml
deleted file mode 100644
index 3c3a41206421..000000000000
--- a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-build.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 5/22/15 2:49 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="jackrabbit-webdav-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="jackrabbit-webdav-2.10.1"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/biz/aQute/bndlib/1.43.0/bndlib-1.43.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar"/>
-    <pathelement location="${maven.repo.local}/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
-    <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/org/slf4j/jcl-over-slf4j/1.7.4/jcl-over-slf4j-1.7.4.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/biz/aQute/bndlib/1.43.0/bndlib-1.43.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar"/>
-    <pathelement location="${maven.repo.local}/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
-    <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/org/slf4j/jcl-over-slf4j/1.7.4/jcl-over-slf4j-1.7.4.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/>
-    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
-    <pathelement location="${maven.repo.local}/ch/qos/logback/logback-classic/1.0.12/logback-classic-1.0.12.jar"/>
-    <pathelement location="${maven.repo.local}/ch/qos/logback/logback-core/1.0.12/logback-core-1.0.12.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/*TestAll.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <!--
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-  -->
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             source="1.6" 
-             linksource="false" 
-             breakiterator="false">
-      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
-      <link href="http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0/"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/biz/aQute/bndlib/1.43.0"/>
-    <get src="http://repository.apache.org/snapshots/biz/aQute/bndlib/1.43.0/bndlib-1.43.0.jar" 
-         dest="${maven.repo.local}/biz/aQute/bndlib/1.43.0/bndlib-1.43.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="https://repo.maven.apache.org/maven2/biz/aQute/bndlib/1.43.0/bndlib-1.43.0.jar" 
-         dest="${maven.repo.local}/biz/aQute/bndlib/1.43.0/bndlib-1.43.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.6.6"/>
-    <get src="http://repository.apache.org/snapshots/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar" 
-         dest="${maven.repo.local}/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar" 
-         dest="${maven.repo.local}/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/javax/servlet/servlet-api/2.3"/>
-    <get src="http://repository.apache.org/snapshots/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" 
-         dest="${maven.repo.local}/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="https://repo.maven.apache.org/maven2/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" 
-         dest="${maven.repo.local}/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1"/>
-    <get src="http://repository.apache.org/snapshots/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" 
-         dest="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="https://repo.maven.apache.org/maven2/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" 
-         dest="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/commons-codec/commons-codec/1.2"/>
-    <get src="http://repository.apache.org/snapshots/commons-codec/commons-codec/1.2/commons-codec-1.2.jar" 
-         dest="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.2/commons-codec-1.2.jar" 
-         dest="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/slf4j/jcl-over-slf4j/1.7.4"/>
-    <get src="http://repository.apache.org/snapshots/org/slf4j/jcl-over-slf4j/1.7.4/jcl-over-slf4j-1.7.4.jar" 
-         dest="${maven.repo.local}/org/slf4j/jcl-over-slf4j/1.7.4/jcl-over-slf4j-1.7.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="https://repo.maven.apache.org/maven2/org/slf4j/jcl-over-slf4j/1.7.4/jcl-over-slf4j-1.7.4.jar" 
-         dest="${maven.repo.local}/org/slf4j/jcl-over-slf4j/1.7.4/jcl-over-slf4j-1.7.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.10"/>
-    <get src="http://repository.apache.org/snapshots/junit/junit/4.10/junit-4.10.jar" 
-         dest="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="https://repo.maven.apache.org/maven2/junit/junit/4.10/junit-4.10.jar" 
-         dest="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1"/>
-    <get src="http://repository.apache.org/snapshots/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
-         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
-         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/ch/qos/logback/logback-classic/1.0.12"/>
-    <get src="http://repository.apache.org/snapshots/ch/qos/logback/logback-classic/1.0.12/logback-classic-1.0.12.jar" 
-         dest="${maven.repo.local}/ch/qos/logback/logback-classic/1.0.12/logback-classic-1.0.12.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="https://repo.maven.apache.org/maven2/ch/qos/logback/logback-classic/1.0.12/logback-classic-1.0.12.jar" 
-         dest="${maven.repo.local}/ch/qos/logback/logback-classic/1.0.12/logback-classic-1.0.12.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/ch/qos/logback/logback-core/1.0.12"/>
-    <get src="http://repository.apache.org/snapshots/ch/qos/logback/logback-core/1.0.12/logback-core-1.0.12.jar" 
-         dest="${maven.repo.local}/ch/qos/logback/logback-core/1.0.12/logback-core-1.0.12.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="https://repo.maven.apache.org/maven2/ch/qos/logback/logback-core/1.0.12/logback-core-1.0.12.jar" 
-         dest="${maven.repo.local}/ch/qos/logback/logback-core/1.0.12/logback-core-1.0.12.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
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
index 108db165b5f0..de5e7d799a3f 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
 
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
deleted file mode 100644
index 2f95946aa570..000000000000
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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 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="app-arch/unzip
-	>=virtual/jdk-1.6
-	${CDEPEND}
-	test? ( dev-java/ant-junit:0 )"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-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
-)
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-	epatch "${PATCHES[@]}"
-}
-
-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.21.7-r1.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
new file mode 100644
index 000000000000..9a02a05c7708
--- /dev/null
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.halifax.rwth-aachen.de/gentoo/distfiles/3b/jackrabbit-2.21.7-src.zip --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jackrabbit-webdav-2.21.7.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.jackrabbit:jackrabbit-webdav:2.21.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Generic WebDAV Library"
+HOMEPAGE="http://jackrabbit.apache.org/jackrabbit-webdav/"
+SRC_URI="mirror://apache/jackrabbit/${PV}/jackrabbit-${PV}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# org.apache.httpcomponents:httpclient:4.5.13 -> >=dev-java/commons-httpclient-4.5.13:4
+# org.apache.httpcomponents:httpcore:4.4.14 -> >=dev-java/httpcore-4.4.14:0
+# org.slf4j:jcl-over-slf4j:1.7.30 -> !!!artifactId-not-found!!!
+# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
+
+CDEPEND="
+	dev-java/httpcomponents-client:4
+	dev-java/httpcore:0
+	dev-java/osgi-annotation-versioning:0
+	dev-java/slf4j-api:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# javax.servlet:javax.servlet-api:3.1.0 -> !!!groupId-not-found!!!
+# org.osgi:org.osgi.annotation:6.0.0 -> !!!groupId-not-found!!!
+# POM: pom.xml
+# test? ch.qos.logback:logback-classic:1.2.3 -> !!!groupId-not-found!!!
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*
+	dev-java/osgi-annotation-versioning:0
+	java-virtuals/servlet-api:3.1"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/jackrabbit-${PV}/${PN}"
+
+JAVA_GENTOO_CLASSPATH="httpcomponents-client-4,httpcore,osgi-annotation-versioning,servlet-api-3.1,slf4j-api"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS=( "src/main/resources" "src/main/appended-resources" )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
diff --git a/dev-java/jackson-annotations/Manifest b/dev-java/jackson-annotations/Manifest
index f3bff0170201..8aaadf739044 100644
--- a/dev-java/jackson-annotations/Manifest
+++ b/dev-java/jackson-annotations/Manifest
@@ -1,5 +1,3 @@
 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
+EBUILD jackson-annotations-2.13.0.ebuild 1431 BLAKE2B 2274e9b3b19c510f1b4a0187b5453ce8eb00558cc8196ac71de6336218558b0e778ba96a042b7aff0fe4736efffd93b7252f799aede9af53e89bd3a4d6ccdcfd SHA512 a487c150a3c9df585feba859a2b8aa536fbeb811ae3493807859ffa8269a44e50ce3c5cef45b2e592b857a3c04607516e17229d242cd119582b878be3c5453ad
 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
index 91338cc24cc9..04d11cb62cce 100644
--- a/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild
+++ b/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/refs/tags/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.9.10.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.9.10.ebuild
deleted file mode 100644
index 5f6b0bc2fef8..000000000000
--- a/dev-java/jackson-annotations/jackson-annotations-2.9.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Annotations for the Java Jackson data processor"
-HOMEPAGE="https://github.com/FasterXML/jackson-annotations"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${PN}-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.7"
-
-DEPEND=">=virtual/jdk-1.7
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${PN}-${P}"
-JAVA_SRC_DIR="src/main/java"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.md release-notes/VERSION
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4)"
-	local TESTS=$(find * -name "*Test.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/jackson-core/Manifest b/dev-java/jackson-core/Manifest
new file mode 100644
index 000000000000..39a28d2f50f9
--- /dev/null
+++ b/dev-java/jackson-core/Manifest
@@ -0,0 +1,3 @@
+DIST jackson-core-2.13.0.tar.gz 11437457 BLAKE2B d4629f7a5c497bb837369050564ed91b9520290c2355a3fe20939c6211112c552b8e2db5dfc8bd9965ec17df8194191368189dcb425e3f9a5ad60a08c3a2b900 SHA512 b3d50849f0912252cbdde77de05a1c9836d044f48c50c4a4992e7b207d1f83ea9580df2bf843d9cb1c50008a808525ca82dd22d8dfa192fa394f8a923ee274a3
+EBUILD jackson-core-2.13.0.ebuild 2215 BLAKE2B 7783e6a6f574c54427fad6d256b652394170e5587a6dc2b8c7a358ead90f2b1db94a63af228d0e612ac9e3461e37d85560b6d1ebcb921b5ee3878fce4a25114b SHA512 a133ad7be357b05af753ee228f4978d26535af30c1d58179eba48a4567fc7ef04f10e0cb18e8c3d60ef1d4385231323dbbdfa7a3572e7e2742ad03f5298c92fd
+MISC metadata.xml 312 BLAKE2B b1beb51833c35e3ab2191a3c722768a34ec6cbf3ee240d67381b5137aabc0bb8be862f32638f35c1ba84a75498bb66303223c1d43b7d48c8bfe143ee837d6338 SHA512 b85d17092438f67523cf8c3c861de1183e061f55620342239bd662e5e90058f82fb501ba24bf2c1de6ebbe512ae4559d4b746a575261cbf2feb142e120118372
diff --git a/dev-java/jackson-core/jackson-core-2.13.0.ebuild b/dev-java/jackson-core/jackson-core-2.13.0.ebuild
new file mode 100644
index 000000000000..562b36a94013
--- /dev/null
+++ b/dev-java/jackson-core/jackson-core-2.13.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-core/archive/refs/tags/jackson-core-2.13.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-core-2.13.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.jackson.core:jackson-core:2.13.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Core Jackson processing abstractionis (Streaming API), implementation for JSON"
+HOMEPAGE="https://github.com/FasterXML/jackson-core"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( LICENSE README.md release-notes/{CREDITS-2.x,VERSION-2.x} )
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_EXCLUDES=(
+	# Upstream doesn't run these tests and gets
+	# »Tests run: 928, Failures: 0, Errors: 0, Skipped: 0«
+	com.fasterxml.jackson.failing.async.AsyncTokenErrorTest
+	com.fasterxml.jackson.failing.filter.BasicParserFilteringTest
+	com.fasterxml.jackson.failing.ParserErrorHandling105Test
+	com.fasterxml.jackson.failing.ParserErrorHandling679Test
+	com.fasterxml.jackson.failing.ParserFilterEmpty708Test
+	com.fasterxml.jackson.failing.Surrogate223Test
+	perf.ConcurrencyReadTest
+	perf.ManualCharAccessTest
+)
+
+src_prepare() {
+	default
+
+	sed -e 's:@package@:com.fasterxml.jackson.core.json:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
+		-e 's:@projectartifactid@:jackson-core:g' \
+		"${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java" || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/saxpath/metadata.xml b/dev-java/jackson-core/metadata.xml
index d88f87a68d1b..7c4f08455c28 100644
--- a/dev-java/saxpath/metadata.xml
+++ b/dev-java/jackson-core/metadata.xml
@@ -3,9 +3,8 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
-		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">saxpath</remote-id>
+		<bugs-to>https://github.com/FasterXML/jackson-core/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jackson-databind/Manifest b/dev-java/jackson-databind/Manifest
new file mode 100644
index 000000000000..942b607b0e94
--- /dev/null
+++ b/dev-java/jackson-databind/Manifest
@@ -0,0 +1,3 @@
+DIST jackson-databind-2.13.0.tar.gz 44195827 BLAKE2B f623840b21ba149510d81722ef5aa94dcc99fadc18954427340db2c411e90db53d1507789e79048d4bc84f56786202a4ad741a30bf904863a974939e038e7bb8 SHA512 f76a0b0b940f297d65c6bcf9ba3e6f276294f5ef70fe1c5b1dddab826ef9b49ef195fa0115d422906925e32ced1002c7e02991106e8cf196f48db49b67e39067
+EBUILD jackson-databind-2.13.0.ebuild 2695 BLAKE2B 3d00beae87e25831f3fe9368787d5e75fd2e6e0667fe207f6cbf147c708323f04d87a8c903184dbd6546c8b59199804d4c36aaad854f8ff72f031f61a8f0096a SHA512 52fc3cd41f28027943ed90ba042456912328d8c86f43c891166574fd178922cf87da72bcef14003aa774a362cdf4d18d28b784bf1e84d121b5b8b36e57b8a90d
+MISC metadata.xml 316 BLAKE2B 06c857b21b1c39450aefd3a56ee67e0a9c57ce28f434e0af285397bf9c0a73801983b71415c1dd3ee1b53e9b1bf855d81b204559ccfe5bda7cf0703975a8420e SHA512 3308a8e0872865b0da8c3c5720364f786764d6cb751b6ad465dc450338b8c3f672b8266ab957a27609363d507b7f711ccb0edb921388a8f50cba73424fc85253
diff --git a/dev-java/jackson-databind/jackson-databind-2.13.0.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.0.ebuild
new file mode 100644
index 000000000000..1d9ce42a4732
--- /dev/null
+++ b/dev-java/jackson-databind/jackson-databind-2.13.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-databind/archive/refs/tags/jackson-databind-2.13.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-databind-2.13.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.jackson.core:jackson-databind:2.13.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="General data-binding functionality for Jackson: works on core streaming API"
+HOMEPAGE="https://github.com/FasterXML/jackson-databind"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Dependencies like powermock-{core,module-junit4,api-mockito2} are not available in ::gentoo
+RESTRICT="test"
+
+# Common dependencies
+# POM: pom.xml
+# com.fasterxml.jackson.core:jackson-annotations:2.13.0 -> >=dev-java/jackson-annotations-2.13.0:2
+# com.fasterxml.jackson.core:jackson-core:2.13.0 -> >=dev-java/jackson-core-2.13.0:0
+
+CP_DEPEND="
+	>=dev-java/jackson-annotations-2.13.0:2
+	dev-java/jackson-core:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? javax.measure:jsr-275:0.9.1 -> !!!groupId-not-found!!!
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+# test? org.powermock:powermock-api-mockito2:2.0.0 -> !!!groupId-not-found!!!
+# test? org.powermock:powermock-core:2.0.0 -> !!!groupId-not-found!!!
+# test? org.powermock:powermock-module-junit4:2.0.0 -> !!!groupId-not-found!!!
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+#	test? (
+#		!!!groupId-not-found!!!
+#	)
+#"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-${P}"
+
+DOCS=( LICENSE {README,SECURITY}.md release-notes/{CREDITS,VERSION}-2.x )
+
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+#	JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,junit-4,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+#	JAVA_TEST_SRC_DIR="src/test/java"
+#	JAVA_TEST_RESOURCE_DIRS=(
+#		"src/test/resources"
+#	)
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	sed -e 's:@package@:com.fasterxml.jackson.databind.cfg:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
+		-e "s:@projectartifactid@:${PN}:g" \
+		"${JAVA_SRC_DIR}/com/fasterxml/jackson/databind/cfg/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/databind/cfg/PackageVersion.java" || die
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jackson-databind/metadata.xml b/dev-java/jackson-databind/metadata.xml
new file mode 100644
index 000000000000..7db69d87c0d8
--- /dev/null
+++ b/dev-java/jackson-databind/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/FasterXML/jackson-databind/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
new file mode 100644
index 000000000000..3bfd69435e36
--- /dev/null
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -0,0 +1,3 @@
+DIST jackson-dataformat-xml-2.13.0.tar.gz 3009443 BLAKE2B eaad5101f74ba5fdc0b91bc1c2b1f6174e812a63aea43d64ae9626bd22f5623fd9fb8dcd98384124e6860ea60dec4f4bb25196bd0be21daa9cf71e59a3b0252b SHA512 ad8bff16efe62cd9b8a509bc6677f771cf8e8f76bf320b8a463fe4d63d533e2cf7e3d9eda8c665c32383cf70b790f0847ea5e63a0cfcad5d4ea6918db21d6573
+EBUILD jackson-dataformat-xml-2.13.0.ebuild 4706 BLAKE2B 4a73e70a2249fd16202c43b790c1e1f2c24cbdc85792c01cbcc106a9db9654eb94699a562d740a13fb4d32f93f254d6cd483994e0567f6fca6fa6cfd05c4b5dd SHA512 368b584da61e517e55fee01d9c9cb0d0ff5da08a725da3eebdc98ec667b1fed35c0cbce314cbe49bf6d686e6cca4c4549828b8cc77bd66cee56d197fa03a3f89
+MISC metadata.xml 487 BLAKE2B 0e5e73be66b890aab37fce8ccd162c168c7cff415c418a30f5cdcc76624499633abfd366f86ece75de208b981a03364566659e37c2b3a34ad90a01f3577a707a SHA512 b920c1d3b8d8f6023df6c100ba4b36282c7cbfdad4a4690055d70cd3dac8d0da91f236a38565bee798342dd94c49cf2c9ce125282a7e5fd818321e28d288b3f1
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild
new file mode 100644
index 000000000000..f1ee5befc428
--- /dev/null
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-dataformat-xml/archive/refs/tags/jackson-dataformat-xml-2.13.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-xml-2.13.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Data format extension for Jackson"
+HOMEPAGE="https://github.com/FasterXML/jackson-dataformat-xml"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.fasterxml.jackson.core:jackson-annotations:2.13.0 -> >=dev-java/jackson-annotations-2.13.0:2
+# com.fasterxml.jackson.core:jackson-core:2.13.0 -> >=dev-java/jackson-core-2.13.0:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.0 -> >=dev-java/jackson-databind-2.13.0:0
+# com.fasterxml.woodstox:woodstox-core:6.2.6 -> >=dev-java/woodstox-core-6.2.7:0
+# org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0
+
+CP_DEPEND="
+	>=dev-java/jackson-annotations-2.13.0:2
+	>=dev-java/jackson-core-2.13.0:0
+	>=dev-java/jackson-databind-2.13.0:0
+	>=dev-java/stax2-api-4.2.1:0
+	>=dev-java/woodstox-core-6.2.7:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.0 -> >=dev-java/jackson-module-jakarta-xmlbind-2.13.0:0
+# test? com.sun.xml.stream:sjsxp:1.0.2 -> >=dev-java/sjsxp-1.0.2:0
+# test? jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/jackson-module-jakarta-xmlbind:0
+		dev-java/jaxb-api:3
+		dev-java/sjsxp:0
+	)
+"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( LICENSE README.md release-notes/{CREDITS,VERSION}-2.x )
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="jackson-module-jakarta-xmlbind,sjsxp,jaxb-api-3,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_EXCLUDES=(
+	# Upstream: Tests run: 316, Failures: 0, Errors: 0, Skipped: 0
+	# All the following are not run by upstream (mvn test).
+	com.fasterxml.jackson.dataformat.xml.failing.ConflictingGetters27Test
+	com.fasterxml.jackson.dataformat.xml.failing.ElementWrapperViaCreator149Test
+	com.fasterxml.jackson.dataformat.xml.failing.EnumIssue9Test
+	com.fasterxml.jackson.dataformat.xml.failing.Issue37AdapterTest
+	com.fasterxml.jackson.dataformat.xml.failing.Issue491NoArgCtorDeserRegressionTest
+	com.fasterxml.jackson.dataformat.xml.failing.PojoAsAttributeSer128Test
+	com.fasterxml.jackson.dataformat.xml.failing.PolymorphicIssue4Test
+	com.fasterxml.jackson.dataformat.xml.failing.PolymorphicList426Test
+	com.fasterxml.jackson.dataformat.xml.failing.UntypedListSerialization8Test
+	com.fasterxml.jackson.dataformat.xml.failing.UnwrappedAndList299DeserTest
+	com.fasterxml.jackson.dataformat.xml.failing.VerifyRootLocalName247Test
+	com.fasterxml.jackson.dataformat.xml.failing.XmlTextViaCreator306Test
+	com.fasterxml.jackson.dataformat.xml.failing.XmlTextWithEmpty449Test
+)
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	sed -e 's:@package@:com.fasterxml.jackson.dataformat.xml:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
+		-e "s:@projectartifactid@:${PN}:g" \
+		"${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java" || die
+}
+
+src_test() {
+	# The same failure occurs upstream (running 'mvn test')
+
+	# 1) testCollection(com.fasterxml.jackson.dataformat.xml.lists.ListAsObjectTest)
+	# com.fasterxml.jackson.databind.exc.InvalidDefinitionException: Failed to call `setAccess()` on Field 'first' due to
+	# `java.lang.reflect.InaccessibleObjectException`, problem: Unable to make field transient java.util.LinkedList$Node
+	# java.util.LinkedList.first accessible: module java.base does not "opens java.util" to unnamed module @42bb2aee
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge "17" ; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
+	fi
+
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jackson-dataformat-xml/metadata.xml b/dev-java/jackson-dataformat-xml/metadata.xml
new file mode 100644
index 000000000000..76dcd355d49d
--- /dev/null
+++ b/dev-java/jackson-dataformat-xml/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Data format extension for Jackson to offer alternative support for serializing POJOs as XML and deserializing XML as pojos.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/FasterXML/jackson-dataformat-xml/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jackson-dataformat-yaml/Manifest b/dev-java/jackson-dataformat-yaml/Manifest
new file mode 100644
index 000000000000..7bd9e9f8f183
--- /dev/null
+++ b/dev-java/jackson-dataformat-yaml/Manifest
@@ -0,0 +1,3 @@
+DIST jackson-dataformat-yaml-2.13.0.tar.gz 3125487 BLAKE2B 84ad1a6c041df324be312161b944435063c11c4e572532d3b0a50a207ad4babff59d90aad112e9d46f2c35f6be4732e3e2d8426e42f3bccb1dfcbe4c083056b4 SHA512 9dc9a683f5cc943711221ac1a4ec862681ae49c8003f08a4a29f15ff77893de3936b37e28fadc433db5a9f498fb70c78eaa4dc0fc6b0875d773999c78f74365a
+EBUILD jackson-dataformat-yaml-2.13.0.ebuild 2726 BLAKE2B 835171fa0cbb9f2b1a554cf465e9c62a79429202cae8e7fc8a5c4a3c8035fe3ae1e9ce6d0c2dfdf7d9bc7ee5a4f28b1bb724bd3a7dbc75588287f66c2a11579e SHA512 ea0587ee2732acdf3dfd11d6c7ec66dd1d678e1a568b73034fd7183788400c531437cf8a20722fa0942ff4d409d4e81ad736eb2aa82f28c9c28ab9f703e89110
+MISC metadata.xml 342 BLAKE2B 4d57f5b5bc0e926e2c359501044c45f3c8223639349286adf9e979cc0cf2bc02070999b1fae29b1da8e14b0348a0aa95dac24006b138f7a60fb7d2d9127fea1f SHA512 7ec10474b90f26e90dfd0d4039901582620a8f84d1a859283522c14aac5a11677d624a3cb773245add8d9fb5704ae94f8a825e68cd4299bf93d4678894561742
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.0.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.0.ebuild
new file mode 100644
index 000000000000..e90213a12e8c
--- /dev/null
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-dataformats-text/archive/refs/tags/jackson-dataformats-text-2.13.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-yaml-2.13.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Support for reading and writing YAML-encoded data via Jackson abstractions"
+HOMEPAGE="https://github.com/FasterXML/jackson-dataformats-text"
+SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/refs/tags/jackson-dataformats-text-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.fasterxml.jackson.core:jackson-core:2.13.0 -> >=dev-java/jackson-core-2.13.0:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.0 -> >=dev-java/jackson-databind-2.13.0:0
+# org.yaml:snakeyaml:1.28 -> >=dev-java/snakeyaml-1.28:0
+
+CP_DEPEND="
+	dev-java/jackson-core:0
+	dev-java/jackson-databind:0
+	dev-java/snakeyaml:0
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( README.md release-notes/{CREDITS,VERSION} )
+
+S="${WORKDIR}/jackson-dataformats-text-jackson-dataformats-text-${PV}/yaml"
+
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_EXCLUDES=(
+	# Upstream doesn't run these tests and gets
+	# »Tests run: 121, Failures: 0, Errors: 0, Skipped: 0«
+	com.fasterxml.jackson.dataformat.yaml.failing.ObjectIdWithTree2Test
+	com.fasterxml.jackson.dataformat.yaml.failing.PolymorphicWithObjectId25Test
+	com.fasterxml.jackson.dataformat.yaml.failing.SimpleGeneration215Test
+)
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+
+	sed -e 's:@package@:com.fasterxml.jackson.dataformat.yaml:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
+		-e "s:@projectartifactid@:${PN}:g" \
+		"${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java" || die
+
+	# dev-java/snakeyaml-1.28-r1 does not provide module-info
+	sed -e '/snakeyaml;/d' -i src/moditect/module-info.java || die
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/freehep-graphics2d/metadata.xml b/dev-java/jackson-dataformat-yaml/metadata.xml
index 496b6e6faccc..ff11baa0e7b6 100644
--- a/dev-java/freehep-graphics2d/metadata.xml
+++ b/dev-java/jackson-dataformat-yaml/metadata.xml
@@ -3,9 +3,8 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
-		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">freehep/freehep-vectorgraphics</remote-id>
+		<remote-id type="github">https://github.com/FasterXML/jackson-dataformats-text/issues</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jackson-module-jakarta-xmlbind/Manifest b/dev-java/jackson-module-jakarta-xmlbind/Manifest
new file mode 100644
index 000000000000..221b7918dde8
--- /dev/null
+++ b/dev-java/jackson-module-jakarta-xmlbind/Manifest
@@ -0,0 +1,3 @@
+DIST jackson-module-jakarta-xmlbind-2.13.0.tar.gz 1841327 BLAKE2B 41b4f92979274265901fb5facd16169ee38d792f8cbd38fbadecb7cd9cdc836b0b42b3cc5a7372af92c77cb5a08ac8d33a9c9c51b6e499ad3dbb8b1dc204a406 SHA512 6c076eaaf7713ed82d60bb48492747bcdd09d8eedf73aae521b446cc5944ce3c2d01ce942f00cab85a1139b5383afc78142aab32093fc9b8e8bf5b743534d2a4
+EBUILD jackson-module-jakarta-xmlbind-2.13.0.ebuild 3120 BLAKE2B a34ddf77f92c3fed0c3bba60cc6980cdd051faaf1cc61a76bf7701774b2894c90e05d0650ee9967b40298b82f4a3a7f69c4922c017037e50cc87c87214d758e3 SHA512 4960fd3b384ae104c540136dfec05e5daeabee250a73f3608f2f27345456bc7f1a28a2b244a85c7f4e400e8d742d527f425532146932e0430c51c76a40e75fb6
+MISC metadata.xml 506 BLAKE2B 4e62bddea5ad8f7e6b73de9a173dbc8416b309caf4e4f9801496712f1cc88bdab646d237e48c3f55c99d95c198056b6642cf19070805f694b3a8e996e9bd0528 SHA512 96825b1a8ec0808f4dfa4a2482a1c184acab23d624ab178be8df496c67ff3ca5cd7cf012e6e7017721a3355a6ff3265d6f76734a655bfb261d3530781825f5d5
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.0.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.0.ebuild
new file mode 100644
index 000000000000..e93391f95948
--- /dev/null
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-modules-base/archive/refs/tags/jackson-modules-base-2.13.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-xmlbind-annotations-2.13.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Support for using Jakarta XML Bind (aka JAXB 3.0) annotations"
+HOMEPAGE="https://github.com/FasterXML/jackson-modules-base"
+SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/refs/tags/jackson-modules-base-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# We don't have jaxb-runtime:3.0.1
+RESTRICT="test"
+
+# Common dependencies
+# POM: pom.xml
+# com.fasterxml.jackson.core:jackson-annotations:2.13.0 -> >=dev-java/jackson-annotations-2.13.0:2
+# com.fasterxml.jackson.core:jackson-core:2.13.0 -> >=dev-java/jackson-core-2.13.0:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.0 -> >=dev-java/jackson-databind-2.13.0:0
+# jakarta.activation:jakarta.activation-api:1.2.1 -> >=dev-java/jakarta-activation-api-1.2.2:1
+# jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3
+
+CP_DEPEND="
+	dev-java/jackson-annotations:2
+	dev-java/jackson-core:0
+	dev-java/jackson-databind:0
+	dev-java/jakarta-activation-api:1
+	dev-java/jaxb-api:3
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+# test? org.glassfish.jaxb:jaxb-runtime:3.0.1 -> !!!groupId-not-found!!!
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+#	test? (
+#		!!!groupId-not-found!!!
+#	)
+#"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+S="${WORKDIR}/jackson-modules-base-jackson-modules-base-${PV}/jakarta-xmlbind/"
+
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+# JAVA_TEST_GENTOO_CLASSPATH="junit-4,!!!groupId-not-found!!!"
+# JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	sed -e 's:@package@:com.fasterxml.jackson.module.jakarta.xmlbind:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.module:g' \
+		-e "s:@projectartifactid@:jackson-module-jakarta-xmlbind-annotations:g" \
+		"${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jakarta/xmlbind/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jakarta/xmlbind/PackageVersion.java" || die
+
+	# This is an ugly hack, but ...
+	#	src/moditect/module-info.java:13: error: cannot find symbol
+	#	        com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindModule;
+	#	                                                    ^
+	#	  symbol:   class JakartaXmlBindModule
+	#	  location: package com.fasterxml.jackson.module.jakarta.xmlbind
+	sed -e '/JakartaXmlBindModule/d' \
+		-e '/provides/d' \
+		-i src/moditect/module-info.java || die
+}
diff --git a/dev-java/jackson-module-jakarta-xmlbind/metadata.xml b/dev-java/jackson-module-jakarta-xmlbind/metadata.xml
new file mode 100644
index 000000000000..d8255baa3203
--- /dev/null
+++ b/dev-java/jackson-module-jakarta-xmlbind/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Support for using Jakarta XML Bind (aka JAXB 3.0) annotations as an alternative to \"native\" Jackson annotations, for configuring data-binding.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/FasterXML/jackson-modules-base/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jacl/Manifest b/dev-java/jacl/Manifest
index d203eee9fd7b..b748c2161571 100644
--- a/dev-java/jacl/Manifest
+++ b/dev-java/jacl/Manifest
@@ -1,3 +1,4 @@
 DIST jacl-1.4.1.tar.gz 1921630 BLAKE2B 1b5693aa79fc50b5ff7a1ef86608b640d0bf391ced72dbe5d30f30fb46b26174535aac9d0ec32e1528f16af9e54def344d2fe38602700f921d612761f706fcce SHA512 e4b906efbd3ef4ab9338e8bf2f50c3b820e25b9fbe61f194e90cc0fa128f68d64eb459f7b05171d4b86b4c9635ef483906a02952bdedcee89ccb92256b789247
 EBUILD jacl-1.4.1-r1.ebuild 976 BLAKE2B 4b9d1aae4306c49d0cd12ea8d3c45c89f30725ea024f69003ed3202438dc3d2e3c9df360fd3394425d7c6c8376025b4e5d13493e1cf4739177c5a9ccbf6a89b7 SHA512 bfdc3c8b4467bb1d33b54a9fc62bc0a861e3565bd7d059badc6e0a1a6970c865e3d4eb152793b2f1ed2c8f49494eac550cba05cf9ed9bdab29f0dd6f5ac112ab
+EBUILD jacl-1.4.1-r2.ebuild 1001 BLAKE2B 24ca124a2a19263e7039483cce0c7291de169e7383ff215c090791729df6308729837b5b119ea342f3dfbfcdf59da80177e5034cdc61ea35ad0b7980a1949c89 SHA512 858802000ce65e4f28bef841d1a39a2f6362c4939403de92eaa6b0836457fb17aa05c8df028a8eb5334816e164f87a092dbb4288bf15882791022f249d874252
 MISC metadata.xml 2117 BLAKE2B a5929a947338b70ae6e55e33385ec8a709d191d75d93122a56c202add8f3b9350a2f54e6c1f87ad1206235bb273c88dac1707446b2d864227b9ae6335dd03bce SHA512 8e41dac5346fafe366423a573ae61149a6f7d451219bc31ab65c1031d8f8e33318791ea08fe340fc79305f4df4fea5c26da821513912c010fca8382a74093fac
diff --git a/dev-java/jacl/jacl-1.4.1-r2.ebuild b/dev-java/jacl/jacl-1.4.1-r2.ebuild
new file mode 100644
index 000000000000..b09fdb0f9cf4
--- /dev/null
+++ b/dev-java/jacl/jacl-1.4.1-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jacl is an implementation of Tcl written in Java"
+HOMEPAGE="http://tcljava.sourceforge.net"
+SRC_URI="mirror://sourceforge/project/tcljava/jacl/${PV}/jacl${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc"
+
+CDEPEND=">=dev-lang/tcl-8.4.5:*"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CRDEPEND}
+	>=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/${PN}${PV}"
+
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	rm -rf src/{Test.java,empty,tests,janino} || die
+	java-pkg-simple_src_compile
+	mv src/jacl/tcl src/ || die
+	java-pkg_addres "${PN}.jar" src/ -name "*.tcl"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher jaclsh --main tcl.lang.Shell
+	dodoc README ChangeLog known_issues.txt
+}
diff --git a/dev-java/jacoco/Manifest b/dev-java/jacoco/Manifest
deleted file mode 100644
index bd5be72b4fbc..000000000000
--- a/dev-java/jacoco/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST jacoco-0.7.9-agent.jar 4078 BLAKE2B 40d44cbbaecdd4613abed5c065c2ee320208fb1bc7e8b0a5b1e65f2ce59424967c49ee3c286ab59adc504efd2f8dac0a08c2716b400b9dae63ce5cb583a4ac1c SHA512 b0dc423039bd03bbccb62667c5dd6e2838bf75a8d98b0bb5eb51c6ebfbe3fbc6cdda86ac9e15cd2e06165202d40ddfdcc5a8553681d78026fc766ebe2f81f17e
-DIST jacoco-0.7.9-ant.jar 18096 BLAKE2B 08b5831a0321ee5620d71fbdb397bb1854c1fbd8d3d134ef8b924c67d4aff21c84875df8c2e6ec16d4a658a79ebeeb6af0ab5d653bfa87498221c38d163ce681 SHA512 8238cf2ee6233199280eaa271db8a189c33c9bef3508a7bdffc9363e6afaba90ed38d9d53eb2a88ddc3b214f1f25d7f872d6109942de7a8987e84392fb958f72
-DIST jacoco-0.7.9-core.jar 117366 BLAKE2B 2c0278cc688a26f429d78066d76148ac94b2af8bcad4631666a53b4977f136c9379e8fcc817dfede088f3df0b179220eb8d9d915d599b0a076edc0d9e86a2638 SHA512 7ac184a92aa0054eb44bfadd54c42de238da6193e9536b26fe67c2d4b65398e9ed7c471daa69a98d7138fc0ee5035a8ef40731e45363435cd30df959eb80e5f6
-DIST jacoco-0.7.9-report.jar 112521 BLAKE2B 9faaf71d98b4b0ee19f78785218de47f2a5ac52bfddf80256ff00ef3786177a3f37e53aa75dd8d373a247019a3a989532eb1a5337f7af4006e2d4133c3a834c4 SHA512 128b254767d627a185e5794b3c0ea479628e2eba05a4188c613c4661da99f3330d4491640860a0ce33fe2663ff7c218772d09dc22237c00f78f60f6b9dcc0990
-EBUILD jacoco-0.7.9.ebuild 960 BLAKE2B 38f33ebcd2479728dcd5fe738a8756426759953f344a14595081f80660b0c17c7fbbb61485d019151ee7e04e8377260ef74e61626b18024a5a0da7bb0afd9f50 SHA512 e28c66edcaf28f0c840b6a32f04243e12eeb3770931a1f20e54aaa9dd83cfbc99d99509bbda466d11ce070052842a0f500022a08682e22b2aa51043abe9d7b65
-MISC metadata.xml 326 BLAKE2B 1af5c26d655d61e1ee7ffeb109805cf94f65d7689fd11dc9130370694a300d9b6a1b4ab4c6e4b550c286fc181e826439114c37ebe04064aed959f545f8bf72d2 SHA512 4ee5cd62caae2236e2b554ef1477f0d55bb1b076ab50ca23a782a2d309a1045a14a87754f09e8f3cc7a21c94a59dbacd78a984f1566cfcd6abc26d0743f7f1f2
diff --git a/dev-java/jacoco/jacoco-0.7.9.ebuild b/dev-java/jacoco/jacoco-0.7.9.ebuild
deleted file mode 100644
index 14007c228165..000000000000
--- a/dev-java/jacoco/jacoco-0.7.9.ebuild
+++ /dev/null
@@ -1,38 +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="Java Code Coverage library"
-HOMEPAGE="https://eclemma.org/jacoco/"
-
-SRC_URI="
-	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.report/${PV}/org.${PN}.report-${PV}-sources.jar -> ${P}-report.jar
-	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.agent/${PV}/org.${PN}.agent-${PV}-sources.jar -> ${P}-agent.jar
-	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.core/${PV}/org.${PN}.core-${PV}-sources.jar -> ${P}-core.jar
-	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.ant/${PV}/org.${PN}.ant-${PV}-sources.jar -> ${P}-ant.jar"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-CDEPEND="
-	dev-java/ant-core:0
-	dev-java/asm:4"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
-	asm-4
-	ant-core
-"
diff --git a/dev-java/jacoco/metadata.xml b/dev-java/jacoco/metadata.xml
deleted file mode 100644
index db2f72de04b2..000000000000
--- a/dev-java/jacoco/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="person">
-    <email>monsieurp@gentoo.org</email>
-  </maintainer>
-<maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-java/jakarta-activation/Manifest b/dev-java/jakarta-activation/Manifest
index 8aa9b5cea278..9fe1f97a5c0d 100644
--- a/dev-java/jakarta-activation/Manifest
+++ b/dev-java/jakarta-activation/Manifest
@@ -1,5 +1,5 @@
 DIST jakarta-activation-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
 DIST jakarta-activation-2.0.1.tar.gz 133807 BLAKE2B 3b793fc767601cc1406482facb0456efd1f784371dff602e71f579a2c74f8e66affed384c8ce3b6aa7c2abfcb5cb0ff5f781ea109829c03f645099fb52016e21 SHA512 51e60d851b9f2027944ab24b248b3c7c19028a504ccf5f92a61495ffa65176df78c63c25e91de4a22d6aa9a1989db274f419f91693a21f052875635b8b21bad1
 EBUILD jakarta-activation-1.2.2.ebuild 1609 BLAKE2B ea8344052807a8d93da556279f8fef6a42a99317be98ccab2cb8e18d7834d04f4fe54821b9511ada0506b36979b2af4720860e858955590af578080aefcff750 SHA512 27a2dd8955cf3ed76927da79ae25b3d738b14fac05cda428ecb2527d00c146ff36281d2b02bd219de068e58a3ab1e307d2f2a1d7adfbe567fc75ac23289872c5
-EBUILD jakarta-activation-2.0.1.ebuild 929 BLAKE2B 1afae6b92e5196ac330b64c5100d49ef3da5c4eb1801d92893b6411c1691432ae34d9887fa3a0099b62827bcf2cfbd722be26b55917e94a9fac989854f739fd2 SHA512 fcf28e13812fe6497668799359611dda757032dc570a226d5709cf146fe91fc6e11b0ae2b0446fd8960be423bf2f92b173458cb5a24c77d7a975edb146cb2702
+EBUILD jakarta-activation-2.0.1.ebuild 925 BLAKE2B 57738556632dfbf21afa79b03fc54f2bc4910c34caa2ca7e1e5739a333484b791b2840032be41b82de1a22545257ac6d5f02c738ea86b87953927fe0cf7d63eb SHA512 469571fd8e95a797b28ebd3f751e8f47f58d661bc2999e676d5f2cf415d0258cef555610f1242d48f2c3fffbc030a32b05469c13e6b7841515c074df63ee851d
 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
index 42ca41812176..f7fe1163b923 100644
--- a/dev-java/jakarta-activation/jakarta-activation-2.0.1.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> $
 
 LICENSE="EPL-1.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/jakarta-json-api/Manifest b/dev-java/jakarta-json-api/Manifest
new file mode 100644
index 000000000000..a55631f89e11
--- /dev/null
+++ b/dev-java/jakarta-json-api/Manifest
@@ -0,0 +1,3 @@
+DIST jakarta-json-api-1.1.6.tar.gz 205455 BLAKE2B d928c0fbf65da992670eea0ad5a010b536ba6619b2d981a7fb02cf4cd05f00120f84dc0e19bbb4ee415de06d0c715a1e6736d11f2e1d3d8cc262f496319e389e SHA512 107fd6e48a3b3693a3019726cbe398ff7640896ffc7eac05bccee168f45be2c91baa1b673684006a3147716c274b11f1e44314b4d8fe89fbf124117fde26da1a
+EBUILD jakarta-json-api-1.1.6.ebuild 916 BLAKE2B d0c576304b863523e215ad88bd9a6d58def633093afdf65fad1b9252b016edf37d500534afc5f12d6c78d61d8a5c226a161b1dc468940230f38399b3a2c06b0c SHA512 5338612b055fd695b1e82e134daa63a69e087acdf4a04398227b05a26b11dbc5f214ef9b09a261b8a80183f9fbcec90b2f4198199cf78e2d1949754cdccacab4
+MISC metadata.xml 320 BLAKE2B 7122c677970180a1bf5faa715f1a4887df4692673cb4dfb0df9538e36f645e89b64fb3374a854cad50e2d2a0965ee97eaaafbc20f6526397a035e9182979ac19 SHA512 3fc26e2503653efab9e6724b7947fc01ec8d23934f3c9455dc55e731f88546844cd7aebdcd696c7bdf62bd3f05094fb35aad03c38078a1824c6031f26877a240
diff --git a/dev-java/jakarta-json-api/jakarta-json-api-1.1.6.ebuild b/dev-java/jakarta-json-api/jakarta-json-api-1.1.6.ebuild
new file mode 100644
index 000000000000..d8ca5b27516a
--- /dev/null
+++ b/dev-java/jakarta-json-api/jakarta-json-api-1.1.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.json:jakarta.json-api:1.1.6"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="jsonp"
+MY_PV="1.1-${PV}-RELEASE"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="JSR 374 (JSON Processing) API"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jsonp"
+SRC_URI="https://github.com/eclipse-ee4j/jsonp/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( EPL-2.0 GPL-2-with-classpath-exception )"
+# Since version 2.0.0, the namespace has changed to jakarta.json
+SLOT="1"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_SRC_DIR="api/src/main"
+
+DOCS=( CONTRIBUTING.md NOTICE.md README.md )
+
+src_install() {
+	java-pkg-simple_src_install
+	einstalldocs # https://bugs.gentoo.org/789582
+}
diff --git a/dev-java/nanoxml/metadata.xml b/dev-java/jakarta-json-api/metadata.xml
index d2350524ebbd..f7203c39781d 100644
--- a/dev-java/nanoxml/metadata.xml
+++ b/dev-java/jakarta-json-api/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">nanoxml</remote-id>
+		<remote-id type="github">eclipse-ee4j/jsonp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jakarta-oro/Manifest b/dev-java/jakarta-oro/Manifest
index dfa9e3bce3c4..ddfd10196b4d 100644
--- a/dev-java/jakarta-oro/Manifest
+++ b/dev-java/jakarta-oro/Manifest
@@ -1,3 +1,3 @@
 DIST jakarta-oro-2.0.8.tar.gz 345304 BLAKE2B a52b14f2753cb5ce07d16d417e943009dbb9268fddc62850daebb703ba2da3d83a3d05828479c89cab96174582514af75efedc73050a5f933cc0b26fbd51c948 SHA512 a7f6eb6a088765f273df18ccc823f918737f18ec8772275054839a87f8370f1848e795d481f226c712651104d7598ab86c7d90a991fb039df6581f42f1447920
-EBUILD jakarta-oro-2.0.8-r5.ebuild 860 BLAKE2B 060eb301ce8d61d81594dcf03c18cb46d9384e3f82608e218f5c87e2f246a264e0344da6f82946b008151c4ef3e780c178fb05012fce9661afc3084abdf1a822 SHA512 a7aa6eb673f5e189ce34e0b81bd0cb7e586c616a64128aed3ea02a4061272454f10203c51d8560ed658976a776a20f962c2eb13a91c781d3e8dc6601c4e7a3d2
+EBUILD jakarta-oro-2.0.8-r5.ebuild 859 BLAKE2B ea3ce84765e28f23a5bace92f9af8ae2fcd7593687867745320e44fb20a3507f4026612b755dda72c6fdffb243c71b4c40024569a0e9843053b5b0fe9c63a285 SHA512 ddfa4c529ed10765d1d48e2441c3cf7906806963822450f514ab3ca4ef89edafb2b96e51cffa6169dffe12ca782fb5bc4924c2c86b5ed5d53f356c69e11ecc11
 MISC metadata.xml 514 BLAKE2B bfab1f301fcf0ae2db49f612bc82d42535d943559f894e1bfc4cd97c20536686e518229d41d6ea0c48bda1dd9d32d9b9f1848d11a26bbe72781faa95b0c35a82 SHA512 aacf03d805c50b656b2e3b8c22d72096949f59e98e6b766476fc8a2082572846828114587468d289c83ff705b7e546e3e72749a120125d2292d68a6f45dcf746
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild
index 52bdf68ec975..749ea832a8da 100644
--- a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://archive.apache.org/dist/${MY_J}/${MY_O}/${P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="2.0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jakarta-regexp/Manifest b/dev-java/jakarta-regexp/Manifest
index 7f964b3695cf..0bf2e414132a 100644
--- a/dev-java/jakarta-regexp/Manifest
+++ b/dev-java/jakarta-regexp/Manifest
@@ -2,6 +2,6 @@ DIST jakarta-regexp-1.3.tar.gz 127069 BLAKE2B c6bb7383459a4cacc3af40ec65d83f7d16
 DIST jakarta-regexp-1.4.tar.gz 137768 BLAKE2B f6732f6a856736d1394b429453fd8958deb9f3f651f24accf641fee8b5ccc39e9807510135b07452f80fff55423406afc1aed88cef7d80e16ac013a1436b2649 SHA512 209b3f960cd16f05d3fd609b3b6ddb119e056f428b831788caaed6ebcb64c00279b18484845456dd07b8b761a7181f6772dbe9fd578f0401a5d8b1dcf98afc35
 DIST jakarta-regexp-1.5.tar.gz 170142 BLAKE2B f245a3d53eb0be3ed2494269eee956aec7a7459872219f1bb8ecb3e5f544070b0792a690b4a52f70f0e2ba6963842868cfcbf40cdfea0155831f216636d943cf SHA512 428e5971140dd29246ec41e698813d244efc0e871c69d2d83685d8ae3691f0e20ac44aedad3c59f3c356d24384461de83921e40f0cc4d69c95813f02e8aaba82
 EBUILD jakarta-regexp-1.3-r6.ebuild 606 BLAKE2B 5eae2df10f5d79bc562d40dc0c3002425b17eb25f263041200d798081480bd8650bdc00f70e8450eb1fdc7c8a2e930127d2987b40781ed5de6c694ae9942414c SHA512 c29b6112102a774775889c04ad5790b3304067d08842a746ea13498ee877ae9af981f8a17262767ab4768fd2c9809d2d04eee316831e7a8b419c21586a6e4b6f
-EBUILD jakarta-regexp-1.4-r3.ebuild 617 BLAKE2B e6d1018dcab755fbd31e2a3831082da0950c70111619533fd75ebad177de7e609d2427c573201aed7ebe2963d42c799063635e9b6f04822cc0123bfd575a442b SHA512 253ebb20e94128280ffad950b95c336753a702059bc531910c23c9e9788529bc906efa1fd8604c030f77a586a77c99330e992e750d479146974b13e39d569ff5
+EBUILD jakarta-regexp-1.4-r3.ebuild 616 BLAKE2B f4b4cdf411d62b030f15e8e246be6c9555bd59cb21d65dd23b2a50122276b93a6ad83148646b9d834f54d82a42d1e3456323a70e7e19ee4617fa83c82aeea9ce SHA512 24a5df5dcabce59d0e7a7edc239d9a401d391c1c3e6229c080dcd90ca9f4f3f05d1a94442d405e60eaf1561dcdd8203a5afeb3d55d6f3a08804460c4590fafc8
 EBUILD jakarta-regexp-1.5-r1.ebuild 605 BLAKE2B c4c927c9841c774012bad9f79f10e701d2fa71f12e7c1043ecc445c1e98bcfbe3e7e93bad0cb19a8411789304e048e292cca3fb817323116730f31335ee272ba SHA512 dd86f1822add3b584871cf63ba79db07e70fcc76927584717e8833cc8808625a424e2bca2f1086b6287b0e52023540a4c4db2edf1d70b9a359fb9bbf5f7044cb
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
index 6fcce04eebce..76c18b6d8dcd 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://jakarta.apache.org/"
 SLOT="${PV}"
 IUSE=""
 LICENSE="Apache-1.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=virtual/jre-1.8:*"
diff --git a/dev-java/jakarta-xml-soap-api/Manifest b/dev-java/jakarta-xml-soap-api/Manifest
index 5572c574b679..c1b606fe364c 100644
--- a/dev-java/jakarta-xml-soap-api/Manifest
+++ b/dev-java/jakarta-xml-soap-api/Manifest
@@ -1,3 +1,3 @@
 DIST jakarta-xml-soap-api-1.4.2.tar.gz 107226 BLAKE2B 4de5b994505d1964b6804010191b7b623322005d7bac6e9295062e821b5e0994a02d04f72d7f1bba9a8bf835ce42f455678af35c8cdf3e9e7208a2fde4151927 SHA512 9df8bb191fee0f6afa46f2d0c4bd5d1760324220be6862ff17df77d0dd4c9341360f18dd935233fdf6d9656d511c5378bd557e3dadd6570dfd3c9d7981179516
-EBUILD jakarta-xml-soap-api-1.4.2.ebuild 1751 BLAKE2B bdc1b17e022051f13b429e81cb28a4c580858b64a8e9fefe7629c8bb042780792ca6713f992deaf993c79f8d9fb2e5b6e314083b8701131e8b59ac0bc4fb20b8 SHA512 c475885c3231129f2341dab67f3edc1e07072b34059b7334bb785f8e14e430c1aaa6f8b41e9f99cafcdb6034026c2257b41b96c05f5374241e47f16da8d12864
+EBUILD jakarta-xml-soap-api-1.4.2.ebuild 1768 BLAKE2B b392d54b77298603b0aabce183ecebdc5bda073736856496d7985ab624c3ac58a5990a2336aaa4a87b3f43c7756c3d9c5118a4bc9ad01c4306eea305b7fe0d10 SHA512 82bcab94ff2d9c77248e86eab6b5d0c874cb08b1d1ea8111ecf9e9d2a8e46f6a46eaece87fc0df5a93a49ec95969ec39818a967f2e72fcb30e4213d185dca4e6
 MISC metadata.xml 323 BLAKE2B 4344e9fa5329a4353e4d1c824a0b64b4bcc4c9a59a9e085e2d4d4e075206b8137f36ec01673684881a93da8c4a4fca7f53770d9d0012e347a32e316582e4a709 SHA512 19672c91b0f5da04ad8d44d477a6192a010b57651eda3e6e4e68c0020ace835132a18a519015e49ab06fa4091a8fdb67a3cdeaee1058602c5009df086796a16e
diff --git a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild
index b22fd582fcc8..c93feda39bca 100644
--- a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild
+++ b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/eclipse-ee4j/saaj-api/archive/refs/tags/${PV}.tar.gz
 LICENSE="BSD"
 # Since version 2.0.0, the namespace has changed to jakarta.xml.soap
 SLOT="1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 CP_DEPEND="
 	dev-java/jakarta-activation-api:1
diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index 9c827eeb05e0..0c180a4a7d13 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,3 +1,3 @@
 DIST jakartaee-migration-1.0.0-sources.tar.gz 35116 BLAKE2B 98b587e5a51e8f3540d6f4570c60ffa5516801709e41260ac09f7fcabc9e96a3b9067e8eba6c5975c62e3c56585a1f334a21acc15627666e1616ced6f625c56f SHA512 f0c0dc5da4d3c5d4bae8fd4c3db349cb45b7c8d82ca0bb12f3c995e92d4b0893db111ab33ce812299d66904827adc91b22c49381625760fc05c1b10de76faa0c
-EBUILD jakartaee-migration-1.0.0.ebuild 2876 BLAKE2B 46a8801f556665922b81dc55f548429ecbeded7e6dd03cd61aee6806d29eedc6e8e106d0b010e03e72776587efc492fad8738f796d85cf473ccb4e34b65cee19 SHA512 87855b3f6e73782f902a7e68a9308849c923316a3fef72899aaedff4164254f70b5f1b986d67151f3360fceb648369b58a279642ed9b6ec1d344a3e66241409a
+EBUILD jakartaee-migration-1.0.0.ebuild 2875 BLAKE2B 5c1d22930a619cedf70f5ab662f97254d749f9e61b69cef1042cdf953ed88500760a584293f85ddfd6092e16cb5da37a6e338bd8774248a30b6a356bc1b65977 SHA512 437f3185594bcc8450f8f000ae300bd178e82a4da58cb6a30c9412e387684a50d435e026d28712d6d06c675055ea23f0fa85f9f18bc0290116a6ad8010bae1e3
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
index 405fd366f61b..d2f4bdc8953d 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-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 @@ HOMEPAGE="https://tomcat.apache.org"
 SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jal/Manifest b/dev-java/jal/Manifest
index 731b88ce127f..cb8d1b236b10 100644
--- a/dev-java/jal/Manifest
+++ b/dev-java/jal/Manifest
@@ -1,3 +1,3 @@
 DIST jal-20031117.tar.gz 48793 BLAKE2B b7cb51f5adb2b0f2fc4e03c9adf826519accee43aee3d98be0139439408527618af9e30b63c1e439a5defe4c74a0185ea48e9fd24235a319e9571fb8764e080f SHA512 0cb6cbd5e80d38dfbf57417b756dbc3bdddb2a28c4cbec292799ee71ac86cff3121f1e09e86f976f6562dafac54835bdd58780e4f1ffe733897b6d6ef053f95e
-EBUILD jal-20031117-r5.ebuild 1079 BLAKE2B 139496cd711ac7f710d391445fe7f0dd9e579ea61a5654a4a4be9af2c597b62bd8b098a6b0a38a8496742b7806ded4620bc909a9f8fea43fb4520b9aed3f3e03 SHA512 ad0c21c2c75426e8e37b59682da2f6e79f45317232ba15229193e30d0d0cfc1f7838c507255889525fd1808a8a7802e7e6a4c9f8f4deadb6ae9a38a725c72688
+EBUILD jal-20031117-r6.ebuild 1052 BLAKE2B c0a2ffe2e9b783de798d5bb014df174a1b5fe7cd5e5db33878075dac96b16e17c949e3489c8b73d43218d9c8104361d3b8b3bc990ba3ea07051e9e29ec06bd42 SHA512 60ca5eadc41bd29a4cc0543ef6ea8fa93901a71e39cbdb74e56c1dd5d070685a8343d72d8771bb52eb2c68be48ab972211eca614818aab745e593969169c07d0
 MISC metadata.xml 549 BLAKE2B a1f9b88d1930fa34d04a62d2f927f85f981edd46abe2a5a210701a223982abe059c27ee6ef61cf6efe06b0baec457982b5871df4ceabd51068e9bd92645cf9af SHA512 1e30ba295c2d7b008bedf56eaf212266359ca2ecb82206be5e542c44b5912b3ca0f4de8afbc45dab628a35bb3b6d5b2974a596878ecaca7b9054ef9ceaa35028
diff --git a/dev-java/jal/jal-20031117-r5.ebuild b/dev-java/jal/jal-20031117-r6.ebuild
index f3d33be5161f..f8f5bb559e77 100644
--- a/dev-java/jal/jal-20031117-r5.ebuild
+++ b/dev-java/jal/jal-20031117-r6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
@@ -15,20 +15,18 @@ LICENSE="HPND"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-CDEPEND="dev-java/ant-core:0"
+CP_DEPEND="dev-java/ant-core:0"
 
 RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*"
 
 DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
 
 S="${WORKDIR}/${P}"
 
-JAVA_GENTOO_CLASSPATH="ant-core"
-
 JAVA_SRC_DIR="src/jal"
 
 src_prepare() {
diff --git a/dev-java/jansi/Manifest b/dev-java/jansi/Manifest
index 734052c8fc0c..f12324103ee6 100644
--- a/dev-java/jansi/Manifest
+++ b/dev-java/jansi/Manifest
@@ -1,5 +1,5 @@
 DIST jansi-1.13.tar.gz 253219 BLAKE2B 89fc81710bc0860c717241c97fe2e7a148ccbaa5fb1e7db30b978aa69cddccbc9ea45a0e30ef384c42a741d707f5eab73ce8b2a76e1095c66a2c95f9088f28f0 SHA512 9c4bb0b7435c102068718e039900828994f1ba60ed44307eb726eb91a2884bc406688c2747635b9353f3bd68a6bf0e7c082a4069343b59efffc900f59c563fde
 DIST jansi-2.4.0.tar.gz 225579 BLAKE2B f07dfde9b789d62ec31999632e35609143289c5ab0972ce7cb931dea72ba41e6f2b9b74f7b3d82050e9ed4abd89386040d5268c408d787d3edd49fcdf0cce965 SHA512 4172b264463b847d6008dfad5c80246b029c7add2fd659f4b1c636891a86860f8f5ddd0ce0a5150065faeae72b19682339dda2d019c82f45d8f1be7a547e4558
 EBUILD jansi-1.13.ebuild 946 BLAKE2B 93adfeeca34d5c12afb71ee93d27f86068d550d45c4017dc80a1b5c47d868edf3d1eae1794d30c7dd6d5f962e496410a37da33183a74d96baac8604a2ee875eb SHA512 085e83dfc7e435bf2824fb196a4cf4fc276befebab7e89a0a6c63281323da860202e4278fc5e797759452d6a7a827820c7325e63436505d6e5f92f30dfd432d8
-EBUILD jansi-2.4.0-r1.ebuild 2347 BLAKE2B 0e50d0695d1dd5810654fa2aa9d2d96630d9e551a9e3cef788d2dca79213775fa73dcac612da58af21e799ad373731a126d61288096a352fac53b403d46f8da4 SHA512 ff09eb4c4a019443991f41176b6bb22a346f6f02edb6a4d18ae067d9c39acc586d1be560c35fad4029cca9c43ecaeec450afbfd14f722ddff68c5fe2407b82ba
+EBUILD jansi-2.4.0-r1.ebuild 2343 BLAKE2B 079672b4d2e2229d2ba952966352a5e95abfc6b39ffb14a9b116d44e4b586ab8412a17e100ebad3f1a4d6a2c93de28a8e72468f67efa7067afb38a9aa11b2159 SHA512 c189dd1442e62cc041b3fbcec1a7832dc7d8fed47bcfd3d4a98ba12ee4d920ab8dccae8a621a73aab03dfdfb958817ee17430150742fd41bc3c171687d8795da
 MISC metadata.xml 492 BLAKE2B 6620d0d7d7c5cc16b029617d431785e423a84ce8d23e06cc7a7a88c876d62223113be6c867d46b3a8537e3376174d00e2e3db19b3a178354140066a37da9956a SHA512 a460cd0627fa5d6ea41178f6268454f3841e67bbabaa7426d9d0e96caf941881694acd88e6c9a038ad5eafd46c78f7b0a29a3308e13be676f26d73e9fd9af79c
diff --git a/dev-java/jansi/jansi-2.4.0-r1.ebuild b/dev-java/jansi/jansi-2.4.0-r1.ebuild
index 75e764ffdbfd..7974adb4db91 100644
--- a/dev-java/jansi/jansi-2.4.0-r1.ebuild
+++ b/dev-java/jansi/jansi-2.4.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/fusesource/${PN}/archive/refs/tags/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/jargs/Manifest b/dev-java/jargs/Manifest
deleted file mode 100644
index b7ec010946c1..000000000000
--- a/dev-java/jargs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jargs-1.0.zip 202051 BLAKE2B dbf74d90a5c229f9ca1ba42c8d0b3b35404b3eb7c5dc7af0a76fc222465707b9dbfe44fef63cb1ffbc64821fa2f0c7e8144466e44de9bbf84cf198f5a107e31c SHA512 c121a8850c43fda1561df2ead211d526596b3aa8d01074df86ef0fa68eab83021fbb99ba16f05a0a20185b027f820643189c591bc8b79fb29d579eff4745b359
-EBUILD jargs-1.0.ebuild 556 BLAKE2B 6003311771e030c4f2dadff72c08aa22c0b984a72786d2bb61d07beb22796aad8127a242591e944fc56604387f0c9072dffdf404431eadfe2bd38e18c3fd474a SHA512 4312ddf7383efa9b098e7f9c6746f49bdd77242bf910f6196eedfed2c7531f8b23f7f3b6fa9fe32dd420a60787e85222bf60618373ae371602950e4db95328e1
-MISC metadata.xml 377 BLAKE2B edee1e237b26fa4c764e3bced2a1335e09b0ddde343293647eb1fd53a7876c6f95c93770ff3dc8b6b21c41ae7cae1296b3c8fe428abb550d5492baaf8ea7f5d8 SHA512 87ce2f8c6d80ea639ffbb7df4a7c0bca4f11686eb2346051eb5e2dc3bdf7aff118f6b15cf15783ab3afa41aa11f15ef7ae46f26e452636785c125fe2a3f86768
diff --git a/dev-java/jargs/jargs-1.0.ebuild b/dev-java/jargs/jargs-1.0.ebuild
deleted file mode 100644
index 41dfa42c8715..000000000000
--- a/dev-java/jargs/jargs-1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Command-line argument parsing library in Java"
-HOMEPAGE="https://github.com/purcell/jargs"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}"
-
-java_prepare() {
-	java-pkg_clean
-	rm -rf src/jargs/{examples,test} || die
-}
diff --git a/dev-java/jargs/metadata.xml b/dev-java/jargs/metadata.xml
deleted file mode 100644
index ed361ad4ae26..000000000000
--- a/dev-java/jargs/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">purcell/jargs</remote-id>
-    <remote-id type="sourceforge">jargs</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index 4c9718fa440f..63fe429cab9d 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -2,5 +2,5 @@ AUX java-service-wrapper-3.5.25-as-needed.patch 7061 BLAKE2B e3dd530192faff52f05
 AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1260 BLAKE2B 6d48e0ea2537343f76d6c7114c99aba4a9887bfba1b184076f8fae636f3888c8494251d6022946f2632ea24d1cb8b03030caa9de71ae21b8a7f1fc3e9acacf64 SHA512 1581a01ec1e4a352d86939e43e659c86fe8f99420e67ded44ed8ec42462b35a540b7763a8d1c055d8710dae422b8163d8ff650df016779f68ec6672cd8fc1150
 AUX java-service-wrapper-3.5.25-testsuite.patch 463 BLAKE2B aa5f7e4e298265afd227d2eb0edede37650bb8dfa1c7a8e9a18109f34eabfb5ddc7b9db67c2922403b0448997cc96d8e83c96b62974b25da22a624d91dc500cf SHA512 c058363d17e0594ccce355183358d016acf8ec06dd88ff3dc3b360d143cd56fd1a70b5d7d9f5bf774451ea0eed5a78752c8b3fcc32422a1a97d52eb43e057e91
 DIST wrapper_3.5.25_src.tar.gz 556678 BLAKE2B bead95eb2feebe0c22f8c66ca948185c320a979e498fb5156de576d443ba6e3375efb6244a66db6af101fa7dc459d983b51631fc237ad4578505be47059cf2c7 SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4
-EBUILD java-service-wrapper-3.5.25-r2.ebuild 1402 BLAKE2B e3c683aa9f2e18ef85f60d9cdea56cedf23a43ade7b9eafe734fa681a9f8d40447ebb84d92ce753a76c8bd5fb18750b5a650553d88a1bf6520050cfca43a6fc2 SHA512 31c53a9f6c76a1dd679fa353da0e23ce12b4303b94131575a0be1d4e8718e08a90016832c97ee4079d41621accc5914fbc191cc09c6b92afc19dbb9216577210
+EBUILD java-service-wrapper-3.5.25-r2.ebuild 1407 BLAKE2B e05a6930c0ee852a43df15a7cadc1011663ab8db7849e45461a3d0fd1db43b379e254f1fcae482451a85c067eed0c851fe923c7dbd0c6785cb3adce9d92b9953 SHA512 60b08f6ce759bb8a724b1c50d5dd1e5aa8ca76ce95602dfae7c21d6567d9ff9719d5528e0d715842158f2f2f7c4f3147b7f646247cd4538e42eb0954ae98c705
 MISC metadata.xml 640 BLAKE2B 1ced5abe1a0ff9b141f3a6020cd6352b02cf228524b694f36bedb7ef91a892ee471235b36e81e03fbe98eee6f28f680821b15501447b58c8788129eaf8e6b39a SHA512 4d9eb54f0328aa00380b40a0ead3fc43e552b71e8d4b5279341d5249a9615c3c161ca19295d6f586c43708f9e29aaf3799799243dd277c8822b95d7c1f82afd1
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild
index 5ad4333b0e62..e09f0c051ef4 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="http://${MY_PN}.tanukisoftware.org/download/${PV}/${MY_P}.tar.gz"
 
 LICENSE="tanuki-community"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="
 	virtual/jre:1.8"
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index 6df87f82d765..e30fb8485229 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,5 +1,4 @@
 AUX javacc-4.0-javadoc.patch 420 BLAKE2B 8f26c37e26f8967cf527a6f7f4b6c5396bffb5cde4cf9aad292217d41e614800cac438b92971e0c942f71ace4f551db30bae873e83ecdcf2ee7940153fca50bf SHA512 e20554696a27137b7f9c086f7d8c4854742fa1e14ad84e2157cecebdc65f2fb6726a0eaaff7bf3f1113a6fade51c5825b86641b61b917a4fcdd96663a8830438
 DIST javacc-5.0src.tar.gz 810123 BLAKE2B 6833e79a33c7ae8b28902d1c372162a2f9e326629f0d4c1936a8c3638d3aa3f6bd5713aca8398ba5f1ff963fe585eb683fcd3009602ee592ba79692c8ba0f3d6 SHA512 91896a0affac1c4fd00a093a731dfd02bda548d1a4d83e1077ed36a67f4f9deab0ce9f2d0212fd4c08ab00065d3029533adbafbc026a22ca071285093bd3bba6
-EBUILD javacc-5.0-r3.ebuild 1402 BLAKE2B 3357b3e97b8d5cbafb588809e6c1e7faafa54f35ab9f910771e0870b2be425998efa2a7ab5376b0f5f0ff67a8822b2f88cf4e6a41ea0a1b5a02d95972839c169 SHA512 74fdbc40ff51b8302639a242e31dd03320832705d7566524ee27be7039ec7974b94625788f4569b45ded38467c6675085ff2b0db3f239d82554fb4af7dd39ebe
-EBUILD javacc-5.0-r4.ebuild 1410 BLAKE2B 11eed861cb1f38d44bf799d3228598245fff56933fa5a04a95910ecfa0b880aaa6fdad56e7f8e59e74edeaeee1549ad3e4c9403444895e1ac6cb0d7c83f52013 SHA512 0ebf0b87a9a7e97784d987a60a1737ffc6a2b50230d3e2314a8fb59ad8c5e2f583530571582ef43083abecfde758e0db3d46610de4a8b082fce7a10f77bdf0c8
+EBUILD javacc-5.0-r4.ebuild 1406 BLAKE2B a14d39d675a7eec5ae330c6aeabf80b2f9980bcc589470a30dfe17bfa762f09cec0a967eee0a153cd10d276dd440761d14273602e1835d0f6bf12c459f3afb7d SHA512 7c043d24cbc0eea4c96b20bb9944471685256d7f8ba1c95c9d27772cdacb6bf6a9e68d8e16fbba6d92061f97dc1c9aee41b89f881f64558909f564f95ec050a4
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/javacc/javacc-5.0-r3.ebuild b/dev-java/javacc/javacc-5.0-r3.ebuild
deleted file mode 100644
index 2ee54cf55c8b..000000000000
--- a/dev-java/javacc/javacc-5.0-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
-HOMEPAGE="https://javacc.java.net/"
-SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-CDEPEND="dev-java/junit:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	test? (	dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-javadoc.patch
-)
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-EANT_GENTOO_CLASSPATH="junit"
-
-src_prepare() {
-	default
-
-	rm -v lib/junit*/*.jar || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar "bin/lib/${PN}.jar"
-
-	if use doc; then
-		java-pkg_dohtml -r www/*
-		java-pkg_dojavadoc doc/api
-	fi
-
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc src/*
-
-	echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc || die
-	doenvd "${T}"/22javacc
-
-	echo "export VERSION=${PV}" > "${T}"/pre || die
-
-	local launcher
-	for launcher in javacc jjdoc jjtree; do
-		java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
-	done
-
-	einstalldocs
-}
diff --git a/dev-java/javacc/javacc-5.0-r4.ebuild b/dev-java/javacc/javacc-5.0-r4.ebuild
index dac3ebd544ec..0df7bc24b7f8 100644
--- a/dev-java/javacc/javacc-5.0-r4.ebuild
+++ b/dev-java/javacc/javacc-5.0-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 CDEPEND="dev-java/junit:0"
 
diff --git a/dev-java/javax-inject/Manifest b/dev-java/javax-inject/Manifest
index e4d152a92c8e..0c1bacd6d870 100644
--- a/dev-java/javax-inject/Manifest
+++ b/dev-java/javax-inject/Manifest
@@ -1,6 +1,3 @@
 DIST javax-inject-1.jar 10928 BLAKE2B 3294e302dd1af079d1bc57620dcd4b46169498a1619711837e329dc682aae4e204bc1d6733c9e7dac3fa978ddc183bf6d9833f5d0524d31c1ac95db8c81f2648 SHA512 8bcfae4933073c212c3370a36cdacbff0474648720766df5d0acfc2dafd3307a514b7fb49c08762d32bfca9d8afce47cbfe1eba7399b459b6543472ac9de715b
-DIST javax.inject-1-sources.jar 10928 BLAKE2B 3294e302dd1af079d1bc57620dcd4b46169498a1619711837e329dc682aae4e204bc1d6733c9e7dac3fa978ddc183bf6d9833f5d0524d31c1ac95db8c81f2648 SHA512 8bcfae4933073c212c3370a36cdacbff0474648720766df5d0acfc2dafd3307a514b7fb49c08762d32bfca9d8afce47cbfe1eba7399b459b6543472ac9de715b
-EBUILD javax-inject-1-r2.ebuild 584 BLAKE2B 08f11573cd4ae71aee344051c4d5d51d508cf3bfabc8d2fad9ff8c9e267514abee7f40890fa308fefa96001ad833a7bf97ac3fa8bfa2368dabce850b71eac047 SHA512 86d614120b41a3ef3e6bdadb7772537a60896946150a065c27850650c9a72d2ca20e38f0e3bbe19568922e6e820cf93d0dc26269c1615969860d907cfd0e63d2
-EBUILD javax-inject-1-r3.ebuild 570 BLAKE2B b618a004012cca3a5414a96896e65d574875e3c7c489e0fdfc8e9bdc3eaa6aeca52242dbd2e790d7fbf047c657a3e3f4a9843bac9e5e5c4de43b67432970e1ef SHA512 42af9eb1625f1860aa3003f4876cd5e143c6977777ed9eb8084823cebe76372f788ae31b4d0fb038ef235ab160310928b9817fa27c08d47d64d51da1139c3f51
-EBUILD javax-inject-1-r4.ebuild 576 BLAKE2B e7065833a4ac47a090c4c0cb66182abbbc913dbbe8c3fbe2c872b6335380ad5dd4780206c1991a643fb8ce1a98b4f5e18a8c183a974fbeb21b7d290544a13452 SHA512 bf9c9708051b248b70616de1e810c9482a17a886ccf157cecc8171c814bbc6626a2959f7eab612965366c769035a87fa1cae6c98c34b45f69a9ceaa200f2291f
+EBUILD javax-inject-1-r4.ebuild 572 BLAKE2B fbf12ffdaecb13e08a94e1d03bf7074120347cd206e4d921af11ea32b53cb327dc4cd2be8e6ba8e124440fdde6e885376c2a4325f8576b69b6791158cf6117a8 SHA512 e97a8083e764265e71570047d87b15e324dcf35af60041c09d6e2b47b4d964bfd5e3bd5549eb8e81e4040cee71fbdece680f5e6ac1caa8fa6f4e421e0f548916
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/javax-inject/javax-inject-1-r2.ebuild b/dev-java/javax-inject/javax-inject-1-r2.ebuild
deleted file mode 100644
index 1e5e418d3cd0..000000000000
--- a/dev-java/javax-inject/javax-inject-1-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="${PN/-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Dependency injection for Java (JSR-330)"
-HOMEPAGE="https://github.com/javax-inject/javax-inject"
-SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-IUSE=""
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	app-arch/unzip"
diff --git a/dev-java/javax-inject/javax-inject-1-r3.ebuild b/dev-java/javax-inject/javax-inject-1-r3.ebuild
deleted file mode 100644
index 4778a718f69d..000000000000
--- a/dev-java/javax-inject/javax-inject-1-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="${PN/-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Dependency injection for Java (JSR-330)"
-HOMEPAGE="https://github.com/javax-inject/javax-inject"
-SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/javax-inject/javax-inject-1-r4.ebuild b/dev-java/javax-inject/javax-inject-1-r4.ebuild
index 24a0d7ec2875..44283325ca8a 100644
--- a/dev-java/javax-inject/javax-inject-1-r4.ebuild
+++ b/dev-java/javax-inject/javax-inject-1-r4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sou
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/javax-mail/Manifest b/dev-java/javax-mail/Manifest
index c4e1bdc715b6..33ffa5b0d328 100644
--- a/dev-java/javax-mail/Manifest
+++ b/dev-java/javax-mail/Manifest
@@ -1,5 +1,3 @@
-DIST JAVAMAIL-1_6_2.tar.gz 1107140 BLAKE2B c0f84bad014af1146bc2bb7f4f58924edf8f6762c222f979d1fec787e8dc93861691cd95c23eb663924597277607d2ce5058c232ad1e8626ed2d0f1e17c34a98 SHA512 6c07490fabbcf5969a2d8946bd9f38187cd33b864985e8183f15d9e1ba1508e445f2050633d9054f9ad546fede7790e64d31956bf23eb2ff8dae45129bd43534
 DIST javax-mail-1.6.7.tar.gz 1854297 BLAKE2B 70dac40cdf67c413db3370f9cdf5b9786fcebce4ba12725758bf6120a2b6874e079a5beef08ee1190e30bfe2f14ad21e73ef1710c982e3f658a2f2f11e524f2e SHA512 9e8754839efb43d14ade6189428c4b86f5fc180e2e18b4e121a9463aaa52c34a431dbf05a6264ef8221faf0b09cc08f914ff758cbb3931df97cea1a897c54c08
-EBUILD javax-mail-1.6.2-r1.ebuild 2066 BLAKE2B a1bee101bc627a3a90e48368eb20662bbedda45d573e045869bb1bd4a9f336dd047c2e5d42c830852776335e75422af6b8048fb68aeea22d131c678a170a1de4 SHA512 2b6265523669dd4d7c5eaf68e67ea2b34a141bc07a44f53f229144ab1d19a9a55c2242f834285594ecf8ce8140797d68238668eb9e12309752177c161280a0ec
-EBUILD javax-mail-1.6.7.ebuild 2055 BLAKE2B 279e78b4dddb2bb03502ada8c94d838a42ab67ce5d870a9bee08966a425b78bf2804f3f4c0d46d3f6af04bab9140486e668f7e97b9b3c4b92bcffefc91d30e37 SHA512 43a435d6c4866bc5fcdb7db97995947b2f0f254be98c5ea83c41f1a71e4ef448426fe263488cd30e41a7a01419282d2718b301e72abc6656076f57d30d2be32f
+EBUILD javax-mail-1.6.7.ebuild 2051 BLAKE2B 665e0612fd271172dadcb8edb5b9b33e2e61c6b7eb1b12fb41c7d79dfee933c5fa3a01fea64989f07819523880f09d03ddce2cecdef35eca1bb546f3c2d3cebf SHA512 c9b34da68b53e3a773b7bffce383eeab5e21a6fea31a2dd2ba2b2129df83e0dc4ad459252ace64d7f720db79f13d0332ea4acefa0e3674149e8630289a390210
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/javax-mail/javax-mail-1.6.2-r1.ebuild b/dev-java/javax-mail/javax-mail-1.6.2-r1.ebuild
deleted file mode 100644
index 81ac05785694..000000000000
--- a/dev-java/javax-mail/javax-mail-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom mail/pom.xml --download-uri https://github.com/javaee/javamail/archive/refs/tags/JAVAMAIL-1_6_2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild oracle-javamail-1.6.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.sun.mail:javax.mail:1.6.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JavaMail API"
-HOMEPAGE="https://javaee.github.io/javamail/"
-SRC_URI="https://github.com/javaee/javamail/archive/refs/tags/JAVAMAIL-${PV//./_}.tar.gz"
-
-LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-# Common dependencies
-# POM: mail/pom.xml
-# javax.activation:activation:1.1 -> !!!groupId-not-found!!!
-
-CP_DEPEND="
-	dev-java/jakarta-activation-api:1
-	dev-java/jakarta-activation:2
-"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( ../{LICENSE.txt,README.md} )
-
-S="${WORKDIR}/javamail-JAVAMAIL-${PV//./_}/mail"
-
-JAVA_ENCODING="iso-8859-1"
-
-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_prepare() {
-	default
-	mv src/main/{resources,java}/javax/mail/Version.java || die
-}
-
-src_test() {
-	pushd src/test/java || die
-		# Selection according to 201,202 pom.xml
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			-name "*TestSuite.java" -o -name "*Test.java" \
-			! -name "MailHandlerTest.java" \
-			! -name "DurationFilterTest.java" \
-			! -name "CompactFormatterTest.java" \
-			! -name "CollectorFormatterTest.java" \
-			! -name "WriteTimeoutSocketTest.java" \
-			)
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	popd
-
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/javax-mail/javax-mail-1.6.7.ebuild b/dev-java/javax-mail/javax-mail-1.6.7.ebuild
index 63b23faa0a7e..985b9effbf4a 100644
--- a/dev-java/javax-mail/javax-mail-1.6.7.ebuild
+++ b/dev-java/javax-mail/javax-mail-1.6.7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/mail/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: mail/pom.xml
diff --git a/dev-java/jaxb-api/Manifest b/dev-java/jaxb-api/Manifest
index 026fbf3a6ad3..32b28c50dc40 100644
--- a/dev-java/jaxb-api/Manifest
+++ b/dev-java/jaxb-api/Manifest
@@ -1,5 +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
+EBUILD jaxb-api-3.0.1.ebuild 1153 BLAKE2B c9ba7c100acff5546a1a84c7d4c44459218bba27d183df4b17f51f61396ecbc4b1f1bcbcfdef146c607c5bd2474233116b12bd713c999af83fbf7cd311fe6a52 SHA512 36e32cb358e10716831a33daa388c2fce8012c0cac637e20fcd412e946df8a4395f64db46cf5a82ebbf77d40a2d861cf0fd37fd4cc59c41c0cc36ac90b1dc955
 MISC metadata.xml 372 BLAKE2B 989cc55b0f2734eaffc192a47e27d159a4dcb39b4383c9a19d5a331e2f30d136e7db69e67533d1e6823433ddadd08d127372fa4be0bbf20971dcd9d4d3eade82 SHA512 75fbacfd6c24164733c2382ffef0e56545b304af647880c10f1de7ac599062fed293f9f907097fcb0afe566b370cc9e74887d8450af6f196ca34087e4e0c8153
diff --git a/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild b/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild
index 1588cd3601b4..857f9ebaa6e0 100644
--- a/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild
+++ b/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # 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="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jboss-jms-api/Manifest b/dev-java/jboss-jms-api/Manifest
new file mode 100644
index 000000000000..1c4415480b24
--- /dev/null
+++ b/dev-java/jboss-jms-api/Manifest
@@ -0,0 +1,3 @@
+DIST jboss-jms-api-1.0.1.tar.gz 63730 BLAKE2B d97bea2fe9a61bed91552479f6ec37646afcade7a723d10bccd78d6f8e38f1dde11619a1543d00589065df5e5a9e4896a66abb4a9cb1d34406b153456966f137 SHA512 0cbf656fc450983730f2e168da9558eefdff696426caf4bfa61ec5db1051573635aa32bfa87b705f675e61df5d787771ed1d884e6713e1eb454969de92e98902
+EBUILD jboss-jms-api-1.0.1.ebuild 1077 BLAKE2B c9bf56caa40d6bc600c9fcfb6dde17398782afef38c78d545f027c1f98754ba4489aa223c12cd0e3971c07eb25e49eded08d50ea0c287a3d7d5128eb3c26ab23 SHA512 e53a4cff040f03336d81849d58f53f624fa55b1cf4ebab6fa56db6eb87b88df9f9cda296f6e39a87425fd5d8774168a773286a108c307ae70775e1170911b6bc
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/jboss-jms-api/jboss-jms-api-1.0.1.ebuild b/dev-java/jboss-jms-api/jboss-jms-api-1.0.1.ebuild
new file mode 100644
index 000000000000..015ca5b9e7fe
--- /dev/null
+++ b/dev-java/jboss-jms-api/jboss-jms-api-1.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jboss/jboss-jms-api_spec/archive/jboss-jms-api_1.1_spec-1.0.1.Final.tar.gz --slot 1.1 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jboss-jms-api-1.0.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.1.Final"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JSR-000914: Java(TM) Message Service (JMS) 1.1 API"
+HOMEPAGE="https://github.com/jboss/jboss-jms-api_spec"
+SRC_URI="https://github.com/jboss/${PN}_spec/archive/${PN}_1.1_spec-${PV}.Final.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CDDL GPL-2-with-classpath-exception"
+SLOT="1.1"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( LICENSE README )
+
+S="${WORKDIR}/${PN}_spec-${PN}_1.1_spec-${PV}.Final"
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/glassfish-transaction-api/metadata.xml b/dev-java/jboss-jms-api/metadata.xml
index 4221e170cbc0..75321cfb5598 100644
--- a/dev-java/glassfish-transaction-api/metadata.xml
+++ b/dev-java/jboss-jms-api/metadata.xml
@@ -3,6 +3,5 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
-		<name>Java</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jcalendar/Manifest b/dev-java/jcalendar/Manifest
index 2c9081e55fe8..e7e6134fff77 100644
--- a/dev-java/jcalendar/Manifest
+++ b/dev-java/jcalendar/Manifest
@@ -1,3 +1,3 @@
 DIST jcalendar-1.4.zip 982517 BLAKE2B f82ba64d26aefe44a197d78998427af2173c41d1843e080f12c35984c18be58235ca115bc1f53d17a035e4c1ab7bd590b4993b0509e7408a4af50f4ec4b4697e SHA512 aeab6f98451f4fa8718e127de6c0af345410bebbd1de4fa1ca4b9e7f5a22908f9e455ba96da34ef9e8691b4d462e8a01dbd7881b6565a0f3a65d18fe58b68d9c
-EBUILD jcalendar-1.4.ebuild 901 BLAKE2B 090da23a2a72cab5251805ff7d50a5ec85f7de27e71e9a9687e512df4950d512fef715bc66f8fe6fb9acf96789d2321e0736c6e793a3894fffede13bca1382fe SHA512 12165e035a51dd4f3a6916e0cfbfbfe054749eb33c4b28440ba10f7960099f4945b077f2955b1c3b98437fee1e270d9dbc85520ff26995002a8e667188aac859
+EBUILD jcalendar-1.4-r1.ebuild 920 BLAKE2B 539afb6e0a5e5403a2ade349bdacaf143d577f15381e8a7ff353f7adbf356013042546582f04f84740da807fffbe7e5583e982d75914804f1ed88f3f6063a02e SHA512 8bbff1c750dbb220e39942d315c3748e81a5346a1d065b2e53c4b6dd076be9a35c781e2a47eca5d4c55e0da64ec2c03b8eed16d124330be15238416488f00a5e
 MISC metadata.xml 643 BLAKE2B 8912f34c6db67cfc93128de60b468ff57f33fad59d320c3bde5e724480e3f029772c6709be554ede57151b9295ffeccdf5d2d31b0a6ca0d46249143ae966ca4b SHA512 0fa2211e2fcea4cd103bf43a1903ffaf0bd9432328b9032d30de51c1be238e8aa2b2c5ff40cb6439a864aee10992dffe77d86af846252a728df10e637f7f2e13
diff --git a/dev-java/jcalendar/jcalendar-1.4.ebuild b/dev-java/jcalendar/jcalendar-1.4-r1.ebuild
index 1833038cc4a9..c0de4b6cfb3e 100644
--- a/dev-java/jcalendar/jcalendar-1.4.ebuild
+++ b/dev-java/jcalendar/jcalendar-1.4-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Java date chooser bean for graphically picking a date"
-HOMEPAGE="http://www.toedter.com/en/jcalendar/"
-SRC_URI="http://www.toedter.com/download/${P}.zip"
+HOMEPAGE="https://www.toedter.com/en/jcalendar/"
+SRC_URI="https://www.toedter.com/download/${P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="1.2"
@@ -17,14 +17,15 @@ KEYWORDS="amd64 x86"
 
 CDEPEND="dev-java/jgoodies-looks:2.6"
 
-RDEPEND="
+DEPEND="
 	${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jdk-1.8:*"
 
-DEPEND="
+RDEPEND="
 	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
+	>=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
@@ -36,7 +37,8 @@ EANT_BUILD_XML="src/build.xml"
 EANT_BUILD_TARGET="jar"
 EANT_DOC_TARGET=""
 
-java_prepare() {
+src_prepare() {
+	default
 	java-pkg_clean
 }
 
diff --git a/dev-java/jchart2d/Manifest b/dev-java/jchart2d/Manifest
index f9b282147711..35ed03954dc9 100644
--- a/dev-java/jchart2d/Manifest
+++ b/dev-java/jchart2d/Manifest
@@ -1,3 +1,3 @@
 DIST jchart2d-eclipse-project-3.2.2.zip 3203952 BLAKE2B 99f3058184e02b682e288675edd68c7f53f2961a1888d096c7834d011ce279b9cfc8228f801e8fc4d3b20250875c5db59cc945ab46ae62c28b85545082e684ca SHA512 aa369b78aced9f7884d51f5298a6772d00cd4003d970e0bb401b717b4bdd2fdd543cf9a382edf7c9a6d1837cedb483a04aa89aac1e66d6e365655e99c76ee812
-EBUILD jchart2d-3.2.2.ebuild 912 BLAKE2B 1d03ce8959dd57b2d714e8afec81d740054a8b113c1564e80ec37e720c5d1907a9acdb21f9f1cc168a173f42f2e83c813d1485f0ff4aea3838d29f85f606f95e SHA512 abf365afbd13a3f2ccc937ff68926ad9abf0e53deb8c96b24b3dbf0a8c361813e51d4e9b0cc95a0fa145062c36a51b412c0d037b75fcc8442df4250002e1ab49
+EBUILD jchart2d-3.2.2-r1.ebuild 1277 BLAKE2B 8e7935c0ae45ce1c550389f414a42c46220e6f429179d134da37a3ada3c6bb8f48ec68274bdae7591ef034921f94963824e443cca51ff2c19cc1cf38740906ae SHA512 7517ca26379c108b84fde30d29e16ed48854c6b74f08390873056bddd5967d28d56c9cd5efc63503558cdad3101e5e09cb96796106ff4fd51539869609915b8d
 MISC metadata.xml 888 BLAKE2B a0930cd934de146950dba51ca961f8b1679e37062f24fe4ad2c2a375809da6a2489855afd638552652a3aeefd9fd20dca50250ba0022e32372491a191e09e51b SHA512 b88619b0447efbd55015786afa2d2ab02a23f29cb16b6d2b78123bfcb1ca4f500d0124061856d88ce4ffd5773c104e0ae043e1f6826e65e1b8242e9bb3fedaaf
diff --git a/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild b/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..fe2e13524222
--- /dev/null
+++ b/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="net.sf.jchart2d:jchart2d:3.2.2"
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A minimalistic realtime charting library for Java"
+HOMEPAGE="http://jchart2d.sourceforge.net"
+SRC_URI="mirror://sourceforge/project/jchart2d/jchart2d/sources/jchart2d-eclipse-project-${PV}.zip"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="dev-java/jide-oss:0
+	dev-java/xmlgraphics-commons:2"
+
+DEPEND=">=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+BDEPEND="
+	app-arch/unzip"
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( ../NOTICE-apache-xmlgraphics-commons )
+
+JAVA_SRC_DIR="src"
+
+# FAILURES!!!
+# Tests run: 212,  Failures: 119
+# JAVA_TEST_SRC_DIR="test"
+# JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+src_prepare() {
+	default
+	java-pkg_clean
+
+	# src/Bug3553696.java:3: error: package info.monitorenter.gui.chart.tracepoints does not exist
+	# import info.monitorenter.gui.chart.tracepoints.TracePoint2D;
+	#                                               ^
+	rm src/Bug3553696.java || die
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jchart2d/jchart2d-3.2.2.ebuild b/dev-java/jchart2d/jchart2d-3.2.2.ebuild
deleted file mode 100644
index 4e3f1e632d16..000000000000
--- a/dev-java/jchart2d/jchart2d-3.2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A minimalistic realtime charting library for Java"
-HOMEPAGE="http://jchart2d.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/sources/${PN}-eclipse-project-${PV}.zip"
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test" # Even the headless tests need a display!?
-
-CDEPEND="dev-java/jide-oss:0
-	dev-java/xmlgraphics-commons:2"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="jide-oss,xmlgraphics-commons-2"
-JAVA_SRC_DIR="src"
-
-S="${WORKDIR}/${PN}"
-
-java_prepare() {
-	rm -rv ext/* || die
-
-	# Ant tries and fails to build these outdated bug
-	# demonstrations. Did Ant's globbing behaviour change?
-	rm -v src/*.java || die
-}
diff --git a/dev-java/jcifs/Manifest b/dev-java/jcifs/Manifest
index 1417e4b641ad..2b2efd099263 100644
--- a/dev-java/jcifs/Manifest
+++ b/dev-java/jcifs/Manifest
@@ -1,5 +1,3 @@
-DIST jcifs-1.3.17.tgz 862091 BLAKE2B 67605ebd810caf097a9172c17f31d39c9e16af5885c706f7d8c2c2cff9b8e6a643174c9aaa8bd6aa06c816e312b7170a5aa06535f823a5c5b182e97beecccd0d SHA512 2fa1950f9ab6f0f3d45fd9b7866cc94993d1135f48d78ce357dca1d872746d22bff6097da8c418d0d11fd71d86b3fdc79b23195bcbab5bc460d8d0cca87efedc
 DIST jcifs-1.3.19.tgz 883534 BLAKE2B ede24f43018a4bf304019aeddb6cf789e3a01622d840dc3f6bfa45104b97a39d256807f766f14b3e215e53519f3838aabeb73bdf7897323fb41ca5ef2b7c9372 SHA512 24ea656469ac7a5666d28dcdf122c80d254af5317a704718d8848858a21b38c6efe9b977854a33130cdb57d2fc8324ac3ee01fb5443360899f9572ec41788eef
-EBUILD jcifs-1.3.17-r2.ebuild 794 BLAKE2B 4da988b2dc46f9b33b84a6a18b3309c40cb775c7c5faa6312d89d0ee7444e69831cfccb62d4c4f99713c7c98b1755732cd50234aba5f4429f68a5fb449144c49 SHA512 5fa03afb1988311c5398d01ef9af4618260af25ebc0deafb204378553037eb0243051c14bc372484e2b0995a1791d6352f7eba956b564748e03d48f8c604141b
-EBUILD jcifs-1.3.19-r1.ebuild 799 BLAKE2B 5602206e47b356a402b35a6243b23b1a3161c9836a9bbe03fa869b41fa24896f5608afbb4c78214985b3ad79702d26651efcfbd243645f5538a8c89b62e0eece SHA512 6c6f86e6c77fb5dec022b7bef80c5c89c3d8893b1afbf14d39d4b33ea54368585a1aef26c6acdc045873177f60e9ca85d500578adaaa0503f46fe7c3f9410c98
+EBUILD jcifs-1.3.19-r1.ebuild 796 BLAKE2B 4f7851449f0618e9f4457ec4a4dbb0d620f5c546bf9054b44f3fc6dff601181f5f447be90d440ee5310071bfb2378632a1a423d1c1c968605222e919c9d3a59c SHA512 b9b0435c98c1c6e898ddc8b4812f2bdc11bde89b06cc517305e59dec22c23c8f82b7ac67dbc11204d0168c674f61657e89bd612810cedf818069080f7c35e7eb
 MISC metadata.xml 548 BLAKE2B bc7c331f8d53556d450986b25180a144923c7a84dd0aeaff351c4603899d2664fd919f82ff6d9545331855889aa350b7b9d68e8963c2454a79dab7cf26904003 SHA512 339f5cabfc56e1c50cb6d2e1a55992bc593c31ed9b818cd1c071f4c5e07e46cf2c5699287ecf8e27e69ba3f48946856c31723fe9e26e37ef8a1a795f32b70a3d
diff --git a/dev-java/jcifs/jcifs-1.3.17-r2.ebuild b/dev-java/jcifs/jcifs-1.3.17-r2.ebuild
deleted file mode 100644
index 5a4129393d4c..000000000000
--- a/dev-java/jcifs/jcifs-1.3.17-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Library that implements the CIFS/SMB networking protocol in Java"
-SRC_URI="https://jcifs.samba.org/src/${P}.tgz"
-HOMEPAGE="https://jcifs.samba.org/"
-LICENSE="LGPL-2.1"
-SLOT="1.1"
-
-KEYWORDS="amd64 ppc64 x86"
-
-CDEPEND="java-virtuals/servlet-api:3.0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="servlet-api-3.0"
-
-JAVA_SRC_DIR="src"
-
-DOCS=( README.txt )
-
-S="${WORKDIR}/${P/-/_}"
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use examples && java-pkg_doexamples examples
-	einstalldocs
-}
diff --git a/dev-java/jcifs/jcifs-1.3.19-r1.ebuild b/dev-java/jcifs/jcifs-1.3.19-r1.ebuild
index b8169cb79866..2ccf1a0705d6 100644
--- a/dev-java/jcifs/jcifs-1.3.19-r1.ebuild
+++ b/dev-java/jcifs/jcifs-1.3.19-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://jcifs.samba.org/"
 LICENSE="LGPL-2.1"
 SLOT="1.1"
 
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 CDEPEND="java-virtuals/servlet-api:3.0"
 
diff --git a/dev-java/jclasslib/Manifest b/dev-java/jclasslib/Manifest
index 80a411d52396..4c283371eb4c 100644
--- a/dev-java/jclasslib/Manifest
+++ b/dev-java/jclasslib/Manifest
@@ -1,3 +1,4 @@
 DIST jclasslib-3.1.tar.gz 4630493 BLAKE2B 2dbede05833a6f7ff0f32194ea91aeb071615ee8562541d1b5abc2fc61c3f393bd93f5e444110a6a72df161d488cf21551af8208b1f391951b5ae7002ceb6ef3 SHA512 5c44043eb30ab32110097ef6b52f459bf4d512db71efc79aae99fdb6b9db740a7be1e6a59f6e3a233a3b303933ed90fe482c6b9c81d76de93af6c9724aad41dc
+EBUILD jclasslib-3.1-r1.ebuild 791 BLAKE2B 5c915ada703c8188fa22c13846fcc85344140355a40361f9158dec090bcc3f6764405abb02502b84405fed5cb123b7aa2cdffeba80b14414cf73d43590fc4f04 SHA512 a499200886f6f024702da032545f31dc3f9ab24ac08135e8b3b1b98a7505ce466687825ff461806e8b261b4851ff9b853ad08aaaa66954681cbaf83fcb21097b
 EBUILD jclasslib-3.1.ebuild 785 BLAKE2B d2074d2243658320d3c4b18b0a57306b23e8f7d1a0d9aaf26c890b153bdb8d3edf1b044b33382da9acd7f429700b952c9260b57f2a955bff78bc14ceb0e1dd9e SHA512 339dde0b536f81c8a1d3de60571b16c0a22801d29c264f4d6a22e12e1fb936a5ff2464c68973dbc90d56c2079c2accdc2420ebb0d6a3b49047789a17defe3ad0
 MISC metadata.xml 375 BLAKE2B a604e3c57ee7ec7fc9d48a15cbfeeec58ce11483275d250f5fbeb69d0343f41de2617770a2445c575ce0d66ff4619e4bd2e1a7911d117282e66ee5ea7bc5d9a4 SHA512 c3b644a00bf9a0c92cfdc04c4d03f3974dc151538f67925ab967b8e2e5ce8e3865129f01843cd2c55d23a85365e31d2bb526f6c4c2e4edca13381dabea29c786
diff --git a/dev-java/jclasslib/jclasslib-3.1-r1.ebuild b/dev-java/jclasslib/jclasslib-3.1-r1.ebuild
new file mode 100644
index 000000000000..5234a552cfb2
--- /dev/null
+++ b/dev-java/jclasslib/jclasslib-3.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java bytecode viewer"
+HOMEPAGE="https://github.com/ingokegel/jclasslib"
+SRC_URI="https://github.com/ingokegel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+src_install() {
+	java-pkg_dojar "build/${PN}.jar"
+
+	java-pkg_dolauncher "${PN}" \
+		--main org.gjt.jclasslib.browser.BrowserApplication
+
+	use doc && java-pkg_dohtml -r doc/*
+	use source && java-pkg_dosrc src/*
+}
+
+pkg_postinst() {
+	elog "jclasslib uses Firefox by default."
+	elog "Set the BROWSER environment at your discretion."
+}
diff --git a/dev-java/jcommander/Manifest b/dev-java/jcommander/Manifest
index 986cea368111..1842a931ec2f 100644
--- a/dev-java/jcommander/Manifest
+++ b/dev-java/jcommander/Manifest
@@ -1,4 +1,3 @@
 DIST jcommander-1.48.tar.gz 64544 BLAKE2B 29ed81d5f9a7e4ec193c8fa03cdd67481e9904898bee2730c585be6b6beb2e0ec37b31634513095b660655b8202c42077361318a83c1e016c9450d7d7ff30244 SHA512 1304bb14ecb89f9945e8219f3229941e556c7cccef52a2eb4e4663da9dbf9fa5ecec4914275a743fb7d90ca301153284dc76dd380903aac93db1507894d72a6e
-EBUILD jcommander-1.48-r1.ebuild 571 BLAKE2B 376eb664ff832f999f2284664fdff8844b1ef3b833ba0e3afcdf0c81cb5b4fa197b7ffc20aba0616b39ebf46d16c96b12e15481c4f08023de60b51fde61505bf SHA512 277b578a9af404ed7d2377960a51d1493c2b0757650d225abd559f17267ccbe284f789764854a765636ef95b45d7ed159b55aa4912853e5e6078072f6d1e5f7a
-EBUILD jcommander-1.48.ebuild 556 BLAKE2B 767fc257eb5f199fe390b870cb6b790276575e036b0e64aa5d0db28e79ad40b4195e33b183ee2ecbc23ce95ed431858fea64560e0cc8a8a08b07a7c891a707d2 SHA512 3380f05ba85da50799d30f7c2f906196ea54ec92d3672c7436272d4683c6d7701c0ee92fa4d1eae560927989512ca073abe5ecab795428ba863135b0b5e068ff
+EBUILD jcommander-1.48-r1.ebuild 567 BLAKE2B 395bf3d9bbabaeb225183948d18c0e6b61ba522d45ea577918b6f332190726961c0fc5681dddb8acfbcce083ac8b42cda3e4871dce5440d21f6a28f9260a4f59 SHA512 9c859361f523fd45522e0c76a8cc0910f6ef867e5b58c8f7e2f2a1c027347a19e342d1b3f35a549d07f2fd37703270c13ad02ddb43b9e0cc41f4c5c573add039
 MISC metadata.xml 329 BLAKE2B 35efab95ec95b721d53463b4fe8d98358c632a76476f1648e2e1f33f7432b2fbf9d00199e4e53c047a91c90ac9e86e733089bf1c9dc69a9f2961d7cc8266b710 SHA512 c83a4611485d806ca1c1848db6605a8d4956956dd521e5b6171d98027324236e51a13c9032e76b462168d07bb74dc105fb9587ab91bd554845d733e668c9df32
diff --git a/dev-java/jcommander/jcommander-1.48-r1.ebuild b/dev-java/jcommander/jcommander-1.48-r1.ebuild
index a6f99b1114f2..b8ff1a494676 100644
--- a/dev-java/jcommander/jcommander-1.48-r1.ebuild
+++ b/dev-java/jcommander/jcommander-1.48-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cbeust/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jcommander/jcommander-1.48.ebuild b/dev-java/jcommander/jcommander-1.48.ebuild
deleted file mode 100644
index 4e01584edd82..000000000000
--- a/dev-java/jcommander/jcommander-1.48.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Command line parsing framework for Java"
-HOMEPAGE="https://github.com/cbeust/jcommander"
-SRC_URI="https://github.com/cbeust/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${PN}-${P}"
-
-RESTRICT="test"
-
-java_prepare() {
-	rm -rf src/test || die
-}
diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest
new file mode 100644
index 000000000000..fad97b34190d
--- /dev/null
+++ b/dev-java/jctools-core/Manifest
@@ -0,0 +1,3 @@
+DIST jctools-core-2.0.2.tar.gz 4136573 BLAKE2B 6ca4c276422b24b18256b35606b6e59e8be53b77fe0b757e4f46dc4e0bdab0ea8fbb8c58e84794c689aa1df29a80aa847b6baf7cda430f2657720ecb5d60e99f SHA512 734905d6847664a08557fa9807766bfe2cd57e9562f1dc0d908c9fffc627c1cb7576ac079715004da9a1f2ee958c8373caf60c110ef3de8f7da5bb04775f6f7f
+EBUILD jctools-core-2.0.2.ebuild 2134 BLAKE2B 394965b73740c75bf5578c02fdc035efa3e719501fa7452ae6da7e0d51bb11994def69e379623900c315de47a4e8147d1dd5cc6acaccda5b2188c174fb115f9d SHA512 6e5f6f1514a9bdbdff75dba29ca34553dd2d781c134579670195edbc70d702d34411b069ef353d81390dba47f23b81bfc960ca973b9eb75de68ba2ddd8d56695
+MISC metadata.xml 305 BLAKE2B 4ac1a7216894d3a7be6d9b4bbc034c2cb571ce0e9ec4f401eb4921f9c56b00296494be04d33b052d7f89684ac9a8d9b80385f7b33d7cb0a92b2ddb4bcc323835 SHA512 3ce5145f2b40c8a5bc7cd89c14ce33d6d194809ab70bec23c0726636ed516693f3cfdfe231e79fc1e3f3591ad950ff27f2632545fd69213a878be1b27d6f1f9d
diff --git a/dev-java/jctools-core/jctools-core-2.0.2.ebuild b/dev-java/jctools-core/jctools-core-2.0.2.ebuild
new file mode 100644
index 000000000000..825bc561d7d7
--- /dev/null
+++ b/dev-java/jctools-core/jctools-core-2.0.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/JCTools/JCTools/archive/refs/tags/v2.0.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jctools-core-2.0.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jctools:jctools-core:2.0.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Concurrency Tools Core Library"
+HOMEPAGE="https://jctools.github.io/JCTools/"
+SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+# test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!!
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? ( dev-java/hamcrest-library:1.3 )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=(
+	../{LICENSE,{README,RELEASE-NOTES}.md}
+	../resources/'1977 - Lamport - Concurrent Reading and Writing.pdf'
+	../resources/'2010 - Pisa - SPSC Queues on Shared Cache Multi-Core Systems.pdf'
+	../resources/'2011 - Dice - MultiLane - A Concurrent Blocking Multiset.pdf'
+	../resources/'2011 - Technion - CAFE - Scalable Task Pools with Adjustable Fairness and Contention.pdf'
+	../resources/'2012 - Junchang- BQueue- Efﬁcient and Practical Queuing.pdf'
+	../resources/'2012 - Salzburg - Fast and Scalable k-FIFO Queues.pdf'
+	../resources/'2012 - Technion - SALSA - NUMA-aware Algorithm for Producer-Consumer Pools.pdf'
+	../resources/'2013 - Afek - Fast Concurrent Queues for x86 Processors.pdf'
+	../resources/'2013 - Salzburg - Distributed Queues in Shared Memory.pdf'
+	../resources/'2014 - Afek - Fence-Free Work Stealing on Bounded TSO Processors.pdf'
+)
+
+S="${WORKDIR}/JCTools-${PV}/jctools-core"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,hamcrest-library-1.3"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jctools-core/metadata.xml b/dev-java/jctools-core/metadata.xml
new file mode 100644
index 000000000000..a9affe0868c9
--- /dev/null
+++ b/dev-java/jctools-core/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/JCTools/JCTools/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jdepend/Manifest b/dev-java/jdepend/Manifest
index a920cd91e4ec..3ef97bbcf5df 100644
--- a/dev-java/jdepend/Manifest
+++ b/dev-java/jdepend/Manifest
@@ -1,5 +1,3 @@
 DIST jdepend-2.10.tar.gz 1226471 BLAKE2B d4ec55913a882e4796de88bd220e6bf6a13df516653e7f247a4c84c0c6967f642b1633341955704a0d89b1d449368c4b0d1cd4b52034c64caeb5781e9d2c5839 SHA512 7a01ab4311f41c9176e61e6b0ad50e7c50b4d5638550775a6bd8ee9587ea5978b7dde502d5a82b2ff12811c57a6407e2add42e0c5400517680f425e55e04ae3f
-DIST jdepend-2.9.zip 302836 BLAKE2B dcf3b9c37037926d3792932327ddeb1e95fbbc47beaffb2197653b32bb919a0f3bb4d80c3b32d8e8d83f58e3c216ae5ae6e7ad923971adb460ef0d7fd6036149 SHA512 93ae1ca82422be0dce9794f25ad98c078da7437bca59c697405806a462f81b52028e0536075e2a2f428d8f8c5a27ae50fa7a580b75edbd4e8c9c750315b1c919
-EBUILD jdepend-2.10.ebuild 858 BLAKE2B f2328a3efe10f2d09de3943c8f85bdbeea5a4497bc570028bb1a906b4690453dff43c57f8531215356090fcf0e1de8f6a94628dee135981ea4138b0f4f4615d9 SHA512 4a9e4df5c232c2a662778e16ee18cb50fb02b6dd9ead205267211088a0a70d4c45a029d431bdc5633b626b5d51598b6d0ec39050e086508800fedb9f91bb5c88
-EBUILD jdepend-2.9-r6.ebuild 851 BLAKE2B e088be94b340973d466673a3a8272ab3e0234b3b5c89bad2e0ae823536e6e5350bb25046bb845d695bf195ef66c7adaba32a7047fce2f8e445038b81e2c08779 SHA512 dd2726988f1278b80ab22c6e0f90bfc2546d7f2b01d93bd48bf85f68fbd430044cfed11143d62605aa72d3894085c2ec5514adbdc459dbffc8bc88c4edbf2b8c
+EBUILD jdepend-2.10.ebuild 854 BLAKE2B ceeaf9350e87423b4a6c2d774c214f703b4594170dfffa437ffcc153eb8672f755011414e2e219d9c7e791d8c792a901f401e6e749612585c0d75789c2b1bb62 SHA512 8e9705126eed7b1dd4a72f73bb9dc5215f48aeee738c53480ba396f27c392ac981629103d1afc56e912457ae455736255d215cebc72f61fbdc6c691dd5211354
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jdepend/jdepend-2.10.ebuild b/dev-java/jdepend/jdepend-2.10.ebuild
index 1a92cd4f53c8..1c22b5cab1e6 100644
--- a/dev-java/jdepend/jdepend-2.10.ebuild
+++ b/dev-java/jdepend/jdepend-2.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/clarkware/jdepend/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jdepend/jdepend-2.9-r6.ebuild b/dev-java/jdepend/jdepend-2.9-r6.ebuild
deleted file mode 100644
index 676b7d948b74..000000000000
--- a/dev-java/jdepend/jdepend-2.9-r6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Traverses Java class file directories and generates design quality metrics"
-HOMEPAGE="http://www.clarkware.com/software/JDepend.html"
-SRC_URI="http://www.clarkware.com/software/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8
-	>=app-arch/unzip-5.50-r1"
-RDEPEND=">=virtual/jre-1.8"
-
-java_prepare() {
-	rm -v "${S}"/lib/*.jar || die
-}
-
-src_install() {
-	java-pkg_newjar dist/jdepend-2.9.jar
-	dodoc README
-	dohtml -r docs/*
-	use doc && java-pkg_dojavadoc build/docs/api
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/jeromq/Manifest b/dev-java/jeromq/Manifest
new file mode 100644
index 000000000000..be2dab4d2139
--- /dev/null
+++ b/dev-java/jeromq/Manifest
@@ -0,0 +1,3 @@
+DIST jeromq-0.5.2.tar.gz 422673 BLAKE2B f244ef95bff70de8eb184e6eda8e292c54488435b8c9e000dbff5f1d6cb7b2b3066061bcb1fa678d2756117a52c39df795dae84071b544b0f577a331aecc8516 SHA512 49a3e9f7ff6b54dcde03958a84e72b8d4b44fb150fc980e9f1ea4ba9e258dcb0a0730d006550a3eb33e9f241e6d89cdc0ee2155213ddd309e255d606d1fa567b
+EBUILD jeromq-0.5.2.ebuild 1264 BLAKE2B 1b0ae5d6f70f6b8f3f1c96403d8980381720653dd6f93278f8c8cbc9650ea7e3cca9a3db33338267d244df1267f50c9f01be0cd0b597e26ad2c43faee9900c3b SHA512 6f836e43242732acb4c57f2e2c9796e65b84950587a00629208e3ebaa5bc90ad51124e9429eb6b96e0b35fbf7b959a11de3d045cc83afb1e646614243a00ca4b
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/jeromq/jeromq-0.5.2.ebuild b/dev-java/jeromq/jeromq-0.5.2.ebuild
new file mode 100644
index 000000000000..a9d3fe3c79c2
--- /dev/null
+++ b/dev-java/jeromq/jeromq-0.5.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/zeromq/jeromq/archive/refs/tags/v0.5.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jeromq-0.5.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.zeromq:jeromq:0.5.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Pure Java implementation of libzmq"
+HOMEPAGE="https://github.com/zeromq/jeromq"
+SRC_URI="https://github.com/zeromq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+PROPERTIES="test_network"
+RESTRICT="test"
+
+# Common dependencies
+# POM: pom.xml
+# com.neilalexander:jnacl:1.0.0 -> >=dev-java/jnacl-1.0:0
+
+CP_DEPEND="dev-java/jnacl:0"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( AUTHORS LICENSE {CHANGELOG,CONTRIBUTING,README}.md )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/junitperf/metadata.xml b/dev-java/jeromq/metadata.xml
index 4221e170cbc0..75321cfb5598 100644
--- a/dev-java/junitperf/metadata.xml
+++ b/dev-java/jeromq/metadata.xml
@@ -3,6 +3,5 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
-		<name>Java</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jgoodies-common/Manifest b/dev-java/jgoodies-common/Manifest
index 273366a718bc..38f2fe3c79a7 100644
--- a/dev-java/jgoodies-common/Manifest
+++ b/dev-java/jgoodies-common/Manifest
@@ -1,3 +1,3 @@
 DIST jgoodies-common-1_8_0.zip 575972 BLAKE2B c197f35e495c7f638f9601aa29041271522c8382b97151ea3a4f78a38a17e8dd45d0b6baf8d74bfa0ac3deeefac77c8da3cc8c956495d3443e87461e876e66bc SHA512 c00ffb6498b40b214bccad3ee8f0f3a9231bb8e67243be5ea15956694466485ac75aeed09f340aea323c6989190c10015b7a72b82d5a251bb5ea12ddaedb6b25
-EBUILD jgoodies-common-1.8.0.ebuild 692 BLAKE2B 0a04152d1a665ca0e78dcf9ed8a4b4692bb29c3f778f71b39c30e41541841cafd504dfdb165b30fe4a4270d1229578b37b5bec02091859055a19ef6c094243f5 SHA512 aec03eefbfeadb1b7756d21555658f0ff905f1e8e83fd66df8d4f2f00ece76d38ea0b4578ea5efc890981a9255c7d22c2f3078ef0e9e6be1c4f5c725954f9185
+EBUILD jgoodies-common-1.8.0-r1.ebuild 702 BLAKE2B df9c49be345ebbb522189d88a297feec41362fabbbdae064d54b8587b2285d45bbb7397fa2d0e5c9454ec22695b2df8c2cebf52803d468845b68e61abce81faa SHA512 42f1ca71d6e7e694533efeb0a41ee8ba3eeb1dae11ab78f844fe458bbd500cad1ef51e6d9b4fc73dc7765380c3aba8b613745f9e72a68ab97deca11c94e28238
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild b/dev-java/jgoodies-common/jgoodies-common-1.8.0-r1.ebuild
index 0c830c5581e9..92301470bd7f 100644
--- a/dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild
+++ b/dev-java/jgoodies-common/jgoodies-common-1.8.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
@@ -22,17 +22,18 @@ IUSE=""
 
 RESTRICT="test"
 
-RDEPEND=">=virtual/jre-1.6"
+RDEPEND=">=virtual/jre-1.8:*"
 
 DEPEND="
 	app-arch/unzip
-	>=virtual/jdk-1.6"
+	>=virtual/jdk-1.8:*"
 
 S="${WORKDIR}"/${P}
 
 JAVA_SRC_DIR="src"
 
-java_prepare() {
+src_prepare() {
+	default
 	mkdir src || die
 	unzip ${P}-sources.jar -d src || die
 	rm "${S}"/pom.xml "${S}"/*.jar || die
diff --git a/dev-java/jnacl/Manifest b/dev-java/jnacl/Manifest
new file mode 100644
index 000000000000..a35d7c7b94eb
--- /dev/null
+++ b/dev-java/jnacl/Manifest
@@ -0,0 +1,3 @@
+DIST jnacl-1.0.tar.gz 9485 BLAKE2B ecbe56d12d7cc53dfc87b2f332c1c4328946ca4ed0d4ec3b8fa22a2ea5d98a3acf51fb17e1d93d3d7831f98a36a3d657a904cb63b225da4a30b8e907cbfe8384 SHA512 b4f28b4bd6deb13c17e74f911f89e762c9111aa90474754f072df66f0ca4bd366dc8369f51404fbd4f6c5f55223bb98b6bfe3de78e2f6b5527509741008f2015
+EBUILD jnacl-1.0.ebuild 1385 BLAKE2B a901db50ec5ecec4dc0616bfc9969f60558986010d00f7a2f66380b313e931a57d14a5560599cdb7bf1cff756a45aca96a8853a0f2d45df5227b7bb88fe64752 SHA512 b8e56a502b357f624cfb69f964222a69f663e5b078dbf22a847df37562b232e749a2515317346d90e5a7b4a86d025461de97840e448a345fe296585ab068a5b1
+MISC metadata.xml 496 BLAKE2B d9546b41af10481b94985db5e46d0223dab158e61ac37d7d90ede17ecf7aee94fde3fd6444148a184f7492369971d7ecb8d1880c3241bdf375530b15f063fd26 SHA512 905992b4781f744c98d556f24495ed849da5c661b3b4816eb07e11db5a12b946d2acb8dd029ee26a875b41ba26afaf4f23a42f3ca31e55bc74404bc15a9967cf
diff --git a/dev-java/jnacl/jnacl-1.0.ebuild b/dev-java/jnacl/jnacl-1.0.ebuild
new file mode 100644
index 000000000000..a21823be388d
--- /dev/null
+++ b/dev-java/jnacl/jnacl-1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/neilalexander/jnacl/archive/refs/tags/v1.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jnacl-1.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.neilalexander:jnacl:1.0"
+# JAVA_TESTING_FRAMEWORKS="testng"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Pure Java implementation of NaCl: Networking and Cryptography library"
+HOMEPAGE="https://github.com/neilalexander/jnacl"
+SRC_URI="https://github.com/neilalexander/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# We don't have fest-assert
+RESTRICT="test"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? org.easytesting:fest-assert:1.4 -> !!!groupId-not-found!!!
+# test? org.testng:testng:6.13.1 -> !!!groupId-not-found!!!
+
+DEPEND=">=virtual/jdk-1.8:*"
+#	test? (
+#		!!!groupId-not-found!!!
+#	)
+#"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( LICENSE README.md )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+# JAVA_TEST_SRC_DIR="src/test/java"
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jnacl/metadata.xml b/dev-java/jnacl/metadata.xml
new file mode 100644
index 000000000000..85fac4d279d3
--- /dev/null
+++ b/dev-java/jnacl/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Pure Java implementation of curve25519, salsa20, hsalsa20, xsalsa20 and poly1305 cryptographic primitives, along with a NaCl "Box" implementation
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/neilalexander/jnacl/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jnlp-api/Manifest b/dev-java/jnlp-api/Manifest
deleted file mode 100644
index aa7db863ba62..000000000000
--- a/dev-java/jnlp-api/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jnlp-api-6.0.18.tar.bz2 10518 BLAKE2B c5e9f1c3f14dac45c2bdd979844ff3a49f573c6a79010d3b412086a2496ca7429a8ecd6211224c934cba90f40f7cc903fe23715006570e5876a504070ac797d8 SHA512 e3b7ed5092255b665feac2c37341be81bd71c1f2c925851338f1dbfb05bf1e1a8f09f5fea63c08ca1e737db7072b6ee25ec55cfaa18789e40101d6930785209f
-EBUILD jnlp-api-6.0.18.ebuild 594 BLAKE2B 8ba5886c83d0beb6b3e27c22d78a02802cba91f02ae5100eaa2aade3d7c23c655dd116123f7073fdb65ec96e5aa95e2e3b65cb634bb1e2cc4b86a0d9dba51296 SHA512 41a89df8c61462718888edbd767e63bc269459726fdcccb02b46d6eb0b05b5869619773c7143701d3ea4d7c1082634bd6e4ccf2aca705f65b487e85dbc935146
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/jnlp-api/jnlp-api-6.0.18.ebuild b/dev-java/jnlp-api/jnlp-api-6.0.18.ebuild
deleted file mode 100644
index a5b656de4c1b..000000000000
--- a/dev-java/jnlp-api/jnlp-api-6.0.18.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 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
-
-DESCRIPTION="JNLP API classes, repackaged from the icedtea-web fork of netx"
-HOMEPAGE="http://jcp.org/en/jsr/detail?id=56"
-SRC_URI="https://dev.gentoo.org/~caster/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="source"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	use source && java-pkg_dosrc javax
-}
diff --git a/dev-java/joda-convert/Manifest b/dev-java/joda-convert/Manifest
index 5018b2489949..f85523790f0d 100644
--- a/dev-java/joda-convert/Manifest
+++ b/dev-java/joda-convert/Manifest
@@ -1,3 +1,3 @@
 DIST joda-convert-2.2.2.tar.gz 65476 BLAKE2B 9ef8e3b172d31f4e3b748ba5aae807b1d344c3b6bedeb0bf0b84b93009171495f271d03cd9f7b29147a256ddd1081b3fc9640c1df6b45425080ce1d44e2c0f37 SHA512 9660491373d5f7d415ab47cec7164922fc8901803e759bbf8cf7d0cc58040c2c8b245271f33d641a563ffb25b8e42f8197e297da7d1fe68a5c50ebb61536f3ae
-EBUILD joda-convert-2.2.2.ebuild 2015 BLAKE2B 539a3f32140a5796cef6e0dd083dcf26965d68662d5a77e7a843dab9007ea1e4f4f58c8c75f9be2a06807286c2259fad6b0dc07a5e211a5c0cd4174452ad92d6 SHA512 667bb9c85af1ef67a9f3bcd3eb738ef488202f4daabbdaba940f44e1f4d4b61392a77a17fbe03095eba111cfa2590efd39e088eab38f4cecc6c56f77cfddff98
+EBUILD joda-convert-2.2.2-r1.ebuild 2001 BLAKE2B b0f8f4c14595af75f6cb2d55b6a540611070199c41f31d8a92447a0ed04d58f6b879de137d2a4cb18d15ed4afac6af497076b80f8b0087e8b7d6569034c7be5a SHA512 cefbd0b9d04591f08c9a5f69e1e0578f3d4f9761c6a7000854b96fbe52e9506355875e6903d1d161d6ceb7792a227995622b25ca2dfb4eccd47f1f06b2d5504b
 MISC metadata.xml 390 BLAKE2B 50a8eb1f9935a4b0bc775f4c5f069df312da8aec16f6aeb6fb9c66df41f1af3ad4b3a06697e7a2d660275f6cdb19571b99b6d2a9d7418c7d4d9cb177e7660769 SHA512 da06cf231ded50201b189737b5021486c4ec324f6f7e6eb5df1ed2f1ae67a29bd529d4f108eb904c6820994c960c7c6523d69f70378f5d928286736c4ce78cc0
diff --git a/dev-java/joda-convert/joda-convert-2.2.2.ebuild b/dev-java/joda-convert/joda-convert-2.2.2-r1.ebuild
index cd9779ad6bd8..df8f686daa93 100644
--- a/dev-java/joda-convert/joda-convert-2.2.2.ebuild
+++ b/dev-java/joda-convert/joda-convert-2.2.2-r1.ebuild
@@ -14,7 +14,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Library to convert Objects to and from String"
 HOMEPAGE="https://www.joda.org/joda-convert/"
-SRC_URI="https://github.com/JodaOrg/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/JodaOrg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -28,7 +28,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 DEPEND="
 	>=virtual/jdk-1.8:*
 	test? (
-		dev-java/guava:20
+		dev-java/guava:0
 	)
 "
 
@@ -43,7 +43,7 @@ S="${WORKDIR}/${P}"
 JAVA_SRC_DIR="src/main/java"
 #	JAVA_RESOURCE_DIRS=""
 
-JAVA_TEST_GENTOO_CLASSPATH="guava-20,junit-4"
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4"
 JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_RESOURCE_DIRS="src/test/resources"
 
diff --git a/dev-java/jol-core/Manifest b/dev-java/jol-core/Manifest
new file mode 100644
index 000000000000..55e80412dcb6
--- /dev/null
+++ b/dev-java/jol-core/Manifest
@@ -0,0 +1,3 @@
+DIST jol-0.16.tar.gz 120373 BLAKE2B 06301e1802c89c76038aec2247cbb45d96cc74afa9f099500f8e5f33b919117e85744bc2b8214b6c9e765a2579a43f256eecc2ba8537e76c81aceaa8694f49dc SHA512 d9abf579d0230f2b6d0e0a33ee11c9599b4f36d945239dd8670bbd00591137c2229e5251b32dd5405fd4b08e0070af70e6b04e4ea4be0c28c4d5bc94874858de
+EBUILD jol-core-0.16.ebuild 956 BLAKE2B af95545690764c9d5478a4ecf4e29ab8455aac4ba06e0cd3867c7aa5a47188be59702530e121d90b00efa9c5c304bea2527f875d97ffe85dfd199522a228ef0f SHA512 c1154530ce7439af30ee8e5d1b8682fde69dd533b6eb191e71dafac7800186e085b383c5f205f5ac9158249e218a0af08b74c415d3d29ed9867bb2e1a4f1aac8
+MISC metadata.xml 313 BLAKE2B 3925dd7555fc2d9739c092e1949399e496d7b2d40bc2219dd95a5c3bba98e398e57e64eb30414e6efe5e432582ec52b3b2926c7858da7a09ec2590f72b52948a SHA512 e7d4a307cc24ee5ff8f7d5c1c65c87bd7ff2edbc48730355f05faa50c35c7f3dcb4d4667dce909ce77d299da603503b2c30eab4e68f1293f5f4410d20bd53314
diff --git a/dev-java/jol-core/jol-core-0.16.ebuild b/dev-java/jol-core/jol-core-0.16.ebuild
new file mode 100644
index 000000000000..a36940d2c74b
--- /dev/null
+++ b/dev-java/jol-core/jol-core-0.16.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.openjdk.jol:jol-core:0.16"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN%-core}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Java Object Layout: Core"
+HOMEPAGE="https://openjdk.java.net/projects/code-tools/jol/"
+SRC_URI="https://github.com/openjdk/jol/archive/refs/tags/${PV}.tar.gz -> jol-${PV}.tar.gz"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/asm:4
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_SRC_DIR="${PN}/src/main/java"
+JAVA_RESOURCE_DIRS=( "${PN}/src/main/resources" )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,asm-4"
+JAVA_TEST_SRC_DIR="${PN}/src/test"
+
+src_install() {
+	java-pkg-simple_src_install
+	einstalldocs # https://bugs.gentoo.org/789582
+}
diff --git a/dev-java/kxml/metadata.xml b/dev-java/jol-core/metadata.xml
index e688fd035b5f..770ce3726f19 100644
--- a/dev-java/kxml/metadata.xml
+++ b/dev-java/jol-core/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">kxml</remote-id>
+		<remote-id type="github">openjdk/jol</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jopt-simple/Manifest b/dev-java/jopt-simple/Manifest
index 94e34a5ecd03..1d69d538a6d6 100644
--- a/dev-java/jopt-simple/Manifest
+++ b/dev-java/jopt-simple/Manifest
@@ -1,6 +1,5 @@
 DIST jopt-simple-4.6.tar.gz 107082 BLAKE2B 622144647b24049861398cc99ca3cc268baae045f8ca23cdd5bddb2e656bc97d17397ae752ca9a6edc91b8486e1e55ce19ba335d2afadf6c6df4f858faf43a1e SHA512 c2f467521f6419f91206f6036d420671b02106beadff3fc51d1893e6f3f6302b8fcbb31957327b9e40cbfd7a7d55030e0c999d9570d7e29fe7a4375bab10ed76
 DIST jopt-simple-5.0.tar.gz 119502 BLAKE2B 975a0d338fa3154963954fd3b218c944dded023b3a2da59ee2671c73450a578dbf1aee8e52b9f715839e15c1937e0a493c4b37518b73038aa017e1d0ec1ca06a SHA512 f440c62cb307aad7cab64f091c82f78e11a117e60aaadf71883c149a622576531272de3d67859f6df093df658bb0bfb435d9bb33bc729bcda24dcc99d27369ff
-EBUILD jopt-simple-4.6-r1.ebuild 582 BLAKE2B 5c3e60b45a2dbb0e397135d46a05937b429f58ecc00556a1ba04a0a8e6ad0c2fe3bffb4f8046dd250152965cdae7114351091f4db69fb7135a728971d0501ecb SHA512 6c58fb86948bf172dc0449c0f87c1d6d957f0e7ac9e8639775028fa823eb795e8252ee483f88acb5b9d31f39f1dbdb41ec6d85e6907b2f9e138f9a0d05f2eaa7
-EBUILD jopt-simple-4.6.ebuild 654 BLAKE2B 0a19b2700df2a68f66a1506f7d877592154af4a11c645919b49078ba316f6e2fd1cf8ef76fdaf3ebfa340eb54611d4168ca5af778caba88dd5da91c21a6acf0a SHA512 d541d7380cb483c18d99fe5048a05952d8afad088f26783e1cfaa0968369d6deec10031abc180feb3e7d154b811bbf78df44d0d126e1f891cde5dabe31ee50dc
+EBUILD jopt-simple-4.6-r1.ebuild 579 BLAKE2B 1c988774f4fb47b0f4e1b57aaf58820280dc7b819dbefa916b4f198e1861ccd0f01bbd0e17aeb850499bd0a26fa59350b44085840c9c39c314a367eb5471a9fb SHA512 c0714503fdfe7011347a08395769ba6261cc3d46a11a403fa1b08f3cabc4c508f829655951bedd8c1ad8aa2d15a484d7db381a89ebd8265c82f235d8e89ff7f6
 EBUILD jopt-simple-5.0.ebuild 648 BLAKE2B 137db3a025327e0e9cc2c57c465f9f8734f523e350ad91263f33ffb3edb761ac99c9f84a897a60387694a61d5cb46c67dd12579dd68dca8321b5e70428ac1934 SHA512 3c2863dbcc4613fe33bdf4e3afac16d8f006e0c958315ad35cfbfb4428a519cf743a2532f8a831c37fc0a5bad7608daecd2aac27fc23588e4d8a95bdcf51903a
 MISC metadata.xml 321 BLAKE2B 1165369ebb01fa6f8d30370de45e8b6dbfb6bd57687593395213e2772bdd379a0f4adefa0901f23e79262c6803ea3544b0127fc1e5f5f2a00e3523ef26ad2ce9 SHA512 9306c4766bac17556a01b019139fcdbebdb08ee1f0b56adcf4ffb25805075ae2d5d5007659e897418da012ee05157cec8cdc119715bf88abd8a00a6a7661b89e
diff --git a/dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild b/dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild
index ba73eb0fea10..131323ebb6b1 100644
--- a/dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild
+++ b/dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jopt-simple/jopt-simple/archive/refs/tags/jopt-simpl
 
 LICENSE="MIT"
 SLOT="4.6"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/jopt-simple/jopt-simple-4.6.ebuild b/dev-java/jopt-simple/jopt-simple-4.6.ebuild
deleted file mode 100644
index 91899dcea876..000000000000
--- a/dev-java/jopt-simple/jopt-simple-4.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java library for parsing command line options"
-HOMEPAGE="https://pholser.github.com/jopt-simple/"
-SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="4.6"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-JAVA_SRC_DIR="src/main/java"
-
-S="${WORKDIR}/${PN}-${PN}-8808a39"
-
-src_prepare() {
-	default
-	rm -v pom.xml || die
-}
-
-src_install() {
-	default
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jrobin/Manifest b/dev-java/jrobin/Manifest
index a77295c5e5d5..6abdd03c87d6 100644
--- a/dev-java/jrobin/Manifest
+++ b/dev-java/jrobin/Manifest
@@ -1,3 +1,4 @@
 DIST jrobin-1.6.0-1.tar.gz 7340700 BLAKE2B 2db142423c3ad0006609b31fed38a4121e942f1253a5b6ed8b10f83c71c9b9fbf271346bad1f419f7337871cd4e61e59a4117de79a07715557335458944fccea SHA512 c5428906bf975f6c31f90185da3f0cbcaaff74d68e35e37b5e425340899fe01290d3d9813f1ecd60bd599512e3d62f635de290db9a9a1bd45292ac9c187b15c7
 EBUILD jrobin-1.6.0-r1.ebuild 1592 BLAKE2B ee87d6b590cdb056ddda0cd94c461e7f3260a62df371be8cf4c25e0f78abb911f44fe3371d89c1d6ffc5ea01395ae97b051cfc5644a0eefd2edd1a2748901ef5 SHA512 a6f70667b55ab8630e44d168c09252bab98f3c07a9764c082880f91081e79f7060b7a53f788c03dbbbf7e08ca0ade875e91f4b4f80ff3aebe1b9084d4a933402
+EBUILD jrobin-1.6.0-r2.ebuild 1724 BLAKE2B 165094d6048cb6a3f29e65a5b8eb6b62557cdfcce6b296e77ae9c0de07cb8d896b564528755c7d772d234b23ac2c075d7585f52721d837f7dc5a47228460ce47 SHA512 7bba4d9bd567192426b043b67eade26b58a629b5c3843ddf3576d0133cc2169c99307d98099d6ef1d837e5a65872db00401d86e1db15d447bdc5e8b04331d214
 MISC metadata.xml 603 BLAKE2B eba31b8e000513e2a29e8e93e6a2405487d3665f4daa2fc0c7cf4e4e9fe6582441682374f5f06c2bdf19e8e64b276f9b85ee19c6923b629cd22f41c2b8d31037 SHA512 aa5eba1f7c5635afc0b288f20428cc03e5104bde59320abdb607bf0462ef34e6fdd58f3ab9253edc58181c53e82f273968b7bfabb3dc076af66021356cbde51c
diff --git a/dev-java/jrobin/jrobin-1.6.0-r2.ebuild b/dev-java/jrobin/jrobin-1.6.0-r2.ebuild
new file mode 100644
index 000000000000..427e2dc13d7b
--- /dev/null
+++ b/dev-java/jrobin/jrobin-1.6.0-r2.ebuild
@@ -0,0 +1,74 @@
+# 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/OpenNMS/jrobin/archive/jrobin-1.6.0-1.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild jrobin-1.6.0-r2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jrobin:jrobin:1.6.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JRobin is a 100% pure Java alternative to RRDTool"
+HOMEPAGE="https://github.com/OpenNMS/jrobin"
+SRC_URI="https://github.com/OpenNMS/${PN}/archive/${P}-1.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
+
+# Compile dependencies
+# POM: pom.xml
+# test? org.easymock:easymock:3.1 -> >=dev-java/easymock-3.3.1:3.2
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/easymock:3.2
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*"
+
+DOCS=( LICENSE.txt README.osgi )
+
+S="${WORKDIR}/${PN}-${P}-1"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_MAIN_CLASS="org.jrobin.cmd.RrdCommander"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+# Workaround for https://github.com/OpenNMS/jrobin/issues/7
+JAVADOC_ARGS="-source 8"
+
+JAVA_TEST_GENTOO_CLASSPATH="easymock-3.2,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_test() {
+	export LANG="C" LC_ALL="C"
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if [[ "${vm_version}" -ge "17" ]] ; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+	fi
+
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jsch/Manifest b/dev-java/jsch/Manifest
index a8028cc9e06f..c4208cfcc619 100644
--- a/dev-java/jsch/Manifest
+++ b/dev-java/jsch/Manifest
@@ -1,6 +1,3 @@
-DIST jsch-0.1.54.zip 365455 BLAKE2B 5cd6fa012e5a511bad8f23a233559e6ad6d600f39ea7b519e66e118b1fdb997491b7ac8cff5bc1491c28f7ee99f0f4a3b4727f5d8ec02030576f34949d74e203 SHA512 2ed29f07495fbc28d6eb7b4fe414e8a9a96b911b2feea5b1513cc48a9439adba12341bceb23a3ea9ab307e32d48bfd4356c7bc877c56e77f6f55d69214db3a9e
 DIST jsch-0.1.55.zip 369664 BLAKE2B 4a35845e7b9e57c64a890547b2cabdec5bd03fa462ac3c78d8bcb757dbd5b50b366d41c042e904e44b967c85da01396c7dd085b8fe5f69ad243237fab38fa1f1 SHA512 334b550594272fe179f13fb6bbfc0a353334586786db2b3279608b85cdab3dd604e6dd04aa2376b5532816d906133e636b5359dda36c449d90173be501c61418
-EBUILD jsch-0.1.54-r1.ebuild 1234 BLAKE2B f6a4146afce8d015bb762ba9c023ea866f5c6379ff295a7dc279693c397432c516dbfdb6fbf0b80657d6cc800d5890bc96daa1293c9ccf264dc78decd43336fa SHA512 e6876ac8e6adc5a4bcf4b1333e5a45f8f6b57992fa4dd0a1e8abedcb60c98b09c9bc73c0b4173a09f95309b4250b4746c767eaae706a44cec5125c94c1c10930
-EBUILD jsch-0.1.54.ebuild 1202 BLAKE2B 118bff8b932f70f9fb70f2aab5c934870e89a806c3c8620554093735a2a5c0f6b7341737edbe0784fb215a8c8a18649d26aec29da1c3485b4d7d0621df0d49a2 SHA512 b0b9e7253f695136afbddf241a8690aba1790301dc849eb30f3fd3dd5d319efc1f8e3395f8da6eeed6764b55e72669f08dceef009eaa83196496c5046b30b3fa
-EBUILD jsch-0.1.55.ebuild 947 BLAKE2B 30118130bda8c22499e0e57b6e628b403999db507fd2e3bf61e04fcb0e8acdbf2e3d1ea11133ce23a33db20d2bec702a2b11930a9e91d5693267e52c83a902cb SHA512 6fcbf7a3e817850c4db9aa60a5937b1eff02149fa5e1d7a2b6a8327a503444ad02b33334e26823beb4e7445fa8480894b3a1f8b9aaf7624ff285f4f4fd3a1ef4
+EBUILD jsch-0.1.55.ebuild 943 BLAKE2B 59d6a168662a04a5dc861757b0ce05fd2898dac3cfdffa8d50aa2ffb904cce4cccea57368afd036f148835c00b27b1b954f051155291360a8ab2ec775869f0cc SHA512 124451c267b51d8b4be6d306fccd1c4b47c2bd605830fbd60cb5e8599b50dbef504a849b4f3c4ad377685e0298a3fcb534cdde34121bc2f8b55f742062555fb1
 MISC metadata.xml 311 BLAKE2B a694ea0db3a5ed039fa56b939a9473672f07c927a6a9ca818ebe826b3a388edf16dfab642179044114bf6b0e7274a959b18361097d72207da5fba4a724781efa SHA512 7dfed16685de8168719b2874d46624ca519933aed410c451d77caf0811dee59391c5fcf05e390dd32f7bf4a1829d5bc8b810b7b7d993fa807d897c86961592d9
diff --git a/dev-java/jsch/jsch-0.1.54-r1.ebuild b/dev-java/jsch/jsch-0.1.54-r1.ebuild
deleted file mode 100644
index 99d5d3657c76..000000000000
--- a/dev-java/jsch/jsch-0.1.54-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source examples"
-MAVEN_ID="com.jcraft:jsch:0.1.55"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="JSch is a pure Java implementation of SSH2"
-HOMEPAGE="http://www.jcraft.com/jsch/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="zlib"
-
-CDEPEND="
-	zlib? ( dev-java/jzlib:0 )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-BDEPEND="
-	app-arch/unzip
-"
-
-EANT_BUILD_TARGET="dist"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_compile() {
-	if use zlib; then
-		EANT_EXTRA_ARGS="-Djzlib.available=true"
-		EANT_GENTOO_CLASSPATH="jzlib"
-	fi
-
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-osgi_newjar dist/lib/jsch*.jar \
-		"com.jcraft.jsch" "JSch" \
-		"com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true, \
-		com.jcraft.jsch.jcraft;x-internal:=true"
-
-	einstalldocs
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/jsch/jsch-0.1.54.ebuild b/dev-java/jsch/jsch-0.1.54.ebuild
deleted file mode 100644
index 42b5f979f56f..000000000000
--- a/dev-java/jsch/jsch-0.1.54.ebuild
+++ /dev/null
@@ -1,53 +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 examples"
-MAVEN_ID="com.jcraft:jsch:0.1.55"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="JSch is a pure Java implementation of SSH2"
-HOMEPAGE="http://www.jcraft.com/jsch/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="zlib"
-
-CDEPEND="
-	zlib? ( dev-java/jzlib:0 )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-EANT_BUILD_TARGET="dist"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_compile() {
-	if use zlib; then
-		EANT_EXTRA_ARGS="-Djzlib.available=true"
-		EANT_GENTOO_CLASSPATH="jzlib"
-	fi
-
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-osgi_newjar dist/lib/jsch*.jar \
-		"com.jcraft.jsch" "JSch" \
-		"com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true, \
-		com.jcraft.jsch.jcraft;x-internal:=true"
-
-	einstalldocs
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/jsch/jsch-0.1.55.ebuild b/dev-java/jsch/jsch-0.1.55.ebuild
index 4e12aeb3d7a9..33cc6811dfc7 100644
--- a/dev-java/jsch/jsch-0.1.55.ebuild
+++ b/dev-java/jsch/jsch-0.1.55.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: ${P}.pom
diff --git a/dev-java/jsr223/Manifest b/dev-java/jsr223/Manifest
deleted file mode 100644
index 56aff32301bd..000000000000
--- a/dev-java/jsr223/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jsr223-openjdk-6-src-b19.tar.bz2 15936 BLAKE2B fb72dce61428f8a2bf5ef13dafa8b7fe4a4b2060322756d3140e8d3da0a995024a71cc954ca5f275fcedbffb0ca40001761f4c7b5a9e26a7610df7766d411a88 SHA512 69e09e7cce017693abdbf1a9fc1c4b412686f05fa6a3098bc2724020c95bbb8e5349a0a176b930a364a8848b91dd4383d9e9c40dde317b3ab998139bd528f205
-EBUILD jsr223-1.0-r2.ebuild 476 BLAKE2B e4095d99775f7fd6f0964613d8cf584f28e2a5ba453d71d9c15d816dbb498d0c5ddd9b61548eb56ee457e8a478105cac204cb2598135e3c4ffe8c3b86a1b28e9 SHA512 a4a3849eecc321a29955932b616641d4e9696a2b6115a866b3b775a8f2f8e4fe6258ae33c5d603182d7cbced993880b12d29bc43f999fe94091e3cbad1c0be96
-MISC metadata.xml 215 BLAKE2B 869610e21e1baac019fc79b7072721c201f4e3f0c6a65712d93e69131505f6ee0aab3ed48890073238645280b22edf2078b56dd4ba7edb593952f9ee2b2ff1e0 SHA512 aa3da8e5bf0b257d555c610b3dee82560e6fce192024e99eb63932511f25aceb24e3541f01c495771f3f54c299286c35672c8658cd5e577d6ae5927486a125a2
diff --git a/dev-java/jsr223/jsr223-1.0-r2.ebuild b/dev-java/jsr223/jsr223-1.0-r2.ebuild
deleted file mode 100644
index 758dd0285b50..000000000000
--- a/dev-java/jsr223/jsr223-1.0-r2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Scripting for the Java(TM) Platform"
-HOMEPAGE="http://jcp.org/en/jsr/detail?id=223"
-SRC_URI="mirror://gentoo/${PN}-openjdk-6-src-b19.tar.bz2"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr223/metadata.xml b/dev-java/jsr223/metadata.xml
deleted file mode 100644
index 851b900d2361..000000000000
--- a/dev-java/jsr223/metadata.xml
+++ /dev/null
@@ -1,7 +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>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/jtds/Manifest b/dev-java/jtds/Manifest
index 49663262828d..3d46c0cca133 100644
--- a/dev-java/jtds/Manifest
+++ b/dev-java/jtds/Manifest
@@ -1,3 +1,3 @@
 DIST jtds-1.3.1-src.zip 3377625 BLAKE2B 2c5ccfa4d7c6fbb1879007b5f0e9bcfd1ae1061fc68174d1679c72f3f9806433af842d5ca8e47da69acf53b8d517522f33a901adfa35867c96a63446da5269c3 SHA512 1744219a52c7167449388d774fd5e834ef551f60548569c4c54e6caefaade1d932a3879a023869d8d9ddb29ce4ab52b6d08bc4c364d5f372ff5fa96bed6d9864
-EBUILD jtds-1.3.1.ebuild 829 BLAKE2B 692867bb0c1c9f82f98d5fa30cfaee62025d6c16a2411262ef2f11fc375b20fca5d8bd5efce3e53167d0045df22a2dcc358f6d94be28e347ec31f346ecf24241 SHA512 482f2b94a427eecbfd3bccdd678635bd733379c7cd5b04ade41e12dfa5a30f7cc9f5dfa9e871936b0e74b77947bc141a75fe45d23de4509ca9cb8b75adf6adeb
+EBUILD jtds-1.3.1-r1.ebuild 868 BLAKE2B 783013e023f8d46d80749afadd51d04b573b14fe2bdf25a094720fd369d2c0f4a26a2d0bb7251ed8e031f06d7edd21b37d24fc330872448d06bc2f13381893d4 SHA512 69b78588494af578bd5897b166d51fbd43d3233eaf8579e27ac6fb18dc5c12e6c48f1377088010ae512933183fc38ac8912fc6359defaf87bf230ad37688574f
 MISC metadata.xml 878 BLAKE2B 60f04108c7209daad88d8dd27f45274f7dbb2143f6524b968ac344f84f4155ecfa2a1842c4ce328862e5d341d4da7ddec564816a9d26794d2d1684f889a736a9 SHA512 90012315bece0d428ef9e8546fb439379f6a671b01338f7b112fd0f7f6002250f20a265f366e168e93960587312f28e463a621523cc3843a3748c168ccd481ac
diff --git a/dev-java/jtds/jtds-1.3.1.ebuild b/dev-java/jtds/jtds-1.3.1-r1.ebuild
index fd6ec16d4026..d5b7dd1cd11a 100644
--- a/dev-java/jtds/jtds-1.3.1.ebuild
+++ b/dev-java/jtds/jtds-1.3.1-r1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="jTDS - SQL Server and Sybase JDBC driver"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 HOMEPAGE="http://jtds.sourceforge.net"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}-src.zip"
+
 LICENSE="LGPL-2.1"
 SLOT="1.3"
 KEYWORDS="amd64 x86"
@@ -17,18 +18,19 @@ RESTRICT="test" # Needs a running server
 
 CDEPEND="dev-java/jcifs:1.1"
 
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7
-	app-arch/unzip"
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
 
 JAVA_SRC_DIR="src/main"
 JAVA_ENCODING="ISO-8859-1"
 JAVA_GENTOO_CLASSPATH="jcifs-1.1"
 
-java_prepare() {
+src_prepare() {
+	default
 	java-pkg_clean
 }
 
diff --git a/dev-java/jtidy/Manifest b/dev-java/jtidy/Manifest
index 522ae0090d1c..07e01468ad82 100644
--- a/dev-java/jtidy/Manifest
+++ b/dev-java/jtidy/Manifest
@@ -1,4 +1,4 @@
-AUX jtidy-1.0-build.xml.patch 994 BLAKE2B 502f0ee95fefbdc9e73f93bc551c029a8fdaf4436b4cc9ea5ae153931ce8915988f2d971eace574b5c4b57acd61957df3251530a24b17f23c2edfc076df48261 SHA512 62a3f995ab94d9759196ae48047d6de75146a82438c60e55e4e6fa27fea0c80685619e19224200462d54cc8c560e354cf1bf5953deddcebbe485c2b217912d30
+AUX jtidy-1.0-build.xml.patch 998 BLAKE2B 7bd86d87699a784a918e102195e097d3b88bed791af9fd5df929b06609831749a65fb9c7d79aa4aaa86d87c6796872ef1fbc077844a3ec7e431970bc3a094d65 SHA512 18b5679c538aee7821456acd44342a03e79dbb4d5b65ec7f7103a4d2b883f3726f346804d6362e7775b7e2826ea0e002663bfc32c0282a431254bf199791cd9d
 DIST jtidy-1.0.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a
-EBUILD jtidy-1.0.ebuild 1041 BLAKE2B f08794ec51cb9effef5e426632e4096cb3f2f09ab41d9d858623794d849c212a72185593562dad437b5c517b35bc289f2f33d93daa14e67f3d4fc8b02fda6cfc SHA512 cb06626f07e65f7e58dca3e4629a1bfe5b9ac3cb8f720f1659c0f38e3f458d1a220ddcec5787507d5df809a880dba6d6826832ce7d0fa485642f413d03851422
+EBUILD jtidy-1.0-r1.ebuild 1051 BLAKE2B 7c2dc7e113d109733f3f05d4160edd50155726019c063e249b137b539a2e9a4c5213cdb365f3470384b60e850f1ec923128802ea8b4cbc41379c7b483bf9812f SHA512 ad278e2e648fddea28eaed937ca5d64ab7864b521261f9d267b685b1e2fd08f9ea478d515d89f1a188e884bed9576511f1ce62b4386f2a117fe54ac766853512
 MISC metadata.xml 312 BLAKE2B 0cefe0ab92f9a89c5728c2d7ceb5079e2942590955ebed76105c11ca6e25064fa5d74ad968bdb922be16ef01348ad9e015e68d501c7da3ee6a807cf3821e5380 SHA512 2f68badf7c7d98f60ca73b9fe7e5b5b12168aaec72605ca780e2478ba49f73f460dc3f8a7b4c6d28e334aac3e3e99d76573c4fb8eb40d92619ccbea845947bdd
diff --git a/dev-java/jtidy/files/jtidy-1.0-build.xml.patch b/dev-java/jtidy/files/jtidy-1.0-build.xml.patch
index fea64813365d..ba5e04a7f976 100644
--- a/dev-java/jtidy/files/jtidy-1.0-build.xml.patch
+++ b/dev-java/jtidy/files/jtidy-1.0-build.xml.patch
@@ -1,5 +1,5 @@
---- build.xml.orig	2015-12-01 21:10:36.689000000 +0000
-+++ build.xml	2015-12-01 21:11:05.642000000 +0000
+--- a/build.xml.orig	2015-12-01 21:10:36.689000000 +0000
++++ b/build.xml	2015-12-01 21:11:05.642000000 +0000
 @@ -9,11 +9,7 @@
  	<property name="srczip" value="jtidy-${version}-sources.zip"/>
  	<property name="allzip" value="jtidy-${version}.zip"/>
diff --git a/dev-java/jtidy/jtidy-1.0.ebuild b/dev-java/jtidy/jtidy-1.0-r1.ebuild
index f91781cedec6..7c227fdf5e9e 100644
--- a/dev-java/jtidy/jtidy-1.0.ebuild
+++ b/dev-java/jtidy/jtidy-1.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
@@ -12,21 +12,23 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Java port of HTML Tidy, an HTML syntax checker and pretty printer"
 HOMEPAGE="http://jtidy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}-sources.zip -> ${P}.zip"
+SRC_URI="mirror://sourceforge/project/${PN}/JTidy/${MY_PV}/${PN}-${MY_PV}-sources.zip -> ${P}.zip"
 LICENSE="HTML-Tidy W3C"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 
 CDEPEND="dev-java/ant-core:0"
 
-RDEPEND="
+DEPEND="
 	${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jdk-1.8:*"
 
-DEPEND="
+RDEPEND="
 	${CDEPEND}
-	>=virtual/jdk-1.6
-	source? ( app-arch/zip )"
+	>=virtual/jre-1.8:*"
+
+BDEPEND="
+	app-arch/unzip"
 
 JAVA_ANT_ENCODING="UTF-8"
 JAVA_ANT_REWRITE_CLASSPATH="yes"
@@ -39,8 +41,8 @@ PATCHES=(
 	"${FILESDIR}"/"${P}-build.xml.patch"
 )
 
-java_prepare() {
-	epatch "${PATCHES[@]}"
+src_prepare() {
+	default
 }
 
 src_install() {
diff --git a/dev-java/junitperf/Manifest b/dev-java/junitperf/Manifest
deleted file mode 100644
index 669309d71fc0..000000000000
--- a/dev-java/junitperf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST junitperf-1.9.1.zip 110600 BLAKE2B f3f1467382da532d104fb1236607c72f2984f00e98eb9ae931df6cfdd8235f075e485f2cdb21a9837a866ea00fd4d07a55ed80c29c9a74871890441519a551a9 SHA512 35fd3cddf5643ede31a89f39e0149ceb5a07c97521bcb4e661fce32b08a5299064f6b52828889d4918485f3ca000f6020dd6cec802d8b1579f46bd861ad74b1b
-EBUILD junitperf-1.9.1-r2.ebuild 1018 BLAKE2B 953336a1ccd9b935bcdec91cd44f439472a97b0a66869a5aac7fa6570e5798792d93be74bfb3159fe89f2ed391b7d95e465797cf29e9f3f7ac6158177d27fc17 SHA512 5869737034f34893b10608f2b9f4e64ba33bfbb6241491e3f0bcf2f66806a9d44961a34418650bc1a7d8198d5ead8db896fd05dff9a949a392e5668a8d6ef813
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/junitperf/junitperf-1.9.1-r2.ebuild b/dev-java/junitperf/junitperf-1.9.1-r2.ebuild
deleted file mode 100644
index ec0cf9ffc4bb..000000000000
--- a/dev-java/junitperf/junitperf-1.9.1-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc test source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple framework to write repeatable tests"
-SRC_URI="http://www.clarkware.com/software/${P}.zip"
-HOMEPAGE="http://www.clarkware.com/software/JUnitPerf.html"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-CDEPEND="dev-java/junit:4"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	test? ( dev-java/ant-junit:0 )
-	source? ( app-arch/zip )
-	>=virtual/jdk-1.6"
-
-java_prepare() {
-	java-pkg_clean
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="junit-4"
-EANT_DOC_TARGET="doc"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}"
-EANT_TEST_TARGET="test"
-
-src_test() {
-	ANT_TASKS="ant-junit" java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar "lib/${PN}.jar"
-	dodoc README
-	use doc && java-pkg_dojavadoc docs/api
-	use source && java-pkg_dosrc src/app/*
-}
diff --git a/dev-java/jzlib/Manifest b/dev-java/jzlib/Manifest
index bfb588e7183e..d59a84beb75b 100644
--- a/dev-java/jzlib/Manifest
+++ b/dev-java/jzlib/Manifest
@@ -1,3 +1,3 @@
 DIST jzlib-1.1.3.tar.gz 139424 BLAKE2B cae5f0f6ac8efd99cc916e8cc087280be84e1a2a8b43b8932dc68e2393ac5f1848e4dac1759aa75a54123adba63956463719aaa469ed88cf0c609eaa63647e16 SHA512 d78ed3feaded0bde62b3e2c6fb17b5051a6637bcf12e7fe0f5b1855922358b54b440b05bdba7328c5d2cb9f972bc68195f8f0570ce5d49de9251d7060018d88d
-EBUILD jzlib-1.1.3-r2.ebuild 1358 BLAKE2B 0c0daf567ac8a212c23f57b9d20eccca3205e4c1781de8c6cb463ac3cb8be5d172e76ca2c6cf1ab986d8d746aa804de739e779d5d509856fd3f26c1af7f495c4 SHA512 4525ae6863a81ebc1fe3a1054c0d49215bbd0c93c2b32598c48ebb5e385cfbc9d1ec52dd1f938e807c3c169d8d0b7b36cc059f1bc706933cdd3a6eb12a8595a9
+EBUILD jzlib-1.1.3-r2.ebuild 1357 BLAKE2B 5d6d650bf33a6d2977b2e73ba1198a1d7ba4372ebb9e5b4894a1078a5bcfe31c19b55a5fbb7dda6116f9ce9b63da410aa3db6cd8c2708ffd58c3f34983dccea8 SHA512 a072b2394dd62da277fa96af8e0f06dce080922830269bc58028abea8d8993c3c8d222a4b07ca4bf0042aacad56352e372a6eaf146dea7c152f609a724fde570
 MISC metadata.xml 322 BLAKE2B 6222cc2cd2fa5edb23a097bd254a7b7d8f7a4bba7dcda28b0435f1053aa990293d224851143662f2c9cbca6d48bb3576c40d357746cae77c02bd60404ce25c7b SHA512 d775e95ea730463fa57323f5cc0b00488790de6bb13e4aeb0941660573c385c1bf2045fa765b350e00fcba2f6f2035a6871b717399616bbc184222ae6b8fcc93
diff --git a/dev-java/jzlib/jzlib-1.1.3-r2.ebuild b/dev-java/jzlib/jzlib-1.1.3-r2.ebuild
index 89a304b848fb..4ed94830325b 100644
--- a/dev-java/jzlib/jzlib-1.1.3-r2.ebuild
+++ b/dev-java/jzlib/jzlib-1.1.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ymnk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=virtual/jre-1.8:*"
diff --git a/dev-java/kafka-clients/Manifest b/dev-java/kafka-clients/Manifest
new file mode 100644
index 000000000000..ee5722ea8242
--- /dev/null
+++ b/dev-java/kafka-clients/Manifest
@@ -0,0 +1,3 @@
+DIST kafka-1.1.1-src.tgz 6443963 BLAKE2B 721f9efb4bd2a1c605e1750a29a33f9939d346a1f81d380b980631d03a1dffcba2f435a91e9420a5876d2294f62c4e4ef39e951b0d37406c0b924f036947848d SHA512 26aa54fe5a761619fb748e4597dd2e3968a99c32d39312b56a83738df6df5e62052d7f883bf56cec25d1e31315d2ff856375fdc7f97a6029786abfa341769ecc
+EBUILD kafka-clients-1.1.1.ebuild 740 BLAKE2B 2f106e1388b02ab33e591281f2504d357e2ad080fd818bc82ff80c3b6c44e70a50260e7d9169fa4a94c43209a2367a5be12693f93180c7f842c2116a031749de SHA512 2c05add6e9527b8e352fe50950f93c90d402c0cf26362e5154051308e4e561dd478ea69b8765658143ea890cf4094db904c124d88cf15339a6cd09ed55a6ad18
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/kafka-clients/kafka-clients-1.1.1.ebuild b/dev-java/kafka-clients/kafka-clients-1.1.1.ebuild
new file mode 100644
index 000000000000..88b5337e7ba3
--- /dev/null
+++ b/dev-java/kafka-clients/kafka-clients-1.1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.kafka:kafka-clients:1.1.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Kafka distributed event streaming platform"
+HOMEPAGE="https://kafka.apache.org/"
+SRC_URI="https://archive.apache.org/dist/kafka/${PV}/kafka-${PV}-src.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+CP_DEPEND="
+	>=dev-java/lz4-java-1.4.1:0
+	>=dev-java/slf4j-api-1.7.25:0
+	>=dev-java/snappy-1.1.7.1:1.1
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/kafka-${PV}-src/clients"
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/kafka-clients/metadata.xml b/dev-java/kafka-clients/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/kafka-clients/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/kunststoff/Manifest b/dev-java/kunststoff/Manifest
deleted file mode 100644
index bc85adb3e619..000000000000
--- a/dev-java/kunststoff/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kunststoff-2_0_2.zip 77078 BLAKE2B f4da25026f04b1feec10fc1f74405116702d745711d1d6ddd3a8844905a1530a577fd9bf832451bdb87320b6ae2f34390842f58b9a5b70af70ce045e576554b1 SHA512 30e4d74ba28795152b7c740430ac8e5aa650bead2adcbe17442b6e2daefb36b0000d6f98653a161c6d504a6ac77b40fd1477d64143b77e73bec8c28f1c03c5d7
-EBUILD kunststoff-2.0.2-r2.ebuild 440 BLAKE2B ecc32f2876d2b56d984f8b27db33294d9889d7999aacb186ad31f7865ea084a6b88299f34548b9bdef619ed6141b80ab3648711ab9589b544530ae7c052e98a5 SHA512 7e7bf5bf7c3d8bcdcffa239b36955ad9806f3aebf33473f53a73328a928ec479f307b173c022a4014c6cb88ae45a062985d07632fcf295f6858f2ba5ad3b2072
-MISC metadata.xml 504 BLAKE2B ff22ce66d99cc092086640a5635310d33ededc431c9cf1df75e91e65ca1778387f4d02e0af6b6853e7232659acf2f30233d0423060bac2cd68a8ad730093adfa SHA512 dffb456fe85447c2645ef86ace7b0e49a9979d27e6f73586662a4542acbdedd5eb627c77e6a65a882fdcc8124909e6608abaac049449a7d55986ea34e8ca9eac
diff --git a/dev-java/kunststoff/kunststoff-2.0.2-r2.ebuild b/dev-java/kunststoff/kunststoff-2.0.2-r2.ebuild
deleted file mode 100644
index 381acae2d3ce..000000000000
--- a/dev-java/kunststoff/kunststoff-2.0.2-r2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Kunststoff look'n'feel Java library"
-HOMEPAGE="http://www.incors.org/archive"
-SRC_URI="http://www.incors.org/archive/${P//./_}.zip"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/kunststoff/metadata.xml b/dev-java/kunststoff/metadata.xml
deleted file mode 100644
index a269c3923233..000000000000
--- a/dev-java/kunststoff/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-
-<longdescription>
-
-The Kunststoff Look&amp;Feel is an extension to the the Java Metal
-Look&amp;Feel.  This makes it very compact in size (approx. 43 kBytes) and
-ensures that all the great features provided by the Metal Look&amp;Feel do not
-get lost.
-
-</longdescription>
-</pkgmetadata>
diff --git a/dev-java/kxml/Manifest b/dev-java/kxml/Manifest
deleted file mode 100644
index a937653d4463..000000000000
--- a/dev-java/kxml/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX kxml-2.3.0-build.xml 1888 BLAKE2B 8a64b9c1b87aef6d2d58bb7ebe6a7c55da351ef08ab48912d5e394310cd44d25b59d8f66f1936647a2c529bc94329ffa405e904c8ace9842db0bd34cc278b75e SHA512 4fab1fd2b9abc410d0df327ba08f99658c1752e07fffd97183c924e815f72c365293ad5771d3eb3375b827b80ccd17bda3211d595066cbfd16e32a080950148a
-DIST kxml2-src-2.3.0.zip 354878 BLAKE2B 5e1a5f7d684493eac0b74ef1c2220075d85f2276dbd2b5ff4cba539571831045dad1a9e84f71596390adbcc34368f381318dd20ccd75968eb66abdb2805e50c8 SHA512 f4eeaa71fbe76b51cefb9a195d292c22c79c241920915fe8ddcf30dc11af39bbeb6b848a8c4dab9775fc8e327c5a29586ac53263a577de361312bbf45e25c1e5
-EBUILD kxml-2.3.0.ebuild 941 BLAKE2B 225088a5ca66d4e6da229fef3be398552e5c77f5a2b738e98807c42f8fc0db0597c263c61ad556035c10cb86596d175bbc289e7ab2c42cf7e4f64f35d3f9d83d SHA512 98e94185940701b7fe28f5c6a1a0536064e41a98554e4784f4046bdfa0e2e3249766d1b8fd06d88d085c070d43319e61d1f0c30e3894e6b523d6d2c986815dba
-MISC metadata.xml 311 BLAKE2B 3606d262e9272cf836bd57275290c96874ac0f36cfe1eaec3dd2a8f2107a661077fc37324174310d9d877e01fbabaf9912236048476fbe7afd635adc4b88c018 SHA512 cae86afc667688499de935e3fb7a4a11b63d6dacda60a4c9cf3463706ebf389131cea033a3baa60d3b1386527a80f20804b8f4cccfb91f58faf6e9e874a7a8c8
diff --git a/dev-java/kxml/files/kxml-2.3.0-build.xml b/dev-java/kxml/files/kxml-2.3.0-build.xml
deleted file mode 100644
index ee1280d24b1b..000000000000
--- a/dev-java/kxml/files/kxml-2.3.0-build.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="build" basedir="." name="kxml2" >
-
-  <property name="version" value="2.3.0" ></property>	
-	
-  
-  <target name="javadoc" >
-    <delete dir="www/kxml2/javadoc" ></delete>
-    <mkdir dir="www/kxml2/javadoc" ></mkdir>    
-    <javadoc use="true" windowtitle="kxml API" author="true" sourcepath="src" classpath="" destdir="www/kxml2/javadoc" doctitle="kxml API" version="true" packagenames="org.kxml2.*" public="yes" source="1.4" ></javadoc>
-  </target>
-  
-    
-    <target depends="build_jar,javadoc" name="build_src" >
-		<zip zipfile="dist/kxml2-src-${version}.zip" >
-		  <fileset dir="." >
-		    <include name="*/**" ></include>
-		    <exclude name=".*" ></exclude>
-		    <exclude name="classes/**" ></exclude>
-		    <exclude name="tmpclasses/**" ></exclude>
-		    <exclude name="dist/kxml2-src-*.zip" ></exclude>
-		   </fileset>
-		</zip>    
-    
-    </target>
-
-
-    <target name="build_jar" >
-
-    	<delete dir="tmpclasses" ></delete>
-    	<mkdir dir="tmpclasses" ></mkdir>
-    	
-    	<javac destdir="tmpclasses" debuglevel="none" srcdir="src" optimize="true" verbose="true" source="1.4" target="1.4" nowarn="yes" classpath="${gentoo.classpath}" ><classpath path="${gentoo.classpath}" ></classpath></javac>
-	
-        <mkdir dir="dist" ></mkdir>
-            
-    	
-		<jar jarfile="dist/kxml2-${version}.jar" >
-			<fileset dir="tmpclasses" >
-				<include name="**/*.class" ></include>
-				<include name="META-INF/**" ></include>
-			</fileset>
-			<fileset dir="src" >
-				<include name="META-INF/**" ></include>
-			</fileset>			
-		</jar>
-
-		<jar jarfile="dist/kxml2-min-${version}.jar" >
-			<fileset dir="tmpclasses" >
-				<include name="org/kxml2/io/KXmlParser.class" ></include>
-			</fileset>
-		</jar>
-
-    	<delete dir="tmpclasses" ></delete>
-	</target>
-
-
-    <target depends="build_src" name="build" ></target>
-
-	
-    
-</project>
diff --git a/dev-java/kxml/kxml-2.3.0.ebuild b/dev-java/kxml/kxml-2.3.0.ebuild
deleted file mode 100644
index 434bf19f6533..000000000000
--- a/dev-java/kxml/kxml-2.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Small XML Pull Parser"
-HOMEPAGE="http://kxml.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}2-src-${PV}.zip"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="amd64 ppc64 x86"
-
-CDEPEND="dev-java/xpp3:0"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	app-arch/unzip"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-java_prepare() {
-	java-pkg_clean
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="build_jar"
-EANT_GENTOO_CLASSPATH="xpp3"
-
-src_install() {
-	java-pkg_newjar dist/${PN}2-${PV}.jar ${PN}.jar
-	java-pkg_newjar dist/${PN}2-min-${PV}.jar ${PN}-min.jar
-
-	use source && java-pkg_dosrc src/org
-	use doc && java-pkg_dojavadoc www/kxml2/javadoc
-	use examples && java-pkg_doexamples samples
-}
diff --git a/dev-java/laf-plugin/Manifest b/dev-java/laf-plugin/Manifest
deleted file mode 100644
index 579dd39b24d9..000000000000
--- a/dev-java/laf-plugin/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX laf-plugin-0.2-enum.patch 1987 BLAKE2B 9098169cdc3af4f3497542a4a92a37ee3dfa7be9843887d1f8ffdd7f4c40a8cd6bb3ee3efdf76a4fc6fefca7d803189cfb01179e57506feac30c3ae7984dd780 SHA512 3f32b546c95033add7647a209ea269ee398b90a3e286e60479dff83f20cb93c78318d80f961c544ed728c09b1f61297e492b7963736eb56e802ec7401298b801
-DIST laf-plugin-0.2.tar.bz2 13799 BLAKE2B b466053ccc064cc067f408a2d57e9ff99ae1d0e421ec70fe789baa865aa8ad12dae0143591b06ee9f19ce7d59b3c41e75ccb2adfe597d40923f5e4a4f156e144 SHA512 91ac3f9f5ebfcd70e7cc76f2e028e9578c6113a848b0ccdc6b001fff006bf5aaa12af08b1752851693d218d4b2d7d053f62461481e49d5a0bde21e5a7d086331
-DIST laf-plugin-1.1.jar 8105 BLAKE2B 45d065389b25f2e6cf8a06058edba8f056bb02a8e1eb038d0e88c04e086ba09b4ede4064f7bd8c618a0daf328e20781fa15d4902cf7889d41110af92bcf5e5a7 SHA512 2ca265d23ac95e5d194e4905ead4c975cb8739a0aa30096c028d2f6467b148de2ac0ff71c6730752a666eee53551867d9d8c852d25238a873fbd4bd994cf80c0
-EBUILD laf-plugin-0.2-r2.ebuild 539 BLAKE2B 9b9d49d0f726427c6e5691044ca1101161b78be33317ee0083d95dcf18bfa61d71d953f8c14f7ff9dd687b86f917835de6de3a842f35fe5c5a29a35679c5a198 SHA512 0866b89e12c674b363987c0be1a604a561b136b26f92301e3ad5710b11f4ba604e085e29baff0c2304776f297b24852f7dca272dd3b1d47c97a44862f6809ab1
-EBUILD laf-plugin-1.1-r1.ebuild 648 BLAKE2B a3e386472b23de79162574227eb866422090efa8fa326413111768f897445c5b2030712a92ac26306c540bffedbe946d75038ad7d78dc1d0bab57503d02c1a91 SHA512 4d788eacf78c97ebc3f873766d2872f93a408bca6be7524c09c095350b4825df1e995a6a26437a3c4cf34959d6ccef0461f6e1afab9f88551f781b924a9da9b4
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/laf-plugin/files/laf-plugin-0.2-enum.patch b/dev-java/laf-plugin/files/laf-plugin-0.2-enum.patch
deleted file mode 100644
index 35d818ead30a..000000000000
--- a/dev-java/laf-plugin/files/laf-plugin-0.2-enum.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/src/org/jvnet/lafplugin/XMLElement.java	2017-03-24 19:08:40.320048066 +0000
-+++ b/src/org/jvnet/lafplugin/XMLElement.java	2017-03-24 19:10:18.490049991 +0000
-@@ -478,9 +478,9 @@
-         this.children = new Vector();
-         this.entities = entities;
-         this.lineNr = 0;
--        Enumeration enum = this.entities.keys();
--        while (enum.hasMoreElements()) {
--            Object key = enum.nextElement();
-+        Enumeration myEnum = this.entities.keys();
-+        while (myEnum.hasMoreElements()) {
-+            Object key = myEnum.nextElement();
-             Object value = this.entities.get(key);
-             if (value instanceof String) {
-                 value = ((String) value).toCharArray();
-@@ -2168,10 +2168,10 @@
-         writer.write('<');
-         writer.write(this.name);
-         if (! this.attributes.isEmpty()) {
--            Enumeration enum = this.attributes.keys();
--            while (enum.hasMoreElements()) {
-+            Enumeration myEnum = this.attributes.keys();
-+            while (myEnum.hasMoreElements()) {
-                 writer.write(' ');
--                String key = (String) enum.nextElement();
-+                String key = (String) myEnum.nextElement();
-                 String value = (String) this.attributes.get(key);
-                 writer.write(key);
-                 writer.write('='); writer.write('"');
-@@ -2189,9 +2189,9 @@
-             writer.write('/'); writer.write('>');
-         } else {
-             writer.write('>');
--            Enumeration enum = this.enumerateChildren();
--            while (enum.hasMoreElements()) {
--                XMLElement child = (XMLElement) enum.nextElement();
-+            Enumeration myEnum = this.enumerateChildren();
-+            while (myEnum.hasMoreElements()) {
-+                XMLElement child = (XMLElement) myEnum.nextElement();
-                 child.write(writer);
-             }
-             writer.write('<'); writer.write('/');
diff --git a/dev-java/laf-plugin/laf-plugin-0.2-r2.ebuild b/dev-java/laf-plugin/laf-plugin-0.2-r2.ebuild
deleted file mode 100644
index 27a2ea3f6544..000000000000
--- a/dev-java/laf-plugin/laf-plugin-0.2-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Look'n'feel Java library"
-HOMEPAGE="http://laf-plugin.dev.java.net/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="BSD"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}"
-
-PATCHES=( "${FILESDIR}/${P}-enum.patch" )
-
-src_prepare() {
-	default
-}
-
-src_install() {
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/laf-plugin/laf-plugin-1.1-r1.ebuild b/dev-java/laf-plugin/laf-plugin-1.1-r1.ebuild
deleted file mode 100644
index 0c34f8779fc1..000000000000
--- a/dev-java/laf-plugin/laf-plugin-1.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Look'n'feel Java library"
-HOMEPAGE="http://laf-plugin.dev.java.net"
-SRC_URI="https://repo1.maven.org/maven2/net/java/dev/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-LICENSE="BSD"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/nanoxml:0"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-JAVA_GENTOO_CLASSPATH="nanoxml"
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_install() {
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/laf-plugin/metadata.xml b/dev-java/laf-plugin/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/laf-plugin/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/leiningen-bin/Manifest b/dev-java/leiningen-bin/Manifest
index 31cbf865501d..be867e3a63c5 100644
--- a/dev-java/leiningen-bin/Manifest
+++ b/dev-java/leiningen-bin/Manifest
@@ -1,14 +1,5 @@
 AUX leinrc 37 BLAKE2B 0c5df00ef323caebf53e52246ca87b066a1b6104fb03fc7e3548dba0947ecf53c33bf4e8215fc098212293915d9808b961c0df527f30d7f6316b4aff84bf3b69 SHA512 f948d5f355d43fdee6cf68d0dad39f53f72b341649869a6ca161f5d8c83bf30434ed03c51a7e01aaefa422ff4e93ca3db5680fd4c2af92f5393acde6e8aec7d0
-DIST leiningen-2.8.0-standalone.jar 13541842 BLAKE2B 79697751b9da90a3f61bd4b8722436d1af1ce9f8db5c0e3a68d15d006f2afcb9518ab2034554b9b8a8e5f8bb991b304d51b8f45fb9a77d7337718035dc271e7d SHA512 e16359b2d211f9a72eeb9b672a94155f49531cbb731df11451b76ec30ad83be4a22e0b2ecc582bb01fdadd6822f56f27d42fa214df222f6c95e0fde64cb305ed
-DIST leiningen-2.8.0.sh 4335 BLAKE2B 951cc9b69e726bbb84c88b8b6407386c878cb1521c5cd79c7ce39ed48805cd24e9af0102f21cd7e852a024830b151751d42e7524f729bcca40f0e7de013ceb8b SHA512 08a5e2fc68ac3bd34dc32558088bd2ff79c9d72c54a610cfcd8c79fa5dcb98ad28d6950cb91b88081d024d5be881a168c2f9235c7888aa36c0f0e7e1f124169f
-DIST leiningen-2.8.1-standalone.jar 13541128 BLAKE2B f38c5d9e8e0088af352f915c2e3290bbbd97fd791607e1553109084a302c6c58d37f1d712b68b31d16d5de83239a9908bcf69aad0eaf1d2dc2e358090665fab8 SHA512 7c585d25f7089dbd718d84711b202b087ec4987f2e1a448fc00cb789a12da88967c048f2de1d087c9e81c6fcfd8b82825117220ba729096b4c946ae25504c716
-DIST leiningen-2.8.1.sh 4461 BLAKE2B ed3fe5421bfdf4fc3a0a8d09bba7c3ca4de4571bd2dcd26251af338dcff0baaa71208c83317b62067f2fcde4a70aef5593cc7c31742eed6ce5db8c3ce8a80b9b SHA512 77ef29885a87e7c23b972d519cdb052b94a74d63f8a455935c199f5f7c04ab30ed06503792ea5a21ac047c7abdcf7e4e72e54114b96f984e4bcb9790e97909de
-DIST leiningen-2.8.3-standalone.jar 13598124 BLAKE2B 1810acb75adb25985b660d14d5be429a82b81480d38a6325ddb99a34ae6d44fed0b19243135c673001ff958935d1bb8e912940e22b25b3aed7982a80fbbd3fb3 SHA512 f9ed3604dbf0498524b3a137a872576de7cb5b8df6d4841cf6d552adc0b8cf2186244805cd53228d57c4285803069ed8a67a8dd33a326369cb468dcc773444f7
-DIST leiningen-2.8.3.sh 4509 BLAKE2B b5291c5596dea00c2043ae7c791f2a79077e545eec667a99e584400af5351258fb5041037fe060a12033115dd0fbc63a8e9ad83f1d6c926c231d49ad331adb51 SHA512 d62a5e9bbf10d940763ca988f900900413e80bf9d0e2d8c668f897f178dbc64daf7b828e8dcd1c72aa0794e266814491122b8d8acd47c5561feec177595cabdd
 DIST leiningen-2.9.1-standalone.jar 14621704 BLAKE2B 51d3aca27c56dcdf1560271509e6c4868e387255af5f4e75f42755243b14949ef994cbee81f796a5a533089433fff59e9aff65d7e4e93df02e86fccfd47cf7f9 SHA512 4364aa2a071117049f97f95e020f75bfd0875c88475591d4e04100ac1b228137360a8b24c09877cd3400b7854bf9392b4e5d07ed7f7972e10e4ef5396d0db574
 DIST leiningen-2.9.1.sh 4511 BLAKE2B 66fd656c20ed9b109982840315951b062b1a3fbf0b2b76fc1b6ca612d4daa5d07480838f3f58ec1f1193ff29318323123b6f58bde390d4fb628566687ed39eab SHA512 044621254d31bee3bcdd3f6bd52e9c233a736e2e780edaa3af1d5a7a90424294efd25590c9d3a0606560b223b9e73c87c258fbbb626d2af1b39a400ba1aea86d
-EBUILD leiningen-bin-2.8.0.ebuild 1549 BLAKE2B 121745ac21ffc2a35bc7fcf9faf3cc60a94125445f426b6cbcc96dad0be74f0a94060ecf5f1490239c1cfc5e1eaff8e597a4f2823474c9c82ea201280f7e9912 SHA512 538011051c64acaf051b4b7b97e23e8a32655fe038520e4585d5d90d071ae6241c61e366b71e5b8d5178d2c1acd573d4b51796cfc2e1513cfb296232e9eee2af
-EBUILD leiningen-bin-2.8.1.ebuild 1546 BLAKE2B 06c5c1d35e08895de62663541d2f49e221b89c24946ae30eedc8ef4eb49a72d885efd621be562b8477cb5381fdd7d369b236ab27956d04669682dbdbcf541d8e SHA512 ff8b91c1e3482867e6a6fb4fa02f9445c8cb49ad8531e37dd1be4e2256522b299333328660feabfbd10098cd959b1a6123793fa11fa19dbb50608291f1e1efdf
-EBUILD leiningen-bin-2.8.3.ebuild 1546 BLAKE2B eea35f9cb33a79851688f15c92ab0e3ffeb167aefaa217cfcd53bd523675fac8a86fac89e8472b154a6831864f5146dcbb7eda6d251ee45316ba4fa75b60c88b SHA512 2d1e01491c03f3415e88bde8f9a0919f025abfccc41ae9f8675b4c276d2bd88349af5043de457afe0e048ab67f17d6b90c41abe6aafc7c1427f39ea1ee9afe8a
 EBUILD leiningen-bin-2.9.1.ebuild 1551 BLAKE2B 711f1bf3e8452e3def5e88ebe555533f87875670160ca44843647e0aef1b19d5117f6c7281ecf32fc626ff8c155a0b287cce2e5551ab794b21e6687bebeb9c3e SHA512 b57c0ad469d3b3bd2f1fb2fe0873c027106d699b30e7291607107f588a8f1283cf714b2d81fa2d8a8bd4f9a80d4e375be933e38d17e76ba64a81ff9fc633bf69
 MISC metadata.xml 303 BLAKE2B 3567c3889af4a644c925f03a220c329a207daeeca9437b8382ff777db620106cc807aadfaf6c157654c634dfa26c14fd654933aa5bd4b8027068fd6f67f1f241 SHA512 73c6a8fbd269fdf6a20f70aa0228314e3010461dad5c1b04f7b7c54d1cc3a2c7b475f180c6740cc9795b6d73fd39c7ce326ecf69768b1f11f2b264618711c1c3
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.8.0.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.8.0.ebuild
deleted file mode 100644
index dd80a3d2fd2f..000000000000
--- a/dev-java/leiningen-bin/leiningen-bin-2.8.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_PNV="${MY_PN}-${PV}"
-
-DESCRIPTION="Automate Clojure projects without setting your hair on fire"
-HOMEPAGE="https://leiningen.org/"
-SRC_URI="
-	https://github.com/technomancy/${MY_PN}/releases/download/${PV}/${MY_PNV}-standalone.zip -> ${MY_PNV}-standalone.jar
-	https://raw.githubusercontent.com/technomancy/${MY_PN}/${PV}/bin/lein-pkg -> ${MY_PNV}.sh
-"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-RESTRICT="test"
-
-src_unpack() {
-	mkdir -p "${S}" || die "Can't mkdir ${S}"
-	cd "${S}"	|| die "Can't enter ${S}"
-	for file in ${A}; do
-		einfo "Copying ${file}"
-		cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
-	done
-}
-
-src_prepare() {
-	einfo "Copying leinrc"
-	cp "${FILESDIR}/leinrc" "${S}/" || die "Can't copy leinrc"
-	einfo "Patching leinrc"
-	sed -i "s^@@PN@@^${PN}^" "${S}/leinrc" || die "Can't patch leinrc"
-
-	einfo "Renaming lein-pkg"
-	# Rename generically to help user patching
-	mv "${S}/${MY_PNV}.sh" "${S}/lein" || die "Can't rename to lein"
-
-	einfo "Patching lein"
-	java-pkg_init_paths_
-	sed -i "s|^LEIN_JAR=.*$|LEIN_JAR=${EPREFIX}/${JAVA_PKG_JARDEST#/}/${PN}.jar|" "${S}/lein" \
-		|| die "Can't patch LEIN_JAR in lein"
-
-	default
-}
-
-src_compile() { :; }
-
-src_install() {
-	dobin "${S}/lein"
-	java-pkg_newjar "${MY_PNV}-standalone.jar"
-	insinto /etc
-	doins "${S}/leinrc"
-	fperms 0644 "/etc/leinrc"
-}
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.8.1.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.8.1.ebuild
deleted file mode 100644
index c8a23a81510b..000000000000
--- a/dev-java/leiningen-bin/leiningen-bin-2.8.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_PNV="${MY_PN}-${PV}"
-
-DESCRIPTION="Automate Clojure projects without setting your hair on fire"
-HOMEPAGE="https://leiningen.org/"
-SRC_URI="
-	https://github.com/technomancy/${MY_PN}/releases/download/${PV}/${MY_PNV}-standalone.zip -> ${MY_PNV}-standalone.jar
-	https://raw.githubusercontent.com/technomancy/${MY_PN}/${PV}/bin/lein-pkg -> ${MY_PNV}.sh
-"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-RESTRICT="test"
-
-src_unpack() {
-	mkdir -p "${S}" || die "Can't mkdir ${S}"
-	cd "${S}"	|| die "Can't enter ${S}"
-	for file in ${A}; do
-		einfo "Copying ${file}"
-		cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
-	done
-}
-
-src_prepare() {
-	einfo "Copying leinrc"
-	cp "${FILESDIR}/leinrc" "${S}/" || die "Can't copy leinrc"
-	einfo "Patching leinrc"
-	sed -i "s^@@PN@@^${PN}^" "${S}/leinrc" || die "Can't patch leinrc"
-
-	einfo "Renaming lein-pkg"
-	# Rename generically to help user patching
-	mv "${S}/${MY_PNV}.sh" "${S}/lein" || die "Can't rename to lein"
-
-	einfo "Patching lein"
-	java-pkg_init_paths_
-	sed -i "s|^LEIN_JAR=.*$|LEIN_JAR=${EPREFIX}/${JAVA_PKG_JARDEST#/}/${PN}.jar|" "${S}/lein" \
-		|| die "Can't patch LEIN_JAR in lein"
-
-	default
-}
-
-src_compile() { :; }
-
-src_install() {
-	dobin "${S}/lein"
-	java-pkg_newjar "${MY_PNV}-standalone.jar"
-	insinto /etc
-	doins "${S}/leinrc"
-	fperms 0644 "/etc/leinrc"
-}
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.8.3.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.8.3.ebuild
deleted file mode 100644
index 8025bfa59aba..000000000000
--- a/dev-java/leiningen-bin/leiningen-bin-2.8.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_PNV="${MY_PN}-${PV}"
-
-DESCRIPTION="Automate Clojure projects without setting your hair on fire"
-HOMEPAGE="https://leiningen.org/"
-SRC_URI="
-	https://github.com/technomancy/${MY_PN}/releases/download/${PV}/${MY_PNV}-standalone.zip -> ${MY_PNV}-standalone.jar
-	https://raw.githubusercontent.com/technomancy/${MY_PN}/${PV}/bin/lein-pkg -> ${MY_PNV}.sh
-"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8"
-
-RESTRICT="test"
-
-src_unpack() {
-	mkdir -p "${S}" || die "Can't mkdir ${S}"
-	cd "${S}"	|| die "Can't enter ${S}"
-	for file in ${A}; do
-		einfo "Copying ${file}"
-		cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
-	done
-}
-
-src_prepare() {
-	einfo "Copying leinrc"
-	cp "${FILESDIR}/leinrc" "${S}/" || die "Can't copy leinrc"
-	einfo "Patching leinrc"
-	sed -i "s^@@PN@@^${PN}^" "${S}/leinrc" || die "Can't patch leinrc"
-
-	einfo "Renaming lein-pkg"
-	# Rename generically to help user patching
-	mv "${S}/${MY_PNV}.sh" "${S}/lein" || die "Can't rename to lein"
-
-	einfo "Patching lein"
-	java-pkg_init_paths_
-	sed -i "s|^LEIN_JAR=.*$|LEIN_JAR=${EPREFIX}/${JAVA_PKG_JARDEST#/}/${PN}.jar|" "${S}/lein" \
-		|| die "Can't patch LEIN_JAR in lein"
-
-	default
-}
-
-src_compile() { :; }
-
-src_install() {
-	dobin "${S}/lein"
-	java-pkg_newjar "${MY_PNV}-standalone.jar"
-	insinto /etc
-	doins "${S}/leinrc"
-	fperms 0644 "/etc/leinrc"
-}
diff --git a/dev-java/libg/Manifest b/dev-java/libg/Manifest
index bf348eb2b409..6c32a0d549b7 100644
--- a/dev-java/libg/Manifest
+++ b/dev-java/libg/Manifest
@@ -1,3 +1,3 @@
 DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e
-EBUILD libg-2.1.0-r2.ebuild 1387 BLAKE2B 3e3d381476db88d4326d40afd08b0bf595562a5a8da9e0fc2ac818cdad263964eeb60f66e6e0dd3b0dbe99194db3be0b0ff0c6017d869b8f91968f3eebb3e1a1 SHA512 96af4abc40ea4d213c086ee85a73bc2f2e6a1b35fd287a70d5f8acc36d85b04bd3c19d4ef106241043c436c12a3fb9b0e1f1b8bf7f242d1390dbb02d37388792
+EBUILD libg-2.1.0-r2.ebuild 1386 BLAKE2B 18b2226cc5baf7163a3be41ff76f01d4299c8140a3c70deea384fc49940a7ec2da58422dd540eaf61ff15ae727b888917e21ea6e5969e6c05c2813e33631436e SHA512 7c8611502139b1ead43116b363b4e61d825e751d08d945551c307fae1179c245ea0686bc64e5b282892d93b905cb9c93e89449abeb289b31c87e7e23d1302dd0
 MISC metadata.xml 324 BLAKE2B 4abc17608a568a12af96dc0ddb7b82d55341ad891537e120633fd8517e09a339d805325988f3208050cde9b20aeb0a4dcab95e55ba13c66854a0d90b0e54551c SHA512 e9e23c794433024b0888c2d5859120c0ef39cd6b55df99035c3ea1761280bd4287fdeb4aaf8ff067bab1bea80dcdcc9060f74b43b1a6a004bad87eb69a9bd3c3
diff --git a/dev-java/libg/libg-2.1.0-r2.ebuild b/dev-java/libg/libg-2.1.0-r2.ebuild
index b5305fd26da6..426364b8ed10 100644
--- a/dev-java/libg/libg-2.1.0-r2.ebuild
+++ b/dev-java/libg/libg-2.1.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> bndlib-${PV
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Tests depend on biz.aQute.junit, which depends on biz.aQute.bndlib, which on
 # its own turn again depends on aQute.libg again; we can temporarily assume that
diff --git a/dev-java/lmax-disruptor/Manifest b/dev-java/lmax-disruptor/Manifest
new file mode 100644
index 000000000000..ac883d4784a9
--- /dev/null
+++ b/dev-java/lmax-disruptor/Manifest
@@ -0,0 +1,3 @@
+DIST lmax-disruptor-3.4.4.tar.gz 237165 BLAKE2B ff17747e24a587e4b0656e16281ecf98cad5b3f260cd270a87e157ccbd6afc4a4e0886fcfab774a3c7919a9f5d26e13199a3cbcd3f7699986d4f9a36576f72dd SHA512 871d474ecbc4e09d33b0d099232f2abdf88b755141e00406e4a721e5bd6c5edc99c6c446277e054bd603ae9b158bdb6b438aa6e8532194dca9bce953b748bfde
+EBUILD lmax-disruptor-3.4.4.ebuild 1107 BLAKE2B 03bcc8f5ffcb179470fdb30b17947d2bc5cb5cd344e1fd2686d1b34240552cd0fb656a4c3b0240f37a0e06d7f4556d2a2eab625eeacab17833924cb6a30e23e8 SHA512 e420a4458140df67c28a9899bec7eb5bc7ac4d50d64c470031dac91c43048f0070064fcae6156c78a5b6fb8af95a3565665c634c4c387a104b3e44700ccc5d3c
+MISC metadata.xml 376 BLAKE2B f4b72884865eb86b976ea321da5928f86381e0e75e3a70e41d021bae09899405a94ed5912e1df50ff08cf5c2235dcd8d4313b28ff28abf2139472d4567c8e371 SHA512 024ef518413831c50007e65121469b9e3b8c1f10e83bb9c43dc7f266163f694d72cccdc1ecaa03f12461dd9f8571049dba95968e22407d662d3e249fff9779af
diff --git a/dev-java/lmax-disruptor/lmax-disruptor-3.4.4.ebuild b/dev-java/lmax-disruptor/lmax-disruptor-3.4.4.ebuild
new file mode 100644
index 000000000000..740ecc7747c2
--- /dev/null
+++ b/dev-java/lmax-disruptor/lmax-disruptor-3.4.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.lmax:disruptor:3.4.4"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A High Performance Inter-Thread Messaging Library"
+HOMEPAGE="https://lmax-exchange.github.io/disruptor/"
+SRC_URI="https://github.com/LMAX-Exchange/disruptor/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( LICENCE.txt README.md )
+
+S="${WORKDIR}/disruptor-${PV}"
+
+JAVA_SRC_DIR="src/main"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test"
+JAVA_TEST_EXCLUDES=(
+	# valid test classes have pattern *Test with nothing behind
+	com.lmax.disruptor.dsl.stubs.TestWorkHandler # No runnable methods
+	com.lmax.disruptor.support.TestEvent # No runnable methods
+	com.lmax.disruptor.support.TestWaiter # No runnable methods
+)
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/freehep-graphicsio-tests/metadata.xml b/dev-java/lmax-disruptor/metadata.xml
index 496b6e6faccc..bc7984dba201 100644
--- a/dev-java/freehep-graphicsio-tests/metadata.xml
+++ b/dev-java/lmax-disruptor/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
-		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">freehep/freehep-vectorgraphics</remote-id>
+		<remote-id type="github">LMAX-Exchange/disruptor</remote-id>
+		<bugs-to>https://github.com/LMAX-Exchange/disruptor/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/log4j-12-api/Manifest b/dev-java/log4j-12-api/Manifest
new file mode 100644
index 000000000000..9601bde1d5be
--- /dev/null
+++ b/dev-java/log4j-12-api/Manifest
@@ -0,0 +1,3 @@
+DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
+EBUILD log4j-12-api-2.17.1.ebuild 3117 BLAKE2B 6be65ea15be5ba1990b0f221d9886088ffb3c335f87161abbf42859e61cb6aa88fa5cbe1e7fb772eb074cab9edbdb053aa34e277cbd1bb7562621602307dd739 SHA512 60312afbd6442c064edb3fd54cbaa3e4305773d3a9473d175f0ed474affd7699ccb673a7f54e4836245fa96ab399ede336df0e3f6083c300db163c5967bc3418
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild b/dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild
new file mode 100644
index 000000000000..b623dce8e57d
--- /dev/null
+++ b/dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom log4j-1.2-api/pom.xml --download-uri mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-12-api-2.17.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.logging.log4j:log4j-1.2-api:2.17.1"
+JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Apache Log4j 1.x Compatibility API"
+HOMEPAGE="https://logging.apache.org/log4j/2.x/"
+SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+
+# We don't have junit-vintage and junit-jupiter
+RESTRICT="test"
+
+# Common dependencies
+# POM: log4j-1.2-api/pom.xml
+# org.apache.logging.log4j:log4j-api:2.17.1 -> >=dev-java/log4j-api-2.17.1:2
+# org.apache.logging.log4j:log4j-core:2.17.1 -> >=dev-java/log4j-core-2.17.1:2
+
+CP_DEPEND="
+	~dev-java/log4j-api-${PV}:2
+	~dev-java/log4j-core-${PV}:2
+"
+
+# Compile dependencies
+# POM: log4j-1.2-api/pom.xml
+# org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.1.Final -> >=dev-java/jboss-jms-api-1.0.1:1.1
+# POM: log4j-1.2-api/pom.xml
+# test? com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.12.4 -> >=dev-java/jackson-dataformat-xml-2.13.0:0
+# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
+# test? org.apache.felix:org.apache.felix.framework:5.6.12 -> !!!groupId-not-found!!!
+# test? org.apache.logging.log4j:log4j-api:2.17.1 -> >=dev-java/log4j-api-2.17.1:2
+# test? org.apache.logging.log4j:log4j-core:2.17.1 -> >=dev-java/log4j-core-2.17.1:2
+# test? org.apache.velocity:velocity:1.7 -> !!!artifactId-not-found!!!
+# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-engine:5.7.2 -> !!!groupId-not-found!!!
+# test? org.junit.vintage:junit-vintage-engine:5.7.2 -> !!!groupId-not-found!!!
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	dev-java/jboss-jms-api:1.1"
+#	test? (
+#		!!!artifactId-not-found!!!
+#		!!!groupId-not-found!!!
+#		>=dev-java/commons-io-2.11.0:1
+#		>=dev-java/jackson-dataformat-xml-2.13.0:0
+#		~dev-java/log4j-api-${PV}:2
+#		~dev-java/log4j-core-${PV}:2
+#	)
+#"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md LICENSE.txt )
+
+S="${WORKDIR}/apache-log4j-${PV}-src"
+
+JAVA_CLASSPATH_EXTRA="jboss-jms-api-1.1"
+JAVA_SRC_DIR="log4j-1.2-api/src/main/java"
+JAVA_RESOURCE_DIRS=(
+	"log4j-1.2-api/src/main/resources"
+)
+
+#	JAVA_TEST_GENTOO_CLASSPATH="jackson-dataformat-xml,commons-io-1,!!!groupId-not-found!!!,log4j-api-2,log4j-core-2,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+#	JAVA_TEST_SRC_DIR="log4j-1.2-api/src/test/java"
+#	JAVA_TEST_RESOURCE_DIRS=(
+#		"log4j-1.2-api/src/test/resources"
+#	)
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jnlp-api/metadata.xml b/dev-java/log4j-12-api/metadata.xml
index 4221e170cbc0..75321cfb5598 100644
--- a/dev-java/jnlp-api/metadata.xml
+++ b/dev-java/log4j-12-api/metadata.xml
@@ -3,6 +3,5 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
-		<name>Java</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/log4j-api-java9/Manifest b/dev-java/log4j-api-java9/Manifest
index 045221d1256b..dec3535e1897 100644
--- a/dev-java/log4j-api-java9/Manifest
+++ b/dev-java/log4j-api-java9/Manifest
@@ -1,3 +1,3 @@
-DIST apache-log4j-2.15.0-src.tar.gz 11550453 BLAKE2B 3b7a356714fbff0ad81f633750a45f6b3869df933c89c22b28346e49c6dfb83002ecf6374d04b1ae6a45b5486314654c8a660f3aee7a6b30273439e44db2c610 SHA512 61574722ab0a24bd0301fea57504a645f98f0e5913d1e02e49d25b3dcbf2dcbb3153cfca58fdde632087f94edc8e83820951288ba494234954ab4eeeb6b8be6a
-EBUILD log4j-api-java9-2.15.0.ebuild 1551 BLAKE2B 44ffc336a3535f462e73cb30e6dc8f5cf94b7fc55ca86a3f76a45bf9b7c7be6a7fd2dfbe71613075b6aff0cf8110a11039f828e5f5770d417d922ddad31236e2 SHA512 9fbf1ab640d31db0eaa043a39a8a42d9f92969fafabf9844488557fd453ad7eea9adc6ba5863afb6f52ab887f0d60a85279649972581298af1290f39561d4f39
+DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
+EBUILD log4j-api-java9-2.17.1.ebuild 1532 BLAKE2B f74496a314f839b04f84478859ea4d05ecc9f4dc5e0a0c94e3e99fa9b24bbabc4f41be23e72ff6d5acc45decc11daf07566915079c127503953cfcd7e08225a7 SHA512 bedcb16778351ac65a58021007a8e8b0f7f3df17414f47525958f36d7e587b2f853733f758bbe32d5f5be05b50703b4fabda4bb84b30ee03b9bf0e2a8618556a
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-api-java9/log4j-api-java9-2.15.0.ebuild b/dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild
index fc6b19c9ff55..6ebd34f1d05f 100644
--- a/dev-java/log4j-api-java9/log4j-api-java9-2.15.0.ebuild
+++ b/dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom log4j-api-java9/pom.xml --download-uri mirror://apache/logging/log4j/2.15.0/apache-log4j-2.15.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-java9-2.15.0.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom log4j-api-java9/pom.xml --download-uri mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64" --ebuild log4j-api-java9-2.17.1.ebuild
 
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.logging.log4j:log4j-api-java9:2.15.0"
+MAVEN_ID="org.apache.logging.log4j:log4j-api-java9:2.17.1"
 JAVA_TESTING_FRAMEWORKS="junit-jupiter"
 
 inherit java-pkg-2 java-pkg-simple
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 # junit-jupiter is not available in ::gentoo
 RESTRICT="test"
diff --git a/dev-java/log4j-api/Manifest b/dev-java/log4j-api/Manifest
index a1c4aa4f5513..57920f6243f5 100644
--- a/dev-java/log4j-api/Manifest
+++ b/dev-java/log4j-api/Manifest
@@ -1,3 +1,3 @@
-DIST apache-log4j-2.15.0-src.tar.gz 11550453 BLAKE2B 3b7a356714fbff0ad81f633750a45f6b3869df933c89c22b28346e49c6dfb83002ecf6374d04b1ae6a45b5486314654c8a660f3aee7a6b30273439e44db2c610 SHA512 61574722ab0a24bd0301fea57504a645f98f0e5913d1e02e49d25b3dcbf2dcbb3153cfca58fdde632087f94edc8e83820951288ba494234954ab4eeeb6b8be6a
-EBUILD log4j-api-2.15.0.ebuild 3375 BLAKE2B 088b7ae0b330c542ba653f3da205891343037d79feb0ece1b2e8cfdf15f211e672f3ca17b5b4d8d83701c7b72c7f9a426a83cb7c1c7fe78b1c2d19797c8cd1b0 SHA512 acc7c15befa203bbc4924fa6d7865d1cfbab5cb7adfdab07082804f64f9fa53282cf701e4272638b79d575728cd7a7389957b18e0c8507203f34b19fd075914e
+DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
+EBUILD log4j-api-2.17.1.ebuild 3342 BLAKE2B c3547005b8a23ed6bdf9414dcdf556d3a8f9894aefa0a6d918ffbde75da4ff1386ce8996281678593b0b931508612d45f2efdf3041e79d9c799b5648c84476c4 SHA512 881b89b9ee72ab0005fd75a2f9ef802bcc1e70e647ca378c6cf4f100d403b432c2125bf000ebbcbb79a0bcefcef6df810efa080da45c6bb2e9850a17075ee9aa
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-api/log4j-api-2.15.0.ebuild b/dev-java/log4j-api/log4j-api-2.17.1.ebuild
index 10e57a693ca9..dde9ca78860f 100644
--- a/dev-java/log4j-api/log4j-api-2.15.0.ebuild
+++ b/dev-java/log4j-api/log4j-api-2.17.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom log4j-api/pom.xml --download-uri mirror://apache/logging/log4j/2.15.0/apache-log4j-2.15.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-2.15.0.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom log4j-api/pom.xml --download-uri mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-2.17.1.ebuild
 
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.logging.log4j:log4j-api:2.15.0"
+MAVEN_ID="org.apache.logging.log4j:log4j-api:2.17.1"
 JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
 
 inherit java-pkg-2 java-pkg-simple
@@ -18,18 +18,17 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # junit-{jupiter,vintage} is not available in ::gentoo
 RESTRICT="test"
 
 # Compile dependencies
 # POM: ${PN}/pom.xml
-# org.apache.logging.log4j:log4j-api-java9:2.15.0 -> >=dev-java/log4j-api-java9-2.15.0:2
-# org.osgi:org.osgi.core:4.3.1 -> !!!artifactId-not-found!!!
+# org.osgi:org.osgi.core:4.3.1 -> >=dev-java/osgi-core-api-5.0.0:0
 # POM: ${PN}/pom.xml
-# test? com.fasterxml.jackson.core:jackson-core:2.12.4 -> !!!groupId-not-found!!!
-# test? com.fasterxml.jackson.core:jackson-databind:2.12.4 -> !!!groupId-not-found!!!
+# test? com.fasterxml.jackson.core:jackson-core:2.12.4 -> >=dev-java/jackson-core-2.13.0:0
+# test? com.fasterxml.jackson.core:jackson-databind:2.12.4 -> >=dev-java/jackson-databind-2.13.0:0
 # test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
 # test? org.apache.felix:org.apache.felix.framework:5.6.12 -> !!!groupId-not-found!!!
 # test? org.apache.maven:maven-core:3.6.3 -> !!!groupId-not-found!!!
@@ -40,41 +39,42 @@ RESTRICT="test"
 # test? org.junit.jupiter:junit-jupiter-params:5.7.2 -> !!!groupId-not-found!!!
 # test? org.junit.vintage:junit-vintage-engine:5.7.2 -> !!!groupId-not-found!!!
 
-DEPEND=">=virtual/jdk-11:*
-	dev-java/osgi-core-api:0
-	dev-java/log4j-api-java9:2"
+DEPEND=">=virtual/jdk-1.8:*
+	dev-java/osgi-core-api:0"
 #	test? (
 #		!!!groupId-not-found!!!
 #		!!!suitable-mavenVersion-not-found!!!
 #		>=dev-java/commons-lang-3.12.0:3.6
+#		>=dev-java/jackson-core-2.13.0:0
+#		>=dev-java/jackson-databind-2.13.0:0
 #	)
 #"
 
-RDEPEND=">=virtual/jre-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md LICENSE.txt )
 
 S="${WORKDIR}/apache-log4j-${PV}-src"
 
-JAVA_CLASSPATH_EXTRA="log4j-api-java9-2,osgi-core-api"
+JAVA_CLASSPATH_EXTRA="osgi-core-api"
 JAVA_SRC_DIR="${PN}/src/main/java"
 JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
 
-#	JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,!!!groupId-not-found!!!,commons-lang-3.6,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!suitable-mavenVersion-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+#	JAVA_TEST_GENTOO_CLASSPATH="jackson-core,jackson-databind,commons-lang-3.6,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!suitable-mavenVersion-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
 #	JAVA_TEST_SRC_DIR="${PN}/src/test/java"
 #	JAVA_TEST_RESOURCE_DIRS=(
 #		"${PN}/src/test/resources"
 #	)
 
-src_prepare() {
-	default
-	mkdir -p log4j-api/src/main/resources/META-INF/versions/9 || die
-	pushd log4j-api/src/main/resources/META-INF/versions/9 || die
-		jar -xf "$(java-pkg_getjar --build-only log4j-api-java9-2 log4j-api-java9.jar)" \
-			org/apache/logging/log4j/util module-info.class || die
-		rm org/apache/logging/log4j/util/{PrivateSecurityManagerStackTraceUtil,PropertySource}.class || die
-	popd || die
-}
+#	src_prepare() {
+#		default
+#		mkdir -p log4j-api/src/main/resources/META-INF/versions/9 || die
+#		pushd log4j-api/src/main/resources/META-INF/versions/9 || die
+#			jar -xf "$(java-pkg_getjar --build-only log4j-api-java9-2 log4j-api-java9.jar)" \
+#				org/apache/logging/log4j/util module-info.class || die
+#			rm org/apache/logging/log4j/util/{PrivateSecurityManagerStackTraceUtil,PropertySource}.class || die
+#		popd || die
+#	}
 
 src_install() {
 	default # https://bugs.gentoo.org/789582
diff --git a/dev-java/log4j-core/Manifest b/dev-java/log4j-core/Manifest
new file mode 100644
index 000000000000..e8c5fee6c6b7
--- /dev/null
+++ b/dev-java/log4j-core/Manifest
@@ -0,0 +1,3 @@
+DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
+EBUILD log4j-core-2.17.1-r1.ebuild 8265 BLAKE2B 31059517d4b240f7c9a93c0201c37b40f8c564f63c3ba7cb573f944e732f6256413587a688688e53cca5fba9e1c320c94a35d6cfd2bfd3b851a017bd15adf85f SHA512 7ee26ceddb2100a5573a54d80be95c875c9cd584fe2a7643df49da2be89a15f98992d52b6649dbd5f4c179e902d89afdc15d19a6fcc95f12ec368340e5ec727b
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-core/log4j-core-2.17.1-r1.ebuild b/dev-java/log4j-core/log4j-core-2.17.1-r1.ebuild
new file mode 100644
index 000000000000..79d595da15bf
--- /dev/null
+++ b/dev-java/log4j-core/log4j-core-2.17.1-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom log4j-core/pom.xml --download-uri mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-core-2.17.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.logging.log4j:log4j-core:2.17.1"
+# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Apache Log4j Implementation"
+HOMEPAGE="https://logging.apache.org/log4j/2.x/"
+SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+
+# We don't have junit-vintage and junit-jupiter
+RESTRICT="test"
+
+# Common dependencies
+# POM: ${PN}/pom.xml
+# com.conversantmedia:disruptor:1.2.15 -> >=dev-java/conversant-disruptor-1.2.19:0
+# com.fasterxml.jackson.core:jackson-core:2.12.4 -> >=dev-java/jackson-core-2.13.0:0
+# com.fasterxml.jackson.core:jackson-databind:2.12.4 -> >=dev-java/jackson-databind-2.13.0:0
+# com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.12.4 -> >=dev-java/jackson-dataformat-xml-2.13.0:0
+# com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.4 -> >=dev-java/jackson-dataformat-yaml-2.13.0:0
+# com.fasterxml.woodstox:woodstox-core:6.2.6 -> >=dev-java/woodstox-core-6.2.7:0
+# com.lmax:disruptor:3.4.4 -> >=dev-java/lmax-disruptor-3.4.4:0
+# com.sun.mail:javax.mail:1.6.2 -> >=dev-java/javax-mail-1.6.2:0
+# org.apache.commons:commons-compress:1.21 -> >=dev-java/commons-compress-1.21:0
+# org.apache.commons:commons-csv:1.9.0 -> >=dev-java/commons-csv-1.9.0:0
+# org.apache.kafka:kafka-clients:1.1.1 -> >=dev-java/kafka-clients-1.1.1:0
+# org.apache.logging.log4j:log4j-api:2.17.1 -> >=dev-java/log4j-api-2.17.1:2
+# org.fusesource.jansi:jansi:2.3.4 -> >=dev-java/jansi-2.4.0:2
+# org.jctools:jctools-core:1.2.1 -> >=dev-java/jctools-core-2.0.2:0
+# org.slf4j:slf4j-api:1.7.25 -> >=dev-java/slf4j-api-1.7.30:0
+# org.zeromq:jeromq:0.4.3 -> >=dev-java/jeromq-0.5.2:0
+
+CP_DEPEND="
+	dev-java/commons-compress:0
+	dev-java/commons-csv:0
+	dev-java/conversant-disruptor:0
+	dev-java/jackson-core:0
+	dev-java/jackson-databind:0
+	dev-java/jackson-dataformat-xml:0
+	dev-java/jackson-dataformat-yaml:0
+	dev-java/jakarta-activation-api:1
+	dev-java/jansi:2
+	dev-java/javax-mail:0
+	dev-java/jctools-core:0
+	dev-java/jeromq:0
+	dev-java/kafka-clients:0
+	dev-java/lmax-disruptor:0
+	~dev-java/log4j-api-${PV}:2
+	dev-java/slf4j-api:0
+	dev-java/woodstox-core:0
+"
+
+# Compile dependencies
+# POM: ${PN}/pom.xml
+# org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.1.Final -> >=dev-java/jboss-jms-api-1.0.1:1.1
+# org.osgi:org.osgi.core:4.3.1 -> >=dev-java/osgi-core-api-5.0.0:0
+# POM: ${PN}/pom.xml
+# test? ch.qos.logback:logback-classic:1.2.3 -> !!!groupId-not-found!!!
+# test? ch.qos.logback:logback-core:1.2.3 -> !!!groupId-not-found!!!
+# test? com.github.tomakehurst:wiremock:2.26.3 -> !!!groupId-not-found!!!
+# test? com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.0.1 -> !!!groupId-not-found!!!
+# test? com.h2database:h2:1.4.200 -> !!!groupId-not-found!!!
+# test? commons-codec:commons-codec:1.15 -> >=dev-java/commons-codec-1.15:0
+# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
+# test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+# test? log4j:log4j:1.2.17 -> >=dev-java/log4j-1.2.17:0
+# test? net.javacrumbs.json-unit:json-unit:2.27.0 -> !!!groupId-not-found!!!
+# test? org.apache-extras.beanshell:bsh:2.0b6 -> >=dev-java/bsh-2.0_beta6:0
+# test? org.apache.activemq:activemq-broker:5.16.3 -> !!!groupId-not-found!!!
+# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
+# test? org.apache.felix:org.apache.felix.framework:5.6.12 -> !!!groupId-not-found!!!
+# test? org.apache.logging.log4j:log4j-api:2.17.1 -> >=dev-java/log4j-api-2.17.1:2
+# test? org.apache.maven:maven-core:3.6.3 -> !!!groupId-not-found!!!
+# test? org.awaitility:awaitility:4.0.3 -> !!!groupId-not-found!!!
+# test? org.codehaus.groovy:groovy-dateutil:3.0.8 -> !!!groupId-not-found!!!
+# test? org.codehaus.groovy:groovy-jsr223:3.0.8 -> !!!groupId-not-found!!!
+# test? org.codehaus.plexus:plexus-utils:3.4.0 -> !!!groupId-not-found!!!
+# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
+# test? org.hamcrest:hamcrest:2.2 -> !!!artifactId-not-found!!!
+# test? org.hdrhistogram:HdrHistogram:2.1.9 -> !!!groupId-not-found!!!
+# test? org.hsqldb:hsqldb:2.5.2 -> !!!groupId-not-found!!!
+# test? org.jmdns:jmdns:3.5.7 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-engine:5.7.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-params:5.7.2 -> !!!groupId-not-found!!!
+# test? org.junit.vintage:junit-vintage-engine:5.7.2 -> !!!groupId-not-found!!!
+# test? org.mockito:mockito-core:3.11.2 -> !!!suitable-mavenVersion-not-found!!!
+# test? org.mockito:mockito-junit-jupiter:3.11.2 -> !!!artifactId-not-found!!!
+# test? org.slf4j:slf4j-ext:1.7.25 -> !!!artifactId-not-found!!!
+# test? org.springframework:spring-test:5.3.13 -> !!!groupId-not-found!!!
+# test? org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0
+# test? org.xmlunit:xmlunit-core:2.8.3 -> !!!groupId-not-found!!!
+# test? org.xmlunit:xmlunit-matchers:2.8.3 -> !!!groupId-not-found!!!
+# test? org.zapodot:embedded-ldap-junit:0.8.1 -> !!!groupId-not-found!!!
+
+DEPEND="${CP_DEPEND}
+	dev-java/jboss-jms-api:1.1
+	dev-java/osgi-core-api:0
+	>=virtual/jdk-1.8:*"
+#	test? (
+#		!!!artifactId-not-found!!!
+#		!!!groupId-not-found!!!
+#		!!!suitable-mavenVersion-not-found!!!
+#		>=dev-java/bsh-2.0_beta6:0
+#		>=dev-java/commons-codec-1.15:0
+#		>=dev-java/commons-io-2.11.0:1
+#		>=dev-java/commons-lang-3.12.0:3.6
+#		>=dev-java/commons-logging-1.2:0
+#		>=dev-java/log4j-1.2.17:0
+#		~dev-java/log4j-api-${PV}:2
+#		>=dev-java/xz-java-1.9:0
+#	)
+#"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md LICENSE.txt )
+
+S="${WORKDIR}/apache-log4j-${PV}-src"
+
+JAVA_CLASSPATH_EXTRA="jboss-jms-api-1.1,osgi-core-api"
+JAVA_SRC_DIR="${PN}/src/main/java"
+JAVA_RESOURCE_DIRS=(
+	"${PN}/src/main/resources"
+)
+
+#	JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,commons-codec,commons-io-1,commons-logging,log4j,!!!groupId-not-found!!!,bsh,!!!groupId-not-found!!!,commons-lang-3.6,!!!groupId-not-found!!!,log4j-api-2,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!suitable-mavenVersion-not-found!!!,!!!artifactId-not-found!!!,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,xz-java,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+#	JAVA_TEST_SRC_DIR="${PN}/src/test/java"
+#	JAVA_TEST_RESOURCE_DIRS=(
+#		"${PN}/src/test/resources"
+#	)
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# Process the @Plugin annotation used on Log4j 2 built-in plugins
+	# to generate a serialized plugin listing file
+	# https://logging.apache.org/log4j/2.x/manual/plugins.html
+	local processor="org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor"
+	local classes="target/classes"
+	local classpath="${JAVA_JAR_FILENAME}:$(\
+		java-pkg_getjars --build-only --with-dependencies \
+		"${JAVA_GENTOO_CLASSPATH},${JAVA_CLASSPATH_EXTRA}")"
+	# Just in case java-pkg-simple.eclass changes the path in the future
+	mkdir -p "${classes}" || die "Failed to create directory for classes"
+	ejavac -d "${classes}" -cp "${classpath}" \
+		-proc:only -processor "${processor}" \
+		$(find "${JAVA_SRC_DIR}" -name "*.java")
+	# Update the JAR to include the serialized plugin listing file
+	local jar="$(java-config -j)"
+	"${jar}" -uf "${JAVA_JAR_FILENAME}" -C "${classes}" . ||
+		die "Failed to update JAR"
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/log4j-core/metadata.xml b/dev-java/log4j-core/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/log4j-core/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 266e5432944f..944fc9c585eb 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -1,5 +1,4 @@
 DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
-DIST lucene-3.6.2-src.tgz 32139784 BLAKE2B 48fe88efeae8396e084f827aa66530480f40aee3a2e59c8524420059f004a73be4c1e50c98345ad0ad4808ff8a0a996f9406523bf5c124616657ec91f9797f70 SHA512 e9a08a1b5303c44e4feecc0bb6e7013e4a9420517ae4e98999bd318ec25b5b2ff3b6de8b51db8f68afc0fdc3149829297023a95b103d4f99e7db68deee4c3965
 EBUILD lucene-2.4.1-r2.ebuild 1802 BLAKE2B 71e720f396d65c1621d956d0536c3655a1530014861df0350dc506b7e03f2acd4f75ab70f0f7768ae867523ee49e1b7fac11095502fbba65d350ecf8223d1d41 SHA512 2551db0ac39d6ca7516b71e86202cef50e7784ee49f715f03703b205509e89983e735cc66ce3970abca9212390edbb06a948399310845e758855fb4764e2c985
-EBUILD lucene-3.6.2-r2.ebuild 5553 BLAKE2B 4602e1ddf43e0fc5b71093bbc88069fe7f016187e78b61fd7a1fbd7ed03f1ce54b1dcf42e918f128c3bb58cc7eadfdd4fcb3ba455d5567788a9866834c805db4 SHA512 92d2a8aa60347ae964ed8d99e50c57addb4b3621fee34262a865565c6280f381dfc9f14792ddb330d89a1b7fbaaf07d4031bf6cbbd2ddfffa62634fd84779b49
-MISC metadata.xml 320 BLAKE2B 964c2f3d2447805c88b2e80f6430adb397ae5d39397f989c281c93419ec2ed5b777944be9666d74985095010b1de72bfbbdee1533fbbb9ef1bfb5f53c783cce6 SHA512 d3c1f696fe447d24b8023f391d205b7a0e64613494a6d8f14561646b4b842b354bf07430157600a1db151b47a00b8883fb14cb2dc54e7bbc25570469887dce4f
+EBUILD lucene-2.4.1-r3.ebuild 2074 BLAKE2B 46e4ac4faf9de5e5a8017c80cb373e84cd4f9934b441f8ea57c5250f046a0f44b744bdf0057c198456c2f228d8e537efee1514b337962c7dce30e6b3a20b6694 SHA512 02dbcafbf53a6e2eba563ce9f0df44f327acd7732d1c293ad722d816918a8c14537f2b18d8af2572c539c04fec58169a6806619d7d6bf0d4c8bb1339d4d1df0f
+MISC metadata.xml 235 BLAKE2B 5144dc07ec1e929d9a5734dc5c96258dbc8292cd9710c8deb32bdb3b585964b29e7f28563f2b71fc10e8601805c8d75549315d5997c5c0544bacfbd1c554c365 SHA512 da42efb5c9e4e199aa88b5ff4c2ba647284a3f82d251ddabd7e888ffb7e0efe68f6060aa06ebf8c059f3affdf275ee787566acb355ccbc9f072f9f7f3e28f729
diff --git a/dev-java/lucene/lucene-2.4.1-r3.ebuild b/dev-java/lucene/lucene-2.4.1-r3.ebuild
new file mode 100644
index 000000000000..762e6681fc1e
--- /dev/null
+++ b/dev-java/lucene/lucene-2.4.1-r3.ebuild
@@ -0,0 +1,83 @@
+# 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_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="https://lucene.apache.org"
+SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.4"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-java/javacc:0"
+
+# Restricting to jdk:1.8 since it fails to build with openjdk-17
+# BUILD FAILED
+# /var/tmp/portage/dev-java/lucene-2.4.1-r3/work/lucene-2.4.1/build.xml:52: rmic does not exist under Java 15 and higher,
+# use rmic of an older JDK and explicitly set the executable attribute
+DEPEND="
+	${CDEPEND}
+	virtual/jdk:1.8
+	test? (
+		dev-java/junit:0
+		dev-java/ant-core:0
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+src_prepare() {
+	default
+	java-pkg_clean
+	sed -i -e '/-Xmax/ d' common-build.xml || die
+
+	# Portage marks shese files as bogus for some reason.
+	find . -type f -name instruction_arrow.png -exec rm -v {} \; || die
+}
+
+src_compile() {
+	# regenerate javacc files just because we can
+	# put javacc.jar on ant's classpath here even when <javacc> task
+	# doesn't use it - it's to fool the <available> test, first time
+	# it's useful not to have ignoresystemclasses=true...
+	ANT_TASKS="ant-core javacc" \
+		eant \
+		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib \
+		javacc
+	ANT_TASKS="none" \
+		eant \
+		-Dversion=${PV} \
+		jar-core \
+		jar-demo \
+		$(use_doc javadocs-core javadocs-demo)
+}
+
+src_test() {
+	java-ant_rewrite-classpath common-build.xml
+	EANT_GENTOO_CLASSPATH="junit ant-core" \
+		ANT_TASKS="ant-junit" \
+		eant \
+		test-core
+}
+
+src_install() {
+	einstalldocs
+	java-pkg_newjar "build/${PN}-core-${PV}.jar" "${PN}-core.jar"
+	java-pkg_newjar "build/${PN}-demos-${PV}.jar" "${PN}-demos.jar"
+
+	if use doc; then
+		dodoc -r docs
+		java-pkg_dohtml -r build/docs/api
+	fi
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/lucene/lucene-3.6.2-r2.ebuild b/dev-java/lucene/lucene-3.6.2-r2.ebuild
deleted file mode 100644
index 091821750c1b..000000000000
--- a/dev-java/lucene/lucene-3.6.2-r2.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test contrib"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="https://lucene.apache.org"
-SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="3.6"
-KEYWORDS="amd64 x86"
-
-CDEPEND="
-	dev-java/ant-ivy:2
-	dev-java/ant-junit:0
-	dev-java/ant-core:0
-	dev-java/hamcrest-core:0
-	contrib? (
-	          dev-java/jakarta-regexp:1.4
-			  dev-java/commons-compress:0
-	          dev-java/commons-collections:0
-	          dev-java/commons-digester:0
-	          dev-java/commons-logging:0
-			  dev-java/commons-beanutils:1.7
-	)"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/junit:4
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DOCS=(
-	CHANGES.txt README.txt
-	NOTICE.txt CHANGES.txt
-	JRE_VERSION_MIGRATION.txt
-)
-
-# All tests fail with the following error:
-# junit.framework.AssertionFailedError: ensure your setUp() calls super.setUp()!!!
-RESTRICT="test"
-
-src_prepare() {
-	default
-	java-pkg_clean
-	sed -i \
-		-e '/-Xmax/ d' \
-		common-build.xml || die
-
-	# FIXME: contrib builds do not work if junit not included
-	#java-pkg_jar-from --build-only --into lib \
-	#	junit-4 junit.jar junit-4.7.jar
-	java-pkg_jar-from --build-only --into lib \
-		ant-core ant.jar ant-1.7.1.jar
-	java-pkg_jar-from --build-only --into lib \
-		ant-junit ant-junit.jar ant-junit-1.7.1.jar
-
-	if use contrib; then
-	  cd contrib/ || die
-	  java-pkg_jar-from --build-only --into queries/lib \
-	  	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-compress commons-compress.jar commons-compress-1.1.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-collections commons-collections.jar commons-collections-3.1.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-digester commons-digester.jar commons-digester-1.7.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-logging commons-logging.jar commons-logging-1.0.4.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
-	fi
-}
-
-src_prepare() {
-	default
-	java-pkg_clean
-	sed -i \
-		-e '/-Xmax/ d' \
-		-e '/property="ivy.available"/s,resource="${ivy.resource}",file="." type="dir",g' \
-		-e '/<ivy:retrieve/d' \
-		common-build.xml || die
-	mkdir -p {.,queries,benchmark,analyzers/phonetic}/lib || die
-	java-pkg_jar-from --build-only --into lib \
-		ant-core ant.jar ant-1.7.1.jar
-	java-pkg_jar-from --build-only --into lib \
-		ant-junit ant-junit.jar ant-junit-1.7.1.jar
-	java-pkg_jar-from --build-only --into lib \
-		ant-ivy:2
-	java-pkg_jar-from --build-only --into lib \
-		junit-4 junit.jar junit-4.10.jar
-	java-pkg_jar-from --build-only --into lib \
-		hamcrest-core
-
-	# Always needed anyway
-	cd "${S}"/test-framework/ || die
-	java-pkg_jar-from --build-only --into lib \
-		ant-core ant.jar ant-1.7.1.jar
-	java-pkg_jar-from --build-only --into lib \
-		ant-junit ant-junit.jar ant-junit-1.7.1.jar
-	java-pkg_jar-from --build-only --into lib \
-		junit-4 junit.jar junit-4.10.jar
-	java-pkg_jar-from --build-only --into lib \
-		hamcrest-core
-
-	if use contrib; then
-	    cd "${S}"/contrib/ || die
-		# queries
-	    java-pkg_jar-from --build-only --into queries/lib \
-	    	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexp-1.4.jar
-		# benchmark
-	    java-pkg_jar-from --build-only --into benchmark/lib \
-	    	commons-compress commons-compress.jar commons-compress-1.1.jar
-	    java-pkg_jar-from --build-only --into benchmark/lib \
-	    	commons-collections commons-collections.jar commons-collections-3.1.jar
-	    java-pkg_jar-from --build-only --into benchmark/lib \
-	    	commons-digester commons-digester.jar commons-digester-1.7.jar
-	    java-pkg_jar-from --build-only --into benchmark/lib \
-	    	commons-logging commons-logging.jar commons-logging-1.0.4.jar
-	    java-pkg_jar-from --build-only --into benchmark/lib \
-	    	commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
-		# analyzers/phonetic
-	    java-pkg_jar-from --build-only --into analyzers/phonetic/lib \
-	    	commons-codec commons-codec.jar commons-codec-1.6.jar
-	fi
-}
-
-src_compile() {
-	# FIXME: docs do not build if behind a proxy, -autoproxy does not work
-	java-ant_xml-rewrite -f common-build.xml \
-		-c -e javadoc \
-		-a failonerror \
-		-v "false"
-
-	ANT_TASKS="none" \
-		eant -Dversion=${PV} \
-		-Dfailonjavadocwarning=false \
-		jar-core \
-		$(use_doc javadocs-core)
-
-	if use contrib; then
-		ANT_TASKS="none" \
-			eant -Dversion=${PV} \
-			-Dfailonjavadocwarning=false \
-			build-contrib \
-			$(use_doc javadocs-all)
-	fi
-}
-
-src_test() {
-	# FIXME: test does not get run, even when selected
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \
-		ANT_TASKS="ant-junit" \
-		eant test-core
-}
-
-src_install() {
-	einstalldocs
-	java-pkg_newjar build/core/${PN}-core-${PV}.jar ${PN}-core.jar
-
-	if use contrib; then
-		local i j
-		for i in $(find build/contrib -name \*-${PV}.jar); do
-		    j=${i##*/}
-			java-pkg_newjar $i ${j%%-${PV}.jar}.jar
-		done
-	fi
-	if use doc; then
-		dodoc -r docs
-		java-pkg_dohtml -r build/docs/api
-	fi
-	if use source; then
-	     java-pkg_dosrc core/src/java/org
-	  	 use contrib && java-pkg_dosrc contrib
-	fi
-}
diff --git a/dev-java/lucene/metadata.xml b/dev-java/lucene/metadata.xml
index fc70b0ebf07e..9a0df749aac0 100644
--- a/dev-java/lucene/metadata.xml
+++ b/dev-java/lucene/metadata.xml
@@ -5,7 +5,4 @@
   <email>java@gentoo.org</email>
   <name>Java</name>
 </maintainer>
-<use>
-  <flag name="contrib">Include extra functionality from contrib/</flag>
-</use>
 </pkgmetadata>
diff --git a/dev-java/lz4-java/Manifest b/dev-java/lz4-java/Manifest
new file mode 100644
index 000000000000..7f55cf8059ad
--- /dev/null
+++ b/dev-java/lz4-java/Manifest
@@ -0,0 +1,7 @@
+AUX lz4-java-1.8.0-gentoo-classpath.xml 179 BLAKE2B 78a1d2615b0ceca3990b58891fa560ed2eeabb8dff397cef99b9f3281cb3d70a563257639051f2f96fa574fe5edefe3bae231a6553a6c1daf96df5e97a44aaee SHA512 b815a4f876a9d8fc30b1c68ec4b8c2fbee5e544247d5272af033d04ffb60fe018713b15f04740348306411c69775bcbc339e30df35bb147a208d119e1c11c017
+AUX lz4-java-1.8.0-print-os-props.patch 880 BLAKE2B 53256984d5afc08d85bee460f6f7ce4a333ea5960fbe3a6a6322338477d701582ee33bf52b05ec3105147fca3ea58424f82b742f965b6d638e56b5cf7e0f3135 SHA512 9c5dedab3cfa09014f9235d4a20dc9a7136b6925d53840e0721c7a58d7a2d2faa3e066440a7e23be60e79c1817813a683a9e76c9947d23ac168882421a498f5b
+AUX lz4-java-1.8.0-r1-Makefile 1528 BLAKE2B e3f8825785c329fc2c9a480dc5e7dbb00268a87d0fa84fb09c70af5259f7a108970c9abbbd9276218d7ae3500ae28d5b4a782e1e9e80046af0e394d8a677944d SHA512 1b391cf872cfdc30e7b7b3f74b7cf4b6f1d9c8268be2556cfce4b9f51fe8bd5c1bf717bdfd2c7a5b05db63231ccb5b315fd34de7aa96e4eb418124bf4c47d3dd
+AUX lz4-java-1.8.0-skip-ivy.patch 3236 BLAKE2B cae70a2600d8bc6f3e89e901728261d23102ec61ae35dfe678542953ecd5467f33d724154903dae3e7214c4c5bfcbf5b6956ae70f7806e270a9cb747b3661d47 SHA512 fd24db414b0944cac78e0b39014d9de38d694e958352d9dc4b83560c84c16790844f197a80bb4f90f084bb882406992ed72da5e54dc774122a347c2df2c76301
+DIST lz4-java-1.8.0.tar.gz 1069398 BLAKE2B 02ee363fc42eeeade01f04649416dd874513f4517264c6e1b6474d64e8b81e2ee9ff1f55e51b508608929e8d78cb30e98d929cc4a118c03f86b0e69bae237e8a SHA512 ae78748d984d2ede18018d5e9ae6aee0d5fe6ac8b56d717f863968cfad6e9f85b62305692345ba16002bee68278e87a0364aa98aeb92e2af6dc169e5d5b612d4
+EBUILD lz4-java-1.8.0-r1.ebuild 3162 BLAKE2B af48a8774cc7e0c67fbeea0b48383fc48b909d90cc05f03217846f082741416253dd215b073cb41cf1508b2b42eb7b22b45ba9191b8a739ce0276de078b40209 SHA512 0fd583fcfba0fb4760c263aec6a2d4cb3334c7c780c47ebee392ce3c78e4b6a1f0bc181a9d7470e49ce48e9bc72166bb785a522a29e4842fe640629fd5ed00e9
+MISC metadata.xml 313 BLAKE2B 08a0f9bbda1bcbc57ad87da568cb744824936147acbf6cc4d2693b957ebbf52454548d9f4ee568f7d1de864406c8a6af487cf6c8775d7cfa3f0a6029640d5d23 SHA512 1b33a50efd738cfbaf5fd163bbeb26736a0d4db2b1c68ff22d6d97931aa67043b2629900fcea3870afb99c6c6792db139361107f21dd87e75522287ae55c68f8
diff --git a/dev-java/lz4-java/files/lz4-java-1.8.0-gentoo-classpath.xml b/dev-java/lz4-java/files/lz4-java-1.8.0-gentoo-classpath.xml
new file mode 100644
index 000000000000..2392679c4a69
--- /dev/null
+++ b/dev-java/lz4-java/files/lz4-java-1.8.0-gentoo-classpath.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<project name="gentoo-classpath">
+    <path id="mvel.classpath">
+        <pathelement path="${gentoo.classpath}" />
+    </path>
+</project>
diff --git a/dev-java/lz4-java/files/lz4-java-1.8.0-print-os-props.patch b/dev-java/lz4-java/files/lz4-java-1.8.0-print-os-props.patch
new file mode 100644
index 000000000000..d4363b6853e4
--- /dev/null
+++ b/dev-java/lz4-java/files/lz4-java-1.8.0-print-os-props.patch
@@ -0,0 +1,31 @@
+From b8d50d44ba1c0e4b5bf297f7499ad0fb5b82706e Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Wed, 19 Jan 2022 10:09:14 -0800
+Subject: [PATCH] build.xml: Add target that prints JVM system properties os.*
+
+The Gentoo custom JNI Makefile needs some of those properties.
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ build.xml | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/build.xml b/build.xml
+index b7940ab..96e52ea 100644
+--- a/build.xml
++++ b/build.xml
+@@ -62,6 +62,11 @@
+     <javaversion atleast="10"/>
+   </condition>
+ 
++  <target name="os-props"
++    description="echo values of JVM system properties os.* to file os.properties">
++    <echoproperties prefix="os." destfile="os.properties" />
++  </target>
++
+   <target name="clean" description="clean working copy">
+     <delete dir="${build}" />
+     <delete dir="${dist}" />
+-- 
+2.34.1
+
diff --git a/dev-java/lz4-java/files/lz4-java-1.8.0-r1-Makefile b/dev-java/lz4-java/files/lz4-java-1.8.0-r1-Makefile
new file mode 100644
index 000000000000..4a766552c65e
--- /dev/null
+++ b/dev-java/lz4-java/files/lz4-java-1.8.0-r1-Makefile
@@ -0,0 +1,47 @@
+# Gentoo custom Makefile for the JNI portion of lz4-java
+#
+# Adapted from the logic for target "compile-jni" in build.xml,
+# but uses lz4 installed on the system.  This Makefile respects
+# custom CFLAGS and LDFLAGS settings, whereas build.xml does not.
+
+# Java system properties read by build.xml
+PLATFORM ?= linux
+SRC ?= src
+BUILD ?= build
+JAVA_HOME ?=
+# Requires lz4-java-*-print-os-props.patch
+OS_ARCH := $(shell ant os-props 2>&1 > /dev/null && \
+		grep 'os\.arch=' os.properties | sed -e 's/os\.arch=//')
+
+MKDIR_P = mkdir -p
+
+SRC_DIR := $(SRC)/jni
+OBJS_DIR_PREFIX := $(BUILD)/objects
+OBJS_DIR := $(OBJS_DIR_PREFIX)/$(SRC_DIR)
+OUT_DIR := $(BUILD)/jni/net/jpountz/util/$(PLATFORM)/$(OS_ARCH)
+
+SRC_FILES := $(wildcard $(SRC_DIR)/*.c)
+OBJS := $(addprefix $(OBJS_DIR_PREFIX)/,$(SRC_FILES:.c=.o))
+SONAME = liblz4-java.so
+
+# C compiler arguments may be obtained by running 'ant -v compile-jni',
+# as long as dev-java/cpptasks is in the classpath
+CFLAGS := -fPIC $(CFLAGS)
+
+$(OUT_DIR)/$(SONAME): $(OBJS) | $(OUT_DIR)
+	# '-llz4' must be listed after this package's objects
+	# https://wiki.gentoo.org/wiki/Project:Quality_Assurance/As-needed#Importance_of_linking_order
+	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$(SONAME) -o $@ $^ -llz4
+
+$(OBJS_DIR_PREFIX)/%.o: %.c | $(OBJS_DIR)
+	$(CC) $(CFLAGS) -c -o $@ \
+		-I$(JAVA_HOME)/../include -I$(JAVA_HOME)/../include/$(PLATFORM) \
+		-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(PLATFORM) \
+		-I$(BUILD)/jni-headers \
+		$<
+
+$(OUT_DIR):
+	$(MKDIR_P) $@
+
+$(OBJS_DIR):
+	$(MKDIR_P) $@
diff --git a/dev-java/lz4-java/files/lz4-java-1.8.0-skip-ivy.patch b/dev-java/lz4-java/files/lz4-java-1.8.0-skip-ivy.patch
new file mode 100644
index 000000000000..26c09e147072
--- /dev/null
+++ b/dev-java/lz4-java/files/lz4-java-1.8.0-skip-ivy.patch
@@ -0,0 +1,91 @@
+From 95ae85542f39cecd1af6a3e661ad6120195d2304 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Mon, 20 Dec 2021 09:57:31 -0800
+Subject: [PATCH] build.xml: Skip Ivy logic and use Gentoo classpath
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ build.xml | 22 +++++++---------------
+ 1 file changed, 7 insertions(+), 15 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index b7940ab..ff321c6 100644
+--- a/build.xml
++++ b/build.xml
+@@ -20,6 +20,8 @@
+     xmlns:junit4="antlib:com.carrotsearch.junit4"
+     xmlns:mvn="antlib:org.apache.maven.artifact.ant">
+ 
++  <import file="gentoo-classpath.xml" />
++
+   <property name="src" location="src"/>
+   <property name="build" location="build"/>
+   <property name="dist"  location="dist"/>
+@@ -81,8 +83,6 @@
+   </target>
+ 
+   <target name="install-cpptasks" unless="cpptasks.available">
+-    <ivy:cachepath organisation="ant-contrib" module="cpptasks" revision="1.0b5"
+-      inline="true" conf="default" transitive="true" pathid="cpptasks.classpath"/>
+     <taskdef uri="antlib:net.sf.antcontrib.cpptasks" resource="net/sf/antcontrib/cpptasks/antlib.xml" classpathref="cpptasks.classpath"/>
+     <property name="cpptasks.available" value="true"/>
+   </target>
+@@ -117,22 +117,14 @@
+ 
+   <target name="init">
+     <tstamp />
+-    <ivy:resolve file="${ivy.xml.name}" conf="test" />
+-    <ivy:retrieve />
+   </target>
+ 
+   <target name="install-junit4" depends="init" unless="junit4.available">
+-    <taskdef uri="antlib:com.carrotsearch.junit4">
+-      <classpath>
+-        <fileset dir="${lib}" includes="*.jar" />
+-      </classpath>
+-    </taskdef>
++    <taskdef uri="antlib:com.carrotsearch.junit4" resource="com/carrotsearch/junit4/antlib.xml" classpath="${gentoo.classpath}"/>
+     <property name="junit4.available" value="true" />
+   </target>
+ 
+   <target name="generate-sources" depends="init">
+-    <ivy:cachepath organisation="org.mvel" module="mvel2" revision="2.3.2.Final"
+-      inline="true" conf="default" transitive="true" pathid="mvel.classpath"/>
+     <mkdir dir="${build}/java" />
+     <java
+       fork="true"
+@@ -244,12 +236,12 @@
+     <pathelement path="${build}/classes" />
+     <pathelement path="${build}/unsafe-classes" />
+     <pathelement path="${build}/generated-classes" />
+-    <fileset dir="lib" includes="*.jar" />
++    <pathelement path="${gentoo.classpath}" />
+   </path>
+ 
+   <path id="compile.tests.classpath.with.jar">
+     <pathelement path="${lz4-java.jar}" />
+-    <fileset dir="lib" includes="*.jar" />
++    <pathelement path="${gentoo.classpath}" />
+   </path>
+ 
+   <path id="test.classpath">
+@@ -260,14 +252,14 @@
+     <pathelement path="${build}/unsafe-classes" />
+     <pathelement path="${build}/generated-classes" />
+     <pathelement path="${build}/test-classes" />
+-    <fileset dir="${lib}" includes="*.jar" />
++    <pathelement path="${gentoo.classpath}" />
+   </path>
+ 
+   <path id="test.classpath.with.jar">
+     <pathelement path="${lz4-java.jar}" />
+     <pathelement path="${src}/test-resources" />
+     <pathelement path="${build}/test-classes" />
+-    <fileset dir="${lib}" includes="*.jar" />
++    <pathelement path="${gentoo.classpath}" />
+   </path>
+ 
+   <target name="test" description="run tests">
+-- 
+2.32.0
+
diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..993a8803f183
--- /dev/null
+++ b/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.lz4:lz4-java:1.8.0"
+
+inherit java-pkg-2 java-ant-2 toolchain-funcs
+
+DESCRIPTION="LZ4 compression for Java"
+HOMEPAGE="https://github.com/lz4/lz4-java"
+SRC_URI="https://github.com/lz4/lz4-java/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Tests require com.carrotsearch.randomizedtesting:junit4-ant, which is yet to
+# be packaged.  Some extra steps are required before running the tests:
+# 1. Download junit4-ant 2.7.x from https://mvnrepository.com/artifact/com.carrotsearch.randomizedtesting/junit4-ant
+# 2. Set EANT_GENTOO_CLASSPATH_EXTRA to the path to junit4-ant-2.7.*.jar
+# 3. ppc64 only: Install test dependencies that are unkeyworded
+# 4. Set ALLOW_TEST="all"
+RESTRICT="test"
+
+CDEPEND="
+	app-arch/lz4:=
+"
+
+# The version requirement on mvel is strict; mvel-2.4.* generates source files
+# incorrectly, which causes build failure of this package
+DEPEND="
+	>=virtual/jdk-1.8:*
+	dev-java/mvel:2.3
+	dev-libs/xxhash
+	test? (
+		dev-java/junit:4
+		!ppc64? (
+			dev-java/randomized-runner:0
+		)
+	)
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+# Ant is only needed to generate JNI headers;
+# the JNI shared object will be built by the custom Makefile
+EANT_BUILD_TARGET="compile-java generate-headers"
+EANT_DOC_TARGET="docs"
+EANT_EXTRA_ARGS="-Djava.io.tmpdir=${T}"
+EANT_TEST_GENTOO_CLASSPATH="randomized-runner"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	local build_only_cp="$(java-pkg_getjars --build-only mvel-2.3)"
+	if [[ -z "${EANT_GENTOO_CLASSPATH_EXTRA}" ]]; then
+		EANT_GENTOO_CLASSPATH_EXTRA="${build_only_cp}"
+	else
+		EANT_GENTOO_CLASSPATH_EXTRA+=":${build_only_cp}"
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-print-os-props.patch"
+	eapply "${FILESDIR}/${P}-skip-ivy.patch"
+	cp "${FILESDIR}/${P}-r1-Makefile" Makefile || die "Failed to copy Makefile"
+	cp "${FILESDIR}/${P}-gentoo-classpath.xml" gentoo-classpath.xml ||
+		die "Failed to copy Gentoo classpath injection XML"
+	java-pkg-2_src_prepare
+	rm -r src/resources || die "Failed to remove pre-built shared libraries"
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+	emake CC="$(tc-getCC)" JAVA_HOME="${JAVA_HOME}"
+	# JNI has already been built by the Makefile at this point
+	# Also pretend cpptasks is available, which is required by build.xml
+	EANT_EXTRA_ARGS+=" -Dcpptasks.available=true -Dskip.jni=true"
+	# Manually call 'ant jar' to include the JNI shared object in JAR
+	eant jar -f "${EANT_BUILD_XML}" ${EANT_EXTRA_ARGS}
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar 'dist/${ivy.module}.jar'
+	java-pkg_doso $(find build/jni -name "*.so")
+	use doc && java-pkg_dojavadoc build/docs
+	# Ant project's 'sources' target generates a source JAR rather than a Zip
+	# archive; we simply let java-utils-2.eclass create the source Zip archive
+	# from the same source directories the 'sources' target would access
+	# https://github.com/lz4/lz4-java/blob/1.8.0/build.xml#L323-L330
+	use source && java-pkg_dosrc src/java/* src/java-unsafe/*
+}
diff --git a/dev-java/lz4-java/metadata.xml b/dev-java/lz4-java/metadata.xml
new file mode 100644
index 000000000000..576cd0ee41f1
--- /dev/null
+++ b/dev-java/lz4-java/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lz4/lz4-java</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/mchange-commons/Manifest b/dev-java/mchange-commons/Manifest
index acec986b79ae..1fb6ce484419 100644
--- a/dev-java/mchange-commons/Manifest
+++ b/dev-java/mchange-commons/Manifest
@@ -1,5 +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
+DIST mchange-commons-0.2.20.tar.gz 231274 BLAKE2B f13d82d8a9f67a81c0fe69bd2d59e4ee88100c21067e454ba81ba5b5f60761c2352e8f2303c12e1ab0d54027ae9e7daca76f4e8308417a8e933d5a4c8cc0ad73 SHA512 d9019ca73f77f3f629c54bb65416f92b0a2c2fe5b23ef32cc48b4a951d505d8ba89f0ab71654b8e5d5983e4237c5c4e15c529abbb91ef0abdbff989806c2e44f
+EBUILD mchange-commons-0.2.10-r1.ebuild 804 BLAKE2B 691dfddfcb78346e6032d98acc9846a0e606f60c588ceb6fdaa8f2b5287653a1cd9a92c73b4161e055bafbc1e97f440fe874f46920fa37c2451d331a9c18a132 SHA512 c1398a4b55fe890961d6e2ebc63b38d59d9f7f1d6f0d78d0a4e123e5ab3c3de9a1c187cb9a203d294e4ed4fa6a29c3c0cf18be6ef73546dd79a98e6c3dc8ffcc
+EBUILD mchange-commons-0.2.20.ebuild 1347 BLAKE2B d8e8a3d19c4fb712febaae966c181fdb4951bd9a4db2d61197771982b64087c3f00b93ebd0b252abcdd22c02507e21d664bf321bb0ff61918381861e31d1f48f SHA512 b0f4a0779f5755c11f0b81ced62e3d2b31c8922b3894d3d44add475994f0845cde1c25252f58e1de84489f26119870f00c17aa4bf54d7e1a0827ec786a4dd4ac
 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
index bbae432a3666..6df76356d302 100644
--- a/dev-java/mchange-commons/mchange-commons-0.2.10-r1.ebuild
+++ b/dev-java/mchange-commons/mchange-commons-0.2.10-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/swaldman/${MY_PN}/archive/refs/tags/${MY_P}.tar.gz -
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE="doc source"
 
diff --git a/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild b/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild
deleted file mode 100644
index da085079a41a..000000000000
--- a/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="${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/${MY_P}.zip"
-
-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.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/zip
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}"
-
-JAVA_SRC_DIR="src/main"
-
-JAVA_GENTOO_CLASSPATH="
-	log4j
-	slf4j-api
-	typesafe-config"
diff --git a/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild b/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild
new file mode 100644
index 000000000000..8e2886a930c9
--- /dev/null
+++ b/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom src/main/maven/pom.xml --download-uri https://github.com/swaldman/mchange-commons-java/archive/refs/tags/v0.2.20.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild mchange-commons-0.2.20.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.mchange:mchange-commons-java:0.2.20"
+#	JAVA_TESTING_FRAMEWORKS=""
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="a library of arguably useful Java utilities."
+HOMEPAGE="https://github.com/swaldman/mchange-commons-java"
+SRC_URI="https://github.com/swaldman/${PN}-java/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/log4j-api:2
+	dev-java/log4j-12-api:2
+	dev-java/log4j-core:2
+	dev-java/slf4j-api:0
+	dev-java/typesafe-config:0"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+S="${WORKDIR}/mchange-commons-java-${PV}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+#	# https://github.com/swaldman/mchange-commons-java/blob/master/build.sbt#L29-L31
+#	JAVA_TEST_GENTOO_CLASSPATH=""
+#	JAVA_TEST_SRC_DIR="src/test/java"
+#	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
diff --git a/dev-java/metainf-services/Manifest b/dev-java/metainf-services/Manifest
index 754402d0a92c..86363966d3ef 100644
--- a/dev-java/metainf-services/Manifest
+++ b/dev-java/metainf-services/Manifest
@@ -1,4 +1,4 @@
 AUX metainf-services-1.7-build.xml 8356 BLAKE2B a9ee4ed2d959885fd2cb81a827f709152ce656f3864af8949ef47fc32fe9932dddac08cdc44887115444069b5852383177b17de162404c6d1c46a073558bcead SHA512 183ea6c131bc9d63172d34966950f6d7eca5aeb4b23e2b9fc4f6045ac2688cc8e2931ab7d1a986c36bedbc0521a7fc13263be3e5cebbf915b07d12c4e6aac5ec
 DIST metainf-services-1.7.tar.gz 5301 BLAKE2B dabb2229e5123b535c81f5796d92365eba609e696c0c513666c105534eb1430420b71768436ed53078dc72a2261ed821010ffea0098a4a65f81c5f1c2c118a6e SHA512 d6162e94ff5efcf61e56e0c1e1d22c51854fa7f98662b6ac0cc7d230b7f11b0d3c7c7238b640693d8d6f5e6e6f508bf5116ea22e73487d00145cd5a87853b3df
-EBUILD metainf-services-1.7.ebuild 567 BLAKE2B a1fddf4bd500d0a536839e8bf5bd0d59915b378ae6878b85872c71693b606e064dfb786f22d69c55131054e9a5d81eecdb2a4b1152fad6c95491bf06e8f4ee9b SHA512 ee6c26b10fa347d7ffcfb067a7f363f90032c462e7956a3289b16651f48b526b08e36350fce8fa9b8e6218ade065c4b7ca6bbfb857b97bbd4ea19c79e41d31ca
+EBUILD metainf-services-1.7-r1.ebuild 579 BLAKE2B 204d9b2856a31b0b0b8132e5ddfeaf4f07f81e7920a4ddd41d09802ef94fb804d92b682736c7dd1d7b2b4ff6b2c8547ab63a085e05cb6f20a2a96b37ba1fe4f9 SHA512 30b4b933a1648cc356335df4005d820fa1c7b040452aafcf5f5cc2386d350a2bc8480c6961173ce95a31ed3926898c42b4be98cc002f7a078981bceb04f2c0b0
 MISC metadata.xml 336 BLAKE2B b113ab8fbfc9b92ca28ffd74d92fbea63d51e156566c0cb5292186efe18e8cc6b1e4c8d53efa1bade7d7ffacfed5780e699838805ac7ec6e2dd6684067fa9297 SHA512 1e1092dca56408b2ea5d09537f33d685c6ee97d59e62b1894f2fa24255d699b82c6aeb6fe7af90045bf4498035a6f45be93b843784ee1e89fdcf7ce165aeccc9
diff --git a/dev-java/metainf-services/metainf-services-1.7.ebuild b/dev-java/metainf-services/metainf-services-1.7-r1.ebuild
index bb7d68cfe2f2..046f310fec8a 100644
--- a/dev-java/metainf-services/metainf-services-1.7.ebuild
+++ b/dev-java/metainf-services/metainf-services-1.7-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 inherit java-pkg-2 java-ant-2
 
@@ -13,12 +13,13 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
 
 S="${WORKDIR}/${PN}-${P}"
 
-java_prepare() {
+src_prepare() {
+	default
 	cp "${FILESDIR}"/${P}-build.xml build.xml || die
 }
 
diff --git a/dev-java/microba/Manifest b/dev-java/microba/Manifest
index f2b8cb9ce73c..c7195b419d5e 100644
--- a/dev-java/microba/Manifest
+++ b/dev-java/microba/Manifest
@@ -1,3 +1,5 @@
+DIST microba-0.4.4.3.tar.gz 50106 BLAKE2B 15b7fe422f7d6aa92929a697ee2c12b2325c9cfcef6d43cc2f135b57a14d8a2a7c1a7b5b3de6bf8a7e1ed07ac275c26017430f776c435295e36109914aca090d SHA512 0191213d00fd0a6bd59a623fb0762eb589a5ac42c5c988a612c01781b30bcb6d86ce431f76687f5647889d54ad13b7f3fa2eec02ca81038f692d2cf25fa1aad1
 DIST microba-0.4.4.3.zip 89737 BLAKE2B 130f6a39f069b0b4e93f352b7fea10abd6eec23b7f0392ad15fa34c198b4dfb46a9b0208322b245f0934e2ff2260661934f958e6216a45c4c69573976f366a2c SHA512 17933578fe101053a1004a1aa0ef342ffa1dc1f2ea2d670fa8aa2523c7d8207bb79e54755e58d0b7ce5ba627ca3b348ac10870718622e818f4097a966acc0a10
 EBUILD microba-0.4.4.3-r1.ebuild 768 BLAKE2B 118819854bb185b357736387a7b016f30a9e2bbd768b93a8b129c2e06854414fb7ce21c08a84bed586f5e9419a7ebc867f878f34c35eb179a3e033a02eedd5b9 SHA512 57501fb0b7b526e150ac60f1d6ff9435500ee771348e63f6487e2d78b4ec7904fca664c9bfbcc91a02e7e9e479af483492c5ecdbb9ebc30528901aa61156cc16
+EBUILD microba-0.4.4.3-r2.ebuild 787 BLAKE2B d7d79c9da20168ae8d2744cf400584a6d716f9d833e2acaa85f78cdd3124ce18266485a5775c3925ee4dd5d7fd7fdbe515fa7046dda4132d004b3b54f5b0ced0 SHA512 91dae05e941174b3767ae91a1b7e572b52beee0c0938afd69c35cd8bdb271a8bd6b19ca790aa80ce80a99d794a9b30c7b6a40b4091eb2bbdbe01de4b68140798
 MISC metadata.xml 368 BLAKE2B 2b63a4d825225df05883aa88d19cfa39372812f28f8780870170b4121417b3f1d0d3b03ed2dfa2797154a6e96b4ae875029bbc8e7e862796d1e76799a1aa8214 SHA512 d5d5fe4b61a9b2f1e1cad3a8ccd658e96afbf8ff2b7aa9c962d2dc1d8106929d162f7dc4c52cea0ca64339aa212ac0a2b07b80b36bf94a34d1394360ed958e07
diff --git a/dev-java/microba/microba-0.4.4.3-r2.ebuild b/dev-java/microba/microba-0.4.4.3-r2.ebuild
new file mode 100644
index 000000000000..30212b3f2397
--- /dev/null
+++ b/dev-java/microba/microba-0.4.4.3-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Swing components for date operations and palettes"
+HOMEPAGE="https://github.com/tdbear/microba"
+SRC_URI="https://github.com/tdbear/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="dev-java/jgraph:0"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src/main/java"
+
+DOCS=(
+	change.log.txt
+	readme.txt
+	README.md
+)
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar ${JAVA_SRC_DIR}
+}
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index 738eb38c2b5b..b83a961cbae1 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,7 +1,9 @@
 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
+DIST mill-bin-0.10.1 67217004 BLAKE2B 4df576762b86e909b2fdbab49e5f8025d73ea0f6b60e25c6d1ec0b55acd91af44c5fbeb5088ea7e0138c4e418e36e60eaf2248b6867a7936aa6612749101f46f SHA512 0fd727aa0bd2f67536ef7155a5f57166bcd13b2fccf0d9b03c3081b8ce9ab1e7290b5705b52aad7e993a4bc0421ea6d57f94d76c0f240ce41df9e05e61dce940
+EBUILD mill-bin-0.10.0.ebuild 480 BLAKE2B 975ae40b61d1aee9e011cd04fddac1b6adfb788cfb6218648284330e1d936611b73473e82383524e4be1a4ce6bff26bcc047bfb1ab9c67c9c646a85d892bdff4 SHA512 1625db9ae485f31f37033d30c5de765850f77a57d22f772645c38de7077f87431d41826241e108b9f8deab2d8e04bea4b98e7aeaba35a13ca1693888b6d1e67f
+EBUILD mill-bin-0.10.1.ebuild 482 BLAKE2B bd450dd8e02ed513d1d9a2546220e91556ccdc46a515bd41ca1450f9f36c602e25a36830c65211dcf87946b1dd028a474c84638e3f1039d83b4cc048b7100e33 SHA512 0c47890e11f7b3d2fcfb1469213dcb2f7103ff7f3460968dee8d4ce54bb0fe7efd80e0604a5a6ed5cbfb0c47fe68f43b02b6c653ea2401707bb9f318a6ddfddc
 EBUILD mill-bin-0.9.10.ebuild 462 BLAKE2B 0b33b8aea299741600f108c52c46408ec29442b91cc81716a5c7d7c07face2135d51a9ba107e71711528f9971588d2bd1959aceeeb44ba68b477a7008d027c88 SHA512 de66509bb517bbdb36f1b1fb6c9f64871ace3a859e7d33b552a27685f341ffb95ae3360830ece8fdea7521a2dcf6fbdbba7a1f88aff65eb01644e40fe558f2a3
 EBUILD mill-bin-0.9.11.ebuild 463 BLAKE2B 76b3ea412b568cc70308b150c92a97792c3eb49cf9c94caa850d92732f658de051633ad228cd9292a5bea24106340bf1a1306f8517e62d7384d4273d5e6a6d99 SHA512 93dfb789423caa0d06876350adcd789b48e79ad2b6722972f509c67366eb03f69010f6700b629d0632b3cdaf0c813776dabcf13e1c1be2274aceb6ba246c58dd
-MISC metadata.xml 247 BLAKE2B 4e1dbdae308a736b571e2a7ab4a90c650461771c024127c95a33990f3973331ba5de3cc8fe960115af9bb06f49908d258211b2a4e07c0f8d2a9536c965d836c3 SHA512 734659aca9188fe48564f64e23622ef0201931c75e1306043902fcf487a4155e8027a378872a48c7e34a903cdd0363a8e237b0965b7f532f80eaf38353940dbc
+MISC metadata.xml 464 BLAKE2B b60279b753026e5ba2247448a3e009a02b1d017cd3269fbf518783dc7f0a59adfdea03201123891d113da14f9d5a3cafd66628d71037064387086b622412994f SHA512 d7eeb833078c86092aaebc30a92d5029aea2ecbd1274c0f8eb86bc9015bf1bd1a2ab91b50ee0fc9816a661ace9635f4c06e9dcfb9d0bf1402b6f94867eb4e505
diff --git a/dev-java/mill-bin/metadata.xml b/dev-java/mill-bin/metadata.xml
index 75209e7cb520..9cf287216c24 100644
--- a/dev-java/mill-bin/metadata.xml
+++ b/dev-java/mill-bin/metadata.xml
@@ -5,4 +5,9 @@
 		<email>flow@gentoo.org</email>
 		<name>Florian Schmaus</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">com-lihaoyi/mill</remote-id>
+		<bugs-to>https://github.com/com-lihaoyi/mill/issues</bugs-to>
+		<changelog>https://github.com/paul-j-lucas/cdecl/releases</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/mill-bin/mill-bin-0.10.0.ebuild b/dev-java/mill-bin/mill-bin-0.10.0.ebuild
index e8485c57dfd6..4b4375e44bc5 100644
--- a/dev-java/mill-bin/mill-bin-0.10.0.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.10.0.ebuild
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 x86"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-java/mill-bin/mill-bin-0.10.1.ebuild b/dev-java/mill-bin/mill-bin-0.10.1.ebuild
new file mode 100644
index 000000000000..e8485c57dfd6
--- /dev/null
+++ b/dev-java/mill-bin/mill-bin-0.10.1.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/msv/Manifest b/dev-java/msv/Manifest
new file mode 100644
index 000000000000..65cf717332d6
--- /dev/null
+++ b/dev-java/msv/Manifest
@@ -0,0 +1,3 @@
+DIST msv-core-2013.6.1-sources.jar 1011944 BLAKE2B 474d8a45bc5f16ec76dbe853a835b66cd1d733973ffad0dd5e0a653d349f075e22a72d29d91da312a9a133218f4187ece15fd66b19dc34bc00cdea72b95a5929 SHA512 3985451ff52e50957fdc22ef598edcd7b02495b834a53a048018064d1a6063d4554a7cb5d7752c2d265b852d17c7a55787d9b1ec2b580988ad005fcbc9c6eb8a
+EBUILD msv-20130601.ebuild 1417 BLAKE2B 31e1f539d89c0c831d68bf983c7ea8fc7073969742dfba4c25275a3b18e9f879e0878f375daf18f663ff4ce030fa6efcca6d54be6e786aafaeb651d76e19711a SHA512 46a52e0e6769fd968f94143635282f7f5b758cae3ba6ccb38180f4bd954f4ad48c6cc3c27b013a76003d757ee942658dc60263edd64ef7c26fee98cfd275c676
+MISC metadata.xml 401 BLAKE2B fbb5715feb77351d3edfb71b51f026f5c858300cb966a8d5cdfa4f3534c03e0de977703263015e5e60bc2928a2060e3da8684f5442f22c4e119e4d1616c82ac1 SHA512 cb176f670e860f0fb7612d313b9fe2fe1c00d5f08de531d7ef93f42204bb0dd537e6b51728b8e068cf571e24aaa7488441e0743724c8d54357f1aeee5ca10560
diff --git a/dev-java/msv/metadata.xml b/dev-java/msv/metadata.xml
new file mode 100644
index 000000000000..5793ba043a01
--- /dev/null
+++ b/dev-java/msv/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+<longdescription>
+The Sun Multi-Schema XML Validator (MSV) is a Java technology tool
+to validate XML documents against several kinds of XML schemata.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/msv/msv-20130601.ebuild b/dev-java/msv/msv-20130601.ebuild
new file mode 100644
index 000000000000..a3e3eb88b963
--- /dev/null
+++ b/dev-java/msv/msv-20130601.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="${PV:4:2}.${PV:6}"
+MY_PV="${PV:0:4}.${MY_PV//0}"
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="net.java.dev.msv:msv-core:2013.6.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Multi-Schema XML Validator, a Java tool for validating XML documents"
+HOMEPAGE="https://msv.java.net/"
+SRC_URI="https://search.maven.org/remotecontent?filepath=net/java/dev/${PN}/${PN}-core/${MY_PV}/${PN}-core-${MY_PV}-sources.jar"
+
+LICENSE="BSD Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+CP_DEPEND="
+	dev-java/iso-relax:0
+	dev-java/relaxng-datatype:0
+	dev-java/xml-commons-resolver:0
+	dev-java/xsdlib:0"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	dev-java/xerces:2
+	>=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+JAVAC_ARGS="-XDignore.symbol.file"
+JAVA_SRC_DIR="."
+JAVA_RESOURCE_DIRS="res"
+
+src_prepare() {
+	default
+	mkdir "res" || die
+	cp -r "com" "res" || die
+
+	# The only resources to have are '*.properties'
+	find res -type f ! -name '*.properties' -exec rm -rf {} + || die
+
+	sed -e '/resolver.tools.CatalogResolver/s/com.sun.org.apache.xml.internal/org.apache.xml/' \
+		-i com/sun/msv/driver/textui/Driver.java || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_register-dependency xerces-2
+	java-pkg_dolauncher "${PN}" --main com.sun.msv.driver.textui.Driver
+}
diff --git a/dev-java/mvel/Manifest b/dev-java/mvel/Manifest
index c277bbdcb020..d41634fcefa3 100644
--- a/dev-java/mvel/Manifest
+++ b/dev-java/mvel/Manifest
@@ -2,5 +2,5 @@ AUX mvel-2.3.2-ignore-failing-tests.patch 1722 BLAKE2B 030a8ac91262dda0af70dd73b
 AUX mvel-2.3.2-update-supported-java-versions.patch 1982 BLAKE2B b32623d0b8bbedf339b34fa7d07b15f3089ea2c1fe52e78852fdf4c82f42eaabae1e29c9d0bf781e28700300a26905379a39767795eecb8bd43a31d8e82c3d0e SHA512 b4441c6dbe721e54e34658d4a04090898ec1a9dcd38638f0fffbfc344889820b3f8138328c05777c5e9b51b4e05e178e9da35a6404fb183b307b9b2742f2ce4b
 AUX mvel-2.3.2-update-version-in-output.patch 1150 BLAKE2B bd69e3a534d62ce7fb822dfd3952490b13986526b2dfc745a1c8d286348dbd4b6554b83b9675de6f497a07ee17f129f98519b41258170df69aa81e2326fc85fe SHA512 762703a7886748a48c10ddc81f25ae545c486a5a00413b1d89e787ce9adebeefa26d9dcc4731c1c8a17957330570a6e6f73e0a1befd6b14db6c97ba150527e5f
 DIST mvel2-2.3.2.Final.tar.gz 2405839 BLAKE2B 5f12652a0f4375f6e24f18313d99a02bb86463cc1acc2f8845b815c9c7afcda410d67c9f1c30544f9ab1cd50a48ce0ab72e9cca94faafab776f3704b1d5fa087 SHA512 9d1c92bfe90aa4cfe5f4bbdd7eef2060bfaec3979c5c07a5baf3ddb4d84a00632dcaec266bab675b31d5b745bfa36a89dd5969ababeb64332069939a4df23dbc
-EBUILD mvel-2.3.2-r1.ebuild 2554 BLAKE2B 4bea05dc8c5319def73c2bda474246d3d013982c8cfd482e96c060bbd8d97e70890d069bc02616e3bffe50e13f4303f7a03788001c95082da21a1697d96d343e SHA512 aa73c6edc34584f271c7ca3c21e575710621688162ed6ae0fe508b0bc1bacc8fbac76c2ec109c64e6caf1d01ef076665a876d8105c5a2598dbe889bd9088a865
+EBUILD mvel-2.3.2-r1.ebuild 2550 BLAKE2B 165a984f91f61ca6cb13259eee2c7c45e036e3c7fd88bcb985360e09a5b985159e38e0ecd0acec2b85aa9ca9d2a4483a22223907ff48ef277799fe51c1f14fe4 SHA512 2bbf6959afe024366fe52811c1da666d64be14b433af64e146cc5eeaf454ae6c18489c894abde11b53f3cbb634db276f3ded3cd88af235af4e6b11a50c8d853f
 MISC metadata.xml 311 BLAKE2B fd4a83fa02a7d87a3b03c3b99b99f0e87b2dbe54b45eb00172999f629712e499aca3dfa631000d92ba51c1303dacea1499cf0394af8aab8ac53610b6bb7c31d7 SHA512 6ecb610dd945d4cba9764e55ffe05e896536d1deec4cdaa18949943fdb2e7e953f167f87599b4d6ebb16ee85c19e23da63217c4063b8553fa45ecf0680589ed1
diff --git a/dev-java/mvel/mvel-2.3.2-r1.ebuild b/dev-java/mvel/mvel-2.3.2-r1.ebuild
index 0b93cdde5b40..2fc29e17956e 100644
--- a/dev-java/mvel/mvel-2.3.2-r1.ebuild
+++ b/dev-java/mvel/mvel-2.3.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/mvel/mvel/archive/refs/tags/mvel2-${PV}.Final.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/myfaces-api/Manifest b/dev-java/myfaces-api/Manifest
deleted file mode 100644
index e159c21e1861..000000000000
--- a/dev-java/myfaces-api/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST myfaces-api-2.2.14-sources.jar 960365 BLAKE2B da66641c77161af268f42f197fff9366e6971b1646ac1b469fc2b318b179844ef995d3911975269375e3d46fe8e7590eb812d6ac9be0bb7bda0f4170dde47d77 SHA512 9c6d1ae8cf1fe0d407c3241a260071391c642206184f7be83a0d0c767da08981a0ce21cafb31a52c6bd4f4023501538fbec9bee122f0a60943300ef7e22b2d1a
-EBUILD myfaces-api-2.2.14.ebuild 849 BLAKE2B 183558289cd67b3a4f227971c8099ed587eda8f49d63549dc04afd34927fe8191a069f85114c7f20d192d690719c548a8012d6dc4862e39608de08a88f569021 SHA512 c7eed888d6b526221644ccce2b18d69ede7bb48d2babbf9de61ccf84da17e8879f9da342a77de56f172c5a896bd2ec6708a624529b6045f968a5ad94055ef0e9
-MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/myfaces-api/myfaces-api-2.2.14.ebuild b/dev-java/myfaces-api/myfaces-api-2.2.14.ebuild
deleted file mode 100644
index d5da5cc0cf63..000000000000
--- a/dev-java/myfaces-api/myfaces-api-2.2.14.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache MyFaces API - Core package"
-HOMEPAGE="https://myfaces.apache.org/"
-SRC_URI="https://repo1.maven.org/maven2/org/apache/myfaces/core/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
-	dev-java/cdi-api:1.2
-	dev-java/javax-inject:0
-	dev-java/tomcat-jstl-spec:0
-	dev-java/validation-api:1.0
-	dev-java/tomcat-servlet-api:3.0
-	dev-java/myfaces-builder-annotations:0
-	"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8
-	app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="
-	cdi-api-1.2
-	javax-inject
-	tomcat-jstl-spec
-	validation-api-1.0
-	tomcat-servlet-api-3.0
-	myfaces-builder-annotations
-"
diff --git a/dev-java/myfaces-builder-annotations/Manifest b/dev-java/myfaces-builder-annotations/Manifest
deleted file mode 100644
index b87628d01956..000000000000
--- a/dev-java/myfaces-builder-annotations/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST myfaces-builder-annotations-1.0.9-sources.jar 43051 BLAKE2B 72ea55574c863965465189fb38abfbefed51aec8b260d041b1cbfd8cd97bcdacbf8d2cafcd8589863a2c54f9e6eea7a0858abe35f91a75b160ad23c0a824fac0 SHA512 09bf3f9faaaae0545544b2195c8070689431bf28497afc9e317010243617137528a61be82f47123237e114b1a7f5f174a5e2cc2190abdff8beb5188e38feec04
-EBUILD myfaces-builder-annotations-1.0.9.ebuild 521 BLAKE2B ddc8c26db9c7d85fc6b4e38c6067318c56ae7f56ba1e34333f99ed8b5b1db0e09f0c8e2c4a68df6abc85dedd4167934c363131e591164825c1418a36e4e088a5 SHA512 52a0bef3884068312da90cc95d147e18d308d1b065acea03a8ff99985e797ea5d19a40f4a3cc73b52bc01f17f8351dbe1ab8df184a365f3da72b1b365870e9ba
-MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/myfaces-builder-annotations/metadata.xml b/dev-java/myfaces-builder-annotations/metadata.xml
deleted file mode 100644
index 6ef2d50cf07e..000000000000
--- a/dev-java/myfaces-builder-annotations/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/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild b/dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild
deleted file mode 100644
index 10d59c6e606f..000000000000
--- a/dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache MyFaces API - Builder annotations package"
-HOMEPAGE="http://myfaces.apache.org/"
-SRC_URI="http://repo1.maven.org/maven2/org/apache/myfaces/buildtools/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip"
diff --git a/dev-java/nanoxml/Manifest b/dev-java/nanoxml/Manifest
deleted file mode 100644
index 0962dc803d60..000000000000
--- a/dev-java/nanoxml/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX nanoxml-2.2.3-enum.patch 9487 BLAKE2B 33d1433983f461f50f17a63151b292798036eda70d340ca8d7f139615fc16dda87c6e4d4314952ed8b270a7972ecd06fc1ddda8faa24e505af816c1bf7f0f614 SHA512 cdb5bc356f35e0b1906d2acc6b937ab8102ae34fd688f77e214976417174a3f15c884b1d22715782a19b4c374f9def94d35971ca88b9400c9c28350d3f795769
-AUX nanoxml-2.2.3-lite-enum.patch 2515 BLAKE2B 41f698b9fd685739b181951d1ac022226e5be8e4c4c72078ec4339102f46fb24acd9ba3aa2765f6f9787a9c818bf6c50bc3818835635f48279dc2214a84d284c SHA512 8bb31f737211168bb4a24f2abbd8f4fb78df35bc471116b427b5c2faeb2b1b1710ce5eda793d364a95bd7d7162075f1322dfed4c5a2527c3ae113a8c9a5cb97e
-DIST nanoxml-2.2.3.tar.gz 426111 BLAKE2B ac9980502c8c6ec50c6aebd19c0d08319701a508eea2a58847b804dcb3a3a93ca8d41ee1f08f4ec48527e669fc1695ec945933688516775373458ac7b6564895 SHA512 6800b86039cb555efc05644db65c516fb242d4d081ea612969d6cc52a12ffd7571e012a7afe7962cd61c28b0ebb3b9d94af76f20013f3b4dd7d2aacdc552c6fc
-EBUILD nanoxml-2.2.3-r4.ebuild 861 BLAKE2B 8f3321804dd82db2afb880f5a63caf0fa4fefde59635ca5fbe62b6ec7bee932ad8f216cffd93ce44b3d954148762509ab6eb03145641bf2b2cab880a25b32a7b SHA512 9e57cfd0caec311a01ef261c54b4fcc3cc701240178ac328ef8ab2a23179a9196840a33d8badf45ff1f0fba7059e2cd9e028297d2856deebf74d355e45d7bc94
-MISC metadata.xml 314 BLAKE2B 08d12be6ff013add9cbdaca3402439da264ce207f5ffd58a81e38d78e7147cdc581d5334e5568ec213b584a34ccd82a5922067b35ce44cae82cd305fa9341eec SHA512 f8e8572c8aefe3a486ed7c9a39c516d71f32ec908f8f0fbdb11e40f46c1c2bf6bd8e00e72ba47909142e34f136fb0e89b4b17f195d6f495027252f5e8599f62d
diff --git a/dev-java/nanoxml/files/nanoxml-2.2.3-enum.patch b/dev-java/nanoxml/files/nanoxml-2.2.3-enum.patch
deleted file mode 100644
index f3992f845b85..000000000000
--- a/dev-java/nanoxml/files/nanoxml-2.2.3-enum.patch
+++ /dev/null
@@ -1,208 +0,0 @@
---- a/Sources/Java/net/n3/nanoxml/XMLElement.java.orig	2016-03-04 09:21:07.908000000 +0000
-+++ a/Sources/Java/net/n3/nanoxml/XMLElement.java	2016-03-04 09:35:16.283000000 +0000
-@@ -484,9 +484,9 @@
-      * @return the child element, or null if no such child was found.
-      */
-     public IXMLElement getFirstChildNamed(String name) {
--        Enumeration enum = this.children.elements();
--        while (enum.hasMoreElements()) {
--            IXMLElement child = (IXMLElement) enum.nextElement();
-+        Enumeration myEnum = this.children.elements();
-+        while (myEnum.hasMoreElements()) {
-+            IXMLElement child = (IXMLElement) myEnum.nextElement();
-             String childName = child.getFullName();
-             if ((childName != null) && childName.equals(name)) {
-                 return child;
-@@ -506,9 +506,9 @@
-      */
-     public IXMLElement getFirstChildNamed(String name,
-                                           String namespace) {
--        Enumeration enum = this.children.elements();
--        while (enum.hasMoreElements()) {
--            IXMLElement child = (IXMLElement) enum.nextElement();
-+        Enumeration myEnum = this.children.elements();
-+        while (myEnum.hasMoreElements()) {
-+            IXMLElement child = (IXMLElement) myEnum.nextElement();
-             String str = child.getName();
-             boolean found = (str != null) && (str.equals(name));
-             str = child.getNamespace();
-@@ -534,9 +534,9 @@
-      */
-     public Vector getChildrenNamed(String name) {
-         Vector result = new Vector(this.children.size());
--        Enumeration enum = this.children.elements();
--        while (enum.hasMoreElements()) {
--            IXMLElement child = (IXMLElement) enum.nextElement();
-+        Enumeration myEnum = this.children.elements();
-+        while (myEnum.hasMoreElements()) {
-+            IXMLElement child = (IXMLElement) myEnum.nextElement();
-             String childName = child.getFullName();
-             if ((childName != null) && childName.equals(name)) {
-                 result.addElement(child);
-@@ -557,9 +557,9 @@
-     public Vector getChildrenNamed(String name,
-                                    String namespace) {
-         Vector result = new Vector(this.children.size());
--        Enumeration enum = this.children.elements();
--        while (enum.hasMoreElements()) {
--            IXMLElement child = (IXMLElement) enum.nextElement();
-+        Enumeration myEnum = this.children.elements();
-+        while (myEnum.hasMoreElements()) {
-+            IXMLElement child = (IXMLElement) myEnum.nextElement();
-             String str = child.getName();
-             boolean found = (str != null) && (str.equals(name));
-             str = child.getNamespace();
-@@ -585,9 +585,9 @@
-      * @return the attribute, or null if the attribute does not exist.
-      */
-     private XMLAttribute findAttribute(String fullName) {
--        Enumeration enum = this.attributes.elements();
--        while (enum.hasMoreElements()) {
--            XMLAttribute attr = (XMLAttribute) enum.nextElement();
-+        Enumeration myEnum = this.attributes.elements();
-+        while (myEnum.hasMoreElements()) {
-+            XMLAttribute attr = (XMLAttribute) myEnum.nextElement();
-             if (attr.getFullName().equals(fullName)) {
-                 return attr;
-             }
-@@ -606,9 +606,9 @@
-      */
-     private XMLAttribute findAttribute(String name,
-                                        String namespace) {
--        Enumeration enum = this.attributes.elements();
--        while (enum.hasMoreElements()) {
--            XMLAttribute attr = (XMLAttribute) enum.nextElement();
-+        Enumeration myEnum = this.attributes.elements();
-+        while (myEnum.hasMoreElements()) {
-+            XMLAttribute attr = (XMLAttribute) myEnum.nextElement();
-             boolean found = attr.getName().equals(name);
-             if (namespace == null) {
-                 found &= (attr.getNamespace() == null);
-@@ -860,9 +860,9 @@
-      */
-     public Enumeration enumerateAttributeNames() {
-         Vector result = new Vector();
--        Enumeration enum = this.attributes.elements();
--        while (enum.hasMoreElements()) {
--            XMLAttribute attr = (XMLAttribute) enum.nextElement();
-+        Enumeration myEnum = this.attributes.elements();
-+        while (myEnum.hasMoreElements()) {
-+            XMLAttribute attr = (XMLAttribute) myEnum.nextElement();
-             result.addElement(attr.getFullName());
-         }
-         return result.elements();
-@@ -897,9 +897,9 @@
-      */
-     public Properties getAttributes() {
-         Properties result = new Properties();
--        Enumeration enum = this.attributes.elements();
--        while (enum.hasMoreElements()) {
--            XMLAttribute attr = (XMLAttribute) enum.nextElement();
-+        Enumeration myEnum = this.attributes.elements();
-+        while (myEnum.hasMoreElements()) {
-+            XMLAttribute attr = (XMLAttribute) myEnum.nextElement();
-             result.put(attr.getFullName(), attr.getValue());
-         }
-         return result;
-@@ -915,9 +915,9 @@
-      */
-     public Properties getAttributesInNamespace(String namespace) {
-         Properties result = new Properties();
--        Enumeration enum = this.attributes.elements();
--        while (enum.hasMoreElements()) {
--            XMLAttribute attr = (XMLAttribute) enum.nextElement();
-+        Enumeration myEnum = this.attributes.elements();
-+        while (myEnum.hasMoreElements()) {
-+            XMLAttribute attr = (XMLAttribute) myEnum.nextElement();
-             if (namespace == null) {
-                 if (attr.getNamespace() == null) {
-                     result.put(attr.getName(), attr.getValue());
-@@ -1007,9 +1007,9 @@
-         if (this.attributes.size() != elt.getAttributeCount()) {
-             return false;
-         }
--        Enumeration enum = this.attributes.elements();
--        while (enum.hasMoreElements()) {
--            XMLAttribute attr = (XMLAttribute) enum.nextElement();
-+        Enumeration myEnum = this.attributes.elements();
-+        while (myEnum.hasMoreElements()) {
-+            XMLAttribute attr = (XMLAttribute) myEnum.nextElement();
-             if (! elt.hasAttribute(attr.getName(), attr.getNamespace())) {
-                 return false;
-             }
---- a/Sources/Java/net/n3/nanoxml/NonValidator.java.orig	2016-03-04 09:36:05.247000000 +0000
-+++ a/Sources/Java/net/n3/nanoxml/NonValidator.java	2016-03-04 09:36:25.195000000 +0000
-@@ -587,10 +587,10 @@
-                                           int        lineNr)
-    {
-       Properties props = (Properties) this.currentElements.pop();
--      Enumeration enum = props.keys();
-+      Enumeration myEnum = props.keys();
- 
--      while (enum.hasMoreElements()) {
--         String key = (String) enum.nextElement();
-+      while (myEnum.hasMoreElements()) {
-+         String key = (String) myEnum.nextElement();
-          extraAttributes.put(key, props.get(key));
-       }
-    }
---- a/Sources/Java/net/n3/nanoxml/XMLWriter.java.orig	2016-03-04 09:36:53.616000000 +0000
-+++ a/Sources/Java/net/n3/nanoxml/XMLWriter.java	2016-03-04 09:38:11.868000000 +0000
-@@ -182,10 +182,10 @@
-             }
-          }
- 
--         Enumeration enum = xml.enumerateAttributeNames();
-+         Enumeration myEnum = xml.enumerateAttributeNames();
- 
--         while (enum.hasMoreElements()) {
--            String key = (String) enum.nextElement();
-+         while (myEnum.hasMoreElements()) {
-+            String key = (String) myEnum.nextElement();
-             int index = key.indexOf(':');
- 
-             if (index >= 0) {
-@@ -203,10 +203,10 @@
-             }
-          }
- 
--         enum = xml.enumerateAttributeNames();
-+         myEnum = xml.enumerateAttributeNames();
- 
--         while (enum.hasMoreElements()) {
--            String key = (String) enum.nextElement();
-+         while (myEnum.hasMoreElements()) {
-+            String key = (String) myEnum.nextElement();
-             String value = xml.getAttribute(key, null);
-             this.writer.print(" " + key + "=\"");
-             this.writeEncoded(value);
-@@ -229,10 +229,10 @@
-                writer.println();
-             }
- 
--            enum = xml.enumerateChildren();
-+            myEnum = xml.enumerateChildren();
- 
--            while (enum.hasMoreElements()) {
--               IXMLElement child = (IXMLElement) enum.nextElement();
-+            while (myEnum.hasMoreElements()) {
-+               IXMLElement child = (IXMLElement) myEnum.nextElement();
-                this.write(child, prettyPrint, indent + 4,
-                           collapseEmptyElements);
-             }
---- a/Sources/Java/net/n3/nanoxml/StdXMLParser.java.orig	2016-03-04 09:38:44.521000000 +0000
-+++ a/Sources/Java/net/n3/nanoxml/StdXMLParser.java	2016-03-04 09:39:08.028000000 +0000
-@@ -492,10 +492,10 @@
-                                                 extraAttributes,
-                                                 this.reader.getSystemID(),
-                                                 this.reader.getLineNr());
--      Enumeration enum = extraAttributes.keys();
-+      Enumeration myEnum = extraAttributes.keys();
- 
--      while (enum.hasMoreElements()) {
--         String key = (String) enum.nextElement();
-+      while (myEnum.hasMoreElements()) {
-+         String key = (String) myEnum.nextElement();
-          String value = extraAttributes.getProperty(key);
-          attrNames.addElement(key);
-          attrValues.addElement(value);
diff --git a/dev-java/nanoxml/files/nanoxml-2.2.3-lite-enum.patch b/dev-java/nanoxml/files/nanoxml-2.2.3-lite-enum.patch
deleted file mode 100644
index 602cd9f87909..000000000000
--- a/dev-java/nanoxml/files/nanoxml-2.2.3-lite-enum.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/Sources/Lite/nanoxml/XMLElement.java.orig	2016-03-04 09:16:52.339000000 +0000
-+++ a/Sources/Lite/nanoxml/XMLElement.java	2016-03-04 09:19:03.213000000 +0000
-@@ -63,8 +63,8 @@
-  * The following example shows how to list the attributes of an element:
-  * <UL><CODE>
-  * XMLElement element = ...;<BR>
-- * Enumeration enum = element.getAttributeNames();<BR>
-- * while (enum.hasMoreElements()) {<BR>
-+ * Enumeration myEnum = element.getAttributeNames();<BR>
-+ * while (myEnum.hasMoreElements()) {<BR>
-  * &nbsp;&nbsp;&nbsp;&nbsp;String key = (String) enum.nextElement();<BR>
-  * &nbsp;&nbsp;&nbsp;&nbsp;String value = element.getStringAttribute(key);<BR>
-  * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println(key + " = " + value);<BR>
-@@ -478,9 +478,9 @@
-         this.children = new Vector();
-         this.entities = entities;
-         this.lineNr = 0;
--        Enumeration enum = this.entities.keys();
--        while (enum.hasMoreElements()) {
--            Object key = enum.nextElement();
-+        Enumeration myEnum = this.entities.keys();
-+        while (myEnum.hasMoreElements()) {
-+            Object key = myEnum.nextElement();
-             Object value = this.entities.get(key);
-             if (value instanceof String) {
-                 value = ((String) value).toCharArray();
-@@ -2168,10 +2168,10 @@
-         writer.write('<');
-         writer.write(this.name);
-         if (! this.attributes.isEmpty()) {
--            Enumeration enum = this.attributes.keys();
--            while (enum.hasMoreElements()) {
-+            Enumeration myEnum = this.attributes.keys();
-+            while (myEnum.hasMoreElements()) {
-                 writer.write(' ');
--                String key = (String) enum.nextElement();
-+                String key = (String) myEnum.nextElement();
-                 String value = (String) this.attributes.get(key);
-                 writer.write(key);
-                 writer.write('='); writer.write('"');
-@@ -2189,9 +2189,9 @@
-             writer.write('/'); writer.write('>');
-         } else {
-             writer.write('>');
--            Enumeration enum = this.enumerateChildren();
--            while (enum.hasMoreElements()) {
--                XMLElement child = (XMLElement) enum.nextElement();
-+            Enumeration myEnum = this.enumerateChildren();
-+            while (myEnum.hasMoreElements()) {
-+                XMLElement child = (XMLElement) myEnum.nextElement();
-                 child.write(writer);
-             }
-             writer.write('<'); writer.write('/');
diff --git a/dev-java/nanoxml/nanoxml-2.2.3-r4.ebuild b/dev-java/nanoxml/nanoxml-2.2.3-r4.ebuild
deleted file mode 100644
index fb78db838106..000000000000
--- a/dev-java/nanoxml/nanoxml-2.2.3-r4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-MY_P="NanoXML-${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="NanoXML is a small non-validating parser for Java"
-HOMEPAGE="http://nanoxml.sourceforge.net/"
-SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/nanoxml/${MY_P}.tar.gz/357c7136417ea996cf714278ea84f2df/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-CDEPEND="dev-java/sax:0"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="sax"
-
-JAVA_SRC_DIR="Sources"
-
-PATCHES=(
-	"${FILESDIR}"/"${P}-lite-enum.patch"
-	"${FILESDIR}"/"${P}-enum.patch"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-	rm -rf Test || die
-}
diff --git a/dev-java/netty-common/Manifest b/dev-java/netty-common/Manifest
index 58fee94589fb..4015717cdc66 100644
--- a/dev-java/netty-common/Manifest
+++ b/dev-java/netty-common/Manifest
@@ -1,4 +1,5 @@
 DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
 EBUILD netty-common-4.0.36-r1.ebuild 1985 BLAKE2B c7cf7c00ae6c9e38070f469fdd3b15941b3f9d2e52282602dbecd4c923ce847417cafa7af247145fff8eed8fe82208e61a9f56283ed82c061a11953e7afa29d7 SHA512 eea2879c06b4d2eb695cb9f24a1275d2b78408a986a5f845fdaa1174c8bb50ab3807f78ff3ed9ba0d01403bb1086ee8c4fc9eb0e777f8910b615a1d8c97692aa
+EBUILD netty-common-4.0.36-r2.ebuild 1958 BLAKE2B 76261b2ac5ab0a0163ba27953360767a382d2a2b2e3fd16ad962dc14c197b71a49876bf1c64f2900f5b1e78f840b4cd841823822e4339c9f0742ead7e0c787fa SHA512 0742d56a578577bb26c7833b5f28d9dcced6607b8c280626efefe8ed689612f3acbc3e38bdf6ec4ca66ff141dcde9f24ba6f6621e7edd294e6bcb7ab9124225d
 EBUILD netty-common-4.0.36.ebuild 1603 BLAKE2B 20210d9a3d5f26ca914d2ca739c59cfe2ebeac66ba59f1d7a8a00cb0b2cadf0e146f341d3c79b6de762513f89bc00c8fc42df8bd29b80297d810dde211299920 SHA512 d5aa89abcc60bd5313693773b9a24bd0fcde2ad7623f246fbad156c7251831507dbfa6d671fcfe1de0957ce8c165e6e04079df93881bba0c5730dcdf2e70fde0
 MISC metadata.xml 323 BLAKE2B de4c9f6ab6a8f2e4243cb7ea8d3e96a08e9a99b579d7996601094ca1bba95c4331fec32c42c4fa42defb8de1f5ed3bf9e52cc3ac3ca9e6a0bec6a55c3edf3d3a SHA512 99c3bb74ad41a72119dbccfaf446e9d13fd1002204188c363531a68e4434fb01a9f2ab0158ad359cea6163f3791759e8fa5b7b2c8cb7268212776d912840b89a
diff --git a/dev-java/netty-common/netty-common-4.0.36-r2.ebuild b/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
new file mode 100644
index 000000000000..9536f39175b8
--- /dev/null
+++ b/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="netty"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Async event-driven framework for high performance network applications"
+HOMEPAGE="https://netty.io/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+# Same test failures as before the revbumps still occur. See https://bugs.gentoo.org/827221
+RESTRICT="test"
+
+CP_DEPEND="dev-java/commons-logging:0
+	dev-java/javassist:3
+	dev-java/log4j-12-api:2
+	dev-java/log4j-core:2
+	dev-java/slf4j-api:0"
+
+RDEPEND="${CP_DEPEND}
+	virtual/jre:1.8"
+
+# It does not build with java 11, https://bugs.gentoo.org/788364
+# src/main/java/io/netty/util/internal/Cleaner0.java:44: error: cannot find symbol
+#                Cleaner cleaner = (Cleaner) cleanerField.get(direct);
+#                ^
+#  symbol:   class Cleaner
+#  location: class Cleaner0
+DEPEND="${CP_DEPEND}
+	virtual/jdk:1.8
+	test? (
+		dev-java/asm:4
+		dev-java/cglib:3
+		dev-java/easymock:3.2
+		dev-java/hamcrest-core:1.3
+		dev-java/hamcrest-library:1.3
+		dev-java/junit:4
+		dev-java/mockito:0
+		dev-java/objenesis:0
+		dev-java/slf4j-simple:0
+	)"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	default
+	# Needs Mockito 1.10.
+	rm -v src/test/java/io/netty/util/concurrent/PromiseCombinerTest.java || die
+}
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH},asm-4,cglib-3,easymock-3.2,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,mockito,objenesis,slf4j-simple)"
+	local TESTS=$(find * -name "*Test.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 121eb9e1c719..f7a301fb2cc2 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -28,6 +28,7 @@ DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.2_8.tar.gz 192611208 BLAKE2B ef5e801d3d
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u312b07.tar.gz 102144826 BLAKE2B b351fe3a82d8ef1e77314890a00c2920dbe5621bb524c4d4ed80b2f3a3b10853f91b0488ab42a5b1691ba66aa9de8eb0630b9325c3dc7fe6b071e2a95dad6bed SHA512 1b58c5453c473d798e5c4871212c484518b44038f81b32623668174fc47c4118120f770ebe3a21534b7f9e01c383a75cb558538e1e635f7c290686825b4ea78a
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u322b06.tar.gz 102170434 BLAKE2B 84755d791d6aea0b58de68f7ced3e023d7d5f705c99ece9cb91f77663643681ea22672bb1dae143475959374193b1bea1068c0a0f73df4e748430495993d1c5c SHA512 cda25392c8d51b720fac9022de0d7cfc1f496b9e5295b90ee6082e6787d483eaf32198092072b6fe9cadfec157a93f66290691b3d1476572ba2097ab5e70b33c
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u312b07.tar.gz 98364180 BLAKE2B 2b7cfffa33e9486637f9274f5a3138d6c1a53afa63d24ecb82aff4c0baa8b765003642c582c0191d0d229754dd9de64ab7cda4d81e9168df3d960baa44a5de9a SHA512 8b7273688a1ee28d0a2f918f2fe02586b8ff9e7962bbf8cd2973001594e627b1eef7a9f1893bf3bd3789fabe0058a916ac2d4d53c72cbd8d586e4e7c3217438e
+DIST OpenJDK8U-jdk_arm_linux_hotspot_8u322b06.tar.gz 98420081 BLAKE2B 77d735d6f07320d226cf575c84f3879d7dafb4fa4ce06c737e7bdaf4f731af323c3ed0bdbd66067200ef350c7b5202c75bdf7cdc2a538c54ef1058be54a9d57f SHA512 b355c813b2b382bb37c2ca34c01a631b6651e0559a864286c04518332c513d1f833f8441bed52ecc1e24074951a2e5149ce60c88fa2490165d43d0058efe073c
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u312b07.tar.gz 100571080 BLAKE2B 3a1c5c7488de740210758a34dcc34517c8d5310a9d17c1d251d0ad6d5e7a619595304479b88c807b5d0cd839f85f9b7c819d0dcc297a738052b337b3e962b457 SHA512 0b530ffd0c41fa71962072c70c0712b71573b9d1b66e9b23f6122b770bfa7cc42d8ca0c87a721bb8481104edd062b79ebc09a728f1977699b242b62cd546146b
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u322b06.tar.gz 100615206 BLAKE2B 8956f1ed38732aa8e9880396dce7c477370d128c1a957ba6d135676140f3e8bf233c6563dbcd2f63c2136454a398c49455a96f77224691ded7843f6cac027d1f SHA512 11975e73e6615bcb686703241b0f1589699edfc76a4de97e7066d4d93826dfb8c07a54b6ea3f8a70d231f98d4033c2fbb7741fbf0df374aa810f6cff8b5cda33
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u312b07.tar.gz 103016010 BLAKE2B 9e7b10497bb46a176016f4df6bfa5fa90905bffaaf9668ca39f30a01cccf78c04d1391aed304493159d5b520879762b7e284befdc11c5444b0edff6b363d9c3c SHA512 20ba919c6b4b2f1253b7a9119193f2ee6c16498ed15296ed5d4588284e635fbc53fa368180c1362cb5c3cc2f2446e96d5a752a96d64382ddf73b062319b1ef47
@@ -36,10 +37,10 @@ DIST OpenJDK8U-jdk_x64_mac_hotspot_8u312b07.tar.gz 107991615 BLAKE2B fb068abc678
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u322b06.tar.gz 108075347 BLAKE2B 89c81377516b737e1ce096b66c8460c86f77229c8a7021471e6c67ae738c99183dbe4e5d868de0de5251cca9eb5bcf888f88526a8390a56eb33bb6270038ebfb SHA512 5f9e6036ca72b015609c503b8446b79013dd4aac09349e3c65c9df0e91e2541f3672d867006cd1f236cdd8a60e16671c6e4423d5d6e85a5a31f6f97f1d168434
 EBUILD openjdk-bin-11.0.13_p8-r1.ebuild 3004 BLAKE2B e8c59082463b4418045bbe589bb7567f38e68d8a2e06efe6d65ab777e0260effa8c277a866d0c647e39ec018d9f9ac3b8e20f29d6af323e512e879d042c9c9bb SHA512 96c21cc30feb9fbebe6fb63846c50bc9a31e7382a90b32537935aa18ecc7a71e629339bcf99afa3e2974afed74d345da01a1a378eee8818ac23ea15421b24642
 EBUILD openjdk-bin-11.0.13_p8.ebuild 3003 BLAKE2B b5bf1a9ec3297e3d417c19f6c9a3cf9d7155694462e6b3f9378bc0af992232e9f8a79677675ea78257215a4a8833620f2053d2da0f969201f1a4898a5eff3f06 SHA512 7f9e47fdafb8d8a7ab5602cda247c6847d7b9b008561ae6590d9b074c31ead43d6ae604aaf827a5af65243ab317f6d4eef96afd5b9d6561386a162ee958e8f47
-EBUILD openjdk-bin-11.0.14_p9-r1.ebuild 3188 BLAKE2B 9fd7ce4ceb0821acf0a11acbd997578074f264786e6db048b89c8bf3d6af33825b981228a25991f5808d8e690e3d1d1dfeaf905fda5757d253e8a586388285fa SHA512 c40239ee1272f03edce613b7d9809a04defa23061fe68ab6badef1fc3da529236badd2f262e2b872c5c734fabaa24477d61804229472b4eec5af909f7647fbe6
+EBUILD openjdk-bin-11.0.14_p9-r1.ebuild 3185 BLAKE2B 40efb7b12aaea7fc35274e9fae8ad8130f6951a749e3dcccef5f824f9fe9d27c3af39db5990c66284b3ce77bc4d198036a306f0e382c393c4085a6a89cc50b93 SHA512 b1d2d56d7c202a3d1aa0e7f363f17e52abb8b3f8fadca6998b9257ca8507142fcdc8816ed0a096bd0acc1fa120925982c38153800806425965a43eac31f3c6ff
 EBUILD openjdk-bin-17.0.1_p12-r1.ebuild 3817 BLAKE2B 730195b2a13f8cf6fb77acc0620ee6a1bf0dec819c4a212483668a8db925d21589367c2e004929b00ee4c9409e5f56ab8b29735ddfb38da215acf76b71d22e3e SHA512 5d690859f283ffe6e15d10faa647b8e28cddd9feea9c6ffc062c9a3f23c9bb6185f13bd8f03fba2f5117fa19db76d1260460970f42ad1912e9c1c3ed2ef71957
-EBUILD openjdk-bin-17.0.2_p8.ebuild 3872 BLAKE2B b9d5dbf7d6a089352848e391db1edca76b9b4b715b569f24ba8bd088195444b3510d96c7ee7d05fab6a4bdce7d07a71c9bff8b8504ae120b44adb09ad84e5a72 SHA512 a256f3d72280d24013cdf4dee55edfd49cb7585609e2f15f1176883cec4e57a1b68ed648b7fa02d2ab17eca8c7f31ad486fbb07a67c3033ff218bc405e10a634
+EBUILD openjdk-bin-17.0.2_p8.ebuild 3869 BLAKE2B ee11a32fa646f841c274a0bf872574dcfb4684da937c3423446cd44aaaef1230a8d979b62097b1718dc897bd6ae63aac82bcec7fe18c1d28cc4064222d5b0ff4 SHA512 4811b678d0884a2b6afdfb1d3daaced3b6c0db1c2b0686d4b4eaa7406b0daac6e5173ff52b982cf3f64e323757ba087109167de74ef5ffd69b7d6944b89083e9
 EBUILD openjdk-bin-8.312_p07-r1.ebuild 3038 BLAKE2B 1fc8d0830bd700d7866f54994c40665de60be274d0e5fa373e2dbbe417a84597435e1d6fea3fee269338036b5f047ba9916b025d883b23cb4b70408e4ef0401a SHA512 2717e11822ef00514783a0dc932a7c7212d70076385337f9c7b8bd4f00791dc1ce3d4168e0e662f9504fe276233eb3398461f1ae2a263f5c1720f568065aa9e8
 EBUILD openjdk-bin-8.312_p07.ebuild 3047 BLAKE2B e636d705075e18d16bdb5fab3c018db59af78afb52c189c21400990c11929bec7edba0592fc14e5b800bc0e898cbe13f352e3572426e7320b5d524e6c2cf4152 SHA512 406fc714f07b1e743fd3f5b0570c2a0f9805bacecbe2c97fdae8c8551dd51ad789dfa1ec51b23321801dbe1a0f44575af58485f2d6dc3662e7432b29d95ebd1d
-EBUILD openjdk-bin-8.322_p06.ebuild 3017 BLAKE2B 576d3da76e6c201d2884b4b10cc21c9f1a4bac3c736811c1f10be3810d692609ae3e2b2756021e1cad3de20249b444c76232962fe7a7a095eeb88e4c5246edc8 SHA512 b66fda10d13896bd3fc5c5d566f223605eb36ae9185964a0503cecb413e6c0b79bd9bd9a6672a28d9e3cfd71b21f90bc879ee2ee4022f8ca065de68b3edbf6c6
+EBUILD openjdk-bin-8.322_p06.ebuild 3035 BLAKE2B 96b42ec8bf943f975cd1767a666373e09592b0d3886e10cc546106aa941c0cc14ae1c1e86c8372e7bb134aab52b7bbb15fddc35678ff025e85f42c6c22feb7d7 SHA512 8d479ff64e2511d7bf0122e4a7b25fd429f523ce4153f02f057d8b05aa9d26626c9d80f67a8b9172834b8422901f8e8f68921bb3806b27064866c6b3768b3b57
 MISC metadata.xml 941 BLAKE2B 16002011c075cd453721b20649521e7370b0835939bf228e3a66cb6994b98d11ee2b0074bd9ead474c8787301d2be44a2c05d2d49c09b3f2767995153c37a69a SHA512 37681cf8ecc00361d9bc3ab5b26defae227a1d95aec0a5f51b39d412e1d4f62bc3c9db0c1296b394c02f81f0b8eb052ea85212eed0319991f372525c0bf26b09
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild
index 81cd7dd0c1fe..2a69b6b5e04c 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild
@@ -41,7 +41,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
 IUSE="alsa cups headless-awt selinux source"
 
 RDEPEND="
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild
index ebe4afd00a4e..69156e432327 100644
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild
@@ -42,7 +42,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
 IUSE="alsa cups +gentoo-vm headless-awt selinux source"
 
 RDEPEND="
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild
index 9ae60de7a9e9..1c0861a84f55 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild
@@ -26,6 +26,7 @@ SLOT="$(ver_cut 1)"
 DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 SRC_URI="
+	$(abi_uri arm)
 	$(abi_uri aarch64 arm64)
 	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 amd64)
@@ -33,7 +34,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
 
 IUSE="alsa cups examples headless-awt selinux source"
 
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index f27b3d4b423c..c4eff1306287 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -3,7 +3,7 @@ AUX openjdk-jre-bin-8.env.sh 678 BLAKE2B 9cc23ab6e5c7d9e27861e051ea68c074c23789d
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.14_9.tar.gz 42435138 BLAKE2B 0f972a78221b74be4b8c87845f52d331eb6caf84eef06d291d0cd25ce4357b7072f938fd0390a9c54647d4ddcfe4c0184ddf84583e017e1bf78338b7939437bc SHA512 9ee64498d83d16cefc5a155393d9477bb78338d43a3b4b1699f4358644415a6be5601f7b2a87a82f2a95cafd6485b6db7b30bd0d21096110211b942e95deed64
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u312b07.tar.gz 41286015 BLAKE2B f555fee173b8af98f64cdd08b8141c823033473d8fa0601f8e69899bc6b82234ac33a6de45f87b2cd9457e22d500da9052209c45798d47ec3c4a34496b30d154 SHA512 36d07389e63e49ee16f1329aa7e0bd5b42b397f864f10080038017920fd2b178d5cd9dfaef157080ac020721d0e6e7b26b0277ab1cde69c20500fc34bab0e915
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz 41317897 BLAKE2B b96b39d4b3f7fe54f9b04698d4f24879ce617e61ade298b7de1472cb85fbf7d5f297f009c0e881a17bcdaf9baaf3187acef531b0ace97a1f2ab099811995c815 SHA512 4a3acc1330056011f0097aaca77858779e2c89d214598ef66736956984204b8de804549e42c51f8392806753f3d534d34ad93ef6df9f2f45a369e04f6a0694ac
-EBUILD openjdk-jre-bin-11.0.14_p9.ebuild 2021 BLAKE2B 7665a35bf44a845b502d1330d36d86e7d3164fd5d3433bd5d2080b0d9999e9cbbfd72edb18dd61405fb8b61b99d14479fe806ae8878eedb72c240f7b2673ac4f SHA512 5a9fb96346d6d9fc4c2334d02f6dfc343653cb72a272abd0fa74892d618c8d36d13726925d2090c0ee786a2676323016a9d20533a5d7dad47db90bf61731669c
+EBUILD openjdk-jre-bin-11.0.14_p9.ebuild 2020 BLAKE2B ede152b4e3c5ec4b1c6ddbd84aa88bcce55e87bb64a57cd7a938b3f31637e243865c60f0d59dbcea7723ecafdc90f23ab1b9997d1740964ecdf807dc1a9eb68b SHA512 08dca400daa7635cd744321d683e655c6f59a6f01897fa7e46389062b72bd08ddde42f99fa4fc0c79defd9d13e2675b675907abc08ba7c6ad8c8f0cf12a2b234
 EBUILD openjdk-jre-bin-8.312_p07-r1.ebuild 1847 BLAKE2B 3c7e883db3d886c57de3aefd89af687733c43ab63b9d260102d86a5992aa7432f763aae7108e7663107e9dbeed927485e211251f7bd64ed89b16c876374057de SHA512 06086af6d8b5e8ba7e290046ebf2e94055a273a3f8557ebb0272d41471cc26d1874f87f412bd722c19b8ff2955777edce3ee4b6ce7160607f5e9b77ac6bc3d73
-EBUILD openjdk-jre-bin-8.322_p06.ebuild 1833 BLAKE2B 3a7cf0e521421f430068e35e9e5817b7f50ea8036c8b2ef5f7708096f40baeed4d6eb9df93538c8eb3d949d477c553e8ce886409ee4581513c4e935fb672d29c SHA512 06250bf0e366cece0d0782a9f66b129990699819a7e6a1bdd4b6ca7fc8e1268ed26d4015f1c925ffb899d87226f8c7ae22787e08851e00a9e3050836ec44e70c
+EBUILD openjdk-jre-bin-8.322_p06.ebuild 1832 BLAKE2B 31dd2783dad44148857303b74c82b556d1360338b80747f36fc19052c5091ba7106837777b6bfffb088b5c31fc4072529cdea994cfc35b4f56bc032d5830a000 SHA512 df9a819e9673d952422d9dcee7d1f901cde3982dae1e64ce4ddce39b28ae7eae96d1598718c311412d9727a977ad4ed1233e43c933564ef0e9afd7fc97817d56
 MISC metadata.xml 896 BLAKE2B db8489d7738bb5444ee789ae0dc516941ece1b814ce4c4d0e12284e4027315aa20b141027ca6db8aae7ab6580d881e79bcb1b4dffa8a890f75da6d7177c7c279 SHA512 8833e637b8b935247972eaf7afbf3787cc17013080d9747defad4784ea89c2b147d0f2284327e9ade30100594a0d1e638f0ecd01f0375101372028dbfd0b31a3
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild
index a6f7f3ee248b..d7a2d14be024 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa cups +gentoo-vm headless-awt selinux"
 
 RDEPEND="
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.322_p06.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.322_p06.ebuild
index d4b6279fcfac..f337effa4a4f 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.322_p06.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.322_p06.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="alsa cups headless-awt selinux"
 
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 5418f46a332a..fbc6ccfd9cee 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -29,9 +29,9 @@ DIST openjdk-jdk-8.312_p07.tar.bz2 48705905 BLAKE2B 0e9849a58a05e300441e63702846
 DIST openjdk-langtools-8.312_p07.tar.bz2 2403774 BLAKE2B 2eaaf2d23b0d31d566b95075f1e00a8ec01617a48bd860b927fc56f56c0ec1e4232c1d2e316b9b13bf563b89ecc6464bf1e49a86eda1a31d998dbbc85e1fa542 SHA512 b77d8b1864e121a838023da424b0910903cc2b11cd9669e61c0ced84e1210d4902b2a0b97031e6646f26b01f1120d72b6f3382c6aee4d25fcd2d8e4605b8b4ff
 DIST openjdk-nashorn-8.312_p07.tar.bz2 2848133 BLAKE2B 4e416ddb38aafb97796233adda615525fb6e583428cdf0b25fd285276b3bef81682d3a607122aa8724dd9ec2ef0890b889ef809aa8f72cb03ac5bc9bfce9192e SHA512 411ac87cf1e8c889330b3fc41ce8cd8ed70c553d079dd46349813b02b171a22c2421075cc6391e46a866ee802df874cf1a6ff3e7dfba20e73564380be24ae843
 EBUILD openjdk-11.0.13_p8.ebuild 7470 BLAKE2B 51487f24150b411a085a022f83f539c11e2532b82afafc76f03a15a6ff96b3b04d3ce9078a3cde6b2c91ffcedf55dac2976eb00bdbb0ad4352c7a428df4d5956 SHA512 644cdae2f094d080eb27054a4f2b7fc3dfb6a540567a15e1c07d0cf0540dead5a97f7751747e2d4db2ed9e860611f19bd958eb4732c2db0d95c5119d61df8a34
-EBUILD openjdk-11.0.14_p9-r1.ebuild 7771 BLAKE2B 10a62c7c57432f86fedf3102c9ee278f2a4b55875fea4f199c727d09d9f51bec19871e01a5d0ac27b8435daecbe850be5c8cb42d5298eeeaa30973e667e71aff SHA512 ef6a23ca55993f0b4dfbf2dbe4c330fb82796cb250d10dd4fa85cf8e7e15db185d780c4f11f585dc50f43bdd6b208f9bcd8a19993bff6cbea8c3811d45a5a05e
+EBUILD openjdk-11.0.14_p9-r1.ebuild 7768 BLAKE2B 242092fb322793922d01c4125dbef63edbc1ccb12176634df8cf07048de88faf04106f7138a8c862a76b3fedb1d2f9ed680ad2ad68e1afd1389d59e8da1c861d SHA512 9b43396290e3958809c0bdb97d2de3df4cfd5756b2c5d046e7e5661fa3a5de091a156dbd4c4995c18252dd93c284a796ed005b67ed415cf1fb7448e4954c49c5
 EBUILD openjdk-17.0.1_p12.ebuild 7855 BLAKE2B cb7a7215afcd9382edd8053ea4182012d46743fdff5ba03ac4ff2f8750b454c352b25ec4ca04b0b3a5dcfeadf64cf24518ebf119a87cde7ca7f2c9a09bf39256 SHA512 5bc08b0e7707725dafd4165d8f7af2964981195d19fc95ae5465ab3f2907bd4c81d2ba2bfbf6eb42dd331dd8a9eb2c8c0584615146163669514a2c2773cf68df
-EBUILD openjdk-17.0.2_p8.ebuild 9144 BLAKE2B 13c56192cf50286fb2c7676b2781f96b9d48439b9dbfbca5c0427dabc74b249754a413cbbcf0360e7e1e6edcdb33c2dbceb30ebfa17f7a413bef3b08a93ae967 SHA512 2c959301483293c2232308c9b16984b17e44a0b037c924a5835fd56363df0a618aa629483d72bd1b363b8914637db8cbd0aaeef21a6dfad88bfb77f3be0375f9
+EBUILD openjdk-17.0.2_p8.ebuild 9105 BLAKE2B 0510a231c319d95ba3c3ad411524956872184bb958993dce100e2b39c7654ddea8cd4842f9ece6d7da53efa54b06d165db3c15d4d69be08a676a5cd6d42978e1 SHA512 bc349ca6ab90f97cdaecf6bb0634b43a1b122c086a808c854613799ef896b61617736b82fac0a209c37fafbe54d329da546076cb077931f11112c5e2bc0e7863
 EBUILD openjdk-8.312_p07.ebuild 7399 BLAKE2B b07477683dd271a5c1cf0830137f9c846df5375666ac0d3863f3647f9c0ca3db3bce0e68e4f3931124a071e9b0fb81434733d034194cbee3a764056cfa2721fe SHA512 467b1479f425e9d36be216c24d2f226a2c4a1aec9947fedc73d0b4703e1efaad727c36c427c3010a78576db997d2975623d0209d11ba6adbd65e360265173c10
-EBUILD openjdk-8.322_p06.ebuild 5859 BLAKE2B fe046363d60b08ca2569669f74a2cc71552086c84fa24df81a937970c5b3d4521720472686caf043e9aa860020ecfaa55e652caacf9d4e02cd8bd88256387055 SHA512 99315a5ba5fa12b4b059cb4787928e8ae02f04cc83c5064597b510da35386408c469af700dc3c99c43cbac4221e23a10501ddb62cb5b1b192a1062b816bd5d66
+EBUILD openjdk-8.322_p06.ebuild 5855 BLAKE2B 18c709101374aefadc63785c8930de08319deca6ea6ce7d54929dc269d571253bad6638317c1f33373678c3e58d39233e98d85b5610eb5bf2124d30314672c33 SHA512 ade8377a8efa05bb475cc251960cef4ebe7d068ab0e5f435fbede1530095490ae04f216346d759557635b8697f846d3ec03465853cf5aa9a397491e072ec7cf5
 MISC metadata.xml 1506 BLAKE2B d56098f4ba9acb9bd5891247f5165beea69a802ae4fe57f6c0e4b54875efd73d3dafaa78f5c182e640028e31840aa6b9d16bafade717a469b4a43ccbe37cbef6 SHA512 84aa8b3bef355e93fea678612e9512ca2ce5df77efbf4f055589ff67387f0571e43eb5308b8c575eb09bf52b68e5fcc68fdd819a6781080755c3f6c24d6eb77d
diff --git a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
index 9b1ca168a49f..b1990f6ea4f8 100644
--- a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
@@ -40,7 +40,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
 
diff --git a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
index 09fe2c1ba754..501c0e15b4d2 100644
--- a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
 
 # variable name format: <UPPERCASE_KEYWORD>_XPAK
 ARM64_XPAK="17.0.2_p8" # musl bootstrap install
@@ -31,7 +31,7 @@ SLOT="$(ver_cut 1)"
 DESCRIPTION="Open source implementation of the Java programming language"
 HOMEPAGE="https://openjdk.java.net"
 SRC_URI="
-	https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
+	https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
 		-> ${P}.tar.gz
 	!system-bootstrap? (
 		$(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
@@ -41,7 +41,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 IUSE="alsa big-endian cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
 
@@ -148,14 +148,14 @@ pkg_setup() {
 		fi
 	done
 
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
+	if has_version dev-java/openjdk:${SLOT}; then
 		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
 	elif use !system-bootstrap ; then
 		local xpakvar="${ARCH^^}_XPAK"
 		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
 	else
 		if [[ ${MERGE_TYPE} != "binary" ]]; then
-			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+			JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT})
 			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
 			JDK_HOME=${JDK_HOME#*/}
 			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
@@ -214,7 +214,7 @@ src_configure() {
 	)
 
 	if use javafx; then
-		local zip="${EPREFIX%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
+		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
 		if [[ -r ${zip} ]]; then
 			myconf+=( --with-import-modules="${zip}" )
 		else
@@ -249,7 +249,7 @@ src_compile() {
 
 src_install() {
 	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}${dest#/}"
+	local ddest="${ED}/${dest#/}"
 
 	cd "${S}"/build/*-release/images/jdk || die
 
@@ -277,7 +277,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
 
 	# must be done before running itself
 	java-vm_set-pax-markings "${ddest}"
diff --git a/dev-java/openjdk/openjdk-8.322_p06.ebuild b/dev-java/openjdk/openjdk-8.322_p06.ebuild
index 3d08d57546ea..5af7952e09b3 100644
--- a/dev-java/openjdk/openjdk-8.322_p06.ebuild
+++ b/dev-java/openjdk/openjdk-8.322_p06.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://openjdk.java.net"
 SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source"
 
 COMMON_DEPEND="
diff --git a/dev-java/osgi-compendium/Manifest b/dev-java/osgi-compendium/Manifest
index 37577ca094dd..b62ca8379727 100644
--- a/dev-java/osgi-compendium/Manifest
+++ b/dev-java/osgi-compendium/Manifest
@@ -1,3 +1,3 @@
 DIST osgi.cmpn-4.3.1.jar 741615 BLAKE2B 6f6058c07fd7744f0369d05cdf607b4d4fe51bbdf567c6a6c951413b0627eb1dbb6e56f65641a8472198d0aedca378da4715c26ebe05aa4e7ef80adb1020175f SHA512 803e929b4b7cfee13a3ffa2c60ad03775afd8409c972bf26e3f79abc590466c2d885bdc339d9af2a3e8fda9cdf082d23a298362ac37935b0ede0719dee27e9f9
-EBUILD osgi-compendium-4.3.1-r2.ebuild 872 BLAKE2B adcd9909d248dccb67615dab778134bd3ec6b6999edae6c20bc303818dd5b96d04216cb39b45a774a0a56c3321767bf54925d7739b3c95d65803e7ead505e5d3 SHA512 536371356cab02647e7cc8996423d690789c73f084bb25562d1b24594d9f075744686616cc4bbf1df83deaf1cb14f44ba70ec00f7159cd1cddee02a2585e0575
+EBUILD osgi-compendium-4.3.1-r2.ebuild 871 BLAKE2B 20f2cd1d7ce730734be4234a1d29cddc5c7c5b99e751d2ae385d13fc2490f48c94452f311b39c9c1610866a9787fc5b4cf918ddd10ffcdffa3f5aec14e0f2878 SHA512 fc9cb03f738d0d95a02a9635b172e4e9b95ed8c6cbb5cfe7f7be313ffd63c664d4863911324512c363acba0217bc8a912800f6262d898d842fb89754cbbccb56
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.ebuild b/dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.ebuild
index 63e95eae4bce..609e01017aa2 100644
--- a/dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.ebuild
+++ b/dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://osgi.org/download/r4v43/osgi.cmpn-${PV}.jar"
 
 LICENSE="Apache-2.0 OSGi-Specification-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CDEPEND="dev-java/glassfish-persistence:0
 	dev-java/osgi-core-api:0
diff --git a/dev-java/osgi-core-api/Manifest b/dev-java/osgi-core-api/Manifest
index b9a88acf7879..039b4834f020 100644
--- a/dev-java/osgi-core-api/Manifest
+++ b/dev-java/osgi-core-api/Manifest
@@ -1,3 +1,3 @@
 DIST osgi.core-5.0.0.jar 418232 BLAKE2B d7cfb8b2c6ff955ffc8252f248eb7bec562d16598e1a56fb50f12c099adae8b5268bc26003e166794eaee8fa6cb116ce388eb1981ef5a09394c05b7ea8655f0d SHA512 de7c5aa327a4361b81d953951488b84071e525cfd3e50f0334450b8c1b25733248de9459239ee7091f8961ac8b047a0492d692fb7cd408a0ec07df090ea9e2c3
-EBUILD osgi-core-api-5.0.0-r2.ebuild 642 BLAKE2B 4ba55f807511e19b9d2172ff3d52c7dbb1934c9c6e4536bbfeede846e2415b47f5480582890629f780291a9b2ea90471764c33724604caa945454f239b65245a SHA512 01630584faaf4709f3040bb43012bf909a83c01c915f2e8fcb3d8ee79536e5e5a59ce871b33984b09011882d09ceec114eda3539bed19a9e5b7702c30f911d17
+EBUILD osgi-core-api-5.0.0-r2.ebuild 641 BLAKE2B cffca2e2ca874159cf9446b4b2d2614435a27731f6c49fbaae3faadbe07b6a7982c95c369953e98690543c8a7acb1d99cdbc58870ce2d1d3deaf2cb743124fdd SHA512 e315a783580c253591d83253109390880fb469af2a2144e6445a0d2d99f1c4bb28a79282a67327e968a7621f1d87301b8054299b86a5a6db6d489a40ac12531a
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r2.ebuild b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r2.ebuild
index 687d31892300..36af959c037c 100644
--- a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r2.ebuild
+++ b/dev-java/osgi-core-api/osgi-core-api-5.0.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=8
@@ -14,7 +14,7 @@ SRC_URI="http://www.osgi.org/download/r5/osgi.core-${PV}.jar"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
 
 RDEPEND=">=virtual/jre-1.8:*"
 
diff --git a/dev-java/osgi-enterprise-api/Manifest b/dev-java/osgi-enterprise-api/Manifest
index 051d7e92702d..37edb0880681 100644
--- a/dev-java/osgi-enterprise-api/Manifest
+++ b/dev-java/osgi-enterprise-api/Manifest
@@ -1,3 +1,3 @@
 DIST osgi.enterprise-5.0.0.jar 479506 BLAKE2B 2bd53b50e469388d132a6d3ebd78d4040093f8c1d79299fd87412853d959f7559f04287567eeea47635fe287a3e9d3812ac9303a5d39ec35135ab3c58bd0b010 SHA512 0404c05afd8cb3ef8b826b0f08deeb03b0027ca99e091953d39ef69674809c5b899e0f2c8efb685df5fce070c2aafcf813e470fbb538d4ec3b480a8060351144
-EBUILD osgi-enterprise-api-5.0.0-r1.ebuild 814 BLAKE2B ade66d78374c79bcbd01781d46b72b4eef258ad0430a3b0a28b2f31858e25e24a192e678d0e648aa730618a5f85b71fc1f3a98fc075f2ebdd6fe274daca24330 SHA512 a51d571a1029e805b3cbab7b4772697daec48a87c917b37bad7747463b194855688045e419bd6c88f2f11d8735ad31d7fa11c178e7c68fee2e68be7307d3939e
+EBUILD osgi-enterprise-api-5.0.0-r1.ebuild 813 BLAKE2B 1f31874e149fb8d148db2d4b6a2e6f3aa1e9b3d5f549d84df308962780cfd77dd9b3cbeb595858d25cba85c77898487c815940bfa2fa21b85ced0dddd758f880 SHA512 b35779fc555b4e7be83fa8bb8e17880350f33fd9a6e06d27fc1af6e6fb07a6e00b05deddbb203496aff6febe23a9fd51308de1b1d33c17ba19ce311286ac04b1
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild
index 9bfed594de55..7de7a8540382 100644
--- a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild
+++ b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://docs.osgi.org/download/r5/osgi.enterprise-${PV}.jar"
 
 LICENSE="Apache-2.0 OSGi-Specification-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 RESTRICT="bindist"
 
diff --git a/dev-java/osgi-foundation/Manifest b/dev-java/osgi-foundation/Manifest
index 006d90a7b4d3..0be11e1fdd0f 100644
--- a/dev-java/osgi-foundation/Manifest
+++ b/dev-java/osgi-foundation/Manifest
@@ -1,4 +1,4 @@
 AUX osgi-foundation-1.2.0-build.xml 9886 BLAKE2B aacff8e000b02c742ee7e5d03d2c057b6baf56bce9cc1b9cd0031c39550e9ef07bcf85a7d89dd265cc523d638063e425b1553f146b5ce6af107440b1e0d61d43 SHA512 5f106bd612a65033e35beb4fb635d07199e10b69e692db5949424ecf7a8baf2bd6af0f35898bd465334356333d82d5c4941ef6ce7ce16c3939f425f4e58c6fcc
 DIST osgi-foundation-1.2.0.tar.xz 45176 BLAKE2B 4b5432dfaad9134f402b5f448a8d7ba5f626a7b160bbc953914352a28f745725da851b6c5f2122f820b52f2fd8ad463c2df5c8ae3e2b46ef8bb9d56d89d90f1b SHA512 6523dd6b4cd8205aa3359fae4640ff6b17a1944aec6bf23acf0d6e4eb33839a9b9049e8df0c55a4f35013b40b1df2391a53ed68df682a317c35dca504e9b996b
-EBUILD osgi-foundation-1.2.0-r2.ebuild 659 BLAKE2B e5b83bbe67320a8b1dddb67e29f781044f8be21c518c7a5e6609d3f2730d7e91f1d706528c414eb2be206a95e48358cb10f6b56bb33c3269dbcacbdceefcf939 SHA512 4c5ff5adeaafcb26b28da354278be9af19d88e9d93c084acdc2b2afffa6f8f73db4219d1133c061e341813414d9d2e617ff6b783db27597a4c1a11178f5d943c
+EBUILD osgi-foundation-1.2.0-r2.ebuild 658 BLAKE2B 9602a7a08c48b83e91ab142961e475969e5e7266f15689773937762e28e9db5e7194d0c6e446d031876f0f126c96da2c9f9213c981be2176eaa5c1c07847bda2 SHA512 aad271450c88225d522a840b1fcd051f920f28cb1707562d85470bd31fc83d9ab3d9807f72774d476195ca56b4be4836f4577dab98b414a1a3144ccfa03b89a7
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild b/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild
index 455bcca5e202..7adbb2f51fdd 100644
--- a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild
+++ b/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
 
 LICENSE="Apache-2.0 OSGi-Specification-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/osgi-obr/Manifest b/dev-java/osgi-obr/Manifest
deleted file mode 100644
index 729c9c0e4747..000000000000
--- a/dev-java/osgi-obr/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX osgi-obr-1.0.2-build.xml 10866 BLAKE2B 4ed0fc6154cb2bee42f3c4cc51168d0d08cbdaff440149c15bb113041adac10a1f9fba682e0922c06977a135f90ba40412237cb3f9b28be2f5765372ad6c5ea7 SHA512 4c9fb92e0f5f36dbf02d749b74f58fb15a9ab5617ba84eed3b0a80941e874bdf6b391b7ddf44cbcf62d8cbd9b5b22655db0795e2cf3c9167e9cc15f668417ebd
-DIST org.osgi.service.obr-1.0.2-project.tar.gz 7939 BLAKE2B 6499f12ab5a63bd8f178d4a6be0d9ca8a75ef0a843b73962b3e71bdfaed77edef2f307ce80fba418580ae0a6c507f97103cf8acb292e79c301422cd7134b8fec SHA512 2af278c6309f8e2fd64c86c5e28a32935ee88e43489b2ca89be94bd2b996acbfcbf93a439f4e3c5f61d5d98df8d0897485982cd749f57d80574a3eb1fbb8ad21
-EBUILD osgi-obr-1.0.2.ebuild 768 BLAKE2B 857fe3a85d9ad3396548983afcc35c2ac2008629c3aa3c20b79f995fa2372d545f230e93131669c5ae3f284b6287a0db9d6d3183c4713be03dac2e211f35758b SHA512 a42ef99f5e739569270a6ad5a4d767517fae926c29e1e62cb81945a4489cd516c5ad749123bff010e13055635cd7bd2785b795396611a2b423d620dce99306f1
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/osgi-obr/files/osgi-obr-1.0.2-build.xml b/dev-java/osgi-obr/files/osgi-obr-1.0.2-build.xml
deleted file mode 100644
index 4b933209494d..000000000000
--- a/dev-java/osgi-obr/files/osgi-obr-1.0.2-build.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 5/13/13 7:05 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="org.osgi.service.obr-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="org.osgi.service.obr-1.0.2"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.resourceDir.1" value="."/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/apache/felix/org.osgi.core/1.0.1/org.osgi.core-1.0.1.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/apache/felix/org.osgi.core/1.0.1/org.osgi.core-1.0.1.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"/>
-    <pathelement location="${maven.repo.local}/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.3" 
-           verbose="false" 
-           fork="false" 
-           source="1.3">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}"/>
-    </copy>
-    <mkdir dir="${maven.build.outputDir}/META-INF"/>
-    <copy todir="${maven.build.outputDir}/META-INF">
-      <fileset dir="${maven.build.resourceDir.1}">
-        <include name="LICENSE*"/>
-        <include name="NOTICE*"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases"/>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/org/apache/felix/org.osgi.core/1.0.1"/>
-    <get src="http://people.apache.org/repo/m2-snapshot-repository/org/apache/felix/org.osgi.core/1.0.1/org.osgi.core-1.0.1.jar" 
-         dest="${maven.repo.local}/org/apache/felix/org.osgi.core/1.0.1/org.osgi.core-1.0.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/apache/felix/org.osgi.core/1.0.1/org.osgi.core-1.0.1.jar" 
-         dest="${maven.repo.local}/org/apache/felix/org.osgi.core/1.0.1/org.osgi.core-1.0.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/3.8.1"/>
-    <get src="http://people.apache.org/repo/m2-snapshot-repository/junit/junit/3.8.1/junit-3.8.1.jar" 
-         dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar" 
-         dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/easymock/easymock/1.2_Java1.3"/>
-    <get src="http://people.apache.org/repo/m2-snapshot-repository/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar" 
-         dest="${maven.repo.local}/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar" 
-         dest="${maven.repo.local}/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/osgi-obr/metadata.xml b/dev-java/osgi-obr/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/osgi-obr/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/osgi-obr/osgi-obr-1.0.2.ebuild b/dev-java/osgi-obr/osgi-obr-1.0.2.ebuild
deleted file mode 100644
index 4397353a0207..000000000000
--- a/dev-java/osgi-obr/osgi-obr-1.0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="org.osgi.service.obr"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="OSGi Service OBR by Apache"
-HOMEPAGE="http://felix.apache.org"
-SRC_URI="mirror://apache/dist/felix/${MY_P}-project.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-CDEPEND="dev-java/osgi-core-api:0"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="osgi-core-api"
-
-src_install() {
-	java-pkg_newjar target/${MY_P}.jar
-}
diff --git a/dev-java/picocli/Manifest b/dev-java/picocli/Manifest
index 3707e20851ee..a2f473984ea2 100644
--- a/dev-java/picocli/Manifest
+++ b/dev-java/picocli/Manifest
@@ -1,3 +1,3 @@
-DIST picocli-4.6.2-sources.tar.gz 13488726 BLAKE2B dbec032bd0f40a45172e7c72884c32c9f769a9df0bdacc1904f3d45f4b02d1a3cc7c541a2ae4ca8a6754d67b5351412e4d91f2dc6fbbb3fc37bc4e2776ccdd68 SHA512 83ae37666a3c703b186cdb920095ad46de46de9a092841c352ec7db33877fa102afbd24227a1f73cad8be8a75b800f5c1487a8720d7080bdc8aa20dd8acafbe4
-EBUILD picocli-4.6.2.ebuild 1208 BLAKE2B 2dc89bbe4c5eaf514d1d4bc7a955824a7f232bf56811a272a4932c38cc4b2009dbd8fbbaf97d9ec805077f2d811936bcefe42d59756ed889f59e1cbe29f14e90 SHA512 3d80b53b77b67f78afe9366a8b383c16df58b2e3b2d403b6ad7c6b53471a23c119dc394ce1b42fc81322b666e4af0a45abf6adde8ee54628f1103e543145d04e
+DIST picocli-4.6.3-sources.tar.gz 56087383 BLAKE2B ce9aaada241358fd570332696b1ac529a9a1e300911aaf2e1f927a94a44a3e38cae96df3d99a7a7e287fb48d429097624004b4ddd792ba564cc9c67ec975d9e0 SHA512 34b8388c6cf268799f06d465aa06e8d5c39c2673806cdfa1b346dac4aaf32ae5b033ae975333b7401bb79c77c4e34b9b932f8699344d6cc00f35a00c1b7bc504
+EBUILD picocli-4.6.3-r1.ebuild 1289 BLAKE2B 03b722e6310baade57f76d0e9d327503847865010414ca72a21997f540fc11b4bff85940d1f3f20be24cd7d67d99d3e8063feefba2e99ab1eae56f37750d3410 SHA512 ddc48dea62cef2c708497fac3d9d60ebd8d258981d36cefbaff5f4e31aaddc10b0870a0d6ec532d1acad86d3265b42f62d5b9fb0673b921db8c225de2c23c2ca
 MISC metadata.xml 701 BLAKE2B 67e85243551f69c831b4a91807a5dc0661da92e2e7c21fcb8fc9936dd047defa9382d659b7910d5929e193a0a97397c1bf7f8a4d20c86ce46185f5fec4ec15c7 SHA512 6c6056c3e204886ccdc9c6ca28911cf6a5e3cf64e1830fc5c3acca736d28f4c050dba5d1a4ae4bab6c3ae48ae3e34d6b3187d695b2275d20bfb2722bfea753a6
diff --git a/dev-java/picocli/picocli-4.6.2.ebuild b/dev-java/picocli/picocli-4.6.3-r1.ebuild
index 779e7aef18b7..98e5a9c62a30 100644
--- a/dev-java/picocli/picocli-4.6.2.ebuild
+++ b/dev-java/picocli/picocli-4.6.3-r1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/remkop/picocli/archive/refs/tags/v4.6.2.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild picocli-4.6.2.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/remkop/picocli/archive/refs/tags/v4.6.3.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild picocli-4.6.3.ebuild
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="info.picocli:picocli:4.6.2"
+MAVEN_ID="info.picocli:picocli:4.6.3"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Java command line parser with both an annotations API and a programmatic API"
-HOMEPAGE="http://picocli.info"
-SRC_URI="https://github.com/remkop/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}-sources.tar.gz"
+HOMEPAGE="https://picocli.info"
+SRC_URI="https://github.com/remkop/${PN}/archive/v${PV}.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ppc64 x86"
@@ -42,3 +42,8 @@ JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_RESOURCE_DIRS=(
 	"src/test/resources"
 )
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/plexus-classworlds/Manifest b/dev-java/plexus-classworlds/Manifest
index 0d20e28975e0..9adc8fd75004 100644
--- a/dev-java/plexus-classworlds/Manifest
+++ b/dev-java/plexus-classworlds/Manifest
@@ -1,4 +1,4 @@
 AUX 2.2.3-build.xml 5712 BLAKE2B 334710114da891baa655f4cf6811967af323fb957a97259f13326d3ce16b30d3b13c7cc9a05b26a275eb95d6e220a4b409d66332469699a1e2d063a50905f652 SHA512 575a086222b4cb9728b36c7a8d9eb64e73438023a0a83b94549962d88aea9591fb847c7d866a830e991bff296d66bf9ebd79c5a93922f040c9d5ce432fbc78cc
 DIST plexus-classworlds-2.2.3.tar.bz2 41744 BLAKE2B 41ddc64c066bdfb5f2398773790b9fec213070d3dad5e57f7b0643f4347386d5304c435cd60e5b1fad32f2d7fae7b48a2afd0189d115018ed5ee38901c80867a SHA512 d5f3d3dac4df569b91ddea9265b14a2459b0ecd4ac3e4547cbac341f50d18238071a7a560d9771a9f8724c59225ea7fa8645ed72c5a00a684519a46a024c3c61
-EBUILD plexus-classworlds-2.2.3.ebuild 878 BLAKE2B 204ef74a626df9e44bd69be8bae3521f7dd2d7e18b28ca397080c9f2e48f476cce61b8a3c7221b25bb71d9044dc33c7e15fd2c99dfbd87840b11574b7ce076fc SHA512 a220019da40d4af5dd732416c4c1dc9a44d842d24b1dfca66702082e58d4416e5eb5054f353219e89aab6b1257c031e22121c6eb490c88cead6a3efa328872da
+EBUILD plexus-classworlds-2.2.3.ebuild 874 BLAKE2B e2d6bd5df46866827f8362d489c836d243994b7b683d63e20bf09132cb37eafb29ca2f818556a3c50d3e9590764272b220e636084e9d46b72da83eadfcb91522 SHA512 fb82fe513c366c2f9805f0eb87da143b23bdb3f767ce4e314cf9ca400124cc11b79eed673e171cc46325d908f8304e4278dfe0d562047b758d7a8f10eac4de93
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
index bb3af0835423..31491d6dd752 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
 LICENSE="codehaus-classworlds"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 0e53901b03d4..703d4682239a 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,16 +1,6 @@
-DIST protobuf-3.17.0.tar.gz 5185780 BLAKE2B a168619df72cdf097c7ddfd50aca96a2101bf73e7c1c842c020e6ee08a853db8674a86ca999b7706da3dd21d4d3d2159241c93232efc693701962f3a54a382e9 SHA512 36ed2de641849ce01531ff1207f62a0748f811519c40622a119a17a1e709864382de81481fb58f374a025948971c48416e7e6de9c00512a78633c7a8a3aa3a36
-DIST protobuf-3.17.1.tar.gz 5192666 BLAKE2B 7f912db7e0835aaa42628fcf564a5666e2cbfa021bb35638a5eec53c3c457f1e747225dea54f732b7239a1520febca9bc20c824b1938f100796caa3ac2133bc1 SHA512 5a18aa3c1dab040dc6d22310a8503241081106acf7ca89079d7b416533d7c2cdd47719dc9023e6bc26969f0f1c796550260a04034a403c69752f6a3a7a651bb8
-DIST protobuf-3.17.2.tar.gz 5192779 BLAKE2B 97f9561848e70b8d26ebcc7fc4fa8da51c4b8267efbe1d2d386c2785308e7ba7edc05f1b3863c274dc8838866d58b58509606d72c51a22b956d1d528584c4c95 SHA512 b3e7ad50ed772668df70a3a20ad1af13a5e82f23b109e4fecd34e6a74947bed300963c9f084907fbfafe28fc18365cde7df1975e2ff9538d2f5a3d2b458bca98
 DIST protobuf-3.17.3.tar.gz 5235236 BLAKE2B 2495e678c8f9436d4e5a30ccee8b6226125d418ac7ecf7df20b078a1a16c221cbccab7d846dcd56a90220c106617fa75c410a21b62612fedec378cd7e8571350 SHA512 b4030b4474cc5fb5a62501200725dd488e6e66e3ced4ed12ab4ee029fcfed305e92ec966adafbdd343afffd186908163849422b95eaa500e7e741ac325d01d12
-DIST protobuf-3.18.2.tar.gz 5272935 BLAKE2B f65caa4483d3ff4186f9ea388e2a9ef232ab758cfda846cfb5993df1f991e4574e63a33b175dd00c72f61c0a23ed12d3c62eb658cd397bf43b805c41fb34c47e SHA512 8ca613fdeefcbd93e866fab65effc38aa8508060aa3de0109dbead68f2e27eb22ad0a8aea10c8b4c3e9de181d62185c93b369fb5abf96de02a170f2e5c27e0cd
-DIST protobuf-3.19.1.tar.gz 5291573 BLAKE2B a34f1a7cf99ecb6cb8a26bc858de6273bfd26aa9be1e89e48c16cb5df0f1e9576479344c8250017238dbac0d0c4ac33001125b5fc622cb64ed6b91023198b03a SHA512 f1271f5159a7be363a5f60ce4921dfea68a8468d66808330bacaeaa1cb7f652d045ab080b5d82816a6fd4e6d7d7fe79aaa6c8d66d81692721d36ce3bbf619f31
 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
-EBUILD protobuf-java-3.17.0.ebuild 1454 BLAKE2B 8677e5ec0fdc53308a9a219ba1ffd719112e46075f6c376a1d88c542039559173bd9a7b7e386021a78e3ea0c41a66af2effb263d8cb6ff11a4da851a2d7d5dd1 SHA512 125deb6bfb83d79ae3f6169c92ab9d17ea0c4c5f47123024e418811a1460c2c8e96e872c340c19b43991d9b566c5fac5a422278e15944b14cf5a7a6e73610575
-EBUILD protobuf-java-3.17.1.ebuild 1454 BLAKE2B 8677e5ec0fdc53308a9a219ba1ffd719112e46075f6c376a1d88c542039559173bd9a7b7e386021a78e3ea0c41a66af2effb263d8cb6ff11a4da851a2d7d5dd1 SHA512 125deb6bfb83d79ae3f6169c92ab9d17ea0c4c5f47123024e418811a1460c2c8e96e872c340c19b43991d9b566c5fac5a422278e15944b14cf5a7a6e73610575
-EBUILD protobuf-java-3.17.2.ebuild 1454 BLAKE2B 8677e5ec0fdc53308a9a219ba1ffd719112e46075f6c376a1d88c542039559173bd9a7b7e386021a78e3ea0c41a66af2effb263d8cb6ff11a4da851a2d7d5dd1 SHA512 125deb6bfb83d79ae3f6169c92ab9d17ea0c4c5f47123024e418811a1460c2c8e96e872c340c19b43991d9b566c5fac5a422278e15944b14cf5a7a6e73610575
 EBUILD protobuf-java-3.17.3.ebuild 1451 BLAKE2B 4d08dcb9be366902af79f53bf8cb388ed2fd61192406ccca8089147f3854cef4e9d6824482dc2f35209cfe305e1ac69d1be790eeac87365aefd550c0a9d215ea SHA512 6804911a2b3167a7eb0889b4f7da071c97ec2b7aca9adb613679905f6ae3abb391caefbf3737a5ec30e7aef4ecd9a817df05b7ac16d95f893d4b6cce853cb89c
-EBUILD protobuf-java-3.18.2.ebuild 1454 BLAKE2B f11c30a01fb119f81be90639d0fb2667aaff9753c6559a60430205d5bbaacbac18d6ab3de7d6ce64f0634830c487923ba0a3dc1e5a76c9129325014245713228 SHA512 dcc86b5660d7d27fdefe40cdc1889fad5ea5a29adab114638e1afe9f976df27a3fc43775056fbcc937f93b4d898d367c6b63fc0b01f683c5fc1c50e56e3c7fd0
-EBUILD protobuf-java-3.19.1.ebuild 1447 BLAKE2B 2988457aac2d90f55d39efbb976cc7af1d26277f9b810d06786d16660d4eb2412640fdcf595230eab986e35f372c6a559c13db4bb8cf2851cbaab7dd306446f9 SHA512 cebc604c66d76148bf206b3003fa99404a8116a62dad57aeee2fab451897238d75a3e3c47f127216a813af3a8e2e64785c41c437da0a3e342bac0c65361ec9de
 EBUILD protobuf-java-3.19.3.ebuild 1454 BLAKE2B 493b90da2ef5874252e9876e6a8e760b5cef2f672bafbb0789b08b0fdfd7950e00ef78d744a3e85e673b46dff08b924761f4273cfad2519c9529e5c1febc279d SHA512 c8f40fba3ff4333dd4316f59fec5e1165bfabdff0e9d19ff4d79f1995c6bb2c4f0601a4e028f09237dd7e5574aec27177802dd2353ceb81454b2b7ec621cbba4
 EBUILD protobuf-java-9999.ebuild 1389 BLAKE2B e7a8e41fade60ff00e35c2cb29c185d68b2b5d41d99611f07eda97968c3b2f0d3e956304ae739a82cd386101dbd9936431483019b7bc38aad35d392674aa2bf4 SHA512 c0f3964bdde178cdf734318c9c5c42d5332401c276fa9513ec42e7729e8105b8129f89a53704f3b0622d831f96068501a131d47636aa95504a6d46df2e093f20
 MISC metadata.xml 548 BLAKE2B 2468487e12d536d67daebf5b7a21cd63a9c4af321a8979132e63d9b8394bf577e347f891326c73bfa6907e82ca355ea0d4ec40a37bb297db0da1e55a62b6ef33 SHA512 c0c2556fbf8821f3a75ed344daa59b4fc355029f96efb8f9784f54c819916adeb46b2c5d8c2e8d405dc58395c2f18b30cda69c6d406948a066bd1d78a55df80b
diff --git a/dev-java/protobuf-java/protobuf-java-3.17.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.17.0.ebuild
deleted file mode 100644
index d24b960991a9..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.17.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/28"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-src_prepare() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply_user
-	popd > /dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.17.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.17.1.ebuild
deleted file mode 100644
index d24b960991a9..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.17.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/28"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-src_prepare() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply_user
-	popd > /dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.17.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.17.2.ebuild
deleted file mode 100644
index d24b960991a9..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.17.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/28"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-src_prepare() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply_user
-	popd > /dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.18.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.18.2.ebuild
deleted file mode 100644
index 639718e1e00d..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.18.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2008-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/29"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-src_prepare() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply_user
-	popd > /dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.19.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.19.1.ebuild
deleted file mode 100644
index 6ae6dca3c0b1..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.19.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-S="${WORKDIR}/protobuf-${PV}/java"
-
-LICENSE="BSD"
-SLOT="0/30"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.8:*
-"
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-src_prepare() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply_user
-	popd > /dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
-}
diff --git a/dev-java/randomized-runner/Manifest b/dev-java/randomized-runner/Manifest
index f99e9f41e808..285a991f80de 100644
--- a/dev-java/randomized-runner/Manifest
+++ b/dev-java/randomized-runner/Manifest
@@ -1,3 +1,3 @@
 DIST randomized-runner-2.7.8.tar.gz 1501825 BLAKE2B e375d4509d8be914829c4ebfad5584e16f8f03be480ed21b52a0ad3db363b7f2761ae6442bb9baa8c929bc182c422963a6e8480165f53b7b820f9f4e2954a243 SHA512 5627f14dc70a6341838ad1ade0fa0f152ec6a5a7f3da4bc31e0ff040ea2c62aeafd669460f61f37db31de379db857ce3d58f0deed22d1cf714f1461988a92cdc
-EBUILD randomized-runner-2.7.8.ebuild 1490 BLAKE2B b6e71993ef66146482b7df67dfb2ee34b5202ef5e611514e09431d160485fc13739b5a0ae098bea68138a830f4d39648b144763780603cc66d99b875f4d04fca SHA512 e4101cdd2a6302e12fe595a697bb90dd8bbe3bb3fbd584e8fcdf79b416517261ba96e42e6bb1ddbd66514c952c26a2b76a657e0c754047a8ba4e15ab42b89552
+EBUILD randomized-runner-2.7.8.ebuild 1487 BLAKE2B 09ab6b7da23ca31d7c79da86baab005ef485821e2ba7bedee6a26444a8c0dca6673c74fd4793d8488b1072ad9e849acef16224b5a476cf0ff80fe42f9c28f6a1 SHA512 0c7964b579de9109c7527277e3d0154293e49dd2e6a4ca615d102771ce2f3fca16fd760f209021e2843f9e9055070fe704d49ab40a31d0935406ab844f72eb74
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild b/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
index ee0b27a1d2c6..acbb09778fb2 100644
--- a/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
+++ b/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/randomizedtesting/randomizedtesting/archive/refs/tag
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/reflections/Manifest b/dev-java/reflections/Manifest
index ce76e953b1d8..77f5abe89f13 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 723 BLAKE2B df08df148a9e1cac1453e06613cc2889df1caecbec01d98a779ec328a8898509527ef638613a0fa63b0f5fefe9bda7e121f03d9d3ba032177adeba3b5530f54e SHA512 4a8aa2bd801760a394822127b5b2eb30b9d544de358d65cbe1f16ba2806402212f03b9a89610ce32af50604cfbc782200bc485259c61485a7f195c1e009712f5
+EBUILD reflections-0.9.10-r1.ebuild 722 BLAKE2B 538624b2713ad75cb8ef54786e492e78eb41e422fc3c8152c58c2e179f09131801ceee214848d45a74f750c5ae57c26e98fb9de6b2b47c8c0fbefadb3ca06744 SHA512 a950aaf4c57532746fac766c12f897028d0486227e3effe5a79db71c53a283693df5ab80095a5e60d76ae11a3363357147246586594c91b9c32c8307a8933df3
 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 98a87c203fcc..e51003333934 100644
--- a/dev-java/reflections/reflections-0.9.10-r1.ebuild
+++ b/dev-java/reflections/reflections-0.9.10-r1.ebuild
@@ -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 ~arm ~arm64 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 d017f921c657..59dedf17e9b7 100644
--- a/dev-java/rhino/Manifest
+++ b/dev-java/rhino/Manifest
@@ -1,4 +1,6 @@
 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
+DIST rhino-1.7.14.tar.gz 4694660 BLAKE2B d6ba958265c4ebf881161d0b61f598ac7e82d7be4e6b0fbd6416e7b0af7835058a2744ab5524b6ff698159898e962cc246ac559e9c5db1b4467b147700e894e0 SHA512 f20e8a8f7c78c88d815c53f89f3f18a53c2e86d92a284cd275aa5556c08962d2905f2d4fc829e5cb61d416cd55b13323d9a110f4f492f588a149b4d2105b21a1
+EBUILD rhino-1.7.14.ebuild 3855 BLAKE2B b34e54b7d85d159708dd29b5513d8d7b4a9b58d8f8c502b6af0f253aeb58ac7ad330f1199e296bf623fef166016a18f5d96f0a3498c106b5d1ffc36574c8d48c SHA512 984461442e826f09f68ec799989679818af3ec5a703c2e6b972b4e577be59d25184df0e6b12bca372c45c395cf88dacb8f8e65c9331332b7ee30e2cd4b3c7d8d
 EBUILD rhino-1.7.7-r1.ebuild 2084 BLAKE2B e943aa034cf71150da32db6af5301d5a094564715a3e2ae660e91abb50563e47eac6b5d9003a03e7bf8cd37c3184409f7cd005772a2131aea6cdbe3d88ad3a5c SHA512 c04269f891908b81b38da033eb111941cc6248ff3308ceb3d75c5d6f3a36eebe42547cb0df8fc5fa014ade8277e713b262f8bcfbce6c24fdfd898470f19b120d
-MISC metadata.xml 510 BLAKE2B 9b51ffca1a744e3a725e3966e25e60744e50fac1dfad6099ee24c4c1a671b986c777979ee9307e928a2adb132e6e8ab21dae8e358d160b93286d6827a209f76a SHA512 612798c48a62f7bbfe40219643d9ddcf0658384b50f0fc8bc511c054870c81a94e60636a533b647c89e5233dc900e0f8899b17d0e831f89423909073cb7e0c0e
+MISC metadata.xml 658 BLAKE2B 95a465da3522f815ddd5576c81bb54e9d8ce55da3ec055cd80568fd919227360a10d86e2134db02a4d5bb669a8f3c34c05f0bb879924a008ccaf7ebd2ccdf3ad SHA512 477809635ecc04713f8d9d5f00d17b298597555a30cc9d6aacd6353ae17c98de41d0f83596a004dc96859799948e9ca813a9825577c2869bc6279ccabf20ba51
diff --git a/dev-java/rhino/metadata.xml b/dev-java/rhino/metadata.xml
index 603129d072cc..8ba5d74b80e6 100644
--- a/dev-java/rhino/metadata.xml
+++ b/dev-java/rhino/metadata.xml
@@ -12,5 +12,7 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">mozilla/rhino</remote-id>
+		<changelog>https://github.com/mozilla/rhino/blob/master/RELEASE-NOTES.md</changelog>
+		<bugs-to>https://github.com/mozilla/rhino/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/rhino/rhino-1.7.14.ebuild b/dev-java/rhino/rhino-1.7.14.ebuild
new file mode 100644
index 000000000000..f73aed7eae8d
--- /dev/null
+++ b/dev-java/rhino/rhino-1.7.14.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.mozilla:rhino:1.7.14"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An open-source implementation of JavaScript written in Java"
+HOMEPAGE="https://github.com/mozilla/rhino"
+SRC_URI="https://github.com/mozilla/rhino/archive/Rhino${PV//./_}_Release.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-1.1 GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+SLOT="1.6"
+
+# There are too many test failures:
+# FAILURES!!!
+# Tests run: 10504,  Failures: 613
+# With openjdk-11 tests even fail to compile:
+# ./testsrc/tests/src/com/netscape/javascript/qa/liveconnect/LiveConnectTest.java:104: error: cannot find symbol
+#         global  = JSObject.getWindow( this );
+#                           ^
+#   symbol:   method getWindow(LiveConnectTest)
+#   location: class JSObject
+RESTRICT="test"
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? (
+		dev-java/ant-junit:0
+		dev-java/emma:0
+		dev-java/jakarta-xml-soap-api:1
+		dev-java/jmh-core:0
+		dev-java/hamcrest-core:1.3
+		dev-java/snakeyaml:0
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CDEPEND}"
+
+DOCS=( {CODE_OF_CONDUCT,README,RELEASE-NOTES,RELEASE-STEPS}.md {NOTICE-tools,NOTICE}.txt )
+
+S="${WORKDIR}/rhino-Rhino${PV//./_}_Release"
+
+JAVA_SRC_DIR=( "src" "toolsrc" "xmlimplsrc" )
+JAVA_RESOURCE_DIRS="res"
+JAVA_MAIN_CLASS="org.mozilla.javascript.tools.shell.Main"
+
+JAVA_TEST_GENTOO_CLASSPATH="ant-junit,emma,hamcrest-core-1.3,jakarta-xml-soap-api-1,jmh-core,junit-4,snakeyaml"
+JAVA_TEST_SRC_DIRS="testsrc"
+JAVA_TEST_RESOURCE_DIRS="testres"
+
+# https://github.com/mozilla/rhino/blob/Rhino1_7_14_Release/build.gradle#L81-L87
+JAVA_TEST_EXTRA_ARGS=(
+	-Djava.awt.headless=true
+	-Dmozilla.js.tests=testsrc/tests
+	-Dmozilla.js.tests.timeout=60000
+	-Duser.language=en
+	-Duser.country=US
+	-Duser.timezone=America/Los_Angeles
+	-Dfile.encoding=UTF-8
+)
+
+src_prepare() {
+	default
+	java-pkg_clean
+
+	mkdir -p res/org/mozilla/javascript/tools/{resources,debugger} || die
+
+	cp -r "src/org" "res" || die
+	find "res" -type f -name '*.java' -exec rm -rf {} + || die
+
+	cp {toolsrc,res}/org/mozilla/javascript/tools/resources/Messages.properties || die
+	cp {toolsrc,res}/org/mozilla/javascript/tools/debugger/test.js || die
+
+	mv {src,testsrc}/org/mozilla/javascript/engine || die
+	cp -r "testsrc" "testres" || die
+	find "testres" -type f -name '*.java' -exec rm -rf {} + || die
+
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/LiveConnectDrv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/LiveConnectEnv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/LiveNavDrv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/LiveNavEnv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/MacRefEnv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/NavDrv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/NavEnv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/ObservedTask.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/RefDrv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/RefEnv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/RhinoDrv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/RhinoEnv.java || die
+}
+
+src_test() {
+	# https://github.com/mozilla/rhino/blob/Rhino1_7_14_Release/build.gradle#L71-L77
+	rm -r testsrc/benchmarks || die
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -gt "1.8" ; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.desktop/javax.swing.table=ALL-UNNAMED )
+	fi
+
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/rome/Manifest b/dev-java/rome/Manifest
index fc6ac4759740..851bfefe5037 100644
--- a/dev-java/rome/Manifest
+++ b/dev-java/rome/Manifest
@@ -1,4 +1,5 @@
 AUX rome-0.9-build.xml-test-upstream.patch 527 BLAKE2B 5c5d4f057298071912472b4a7bdfd7a8a184a78bc45bdb75e892497dd297771ff4a633f0ff9904545fdb12d43f1c0364fa55598670ea8d56e06cd1863b53c36c SHA512 bdbe4232e443228cb64be2f108ec021a9e8654e28c1c9a50f2bf453cb62d090cbfa47df1a0df14e01780c8b8c460331b45a4a974e121ac3d4ee93b82beca0781
 DIST rome-0.9.zip 248755 BLAKE2B dcd19b49a9c5aa9849f5807508e4d10c7effaa9ec9247ffd5039cda7a08afb525a095ac7bbb72d0443566d08a0ebf75919b3dae018aba8957a94c4389d7df82d SHA512 d4bc9945e2b77bdc38eca609ec353379c279cd700d8d85220a1723d1b019da2c18bd93ff98b062e519e7d87f2d2b6853f373fc7178cec0f83b34af45fce5f3ff
 EBUILD rome-0.9-r3.ebuild 953 BLAKE2B 39bf7d53a8e6b5a2182e978a52e8c8e4df74748a5074881a7c19d3dd657f921ee000a596afe5997bdaf62deeb8fe45e28636a4a7f9187087223c8ddfd6bd498d SHA512 3ce722cac645508e768c9c6788d26ee8032e6b5710fd0bd363bbc4d45dfe67614e7dd86171b2fe03596dbfc2bc6896b24ea948997be0c651e053d7cd7a15587b
-MISC metadata.xml 215 BLAKE2B 869610e21e1baac019fc79b7072721c201f4e3f0c6a65712d93e69131505f6ee0aab3ed48890073238645280b22edf2078b56dd4ba7edb593952f9ee2b2ff1e0 SHA512 aa3da8e5bf0b257d555c610b3dee82560e6fce192024e99eb63932511f25aceb24e3541f01c495771f3f54c299286c35672c8658cd5e577d6ae5927486a125a2
+EBUILD rome-0.9-r4.ebuild 1191 BLAKE2B e8c53b8d1bbe024ac9fb4c8576669a78a6cfcf417b44cb124a71902842ce931a7660045c72a02ffb03e0f765e9b4df17376db7b41a5f862e6dc436c834c7dc5d SHA512 0f6124d5f02b252d6d195198f3579623f98c9cb9cd85a6ad522e3a0e73444cbad4824a17c2c36cf3a5d49e6fcf636a4c4a5e9aab8fed6a761128d31314d55aec
+MISC metadata.xml 296 BLAKE2B 01dcba6c8b28c78d2e690f04b22002ffe6585a213667574be6168d84734ce2210993dafde1b93f464590273dfe72218f3d61bd8f0748ba15617228ca43d713d2 SHA512 0e447adc03a21da5afb4a929a8341c99a01b553517012035dd1f0b2dedff583d2ae1746d59a38417d16979bd3ad9ee627c65e9954bbf36bf0ab838daddb3bb47
diff --git a/dev-java/rome/metadata.xml b/dev-java/rome/metadata.xml
index 851b900d2361..2b16361c3e20 100644
--- a/dev-java/rome/metadata.xml
+++ b/dev-java/rome/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rometools/rome</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/rome/rome-0.9-r4.ebuild b/dev-java/rome/rome-0.9-r4.ebuild
new file mode 100644
index 000000000000..c92d79f20e09
--- /dev/null
+++ b/dev-java/rome/rome-0.9-r4.ebuild
@@ -0,0 +1,53 @@
+# 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"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java framework for RSS and Atom feeds"
+HOMEPAGE="https://rometools.github.io/rome/"
+SRC_URI="mirror://gentoo/${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="dev-java/jdom:0"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? ( dev-java/ant-junit:0 )"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="src/java"
+JAVA_RESOURCE_DIRS="res/java"
+JAVA_TEST_SRC_DIRS="src/test"
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+
+S="${WORKDIR}/${P}"
+
+src_prepare() {
+	default
+	mkdir -p res/java/com/sun/syndication || die
+	cp {src,res}/java/com/sun/syndication/rome.properties || die
+
+	sed -e 's:\(public \)\(Module\):\1com.sun.syndication.feed.module.\2:' \
+		-e 's:\(,\)\(Module\):\1com.sun.syndication.feed.module.\2:' \
+		-i src/java/com/sun/syndication/feed/synd/Synd{Feed,Entry}Impl.java || die
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/rxtx/Manifest b/dev-java/rxtx/Manifest
index 6cb68ac9febc..a7a70333c158 100644
--- a/dev-java/rxtx/Manifest
+++ b/dev-java/rxtx/Manifest
@@ -2,7 +2,10 @@ AUX lockfiled.xinetd 202 BLAKE2B 38ecf8d5faadf521d5253e60183d13c3040a88035d5e039
 AUX rxtx-2.1-7r2-lfd.diff 497 BLAKE2B 1e74708071d4645e0444d4ac2bffb8b952f17723d1ce98a784a75c5e1f1d22f2472ebbe0aa16c40b830be0255bd04b8d3a13ffe8d54b4d787e3a03e4d07f4be9 SHA512 fd06c021ad496036556f979e783864d6d88d1a0c039396eefacc569d66e6942b08b246970be640c73c0c2d209aa0c3247db61bdc19a99066789d4f4d0e4d390e
 AUX rxtx-2.1-7r2-nouts.diff 3583 BLAKE2B a92f5459ec2309f941ca7f8c3437a1c392da06972d4511905c73e1676fab4ad772a9d22aa3d639095798def629cba794f93add6e67878fff8441f628063ce421 SHA512 c7c6c11785089d321ee9680f4b67c590fe0c3cc0f031196eb71831ef7f319867fb156912c0c934a751d5d9e97774d6c26cab5c710055e919e97bcf39a789787d
 AUX rxtx-2.2_pre2-add-ttyACM.patch 328 BLAKE2B 93e5ddca58bf3886c1ed7d34ef6e718d844eb067b55d9ff4fde7faa083735b135a853ebad7f9baf9ce1877fbc5cc3ce9bbd88b342aac4f040a2c0b6045629b99 SHA512 c81ae4e3f6fe09722709b6a9ae09fd3a300c9ef94641a3aa9f821b6fd4e4c28f15e9f672d2bfe6b51715f9e6b2caa5f637be20a76027cb31098062f60a0b0d0f
+AUX rxtx-2.2_pre2-fix-for-java-10+.patch 1825 BLAKE2B 5ae56268cf4e98ec78f91c4e65d17c0bccefcc297b7f34354d4de972038f894f4aa14493c8f40f4ba0ef89c93865e4384494195e93b2c2083d4612b13f54ac65 SHA512 61a1d5ced0f25cd5cd7eea7e4da57eeb933f59919c3b1137a27cf69195d08c9ad0f2d7d0a52748df2daf280c9abd5bdd4f610783b8ccaccd480b02ef1d0a8555
+AUX rxtx-2.2_pre2-fix-invalid-javadoc.patch 8268 BLAKE2B f5b40ce1dbdfa2a1ec98ad6c886a932ddfea7157ff5a2e21f7c56c32e50dfe9b220e033ced0e41f94b0432669d042eebb37dc23e0b1084127f5376fb8f1faaa1 SHA512 a86dbc331e6c3a697f09a517abdebbf450ecffdd0a90dd0b539a4ea7ccda366655e1efd626d8fd503d58a9e221be9a01ad44ac37327316149d8d0e2fb6923802
+AUX rxtx-2.2_pre2-format-security.patch 2480 BLAKE2B 5e19b8ae5d49c094a8faa84c2cd5eca513bb309836fc8f1544e142ccab5b9a53f05771f2412b2953cae3f13e1c96d8d84e1f4a1f4dfdcc3719947d5ec182cec8 SHA512 c0ed0d34c04cfe87b134c55c819af65017c30e38cce00eedd146d70bb7e3a304b92b8fa8c11f3ab9076701f71f7370b28a902c7e3fee18f46f5a6a2aea3ed66a
 AUX rxtx-2.2_pre2-limits.patch 272 BLAKE2B 8f49c4a9dbf852f444a742ab3b2b5c846d3d0035307415dd3b4ba34bf3a37179e82d63e04eeb3b553e678fcfc5d0cc3ab0651fdcbf6be20228e35d13db3bf1b0 SHA512 0e4d5b8e622515c75613aeb8c5e4fc1786f1c05ef2619b65c4b1060776933172479957b9f9a15195c79f10c90a1802956eac32cd60939b9b0a15540901e62180
 DIST rxtx-2.2pre2.zip 1491209 BLAKE2B fe115833ee89cfe9a3ae58117ac4a4326e8f79e6fdc0528cb8dd2824e231c862e4b421c94784059e4cf03f6cc93a32636444916a5c8cebe002da470b460bf23b SHA512 cd94bd08bc8b5689fc9a0e539f17645f530a3a280998e9838a2e4c8b3386f2b00a592ab41c07bd720eadf26fddb324bf80d8f7b9ecb35ea8507120c16048f514
-EBUILD rxtx-2.2_pre2-r1.ebuild 2222 BLAKE2B f94fffc150c4ec4fec5788ac72156208bfedad321ebf40b220b1abc98e31be3df6ad22705b6491df61028e0fd79e9cca453f5a989322006ebf153b53b6da34b9 SHA512 92a9461b5789013746a149a11d3d52e2476933200b127975c64c6969751193919fe70ff7b871ae0e1b6c59f7ac4d3292d66ad9fdf3a189766e428254db7ede12
+EBUILD rxtx-2.2_pre2-r2.ebuild 2650 BLAKE2B 2095d6555f375b9d1ee75538abb734c719785516047727b5d929de1c00a2fa8b03fe57522560c38074212a7ba7742f607c22f621269da38b3d00de910217f778 SHA512 323bb50e9c3a636fdbd4018391c4feea544e9d3f4f6458ec4a9b6868c882ce4e9ca79bf8685395bd03be111be8a7689d649a5a561ca4f8c6864ebfb61ce70bec
 MISC metadata.xml 334 BLAKE2B b86a021232d18fba74442a66f689351c6440a1cca9be38d526ec2c9e65fa634f1cb265177d974bdf6b6f764c1df9531f75346f69ac071de6ed3f880eb09a3f44 SHA512 cb51df875f3ab1e39a5141ffe2cf79fed88339a9bf2bcb747be78b5986035dd5925fccd120cdb54ab8ab4e0371eda1cb9412f141bcc7583cb55f7bcf85a3683a
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch
new file mode 100644
index 000000000000..366bb78c2cba
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch
@@ -0,0 +1,50 @@
+Debian patch for fixing build issues on JDK 10 and above.
+In particular, 'javah' needs to replaced by 'javac -h' since 'javah'
+has been removed due to JEP 313 (https://openjdk.java.net/jeps/313).
+
+To support Javadoc generation with JDK 17 and above, the '-source 1.8'
+option must be included in the arguments to 'javadoc'.  Otherwise, the
+following error would be raised:
+
+	src/gnu/io/LPRPort.java:373: error: invalid use of a restricted identifier 'yield'
+				yield();
+				^
+	  (to invoke a method called yield, qualify the yield with a receiver or type name)
+
+The original patch can be found at:
+https://salsa.debian.org/java-team/rxtx/-/blob/6500bd55f265de7d2dfef68dc1df5d8b990f66c3/debian/patches/java10-compatibility.patch
+
+Bug: https://bugs.gentoo.org/831394
+
+---
+Description: Fixes the build failure with Java 10
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -111,11 +111,6 @@
+ $(CLASSES): $(javafiles) $(TOP)/Makefile
+ 	$(JAVAH_FIX)
+ 	$(JAVAC) $(javafiles)
+-	$(JAVAH) `(for i in $(javahfiles);do \
+-		if grep > /dev/null native.*\( $(SPATH)/gnu/io/$$i.java; then \
+-			echo $(CLASSDIR).$$i; \
+-		fi; \
+-	done)`
+ 	$(JAR) cf $(JARTARGET) $(CLASSTOP)/*
+ 
+ #  install librxtxSerial.so into the proper directory and copy $(JARTARGET) to its
+--- a/configure.in
++++ b/configure.in
+@@ -485,9 +485,9 @@
+ 	*)
+ 		find_java_native_include jni_md.h
+ 		JAVAH="\$(JPATH)/bin/javah -classpath \$(CLASSPATH) -d \$(DEST) -jni"
+-		JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.8 -target 1.8"
++		JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.8 -target 1.8 -h \$(DEST)"
+ 		JAR="\$(JPATH)/bin/jar"
+-		JAVADOC="\$(JPATH)/bin/javadoc"
++		JAVADOC="\$(JPATH)/bin/javadoc -source 1.8"
+ 		CFLAGS=$CFLAGS" -D_BSD_SOURCE"
+ 		;;
+ 	esac
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch
new file mode 100644
index 000000000000..a00ed96f7e5a
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch
@@ -0,0 +1,229 @@
+From 4c47d6d133f727a9615987d582fa143e4a17cd01 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sun, 20 Feb 2022 08:17:59 -0800
+Subject: [PATCH] Fix invalid Javadoc syntax that leads to errors
+
+Bug: https://bugs.gentoo.org/642030
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ src/gnu/io/RXTXPort.java | 50 ++++++++++++++++++++++------------------
+ 1 file changed, 27 insertions(+), 23 deletions(-)
+
+diff --git a/src/gnu/io/RXTXPort.java b/src/gnu/io/RXTXPort.java
+index 622a6a8..77a23ea 100644
+--- a/src/gnu/io/RXTXPort.java
++++ b/src/gnu/io/RXTXPort.java
+@@ -1732,7 +1732,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*
+ 	*  @param  port the name of the port thats been preopened
+ 	*  @return BaudRate on success
+-	*  @throws UnsupportedCommOperationException;
++	*  @throws UnsupportedCommOperationException
+ 	*  This will not behave as expected with custom speeds
+ 	*
+ 	*/
+@@ -1751,7 +1751,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*
+ 	*  @param  port the name of the port thats been preopened
+ 	*  @return DataBits on success
+-	*  @throws UnsupportedCommOperationException;
++	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 	public static int staticGetDataBits( String port )
+@@ -1770,7 +1770,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*
+ 	*  @param  port the name of the port thats been preopened
+ 	*  @return Parity on success
+-	*  @throws UnsupportedCommOperationException;
++	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 	public static int staticGetParity( String port )
+@@ -1789,7 +1789,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*
+ 	*  @param  port the name of the port thats been preopened
+ 	*  @return StopBits on success
+-	*  @throws UnsupportedCommOperationException;
++	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 	public static int staticGetStopBits( String port )
+@@ -1839,7 +1839,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  the port a second time later on.
+ 	*
+ 	*  @return true on success
+-	*  @throws UnsupportedCommOperationException;
++	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 
+@@ -1862,7 +1862,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  the port a second time later on.
+ 	*
+ 	*  @return true on success
+-	*  @throws UnsupportedCommOperationException;
++	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 
+@@ -1885,7 +1885,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  the port a second time later on.
+ 	*
+ 	*  @return none
+-	*  @throws UnsupportedCommOperationException;
++	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 
+@@ -1907,7 +1907,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*
+ 	*  @param port
+ 	*  @return true if asserted
+-	*  @throws UnsupportedCommOperationException;
++	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 
+@@ -1927,7 +1927,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*
+ 	*  @param port
+ 	*  @return true if asserted
+-	*  @throws UnsupportedCommOperationException;
++	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 
+@@ -1947,7 +1947,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*
+ 	*  @param port
+ 	*  @return true if asserted
+-	*  @throws UnsupportedCommOperationException;
++	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 
+@@ -1967,7 +1967,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*
+ 	*  @param port
+ 	*  @return true if asserted
+-	*  @throws UnsupportedCommOperationException;
++	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 
+@@ -1987,7 +1987,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*
+ 	*  @param port
+ 	*  @return true if asserted
+-	*  @throws UnsupportedCommOperationException;
++	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 
+@@ -2007,7 +2007,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*
+ 	*  @param port
+ 	*  @return true if asserted
+-	*  @throws UnsupportedCommOperationException;
++	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 
+@@ -2025,7 +2025,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  This is an extension to CommAPI.  It may not be supported on
+ 	*  all operating systems.
+ 	*  @return int the Parity Error Character
+-	*  @throws UnsupportedCommOperationException;
++	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*  Anyone know how to do this in Unix?
+ 	*/
+@@ -2049,7 +2049,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  all operating systems.
+ 	*  @param b Parity Error Character
+ 	*  @return boolean true on success
+-	*  @throws UnsupportedCommOperationException;
++	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*  Anyone know how to do this in Unix?
+ 	*/
+@@ -2067,7 +2067,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  This is an extension to CommAPI.  It may not be supported on
+ 	*  all operating systems.
+ 	*  @return int the End of Input Character
+-	*  @throws UnsupportedCommOperationException;
++	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*  Anyone know how to do this in Unix?
+ 	*/
+@@ -2091,7 +2091,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  all operating systems.
+ 	*  @param b End Of Input Character
+ 	*  @return boolean true on success
+-	*  @throws UnsupportedCommOperationException;
++	*  @throws UnsupportedCommOperationException
+ 	*/
+ 
+ 	public boolean setEndOfInputChar( byte b )
+@@ -2111,7 +2111,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  or "16750".
+ 	*  @param test boolean flag to determin if the UART should be tested.
+ 	*  @return boolean true on success
+-	*  @throws UnsupportedCommOperationException;
++	*  @throws UnsupportedCommOperationException
+ 	*/
+ 	public boolean setUARTType(String type, boolean test)
+ 		throws UnsupportedCommOperationException
+@@ -2127,7 +2127,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  @return type String representation of the UART type which mayb
+ 	*  be "none", "8250", "16450", "16550", "16550A", "16650", "16550V2"
+ 	*  or "16750".
+-	*  @throws UnsupportedCommOperationException;
++	*  @throws UnsupportedCommOperationException
+ 	*/
+ 	public String getUARTType() throws UnsupportedCommOperationException
+ 	{
+@@ -2140,7 +2140,8 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  @param BaudBase The clock frequency divided by 16.  Default
+ 	*  BaudBase is 115200.
+ 	*  @return true on success
+-	*  @throws UnsupportedCommOperationException, IOException
++	*  @throws UnsupportedCommOperationException
++	*  @throws IOException
+ 	*/
+ 
+ 	public boolean setBaudBase(int BaudBase)
+@@ -2155,7 +2156,8 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	/**
+ 	*  Extension to CommAPI
+ 	*  @return BaudBase
+-	*  @throws UnsupportedCommOperationException, IOException
++	*  @throws UnsupportedCommOperationException
++	*  @throws IOException
+ 	*/
+ 
+ 	public int getBaudBase() throws UnsupportedCommOperationException,
+@@ -2170,7 +2172,8 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  Extension to CommAPI.  Set Baud Base to 38600 on Linux and W32
+ 	*  before using.
+ 	*  @param Divisor
+-	*  @throws UnsupportedCommOperationException, IOException
++	*  @throws UnsupportedCommOperationException
++	*  @throws IOException
+ 	*/
+ 
+ 	public boolean setDivisor(int Divisor)
+@@ -2184,7 +2187,8 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	/**
+ 	*  Extension to CommAPI
+ 	*  @return Divisor;
+-	*  @throws UnsupportedCommOperationException, IOException
++	*  @throws UnsupportedCommOperationException
++	*  @throws IOException
+ 	*/
+ 
+ 	public int getDivisor() throws UnsupportedCommOperationException,
+-- 
+2.34.1
+
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch
new file mode 100644
index 000000000000..1337cce3c546
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch
@@ -0,0 +1,118 @@
+Debian patch for fixing errors emitted due to -Werror=format-security.
+The patch can be found at:
+https://salsa.debian.org/java-team/rxtx/-/blob/6500bd55f265de7d2dfef68dc1df5d8b990f66c3/debian/patches/format_security.patch
+
+Bug: https://bugs.gentoo.org/550534
+
+---
+From: tony mancill <tmancill@debian.org>
+Forwarded: no
+Description: use format specifiers in fprintf statements for hardening flags
+
+--- a/src/SerialImp.c
++++ b/src/SerialImp.c
+@@ -5108,7 +5108,7 @@
+ void report_warning(const char *msg)
+ {
+ #ifndef DEBUG_MW
+-	fprintf(stderr, msg);
++	fprintf(stderr, "%s", msg);
+ #else
+ 	mexWarnMsgTxt( (const char *) msg );
+ #endif /* DEBUG_MW */
+@@ -5129,7 +5129,7 @@
+ #ifdef DEBUG_MW
+ 	mexErrMsgTxt( msg );
+ #else
+-	fprintf(stderr, msg);
++	fprintf(stderr, "%s", msg);
+ #endif /* DEBUG_MW */
+ #endif /* DEBUG_VERBOSE */
+ }
+@@ -5145,7 +5145,7 @@
+ void report_error(const char *msg)
+ {
+ #ifndef DEBUG_MW
+-	fprintf(stderr, msg);
++	fprintf(stderr, "%s", msg);
+ #else
+ 	mexWarnMsgTxt( msg );
+ #endif /* DEBUG_MW */
+@@ -5164,7 +5164,7 @@
+ {
+ #ifdef DEBUG
+ #	ifndef DEBUG_MW
+-		fprintf(stderr, msg);
++		fprintf(stderr, "%s", msg);
+ #	else
+ 		mexPrintf( msg );
+ #	endif /* DEBUG_MW */
+--- a/src/ParallelImp.c
++++ b/src/ParallelImp.c
+@@ -920,7 +920,7 @@
+ void report_error(char *msg)
+ {
+ #ifndef DEBUG_MW
+-	fprintf(stderr, msg);
++	fprintf(stderr, "%s", msg);
+ #else
+ 	mexWarnMsgTxt( msg );
+ #endif /* DEBUG_MW */
+@@ -938,7 +938,7 @@
+ void report(char *msg)
+ {
+ #ifdef DEBUG
+-        fprintf(stderr, msg);
++        fprintf(stderr, "%s", msg);
+ #endif /* DEBUG */
+ }
+ 
+--- a/src/SerialImp.cpp
++++ b/src/SerialImp.cpp
+@@ -1844,7 +1844,7 @@
+ 
+ 
+ #ifdef DEBUG
+-	fprintf(stderr, msg);
++	fprintf(stderr, "%s", msg);
+ #endif
+ }
+ 
+--- a/CNI/SerialImp.c
++++ b/CNI/SerialImp.c
+@@ -4549,7 +4549,7 @@
+ void report_warning(char *msg)
+ {
+ #ifndef DEBUG_MW
+-	fprintf(stderr, msg);
++	fprintf(stderr, "%s", msg);
+ #else
+ 	mexWarnMsgTxt( (const char *) msg );
+ #endif /* DEBUG_MW */
+@@ -4570,7 +4570,7 @@
+ #ifdef DEBUG_MW
+ 	mexErrMsgTxt( msg );
+ #else
+-	fprintf(stderr, msg);
++	fprintf(stderr, "%s", msg);
+ #endif /* DEBUG_MW */
+ #endif /* DEBUG_VERBOSE */
+ }
+@@ -4586,7 +4586,7 @@
+ void report_error(char *msg)
+ {
+ #ifndef DEBUG_MW
+-	fprintf(stderr, msg);
++	fprintf(stderr, "%s", msg);
+ #else
+ 	mexWarnMsgTxt( msg );
+ #endif /* DEBUG_MW */
+@@ -4605,7 +4605,7 @@
+ {
+ #ifdef DEBUG
+ #	ifndef DEBUG_MW
+-		fprintf(stderr, msg);
++		fprintf(stderr, "%s", msg);
+ #	else
+ 		mexPrintf( msg );
+ #	endif /* DEBUG_MW */
diff --git a/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
index 250fe5e92412..16874cfaeefa 100644
--- a/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild
+++ b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
-inherit toolchain-funcs versionator autotools java-pkg-2
+inherit toolchain-funcs autotools java-pkg-2
 
-MY_PV="$(delete_version_separator 2)"
+MY_PV="$(ver_rs 2 '')"
 MY_P="${PN}-${MY_PV}"
 
-DESCRIPTION="Native lib providing serial and parallel communication for Java"
+DESCRIPTION="Native library providing serial and parallel communication for Java"
+# SSL protocol versions supported by the HTTPS website are too old for
+# the latest web browsers, so please keep the HTTP URL for HOMEPAGE
 HOMEPAGE="http://rxtx.qbang.org/"
 SRC_URI="ftp://ftp.qbang.org/pub/rxtx/${MY_P}.zip"
 LICENSE="LGPL-2.1+"
@@ -18,11 +20,12 @@ SLOT="2"
 KEYWORDS="amd64 x86"
 IUSE="lfd"
 
-RDEPEND=">=virtual/jre-1.6
+RDEPEND=">=virtual/jre-1.8:*
 	lfd? ( sys-apps/xinetd )"
 
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip"
+DEPEND=">=virtual/jdk-1.8:*"
+
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -34,11 +37,14 @@ src_prepare() {
 		-e "s:-source ... -target ...:$(java-pkg_javac-args):g" \
 		configure.in || die
 
-	epatch \
-		"${FILESDIR}/${PN}-2.1-7r2-lfd.diff" \
-		"${FILESDIR}/${PN}-2.1-7r2-nouts.diff" \
-		"${FILESDIR}/${P}-add-ttyACM.patch" \
-		"${FILESDIR}/${P}-limits.patch"
+	eapply -p0 "${FILESDIR}/${PN}-2.1-7r2-lfd.diff"
+	eapply -p0 "${FILESDIR}/${PN}-2.1-7r2-nouts.diff"
+	eapply -p0 "${FILESDIR}/${P}-limits.patch"
+	eapply "${FILESDIR}/${P}-add-ttyACM.patch"
+	eapply "${FILESDIR}/${P}-format-security.patch"
+	eapply "${FILESDIR}/${P}-fix-invalid-javadoc.patch"
+	eapply "${FILESDIR}/${P}-fix-for-java-10+.patch"
+	eapply_user
 
 	rm acinclude.m4 || die
 	eautoreconf
@@ -50,7 +56,9 @@ src_configure() {
 }
 
 src_compile() {
-	emake
+	# Parallel build on this package may cause random
+	# build-time errors sometimes due to race conditions
+	emake -j1
 
 	if use lfd ; then
 		# see INSTALL in src/ldf
@@ -58,7 +66,7 @@ src_compile() {
 	fi
 
 	if use doc ; then
-		emake docs
+		emake -j1 docs
 	fi
 
 	# Fix for src zip creation
diff --git a/dev-java/sac/Manifest b/dev-java/sac/Manifest
index ca96af1861f0..3b244b015419 100644
--- a/dev-java/sac/Manifest
+++ b/dev-java/sac/Manifest
@@ -1,4 +1,3 @@
 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-r4.ebuild 633 BLAKE2B 536b8c2fdcf557c84e1316dcac41448ea9058ad11c3e55c093b4f02931d94da594a5da53ffa49d7b94b577166d7d76ccd05faea5135cd68fb3490be75db85060 SHA512 6929915abdd0449758fdaf428e421ad655dedd2ca207f27ddf0f1dae031a81a34d2cd843e88911e51350c8884ef828104df8c621107a98979f46840637cdf56d
+EBUILD sac-1.3-r4.ebuild 629 BLAKE2B 42be9ca1aa9625e0ef6bb96f5fdba147d4eb02bd68516c58441a1509ff2662fffefd2d239747810fed6a4d8a136f695532124891aac8b07929b2008dc44dca42 SHA512 abc2f64e1ea490a3d22b17cc1bfa4b796fab1df28f9e7af2451568f3f9cef8fbaa48c65eaf10ed6726308b4a6b8f1ae4ae30654d400e7cda77bcb74a1419656a
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/sac/sac-1.3-r2.ebuild b/dev-java/sac/sac-1.3-r2.ebuild
deleted file mode 100644
index 395631671fe0..000000000000
--- a/dev-java/sac/sac-1.3-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="SAC is a standard interface for CSS parser"
-HOMEPAGE="http://www.w3.org/Style/CSS/SAC/"
-SRC_URI="http://www.w3.org/2002/06/sacjava-${PV}.zip -> ${P}.zip"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND="
-	app-arch/zip
-	>=virtual/jdk-1.6
-	source? ( app-arch/zip )"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="org"
-
-java_prepare() {
-	java-pkg_clean
-}
diff --git a/dev-java/sac/sac-1.3-r4.ebuild b/dev-java/sac/sac-1.3-r4.ebuild
index 53e08b765c02..00e8e0904e2a 100644
--- a/dev-java/sac/sac-1.3-r4.ebuild
+++ b/dev-java/sac/sac-1.3-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.w3.org/2002/06/sacjava-${PV}.zip -> ${P}.zip"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	app-arch/zip
diff --git a/dev-java/sax/Manifest b/dev-java/sax/Manifest
index c17302dcc72e..7abbafafde14 100644
--- a/dev-java/sax/Manifest
+++ b/dev-java/sax/Manifest
@@ -1,4 +1,3 @@
 DIST sax-2.2.1.zip 372488 BLAKE2B 27813712e81c8a42f746ac5d84f381f7d5d30b6e11988624a01616632b742ac90f834574c7c1288385b3d6720cd2f3ee0eb9df1644e7cca5eae813ef8a2f9f45 SHA512 af05c14994894f0b6cd860c1d632a1148f43cef824081357c9e4b256e66e0f36ac3cba1838f03322182339f2642b4bf68f707407fba8ee6c2f95d5b8d1267648
-EBUILD sax-2.2.1-r3.ebuild 630 BLAKE2B f194d0451fc5ea9c3357ac464ae1f05657f6838b8024a46ef747ff815a01cb60ad236ffc54af9644647783be49ca01c3c4b215b2fd750fb412af4f3e9dbe5501 SHA512 df55f243bb083c62d112e135d976820ad1558c633df24d4aba3faf4fc2650289285a90da3bd7e4ef157d6a909499d3d05ec81b62789576fb0ec948f00101f751
-EBUILD sax-2.2.1-r5.ebuild 731 BLAKE2B f9f7ee29aaab765532e1540e576f4b14c801adf65cd9e7f0a1bc0d914aa22e57686a4481db119af3317d069b91c252babe58e9f8edf4be91792f9ab84189ebc4 SHA512 236141029e371486baf1c7c78e3b0ba9514d0214c9da233ef6a388a9112ebec71edc0523e15bb900e4cc70c8be061d6335be7f4f799acb5488647c38b9e22bc3
+EBUILD sax-2.2.1-r5.ebuild 728 BLAKE2B f36bdd9634ca2b91eeb95571d8ed5b3352ba3d5650c43ae56c0381df6c7f3aa16dbc0cfb6886cab6397b81934e170837b741b4cce17ae4f59acd9d66ef06f690 SHA512 90476353bcb83a7875b4dcf8a97254cae43c14e4ca48aebe46fa9ffe430eeb8eab5b89ac04fdb905fd728b8604da68a63bbb897a5de07b03864f8501fcda4b94
 MISC metadata.xml 310 BLAKE2B 6f27bc088c8ab7cf0461ae4f097031fdc391476fd08dcb33e1780cde6a384e41351b3829558c291ca468a9875f7de9e0aeca96aa645a4316f1c62b6471b310b7 SHA512 bcd71a2b8844f9b91f3f0c93a2da9dd499a93e46a629801c54fe727ee83856716da0c860936aedc4c08bbadd20417fc3b01a02dcbc0c247ff05f60fb4479440b
diff --git a/dev-java/sax/sax-2.2.1-r3.ebuild b/dev-java/sax/sax-2.2.1-r3.ebuild
deleted file mode 100644
index 7e77a681194a..000000000000
--- a/dev-java/sax/sax-2.2.1-r3.ebuild
+++ /dev/null
@@ -1,32 +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"
-
-MY_PN="sax2r3"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="SAX: Simple API for XML in Java"
-HOMEPAGE="http://sax.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip -> ${P}.zip"
-LICENSE="public-domain"
-
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S="${WORKDIR}/sax2r3"
-
-java_prepare() {
-	java-pkg_clean
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc ChangeLog CHANGES README
-}
diff --git a/dev-java/sax/sax-2.2.1-r5.ebuild b/dev-java/sax/sax-2.2.1-r5.ebuild
index 4969e66b47eb..d367d673cb21 100644
--- a/dev-java/sax/sax-2.2.1-r5.ebuild
+++ b/dev-java/sax/sax-2.2.1-r5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip -> ${P}.zip"
 LICENSE="public-domain"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="
 	>=virtual/jdk-1.8:*"
diff --git a/dev-java/saxon/Manifest b/dev-java/saxon/Manifest
index fbd512f822a9..7d2490c5deeb 100644
--- a/dev-java/saxon/Manifest
+++ b/dev-java/saxon/Manifest
@@ -3,5 +3,7 @@ AUX 9.2-edition.properties 74 BLAKE2B d468841c782fa7bf1b39cbeeac01d983a8d6891a13
 DIST saxon6-5-5.zip 3346162 BLAKE2B 63d49545d101c3b595ff3f3db6d781158b8a51862ccdc294e782ac0935010a841405fb21663bd35853042c53548991dfefa7f789be292fe8497a29253c87ee09 SHA512 2d76ab6da8fc8ca8502139f6b620d4c9e94732a520083480e3936f6bd0a9f069252a7a05df53dab49aabec505764b2ec4ca1b36022bb56df568883a0491f495a
 DIST saxonhe9-2-0-6source.zip 2942625 BLAKE2B 45f9cc12591ebb94076392b16edba52811d911c41f2f197ffe864e37c1ef478670ff276b7dc8dff316dcd2986f777b4cc2d43989e5d300510ee0edfe7e54103d SHA512 6c59c0cbed905cf561387acb54bb31f0a251432deb0edf498ec4f4d9955bbcc12d1765ace594090d3ccb0416e3e72349466e430bb4f799b51fd12ce8fc5a144e
 EBUILD saxon-6.5.5-r2.ebuild 880 BLAKE2B 2916359129a0460531c31e5b7d511ba1685bc685b569e5c76d342423b3ecf5c8a357840cf45f4e0d92cc3954ce7bb457da51dcd06cdc55d5fe4ba2657a2efabd SHA512 978932d30eb0374bd527e40bb6be7a27c59c64c60e105bd815778a40d1cddd6f99ad70ed35371fe00637878951797969db3fdb9b1e2f492612c1286ac2dad50e
+EBUILD saxon-6.5.5-r3.ebuild 995 BLAKE2B ad6be49a087782483cb99b00d3ea5ea7a531aab08efbf5bb7585b11ec3c6aaf982d6d8eff92037e99b8aa3a0b97e8736bd791743ebe13d86060e4a098e4f201e SHA512 143033c03b7937b53ab03387de72d4b9338b01b2af92807ab3c72e2e7a0fe5eb4a3413ecc14c5eee32f9c7da3a607eb37ba08d14bfae58b3d359d806698c13a4
 EBUILD saxon-9.2.0.6-r2.ebuild 1977 BLAKE2B da97c782b3c1654b5baf8833de0c5e007f40b55780cc02a4eef056991cf1d250c9f82237615642ba71c30acb7d3bb4146f0ad01c314070b058dcdc9b14ec03ac SHA512 88cd0d289c424aea55ca46abee3cfe6f16a9e73976a68c23c2c84431cdbe151cef36f476ab14c10ac8f7c47afb5ba023a4db5548c1a21fffece73b6cf7ddb5b6
+EBUILD saxon-9.2.0.6-r3.ebuild 1952 BLAKE2B 8d189dc888fe6f5bb96b970454259ff85dd961787e0a80b5440fb30cc9dfc025387678506bbb9b32a1d9e30df0684ce26238799c4cf2033bd7cef7b80f635e0c SHA512 6a29226b825a8a687f623d4fd91f9484dfba9820175124c8d3579ea310a5e6594b6ce1bc52829adb0d8fbcce9b4b0ce1a55374889408b8cb6793164e1e8e376c
 MISC metadata.xml 312 BLAKE2B 819738845b7b0a9a9fcc19e4997fdfdaf55b820253d58ea32b1fac35dab2b5760e4cdadd38607b54df2f3bc2b10eee0d747d59c6785ecb3f1b3ca3a68e428be7 SHA512 f798aabc41fc786a18b25c42ac3201b8f2d3e665397f53bc1988531f8ea75ce0d8517af43dadf6fac433d8f689f25dc7f6593c83d941feac5a2d14fe58c82fd1
diff --git a/dev-java/saxon/saxon-6.5.5-r3.ebuild b/dev-java/saxon/saxon-6.5.5-r3.ebuild
new file mode 100644
index 000000000000..49603d408175
--- /dev/null
+++ b/dev-java/saxon/saxon-6.5.5-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Set of tools for processing XML documents"
+HOMEPAGE="http://saxon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/saxon/saxon6/${PV}/saxon${PV//./-}.zip"
+
+LICENSE="MPL-1.1"
+SLOT="6.5"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="dev-java/jdom:0"
+
+# Restricting to jdk:1.8 for following reason:
+# src/org/w3c/dom/UserDataHandler.java:1: error: package exists in another module: java.xml
+# package org.w3c.dom;
+DEPEND="${CP_DEPEND}
+	virtual/jdk:1.8"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="src"
+
+src_unpack() {
+	unpack ${A}
+	unzip -qq source.zip -d src || die "failed to unpack"
+}
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples samples
+}
diff --git a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild b/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
new file mode 100644
index 000000000000..df8fd42a18eb
--- /dev/null
+++ b/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A XSLT and XQuery Processor"
+HOMEPAGE="http://saxon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe${PV//./-}source.zip"
+
+LICENSE="MPL-1.0"
+SLOT="9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CDEPEND="
+	dev-java/xom:0
+	dev-java/jdom:0
+	dev-java/dom4j:1
+	dev-java/ant-core"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+# prepare eclass variables
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
+
+src_prepare() {
+	default
+
+	# Fedora-inspired removal.
+
+	# deadNET.
+	rm -rv net/sf/saxon/dotnet || die
+
+	# Depends on XQJ (javax.xml.xquery).
+	rm -rv net/sf/saxon/xqj || die
+
+	# This requires a EE edition feature (com.saxonica.xsltextn).
+	rm -v net/sf/saxon/option/sql/SQLElementFactory.java || die
+
+	# <major>.<minor> version
+	local version="$(ver_cut 1-2)"
+
+	# generate build.xml with external javadoc links
+	sed -e "s:@JDK@:1.6:" \
+		-e "s:@JDOM@:1:" \
+		< "${FILESDIR}/${version}-build.xml" \
+		> "${S}/build.xml" \
+		|| die "build.xml generation failed!"
+
+	# prepare creates the dir for properties
+	eant prepare
+
+	# properties
+	cp -v \
+		"${FILESDIR}/${version}-edition.properties" \
+		"${S}/build/classes/edition.properties" || die
+}
+
+src_compile() {
+	local gcp="$(java-pkg_getjars dom4j-1,jdom,xom)"
+	gcp="${gcp}:$(java-pkg_getjars --build-only ant-core)"
+	eant -Dgentoo.classpath="${gcp}" jar $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	java-pkg_dolauncher ${PN}${SLOT}-transform --main net.sf.saxon.Transform
+	java-pkg_dolauncher ${PN}${SLOT}-query --main net.sf.saxon.Query
+
+	java-pkg_register-ant-task
+
+	use doc && java-pkg_dojavadoc build/api
+
+	use source && java-pkg_dosrc src
+}
diff --git a/dev-java/saxpath/Manifest b/dev-java/saxpath/Manifest
deleted file mode 100644
index 000352330485..000000000000
--- a/dev-java/saxpath/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST saxpath-1.0.jar 36257 BLAKE2B 0b6b2c943b3b472a01109c6f6b25d8e54b5afff7c44f980f4741ccb3bb689520e5e6e49fb17e918f35212fceb69e5aa551469fb923675b9287733799134bb967 SHA512 53e7781ea3efc1e16a839c9137fe7ab683e7a9e40283f0f5aa7afc1de75c4dc366a91a93ae5f256fc24e78fd3a4dcdcde6631bfa0d926b7dd0ddacd5c240ca96
-EBUILD saxpath-1.0-r3.ebuild 532 BLAKE2B ca6df0f7e3f30a5e9b3e10f80be8928553d8a0d59227a8dab9ae5c30009f6f2be3b59edc8601332de4daaa69d75f7ce2d37b860031ee7332888ef5bdc66bb141 SHA512 a31242f0c2714fbde04bfdcb80f44d5722c28a8b196d1bcd1fac8df1af76805ce486d206cdb9dc4040a248ef4013f41f540d46c2adc28261271bcbefa7e16b84
-MISC metadata.xml 314 BLAKE2B 2310ee6cda95d6727f4e9f2dd528bb9d9fd8b17aa8d7a95e40be56bfa050bedd901b210aa80e87886539952217d7003b22e517be9ed44e0619c96ed86d1cc9e0 SHA512 94e79ed4ff69adf544641da7cb924a4849bb71ba72df3488850804e580d07746fbbf677e84f513b72670e79aa36c0ab551cf57dc8bf05b6fd90d630bada95c6e
diff --git a/dev-java/saxpath/saxpath-1.0-r3.ebuild b/dev-java/saxpath/saxpath-1.0-r3.ebuild
deleted file mode 100644
index 6ce0da55b9e7..000000000000
--- a/dev-java/saxpath/saxpath-1.0-r3.ebuild
+++ /dev/null
@@ -1,19 +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="Java XPath API"
-HOMEPAGE="https://saxpath.sourceforge.net"
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}-FCS/${P}-FCS-sources.jar -> ${P}.jar"
-
-LICENSE="JDOM"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/sjsxp/Manifest b/dev-java/sjsxp/Manifest
new file mode 100644
index 000000000000..ecc904b8ad91
--- /dev/null
+++ b/dev-java/sjsxp/Manifest
@@ -0,0 +1,3 @@
+DIST sjsxp-1.0.2-sources.jar 531127 BLAKE2B d3088b89537027d8b6b5dd2a07af7713ada83fad36ffa0dee5a882db67ff20389d72185376a3da491258e5d76743ff2efcfa7f76a032b849f7f74e31ecdc4ac6 SHA512 bc6f051e72b9785d7f1352464ed620282c8e4e190f66c9825e92b9409f21f5dc046a6fa678808dbffa2f8dfdb47d622dce7699c811a2afd60e57007a7b43f17a
+EBUILD sjsxp-1.0.2.ebuild 1045 BLAKE2B dc0882c8715f7b8a7502b876c4ed3c2dfbcb009188751aa013df26ad8cf382d644513624f4cb515441a31a94fc6c56cd064757723a1ad10a70493b03d77db6d7 SHA512 49a7efc128476b8091144f88c311ad2c8b61908feeaebd158cdd634eb41c54b0f3b7d0f48a4f71f1dbf5370504b161d5931ebbbfadd0ed9b16e1de4f0fbda745
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/sjsxp/metadata.xml b/dev-java/sjsxp/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/sjsxp/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/sjsxp/sjsxp-1.0.2.ebuild b/dev-java/sjsxp/sjsxp-1.0.2.ebuild
new file mode 100644
index 000000000000..c1ac1a596f49
--- /dev/null
+++ b/dev-java/sjsxp/sjsxp-1.0.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom sjsxp-1.0.2.pom --download-uri https://repo1.maven.org/maven2/com/sun/xml/stream/sjsxp/1.0.2/sjsxp-1.0.2.jar --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild sjsxp-1.0.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.sun.xml.stream:sjsxp:1.0.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Sun Java Streaming XML Parser (SJSXP) is the implementation of JSR 173"
+HOMEPAGE="https://sjsxp.java.net/"
+SRC_URI="https://repo1.maven.org/maven2/com/sun/xml/stream/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Common dependencies
+# POM: ${P}.pom
+# javax.xml.stream:stax-api:1.0 -> !!!groupId-not-found!!!
+
+CP_DEPEND="dev-java/xpp3:0"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+#	JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/slf4j-api/Manifest b/dev-java/slf4j-api/Manifest
index 247c43622f1f..41bd57897343 100644
--- a/dev-java/slf4j-api/Manifest
+++ b/dev-java/slf4j-api/Manifest
@@ -1,5 +1,5 @@
-DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
 DIST slf4j-1.7.32.tar.gz 2277207 BLAKE2B d16c93ddc4667700a868d872a58b64248c8594fafa37e05ed300a71061c58ec2b3f1e0036326ff42ebdd57d5df3576e8ec2d8ae6090439b5d8e6f1fa0c555332 SHA512 512c33cb812058a7419eb717e55ad9a0522e602339f088e7295bb0bfb3cf39972412a74479896c14e8c48124d8c2adc4c4d78735f4747b4fa9742ddac2ae07fa
-EBUILD slf4j-api-1.7.30-r1.ebuild 1370 BLAKE2B 1f3f7b0777335c12c72a2b6cc7b2f86755350d973db339d269fe352317e70ad8b36d0024d08818c959d0f61f2df02ee11ce32c15e7f3818a9b4d972a33bc4d16 SHA512 c505fdcb9b95845e745ab22246728386872a19a26e2b4ba906a1542bc6ebbe50a0f038922494fcec06ed9f7fdc547ae21269fe7270e01830c9d73402a1a5b395
-EBUILD slf4j-api-1.7.32.ebuild 1471 BLAKE2B 955a2641968b81f58383aff9e9ff7337cf26b3845bef655cfaf2beed1a6f3d2ff07d8fcad79a479b717fc40bf6858c810e645a228138dc27a4fecff64b0ebd40 SHA512 9b15a88bd161b70ea887e1b4c080464cac4722a9abb0d59fd0cf0f18e58fa6cdb428e90b03b1e44cecb809d1a2f8bb70d821a9ebcd25237a79a7dc30377073b8
+DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
+EBUILD slf4j-api-1.7.32.ebuild 1467 BLAKE2B 8cfde573d5913ad88f7cff6bcbb226673f23409cad31f95d9efe0623f7ab3b3bfa4b874aa3ebc73e2a574fd173a6bf6cf58cb4067d7d6aab444f972bafb6d7a3 SHA512 fbc3751468b574e01f974b682f3f0938161d144b0320ed28efcfb5356ea9e7218275d42bb3c29f4ffa84a6ed76d7399aa9b1277c36be2d470852b414f0dd924d
+EBUILD slf4j-api-1.7.36.ebuild 1451 BLAKE2B 3e1f960f76250d6d306ccb3011f9662cb2c7010fc500e34dbdb2be4abd5a99b69bf2aaebbcf499e80f7b830b2f4abdc46aabfe2bae8c1f2e98b5a428bd528c44 SHA512 3d6e6b4376ee020f65111532826dd9b8fd5b7853b533e39f780abcce1338feb95000dab61fcaf6669ee6ccfb618770fdb32184b313c1ecf93cdec14c93624967
 MISC metadata.xml 367 BLAKE2B 086e22a444bd6a3dfab4f0a74e4900ed1f1a7be81b47932e192ebe4d6d1e8d65b63f064848e5cd3f0ad03a40c54e863d48acad905e09b918b9f24fe255820883 SHA512 d80fd3fc9ad1da46807f41251cf2a9bc384ef6566c24627482b4d7d5d3c46c672dcdd19037fd80a482079af86662fd07d35cb33b34c2e14911de7f3fc6b5e3a4
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.32.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.32.ebuild
index 40f19bf19cb4..bf1ff2d20242 100644
--- a/dev-java/slf4j-api/slf4j-api-1.7.32.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild
index 2acf963a0925..7644bfeebf50 100644
--- a/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom slf4j-v_1.7.30/slf4j-api/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-api-1.7.30.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild slf4j-api-1.7.36.ebuild
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.slf4j:slf4j-api:1.7.30"
+MAVEN_ID="org.slf4j:slf4j-api:1.7.36"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="The slf4j API"
 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"
+SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
@@ -29,6 +29,8 @@ RDEPEND="
 "
 BDEPEND="app-arch/zip"
 
+DOCS=( LICENSE.txt ../README.md )
+
 S="${WORKDIR}/slf4j-v_${PV}/${PN}"
 
 JAVA_SRC_DIR="src/main/java"
@@ -53,3 +55,8 @@ src_compile() {
 	# remove org/slf4j/impl/ from the jar file
 	zip -d ${PN}.jar org/slf4j/impl/\* || die "Failed to remove impl files"
 }
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/slf4j-ext/Manifest b/dev-java/slf4j-ext/Manifest
new file mode 100644
index 000000000000..06d1c7bddbe7
--- /dev/null
+++ b/dev-java/slf4j-ext/Manifest
@@ -0,0 +1,3 @@
+DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
+EBUILD slf4j-ext-1.7.36.ebuild 1889 BLAKE2B 0275d6791202f00d7d528a9ea7e38f1b9db1f5b18c6491fc355907772c044b405c1e08a66be7b6e132241d17814dbd2734220f564e8df1cc58fe9c804bd219b3 SHA512 e22e7b37432ab908ef7286ed55e0dab4801b2b5bd45e26cf4928bae2ff5c4f134e01ca27bd0a1d5695cb2a05e5a434a91a43ff87de12af4f03e47b7ceca0bec2
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/myfaces-api/metadata.xml b/dev-java/slf4j-ext/metadata.xml
index 6ef2d50cf07e..37998bf40746 100644
--- a/dev-java/myfaces-api/metadata.xml
+++ b/dev-java/slf4j-ext/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>java@gentoo.org</email>
diff --git a/dev-java/slf4j-ext/slf4j-ext-1.7.36.ebuild b/dev-java/slf4j-ext/slf4j-ext-1.7.36.ebuild
new file mode 100644
index 000000000000..e7829f656f9c
--- /dev/null
+++ b/dev-java/slf4j-ext/slf4j-ext-1.7.36.ebuild
@@ -0,0 +1,74 @@
+# 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/qos-ch/slf4j/archive/v_1.7.36.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild slf4j-ext-1.7.36.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.slf4j:slf4j-ext:1.7.36"
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Extensions to the SLF4J API"
+HOMEPAGE="https://www.slf4j.org"
+SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# ch.qos.cal10n:cal10n-api:0.8.1 -> >=dev-java/cal10n-0.8.1:0
+# commons-lang:commons-lang:2.4 -> >=dev-java/commons-lang-2.6:2.1
+# javassist:javassist:3.4.GA -> >=dev-java/javassist-3.18.2:3
+# org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0
+
+CP_DEPEND="
+	dev-java/cal10n:0
+	dev-java/commons-lang:2.1
+	dev-java/javassist:3
+	~dev-java/slf4j-api-${PV}:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
+# test? org.slf4j:slf4j-reload4j:1.7.36 -> !!!artifactId-not-found!!!
+
+# slf4j-reload4j has further dependencies which are not available in ::gentoo.
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( ../LICENSE.txt ../README.md )
+
+S="${WORKDIR}/slf4j-v_${PV}/${PN}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+# JAVA_TEST_GENTOO_CLASSPATH="junit-4,!!!artifactId-not-found!!!"
+# JAVA_TEST_SRC_DIR="src/test/java"
+# JAVA_TEST_RESOURCE_DIRS=(
+# 	"src/test/resources"
+# )
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/slf4j-nop/Manifest b/dev-java/slf4j-nop/Manifest
index f309d4675ef0..5d5c3f99eaaf 100644
--- a/dev-java/slf4j-nop/Manifest
+++ b/dev-java/slf4j-nop/Manifest
@@ -1,5 +1,5 @@
-DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
 DIST slf4j-1.7.32.tar.gz 2277207 BLAKE2B d16c93ddc4667700a868d872a58b64248c8594fafa37e05ed300a71061c58ec2b3f1e0036326ff42ebdd57d5df3576e8ec2d8ae6090439b5d8e6f1fa0c555332 SHA512 512c33cb812058a7419eb717e55ad9a0522e602339f088e7295bb0bfb3cf39972412a74479896c14e8c48124d8c2adc4c4d78735f4747b4fa9742ddac2ae07fa
-EBUILD slf4j-nop-1.7.30.ebuild 1437 BLAKE2B 653e4cf4692273839bef1fd7660d7e34250f3425ecaf710ecfc479f52df8b8b3cc360af22ca5551ebbf4f7a291135b224791fa0c19b35372cb8308d4bab81c93 SHA512 ae23fec76971365baf682fcef61c508e5cc29f1887e56d3fe5c49dd46debc29fb462bf24caaaf2ff2d4c1a39c6e794f07d70571522087126bf9b3d91dc535ff5
-EBUILD slf4j-nop-1.7.32.ebuild 1300 BLAKE2B bc3efc15a5ad22c8641f65f1aaef45201e424687deeb1710804f2ff4e0ba038acf4a3117dea4191402a47014bd7e906d2f6845747f46502f900c2daf7cba3919 SHA512 2ec7a8c5a9004995006f4d66f0125c90fea9b94382fe401acc5738db5714c0dcb519ac735c294bfb6e46f0883a8e0b15789be3f6554634a9f55863d81c935a7a
+DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
+EBUILD slf4j-nop-1.7.32.ebuild 1301 BLAKE2B 9924a22bb70803bc12abecd59a408cd17b1c0792a025bbf09b0ec2053ad3fe6536e8d880d4001c9a17d17f5e901a48594a3a5a6d2f790a8f1a57279255d119a0 SHA512 421482239d512d1cb830ffbb3a6c3001c7ad8a2a10062950bdee585b2488d8b8b60c2a76f8bdd1a570c463ad3787fd024f775e74a8e7bf460587a14054e1018f
+EBUILD slf4j-nop-1.7.36.ebuild 1290 BLAKE2B e4b8b9deeecfe0e40495d98809ab65bae779ee3dc2e2373ab780a9dbb2a61630ce17234665e14dda9e0ad09d6b8ae0ea384d4f04ed10d13bc44555fe07d6a588 SHA512 7a7edbb2e786d9479d1f393da17c5aba55c0466f93e49a285c3564a261cea3cf6eac067eb0056f6f7889d3f86445f18982f403e5fea67eaee50082fafaa0f94c
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild
deleted file mode 100644
index d20cb0d8c7b6..000000000000
--- a/dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom slf4j-v_1.7.30/slf4j-nop/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-nop-1.7.30.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.slf4j:slf4j-nop:1.7.30"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="SLF4J NOP 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 ~arm ~arm64 ppc64 x86"
-
-# Common dependencies
-# POM: slf4j-v_${PV}/${PN}/pom.xml
-# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
-
-CDEPEND="
-	>=dev-java/slf4j-api-1.7.30:0
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}"
-
-JAVA_GENTOO_CLASSPATH="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"
-JAVA_TEST_SRC_DIR="slf4j-v_${PV}/${PN}/src/test/java"
-JAVA_TEST_EXCLUDES=(
-	# java.lang.AssertionError: expected:<0> but was:<5>
-	"org.slf4j.impl.MultithreadedInitializationTest"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.32.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.32.ebuild
index e480511feede..db043c55fe30 100644
--- a/dev-java/slf4j-nop/slf4j-nop-1.7.32.ebuild
+++ b/dev-java/slf4j-nop/slf4j-nop-1.7.32.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.36.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.36.ebuild
new file mode 100644
index 000000000000..2a1d4df2e424
--- /dev/null
+++ b/dev-java/slf4j-nop/slf4j-nop-1.7.36.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild slf4j-nop-1.7.36.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.slf4j:slf4j-nop:1.7.36"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SLF4J NOP Binding"
+HOMEPAGE="https://www.slf4j.org"
+SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0
+
+CP_DEPEND="
+	~dev-java/slf4j-api-${PV}:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( LICENSE.txt ../README.md )
+
+S="${WORKDIR}/slf4j-v_${PV}/${PN}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/slf4j-simple/Manifest b/dev-java/slf4j-simple/Manifest
index 4ba1d3b6611d..9c0c5b0b0424 100644
--- a/dev-java/slf4j-simple/Manifest
+++ b/dev-java/slf4j-simple/Manifest
@@ -1,5 +1,5 @@
-DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
 DIST slf4j-1.7.32.tar.gz 2277207 BLAKE2B d16c93ddc4667700a868d872a58b64248c8594fafa37e05ed300a71061c58ec2b3f1e0036326ff42ebdd57d5df3576e8ec2d8ae6090439b5d8e6f1fa0c555332 SHA512 512c33cb812058a7419eb717e55ad9a0522e602339f088e7295bb0bfb3cf39972412a74479896c14e8c48124d8c2adc4c4d78735f4747b4fa9742ddac2ae07fa
-EBUILD slf4j-simple-1.7.30-r1.ebuild 2034 BLAKE2B 148495626c3660c22e6b531a77a6284e9c9a5b27a2d34559ceb910221be7d79e7b6929cc5884eaa326f71162921ba02ce4118014b6905701a371ffe761e39e5c SHA512 4a7e43a61501da86e90830dcc298a21ff9e408238678dc9a85fc6c935853dee0f9303e2979346b4f9dee6755e92d2612ae385ae688ed9bb52823302ad5d6c269
-EBUILD slf4j-simple-1.7.32.ebuild 2074 BLAKE2B 958c5c3d66231934fbde4def1dbbef3853e1f7979905a26a1592d9aad3737ed58856dc1fc850547b73cb5c0d9615dd7919942eaec83e86c282dc4cfaf6773b9a SHA512 06bd156f6abce57ae27919ef4a62a6d87aff65b868bf18f204175b11482e57637428427e3e546d97cc51486f8b5a3e803a4e1ffa9f53cba8ead304cfe2b73cf5
+DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
+EBUILD slf4j-simple-1.7.32.ebuild 2070 BLAKE2B 667450fd16ceadd7db4f9e36554f6b04f6c9af3789c70d43a47dd854557c479f445c082403305a46aac48c68ea40af0851a538a2bcf934a2ce430803321d643b SHA512 a25934419b0a2d871540ee12d014affaf1d1bb470d0329b4bc88cbbc01f1d9f2c4a56277f7f1841b53d8a4c298f2d72af867058c81b8683bd8297ba4ec2e6d98
+EBUILD slf4j-simple-1.7.36.ebuild 1960 BLAKE2B 36fa684f82aa54402087b117f10576bbacf8344cd3fef736fef68d7aa19820afd86842b524923b1917cc08a7af321b4ee98f5b89b57336fa83daf7646f233aab SHA512 5c447b402760cf02c93d8f7db41a4dd6ccab015fdfb896341de27ef95adc6f3a008c6b5c79d2e935f521f7e31d465818554976a108e3e5ef5c6a85a32cee36e9
 MISC metadata.xml 367 BLAKE2B 086e22a444bd6a3dfab4f0a74e4900ed1f1a7be81b47932e192ebe4d6d1e8d65b63f064848e5cd3f0ad03a40c54e863d48acad905e09b918b9f24fe255820883 SHA512 d80fd3fc9ad1da46807f41251cf2a9bc384ef6566c24627482b4d7d5d3c46c672dcdd19037fd80a482079af86662fd07d35cb33b34c2e14911de7f3fc6b5e3a4
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.30-r1.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.30-r1.ebuild
deleted file mode 100644
index 1cea0263a4b9..000000000000
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.30-r1.ebuild
+++ /dev/null
@@ -1,74 +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-simple/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-simple-1.7.30.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.slf4j:slf4j-simple:1.7.30"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="SLF4J Simple 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 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: slf4j-v_${PV}/${PN}/pom.xml
-# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
-
-CDEPEND="
-	>=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}/slf4j-v_${PV}/${PN}"
-
-JAVA_GENTOO_CLASSPATH="slf4j-api"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,slf4j-api"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
-	# java.lang.InstantiationException
-	"org.slf4j.helpers.MultithreadedInitializationTest"
-
-	# java.lang.AssertionError: 1284 < 1263+16
-	"org.slf4j.helpers.SimpleLoggerMultithreadedInitializationTest"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-	cp "../slf4j-api/src/test/java/org/slf4j/helpers/MultithreadedInitializationTest.java" \
-		"${JAVA_TEST_SRC_DIR}/org/slf4j/helpers/" || die
-	cp "../slf4j-api/src/test/java/org/slf4j/LoggerAccessingThread.java" \
-		"${JAVA_TEST_SRC_DIR}/org/slf4j/" || die
-}
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.32.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.32.ebuild
index c0eeacfedb10..a98ef1a0d287 100644
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.32.ebuild
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.32.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild
new file mode 100644
index 000000000000..03237365c3cc
--- /dev/null
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild
@@ -0,0 +1,77 @@
+# 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/qos-ch/slf4j/archive/v_1.7.36.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild slf4j-simple-1.7.36.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.slf4j:slf4j-simple:1.7.36"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SLF4J Simple binding"
+HOMEPAGE="https://www.slf4j.org"
+SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0
+
+CP_DEPEND="
+	~dev-java/slf4j-api-${PV}:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
+# test? org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		~dev-java/slf4j-api-${PV}:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( LICENSE.txt ../README.md )
+
+S="${WORKDIR}/slf4j-v_${PV}/${PN}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,slf4j-api"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# java.lang.InstantiationException
+	"org.slf4j.helpers.MultithreadedInitializationTest"
+
+	# java.lang.AssertionError: 1284 < 1263+16
+	"org.slf4j.helpers.SimpleLoggerMultithreadedInitializationTest"
+)
+
+src_prepare() {
+	default
+	java-pkg_clean
+	cp {../slf4j-api/,}src/test/java/org/slf4j/helpers/MultithreadedInitializationTest.java || die
+	cp {../slf4j-api/,}src/test/java/org/slf4j/LoggerAccessingThread.java  || die
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest
index 98475bac6676..bd6d8353499c 100644
--- a/dev-java/snappy/Manifest
+++ b/dev-java/snappy/Manifest
@@ -1,6 +1,9 @@
-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.1.7.8-gentoo.patch 832 BLAKE2B 0e3a5061c0b410b7609ac49ec3b610ca7934c664398488020a15033fabf3c1576ee9900359948e69e2e86c54a56709f98b68482a75dff156a77874ffaa966674 SHA512 2a75eebf1851bebda7d6204c43503b6464416adff12cf5de5e35825fd6a9c43495419e886343cf3566f6ae437295eff2098aea0f17314a5c138011a3abf6f9b9
+AUX 1.1.7.8-java-version-target.patch 1875 BLAKE2B 6e2b66e642806acbf3de146fa853bb642764eb73ebb3489edd5208622f15fa9bc037bcb26447c4f45cfb362ce72910943b76dd8c1a6cf5f61fd4b05f6929a974 SHA512 5a60cc590dd10829487108c04c82a10b207fe95524f94163be967f557782537c0e19176a44782a1189f0e72e14dbd62a9c0f2f8415476d0fc133e040881a7d61
+AUX 1.1.7.8-remove-perl-usage.patch 1720 BLAKE2B f6e1462356bfa94e946fb2e8a4200bd62f17e56bd64cb115e7ee1826dce3d79286e0e192443d13e0bd16018e6450d08d772f0ddf06183d5a86bb419ccd710543 SHA512 0ed15f3bd969ce20b1ea9f3ccf73cdfecfe4568719840a2a244617fd12f9dc9ab511678782127c53456b64494c043adfa61b9fb4ca3d716b99f01b70098029d0
+AUX 1.1.7.8-unbundle-bitshuffle.patch 1006 BLAKE2B 99b88fd2af02ff6d95d90ec2e302593c7ae00691156b283e11425677f904847d2809ce91d7094de8a5ec759595e721bf0f80d3deadd56f0f05e8d4ae1d4c4613 SHA512 dd4877f023095f7d41e6d22213d1916ae17ec8a88977354d5e1662fa3e555f89bc27def9537cd6ffd07a75794c25719379189b14a0db481df1c2e729525b12f0
+AUX 1.1.7.8-unbundle-snappy.patch 1820 BLAKE2B ec2f5724675cef1a796678f5b12ccd4b49c2415fcfd98e2a3f9214bb63477bfd9bed93999c2f12b2f0e8b5aedb705299bf37e52a16833797a745bf4e1eeecdd9 SHA512 408c09f01cb65dcf17b7ecd5542cd622b6296ab6d433be79ff2a8d03dc4e8f8b9c48165d95afa0b865c8ab196c4470e93f5b07e9eeded1f492d1ef2d8d91fa82
 AUX 1.x-build.xml 8496 BLAKE2B 0ab98a4149d0d7b294efec29374c59af8599362fa40d04737d50d1106157d8e604e17ce06c9180c2d9ca2b612cb5d025a111fe620739f7109a0c384ae940d4dc SHA512 ed47379879bab5cbaa4111616c3cca526725e4fa3d8d42da72d19a21738cc42826e37756a181e6d541f27aa4abe7f2353be90c51f4d89d04413501e6ccdb4cb0
-DIST snappy-java-1.1.0.1.tar.gz 4909520 BLAKE2B 65daf3d01f1cb46dd0d51609e2d95fc954d56e41fbb2d22e9eca24fad16a6d4ba16083e633fb13e68dacf6c2fb0d10ec6fb1e6dcdda6dc611b58b172710fcd62 SHA512 32d0afce880ecccd814f7738eb375a13bd533998c73d79908964061337730ad76fb4794f78fd1fcdc4a4562db57cbc4c6f912d9f3351b1d75b12ce3224ec387e
-EBUILD snappy-1.1.0.1.ebuild 1697 BLAKE2B 303375436532cd1e63fb71b70230f072f7678519b39415e11137cd040ab0562e4fa850c980b0c7c9c343e63ef8aedf1da9311f33ffbecbbd72ba725e79b5bf86 SHA512 3f7c40dd83d8a7205640663a14f8ef31f7944000d8011019690a7c37b4fdb32e6c541139cdae2ac67ba02f666d61c98351cc08aeff6816803bdb3c2f7433b86d
+DIST snappy-java-1.1.7.8.tar.gz 3558859 BLAKE2B 871f4190212399c5bd34a72766d7f3abca9a09608d9acddc126905bcdafc723613aa33d0cdb59419e6bfba46ff27e91f5ca5382073dd895d5601f6d84929ef96 SHA512 8129d4ae2abd78f967c07e7f13df8cb9043cc34bd8346be28625a3d2bea06674ce6dd09b521af2b7053b25d0132a0e822b78c06e09bacd0067ba8178bd167691
+EBUILD snappy-1.1.7.8.ebuild 2569 BLAKE2B 5744632d7f2d1931790e0b5ef481444653eb3711e4311688f6cda071b9b2f339d2743e8f0a2cd299ba93164e8c1e135110c315256f3b6b0330ce721dd2964b89 SHA512 f274294167f77a7f9c96868117c4ee75f1e0fa062bbab9027f12bf98333fcb0bf6ae7bb0e5692bfba0193ce423598674bc6b982bbb700e3255ce557d4c7c6572
 MISC metadata.xml 320 BLAKE2B 5e3039edeec0b66e6b896158777909fdfed881f06def61b5e3424baeb51ea898cb3cb273e6ddc939b7efea88860a945b5f29da513be22ee6b601551a6e02170a SHA512 c2e9282ce950b419588d080145e85e63e6491500edce141678a4aaae65a43d945694ad992dd4d485c94748e26ac225e58177fcff11db3430035b837741ec45af
diff --git a/dev-java/snappy/files/1.1.0.1-gentoo.patch b/dev-java/snappy/files/1.1.0.1-gentoo.patch
deleted file mode 100644
index 61403dd9167f..000000000000
--- a/dev-java/snappy/files/1.1.0.1-gentoo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 04f0435..0249d09 100644
---- a/Makefile
-+++ b/Makefile
-@@ -60,8 +60,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.1.0.1-unbundle-snappy.patch b/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch
deleted file mode 100644
index 17fb2e1583ed..000000000000
--- a/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 0821c87..04f0435 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)
-@@ -46,7 +47,8 @@ src/main/resources/org/xerial/snappy/SnappyNativeLoader.bytecode: src/main/resou
- 	$(JAVAC) -source 1.5 -target 1.5 -d $(TARGET)/temp $<
- 	cp $(TARGET)/temp/org/xerial/snappy/SnappyNativeLoader.class $@
- 
--$(SNAPPY_SRC): $(SNAPPY_UNPACKED)
-+$(SNAPPY_SRC):
-+# $(SNAPPY_UNPACKED)
- 
- $(SNAPPY_OUT)/%.o : $(SNAPPY_SRC_DIR)/%.cc
- 	@mkdir -p $(@D)
-@@ -58,7 +60,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: 
-@@ -73,14 +75,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: native $(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)
diff --git a/dev-java/snappy/files/1.1.7.8-gentoo.patch b/dev-java/snappy/files/1.1.7.8-gentoo.patch
new file mode 100644
index 000000000000..b4a58e6482be
--- /dev/null
+++ b/dev-java/snappy/files/1.1.7.8-gentoo.patch
@@ -0,0 +1,28 @@
+--- a/Makefile
++++ b/Makefile
+@@ -124,11 +124,7 @@
+ 	$(CXX) $(CXXFLAGS) -c $< -o $@
+ 
+ $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
+-	$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy -lbitshuffle
+-    # Workaround for strip Protocol error when using VirtualBox on Mac
+-	cp $@ /tmp/$(@F)
+-	$(STRIP) /tmp/$(@F)
+-	cp /tmp/$(@F) $@
++	$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy -lbitshuffle $(LDFLAGS)
+ 
+ clean-native:
+ 	rm -rf $(SNAPPY_OUT)
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -274,8 +274,8 @@
+ 
+ CXX        := $($(os_arch)_CXX)
+ STRIP     := $($(os_arch)_STRIP)
+-CXXFLAGS    := $($(os_arch)_CXXFLAGS)
+-LINKFLAGS := $($(os_arch)_LINKFLAGS)
++CXXFLAGS    := $($(os_arch)_CXXFLAGS) $(CXXFLAGS)
++LINKFLAGS := $($(os_arch)_LINKFLAGS) $(LDFLAGS)
+ LIBNAME   := $($(os_arch)_LIBNAME)
+ SNAPPY_FLAGS := $($(os_arch)_SNAPPY_FLAGS)
+ 
diff --git a/dev-java/snappy/files/1.1.7.8-java-version-target.patch b/dev-java/snappy/files/1.1.7.8-java-version-target.patch
new file mode 100644
index 000000000000..a852d0bdb807
--- /dev/null
+++ b/dev-java/snappy/files/1.1.7.8-java-version-target.patch
@@ -0,0 +1,47 @@
+From e7d1d0167426790ba9b1d28ffa11e0d0c523f3b5 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sun, 6 Feb 2022 08:29:20 -0800
+Subject: [PATCH] Allow Java version target to be specified using variable
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ Makefile        | 4 ++--
+ Makefile.common | 2 ++
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1d82a8a..8eaa319 100644
+--- a/Makefile
++++ b/Makefile
+@@ -92,13 +92,13 @@ snappy-header: $(SNAPPY_CMAKE_CACHE)
+ 
+ $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class: $(SRC)/org/xerial/snappy/SnappyNative.java
+ 	@mkdir -p $(TARGET)/jni-classes
+-	$(JAVAC) -source 1.7 -target 1.7 -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $<
++	$(JAVAC) -source $(JAVA_SOURCE) -target $(JAVA_TARGET) -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $<
+ 
+ $(SRC)/org/xerial/snappy/SnappyNative.h: $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class
+ 
+ $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class: $(SRC)/org/xerial/snappy/BitShuffleNative.java
+ 	@mkdir -p $(TARGET)/jni-classes
+-	$(JAVAC) -source 1.7 -target 1.7 -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $<
++	$(JAVAC) -source $(JAVA_SOURCE) -target $(JAVA_TARGET) -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $<
+ 
+ $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class
+ 
+diff --git a/Makefile.common b/Makefile.common
+index 534bc4f..86d839b 100755
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -10,6 +10,8 @@ endif
+ JAVA  := "$$JAVA_HOME/bin/java"
+ JAVAC := "$$JAVA_HOME/bin/javac"
+ JAVAH := "$$JAVA_HOME/bin/javah"
++JAVA_SOURCE := 1.8
++JAVA_TARGET := 1.8
+ 
+ LITTLE_ENDIAN	:= "Little Endian"
+ BIG_ENDIAN	:= "Big Endian"
+-- 
+2.34.1
+
diff --git a/dev-java/snappy/files/1.1.7.8-remove-perl-usage.patch b/dev-java/snappy/files/1.1.7.8-remove-perl-usage.patch
new file mode 100644
index 000000000000..0c64240f12a3
--- /dev/null
+++ b/dev-java/snappy/files/1.1.7.8-remove-perl-usage.patch
@@ -0,0 +1,38 @@
+From 1413a33ef00e722bacab2e17297b89bb55b2bd49 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Tue, 21 Dec 2021 07:33:52 -0800
+Subject: [PATCH] Makefile: Eliminate usage of the `perl` command
+
+dev-lang/perl is not an implicit system dependency, so we cannot assume
+its existence during build time.  The Makefile uses the `perl` command
+to generate the name of the JAR being built with it, but the ebuild uses
+Ant and a custom build.xml to build the JAR, and it uses the Makefile to
+build only the JNI part, thus the name of JAR in the Makefile will not
+be used.  For this reason, this package can still be built and installed
+without dev-lang/perl.  However, a QA notice for absent `perl` command
+will appear in this case.  Rather than declaring dev-lang/perl as a
+dependency, it might be better to eliminate usage of the `perl` command
+if it is never used in any meaningful way.
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index a7bd87c..d1d3d32 100644
+--- a/Makefile
++++ b/Makefile
+@@ -138,7 +138,8 @@ NATIVE_DIR:=src/main/resources/org/xerial/snappy/native/$(OS_NAME)/$(OS_ARCH)
+ NATIVE_TARGET_DIR:=$(TARGET)/classes/org/xerial/snappy/native/$(OS_NAME)/$(OS_ARCH)
+ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
+ 
+-snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s+\"(.*)\"/\1/" version.sbt | sed -e "/^$$/d")
++#snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s+\"(.*)\"/\1/" version.sbt | sed -e "/^$$/d")
++snappy-jar-version:=snappy
+ 
+ native: jni-header snappy-header $(NATIVE_DLL)
+ native-nocmake: jni-header $(NATIVE_DLL)
+-- 
+2.32.0
+
diff --git a/dev-java/snappy/files/1.1.7.8-unbundle-bitshuffle.patch b/dev-java/snappy/files/1.1.7.8-unbundle-bitshuffle.patch
new file mode 100644
index 000000000000..e4f699ad123e
--- /dev/null
+++ b/dev-java/snappy/files/1.1.7.8-unbundle-bitshuffle.patch
@@ -0,0 +1,26 @@
+--- a/Makefile
++++ b/Makefile
+@@ -36,11 +36,11 @@
+ 
+ $(SNAPPY_OUT)/%.o: $(BITSHUFFLE_SRC_DIR)/%.c
+ 	@mkdir -p $(@D)
+-	$(CXX) $(CXXFLAGS) $(CXXFLAGS_BITSHUFFLE) -c $< -o $@
++	$(CXX) $(CXXFLAGS) -c $< -o $@
+ 
+-SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) $(patsubst %.c,%.o,$(BITSHUFFLE_C)) SnappyNative.o BitShuffleNative.o)
++SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) SnappyNative.o BitShuffleNative.o)
+ 
+-CXXFLAGS:=$(CXXFLAGS) -I$(SNAPPY_SRC_DIR) -I$(SNAPPY_OUT) -I$(BITSHUFFLE_SRC_DIR)
++CXXFLAGS:=$(CXXFLAGS) -I$(SNAPPY_SRC_DIR) -I$(SNAPPY_OUT)
+ 
+ ifndef CXXFLAGS_BITSHUFFLE
+   ifeq ($(OS_NAME)-$(OS_ARCH),Linux-x86_64)
+@@ -124,7 +124,7 @@
+ 	$(CXX) $(CXXFLAGS) -c $< -o $@
+ 
+ $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
+-	$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
++	$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy -lbitshuffle
+     # Workaround for strip Protocol error when using VirtualBox on Mac
+ 	cp $@ /tmp/$(@F)
+ 	$(STRIP) /tmp/$(@F)
diff --git a/dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch b/dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch
new file mode 100644
index 000000000000..6113019be3ea
--- /dev/null
+++ b/dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch
@@ -0,0 +1,54 @@
+diff --git a/Makefile b/Makefile
+index 0821c87..04f0435 100644
+--- a/Makefile
++++ b/Makefile
+@@ -8,7 +8,8 @@
+ 
+ SNAPPY_OUT:=$(TARGET)/snappy-$(SNAPPY_VERSION)-$(os_arch)
+ SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(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-$(SNAPPY_VERSION)
+ SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC))
+ SNAPPY_GIT_REPO_URL:=https://github.com/google/snappy
+@@ -100,7 +101,8 @@
+ 
+ $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class
+ 
+-$(SNAPPY_SRC): $(SNAPPY_GIT_UNPACKED)
++$(SNAPPY_SRC):
++# $(SNAPPY_GIT_UNPACKED)
+ 
+ # aarch64 can use big-endian optimzied code
+ ifeq ($(OS_ARCH),aarch64)
+@@ -122,7 +124,7 @@
+ 	$(CXX) $(CXXFLAGS) -c $< -o $@
+ 
+ $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
+-	$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS)
++	$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
+     # Workaround for strip Protocol error when using VirtualBox on Mac
+ 	cp $@ /tmp/$(@F)
+ 	$(STRIP) /tmp/$(@F)
+@@ -140,9 +142,9 @@
+ #snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s+\"(.*)\"/\1/" version.sbt | sed -e "/^$$/d")
+ snappy-jar-version:=snappy
+ 
+-native: jni-header snappy-header $(NATIVE_DLL)
+-native-nocmake: jni-header $(NATIVE_DLL)
+-snappy: native $(TARGET)/$(snappy-jar-version).jar
++native: $(NATIVE_DLL)
++native-nocmake: $(NATIVE_DLL)
++snappy: native
+ 
+ native-all: native win32 win64 native-arm linux32 linux64 linux-ppc64le
+ 
+@@ -151,6 +153,7 @@
+ 	cp $(SNAPPY_OUT)/$(LIBNAME) $@
+ 	@mkdir -p $(NATIVE_TARGET_DIR)
+ 	cp $(SNAPPY_OUT)/$(LIBNAME) $(NATIVE_TARGET_DIR)/$(LIBNAME)
++	cp $< $(TARGET)/
+ 
+ package: $(TARGET)/$(snappy-jar-version).jar
+ 
diff --git a/dev-java/snappy/snappy-1.1.0.1.ebuild b/dev-java/snappy/snappy-1.1.0.1.ebuild
deleted file mode 100644
index 443002b9ab82..000000000000
--- a/dev-java/snappy/snappy-1.1.0.1.ebuild
+++ /dev/null
@@ -1,72 +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 test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="${PN}-java"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Snappy compressor/decompressor for Java"
-HOMEPAGE="https://github.com/xerial/snappy-java/"
-SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${PN}-java-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.1"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-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
-		dev-java/plexus-classworlds:0
-	)
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="osgi-core-api"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,xerial-core,plexus-classworlds"
-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() {
-	local jniext=.so
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		jniext=.jnilib
-		# avoid install_name check failure
-		install_name_tool -id @loader_path/libsnappyjava${jniext} \
-			"${S}"/target/libsnappyjava${jniext}
-	fi
-	java-pkg_doso "${S}"/target/libsnappyjava${jniext}
-	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/snappy/snappy-1.1.7.8.ebuild b/dev-java/snappy/snappy-1.1.7.8.ebuild
new file mode 100644
index 000000000000..bb7a64023a0a
--- /dev/null
+++ b/dev-java/snappy/snappy-1.1.7.8.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.xerial.snappy:snappy-java:1.1.7.8"
+
+inherit java-pkg-2 java-ant-2 toolchain-funcs
+
+MY_PN="${PN}-java"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Snappy compressor/decompressor for Java"
+HOMEPAGE="https://github.com/xerial/snappy-java/"
+SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.1"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Tests require org.apache.hadoop:hadoop-common:2.7.*, which is yet to be
+# packaged.  Some extra steps are required before running the tests:
+# 1. Download hadoop-common 2.7.x from https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-common
+# 2. Set EANT_GENTOO_CLASSPATH_EXTRA to the path to hadoop-common-2.7.*.jar
+# 3. Set ALLOW_TEST="all"
+RESTRICT="test"
+
+CDEPEND="dev-java/osgi-core-api:0
+	app-arch/snappy
+	dev-libs/bitshuffle"
+
+DEPEND=">=virtual/jdk-1.8:*
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/commons-io:1
+		dev-java/commons-lang:2.1
+		dev-java/plexus-classworlds:0
+		dev-java/xerial-core:0
+	)"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
+EANT_GENTOO_CLASSPATH="osgi-core-api"
+EANT_TEST_GENTOO_CLASSPATH="
+	${EANT_GENTOO_CLASSPATH}
+	commons-io-1
+	commons-lang-2.1
+	plexus-classworlds
+	xerial-core
+"
+
+src_prepare() {
+	cp "${FILESDIR}/1.x-build.xml" build.xml || die
+	rm -r src/main/resources/org/xerial/snappy/native || die
+	eapply "${FILESDIR}/${PV}-java-version-target.patch"
+	eapply "${FILESDIR}/${PV}-remove-perl-usage.patch"
+	eapply "${FILESDIR}/${PV}-unbundle-snappy.patch"
+	eapply "${FILESDIR}/${PV}-unbundle-bitshuffle.patch"
+	eapply "${FILESDIR}/${PV}-gentoo.patch"
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	emake \
+		CXX="$(tc-getCXX)" \
+		JAVA_SOURCE="$(java-pkg_get-source)" \
+		JAVA_TARGET="$(java-pkg_get-target)"
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	cp -r src/test/resources/org/xerial/snappy/* \
+		src/test/java/org/xerial/snappy || die
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local jniext=.so
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		jniext=.jnilib
+		# avoid install_name check failure
+		install_name_tool -id "@loader_path/libsnappyjava${jniext}" \
+			"target/libsnappyjava${jniext}"
+	fi
+	java-pkg_doso "target/libsnappyjava${jniext}"
+	java-pkg_dojar "target/${PN}.jar"
+
+	use source && java-pkg_dosrc src/main/java/*
+	use doc && java-pkg_dojavadoc target/site/apidocs
+}
diff --git a/dev-java/spin/Manifest b/dev-java/spin/Manifest
index 9c96fb480d14..73e38c6b7e0a 100644
--- a/dev-java/spin/Manifest
+++ b/dev-java/spin/Manifest
@@ -1,5 +1,3 @@
-AUX 1.5-build.xml 8638 BLAKE2B ef4667e88f82c6284c592574822b88fe66fc5ca22626fd12164be6e18315b139e18636420cb7bb832167fe26f2b2bbf48a2e928a169f094786d770816cfd157d SHA512 8126661b264cac4a86dfbd646a8e88598075173479d1d952dcaa3c756793394bb50ff1bd5a57f4a4a86cad99d4b49cd5bd398ad608fb199a12adeecb64228583
-AUX 1.5-maven-build.properties 673 BLAKE2B b014639d8fccc8845dc632a06b25f8a0a4c00ed96b76ac8d8ff74cc2957d98d56f585a53b2cd3028d1d9d6d9b0a96c3fc29dc85dddf21678d6e8f60fcbe73a6f SHA512 1004515f5a89a2d22409cd7553fb11767a4580d1288393516f4dc3c0efa0c149d7bc3e46fac93800e6481fc7885302730e52e9e518d6d7224a0d9220d0f3c3a2
 DIST spin-1.5-all.zip 482286 BLAKE2B d1b1de891290ed465f2886bea046d9aa106626be91e5ac37dcd795bb0ef5e558b3d81b1e86cfb168d660f4c2884d321d560bece50645822a0334848225c6638b SHA512 ce1fad3b138781359d472727b186722d6f1f23b7002dd1ada294efd80b3a9caf5de15207cdd682fcbfcafa85c63895c7dd9683fefb5ce5b09cc4115ae3733466
-EBUILD spin-1.5-r1.ebuild 1012 BLAKE2B dbcc56a3a70e6f85803ff8ed8872aff88d575831c437ae255030f3442abaf52eccc256b3bd9ac797e8f0c1d6abb76328abffaa1b222dd390bda8b31f7b33e58d SHA512 1e5a42026101717f93dcb30384bbedc74c222f5acc34042f09630df8ea3f869d9b6731526bc7af1e377a3ba7a7319f70bfe0bd769c12a4ff72bc01e715c4a707
+EBUILD spin-1.5-r2.ebuild 3049 BLAKE2B c93e50ea27af69cea44a6b34ef6afc72eee4b49eabb5a85f0d966828c760e4e354cb6aa8e71c7d7a71ace9e23cab2ad4815031e7a0d5fdbbf04677ee308c9e58 SHA512 496cc013453570add3ffbe23ea5800fe8e43416a31007034ed9c2b401b4f0062aee915cbb98c3e65ac954fc8f35569a889b6d5cd5a6f41420edce80e09a4faa4
 MISC metadata.xml 311 BLAKE2B 4b74521bd09bf6dc5cc23756c20b979e6bd0def2976e74cc5ed62dca4482e460bbd43c98517828a0396abce3623cf16cffff230c8a92015a9d9894196f9480ef SHA512 fa0bd5bc4452ece5f45815567016bb38b79c420ea5050f66aca8062839360d0c4e563f56316ff1f98e02e088b3a7e15d8bfd583c94fb494df643d24ba3b7fb90
diff --git a/dev-java/spin/files/1.5-build.xml b/dev-java/spin/files/1.5-build.xml
deleted file mode 100644
index ac58aec49131..000000000000
--- a/dev-java/spin/files/1.5-build.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 4/20/07 5:09 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="spin-from-maven" default="dist" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environnement properties                                         -->
-  <!-- ====================================================================== -->
-
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="spin-1.5"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/java"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/main/java"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.settings.offline" value="true"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.4" 
-           verbose="false" 
-           fork="false" 
-           source="1.4">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}">
-        <include name="**/*"/>
-        <exclude name="**/*.java"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="junit-present, compile" 
-          description="Compile the test code" 
-          if="junit.present">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.classpath}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.4" 
-           verbose="false" 
-           fork="false" 
-           source="1.4">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}">
-        <include name="**/*"/>
-        <exclude name="**/*.java"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="junit-present, compile-tests" 
-          if="junit.present" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <pathelement path="${gentoo.classpath}"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/*Test.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="junit-present" 
-          depends="test-junit-present" 
-          unless="junit.present">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Dist target                                                            -->
-  <!-- ====================================================================== -->
-
-  <target name="dist" depends="package,test" description="Package the application and run tests"/>
-</project>
-\ No newline at end of file
diff --git a/dev-java/spin/files/1.5-maven-build.properties b/dev-java/spin/files/1.5-maven-build.properties
deleted file mode 100644
index 1d9c9b68034b..000000000000
--- a/dev-java/spin/files/1.5-maven-build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-#Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!
-#Fri Apr 20 17:09:04 EEST 2007
-project.build.outputDirectory=${maven.build.outputDir}
-project.build.directory=${maven.build.dir}
-maven.test.reports=${maven.build.dir}/test-reports
-maven.build.finalName=spin-1.5
-maven.reporting.outputDirectory=${maven.build.dir}/site
-maven.build.testResourceDir.0=src/test/java
-maven.build.outputDir=${maven.build.dir}/classes
-maven.build.resourceDir.0=src/main/java
-maven.build.testOutputDir=${maven.build.dir}/test-classes
-maven.settings.offline=false
-maven.build.dir=target
-maven.settings.interactiveMode=true
-maven.build.testDir.0=src/test/java
-maven.build.srcDir.0=src/main/java
diff --git a/dev-java/spin/spin-1.5-r1.ebuild b/dev-java/spin/spin-1.5-r1.ebuild
deleted file mode 100644
index ba1292591bb0..000000000000
--- a/dev-java/spin/spin-1.5-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Transparent threading solution for non-freezing Swing applications"
-HOMEPAGE="http://spin.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}-all.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-COMMON_DEP="dev-java/cglib:3"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	cp "${FILESDIR}/${PV}-build.xml" build.xml || die
-	cp "${FILESDIR}/${PV}-maven-build.properties" maven-build.properties || die
-	rm -v lib/*.jar || die
-	java-pkg_filter-compiler jikes
-}
-
-EANT_GENTOO_CLASSPATH="cglib-3"
-
-# Needs X
-RESTRICT="test"
-
-src_test() {
-	ANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/spin/spin-1.5-r2.ebuild b/dev-java/spin/spin-1.5-r2.ebuild
new file mode 100644
index 000000000000..a8557a83ef98
--- /dev/null
+++ b/dev-java/spin/spin-1.5-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://sourceforge/project/spin/spin/v1.5/spin-1.5-all.zip --slot 0 --keywords "~amd64 ~x86" --ebuild spin-1.5-r2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="spin:spin:1.5"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Transparent threading solution for non-freezing Swing applications."
+HOMEPAGE="http://spin.sourceforge.net"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/v${PV}/${P}-all.zip"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+# Common dependencies
+# POM: pom.xml
+# cglib:cglib-nodep:2.1_3 -> !!!artifactId-not-found!!!
+
+CP_DEPEND="
+	dev-java/cglib:3
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+BDEPEND="app-arch/unzip"
+
+DOCS=( license.txt )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/java"
+
+src_test() {
+	# 1) testEDTNotBlockedDuringInvocation(spin.off.SpinOffTest)java.lang.Error:
+	# Unable to make void java.awt.EventDispatchThread.pumpEvents(java.awt.Conditional) accessible:
+	# module java.desktop does not "opens java.awt" to unnamed module @42bb2aee
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge "17" ; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.desktop/java.awt=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+	fi
+
+	# There was 1 error:
+	# 1) testNonAccessibleInterface(spin.JDKProxyFactoryTest)java.awt.HeadlessException
+	#         at java.desktop/java.awt.GraphicsEnvironment.checkHeadless(GraphicsEnvironment.java:166)
+	#         at java.desktop/java.awt.Window.<init>(Window.java:553)
+	#         at java.desktop/java.awt.Frame.<init>(Frame.java:428)
+	#         at java.desktop/java.awt.Frame.<init>(Frame.java:393)
+	#         at java.desktop/javax.swing.JFrame.<init>(JFrame.java:180)
+	#         at spin.JDKProxyFactoryTest$1.<init>(JDKProxyFactoryTest.java:44)
+	#         at spin.JDKProxyFactoryTest.testNonAccessibleInterface(JDKProxyFactoryTest.java:44)
+	#         at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	#         at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
+	#         at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+
+	# JAVA_TEST_RUN_ONLY="spin.JDKProxyFactoryTest"
+	# java-pkg-simple_src_test
+
+	JAVA_TEST_RUN_ONLY="spin.CGLibProxyFactoryTest"
+	java-pkg-simple_src_test
+
+	JAVA_TEST_RUN_ONLY="spin.off.AWTReflectDispatcherTest"
+	java-pkg-simple_src_test
+
+	JAVA_TEST_RUN_ONLY="spin.off.SpinOffTest"
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/stax2-api/Manifest b/dev-java/stax2-api/Manifest
new file mode 100644
index 000000000000..b266cce2a596
--- /dev/null
+++ b/dev-java/stax2-api/Manifest
@@ -0,0 +1,3 @@
+DIST stax2-api-4.2.1.tar.gz 128806 BLAKE2B 64254b0bbd269e5d62931280773e0e7e7915204ce41a86eb10a08e3d8d27691d48094e17a8deb0ca3fa916b413800d75969af05db1ba897277c0dae13771e3b4 SHA512 f6fada289e75db0c4c911d3f70e8b8167c96342390168c87563ab4e3e1498360d47c393407cd8ae670716fcb7e1c83d6a8d38364d00648ed380844cf08bdc063
+EBUILD stax2-api-4.2.1.ebuild 1044 BLAKE2B bcd69c387fc42a8b474b408fec694d46def41c97b06d689d0748c9f399325d31c808301247b8fd0b4d4f596c3bb35e3d9a44ed1b90c5bbd0a3cdc836b851fb75 SHA512 9655f78987b664063072b6ad8f080555328192ffc401dc85a9d4e4d8265c940d7232f1ed76f3cab35cdfcb3369484c687504138eac6db0c95fc06b18d219ddcb
+MISC metadata.xml 534 BLAKE2B 53aec30f2ec738fa257cf67be461177475f4706f625a41ec72a51bcc97e16e8fe2ddad45f74e749230e7f668dbb6857d66409413ce462eb13cef793a955e94b2 SHA512 ed2bb40dbbe18087f3b1647878f072be88c57034c9af03cafb4ceebb9f11e84e9309c2a316299938ebbf2e872eed75de19ceb31efc88849b73b527918d540ba9
diff --git a/dev-java/stax2-api/metadata.xml b/dev-java/stax2-api/metadata.xml
new file mode 100644
index 000000000000..995e89fc3df7
--- /dev/null
+++ b/dev-java/stax2-api/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		stax2 API is an extension to basic Stax 1.0 API that adds significant new functionality, such as full-featured bi-direction validation interface and high-performance Typed Access API.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/FasterXML/stax2-api/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/stax2-api/stax2-api-4.2.1.ebuild b/dev-java/stax2-api/stax2-api-4.2.1.ebuild
new file mode 100644
index 000000000000..e0db485cf34e
--- /dev/null
+++ b/dev-java/stax2-api/stax2-api-4.2.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/stax2-api/archive/refs/tags/stax2-api-4.2.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild stax2-api-4.2.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.codehaus.woodstox:stax2-api:4.2.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="stax2 API is an extension to basic Stax 1.0 API"
+HOMEPAGE="https://github.com/FasterXML/stax2-api"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( README.md release-notes/VERSION )
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index 606801ffc188..61b317cf6a38 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,12 +1,7 @@
-AUX 4.0.8-r1-test-fixes.patch 3059 BLAKE2B 8b278f4d13067c5abc4994aca7cf7a011712d59fbe4595eb86a07a095680bba4a14fb5f1ae4ccee2705b21e0ad857562725c4e773a361eb4d392d64e8031dd09 SHA512 d1ed78332950c1ee81846f51086acec62e19c84293cf45d01a07379e4e96d0dfcfc3af933e78eb986d087a1083eeeead0d5bd80c2ed040861ca931df112d795d
-AUX stringtemplate-4.0.8-fix-tests.patch 2956 BLAKE2B 698727b248f9ebbeda46f099c3880b104a6713c600d820f7576757ba69f72d207ff4ecb7271afd8113a4250d51dd63d16f908a3f2aeff76f6112637934dce411 SHA512 29d33536a6abbbb3b0c99263b15a3ba4cc90b5beb03965884598c5d946c41a4727d582b5143d3e7356c9f22fc148ad899efa3281927bf3aca0c4d9dc758d1a8e
 AUX stringtemplate-4.3.1-BaseTest-javac-source-target.patch 1318 BLAKE2B 6b93c9591b220584c8dca11a10c7012801f54d922a2dc938ce87cb7c996b0eec1124fb5ec57725a71c482c18922f8bae585f7aacc5609ac9e40715553f96d8e8 SHA512 618b10a46373cc0be12e3bbc6cf4d2177b300b52e65385d1babd1af67236f080a848ab61271c84102a305552de48071945e5f66c40aa084bf4aa8705ed92a267
 DIST ST4-4.3.1-sources.jar 198002 BLAKE2B d1bd78dac71800e342291920ba78ab39c9a43b1f3866e2afcb0e1d61d439592663a625efe2a5a215c6032469e7ebeeebb31267e1681536ca0cc524cc58781a3d SHA512 bd06940b629ab0378afd6342b6f5beef002023387843cefd866ebe6ae8e94996edc3f21a0c70ed3570d3fcb7194bf354d0e42d4eff32522b3c01c51369867be0
-DIST antlr-3.5.2-complete.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0 SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
 DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435 SHA512 76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
-DIST stringtemplate-4.0.8.tar.gz 147305 BLAKE2B 0c09326f4eecfc86db8588a9b8db801bac8d8e128f8ef004a3691813d1dfcbd1e397acd5cad47e4c9d44d7ee8c17b8f6b66386fb897e4137df43dc46f46dc3f3 SHA512 21e4936356a6d374bf92645f09351a495a5900a408ead8dce1903ed81d7fc70eb4b44b206b587b05ed87edb2d4792c1cf72907a9cb527e18373ba2e5f31b5724
 DIST stringtemplate-4.3.1.tar.gz 432541 BLAKE2B c5b4124524e36a7104908dabf9ed258d2397095d8dc86eef401d0da1ac245629e88a1b2d0e35417ed7735ad6b8495fd2cc82970601a16ee856f5456fdc24b48f SHA512 afe62ca1cbc7572d05859c6fdaa1eb3221045da582bce5d88c328acae39128c904396f8ba1e10643a2757123297ba1924e046841cc8a667fbc724bdeca95680c
 EBUILD stringtemplate-3.2.1-r2.ebuild 1557 BLAKE2B 23393c4b73e75d1dd536957bceef00194eef22db42db38a6423f3fbc515e9bcd89a554d725735c94040c8abdae462e712ed92e2f58594338710c8790b8ef3c0c SHA512 244089013be014dbc4de338339ead998c9aa19464e651f7fcc02fa56410218e8289e1d91b5deb6b3905a11696b4ff6c44a0d19f783157b96acf8f3d85647a7d6
-EBUILD stringtemplate-4.0.8-r1.ebuild 2227 BLAKE2B 10d792caffab1e99e83eb551fc53603107f9be7f662fab164bc8b1573fbe577c777d509e8dbf1b1ea0e2cc899cf1c1b168f7314a5d98c817a74b019772ae785e SHA512 281ce1c2835412d72dd327dce4fb1df38a5e493ebb2f76ee59ce75945ecf4b4c4a45c6ea2e417e287ca1f422dd319bf693eafe19b4c52e84e04876454dab8b97
-EBUILD stringtemplate-4.3.1.ebuild 1878 BLAKE2B 9e8400a938e0ad81c1bb31e420e46ef0271b139b0ca6d4ebbfe06bc7aff06765f8154a4aa64ee9340494dd2ae616c09a09c07bed46b1dc1f7a1c52d5fe16002d SHA512 115ce9b075824cf3b3575ff9209a1a5cd191371b1780b14f71ae34f208b8c831e8d4f97c1e7e4eb592a3ce607a4bd7f6b9919736c4c2420fbd99374c9072a7f7
+EBUILD stringtemplate-4.3.1.ebuild 2946 BLAKE2B d6552374db1cea1a9bcf20e725f0ebb441579e0a7f56872fdecb2d6276203618bbdfed84ddc6680b7f464aeb3746e0fedae4597026ccb90a8808f662662d83c3 SHA512 17cb383f2e8e6111a82bf1d257136e789e7fafe1ffd88c50ca5065236a36a03001e3adaad600696766d34db5ac25fa16dcbec544dd6a933efa77950d24aacd64
 MISC metadata.xml 323 BLAKE2B 4b53767b7c81b78dfcfb69b4175baba46ee266cf145dff77dc855838f8b3209edf2fa1949b17aa88b284f0cc92d68250c0b64d4966253de734f1263d46b6b6be SHA512 9f7523f1186535db76c503816be7b41a6f58fb07469347d43acfbee68effdb5e748ebae3cc9cba2c9ac45b0c504b64eabd4947c48f040efa2d42f11328ae100c
diff --git a/dev-java/stringtemplate/files/4.0.8-r1-test-fixes.patch b/dev-java/stringtemplate/files/4.0.8-r1-test-fixes.patch
deleted file mode 100644
index 0834ccf9bcce..000000000000
--- a/dev-java/stringtemplate/files/4.0.8-r1-test-fixes.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- a/test/org/stringtemplate/v4/test/TestGroups.java	2014-03-25 11:55:55.000000000 +0000
-+++ b/test/org/stringtemplate/v4/test/TestGroups.java	2015-09-13 11:01:07.999800299 +0100
-@@ -29,6 +29,7 @@
- 
- import org.junit.Assert;
- import org.junit.Test;
-+import org.junit.Ignore;
- import org.stringtemplate.v4.ST;
- import org.stringtemplate.v4.STErrorListener;
- import org.stringtemplate.v4.STGroup;
-@@ -527,6 +528,7 @@
- 		assertEquals(expected, result);
- 	}
- 
-+	@Ignore
- 	@Test public void testUnknownNamedArg() throws Exception {
- 		String dir = getRandomDir();
- 		String groupFile =
---- a/test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java	2014-03-25 11:55:55.000000000 +0000
-+++ b/test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java	2015-09-13 11:01:05.011850826 +0100
-@@ -28,6 +28,7 @@
- package org.stringtemplate.v4.test;
- 
- import org.junit.Test;
-+import org.junit.Ignore;
- import org.stringtemplate.v4.STErrorListener;
- import org.stringtemplate.v4.STGroup;
- import org.stringtemplate.v4.STGroupFile;
-@@ -36,6 +37,7 @@
- import static org.junit.Assert.assertEquals;
- 
- public class TestGroupSyntaxErrors extends BaseTest {
-+	@Ignore
- 	@Test public void testMissingImportString() throws Exception {
- 		String templates =
- 			"import\n" +
---- a/test/org/stringtemplate/v4/test/TestRenderers.java
-+++ b/test/org/stringtemplate/v4/test/TestRenderers.java
-@@ -59,7 +59,7 @@ public class TestRenderers extends BaseTest {
- 		group.registerRenderer(GregorianCalendar.class, new DateRenderer());
- 		ST st = group.getInstanceOf("dateThing");
- 		st.add("created", new GregorianCalendar(2005, 07-1, 05));
--		String expecting = "datetime: 7/5/05 12:00 AM";
-+		String expecting = "datetime: 7/5/05, 12:00 AM";
- 		String result = st.render();
- 		assertEquals(expecting, result);
- 	}
-@@ -85,7 +85,7 @@ public class TestRenderers extends BaseTest {
-         group.registerRenderer(GregorianCalendar.class, new DateRenderer());
-         ST st = group.getInstanceOf("dateThing");
-         st.add("created", new GregorianCalendar(2005, 07-1, 05));
--        String expecting = " datetime: 7/5/05 12:00 AM ";
-+        String expecting = " datetime: 7/5/05, 12:00 AM ";
-         String result = st.render();
-         assertEquals(expecting, result);
-     }
-@@ -102,7 +102,7 @@ public class TestRenderers extends BaseTest {
-         	// set Timezone to "PDT"
-         	TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
-         	st.add("created", new GregorianCalendar(2005, 07-1, 05));
--        	String expecting = " datetime: Tuesday, July 5, 2005 12:00:00 AM PDT ";
-+        	String expecting = " datetime: Tuesday, July 5, 2005 at 12:00:00 AM Pacific Daylight Time ";
-         	String result = st.render();
-         	assertEquals(expecting, result);
-         } finally {
-@@ -358,6 +358,6 @@ public class TestRenderers extends BaseTest {
- 		cal.set(2012, Calendar.JUNE, 12);
- 		st.add("date", cal);
- 
--		assertEquals("12 de Junho de 2012", st.render(new Locale("pt")));
-+		assertEquals("12 de junho de 2012", st.render(new Locale("pt")));
- 	}
- }
diff --git a/dev-java/stringtemplate/files/stringtemplate-4.0.8-fix-tests.patch b/dev-java/stringtemplate/files/stringtemplate-4.0.8-fix-tests.patch
deleted file mode 100644
index 994fd42ad5e6..000000000000
--- a/dev-java/stringtemplate/files/stringtemplate-4.0.8-fix-tests.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 3ea94a870b6e139399abbf932da1dfa2f9bd37e3 Mon Sep 17 00:00:00 2001
-From: parrt <parrt@cs.usfca.edu>
-Date: Thu, 8 Nov 2018 11:40:24 -0800
-Subject: [PATCH] make tests work with java 10 and 6, 7, 8
-
----
- .../stringtemplate/v4/test/TestRenderers.java | 24 +++++++++++++++----
- 1 file changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/test/org/stringtemplate/v4/test/TestRenderers.java b/test/org/stringtemplate/v4/test/TestRenderers.java
-index bc5406f7..7b7536e0 100644
---- a/test/org/stringtemplate/v4/test/TestRenderers.java
-+++ b/test/org/stringtemplate/v4/test/TestRenderers.java
-@@ -48,6 +48,8 @@
- 
- public class TestRenderers extends BaseTest {
- 
-+	String javaVersion = System.getProperty("java.version");
-+
- 	// Make sure to use the US Locale during the tests
- 	private Locale origLocale;
- 
-@@ -73,6 +75,9 @@ public void tearDown() {
- 		ST st = group.getInstanceOf("dateThing");
- 		st.add("created", new GregorianCalendar(2005, 7 - 1, 5));
- 		String expecting = "datetime: 7/5/05, 12:00 AM";
-+		if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
-+			expecting = "datetime: 7/5/05 12:00 AM";
-+		}
- 		String result = st.render();
- 		assertEquals(expecting, result);
- 	}
-@@ -99,7 +104,10 @@ public void tearDown() {
-         ST st = group.getInstanceOf("dateThing");
-         st.add("created", new GregorianCalendar(2005, 7 - 1, 5));
-         String expecting = " datetime: 7/5/05, 12:00 AM ";
--        String result = st.render();
-+	    if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
-+		    expecting = " datetime: 7/5/05 12:00 AM ";
-+	    }
-+	    String result = st.render();
-         assertEquals(expecting, result);
-     }
- 
-@@ -116,9 +124,13 @@ public void tearDown() {
-         	TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
-         	st.add("created", new GregorianCalendar(2005, 7 - 1, 5));
-         	String expecting = " datetime: Tuesday, July 5, 2005 at 12:00:00 AM Pacific Daylight Time ";
--        	String result = st.render();
-+	        if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
-+		        expecting = " datetime: Tuesday, July 5, 2005 12:00:00 AM PDT ";
-+	        }
-+	        String result = st.render();
-         	assertEquals(expecting, result);
--        } finally {
-+        }
-+        finally {
-            	// Restore original Timezone
-            	TimeZone.setDefault(origTimeZone);
-         }
-@@ -371,6 +383,10 @@ public void tearDown() {
- 		cal.set(2012, Calendar.JUNE, 12);
- 		st.add("date", cal);
- 
--		assertEquals("12 de junho de 2012", st.render(new Locale("pt")));
-+		String expected = "12 de junho de 2012";
-+		if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
-+			expected = "12 de Junho de 2012";
-+		}
-+		assertEquals(expected, st.render(new Locale("pt")));
- 	}
- }
diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild b/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild
deleted file mode 100644
index 72831a73fdbb..000000000000
--- a/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANTLR3="3.5.2"
-JAVA_PKG_IUSE="doc source test"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java template engine"
-HOMEPAGE="https://www.stringtemplate.org/"
-SRC_URI="https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://www.antlr3.org/download/antlr-${ANTLR3}-complete.jar"
-
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-# StringTemplate has a cyclic dependency on ANTLR 3. The runtime classes
-# are needed at build time and runtime and the tool is also needed at
-# build time. To break out of this, we use a prebuilt copy of ANTLR 3 at
-# build time and manually register a dependency on the package, which
-# will be present at runtime thanks to this PDEPEND. No prebuilt
-# software is actually installed onto the system.
-PDEPEND=">=dev-java/antlr-${ANTLR3}:3.5"
-
-S="${WORKDIR}/${PN}4-${PV}"
-JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/antlr-${ANTLR3}-complete.jar"
-JAVA_SRC_DIR="src"
-
-PATCHES=(
-	# These tests are broken but are probably fixed in current master.
-	"${FILESDIR}/4.0.8-r1-test-fixes.patch"
-	"${FILESDIR}/${P}-fix-tests.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	default
-
-	# Some of these tests requires a graphical display.
-	rm -v test/org/stringtemplate/v4/test/TestEarlyEvaluation.java || die
-}
-
-src_compile() {
-	java -jar "${JAVA_GENTOO_CLASSPATH_EXTRA}" -lib ${JAVA_SRC_DIR}/org/stringtemplate/v4/compiler $(find ${JAVA_SRC_DIR} -name "*.g") || die
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	cd test || die
-	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4):${JAVA_GENTOO_CLASSPATH_EXTRA}"
-
-	local TESTS=$(find * -name "Test*.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -classpath "${CP}" $(find -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_register-dependency antlr-3.5 antlr-runtime.jar
-	dodoc {CHANGES,contributors,README}.txt
-}
diff --git a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
index 3eb42e302549..96b458d2cc14 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
 	dev-java/antlr-runtime:3.5
@@ -68,6 +68,29 @@ src_prepare() {
 	rm -v "${JAVA_TEST_SRC_DIR}/org/stringtemplate/v4/test/TestEarlyEvaluation.java" || die
 }
 
+src_test() {
+	# Make sure no older versions of this slot are present in the classpath
+	# https://bugs.gentoo.org/834138#c4
+	local old_ver_cp="$(nonfatal java-pkg_getjars "${PN}-${SLOT}")"
+	local new_test_cp="$(\
+		java-pkg_getjars --with-dependencies "${JAVA_TEST_GENTOO_CLASSPATH}")"
+	new_test_cp="${new_test_cp//"${old_ver_cp}"/}"
+
+	# Some of the test cases require an absolute path to the JAR being tested
+	# against to be in the classpath, due to the fact that they call the 'java'
+	# command outside ${S} and reuse the classpath for the tests:
+	# https://github.com/antlr/stringtemplate4/blob/4.3.1/test/org/stringtemplate/v4/test/TestImports.java#L103
+	# https://github.com/antlr/stringtemplate4/blob/4.3.1/test/org/stringtemplate/v4/test/BaseTest.java#L174
+	new_test_cp="${S}/${JAVA_JAR_FILENAME}:${new_test_cp}"
+
+	# Use JAVA_GENTOO_CLASSPATH_EXTRA to set test classpath
+	local JAVA_TEST_GENTOO_CLASSPATH=""
+	[[ -n "${JAVA_GENTOO_CLASSPATH_EXTRA}" ]] &&
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":"
+	JAVA_GENTOO_CLASSPATH_EXTRA+="${new_test_cp}"
+	java-pkg-simple_src_test
+}
+
 src_install() {
 	java-pkg-simple_src_install
 	einstalldocs # https://bugs.gentoo.org/789582
diff --git a/dev-java/sun-jaf/Manifest b/dev-java/sun-jaf/Manifest
deleted file mode 100644
index 771a83840eb6..000000000000
--- a/dev-java/sun-jaf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sun-jaf-1.1.1.tar.bz2 125305 BLAKE2B bf7676f3b47e9cf4c169a7625160604c7973d2bb8f6a087f7a7759c924efc0c24fbc6d59f03fb89dc874b2ad03e311b5029fc066fe5083c1accdc73fa9666ea6 SHA512 c7287056514324aa5feeed3d4afaf861869974dd565f7810e0161fe590f070ec894e7005ffac4dd42cf075313237027d7d7c88cbf583e28e05df361536d73001
-EBUILD sun-jaf-1.1.1-r1.ebuild 589 BLAKE2B ff47d298b6775b126d0b0c8dc712b7f780a6085c64dfaf06d3b98e98006d66096dcbf5b0d7519af20ce59d9045891dcec07a2f0c349bf0bdd2beb8b08b287339 SHA512 e978ea0fb2bbca282e4e7d511de8b7962bf5812ee5703168a3e8383a91e0b7a33a15a0f75172cc9567ba3d129ff9d8f695169d2363ee42faed104bbd81d5bfb7
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/sun-jaf/metadata.xml b/dev-java/sun-jaf/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/sun-jaf/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/sun-jaf/sun-jaf-1.1.1-r1.ebuild b/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
deleted file mode 100644
index d979f1b67800..000000000000
--- a/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,21 +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="Sun's JavaBeans Activation Framework (JAF)"
-HOMEPAGE="http://java.sun.com/products/javabeans/glasgow/jaf.html"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-LICENSE="CDDL"
-SLOT="0"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/glassfish/activation"
diff --git a/dev-java/sun-jai-bin/Manifest b/dev-java/sun-jai-bin/Manifest
index f70113cd29d1..283c175af52d 100644
--- a/dev-java/sun-jai-bin/Manifest
+++ b/dev-java/sun-jai-bin/Manifest
@@ -1,4 +1,4 @@
 DIST jai-1_1_3-lib-linux-amd64.tar.gz 3510451 BLAKE2B c16dc0e04127bf57df6390dc9d99a1e44040c0fe81ccacc88698493d3fd3483aae12d664a89bc13939655d21ce2d92b64537b073c0d1063bbf91e18129da5eb4 SHA512 5089b696baabdea9622683aa7a3569daf724fd7fa8a4f1c95073b9e96ff5c37fc55a9e3a6fe499abafe61f5f4a109770bd27172ae6711ab7b4da3de55d8b0f56
 DIST jai-1_1_3-lib-linux-i586.tar.gz 3501711 BLAKE2B eec4976124a9701367e7b61c652ed619df69fa12eb02c5288d9d1ba4845ca7e2315514fba1f75f15c8bbb90cba981972961e8d1e843a8a8ac2b000e5e4917975 SHA512 bd142eea557b68d10d26a18b6b0d04e5cb42212e98268035b1b3615d6489bbc4fa07ad141fd04fc5ae3c74f1703c9ade77130cbf8a61603b4b271e3a0e06e860
-EBUILD sun-jai-bin-1.1.3-r2.ebuild 1112 BLAKE2B 541e6e4e4ace7dc16c9324dcf66a9eaabd9f83554378331827bca5b5de295911b103fbf7280e5efe97d30935b49bf8dbbe7afc76ac41fcf712e477c58e07e467 SHA512 8b751798fcf86a06def0c2d90dab288921b6058091676a911e532a099d489680d94d067b9f229ef7e74a48433b7db9a0c2ca7c1369a4257c420402a1515b7e6c
+EBUILD sun-jai-bin-1.1.3-r2.ebuild 1111 BLAKE2B 09e0326ca5c1b419a854b555a9936b98aee9a612735f577bdf73634298086f88b0b0d944df78cacc8f7ac89cbe32d599724041d5b6959bccdaabb3598d89e5f4 SHA512 ab2a3a1226bc4a24de1f06278e0ca18134d733b33031dd3f1462cb181ea13da309021995689637a49d20de2ac51144b5c37ef2a955a2233d70a9025cc179816d
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
index ef3446d4185a..8f2bf9a016a3 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="sun-bcla-jai"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=""
 RDEPEND="virtual/jre:1.8"
diff --git a/dev-java/swing-layout/Manifest b/dev-java/swing-layout/Manifest
index f090b6e06400..10eff475f9b1 100644
--- a/dev-java/swing-layout/Manifest
+++ b/dev-java/swing-layout/Manifest
@@ -1,3 +1,4 @@
 DIST swing-layout-1.0.4-src.zip 69859 BLAKE2B ccf30c659e6dacecbd0bbe4f3cedbbb7088c108f7af615f7ba465a36f70181da4744c364529ded933ba5c402dddf6f640d8ea1ebd739bb425861605a71315f27 SHA512 83fe876b7d35ba204158ea9ee7a313b330c4f0e8b0ea81b3b487e75aa5e14a00c744aa30af049d9feaafc888875ab194fe73a5838b8073852596704e36517dae
 EBUILD swing-layout-1.0.4-r1.ebuild 506 BLAKE2B 19386f4f5d579fd2782b5f88867d60ef1c290bfc04d01b9ecd5f5faf99812aa030859aec8f17a47d59b01532fc1037d3beb40fb495e189b39077e6f882ee7773 SHA512 17c1ec85b611fad3b8c734d1ec9298d65c95cfc3afcfc8e6db3f5e2450654a076921a4f9ba8dbe6a0c63d060e0bd04c4dfc7ba812dfda3580b7cb6859d663188
+EBUILD swing-layout-1.0.4-r2.ebuild 509 BLAKE2B 21e936326c2e4b874112a3f0140251f279077f3be0d962a75f9dfcd5d7261ddc2c4a996a154c654c7e5515d9435dc5dff6da853ab98f0c5a6e87be9738ab2208 SHA512 7a49aadd883e2729eedeee86c2380687617c779000a3b1ee11475bc7d67b42c64f77d7732d73952aefcfe8e106bd1c03b15d26b8af64504a06a075ebd8dfdd5d
 MISC metadata.xml 452 BLAKE2B e89e076ddc599049c2575ba125244ea4f69edd3fc28b4e91a89f82a60100a6cdb8bdfc4b7c17f46c9d9a1160ced3cb9361e6c973ac4cd281040520161ca523e0 SHA512 e60ee7f2a6911d2fee83d2843b0fbec05666ec5e99001403796d6d93f56288bd80683847431b345cc3f85c96f694f046007fb6f79e4ebad320b5e450c9cc8367
diff --git a/dev-java/swing-layout/swing-layout-1.0.4-r2.ebuild b/dev-java/swing-layout/swing-layout-1.0.4-r2.ebuild
new file mode 100644
index 000000000000..bdf33b331bc8
--- /dev/null
+++ b/dev-java/swing-layout/swing-layout-1.0.4-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Professional cross platform layouts with Swing"
+HOMEPAGE="https://swing-layout.dev.java.net/"
+SRC_URI="mirror://gentoo/${P}-src.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="
+	>=virtual/jre-1.8:*"
+
+BDEPEND="
+	app-arch/unzip"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
diff --git a/dev-java/swingx-beaninfo/Manifest b/dev-java/swingx-beaninfo/Manifest
index ca6f8a4460cf..ed2162140b83 100644
--- a/dev-java/swingx-beaninfo/Manifest
+++ b/dev-java/swingx-beaninfo/Manifest
@@ -1,3 +1,3 @@
 DIST swingx-beaninfo-1.6.4-sources.jar 185813 BLAKE2B 6475c08c495b246ab34b605f63131616645c4533c1603c2d53303b809f77509756ef09106bdf3ae9f963ed1ca3b83f7dc5be31740a6f1568564ec5308081a61e SHA512 9461a00404c8cd1aa7c473e060c855667fedd357688ca1be5e78d6d7f56e15ff5345cf593bc03c173172a42c190c5f76682c01d226f51472f9b1757fcca52ac9
-EBUILD swingx-beaninfo-1.6.4.ebuild 619 BLAKE2B c56ee050a5385b1ec4ffc540b3bde3d2b716025bbc5a6a3a78388efe40e9e37bab6cd0609e2b9f80c10f8a684d0a4543f016cc0bb42e7809eface5a3724276d2 SHA512 d3a6a148173d59b2a156ede023be68b8cef07b1270901eb8f79c45e765186599cdcd37102b63809e2dce065c6135aa5d0a31e9c84ace7168fe8554639eec119e
+EBUILD swingx-beaninfo-1.6.4-r1.ebuild 630 BLAKE2B 57a38e9485689fb526bb2027a60f08c4c648a5777f7f21e82b4548e6d75402119c6a1257e327e2ffb77f9fb254e5ac7bcaf72ea7a81026aecc0d1c1e5eece862 SHA512 58864630350921b98200c2626d1ee0e3f3a0d20d678e08025ad7b9c7925d2f142715965506f114e9128817787a354c6f3bc23249435dc492affdc55102a35ce8
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/swingx-beaninfo/swingx-beaninfo-1.6.4.ebuild b/dev-java/swingx-beaninfo/swingx-beaninfo-1.6.4-r1.ebuild
index d16f79a73d8a..ce085b076923 100644
--- a/dev-java/swingx-beaninfo/swingx-beaninfo-1.6.4.ebuild
+++ b/dev-java/swingx-beaninfo/swingx-beaninfo-1.6.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
@@ -16,11 +16,13 @@ KEYWORDS="~amd64 ~x86"
 
 CDEPEND="dev-java/swingx:1.6"
 
-RDEPEND=">=virtual/jre-1.6
+RDEPEND=">=virtual/jre-1.8:*
 	${CDEPEND}"
 
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
+DEPEND=">=virtual/jdk-1.8:*
+	${CDEPEND}"
+
+BDEPEND="
 	app-arch/unzip"
 
 JAVA_GENTOO_CLASSPATH="swingx-1.6"
diff --git a/dev-java/swingx-ws/Manifest b/dev-java/swingx-ws/Manifest
index 29c0facf7da6..0468623b2614 100644
--- a/dev-java/swingx-ws/Manifest
+++ b/dev-java/swingx-ws/Manifest
@@ -1,3 +1,4 @@
+AUX swingx-ws-1.0_p20110515-replace-sun.misc-classes-for-java-9+.patch 1446 BLAKE2B 4abe6f6f22d46cc2f39720f43645098aad3b9e13ffeba1017dfb06e12f2acd1e3c7fa8e328ab421f24cc907dab223c6098fd65fbeeb500d178af75bab6429913 SHA512 5fe1b2af4834bd90183d9cbe0d697e5fbf22b6c401d7c2240fc1cdece71a24ed80ba8e4fbb3beeb4345761a51c1ee214f02206dac0efa1bf97a60523a39745d0
 DIST swingx-ws-2011_05_15-src.zip 7010679 BLAKE2B 529507f3a7f48d38eb755001b2d442d040adf884a31a49c00f57fc638855e96b195a50813196fdb7318860b0a547eb8220fdd2d05ed613c2cd7d83cb8b7dd7fd SHA512 1929bcd5d615e336fbf77f5c0406a15f0b8aae1ea2167106b8efe2708bf365b39a2313d2a22b5f77ca9559b161db5c50dc18d0cc4cebfcf7a0e4e0c978d4d5da
-EBUILD swingx-ws-1.0_p20110515-r1.ebuild 1748 BLAKE2B 61caa7e1ff917faf40d1d2e4996d2de87cd92b525ba3893c320f58c081a62b468c85737160a76cb834ff9362b0a839b81b0659198ef1377531053cd949f7b53a SHA512 5e6a936b62bd3bb712b0ad7881f9335bd8a7757fd78b978dc97c89b6bd150e53862d78055ec4329a49ba466919150fda5af27ced9588cea0b7cab458a0f6a35a
+EBUILD swingx-ws-1.0_p20110515-r2.ebuild 1873 BLAKE2B 194f550d73efec79aa9e06280cc1843e991251282dcf02918354a1887c0aa9633f0a4c9ec22f824079930580d63f92e76e8ff2a6ca130ca22f1c0b1cf1c88dd3 SHA512 083ecf5d235caa3a7bff4ba48184542192c4e25c1afc314ac964d7fe67e0c1230442c86f33fd9a79f4bb02ad68de7df277fee116bcc68323d8bc9775d60c1b78
 MISC metadata.xml 460 BLAKE2B 745c927a4a496be4c3ea9ce20a9e70bfcd85887421cc7836f056a2c048101c423f1c2e6c7ae39ebbce80e7f35ee659809463138dc37b5ddc50254d28b8871f79 SHA512 7cc9fcc1d808f78b4b38559af09e21dac1e8832b4e2d21e3a81abfa3881e54572d81fe18c5c646cf0e75179942a007a0bbed97e1809610366edc7de701b49121
diff --git a/dev-java/swingx-ws/files/swingx-ws-1.0_p20110515-replace-sun.misc-classes-for-java-9+.patch b/dev-java/swingx-ws/files/swingx-ws-1.0_p20110515-replace-sun.misc-classes-for-java-9+.patch
new file mode 100644
index 000000000000..f254274c62cc
--- /dev/null
+++ b/dev-java/swingx-ws/files/swingx-ws-1.0_p20110515-replace-sun.misc-classes-for-java-9+.patch
@@ -0,0 +1,40 @@
+From 803016b9b4bd6cc96efb6cba8c37befaf410be61 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sun, 20 Feb 2022 11:07:41 -0800
+Subject: [PATCH] Replace use of sun.misc.BASE64{En,De}coder for Java 9+
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ java/org/jdesktop/http/Request.java | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/java/org/jdesktop/http/Request.java b/java/org/jdesktop/http/Request.java
+index ff72322..57c4bf8 100644
+--- a/java/org/jdesktop/http/Request.java
++++ b/java/org/jdesktop/http/Request.java
+@@ -30,8 +30,7 @@ import org.jdesktop.beans.AbstractBean;
+ import org.jdesktop.http.Header.Element;
+ import org.jdesktop.xpath.XPathUtils;
+ import org.w3c.dom.Document;
+-import sun.misc.BASE64Decoder;
+-import sun.misc.BASE64Encoder;
++import java.util.Base64;
+ 
+ /**
+  * <p>Represents an http request. A <code>Request</code> is constructed and then
+@@ -613,10 +612,10 @@ public class Request extends AbstractBean {
+     }
+ 
+     private static String base64Encode(String s) throws Exception {
+-        return new String(new BASE64Encoder().encode(s.getBytes()));
++        return Base64.getEncoder().encodeToString(s.getBytes());
+     }
+     
+     private static String base64Decode(String s) throws Exception {
+-        return new String(new BASE64Decoder().decodeBuffer(s));
++        return new String(Base64.getDecoder().decode(s));
+     }
+ }
+-- 
+2.34.1
+
diff --git a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild
index 2f0f79d05170..92355258c5ef 100644
--- a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild
+++ b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 MY_P="${PN}-2011_05_15-src"
 JAVA_PKG_IUSE="doc source"
@@ -16,6 +16,7 @@ SLOT="bt747"
 KEYWORDS="~amd64 ~x86"
 
 CP_DEPEND="
+	dev-java/jakarta-xml-soap-api:1
 	dev-java/jdom:0
 	dev-java/json:0
 	dev-java/rome:0
@@ -29,16 +30,22 @@ CP_DEPEND="
 
 RDEPEND="
 	${CP_DEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8:*"
 
 DEPEND="
 	${CP_DEPEND}
-	>=virtual/jdk-1.6
+	>=virtual/jdk-1.8:*"
+
+BDEPEND="
 	app-arch/unzip"
 
 S="${WORKDIR}/${MY_P}/src"
 JAVA_SRC_DIR=( "beaninfo" "java" )
 
+PATCHES=(
+	"${FILESDIR}/${P}-replace-sun.misc-classes-for-java-9+.patch"
+)
+
 src_prepare() {
 	default
 	java-pkg_clean "${WORKDIR}"
diff --git a/dev-java/tijmp/Manifest b/dev-java/tijmp/Manifest
deleted file mode 100644
index 362c42a51e0a..000000000000
--- a/dev-java/tijmp/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX tijmp-0.8-respect-javacflags.patch 433 BLAKE2B 22999d08accccc8a00bb27e4db93b47faad83481083ecfef8b33c43e670093d15c6f483f5f15f1e02069e14d7dfa9df2d67846e2455ff73a01a5a209a8ac702e SHA512 01de85f6dd0609a85faecf398de83862dc99741d7447127ae8fbd57a16ead7b1493cee0479700e1027c45c4ee5a9561352868c2a45293f29a6e2fe8ee501f972
-AUX tijmp-jni.h.patch 1120 BLAKE2B e444841f9454f7fc8f8423986a5b82cceda43513a07c5ed3d4a143e813645a2f2323aa42e4fdc391e7ab38f3603acaf6efc18c8de0fc3c363273916b6db47477 SHA512 03c5b6425b4b92d929117366bbf1e3d3c5376f0882e7363e83f70324e5ba6533f212226cc811eb61b24772a45853f3b3243c24a444d181eedd1aa67017a15dc6
-DIST tijmp-0.8.tar.gz 347809 BLAKE2B d18fd0ba9145fb9277404a24fa26a65e4cbba34e62dfa0b080bc380d61a3dd11aab23e2c7fb982a97cb40fa216b1b3347c949cee52f7462f0113c3adef993c8d SHA512 911efd93c1548db45fcf8fd924675329aa82c6853ffe93074768646d08f80f4b076f336dba0da293d1acb084a12eb62c68803fa9408e2b64b2b82ab62db1de25
-EBUILD tijmp-0.8-r1.ebuild 1015 BLAKE2B b4efdd99f67d769fe9d4d2eafd4bb142865d07381da7b17a2b0d9381fe46ac46a91f9909e1e8b54f87dba17f004a1f70bd4c596f1dd69a9a5e9d18eae9e75566 SHA512 56ac465b66ec0ccd8bed635d05350d3ceace3a43df53f395e02f883eda535be24162b34c3668fb1ff28e1f7abdf2021c4a3b9591f6fa69014c2fd07e4a380920
-MISC metadata.xml 482 BLAKE2B 546fe19d6bd7c3b808e65a43b6517af250ba66898d21ef11c34f9ddf687fb31ddf14c69b9dd91f1ab9a178a4e92689654a53c8c50f837fe3200b9f060494a740 SHA512 3150af957776b9cddaa7a24844c76cfab00faef3f8484c9966baf697f2d4a70ec33e85c71dcfd8892b4b24b3577a793ac1563c32c5b158ded2bf596a8446ea0b
diff --git a/dev-java/tijmp/files/tijmp-0.8-respect-javacflags.patch b/dev-java/tijmp/files/tijmp-0.8-respect-javacflags.patch
deleted file mode 100644
index 96902aedf4ec..000000000000
--- a/dev-java/tijmp/files/tijmp-0.8-respect-javacflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,7 +18,7 @@
- java_files := $(foreach dir,$(dirs),$(find_files))
- class_files := $(patsubst $(jdir)/%.java,%.class,$(java_files))
- 
--JCFLAGS := -source 1.6 -encoding ISO-8859-1 -Xlint:unchecked -deprecation
-+JCFLAGS := $(JAVACFLAGS) -encoding ISO-8859-1 -Xlint:unchecked -deprecation
- 
- # standard java compilation..
- JAVACOMPILE := $(JAVAC) $(JCFLAGS) -sourcepath $(jdir) -d $(top_builddir)
diff --git a/dev-java/tijmp/files/tijmp-jni.h.patch b/dev-java/tijmp/files/tijmp-jni.h.patch
deleted file mode 100644
index 02a9b43670b0..000000000000
--- a/dev-java/tijmp/files/tijmp-jni.h.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# Patch by Vlastimil Babka <caster@gentoo.org>
-# Some JDK's such as ibm-jdk-bin don't have jni_md.h, so make the test more robust
---- a/configure.ac	2009-01-10 00:29:01.000000000 +0100
-+++ b/configure.ac	2010-04-05 12:17:35.000000000 +0200
-@@ -24,22 +24,16 @@
-   JAVA_HOME=/usr/local/jdk
- fi
- 
--jni_md=no
--AC_CHECK_HEADERS($JAVA_HOME/include/$java_os/jni_md.h,
--	jni_md=found)
-+dnl ok, maybe we dont always need include/$java_os but we use an -I for it anyway...
-+CPPFLAGS="$CPPFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/$java_os"
- 
--if test $jni_md = no
--then 
--AC_CHECK_HEADERS($JAVA_HOME/include/jni_md.h,
--	jni_md=found)
--fi
-+jni_h=no
-+AC_CHECK_HEADERS($JAVA_HOME/include/jni.h,
-+	jni_h=found)
- 
--if test $jni_md = no
-+if test $jni_h = no
- then
--  	AC_MSG_ERROR(Does JAVA_HOME point to the java SDK directory?)
--else
--dnl ok, maybe we dont need include/$java_os but we use an -I for it anyway...
--  	CPPFLAGS="$CPPFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/$java_os"
-+  	AC_MSG_ERROR(Could not find jni.h. Does JAVA_HOME point to the java SDK directory?)
- fi
- 
- AC_CHECK_HEADER($JAVA_HOME/include/jvmti.h,
diff --git a/dev-java/tijmp/metadata.xml b/dev-java/tijmp/metadata.xml
deleted file mode 100644
index 2843279173e1..000000000000
--- a/dev-java/tijmp/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-
-<longdescription>
-JMP is a profiler for java that can be used to trace objects usage and
-method timings. JMP uses the JVMPI interface to gather statistics
-and interact with the JVM. JMP uses a GTK+ interface to show the status.
-</longdescription>
-
-</pkgmetadata>
diff --git a/dev-java/tijmp/tijmp-0.8-r1.ebuild b/dev-java/tijmp/tijmp-0.8-r1.ebuild
deleted file mode 100644
index dfe78930f1a1..000000000000
--- a/dev-java/tijmp/tijmp-0.8-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools java-pkg-2
-
-DESCRIPTION="Java Memory Profiler"
-HOMEPAGE="http://www.khelekore.org/jmp/tijmp/"
-SRC_URI="http://www.khelekore.org/jmp/tijmp/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-DEPEND="
-	>=virtual/jdk-1.6"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-jni.h.patch"
-	"${FILESDIR}/${P}-respect-javacflags.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" jardir="/usr/share/${PN}/lib/" install
-	java-pkg_regjar "${D}/usr/share/${PN}/lib/${PN}.jar"
-	java-pkg_regso "${D}/usr/$(get_libdir)/lib${PN}.so"
-
-	cat > "${T}/${PN}" <<- "EOF" || die
-#!/usr/bin/env bash
-java -Dtijmp.jar="$(java-config -p tijmp)" -agentlib:tijmp "${@}"
-EOF
-	dobin "${T}/${PN}"
-}
-
-pkg_postinst() {
-	einfo "For your convenience, ${PN} wrapper can be used to run java"
-	einfo "with profiling. Just use it in place of the 'java' command."
-}
diff --git a/dev-java/tomcat-jstl-impl/Manifest b/dev-java/tomcat-jstl-impl/Manifest
deleted file mode 100644
index 7fc56dd12646..000000000000
--- a/dev-java/tomcat-jstl-impl/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX tomcat-jstl-impl-1.2.5-ImportSupport.patch 1141 BLAKE2B 6781a2d1ab7b706895f44c3c5d25360e0b003a69aac44ebee97f488461d312d26c06fbbe2b8784a4744ca2f30474d0f89fa6d628af3e35b26599955ab5d460d5 SHA512 0d283548eb5ee98dc92a59084ed162c239c077f8f47e88fa48e10e9304f101085df31dcdbf045acea914e1b555c0cdabbf714741618b63030c121e13f2413382
-AUX tomcat-jstl-impl-1.2.5-SetSupport.patch 1334 BLAKE2B ff3c948f782dd19f9d697045addb44e75c62f76890d450bceb6a6c743aa9688eee6cc627f23292f818d33698e274901b247d64fbe06c6a050b96550ed023ef93 SHA512 1a4f969c03312a02485e1eb37b3bcc0ce0153095f163c7c776c3a10e26c7b2c909fff1f3d16c7b2e178eac190f84432f0adeb2c3eda6004d699ad7d3377f3b22
-AUX tomcat-jstl-impl-1.2.5-build.xml 10337 BLAKE2B 68f960261f773c48e06b0a41386770a63af71a8c04dcae794f235de17f9eb20905326166aa3e8aed9a966b1e5ee252f0c0846364648bd692e36bbbd1ec050448 SHA512 e2ecf367a8d30f64c65bc4cf2b84bd017fe7d2dc32cf6030b25e0b0dd3533609243b71c0f7805196901e702da12feb3c5b60cc4f6859f9aa2419e1732a589e8e
-DIST tomcat-jstl-impl-1.2.5.zip 615779 BLAKE2B f5c307625a84a7170659683913282df1cf7e8b6a021ffed9895aa0e770a35d8db5351660c96668091ed59e5be35d2e8ad9359f524cbfe5a380e89ebe4fe08b43 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0
-EBUILD tomcat-jstl-impl-1.2.5-r1.ebuild 1762 BLAKE2B b06769b3dec37efa0e5566ec73263c4ab6d09aa8c84df98095ec65440c792df21c00ea8830d85b275b569696105e5db3f8860bca681ccdf8c39a6305b6491977 SHA512 8e3f0d78d65b424bb5c8f6c54c1408c6e43eac75fd2f5d9cf1650d38037c51a158835cfecbd8dc4025d932bf7264ad48e42b2b06fc03b69025d6ffa4b8d5e01e
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-ImportSupport.patch b/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-ImportSupport.patch
deleted file mode 100644
index f43dfc1f903b..000000000000
--- a/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-ImportSupport.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java.orig	2015-06-01 22:34:34.882000000 +0000
-+++ impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java	2015-06-01 22:35:29.078000000 +0000
-@@ -36,6 +36,7 @@
- import javax.servlet.ServletContext;
- import javax.servlet.ServletException;
- import javax.servlet.ServletOutputStream;
-+import javax.servlet.WriteListener;
- import javax.servlet.http.HttpServletRequest;
- import javax.servlet.http.HttpServletResponse;
- import javax.servlet.http.HttpServletResponseWrapper;
-@@ -430,6 +431,24 @@
-             public void write(int b) throws IOException {
-                 bos.write(b);
-             }
-+
-+            @Override
-+            public boolean isReady() {
-+                return true;
-+            }
-+
-+            @Override
-+            public void setWriteListener(WriteListener writeListener) {
-+            }
-+
-+            @Override
-+            public void close() throws IOException {
-+            }
-+
-+            @Override
-+            public void flush() throws IOException {
-+            }
-+
-         };
- 
-         /**
diff --git a/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-SetSupport.patch b/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-SetSupport.patch
deleted file mode 100644
index 9ed4ed84a38d..000000000000
--- a/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-SetSupport.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- impl/src/test/java/org/apache/taglibs/standard/tag/common/core/SetSupportTest.java.orig	2015-06-01 22:59:35.208000000 +0000
-+++ impl/src/test/java/org/apache/taglibs/standard/tag/common/core/SetSupportTest.java	2015-06-01 22:59:54.191000000 +0000
-@@ -334,30 +334,12 @@
-     }
- 
-     @Test
--    public void testResultFromBodyContent() throws JspException {
--        tag = new MockSetSupport();
--        BodyContent bodyContent = createMock(BodyContent.class);
--        expect(bodyContent.getString()).andStubReturn("  Hello  ");
--        replay(bodyContent);
--        tag.setBodyContent(bodyContent);
--        Assert.assertEquals(VALUE, tag.getResult());
--    }
--
--    @Test
-     public void testResultFromNullBodyContent() throws JspException {
-         tag = new MockSetSupport();
-         tag.setBodyContent(null);
-         Assert.assertEquals(tag.getResult(), "");
-     }
- 
--    @Test
--    public void testResultFromEmptyBodyContent() throws JspException {
--        tag = new MockSetSupport();
--        BodyContent bodyContent = createMock(BodyContent.class);
--        expect(bodyContent.getString()).andStubReturn(null);
--        Assert.assertEquals("", tag.getResult());
--    }
--
-     public static class MockSetSupport extends SetSupport {
-         private final boolean valueSpecified;
-         private final Object value;
diff --git a/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-build.xml b/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-build.xml
deleted file mode 100644
index fce6b8d72338..000000000000
--- a/dev-java/tomcat-jstl-impl/files/tomcat-jstl-impl-1.2.5-build.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 6/1/15 9:48 PM                        -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="taglibs-standard-impl-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="taglibs-standard-impl-1.2.5"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-  </path>
-  <path id="build.test.classpath">
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-          <exclude name="**/ExprSupportTest.java"/>
-          <exclude name="**/EscapeXMLTest.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-          <exclude name="**/ExprSupportTest.java"/>
-          <exclude name="**/EscapeXMLTest.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false">
-      <link href="http://download.oracle.com/javase/1.5.0/docs/api"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-      <manifest>
-        <attribute name="Main-Class" value="Main"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-</project>
diff --git a/dev-java/tomcat-jstl-impl/metadata.xml b/dev-java/tomcat-jstl-impl/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/tomcat-jstl-impl/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/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
deleted file mode 100644
index 80abba919d84..000000000000
--- a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="taglibs-standard"
-MY_P="${MY_PN}-${PV}"
-MY_IMPL="${MY_PN}-impl"
-
-DESCRIPTION="JSP Standard Tag Library (JSTL) - Implementation jar"
-HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip -> ${P}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-java/xalan:0
-	dev-java/tomcat-jstl-spec:0
-	dev-java/tomcat-servlet-api:3.1"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-java/ant-junit:0
-		dev-java/easymock:3.2
-	)
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-3.1,tomcat-jstl-spec,xalan"
-EANT_BUILD_TARGET="package"
-EANT_BUILD_XML="impl/build.xml"
-
-JAVA_RM_FILES=(
-	impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
-)
-
-PATCHES=(
-	# This patch overrides a couple of methods.
-	"${FILESDIR}"/${P}-ImportSupport.patch
-	# This one disables one test case which doesn't work.
-	"${FILESDIR}"/${P}-SetSupport.patch
-)
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/impl/build.xml || die
-
-	epatch "${PATCHES[@]}"
-}
-
-EANT_TEST_TARGET="test"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},easymock-3.2"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar "${S}"/impl/target/${MY_IMPL}-${PV}.jar ${MY_IMPL}.jar
-
-	if use doc; then
-		java-pkg_dohtml -r "${S}"/impl/target/site/apidocs/
-	fi
-
-	if use source; then
-		java-pkg_dosrc "${S}"/impl/src/*
-	fi
-}
diff --git a/dev-java/tomcat-jstl-spec/Manifest b/dev-java/tomcat-jstl-spec/Manifest
deleted file mode 100644
index 6321b65ab1ba..000000000000
--- a/dev-java/tomcat-jstl-spec/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX tomcat-jstl-spec-1.2.5-build.xml 9490 BLAKE2B 3616a227199fc79e3f65ca8f1d6d9804bcbbd52528122583d3aa5dfc7ddd27755149b794a64cdc86db76f39ad75957769202eb617e59f1dadc5721482424ced5 SHA512 7375c12b07eb3ce07e03826219f1e239a507cea6052605ceac5261ab9cfbb2c28a8d88d95ee8fb90c8172847317adccb4969ac5e8e4caf0c20f39f46ab20542e
-DIST tomcat-jstl-spec-1.2.5.zip 615779 BLAKE2B f5c307625a84a7170659683913282df1cf7e8b6a021ffed9895aa0e770a35d8db5351660c96668091ed59e5be35d2e8ad9359f524cbfe5a380e89ebe4fe08b43 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0
-EBUILD tomcat-jstl-spec-1.2.5-r1.ebuild 1361 BLAKE2B df921856d6bf08b26f87a7c5f3f144e9b067b07f39d468c842d871a0d0bc5bc781f8dd44b85f83e40b18fb1812ac981626e9af633e87254b1216027765972c4b SHA512 4fe459e64e14215f3cc5c74f9351781817acdc879c3831fde8df1f48eef273f3639f3bae8af6b11f692fd5f976f9ec90010776a74a49cb4d3fdb061683359ca9
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-jstl-spec/files/tomcat-jstl-spec-1.2.5-build.xml b/dev-java/tomcat-jstl-spec/files/tomcat-jstl-spec-1.2.5-build.xml
deleted file mode 100644
index 27ba9e5bcb07..000000000000
--- a/dev-java/tomcat-jstl-spec/files/tomcat-jstl-spec-1.2.5-build.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 5/25/15 5:16 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="taglibs-standard-spec-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="taglibs-standard-spec-1.2.5"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-  </path>
-  <path id="build.test.classpath">
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false">
-      <link href="http://download.oracle.com/javase/1.5.0/docs/api"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-      <manifest>
-        <attribute name="Main-Class" value="Main"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-</project>
diff --git a/dev-java/tomcat-jstl-spec/metadata.xml b/dev-java/tomcat-jstl-spec/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/tomcat-jstl-spec/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/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
deleted file mode 100644
index f765fd0acbcd..000000000000
--- a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="taglibs-standard"
-MY_P="${MY_PN}-${PV}"
-MY_SPEC="${MY_PN}-spec"
-
-DESCRIPTION="JSP Standard Tag Library (JSTL) - Specification jar"
-HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip -> ${P}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="java-virtuals/servlet-api:3.0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-java/ant-junit:0
-		dev-java/easymock:3.2
-	)
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="servlet-api-3.0"
-EANT_BUILD_TARGET="package"
-EANT_BUILD_XML="spec/build.xml"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/spec/build.xml || die
-}
-
-EANT_TEST_TARGET="test"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},easymock-3.2"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar "${S}"/spec/target/${MY_SPEC}-${PV}.jar ${MY_SPEC}.jar
-
-	if use doc; then
-		java-pkg_dohtml -r "${S}"/spec/target/site/apidocs/
-	fi
-
-	if use source; then
-		java-pkg_dosrc "${S}"/spec/src/*
-	fi
-}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index d9f955a180a2..77f94ef12ea8 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,24 +1,30 @@
 AUX 2.5-build-r1.xml 3084 BLAKE2B 6eb6025444ad6b2af035217bc7c1410a1238e25eaafdfdfe4ac706137791b329b05a28f56f77c57fa8de30b77d457e912208068b97bf6b8fbee7d7af168d07a5 SHA512 1bf5789c683896ffde160f96dc6fcb2ef58dd645a208b3d8e08863fd176337ae81e4d29535bb18df909cfe233576f25d93c35ad1072fca3a79b19e784638f5fb
 AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1e0b8193fa80d70a776c0cf24b2eee585cf77292bc2112b60075414a4d05ebe16dc26eb3c2976a44420774 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41
 AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
-DIST apache-tomcat-10.0.14-src.tar.gz 6074341 BLAKE2B e6607773aebb5b5279720cbcf667e9f82d752833a323dd611d411bcb48d6b0f42a98b9120d2bf29bb53e563f7f421194e92a41c89dadff76db2f6aaa171af64b SHA512 13614a410ecb7d5d1e4e6cc0e5dab9fe21809a8a70b3f42d5b0f75a2006d098857395858cdfacbe84349f73c1ce7eecca59c1bdeac809f434df8ae3f4cff46c1
 DIST apache-tomcat-10.0.16-src.tar.gz 6088262 BLAKE2B f02a5b08e4502d4e7be2fa14f8dae8760c2844f262cdc75e2cc821038d248ed961281d11f7bb847cf55ecf012ee05c870366508fb1fe1485da2100e87aa13c55 SHA512 44a1ac752077603c5366ec92c6a5860d33ce810bf2554190a013329106ec118d1a18d1a26823b3024d046b05160a20dda65573365451d0481be8be97218445c8
+DIST apache-tomcat-10.0.17-src.tar.gz 6086996 BLAKE2B ff3584e58ec6f22f493cf7f32435423d68b941d9eec22441ee54ba69af03b50b687b23012129108485c9db147c8e7364ded037cf9ed2add174e6c928b927382a SHA512 1cc0f8e2187934c6dac3e31739f8c53a0a152527a98210deab8ce027c1347cbbd1cef3bdf0294bee3c4dbed20ba57b2291bcd887f353837fd505ea2d17e7ba3d
+DIST apache-tomcat-10.0.18-src.tar.gz 6088118 BLAKE2B 7d3fdb5a682dd44d358a619a18ca3df3bde27c9fc963436c9bce86baf07a42e87ba80724afdc6ce72b493d2fb35dda644eba29df7d4434f8c815ada4cb5d2ca3 SHA512 001205f382f44163f08dba1d306472b7ef3256e31a522c3f1f7595bca4fd084776a0c1f69b241302fa5d0d2f143ac063cb34d4fcf79a51ec9722f2f2ce3f1dab
 DIST apache-tomcat-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-8.5.75-src.tar.gz 5961981 BLAKE2B a8d3c0ef390ce6b12b09cedb71cd9c102e3a37265f7ef6db9797eb7eaf04429f75bdedf6a7dbaa7ade0b57a12cbb461498c37d9c7e234bb9dc98e3d095b66b8a SHA512 c1c2609db623eb94a5e177c0f7ccabf8753a34151961ddc0fdea47704aca86123ef63f746b7ca76e818185cae19121823f7700f9bd47ba27625b3c801ddc8bad
-DIST apache-tomcat-9.0.56-src.tar.gz 6138381 BLAKE2B 5e49287531fcb9bcb80ba124ed83fc3acbf3406b53424c3be5c2b3fb04da86785ba9e3ef89283c3ebb88bc8aadf8211328608edf068f0d7733c2f0ec0401d7ce SHA512 43332241fda149f9da107496cc6b812e38544c9043c567e3fe11ee01b5abfbd02b6a377c3f6090902048bd9dc67746cdc65d59f03bd0de68c05e0955bfe018c5
+DIST apache-tomcat-8.5.76-src.tar.gz 5961741 BLAKE2B 4c661c2f753edac48c28fdec3caa06c487e1546feb91f2d69003a4d9f71fb023eb2314520bb156f3087656d655acdfdbdff3f68cd3f81d0d9dfbb2c9577898ee SHA512 b1c1b8c870c77e46969fe64acc71194d37605e5ccda87d105186d8070ec2dd0b7b9c64cf2f9b276db140fd3927832405123018f6fe8f46c0ebda50af6404d8b9
+DIST apache-tomcat-8.5.77-src.tar.gz 5963037 BLAKE2B 63192409b148cf0691e6ad22180e4f79d8603e89633598ee3f1dcfdd7d55b88530ecb1aa7c585920e086a7582dea78fcbcd1498ed2552e0f8d17127658769f66 SHA512 a0d2f77540b5370e09d03d04340e0c7f539eb5761b84ea3c8ef924e2a3e7f9528b3ed83a0c8e413bc9335cee6052135788e48e30d95f231ba3ade7f0b53ec157
 DIST apache-tomcat-9.0.58-src.tar.gz 6142037 BLAKE2B 0515273882468958f5bc2ef95e3085c22975e0ec9f8153a20773266a43710645c2262da8cb10736f0f0b255716fa05a12252194e1f32851704364ef89a62e5e9 SHA512 b2b572dcad2efadf3e5e5a6ae6e108f5699af23b7751ca3c9c00e6ba896f5179745108fa602d8bd87a9611fd8bebe8817fad53c38fc75b0063835b953c67d74a
-EBUILD tomcat-servlet-api-10.0.14.ebuild 3015 BLAKE2B 8326a595c857ea61fb4c7c684de79a3255822ba0235f9734cfbc64240b9e4917033f242ed12be88efaf8498fcf306c4b8e2162462fbaf0df808fdb33c40f4219 SHA512 a530aeb1d78bb9cb95ec8cb54113668995d3d6989ae50ddeeb1bf220d1629198b6b5d5a1009826aa329d1174eb99cf5b7c2df33e789f01f61d33b7521353775f
-EBUILD tomcat-servlet-api-10.0.16.ebuild 3018 BLAKE2B 7407df97c33c89d436e1d338f9c30a1dd2b2b0b90aad199e2e1d02a6a2d0360ef2f95f7b452d4b677d4daad016d5a27bc7a823e353355c7c28f6586117efa6e9 SHA512 7c08253ab8ec762c693902e17a0261023e9cbdd022b436944fd921b0969807bf79766d3ff6c951db1b9cae1580d073c6259d3d4688ae3a3ab88a8c3762cefc27
-EBUILD tomcat-servlet-api-4.1.40.ebuild 1008 BLAKE2B 982a481d22749c6b7a68688ae81a12235bc3eee0a2a54fe0afc1791970c30186342f1541d080102fe06fbbc58305ed5ce86b4ed3458fdc2218c23503294e022e SHA512 26c604a85510835c146df1ed62ac97de9e9721388692f8e818949bdc9907e4d76b2077c785ae45b04774d493a147411d9ab1fb529a39c6c71b9b68970e468cb2
+DIST apache-tomcat-9.0.59-src.tar.gz 6142359 BLAKE2B 26dee501a374e54280237dbe392924ac89e3e4b331a11b30c2e0923ac38fa16bb52c02dfc8a9f3597fb0ee169ae2835ac254eab745d1e2ab1e64cfed6395d0c3 SHA512 cea0125ca9b90b247ed114fa7b2e9c63da38b1ef97b3a373a43ed0d775764178534a4014b254219c8c5a26575eaf0ddc25ebc1e276b2ad5086ef3406627f1c80
+DIST apache-tomcat-9.0.60-src.tar.gz 6143845 BLAKE2B af7061854659de06afa6a7cf6380c4be4375e18bec896049bf468ddb9139794170271454af4712ade5099b8d46ed7c8d642e9c5f37ea168f0e31394a5128beeb SHA512 e5cb12fb134ff0a59e01a30fbcabc350ddbef6959494176848c2858c3c68444bc520153e00fdcdecb0eefbe7f69876c2965fedbffeeb0aeda7931dc1c11b0de5
+EBUILD tomcat-servlet-api-10.0.16.ebuild 3015 BLAKE2B 8326a595c857ea61fb4c7c684de79a3255822ba0235f9734cfbc64240b9e4917033f242ed12be88efaf8498fcf306c4b8e2162462fbaf0df808fdb33c40f4219 SHA512 a530aeb1d78bb9cb95ec8cb54113668995d3d6989ae50ddeeb1bf220d1629198b6b5d5a1009826aa329d1174eb99cf5b7c2df33e789f01f61d33b7521353775f
+EBUILD tomcat-servlet-api-10.0.17.ebuild 3018 BLAKE2B 7407df97c33c89d436e1d338f9c30a1dd2b2b0b90aad199e2e1d02a6a2d0360ef2f95f7b452d4b677d4daad016d5a27bc7a823e353355c7c28f6586117efa6e9 SHA512 7c08253ab8ec762c693902e17a0261023e9cbdd022b436944fd921b0969807bf79766d3ff6c951db1b9cae1580d073c6259d3d4688ae3a3ab88a8c3762cefc27
+EBUILD tomcat-servlet-api-10.0.18.ebuild 3018 BLAKE2B 7407df97c33c89d436e1d338f9c30a1dd2b2b0b90aad199e2e1d02a6a2d0360ef2f95f7b452d4b677d4daad016d5a27bc7a823e353355c7c28f6586117efa6e9 SHA512 7c08253ab8ec762c693902e17a0261023e9cbdd022b436944fd921b0969807bf79766d3ff6c951db1b9cae1580d073c6259d3d4688ae3a3ab88a8c3762cefc27
+EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802e96cdb2d431778dced5de495f7ed2c665ff079300b37e658b3cad133c99bda92505eaf8add6c3e582d00ccdad61ebc4097c80 SHA512 7a571e537319eee86a34070e5e8e2baa722238fff2a57bea51a9e9ca746ec43ef07c7864a7235ef3ab33560b111c8d4971b8e4848f1e54f2719ed162857a7437
-EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 25cca0a5612b56c0c2999c574f3ae6b00f5940eca3d39e6378e5d2686d8fc6a75b728d0609dc3443a38a3edef641825c8862f17693b2920403369eb99d4c2371 SHA512 033a9bbd48a76792d9c00f5bda4c32d9c808484cde33c62206d2753b665f6d99c7668b95f2cf3e4337bcbbd00478de78d98623443be50e84c67e3d9382f44e1d
+EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2549a23f359648d8df6f69399be2c821eb55426fd9cdaa284aa3d474bf26a3cbed649d0e46ccf0a2334f8430e0927d35a72d8dbf SHA512 0ad484e1c808864d96daec646c5a14857f87ae097388f02631687a199c12888581edf24ff2e992a3b48ed0d4f5f5e954960673519705f4885004a46bd47dca78
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
-EBUILD tomcat-servlet-api-8.5.73.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
-EBUILD tomcat-servlet-api-8.5.75.ebuild 3006 BLAKE2B ffed57a50da25f7e5ba64026f6ed77a530f09b54f548a6e4ec99cc2f97313ed3c527a43f91e39d4b89d3ff016146ca9cfdfef22fcb9206914261afaa214e2bbb SHA512 8927451e4d1c067b17b758fbdf21c17f63fcf7e135b31e0f0b67e471dc0aa5eec0a10fc0e31f091a29614343b856cfff50e3a063674b9b1613edcd696793626d
-EBUILD tomcat-servlet-api-9.0.56.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
-EBUILD tomcat-servlet-api-9.0.58.ebuild 3013 BLAKE2B 642b4fd0b2c0703f48dc9b0354dc9df887d149485ca538a9450ee2110cee17dc145be54538d27c21da079db942543cc7e7ffa4206cb3e2c8f755b2dbf0159012 SHA512 adb2ef89bfa5e7b111b0135ae318ea5989d0f5350ccaa23053108a1c53a17aa2b908eab00879c3e384edb22630dec79d582ed682ffd8fff6eba58470d77e977d
+EBUILD tomcat-servlet-api-8.5.75.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634
+EBUILD tomcat-servlet-api-8.5.76.ebuild 3006 BLAKE2B ffed57a50da25f7e5ba64026f6ed77a530f09b54f548a6e4ec99cc2f97313ed3c527a43f91e39d4b89d3ff016146ca9cfdfef22fcb9206914261afaa214e2bbb SHA512 8927451e4d1c067b17b758fbdf21c17f63fcf7e135b31e0f0b67e471dc0aa5eec0a10fc0e31f091a29614343b856cfff50e3a063674b9b1613edcd696793626d
+EBUILD tomcat-servlet-api-8.5.77.ebuild 3006 BLAKE2B ffed57a50da25f7e5ba64026f6ed77a530f09b54f548a6e4ec99cc2f97313ed3c527a43f91e39d4b89d3ff016146ca9cfdfef22fcb9206914261afaa214e2bbb SHA512 8927451e4d1c067b17b758fbdf21c17f63fcf7e135b31e0f0b67e471dc0aa5eec0a10fc0e31f091a29614343b856cfff50e3a063674b9b1613edcd696793626d
+EBUILD tomcat-servlet-api-9.0.58.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
+EBUILD tomcat-servlet-api-9.0.59.ebuild 3013 BLAKE2B 642b4fd0b2c0703f48dc9b0354dc9df887d149485ca538a9450ee2110cee17dc145be54538d27c21da079db942543cc7e7ffa4206cb3e2c8f755b2dbf0159012 SHA512 adb2ef89bfa5e7b111b0135ae318ea5989d0f5350ccaa23053108a1c53a17aa2b908eab00879c3e384edb22630dec79d582ed682ffd8fff6eba58470d77e977d
+EBUILD tomcat-servlet-api-9.0.60.ebuild 3013 BLAKE2B 642b4fd0b2c0703f48dc9b0354dc9df887d149485ca538a9450ee2110cee17dc145be54538d27c21da079db942543cc7e7ffa4206cb3e2c8f755b2dbf0159012 SHA512 adb2ef89bfa5e7b111b0135ae318ea5989d0f5350ccaa23053108a1c53a17aa2b908eab00879c3e384edb22630dec79d582ed682ffd8fff6eba58470d77e977d
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.16.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.16.ebuild
index 5ed928878473..440d44e0a658 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.16.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.16.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.14.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.17.ebuild
index 440d44e0a658..5ed928878473 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.17.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild
new file mode 100644
index 000000000000..5ed928878473
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="5.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}/"
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+	default
+
+	# The sources and also resources are mixed together so we first give it a structure to make it easier to compile and package
+	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+		${EL_API_SRC} ${EL_API_RESOURCES} \
+		${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \
+		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+	pushd java || die "Failed to cd to java dir"
+
+	cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+	mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources"
+	cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+	popd
+
+	for file in $(find src -type f | grep -vE "\.java$"); do
+		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+		mkdir -p ${target_dir} || die "Failed to create resource directory"
+		mv $file ${target_dir} || die "Failed to move resource file"
+	done
+
+	mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild
index 354e5da5621a..9a0975a36b7b 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild
@@ -15,7 +15,7 @@ DEPEND=">=virtual/jdk-1.8"
 RDEPEND=">=virtual/jre-1.8"
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 S="${WORKDIR}/${MY_P}/servletapi"
 
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild
index 5eabc891630d..dd8cbeacb915 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.apache.org/dist/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.75.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.75.ebuild
index c6359840b613..888295412849 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.75.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.75.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.73.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.76.ebuild
index 8846bfbc900c..c6359840b613 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.73.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.76.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.77.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.77.ebuild
new file mode 100644
index 000000000000..c6359840b613
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.77.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}/"
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+	default
+
+	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
+
+	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+		${EL_API_SRC} ${EL_API_RESOURCES} \
+		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
+		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+	pushd java || die "Failed to cd to java dir"
+
+	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
+	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+	popd
+
+	for file in $(find src -type f | grep -vE "\.java$"); do
+		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+		mkdir -p ${target_dir} || die "Failed to create resource directory"
+		mv $file ${target_dir} || die "Failed to move resource file"
+	done
+
+	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.58.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.58.ebuild
index 09fffd263372..f1c865a27bec 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.58.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.58.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.56.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.59.ebuild
index f1c865a27bec..09fffd263372 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.59.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild
new file mode 100644
index 000000000000..09fffd263372
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="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/touchgraph-graphlayout/Manifest b/dev-java/touchgraph-graphlayout/Manifest
deleted file mode 100644
index 3249e1e24e63..000000000000
--- a/dev-java/touchgraph-graphlayout/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST TGGL_122_jre11.zip 202777 BLAKE2B 108b09934a5463460147f82409b09d5d2e755ac30996c6bffbfe07b89abea11d2c609e2d9f6d79ed4f425961898cdf3a8b46a8b7ee2191782d96f5cb5496cf42 SHA512 5c638972264ada2cb91ea1667c0b770629120a01496f7834ef3e4999ad5867ff911e772ea1361e33c168d8681c6f19f46ada33ea637daf4474f66a5cc97610a5
-EBUILD touchgraph-graphlayout-1.22-r1.ebuild 655 BLAKE2B 2b24c048af141177dc991a744ea70024cc2959975802f1e245d5412c4cc08cf353b477933eb94ec3156fbf7c1658ccedea166fe0069caad6d56a8377424d108d SHA512 1ea6a01cd3d748f8b638fff000b0a94ed230c582299b2057e7ec2030e32d194b92945938ab24795ce0d6e15fc4a2bd2c526a20ac6eee4cab676e546fdf326e52
-MISC metadata.xml 317 BLAKE2B 821663396853325726e0f3289e494af991fcdc0ad2d71110dcfc11064fcc1ea0f793024449456644a3794b9df1bfc88e326aef45c160035b0aa1f89b40426ef2 SHA512 002da9b5bfee1e6782f74ce227e78969c0da7e4082ee0b3028143015e61f44c4bdacf0c657b8c70cf9ad80b039e1a727d7fae8aab937c49d8bc95c248721d290
diff --git a/dev-java/touchgraph-graphlayout/metadata.xml b/dev-java/touchgraph-graphlayout/metadata.xml
deleted file mode 100644
index 839b99fce617..000000000000
--- a/dev-java/touchgraph-graphlayout/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">touchgraph</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild b/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild
deleted file mode 100644
index 2119402430f9..000000000000
--- a/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="TGGraphLayout"
-
-DESCRIPTION="TouchGraph provides a set of interfaces for graph visualization"
-HOMEPAGE="http://touchgraph.sourceforge.net"
-SRC_URI="mirror://sourceforge/touchgraph/TGGL_${PV//./}_jre11.zip"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.6
-"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_PN}"
-
-JAVA_SRC_DIR="com"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc "TGGL ReleaseNotes.txt"
-}
diff --git a/dev-java/treelayout/Manifest b/dev-java/treelayout/Manifest
index 9813d1758cd2..a6c6d2650fb5 100644
--- a/dev-java/treelayout/Manifest
+++ b/dev-java/treelayout/Manifest
@@ -1,5 +1,3 @@
-DIST treelayout-1.0.2.tar.gz 1007086 BLAKE2B c5ef3f0bc2a7c99a983f648efcca65a4a4fd9d72710b7a1a8263629435da6a79a328778983475565dfc23738978bf658067e3e63e7c36db84a54189821c0da07 SHA512 89a627d8ab2f248bb9b22139de0a28f310deb555f78825f29f4acfd0df7b4c212c8df241b004f8452a4be8a0f7717ee996df3eef4dd88ca905f4ad211df92655
 DIST treelayout-1.0.3.tar.gz 965389 BLAKE2B 5fb893ca0176e245778cf115a3c537d7a0ae4bcaf8119be41aa214dcf3887f5c286445d3d289134193a1b28269a2ba4952c6b9e81e3e462163bead188768f919 SHA512 5fb6a70206978c6bf8ea3c70603f38049cad21038bcedfd5a7f4dde1e4f8b080bfa78ca6dc2e43a7d0771ded39d5793f0c5340cf60ce63348d28a9be6abc3be4
-EBUILD treelayout-1.0.2.ebuild 1004 BLAKE2B 7eafdbac19bf6141d67a96d666cd592946b4a93e9bf3cd4b35221b5a3df1eadeadaaec698d748c7bc7b8a8ed9c525b13d351566916dfd4e3e0a2a157ba242f00 SHA512 a7ee265033e143173d1cb0e2f59d88c9e66cc57b9fb1f4b3ab6fe7eb6893e42a3db235455a115d5eed64c6fa177ac5ae04adb06c2801a3f4b54be622103a47ec
-EBUILD treelayout-1.0.3.ebuild 1017 BLAKE2B a819a2735f4f8a6145425f91d86d43175a4852510ac369a05b72455ebbb8b3441c7ec3c3764716100ca500bfd5fdd8b40380beb243675df7d95e048b677429c0 SHA512 bc4491ef38618fec210518054107ba81257b4de258aad99102e5ecd60ba4b5d2b619b4e1b8c2884d7f1be157b09665910b05ce07c0f0f9a3f0d6b2aba3335ba1
+EBUILD treelayout-1.0.3-r1.ebuild 1162 BLAKE2B 331154c903aa1d898d41dc3468262ae4149e3534a1ca6dfcec654faef8f016362b3c060f149b4d8636a776265e9faeb2331e76b46409c7915324acf4297bb8bd SHA512 63a4ded165bdfc0991a2fc0e511680b88133758f9e47d79e7209f0ff00b553173d298b24ae579ddc85be133679f2c8dbfbb1368d193ee1aa33f1c503727b060b
 MISC metadata.xml 678 BLAKE2B 938023ea4359e75dbde9c82c09764342f83b97e0aa35c53820f38dcd91832a8e1c930a97f5f58f379f18ac94e352ffc8b8bc039c4bcf4d723e925b5ddfe34a3b SHA512 db1c6876c80fc0c2adbb380b3c32c64827a8c203dcac99a7d428e2e7ab3a042ed3aa064c819510110480497fcea5b51a603b3a0e3d8e0cc46dbe624986232d1d
diff --git a/dev-java/treelayout/treelayout-1.0.2.ebuild b/dev-java/treelayout/treelayout-1.0.2.ebuild
deleted file mode 100644
index a055bd951140..000000000000
--- a/dev-java/treelayout/treelayout-1.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Efficiently create compact tree layouts in Java"
-SRC_URI="https://github.com/abego/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/abego/treelayout"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND=">=virtual/jdk-1.6
-	test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${P}/org.abego.${PN}"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_PKG_BSFIX_NAME="build-impl.xml"
-EANT_BUILD_XML="nbproject/build-impl.xml"
-
-src_configure() {
-	EANT_EXTRA_ARGS="-Dplatform.home=${JAVA_HOME}"
-}
-
-src_install() {
-	java-pkg_newjar dist/org.abego.${PN}.core.jar
-	dodoc CHANGES.txt doc/abegoTreeLayout.pdf
-	use doc && java-pkg_dojavadoc dist/javadoc
-	use source && java-pkg_dosrc src/main/java/*
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/treelayout/treelayout-1.0.3-r1.ebuild b/dev-java/treelayout/treelayout-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..010b4519046e
--- /dev/null
+++ b/dev-java/treelayout/treelayout-1.0.3-r1.ebuild
@@ -0,0 +1,44 @@
+# 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/abego/treelayout/archive/v1.0.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild treelayout-1.0.3-r1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.abego.treelayout:org.abego.treelayout.core:1.0.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Efficient and customizable TreeLayout Algorithm in Java."
+HOMEPAGE="https://github.com/abego/treelayout"
+SRC_URI="https://github.com/abego/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+#	LICENSE="!!!equivalentPortageLicenseName-not-found!!!"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( ../README.md )
+
+S="${WORKDIR}/${P}/org.abego.treelayout"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/treelayout/treelayout-1.0.3.ebuild b/dev-java/treelayout/treelayout-1.0.3.ebuild
deleted file mode 100644
index 6785a357c359..000000000000
--- a/dev-java/treelayout/treelayout-1.0.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_PKG_BSFIX_NAME="build-impl.xml"
-EANT_BUILD_XML="nbproject/build-impl.xml"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Efficiently create compact tree layouts in Java"
-HOMEPAGE="https://github.com/abego/treelayout"
-SRC_URI="https://github.com/abego/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}/org.abego.${PN}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )"
-
-src_configure() {
-	EANT_EXTRA_ARGS="-Dplatform.home=${JAVA_HOME}"
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar dist/org.abego.${PN}.core.jar
-	dodoc CHANGES.txt src/website/abegoTreeLayout.pdf
-	use doc && java-pkg_dojavadoc dist/javadoc
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/trove/Manifest b/dev-java/trove/Manifest
deleted file mode 100644
index a345d78cf2ce..000000000000
--- a/dev-java/trove/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST trove-3.0.2.tar.gz 5880161 BLAKE2B a3dbb6a967ad9a519bd04abbbbf9e6af483360991956ff79532462a9ad471d409744017a3b24e4a09d2377243406e5d7cd542b452da8f59a1a97b454a2f60a8c SHA512 27460a66bad6f206eaeae02453c94333456db5a9c566246d495fb4184d42de6033b66d1bf74060f799cf4298d531afeb9597b92da4e2963b43dd4ef072ee750b
-DIST trove-3.0.3.jar 1793123 BLAKE2B efc6ff678d2f5cef8c68403faafce3dfb66ba7b3c1ffa42ad6727cd71c6dbd77fa06b4a6eb23c44a794982a8f2933afa10d4a5555a8749f49cf5e0ae227afb5a SHA512 03e0a376258730cb79fd0dd0a68bfacba6ca4baf3a352cce621d64e091ccd3f24c143b592f3bbd5bbac26529bc425b814dff45680ac46fd323eca95b36d2b640
-EBUILD trove-3.0.2-r3.ebuild 790 BLAKE2B c15a938a6e36c420a8e1815b14548994c90d13457884361c7099e2b2bd115da2732edc5833cfbb936ec00ba9a50066c505a8c9e9aa7f41eaeb44d170d83d1bd1 SHA512 68f241c22a60f164596e557fb78844f982412758ff374fb3d2123e78b77f7664b1110eddcbef6f5bba3332ffcbfd6d44227462c8e6fc54f8c2bf1330e351b124
-EBUILD trove-3.0.3.ebuild 650 BLAKE2B a760537aa55fd7e218080fa3cea32e0d8f655f3a2a8e3d1592109b79e4aa0f1e84d39a014bbe3b097d28aa2de3449f1ab5d004a29625142c8facb2689d680257 SHA512 9ece8db39ef58f37b5465700cae031b3d3c0c8eca6a3af8416233093bc4d24781a48f4cb924f15f0453b258a35dda78db4e46637a4ae45c48b77d45a60a52169
-MISC metadata.xml 314 BLAKE2B 317bcb9ac941fc89c6f6a22fc4f592efc8eaca3542998371a6e9a3160489585b323896e377d1f185201a69b9786de676c9d9f191c9237f635b1e8692b74c8a63 SHA512 a24188000aa630a6bb7dbe472d0a37d68ebdba4e52c3e543ff95957c4478bcf044970a64352f8922d000b64d254218761aa84f8b946d439b08646e9e7b20a6ab
diff --git a/dev-java/trove/trove-3.0.2-r3.ebuild b/dev-java/trove/trove-3.0.2-r3.ebuild
deleted file mode 100644
index ba6c309b4abe..000000000000
--- a/dev-java/trove/trove-3.0.2-r3.ebuild
+++ /dev/null
@@ -1,40 +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="GNU Trove: High performance collections for Java"
-SRC_URI="mirror://sourceforge/trove4j/${P}.tar.gz"
-HOMEPAGE="http://trove4j.sourceforge.net"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-DEPEND="
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}/${PV}"
-
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	mv "${PV}/${P}-src.jar" . || die
-	rm -rf "${PV}" || die
-	mkdir "${P}" || die
-	unzip -d "${P}" -qq "${P}-src.jar" || die
-	export S="${WORKDIR}/${P}"
-}
-
-src_prepare() {
-	default
-	find . -type f ! -name "*.java" -exec rm -v {} \; || die
-}
diff --git a/dev-java/trove/trove-3.0.3.ebuild b/dev-java/trove/trove-3.0.3.ebuild
deleted file mode 100644
index 731fa2823334..000000000000
--- a/dev-java/trove/trove-3.0.3.ebuild
+++ /dev/null
@@ -1,30 +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
-
-MY_PN="${PN}4j"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="GNU Trove: High performance collections for Java"
-SRC_URI="https://repo1.maven.org/maven2/net/sf/${MY_PN}/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
-HOMEPAGE="http://trove4j.sourceforge.net"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-DEPEND="
-	>=virtual/jdk-1.6"
-
-src_prepare() {
-	default
-	rm -v gnu/trove/impl/package.html || die
-}
diff --git a/dev-java/unkrig-nullanalysis/Manifest b/dev-java/unkrig-nullanalysis/Manifest
deleted file mode 100644
index ffbd429945c8..000000000000
--- a/dev-java/unkrig-nullanalysis/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST unkrig-nullanalysis-0_pre1644.tar.bz2 2322 BLAKE2B 49873e7c5eaa6b367350f3569d4d36945222b8048ed67fa7c77337133d67b68dda5344057fe80caaf34e54378da579e0525179e72ac8ef88865571c0381a2d14 SHA512 6e4f069023043ac24f7e68f748ad4c6cfaf16312310abfd9c6d395b34491b68a7c3cca6b3a36b18c4dd656cc15f17755dbd4ce3e6379da06f82a2691453c3c03
-EBUILD unkrig-nullanalysis-0_pre1644.ebuild 500 BLAKE2B ee666634b3cd88a170921b916a478fa951b90b294707c1a544c3ccb2e851e5674bfc555281088767a275d57cbd054fdcc93b0a849db802dc65cd28c54d7b8d36 SHA512 8fbabcfcf97f030e71ef9d4e0572b012b391e80aa2e94ac05fccf6e84dd53effa92467429f3298a5c4c4b0f017b13c8a87c2462fea72ca7266e3f28ecb7b40b9
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/unkrig-nullanalysis/metadata.xml b/dev-java/unkrig-nullanalysis/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/unkrig-nullanalysis/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/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.ebuild b/dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.ebuild
deleted file mode 100644
index 4f856cfa6c0c..000000000000
--- a/dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Some classes to test for various null conditions"
-HOMEPAGE="http://commons.unkrig.de"
-SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-JAVA_SRC_DIR="src"
diff --git a/dev-java/woodstox-core/Manifest b/dev-java/woodstox-core/Manifest
new file mode 100644
index 000000000000..ae23b6493baa
--- /dev/null
+++ b/dev-java/woodstox-core/Manifest
@@ -0,0 +1,5 @@
+DIST woodstox-core-6.2.7.tar.gz 5250524 BLAKE2B 3f5be53a459e8999cb53b3e89398bd94439815dd58cc30df7e1b71b9e98ef94b7704d04ae20401d39afff67210e423a4c5a148909a3a7ed750f7e0e24146c24a SHA512 0e2e11607c26d97509708523c4617d9e75fc529fbf5294b25deba5ca570797692e31e65621c77e7c4d9bdf0b3dee4b3c4fe0486a1e23d19dc41035d7d710668e
+DIST woodstox-core-6.2.8.tar.gz 5250255 BLAKE2B 69e45da9c7e09652ffc45b366359ae12954ad0450157d8639833d41600958d10ff1203502c926f0f23cd3e3d03dbc83378a9614e5eb19367fb60fad1232f4dd8 SHA512 c5af386891ab63fb2efc8510353e35c20fa157048631c809ed3d7e070b377ef5c21ffb1b7a0f9e597113db714ebc778951ac8a8e049c3d8291a89c3a0e7a044e
+EBUILD woodstox-core-6.2.7.ebuild 3569 BLAKE2B 1e9392272233dbe42a3cd4ae8735de1731526a35018ce6180a5049785e23e5735b930d250fdbeba57640af26584a51ddc17d2d073f8299188e4549b57c13c319 SHA512 58bdcc159675fd5bad2037e24e4fa694b4ca8a227a649f241f6d5acda4ca35f3b2f8f89cd15309c06f7c0e54bd32f3eb709a0ca11486ec5638e4de792048e01a
+EBUILD woodstox-core-6.2.8.ebuild 3023 BLAKE2B d8b9676a141bd1fa4a1e00d9bc1bf3c29f72ad3aa1d4cd5fdb4c5801815bfc48a453f8fc07740b5511942be7f06c9241313c1f7a034a8c19ee9045bbfdff810f SHA512 41aadd6b3b5fc7d41354878193862d754481e28e7a0e35ce047132083a1d43b01c0951216d884bf790eb64b265ed8712fe04735ad0f9cea42d29614b479ff6d4
+MISC metadata.xml 308 BLAKE2B f2c06b12854fb8659cf5b265400a53de6b0b10753da1438362a410f7831cab326887b09fb23b9678fe4939a7d33480fcdc6f2295c975e4fed021e2597e5349ce SHA512 9cc92aafb6c2e2c0226d2f59675a381f311028d149a731c5dbbb388d7174a9f69d6b47fc49d3ed60f8fc7af84b0b999c4dea5eb13477c21024f75e90736ca0a3
diff --git a/dev-java/woodstox-core/metadata.xml b/dev-java/woodstox-core/metadata.xml
new file mode 100644
index 000000000000..28e9d38710f5
--- /dev/null
+++ b/dev-java/woodstox-core/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/FasterXML/woodstox/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/woodstox-core/woodstox-core-6.2.7.ebuild b/dev-java/woodstox-core/woodstox-core-6.2.7.ebuild
new file mode 100644
index 000000000000..be656d0b16aa
--- /dev/null
+++ b/dev-java/woodstox-core/woodstox-core-6.2.7.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/woodstox/archive/refs/tags/woodstox-core-6.2.7.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild woodstox-core-6.2.7.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.woodstox:woodstox-core:6.2.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An XML processor that implements Stax (JSR-173), SAX2 and Stax2 APIs"
+HOMEPAGE="https://github.com/FasterXML/woodstox"
+SRC_URI="https://github.com/FasterXML/woodstox/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Common dependencies
+# POM: pom.xml
+# net.java.dev.msv:msv-core:2013.6.1 -> !!!artifactId-not-found!!!
+# net.java.dev.msv:xsdlib:2013.6.1 -> >=dev-java/xsdlib-20090415:0
+# org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0
+# relaxngDatatype:relaxngDatatype:20020414 -> !!!groupId-not-found!!!
+
+CP_DEPEND="
+	dev-java/msv:0
+	dev-java/relaxng-datatype:0
+	dev-java/stax2-api:0
+	dev-java/xsdlib:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# org.apache.felix:org.osgi.core:1.4.0 -> !!!groupId-not-found!!!
+# POM: pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	dev-java/osgi-core-api:0"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( LICENSE {README,SECURITY}.md release-notes/{CREDITS,VERSION} )
+
+S="${WORKDIR}/woodstox-${P}"
+
+JAVA_CLASSPATH_EXTRA="osgi-core-api"
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# Upstream: Tests run: 864, Failures: 0, Errors: 0, Skipped: 0
+	# "No tests found in ..."
+	wstxtest.vstream.BaseValidationTest
+	wstxtest.BaseWstxTest
+	stax2.vstream.BaseStax2ValidationTest
+	stax2.BaseStax2Test
+	stax2.wstream.BaseWriterTest
+	org.codehaus.stax.test.BaseStaxTest
+	org.codehaus.stax.test.wstream.BaseWriterTest
+	org.codehaus.stax.test.stream.BaseStreamTest
+	# "... has no public constructor"
+	wstxtest.stream.BaseStreamTest
+	wstxtest.wstream.BaseWriterTest
+	stax2.vwstream.BaseOutputTest
+	org.codehaus.stax.test.vstream.BaseVStreamTest
+	org.codehaus.stax.test.evt.BaseEventTest
+	# Upstream does not run these:
+	failing.TestBasicSax
+	failing.TestExtLocationInfo91
+	failing.TestRelaxNG
+	failing.TestW3CDefaultValues
+	failing.TestW3CDefaultValues
+	failing.TestW3CSchemaComplexTypes
+	failing.TestW3CSchemaTypes
+	failing.TestW3CSchemaTypes
+)
+
+src_prepare() {
+	default
+
+	#rc/moditect/module-info.java:32: error: package com.ctc.wstx.shaded.msv.relaxng_datatype does not exist
+	#    provides com.ctc.wstx.shaded.msv.relaxng_datatype.DatatypeLibraryFactory with com.ctc.wstx.shaded.msv_core.datatype.xsd.ngimpl.DataTypeLibraryImpl;
+	#                                                     ^
+	#src/moditect/module-info.java:32: error: package com.ctc.wstx.shaded.msv_core.datatype.xsd.ngimpl does not exist
+	#    provides com.ctc.wstx.shaded.msv.relaxng_datatype.DatatypeLibraryFactory with com.ctc.wstx.shaded.msv_core.datatype.xsd.ngimpl.DataTypeLibraryImpl
+	sed -e '/com.ctc.wstx.shaded.msv/d' \
+		-e '/org.codehaus.stax2.validation/d' \
+		-i "src/moditect/module-info.java" || die
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/woodstox-core/woodstox-core-6.2.8.ebuild b/dev-java/woodstox-core/woodstox-core-6.2.8.ebuild
new file mode 100644
index 000000000000..06610489010c
--- /dev/null
+++ b/dev-java/woodstox-core/woodstox-core-6.2.8.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/woodstox/archive/woodstox-core-6.2.8.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild woodstox-core-6.2.8.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.woodstox:woodstox-core:6.2.8"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An XML processor that implements Stax (JSR-173), SAX2 and Stax2 APIs"
+HOMEPAGE="https://github.com/FasterXML/woodstox"
+SRC_URI="https://github.com/FasterXML/woodstox/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# net.java.dev.msv:msv-core:2013.6.1 -> >=dev-java/msv-20130601:0
+# net.java.dev.msv:xsdlib:2013.6.1 -> >=dev-java/xsdlib-20090415:0
+# org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0
+# relaxngDatatype:relaxngDatatype:20020414 -> !!!groupId-not-found!!!
+
+CP_DEPEND="
+	dev-java/msv:0
+	dev-java/relaxng-datatype:0
+	dev-java/stax2-api:0
+	dev-java/xsdlib:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# org.apache.felix:org.osgi.core:1.4.0 -> !!!groupId-not-found!!!
+# POM: pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	dev-java/osgi-core-api:0"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( LICENSE {README,SECURITY}.md release-notes/{CREDITS,VERSION} )
+
+S="${WORKDIR}/woodstox-${P}"
+
+JAVA_CLASSPATH_EXTRA="osgi-core-api"
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# Upstream: Tests run: 864, Failures: 0, Errors: 0, Skipped: 0
+	# "No tests found in ..."
+	wstxtest.vstream.BaseValidationTest
+	wstxtest.BaseWstxTest
+	stax2.vstream.BaseStax2ValidationTest
+	stax2.BaseStax2Test
+	stax2.wstream.BaseWriterTest
+	org.codehaus.stax.test.BaseStaxTest
+	org.codehaus.stax.test.wstream.BaseWriterTest
+	org.codehaus.stax.test.stream.BaseStreamTest
+	# "... has no public constructor"
+	wstxtest.stream.BaseStreamTest
+	wstxtest.wstream.BaseWriterTest
+	stax2.vwstream.BaseOutputTest
+	org.codehaus.stax.test.vstream.BaseVStreamTest
+	org.codehaus.stax.test.evt.BaseEventTest
+	# Upstream does not run these:
+	failing.TestBasicSax
+	failing.TestExtLocationInfo91
+	failing.TestRelaxNG
+	failing.TestW3CDefaultValues
+	failing.TestW3CDefaultValues
+	failing.TestW3CSchemaComplexTypes
+	failing.TestW3CSchemaTypes
+	failing.TestW3CSchemaTypes
+)
+
+src_prepare() {
+	default
+
+	# We do not bundle any shaded (aka relocated) classes.
+	sed -e '/com.ctc.wstx.shaded.msv/d' \
+		-e '/org.codehaus.stax2.validation/d' \
+		-i "src/moditect/module-info.java" || die
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index bbb3ceabb2b6..0bd995eeaab9 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,6 +1,3 @@
-AUX xerces-2.12.0-overrides.patch 1526 BLAKE2B 837bba05c47933fa4cc44a5a326fe6a7c872028181ec11c8da7e8ec182c8bcabeead38b1ad336ae20ec47dffb30e98a8d2c181e4dfbffa12d14bfe017fff4e19 SHA512 b81fb06ba89b6ef374205d623d655309778c9713f0ff11fa392d9f53d6331eaa342ce4145433c2e187f26145b3d9b8de7d48778bfd0c29497900ab47556d2bf9
-DIST xerces-2.12.0.jar 2113705 BLAKE2B 4224b9c00b9c7f388fc40f3bebe6520a21011f36ee1ffcf62e864fe370bbcac8c45b3627d2aff20655f467661a252e1bfd5cb9613f9bbe5b08f1917d09493fa7 SHA512 21f5218f71b3423a883e2bf5c99f7badd5a004a09454d0b218f57f463daf8fe83e7a186b64dd4c19388795a6e6e995f6ed133bbe4c81aab07b0a0d33cf2f7dbb
-DIST xerces-2.12.1.jar 2149927 BLAKE2B b02c518754bcab1da9200122b398496c273a84c07a60945c0eea5524a230f5f4815b619685fc41bf48a124f9147803b9452d5d0105b57d535c9c666c52196571 SHA512 2c4ce274904eda6eb4b0b8800dc8383bc6504e215eb9603c45a25c32335651c8ea4d69539b984c048c1974d2aed3d852fff168eb44e2a9b1087ded578394b849
-EBUILD xerces-2.12.0-r1.ebuild 1243 BLAKE2B 2f7141d2a08249d6b293e99b2648b7dcc8a54f6e1d9edf3d1289a0c556d9a0c263520f844fd76e2e2a3a16250af3314351be9a493d94cc7cbafe72233aaae7d6 SHA512 92a01a9ab116180ac968c2474823cf9041f6d4bef5ad093cd2a7bb167e77550472e8d3eef615b79c7042998b79f83dda02e0cf6df609e7c8e3c1d9d7639f5ed3
-EBUILD xerces-2.12.1.ebuild 784 BLAKE2B 2b1fc5fe458e4b064e8149de5c4b9f691210e8947f4a8e70f72715e0ba6e92ef4f3be2b61474947f5ea29dfafeb55ca6d707a94f7cd2a10c1e3f4562f13d20f5 SHA512 81acd3d9ea6587c9851800606d82279846b7eb6f55483b83a007c54be7959d8a0ae38f0fc1406e07d0905208beb43c50e54660a47ba317722a66f1247d59a869
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
+DIST Xerces-J-src.2.12.2.tar.gz 1812583 BLAKE2B f1b5928abe2852acc4d554c47aa7cbd81a568e15c8a1fd5ea98dc526c52838b0a50920d2ed807e607b01c875676e54578f1493856b06de5a7ba8784591f7f06f SHA512 e71a692212a974ebfa39af5ffd023b433ece34425b12aceeffe89cebe04f28dd8fa46a131a56f30295dca36de115128a6d7e05172c82f5b85d914cd991f34056
+EBUILD xerces-2.12.2.ebuild 1736 BLAKE2B 7fadb87267e36e3354a83fb5fb124699258455c4e9f077b1af4bedd337933179d3db4fd6b0fdfadcfa9b354f58202852be45983472b95ceb721ccc622d2a14b0 SHA512 ecdeb6cb34e09cb4ffbbcc66648f79ec5b4608caccef7c8ba899643cda632762f71d12a055773d879c9362371191443021152b0a287f2db5d6c3f23bdaebc1e6
+MISC metadata.xml 1778 BLAKE2B 458bcbd9e8adfab1d2bd25a5fe9de0bee48292cb57e3591821fade58a987e59cb9811800273ac62b525738e7e955514b8b77c27fe97d9040bad0db203e6171a4 SHA512 ccbd7007ce2efe5b19d300ba939abe4e756d65eb1c910c74c5f3f13410de0d75e83bfd82d1e226e5dc1180982a1bfe231d30cb849f60142a177cc9aeb087c91f
diff --git a/dev-java/xerces/files/xerces-2.12.0-overrides.patch b/dev-java/xerces/files/xerces-2.12.0-overrides.patch
deleted file mode 100644
index 2e31002065e3..000000000000
--- a/dev-java/xerces/files/xerces-2.12.0-overrides.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/org/apache/html/dom/HTMLIFrameElementImpl.java	2019-04-17 18:08:03.187783332 +0000
-+++ b/org/apache/html/dom/HTMLIFrameElementImpl.java	2019-04-17 18:09:38.640274335 +0000
-@@ -17,6 +17,7 @@
- package org.apache.html.dom;
- 
- import org.w3c.dom.html.HTMLIFrameElement;
-+import org.w3c.dom.Document;
- 
- /**
-  * @xerces.internal
-@@ -161,6 +162,11 @@
-         super( owner, name );
-     }
- 
-+    @Override
-+    public Document getContentDocument()
-+    {
-+        return null;
-+    }
- 
- }
- 
---- a/org/apache/html/dom/HTMLFrameElementImpl.java	2019-04-17 19:14:06.833172177 +0000
-+++ b/org/apache/html/dom/HTMLFrameElementImpl.java	2019-04-17 19:14:56.755428976 +0000
-@@ -17,6 +17,7 @@
- package org.apache.html.dom;
- 
- import org.w3c.dom.html.HTMLFrameElement;
-+import org.w3c.dom.Document;
- 
- /**
-  * @xerces.internal
-@@ -138,6 +139,11 @@
-         super( owner, name );
-     }
-   
-+    @Override
-+    public Document getContentDocument()
-+    {
-+        return null;
-+    }
- 
- }
- 
---- a/org/apache/html/dom/HTMLObjectElementImpl.java	2019-04-17 19:17:26.624199895 +0000
-+++ b/org/apache/html/dom/HTMLObjectElementImpl.java	2019-04-17 19:19:23.691802087 +0000
-@@ -17,6 +17,7 @@
- package org.apache.html.dom;
- 
- import org.w3c.dom.html.HTMLObjectElement;
-+import org.w3c.dom.Document;
- 
- /**
-  * @xerces.internal
-@@ -251,6 +252,11 @@
-         super( owner, name );
-     }
- 
-+    @Override
-+    public Document getContentDocument()
-+    {
-+        return null;
-+    }
- 
- }
- 
diff --git a/dev-java/xerces/metadata.xml b/dev-java/xerces/metadata.xml
index 6021501589e0..ad8d1c3e6d98 100644
--- a/dev-java/xerces/metadata.xml
+++ b/dev-java/xerces/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		Xerces2 provides high performance, fully compliant XML parsers in the Apache Xerces family. This new version of Xerces continues to build upon the Xerces Native Interface (XNI), a complete framework for building parser components and configurations that is extremely modular and easy to program. The Apache Xerces2 parser is the reference implementation of XNI but other parser components, configurations, and parsers can be written using the Xerces Native Interface. For complete design and implementation documents, refer to the XNI Manual. Xerces2 provides fully conforming XML Schema 1.0 and 1.1 processors. An experimental implementation of the "XML Schema Definition Language (XSD): Component Designators (SCD) Candidate Recommendation (January 2010)" is also provided for evaluation. For more information, refer to the XML Schema page. Xerces2 also provides a complete implementation of the Document Object Model Level 3 Core and Load/Save W3C Recommendations and provides a complete implementation of the XML Inclusions (XInclude) W3C Recommendation. It also provides support for OASIS XML Catalogs v1.1. Xerces2 is able to parse documents written according to the XML 1.1 Recommendation, except that it does not yet provide an option to enable normalization checking as described in section 2.13 of this specification. It also handles namespaces according to the XML Namespaces 1.1 Recommendation, and will correctly serialize XML 1.1 documents if the DOM level 3 load/save APIs are in use.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/xerces/xerces-2.12.0-r1.ebuild b/dev-java/xerces/xerces-2.12.0-r1.ebuild
deleted file mode 100644
index 60f2bd89f71a..000000000000
--- a/dev-java/xerces/xerces-2.12.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="xerces:xercesImpl:2.12.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="xercesImpl"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Xerces Java XML parser"
-HOMEPAGE="https://xml.apache.org/xerces2-j/index.html"
-SRC_URI="https://repo1.maven.org/maven2/xerces/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CDEPEND="
-	dev-java/xml-commons-resolver:0
-	dev-java/xml-commons-external:1.4"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-JAVA_SRC_DIR="org"
-JAVA_RESOURCE_DIRS="resources"
-
-JAVA_GENTOO_CLASSPATH="
-	xml-commons-resolver
-	xml-commons-external-1.4"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-overrides.patch"
-)
-
-src_prepare() {
-	default
-	mkdir "${JAVA_RESOURCE_DIRS}" || die
-	cp -r "${JAVA_SRC_DIR}" "${JAVA_RESOURCE_DIRS}" || die
-	find "${JAVA_RESOURCE_DIRS}" -type f -name '*.java' -exec rm -rf {} + || die
-	rm "${JAVA_RESOURCE_DIRS}"/org/apache/xerces/{dom/org.apache.xerces.dom.DOMImplementationSourceImpl,xs/datatypes/package.html,parsers/org*} || die
-
-	java-pkg-2_src_prepare
-}
diff --git a/dev-java/xerces/xerces-2.12.1.ebuild b/dev-java/xerces/xerces-2.12.1.ebuild
deleted file mode 100644
index 0d5e000fae02..000000000000
--- a/dev-java/xerces/xerces-2.12.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="xerces:xercesImpl:2.12.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="xercesImpl"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Xerces Java XML parser"
-HOMEPAGE="https://xerces.apache.org/xerces2-j/index.html"
-SRC_URI="https://repo1.maven.org/maven2/xerces/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-CDEPEND="dev-java/xml-commons-resolver:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-11:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-11:*"
-
-JAVA_SRC_DIR="org"
-
-JAVA_GENTOO_CLASSPATH="xml-commons-resolver"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	rm -rv "org/w3c" || die
-}
diff --git a/dev-java/xerces/xerces-2.12.2.ebuild b/dev-java/xerces/xerces-2.12.2.ebuild
new file mode 100644
index 000000000000..1a52c0d15261
--- /dev/null
+++ b/dev-java/xerces/xerces-2.12.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="xerces:xercesImpl:2.12.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Xerces Java XML parser"
+HOMEPAGE="https://xerces.apache.org/xerces2-j/index.html"
+SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.2.12.2.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+CP_DEPEND="
+	dev-java/xml-commons-external:1.4
+	dev-java/xml-commons-resolver:0"
+
+# JDK 11+ already privides the following file and the compilation
+# fails if xerces provides it too. On contrary, compilation on 1.8
+# fails if we don't provide the file because it's not part of 1.8.
+# By restricting compilation to 1.8 and providing the file we build
+# a jar that should work both on 1.8 and also on the newer versions
+# of JDK.
+# the file: "org/w3c/dom/html/HTMLDOMImplementation.class"
+DEPEND="
+	${CP_DEPEND}
+	virtual/jdk:1.8"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( LICENSE NOTICE README {LICENSE.resolver,LICENSE.serializer,NOTICE.resolver,NOTICE.serializer}.txt )
+HTML_DOCS=( {LICENSE.DOM-documentation,LICENSE.DOM-software,LICENSE-SAX,Readme}.html )
+
+S="${WORKDIR}/${P//./_}"
+
+JAVA_SRC_DIR="src"
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+	default
+	mkdir "${JAVA_RESOURCE_DIRS}" || die
+	cp -r "${JAVA_SRC_DIR}/org" "${JAVA_RESOURCE_DIRS}" || die
+	find "${JAVA_RESOURCE_DIRS}" -type f -name '*.java' -exec rm -rf {} + || die
+	rm "${JAVA_RESOURCE_DIRS}"/org/apache/xerces/{dom/org.apache.xerces.dom.DOMImplementationSourceImpl,xs/datatypes/package.html,parsers/org*} || die
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/xerial-core/Manifest b/dev-java/xerial-core/Manifest
index 37749085dea8..80ed6051641e 100644
--- a/dev-java/xerial-core/Manifest
+++ b/dev-java/xerial-core/Manifest
@@ -1,5 +1,3 @@
-AUX 2.0.1-build.xml 5674 BLAKE2B dc70ae55f105e36306cc30e71b64fb1008003b2a330dd12b7531a81191e82a6ea376eedd58495b788fa2a526badb5b33b0e72a4627c5cbe0db3ebefbd9eee924 SHA512 fe6cae55b06099f1718fe2d2b70f680b3549c20047884f879d4fcdc7f8765d4b18a5f8b80478b09913013958834f2602ded4e0b9580db96467d89b1bd5c23650
 DIST xerial-core-2.0.1.tar.bz2 519709 BLAKE2B 3d81bda265e3b3b37a50a62061298f23de7c2947a9d50ba6eac336c3ec09fcaaeea84d456e344b0d2ae16710870025a869c2359a17f0956c8dda557804e9d5ff SHA512 39236e8a653301a6899ce80d3240d505e91f0cfc8878fa1a698113d06f3af3fd7adef540d72da1c0e1fb7101542c43e92fb9388243d95c3185a561532c18c6fb
-EBUILD xerial-core-2.0.1-r1.ebuild 1454 BLAKE2B 39c8bae5eea1ec987e023bd37a445fda6f38394cc310df81738195abaebacc3d22ebdba415696cac16f979befea37ea0ffad12094a9d38ef3151ffbe61c44d96 SHA512 c3074c29cc04a036755f1c25f401d782a1af7b3364010146f6679acff0e0d14863c81fb08098c648cba51584f8fa1da988cce9bdc978246edaf269549526b9f4
-EBUILD xerial-core-2.0.1.ebuild 924 BLAKE2B eeea14596a52313896ec32d3fad773bebb08a8ee73fbb43f7ee16e818896920e3bbc2a230b1de586ec33900701c908b7826c37e44d77ced69806fa5cfb901651 SHA512 1d0e2abac6e6733e1992ea76d87788e489654af275849e4e78a5bfd5bf29fa9ea5f845b82684a39421b4ab4d9332f49140093fc5e7da89570bc42f94b7cf997f
+EBUILD xerial-core-2.0.1-r1.ebuild 1469 BLAKE2B c00a498648c515ba78a4680db4c967d472ab4696435e7c0907d286b4703318571ce8f82400af41129019b09bca576222000432f3e5f1246a5118db280ece45ff SHA512 32cbb09e2e83358641c0cd3d939900d2bfdeac606f918ee23bbebbc7747a307af62ebc6f4de08645d1ec35479cd1f7267cac51b94f53802d51526fcca7a55d5a
 MISC metadata.xml 320 BLAKE2B e2b3c6290aa495c539b2b3f7afe9fbbad2011245a00e41dd928649a35256f1882ea2bc0eb95c9b468e041734464f4299c39da87c7727b9f43ad8346a0d68affa SHA512 86ce5a0bed000e534fce286494c981aa6e3d8e7619c549ad666655d51928a62699cfd1638d99dcb66f3a83c5717aacb50211f3e2e3314408c188594e986f7171
diff --git a/dev-java/xerial-core/files/2.0.1-build.xml b/dev-java/xerial-core/files/2.0.1-build.xml
deleted file mode 100644
index 76a6adfcb189..000000000000
--- a/dev-java/xerial-core/files/2.0.1-build.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="xerial-core-from-maven" default="package" basedir=".">
-	<property file="${user.home}/.m2/maven.properties" />
-	<property file="maven-build.properties" />
-
-	<property name="maven.build.finalName" value="xerial-core-2.0.1" />
-	<property name="maven.build.dir" value="target" />
-	<property name="maven.build.outputDir" value="${maven.build.dir}/classes" />
-	<property name="maven.build.srcDir.0" value="src/main/java" />
-	<property name="maven.build.resourceDir.0" value="src/main/java" />
-	<property name="maven.build.resourceDir.1" value="src/main/resources" />
-	<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes" />
-	<property name="maven.build.testDir.0" value="src/test/java" />
-	<property name="maven.build.testResourceDir.0" value="src/test/java" />
-	<property name="maven.build.testResourceDir.1" value="src/test/resources" />
-	<property name="maven.test.reports" value="${maven.build.dir}/test-reports" />
-	<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site" />
-
-	<property name="maven.repo.local" value="${user.home}/.m2/repository" />
-	<property name="maven.settings.offline" value="false" />
-	<property name="maven.settings.interactiveMode" value="true" />
-
-	<path id="build.classpath" />
-	<path id="build.test.classpath" />
-
-	<target name="clean" description="Clean the output directory">
-		<delete dir="${maven.build.dir}" />
-	</target>
-
-
-	<target name="compile" description="Compile the code">
-		<mkdir dir="${maven.build.outputDir}" />
-		<javac destdir="${maven.build.outputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.6" verbose="false" fork="false" source="1.6">
-			<src>
-				<pathelement location="${maven.build.srcDir.0}" />
-			</src>
-			<classpath refid="build.classpath" />
-		</javac>
-		<copy todir="${maven.build.outputDir}">
-			<fileset dir="${maven.build.resourceDir.0}">
-				<exclude name="**/*.java" />
-			</fileset>
-		</copy>
-	</target>
-
-
-	<target name="compile-tests" depends="compile" description="Compile the test code" unless="maven.test.skip">
-		<mkdir dir="${maven.build.testOutputDir}" />
-		<javac destdir="${maven.build.testOutputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.6" verbose="false" fork="false" source="1.6">
-			<src>
-				<pathelement location="${maven.build.testDir.0}" />
-			</src>
-			<classpath>
-				<path refid="build.test.classpath" />
-				<pathelement location="${maven.build.outputDir}" />
-			</classpath>
-		</javac>
-		<copy todir="${maven.build.testOutputDir}">
-			<fileset dir="${maven.build.testResourceDir.0}">
-				<exclude name="**/*.java" />
-			</fileset>
-		</copy>
-		<copy todir="${maven.build.testOutputDir}">
-			<fileset dir="${maven.build.testResourceDir.1}" />
-		</copy>
-	</target>
-
-	<target name="test" depends="compile-tests, junit-missing" unless="junit.skipped" description="Run the test cases">
-		<mkdir dir="${maven.test.reports}" />
-		<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-			<sysproperty key="basedir" value="." />
-			<formatter type="xml" />
-			<formatter type="plain" usefile="false" />
-			<classpath>
-				<path refid="build.test.classpath" />
-				<pathelement location="${maven.build.outputDir}" />
-				<pathelement location="${maven.build.testOutputDir}" />
-			</classpath>
-			<batchtest todir="${maven.test.reports}" unless="test">
-				<fileset dir="${maven.build.testDir.0}">
-					<include name="**/Test*.java" />
-					<include name="**/*Test.java" />
-					<include name="**/*TestCase.java" />
-					<exclude name="**/*Abstract*Test.java" />
-				</fileset>
-			</batchtest>
-			<batchtest todir="${maven.test.reports}" if="test">
-				<fileset dir="${maven.build.testDir.0}">
-					<include name="**/${test}.java" />
-					<exclude name="**/*Abstract*Test.java" />
-				</fileset>
-			</batchtest>
-		</junit>
-	</target>
-
-	<target name="test-junit-present">
-		<available classname="junit.framework.Test" property="junit.present" />
-	</target>
-
-	<target name="test-junit-status" depends="test-junit-present">
-		<condition property="junit.missing">
-			<and>
-				<isfalse value="${junit.present}" />
-				<isfalse value="${maven.test.skip}" />
-			</and>
-		</condition>
-		<condition property="junit.skipped">
-			<or>
-				<isfalse value="${junit.present}" />
-				<istrue value="${maven.test.skip}" />
-			</or>
-		</condition>
-	</target>
-
-	<target name="junit-missing" depends="test-junit-status" if="junit.missing">
-		<echo>=================================== WARNING ===================================</echo>
-		<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-		<echo>===============================================================================</echo>
-	</target>
-
-	<target name="javadoc" description="Generates the Javadoc of the application">
-		<javadoc sourcepath="${maven.build.srcDir.0}" packagenames="*" destdir="${maven.reporting.outputDirectory}/apidocs" charset="ISO-8859-1" linksource="false" breakiterator="false">
-			<doctitle>&lt;![CDATA[xerial-core-2.0.1 API]]&gt;</doctitle>
-		</javadoc>
-	</target>
-
-	<target name="package" depends="compile,test" description="Package the application">
-		<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" compress="true" index="false" basedir="${maven.build.outputDir}" excludes="**/package.html" />
-	</target>
-
-	<target name="jar" depends="package" description="Builds the jar for the application" />
-
-	<target name="test-offline">
-		<condition property="maven.mode.offline">
-			<equals arg1="${maven.settings.offline}" arg2="true" />
-		</condition>
-	</target>
-
-</project>
diff --git a/dev-java/xerial-core/xerial-core-2.0.1-r1.ebuild b/dev-java/xerial-core/xerial-core-2.0.1-r1.ebuild
index 93fd310af6bb..585c67d8e0b1 100644
--- a/dev-java/xerial-core/xerial-core-2.0.1-r1.ebuild
+++ b/dev-java/xerial-core/xerial-core-2.0.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/xerial-core/xerial-core-2.0.1.ebuild b/dev-java/xerial-core/xerial-core-2.0.1.ebuild
deleted file mode 100644
index edaab8c4a833..000000000000
--- a/dev-java/xerial-core/xerial-core-2.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="An open-source DBMS for XML/JSON/Relational data"
-HOMEPAGE="https://code.google.com/p/xerial/"
-SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/junit:4
-	)"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-EANT_TEST_ANT_TASKS="ant-junit"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die
-}
-
-src_install() {
-	java-pkg_newjar "${S}/target/${P}.jar" "${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/xmldb/Manifest b/dev-java/xmldb/Manifest
deleted file mode 100644
index 363ce5c5c681..000000000000
--- a/dev-java/xmldb/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX xmldb-20011111-enum.patch 618 BLAKE2B 2e75eee88aaf768cd8394e82313448c6f0d5840fe5139dc9301cbd679b8ee05521f0e85b5e47e26224a06a2a5b1f88102592558d8677a560aa74edb66a1f61ad SHA512 5c9649f72dfdcdc054f11fdfd055b46e1b0d84949cedb1c29a8beafd05056c3a0206a38e3f022dfa83262f9a4a85b0cded7e3c899e207f51b31dc47cd2f0246f
-AUX xmldb-20011111-unreachable.patch 301 BLAKE2B c5cfa08eada500432b1c0d35ba74686727b6fcd8c8675cff9b2b2833e26055bb39e2586807e8f3099d49b83de074eb15387978f247bc5d01197d7c2956564104 SHA512 5cb8ee4323596b427fd15a1c0764ebdf377c7acc5a2111c17dc24b826965d61f4e576885dcceca600eb5dd850cee9a98c48f4b3fe5272f7f9d4558834e451786
-DIST xmldb-api-11112001.tar.gz 36553 BLAKE2B 458c0d043e47580776dc9348fc650c135d14c316ca4f5722d30c753e222e5b29cc524d962daa4729bc9cfbbe0adbd5519735e6333811bf202575d375cd3971ec SHA512 20123801a57b5350ade4dc82aba5ba2492cfbbe2e0389aaba4b73cdd3a8d07981a895ec2318885358102e48644cdaa30a18996ab9315891e506506fbc25658a2
-EBUILD xmldb-20011111-r2.ebuild 944 BLAKE2B 36a3f1a08fa88c31be98a7329d4520125e3f9a3d714407c3b437daeacf058112aeb94894957ed99ec069958bbb88e0377934e1dce236abacc969a4f30360f22a SHA512 78217fcf2713a304be4c1a5af5b87d41cfa9352346fe6941765485e0e950b0614768bac5b9d7b2383e6d05742fd0ac80dca4c109ab97e3484d8cc42034ce3888
-MISC metadata.xml 595 BLAKE2B 235f8dad2e7f498beb99aa7b973ac314a75437c3492ed99f160d8ba821c7d8c5ce778cbac9c4cb290d8c90d7f075d152ed809b6e4d12ecb75fbd74d765eecf07 SHA512 619b86012dcc850a5fa63a56b5454a3b0dc6d0abcfb63a8f56a9c540d6ba902b14b91c84a769e599d51bcd6c4d0c0f6c37dcded7f2ac9552fe1734ca982293b0
diff --git a/dev-java/xmldb/files/xmldb-20011111-enum.patch b/dev-java/xmldb/files/xmldb-20011111-enum.patch
deleted file mode 100644
index 33a4b22b179f..000000000000
--- a/dev-java/xmldb/files/xmldb-20011111-enum.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/org/xmldb/api/sdk/modules/SetContentHandler.java	2017-03-17 21:49:05.540172602 +0000
-+++ b/org/xmldb/api/sdk/modules/SetContentHandler.java	2017-03-17 21:49:22.860172942 +0000
-@@ -168,9 +168,9 @@
-          }
-       }
-
--      Enumeration enum = namespaces.keys();
--      while ( enum.hasMoreElements() ) {
--         String key = (String) enum.nextElement();
-+      Enumeration myEnum = namespaces.keys();
-+      while ( myEnum.hasMoreElements() ) {
-+         String key = (String) myEnum.nextElement();
-          newContent.append(" xmlns");
-          if (key.length() > 0) {
-             newContent.append(":");
diff --git a/dev-java/xmldb/files/xmldb-20011111-unreachable.patch b/dev-java/xmldb/files/xmldb-20011111-unreachable.patch
deleted file mode 100644
index a0476158c550..000000000000
--- a/dev-java/xmldb/files/xmldb-20011111-unreachable.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/org/xmldb/api/reference/modules/XPathQueryServiceImpl.java	2002-01-30 04:46:43.000000000 -0500
-+++ b/org/xmldb/api/reference/modules/XPathQueryServiceImpl.java	2005-06-26 21:37:59.000000000 -0400
-@@ -133,7 +133,7 @@
-          }
-       }
- 
--      return result;;
-+      return result;
-    }
- }
- 
diff --git a/dev-java/xmldb/metadata.xml b/dev-java/xmldb/metadata.xml
deleted file mode 100644
index a750666f11fa..000000000000
--- a/dev-java/xmldb/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>
-XML:DB provides a community for collaborative development of specifications
-for XML databases and data manipulation technologies. Along with each
-specification an open source reference implementation will be developed to
-validate the ideas.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">xmldb-org</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/xmldb/xmldb-20011111-r2.ebuild b/dev-java/xmldb/xmldb-20011111-r2.ebuild
deleted file mode 100644
index f7d209a970b1..000000000000
--- a/dev-java/xmldb/xmldb-20011111-r2.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-pkg-simple
-
-MY_PN="${PN}-api"
-MY_PV="11112001"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="XML:DB Java library"
-HOMEPAGE="https://sourceforge.net/projects/xmldb-org/"
-SRC_URI="mirror://sourceforge/xmldb-org/${MY_P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-CDEPEND="
-	dev-java/xalan:0
-	dev-java/xerces:2"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${PN}"
-
-JAVA_GENTOO_CLASSPATH="
-	xalan
-	xerces-2
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-enum.patch"
-	"${FILESDIR}/${P}-unreachable.patch"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-
-	# Must hard-depend on dev-java/junit otherwise.
-	rm -rv org/xmldb/api/tests || die
-}
diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index d53b0ebb1229..5fd20ec46321 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -1,5 +1,3 @@
-DIST xmlgraphics-commons-2.6-src.tar.gz 2718577 BLAKE2B 7be3565d2224adcb1a804a089f6f52810852117a7c13129822bd1a9f27f7c10abf186b5b7d703c0351ef76d50ddb741fae65094af35d2037044ad56220989dfe SHA512 bdf7fb21d076ba722648da016b0686ed3ea6f56b8ba1a8cea34b517095bf91ff900a937e45aba0977389ab736b1815a5733908ad4242911246555dce61cf4cfd
 DIST xmlgraphics-commons-2.7-src.tar.gz 2021218 BLAKE2B a16dda389662a38d5ebf6cbd015ac5bf8154b5e2df9e36fd3a33987b04a4de08cc1ebc71e940c05793ef045249c68e7dbb54c418a7c6888020a800e039b0a188 SHA512 7d3993fc920767512f94edef3342757f0ffc9c9dbad80695fe3d77b0ec162380d9b467682ae41238e7ee719601709edb41b2dab06c385dfd9fa898577d8d2c22
-EBUILD xmlgraphics-commons-2.6.ebuild 2254 BLAKE2B 7ca08e13c790345faa8fe692f990d57844acfe3783c85c5bab81ca76d2228fade803134af6730f3d729410b7e52547b620b5a8e023049b9935d2fc49be73b2b3 SHA512 c43bcf61fff6a28b5acf844165ad3f574b23ed59cf77984b3accfc00da07158793a0123316e88c2840919971b698d044c340418d92c67b90ff93b4b148fe9c98
-EBUILD xmlgraphics-commons-2.7.ebuild 1824 BLAKE2B 0d4c08f0640e149b8f6ea258abb91d1e1a5f847608e635bbe818c51ab3cfeb7712a094ee18e48577ff2b585d14e93dde2e3b981af167fc9b918404554ac3797a SHA512 311c751a03dfdfe42ad74dced141743ac2239b57e2d767821ea09d4a44753d188662d130fc64469fb1913baaac88909de8d2b24046b8ed2e8c59026edc0a6e48
+EBUILD xmlgraphics-commons-2.7.ebuild 1820 BLAKE2B 3622f63c6571d09b621507b4f2a3e641e29f3e38a0bf1c6d6971d6c703518980c2d08de4e7f901b636c42890016150ed78a11f166957b940c77b6cfa8e3a8b73 SHA512 4a891359802ed69d9844415cdd3f7022a16fed7affe236ad807d68276d9b4b9cbcb9b888a9d94c8c4d3a45c0bd5eb22002aeca751882feaa82c09add7640070f
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.6.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.6.ebuild
deleted file mode 100644
index b0f4e8365620..000000000000
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.6.ebuild
+++ /dev/null
@@ -1,75 +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 /var/tmp/portage/dev-java/xmlgraphics-commons-2.6/work/xmlgraphics-commons-2.6/pom.xml --download-uri mirror://apache/xmlgraphics/commons/source/2.6-src.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild xmlgraphics-commons-2.6.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.xmlgraphics:xmlgraphics-commons:2.6"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="XML Graphics Commons"
-HOMEPAGE="https://xmlgraphics.apache.org/commons/"
-SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-# Common dependencies
-# POM: /var/tmp/portage/dev-java/${P}/work/${P}/pom.xml
-# commons-io:commons-io:1.3.2 -> >=dev-java/commons-io-2.8.0:1
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-
-CDEPEND="
-	dev-java/commons-io:1
-	dev-java/commons-logging:0
-"
-
-# Compile dependencies
-# POM: /var/tmp/portage/dev-java/${P}/work/${P}/pom.xml
-# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
-# test? org.mockito:mockito-core:1.8.5 -> >=dev-java/mockito-1.9.5:0
-# test? xml-resolver:xml-resolver:1.2 -> >=dev-java/xml-commons-resolver-1.2:0
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/mockito:0
-		dev-java/xml-commons-resolver:0
-	)
-"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*
-"
-
-DOCS=( LICENSE NOTICE README )
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="commons-io-1,commons-logging"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,xml-commons-resolver"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-# Tests run: 189,  Failures: 12
-JAVA_TEST_EXCLUDES=(
-	"org.apache.xmlgraphics.xmp.XMPParserTestCase"
-	"org.apache.xmlgraphics.image.codec.tiff.TIFFImageEncoderTestCase"
-	"org.apache.xmlgraphics.image.loader.impl.ImageLoaderImageIOTestCase"
-	"org.apache.xmlgraphics.ps.dsc.ListenerTestCase"
-	"org.apache.xmlgraphics.io.XmlSourceUtilTestCase"
-)
-
-src_install() {
-	default
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild
index 62a758d133f1..da5532327d1f 100644
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 # Tests don't even compile with that old mockito version.
 RESTRICT="test"
diff --git a/dev-java/xmlunit/Manifest b/dev-java/xmlunit/Manifest
index f888922a1c6e..508944fdc874 100644
--- a/dev-java/xmlunit/Manifest
+++ b/dev-java/xmlunit/Manifest
@@ -1,4 +1,3 @@
 DIST xmlunit-1.6-src.zip 830899 BLAKE2B 74bc5238667444fac0a6780090a76cf9c2a6fa4f0536bdde36858190cbd0528873b14b5ee05e098840be1b01e0ccfa3d2243ef63f92dae6cbfef1d84732f1f33 SHA512 a7d15905d959ab5bfeb1807c80eab3e0aa58d501a2136335961da842b9571b95b4aab18189e9a21e59afac960ea83f9a2d32e3af398f63c0f839587b60b9f96b
-EBUILD xmlunit-1.6-r1.ebuild 1156 BLAKE2B 3b74d73dd4b2d1a1b3ed35cb6864f8ed570366ae47e826faa64389cc4c3f1dba85a446b023cb32e38e7522ad5be0b844e98ea936d5a1d873ce4dca760a917482 SHA512 235971bfc32ff8ef0098bbe6fdf99d523333231053d92b750c3c63b3445429602b43a5b0051c24ffd2e7b8c89cd93b95379d2915cea78f8aba36fe5e428e51fb
-EBUILD xmlunit-1.6.ebuild 1107 BLAKE2B 2d74e0b4b38e2a8bfd7624573de1f7fd50deca0da2eb74d0c9e8f6e6a130dd7b2b55fba7f929cce7c8dd98f9079b0dcee0765837a6557713a81745d7c040d787 SHA512 2f2b130513571653bdf2535af57aa844b6205fd1943d5156220a7d3aed4c18e0f84f786ed5cb8bafebfb0116d5e258bc10d28fbd66643ddfb9fe70b06ae56f9d
+EBUILD xmlunit-1.6-r1.ebuild 1153 BLAKE2B b1ea89644916d610b5c940b8607fd149cb41bd36d1514ebd6145e6035c8b440204d258aed6605d225d650b9f60d8a6e7b4acdba19c86bc20c92dda322ceb2901 SHA512 2b0113ad47f8e4b4bb8ba49b56e64d61f6ae2ae9b9fb340b9ae23f0cefcd23de36f143a49dc65aeab3bb64daaf25fe8135eb83b515f9ea2d438390db9d5cc6ea
 MISC metadata.xml 314 BLAKE2B 163bb6e09dcedea6c61c6d6c433b282f69bb76d13623e3386d5068be39db821005028b3dc03b44ae4be8966a57a8ab39a5c241b950ef2267f5c5c63b058c3edf SHA512 8041ce046f9cee5f27744e7d8c39aa39aa82e3e37502b4702b50957bab45560c2da3c4af9ba7c7cd1b0ede5ec464f707c1394c7844fd3d46aeaf69ca5714f1b3
diff --git a/dev-java/xmlunit/xmlunit-1.6-r1.ebuild b/dev-java/xmlunit/xmlunit-1.6-r1.ebuild
index c285e2891c96..9c340bc65330 100644
--- a/dev-java/xmlunit/xmlunit-1.6-r1.ebuild
+++ b/dev-java/xmlunit/xmlunit-1.6-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://xmlunit.sourceforge.net/"
 
 LICENSE="BSD"
 SLOT="1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 CDEPEND="dev-java/junit:0"
 
diff --git a/dev-java/xmlunit/xmlunit-1.6.ebuild b/dev-java/xmlunit/xmlunit-1.6.ebuild
deleted file mode 100644
index b6e5dc47b97b..000000000000
--- a/dev-java/xmlunit/xmlunit-1.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="XMLUnit extends JUnit and NUnit to enable unit testing of XML"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-HOMEPAGE="http://xmlunit.sourceforge.net/"
-
-LICENSE="BSD"
-SLOT="1"
-KEYWORDS="amd64 ppc64 x86"
-
-CDEPEND="dev-java/junit:0"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip:0
-	doc? ( app-text/docbook-xsl-stylesheets:0 )
-	test? (
-		dev-java/ant-junit:0
-		dev-java/ant-core:0
-	)
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="junit"
-
-EANT_DOC_TARGET="users-guide-html javadocs"
-EANT_ANT_TASKS="ant-core"
-EANT_EXTRA_ARGS="-Ddb5.xsl=/usr/share/sgml/docbook/xsl-stylesheets"
-
-src_test() {
-	ANT_TASKS="ant-junit ant-core" eant test
-}
-
-src_install() {
-	java-pkg_newjar "build/lib/${P}.jar"
-
-	dodoc README.txt
-
-	if use doc; then
-		java-pkg_dojavadoc build/doc/api
-		dohtml build/doc/userguide/html/*
-	fi
-
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/xp/Manifest b/dev-java/xp/Manifest
deleted file mode 100644
index 060a41602d20..000000000000
--- a/dev-java/xp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xp-0.5-fix-jdk-1.7-enum.patch 1320 BLAKE2B a69336ffcbbed7b41981b6beb29562b94f408ea9e7ab5145c32612b73702b091ea665ad2c2b2d6af8e6b83e46db90a773a0058d3b2ab37d68158e84b4e098802 SHA512 37f9b6969edb07d8b824aabcf07b182f77cd0cdac1bec2e84133526fe48fc2cc5fc15d050ee16e7ab46def72a9d1fcb627d426049b258d2bf063feed9928ca14
-DIST xp-0.5.zip 281324 BLAKE2B c9bf54836b67773f2bcdf34cd0548acc9e2cad039aaae1ff397f63b9f3715742ad9e0494b696415f83ffc50d14e47462c0efcf52e9332f8cf469441094bceb74 SHA512 5bf354967a1135209d5c6b3be979a311aa5c909493dea16a0efd31a1838dda12be4005ac7e919620ed68266a333fdc93a07853ec1e0af0e83b329bd40bda74b6
-EBUILD xp-0.5-r4.ebuild 552 BLAKE2B 433ffba6744be80b9bd7c9fb8361f04c6e5128d883829c990a5787a15fdd4d202d7c9eb94d3aaa5bf0fa8cd30feef1242dbc8b933500a7d0fdab028e80ef14c0 SHA512 832ca2ffd77c0b051659e2953ff31580361c80fc527520a2930c49b2d767f7eeccf0e75f49c51b8d78ac5e64d482edbab58ca41cd283030e7311f727cad1b857
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch b/dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch
deleted file mode 100644
index d2c11ab3ed59..000000000000
--- a/dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/com/jclark/xml/sax/Driver.java b/com/jclark/xml/sax/Driver.java
-index 2b0d90a..d1efd3e 100644
---- a/com/jclark/xml/sax/Driver.java
-+++ b/com/jclark/xml/sax/Driver.java
-@@ -160,9 +160,9 @@ public class Driver extends ApplicationImpl
- 
-     DTD dtd = event.getDTD();
- 
--    for (Enumeration enum = dtd.entityNames(DTD.NOTATION);
--	 enum.hasMoreElements(); ) {
--      String name = (String)enum.nextElement();
-+    for (Enumeration enumx = dtd.entityNames(DTD.NOTATION);
-+	 enumx.hasMoreElements(); ) {
-+      String name = (String)enumx.nextElement();
-       Entity entity = dtd.getEntity(DTD.NOTATION, name);
-       String systemId = entity.getSystemId();
-       if (systemId != null) {
-@@ -173,9 +173,9 @@ public class Driver extends ApplicationImpl
-       }
-       dtdHandler.notationDecl(name, entity.getPublicId(), systemId);
-     }
--    for (Enumeration enum = dtd.entityNames(DTD.GENERAL_ENTITY);
--	 enum.hasMoreElements();) {
--      String name = (String)enum.nextElement();
-+    for (Enumeration enumx = dtd.entityNames(DTD.GENERAL_ENTITY);
-+	 enumx.hasMoreElements();) {
-+      String name = (String)enumx.nextElement();
-       Entity entity = dtd.getEntity(DTD.GENERAL_ENTITY, name);
-       String notationName = entity.getNotationName();
-       if (notationName != null) {
diff --git a/dev-java/xp/metadata.xml b/dev-java/xp/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/xp/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/xp/xp-0.5-r4.ebuild b/dev-java/xp/xp-0.5-r4.ebuild
deleted file mode 100644
index ae0095ad000a..000000000000
--- a/dev-java/xp/xp-0.5-r4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="XP is an XML 1.0 parser written in Java"
-HOMEPAGE="http://www.jclark.com/xml/xp"
-SRC_URI="ftp://ftp.jclark.com/pub/xml/${PN}.zip -> ${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.6
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-jdk-1.7-enum.patch"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
diff --git a/dev-java/xpp3/Manifest b/dev-java/xpp3/Manifest
index 87195fd43915..6fbd1cf4ab93 100644
--- a/dev-java/xpp3/Manifest
+++ b/dev-java/xpp3/Manifest
@@ -1,3 +1,4 @@
 DIST xpp3-1.1.4c.jar 128334 BLAKE2B a0c1d871216e44f7196ae8edd4c0ca2503a16821b6f592e4af0fcc1da346135fd5023fa5210abe1ce772d0001274c0f6a3d2383b7ebad1a65ffa967ac31c1d5e SHA512 743d2a0b20d16e97b640d9ad3e20e56a7446cdaf4ca0ebba072bdbe3eed0ef90289c2829376b4a209b35e0960adee5e01f11e8f361798333d8b4eaf4f1038445
 EBUILD xpp3-1.1.4c-r5.ebuild 775 BLAKE2B 4904458b949700ab454da89f332c7e2e6e114ceaea21f53886f85d28d05d60fd0b0b515fd5c0519c408ad872c1c04d2d33748e27c0427efbcea075a697b6ee0a SHA512 85ca3d9ad08ca1f65f346593245c41d07614893a56b77d605e714f0046e15253fa953a5af9a4169854f8895e77629960ead6b81b171f28e35bda185b4566c5c5
+EBUILD xpp3-1.1.4c-r6.ebuild 985 BLAKE2B de83e919fb7e2bca8110b862067543c449cb98c71c64aea2837b1e650b837f89aae6fea79e7389fb3a767a9d11b312159d176d88f5e7b0b5e60ba3060334eacb SHA512 62fee410e9e3a3996620eada51812d1855c72107e3ae0f786d7af03c280fa07c11a17731746f8cc50ac846cef5c929e089ceab12d5f22ae3cc5c930bbe324967
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild
new file mode 100644
index 000000000000..3b9eb1d77ff8
--- /dev/null
+++ b/dev-java/xpp3/xpp3-1.1.4c-r6.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="xpp3:xpp3:1.1.4c"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An implementation of XMLPULL V1 API"
+HOMEPAGE="https://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html"
+SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+# Restriction to java 1.8
+# Otherwise jdk 11+ would fail to build javadoc:
+# ./javax/xml/namespace/QName.java:55: error: package exists in another module: java.xml
+# package javax.xml.namespace;
+# ^
+# 1 error
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND="virtual/jdk:1.8"
+
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+	default
+	mkdir "resources" || die
+	cp -r "META-INF" "resources" || die
+}
diff --git a/dev-java/yanfs/Manifest b/dev-java/yanfs/Manifest
deleted file mode 100644
index b470ec571f2b..000000000000
--- a/dev-java/yanfs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 1.0-make.patch 2620 BLAKE2B 5514ed5b8b247499d4b94bbdf340fbcbdb66a5d72cff48b1264ab8d1a59fd7917991f9c374cc673e50e928839b69bcafdbaf999fef77b272504729c2d470e2db SHA512 85ad4c443800a33ffb16fee52bd1a2fd89dc8d3de8f6adbc184ca72ad3ee8c877d4658b4c2c82ebdb54b333c16dd54534f47d193e9b808a16f92a97bfd5b427a
-DIST yanfs-1.0.tar.bz2 107232 BLAKE2B 4c344f03e52c4a5eb3cee87e05e4a5b33cdec78ef49427de5ac6a1a44b87444744b0e619963c67ca494092831474587e29dc506bc7261fa98dec05b6cd8c9ebd SHA512 e7031ba630360240de136f588c337a3a4b551320f5e121c1910fc58ba08c7b7c6fe95fb87b57263c19e00a3e44fe81c36d9e8e8971d4fdf910bb3797c0a1eeeb
-EBUILD yanfs-1.0.ebuild 1022 BLAKE2B ad914f7c6c4dfa05dcc48efc9257b5807a6920851211ee8d3f69da4800836d4abfcef355f32c2617a0bae07ddb90ab70a4b3315993ab2e999196ddb3a3ce8569 SHA512 7f68d117ee306c5fd9dc031ea3dd60f5e3dff7da2325ca04a584ab037a110e457687c157464b1bdfe7fc3ea667a96fbcdb13518c9ff7f544645ecdf1454d66da
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/yanfs/files/1.0-make.patch b/dev-java/yanfs/files/1.0-make.patch
deleted file mode 100644
index 3cd23cc042be..000000000000
--- a/dev-java/yanfs/files/1.0-make.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/src/com/sun/Makefile.common b/src/com/sun/Makefile.common
-index a5e49e8..ceea3ca 100644
---- a/src/com/sun/Makefile.common
-+++ b/src/com/sun/Makefile.common
-@@ -35,7 +35,14 @@
- # nuclear facility.
- #
- 
--include $(CODEMGR_WS)/src/com/sun/Makefile.defs
-+CDIR=		$(CODEMGR_WS)/classes
-+JAVADIR=	/usr/java
-+CLASSPATH=	$(CDIR):$(JAVADIR)/lib/classes.zip
-+JCFLAGS=	-classpath $(CLASSPATH)
-+JC=		$(JAVADIR)/bin/javac
-+TFILE=		$(CDIR)/$(PKGDIR)/.tfile
-+M4=		/usr/bin/m4
-+
- 
- # XXX
- #SWINGDIR, BEANCLASSPATH, JCBFLAGS need to be removed once JDK1.2 is FCS.
-diff --git a/src/com/sun/Makefile.defs b/src/com/sun/Makefile.defs
-index 2fa61c9..b4692cc 100644
---- a/src/com/sun/Makefile.defs
-+++ b/src/com/sun/Makefile.defs
-@@ -36,9 +36,9 @@
- #
- 
- CDIR=		$(CODEMGR_WS)/classes
--JAVADIR=	/usr/java
-+JAVADIR=	/usr
- CLASSPATH=	$(CDIR):$(JAVADIR)/lib/classes.zip
- JCFLAGS=	-classpath $(CLASSPATH)
- JC=		$(JAVADIR)/bin/javac
- TFILE=		$(CDIR)/$(PKGDIR)/.tfile
--M4=		/usr/ccs/bin/m4
-+M4=		/usr/bin/m4
-diff --git a/src/com/sun/gssapi/Makefile b/src/com/sun/gssapi/Makefile
-index 49d5933..fc16dfe 100644
---- a/src/com/sun/gssapi/Makefile
-+++ b/src/com/sun/gssapi/Makefile
-@@ -81,7 +81,7 @@ classes:	$(CDIR)/$(PKGDIR) \
- 		$(SUBDIRS)
- 
- $(PFILES):
--	$(RM) $@; install -s -m 644 -f $(@D) $(PROP_FILES)
-+	$(RM) $@; install -m 644 $(PROP_FILES) $(@D)
- 
- clean:
- 	$(RM) $(CDIR)/$(PKGDIR)/*.class $(TFILE) $(PFILES)
-diff --git a/src/com/sun/gssapi/mechs/dummy/Makefile b/src/com/sun/gssapi/mechs/dummy/Makefile
-index 88fc12d..cd3e0a7 100644
---- a/src/com/sun/gssapi/mechs/dummy/Makefile
-+++ b/src/com/sun/gssapi/mechs/dummy/Makefile
-@@ -59,7 +59,7 @@ M4DEF_PROP += -D CONTEXT=_K1000A49
- M4DEF_PROP += -D CRED=_K2102CC5
- 
- Dummy.java: Dummy.m4
--	/usr/ccs/bin/m4 $(M4DEF_PROP) Dummy.m4 > Dummy.java 
-+	$(M4) $(M4DEF_PROP) Dummy.m4 > Dummy.java 
- 
- # Service Provider Interface Context Class and its methods/interface
- M4DEF_CTXTSPI = -D GSSCtxtSpi=C018FE95
-@@ -86,5 +86,5 @@ M4DEF_CTXTSPI += -D _importSecCtxt=_S0AC8F9E
- M4DEF_CTXTSPI += -D _dispose=_S020B957
- 
- DummyCtxt.java: DummyCtxt.m4
--	/usr/ccs/bin/m4 $(M4DEF_CTXTSPI) DummyCtxt.m4 > DummyCtxt.java
-+	$(M4) $(M4DEF_CTXTSPI) DummyCtxt.m4 > DummyCtxt.java
- 
-diff --git a/src/com/sun/nfs/XFileAccessor.java b/src/com/sun/nfs/XFileAccessor.java
-index 50281d1..348ee3a 100644
---- a/src/com/sun/nfs/XFileAccessor.java
-+++ b/src/com/sun/nfs/XFileAccessor.java
-@@ -71,7 +71,7 @@ class XFileAccessor implements com.sun.xfile.XFileAccessor {
-             return true;
-         } catch (IOException e) {
-             return false;
--        };
-+        }
-     }
- 
-     public XFile getXFile() {
diff --git a/dev-java/yanfs/metadata.xml b/dev-java/yanfs/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/yanfs/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/yanfs/yanfs-1.0.ebuild b/dev-java/yanfs/yanfs-1.0.ebuild
deleted file mode 100644
index 477c34c8a244..000000000000
--- a/dev-java/yanfs/yanfs-1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source examples"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Yet Another NFS - a Java NFS library"
-HOMEPAGE="https://java.net/projects/yanfs"
-SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/dev-java/yanfs/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S="${WORKDIR}/${P}"
-
-java_prepare() {
-	epatch "${FILESDIR}/${PV}-make.patch"
-	rm -r "${S}"/src/com/sun/gssapi/mechs/dummy || die
-
-	mkdir examples && \
-		mv "${S}"/src/com/sun/rpc/samples/ examples/rpc && \
-		mv "${S}"/src/com/sun/gssapi/samples/ examples/gssapi || die
-}
-
-src_compile() {
-	CODEMGR_WS="${S}" emake -C "${S}/src/com/sun/gssapi/"
-
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_dojar "${S}/${PN}.jar"
-
-	use source && java-pkg_dosrc "${S}"/src/*
-	use doc && java-pkg_dojavadoc "${S}"/api/
-	use examples && java-pkg_doexamples examples/*
-}
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /dev-java
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)