gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-java
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
430 files changed, 4588 insertions, 6941 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 9653d541a67d..d8313d7c0f9d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index a291de3af722..0d50c08a829f 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1,4 +1,6 @@
 AUX tests-visibility.patch 755 BLAKE2B 57a0815dc7881b5e5b1ebccf20a139624bc237aa67553634f9a2f91d45065694c655c8a63fc78c64c27e389f31c5a9356cafed8864aa56f720d648eff72a005f SHA512 a848c5573ffc9e02b77dd63c74d4314be5c35e47da7646d048d7e28a098290bc50d30287928ef3e06d8dcbba758b7ec1e87118ebac29bf72b04021f20e8c371d
+DIST ant-contrib-1.0_beta6_pre20201123.tar.gz 473435 BLAKE2B f73f0a3cfbf92719143a806e1b4b753f7809aeef4976fd6f75aef85490daa0a44a90c03779aba0784e9e59dfe9b9abf7b19c405287fa20838b29e621fa5f7dac SHA512 0b4d05c90c16c5d076364aa140d3ce503b7b7abf187d7d4cccbf0170dd3afab879bb71b002b3c467f73d2632a57dfd70f74715e8b48f26376cb88e872ec1014e
 DIST ant-contrib-1.0b3-src.tar.bz2 3298187 BLAKE2B 0572d583a770c239880fb7e8e4a1e91331dfe80a52d7cf83a90d108f1e717caa26699dce43b72fb1944a74c8c738ad659f60864e2e8e945c8e91569d80c1214b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8
 EBUILD ant-contrib-1.0_beta3-r2.ebuild 1814 BLAKE2B a2bb1cab559d3e71813493337aa09865010665855ea4321e8cbd4132105d09c169da9fc1a4dccee2931d586fc63f225a39d95151f4d23e8a86bd4d5d9b556c17 SHA512 e46e91963aa9f9fb1fcfa61e4689fa9fa06b2c880ee4c21bfb70bc1f55725d0e59153b8a978856bad417afcb7ea07b30035e64fee2b5ee84fdfb91fa86185d85
-MISC metadata.xml 317 BLAKE2B 7a5bf5450578fb6d057233a53ba7f3e7fa6c3f969f7fa0eba8c22ac17b4efa19b270a765043d61635780b0da1f22e8a0d0304f0c15d468f72fafee1341b8131d SHA512 4f45c942983f0ebb77130dc40a6407ec9781bb2657ac24bdebeddcb21135b7f0b39b560015ce5c7b0df3302c1c6d2e5783cf86d73aa372b9e24c8d1df28249c8
+EBUILD ant-contrib-1.0_beta6_pre20201123.ebuild 2269 BLAKE2B 3eed3cd16b0b73c5991f421cb854528c5c7a81619d05c015236508835e571bcfa9ea83a6ea74f2901122041b29cc2065faf3f8dab4293d10ad360604921ace93 SHA512 0e492df4e615af11202b2df13c7808a3c1c5df107680bf124b2558fbb939a60fe34643e7da553e1abb3c25e8ea2014cf9ef555b48621f8e4e847e384f82bd0d9
+MISC metadata.xml 375 BLAKE2B 507699a997e9885647997143d7cecb35ac673924dc6aec0de9f1f09dad8ebf1a9d000b1c46562ddb07655df9d281788f0b7834d00072b8f675cd559455f5e9f9 SHA512 953b2ed99fb34280fb21995385e76d568fb24ce14eef6adfca7552ceea16b9a6ad82a6381b8cb2ba52c90a949b07f5d2e84bb79b5abdd6975b7cfbc8638037b9
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild
new file mode 100644
index 000000000000..f652e7eadd71
--- /dev/null
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild ant-contrib-1.0_beta6_pre20201123.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="ant-contrib:ant-contrib:1.0b6"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_COMMIT="0228412be2ef648cfabc1d74416d3188755aff9b"
+DESCRIPTION="Ant-contrib tasks for Apache Ant"
+HOMEPAGE="http://ant-contrib.sourceforge.net:80"
+SRC_URI="https://github.com/cniweb/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# commons-httpclient:commons-httpclient:3.1 -> >=dev-java/commons-httpclient-3.1:3
+# org.apache.ant:ant:1.9.15 -> >=dev-java/ant-core-1.10.9:0
+# org.apache.bcel:bcel:5.1 -> >=dev-java/bcel-6.5.0:0
+# org.apache.ivy:ivy:2.5.0 -> >=dev-java/ant-ivy-2.5.0:2
+# org.jvnet.hudson:ivy:1.4.1 -> !!!groupId-not-found!!!
+# xerces:xercesImpl:2.12.0 -> >=dev-java/xerces-2.12.0:2
+
+CDEPEND="
+	>=dev-java/ant-core-1.10.9:0
+	>=dev-java/ant-ivy-2.3.0:2
+	>=dev-java/bcel-6.5.0:0
+	>=dev-java/commons-httpclient-3.1:3
+	>=dev-java/xerces-2.12.0:2
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
+# test? org.apache.ant:ant-launcher:1.9.5 -> >=dev-java/ant-core-1.10.9:0
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+	test? (
+		>=dev-java/ant-core-1.10.9:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}"
+
+#	JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,!!!groupId-not-found!!!,xerces-2"
+JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,xerces-2"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,ant-core"
+JAVA_TEST_SRC_DIR="test/src"
+JAVA_TEST_RESOURCE_DIRS="test/resources"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/^import/s/fr.jayasoft.ivy.ant/org.apache.ivy.ant/' \
+		src/main/java/net/sf/antcontrib/net/Ivy14Adapter.java || die
+}
diff --git a/dev-java/ant-contrib/metadata.xml b/dev-java/ant-contrib/metadata.xml
index 5c1224a74c63..b0770934cd36 100644
--- a/dev-java/ant-contrib/metadata.xml
+++ b/dev-java/ant-contrib/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ant-contrib</remote-id>
+		<remote-id type="github">cniweb/ant-contrib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 37e7a2818bc3..c90636894d27 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-core-1.10.9.ebuild 2750 BLAKE2B c1f2bb02aaade6e5865a977736da3afb5445b3d11632e70373c8440bc75046cfa314cb47bdf0a2dcfd3a565e2d3067443f30399d8f5c46fe89324f8d2abf87e7 SHA512 2010355e71305bbd3b658e3922bab96894132b34817b371854056e58b4814ad03ca62184735be8d691c4d86f7882f6b7d1cc0791a591f5b0c6f857ed66df4e37
+EBUILD ant-core-1.10.9.ebuild 2743 BLAKE2B 5cfca20522c55dd4894f3ab31d027d68343b363fff462bc4cc0acfcebc4f2f0552676ce8c10caed56577cc87325f3ac91f63d74a4c6b30b8a34243cdbe248e7d SHA512 cd338b8e765ee7081d49d8ccb21c5353a49c4af9f6600a7ff103252edadb093da33348e5b4695b69eb4bb4417a01bb265685f4c7b746e88bd41d4018544d91cc
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-core/ant-core-1.10.9.ebuild b/dev-java/ant-core/ant-core-1.10.9.ebuild
index 1ced096f0bd1..86eeb87ed9ba 100644
--- a/dev-java/ant-core/ant-core-1.10.9.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9.ebuild
@@ -10,7 +10,7 @@ JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
 JAVA_PKG_BSFIX_ALL="no"
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2 prefix
+inherit java-pkg-2 java-ant-2 prefix
 
 MY_P="apache-ant-${PV}"
 
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index 07942b1fb5d0..addf597bf6a6 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -2,5 +2,5 @@ AUX 1.4.1-javadoc.patch 500 BLAKE2B 9954ccef76c45a403d444a730986c15d9fc5c6106908
 DIST apache-ivy-2.3.0-src.tar.gz 2790722 BLAKE2B 87a79bad15b9b74517ce240fcfd0ae9e58b67816f0ec1fbd14081a17bd837c497da419d0b45ad63b3782b151e86c85b79cafa11f8c1170ab0287597be78cabe7 SHA512 fde43ff288cd8c77f2bdecdcbf52f180247ed99a8526be9d875d60e209b66155d5526e968400382d2cef22cabb8899c3b0912e049ae7d23e2cb79be8a81fe00f
 DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d
 EBUILD ant-ivy-1.4.1-r2.ebuild 1760 BLAKE2B 042c11aee2720ffaf77877ab6f903026833db5600c98ea4fc70f0534fe33d478ab01d337b4dfcbfb2218a916ee06bbab42a3afffc29b8b60d663e4e51dec8bed SHA512 926b90f406b1be28920cf56b1463765b676fa00c01ddb4fa7d8a7f3b60b99ea009cad9591015fe65dae636827717390a3d4c5c00118c141f65e4e842f7599e2f
-EBUILD ant-ivy-2.3.0-r3.ebuild 2213 BLAKE2B c47655fedaf297eef86e78ef1e28966d98fd6f93ec4c97ec0d36fbd4612837bce74727f66f6108f7fb692e0bdcf86907d0e0fe2444a38bd1182f14daba347d08 SHA512 122f6c157a461bed828bd8ee0a545ca6f178130ebb5d5b0069540ecffce35947abb26a9d54572db429d61ee0a8bd26677bf9a1e67e4ac3d3e7996723b3c83216
+EBUILD ant-ivy-2.3.0-r3.ebuild 2206 BLAKE2B 81ecc8890da54bcda84c4d74e3125e01a0f390264e1e243172c35cfec6629f00d2deee6441a3dce2d1e2e3dda1148cf63d8dab013f556a02705af0eee15fc8b2 SHA512 2405021491feb8fb173f0d7da0333debdb53f260a6de1b58178d3f2440ecebb21430333c733bc0ee0c298152d5cef34ab77ffb5842d3ccc8e632eb9a1f55435e
 MISC metadata.xml 655 BLAKE2B ae710cffd6d182e1f67df6734f0bb1e3b61daa87629b8259f8d75f7476fa732904cd73d2ef02d496448191e33c069d3d284a79aeedb87323e28c029e8ceaa40f SHA512 81eb7f4ce41f17a43b32ac6e4ade9677397696cab06ae94964d1756d6745aadc9d61df9ef3b0749eb547b62fdc5bb19a98484268fbce9d56773be09a03671c0d
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild
index ef8d904b79d8..17350b9fc443 100644
--- a/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild
@@ -11,7 +11,7 @@ WANT_SPLIT_ANT="true"
 # Don't rewrite examples, that's bad.
 JAVA_PKG_BSFIX_ALL="no"
 
-inherit java-pkg-2 java-ant-2 eutils
+inherit java-pkg-2 java-ant-2
 
 MY_PN="apache-ivy"
 MY_P="${MY_PN}-${PV}"
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 58308e41c2d2..04140315f67e 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -12,8 +12,8 @@ DIST antlr-4.5.3-complete.jar 1485121 BLAKE2B 84d41b17bd30dfad7a79e9759802c76d98
 DIST antlr-4.5.3.tar.gz 6760401 BLAKE2B d436b4a964c527e230912a0ba23146af199478570cf5491eadeb5025e814642658cc71d71e6a09b5df3cc18e9b8991abf930cab70677d117a112e0922e046e07 SHA512 d0e61baebb338e5e4e8eaf87aa6ef52a568ec51bc86bc07acf8f82be0c173ea4f0f85978dfd034c2642505888c0849663f6b6fb030c4c19e0571f29277fb54f7
 EBUILD antlr-2.7.7-r7.ebuild 1076 BLAKE2B 49124667f298ebfad5989d19972baed8e3f66c0cdb6ff4027d4c0b1692430debbe2844d87fcfd04d885b728aeaa38554337bff7a1ec227151f43fccdb0559653 SHA512 b9fe195653c78a3bd7ae0ffcee143ccd8bfb770567fb83fe9ff9e7e2201c0ae4683520addaeddd759e0f82fcfb034788c1e933776b3d87e0206eb05cc5f60b08
 EBUILD antlr-2.7.7-r8.ebuild 1087 BLAKE2B c6bdc1f7d552392aa67ef176906a1166015198d5fd2ae67c1c323d664f3313d7333e8669a2b5f354953b7618045a1bd6d9a5dc733c393dcba00732b5745c6852 SHA512 01d07904b06d66fe88467846734466ff8510c0e3c6bec84d03f52ce9db38bbc2e761157ccb5480a59647da4605b6093673c0d71ce0d9290fc545a2251db37b5f
-EBUILD antlr-3.2.ebuild 3258 BLAKE2B 63c9e7d7506252e47f456f531bf76925af20d9d90bf1ac76f7b2f7f65e99879175a040ec4562f9c6fc35723e876a7887b3a053b52465c9fa82bc572533eafd20 SHA512 361f21b60d25073bf153dfaaf0313a578ce34e061695e568f8b60f530450b73bc3dedb6ad1d8e934214d1fbe5855e7d88cd7c991f52f5018b6de6eaba323c03a
-EBUILD antlr-3.5.2-r1.ebuild 3029 BLAKE2B 2fa039df22471e9ba12588c1d100e0fc32d5e28b0ff523ba37c85f755205433c52548e4b6db40f4400c38a048e5b071753950918520e21e67c6399084247de15 SHA512 ab3b66ad840f08535063e45f51b9ae5415a61b7ac41c685d2e8e84512892f538969fac0ef2caa50831c4648dd0211be7df8a66c817fa6c33339cb499749d01c7
+EBUILD antlr-3.2.ebuild 3258 BLAKE2B d5421808caca91f7b1d15a304c0f37fa6a4216920cf0aef7c66df36a5b622144f23db838cdd7b248037bd45864847368d2b921157fe340b571237df4805b0011 SHA512 63234889e423852a17067dcf253ba63f70443de7e0df4be6dddc423f5035aa582796ecd32906ef4e9421bebfa6c0b419bcfcbe125643715eaf3004f25066f7d0
+EBUILD antlr-3.5.2-r1.ebuild 3022 BLAKE2B 6f3a8b1716d3206391d5f657f732ee1ffe9a02075560afb39ba33b452b03f70b75d953ead0b09a8fd0e96262ef470a39cdb9f852be2e31cfede284d2982d3b0d SHA512 9f19d2fa54a8cfcd0c3d7bc8d6fb0d23886435e0ca6b78da5db97a84598224d9e1a5b68db2d4a4521a3afa60f1e4faa15085d17507e87abe3cfff17417302f74
 EBUILD antlr-4.5.1.ebuild 2467 BLAKE2B 176f21576d433466f221190f71bb27a7600904efef43d182a025698e30420345b244f5c2e353d49fb25937bceca683aa30e18d5ee3b0b44c5f89baf1e8bc742c SHA512 74174f4ee6fe803c4e243be51562339e530934a6aed38a8024ed687fbc888b2f01c942558e8de90d42f28a5ae0801d95b148497310304466686c087cd4eb8d7a
-EBUILD antlr-4.5.3.ebuild 2477 BLAKE2B 35b5131ef9c787d3108c8fcfc7ae661b36a980768d506ab82af401b416e2be7eaff49d77da211dbc82efdaa14766996539950d7096641af6be0583d450f585f1 SHA512 4023335147de01ca8606b168af681aad5a860fde3729e93bf02ca0cc2be80b9201c00105d63ef904c13707ba66f9a672b1d94ec134297c136817dbf40b1653d9
+EBUILD antlr-4.5.3.ebuild 2511 BLAKE2B d1e36cee6e8d101a265a337071c19020528f42a70976b554f2eecf8ec7200ab020e2d971fcc2f0bdcba0be0b4d96f738face2492df498ddf6012aec56a2f4c69 SHA512 ce63e0a89420501f9a7580c409fd30d5714d49ab18cc5f04ecbdba569f9b73307878f3617151146b0c099584eb142166c485dfb4ba24980c78a6ed453a6e4d19
 MISC metadata.xml 313 BLAKE2B 211bde607161c54e23a30950b17cda11291e84a9f745a2c44c17c7c224ad8ef309786ec4952f094e90cc569d86e0186bd2fa426fc1de6718541e207be12c3fd0 SHA512 01f11b9e45bc3c331d445213704287f1f034087930d4b55cbde700a483dcb64260d4805a4c2ec3686a99b59f3225999409d499cb63a40b3d8278d8a2e6213f57
diff --git a/dev-java/antlr/antlr-3.2.ebuild b/dev-java/antlr/antlr-3.2.ebuild
index 0d962209926f..3efa97660287 100644
--- a/dev-java/antlr/antlr-3.2.ebuild
+++ b/dev-java/antlr/antlr-3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit epatch java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A parser generator for many languages"
 HOMEPAGE="https://www.antlr3.org/"
diff --git a/dev-java/antlr/antlr-3.5.2-r1.ebuild b/dev-java/antlr/antlr-3.5.2-r1.ebuild
index 922af348137f..0c83334bc403 100644
--- a/dev-java/antlr/antlr-3.5.2-r1.ebuild
+++ b/dev-java/antlr/antlr-3.5.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A parser generator for many languages"
 HOMEPAGE="https://www.antlr3.org/"
diff --git a/dev-java/antlr/antlr-4.5.3.ebuild b/dev-java/antlr/antlr-4.5.3.ebuild
index bf5db82387ef..3cd757f2a8eb 100644
--- a/dev-java/antlr/antlr-4.5.3.ebuild
+++ b/dev-java/antlr/antlr-4.5.3.ebuild
@@ -4,6 +4,7 @@
 EAPI="5"
 
 JAVA_PKG_IUSE="source"
+MAVEN_ID="org.antlr:antlr4:4.5.3"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/apache-rat-core/Manifest b/dev-java/apache-rat-core/Manifest
new file mode 100644
index 000000000000..c9a5d40a25da
--- /dev/null
+++ b/dev-java/apache-rat-core/Manifest
@@ -0,0 +1,4 @@
+AUX apache-rat-core-0.13-commons-lang3.patch 1813 BLAKE2B 6351b49b0155381902ac2585014ce1c5775444ce2d1fe1292ca9e995316596210ee8afa41603f656c4f02565489231905bb4b157f1fdbcf0e993a9cd40c2dcf4 SHA512 ef0863a0954f47196f45b2ea2a8eb1bf06556535c19b39c5cd7cfee72605dc63f7a3bfa1e1613336b3a357578ab8e419c431a7a41261ab6cda236ebe7adc2567
+DIST apache-rat-0.13-src.tar.bz2 197443 BLAKE2B 5880894bf48e62c97fefebe5672964a78016ba045ca6a13a9b100c1a15cf0a6933edc22c41cb3552f30ebea0486fd6b415f60902f0af7d96663611bfef1a1781 SHA512 564cb2b0f21c98ca5c10566417c0d2732cd177efb68607589e43bcf64eeedee7a570dbea7ef4d6237f6438ecb40d382cb96bd0d6f60c1d1ba1f76778f15ee26a
+EBUILD apache-rat-core-0.13.ebuild 1990 BLAKE2B 36059c19f24974be33d9bbdb183d80e16938f731d7ea835b86982b30e6e559afbad33f48d56b9b77026023867db9b58c01a20392ef092ee166a2cdd6f853cc23 SHA512 95e1ac779a4a8420345eab705bb8403b9fe72134835e84c46553e97c915a895162c40aa70a44172263510f1acfe2e6ff87fd405502f3a6500f156dd0bb0e4d4c
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild b/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild
new file mode 100644
index 000000000000..1131e321b701
--- /dev/null
+++ b/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom apache-rat-core/pom.xml --download-uri https://mirrors.nav.ro/apache//creadur/apache-rat-0.13/apache-rat-0.13-src.tar.bz2 --slot 0 --keywords "~amd64 ~x86" --ebuild apache-rat-core-0.13.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.rat:apache-rat-core:0.13"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The core functionality, shared by the Ant tasks and the Maven plugin."
+HOMEPAGE="https://creadur.apache.org/rat/apache-rat-core/"
+SRC_URI="mirror://apache//creadur/apache-rat-${PV}/apache-rat-${PV}-src.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Common dependencies
+# POM: ${PN}/pom.xml
+# commons-cli:commons-cli:1.3.1 -> >=dev-java/commons-cli-1.3.1:1
+# commons-collections:commons-collections:3.2.2 -> !!!suitble-mavenVersion-not-found!!!
+# commons-io:commons-io:2.2 -> >=dev-java/commons-io-2.8.0:1
+# commons-lang:commons-lang:2.6 -> >=dev-java/commons-lang-2.6:2.1
+# org.apache.commons:commons-compress:1.11 -> >=dev-java/commons-compress-1.20:0
+# org.apache.rat:apache-rat-api:0.13 -> >=dev-java/apache-rat-api-0.13:0
+
+CDEPEND="
+	>=dev-java/commons-cli-1.3.1:1
+	>=dev-java/commons-compress-1.20:0
+	dev-java/commons-collections:0
+	>=dev-java/commons-io-2.8.0:1
+	dev-java/commons-lang:3.6
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}/apache-rat-${PV}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-commons-lang3.patch"
+)
+
+JAVA_GENTOO_CLASSPATH="commons-cli-1,commons-collections,commons-io-1,commons-lang-3.6,commons-compress"
+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
+	java-utils-2_src_prepare
+}
diff --git a/dev-java/apache-rat-core/files/apache-rat-core-0.13-commons-lang3.patch b/dev-java/apache-rat-core/files/apache-rat-core-0.13-commons-lang3.patch
new file mode 100644
index 000000000000..77a90207cbcf
--- /dev/null
+++ b/dev-java/apache-rat-core/files/apache-rat-core-0.13-commons-lang3.patch
@@ -0,0 +1,39 @@
+diff --git a/src/main/java/org/apache/rat/Report.java b/src/main/java/org/apache/rat/Report.java
+index de4a2e7..ecb8ddf 100644
+--- a/src/main/java/org/apache/rat/Report.java
++++ b/src/main/java/org/apache/rat/Report.java
+@@ -21,7 +21,7 @@ package org.apache.rat;
+ import org.apache.commons.cli.*;
+ import org.apache.commons.io.FileUtils;
+ import org.apache.commons.io.filefilter.*;
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.rat.api.RatException;
+ import org.apache.rat.report.IReportable;
+ import org.apache.rat.report.RatReport;
+diff --git a/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java b/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java
+index d56a672..d6b7f4d 100644
+--- a/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java
++++ b/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java
+@@ -20,7 +20,7 @@ package org.apache.rat.document.impl.guesser;
+ 
+ import java.util.Locale;
+ 
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ 
+ public class GuessUtils {
+     
+diff --git a/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java b/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java
+index 02e21d6..5001dff 100644
+--- a/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java
++++ b/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java
+@@ -18,7 +18,7 @@
+  */ 
+ package org.apache.rat.report.claim.impl.xml;
+ 
+-import org.apache.commons.lang.time.DateFormatUtils;
++import org.apache.commons.lang3.time.DateFormatUtils;
+ import org.apache.rat.api.Document;
+ import org.apache.rat.api.MetaData;
+ import org.apache.rat.api.RatException;
diff --git a/dev-java/apache-rat-core/metadata.xml b/dev-java/apache-rat-core/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/apache-rat-core/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/apache-rat-tasks/Manifest b/dev-java/apache-rat-tasks/Manifest
new file mode 100644
index 000000000000..bed07b5a6a02
--- /dev/null
+++ b/dev-java/apache-rat-tasks/Manifest
@@ -0,0 +1,4 @@
+AUX apache-rat-tasks-0.13-fix-tests.patch 1850 BLAKE2B 2dbb2a5370003bfbe9f312044a557e7fadd3d38dcd093b54ab3eeaef60bb5c366ad673f862cd77d39911781847c664c99d184b68807ee95b4f3dfaa6a258019e SHA512 c3d1796144843c7da3edffccf241c79dae9b619fb83fd94ae3142b7fa52e2d01947cfe2b795b7d9ce7171926a058e758c4468a8b0454ec31215add5b0f028ad1
+DIST apache-rat-0.13-src.tar.bz2 197443 BLAKE2B 5880894bf48e62c97fefebe5672964a78016ba045ca6a13a9b100c1a15cf0a6933edc22c41cb3552f30ebea0486fd6b415f60902f0af7d96663611bfef1a1781 SHA512 564cb2b0f21c98ca5c10566417c0d2732cd177efb68607589e43bcf64eeedee7a570dbea7ef4d6237f6438ecb40d382cb96bd0d6f60c1d1ba1f76778f15ee26a
+EBUILD apache-rat-tasks-0.13.ebuild 1825 BLAKE2B 48d66e9b04468ef01b4bea43fcb61fed89a4490bdd7e278478e472f2a932d25e74cadd7bfcdf25767dcc540b798a909da69a960cbd5befec48c0f4eef06f6444 SHA512 09c771124bd48dd6164e49faf1c4c8522593ad7f69831a5f5330a11de9df6807763d0dd04e8d034d31f45f420ccb9720c571befe0ac2cf3402c5abe79b808d90
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/apache-rat-tasks/apache-rat-tasks-0.13.ebuild b/dev-java/apache-rat-tasks/apache-rat-tasks-0.13.ebuild
new file mode 100644
index 000000000000..deed67e6ee11
--- /dev/null
+++ b/dev-java/apache-rat-tasks/apache-rat-tasks-0.13.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom apache-rat-tasks/pom.xml --download-uri https://mirrors.nav.ro/apache//creadur/apache-rat-0.13/apache-rat-0.13-src.tar.bz2 --slot 0 --keywords "~amd64 ~x86" --ebuild apache-rat-tasks-0.13.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.rat:apache-rat-tasks:0.13"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A plugin for Apache Ant that runs Apache Rat to audit the source"
+HOMEPAGE="https://creadur.apache.org/rat/apache-rat-tasks/"
+SRC_URI="mirror://apache//creadur/apache-rat-${PV}/apache-rat-${PV}-src.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Common dependencies
+# POM: ${PN}/pom.xml
+# org.apache.rat:apache-rat-core:0.13 -> >=dev-java/apache-rat-core-0.13:0
+
+CDEPEND="
+	dev-java/ant-core:0
+	~dev-java/apache-rat-core-${PV}:0
+"
+
+# Compile dependencies
+# POM: ${PN}/pom.xml
+# org.apache.ant:ant:1.9.12 -> !!!groupId-not-found!!!
+# POM: ${PN}/pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
+# test? org.apache.ant:ant-antunit:1.4 -> !!!groupId-not-found!!!
+# test? org.apache.ant:ant-testutil:1.9.12 -> !!!groupId-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+	test? (
+		dev-java/ant-testutil:0
+	)"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}/apache-rat-${PV}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-tests.patch"
+)
+
+JAVA_GENTOO_CLASSPATH="ant-core,apache-rat-core"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS=(
+	"src/main/resources"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="ant-testutil,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+	"src/test/resources"
+)
+
+src_prepare() {
+	default
+	java-utils-2_src_prepare
+}
diff --git a/dev-java/apache-rat-tasks/files/apache-rat-tasks-0.13-fix-tests.patch b/dev-java/apache-rat-tasks/files/apache-rat-tasks-0.13-fix-tests.patch
new file mode 100644
index 000000000000..536b68371c3a
--- /dev/null
+++ b/dev-java/apache-rat-tasks/files/apache-rat-tasks-0.13-fix-tests.patch
@@ -0,0 +1,41 @@
+diff --git a/src/test/resources/antunit/report-junit.xml b/src/test/resources/antunit/report-junit.xml
+index 54b0c9c..d12fee4 100644
+--- a/src/test/resources/antunit/report-junit.xml
++++ b/src/test/resources/antunit/report-junit.xml
+@@ -48,7 +48,7 @@
+   <target name="all"/>
+ 
+   <target name="testWithReportSentToFile">
+-    <property name="report.file" location="${output.dir}/selftest.report"/>
++    <property name="report.file" location="../../../../target/anttasks/selftest.report"/>
+     <rat:report reportFile="${report.file}">
+       <file file="${ant.file}"/>
+     </rat:report>
+@@ -88,22 +88,22 @@
+   <target name="testAddLicenseHeaders">
+     <delete dir="${output.dir}/it-sources"/>
+     <mkdir dir="${output.dir}/it-sources"/>
+-    <copy file="src/test/resources/antunit/index.apt" tofile="${output.dir}/it-sources/index.apt"/>
++    <copy file="index.apt" tofile="../../../../target/anttasks/it-sources/index.apt"/>
+     <rat:report addLicenseHeaders="true">
+-       <file file="${output.dir}/it-sources/index.apt"/>
++       <file file="../../../../target/anttasks/it-sources/index.apt"/>
+     </rat:report>
+   </target>
+ 
+   <target name="testISO88591">
+     <rat:report format="xml">
+-      <file file="src/test/resources/org/example/iso-8859-1.html"/>
++      <file file="../../../../src/test/resources/org/example/iso-8859-1.html"/>
+     </rat:report>
+   </target>
+ 
+   <target name="testISO88591WithReportFile">
+-    <property name="report.file" location="${output.dir}/selftest.report"/>
++    <property name="report.file" location="../../../../target/anttasks/selftest.report"/>
+     <rat:report reportFile="${report.file}" format="xml">
+-      <file file="src/test/resources/org/example/iso-8859-1.html"/>
++      <file file="../../../../src/test/resources/org/example/iso-8859-1.html"/>
+     </rat:report>
+   </target>
+ </project>
diff --git a/dev-java/apache-rat-tasks/metadata.xml b/dev-java/apache-rat-tasks/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/apache-rat-tasks/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/apple-java-extensions-bin/Manifest b/dev-java/apple-java-extensions-bin/Manifest
index d7e5f4863ec5..b906bbd504a8 100644
--- a/dev-java/apple-java-extensions-bin/Manifest
+++ b/dev-java/apple-java-extensions-bin/Manifest
@@ -1,3 +1,3 @@
 DIST apple-java-extensions-bin-1.5.zip 18036 BLAKE2B 413ff37758ca59ab0114c747745619dc0886b47b7ebf05b0383f819eee12e3d0d2c01f95520395cdf5586ceaa784cb2ccb89ba13f56c6dbc6bb2879e37b64813 SHA512 9f3e9a8eab3980feda8584ca75d58da8b31ec0ed77fb2a4a1488d0b2ca0efd845ff705fc372ba3958753690f839b0ccb2e9310d6896564317b625ff9ba9cc456
-EBUILD apple-java-extensions-bin-1.5-r1.ebuild 588 BLAKE2B 2b35f183434384c68ca733c3ffd8aaa162ce6761b5e02c0c3eaf2140d923425007149143a35cfbddc9b7d836d2fa02c0f28f2f697e8a7f146429916f2fa2d3bd SHA512 d861e1f02e16c5be7abcfab2caa65320eebc68e27ecec68efb0a319c00b78e56a5ef43abd8a6695673c1afaf80120cf6abbeaf24a125a44c14aaf008156ccedc
+EBUILD apple-java-extensions-bin-1.5-r2.ebuild 580 BLAKE2B f1fe47b26f1d81b3cd5bb1e728c626842275c2a2c040af602c29e8d393c267edc96942b10b66eb3d2b30ea26b895acedc310a3bca740b03c57ad51dad9e892b0 SHA512 4ab7802da61f63659a18dc45d28165052d4d3f7e1cd4fbd178b7d795429dcfc35c4d0e4006f135e901c01fd327dea62192b9664de92a13e57688a487bd2488b5
 MISC metadata.xml 501 BLAKE2B 84e5241185181ae803fbf5d3ea71c61e1e811845d8df6fa7eb82bf320f15b9d6751e2c9f5dbf62cd49e33bef1ff88673da88cb0ba6c31d31b657ab80bcb60869 SHA512 3020f46051a0c24205d991413131b00510ca137564c3c50b329f42ef564ef02a1701a3607fd1720a8169428fb98b5795653b1b40cb520be72c45a23fffcaf440
diff --git a/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r1.ebuild b/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r2.ebuild
index 2a587c9f0fe5..aaef7a010e5e 100644
--- a/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r1.ebuild
+++ b/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r2.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit java-pkg-2
 
 DESCRIPTION="Apple eAWT and eIO APIs for Java on Mac OS X"
 HOMEPAGE="http://developer.apple.com/samplecode/AppleJavaExtensions/"
 SRC_URI="http://developer.apple.com/samplecode/AppleJavaExtensions/AppleJavaExtensions.zip -> ${P}.zip"
+
 LICENSE="Apple"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
+
+BDEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S=${WORKDIR}/AppleJavaExtensions
 
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 234539ad1778..5842744a8397 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,21 +1,12 @@
-DIST asm-3.3.1.tar.gz 854626 BLAKE2B e8738aeda26f72c4630d33f1696188501022b4764f9f93d5fe9c74dd94459107c3bf72752e6d53850807a75d057757968b859d5453e8c61e54a5fa56f2db81f4 SHA512 b0dffde873dcdfd8328736cfaeb8a3fca2e0788fa642d3af0c995d55c6ca4b1847e35c24100277a453b518305c5fe234d1935fa8de9b25bddd5dee5f1d4a4d44
-DIST asm-4.0.tar.gz 752187 BLAKE2B 00795e18a65d1c3d17ddb722fad20c0c7b01101ffc766a0d5f82da83ce0763401c36857780ee82267d18fa67993314069645ffc188207e4628e99626b3409a07 SHA512 642bc32fc0310b8e4291386866e53ba62802f2ae888163cd6e879232bbe3c3728c3a135aa667f91aec5bbb743621c2ee2d2a1a1d1ccb36c5249874a5ba9b08db
-DIST asm-5.0.3.tar.gz 781742 BLAKE2B a2d3f0e59244d27c090be8cfab67f86369a6dae0c49a3526ee25b7c4454c93df1efee461c9a4be33b414161b66d0df65b935ff06850ad8fa6a48fdbc178e77c1 SHA512 fb2fbddbd01ec6d355d5f218db801512a160b505e91c4ad81cc1a0f1265c358cf8df6140c216e2d5acc109dc2286c29de6bf5b60b29a094e70c96070a54b20af
-DIST asm-5.1.tar.gz 791417 BLAKE2B 90ee3e28b20ce649763c43cf1b0bb495995dcfc31a534d774c727d201a913b8ae25f4c015e580c9d73b6f3a847ce32720a0c2b0ea61eab8b35e92be4beaab2fe SHA512 de702516f9e16686c027c9a200a1750e6dcaee96bb1ed8bc0591673404d015b8817e37f210be645681dff7a2c31f7ddce8b406ccc8c6e11f1424e19c04c38f1e
-DIST asm-ASM_3_3_1.tar.gz 14406355 BLAKE2B 4f2634f1cefa3d7342682eba41ac035b0c2ad60457cd976ad194d9a3b728f0ea904ae4f35620116fa81e0095c40d7a30bd95f4f317a118b79fe2a80e1708f16a SHA512 24a48b5a84baeae64dbc587ca4acc2c9a37993a17e0651cdd4881e73567be79b87b50057fa4d0eb2ad5dcdd975566fddf426749ca560ce0453c444aacff3592e
 DIST asm-ASM_4_0.tar.gz 14789505 BLAKE2B 62b49d904f1ef2d32379f4f5d644cdc274b30f292ee4f64ad02be7d2226a90965f7b12421700e79dcd1e67a46e6a8543d5e353486a1577313616688ddc57f3b3 SHA512 e654623a882d9fe414e71861183f64840f7b6629231864872497d4bf9274e8ac05e05496593fa54a90d8c6a2e6d701b9a6f3876df611637f7d2079c5519def1e
 DIST asm-ASM_5_1.tar.gz 16258842 BLAKE2B bd7d717cdfa6ff652c96b88d7b7d33fae614acba390c256ea72ecfbb3edc48382621a076dedf9b8728fdb1d0961cda943f165f99de840824b766c9af45a49339 SHA512 4bb32ce6eba267928261238f8f13cd2365ab374780039ad1df31698cd791645a370aca58c44270ec05f8377d6aa0a0d00f9f3890961cbd32a10cbd2e79e2d518
 DIST asm-ASM_6_2_1.tar.gz 1509237 BLAKE2B fb287ff5346b2fd0a016e7744d44387d2973f89c4d1cfe7b46b864019a56443e71ea0a847940f49db2a2b359651297b65feca236cb1c847e0a9217117f9300b9 SHA512 93e2e4c386b5ae8f459830cf708d62bf96aa35353e93ae9c07005467afc684596281ecc32e4a9441aa9787731c0e8f8967ec9c797c4392f80ee3e828f5c39cff
 DIST asm-ASM_7_3_1.tar.gz 1556552 BLAKE2B 23d7b21de9c163e2e69b8edb5d5d72a79ddcdd80e03393bef33285dc2455a59267ba5a95dec21d9d22e04b2518e593fbf8e856c9f361516826e1141131657259 SHA512 09abd673152ffa2d9f88aea8d940f77e8fc16e8d4b3486f39b8ae56c6f57cf4e40cff8ba829ca568c6ca71d8b676dee394d0e2f36bbf9781f9e3a9ad106e201b
 DIST asm-ASM_8_0_1.tar.gz 1559218 BLAKE2B 2b1d039ccb569cf2574d55fb7f6d2c1535dfa3edfab785a6f0622a893cb5f83f21de2d6a737ac164914893cccdd1d87754284742cdf20f2bbd4f57843dd3b36d SHA512 0b0773c3970a426ebca489e68641c3ecf0cfd3b48cddba1b56ffe0e0ab95274b5a7bcb3ae8b5ade04dffdc366bd0fdd6fd0f0db59936d1994f88107e15c90932
 DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
-EBUILD asm-3.3.1-r1.ebuild 870 BLAKE2B e51b652599a40b8845d5c35ba37d6f20202c92092fab393040dfc7f9fbd17834d8afc73869065956bb4b2bf2d14b62f3d0c200b3dc8524bd029d4d98c244db8a SHA512 55384ff316829c25d191ec5d6280a487627ae2354436ff9ebd7ad0d10efb32d734a9dd33bb6cfa0cf823bf4d4b84b7651605cf3ea7b2a6022aba848f849afb43
-EBUILD asm-3.3.1-r2.ebuild 925 BLAKE2B b8d162ad54bfd93b1e1784ea36211251241f8ec669a8031a9118a9000b02176e99643ef56822c521f5eca6b40be0053a58f15f5c05b87ddf32339577bcd02985 SHA512 80a89ac921c28bb5fbc4bcdc5e330cfceee17c17ac15514f9f9cac5f9aaef8a668fc023d79b2f17e659bb5fd66d716fce23c88bc961dd70aaf6454f920139b95
-EBUILD asm-5.0.3.ebuild 1209 BLAKE2B 79453429c1e78192909435ae7247f0e11e4464ed38f4a0d2d1c2cfe5714ec1e433aed16ad5f0433abb07bee40369a5b5b135d644bbcf36719336d658937343e5 SHA512 3c03125070730ce4d554d163afde459b1f862235fddbff7788fb50556772c8709107c84eb56948c5c4d2bb2e86c9e98be18417ea70b573e562efac971f97003e
-EBUILD asm-5.1-r1.ebuild 1284 BLAKE2B cd9ba7ce9846795d6aed159bd8273e786098736d29343fd7e4599726f11cfc46dd84512604a6b979cbde94c0a3223e8297f2ae69f47703fbf270678ebfa8508c SHA512 dfcafbdf2b442e3a2fc602ed9445ad7a2d2852de8bcfb859f62a1e74925d30372c6a23722217a8d92356990ca817225244282e0947c2e8355d794459114a0153
-EBUILD asm-5.1.ebuild 1209 BLAKE2B 55f774cbe303d63d983a31937babd7e15f04273ea4c1d4052aae21aff2a150919abb490127b7bd8371979120a1b6a793f75ec0ef5f93e1082408d0e800a62a59 SHA512 010768d998a2d406d7ea90492e51bb1056fb4797bebd939aa3f7d776f4a5a599143615fc4471340f8d500345830975c6a48bc1a3191bd5e984e14cac26d57805
+EBUILD asm-5.1-r1.ebuild 1281 BLAKE2B 4b96ddb02de5c1fddf23646db0133774464554bf2957161e1d83c3bab9c3c9bc8fdbeeec67c04b2e2d83438fee807f44d8fb535baf750e6e4e413410a5045582 SHA512 fccc9bd86fe9e41469e2002c2c5ff9cb3bd53b6ba3d935195d92bb8ab771091290b3db0bfa3ce5a685480511a364d3c17a0f74ee08f6be16a1779b6e25f081df
 EBUILD asm-6.2.1.ebuild 568 BLAKE2B 32971b777f8b654ad23e36ec2e15e9ce1dc2e0724dbed9baa3ffd1a508deee565b95031352813f6bddb6bd5f147e2d013e7022cb3b149a50e88bfb5a993db423 SHA512 13492f12664ba269f2ab8cb331bdba728279feaa29dc6c1315164ca16c2de12778958fead17eb827095ef61f273045be6d9efbdd07772e177a10e5b379dd35dc
 EBUILD asm-7.3.1.ebuild 568 BLAKE2B 5813e8eda936a34f77c9647583b92e7ae845b52aa6c9a74408cf096a4b1badfad8fa1b075429bd75ac0d3aea2fe0b9adefca15265869d981dc18a29453d25d40 SHA512 5619c7922bab5b984283968749a46fce73903ebe4db57589f37b2c21a0f242ef03498e753dd0464aa68e66d798db07e3656e30d86ad015799dd1b6e668612bd7
 EBUILD asm-8.0.1.ebuild 568 BLAKE2B 5861690e7bb9868484dbf18e6bd1dd62efd3e779aa63a35364e832db79b4d01d799d583b5c8fcf4967c5815d45baf836b6c2557f597b54deb12b9558790d91ca SHA512 847fcfa188a7028850fb66ebb9f1d615a0f645a0b845276eb0d1c2abdbb5d02d6e9b411d633887d655f9dcbfd9a75670e33d2dc5346330f765b47a21bb8466a3
-EBUILD asm-9.1.ebuild 568 BLAKE2B fb9ac711d6adce8911b558a5558be89dbb2eeb25d37112c506f6797328424c7c966163bcbd266d79403237de21527a2f4b14c0623ac1e1d2179c90d0063f293f SHA512 c6599e31d0522123145c51e3dc9972940d6ced2173156fd4c3f0eaef93b97b087412ce2267f613de64df14f3dff23d7a140d3341c15d56d5ec9a1ee44146b5d2
+EBUILD asm-9.1.ebuild 564 BLAKE2B 26b31a92001b6a04925ab4fcccd999d86c17a2623aa91ccf587ec04f0f0b70da39a6f18dfb9f0889535ddd24fdaa171f8b32a8ce94cb9bc856f15cc66e9b5366 SHA512 dbfbeb8921791c282faedeaabda397a08c3967749eb4191d654a2140682d1372eb01258a52996045235338f561cbdcd561aac9b3773e102c9ff108cd436c6f46
 MISC metadata.xml 1230 BLAKE2B a71da4c461c9ba0e7092f9c16916b0a72359fa198654c7ddabd4544efa0eb17c52378712dfe4bad27f5dcd14b289999d899dac0e89a7fd19350afe951de27839 SHA512 91a6876a431249ac794c998ab741eb4c8e3bef302e090402fd7b84dd6ebfb7734a4dfcf85fdd1ab3cedbf1d746f60ec7aa4444be44a8e316e01b8d1d45fcee5d
diff --git a/dev-java/asm/asm-3.3.1-r1.ebuild b/dev-java/asm/asm-3.3.1-r1.ebuild
deleted file mode 100644
index e37a56ad9fdd..000000000000
--- a/dev-java/asm/asm-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WANT_ANT_TASKS="ant-owanttask"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="http://asm.objectweb.org"
-SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="3"
-IUSE=""
-KEYWORDS="amd64 ppc64 x86 ~sparc-solaris ~x86-solaris"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-# Needs deps we don't have yet
-RESTRICT="test"
-
-EANT_DOC_TARGET="jdoc"
-
-# Fails if this property is not set
-EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar"
-
-src_install() {
-	for x in output/dist/lib/*.jar ; do
-		java-pkg_newjar ${x} $(basename ${x/-${PV}})
-	done
-	use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/asm/asm-3.3.1-r2.ebuild b/dev-java/asm/asm-3.3.1-r2.ebuild
deleted file mode 100644
index b67557484231..000000000000
--- a/dev-java/asm/asm-3.3.1-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WANT_ANT_TASKS="ant-owanttask"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="https://asm.ow2.io"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~sparc-solaris ~x86-solaris"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/asm-${MY_P}"
-
-# Needs deps we don't have yet
-RESTRICT="test"
-
-EANT_DOC_TARGET="jdoc"
-
-# Fails if this property is not set
-EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar"
-
-src_install() {
-	for x in output/dist/lib/*.jar ; do
-		java-pkg_newjar ${x} $(basename ${x/-${PV}})
-	done
-	use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/asm/asm-5.0.3.ebuild b/dev-java/asm/asm-5.0.3.ebuild
deleted file mode 100644
index 6bd00d55c4a1..000000000000
--- a/dev-java/asm/asm-5.0.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-OLD_P="${PN}-4.0"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="http://asm.ow2.org"
-SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz
-	http://download.forge.objectweb.org/${PN}/${OLD_P}.tar.gz"
-LICENSE="BSD"
-SLOT="4"
-IUSE=""
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~x64-macos"
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-# Needs dependencies we don't have yet.
-RESTRICT="test"
-
-EANT_DOC_TARGET="jdoc"
-
-# Fails if this objectweb.ant.tasks.path is not set.
-# Java generics seem to break unless product.noshrink is set.
-EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar -Dproduct.noshrink=true"
-
-java_prepare() {
-	# Borrow some ant scripts from an old version to avoid requiring
-	# bndlib and friends. This may not work forever!
-	cp -vf "../${OLD_P}/archive"/*.xml archive/ || die
-}
-
-src_install() {
-	for x in output/dist/lib/*.jar ; do
-		java-pkg_newjar "${x}" $(basename "${x%-*}.jar")
-	done
-
-	use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/asm/asm-5.1-r1.ebuild b/dev-java/asm/asm-5.1-r1.ebuild
index b53de05f70d8..cae7bdcc920f 100644
--- a/dev-java/asm/asm-5.1-r1.ebuild
+++ b/dev-java/asm/asm-5.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz htt
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~x64-macos"
 
 CDEPEND=""
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/asm/asm-5.1.ebuild b/dev-java/asm/asm-5.1.ebuild
deleted file mode 100644
index 0b38eae33728..000000000000
--- a/dev-java/asm/asm-5.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-OLD_P="${PN}-4.0"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="http://asm.ow2.org"
-SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz
-	http://download.forge.objectweb.org/${PN}/${OLD_P}.tar.gz"
-LICENSE="BSD"
-SLOT="4"
-IUSE=""
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-# Needs dependencies we don't have yet.
-RESTRICT="test"
-
-EANT_DOC_TARGET="jdoc"
-
-# Fails if this objectweb.ant.tasks.path is not set.
-# Java generics seem to break unless product.noshrink is set.
-EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar -Dproduct.noshrink=true"
-
-java_prepare() {
-	# Borrow some ant scripts from an old version to avoid requiring
-	# bndlib and friends. This may not work forever!
-	cp -vf "../${OLD_P}/archive"/*.xml archive/ || die
-}
-
-src_install() {
-	for x in output/dist/lib/*.jar ; do
-		java-pkg_newjar "${x}" $(basename "${x%-*}.jar")
-	done
-
-	use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/asm/asm-9.1.ebuild b/dev-java/asm/asm-9.1.ebuild
index 73bac3be0c6f..671695dc8120 100644
--- a/dev-java/asm/asm-9.1.ebuild
+++ b/dev-java/asm/asm-9.1.ebuild
@@ -12,7 +12,7 @@ MY_P="ASM_${PV//./_}"
 SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~x64-macos"
 RESTRICT="test"
 
 CDEPEND=""
diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index 4bc0800ec2f1..678134fc560a 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -1,5 +1,5 @@
-DIST aspectj-1.7.3.jar 7565941 BLAKE2B 8d3919ecae8bf190331a06644b8ba694b071b961d22e5b85e4f57b50c3ff27112e6c39b2644a400f64ca590d4de619aa1a86dd0d1ea59868499a6cff50709ecf SHA512 2297a11638c6519b50e1938341914c68c2841c7b7894081f3157ef3463fb29519d833d274e24b8da1203a7866b2e1296d67e0872dbaa2dd835b5520f5c0a7a71
 DIST aspectj-1.7.4-src.jar 7570114 BLAKE2B caa942a2414c6f1b39b881bc5abad0cd4e718b231822833756493ce389207d1d855be36f74a4c58ad5f00f7acfcd5791b4ab8e151fd0e11ac497d4f68cab2eb0 SHA512 643d457fba4d58114ee09a37007f5cf5fd40f7ff196ffc69d371d1986cbf6930567ddffd3f1af625139619a0be386e1d9c7e30d267bf53b4286e2179735299bf
-EBUILD aspectj-1.7.3-r1.ebuild 1271 BLAKE2B 7373ada5be09da47419417bc9e310bd07f7931a3eec3195b83594c40fffb6b4fa92dbf0b3b6a7eef33bad564e9f0978856042936b1ef84f00b273df19e210bbd SHA512 3f47fc35c451191c1b8ce57583d1b5d6126b0078e350616ff8dddcf83dbc5b659de3abd400ef08db7afc37efb133667a34f58418aa77079153639a9e5fd3696d
+DIST aspectj-1.9.6-src.jar 8616829 BLAKE2B adc12e181b2584287dd149657f0505b2d3ba877aa3e8cea1f2fd827b4d05c24728f120798019f1679ebafe850a8e68fa3db1467ac080c27692d5f81d31aebd48 SHA512 f15416a3921ef614ab8068c8ff8277f0fd3c177e9b277ac471786953615f1fe81638b8d13d77ebfe0643fdf089ee3cd5e718d522d2e588989a42df775f2a0516
 EBUILD aspectj-1.7.4.ebuild 1259 BLAKE2B 897ff1e5eaaec08f9ac8998174b2251265c1d43373fcdfe97e2def0ab06cbfce039e1080fcc459c0eecf3c11b3022ed2f5c131fb90ef63b41e663267dead0b00 SHA512 885778f6e1ab1c66118ba3756a5369e705c464869898866e73b032014c143310bdd790a7d9bba003fb50d574ec92330afc6d99f7ea66f0213e8abf6e627bef3c
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
+EBUILD aspectj-1.9.6.ebuild 1175 BLAKE2B a4358d0064da922e555af439a87d62e7150d655acdf6d2d93cf62f493e01ffc99b751ddde4a48e55b7be0579e34f34ded122ddf1dcdb8c04eb249c4f76a2c4d6 SHA512 d8cf226a8f39dfa6decbfd1a589ab2973cdff7315b0f6ba295d3aa5d270710a0b460f524d94d06937ca75c75405cb0dc55afb03678bc2953f92544cb353c6007
+MISC metadata.xml 382 BLAKE2B f2aa03e9e9411d65bfd57f63e9de032ba3f48f9ee80e2ca11e2b1ebea7c7223820c75d3e1516f07e94edf4328cd44a511005636f8bead11506b934513fcc8c5e SHA512 c4581ac985534be3aba02b312bcb54c36c358db73d91a449b72d19b3e7e743ad28d50f4bc6f08eb56409f8270b601f41b5f69f18d4a392937aac577bb5515a25
diff --git a/dev-java/aspectj/aspectj-1.7.3-r1.ebuild b/dev-java/aspectj/aspectj-1.9.6.ebuild
index 316152059dfc..a27323985b9f 100644
--- a/dev-java/aspectj/aspectj-1.7.3-r1.ebuild
+++ b/dev-java/aspectj/aspectj-1.9.6.ebuild
@@ -1,46 +1,44 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
+EAPI=7
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A seamless aspect-oriented extension to the Java programming language"
-HOMEPAGE="http://eclipse.org/aspectj/"
-SRC_URI="http://www.eclipse.org/downloads/download.php?file=/tools/aspectj/aspectj-1.7.3-src.jar&r=1 -> ${P}.jar"
+HOMEPAGE="https://eclipse.org/aspectj/"
+SRC_URI="https://www.eclipse.org/downloads/download.php?file=/tools/${PN}/${P}-src.jar&r=1 -> ${P}-src.jar"
 
 LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-CDEPEND="dev-java/asm:4
+CDEPEND="dev-java/asm:9
 	dev-java/commons-logging:0"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+BDEPEND="app-arch/zip"
 
-DEPEND=">=virtual/jdk-1.5
-	app-arch/zip
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-S="${WORKDIR}"
+S=${WORKDIR}
 
 JAVA_SRC_DIR="${S}/src"
-JAVA_GENTOO_CLASSPATH="commons-logging,asm-4"
+JAVA_GENTOO_CLASSPATH="commons-logging,asm-9"
 JAVA_ENCODING="iso8859-1"
 
 src_unpack() {
 	default
-	unzip "${S}/aspectjweaver1.7.3-src.jar" -d "${S}/src/" || die
+	unzip "${S}"/aspectjweaver-${PV}-sources.jar -d "${S}"/src/ || die
 }
 
-java_prepare() {
+src_prepare() {
 	default
+
 	# needs part of BEA JRockit to compile
 	rm "${S}"/src/org/aspectj/weaver/loadtime/JRockitAgent.java || die
 	# aspectj uses a renamed version of asm:4
 	find -name "*.java" -exec sed -i -e 's/import aj.org.objectweb.asm./import org.objectweb.asm./g' {} \; || die
 	mkdir -p "${S}"/target/classes/org/aspectj/weaver/ || die
-	cp -vr "${S}"/src/org/aspectj/weaver/*.properties "${S}"/target/classes/org/aspectj/weaver/ || die
 }
diff --git a/dev-java/aspectj/metadata.xml b/dev-java/aspectj/metadata.xml
index 952a4b9b605c..b1dd050ac0fa 100644
--- a/dev-java/aspectj/metadata.xml
+++ b/dev-java/aspectj/metadata.xml
@@ -5,4 +5,8 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">eclipse/org.aspectj</remote-id>
+		<bugs-to>https://www.eclipse.org/aspectj/bugs.php</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/avalon-framework/Manifest b/dev-java/avalon-framework/Manifest
index cec769b9d7a4..33658be88b83 100644
--- a/dev-java/avalon-framework/Manifest
+++ b/dev-java/avalon-framework/Manifest
@@ -1,6 +1,4 @@
 AUX build.xml 1838 BLAKE2B aa6ad2f58ef4bc96837c5f616376e2bc6dca2b338d0bdbff575b4ba0e45381e18d96c3266769fa23af60888d1baeb86e9456abb091f08cf92a54389e579a05d4 SHA512 a6dafeac52a7e7421c6e97972407b7b5424a8e35bae66153c52b92419c038d0cf31a049619b843ece7f26bcb1fbd675ea36475857609820ab6c66d03d4f8da2b
-DIST avalon-framework-4.1.5.src.tar.gz 99475 BLAKE2B c57c89661042137dd0f5b8d6fe4295030a861499b300d84a8c2dc6364d6bdca443cda96e954816da0351fda3d3ce70d47734656949bffba8d823f7e1c9f4ead9 SHA512 7a15dc2f7c691d7daaa5cbb589eb21e23ef8d6232b5bd1b6b3bb1d6962f4a4dd2dff0c0a1793309d7e8f3aaf4e75de65a9705431e1103c2e33c575770131471b
 DIST avalon-framework-4.2.0-src.tar.gz 68887 BLAKE2B da71631548bf725315c57439c5db017107d4dac529fbfdd59f68da6b97faa8b9a78fc5d89b05ccd05c7ec68b2de05d286ece6654137278b3e8873c78c65adf6c SHA512 b53dc20ecec058ef0b35a626bea6e04f85f6ae8b3645d7dc5c33c194db49b42071093cd305ef718f925b948ec1b885b2a0d8bec534592f97dc48d6e93db45671
-EBUILD avalon-framework-4.1.5-r2.ebuild 912 BLAKE2B 21826ee57ae0b7416c9f788023df6ddef04179b7f57fb92c6cdc95996e44c89f2c8a3a5e0b447c41484aba6aa512369a652dd73987911165425de90bba6516a5 SHA512 f9bf863f6bddf52aed8b471916c6e4ea97dd6140820081235011ffeebe1331c337deb11762f1f1b0457490296827532dcd173ab352da732c311ff02ef795b992
 EBUILD avalon-framework-4.2.0-r2.ebuild 980 BLAKE2B f370e2378c75139af859c0095ec886fa35053651b2425e684a788b69fdf4befb38d55bbf52c3e211fb526cc0b7bda87a5335e43a27baf04d17ab307f0e816c20 SHA512 00d74942a47021077d7bbc7a6175e68d0dc2e9e7e5f16f1f219edc7fdecb650c96367ac8081ed9ee24cd50e39c0dd5b4a6bd20362b3e7d5964f7ed4c162781c6
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
deleted file mode 100644
index 55985d937eb6..000000000000
--- a/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
+++ /dev/null
@@ -1,39 +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
-
-DESCRIPTION="Avalon Framework"
-HOMEPAGE="http://avalon.apache.org/"
-SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}.src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.1"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux"
-IUSE=""
-
-CDEPEND="dev-java/avalon-logkit:2.0
-	dev-java/log4j:0"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.4
-	${CDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-java_prepare() {
-	cp "${FILESDIR}"/build.xml ./build.xml || die "couldn't copy build.xml"
-	local libs="log4j,avalon-logkit-2.0"
-	echo "classpath=$(java-pkg_getjars ${libs})" > build.properties
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/dist/avalon-framework.jar
-
-	use doc && java-pkg_dojavadoc "${S}"/target/docs
-	use source && java-pkg_dosrc impl/src/java/*
-}
diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest
index 4635523d3952..51c09a157b30 100644
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -1,4 +1,4 @@
 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-r8.ebuild 1389 BLAKE2B 7440cec67828be34bb23d118077063c83f4f6255dc97179c0582b8faac488648d064aa8e54f7f674f9f7d0c0eba8521644a7c86bb4443332680a73320cb9e17f SHA512 35e8a04aeda74b52514cc3272647199d192b3f16b273896fdcb2150359804e2c1ad09388a86a60886e9ae091291b936a3fbbf01682d5d71e0e0d427dcd64ccb3
+EBUILD avalon-logkit-2.1-r9.ebuild 1441 BLAKE2B 3bed0691e2f5c4129665612733dde3d231fbfb0f4a09b3ba858cfc80a75e9a35d4b134f1b3c41240ce0205811febbc36ae75648c1af8dae7bed83714315eccbe SHA512 bca49c8f24d197aa35f90636967572d9b398f6dedabe42f99882240de3cb7583b4c3f21cb17677211b8cad6589be7027bd096f1f5de132a230e28c031ed73ae1
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild
index 35ac0446b01c..f66302f731e8 100644
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -10,8 +10,8 @@ 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="http://avalon.apache.org/"
-SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz"
+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 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 LICENSE="Apache-2.0"
@@ -24,16 +24,17 @@ CDEPEND="
 	dev-java/oracle-javamail:0
 	java-virtuals/servlet-api:3.0"
 RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8:*"
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
+	>=virtual/jdk-1.8:*
 	test? (
 		dev-java/ant-junit:0
 	)"
 
-java_prepare() {
+src_prepare() {
+	default
 	# Doesn't like 1.6 / 1.7 changes to JDBC
-	epatch "${FILESDIR}/${P}-java7.patch"
+	eapply "${FILESDIR}/${P}-java7.patch"
 
 	java-ant_ignore-system-classes
 
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 2291a414a752..cba5a8ac336c 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,4 +1,4 @@
 AUX batik-1.9-ImportInfo.patch 439 BLAKE2B 2d1c13f8ffa944c9f303932818b4df5b2c9c10f2903b67500971413e9e3460340b4c6d9bb3e84875ce06845f6646d0ce566a295a5982e88209bf692266dabbb8 SHA512 ff390670537fd631dbd0041a4496e0a33daa1bbd9390867285d2a817ee7794d19c0d634dbfcf4a1e777db072a0f1b6bc2b68e475bbe590bce825aa7b7d76f643
 DIST batik-src-1.9.tar.gz 16748072 BLAKE2B 4e23c0de3d56ba130c5bc9ef80a01549e8c11ab4db3b1ac5dae8525cf0a3a8b7f4df3161c12f1f0df9c74229aaf2034fb6c9c2f91b7fc7407a0af580d144e606 SHA512 96a5c16bd3d61ea33ed5013fd0b00f1724470d9b667f0f84ef4a29dcaaa19b1cc8ffcc92dc49767f4e29d77a47f99df5afca479336ac5619778b51a6fb6cd952
-EBUILD batik-1.9.ebuild 2594 BLAKE2B 831bd1e125ddf89158b3f7b092f430f4a5d478c5c820e499e0bfa30f9d972a713809dd527baf326e8af0f5ad518456abb751f40bfddc876cd29afbc41e24bb89 SHA512 913a694b467d5a853f5c5364aeaed6ecab8df869d1cca03f3cd81539be806a10d3eda65d40dc0f5b6655fa694a1666ffe63fccfdafe5ac74c74232484ef837b2
+EBUILD batik-1.9.ebuild 2594 BLAKE2B a7aa8ebb48b3819cc4fb088cabc6dc858dd5c3f20b2779c910e8f631d2be3920c133ae38caf4048991f1d6a1108a2b16a14a3f8e3d6cdfcea1256bebfcdb1724 SHA512 bf2eee253a058dfe08714e3a533e37a034af1477534a00b425105d9d2330798c37ea9ed3a00dc79f56a7558effa5a44473c74260d0fd2fffe9b621679a120e46
 MISC metadata.xml 449 BLAKE2B 44566acbbaba426170f7f8690216a45cb7809590fd62af0e87eef9cedb6caea2d896507925ec98ed278b90001f92cc38c968795a7b6fc5627c9c4e322da17743 SHA512 e437217b578831129aa80be572fd1044db0ee1c0afb0af0538dbed3e7d2ba739062eca68053426c79433ec03128ea0116a4a92be4d1946e20968be3fe89a4e02
diff --git a/dev-java/batik/batik-1.9.ebuild b/dev-java/batik/batik-1.9.ebuild
index 0582d79cb471..2e905bf8073d 100644
--- a/dev-java/batik/batik-1.9.ebuild
+++ b/dev-java/batik/batik-1.9.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 JAVA_PKG_IUSE="doc"
 
-inherit java-pkg-2 java-ant-2 eutils
+inherit java-pkg-2 java-ant-2 epatch
 
 DESCRIPTION="Java based SVG toolkit"
 HOMEPAGE="https://xmlgraphics.apache.org/batik/"
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index 91d03fe4d387..212e07fa4422 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1,5 +1,4 @@
-DIST BCEL_6_0_RC3.tar.gz 929878 BLAKE2B 05e2e307f226785cda54c06e80b47b8f738d2f5117deb4492cc758e4bfc2b046068f2aa7836336c26514f56c99525732c62acb02ed982e7f446dc254a5aeab3f SHA512 05ccf95ebf6b374fb112296509b4011d741acf2315b331aa971f8c3bc6be2f73b39592721a8c769b6b9d631e78e348c124c56f567adc2338ed5508d5ec3bed77
 DIST bcel-6.5.0-sources.tar.gz 1009051 BLAKE2B fd07d8a5144112efe38e30a8d10c3b6a189a4ec70defa96c402fa88027acf84b07c15138d235354baac18bdb798d407c11ccfada7bbe7339532f829e814e2d2c SHA512 c6da4b4d4cbad3ad2b3a4c0208063e3858170356fc4f6670c95ce819f0aea69f103914875a12bf2715a869c2b19a3e79fcb55a695eb269d9937520db25da1e3d
-EBUILD bcel-6.0_rc3.ebuild 1207 BLAKE2B 99192e908a274cc224f30452a28edd6931f31a570204f51aa1023e6498e062476610485ff9cb2006dd54235522f52bdcd6dab3e7136d45855ccad845450ddf8c SHA512 ebab70ad29898ef6494147629cb08d843da4c566faaea64941e8293ecec8151f8c1ffd745d082d8155f63c008b4209202b887ee14423d3e7f093ed24dda96e14
-EBUILD bcel-6.5.0.ebuild 1080 BLAKE2B 7ad26bbfccedbf4375c23027b47458175134ef9a05fd48099ccd869c2c4bbea0e243becfeeb3664dcf80084fa5e7a3ee2fa247ee7668376e154d3e74b9e9a568 SHA512 fc8783e11bb675ea899fbb651a8a49fcc5e72f52a52e0f45cae0f3588babf8fba44da1eddd2ff54d386dc2a09416fbabeb4b6c6901d265d06496f14d75d43054
+EBUILD bcel-6.5.0-r1.ebuild 2866 BLAKE2B 25feebba95342fac816e5995a9ef4a79655299bb82a6d66df4cd92ca70a87e813526328aae1cfc52fc644a0e7270d3036f20c4d31136a827b042a29043f06412 SHA512 e4372d8efbbec49f8247540a26b40813b95957f67daac00045c6cb0ded9f199894a18c0e5144ff35942c492f94def02c9b6e149241ca67baf0f8f1c3401cd236
+EBUILD bcel-6.5.0.ebuild 1076 BLAKE2B 53a7a80536e25669860ec17e197bb5219c965690de1c89832187ebea88738908daf8887772090b20fabcf8f5eca07f033a68f628ea3c8675ce743b0a68a79561 SHA512 c1acb164288524653f5f0aa80b7a7bf9cb0e4003015b100a727940d00cab00d4186c33faed1bf02805b9d2944ef0d7c120a7fb571686feda7e7f351d5e4989a8
 MISC metadata.xml 819 BLAKE2B e997d77649047065ba6102ad1e4c71a3622fb20544234f529566e665c6c97830bead40f81fb4664f3565225f07abb6d7829b9a6a9f2b7d5365c9fdd02572b020 SHA512 2dd8f3339c680fe11255c65ea92b2ad808ec4cb59d49b47ea533092119fef14424859368feee8ce94e7621a607ef71c4499ab78e518ce07886388def593e7281
diff --git a/dev-java/bcel/bcel-6.0_rc3.ebuild b/dev-java/bcel/bcel-6.0_rc3.ebuild
deleted file mode 100644
index 29554308da99..000000000000
--- a/dev-java/bcel/bcel-6.0_rc3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PV="${PV//./_}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P="BCEL_${MY_PV}"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Byte Code Engineering Library: analyze, create, manipulate Java class files"
-HOMEPAGE="http://commons.apache.org/bcel/"
-SRC_URI="https://github.com/apache/commons-${PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/commons-${PN}-${MY_P}/src"
-JAVA_SRC_DIR="main/java"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc ../{NOTICE,README,RELEASE-NOTES}.txt
-}
-
-src_test() {
-	cd test/java || die
-
-	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4)"
-	local TESTS=$(find * -name "*TestCase.java" ! -name "Abstract*")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -g -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/bcel/bcel-6.5.0-r1.ebuild b/dev-java/bcel/bcel-6.5.0-r1.ebuild
new file mode 100644
index 000000000000..183c85a56fa3
--- /dev/null
+++ b/dev-java/bcel/bcel-6.5.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.wayne.edu/apache//commons/bcel/source/bcel-6.5.0-src.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" --ebuild bcel-6.5.0-r1.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.bcel:bcel:6.5.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Commons Bytecode Engineering Library"
+HOMEPAGE="https://commons.apache.org/proper/commons-bcel"
+SRC_URI="mirror://apache/commons/${PN}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Compile dependencies
+# POM: pom.xml
+# test? javax:javaee-api:6.0 -> !!!groupId-not-found!!!
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.1:4
+# test? net.java.dev.jna:jna:5.5.0 -> !!!groupId-not-found!!!
+# test? net.java.dev.jna:jna-platform:5.5.0 -> !!!groupId-not-found!!!
+# test? org.apache.commons:commons-lang3:3.10 -> >=dev-java/commons-lang-3.11:3.6
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	!arm? (
+		!arm64? (
+			!ppc64? (
+				test? (
+					dev-java/commons-collections:4
+					dev-java/commons-lang:3.6
+					dev-java/jna:4
+					dev-java/jmh-core:0
+					dev-java/oracle-javamail:0
+				)
+			)
+		)
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+RESTRICT="!test? ( test ) arm? ( test ) arm64? ( test ) ppc64? ( test )"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="commons-collections-4,commons-lang-3.6,jmh-core,jna-4,junit-4,oracle-javamail"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+	"src/test/resources"
+)
+JAVA_TEST_EXCLUDES=(
+	# Invalid test class
+	"org.apache.bcel.data.AnonymousClassTest"
+	"org.apache.bcel.verifier.tests.TestArray01"
+	"org.apache.bcel.verifier.tests.TestArrayAccess01"
+	"org.apache.bcel.verifier.tests.TestArrayAccess02Creator"
+	"org.apache.bcel.verifier.tests.TestArrayAccess03Creator"
+	"org.apache.bcel.verifier.tests.TestArrayAccess04Creator"
+	"org.apache.bcel.verifier.tests.TestLegalInvokeInterface01"
+	"org.apache.bcel.verifier.tests.TestLegalInvokeSpecial01"
+	"org.apache.bcel.verifier.tests.TestLegalInvokeSpecial02"
+	"org.apache.bcel.verifier.tests.TestLegalInvokeStatic01"
+	"org.apache.bcel.verifier.tests.TestLegalInvokeVirtual01"
+	"org.apache.bcel.verifier.tests.TestLegalInvokeVirtual02"
+	"org.apache.bcel.verifier.tests.TestReturn01Creator"
+	"org.apache.bcel.verifier.tests.TestReturn02"
+	"org.apache.bcel.verifier.tests.TestCreator"
+	"org.apache.bcel.verifier.tests.TestReturn03Creator"
+)
diff --git a/dev-java/bcel/bcel-6.5.0.ebuild b/dev-java/bcel/bcel-6.5.0.ebuild
index a16085388107..b4fcd293facd 100644
--- a/dev-java/bcel/bcel-6.5.0.ebuild
+++ b/dev-java/bcel/bcel-6.5.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-bcel"
 SRC_URI="mirror://apache/commons/${PN}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/brotli-dec/Manifest b/dev-java/brotli-dec/Manifest
index 6af7da26ede7..9da9112232a9 100644
--- a/dev-java/brotli-dec/Manifest
+++ b/dev-java/brotli-dec/Manifest
@@ -1,3 +1,3 @@
 DIST brotli-dec-0.1.2-sources.jar 89491 BLAKE2B 68bb997d4e9513cfa50c22d93065a713340cf7ef75b6e08ba4fddbdeaed5a4423f2b51e7a277dbe435e835ccebed8fe5c80a2a61baaefc725e3a2840df1f54c3 SHA512 00ebbda7e3d8e558651523f8d3ab3f66aa20e300422ae2f5de57fca9a95538cb12751b87a959c8229a228878e61661ba01c4f08077b1e540c3a2d2219a71f070
-EBUILD brotli-dec-0.1.2.ebuild 522 BLAKE2B d8c12fd52da8b56f334ac569e4342c80cc1191552c2899e05f87d94aeac1c6e66eba64439222b088db5fc178a43e4f0a63dbedc1bd060107defa60ea9333a89a SHA512 b07a2a43af521fca76e3c3abf67bf16c42d2ff937748775ed99199ecd77de938575f304cad9b5ecc0c200a0b90f87af0cdeb76ebcaaae4b50cc177722cb69a4a
+EBUILD brotli-dec-0.1.2.ebuild 530 BLAKE2B fc2215c60b16a629fdd5f9ed38f939a70965aa7e0c8ea29fe1893ff059e14d3ce4d37e9748235dad978f645a71bd5e77526084bb8dff8ed5ed88d44cb1a3e923 SHA512 c814aaab6adb95d22620182e32012e2108f0a3db1c3549b7b27092ea16399f0e3145be904db0c08f3291104556b550182db2d101729ede4e17832ca4482efe1d
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild b/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild
index 72b0761c55f2..37bd8ac39308 100644
--- a/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild
+++ b/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild
@@ -4,16 +4,17 @@
 EAPI=7
 
 JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.brotli:dec:0.1.2"
+MAVEN_ID="org.brotli:dec:${PV}"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Brotli decompressor"
 HOMEPAGE="https://github.com/google/brotli"
-SRC_URI="https://repo1.maven.org/maven2/org/brotli/dec/0.1.2/dec-0.1.2-sources.jar -> ${P}-sources.jar"
+SRC_URI="https://repo1.maven.org/maven2/org/brotli/dec/${PV}/dec-${PV}-sources.jar -> ${P}-sources.jar"
+
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 BDEPEND="app-arch/unzip"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/browserlauncher2/Manifest b/dev-java/browserlauncher2/Manifest
index db6f22586648..ccd1107e40da 100644
--- a/dev-java/browserlauncher2/Manifest
+++ b/dev-java/browserlauncher2/Manifest
@@ -1,3 +1,3 @@
 DIST BrowserLauncher2-all-1_3.jar 186442 BLAKE2B b26509cf9a6700bd7261423b387479fde852f55735ddf6fb419e717c454b398a0a8c0c8acbd4be2e59aca6bd36837c0329f3a635482863273a1e9a389806bcdd SHA512 529195a94b757578afb3863c6b53cf16584097c659c576167fcbf86897cc484d80092c8d6e409ba1fdec69cb4f4a42b65c89c881663ae64bbc0a0a496309da5f
-EBUILD browserlauncher2-1.3-r1.ebuild 1104 BLAKE2B 5357814ea2c0e6431800dade0700f3daf5d8a12c87ad7b2bb174d1e08905799c73f09476710a03b3f5a0dc112b536754168feb8e04f1b5297832e05bb16c3dc3 SHA512 47b3e8820b5af7aad4f03e9b28e953395535133a58329564ad7de614755c85306fcd935b8f13afb4ac63899372c8c5687e1fc4ca421a47db04da92d7123b7846
+EBUILD browserlauncher2-1.3-r2.ebuild 1294 BLAKE2B 789c14125250f2024cac56d60b8fa5a2c6dadc112e87a7a770829e20d744ac6e9bcf41694f3405c6f99eba257bbb1e732ca16e89ab7c10ef63b21fa20f26b434 SHA512 17fbf84450123015100fb1b61f8150169ad248fd83c44df5e88488e44231712fd7d88917f3eadd9dcd3337ad04b12734a3d5871b99edf79363edfa5ec4ff12ee
 MISC metadata.xml 628 BLAKE2B 1cf381041505b896f78e6eff1771be500ad84af5827a59f5243b5c55883cebd53f53ddb5ec1e07c7491b2e0ac98eedd86353c50bf4a437be8302e43a5ab548d0 SHA512 0a45a31198ed3fa2b1e78a43342b9b079cf0ac421668ec360443e803272f25da44dac62f458568a030c67efc720a80eda629532dd2687c8324aebb506436a3d4
diff --git a/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild b/dev-java/browserlauncher2/browserlauncher2-1.3-r2.ebuild
index 8d5e98ca31ee..7f2370c1c9c6 100644
--- a/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
+++ b/dev-java/browserlauncher2/browserlauncher2-1.3-r2.ebuild
@@ -1,35 +1,38 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
-inherit versionator eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
-MY_PV="$(replace_all_version_separators _)"
-MY_PN="BrowserLauncher2"
+MY_PV="$(ver_rs 1- _)"
 
 DESCRIPTION="A library that facilitates opening a browser from a Java application"
 HOMEPAGE="http://browserlaunch2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/browserlaunch2/${MY_PN}-all-${MY_PV}.jar"
+SRC_URI="https://downloads.sourceforge.net/project/browserlaunch2/browserlauncher2/${PV}/BrowserLauncher2-all-${MY_PV}.jar"
 
 LICENSE="LGPL-2.1"
 SLOT="1.0"
 KEYWORDS="amd64 ppc64 x86"
-IUSE=""
 
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
-java_prepare() {
+src_prepare() {
+	default
 	unpack ${A}
 	find . -name "*.class" -exec rm -v {} \; || die
 	# fixing build.xml
 	sed -i -e "s: includes=\"\*\*/\*\.class\"::g" "${S}/build.xml" || die
+
+	iconv -f ISO-8859-1 -t UTF8 -o "${S}/source/at/jta/Regor.java~" \
+		"${S}/source/at/jta/Regor.java" || die "recoding failed"
+	mv -f "${S}"/source/at/jta/Regor.java{~,} || die "cannot rename"
 }
 
 EANT_BUILD_TARGET="build"
diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest
index c21d393c9ed8..a9bd9fd2a89d 100644
--- a/dev-java/bsf/Manifest
+++ b/dev-java/bsf/Manifest
@@ -1,5 +1,5 @@
 AUX bsf-2.4.0-PyJavaInstance.patch 1650 BLAKE2B ceb772a69d454d1d85e05486d28d13824724813e7875f731a165aaf97bdd7f0c006baa927e849f82de7fa16228c3de5847f8d59013142f8df4823a951b42c785 SHA512 7946622658473ef4cf6b5921f58d224f7378cb00c345a748653306d2648a89b5ab3ed68786d09bbb170b95dc657f7f55501013c854536d6dfd6b38e6a1f3963e
 AUX bsf-2.4.0-build-properties.xml 1984 BLAKE2B 6db0c1ca7f899e95a0728d61b79ef6c0a1320ee747b5479c9c50a7bd258dc7fee0b6b569e3813f323cbc694d405f9af1d269dd5370ac82e6eca2bde5072d905d SHA512 d262daec432d7a22c217e24089f22e4c349be0487fd00a2e6992e77770a3699e7e2b5977e2108455d7f73c31b372d6a73febdff2856e256f93b25f3781e11679
 DIST bsf-src-2.4.0.tar.gz 299749 BLAKE2B 41f3cfe77b1ccf6b78493df7f5f288b397234b3236977c4b7d2e6c85b330e40319474419f560eefa1632da4d0524593b8c3e0c66cd27b852749b1405c20df5a6 SHA512 a1e7564fd14abbf725fee75c4b0ba5f92d7eada0e242ad05897753bb4afe639d859c42cae1d684e8dd9151409d4cc68e1a422a70bc74d8016144cc30d03a2d43
-EBUILD bsf-2.4.0-r2.ebuild 2692 BLAKE2B 5d10fbd9e260c34b2e2f8afa5d67a443e4fc91dd139fd9acdf3e807771c0a2b2b374577d05312992e6376250b55208dd60bfa5a9eeaf682bf97509b5a6bb2ca3 SHA512 dd1aab0cf9c43311a2eea954fc43b1da1474ba5688e23a878022e9c97877f1d895104c2b15fdbe7de9b6426d5ec8cbe49a54508b9b1499b22bf411d0cccfcb60
+EBUILD bsf-2.4.0-r2.ebuild 2692 BLAKE2B 2d65425bc980e49f947e282d96d8c9f4caadeba19119e77fd6cd5ef10095a7f755acb1e21d8b35628ecc8f1853d1ba1ab7625ce0ae322efdd95988136a9e7f8a SHA512 2348ae0a68288013e8994d162575bf9c29e52f29f758f6df77640e8e9aaddd60978f69af7364c957ec48672a6ee45217792dcc2a20ad76df758a82a935cd767a
 MISC metadata.xml 903 BLAKE2B 65b2684054dd53636f1fddfa7b83c5fc9bf9c10253f12d426a8641fbf431418c24acaf6762e02159f5a2f3e1bd3c16fe97d4b44093ff04a518a79d2645f11515 SHA512 f55f803d1d0fc7a1ce20ea5d46ee89afe46b738362a2b78adfd5f6a4e9d09360f3522de148c56a9b2fae9370df1ed003611d7b68b8ba8e2e4cd7ff5683696abf
diff --git a/dev-java/bsf/bsf-2.4.0-r2.ebuild b/dev-java/bsf/bsf-2.4.0-r2.ebuild
index 2cb3ea0c4a21..01984239b9f1 100644
--- a/dev-java/bsf/bsf-2.4.0-r2.ebuild
+++ b/dev-java/bsf/bsf-2.4.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI="5"
 JAVA_PKG_IUSE="doc examples source"
 
-inherit java-pkg-2 eutils java-ant-2
+inherit java-pkg-2 epatch java-ant-2
 
 DESCRIPTION="Bean Script Framework"
 HOMEPAGE="http://commons.apache.org/bsf/"
diff --git a/dev-java/bytelist/Manifest b/dev-java/bytelist/Manifest
index 88b8cb054d67..a2befbcc641f 100644
--- a/dev-java/bytelist/Manifest
+++ b/dev-java/bytelist/Manifest
@@ -1,4 +1,3 @@
-AUX maven-build.xml 8736 BLAKE2B 6c80c5869c375da19bd15b37f8fc00a7b94d5dcb14396b3c7d42a4cbc1c6e81c3720fcfac38089ae29e492beb5aaa760d82d94d81a83149d0b8cb5e241f06ecc SHA512 1238cb1b7c53c4138f05feaa4bde6bb275d3553039940122d29df7b696945c7b021fe856b28e41c6c0fe4072b0e71280af1ba9b7f07ee8ac9941a049a44a3e86
-DIST bytelist-1.0.10.tar.gz 15619 BLAKE2B d715949e9d78201c2fbc97a6c055630b83db4989108f7fb5f68d09cc461b4bf8f30f7ffb0ad66166aa13f23a50a832e12d721ffa2a72206348db0f4070fad941 SHA512 fb522a43d5cac8a4804f64caa38fb9ab793a0f0688a69987f3be6f2245a4a2c9739a0d807f88be947c0bd7f908c069a2f8092cc4d5314c3fddb6541d9db70f7c
-EBUILD bytelist-1.0.10.ebuild 988 BLAKE2B 1fd8bafad0f950e3f53c39be7b12889304725c05350548e17ad1870f825e391d62cb4dfaa86b01706bc886031661074dcbe6808fc02f1056421c9a9e8847c834 SHA512 a3c74bbc0603a0fac3c821ae07ca5b75233914e5da67f3a0a4013e2d5a49bd6501e79b03e5325dd2e4214f82e737171668a35cd9525c5ea0811c7c79de9ba59e
-MISC metadata.xml 303 BLAKE2B eb9bfc2199bfcb29a93a127137edd0d330f868824bccf1c74830515f1f3c4f5d008d9ab6a7e5c4f9f87fed1ef7e954b7955d6c70e1e840b400428920080be362 SHA512 94ee8b7bd5d0b719b1f2afd8b3f61812bb73cd764b482bcaa73a3d60ee8080b44486697fd58dc601f23502893a0995e1a46dfb262e7c9793531765eceeb1051f
+DIST bytelist-1.0.15-sources.tar.gz 50512 BLAKE2B f17094ac4ef8ea68d48b05589b9fe3b8a90033dbc33992d0ebbcf70851c6877e20dcbe68f2e505e62301346653519833318d2c671bea9d6914d9f017610204f7 SHA512 1575a97229db7a7b99abd4fc74e713f79cd9bca4b7ffa13ba52607d84d5f7af8863c45dfd65dd32e12b03feb659808cf2f07ea494c87ca496061ab00280a40f4
+EBUILD bytelist-1.0.15.ebuild 1104 BLAKE2B 932da043af6890a52c6a293e3d9bb19474f98911732c434597482714e8a6ae873acff4a0addff30579d409e62024a5373b3fda9e3607479cd38ddca7faa05415 SHA512 c83e8d50b9497e19ca48e1657449285ac70ca5b7b44b317b9e3a44ca814af27d1a8302273770cbc7b5cbac0ec7a701ef936b5905daf697875f56672f5235f38a
+MISC metadata.xml 357 BLAKE2B 3dfcc0e03aebdda665a6abbaa40936d4a7a9facf3927bd8e617b9b149eb52f8852ded956d246cce1947c85f6fa9519578d8939ce0c86e198ec98141891a90ccc SHA512 f89cb3940ef64040717f8a89f30df71b1fe289f909c784db1505a3cdb49f3218db2ad2e420de5c01837b210b67bd0b4f2726e080d5ca3e1decaf7e0eb75f8196
diff --git a/dev-java/bytelist/bytelist-1.0.10.ebuild b/dev-java/bytelist/bytelist-1.0.10.ebuild
deleted file mode 100644
index eb1aa2d3d034..000000000000
--- a/dev-java/bytelist/bytelist-1.0.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 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="JRuby support library"
-HOMEPAGE="https://github.com/codehaus"
-SRC_URI="https://github.com/jruby/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEP="dev-java/jcodings:0"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	test? ( dev-java/ant-junit:0 )"
-
-src_unpack() {
-	default
-	mv "${WORKDIR}"/jruby-${PN}-* "${WORKDIR}"/${P} || die
-}
-
-java_prepare() {
-	cp "${FILESDIR}"/maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="jcodings"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/bytelist/bytelist-1.0.15.ebuild b/dev-java/bytelist/bytelist-1.0.15.ebuild
new file mode 100644
index 000000000000..8800cb76ac02
--- /dev/null
+++ b/dev-java/bytelist/bytelist-1.0.15.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jruby/bytelist/archive/refs/tags/bytelist-1.0.15.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild bytelist-1.0.15.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jruby.extras:bytelist:1.0.15"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Byte array based container"
+HOMEPAGE="https://github.com/jruby/bytelist"
+SRC_URI="https://github.com/jruby/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}-sources.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+# Common dependencies
+# POM: pom.xml
+# org.jruby.jcodings:jcodings:1.0.18 -> >=dev-java/jcodings-1.0.11:1
+
+CDEPEND="
+	>=dev-java/jcodings-1.0.11:1
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_GENTOO_CLASSPATH="jcodings-1"
+JAVA_SRC_DIR="src"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_SRC_DIR="test"
diff --git a/dev-java/bytelist/files/maven-build.xml b/dev-java/bytelist/files/maven-build.xml
deleted file mode 100644
index ee880775a409..000000000000
--- a/dev-java/bytelist/files/maven-build.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="bytelist-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="bytelist"/>
-  <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"/>
-  <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="test"/>
-  <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}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             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" 
-         manifest="MANIFEST.MF" 
-         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">
-  </target>
-
-</project>
diff --git a/dev-java/bytelist/metadata.xml b/dev-java/bytelist/metadata.xml
index 96cb48b87e21..2ff0b0026b27 100644
--- a/dev-java/bytelist/metadata.xml
+++ b/dev-java/bytelist/metadata.xml
@@ -1,10 +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>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">jruby/bytelist</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jruby/bytelist</remote-id>
+		<bugs-to>https://github.com/jruby/bytelist/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/cal10n/Manifest b/dev-java/cal10n/Manifest
index c188b160941b..95a9abe478fa 100644
--- a/dev-java/cal10n/Manifest
+++ b/dev-java/cal10n/Manifest
@@ -1,3 +1,3 @@
 DIST cal10n-api-0.8.1-sources.jar 35685 BLAKE2B 949bfb049d51ee4789200a9e9f6141551a648b2be70abfe56fdb0e7ef7bdce432d482cb2a79ea1a9aad0d7738500e1d217954d9e3ee60ceba0262dceffc46a16 SHA512 b6bb8ee7744fb878da1968a6524fa2b95d55c55e0f5e7413e7afd854eae226050cd4209e7489ce4f1fae6f2adb501781048f75ddcb2ad8c6b69595ff053422a7
-EBUILD cal10n-0.8.1.ebuild 629 BLAKE2B faef9f8b9884365653d22f9c93d8fe055e18f9404f482f491a4b08da3cbad3a79a7474a71628c87d9846ef6eca22e25e25ecd5e108d91b2bdcd3ab98d9a8696e SHA512 4f3d130b0e5d45d7556508219f32f285a1b0f18b1f2f2faa638f37ba9f16b86786caa57a330863de164fa86c4932b75b0c9d903837e8160ff88ef8a4660427a8
+EBUILD cal10n-0.8.1.ebuild 668 BLAKE2B 20c7015258585817a7a3db1abc363a5b0c921a7967c767ad85154e6027db60a75151704bab725f594d6d228f43755c8bcca5b4f65ee2fe23968b3cb0c31adb9e SHA512 101150c6193848ec4312aa2edc7c1129558e5f2f54519c81d07ec82ac41b0faa88758356cacbdd11835475e30a7b22d4ce71d64ac5bee462a32534343a26d0c1
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/cal10n/cal10n-0.8.1.ebuild b/dev-java/cal10n/cal10n-0.8.1.ebuild
index 83bba579bad0..5966408f191f 100644
--- a/dev-java/cal10n/cal10n-0.8.1.ebuild
+++ b/dev-java/cal10n/cal10n-0.8.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="ch.qos.cal10n:cal10n-api:0.8.1"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/cdegroot-db/Manifest b/dev-java/cdegroot-db/Manifest
index 6a39c5f94420..ee940c539eeb 100644
--- a/dev-java/cdegroot-db/Manifest
+++ b/dev-java/cdegroot-db/Manifest
@@ -1,5 +1,5 @@
 AUX build.xml 1612 BLAKE2B 2480ba7774db6f2e20b70b3cfd2ffd3a690c86a7d1d12c521faabe942900e4770a6fddae86de4193299b7f738cb71634bde0cc15e356c5b186892b8b8d6fdae0 SHA512 b7d08ecfbecd1615d9a73ba1ab95b10d07ebddda0d4d273dadba770b662957006d84f8057d86f59dd1506cab0fa9f0fc79df7577b7ba1620fbf0d2d6d446de32
 AUX cdegroot-db-0.08-gentoo.patch 7914 BLAKE2B 6139fd7ffcf65bc04ebe03f35919ba28debf86b732dcbfcc8b37192c424ae7cc1f8863556f111c23bd1327cba94e1ffd7d79787ff850b0b99a4933badf9d8ca8 SHA512 f24f13acb265f75408e6cae2a432cbcebbcad912f77ce2883159dc93743ad85c636e5656f21478914712fe393c84a6fe11600c9394b81ce128403c8f59e521cf
 DIST com.cdegroot.db-0.08.tar.gz 154705 BLAKE2B a267d402d1741f701e0fc1a99fa765c0f86a9b13ccca20f4a592661472a31e85a4da49d6fb8be07ef1800cbd0fbb123366def29e30667448484ba419a0938684 SHA512 c8a6a6a46add440499dce42f27876cadfb9d247f4e7f8852e94cc20ca9afacb400f91f884760bf3659bad46979ddd5a65f6dda4bd5416da14d89a93ff5b447d1
-EBUILD cdegroot-db-0.08-r2.ebuild 853 BLAKE2B 9d2a183d4b75eed0599f16ba2a312a83710ef0ec50384b5a9c33f251ac950ca4b2a15787e8bae4736d42336eacb63fb5ff70054d73a77a5b2afab5a1e28c7915 SHA512 84a8476d33ac372b2b921e932373fb4cddf7532b5ade3b486a8cc94385ff8d4862f37562a2c9240d362442e08b0948ce165cbfe84b388be5a33bc4b76bd33421
+EBUILD cdegroot-db-0.08-r2.ebuild 843 BLAKE2B 7c5c0495721f0bffb03f1876e35367a28c5a6acfd666729304c0d82ec9ebbbe25c97a04b6ad09181b689870fefc84a7669ea95970eb2fbc2cb852a540999058f SHA512 85c7106b41293ad19b4cdf8b3fefc118682484a9210ccafdc50f6680b12e5c9776bf5a6ce1aa5cac967255e507392ea47788e9cab4f775f49501f42f93dd0a79
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild b/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
index 4149fbc8454c..13e8e42b1526 100644
--- a/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
+++ b/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="OO database written in Java"
 HOMEPAGE="http://www.cdegroot.com/software/db/"
diff --git a/dev-java/cdi-api/Manifest b/dev-java/cdi-api/Manifest
index e9d4ddb9a1c6..640ff1c5d5c3 100644
--- a/dev-java/cdi-api/Manifest
+++ b/dev-java/cdi-api/Manifest
@@ -1,5 +1,5 @@
 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 802 BLAKE2B cf61b68a82060facbb3eb356d2770f53d1ab3a906b1b26562fbc37fcfa7c741fb6aa2aade938f13696a25882fa3c782e76c850dc9940b0098217baacdc8d9654 SHA512 ea815946719e272503410f07ae71621785e95982eabce700d4ee0812122ef57b7983fdf1537cad851a8c6050360ff39c352253c4203438642f3235600c3f092a
+EBUILD cdi-api-1.2.ebuild 792 BLAKE2B 854a44596165cb8b172018c9a78c974fa0cb72ee658b62b33cb0052f80a8da8e1648a61b36e60996f54ec9927df9a95b3017f1793e3a3657cd282a6df986d1bc SHA512 00365e5a23362cb1084cdfc7c760df5c191ad7945f7a491c2d89eea23a70e0e59ca3a26c57532db82befa623f09c3d3c49daf21c5860cf4201f06dc1bc0fe343
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/cdi-api/cdi-api-1.2.ebuild b/dev-java/cdi-api/cdi-api-1.2.ebuild
index 9396af5ff0b5..5d3e5e09d79a 100644
--- a/dev-java/cdi-api/cdi-api-1.2.ebuild
+++ b/dev-java/cdi-api/cdi-api-1.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Contexts and Dependency Injection for the Java EE platform"
 HOMEPAGE="http://www.cdi-spec.org/"
diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest
index b705b22e2e13..05fedfe5181c 100644
--- a/dev-java/cglib/Manifest
+++ b/dev-java/cglib/Manifest
@@ -1,4 +1,3 @@
-AUX cglib-3.1-build.xml.patch 1864 BLAKE2B 01fbf3ff50bcbcd4dea8b70db5a4fb6b0b3e5770a3d0c17f4fd5ed1106f5ac4f0e21054b81c06fbd731b1ba689ecc97f21db4fafcc9f84df3634ca70afe57401 SHA512 609cf02dd64fe57307ad9571f8b7d4bc3c7f9b452ce755fa968870fc252df08c985b5dc12647f8c543e39d57a01b532a4188d5ffc07359ddfc7967d32dfd978b
-DIST cglib-src-3.1.jar 1541525 BLAKE2B 46df8c11a8d05549c15a3bbf0f9789fbe4ad0540caa5be6d30f922aec95b55427cf36bff7740ba8c050c3c72749c6e9c98d8119a6de345126d7ef72343130568 SHA512 3b246b37f1c90acaefd4ba64f1f1db0b4d1fa64025f0e4e216ae7955e05701671bf8dc01d19c754286966cc5f8c06d78d02cb4f4500542f4448656768109c13f
-EBUILD cglib-3.1.ebuild 1127 BLAKE2B 89471d4fb3349610a09d7468cf5786ad2a2509ffe63bf08ca7bad52db12ff74d0622774cbeeeed673e7ede5649ffe6ce9b1efd3515c09524171bc30ec93c2d63 SHA512 59d439cc175332afe47931b43cf10c65e5fa46ccf81a6fad57059bb0dbad6e9f22f2ab4d51f8bf068449c0be7f180a1dbffb84aba69bf4a84f4e76cbdb2b1cfd
-MISC metadata.xml 554 BLAKE2B 253863978031d659d829e68719bab9dc8bc4a5d6134cd040dba882006eba9f6a6a5fec83efc83915bf7d4995af36752304252610d7163673584226c470ab7065 SHA512 480a6d306dd997a40cc695c42a4d51d12cd1ba131b5b3d80b4ca18ec751ba3dcf2394cb139c4c1a06ad98da30127c65c65eab036aaca167f46a6b63336f2c7ec
+DIST cglib-RELEASE_3_3_0.tar.gz 151490 BLAKE2B d7ca4cc9ea6dad9f7a827c784ad13f93e8f31c817c5a0182a86b2ba759ccd3dfbec88d5178507599cd08a97a1ef13ba4880cab016b68b92dda3358bfb0a751c0 SHA512 635dcdb10a8fe83887a1dc8cf12844fe61b73a12fb530bf84d6ac53f75b0103820d76518cbc0d93d63dba86d13929f0df4dbae3b4943a402cf9f2af76f44161a
+EBUILD cglib-3.3.0.ebuild 1483 BLAKE2B da5525827f1b554b0a4f3d1f9e0c6b6aa48c0b58b91a77664673d15e0694777110eb6d5a266850ca1fffd1063c05f0b89753651088676caf74ebd70c9d5a1477 SHA512 bd3a663a09c5420c2546548ccb725f894fc3304ada130e0c39d4ec6a1aa931c7e66be6247ed2509136f738699f654d0169820f3f7ddf955948fd290519ff7d44
+MISC metadata.xml 662 BLAKE2B 46cc12ace95ebd79e3ae91820fab1dbb71c570cbc19bbb9737bff384669ce771608038ba828239ebf0033281919ca41436875ebb9c8cc94377addf0cb3f4e07b SHA512 785d7be388aa2353dafedb8f8fb80a509ceccb26bdc4f59bfac17beb10fe351a0a0b98f4324d9825090e4a0fd110f4d77df5e81dba5111c52f3eff38a9d58dcc
diff --git a/dev-java/cglib/cglib-3.1.ebuild b/dev-java/cglib/cglib-3.1.ebuild
deleted file mode 100644
index 88dbbfbb6dd9..000000000000
--- a/dev-java/cglib/cglib-3.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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
-
-DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library"
-HOMEPAGE="https://github.com/cglib/cglib"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.jar"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-IUSE=""
-
-COMMON_DEP="dev-java/asm:4
-	dev-java/ant-core:0"
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-	test? ( dev-java/junit:4 )
-	${COMMON_DEP}"
-
-S="${WORKDIR}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="asm-4 ant-core"
-
-java_prepare() {
-	find . -iname '*.jar' -delete || die
-
-	# Get rid of some parts in XML.
-	epatch "${FILESDIR}"/${P}-build.xml.patch
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-
-	if use doc; then
-		java-pkg_dojavadoc docs
-	fi
-
-	if use source; then
-		java-pkg_dosrc src/proxy/net
-	fi
-
-	if use examples; then
-		java-pkg_doexamples --subdir samples src/proxy/samples
-	fi
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/cglib/cglib-3.3.0.ebuild b/dev-java/cglib/cglib-3.3.0.ebuild
new file mode 100644
index 000000000000..df66cf8c3d65
--- /dev/null
+++ b/dev-java/cglib/cglib-3.3.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# 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/refs/tags/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="amd64 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_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/cglib/files/cglib-3.1-build.xml.patch b/dev-java/cglib/files/cglib-3.1-build.xml.patch
deleted file mode 100644
index 0bf60be7b014..000000000000
--- a/dev-java/cglib/files/cglib-3.1-build.xml.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- build.xml.orig	2015-04-11 20:26:25.459688628 +0200
-+++ build.xml	2015-04-11 20:28:41.930026892 +0200
-@@ -73,7 +73,7 @@
-   <target depends="prepare" description="Compile shareable components" 
-           name="compile">
-     <javac debug="${compile.debug}" deprecation="${compile.deprecation}" destdir="${build.home}/classes" optimize="${compile.optimize}" srcdir="${source.home}"
--      target="${compile.target}" bootclasspath="${compile.bootclasspath}" extdirs="${compile.extdirs}" source="${compile.source}">
-+      target="${compile.target}" extdirs="${compile.extdirs}" source="${compile.source}">
-       <classpath refid="compile.classpath"/>
-       <compilerarg compiler="jikes" value="-nowarn"/>
-     </javac>
-@@ -123,15 +123,6 @@
-       <include name="**/*"/>
-       <exclude name="samples/**" />
-     </jar> 
--
--    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/>
--    <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >
--      <zipfileset dir="lib" includes="asm*.txt"/>
--      <zipfileset src="lib/asm-4.2.jar" excludes="META-INF"/>
--      <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/>
--      <include name="**/*"/>
--      <exclude name="samples/**"/>
--    </jarjar> 
-   </target>
- 
-   <target depends="compile,javadoc" description="Create docs and source distribution" name="srcjar">
-@@ -246,7 +237,7 @@
-   <!-- <jvmarg value="-verbose:class"/> -->
-   <!-- <jvmarg value="-Xprof"/> -->
-   <!-- <jvmarg value="-server"/> -->
--  <!-- <sysproperty key="cglib.debugLocation" value="debug"/> -->
-+  <sysproperty key="cglib.debugLocation" value="debug"/>
-   <!-- <jvmarg value="-Djava.security.policy==java.policy" /> -->
-   <!-- <jvmarg value="-Djava.security.manager" />  -->
-  
diff --git a/dev-java/cglib/metadata.xml b/dev-java/cglib/metadata.xml
index 5f26effad5fd..d6cfa73169ff 100644
--- a/dev-java/cglib/metadata.xml
+++ b/dev-java/cglib/metadata.xml
@@ -13,5 +13,7 @@
 	<upstream>
 		<remote-id type="github">cglib/cglib</remote-id>
 		<remote-id type="sourceforge">cglib</remote-id>
+		<bugs-to>https://github.com/cglib/cglib/issues</bugs-to>
+		<doc>https://github.com/cglib/cglib/wiki</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/classmate/Manifest b/dev-java/classmate/Manifest
index c99a0ffadad9..ae0736f6ccfc 100644
--- a/dev-java/classmate/Manifest
+++ b/dev-java/classmate/Manifest
@@ -1,9 +1,5 @@
 DIST classmate-0.9.0.tar.gz 57752 BLAKE2B 31247d159be4898b9ae71024da41c8602fe4d82f4ee10edab3146355cac06b23991fe926397737c43341085f35b392fc3f8a6b8278b9e47706f6fd06012f4c59 SHA512 7fb331c462458c8aab143f23c0d128a0e4e976f9d12bd181eb5658961b217bd1fe0871d056fc38bff794522c8b3118a2a017eab265afffc1d60b5580df1237a2
-DIST classmate-1.0.0.tar.gz 57807 BLAKE2B 171a82fb61fd1e183a5d435912099fd663d41c5d68791502c3a25752b77e809da817d2a8c5f8be55a211c4ab192aff6e2e566e8400c12fef688dfc05ea8a1b16 SHA512 cf721c813674e295fa6c1fe897493d14926d025cab51896ea0cec69ae285a540123060c39e3515daeffa48d6975d060861bf3ca5340bb9273980fee6d92d73b5
-DIST classmate-1.1.0.tar.gz 60936 BLAKE2B 07fe05e3f5e77b4d3551c99940b2c1e53473c37f59c592cca631266d9015618c0e72b4e659ffba999cf53bb6c5fff38a1525dbd2f49852b60ccfe66c1cb75e01 SHA512 461838806e9c181764433473af8a8d3e24539a8a8ccaed29fee8eab9c6a7a2a0b1a7dd4435931ab08ae46566330a69ce3a1d2efadb3bab2535aeb041c530ce9a
 DIST classmate-1.2.0.tar.gz 62150 BLAKE2B fac7cb24e527f69863cfb4c59e634ac77165aa5a1ecae9d887511818a87ae9cd2652eb47e72844f3e38bed3c4856185020db6ece90553d14ce84cf6ce859cae7 SHA512 82f38229cbe57531354300b967589afcf064970a2b41ac56ad3520582719416ca878d9a4adc46d46a4470077e5f14ddcf2906b0af03156863301dca0b20d4151
 EBUILD classmate-0.9.0-r1.ebuild 1153 BLAKE2B 8930a2941a6ba2dc88912ad163b6a90959b378b5589c762e35dd0a360337ba0695f554162e21bc5797cb84da76eaa5faf2e8274b35a18d978bfeb8581250bdbe SHA512 3f65f469845ed7e6d86e6f5e0473cac8d0a6c606270a0c256a01f78a5896267c975bf4b9dfbb4f36e25092c20e2baa1fc808ceb1ac18227aba3bee18ba24cfe4
-EBUILD classmate-1.0.0.ebuild 1161 BLAKE2B 2603fe68a5a76351ff3201e5e8afb8e89ffbf8e981a852b554d45022c61a5fba7c8c7a51dd0b6462d92fe732d795596c4c77f81f866a11a411e944f3f7ca0138 SHA512 d38fc03c084a8b941c8d6b6b2a8a5d07b2f092b416afc93b392c73c85eae14dd48485b223d61a14ac359c3526daf71bfe512d1080624b3d32f0562160a6a1ae3
-EBUILD classmate-1.1.0.ebuild 1221 BLAKE2B 4bc5b7d808f7068564b8b7cb7a641d7c469634664b4845aa9b9d63c1032ecefce973d6038facbbce4f8d7e4f33a22935ef88c2d29cf8d03d3ec0b8b42ac962c9 SHA512 1117e04a48578ab393ffa9222ea2bff023986e566c7fe12ee37ec0e502e7836d867cf512ab56a5236c95347de66cc03a46785b9ca1bd1e8822f668afeb3e2fd5
 EBUILD classmate-1.2.0.ebuild 1116 BLAKE2B 25424340aa51ee12ea829a0c53e730eac4c7efe3ce275fde5b89f0d784c869b3c7d98cf66c9f5d53310ac232b5e7d9db54cc57a4a4bf7f9f5b2d031fa98ea23f SHA512 3e3ef8cc197635ea6e0e271bfc632def2a893b38d1549f0f2248c279880fb92b232b0a3e496e0534a7ebb6460fa3ba8c0ec57eae0f829fe3b1c216ef07d84982
 MISC metadata.xml 328 BLAKE2B b3f4d20d37178f91bc06a2b989603370c97231531d8221d2aed030b538e9b0a93e4ae1e906b5a2b56b6877ec175abe04e4bf7b5ef9768bbb17c88879d0721184 SHA512 ed87fc70d548ed88634183da0afb2548e74bbf5f7435edfa25e71392438df87cc1e18aa90264519009f445810ccd750626460dccb66e0f68ac844c44ba8d9430
diff --git a/dev-java/classmate/classmate-1.0.0.ebuild b/dev-java/classmate/classmate-1.0.0.ebuild
deleted file mode 100644
index 14bf78fc27ec..000000000000
--- a/dev-java/classmate/classmate-1.0.0.ebuild
+++ /dev/null
@@ -1,52 +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-pkg-simple
-
-DESCRIPTION="Zero-dependency Java library for accurately introspecting type information"
-HOMEPAGE="https://github.com/cowtowncoder/java-classmate/"
-SRC_URI="https://github.com/cowtowncoder/java-classmate/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/junit:4
-	)"
-
-S="${WORKDIR}/java-${PN}-${P}"
-
-JAVA_SRC_DIR="src/main/java"
-
-# This one test is buggy.
-JAVA_RM_FILES=(
-	src/test/java/com/fasterxml/classmate/AnnotationsTest.java
-)
-
-java_prepare() {
-	rm pom.xml || die
-}
-
-src_test() {
-	testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
-
-	mkdir target/tests || die
-	ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
-
-	tests=$(find target/tests -name "*Test.class" -not -name "BaseTest.class" \
-			| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
-			| grep -vP '\$');
-	ejunit4 -cp "${testcp}" ${tests}
-}
diff --git a/dev-java/classmate/classmate-1.1.0.ebuild b/dev-java/classmate/classmate-1.1.0.ebuild
deleted file mode 100644
index 65b7a55fc95a..000000000000
--- a/dev-java/classmate/classmate-1.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Zero-dependency Java library for accurately introspecting type information"
-HOMEPAGE="https://github.com/cowtowncoder/java-classmate/"
-SRC_URI="https://github.com/cowtowncoder/java-classmate/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/java-${PN}-${P}"
-
-JAVA_SRC_DIR="src/main/java"
-
-# This one test is buggy.
-JAVA_RM_FILES=(
-	src/test/java/com/fasterxml/classmate/AnnotationsTest.java
-)
-
-src_prepare() {
-	default
-	rm -v pom.xml \
-		src/test/java/com/fasterxml/classmate/AnnotationsTest.java || die
-}
-
-src_test() {
-	testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
-
-	mkdir target/tests || die
-	ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
-
-	tests=$(find target/tests -name "*Test.class" -not -name "BaseTest.class" \
-			| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
-			| grep -vP '\$');
-	ejunit4 -cp "${testcp}" ${tests}
-}
diff --git a/dev-java/colt/Manifest b/dev-java/colt/Manifest
index ca4422e59938..153534a8bcd2 100644
--- a/dev-java/colt/Manifest
+++ b/dev-java/colt/Manifest
@@ -1,5 +1,5 @@
 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 1058 BLAKE2B 322c12ac6e655dfe3c6e025b237d10a56a0666d0570bc190bcbdf391de465a03cc17177a068577ac89748180f4ab87f5a5d0359f929287389c227a92ecaba2fa SHA512 e3b317c790841dfcf62811d98dd4b75b682257857de65bdc71588dfcf5d5f6b1003bc3887d38df4ed0805bded29c5d402019a65f1257923bdcab773d521a11db
+EBUILD colt-1.2.0-r3.ebuild 1055 BLAKE2B b86752fc0929982fbd53b96eee06bc23bf89bcd9dd4b6131574e2692d754b3f78d5aedb7711958d4f26a1e73153875e9862a5ab587fda6259cae3c1184766a88 SHA512 7eb72ee23d2bee8f26f68a221479509939dad488a4c375c8660c3b3cf424b538c887f8874ba3e63d5edeff5044e0725082a1d98d284b46d9c608b694188b6581
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/colt/colt-1.2.0-r3.ebuild b/dev-java/colt/colt-1.2.0-r3.ebuild
index ce5c2ef0fea4..24cb77f19188 100644
--- a/dev-java/colt/colt-1.2.0-r3.ebuild
+++ b/dev-java/colt/colt-1.2.0-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# 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 eutils
+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"
diff --git a/dev-java/commons-beanutils/Manifest b/dev-java/commons-beanutils/Manifest
index 8ab6cc77fba0..c1cbcfe15e1a 100644
--- a/dev-java/commons-beanutils/Manifest
+++ b/dev-java/commons-beanutils/Manifest
@@ -1,3 +1,5 @@
 DIST commons-beanutils-1.9.2-src.tar.gz 396910 BLAKE2B 1324c49605c9640aa3eee5c016a43bbb45b1984dd49eeab8f9b7a4ef1c5284ff8869228dda51719c2e6b3576517fdd02018a4f36654efc7f92d3fb7432008d05 SHA512 cf43aace33eb91368f86445874b16d977e827451f1355bb00e9b33bf0707855b5d757b0d58ad617f3a7f86f9065e7c900907dd604ba4de5ae61473d40cb758a9
-EBUILD commons-beanutils-1.9.2.ebuild 1876 BLAKE2B abadfdf70cb32bf8385eca4096c188a020152fd006e95128cd6607683add92727bfc3d2491e3baad51f0d588f7346043604ad06a6feb92dd59beda2c558652eb SHA512 a0c985e6a3d945b5479e2e46a1c7c77090dd4756a23a75cdd37fb232dd826606a895bf8212fe29cbab8b4072592c5535eb56309877ad4961860f4f30211b5582
+DIST commons-beanutils-1.9.4-src.tar.gz 412606 BLAKE2B 213a2ad4d976ed4c55c9a73c0970a656e2f03efcba886369c8be164e04618937ad636ce7ffa6aa7b981e9595b24e4cbacc2bc632268bbfede8172091ef6eb4ff SHA512 6f3d30d02b9a66cf20509bd868c6e2dadb44bb27da1e6b9af7275675e0f3826845a5d4005509dd1eb77a5b2937820c4770a3753daaab072785dcdab0caa69e73
+EBUILD commons-beanutils-1.9.2.ebuild 1829 BLAKE2B 987acca0c9832be1c004a01d37d88973295cff44640884edbec92aa35e7e70c68cd0721038dc10c5907149c134408bba6598ecae73ae11834b4617cd44d7444e SHA512 b05fec1515bf71928fd9463de580ec191200549cf3a079027725bdf5b0f1029047608de5f893863c22f690b3bffec3d03b3273c1aef0b0e2002ce1b358e530be
+EBUILD commons-beanutils-1.9.4.ebuild 2210 BLAKE2B 1567a8fbded5a1634b7b703487e519f5131ffbff844debb52c93328f4f55ccfa625c8cd3bea3657da585591563f191d513a23698dc658bbc069aa94e5a4b1350 SHA512 38c25f0e231c9c4e9967b0c8e9c9fd030a5d942fd51b5edc949d0beb1993b0a0e02b197bb939136ca08eda0911267cd3855c0db0056c08aba8f1a2acbb728cae
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
index e487ab99a70a..b50bec906c0f 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
@@ -25,7 +25,6 @@ DEPEND=">=virtual/jdk-1.6
 	test? (
 		dev-java/ant-junit:0
 		dev-java/junit:0
-		dev-java/commons-collections[test-framework]
 	)
 	${CDEPEND}"
 
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.4.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.4.ebuild
new file mode 100644
index 000000000000..a36a6aea1cef
--- /dev/null
+++ b/dev-java/commons-beanutils/commons-beanutils-1.9.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/beanutils/source/1.9.4-src.tar.gz --slot 1.7 --keywords "~amd64 ~x86 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos" --ebuild commons-beanutils-1.9.4.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-beanutils:commons-beanutils:1.9.4"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Provides easy-to-use wrappers around Reflection and Introspection APIs"
+HOMEPAGE="https://commons.apache.org/proper/commons-beanutils/"
+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"
+
+# Common dependencies
+# POM: pom.xml
+# commons-collections:commons-collections:3.2.2 -> >=dev-java/commons-collections-3.2.2:0
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+
+CDEPEND="
+	dev-java/commons-collections:0
+	dev-java/commons-logging:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? commons-collections:commons-collections-testframework:3.2.1 -> !!!artifactId-not-found!!!
+# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+	test? (
+		dev-java/commons-collections:0[test]
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_GENTOO_CLASSPATH="commons-collections,commons-logging"
+JAVA_SRC_DIR="src/main/java"
+#	JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="commons-collections,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+#	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	"org.apache.commons.beanutils.TestBeanPublicSubclass"	# Invalid test class
+	"org.apache.commons.beanutils.TestBeanPackageSubclass"	# Invalid test class
+	"org.apache.commons.beanutils.TestResultSetMetaData"	# Invalid test class
+	"org.apache.commons.beanutils.TestResultSet"	# Test class can only have one constructor
+	"org.apache.commons.beanutils.TestBean"	# Test class can only have one constructor
+)
diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
index 6846955e211c..b9f2e7e50ec0 100644
--- a/dev-java/commons-cli/Manifest
+++ b/dev-java/commons-cli/Manifest
@@ -1,5 +1,5 @@
 DIST commons-cli-1.3.1-src.tar.gz 145886 BLAKE2B 951dd516a2b80089cbd3029e456dec295adef12a6e2225a99cf3acf88cb7434bbe0ea3b2dd40190ac1cbbaaf099a88405ac7c4cd9ae096ceeb13c9a13bd0198e SHA512 b5c569bea3c213a1959ae698894f2234477a7a5ed246f8e81142041173f668802959be018011bce6aa2a5631081378e67d69eeba9136fa19c96193dbdf2a7d15
 DIST commons-cli-1.4-src.tar.gz 148530 BLAKE2B 72460ee073b4e8c5179da03c3d599cf04b37b5b3aff89e4927b07765bd879acc9ac56f52e7dee03214e21f7ba9e5af3adf54d2f943aebb266bfa9b4983ba0380 SHA512 a5db856f6154e4340aab1865e3b34c752c0dceb8063faa64740ed470d8e6b3e7782242ae51d6bb57a535a6d6dad2943cc3130d7202223b8f89b8cbecdc3d9d4f
-EBUILD commons-cli-1.3.1.ebuild 1034 BLAKE2B 3ddfdd24fab59fb465ca2ab32ec4e28ca3163c02dc2f8b12e0edbea07db3865a97e83bf6926bd05b06d65fb074eb0704dec986a7a58719ae9e306f057e9822ff SHA512 5c8220f30de277050e08dd7c967803f2632f0dae894f4dbe7bf2212f6723f520a810001718e52242005b5b1fc864ebb20da9b795a5096bbf1ff03aff7283a76e
-EBUILD commons-cli-1.4.ebuild 1037 BLAKE2B ccf5841b2c6b0ed25f25daf3b1fe067aab98814f7944ff7f343843044880b9df4699bddf5a7c6f1cacec3ed56514ab5a883828fa9d4eb070c8f5e8b2771b33b2 SHA512 83837a446eaac5befc6858d6ebd4645608055718a68470a2471fc7da59f47664edbaf9709cf674e6f0bc99f167a02e09dfab8cf8b74f91c873ed9f1629e126d7
+EBUILD commons-cli-1.3.1.ebuild 1075 BLAKE2B 8d8ab4b92f22e80245d27ea1085add0e1c4c68e01349ba23c262f309ed85242e556db93f78951c6f54d03b9821a36bc795bd74600cc66b1a13dbf2703d2eeca3 SHA512 b344ecb5000fe89157cd20969b29e01ca7345605af4414b3e6d3afdf5c655532f6f2805d98ec260f61c5533f833bad19f0b0e39c38dfda3e563d7ac1f5ce2db7
+EBUILD commons-cli-1.4.ebuild 1076 BLAKE2B eec7ba4faa1574174ba009fe59dc0081a7d988cf49ba3ba169a2655fcf231c4889b8d7785c357428d7ba749d764d0b23a0429747ca0d9411d34b52cc2cbc5de9 SHA512 b14324b3bd74190946d6779f95c064e0621f7ca65687f303641f814d45b435c036ba585d93769d20f3990536e8b98804c2afaf6b8ee6f2fa196921dbc621329b
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-cli/commons-cli-1.3.1.ebuild b/dev-java/commons-cli/commons-cli-1.3.1.ebuild
index cea9eeb2d25c..7e54b865b6bd 100644
--- a/dev-java/commons-cli/commons-cli-1.3.1.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.3.1.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="commons-cli:commons-cli:1.3.1"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/commons-cli/commons-cli-1.4.ebuild b/dev-java/commons-cli/commons-cli-1.4.ebuild
index d6caadee84f0..de78b6499639 100644
--- a/dev-java/commons-cli/commons-cli-1.4.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.4.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="commons-cli:commons-cli:1.4"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest
index c295d97ddd6a..2f933ba17f6e 100644
--- a/dev-java/commons-codec/Manifest
+++ b/dev-java/commons-codec/Manifest
@@ -1,6 +1,5 @@
-AUX commons-codec-1.11-build.xml 8949 BLAKE2B f1a5dfadeebbc183c075d96a8769218e98745936b45d38de1d0da8034a052ca99c3def82c2360857849ba7daefa1bf5d7aae1288ec71505de7154b0ab9e87aef SHA512 fc22470e625e7405308d2a21f0dbdf4bf565cc8db623bb3c4dba08d55da3a0884bc3da744cd029716af2ba51d708d0ed309f7c6a21a7df6f0e5027d5c6f646a5
-DIST commons-codec-1.11.tar.gz 369538 BLAKE2B 6b77cb3c69c81a9684b298ac5233b788d6651ecc96b70ac7fda9face5af5a60970c5bb2531fd285d20dce7732829f7470b9e4941d63025faf47247410f1ffba2 SHA512 b3159308f28b2fc50208421412d8cc81f439cc07dc3d071df7b50f2d862aab65b3d20bc8eb2906367a05ecf5138c56b5f12c6cf9c224def8b8286fe12ac5346f
+DIST commons-codec-1.15.tar.gz 423639 BLAKE2B 5d9d3dd44fda7eee77048eaa1e28f54f9baff7ad276f7e718f4a4d6c5b26605914809db538e9832bf06b1468a65432645ef9de74aec9f9af9973668a82bd996f SHA512 dcf0b86f269a96362dca5b36b9e764a07e390634804b359d4dbd1a0c50bfcc9f778e3797f196e1f553d76dd25b3c6fd016f0ffbbca856fa6c88d3d55791889ce
 DIST commons-codec-1.7-src.tar.gz 291251 BLAKE2B b8fecdb9b88a21ceb3106a13332493617ecd2c8064c84a1514dec1c1c254e18116ff4926f7445bef4171000ba77da411efd6a93fe80a4795e887832035373e10 SHA512 31358283ac2827cb05486b8ff1512242153f61deb086f7fe145ee3ca38d96e43fba080a1e89a3b8cd44d09761015ff4dbe5226d29b7f9fcd59e68ca7701b28d6
-EBUILD commons-codec-1.11.ebuild 1034 BLAKE2B 075abe16652088856f9937a3cda1f729b43ff4c034352946bc7f51c8ecdae592282540a1ce051adb453399979174da6630ecfdd035f0c42c0d27e1455436a0ba SHA512 74b6d629ac8bc566e7968c3e8321d2d3a558a3a4680b50aa24a2e9e402cf1ff9727595cac87a2c88cb087989e45f6d7e9309f0e051804d8b52347795ffd68bf8
+EBUILD commons-codec-1.15.ebuild 1368 BLAKE2B 35f84a9e9d3d92f6d9ca6c57060eba3f64881b9b366004e6360f66851ba3439f5473f0703a1ebab16f4ab0030a40e217bd6305177f16380a95b072e38c32c49e SHA512 87cca5998d46ab126a72a015320374f972bb848f1c8e364aa0b99f4b0365e934768f6bf42010a4768e889ece41c3c9012e2d331829c2ca130874695f50df0faf
 EBUILD commons-codec-1.7.ebuild 908 BLAKE2B 54d95f6e45fb34815077188bd9ba7b0370d565ab9a2175715e8e90f2b0d3fffcdb4d0fbe547b68bea1e70e996716bf7187dd06dc6510e5873b0a1309aaa08ec5 SHA512 8f0fd884b856b8c1796fcb6c905b70869fee94d753f442f94531045fa39f4f32ff30dc9aadbdba24135139b59c9bc6e5b6d618b335563149e22e7ee05d6e6c8e
 MISC metadata.xml 1360 BLAKE2B 5e996a35877486521352b61fdb44872970caab9497267c9d95d1364bd299838486f1853b46f35ec140259d33e7158bca7224488f21c388caa4fa9e7a153006bb SHA512 d16f70860d4880e50d25e6297823fb71955c147eedd115ca7eda0a0bf6c4cbc6121bf8b12062241192facd4583f10df56a838c84940b5914f75d13f10c96e9ae
diff --git a/dev-java/commons-codec/commons-codec-1.11.ebuild b/dev-java/commons-codec/commons-codec-1.11.ebuild
deleted file mode 100644
index 6fd721a8942c..000000000000
--- a/dev-java/commons-codec/commons-codec-1.11.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Implementations of common encoders and decoders in Java"
-HOMEPAGE="https://commons.apache.org/codec"
-SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-RESTRICT="test"
-
-DOCS=( RELEASE-NOTES.txt NOTICE.txt )
-
-src_prepare() {
-	cp "${FILESDIR}/${P}-build.xml" "${S}/build.xml" || die
-	default
-}
-
-src_test() {
-	java-pkg-2_src_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/commons-codec/commons-codec-1.15.ebuild b/dev-java/commons-codec/commons-codec-1.15.ebuild
new file mode 100644
index 000000000000..a8a171d01424
--- /dev/null
+++ b/dev-java/commons-codec/commons-codec-1.15.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom commons-codec-1.15-src/pom.xml --download-uri https://apache.osuosl.org/commons/codec/source/commons-codec-1.15-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-codec-1.15.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-codec:commons-codec:1.15"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Implementations of common encoders and decoders in Java"
+HOMEPAGE="https://commons.apache.org/proper/commons-codec/"
+SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+# Compile dependencies
+# POM: ${P}-src/pom.xml
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.1:4
+# test? org.apache.commons:commons-lang3:3.8 -> >=dev-java/commons-lang-3.11:3.6
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		>=dev-java/commons-lang-3.11:3.6
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS=(
+	"src/main/resources"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,commons-lang-3.6"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+	"src/test/resources"
+)
diff --git a/dev-java/commons-codec/files/commons-codec-1.11-build.xml b/dev-java/commons-codec/files/commons-codec-1.11-build.xml
deleted file mode 100644
index 251268136bf8..000000000000
--- a/dev-java/commons-codec/files/commons-codec-1.11-build.xml
+++ /dev/null
@@ -1,200 +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/27/18 9:10 AM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="commons-codec-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="commons-codec-1.11"/>
-  <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.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath"/>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/junit/junit/4.12/junit-4.12.jar"/>
-    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.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>
-    <mkdir dir="${maven.build.outputDir}/META-INF"/>
-    <copy todir="${maven.build.outputDir}/META-INF">
-      <fileset dir="${maven.build.resourceDir.1}">
-        <include name="NOTICE.txt"/>
-        <include name="LICENSE.txt"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          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="**/*AbstractTest.java"/>
-          <exclude name="**/*PerformanceTest.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*AbstractTest.java"/>
-          <exclude name="**/*PerformanceTest.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </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="UTF-8" 
-             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" 
-             docencoding="UTF-8" 
-             source="1.6" 
-             linksource="true" 
-             breakiterator="false">
-      <link href="http://docs.oracle.com/javase/7/docs/api/"/>
-      <link href="http://docs.oracle.com/javaee/6/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" 
-         manifest="/var/tmp/portage/dev-java/commons-codec-1.11/work/commons-codec-1.11-src/target/osgi/MANIFEST.MF" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-      <manifest>
-        <attribute name="Main-Class"/>
-      </manifest>
-    </jar>
-  </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                                           -->
-  <!-- ====================================================================== -->
-
-</project>
diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index 98809818ae7e..e6205ee455ef 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -1,7 +1,7 @@
-AUX commons-collections-3.2.1-Java-8.patch 7059 BLAKE2B c2dd3d388b15cd61224e96eb8b380f881ad4629ce58082c1b80cb843372741f10eaa4f3a71689a3f7817d7a702a82ef61dc7634187992fb03b2a8730262035ff SHA512 1007c9c46944c4b0104b0b13c4c2acdfc9791274019b20bd38b95769095843e4be1ee29d81ff61517d9a7d9b2ad5bd77c92a2f25ebe3bab68f9a04d3a986a44d
-DIST commons-collections-3.2.1-src.tar.gz 609930 BLAKE2B 547b785b82e16f1c318fafb5761292c5fe8beb57dd4a4881cc16ef7df7328df279713442cd1fc4a64fad0d84457c06d5536c084fd8084f62495ce44bfde19a34 SHA512 8b9b5344528b3b8a53142abd944ff6b89cc149a3fa0c1eadf3f2172509499af5820ba86859e47fe7f15f994f680fa3c577c21891540b64f41f826babe81a0fc0
+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-collections4-4.1-src.tar.gz 704671 BLAKE2B dea1b630168373013ca937c9b02414b92845fdd9ddf7a22a05c4d7f8d30ff26d73f3a2d399d7a4c026f8ec43a282120fdf3d3cb1042a311c3b490ffed1774e30 SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b
-EBUILD commons-collections-3.2.1-r1.ebuild 1734 BLAKE2B 624b691c7e76da723412a8f5bad7afe669e1cc28a162aba5dfe212368c4564872055c6b70efeecaf83d0ac4d8ddd96a55a69c1ab7d8abe7b027b848a93a22476 SHA512 b8a51864fbab75f24f7ed488d7ca627dd2682f791f8791e65cbb8300f66734a95a633759b6d4403ff830ba4c76c825c2323452a2cb51f720a464c9d49d6ada89
-EBUILD commons-collections-3.2.1-r2.ebuild 1307 BLAKE2B a565fa83dc992131050b2352a193ae4ff7d2f0d13575469db234631e37ef960a468be139b01a5fc366eea98f7ff44286840bc4408372785ef328826fe48c7ae2 SHA512 c7eb3febfa99cae218849a1a41b126712b4cbac056fec501afba305b6bce2b24671d273dfeeb2a900bf87c774820a07aa739c24872c9434e04ee8f49a9b7d259
-EBUILD commons-collections-4.1.ebuild 1206 BLAKE2B 595e0add9f94d0a7c452625e6f550455dfebf209dbe0d9561f6b4537ce9c8e87077af889d7a79d4a412de7e56cc1606b3fc9cba2e4fdcd7ab2b609c8643ead52 SHA512 78b082d24ce429ab517e85148d7bdb66506a1224469ad6e9cdb160542ca2a5d4397c27cccf82398d5e2add638451007b77fca1588f36fd9201ab1f25db6865ca
-MISC metadata.xml 325 BLAKE2B af3d8863d79f6cb8290734821ff82fbff7b65ec3d017f7f530e5c74d745d94f4a15713fa06b24b7e3dcd092dedc10f6642a0a480ee13e916bbd5895c52f1fab0 SHA512 23d211dbb0efeb5909d6d43ddf7a58ab34d33d25fc80216e0e6d7722424c06df89912947105070e63a64d44b6ad37e3053e19bcddc4c808d9cfc234f4d923645
+EBUILD commons-collections-3.2.2.ebuild 1378 BLAKE2B ca87bc67d684eae78f9816803456c1ef52cc0d3571514dba7cf2d8017f9ce72bddd35a0de681b4c33b0db1bb9e37f3e5a85cc4620819c8bcd98a70f308fc38a0 SHA512 ba6ec8a82736e39dfd41681e87e6587edd163be81ea5f80b56a37e529b7d681292627a308373ac8d2330bfd69206dd54fe1c04c34b4e63cd6255bef712042d2b
+EBUILD commons-collections-4.1-r1.ebuild 1270 BLAKE2B ee4a69564f0ad2d4f979759965d7ca0970417c905321793fec8556180e24f171f1e24fa22cef2887ca784c2c3cde2ecd6444ac96ef9634752da2f823a68e5ecc SHA512 3670396e8c20eb9e7ec040ad4b926f805279fcdd002dbfe441742cedadbad0dbb81c81544056381bcd96d3c6fef40be08197744b422bd92685eec90e4a2d41ea
+EBUILD commons-collections-4.1.ebuild 1261 BLAKE2B f307b979f9614cefe6d4f5eea916abb9591b277f16118b6cdc76a9425eda268845f8cc7860f990d0007449b9ca5d19fbeaf560569a814ace95f79297bfce5f40 SHA512 ef8287e70b9d9995365f24db5f98232207e21c05726eaf27cdd223dc1da52c154addbd0c2bd7bb1f79b2c79a5d90748fa7c2af3ff9e236dc0d1664f5e4039a99
+MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
deleted file mode 100644
index 3db3f7201fd2..000000000000
--- a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,73 +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 java-utils-2 eutils
-
-DESCRIPTION="Jakarta-Commons Collections Component"
-HOMEPAGE="http://commons.apache.org/collections/"
-SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test-framework"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	test-framework? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)
-	"
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${P}-src"
-
-java_prepare() {
-	# Check for VM version.
-	java-pkg_is-vm-version-ge 1.8
-	if [[ $? -eq 0 ]]; then
-		einfo "You are running a JVM greater or equal than version 1.8."
-		epatch "${FILESDIR}"/${P}-Java-8.patch
-	fi
-}
-
-src_compile() {
-	local antflags
-	if use test-framework; then
-		antflags="tf.jar -Djunit.jar=$(java-pkg_getjars junit)"
-		#no support for installing two sets of javadocs via dojavadoc atm
-		#use doc && antflags="${antflags} tf.javadoc"
-	fi
-	eant jar $(use_doc) ${antflags}
-}
-
-src_test() {
-	if [[ "${ARCH}" = "ppc" ]]; then
-		einfo "Tests are disabled on ppc"
-	else
-		ANT_TASKS="ant-junit" eant testjar -Djunit.jar="$(java-pkg_getjars junit)"
-	fi
-}
-
-src_install() {
-	java-pkg_newjar build/${P}.jar ${PN}.jar
-	use test-framework && \
-		java-pkg_newjar build/${PN}-testframework-${PV}.jar \
-			${PN}-testframework.jar
-
-	dodoc README.txt
-	java-pkg_dohtml *.html || die
-	if use doc; then
-		java-pkg_dojavadoc build/docs/apidocs
-		#use test-framework && java-pkg_dojavadoc build/docs/testframework
-	fi
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
index 9dac8440d36b..6d32a5a18a44 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-collections:commons-collections:3.2.2"
 
 inherit java-pkg-2 java-ant-2 java-utils-2
 
@@ -13,22 +14,24 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
+	>=virtual/jdk-1.8:*
 	test? (
 		dev-java/junit:0
 		dev-java/ant-junit:0
-	)
-	>=virtual/jdk-1.6"
+	)"
 
-RDEPEND=">=virtual/jre-1.6"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/${P}-src"
 
-PATCHES=( "${FILESDIR}/${P}-Java-8.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-fixes.patch"
+)
 
 src_prepare() {
 	default
@@ -37,7 +40,7 @@ src_prepare() {
 src_compile() {
 	local antflags
 	if use test; then
-		antflags="tf.jar -Djunit.jar=$(java-pkg_getjars junit)"
+		antflags="tf.jar -Djunit.jar=$(java-pkg_getjars --build-only junit)"
 	fi
 	eant jar $(use_doc) ${antflags}
 }
diff --git a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
new file mode 100644
index 000000000000..1f0821a89031
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
@@ -0,0 +1,53 @@
+# 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.1.ebuild b/dev-java/commons-collections/commons-collections-4.1.ebuild
index 6a1080bb83c2..3cb523c4cd89 100644
--- a/dev-java/commons-collections/commons-collections-4.1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.commons:commons-collections4:4.1"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/commons-collections/files/commons-collections-3.2.1-Java-8.patch b/dev-java/commons-collections/files/commons-collections-3.2.1-Java-8.patch
deleted file mode 100644
index 1a5ebe241f76..000000000000
--- a/dev-java/commons-collections/files/commons-collections-3.2.1-Java-8.patch
+++ /dev/null
@@ -1,160 +0,0 @@
---- a/src/java/org/apache/commons/collections/map/MultiValueMap.java
-+++ b/src/java/org/apache/commons/collections/map/MultiValueMap.java
-@@ -153,7 +153,7 @@
-      * @param value the value to remove
-      * @return the value removed (which was passed in), null if nothing removed
-      */
--    public Object remove(Object key, Object value) {
-+    public Object removeMapping(Object key, Object value) {
-         Collection valuesForKey = getCollection(key);
-         if (valuesForKey == null) {
-             return null;
---- a/src/java/org/apache/commons/collections/MultiHashMap.java
-+++ b/src/java/org/apache/commons/collections/MultiHashMap.java
-@@ -331,7 +331,7 @@
-      * @param item  the value to remove
-      * @return the value removed (which was passed in), null if nothing removed
-      */
--    public Object remove(Object key, Object item) {
-+    public Object removeMapping(Object key, Object item) {
-         Collection valuesForKey = getCollection(key);
-         if (valuesForKey == null) {
-             return null;
---- a/src/java/org/apache/commons/collections/MultiMap.java
-+++ b/src/java/org/apache/commons/collections/MultiMap.java
-@@ -66,7 +66,7 @@
-      * @throws ClassCastException if the key or value is of an invalid type
-      * @throws NullPointerException if the key or value is null and null is invalid
-      */
--    public Object remove(Object key, Object item);
-+    public Object removeMapping(Object key, Object item);
- 
-     //-----------------------------------------------------------------------
-     /**
---- a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
-+++ b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
-@@ -160,7 +160,7 @@
-         MultiValueMap one = new MultiValueMap();
-         Integer value = new Integer(1);
-         one.put("One", value);
--        one.remove("One", value);
-+        one.removeMapping("One", value);
-         
-         MultiValueMap two = new MultiValueMap();
-         assertEquals(two, one);
-@@ -186,7 +186,7 @@
-         assertEquals(4, map.totalSize());
-         map.remove("A");
-         assertEquals(3, map.totalSize());
--        map.remove("B", "BC");
-+        map.removeMapping("B", "BC");
-         assertEquals(2, map.totalSize());
-     }
-     
-@@ -203,7 +203,7 @@
-         assertEquals(2, map.size());
-         map.remove("A");
-         assertEquals(2, map.size());
--        map.remove("B", "BC");
-+        map.removeMapping("B", "BC");
-         assertEquals(2, map.size());
-     }
-     
-@@ -226,7 +226,7 @@
-         map.remove("A");
-         assertEquals(0, map.size("A"));
-         assertEquals(3, map.size("B"));
--        map.remove("B", "BC");
-+        map.removeMapping("B", "BC");
-         assertEquals(0, map.size("A"));
-         assertEquals(2, map.size("B"));
-     }
-@@ -327,11 +327,11 @@
-         map.put("A", "AA");
-         map.put("A", "AB");
-         map.put("A", "AC");
--        assertEquals(null, map.remove("C", "CA"));
--        assertEquals(null, map.remove("A", "AD"));
--        assertEquals("AC", map.remove("A", "AC"));
--        assertEquals("AB", map.remove("A", "AB"));
--        assertEquals("AA", map.remove("A", "AA"));
-+        assertEquals(null, map.removeMapping("C", "CA"));
-+        assertEquals(null, map.removeMapping("A", "AD"));
-+        assertEquals("AC", map.removeMapping("A", "AC"));
-+        assertEquals("AB", map.removeMapping("A", "AB"));
-+        assertEquals("AA", map.removeMapping("A", "AA"));
-         assertEquals(new MultiValueMap(), map);
-     }
- 
---- a/src/test/org/apache/commons/collections/TestMultiHashMap.java
-+++ b/src/test/org/apache/commons/collections/TestMultiHashMap.java
-@@ -217,7 +217,7 @@
-         MultiHashMap one = new MultiHashMap();
-         Integer value = new Integer(1);
-         one.put("One", value);
--        one.remove("One", value);
-+        one.removeMapping("One", value);
-         
-         MultiHashMap two = new MultiHashMap();
-         assertEquals(two, one);
-@@ -269,7 +269,7 @@
-         assertEquals(4, map.totalSize());
-         map.remove("A");
-         assertEquals(3, map.totalSize());
--        map.remove("B", "BC");
-+        map.removeMapping("B", "BC");
-         assertEquals(2, map.totalSize());
-     }
-     
-@@ -292,7 +292,7 @@
-         map.remove("A");
-         assertEquals(0, map.size("A"));
-         assertEquals(3, map.size("B"));
--        map.remove("B", "BC");
-+        map.removeMapping("B", "BC");
-         assertEquals(0, map.size("A"));
-         assertEquals(2, map.size("B"));
-     }
-@@ -464,11 +464,11 @@
-         map.put("A", "AA");
-         map.put("A", "AB");
-         map.put("A", "AC");
--        assertEquals(null, map.remove("C", "CA"));
--        assertEquals(null, map.remove("A", "AD"));
--        assertEquals("AC", map.remove("A", "AC"));
--        assertEquals("AB", map.remove("A", "AB"));
--        assertEquals("AA", map.remove("A", "AA"));
-+        assertEquals(null, map.removeMapping("C", "CA"));
-+        assertEquals(null, map.removeMapping("A", "AD"));
-+        assertEquals("AC", map.removeMapping("A", "AC"));
-+        assertEquals("AB", map.removeMapping("A", "AB"));
-+        assertEquals("AA", map.removeMapping("A", "AA"));
-         assertEquals(new MultiHashMap(), map);
-     }
- 
---- a/src/java/org/apache/commons/collections/map/MultiKeyMap.java
-+++ b/src/java/org/apache/commons/collections/map/MultiKeyMap.java
-@@ -197,7 +197,7 @@
-      * @param key2  the second key
-      * @return the value mapped to the removed key, null if key not in map
-      */
--    public Object remove(Object key1, Object key2) {
-+    public Object removeMultiKey(Object key1, Object key2) {
-         int hashCode = hash(key1, key2);
-         int index = map.hashIndex(hashCode, map.data.length);
-         AbstractHashedMap.HashEntry entry = map.data[index];
---- a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
-+++ b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
-@@ -315,10 +315,10 @@
-             switch (key.size()) {
-                 case 2:
-                 assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1)));
--                assertEquals(value, multimap.remove(key.getKey(0), key.getKey(1)));
-+                assertEquals(value, multimap.removeMultiKey(key.getKey(0), key.getKey(1)));
-                 assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1)));
-                 assertEquals(size - 1, multimap.size());
--                assertEquals(null, multimap.remove(key.getKey(0), key.getKey(1)));
-+                assertEquals(null, multimap.removeMultiKey(key.getKey(0), key.getKey(1)));
-                 assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1)));
-                 break;
-                 case 3:
diff --git a/dev-java/commons-collections/files/commons-collections-3.2.2-fixes.patch b/dev-java/commons-collections/files/commons-collections-3.2.2-fixes.patch
new file mode 100644
index 000000000000..24a7bb2d709c
--- /dev/null
+++ b/dev-java/commons-collections/files/commons-collections-3.2.2-fixes.patch
@@ -0,0 +1,201 @@
+diff --git a/build.xml b/build.xml
+index d6282d0..ea4c7b7 100644
+--- a/build.xml
++++ b/build.xml
+@@ -154,8 +154,7 @@
+              
+     <!-- NOTE: A jar built using JDK1.4 is incompatible with JDK1.2 -->
+     <jar    jarfile="${build.jar.name}"
+-            basedir="${build.classes}"
+-           manifest="${build.conf}/MANIFEST.MF"/>
++            basedir="${build.classes}"/>
+   </target>
+ 
+ <!-- ====================================================================== -->
+diff --git a/src/java/org/apache/commons/collections/MultiHashMap.java b/src/java/org/apache/commons/collections/MultiHashMap.java
+index 7fec9af..53470d1 100644
+--- a/src/java/org/apache/commons/collections/MultiHashMap.java
++++ b/src/java/org/apache/commons/collections/MultiHashMap.java
+@@ -331,7 +331,7 @@ public class MultiHashMap extends HashMap implements MultiMap {
+      * @param item  the value to remove
+      * @return the value removed (which was passed in), null if nothing removed
+      */
+-    public Object remove(Object key, Object item) {
++    public Object removeMapping(Object key, Object item) {
+         Collection valuesForKey = getCollection(key);
+         if (valuesForKey == null) {
+             return null;
+diff --git a/src/java/org/apache/commons/collections/MultiMap.java b/src/java/org/apache/commons/collections/MultiMap.java
+index be9455b..60375a6 100644
+--- a/src/java/org/apache/commons/collections/MultiMap.java
++++ b/src/java/org/apache/commons/collections/MultiMap.java
+@@ -66,7 +66,7 @@ public interface MultiMap extends Map {
+      * @throws ClassCastException if the key or value is of an invalid type
+      * @throws NullPointerException if the key or value is null and null is invalid
+      */
+-    public Object remove(Object key, Object item);
++    public Object removeMapping(Object key, Object item);
+ 
+     //-----------------------------------------------------------------------
+     /**
+diff --git a/src/java/org/apache/commons/collections/map/MultiKeyMap.java b/src/java/org/apache/commons/collections/map/MultiKeyMap.java
+index 9e3e02d..65bffe9 100644
+--- a/src/java/org/apache/commons/collections/map/MultiKeyMap.java
++++ b/src/java/org/apache/commons/collections/map/MultiKeyMap.java
+@@ -197,7 +197,7 @@ public class MultiKeyMap
+      * @param key2  the second key
+      * @return the value mapped to the removed key, null if key not in map
+      */
+-    public Object remove(Object key1, Object key2) {
++    public Object removeMultiKey(Object key1, Object key2) {
+         int hashCode = hash(key1, key2);
+         int index = map.hashIndex(hashCode, map.data.length);
+         AbstractHashedMap.HashEntry entry = map.data[index];
+diff --git a/src/java/org/apache/commons/collections/map/MultiValueMap.java b/src/java/org/apache/commons/collections/map/MultiValueMap.java
+index f44999b..fb1a4d1 100644
+--- a/src/java/org/apache/commons/collections/map/MultiValueMap.java
++++ b/src/java/org/apache/commons/collections/map/MultiValueMap.java
+@@ -153,7 +153,7 @@ public class MultiValueMap extends AbstractMapDecorator implements MultiMap {
+      * @param value the value to remove
+      * @return the value removed (which was passed in), null if nothing removed
+      */
+-    public Object remove(Object key, Object value) {
++    public Object removeMapping(Object key, Object value) {
+         Collection valuesForKey = getCollection(key);
+         if (valuesForKey == null) {
+             return null;
+diff --git a/src/test/org/apache/commons/collections/TestMultiHashMap.java b/src/test/org/apache/commons/collections/TestMultiHashMap.java
+index eca833a..9d47438 100644
+--- a/src/test/org/apache/commons/collections/TestMultiHashMap.java
++++ b/src/test/org/apache/commons/collections/TestMultiHashMap.java
+@@ -217,7 +217,7 @@ public class TestMultiHashMap extends AbstractTestMap {
+         MultiHashMap one = new MultiHashMap();
+         Integer value = new Integer(1);
+         one.put("One", value);
+-        one.remove("One", value);
++        one.removeMapping("One", value);
+         
+         MultiHashMap two = new MultiHashMap();
+         assertEquals(two, one);
+@@ -269,7 +269,7 @@ public class TestMultiHashMap extends AbstractTestMap {
+         assertEquals(4, map.totalSize());
+         map.remove("A");
+         assertEquals(3, map.totalSize());
+-        map.remove("B", "BC");
++        map.removeMapping("B", "BC");
+         assertEquals(2, map.totalSize());
+     }
+     
+@@ -292,7 +292,7 @@ public class TestMultiHashMap extends AbstractTestMap {
+         map.remove("A");
+         assertEquals(0, map.size("A"));
+         assertEquals(3, map.size("B"));
+-        map.remove("B", "BC");
++        map.removeMapping("B", "BC");
+         assertEquals(0, map.size("A"));
+         assertEquals(2, map.size("B"));
+     }
+@@ -464,11 +464,11 @@ public class TestMultiHashMap extends AbstractTestMap {
+         map.put("A", "AA");
+         map.put("A", "AB");
+         map.put("A", "AC");
+-        assertEquals(null, map.remove("C", "CA"));
+-        assertEquals(null, map.remove("A", "AD"));
+-        assertEquals("AC", map.remove("A", "AC"));
+-        assertEquals("AB", map.remove("A", "AB"));
+-        assertEquals("AA", map.remove("A", "AA"));
++        assertEquals(null, map.removeMapping("C", "CA"));
++        assertEquals(null, map.removeMapping("A", "AD"));
++        assertEquals("AC", map.removeMapping("A", "AC"));
++        assertEquals("AB", map.removeMapping("A", "AB"));
++        assertEquals("AA", map.removeMapping("A", "AA"));
+         assertEquals(new MultiHashMap(), map);
+     }
+ 
+diff --git a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
+index dfde362..8287f33 100644
+--- a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
++++ b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
+@@ -1116,7 +1116,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject {
+         verify();
+ 
+         try {
+-            array = collection.toArray(null);
++            array = collection.toArray((Object[]) null);
+             fail("toArray(null) should raise NPE");
+         } catch (NullPointerException e) {
+             // expected
+diff --git a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
+index b1ee3d0..9845721 100644
+--- a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
++++ b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
+@@ -315,10 +315,10 @@ public class TestMultiKeyMap extends AbstractTestIterableMap {
+             switch (key.size()) {
+                 case 2:
+                 assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1)));
+-                assertEquals(value, multimap.remove(key.getKey(0), key.getKey(1)));
++                assertEquals(value, multimap.removeMultiKey(key.getKey(0), key.getKey(1)));
+                 assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1)));
+                 assertEquals(size - 1, multimap.size());
+-                assertEquals(null, multimap.remove(key.getKey(0), key.getKey(1)));
++                assertEquals(null, multimap.removeMultiKey(key.getKey(0), key.getKey(1)));
+                 assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1)));
+                 break;
+                 case 3:
+diff --git a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
+index b9a5ac8..3138a83 100644
+--- a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
++++ b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
+@@ -161,7 +161,7 @@ public class TestMultiValueMap extends TestCase {
+         MultiValueMap one = new MultiValueMap();
+         Integer value = new Integer(1);
+         one.put("One", value);
+-        one.remove("One", value);
++        one.removeMapping("One", value);
+         
+         MultiValueMap two = new MultiValueMap();
+         assertEquals(two, one);
+@@ -187,7 +187,7 @@ public class TestMultiValueMap extends TestCase {
+         assertEquals(4, map.totalSize());
+         map.remove("A");
+         assertEquals(3, map.totalSize());
+-        map.remove("B", "BC");
++        map.removeMapping("B", "BC");
+         assertEquals(2, map.totalSize());
+     }
+     
+@@ -204,7 +204,7 @@ public class TestMultiValueMap extends TestCase {
+         assertEquals(2, map.size());
+         map.remove("A");
+         assertEquals(2, map.size());
+-        map.remove("B", "BC");
++        map.removeMapping("B", "BC");
+         assertEquals(2, map.size());
+     }
+     
+@@ -227,7 +227,7 @@ public class TestMultiValueMap extends TestCase {
+         map.remove("A");
+         assertEquals(0, map.size("A"));
+         assertEquals(3, map.size("B"));
+-        map.remove("B", "BC");
++        map.removeMapping("B", "BC");
+         assertEquals(0, map.size("A"));
+         assertEquals(2, map.size("B"));
+     }
+@@ -338,11 +338,11 @@ public class TestMultiValueMap extends TestCase {
+         map.put("A", "AA");
+         map.put("A", "AB");
+         map.put("A", "AC");
+-        assertEquals(null, map.remove("C", "CA"));
+-        assertEquals(null, map.remove("A", "AD"));
+-        assertEquals("AC", map.remove("A", "AC"));
+-        assertEquals("AB", map.remove("A", "AB"));
+-        assertEquals("AA", map.remove("A", "AA"));
++        assertEquals(null, map.removeMapping("C", "CA"));
++        assertEquals(null, map.removeMapping("A", "AD"));
++        assertEquals("AC", map.removeMapping("A", "AC"));
++        assertEquals("AB", map.removeMapping("A", "AB"));
++        assertEquals("AA", map.removeMapping("A", "AA"));
+         assertEquals(new MultiValueMap(), map);
+     }
+ 
diff --git a/dev-java/commons-collections/metadata.xml b/dev-java/commons-collections/metadata.xml
index 3e4d58fc9fa2..37998bf40746 100644
--- a/dev-java/commons-collections/metadata.xml
+++ b/dev-java/commons-collections/metadata.xml
@@ -5,7 +5,4 @@
     <email>java@gentoo.org</email>
     <name>Java</name>
   </maintainer>
-  <use>
-    <flag name="test-framework">Install the test framework</flag>
-  </use>
 </pkgmetadata>
diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
index a8275df96aeb..5b1d38807286 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -3,5 +3,5 @@ AUX build.xml 11340 BLAKE2B 9a0366053069ca9d060257887cbe70a9de8e8796894975b00b0c
 DIST commons-compress-1.10-src.tar.gz 8528642 BLAKE2B 7fe3891340f8d215134c6926711dabe139cc978560c1c92739a755d69f8f99503e3aa7f8b9a5728922e11109ee196f27ae04a03e26e009a61415d5df2bba975e SHA512 1eee157134d861f49b735df02f028781ef86370d7d246cb8fbfc1f445427d5cdd753a9df7a78e760d53667c43ab5c37df315a1e36e845e5d308961ebe138d910
 DIST commons-compress-1.20-sources.tar.gz 12990994 BLAKE2B 5709419bc7b54ac9eee4ee9a42f2ecef9ae7ed0d4b1a91e0b79c791f4cf018aed8bff4ce507d1ef9136fdc28bd550d234632d0bb9ebe7819b57c5ce99694adb6 SHA512 1794bae69e00339d9e4d35b3276543ff6f9a0f1614ec9bd7c4ec8ff1bc86d08cd48e9dc3ec712b969cf8ccd61ef6054d0c6203d7cba0c28b22e6a3ecccd0c43e
 EBUILD commons-compress-1.10.ebuild 1498 BLAKE2B 753e2e3e8cc14f90ccadcdfc82f73dc5af6d54d7db6ad81b28465c235895325119df88e03028b214427a6642c05aa4b8b4554a5572dcf71dceebdb61bfef42a9 SHA512 0a172dfe3c1026925fd92418085c1324e9fae506f85917e84fee68d9ee4fb38d38c8019c7730157deb2e3fea7ab241296ff74787be3e5a23c996f81267695537
-EBUILD commons-compress-1.20.ebuild 1070 BLAKE2B e62e87c31d535950f9aa90e55847a36b153b446f065955f00bdc4faaa0df672ab5daf3265d2d537eab8b221ed8dc910a4cf05b2bdcb7ba4935cc391422463af8 SHA512 04fe39bb22322218cfe93e2a9a71828aa13805db75e9184b06b3934f65839ac5f43df609e763afee6c484c8546da0e92a75c5d04c508cd40261e7824077f272d
+EBUILD commons-compress-1.20.ebuild 1077 BLAKE2B 9dc9af763b14ec2f2365b21b196b29280e549d43f4c0ebe63f2e0345e35037317a6a864d2758814b94c1b9c54a5c4f3ecc6d18427e63739528e42c5bd3c46b7d SHA512 2f0ce4cdadad28bf19f8c881582b954b664ede4e3c4495ef129b843de9fbce35ab911d077113618dbabdd07480b3496811663b7cae956ef4de2210881f6f1ed9
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-compress/commons-compress-1.20.ebuild b/dev-java/commons-compress/commons-compress-1.20.ebuild
index f20803df625f..dd5d1067aff2 100644
--- a/dev-java/commons-compress/commons-compress-1.20.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.20.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
 SRC_URI="https://mirrors.supportex.net/apache//commons/compress/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 CDEPEND="
 	dev-java/brotli-dec:0
diff --git a/dev-java/commons-configuration/Manifest b/dev-java/commons-configuration/Manifest
index c4da701fa49b..85aefb6deefb 100644
--- a/dev-java/commons-configuration/Manifest
+++ b/dev-java/commons-configuration/Manifest
@@ -1,4 +1,4 @@
 AUX commons-configuration-1.6-gentoo.patch 979 BLAKE2B 37076bf72f33c69dd00a0b1715cdff1746c0ccdf6d59dfe11a40960b0c317c280a30ee2a70d5d3534d5eb22edba0d489c186e7a813c455918cde6f81ce32d906 SHA512 6e0e3e69a77b31a39ad2f160a80ff08b9cdac2b0788b58b06e09f9a07a90a36bc1a4171e6bd739495b8e4c6271cc49ffbfe221dda73756f3407cf268dafec5a7
 DIST commons-configuration-1.6-src.tar.gz 559621 BLAKE2B ce6ca821c03b4948796c46fe796684dbcc8eafbc6004e2abace573f8fa316f638056c03684d10d29c0f3126554bc8cf2c9195228044a2db7203f847d2b71b22e SHA512 5d82b844cf39162976820d030d05afeeec1151aa33bf4353f9ca844e552c55ea26daa1b74158baa31d0677e311e9dd83a1d9721c8d5f4e23d21068c4ca2eeb01
-EBUILD commons-configuration-1.6-r2.ebuild 1679 BLAKE2B 2dce9a08eb53923dff1f9c66cc2dc3d7dded384cc2ce5931fd5fb60952ac713f00ad1726f09f6e7a88cf032e65aee652e25586ad2f40e6f091de016efe2b3880 SHA512 6357dca71b65bf289d0c572036a4eb2ddd33c388aa337c79c37072fb7644fa749747898abf3a395256b6aa09e5dad571aa0cdc0edf92d6e9e392f69535633883
+EBUILD commons-configuration-1.6-r2.ebuild 1676 BLAKE2B b93e2286f021264bdd4b735268b9da21af968f9f7a11f7864a12e0aab4c0ae7fd651064985b0b884879d36956b73430585e097493d558752a94f03d020d62d65 SHA512 eed998eae2ae393ea56ec39f953301ed9ecf1681060a5aa36ed2bdb7e9640d474d844c94d7b4b21b18a135922fa6dee467d2efb649e4df41b77b9fd0d3acfcc2
 MISC metadata.xml 429 BLAKE2B 5a7d59e205a26abfec76c9391d4c8b66710b082ba4a9362e70c4b40775d8d448ed531185dd4f65a04fc19643764364e3a885a4215e883127a781c8af39752cf0 SHA512 eda224d5bad6200ce652d798d7ddd2f5f7de3652419728d05068c2bde19caa2486b1060b8d98d9dc5adca2d00014e868b93dac646ee129d57c7239a6917a260e
diff --git a/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild b/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
index b8d6af15b0dc..4402e78cf004 100644
--- a/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
+++ b/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 DESCRIPTION="Generic interface for reading configuration data from a variety of sources"
 HOMEPAGE="http://commons.apache.org/configuration/"
diff --git a/dev-java/commons-digester/Manifest b/dev-java/commons-digester/Manifest
index e266af539ca0..326e91912627 100644
--- a/dev-java/commons-digester/Manifest
+++ b/dev-java/commons-digester/Manifest
@@ -3,7 +3,7 @@ AUX commons-digester-2.1-build.xml 12816 BLAKE2B 7309479a61897c3ecc28e6394714c1f
 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-digester3-3.2-src.tar.gz 324555 BLAKE2B 7b8bdaa70eeafb069e9ecbfe697ab86f5167ae3b9933e8aa306f0080de0ec99d12bd023067678b7b904329178f553fd6d4d98141ab329154a1c27385b33e449f SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad
-EBUILD commons-digester-1.8.1-r2.ebuild 1327 BLAKE2B 25c01d14ace8b931614199418ac5857c77d65ebfb54d9ed7501d0684e9557e58b003defcfef659168127eb288e09cbb182c4564e8e237f74a0e0cfe70cb49879 SHA512 04d2e6860fdc72bd26fbf7662c96dcf8fca7ce36415a738f75d31254c3ae9a3fb6f357266fd6c8a24b46f8f9868a516d5afb6fdf95ebcfd88b750d33b6207e59
-EBUILD commons-digester-2.1-r1.ebuild 1271 BLAKE2B 627edfe47d49d94e97b2d40773a4a55ccbc885bd95f5889500fd1a6662fb008d5d5efbf4727bec54e04e7a9e6fb6b412bf5425316aaeea5454ac86ff076cc3d6 SHA512 3b6b050868c748e172afcaa91f3f7632f265272cf9cf87a7d8aa24ae044dae92ebb60ab2ba05fc1bc7c5b823d22ea7597d856f7b0151cf4ad4dd2d545a035054
-EBUILD commons-digester-3.2-r2.ebuild 1346 BLAKE2B 569d0a11ac290485043abeaad1f6d5605e23e3c86e2514fddb14c90422499139056ae938d93d1f0c237740e7368844ca9a721f2a36a4c852e65f7d93e353f504 SHA512 380541befcf378f7446af7af0931fb3d95b682400b4fae1beb369a48d1ec807ecfb816a6a120085147924358ed17037027f03f9d9d049659342c3dc7a3882c0e
+EBUILD commons-digester-1.8.1-r2.ebuild 1324 BLAKE2B 2cef18509056f371eb658b67e4a9eff75d6eae6e197eaaf8887a674850399d4f58543913e43113e35e9a5dc2da1ad8397b84711713d82158d6a0fe07ad895117 SHA512 0ac87e54cb3e3ecd4872c9df9ea2bc2174ca8a52922582575ec0006e6e484e6e7e3c878525705de4ba42a58d36fe9235f47065d8837c44c905d8b03ce4481a81
+EBUILD commons-digester-2.1-r1.ebuild 1261 BLAKE2B 0fa8d71a2d26fd25429bbb19e595aba3ff667082aaf551ed777f4d1bfd8ff0b947296a3b4277cef28f073b360172f8b7fe2ad1a912cfe7102ff7c9e795e4e5d1 SHA512 728fd63dec4ef39b69b60ce7a618e60a4d7b5ed35cdf6046b4f733ef133fdfa1cb9ac7bd66ed67c42a9b3c0308b907f32b2c3dffd2abab7ae35ee13cd2c7fe26
+EBUILD commons-digester-3.2-r2.ebuild 1336 BLAKE2B 4f9b7003b2c7b09cd21d79f0f2fb2e0f970a85c48d502e9921ae2e55883edeb5008630bde20f6428b2d91583527a73b8d9630603a608ea06120797631d909c4b SHA512 4325436fc97d1378b011ab7bde10a6187b8e7e0ef7b305e28d531780bc36225f8838bd5aeb5e7dde2c8da5031e97ff68da4f6932c2bdfa685ba836afe2ea5a75
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
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
index e6cb1b16c607..7fef273f04d0 100644
--- a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
+++ b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 MY_P="${P}-src"
 DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
diff --git a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
index a6546742511c..242838b96140 100644
--- a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
+++ b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 MY_P="${P}-src"
 
diff --git a/dev-java/commons-digester/commons-digester-3.2-r2.ebuild b/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
index c818287d257f..f30609298a34 100644
--- a/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
+++ b/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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 eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 MY_P="${PN}3-${PV}-src"
 
diff --git a/dev-java/commons-el/Manifest b/dev-java/commons-el/Manifest
index 63488d779190..7dfe142a4a05 100644
--- a/dev-java/commons-el/Manifest
+++ b/dev-java/commons-el/Manifest
@@ -1,5 +1,5 @@
 AUX commons-el-1.0-java-1.7-compiler.patch 738 BLAKE2B dd71cf204af414172484d5d537c3bd0acd8d3056eabfff95161d7b30db0490a611cf22cb07c76f8782e4543ab8760602ad391ac6f4de12def16468e096bef7a2 SHA512 b189a50f4de4f3362eec45a7dba4e5d4227aae30723180ddbebaae86949687ebb217d4bf28879723fdbcb1393a54dcbf9e14e543373faaeab3975c02e01e2807
 AUX commons-el-1.0-manifest 557 BLAKE2B 085ab2a725e32c7a277a9713f31f613637ea3be5c43e8e4d3134f0cfd996622b9472fc275776a9c03aa2b58fdeb430ddd7f6179e06a84fce24e209ba4ceadf1c SHA512 6f2eba221225f9842eef312519b8c92532be4e87732202d72ecb8c1182264d5219c70fe5c3517b2df8d43bd4f828e556ae57e7e145a4be811acf914ad6b3314e
 DIST commons-el-1.0-src.tar.gz 64009 BLAKE2B df9f6daa8b5a9d86a43f5fdf0e1608b04a5cb3e78dbf7cdce5ba7e484685c9e4271db22777661d07c89a4c792fc9c519b7efef484a41394ba5f1a3a7e302594c SHA512 51bee4a33816b2c7416f55bd2efe1e663350ca0b30b2b5a8f89154c51596df8481c736fa13576a9dad69b2da113728050c2c9b6f50125d38a36f45e4b82e2e83
-EBUILD commons-el-1.0-r3.ebuild 1204 BLAKE2B bb58285024b5392e4771a834b231c334526395f7c9edf2bd401ec4ac17f72d5cf29837b4e2c3569fa04751046c7684de3fda3785cc638ba0528a5ab0d2aaf660 SHA512 3a9bee59dc8b1c62040d1de1c177b73a55d690e1a6fec5649e7182eccf200f84257b4c3a50acc26758126df5c1d6fb67f590b04f35774a1ed0af3282fb1b1370
+EBUILD commons-el-1.0-r3.ebuild 1201 BLAKE2B 3c847ac355a0078b8102cd087ac838e594d68b54498ebaf6791303310343186640bc896b3b60d08382bbfb2ed95b551f209f1be33eef99dcf264bc8ab55ff6f6 SHA512 09996f0d1b9c12c3b65f57326587e293723d4a0f21d00af80785f8904440b671001784dbaba05c176fa7b1ec9faeacc2e778de1e8fc5e67f7bb0abb79d609d6a
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-el/commons-el-1.0-r3.ebuild b/dev-java/commons-el/commons-el-1.0-r3.ebuild
index a7b3d71f48c2..931d642c470b 100644
--- a/dev-java/commons-el/commons-el-1.0-r3.ebuild
+++ b/dev-java/commons-el/commons-el-1.0-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 JAVA_PKG_IUSE="source"
 
-inherit eutils java-pkg-2 java-ant-2 java-osgi
+inherit epatch java-pkg-2 java-ant-2 java-osgi
 
 DESCRIPTION="EL is the JSP 2.0 Expression Language Interpreter from Apache"
 HOMEPAGE="http://commons.apache.org/el/"
diff --git a/dev-java/commons-fileupload/Manifest b/dev-java/commons-fileupload/Manifest
index 8654c926c2f7..4deabfabf76c 100644
--- a/dev-java/commons-fileupload/Manifest
+++ b/dev-java/commons-fileupload/Manifest
@@ -1,5 +1,5 @@
 AUX 0001-Remove-bogous-manifest-entry.patch 744 BLAKE2B 88886753a79a47ed7400de168fe7e560173c3427108f44237c86290551e5abe381f5edf9a86ea506b7dcbdb2de5ce327b21fe89e1c920eec337b138ab51d588a SHA512 a952ea640ca36fd4e4f2fdf13053d4487a88bb5bc95a70909f8202d46dba1cca0d2aacab6d6fbcf3cf8dbc6cd9b3e7b7085963d4ab9b7bb31267a63a5c037db0
 AUX 0002-Fix-running-tests.patch 736 BLAKE2B 71723de12ca1b3f256c6a83357ecf4ca1f69a7aaa42bf822906851893741649a836953cb4067e036c960b4156c17d0efdc21c7f7ad76ac122693e8e69e7e8524 SHA512 c29c2c7d67214b940700cc50905fe879791c451686343a3a52fd840c95d8210663bf667548207d61d53b9967187ca468fa2dc439b56edc6bc137ce0c955fe289
 DIST commons-fileupload-1.3-src.tar.gz 137105 BLAKE2B bfb5a4604aa69d8490fb1e661d0f82c0851ac9281e8e0e43a2e5d68b9cb330556a8df9f67fe9c2b5eaa1f9b871b3fde2b9a8064f94d6d55f7d13f64d5150bce9 SHA512 dbaaef89eb8b4be3555f0736919234b42217e8b6a021dcd99c11d18462b39b10ba92e25bafda51d1b1fcc306c9becf3fb124d03debb66922ab5442197f6360d2
-EBUILD commons-fileupload-1.3.ebuild 1314 BLAKE2B 32d44b8e8567172ff72b79fecb33bee18bc8eff941b47e350b35797a3cc8ee8d151428dbb2803d50d5ec082285503e1743024b547dd0f5762889ec84a0f590f9 SHA512 c4f563ae6d2d0e0f313e2cb637bee659262a2a1929f08c495d4bbeb886fb6a12f387c2c99351e58fd753d9a48168c7c78cb38e7cf0d2a2190bd7967d3336e8cb
+EBUILD commons-fileupload-1.3.ebuild 1311 BLAKE2B ba7aa174fc42bbfc5a22ef9cfe445877c7e52152ab22dd445c873024173429a259e372dd6740a54814524f77689b3ccb5eec8b7c8009b94ced1450836a60faf5 SHA512 8ff7c877bf2e8a760c75c250c50de899ac6a2f10c7cbb37e115c3e045dc05c5c3b772b156c9babed98467a0b68b4401227a456dbca702ad5ea84fffa576c5456
 MISC metadata.xml 749 BLAKE2B 88142a38969fdeab7a7ef48a0a72e78a24d3ec386cfcc5f8424833c026c3e2a135f02bad3eacc0fb0860633da5c71f85eda3db9d76ac52076c17cd2724236c56 SHA512 e18d72be4bcc733ced0cec17570803ff311fb9b31f28367ea2094779e0da40b379c20134fe2b4e81e9f21acd0372115671d41b7224c2f4a302123dc58d12a8ba
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
index c3bb05e55607..b5ddf03cb6a9 100644
--- a/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
+++ b/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 DESCRIPTION="High-performance file upload capability to your servlets and web applications"
 HOMEPAGE="http://commons.apache.org/fileupload/"
diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest
index dc6b6225d127..a48999714011 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -1,3 +1,3 @@
-DIST commons-io-2.4-src.tar.gz 330961 BLAKE2B 1a1ae7c968bfc38b4a4f3c4c131de088c4efdd8fff0858e7493e057909076c74d4b0ebee1999ef01af9636d88600ecca71bb0808686a6f9c1a20f4d7a5cbe6e6 SHA512 69ac5f7b8de952d8b519ad89d4e9a33a9d269af0e68b735c0180ee8853a30e2a09147ceac362626a2fb3a041bd46eca094be2661ff280c1bab54a0548cae0aee
-EBUILD commons-io-2.4.ebuild 1571 BLAKE2B db7712b9a8fae484ac0e42053c545cb5ddaf18bece53cb13c24b9c111e2e38a5fc58552b337cf21960600d096db7d98461e7ecae616fad0031e25fa5eba88c6b SHA512 1aee82477b69219e265ebffc9e9e78f892852d7eeedf47a98a6bc7b0803cc5ae1f038d9a7318d16e7efbbd3a60ac3ab29b6cc57e66bf9710480ff73620418a6e
+DIST commons-io-2.8.0-sources.tar.gz 445833 BLAKE2B 4fc6f9b66fa88adfc110742bd3eab55cbe165552f71d665f70fd54d4b0b79c4e76b45fccdb78c6ef64e476f54efc8b51adc9b2d7e880c71dbdb6bc5883d2fe55 SHA512 6189c72eff8661bfb8cfed95dd7ee32578b24b50f6586d4628a4dbfd3618853a72eb73da311729e55742ace47b2d38d3ce130ab87b684494d8ce33d1ccf14a2d
+EBUILD commons-io-2.8.0.ebuild 1032 BLAKE2B db544b790131b095e00e2966a7633a949e71f32d75545e02491bd0bf59e9ee7a49854dc6d98422167b02fe62d45a84ceff51970c53f62ff40e5f08316d410777 SHA512 a4b5f9b49eb8729afee00b0b29eeb14b5bc15f0f0ffd28da7241fa44335070d0ce7a078159dfdd69553710e82ada47ed947ff71f616dd25913fe01fc9c34cdf6
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-io/commons-io-2.4.ebuild b/dev-java/commons-io/commons-io-2.4.ebuild
deleted file mode 100644
index 6b4ce6ef64d4..000000000000
--- a/dev-java/commons-io/commons-io-2.4.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 source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_P=${P}-src
-DESCRIPTION="Utility classes, stream implementations, file filters, and endian classes"
-HOMEPAGE="http://commons.apache.org/io/"
-SRC_URI="mirror://apache/commons/io/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-EANT_EXTRA_ARGS="-Dcomponent.version=${PV}"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-java_prepare() {
-	# Setting java.io.tmpdir doesn't have effect unless we do this because the vm is forked
-	java-ant_xml-rewrite -f build.xml --change -e junit -a clonevm -v "true"
-}
-
-src_test() {
-	if [[ ${EUID} -ne 0 ]] ; then
-		ANT_OPTS="-Dskip.download=1 -Djava.io.tmpdir=${T} -Duser.home=${T}" \
-		ANT_TASKS="ant-junit" \
-			eant test \
-			-Dgentoo.classpath="$(java-pkg_getjars junit-4):${S}/src/test/resources" \
-			-Dlibdir="libdir" \
-			-Djava.io.tmpdir="${T}"
-	else
-		elog "Tests fail unless userpriv is enabled because they test for"
-		elog "file permissions which doesn't work when run as root."
-	fi
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-
-	dodoc RELEASE-NOTES.txt
-	use doc && java-pkg_dojavadoc target/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/commons-io/commons-io-2.8.0.ebuild b/dev-java/commons-io/commons-io-2.8.0.ebuild
new file mode 100644
index 000000000000..6b1a3a17f7b6
--- /dev/null
+++ b/dev-java/commons-io/commons-io-2.8.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.fau.de/apache//commons/io/source/commons-io-2.8.0-src.tar.gz --slot 1 --keywords "~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" --ebuild commons-io-2.8.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="commons-io:commons-io:2.8.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Utility classes, stream implementations, file filters, and endian classes"
+HOMEPAGE="https://commons.apache.org/proper/commons-io/"
+SRC_URI="mirror://apache/commons/io/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index b6c1c04feab3..f7eb90f4bfec 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -1,15 +1,11 @@
 DIST commons-lang-2.0-src.tar.gz 440989 BLAKE2B d71d73504c740138bdb9c1e190e0f4e846fb08a35d8ee2430ac2e24b0094e83cfc8cab9eaa44230c0d7fd26ec768bf7b448f04e123467acc20d49af6efe3008b SHA512 aecbbdd8eb2712981dcd8615bac2ec69e3ea7ae137407287d2a9b3eeaddb48e5367bc9c5cb8d232429ac6091548dac8af67e0593366365c04fcfe39984c3e549
 DIST commons-lang-2.6-src.tar.gz 564032 BLAKE2B 9d72b0426f2146eaa8498a6601edf80dbf45a16ef5ee14cf4ed87130e6d3732d5c713f25f44c10435baa1357f61a271acb88483915968aaf645d1ceaa318c601 SHA512 4a30ed153f93fe6616a28974721bdf005d064203ef8a3dd375d6c1176647c0cdbd29cfde2a580e2c8d26bfa4655be6be7025b8ccae94086dcd816676c5cf8e87
 DIST commons-lang-3.11.tar.gz 1054329 BLAKE2B 7d198e2e7f09f3711909a168cbef405d06aff7482d8ab87059aa11584e82d950ea32f1c1a4d0c9c6c54729396e6b5ee6165a7689b3c38081af31b7a3dad23657 SHA512 ebcb13e47c24e6984835d9d6904fe33077aa3ba781cd61db109fa7005517e4e74cf086c4789a1d65cf3d6c4924b32337c98827a75f91aab908d8e8b9d3b92087
-DIST commons-lang-3.6.tar.gz 852347 BLAKE2B 4a3ad5f557d27e4a109f6e65f9fe8d792b017376227747669bf949725cdc3817a7f14766e121db099e027fc3c322eeb3f68c41786be9a8d500172cfd3c104c7f SHA512 fb627605154c1b3d4561c27ad931bfcac43303ce98ffca8fca538ce6368506cdd2b80de7f22a93ca628e86804923940dd9909bb884c77ca196b654521febc60a
+DIST commons-lang-3.12.0-sources.tar.gz 1072858 BLAKE2B d6b7ee9ef165e60f61d8d0dfaaf38919877f2edc6742cd58b2b70d379e807e75d9dc24e19f23db1b174d1797d6ef0af7700d686dd835d7a40bf2b2a91346e215 SHA512 80d1b960ae0b02859be329ea60d68cef33f3c7be7ec19752b3c9cfef442adef480878317ce2cfa309a27e662e2c72cab22023eaa3702e27970a1e5d55ca43f57
 DIST commons-lang3-3.1-src.tar.gz 638619 BLAKE2B f971afc9bdd3896178bc4be0b6c5d8809f1c1ac0d69ad73ba0d71c185c600ca7a55c3b4877af64b552ccebed9567aa7830f236f2c0d9c38f259870b894c9d745 SHA512 4d201c695a9b908a1809bbab689f80c6aa508b221b4c2786974eada08e647936f5879841c64eed509032ffdd5410735480e7ecb2910295d0f79e857c27019560
-DIST commons-lang3-3.3.2-src.tar.gz 740462 BLAKE2B dbf8fe7f6a4bb0cf462e2281d709e4ecd65e5fa116bb707af14a2b7b248eb1877f872f937fde2e5743bbe9b4775fabd1d0897ebeb8ebe92af235914cac7dbc2f SHA512 be889e0e9d7aaa7d6635e41c17d19dd1e5f9e03fd78eac61fd5f5483321170b9a72007ad0bfa7023e6ff55ae418b40eaa01dae350641c4e88138ac59d4001667
-DIST commons-lang3-3.4-src.tar.gz 771275 BLAKE2B 870f9c5aa18cb68cb88edc28d426df258af69eb6efc3dfe77bab40e2e81bddd4e56b1244a5ad4433f9dd4c0d533dc7b3b10c865fcaaefd9602e1f681bb48538b SHA512 44e93f2d8f7e6a54becaa797ee3348c6125ccdce96d772158f2a1e5ba2a7ecaecf00a6290f2e0fe2fa61db422313709ec6bc836d9296e2f16c5acf6635bb12b5
 EBUILD commons-lang-2.0-r3.ebuild 839 BLAKE2B 0d2d338ce391a152b73127792904096a744f18aa0ab5cf426bf8e48226a13924de745e43c91866db7e7b5a70cf558285654e2fb4efcac352b9faa323bcf65d9f SHA512 c8f1172157f4ecc2c2b44443a4c9fe14d824164869692b6e3d52684d17792f19c125b23bbebf5b5ab67d4a4e2718f629d9d5600ad98663e024040f0246acc41d
-EBUILD commons-lang-2.6-r1.ebuild 827 BLAKE2B 991053bb232631eeafb475a9b9009debdd9061a48b95cf6af5ca13d22fb1b971f9fa0c84e3682af8cc535902ac5a173e36f732b4902024c14e69829e68847b53 SHA512 ee4d564cf8534a349d8a226fb7bdd7223c0fb5270e9ed34ec133861b2e4be5a65dcc07cd56a28fa05e042f9741a8f049e75382e465fd4bcc742f8d52749e934a
+EBUILD commons-lang-2.6-r1.ebuild 869 BLAKE2B 014e28d08de2cd8bd5ca9dd2d5492566f14864a00ac86cf4e262953396a74aef22882704c2c136c23070758bc5d832a0986c478e1fc0f141b9e4f5727841ebc5 SHA512 6575b1287b05a662f34d80bba40fad7b75f357331f4723900c0e2a5c6294a308acccb2664d9ce0dec0bec87fc0c819efb31f667dc242c22cc18ce508bee5388f
 EBUILD commons-lang-3.1.ebuild 825 BLAKE2B 828fefecb0daecd2c0dee1da07be43d676a55e152ff630e967626fa74e6a58abd6918a6e558e8bf6120435c62b64956aa6e9c05fdd0c44917dbe0241ad4a33a4 SHA512 7d2158fabad2919520b3fe56c78c6b6fe584711fbb0a2f21335f785bc82f842ab947078c0c93a7e641918f3c6d8c0152c41e2f2e09d43524aee44afb5900915b
-EBUILD commons-lang-3.11.ebuild 951 BLAKE2B 704e2be7815cff79dfedb91a93f00cdbecf7996345b9dd36d38922a9481ba5a183d3274a2b36086f6e1d4e709725b210f83a513c5af561059294c424e45b0fd4 SHA512 f16c46323d0ce1c24a9e4e3ad1b4898fd47c5cdc7a35f38cd53dffee20a0d813a328147915662b629d7cdfd07733879eac4b406109db540b641bac18acb529e4
-EBUILD commons-lang-3.3.2.ebuild 1100 BLAKE2B 1a62aaf270ae857c17bfd2e1b0523605cc522f0d8c90ca531ef5a1d520a6ce877a41070570a615e59bd0cb18e328703e166a9f7127e82b2a7a5218f591fee69f SHA512 4ff45b980f45fa148d8c96070cf9702c51fa704d2233bc918f957cd811275522a755526bff5f91d5b398ff204419fd089c7b7cda5416406ee635e49e4d8e0687
-EBUILD commons-lang-3.4.ebuild 1098 BLAKE2B 730dc1990a6fbb1b1a5e2adfdcb894cf13204c97c4155a1db010534564aa9e6923c92da1d7ba6e72298c1de5f6d28a46c6ce609f6a7574528a3548c8546cd06a SHA512 7f258175bc790a329ab8ebe5e9723c1b77d07492c78614fd394bda06062bc7d23f56fe7927ff1ae1c31da686efa2aef4fcb0330f2a17c7803445861a6793b984
-EBUILD commons-lang-3.6.ebuild 953 BLAKE2B 133a34d3bcaf126e47bc77bb4c576d8694fcc3280879557de4cd2191b921728b768ae1929a10ee48a8c42e9e7bc562c0984a0ab59f0a1c752718b029d3e20948 SHA512 ebfa6e7974747646c039afce008bde32b571146f7d710952d8c7e845a0fe77310e097c4c81985e034738570e43aee1ddef921a175097b2f9a68b29f48ad6e8c2
+EBUILD commons-lang-3.11-r1.ebuild 996 BLAKE2B 4d54b5a13578969627f1171a6e64ed6dd573250ad03bbbbdc601b3abc833b8634efc2aba5d50ff2ce9aaf29f0e767ecd0b81fae4fa4d9cd46fb7170f27e15133 SHA512 a67800e8302e5a413cae003d3c3d1bdb1db3ab28b41b250b1e842c43d7f478caf37f158cb5454366cdc0fb51913351da94ef131c060706de417069c9ac0921a2
+EBUILD commons-lang-3.12.0.ebuild 1040 BLAKE2B 776631cfa442dfe17533e1d65ac9b816837fd3bb6a5f19b82a61aa27c9349d52b90184fde0aa7241dd170fd04a3be0abac4e7cdbdde8dc1533f842c199b85514 SHA512 f1f56b70a2aad5f6f17723ffd0d04c70bdd4bb5b07eb682689d54442162ccc72908b52a3dddf4f7fe0d18d4d470d795fdf4432dae9d702734a967a6636f24ecc
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
index 9e6ffed902c1..ce82157c1ae7 100644
--- a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
+
 JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-lang:commons-lang:2.6"
 
 inherit java-pkg-2 java-ant-2
 
diff --git a/dev-java/commons-lang/commons-lang-3.11.ebuild b/dev-java/commons-lang/commons-lang-3.11-r1.ebuild
index e589a3f8da69..bb2399c94a7a 100644
--- a/dev-java/commons-lang/commons-lang-3.11.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.11-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.commons:commons-lang3:3.11"
 
 inherit java-pkg-2 java-pkg-simple
 
@@ -13,8 +14,8 @@ DESCRIPTION="Commons components to manipulate core java classes"
 HOMEPAGE="https://commons.apache.org/lang"
 SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
-SLOT="3.11"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+SLOT="3.6"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 CDEPEND="
 	dev-java/easymock:3.2
diff --git a/dev-java/commons-lang/commons-lang-3.12.0.ebuild b/dev-java/commons-lang/commons-lang-3.12.0.ebuild
new file mode 100644
index 000000000000..a3ff872376f8
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-3.12.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://mirror.checkdomain.de/apache//commons/lang/source/commons-lang3-3.12.0-src.tar.gz --slot 3.6 --keywords "~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" --ebuild commons-lang-3.12.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.commons:commons-lang3:3.12.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Commons components to manipulate core java classes"
+HOMEPAGE="https://commons.apache.org/proper/commons-lang/"
+SRC_URI="mirror://apache/commons/lang/source/${PN}3-${PV}-src.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="3.6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${PN}3-${PV}-src"
+
+JAVA_ENCODING="ISO-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/commons-lang/commons-lang-3.3.2.ebuild b/dev-java/commons-lang/commons-lang-3.3.2.ebuild
deleted file mode 100644
index 477194ec9605..000000000000
--- a/dev-java/commons-lang/commons-lang-3.3.2.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 source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}3-${PV}"
-
-DESCRIPTION="Commons components to manipulate core java classes"
-HOMEPAGE="http://commons.apache.org/lang/"
-SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz"
-
-DEPEND=">=virtual/jdk-1.6
-	!ppc? (
-		!ppc64? (
-			test? (
-				dev-java/ant-junit4
-				dev-java/commons-io:1
-				dev-java/easymock:3.2
-			)
-		)
-	)"
-
-RDEPEND=">=virtual/jre-1.6"
-
-LICENSE="Apache-2.0"
-SLOT="3.3"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-RESTRICT+=" ppc? ( test ) ppc64? ( test )"
-
-S="${WORKDIR}/${MY_P}-src"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2,commons-io-1,junit-4"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_install() {
-	java-pkg_newjar target/${MY_P}.jar ${PN}.jar
-
-	dodoc RELEASE-NOTES.txt NOTICE.txt
-
-	use doc && java-pkg_dojavadoc target/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
-
-src_test() {
-	LC_ALL=C java-pkg-2_src_test
-}
diff --git a/dev-java/commons-lang/commons-lang-3.4.ebuild b/dev-java/commons-lang/commons-lang-3.4.ebuild
deleted file mode 100644
index 9a70bac5f9a7..000000000000
--- a/dev-java/commons-lang/commons-lang-3.4.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 source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}3-${PV}"
-
-DESCRIPTION="Commons components to manipulate core java classes"
-HOMEPAGE="http://commons.apache.org/lang/"
-SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz"
-
-DEPEND=">=virtual/jdk-1.6
-	!ppc? (
-		!ppc64? (
-			test? (
-				dev-java/ant-junit4
-				dev-java/commons-io:1
-				dev-java/easymock:3.2
-			)
-		)
-	)"
-
-RDEPEND=">=virtual/jre-1.6"
-
-LICENSE="Apache-2.0"
-SLOT="3.4"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-RESTRICT+=" ppc? ( test ) ppc64? ( test )"
-
-S="${WORKDIR}/${MY_P}-src"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2,commons-io-1,junit-4"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_install() {
-	java-pkg_newjar target/${MY_P}.jar ${PN}.jar
-
-	dodoc RELEASE-NOTES.txt NOTICE.txt
-
-	use doc && java-pkg_dojavadoc target/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
-
-src_test() {
-	LC_ALL=C java-pkg-2_src_test
-}
diff --git a/dev-java/commons-lang/commons-lang-3.6.ebuild b/dev-java/commons-lang/commons-lang-3.6.ebuild
deleted file mode 100644
index 0cade53ae7f2..000000000000
--- a/dev-java/commons-lang/commons-lang-3.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}3-${PV}"
-
-DESCRIPTION="Commons components to manipulate core java classes"
-HOMEPAGE="http://commons.apache.org/lang"
-SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="3.6"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-
-CDEPEND="
-	dev-java/easymock:3.2
-	dev-java/commons-io:1"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}-src"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-JAVA_GENTOO_CLASSPATH="
-	easymock-3.2
-	commons-io-1"
-
-DOCS=( CONTRIBUTING.md NOTICE.txt RELEASE-NOTES.txt LICENSE.txt README.md )
-
-src_prepare() {
-	default
-	rm -rv src/test || die
-}
-
-src_install() {
-	einstalldocs
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index c831e394f32a..9875d68781f8 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -2,5 +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-r1.ebuild 2200 BLAKE2B 00edbc2be3dbf082669f84234fb6e198f6f0209e3b668e227294e25632eafafdc242fce9b56d6cde269bfa2bab3e9110ee5d5d8dd99d268ad11257e144cfd095 SHA512 e3501a786040b5db5d6b323edfc80e8bfab2b9347a8dd3303fe874ad4f05e62ce7f27e723aeec8f25dedf7e5525a6cabd1f43f6169f0efe58b8366c917121e4b
-EBUILD commons-logging-1.2-r2.ebuild 2305 BLAKE2B 9d8e30b92dfec19347cc8e35aee59b1534485b9d2ade447a2e117b1b932e295454e7cf386afcf56944843af95de19761f4dadf33b92bc108423c87feb8ebb593 SHA512 4e6a834f0230fe4ae5e21228a0fb80b86dddf2806b8b26eb891e10fe3462cc9c30c24de3f27d8c7feb9523293e240b99b98b6e3a6ba3c2a212b6eba7cfc3dd9d
+EBUILD commons-logging-1.2-r3.ebuild 2355 BLAKE2B f7a302e42b8acc956240e2b5775586fd6deda25239483b9ef88ff595bed7fe9dbaee14239a3a7b696f8723285aa078916813121e886f319bec8cdd3256ef1946 SHA512 4513dce22a7665c5d3f93fcbead5d5ece436dea6cb85bbd6b1751dd8db4613c9010a186ca5471777cc9c3e253442b411d0363c822797674f41fbeda5c48e820a
 MISC metadata.xml 551 BLAKE2B c48c3681129ce8ab7a497385bc3bed8a16ca0f5f4557ebda30565db471b25fea1b6c48ad43a470cf27930a0b2dc3a282242600aee3f60eff66291e6d0c80491f SHA512 1ea71763a6890b1f01fb357a7427b99bcb4918eb87290997e61918808daea37dab371b7fd5b6fee114104b2ee4445e022c0f090a2a58017a3d8b755f8dfcd5bd
diff --git a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
index e36cb359aada..bc6d4e26fd4f 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="commons-logging:commons-logging:1.2"
 
 inherit java-pkg-2 java-ant-2 java-osgi
 
@@ -18,18 +19,18 @@ IUSE="avalon-framework avalon-logkit log4j servletapi test"
 RESTRICT="!test? ( test ) !servletapi? ( test )"
 
 CDEPEND="
-	log4j? ( dev-java/log4j:0 )
-	servletapi? ( java-virtuals/servlet-api:3.1 )
 	avalon-logkit? ( dev-java/avalon-logkit:2.0 )
-	avalon-framework? ( dev-java/avalon-framework:4.2 )"
+	avalon-framework? ( dev-java/avalon-framework:4.2 )
+	log4j? ( dev-java/log4j:0 )
+	servletapi? ( dev-java/tomcat-servlet-api:4.0 )"
 
 RDEPEND="
 	${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8:*"
 
 DEPEND="
 	${CDEPEND}
-	>=virtual/jdk-1.6
+	>=virtual/jdk-1.8:*
 	test? ( dev-java/ant-junit:0 )"
 
 S="${WORKDIR}/${P}-src"
@@ -61,7 +62,7 @@ src_prepare() {
 	fi
 
 	if use servletapi; then
-		echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties || die
+		echo "servletapi.jar=$(java-pkg_getjar tomcat-servlet-api-4.0 servlet-api.jar)" >> build.properties || die
 	fi
 }
 
diff --git a/dev-java/commons-math/Manifest b/dev-java/commons-math/Manifest
index 987dea34fe94..dd0d2c65be0d 100644
--- a/dev-java/commons-math/Manifest
+++ b/dev-java/commons-math/Manifest
@@ -1,9 +1,3 @@
-AUX commons-math-2.1-r2-buildfixes.patch 770 BLAKE2B 99782f38b6efdfa94b0b69390bc04d487ef20698fe1bea456c8919ea88a635d009b10c8d27e7124f0e4f0bb9a1c97110a959421cbd4f6aee70ebb9f5821bb812 SHA512 75a0174c839425a7f1387ef582a08899b7433dcc2090d773642ea120dc220c69d741fef5b44508ad9fdb3e2f24d8fe2b9dfc92146985f88416dae8178a5d7798
-AUX commons-math-3.2-build.xml 12448 BLAKE2B 04021b793945a00a95152ef98772dfb5735cce14307d33772701a6240a8d5a094b2156faf4fc775454c0c369df066f9404a0d5a5671f809647ae1e5389648ec4 SHA512 7f7d4a469843b218e90e3482360101058f027cf7d2319f1f7a5a4af7c09b6e4b05237c594eb217d5ffc3f07793fcabaa733be52686148af94a12727e4fda89ed
-DIST commons-math-2.1-src.tar.gz 1099423 BLAKE2B 83c52abc10eebb6c749aec218aa435df4cd05106e6bcbead5061df7381d168aa9392ab70dce8eb0b8e254d6d95a372cacddc8f7714198a186a95a04a394bda9d SHA512 53ed8c0400402c588d824c15365ebe60bef41697ff9728270a9fdc3ac30eb60c4c397caf939ccda839eb701453d98af4eac9eae2090575fcfdee4df2d6f6045b
-DIST commons-math3-3.2-src.tar.gz 2602474 BLAKE2B a818ca5ab1b9799359bad1c84d2774329c7c2605aeea3e13769eed9f1578d412555ad90a8de68971daa42b270d4bcd5fbf0fe79714e839d41b08077e32633125 SHA512 132c4725be582e25f67a955c7b3b8c7ef155606d8f4da07770464c422ded6b5e6efd1a13a6e98cff222f4fcac73606d512ee1ab9e3b1c4befcc1ba16ab68787b
 DIST commons-math3-3.6.1.jar 2514690 BLAKE2B ce5dc1a5bdccf85aa780dd648b64c0ed78b4d5a36d15d9737f661135f4f1ec962c3c44a0c4d8fc7d12c667e62b19860cb2a47f507c8c3e6da6cce57e1b9caf54 SHA512 eab6003834c0f1b7e67eee242d33db43f85d388ac32e37caa6bd16d74340db5c189ff5c7fd112ef13b9009d2fbcf2bad6650b6e5d9124316b59493b2d07d065d
-EBUILD commons-math-2.1-r2.ebuild 903 BLAKE2B 2b390b4109fd875bc79f957b2fc22a0e3ce1536476ed331bd57e32d1e90417200002f14045cd7af145f0a1a172e23773531682ac427f0a20e905cb10b8ae305f SHA512 aacd02d27d30d7f27c5bb35cad318b21a4235b0264282527244d892f509e3e0032eaf5407bfbab9b6c4f548c7e9efcbe68629bf0502899c1e9c6d32fb8ad9a4e
-EBUILD commons-math-3.2.ebuild 1331 BLAKE2B 455f0a53dbbea8b5d7ca7d5ee16920489381495edd5e830c542bac42997a59c0affcc47daebbd6a2777c3f7d2ff0e7d45f79f8565f375b1118fd36cc442c8832 SHA512 447a793d84a98442e647a1e77cdc06bf6b69de8a337aaa40fa3fbe713f031686cba4ff3a21c5500346a29072976ff77d209f09f7057324727ac97818f43af8aa
-EBUILD commons-math-3.6.1.ebuild 679 BLAKE2B b6d558f2fe0edbc77485c91373f19efbae1376be998784465af3f3af34c00ad8dee37bae75469667b3231694dc643c9777aed596331d65c5817718b47ac6ba36 SHA512 932b097cb351466fbe4d5b9e25154ae8bb889a88477e5e93194a0895ae46bd3f42301a501954db5756a7f5a059df2f93c2a23f6e8003b2719b3c902a62887e17
+EBUILD commons-math-3.6.1-r1.ebuild 738 BLAKE2B 91836d98a7bdec31cc38f27520014510532db67e56d8824cad0dc3ee8df3db6d879776e31076255d2bdb4707dca61e37a073d0612fe2b61113ab63ea2e7daf84 SHA512 458aa4fc88756016a6e52d534cea586336ad4df2c47f5a41dab41dfd792a5b9bf5dd804c70222dcf4ea4ca024fbaf4595eb1ad76ee4764ff1178e09e0187dd77
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/commons-math/commons-math-2.1-r2.ebuild b/dev-java/commons-math/commons-math-2.1-r2.ebuild
deleted file mode 100644
index b18fc803124f..000000000000
--- a/dev-java/commons-math/commons-math-2.1-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc test source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Lightweight, self-contained mathematics and statistics components"
-HOMEPAGE="https://commons.apache.org/math/"
-SRC_URI="mirror://apache/commons/math/source/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/ant-junit4
-		dev-java/hamcrest-core:0
-	)"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}-src"
-
-PATCHES=( "${FILESDIR}"/${PF}-buildfixes.patch )
-
-src_test() {
-	java-pkg_jar-from junit-4
-	java-pkg_jar-from hamcrest-core
-	ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/apidocs
-	use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/commons-math/commons-math-3.2.ebuild b/dev-java/commons-math/commons-math-3.2.ebuild
deleted file mode 100644
index 0fcdf307223b..000000000000
--- a/dev-java/commons-math/commons-math-3.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# Tests are currently broken due to nasty -lib argument.
-JAVA_PKG_IUSE="doc source" # test
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-MY_PN="${PN}3"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Lightweight, self-contained mathematics and statistics components"
-HOMEPAGE="https://commons.apache.org/math/"
-SRC_URI="https://archive.apache.org/dist/commons/math/source/${MY_P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=virtual/jdk-1.5"
-
-# Tests are currently broken due to nasty -lib argument.
-# test? (
-# 	dev-java/ant-junit4
-# 	dev-java/hamcrest-core:0
-# )"
-
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${MY_P}-src"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-
-	sed -i 's/manifest=".*MANIFEST.MF"//g' build.xml || die
-	sed -i '/name="Main-Class"/d' build.xml || die
-}
-
-# Tests are currently broken due to nasty -lib argument.
-# src_test() {
-# 	java-pkg_jar-from junit-4
-# 	java-pkg_jar-from hamcrest-core
-# 	ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar test
-# }
-
-src_install() {
-	java-osgi_newjar target/${MY_P}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/commons-math/commons-math-3.6.1.ebuild b/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
index 71c61da8a32a..676842894be4 100644
--- a/dev-java/commons-math/commons-math-3.6.1.ebuild
+++ b/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc examples source"
+MAVEN_ID="org.apache.commons:commons-math3:3.6.1"
 
 inherit java-pkg-2 java-pkg-simple
 
@@ -15,9 +16,9 @@ HOMEPAGE="https://commons.apache.org/math/"
 SRC_URI="https://repo1.maven.org/maven2/org/apache/commons/${MY_PN}/${PV}/${MY_P}-sources.jar
 -> ${MY_P}.jar"
 
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="3"
+KEYWORDS="amd64 ~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-math/files/commons-math-2.1-r2-buildfixes.patch b/dev-java/commons-math/files/commons-math-2.1-r2-buildfixes.patch
deleted file mode 100644
index 6d768969e79c..000000000000
--- a/dev-java/commons-math/files/commons-math-2.1-r2-buildfixes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- build.xml	2010-10-24 11:20:46.000000000 +0300
-+++ build.xml.fixed	2010-10-24 11:25:42.000000000 +0300
-@@ -114,6 +114,7 @@
-     <pathelement location="${build.home}/classes"/>
-     <pathelement location="${build.home}/test-classes"/>
-     <pathelement location="${junit.jar}"/>
-+    <pathelement location="hamcrest-core.jar"/>
-     <path refid="downloaded.lib.classpath"/>
-   </path>
- 
-@@ -232,7 +233,7 @@
- 
- <!-- ========== Create Jar ================================================ -->
- 
--  <target name="jar" depends="test" description="Create jar file">
-+  <target name="jar" depends="compile" description="Create jar file">
- 
-     <mkdir dir="${build.home}/classes/META-INF"/>
-     <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
diff --git a/dev-java/commons-math/files/commons-math-3.2-build.xml b/dev-java/commons-math/files/commons-math-3.2-build.xml
deleted file mode 100644
index 905d12657e26..000000000000
--- a/dev-java/commons-math/files/commons-math-3.2-build.xml
+++ /dev/null
@@ -1,288 +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/29/13 1:59 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="commons-math3-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-math3-3.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.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"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath"/>
-  <path id="build.test.classpath">
-    <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"/>
-  </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.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"/>
-    <copy todir="${maven.build.outputDir}/META-INF">
-      <fileset dir="${maven.build.resourceDir.1}">
-        <include name="NOTICE.txt"/>
-        <include name="LICENSE.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.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>
-    <mkdir dir="${maven.build.testOutputDir}/META-INF"/>
-    <copy todir="${maven.build.testOutputDir}/META-INF">
-      <fileset dir="${maven.build.testResourceDir.1}">
-        <include name="NOTICE.txt"/>
-        <include name="LICENSE.txt"/>
-      </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="**/*TestBinary.java"/>
-          <include name="**/*TestPermutations.java"/>
-          <exclude name="**/*AbstractTest.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*AbstractTest.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="UTF-8" 
-             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" 
-             docencoding="UTF-8" 
-             source="1.5" 
-             linksource="true" 
-             breakiterator="false">
-      <link href="http://download.oracle.com/javase/6/docs/api/"/>
-      <link href="http://download.oracle.com/javaee/6/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" 
-         manifest="/var/tmp/portage/dev-java/commons-math-3.2/work/commons-math3-3.2-src/target/osgi/MANIFEST.MF" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-      <manifest>
-        <attribute name="Main-Class"/>
-      </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>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.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="http://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="http://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"/>
-  </target>
-
-</project>
diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest
index 14074172a8e0..329407bd7131 100644
--- a/dev-java/commons-net/Manifest
+++ b/dev-java/commons-net/Manifest
@@ -1,6 +1,3 @@
-AUX commons-net-3.2-build.xml 12390 BLAKE2B 849ddf4c6525fdb7e7d8a753c5c0e854471c7f6b257bdc506d89be0dd81bc5c02f69c75e23051e283e74a2e66ac07c77a3432899e3de4e30dc93566a85eed554 SHA512 e4784b083ce86b5a22d5bfba0b0d71d811abf55f8375b9982f5ac1b11bb93f4be15ec0ff4bcb8cac58681a68a03cd6b598c998251097e9bf634674712887bdbe
-DIST commons-net-3.2-src.tar.gz 378351 BLAKE2B f40ad73ef7d9865cdbe9da94a458f0c9ce636b0b71dcab3b48b52716aa141de3215581b75b9283d4d918ad0dbbd2761c9b0d9eee1703a2bbc545718c129511d5 SHA512 2152b0c524320702c336b21308bb8166e00487938430b83e08d65b836ab775c372c9251957c674e0bccff6815fc3ed3bdb7113a0d2a140c53f64c2f557eef2ba
-DIST commons-net-3.6.jar 435798 BLAKE2B a8c28909715d76469ad4760ece6f7b3515c56badf8ce19fcadb5b776e0cf341b3f970689a22267d19f22dc12fc8d5e2a071347df1850f290231747d0712263b7 SHA512 50006ebef259c9d4f514bfd4e6b4578f8867e2a105edfcf30542a039e385a02e9c48dfeee0b287c39c375e1418817290713f7d0792b357267723a977a07062c5
-EBUILD commons-net-3.2.ebuild 1246 BLAKE2B e6e296e93a81094787aaee0f2077a74e5173fb788665603c6905b8b1ed44a23e2a359015242d4022c2bf883cb8c50ece48bd949bddb4a054399eb00ef18fdb67 SHA512 00de691849af50b8a1896f8aaae945d4da794ff9152aeb2cbd319feb232d09c1dd865884108ef37cf21de093c6035a622929b3b501329e5e404fe124cbf06b37
-EBUILD commons-net-3.6.ebuild 639 BLAKE2B 1dd80ef5a2cdc10cdede682f20e11c1a3d67feae3f3f277283a0f2a50f7761935cbed79bdb3427b58f8ad8831ce24cd4579a7fd66ecc60398f90defde4ff3537 SHA512 8fe13f3c880a47fa91174f961e88a1032ff8d34d0e3cfa7907077e7c0877c2576a23aed9705106f3528a7aec302153e80248639d4ec06eaab8255b032b9c96ad
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
+DIST commons-net-3.8.0.jar 437325 BLAKE2B 92bdbf2f95cc54f6a791a9de0a56878fe12b6d956d47a4116ae21df35f3dcc4d7b10f5c03c081fc7012a06416f5f9f6555060784bfe22ec9c8d70b17ee7ea215 SHA512 a16ed8c2966541cc052fe963338efcc6f9c42ccd6fefe246547e66d9f46c35cf42bc6d13cb983a1829a378ebd7a676bcb812acbc3aa0ed30e6fa206748dae620
+EBUILD commons-net-3.8.0.ebuild 640 BLAKE2B 9551309c89010c570a6d939d2824cc3623dda84c1ad57304f26219eccb18bac37433126dd46ed7cf33f971b73f7f37b114be03235d406caa939f9ec8cd93a6d2 SHA512 b66c31e251eb3f31ccca4893e30d941404fe5533d226d4e09bd78524c719e6711c0d9f583389635fd125335e3cd487805aca1cef683869a2b9e27a9eb1fc4c45
+MISC metadata.xml 392 BLAKE2B 5184f6b35e6a5c41d2884bd65390eabb564e88fbecf7128a3b21537b3c7401668e1261a1e3e1242ab77342921047bf371118bd81c8a40e63b8f858397b4f62b7 SHA512 e730f0350bc987d01f037bdd03bc9ce83e1c4040ee8a7c28306a5fa736c319f4650c2c83d0f7729fa6fd7439d26d5ec9913f13548864a89d5155c14aa227f864
diff --git a/dev-java/commons-net/commons-net-3.2.ebuild b/dev-java/commons-net/commons-net-3.2.ebuild
deleted file mode 100644
index 84c210c9adf3..000000000000
--- a/dev-java/commons-net/commons-net-3.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# http://issues.apache.org/bugzilla/show_bug.cgi?id=37985
-RESTRICT="test"
-JAVA_PKG_IUSE="doc examples source" # test
-
-inherit eutils java-pkg-2 java-ant-2 java-osgi
-
-MY_P="${P}-src"
-
-DESCRIPTION="Java library emulating the client side of many basic Internet protocols"
-HOMEPAGE="http://commons.apache.org/net/"
-SRC_URI="mirror://apache/commons/net/source/${MY_P}.tar.gz"
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-	sed -i 's/depends="compile,test"/depends="compile"/' build.xml || die "Failed to disable junit"
-	sed -i 's/manifest=".*MANIFEST.MF"//g' build.xml || die
-	sed -i '/name="Main-Class"/d' build.xml || die
-}
-
-src_install() {
-	java-osgi_newjar target/${P}.jar ${P} ${P} "Export-Package: ${P}"
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use examples && java-pkg_doexamples src/main/java/examples
-	use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/commons-net/commons-net-3.6.ebuild b/dev-java/commons-net/commons-net-3.8.0.ebuild
index 50471f703f01..73e3ed4a5df3 100644
--- a/dev-java/commons-net/commons-net-3.6.ebuild
+++ b/dev-java/commons-net/commons-net-3.8.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc examples source"
 
@@ -13,9 +13,9 @@ DESCRIPTION="Client-oriented Java library to implement many Internet protocols"
 HOMEPAGE="https://commons.apache.org/net/"
 SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
 
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-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"
diff --git a/dev-java/commons-net/files/commons-net-3.2-build.xml b/dev-java/commons-net/files/commons-net-3.2-build.xml
deleted file mode 100644
index 72cdd404df11..000000000000
--- a/dev-java/commons-net/files/commons-net-3.2-build.xml
+++ /dev/null
@@ -1,285 +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/29/13 3:17 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="commons-net-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-net-3.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.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"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath"/>
-  <path id="build.test.classpath">
-    <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"/>
-  </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.1}">
-        <include name="NOTICE.txt"/>
-        <include name="LICENSE.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="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"/>
-    <copy todir="${maven.build.testOutputDir}/META-INF">
-      <fileset dir="${maven.build.testResourceDir.1}">
-        <include name="NOTICE.txt"/>
-        <include name="LICENSE.txt"/>
-      </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="**/*FunctionalTest.java"/>
-          <exclude name="**/*POP3*.java"/>
-          <exclude name="**/TestSetupParameters.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*FunctionalTest.java"/>
-          <exclude name="**/*POP3*.java"/>
-          <exclude name="**/TestSetupParameters.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://download.oracle.com/javase/1.5.0/docs/api/"/>
-      <link href="http://download.oracle.com/javaee/6/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" 
-         manifest="/var/tmp/portage/dev-java/commons-net-3.2/work/commons-net-3.2-src/target/osgi/MANIFEST.MF" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-      <manifest>
-        <attribute name="Main-Class"/>
-      </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>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.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="http://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="http://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"/>
-  </target>
-
-</project>
diff --git a/dev-java/commons-net/metadata.xml b/dev-java/commons-net/metadata.xml
index 2444066aa02b..747a23fe8dfc 100644
--- a/dev-java/commons-net/metadata.xml
+++ b/dev-java/commons-net/metadata.xml
@@ -1,8 +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>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">apache/commons-net</remote-id>
+		<bugs-to>https://issues.apache.org/jira/projects/NET/issues/</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/commons-pool/Manifest b/dev-java/commons-pool/Manifest
index a339cb8ee8ec..6b6522f49afc 100644
--- a/dev-java/commons-pool/Manifest
+++ b/dev-java/commons-pool/Manifest
@@ -1,5 +1,5 @@
 DIST commons-pool-1.6-src.tar.gz 321409 BLAKE2B 2ed2bc6d7478217fde271bcc64feefae06aa7f946068e7fa3b2ae055e7c788b2431ba20ce202a2cc879c22d32d6d69cdcc4f8dca6794dc4588b11cda4f665934 SHA512 357dd4b1cab8fccb4116add2bee74036c19cf6102946a1e304dcd3049d3d93f1e405f85349e511a4cc71d0d91382696f97997c9e4014303822b386ac7fbfec93
 DIST commons-pool2-2.2-src.tar.gz 163682 BLAKE2B b9a84b1387cd00eb46cc94726ae3295a73f2f47b824401aca525296eddbf04b6c978a4808014bf7e93c113014e0e2fb0db39d6b9ddb9c651bb385cecd05584a5 SHA512 a9c1a30f497f4a6c28b8b4b82d3b2f801b464fc329d1da4f5087dcd6b923c45bde9ac6f3dc9939025453462f9dfea9fff637db9b4334ed513770a546b4807256
-EBUILD commons-pool-1.6.ebuild 884 BLAKE2B 7751363b2533447a5d9e55034447e8155d7de59dfba492ebf4644273e1edf7f71cd995a37259034a74580486c606a2030bf738460682bc9082452191302f4b1a SHA512 ecc866b7e0761f61354100f4ad11cf93db87832e80e24d55a049fce31396378d9f405f757f0af79d9b9ae3bd336184ddf8e78be42a3402bb13526b1d4af31d3c
-EBUILD commons-pool-2.2.ebuild 1078 BLAKE2B af248d689fc3ed0cbbf84c9bf9650e4aad57e9eae2c67a42cbead532b4be03102e78db9f5305bf894e03e0b7b972ee53467fa009397f6a20fe75bc5684a374be SHA512 3abb6a3aadc14883a683454eade278c3b04cdc0270b52b0e7c798ffb08098792cb771d8d9b072478e0350f837e2fe2178f58779b9fd8808e6ab597341f8bb1b5
+EBUILD commons-pool-1.6.ebuild 874 BLAKE2B 7f513c1f2526330f6c1e6f886c505d89e7179cdcfd1f9d67d884ac954badb217c27a49648210ea889da950560f5dbf58692a9029bdc45b7b13354dccbacc451c SHA512 66da5c550ae3c669c3ca5146f79b58f99f4ddd258d03827ff2c10a61c5dd8f23cd3587c17c18a6d46f7e792ff4fcbc10cf47583b2ed38a5503b79b9f314ec3a2
+EBUILD commons-pool-2.2.ebuild 1082 BLAKE2B 467590a33e977f283beaa9712c661a1be2330184bfcfadd21b400568ecd87f3017801189bc8e0cfddb1ad977633d103512ac6e0aa7496ec271727e8ef58355d5 SHA512 2cddcf9f36c29894531c5d12c8fdd14441bf6da00289418b8b800138037f79eaea043478dee98b4c4dc73bffe09e273b1e1560487e33523eaaa3f0e49d34af1d
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-pool/commons-pool-1.6.ebuild b/dev-java/commons-pool/commons-pool-1.6.ebuild
index 64c331273099..ad7179cfd030 100644
--- a/dev-java/commons-pool/commons-pool-1.6.ebuild
+++ b/dev-java/commons-pool/commons-pool-1.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Provides general purpose object pooling API"
 HOMEPAGE="http://commons.apache.org/pool/"
diff --git a/dev-java/commons-pool/commons-pool-2.2.ebuild b/dev-java/commons-pool/commons-pool-2.2.ebuild
index f494ecaeddc9..1ab8287ac992 100644
--- a/dev-java/commons-pool/commons-pool-2.2.ebuild
+++ b/dev-java/commons-pool/commons-pool-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/commons/pool/source/${MY_P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 COMMON_DEP="dev-java/cglib:3
 	dev-java/asm:4"
diff --git a/dev-java/commons-text/Manifest b/dev-java/commons-text/Manifest
new file mode 100644
index 000000000000..4fe59d86d494
--- /dev/null
+++ b/dev-java/commons-text/Manifest
@@ -0,0 +1,3 @@
+DIST commons-text-1.9-sources.tar.gz 312764 BLAKE2B 44b628c418a910ff38b5a1fb3b4c9f14a1f9818afd12540f8c8cf8b1a99fd7abd365e704142bcec901e5e067b303ff44f9c992f8714eae68b94819780a270dd2 SHA512 53f993e79aaa6789d3388aa96b6b2a14cf646b27ff3774524390e511241a85288947cc929519eff61a8734578f25bdf3d9969d84da20c1a749b19d90a55da8ae
+EBUILD commons-text-1.9.ebuild 1139 BLAKE2B 0d2c35fdac869d03e9229af35cc554366e2d7f98ebb1e6fa83be8b031e1f47b119356874370a1aa7847ccc0b37bc5fe72eefe0012b48cbfb2964a66c31813b31 SHA512 aad8149870ddb4907710580babee7a27a609d335c41753404619beb7bd199dbf00f7d942bcc69ea1598d50074abeab1acdfc7909f96a0c09d9d7e0061f55658c
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/commons-text/commons-text-1.9.ebuild b/dev-java/commons-text/commons-text-1.9.ebuild
new file mode 100644
index 000000000000..8671f21cf484
--- /dev/null
+++ b/dev-java/commons-text/commons-text-1.9.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://downloads.apache.org//commons/text/source/commons-text-1.9-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild commons-text-1.9.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.commons:commons-text:1.9"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Commons Text is a library focused on algorithms working on strings."
+HOMEPAGE="https://commons.apache.org/proper/commons-text"
+SRC_URI="https://downloads.apache.org//commons/text/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# org.apache.commons:commons-lang3:3.11 -> >=dev-java/commons-lang-3.11:3.6
+
+CDEPEND="
+	>=dev-java/commons-lang-3.11:3.6
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ENCODING="ISO-8859-1"
+
+JAVA_GENTOO_CLASSPATH="commons-lang-3.6"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/commons-text/metadata.xml b/dev-java/commons-text/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/commons-text/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/core-specs-alpha/Manifest b/dev-java/core-specs-alpha/Manifest
index 0effab637858..34dd047d9638 100644
--- a/dev-java/core-specs-alpha/Manifest
+++ b/dev-java/core-specs-alpha/Manifest
@@ -1,6 +1,8 @@
 AUX build.xml 1403 BLAKE2B ed4b7cb7f98192fb467df4353c17d5c61f84598f36cbab35b9310970c861505ba2b5fc1e1b3c717996b220c89feac22576e9df1cfac4b45336751564363cbc1c SHA512 c9973b2c0a24ce089b6f4be8c5e8d89664b5dba8d5810c54253b47e4efe7fef3bb2c8c10f3e4f8c988b33ddb538c6617a23fb55b41517ba8b06496d8f168bfba
 DIST core-specs-alpha-0.1.24.tar.gz 9896 BLAKE2B cb06053d2aa77b4bbd58b612fb0f80137833e156a5136e4f53f6123d158bdbe676e9bacdfe76728b1320986589e8242c52f49a4d8922bda5374e34fe52969ddc SHA512 6ddf20bf9be36f7493104f69f4e9402fc62f49005471a967843c7cfee898c67aaf5046886db73e6b54942538beed9556d83f4582e85fd02ef4cb755cb5a18d34
 DIST core-specs-alpha-0.2.44.tar.gz 10163 BLAKE2B c81ebb08779c3db137363ffb12bc7e26d29cd67323c98430a033f639714da83bf8c9d14146c12d925094e057d3735d100e33656e9571a0a4c107dc9fb56359e9 SHA512 1a59b947c580e45a280b25d5827a174565e066dde577685ca86aa1bbd9767716991cefb8a944c7ded0f84a71f9902f7fcdb5baacc7e19180096d599a51083048
+DIST core-specs-alpha-0.2.56.tar.gz 11780 BLAKE2B 088d0b32dea7ec49ddaf0f461703762a5a877ff4028b775eb35998e6a5a3436ad57b35d7d9431b6911ca2304403e95043d375bac80080ecaf6144a77b3ebcf4c SHA512 afbfc04b9708a21ae6c6b29b8653fc62b23efcb271b973534c4b8421a7d73df3ad24bd28d7115a2fe926954dc45571de86971637736f3a494799f6f1ba1765c8
 EBUILD core-specs-alpha-0.1.24.ebuild 884 BLAKE2B 70d8e88cedeb0a133411990f3849b479f24896f644ab5620fe3c3377b793cc6c553177fb6386eed57becfd0876557eea2c512bb0be837e635e24f214cfb9c2ca SHA512 7a93646083f75faedb51925814ad00463348424d704fefc8eee4f780199e8a363b8e343421cc62439d0e4744f03418c65b59495a87a1560dd1590f0b99d9e06d
 EBUILD core-specs-alpha-0.2.44.ebuild 884 BLAKE2B eecf5279ed83fde8cf61cf672f017bfdb38ad4ca58a18eb56b1e550417271ee0b9dac6da589c7769d78fc3768b30e70b62e9663bbfb1f9d7ded797332087ad9a SHA512 d4628a9171862783508b7e7d522db649af73724234ece129e851d14bacee696c5c348f95a76860f4483119403c6a0a7a441677fc016ad8354b6a4b4afc8e33f5
+EBUILD core-specs-alpha-0.2.56.ebuild 977 BLAKE2B 583984b0c05b35f825de6a1d60a0f3753f2d820184d0b0031678665f8e134e4df5518ad9a34cc30928f28675cfe9484215d54a28c5be717d1a420e66da6b98a2 SHA512 bbe9210bfe14e19c4b3d4b4a7a9a5adf0634606e3b9f10925ae781ab668ca925ce71067224b9471e439d1a68399037fa3387c1ad2b60c4599d8e42d502af071f
 MISC metadata.xml 481 BLAKE2B 5077630f26ed6daf5fa01d4a256b14428ed0b7b0fffd264fd4120709bb6d671c332d767326fe38016a8de89f23d166508927a98eddc907baf4f72ba13b43f6e5 SHA512 b833cd62bf3d25bb9140e0619218e68ac35d9ec6667d73a14ea01e738d746afd587e83633e713bd7fe808b177a50e795ce7bc30a1e215c6cce9d3656161a4fab
diff --git a/dev-java/core-specs-alpha/core-specs-alpha-0.2.56.ebuild b/dev-java/core-specs-alpha/core-specs-alpha-0.2.56.ebuild
new file mode 100644
index 000000000000..64ba20033302
--- /dev/null
+++ b/dev-java/core-specs-alpha/core-specs-alpha-0.2.56.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 java-ant-2
+
+EGIT_REF="053d789"
+
+MY_PN=core.specs.alpha
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A Clojure library with specs to describe Clojure core macros and functions"
+HOMEPAGE="https://clojure.org/ https://github.com/clojure/core.specs.alpha"
+SRC_URI="https://github.com/clojure/core.specs.alpha/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0.2"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DEPEND="
+	dev-java/ant-core:0
+	>=virtual/jdk-1.8:*
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+DOCS=( CONTRIBUTING.md LICENSE README.md )
+
+EANT_TASKS="jar"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${MY_P}"
+
+src_prepare() {
+	default
+	rm -r CHANGES.md epl-v10.html || die # epl-10.html is the LICENSE in html format
+	cp "${FILESDIR}/build.xml" . || die
+}
+
+src_install() {
+	java-pkg_newjar "target/${MY_P}.jar"
+	einstalldocs
+}
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index bb9d9c2d504d..f73aba114cbc 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -1,4 +1,5 @@
 DIST dom4j-1.6.1-java5.patch.bz2 2900 BLAKE2B cdd7dc901f5292af3ef7f0ea200c3d22bbc8c0adc27606da3c8fbadc44625b114c995321723dca331f0b23d5248e1f9177f0def2f4138eebcbd4aaac0495d4dd SHA512 38da606d77b62976366cd089e5194a922e348ec396e7b9af4dceb0a536c47f66e0900cfa59c91df04aade6076630077a8f88c713b9c20224d69316109b293a96
 DIST dom4j-1.6.1.tar.gz 9687211 BLAKE2B 3daa3729ea071aa87c7c1e1e2b91f1635109774dd2bd564a85265a0286f1369373084b945409d9d5213d66a7e14224033d42c58d80125b7982eef8961eb29248 SHA512 95c5a7105a81734f77b4bf27f8bb0af116bf43d8ad5297a0902a6687a54109a87dffe2953cf430d14947cdaa590aa0fdf083b46a91d1d98d48431cfae4459d94
-EBUILD dom4j-1.6.1-r8.ebuild 1912 BLAKE2B 7d30137c42a0cdb16e8f7ab3d4ebc6ebf10b5d8b6c969902382a6645aa43654d39d12018efe574397fa8d0a2454e0f48fe8e4aaac60aa279d25b24fcf78bad9d SHA512 1df48894e8cb08b994c53b04b2d6266b4a2c394d35a25e607f0b28a30cf539e950f35f5f2a60fe672146c596e116966fd13043a959ef08f539f9ba3890bec12b
-MISC metadata.xml 529 BLAKE2B 27e8a2aa0c95e7690b99386698f800291371b9962a1a667899c425e58ce73c8eb21dac1c589d47449242f0e2522b66c66379d6dd3b01708015e66278d634a480 SHA512 a9845c5229efbf48ac83b5b8fd0a769d90275de1f336b52147330cc2652a858df2689e17895e2fca5af067288413102de67316e49108c7d9eaf232e9dda31bbd
+EBUILD dom4j-1.6.1-r8.ebuild 1907 BLAKE2B c2802e3270130c27a14cbcd02dfb9228f73e29f39f9866521af5f870396e43a0745836c2279f16b8f4452bed47f2529ac9cb488aa7fe982602affd9ef5fc2f00 SHA512 843e5b3a520ab7ed50fe1ec926b34d5ef114c2dd5d3d7813f12fbd00c018ba791f98294aa300b8042bd6659c31e2e25ee407710c0f9e8a36f79eba7a4e3c603f
+EBUILD dom4j-1.6.1-r9.ebuild 1900 BLAKE2B 314238d8a36167053c0b148c429206b042b5fa14929edd7c92741131596fc24f39e668d165abcb26ea3b5b14363777f725a30893e2395ee57564a875b6cc2306 SHA512 30dab95cdb84bae7a4873be00f1d37f8f412a31f19748a02370071a94407c7d0de1dcdcaaee67aad7d1e024db24218b88d206d373e781b5d2e18154dab051cb1
+MISC metadata.xml 638 BLAKE2B f46f8d2dd95d34b00a632c896e6baa1fa889722364d19b4eb9545f3b4158fd25c7d33351c420a5c4cd06b70944dff110df695f82b00e3c99bab601df21f19ef7 SHA512 77351358dfa7f4d7ae987e49acc828344448578423ad613e2fac18543949ca050e2746c469e0bb7e5b764a8512e3a97b675ab0e1cfbfe2493f013911fcf45f38
diff --git a/dev-java/dom4j/dom4j-1.6.1-r8.ebuild b/dev-java/dom4j/dom4j-1.6.1-r8.ebuild
index 894aca08368f..cc77ae8243da 100644
--- a/dev-java/dom4j/dom4j-1.6.1-r8.ebuild
+++ b/dev-java/dom4j/dom4j-1.6.1-r8.ebuild
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source test"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="XML Java library"
-HOMEPAGE="http://dom4j.sourceforge.net/"
+HOMEPAGE="https://dom4j.github.io/"
 SRC_URI="
 	mirror://sourceforge/dom4j/${P}.tar.gz
 	mirror://gentoo/${P}-java5.patch.bz2"
diff --git a/dev-java/dom4j/dom4j-1.6.1-r9.ebuild b/dev-java/dom4j/dom4j-1.6.1-r9.ebuild
new file mode 100644
index 000000000000..717d7ddf29b2
--- /dev/null
+++ b/dev-java/dom4j/dom4j-1.6.1-r9.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="XML Java library"
+HOMEPAGE="https://dom4j.github.io/"
+SRC_URI="
+	mirror://sourceforge/dom4j/${P}.tar.gz
+	mirror://gentoo/${P}-java5.patch.bz2"
+
+LICENSE="dom4j"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+CDEPEND="
+	dev-java/xpp2:0
+	dev-java/xpp3:0
+	dev-java/xsdlib:0
+	dev-java/relaxng-datatype:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+# restricted to jdk 1.8 because it needs javax.xml.bind
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/xalan:0
+		dev-java/ant-junit:0
+		dev-java/junitperf:0
+	)
+	virtual/jdk:1.8"
+
+PDEPEND="dev-java/jaxen:1.2"
+
+# Add missing methods to compile on Java 5 #137970
+PATCHES=( "${WORKDIR}/${P}-java5.patch" )
+
+JAVA_RM_FILES=(
+	src/test/org/dom4j/bean/BeansTest.java
+	src/test/org/dom4j/io/StaxTest.java
+	src/test/org/dom4j/rule/RuleTest.java
+	src/test/org/dom4j/ThreadingTest.java
+	src/test/org/dom4j/io/XPP3ReaderTest.java
+)
+
+src_prepare() {
+	default
+
+	# Circular deps with jaxen #212993
+	find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
+
+	rm -v "${JAVA_RM_FILES[@]}" || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+EANT_BUILD_TARGET="clean package"
+EANT_GENTOO_CLASSPATH="relaxng-datatype,xpp2,xpp3,xsdlib"
+EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen.jar"
+EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf,xalan"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar "build/${PN}.jar"
+	java-pkg_register-dependency jaxen-1.2
+	use doc && java-pkg_dojavadoc build/doc/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/dom4j/metadata.xml b/dev-java/dom4j/metadata.xml
index af2c88427c79..2d873897cf3c 100644
--- a/dev-java/dom4j/metadata.xml
+++ b/dev-java/dom4j/metadata.xml
@@ -11,6 +11,8 @@
 		and with full support for DOM, SAX and JAXP.
 	</longdescription>
 	<upstream>
-		<remote-id type="sourceforge">dom4j</remote-id>
+		<remote-id type="github">dom4j/dom4j</remote-id>
+		<doc>https://github.com/dom4j/dom4j/wiki</doc>
+		<bugs-to>https://github.com/dom4j/dom4j/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/easymock/Manifest b/dev-java/easymock/Manifest
index e8f477914085..5649fcf47000 100644
--- a/dev-java/easymock/Manifest
+++ b/dev-java/easymock/Manifest
@@ -1,4 +1,4 @@
-AUX 3.3.1-no-android.patch 685 BLAKE2B 30500598f719669c893111aca6afb09a0823343a7813f89c80b12fc41729ab22f0825718f622fe4f6effbaaaf199f599504418cd876a0aae9f64230e86c67f95 SHA512 3ead2f05c122e3e8a3eb1d1748b59c15775fee79e28cf01dba193b8b21aae0039d9608300cbca6e9bdbe291ab15db9f56abe8c2503c6667495f61fccbf3d56ff
-DIST easymock-3.3.1.zip 1015625 BLAKE2B 87e67c6092c3d2276438119a7604a7e5fceb6118f487313bdc706a56678aef56cae44bd9635ade1bb60f0809eddd48a0ddde175d012aa2ac208d3ee47f5ef646 SHA512 0898276df82a99df10e4c91b5b097b6d579914580995b35274ef9d4e0c874266d54c865f96d008becaa210a6307916f6488d0caa205a85caf62920e939becf46
-EBUILD easymock-3.3.1.ebuild 1129 BLAKE2B 794b05c19e790c1fbe9c9e99dd03d2da42b241b3a519250f1173fc83a4fe851fea812dc680e4315e8ee06ae9ed41324dba9f285311fe746b8a6180ad15bb80e7 SHA512 e66d211b69a1a419393d8fdc6736af1cca25f3301796ba35522ed1e7659147ab21d2699ab3dd98657d68d092e70e492316b2eb13454e80e46753a95a525fa9a0
-MISC metadata.xml 314 BLAKE2B 9af04035962b6d333264caf33b4d16e3099709c9a2069f732333a3ec17812dbd88e9086539ec0de3b5009696b92ccebb52bbaf7bd8d543ba2a52bfe926cd7f50 SHA512 a9461432a42e98c60f9b88b92e9a2a170f7c7263178c884c67463f204dc315b689b6a02fc713c8313583536ef5554bcdbbac7eb32ba98b52ccded6ed1913581f
+AUX 3.3.1-r1-no-android.patch 590 BLAKE2B 1fd2493bc0208516421c31adead309adfaad4b30a137739a082588f38b8d85933258718aca277f8f863f468c2775ec1c4ce107948b7d10cc8a4fc8b07cb47383 SHA512 ba9fcb6c5922869511f421b9f1c005c7656840762fac0d9aecf87b5db615dd181bae24d9ce491191c2a7ee8a863ebf14aaf42f94e40d40d8f2192ad4296ece7f
+DIST easymock-3.3.1.tar.gz 624460 BLAKE2B bb5a472aef6c162d3afe5b66edef4891cc48fe6698c1f1eccc7f45f1883ff7f940b0479af5c0dd61b3354b41225ca50f191ba54b92479362a0074ddf3dbb5b43 SHA512 93fefd458a42b6c13d85ab1df768bf906620f052eea88116e93578374a5086eb8b27d8731e82b689dc3d73699e45d03b718c7d8bf2a430ac4a6a717365e52a9a
+EBUILD easymock-3.3.1-r1.ebuild 1478 BLAKE2B 917b09c220baf610511dddae5f5ed0deedcc788cafdf2184399eba177b2b7f825e306bdb9db9f4423b4f58b055a1de084120761900f9a78cd1d9431dc8248adf SHA512 a15f005149d48806f34e1452f43f116a00da270d0542552e911f685de99fab16a734504a044d3b23f15f8b0de631f4a2d8ff1409596055421670a34494aecf3f
+MISC metadata.xml 486 BLAKE2B 90b0a999f8cf928fb74f6b80f15137fcbb4d3bf881f080dee4b424281d95ce0a342f41bf041cfa9d3e72624ca85849bbca1bf2aeebe317a8768951c20d1ab0b2 SHA512 3fc28642c63761d234abf049fa6e33e6548a381e9b15e10a71d1263e1b80e93b4fa773831e0021751ce9736282f50480e93f07aa4f5fc6da5e19c7875f78b3c7
diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild b/dev-java/easymock/easymock-3.3.1-r1.ebuild
new file mode 100644
index 000000000000..3b4e321ccffe
--- /dev/null
+++ b/dev-java/easymock/easymock-3.3.1-r1.ebuild
@@ -0,0 +1,60 @@
+# 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.easymock:easymock:3.3.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Mock Objects for interfaces in JUnit tests by generating them on the fly"
+HOMEPAGE="https://easymock.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.2"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+
+CDEPEND="
+	dev-java/cglib:3
+	dev-java/junit:4
+	dev-java/objenesis:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+JAVA_GENTOO_CLASSPATH="cglib-3,junit-4,objenesis"
+JAVA_SRC_DIR=(
+	"${PN}/src/main/java"
+	"${PN}/src/samples/java"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="${PN}/src/test/java"
+JAVA_TEST_EXCLUDES=(
+	"org.easymock.tests2.EasyMockAnnotationsTest" # "java.lang.InstantiationException" (12 x)
+	"org.easymock.tests.BaseEasyMockRunnerTest" # No runnable methods
+)
+
+src_prepare() {
+	default
+	# error: package com.google.dexmaker.stock does not exist
+	eapply "${FILESDIR}"/3.3.1-r1-no-android.patch
+	rm easymock/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java || die
+	# cannot find symbol   o = ProxyBuilder.forClass(ArrayList.class)
+	rm easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java || die
+}
diff --git a/dev-java/easymock/easymock-3.3.1.ebuild b/dev-java/easymock/easymock-3.3.1.ebuild
deleted file mode 100644
index 36438c1dfb09..000000000000
--- a/dev-java/easymock/easymock-3.3.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Mock Objects for interfaces in JUnit tests by generating them on the fly"
-HOMEPAGE="https://easymock.org/"
-SRC_URI="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="3.2"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-java/junit:4
-	dev-java/objenesis:0
-	dev-java/cglib:3
-"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${COMMON_DEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEPEND}"
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="junit-4,objenesis,cglib-3"
-JAVA_SRC_DIR="src"
-
-src_unpack() {
-	default
-
-	cd "${S}" || die
-	unzip ${P}-sources.jar -d src/ || die
-
-	if use examples; then
-		unzip ${P}-samples.jar -d examples/ || die
-	fi
-}
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PV}-no-android.patch
-	rm src/org/easymock/internal/AndroidClassProxyFactory.java || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-
-	if use examples; then
-		java-pkg_doexamples examples
-	fi
-}
diff --git a/dev-java/easymock/files/3.3.1-no-android.patch b/dev-java/easymock/files/3.3.1-r1-no-android.patch
index 18c4a00dc45f..a68dc6f3ae45 100644
--- a/dev-java/easymock/files/3.3.1-no-android.patch
+++ b/dev-java/easymock/files/3.3.1-r1-no-android.patch
@@ -1,7 +1,5 @@
-diff --git a/src/org/easymock/internal/MocksControl.java b/src/org/easymock/internal/MocksControl.java
-index e709dc4..cd9d5a9 100644
---- a/src/org/easymock/internal/MocksControl.java
-+++ b/src/org/easymock/internal/MocksControl.java
+--- a/easymock/src/main/java/org/easymock/internal/MocksControl.java
++++ b/easymock/src/main/java/org/easymock/internal/MocksControl.java
 @@ -137,12 +137,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters<Object>,
              return cached;
          }
diff --git a/dev-java/easymock/metadata.xml b/dev-java/easymock/metadata.xml
index 144ebe414735..fd53b0590b5e 100644
--- a/dev-java/easymock/metadata.xml
+++ b/dev-java/easymock/metadata.xml
@@ -7,5 +7,8 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">easymock</remote-id>
+		<remote-id type="github">easymock/easymock</remote-id>
+		<doc>https://easymock.org/user-guide.html</doc>
+		<bugs-to>https://github.com/easymock/easymock/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index b28a110b3de1..4fc11aeba108 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,4 +1,4 @@
 AUX headless-launcher.bash 67 BLAKE2B 29ea0750d057e9a914ce26a14f1d6d1c4d49967aa553d6f55b115df0ebf1b77d693e01a7a06dbe92de4a589ff5847b176ccb820c23acde06b336e302a763d089 SHA512 d3a6635105ea62a62f1ff690a457bfbdebe3d15f8fd220f5508a4ec20b8a5c46e66bf9189562661d5053c6ac31a6998d1f4a117e0ac6087b336a0475635d7d3a
 DIST fop-2.0-src.zip 26381859 BLAKE2B 8500de6a23e93c14fdb4f27c59bafba27a64e6aaffb7a761f16de5bd523e2fdb83593ab53a66de79bf7b7d6c2b887ab97a34accb18be416b26448753babe2395 SHA512 428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a
-EBUILD fop-2.0-r3.ebuild 3057 BLAKE2B cf853cefd30ad6ed2e470a0c4fcbdd452a2b0c4a51602b2209aff4615effc32989152f70d503aaceb860a7c3bbbf82731b7ec26edddd516ff4d98370507f0722 SHA512 7b1355901b87ed3a0efab003f9220bd84c5c791aaf2c9a770b3ec151580263086b319cceaaacf6f769d20d7a991e63a9512dbe86d9bfd0bc32111ec9575d5381
+EBUILD fop-2.0-r3.ebuild 3050 BLAKE2B 99e24888912fda8f6d9d2ca37ad03d6af2b4631e8bbf6d3fd3f2398c92636612afba50127fa1c627401b4a41b7f8c03632aea486e92c3c3c493a083a0b9d15b2 SHA512 debaeea4df79a274fe79c531e808e331f1995deb23c981224fe3f8dde57dd62c911494c86a578d314d373289d286d0475c96ad8bbeedf9227f87a4679c21ea45
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/fop/fop-2.0-r3.ebuild b/dev-java/fop/fop-2.0-r3.ebuild
index bd3c03ab2e9d..6265183f67ad 100644
--- a/dev-java/fop/fop-2.0-r3.ebuild
+++ b/dev-java/fop/fop-2.0-r3.ebuild
@@ -9,7 +9,7 @@ EAPI="5"
 
 JAVA_PKG_IUSE="doc examples source test"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
 HOMEPAGE="https://xmlgraphics.apache.org/fop/"
diff --git a/dev-java/freehep-graphicsio-emf/Manifest b/dev-java/freehep-graphicsio-emf/Manifest
index 76a9c97d1d54..8591f1ebcc06 100644
--- a/dev-java/freehep-graphicsio-emf/Manifest
+++ b/dev-java/freehep-graphicsio-emf/Manifest
@@ -1,4 +1,4 @@
 AUX github-30.patch 1643 BLAKE2B dbeeaf08b2a3342c8711d4be892084616e6beece15700633f21f2d56696d2f3408a21afdd18709a2ca86d08f060ba15370af694453841ae17dad666a8a4e9f60 SHA512 63a89ce9bfe23a0c0110e69d34fc76faf2f18c2f2361044fbe426c36f10f596279c958734398efcadc84890a2ecd08dbaf23bdc3c16aa2208fa8b9aab37b4e43
 DIST freehep-vectorgraphics-2.4.tar.gz 4118379 BLAKE2B c8a5840ebab43398a6f87f97855a38f843b0e05267f5446b5f22a0c0124c98717c00801fe93ef3b541b2c53d07176ab1319a27ad26ed177b6dded11e3fa2e7bb SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382
-EBUILD freehep-graphicsio-emf-2.4.ebuild 1639 BLAKE2B e795fb8d7cfbcf5bd198b6dcef8ef8bd5cfefd30c176d3da8de850937e401c97b7d2840a2f58bc3403940129b2dc64cd6ceba5485fbad8f59f0ceaf5e6ae043c SHA512 2812e7c2def2ecc8589995894e8f0aa435370e9e8b9e8f811f65a1067c9ea80ca88a8983e3387df18bcc71923280568337acd4e6b6650f6eb0261e1adc30be9a
+EBUILD freehep-graphicsio-emf-2.4.ebuild 1639 BLAKE2B 1c328d0d1be1a2bd50b271f392424c5f53759192fada688052b0379e51f654c85d8212e04036574da050c9520a2f3a2e3e9c5c34536dd752c1194cd69f8ac0c3 SHA512 5c53c75758c3bb9e0fd30ef192e28160314b810e7d6e21966f5ba8e0643d488a0455aa404e879e1f356aa9d73ec929fd92c5a7fab2b466762f041269f46c21bb
 MISC metadata.xml 331 BLAKE2B b05dee2e48a0495dea84595a536797a1a53dbd82bca89b838b334060e5142ef729f4a3be30e413eaf24a164d3f1998f3197b18bc92eb0e5fe4e1195453869694 SHA512 f7bb0530f563d9ba4e8062f41b32340ac316e267adfffc964156bc4e87a469a7bde0a1af4553240c9dc167d405a3e892ebe501043ca5399e03377164eb71bfb5
diff --git a/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild b/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild
index e10420f55980..7fa5dd56be35 100644
--- a/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild
+++ b/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ MY_PN="freehep-vectorgraphics"
 MY_P="${MY_PN}-${PV}"
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit epatch java-pkg-2 java-pkg-simple
 
 DESCRIPTION="High Energy Physics Java library - FreeHEP Enhanced Metafile Format Driver"
 HOMEPAGE="http://java.freehep.org/"
diff --git a/dev-java/glassfish-jms-api/Manifest b/dev-java/glassfish-jms-api/Manifest
index 2adf5a749aec..1ba0668c7b34 100644
--- a/dev-java/glassfish-jms-api/Manifest
+++ b/dev-java/glassfish-jms-api/Manifest
@@ -1,3 +1,3 @@
 DIST glassfish-v2ur2-b04-src.zip 39817113 BLAKE2B 4aeb0df44f838c91fa8dd52e2a4985e86457f75cec3cd5d527de54f672afcd2824cefaad9d9e67c5ce096515e389bb2fc0874d76ce2ec86a956233f2c3508439 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8
-EBUILD glassfish-jms-api-1.1.2.2.04-r1.ebuild 1109 BLAKE2B e863c23a1366a3a2315d7d0e01f9270594682e9bc6bfc5e2c81d6f1a26581a7fbf939ebc5d44759abef7dd26974c1db3ef55ac311fe9ce35814941d40af4d845 SHA512 8276ac9acc9024620ede702b40c29c092204a4da5eb785e0085863ef9f3434ba959414dceaf67c87d624af4514ddb81989aca6f56167e6057dabf74dd0ab0665
+EBUILD glassfish-jms-api-1.1.2.2.04-r2.ebuild 1113 BLAKE2B ffe8983a19460d08a366d11a116a847b5d9c04eafaa80bbd3428cf14113e57a869666313480d891d417bc28b98cab1dfaf57b95ff360909c647948ac7acbf30e SHA512 ed4f3ebc16bef4f7e5d970433b3f3959fee9f3cc1d13c1b115af883a1e57a9a09e59dc9978978ec18bea6cf705447c3ba5a270980114302cfb0b9a566f8bf32d
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04-r1.ebuild b/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04-r2.ebuild
index a3af5829621c..3b528fd9f0b8 100644
--- a/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04-r1.ebuild
+++ b/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,8 +20,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
 BDEPEND="app-arch/unzip"
 
 S=${WORKDIR}/${MY_PN}
diff --git a/dev-java/glassfish-persistence/Manifest b/dev-java/glassfish-persistence/Manifest
index b3d111003d11..f7987977fcb4 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-r1.ebuild 809 BLAKE2B 507f47d8a7d2ad043218997f2fb0bf402111ff5b384bffb3fa9523bd4a92867bb5715b8ce7d102d34988de6f4892cc1eec59c6a17b88d4ec56c7adbc9fad029a SHA512 028a1ffc006759847744735231c8979bee0ea3c15a180119a7cc99d4f60a9990cb36681a35a63b5409ecd3bd12a16f0d2b4dfa6377b0bf0f018e9b6f1d50f614
+EBUILD glassfish-persistence-1.0-r2.ebuild 823 BLAKE2B fddfe67f7ea6d110943dc0fd2a3190535b2cdd7a812fa62be6c10f56e0fb89f07a94bed6e364581c2a11f31a8d3e86b7375e8862f91301b3a7dbfbc9c53a1780 SHA512 005891869ac6a2f1401dca4d981917b167877129e35d35775ee28880687c7d5f7f572fb25ba1f0484b070d5557d2e7a5198ff2d0082dd62d47edd80cd1f867a6
 MISC metadata.xml 214 BLAKE2B 5452fb11be445b7579865f9777af292067658bf101f6321db48ab1b478101fe031bb7914c6c24215bcdbe369dda396c164fcbbc4253ecb315de82141ee25f8b0 SHA512 d2b6ecfbbd79440de1909d9f195e5d4a6f9886b685ac1e6d7a1db39b8925b29942fac2998cde06040c921f2cc9ef2cbfbf836b60e191d894b00f75628476b1f7
diff --git a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild
index 898ef4606059..1117715835eb 100644
--- a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild
+++ b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,17 +6,18 @@ EAPI=7
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Glassfish implementation of persistence API"
-HOMEPAGE="https://glassfish.java.net/"
-SRC_URI="http://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9_0-b48-src.zip"
-S="${WORKDIR}/glassfish"
+HOMEPAGE="https://javaee.github.io/glassfish/"
+SRC_URI="https://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9_0-b48-src.zip"
 
 LICENSE="CDDL"
 SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
 
 BDEPEND="app-arch/unzip"
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/glassfish"
 
 EANT_BUILD_XML="persistence-api/build.xml"
 EANT_BUILD_TARGET="all"
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index 06d8ca59c442..4f0de90e85e6 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -1,4 +1,4 @@
 AUX gnu-classpath-0.98-freetype-2.5.3-support.patch 1192 BLAKE2B 18a8c2a6516def598c614a50c7c260c13ba7304a1d189ef0d0d7ffbea37b2c8972fdb0449eacfe49deb58c3aaaac44b36593d2b3df745066f64889a957e08d51 SHA512 5832a27caf0a064a29fb00a186d116193af98c0f2a97ef868be7ca0cab1aa51bd32df90f32ee43f9ecdbda52ea3b264f6f3bbd48d8b8f7cb4d1e0a1444f716fb
 DIST classpath-0.98.tar.gz 11021342 BLAKE2B 8bd0c55153569b34dfde767233ed48f6ebf0f507d34d991a410b0e40a2ddfbd20d4568697265f8544823337f568a916288e92c096b39fcd5c67afc82ddfc3cc3 SHA512 0d98f87cd78c166d566ecd8d0372f2d6cdf422e8c4c806ca01d3a77dafbdd80ee936de78a2c5d4226174027efdc053fe92669514bdd8acb3290a7b3ec002d31f
-EBUILD gnu-classpath-0.98-r6.ebuild 2910 BLAKE2B 3d13e6a160c20818b804c01cda619701fe9c6c83005b533167ac31ae9c4d57f5b321244256c3c7816ed1f5e6d573381de5fcb7f355642e81b5ae9776b450c5ff SHA512 1ef171e814e4ff9189a69d66277dfc7eed210d49e879efd38b80419d327a2f6b863fd51f0fb111190ec4473dd9d9cff4976984c23a83605617a72a8b3619d118
+EBUILD gnu-classpath-0.98-r6.ebuild 2908 BLAKE2B 43d72cce9d97c8a58f3b2d166d39e7183721d9e65c8ead2661038bab68e3b1089e9b6d2fcd96b561cfaba8eda7e1686e4f3c9fc6e66978d37608caf268722c3a SHA512 3f3efd40f380a6e71c8c024ff277435d05d04280a9e9f66f5f06fc89030f52617123b8460a3f46841b4fea89115c0ba7ef5bd6f6c12b7bdbbd3415963b3a1aa3
 MISC metadata.xml 703 BLAKE2B 221917dd1d999eb06d4cd4d896f1ae60f06f425442c27cea566c2f19a4366064fc45545e43dd72983ae3810cb8c8753c128f3b690a5234910828dcda2f03131e SHA512 e97e2eb0800c588b0b50a108559cc164df1ae33f626b089c5ed93476e69ce0dc9d47f043988beed9db9c79e6bc9479f0923f8dfbd61c4a6c619dacc8d7863865
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
index 7efae955959b..618fe63fb741 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit eutils java-pkg-2 multilib
+inherit epatch java-pkg-2 multilib
 
 MY_P=${P/gnu-/}
 DESCRIPTION="Free core class libraries for use with Java VMs and compilers"
@@ -109,7 +109,7 @@ src_install() {
 
 	if use doc; then
 		# Strangely the Makefile doesn't install these.
-		insinto "/usr/${PN}-${SLOT}/share/classpath/api"
+		insinto /usr/${PN}-${SLOT}/share/classpath/api
 		doins -r doc/api/html/*
 	fi
 }
diff --git a/dev-java/gnu-jaf/Manifest b/dev-java/gnu-jaf/Manifest
index d2b6fa5d8298..c5655cfab833 100644
--- a/dev-java/gnu-jaf/Manifest
+++ b/dev-java/gnu-jaf/Manifest
@@ -1,5 +1,5 @@
 DIST activation-1.1.1.tar.gz 157018 BLAKE2B e9135b4c0996601c7963a46363e8ede3ba81e83e532637a92d83c89586eb52bd11be84ee37f5e8f31e372564f7c14aac4123726ba20712f5cef89a1e4bcd01f3 SHA512 d323644df13a4572bf1c10e7175c1c4cfa3078483886bba7b308989c215a23e12939b054124dbaf0437a4c5fdcb551b4e2189c09afc078218963389e4b3c3b7d
 DIST activation-1.1.2.tar.gz 290644 BLAKE2B 15ec89a5c757bb134b9ec71e384a80dea5394b9b6463ca1fe44e2e622993fa8809231379b262b0a54595c32451a49ef508bea45ce82120138efe07d81939a817 SHA512 26534f7bb47daddf97b850ab74fc8ef2c5bd62d12cfb96e28e235071af7dcfc7761fa15f2d8f3a2d194f035665cef127812b7476af6cc81f6d6374f1fa725584
-EBUILD gnu-jaf-1.1.1-r1.ebuild 743 BLAKE2B bd43ff60603ad10183eaf057b2b50094354eb50236d99f6aed1b9e2aacf096cd68b4453004821b10ffcee14c75b152d1da91d13767c3f431e081c953c2a341e8 SHA512 82751a161d6225b8e70ac58f9504b307522bf2f19018e0e8a37f001236e9d0db5aa4e525580f2807378a32b916100a862dd4d3d83ab33430483189e10b2f3950
+EBUILD gnu-jaf-1.1.1-r1.ebuild 736 BLAKE2B 7bd012d21fbfc76e25906aa9a1ea8012b758ef4a8877349a8b31eeea99ad1e6ef893da92b02fed8ad6e4bd144a99182bb97fe4d1663eb5747b8e051615943ad4 SHA512 1f789fcaeea02de0faa50ec70fef2498aca541aec2d2d51f7067b6e9155b7810284bb892d0ac2ba50508a615958db7d8764f1508b3720028d48f916eea623eca
 EBUILD gnu-jaf-1.1.2.ebuild 710 BLAKE2B 26c96725f10a506d787bd8a76645fcde629ee0aab5f62c778e35cf1e0e14b00945a83d3f31478b3a3d6625de1edb048793b2e7ef8f7446aa7924e57839452604 SHA512 937ae18d484177f855223c4d8bd1a0f8c3505b885d6f110b42af9070ecdf8baaa869f7c1e35160e9ac533847fc32376cda65db0c86d84a3681b94c6fd3c3d913
 MISC metadata.xml 1072 BLAKE2B d6b9b7455a12a24c3e64b33f34faa427572e456c0d9c331137790d4db1aaf5bc0d870ff5f1bebf296804549cb69f7484d6536f1b7c4605a66331c08911f18cf5 SHA512 8116cd7f57a163402e1abef43f1abdef212914adda64de9a93585134bb232ad5ac0862f73a5422fa330d761d0c0429511a837ef8ae6b10a203b9de3302b830f3
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.1-r1.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.1-r1.ebuild
index b71050b603dd..efb519edd970 100644
--- a/dev-java/gnu-jaf/gnu-jaf-1.1.1-r1.ebuild
+++ b/dev-java/gnu-jaf/gnu-jaf-1.1.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="GNU implementation of the JavaBeans Activation Framework"
 HOMEPAGE="https://www.gnu.org/software/classpathx/jaf/jaf.html"
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index 438dc209cfe5..34b6759280f7 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1,7 +1,3 @@
-DIST gson-2.3.1-sources.jar 139924 BLAKE2B 11b1bcdad898b6e91e7ed902863be0682b57f7c4a12d93f16e0fe9481af9b1966ed60e03a54c43bade52bf93ca8185ab9809b4b8234d2236c4353a0ca4de95ba SHA512 a0423c03358a1d843806bc9367b1a328c147973247abfa47b956ab0409ae9542199f6402feb93155761fe538e5d0a79a095b8dad3ccd203c5be81e88713469ba
-DIST gson-parent-2.6.2.tar.gz 434949 BLAKE2B 0361c8465f41ff654ef474a54fb786ccd0c50ae7433afdddcc9bb65468ea0692ca20e3eb55ffd5d833dfe7771596fbfbe35828947b67662824609ee5917b73f0 SHA512 e4288b60ffaa3773e8025eb8b80ce08f44a197ebdc0ae767e20ed7b514fbc553abd2eea6eea7f949c01f780632273bb55f08fe1947475797b2135e2046cafaf5
 DIST gson-parent-2.7.tar.gz 437390 BLAKE2B 596331eb829797ecb172c55bef3bca0710c1461f504d1ff6170f332c3a77fbe8cf79b85b8ca16867040b86c46d6dcef09b0bf29d213fa82dfb911feeeeff57eb SHA512 663365566234bff0a94eac6ad4cd6e772b8fd542af2cccba2c2f75081935247eebf1a2502d5ce5dd0a0e75e140e17a689880a3aa04fa7c47a1e7bc834edd415e
-EBUILD gson-2.3.1.ebuild 536 BLAKE2B bc4f2c98f179d2ff4beb3bb099ff966cc2a01f7e9706317374084dbaad6983ba3101866654b11a660c7a6ec8bde345dd0301089b01983747d14443f9c56bedb3 SHA512 466b1580f80012d80b714b82e8ccff880a617bced82410f40c180f073b8f3f085844f7e20157d55df2db9088fd923a68aa9c5bea52044b439c85b4c8c02e5766
-EBUILD gson-2.6.2.ebuild 563 BLAKE2B e49f69a3c0e1148161385f2b0147e873c8fa9b7a8a67ce2b0119be0eebd694680c2b1eab9cfdaf94748f8ad69ba62a195a173cea7a1a14f4b8531a92396a825e SHA512 558bc49650b494ece65a8a2ca5b9b7ad0e1b1c3df2ce7b34e8707dd5449d55682e0de1b75ee563790ad3504b9b1ed24cbce0febc8be6076a28a0f042100923a8
-EBUILD gson-2.7.ebuild 563 BLAKE2B 080983fd859d0ccac5bd7cf006633218abb5c1b509c4f378eea50728d6b285284a653dc6a86f6c92eca4741e8ac8809855afa22c5de0b748fd60c756fbfb9c32 SHA512 f51da2521726272f18ba30950a39261826a2aaeceaee8dadbc3fe0e0ddf146c87cb274909f1a8feb22e7abfa65348e4f3090739b559bc7162275db37aa009161
+EBUILD gson-2.7-r1.ebuild 564 BLAKE2B 8bc434205dbc59572fd7db97bb64612b6ecd20b365a195afe7d296bfcebbf63e9790214c51bb1cc8081e9b0bdaaa92e4f2b036aa39477b9655a942070d7747a8 SHA512 ba0cbcf61eedf061ccb78eaae4fb238d1ce077228a96cb5e4f5cd83c9e272e5e06cb2153e791ea28d7871c1a272bcc70b081ac88b6984e3caa8ee3c1149594ab
 MISC metadata.xml 629 BLAKE2B 4e0b0c0f59d898923ef06924e2de1e5bab0cfed3ac891d739ddb16641f927ab878bcea986020c95d8c535114ec232260ddcba2e4100e0a6ff0d92284c66d73ba SHA512 66089434169cfb86acf2e024d61e4cbe90022350223111589d72de9301a6dfc2f3a66596e2e9e4ec4e91ec70932b3aa9ac0fb130f6c1a7ed47efd2e6b81fef76
diff --git a/dev-java/gson/gson-2.3.1.ebuild b/dev-java/gson/gson-2.3.1.ebuild
deleted file mode 100644
index 7f9566410bf6..000000000000
--- a/dev-java/gson/gson-2.3.1.ebuild
+++ /dev/null
@@ -1,21 +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-pkg-simple
-
-DESCRIPTION="Java library to convert JSON to Java objects and vice-versa"
-HOMEPAGE="https://github.com/google/gson"
-SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/code/${PN}/${PN}/${PV}/${P}-sources.jar"
-LICENSE="Apache-2.0"
-SLOT="2.2.2"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/gson/gson-2.6.2.ebuild b/dev-java/gson/gson-2.7-r1.ebuild
index 27e3552bd430..7d902a246532 100644
--- a/dev-java/gson/gson-2.6.2.ebuild
+++ b/dev-java/gson/gson-2.7-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P="${PN}-parent-${PV}"
 JAVA_PKG_IUSE="doc source"
@@ -15,8 +15,8 @@ LICENSE="Apache-2.0"
 SLOT="2.6"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/${PN}-${MY_P}"
 JAVA_SRC_DIR="${PN}/src/main/java"
diff --git a/dev-java/gson/gson-2.7.ebuild b/dev-java/gson/gson-2.7.ebuild
deleted file mode 100644
index fc8a91b02a0f..000000000000
--- a/dev-java/gson/gson-2.7.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
-
-MY_P="${PN}-parent-${PV}"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java library to convert JSON to Java objects and vice-versa"
-HOMEPAGE="https://github.com/google/gson"
-SRC_URI="https://github.com/google/${PN}/archive/${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2.7"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-JAVA_SRC_DIR="${PN}/src/main/java"
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
index 117986cf2742..fba99b74e002 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1,3 +1,3 @@
 DIST guava-20.0.tar.gz 2522092 BLAKE2B 2ca76a71d0c169b80bfaa3e9847b2e465c57aabc0a67622a69519808fa8455146228747dc20e999ebc20ef7cd5fec1cfa82f6c025e9378011619cfedbc2c7d6c SHA512 e89eee8e66502f208878af286c660393712b12fb37647ec70719ca7c5184686c8dc5fc59d45c1813d792ecad9421e2c077dab075f76b1907c04f9f6e80567ac9
-EBUILD guava-20.0.ebuild 799 BLAKE2B ed6006c171950335d8dff74b33a641c3b409ba03391dc1dcf9821dc4fc0963a9fe7a0b019e89930cb9390f96d55b05da49d792f65bb946239f6d7c5a5cd0ef9b SHA512 cfcc6951ed61d81ebbd234cd5a0dbdd977fa55fedada69d92d10af95c3b1897f04f7dcb59cf72505f1693256a641174da3b0f9d73cfc26cdac3eb066f8fd5079
+EBUILD guava-20.0.ebuild 835 BLAKE2B 2ed4fca37b4e138f104976ce3ab0d7ebce990e35cfaebf910bc57530092c482e1f9fa03adc61deb050be663f5ee8912810cd23ca74676a1c7c18feed35ed64e2 SHA512 2e5a66cb220421463e10526b0358c0f8091b887c482c06963dc14eec1987818e681853e0a451e045c7ccce9451fc5a21bc6340773280eeacdf45ca1650c79d2c
 MISC metadata.xml 588 BLAKE2B 4a8bbd786c9895bdbd44d2064ea31d6ef148fd2355870498c77c680232e1fcd4d6223b07e9f29dcaf4fa15d38509ba8912e6e15b8129ef7fca72c00a1fc2aad9 SHA512 8fc32c9a79d61e36376e681775094fbe99a378ac43cf7788fd132e2a9400b94b419480e509f55941857f92e99d68b9112889077823da24fa15c8cf0d2531a26d
diff --git a/dev-java/guava/guava-20.0.ebuild b/dev-java/guava/guava-20.0.ebuild
index b746ddba6c35..f07428f2619f 100644
--- a/dev-java/guava/guava-20.0.ebuild
+++ b/dev-java/guava/guava-20.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.guava:guava:20.0"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest
index 99aab5975d31..11b9c3981406 100644
--- a/dev-java/hamcrest-core/Manifest
+++ b/dev-java/hamcrest-core/Manifest
@@ -1,11 +1,7 @@
-AUX hamcrest-1.3-empty_generator.patch 1227 BLAKE2B 4e0bc6d085f6d26de9f2da8e09eb061c451a58d99385a2c41be28a137b209783affd76e1e0bd901a5497d40b290ac219d61046fc65931ea056c725ae0f835ee1 SHA512 766f57a449d4535432ab192c40a37ff9a09fe760b06ce5beb6a68b2b804c77ce232e8003fb3f3ef7b71df1cd2ceae7ff13fd3de28d20ec0ced1274c912d414b5
 AUX hamcrest-core-1.1-java-11.patch 1198 BLAKE2B 0c9610b9225a6eff96669dbc0c4e052a33ad0ef46d8982d39220e851584afcf67b7696a5770ffe2a61090020a7dc6925367e5eb13c4f0e3c6a621361825e1ac7 SHA512 21f5305ef9bb2b0c4c8f9eb5524dd31a621b6acad1447644f75afac5c87de6187617c3beb592cb934f6befe316735f1cfb72b34371fd4b7c09e893a99461a87a
-AUX hamcrest-core-1.3-fix_javadoc.patch 3036 BLAKE2B ee65eb88f113a5f6fd93b49dafb76d8c1c39266f6fb2f220849eeabec7ce5b084d2411c51102fa5b47853aed66acd6d237497c0c8bb2c688c93b7eb0785e27a3 SHA512 f50fe8f2ba32e17118c42e438ef96973f7c04b70321353ed2c19c7ec8f61ba0c801b49920295d0d30add50fb18dbab5cd079b1879f71f4d569b8253ca40b4ce3
 AUX hamcrest-core-1.3-java-11.patch 886 BLAKE2B eb6e3a1f3cd47d067987a436d947ab89732dfec0f73096b9b9a0be3213cb0bd7ee800f29ff2766e997c202f9309b766aeede966d399c080e1529c9f0d83c7e1d SHA512 82ead3c1344ac7a153992923e06bdb40dad2729202aa695e690c755937f570ad927c5aa832de13553050dfcce48bd84c6e73164c26c39890c134259c9ab67254
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
 DIST hamcrest-core-1.1.tar.gz 1247348 BLAKE2B 07b874ca2e61808cd1a30246cbfe7baa220a9c83df7be94dbb50c4df0279bcf906a32cc1b69aed0ebd81d51392af28050d070b7fabb50f8063964b0782b5e105 SHA512 d86080f1ef5982faee728e29675676a89b42a02c4b00783c67be948076e502e70a2b435568502d8ed3c5b1bcc5441b3cdd8817dab841cac537087edeee47632f
-EBUILD hamcrest-core-1.1-r3.ebuild 716 BLAKE2B a0442ff57be2628e59b831794fb9e48cb54d1ae88abd9ab69bdfe39195e55c16da9234241af00378345e21dd4b98421b625a3e42ffe254f57b2b4fd0a4b8cb55 SHA512 8138d54074543ccbf142647639eb45efd304b0bceffcd0fbe942e3dfcfe565d15c184178661495717aee507196284543a7d4f596e0ea828f1b1871d6ba29f260
 EBUILD hamcrest-core-1.1-r4.ebuild 815 BLAKE2B cdffa29ff20d6b06b31d603bc2c55bfc5d5c492eb7e6cb778b0287b6d6f11acaab57a17f31640a94972f68c3c57afa8c83cb613de3e258ff35e7dcd6628befd1 SHA512 b77edf3f90c512774e0b959a6792b99380bd8a467c3251652f95f98d65ca134d429b06dffdacb8fb4b2b14c3a8bcf384b3373603733ad6c0566092f9ce63b4a0
-EBUILD hamcrest-core-1.3-r1.ebuild 1508 BLAKE2B 9d6f9a554c9194ae529da1323cb299012e0c9e24eb824abc81c97832d6bb3388278b1d2b70c2ab63a881d90e7e37051ab8a77775ebe58b6718f60a19a02a39cc SHA512 0c4e858cabb30eb516ee565bc12a34b3a10c160b8604a6c2ea7c64fdf1ef7f18f307bfd1f6dde9689606fc1396b67c54ed129c49bf92affa91917033ffddd510
-EBUILD hamcrest-core-1.3-r2.ebuild 1428 BLAKE2B ccbf85dcb4938e66ec439a2bda18a1703624031d34a40d6e5fd8f3127196376b0f2b3e4b924ff98c3530ca0fca7dd40fe13a45956268904f0e5f64d385f41b3f SHA512 a9dc9ca58c6a152b0800959098399b354009d6f0218228d0e10c32243537ff59beecd94a0183eaac6e60315a7bfd037cf945deabac27a9e50ad7e87a0b1e076e
+EBUILD hamcrest-core-1.3-r2.ebuild 1470 BLAKE2B f2074cbedbed6df3c8e9e32414d12902bdbfef2712f7906f2c10363f15ba441bf7275faff766f483063a8395d33f7f3ffac4aadaa8949fb1f1b75f8e860393fa SHA512 0fefd10c40fe3cd900a4c512ab91feefa554ed286c69df21143733c6a5c6e2d4833c25e92c9deb5d9a1e7d0561b4c869515981c344b97f763d1dd23b2d0bda8e
 MISC metadata.xml 310 BLAKE2B 18f629f94221f2689e8e27ebd26be9a7fcb14a4a5ba2632b59e370dae8a13e25a7cff75b36b4eee5abee203f9c9d8ad012226928ce7300207b2fe7af151934d6 SHA512 04a1836dd5ab9e764bdde86a1944830b3e272ecba3a6ae7ee84e8128edeff96b5936bf3a7dcd133171b97ab1feac4a2ff639951168d0937e7b76a6958e566cef
diff --git a/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch b/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch
deleted file mode 100644
index 709bca62c02d..000000000000
--- a/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/build.xml	2012-07-02 21:14:09.000000000 +0200
-+++ b/build.xml	2013-06-15 22:00:19.919038284 +0200
-@@ -12,18 +12,6 @@
-     </target>
- 
-     <target name="generator" description="Build code generator tool">
--        <java-to-jar srcdir="hamcrest-generator/src/main/java"
--                     modulename="hamcrest-generator-nodeps"
--                     classpath="lib/generator/qdox-1.12.jar"/>
--
--        <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
--        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>
--        <jarjar jarfile="build/hamcrest-generator-${version}.jar">
--            <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
--            <zipfileset src="lib/generator/qdox-1.12.jar"/>
--            <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>
--        </jarjar>
--        <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
-     </target>
- 
-     <target name="core" depends="generator" description="Build core Hamcrest library">
diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch
deleted file mode 100644
index 4f210ca3380a..000000000000
--- a/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/build.xml	2013-06-15 22:29:44.445548674 +0200
-++- b/build.xml	2013-06-15 22:30:45.098876635 +0200
-@@ -132,30 +132,15 @@
-     </target>
- 
-     <target name="javadoc" description="build javadoc jars">
--        <java-to-javadoc-jar modulename="hamcrest-generator-nodeps"/>
-         <java-to-javadoc-jar modulename="hamcrest-core"/>
--        <java-to-javadoc-jar modulename="hamcrest-library"/>
--        <java-to-javadoc-jar modulename="hamcrest-integration"/>
--        <copy file="build/hamcrest-generator-nodeps-${version}-javadoc.jar" tofile="build/hamcrest-generator-${version}-javadoc.jar"/>
- 
-         <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
-                  destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"
--                 windowtitle="Hamcrest" source="1.6" failonerror="yes" overview="overview.html">
-+                 windowtitle="Hamcrest" source="1.6" failonerror="yes">
--            <classpath>
--                <fileset dir="lib/integration">
--                    <include name="*.jar"/>
--                </fileset>
--            </classpath>
-             <packageset dir="build/temp/hamcrest-core-${version}-sources.jar.contents"/>
--            <packageset dir="build/temp/hamcrest-library-${version}-sources.jar.contents" excludes="org/hamcrest/internal"/>
--            <packageset dir="build/temp/hamcrest-integration-${version}-sources.jar.contents"/>
-             
-             <group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>
-             <group title="Matcher Library" packages="org.hamcrest.*"/>
--            <group title="Integration" packages="org.hamcrest.integration, org.hamcrest.integration.*"/>
--            
--            <link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>
--            <link offline="false" href="http://kentbeck.github.com/junit/javadoc/latest/"/>
-         </javadoc>
-         <jar jarfile="build/hamcrest-all-${version}-javadoc.jar">
-             <fileset dir="build/temp/hamcrest-all-${version}-javadoc.jar.contents"/>
-@@ -302,14 +287,7 @@
-                      destdir="build/temp/@{modulename}-${version}-javadoc.jar.contents" author="true" version="true" use="true"
-                      windowtitle="Hamcrest" source="1.6" failonerror="yes">
-                 <classpath>
--                    <fileset dir="lib/integration">
--                        <include name="*.jar"/>
--                    </fileset>
--                    <fileset file="lib/generator/qdox-1.12.jar"/>
-                     <fileset file="build/hamcrest-core-${version}.jar"/>
--                    <fileset file="build/hamcrest-library-${version}.jar"/>
--                    <fileset file="build/hamcrest-generator-${version}.jar"/>
--                    <fileset file="build/hamcrest-integration-${version}.jar"/>
-                 </classpath>
-             </javadoc>
-             <jar jarfile="build/@{modulename}-${version}-javadoc.jar">
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild
deleted file mode 100644
index 5d747d9d15f4..000000000000
--- a/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild
+++ /dev/null
@@ -1,35 +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
-
-MY_PN="hamcrest"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
-SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x64-solaris"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-DEPEND="
-	virtual/jdk:1.8
-	source? ( app-arch/zip )"
-
-S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}"
-
-JAVA_SRC_DIR="${PN}/src"
-
-java_prepare() {
-	java-pkg_clean
-}
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild
deleted file mode 100644
index 977e37eca2f5..000000000000
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild
+++ /dev/null
@@ -1,54 +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-ant-2
-
-MY_PN="hamcrest"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
-SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
-
-DEPEND="virtual/jdk:1.8
-	~dev-java/hamcrest-generator-${PV}:1.3
-	userland_GNU? ( sys-apps/findutils )"
-
-RDEPEND=">=virtual/jre-1.8"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
-
-EANT_BUILD_TARGET="core"
-
-java_prepare() {
-	# Empty out the contents of the generator target; it has already been built.
-	epatch "${FILESDIR}/hamcrest-1.3-empty_generator.patch"
-
-	# Fix problems with Javadoc target.
-	epatch "${FILESDIR}/hamcrest-core-1.3-fix_javadoc.patch"
-
-	find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
-
-	local cp="build/${P}.jar"
-	cp="${cp}:$(java-pkg_getjars --build-only --with-dependencies hamcrest-generator-${SLOT})"
-	EANT_EXTRA_ARGS="-Dversion=${PV} -Dgentoo.classpath=${cp}"
-}
-
-src_install() {
-	java-pkg_newjar build/${PN}-${PV}.jar ${PN}.jar
-
-	dodoc README.txt CHANGES.txt
-
-	use doc && java-pkg_dojavadoc build/temp/hamcrest-all-${PV}-javadoc.jar.contents
-	use source && java-pkg_dosrc ${PN}/src/main/java/org
-}
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
index 1828b5a8a3f8..627607d45aa2 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.hamcrest:hamcrest-core:1.3"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/hamcrest-generator/Manifest b/dev-java/hamcrest-generator/Manifest
index f9868334c43d..25d3d88a18cd 100644
--- a/dev-java/hamcrest-generator/Manifest
+++ b/dev-java/hamcrest-generator/Manifest
@@ -1,5 +1,4 @@
 AUX hamcrest-generator-1.3-no_jarjar.patch 982 BLAKE2B 4c09b64a6b824025771682dad6875b8c048f488fd777545d7c8f7219de04193fe40eaea63b7e319d5c00843175f66033e26216f68436c2d99e256fe06218daba SHA512 26b77758ab603b02dde03ec7a51f6b1f1077aa45580e8a21ffa671fc385c54ff00b3a79f8a3be037f28a8b77289d1290493469a1c8c856a9b61846d4cedac58f
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
-EBUILD hamcrest-generator-1.3-r2.ebuild 1324 BLAKE2B 80e8b7ef81afe127b0cb4cd17db60e376f448d304695f9ff65a4e9c5571a1a57a1cdf292612bf4671d6c260b377be68d72895a3dee9a15527028f7a390581a8e SHA512 acae20ed327ca7555e47d676ef768991dab7fde73c8156b9f0b167f4ea6fac5079c155148c84bfd4df8c6569be8a7812853e05b25d889ef42c3634a9e2916e11
 EBUILD hamcrest-generator-1.3-r3.ebuild 1302 BLAKE2B 1b0aed94fe4697b23d56fdb5a331880bfdfd275686b15fd54714e9d28220fcb8d3f3843f989a6bfef9a4e7ec988275659ba67de614836fdc8d708bafd9165e53 SHA512 ab8c36a45c6d18ffda071a6106541026faeca61bb1f1ad9ab3784eed2d3b82987eb9cdd64fc21d131b414a42ecc2e7240c72908aa0387535289309b71ada1307
 MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r2.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r2.ebuild
deleted file mode 100644
index 256b9b9a0b54..000000000000
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.3-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="5"
-
-JAVA_PKG_IUSE="source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="hamcrest"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Code generator for Hamcrest's library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
-SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
-
-CDEPEND=">=dev-java/qdox-1.12-r1:1.12"
-
-DEPEND=">=virtual/jdk-1.8
-	userland_GNU? ( sys-apps/findutils )
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.8
-	${CDEPEND}"
-
-EANT_BUILD_TARGET="generator"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-
-java_prepare() {
-	# Don't include source in JAR.  If a Gentoo user wants the source the source
-	# USE flag will be enabled.
-	epatch "${FILESDIR}/${P}-no_jarjar.patch"
-
-	find -iname "*.jar" -exec rm -v {} + || die "Unable to remove bundled JAR files"
-
-	# These jars must be symlinked.  Specifying them using gentoo.classpath
-	# does not work.
-	java-pkg_jar-from --into lib/generator qdox-1.12 qdox.jar qdox-1.12.jar
-}
-
-src_install() {
-	java-pkg_newjar build/${PN}-nodeps-${PV}.jar ${PN}.jar
-
-	dodoc README.txt CHANGES.txt
-
-	use source && java-pkg_dosrc ${PN}/src/main/java/org
-}
diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest
index 18f1f6ed98df..aa0aa664eeba 100644
--- a/dev-java/hamcrest-library/Manifest
+++ b/dev-java/hamcrest-library/Manifest
@@ -1,6 +1,4 @@
-AUX 1.3-remove-targets.patch 2263 BLAKE2B 17fb19da0f70f8d265a4e68f28ca530748af3372bcace0e7e04e04c46097abe2cf61265dd2b84f56467a83e0dc9c72bda2d94da25fa5abbb88f6f31f04d1321d SHA512 e403068cba91964dc7895c111a292a135ad27790da480c8779961075de559163052fa8ca5a997d3cfc278455ab3b8051bd3d4eb069f850dad2780a7ca974e551
 AUX hamcrest-library-1.3-java-11.patch 2323 BLAKE2B 6a16d58c3aadfbb7b6447b68f5d89ec17f82639b530f331e29276d1ebe947daa0c572e874efa328c03397058884ad6cc523c1ded08086fcfa42d1902624c948e SHA512 827966cf7ca175287df5005e35527575427986367013745ef49a7b1719fc3c6a0c7dd5697158726ff7d04122bc6e558bc402b71b6f2e9b932b87b61b5f71cecf
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
-EBUILD hamcrest-library-1.3-r1.ebuild 1348 BLAKE2B e597280ab13aa00088bd7f1173e1a0453cb2435a9db5c1186b9fd66a99ab0d10bf80ff932f21ffdffbc22b73d782348228c03418e7962d833a086452ecb2ee88 SHA512 49e2b5ffe18e7fc03987612d5e78cdc2e908e109fa906b78258ce0bfe17b1f1757ff5684f2598ac07bbce3b8ff72bd952bea118961589a6d629a61a20bdaa6c2
-EBUILD hamcrest-library-1.3-r2.ebuild 1490 BLAKE2B 2068bb62e5bd6e10c692c7de30f47d803ec15ccac13ab3236336eda0c9ded95370ae1ab2216450470cc1cd48a43888cfcd16e9a21fdc7540b02e3aa78d3e2e4f SHA512 53e2916ed7eeb4edad493ada301129252776ae5ae5531b98961cc29f3b103232f879f448f685bd79cfe1a3897f779367de4a507224f4d3e20995ea9062c73dcf
+EBUILD hamcrest-library-1.3-r2.ebuild 1535 BLAKE2B ece7a5fb55b5bf39c89c9eb98fcf49aef36fb403d44fa61f4561d4b2ee58faa7bc9a0cf40689b970c3d5faf9de9a5065886040b4d8747aaa2bedf8f3aa3e28b3 SHA512 76ed07eb45f29a0658627f12dc3db76dc212d16a71d6e8e4dd81565e331dacb41c9a24f2dba415416102fcc2c26c3d0c22e3ed2b31d0f8fd7ae02494f1c4e898
 MISC metadata.xml 310 BLAKE2B 18f629f94221f2689e8e27ebd26be9a7fcb14a4a5ba2632b59e370dae8a13e25a7cff75b36b4eee5abee203f9c9d8ad012226928ce7300207b2fe7af151934d6 SHA512 04a1836dd5ab9e764bdde86a1944830b3e272ecba3a6ae7ee84e8128edeff96b5936bf3a7dcd133171b97ab1feac4a2ff639951168d0937e7b76a6958e566cef
diff --git a/dev-java/hamcrest-library/files/1.3-remove-targets.patch b/dev-java/hamcrest-library/files/1.3-remove-targets.patch
deleted file mode 100644
index 6923b0bcc68e..000000000000
--- a/dev-java/hamcrest-library/files/1.3-remove-targets.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 1cfd4fb..185c563 100644
---- a/build.xml
-+++ b/build.xml
-@@ -12,42 +12,9 @@
-     </target>
- 
-     <target name="generator" description="Build code generator tool">
--        <java-to-jar srcdir="hamcrest-generator/src/main/java"
--                     modulename="hamcrest-generator-nodeps"
--                     classpath="lib/generator/qdox-1.12.jar"/>
--
--        <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
--        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>
--        <jarjar jarfile="build/hamcrest-generator-${version}.jar">
--            <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
--            <zipfileset src="lib/generator/qdox-1.12.jar"/>
--            <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>
--        </jarjar>
--        <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
-     </target>
- 
-     <target name="core" depends="generator" description="Build core Hamcrest library">
--        <java-to-jar srcdir="hamcrest-core/src/main/java" modulename="hamcrest-core"/>
--
--        <!-- Generate one class with all static imports -->
--        <mkdir dir="build/temp/hamcrest-core/generated-code"/>
--
--        <java classname="org.hamcrest.generator.config.XmlConfigurator"
--              fork="yes"
--              failonerror="yes"
--              classpath="
--                build/hamcrest-core-${version}.jar;
--                build/hamcrest-generator-${version}.jar;
--              ">
--            <arg value="core-matchers.xml"/>
--            <arg value="hamcrest-core/src/main/java"/>
--            <arg value="org.hamcrest.CoreMatchers"/>
--            <arg value="build/temp/hamcrest-core/generated-code"/>
--        </java>
--        <!-- Append to core jar -->
--        <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"
--                     modulename="hamcrest-core"
--                     classpath="build/hamcrest-core-${version}.jar"/>
-     </target>
- 
-     <target name="library"
diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
deleted file mode 100644
index b26fd124cfcb..000000000000
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
+++ /dev/null
@@ -1,52 +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-ant-2
-
-MY_PN=${PN/-library}
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
-SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-
-CDEPEND="
-	dev-java/hamcrest-generator:${SLOT}
-	dev-java/hamcrest-core:${SLOT}
-	dev-java/qdox:1.12
-"
-DEPEND=">=virtual/jdk-1.6
-	userland_GNU? ( sys-apps/findutils )
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
-EANT_GENTOO_CLASSPATH="hamcrest-generator-${SLOT},hamcrest-core-${SLOT},qdox-1.12"
-EANT_BUILD_TARGET="library"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-EANT_GENTOO_CLASSPATH_EXTRA="build/${P}.jar"
-
-java_prepare() {
-	# remove core+generator target as they are already built.
-	epatch "${FILESDIR}/${PV}-remove-targets.patch"
-
-	find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
-}
-
-src_install() {
-	java-pkg_newjar build/${PN/core/library}-${PV}.jar ${PN/core/library}.jar
-
-	use source && java-pkg_dosrc ${PN}/src/main/java/org
-}
diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
index d55eef85cd82..afa5bc55ca58 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 JAVA_PKG_IUSE="source"
+MAVEN_ID="org.hamcrest:hamcrest-library:1.3"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/hawtjni-runtime/Manifest b/dev-java/hawtjni-runtime/Manifest
index 3557cc865e0e..c9abea93b8e7 100644
--- a/dev-java/hawtjni-runtime/Manifest
+++ b/dev-java/hawtjni-runtime/Manifest
@@ -1,5 +1,5 @@
 DIST hawtjni-project-1.10.tar.gz 1602839 BLAKE2B 7a6a37c4c208906fc7718bbd1aec566bb2392ef0e0dc082aa552127e97af896ad39b2ecfcd124ac370593daecd69185c184838fafc374173320beee72d87fccb SHA512 3bd94d20bf2d8953c60753aa404077c96c93704c2bd5bebfb5fe790fc29e15d97f6172706f06cea13c4806b652405ccfef824cccf76ff018dafb7262ff845490
 DIST hawtjni-project-1.15.tar.gz 1606236 BLAKE2B 52357dbefde43ec82cf218ada90642d118ebaa6a6be173cc1f4f48377fda95b902f0a90dfb60822c02c144b9bf13d0800c94d67cc2f9c76e607bbbb80a80898e SHA512 1a93658bf8621c770cf97b546c6a5c0cf1821b06cb16dbc872ad0c830c599d3947ffe56b4cca16217a510d4e929ebcfc5eabdf4ad4364f5225b53d22c7d48abb
 EBUILD hawtjni-runtime-1.10.ebuild 698 BLAKE2B 8ebf66fa7c7e975e26cec25542089c005d14ffa03e3d326f9553516caead7d19ca21cab44a46067bf93ac7657c0d0850010c52c97ec30df92bcccc20d117d58f SHA512 c4a8179ea9c77c836118cd1f9d7340b689e840baf497dd23238ba4eb6baa2aa31f0ace2a08bfd9c05f8add8c2803c1c5a7622e0a9b86fee04eeab386376d3141
-EBUILD hawtjni-runtime-1.15.ebuild 701 BLAKE2B cf2361db4ba30ae57efc396da8ed1042c4abbf35c611405630a81bfeca727bedae7444a8f7799cc932f324d16e6c57d19bb979205c9939d2237b5538fd578c74 SHA512 ef483c73c080d5304a8debdedc1ccf07d541811eb5ec22af81cf6a1c6843591e0d4566208be9f974791e6c1e2f50979138e58295710bae1802da8169302785ce
+EBUILD hawtjni-runtime-1.15-r1.ebuild 700 BLAKE2B 559e24e4c0042149edba78bb3d374f0fb57a127465c8f68d919514c9b35a62db1c7c06ee2aaeeb9c0d06f6ace327f079ed9b62ec3d0ef600bec4832edd8d789a SHA512 94c38519876053421c413f4720c4fef8af877e03e1d9da595c55f661a7bec2d74c14029bac7e964cf63feac742c426c27f2a8ce25bd7151707c311a4bb1adb51
 MISC metadata.xml 329 BLAKE2B e78188cf60c43c68f0a74c8199be1b9fbca9d8db73a56ec2d7d4e820c4c483e4fe5eb6afe107524ae85960393f9ad5b07227f037ecba8b7562f92fa79af929f2 SHA512 20b714d09dfdd7430599b1d57d3a3831e86a22bbc3fb3b004dea2d0d9c6a230dcb74cbeeeb7301cf48493f0eb55ad736ab10cd247d329da4e4d02fa149566927
diff --git a/dev-java/hawtjni-runtime/hawtjni-runtime-1.15.ebuild b/dev-java/hawtjni-runtime/hawtjni-runtime-1.15-r1.ebuild
index bcbf6c1590cc..7c07b1bd7a7e 100644
--- a/dev-java/hawtjni-runtime/hawtjni-runtime-1.15.ebuild
+++ b/dev-java/hawtjni-runtime/hawtjni-runtime-1.15-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
@@ -15,10 +15,10 @@ SRC_URI="https://github.com/fusesource/hawtjni/archive/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/hawtjni-${MY_P}/${PN}/src"
 JAVA_SRC_DIR="main/java"
diff --git a/dev-java/icedtea-sound/Manifest b/dev-java/icedtea-sound/Manifest
index c158dd648c53..d3a7d809dd29 100644
--- a/dev-java/icedtea-sound/Manifest
+++ b/dev-java/icedtea-sound/Manifest
@@ -1,3 +1,3 @@
 DIST icedtea-sound-1.0.1.tar.xz 1515308 BLAKE2B 4d9939e1bc0e0b331b032c3a54244960d61354d6b85b83cbbce1aeb96f2748906d5bd0936b36e2aacac526bd7927dbc0686a47a0dd0f41568ca86e3805b943ea SHA512 505d02f5ce885d4c7638cde8042a686aa3651de9072d325db6fefb8c5bd3d7de73253b27162555396e827a65f50aeed8326e99099757d5efe18d14ccebc1c07a
-EBUILD icedtea-sound-1.0.1.ebuild 884 BLAKE2B cbeab5af2535f85b974f70eb861412ea9f94e7c48adc82d72a2b51930053d45cf894dbf9c9a499f33b207a84b5fdfca1b65a95c695ed0060bf4603b1901780b2 SHA512 0de6493e5357a26f9577c98496e66e72b96452e5f5d92f7e6e1c1d3c7470563b793266d280caa672b593cadac7b5d6e21996ccc391ce3af8758432d8a2e77d47
+EBUILD icedtea-sound-1.0.1.ebuild 877 BLAKE2B 17b124f4aa001c3f8dcd7c1d8857f4ec62849f0cecb766a84db94062f24d2f13bdcc4626f32404e30cf6b85c25711ed48fb2cc8704d43eba149f483d7c22b725 SHA512 88b02f1e9948ef9f698e44762c6e18df5a22b852de53b92c2a572799d2629863cd3f73a240841e83ddbdc7dfa33ceb92378653af9aa1d947d7072270c8c23e25
 MISC metadata.xml 382 BLAKE2B 59a6ba628e5453fa0b74e335ddc7b2518b2624037549c20a2850c3dce7119c52c7b592bc875a89e5b04eac272f98156b9819d03623c35580c55501ce6d3b4cd7 SHA512 210018116f0894a6eb291b92cc5994b4e89870035e884b5248f930172cfa431f18dca6acd972ed0b1f366b6aa441e46ff2730c291b4334db4637aeca1e64091f
diff --git a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
index 8baacadd296d..a891e3577f34 100644
--- a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
+++ b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 EAPI="5"
 
-inherit eutils java-pkg-2 prefix
+inherit java-pkg-2 prefix
 
 DESCRIPTION="Plugins for javax.sound"
 HOMEPAGE="http://icedtea.classpath.org"
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index 9b0baa31ef22..617976a659ba 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -1,15 +1,5 @@
-AUX README.gentoo-r1 2328 BLAKE2B 3a9e2be2a241eeebe501c3c97d55c9bd65b3bb1c0b33abeed13dcea238f4c981e3aa173cb385cb15ea184e1ec2d696e630b8b1c497daadb2a79b3e8e287b4600 SHA512 bac787d49827e651fa9a87a2d8a8a64fb714282f569474ebf69712bd2a329c12f7d6fed2b015467c857b66cc0c9e10e7e60ab2186de00f8f3ac6e72353b76628
 AUX README.gentoo-r2 452 BLAKE2B 81347eaa073b22f2b4ddb8c07dbdc07bbe81b2f848c2e86db295b5ee86f133e5c5c98997b7089f78850cdab38fc841647144474efd95c21d079223062dd9a9cc SHA512 0a844f4b180cfb447e267d9783a50f7785bb3458b5fa04e92b74ace3412b9af0f326adfe92929a3166fdfb37f6ee03553f7b7f097f14eab1c7927d25f5d722db
-AUX icedtea-web-1.6-javadoc.patch 463 BLAKE2B 8c6bd88fb3255acfebf91e764bdf4f1677a12d7ea03dbcdd47514ab2d1b240cbc810b8e670c1bb472176323b346ee3a5ddf9aa359bbc1771848334357ad0cb25 SHA512 faa9b4cd96bd6658a9f55ebf7a5f3b75db65a6a813489739df2b8e903bc62cab2cf222a936a52230ff91943263e3ccc303ed7abe4fe8da7bf89a2eed95b3e66d
-AUX icedtea-web-1.6-launchers.patch 3136 BLAKE2B b11e4cb0c8c53e8509e68d30bc3190d8846e742e725cc4918fa08979102bca5d6ef643bf6a524f596a0ed9e0d98722227824bd39f1e84859c4680fc17228b057 SHA512 585a8e12a438f884f6b3c24aacb04a7330bf65388c18a51697c17041f5dfa3df3a24474d5d6b2dc43886dafabf0a05e525ef40ac8247c726797750dcb25d5d92
-AUX icedtea-web-1.6-no-hg.patch 2254 BLAKE2B 9939f85cc1234056de045ca8d85f256e5315d0c603a5ec8a2dc026b62a1ee1fdc142db832ebab32cea698a17172257e3eb88f427f966f9e385ba626bd257550d SHA512 22e30347bbb759b60b954acafb8a920e23f673915e89eb13ad9917b6669e8059d52aacb0b90874427376730840e8ed954b14e2de65e8b594a10616b999863523
-AUX icedtea-web-1.6-respect-ldflags.patch 667 BLAKE2B 215247a834785e592d66717d9c88bc4c04a5adb93bb026460ca1bf729a692cb675a950e17a665086aa6b3699ef9406fe70d26c5455d44eccd7b6dd542a0f0a58 SHA512 23903931c48e47cd78d1d73cf2bd5e06249e26939bbef4f41f09d3c3d69d0418e65fe83be542807452ed41bebfd88d2081d731f03dfbd4950495fc16dc9edb1e
-AUX icedtea-web-1.6-unused-libs.patch 697 BLAKE2B ea140038785a4954ebfbc8dac7e547b34527c845acf285b4ed1a4c66cbfd48a815391c9662e9a19b7f699199c8d37c160c9452af6e192f9e3c3af8e240d6cbe7 SHA512 215242b418159a8ab3d1523f1ef0765d40212feb572441719a830251fc602620f29a254a5734ab08a6b7a902bc1f27060bbf638826e2291305966edfd3062b74
 DIST dunce-0.1.1.crate 4311 BLAKE2B 07b775c2e79d6414af5854282fdfbba26ac4675207f840cf627a33c7bdbca163283466011c641d62646fa77f8623f1f7143b5e3d87c34e0b9840e4807eea2df8 SHA512 3fa16c1d6d78374e6360b9e2349516859b617ac5532ade34359d952002a1fb6d5e70f27ce2c9b3d6e230c753218fcf6e9b3973161bf1f8dd9c08152fbda2f5ad
-DIST icedtea-web-1.6.1.tar.gz 1776222 BLAKE2B e6141303b24e3b4a3a5568562f34c4a512250a1e16234c455d8ca04030324e11eb20134cd352d36c5d2c27769911558e0b739525bba9a58acf892fa5e7bb2b14 SHA512 dae39818f74a098289acd0736d27c2e68b10b603a3fb0a180cf4b6444345cbe71ab1ba77dfb198f053f9567bb18aa96de09049c3b595b3d292d142a7ae7d3ef9
-DIST icedtea-web-1.6.2.tar.gz 1824557 BLAKE2B 897155b528a873b2e0166f47973136c5ccc640fa9da26c934dc93deebacf2b2d714cd70943fc4f7eb2c596542e97656d844638dbd12f407f917d30c9cd75f4d7 SHA512 32c9618a575bf05d3fbe5fec3f8429d55036acde70bf7ccf40b59e14eba775d1f561640acbf673b1737a8c5c3a8eadb74e8f1bef525cfa6060e3f1968d45b3f7
 DIST icedtea-web-1.8.4.tar.gz 2358591 BLAKE2B a62a88cfce49f473a0ab768ca386c4733d69fd3b603b29a8d5e7478b33030e2d016a0577bfc0fa4657bb0b3f99a2524d1b46cad7a8e4f97c1404eff5ca218613 SHA512 d155ec6ed9a007b2c59fd09fed9f4005a79640016ae62287eab7076c05b5ddd56d07b0ff86babf732f1bb82653fc0f7cf434550eabdaac8d666e64feabe4f890
-EBUILD icedtea-web-1.6.1-r1.ebuild 2245 BLAKE2B 86e91baf340e3ac8fd2e88dbc16b3f0d04565a0a5011167be5487676c3821b142b4b187167ee4eebd519310e61c8facfc680413cc3e1bb347f66b08ab4bd020f SHA512 37c9aefae8a58b59e455ae6614d6e57367f5f461f3f71c0bb1cdb8d5988fc3b513ec2977a953af7b1f20e0e4a8322413d8f8dd8feecb576768ec1624d99b8255
-EBUILD icedtea-web-1.6.2.ebuild 2110 BLAKE2B b0d8c5d7f7fda90e25f842f7da8e8676cb0bf8ff19d7eeae886679901fe8a919b1189439a55572c8dcad59a05f82b1a8ab383a5d5472656ffb0b059e107989fe SHA512 06b66744888ae211123c107ec2e012442872481e9d0897e1d505028b48ee13d4279b7acb8a8e5e0fb93d79700784ac880700e470be61776e393ebb40bbf32067
-EBUILD icedtea-web-1.8.4-r1.ebuild 2402 BLAKE2B 84299c51d0eb13327b0b8e61913632cca1e11cbb001bfe95df8f38c91d1bed67f4f185fa83a150d34bff5ce9af0ff5b126639a2215a270f35e1421c6b93b1567 SHA512 b7dcebf90e912183b8dffc25b38dd15be014d19ae9d1f84be45a7b2910b4f11d2c5a183534ecdeb16c52258f0f448a692ed7e54ce0af1ee07467f9b26c6d9166
-MISC metadata.xml 742 BLAKE2B 77af156387b358bd5d7193c7ff3d1860ad18dd4f3b65eb2a4437f4278222b61dcd821e3ac680e49f49e28cffac46a880d6b1820bafca47a82ee6f27e4accc70e SHA512 10f58fcaced19937c90c9fbf9b23bb7d8cea129d14261d95c9d8cff24ffa0faa52435ff34577636eb9fd7257e62f71c4f93f856cb9d3af19b0226eb9a0c01f64
+EBUILD icedtea-web-1.8.4-r1.ebuild 2412 BLAKE2B 908ed64b517a4ef3288a112a4051f9e8da8a99333232ed51ec26c58b39d11123ae38ccc0f0f70a213e452f3dd9634831bf9c6ce591119ad2ddfca8794467f281 SHA512 14b3cdc5db7503201e7eaaceb1ecd23628be9b7565022bc538c7abd732de9e16e35bf08024f0b03f0c751fd519ca3b3944944ba900f6d44c6b05bfb2d971485b
+MISC metadata.xml 469 BLAKE2B 54ea817d083181e4eaa9b3c3fdad63c7a6b2621290226de6eacce93f5f299f654fb3b9afdf9e4f33f3d26811b532924241278fa934d6bf239587ed8f5d378b8f SHA512 44ad5d5bda997b2640380c24c71e57345ec609dd4b847375b640865a55f28c89b8124ba734756668f5008ff59bf41b014b5e0099b5ec37be43b2ab882e17cbef
diff --git a/dev-java/icedtea-web/files/README.gentoo-r1 b/dev-java/icedtea-web/files/README.gentoo-r1
deleted file mode 100644
index 219e14e7f7c3..000000000000
--- a/dev-java/icedtea-web/files/README.gentoo-r1
+++ /dev/null
@@ -1,56 +0,0 @@
-Browser plugin
---------------
-
-The IcedTea browser plugin (NPPlugin) is now made immediately
-available to supporting browsers without the need for eselect. Note
-that Chromium-based browsers no longer support NPAPI-based plugins
-since the code was removed in September 2015. The list of supporting
-browsers is shrinking but still includes Firefox as of version 46.
-
-JVM selection
--------------
-
-By default, IcedTea's browser plugin and Web Start uses the JVM
-selected via eselect or the GENTOO_VM environment variable. Note that
-this doesn't have to be an IcedTea JVM. An Oracle JVM will also
-work. The choice can be overridden using the itweb-settings
-program. Simply blank out the field to restore the default behaviour.
-
-Coexistence with Oracle's plugin
---------------------------------
-
-The IcedTea browser plugin can no longer be installed alongside
-Oracle's plugin. This used to be possible thanks to eselect
-java-nsplugin but this was removed in an effort to simplify things. No
-one is likely to need both, especially with plugins being all but
-outlawed these days. To avoid any blockers, simply enable the nsplugin
-USE flag on icedtea-web or the Oracle packages, but not both.
-
-If you're wondering why we don't just leave plugin selection to the
-browser, it's because Firefox (and probably others) only allows you to
-disable all the Java plugins together, not individually.
-
-Coexistence with Oracle's Web Start
------------------------------------
-
-/usr/bin/javaws, the executable used to launch JNLP files from a
-browser, will always use IcedTea's implementation over Oracle's when
-icedtea-web is installed, regardless of which JVM has been
-selected. This is primarily for consistency with the browser
-plugin. If you want to use Oracle's implementation then simply
-uninstall icedtea-web.
-
-32-bit plugin on 64-bit systems
--------------------------------
-
-This is no longer supported as the 64-bit plugin can launch a 32-bit
-JVM. Other reasons for running a 32-bit browser on a 64-bit system
-have long passed.
-
-32-bit JVM on 64-bit systems
-----------------------------
-
-The emul-linux-x86-java package was removed in 2015 with the migration
-to full multilib. icedtea-bin now provides this feature via the
-multilib USE flag. Once installed, using the 32-bit variant is simply
-a case of selecting that VM as described above.
diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-javadoc.patch b/dev-java/icedtea-web/files/icedtea-web-1.6-javadoc.patch
deleted file mode 100644
index f69db9b6f582..000000000000
--- a/dev-java/icedtea-web/files/icedtea-web-1.6-javadoc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig	2015-09-11 14:02:04.245280051 +0100
-+++ Makefile.am	2016-01-01 14:00:49.857225492 +0000
-@@ -652,7 +652,7 @@
- 
- stamps/netx-docs.stamp:
- if ENABLE_DOCS
--	$(SYSTEM_JDK_DIR)/bin/javadoc $(JAVADOC_MEM_OPTS) $(	_OPTS) \
-+	$(SYSTEM_JDK_DIR)/bin/javadoc $(JAVADOC_MEM_OPTS) $(JAVADOC_OPTS) \
- 	 -d ${abs_top_builddir}/docs/netx -sourcepath $(NETX_SRCDIR) \
- 	 -doctitle 'IcedTea-Web: NetX API Specification' \
- 	 -windowtitle 'IcedTea-Web: NetX ' \
diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-launchers.patch b/dev-java/icedtea-web/files/icedtea-web-1.6-launchers.patch
deleted file mode 100644
index 57f793a2ff30..000000000000
--- a/dev-java/icedtea-web/files/icedtea-web-1.6-launchers.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- launcher/launchers.in.orig	2015-09-11 14:02:04.252280131 +0100
-+++ launcher/launchers.in	2015-12-18 23:06:35.721135526 +0000
-@@ -7,7 +7,7 @@
- BINARY_LOCATION=@BIN_LOCATION@
- SPLASH_LOCATION=@JAVAWS_SPLASH_LOCATION@
- PROGRAM_NAME=@PROGRAM_NAME@
--CP=@JRE@/lib/rt.jar:@JRE@/lib/jfxrt.jar
-+CP=$(java-config -r)
- 
- CONFIG_HOME=$XDG_CONFIG_HOME
- if [ "x$CONFIG_HOME" = "x" ] ; then
---- plugin/icedteanp/IcedTeaNPPlugin.cc.orig	2015-09-11 14:02:04.219279754 +0100
-+++ plugin/icedteanp/IcedTeaNPPlugin.cc	2015-12-19 22:35:23.479775591 +0000
-@@ -137,8 +137,7 @@
- static DIR *data_directory_descriptor;
- 
- // Fully-qualified appletviewer default  executable and rt.jar
--static const char* appletviewer_default_executable = ICEDTEA_WEB_JRE "/bin/java";
--static const char* appletviewer_default_rtjar = ICEDTEA_WEB_JRE "/lib/rt.jar";
-+static const char* appletviewer_default_executable = ICEDTEA_WEB_JAVA;
- //javaws name and binary
- static const char* javaws_bin_property = "-Dicedtea-web.bin.location=" JAVAWS_BIN;
- static const char* javaws_name_property = "-Dicedtea-web.bin.name=" JAVAWS_NAME;
-@@ -298,7 +297,15 @@
-                   PLUGIN_ERROR("Your custom jre (/lib/rt.jar check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
-             }
-       }
--      return appletviewer_default_rtjar;      
-+      gchar *stdout;
-+      if (g_spawn_command_line_sync("java-config -r", &stdout, NULL, NULL, NULL)) {
-+          std::string result = g_strchomp(stdout);
-+          g_free(stdout);
-+          return result;
-+      } else {
-+          PLUGIN_ERROR("Failed to query jre bootclasspath with java-config.\n");
-+          return "";
-+      }
- }
- 
- static void cleanUpDir(){
---- plugin/icedteanp/IcedTeaParseProperties.cc.orig	2015-09-11 14:02:04.220279765 +0100
-+++ plugin/icedteanp/IcedTeaParseProperties.cc	2015-12-19 23:06:05.095409132 +0000
-@@ -151,7 +151,15 @@
- }
- 
- string default_java_properties_file(){
--	return  ICEDTEA_WEB_JRE "/lib/"+default_file_ITW_deploy_props_name;
-+	gchar *stdout;
-+	if (g_spawn_command_line_sync("java-config -o", &stdout, NULL, NULL, NULL)) {
-+		string result = g_strchomp(stdout);
-+		g_free(stdout);
-+		return result+"/lib/"+default_file_ITW_deploy_props_name;
-+	} else {
-+		PLUGIN_ERROR("Failed to query jre location with java-config.\n");
-+		return "";
-+	}
- }
- 
- 
-@@ -224,7 +232,7 @@
- 				dest = custom_jre_file;
- 				return true;
- 			} 
--		} else {
-+		} else if (!default_java_file.empty()) {
- 			if(IcedTeaPluginUtilities::file_exists(default_java_file)) {
- 			dest = default_java_file;
- 			return true;
---- Makefile.am.orig	2015-09-11 14:02:04.245280051 +0100
-+++ Makefile.am	2015-12-19 22:37:35.460518630 +0000
-@@ -353,7 +353,7 @@
- 	  -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
- 	  -DPACKAGE_URL="\"$(PACKAGE_URL)\"" \
- 	  -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
--	  -DICEDTEA_WEB_JRE="\"$(SYSTEM_JRE_DIR)\"" \
-+	  -DICEDTEA_WEB_JAVA="\"$(JAVA)\"" \
- 	  -DPLUGIN_BOOTCLASSPATH=$(PLUGIN_BOOTCLASSPATH) \
- 	  $(GLIB_CFLAGS) \
- 	  $(MOZILLA_CFLAGS) \
diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-no-hg.patch b/dev-java/icedtea-web/files/icedtea-web-1.6-no-hg.patch
deleted file mode 100644
index a76780e500cb..000000000000
--- a/dev-java/icedtea-web/files/icedtea-web-1.6-no-hg.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- html-gen.sh.orig	2015-09-11 14:02:04.250280108 +0100
-+++ html-gen.sh	2016-01-01 14:13:46.693307166 +0000
-@@ -67,13 +67,18 @@
- if [ -z "$CHANGESETS" ] || [ "$CHANGESETS" -lt 0 ]; then CHANGESETS=10; fi
- 
- NEWS_ITEMS=2
--REPO_URL="$(hg paths default | sed -r 's/.*icedtea.classpath.org\/(.*)/\1/')"
-+
-+if [ -d .hg ]; then
-+    REPO_URL="$(hg paths default | sed -r 's/.*icedtea.classpath.org\/(.*)/\1/')"
-+else
-+    unset REPO_URL
-+fi
- 
- start_time="$(date +%s.%N)"
- 
- cd html-gen
- 
--print_debug "Generating HTML content for javaws -about for $REPO_URL. $CHANGESETS changesets, $NEWS_ITEMS news items"
-+print_debug "Generating HTML content for javaws -about${REPO_URL:+ for }$REPO_URL. $CHANGESETS changesets, $NEWS_ITEMS news items"
- print_debug "Starting sed substitutions"
- for FILE in NEWS AUTHORS COPYING ChangeLog
- do
-@@ -99,7 +104,9 @@
- sed -i '5i <br><img src="jamIcon.jpg" alt="Jam Icon" width="87" height="84"><br><br>' AUTHORS.html
- echo "</center>" >> AUTHORS.html
- 
--REVS=(`hg log -l"$CHANGESETS" | grep 'changeset:' | cut -d: -f3 | tr '\n' ' '`)
-+if [ -n "${REPO_URL}" ]; then
-+    REVS=(`hg log -l"$CHANGESETS" | grep 'changeset:' | cut -d: -f3 | tr '\n' ' '`)
-+fi
- 
- print_debug "Done. Starting formatting (bolding, mailto and hyperlink creation)"
- 
-@@ -132,9 +139,11 @@
-             if [[ "$LINE" =~ $date_regex* ]] # Matches line starting with eg 2013-07-01
-             then
-                 html_space="\&ensp;\&ensp;"
--                REV="${REVS["$COUNTER"]}"
--                # Turn the date into a hyperlink for the revision this changelog entry describes
--                LINE=$(echo "$LINE" | sed -r "s|($date_regex)($html_space.*$html_space.*)|<a href=http://icedtea.classpath.org/$REPO_URL/rev/$REV>\1</a>\2|")
-+                if [ -n "${REPO_URL}" ]; then
-+                    REV="${REVS["$COUNTER"]}"
-+                    # Turn the date into a hyperlink for the revision this changelog entry describes
-+                    LINE=$(echo "$LINE" | sed -r "s|($date_regex)($html_space.*$html_space.*)|<a href=http://icedtea.classpath.org/$REPO_URL/rev/$REV>\1</a>\2|")
-+                fi
-                 COUNTER="$(( COUNTER + 1 ))"
-             fi
-             if [ "$COUNTER" -gt "$CHANGESETS" ] # Cut to ten changesets
diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch b/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch
deleted file mode 100644
index 1d03b7c4fd16..000000000000
--- a/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.am.orig	2015-09-11 14:02:04.245280051 +0100
-+++ Makefile.am	2015-12-18 21:37:43.328862431 +0000
-@@ -344,7 +344,7 @@
- $(PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc
- 	mkdir -p $(PLUGIN_DIR) && \
- 	cd $(PLUGIN_DIR) && \
--	$(CXX) $(CXXFLAGS) \
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) \
- 	   $(DEFS) $(VERSION_DEFS) \
- 	  -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
- 	  -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \
-@@ -362,7 +362,7 @@
- 
- $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
- 	cd $(PLUGIN_DIR) && \
--	$(CXX) $(CXXFLAGS) \
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) \
- 	  $(PLUGIN_OBJECTS) \
- 	  $(GLIB_LIBS) \
- 	  $(MOZILLA_LIBS) \
diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch b/dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch
deleted file mode 100644
index b0dc15d32c78..000000000000
--- a/dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.ac.orig	2015-09-11 14:02:04.250280108 +0100
-+++ configure.ac	2016-02-18 09:36:04.684624293 +0000
-@@ -55,17 +55,6 @@
- IT_SET_VERSION
- IT_CHECK_XULRUNNER_VERSION
- 
--AC_CHECK_LIB(z, main,, [AC_MSG_ERROR("zlib not found - try installing zlib-devel")])
--dnl Check for libX11 headers and libraries.
--PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no])
--if test "x${X11_FOUND}" = xno
--then
--  AC_MSG_ERROR([Could not find x11 - \
--  Try installing libX11-devel.])
--fi
--AC_SUBST(X11_CFLAGS)
--AC_SUBST(X11_LIBS)
--
- dnl PR46074 (gcc) - Missing java.net cookie code required by IcedTea plugin
- dnl IT563 - NetX uses sun.security code
- dnl IT605 - NetX depends on sun.misc.HexDumpEncoder
diff --git a/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild
deleted file mode 100644
index ce19e653d3c5..000000000000
--- a/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-README_GENTOO_SUFFIX="-r1"
-
-inherit autotools eutils multilib readme.gentoo-r1 java-pkg-2 xdg-utils
-
-DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
-LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86"
-IUSE="doc javascript nsplugin tagsoup test"
-RESTRICT="test"
-
-CDEPEND="javascript? ( dev-java/rhino:1.6 )
-	nsplugin? ( >=dev-libs/glib-2.16:2= )
-	tagsoup? ( dev-java/tagsoup:0 )"
-
-DEPEND="${CDEPEND}
-	app-arch/zip
-	>=virtual/jdk-1.7
-	virtual/pkgconfig
-	nsplugin? ( net-misc/npapi-sdk )
-	test? (	>=dev-java/junit-4.8:4 )"
-
-RDEPEND="${CDEPEND}
-	>=app-eselect/eselect-java-0.2.0
-	>=virtual/jre-1.7
-	nsplugin? (
-		!dev-java/oracle-jdk-bin[nsplugin]
-		!dev-java/oracle-jre-bin[nsplugin]
-	)"
-
-src_prepare() {
-	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2779
-	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2780
-	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2855
-	epatch "${FILESDIR}"/${PN}-1.6-{javadoc,no-hg,launchers,respect-ldflags,unused-libs}.patch
-
-	if java-pkg_is-vm-version-ge "1.8" ; then
-		sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local tagsoup
-	use tagsoup && tagsoup="$(java-pkg_getjars tagsoup)"
-
-	local config=(
-		# Rename javaws to itweb-javaws as eselect java-vm manages
-		# javaws to prevent a clash with Oracle's implementation.
-		--program-transform-name='s/^javaws$/itweb-javaws/'
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
-		--with-java="${EPREFIX}"/usr/bin/java
-		--with-jdk-home="${JAVA_HOME}"
-		$(use_enable doc docs)
-		$(use_enable nsplugin plugin)
-		$(use_with javascript rhino)
-		$(use_with tagsoup tagsoup "${tagsoup}")
-	)
-
-	# See bug #573060.
-	xdg_environment_reset
-
-	# Rely on the --with-jdk-home option given above.
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf "${config[@]}"
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild b/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild
deleted file mode 100644
index d680ff97d0cb..000000000000
--- a/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-README_GENTOO_SUFFIX="-r1"
-
-inherit autotools eutils multilib readme.gentoo-r1 java-pkg-2 xdg-utils
-
-DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
-LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="doc javascript nsplugin tagsoup test"
-RESTRICT="test"
-
-CDEPEND="javascript? ( dev-java/rhino:1.6 )
-	nsplugin? ( >=dev-libs/glib-2.16:2= )
-	tagsoup? ( dev-java/tagsoup:0 )"
-
-DEPEND="${CDEPEND}
-	app-arch/zip
-	>=virtual/jdk-1.7
-	virtual/pkgconfig
-	nsplugin? ( net-misc/npapi-sdk )
-	test? (	>=dev-java/junit-4.8:4 )"
-
-RDEPEND="${CDEPEND}
-	>=app-eselect/eselect-java-0.2.0
-	>=virtual/jre-1.7
-	nsplugin? (
-		!dev-java/oracle-jdk-bin[nsplugin]
-		!dev-java/oracle-jre-bin[nsplugin]
-	)"
-
-src_prepare() {
-	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2855
-	epatch "${FILESDIR}"/${PN}-1.6-{launchers,respect-ldflags,unused-libs}.patch
-
-	if java-pkg_is-vm-version-ge "1.8" ; then
-		sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local tagsoup
-	use tagsoup && tagsoup="$(java-pkg_getjars tagsoup)"
-
-	local config=(
-		# Rename javaws to itweb-javaws as eselect java-vm manages
-		# javaws to prevent a clash with Oracle's implementation.
-		--program-transform-name='s/^javaws$/itweb-javaws/'
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
-		--with-java="${EPREFIX}"/usr/bin/java
-		--with-jdk-home="${JAVA_HOME}"
-		$(use_enable doc docs)
-		$(use_enable nsplugin plugin)
-		$(use_with javascript rhino)
-		$(use_with tagsoup tagsoup "${tagsoup}")
-	)
-
-	# See bug #573060.
-	xdg_environment_reset
-
-	# Rely on the --with-jdk-home option given above.
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf "${config[@]}"
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild
index 59471a081976..caabab18f661 100644
--- a/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/AdoptOpenJDK/${PN}/archive/${P}.tar.gz
 	$(cargo_crate_uris ${CRATES})"
 LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="doc"
 
 # tests require ton of java deps we don't have packaged/working
@@ -23,6 +23,7 @@ RESTRICT="test"
 
 BDEPEND="
 	app-arch/zip
+	sys-devel/bc
 	virtual/jdk:1.8
 	virtual/pkgconfig
 	virtual/rust
diff --git a/dev-java/icedtea-web/metadata.xml b/dev-java/icedtea-web/metadata.xml
index ebaf03b08ffb..9f30040ec416 100644
--- a/dev-java/icedtea-web/metadata.xml
+++ b/dev-java/icedtea-web/metadata.xml
@@ -8,11 +8,6 @@
 	<longdescription>
 		FOSS Java Web Start and optional browser plugin implementation based on NetX, to be used with icedtea.
 	</longdescription>
-	<use>
-		<flag name="javascript">Enable support for using proxy auto config (PAC) files.</flag>
-		<flag name="nsplugin">Enable the browser plugin (NPPlugin).</flag>
-		<flag name="tagsoup">Depend on dev-java/tagsoup which allows parsing malformed .jnlp files</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">AdoptOpenJDK/IcedTea-Web</remote-id>
 	</upstream>
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 5f4428c34f51..9fdd2e2050f6 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,28 +1,17 @@
 AUX icedtea.env.sh 954 BLAKE2B 4cb0d8baef5f9a6527b8d15e7258805bb859cd79aec1ee0dbbb2aa369d0ecc83cb11a482d6bf5a17a6692da1bdf40ec1544ecdf31d46bcded7a3832d0553ee1a SHA512 80161624e52e705cab16edf04e304906dc0a37b86442e63a9ff8fdda321c4888ab12e8b66dc2f4487fe9bd86bb9f33d597b489d2d486894a36e91ed7563ef23a
-DIST icedtea-3.17-aarch32-3.17.0.tar.xz 7054840 BLAKE2B 461939116607f82b5aef6dd093204dcf383e209630945f6f0ff0360bbe306e7afc2b1ae339911954c2b80446d37e0d25a587912cbfbebe0ace2e701c2e9e9f67 SHA512 493d9a98166255a630306bf1e67e681e0b2ece42b6e7a96c75b2cfb6cb0639b8c9ed8918eb129c9543fab1805a4ac33774f25ecb2272703eabd6eeb680327717
-DIST icedtea-3.17-aarch32-3.17.1.tar.xz 7054944 BLAKE2B 3bbd364f8af7d4aba6f268058ab5e59ad78a8d696a7cf01df9d8b5e49b8a2e4265c93913fe6e696b4017a8d763cf81d45cc511e1fbe41a0e425f78435fbb9bca SHA512 81e149c3afa8678f2e31b2af6c127e49e131ce7f99873dca012bdd83d1cc64fcd9ca6b4d4cd9dded10e8e6e82648a562ee448822bf3aa161aff2e17e11e644cb
-DIST icedtea-3.17-corba-3.17.0.tar.xz 948464 BLAKE2B 97050f07a9ee39c763cff67dcb19ad772fa2529103647b0ec7cdfd40f926cea67e6e02d3f10e7d5aefd8221476c923630f4b9fd6d5f95ae4c74b46e44c911520 SHA512 cec56b02b47f96ac97d6485fc18ea30100ba64c0acd509d408ddfe43e36e14ebf2345b3fefcf001af378af9ed3628ca8c45add604bd435806eba47c9f2945993
-DIST icedtea-3.17-corba-3.17.1.tar.xz 948536 BLAKE2B fce8f3e2ee45326c8eed67b511c74d5d63f38ab5c85b120ce8230b1b1a98a6e6e467e4ee3e935f05bba347ecbaf990494a295b0d2b7e1de7c53d6cbbe39febc8 SHA512 c33886bfa517087e3cf37064fd9dcf1c0b8a9c9ccc4147beac3eb9c07e66c2f8aa3053feb8ab6cbdd42054b073854ed5aaf4a2cfb2888e0a09b7efe3809447c8
-DIST icedtea-3.17-hotspot-3.17.0.tar.xz 7107508 BLAKE2B 61148d11c2cea5fa18e9d115be7dfefa68825cb5396465c2b1c991402ba1a000f2e780773a83a95741571a38992839206e21f26954773fa2306e1a6d4d7eaad9 SHA512 cb1bdf3ab9aee48e745108d2762992c2a6be21e22bf6633a512f4bff28becb61e4cdd3662e7301aa7067271c6c80a8ac2a65fdb5b432b8c02d38b6fd74c7f9e8
-DIST icedtea-3.17-hotspot-3.17.1.tar.xz 7109408 BLAKE2B 902cc0f66c655e9b1754b89430ea092aa04c01fb74f8341a5d66e9f1d7026b23b61e13f5574dafdcfb292a60921b7d1276d36dc5c6110819343aa3a9a9d446db SHA512 e377a2ad481727a1d5218f1bf629690ea5f1b7976307f593505efc07252cc5cd408f7eb0873032ec74ed44a31e5f2cd90747be3e6f709eba5ac9fd90857887ab
-DIST icedtea-3.17-jaxp-3.17.0.tar.xz 2268024 BLAKE2B c1fe1e2a6f28d7108dcbdead86e5ef0836877ebb89ba0446045aad3797616e5a16125d6d6dba425b244710bba77ce8a5ac4c6780dd0ab2b9b35f51d551f291b3 SHA512 a7d69f94cb7ce63522dbe1d16376ff0f39e5e5f013f3a895070dcb05d524f63ecbb1ab3d109edbd48e3bfc6e5758200c95b7ec18ceb84cc580a93395760b975a
-DIST icedtea-3.17-jaxp-3.17.1.tar.xz 2267932 BLAKE2B a38d42d37902deb367ec804771feff7590b4448f11aac012c84880dd8ea8d7acafe204fb8756d2475148e59509b09003ed0edd167ca3798bc67a02f29570d28f SHA512 e690a6c498e2418feaa22713517aefd051524aedd349fbab5c70fbdee3ca0f17a297089e02f1de2a27e318413e5ca6fe7dfd825b49c37e749ff48e9c8981307a
-DIST icedtea-3.17-jaxws-3.17.0.tar.xz 2277156 BLAKE2B 0ea611d90eac928c974d80ae366a95ba7d13b958b7b5e31766ede059015478c3bd87bce4cee2f4350e7dbc8ab27ac2a6e7190efdb61b4e595e8741ab28fa8b1f SHA512 65821e62a2f25e77f3345894d1982e2b6d877ee6ddd2b1dba77b94f1175f7d88fd77ca2d2727f625765702846711f85821f87f62fb6359d2502f57436a22290c
-DIST icedtea-3.17-jaxws-3.17.1.tar.xz 2277028 BLAKE2B 0c78fdd7ad320657cc084db03d2f4917a4cc328bc0d64877ed23cbfe89bbcd445716a3677d769da1cc177da956fcb5d34100528bd837ea4704fc4267b9b0a996 SHA512 99c32483c6f5469c256026be9ee5c2a5654768ceff9d10fa9aa10888640af60d618668ae47880062d1253668e546949fd6ffe94c27d6436088e0a8367e2602fd
-DIST icedtea-3.17-jdk-3.17.0.tar.xz 40601488 BLAKE2B 18c0629aba53b763680fb2e0dd4ad500db286e584d6aaaf43339559907636f8cd4cae9445131164be810ac2518445c8025d4e361e4c6f31d5436bbea1cb254e3 SHA512 42d5387b228ea3143eb91e4fe661a1d578b879b884f098045b8248c77d1f4a583921c520cfab078847b74615732f2e9318bd532b00ce266dad2364f5a640251d
-DIST icedtea-3.17-jdk-3.17.1.tar.xz 40596084 BLAKE2B 9a6f636e4630156bf28c65ade834bc027abf094615df117d5e1579427b3c609b9445fcc947f485e0b600c899da0b7bcc8b63c45aaa870c8172babaddb63e663e SHA512 7f5321944cc6c7510db5d6ea6ef189bd15fdf7c904c8ec009576c33ce1e0288e18e51a5dc906e5c7c3beb4daebb161be0c08d1fe8f2ebde81b72a992da919142
-DIST icedtea-3.17-langtools-3.17.0.tar.xz 2079284 BLAKE2B 0e1d435a54167cf9b3cd381cf12d156ce59da99dd3f02d72422329ee70d7f00dbb25713c315b36a4569408a7ab376de21f0ae525bf7cb3ef54c5fa51ebe50eb1 SHA512 7cd63565adb0beb0a7bf6efc35dacc9bcc8cc48e0e6462c4f295783a48de999fe877964509b81375603fbae18c231084c82cf22c1ee3bb4309360ec2685cebe0
-DIST icedtea-3.17-langtools-3.17.1.tar.xz 2080096 BLAKE2B 0a14904a867ccaf016937d1ad806dca11989a0119e5539cc86480ec01e955d91107d21d58748fb667ff8b68af497c87eb7bcfc8fd8f7c3685136ae88218a059d SHA512 68ff7857d180b90a77858505523416bee6102e30af7a394d08ab1581ba65d28b78c30f48c1b5555c30bf8b43adc5497d5530372101dc2e4adbc99e5d9c988def
-DIST icedtea-3.17-nashorn-3.17.0.tar.xz 2320268 BLAKE2B d77ea15aa6d1b268fcd06a3222f7f526cb46887e0454a612ddf7fd57465c166ebe1ce16436c90ada71a097292be334e25622b223fb40708976f3d3cd7514e23a SHA512 50c5a4e4faa377e8b61395062a7b86856553e48a66d32d83730a536bb8c09f768a78dfc604e679c8fa5c9297887d6432012b2db2f7810b00aaebee3c775960b3
-DIST icedtea-3.17-nashorn-3.17.1.tar.xz 2319500 BLAKE2B 5748eed107f62f17624c0db99b6ca76bdff4c4deba57f579f50dad36b5e1d055b1a80099be6503ee5897203a20d356050e1974883b46cb1cf892e0100474094d SHA512 088948d01fc6ea627610bbdcf6691a7bcdd34c5715be103297292db54d0e9080f82f395c3b4bb432058615bc04e05c2d4292fc8f31735e3005d4cf16ff1f9af1
-DIST icedtea-3.17-openjdk-3.17.0.tar.xz 364764 BLAKE2B c0bb286b691c50ca9d0e6982dab73929065a3af13f1974bd661a51e4959eec38a045fa7032854a65a17cc3f8a826f881c46eda062225af551da7c22f9591ee4f SHA512 4b074a6b14efcb23476a1fed56d52e8f2defea16f840a714324cfd0c3302e3a742123e86f8964a5708600f0856ae1c4daacd0513eaed35d299512277eed7eca8
-DIST icedtea-3.17-openjdk-3.17.1.tar.xz 364724 BLAKE2B 2e608d47d746cd8702e41b54fbe8984c6887dea3a40b4f28db11fb73b7078d13a41db0ceac73ad70359c89e4d03c1e64a8a41c2e0a7b4747b832d7398d8a89af SHA512 82f2688b018b893cbf583ccc1cd328f6909ebeb4d30655ddb554691f1f0ee38debe57dc91bc8200d6676ad531047ffbf149ce7c1e49b65e67db3254c7d6205ed
-DIST icedtea-3.17-shenandoah-3.17.0.tar.xz 7277048 BLAKE2B 034d27ce07b48d27302180da2b100cdf97adc7109a56e9cb67ee37f93957f009f65a460b706ff563c0022efdfd1749322caee069916df4e090aee217ca60b1cd SHA512 ce7df9784a48028ea69f6a2b0f5b08a13456e71ce3e8773b14e5a7c801b0917dd7f5609e2dcdf574836ec2d69bc0acec0648ee087283052c200822b3786e155d
-DIST icedtea-3.17-shenandoah-3.17.1.tar.xz 7276688 BLAKE2B 02db748f1b87694fe0995b153211ccfeb8719a0b8e5f32396eff15012e396647294eb809b6561f1ed845cfd0f43a8b297f55f444651020ea42f1a05c2f0d4692 SHA512 a1bdda704f0331ad445143a7bd9fba33090c2cfd1a6d73a6c427378e3685ca40e0d600256c3c678820061e93d5bdc3faf9040bb11e62647d7b3f9218406405a7
-DIST icedtea-3.17.0.tar.xz 1565156 BLAKE2B f2b5f0b0ac1de70ddd5faa1215fcb17b5b7bee726ca5dd81bc2e3948c7fd342dfe1d7c9dbd232696bf0f2d68f214b0132f386d182b1fe15ec72cdb77cc0ba67c SHA512 4183037d6829f7fdd25b970853e84bfeecb45adca7fb78e773c431e401c155c212b78bc6daf80d8479c13e9ca63ad5446122a8ec2d6e6b1bede8ee747ba7a91b
-DIST icedtea-3.17.1.tar.xz 1565996 BLAKE2B 36a92826fd7f1cda9b1b90d93b57c4fe63cdcbd3e5d6320f3b6ac9819720156943232b17c9b3a6a5ca796cb2a29ef47426e9f10491af844bfa12a99252312d69 SHA512 eaf66df177f08cf335fe795f816e4f6b70a25a402ff8db4c1a2c545dd129350e1135c45e131eab8820620de2a75fda1d56141583ec1a651218d0a02680eb1df7
+AUX openjdk-8-hotspot-arrayallocator.patch 647 BLAKE2B b2403d842ace7198520a25bf7c2027e6d74b5d418b52321722b21cac866df883d47e53e4f5e040aed55a9cc4bf03b5a62d008a0877add6c649a41f6230d78a38 SHA512 4bf002ec25844f4e55b588d0516e658c548700d3bcae79be74bf75d9cf30cf9cd448767db36935924dd3b07f34d0cf087321cb35abb4943690353d11485ab0de
+DIST icedtea-3.18-aarch32-3.18.0.tar.xz 7057736 BLAKE2B bd681871da038ee1eaabe5c38e830a9d80fff30f8793b81afb69803107d0ee2ae8f3dad3985ec05c86120f1e3c86101984397476a76bce30a7b1852784175521 SHA512 3bc033bb4256d6a8ee8387998fbb4b1a14d2c6882337366085ca4648eb9b2a34176003e23e420703a075fb5322a1be3547d5ed82188d97e1f12429b4a8b3671d
+DIST icedtea-3.18-corba-3.18.0.tar.xz 948504 BLAKE2B 00deb77d5aebf19ad404bf44ac7367017f8aee6699e11b93d2cb44f7d23f17f13caba8aee9862b25e528bee3d8fbfa728260850d1aa2f66839b079b1111d3af4 SHA512 db71a9fd6288a8217a8338dda70a87eb4b97f1659c7e990eccd2774785bf1da9e35b71e231e108c610784922d1fa01cdaf115941189910ef9c68cf70746296ea
+DIST icedtea-3.18-hotspot-3.18.0.tar.xz 7110964 BLAKE2B ac45a7271f50a93b0ee27e6096820f3f93a02db42c6fde549515c3297590c94fff349a6cec5c9caf7bda31bbe36d6609097b4f73e99cdc1fe46bcfff0330a82e SHA512 abc46441c6ea7f652ee42376425e2fdd34a18de0803a13f38aa002a57a2835f8e2995f9a762fb53f114ad7b1030fc9ab82bd00839fccf57315018519df1c5c5f
+DIST icedtea-3.18-jaxp-3.18.0.tar.xz 2268136 BLAKE2B 6f398420e55684792020da116f8da25e1b4a59b2423d6b37ed55a567ba68aedca7a59c99ee0e3a87785a12910b518d07a9d0d248bb3ae151f81c7622ec904299 SHA512 fe8d25e38d05e0f65f91712ee7e4b6469605c9a6bd9b0cbdd29f483889b267483008fb913191ffa277047a66ad43eb397582935d984fad00e469b118532a1adf
+DIST icedtea-3.18-jaxws-3.18.0.tar.xz 2277356 BLAKE2B f0c3123722df57346461940f41e6b394a34c9e508ab3d2fa9f75581d4d626468394e2854129671e9bd68ecd217ed3aa0933cd14e2e74acd82d1cccd897e2b209 SHA512 b6879bdab06d1706945960b64f8dcff5ee8e81b95a733807768a0c2a5f329967e671d760a64239a42d6d5f9bf55b2904bf67082a4cd01ca5656bc323b041ff19
+DIST icedtea-3.18-jdk-3.18.0.tar.xz 40637140 BLAKE2B de565a2ba7cdb3732a551aa513cac3f52bf330590e011c6b05d47da1cee8389315ba3eb8112ce3c3d0510a049c49c147ea3a474eaadf70535fe30f63576fa293 SHA512 022115dbfc9ab7217a74b10e347a6a3a5eaa1112fef53cb37ff9dc003ec5bd3018b5b0bf675465d1c496e57b9b177102c6fef135acc881f3db49bea51c4f7375
+DIST icedtea-3.18-langtools-3.18.0.tar.xz 2080068 BLAKE2B e2781cc6728594a6c5e8dd213c810ae7fbed8d365da6db600e75b5786573b3d201cb0c3ed10221de1c139fe7ed55b59e57c47927272374e32ae94e586d6f0f9d SHA512 d96ded5041e488860baf1c17346e9342fb086e999fbf5d5a4dd5be97e0db17771f594c60f584d549d7ce1b4e1aa58b165a32f0633101bb70ea5c2d77758bb42b
+DIST icedtea-3.18-nashorn-3.18.0.tar.xz 2323912 BLAKE2B ab0c7dc3635a6eb7feb350d56c0fd5e03b36b60b107b26dbb04262291c4c0d57077bff5f7d949d95ec1de04210e06f40600d360600db09421f1dc0f801968817 SHA512 2bd488893ac33a16480cceb16fab62c11f8032e68d84818ad20aaa4c3928af6c77c60f8bd94878aa02b703e0302847272688d8641145972071c4e9a048cd5a13
+DIST icedtea-3.18-openjdk-3.18.0.tar.xz 364932 BLAKE2B 098ae1025f0457e14a4afc7b67ad6063f99be5fa486a2f6e187e490fe7b87efbf1cdc6fad2b33f7ae4f92817d5a0410254c723853a2519dacb5c21961c4d7558 SHA512 b4b40d19bb12ae85d68b110eb51051c089a9b7e857eceb10429b609a9f11671cbee34cfcef5c89ef23ad6aea80e4bcad1ed085fb310e09942816c5dccc8f171d
+DIST icedtea-3.18-shenandoah-3.18.0.tar.xz 7279864 BLAKE2B 1d8cfccda9cf24a5522862634d3699a7bd9cd445da7a08ab2061da45ddb885e023d56c096813710ef4f7ddb458300737bae21a56900bfb00e3ed5ac696af2059 SHA512 f8c5d4f108a3575f154a462e8cf907c14fbcdfc95708ebabbf530a79cc66979cc7e141cd239d6603e4a47d114130b07e6f32edb9145930e573a239fa0c91e75b
+DIST icedtea-3.18.0.tar.xz 1565468 BLAKE2B e6bffb9860ae8824a96e55970056025bc426453c26f91a7eb52f01f5ada7c0cb0bdcc4efa503186f514759f914d9053d08ba540bde7d15be81736037ce5d8db5 SHA512 e94c365513e5fa8a17d61fe7957db85018510567df9ba115c9bca98c658257ff1f4dff7967e88b73088630f07670beeaa8cbe49706d6bd02fb2804abad5d95b1
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
-EBUILD icedtea-3.17.0.ebuild 12309 BLAKE2B 749c85a4365c8ce9330de196578f8a7b4cdaac48608e24c50df9244e27e95f62ef97c5b5652cf1af25b3042dfe537344acb617efe54b5cd481b971bb620f7a6f SHA512 9770ce5deb3950ceda3d5fd4089c09feaea93c2181751a561a4166333f727f7afd3a46d0b49bd15174184e1a4b5a72f866d2fdf679886b0e8cd52f8445b29ac7
-EBUILD icedtea-3.17.1.ebuild 12309 BLAKE2B 37146e81d1edc8dd7fc12baa6ed22c4498cc9768d95d14f371003b60d4eb52df0249f3a9a0f15832a78cf52aef3453684b2b5aa57129ed77a48189d9adc36b0c SHA512 edb424109fae679985c7b53eddced8aa926bf812291a2a580b37d8430c4e4e6b506a04db15a5f9cd86151102c1dc1dd4636c39e1ccfe3f604006f587633098e3
+EBUILD icedtea-3.18.0.ebuild 12444 BLAKE2B 067eb985809926407278329743801f66839f4d669f72b8c8586af86421ebb18eb67f8d5da9754199c96e89f904001893ed244e88a13f71692c79ff77d1334b9b SHA512 4a29356a7ad8ff66cde98666ed494ec79581f6276e48ce44000c83fee027118ae48fe05689e052aae405dd510d53d725b4a2c864ee6ff637de086b2d3dab91d8
 MISC metadata.xml 2108 BLAKE2B 3160040a91a46f2b5dc9be02405ad35849b5c02ddfae81a17ec47a15bd9103cb17bcd0c1065a660e3ffcd4e8d815fffab4c020d3dfbe5e9936826bb15072e00d SHA512 fdcb8411daaabf953bbb75d8b58137ab1f7a3755a1c016ba431ab366177eb91e9cef365fc921d989384f076c589fc46358838d4a4c86cd50955cfcfc9b97dd74
diff --git a/dev-java/icedtea/files/openjdk-8-hotspot-arrayallocator.patch b/dev-java/icedtea/files/openjdk-8-hotspot-arrayallocator.patch
new file mode 100644
index 000000000000..ba5283f15771
--- /dev/null
+++ b/dev-java/icedtea/files/openjdk-8-hotspot-arrayallocator.patch
@@ -0,0 +1,16 @@
+Workarounds build error:
+Error: dl failure on line 895
+Error relocating .../libjvm.so: _ZN14ArrayAllocatorImL10MemoryType7EE4freeEv: symbol not found
+
+Possibly due to g++ 10.x error on not properly instantiating the template.
+
+--- openjdk/hotspot/src/share/vm/utilities/bitMap.cpp.orig	2020-11-10 14:07:08.372045326 +0200
++++ openjdk/hotspot/src/share/vm/utilities/bitMap.cpp	2020-11-10 14:08:07.911412813 +0200
+@@ -42,6 +42,7 @@
+ # include "os_bsd.inline.hpp"
+ #endif
+ 
++template class ArrayAllocator<BitMap::bm_word_t, mtInternal>;
+ 
+ BitMap::BitMap(bm_word_t* map, idx_t size_in_bits) :
+   _map(map), _size(size_in_bits), _map_allocator(false)
diff --git a/dev-java/icedtea/icedtea-3.17.0.ebuild b/dev-java/icedtea/icedtea-3.17.0.ebuild
deleted file mode 100644
index 0699e1a02b52..000000000000
--- a/dev-java/icedtea/icedtea-3.17.0.ebuild
+++ /dev/null
@@ -1,379 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="6"
-SLOT="8"
-
-inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix toolchain-funcs versionator xdg-utils
-
-ICEDTEA_VER=$(get_version_component_range 1-3)
-ICEDTEA_BRANCH=$(get_version_component_range 1-2)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-ICEDTEA_PRE=$(get_version_component_range _)
-
-CORBA_TARBALL="${PV}.tar.xz"
-JAXP_TARBALL="${PV}.tar.xz"
-JAXWS_TARBALL="${PV}.tar.xz"
-JDK_TARBALL="${PV}.tar.xz"
-LANGTOOLS_TARBALL="${PV}.tar.xz"
-OPENJDK_TARBALL="${PV}.tar.xz"
-NASHORN_TARBALL="${PV}.tar.xz"
-HOTSPOT_TARBALL="${PV}.tar.xz"
-SHENANDOAH_TARBALL="${PV}.tar.xz"
-AARCH32_TARBALL="${PV}.tar.xz"
-
-CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
-AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
-
-CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DROP_URL="https://icedtea.classpath.org/download/drops"
-ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="https://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
-	https://icedtea.classpath.org/download/source/${SRC_PKG}
-	${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
-	${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
-	${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
-	shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
-	arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
-	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
-	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-IUSE="+alsa cacao +cups doc examples +gtk headless-awt
-	jamvm +jbootstrap kerberos libressl pax_kernel +pch
-	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="gtk? ( !headless-awt )"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	>=media-libs/giflib-4.1.6:0=
-	>=media-libs/libpng-1.2:0=
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	x11-libs/libXcomposite"
-X_DEPEND="
-	x11-base/xorg-proto
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2"
-
-# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
-COMMON_DEP="
-	>=dev-libs/glib-2.26:2=
-	>=dev-util/systemtap-1
-	media-libs/fontconfig:1.0=
-	>=media-libs/freetype-2.5.3:2=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:0=
-	kerberos? ( virtual/krb5 )
-	sctp? ( net-misc/lksctp-tools )
-	smartcard? ( sys-apps/pcsc-lite )
-	system-lcms? ( >=media-libs/lcms-2.9:2= )"
-
-# Gtk+ will move to COMMON_DEP in time; PR1982
-# gsettings-desktop-schemas will be needed for native proxy support; PR1976
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	!dev-java/icedtea-web:7
-	>=gnome-base/gsettings-desktop-schemas-3.12.2
-	>=sys-apps/baselayout-java-0.1.0-r1
-	virtual/ttf-fonts
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )
-	gtk? (
-		>=dev-libs/atk-1.30.0
-		>=x11-libs/cairo-1.8.8
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.8:2
-		>=x11-libs/pango-1.24.5
-	)
-	!headless-awt? ( ${X_COMMON_DEP} )
-	selinux? ( sec-policy/selinux-java )"
-
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# perl is needed for running the SystemTap tests and the bootstrap javac
-# lsb-release is used to obtain distro information for the version & crash dump output
-# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
-# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
-# Ant is no longer needed under the new build system
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
-	|| (
-		dev-java/openjdk-bin:8
-		dev-java/openjdk:8
-		dev-java/icedtea-bin:8
-		dev-java/icedtea:8
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	dev-lang/perl
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl:0 )
-	sys-apps/attr
-	sys-apps/lsb-release
-	x11-libs/libXt
-	virtual/pkgconfig
-	pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
-	local CHECKREQS_DISK_BUILD
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="9000M"
-	else
-		CHECKREQS_DISK_BUILD="8500M"
-	fi
-
-	check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	icedtea_check_requirements
-}
-
-pkg_setup() {
-	icedtea_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="
-		openjdk-8 openjdk-bin-8
-		icedtea-8 icedtea-bin-8"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${SRC_PKG}
-}
-
-src_configure() {
-	# GCC10/-fno-common handling, #723102
-	if [[ $(gcc-major-version) -ge 10 ]]; then
-		append-flags -fcommon
-		append-flags -fno-delete-null-pointer-checks -fno-lifetime-dse
-	fi
-
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter #nowarn
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
-	local vm=$(java-pkg_get-current-vm)
-
-	# gcj-jdk ensures ecj is present.
-	if use jbootstrap || has "${vm}" gcj-jdk; then
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		config+=" --enable-bootstrap"
-	else
-		config+=" --disable-bootstrap"
-	fi
-
-	# Use Zero if requested
-	if use zero; then
-		use_zero="yes"
-	fi
-
-	# Use JamVM if requested
-	if use jamvm; then
-		use_jamvm="yes"
-	fi
-
-	# Use CACAO if requested
-	if use cacao; then
-		use_cacao="yes"
-	fi
-
-	# Are we on a architecture with a HotSpot port?
-	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
-	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
-		hotspot_port="yes"
-		# Work around stack alignment issue, bug #647954.
-		use x86 && append-flags -mincoming-stack-boundary=2
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use Zero for now until alternate VMs are working
-	if test "x${hotspot_port}" != "xyes"; then
-			use_zero="yes"
-	fi
-
-	if use shenandoah; then
-		if { use amd64 || use arm64; }; then
-			hs_config="--with-hotspot-build=shenandoah"
-			hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
-		else
-			eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
-		fi
-	else
-		if use arm ; then
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
-		else
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
-		fi
-	fi
-
-	# Turn on JamVM if needed (non-HS archs) or requested
-	if test "x${use_jamvm}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-jamvm"'
-		fi
-		ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
-		jamvm_config="--enable-jamvm"
-	fi
-
-	# Turn on CACAO if needed (non-HS archs) or requested
-	if test "x${use_cacao}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-cacao"'
-		fi
-		ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
-		cacao_config="--enable-cacao"
-	fi
-
-	# Turn on Zero if needed (non-HS/CACAO archs) or requested
-	if test "x${use_zero}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
-		fi
-		zero_config="--enable-zero"
-	fi
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		config+=" --enable-precompiled-headers"
-	else
-		config+=" --disable-precompiled-headers"
-	fi
-
-	config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	# force bash for now https://bugs.gentoo.org/722292
-	CONFIG_SHELL="${EPREFIX}/bin/bash" econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
-		--with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
-		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
-		--with-pkgversion="Gentoo ${PF}" \
-		--disable-ccache \
-		--disable-downloading --disable-Werror --disable-tests \
-		--disable-systemtap-tests --enable-improved-font-rendering \
-		--enable-system-jpeg --enable-system-zlib \
-		$(use_enable headless-awt headless) \
-		$(use_enable !headless-awt system-gif) \
-		$(use_enable !headless-awt system-png) \
-		$(use_enable doc docs) \
-		$(use_enable kerberos system-kerberos) \
-		$(use_enable system-lcms) \
-		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
-		$(use_enable sctp system-sctp) \
-		$(use_enable smartcard system-pcsc) \
-		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
-}
-
-src_compile() {
-	default
-}
-
-src_test() {
-	default
-}
-
-src_install() {
-	default
-
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}${dest#/}"
-
-	if ! use alsa; then
-		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	if ! use examples; then
-		rm -r "${ddest}"/demo "${ddest}"/sample || die
-	fi
-
-	if ! use source; then
-		rm -v "${ddest}"/src.zip || die
-	fi
-
-	dosym ../../../usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}"
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-	java-vm_install-env "${FILESDIR}/icedtea.env.sh"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	java-vm-2_pkg_postinst
-	einfo "JavaWebStart functionality provided by icedtea-web package"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	java-vm-2_pkg_postrm
-}
diff --git a/dev-java/icedtea/icedtea-3.17.1.ebuild b/dev-java/icedtea/icedtea-3.18.0.ebuild
index 3facf26dfd28..0ec907375811 100644
--- a/dev-java/icedtea/icedtea-3.17.1.ebuild
+++ b/dev-java/icedtea/icedtea-3.18.0.ebuild
@@ -7,15 +7,14 @@
 # * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
 # *********************************************************
 
-EAPI="6"
+EAPI=6
 SLOT="8"
 
-inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix toolchain-funcs versionator xdg-utils
+inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix toolchain-funcs xdg-utils
 
-ICEDTEA_VER=$(get_version_component_range 1-3)
-ICEDTEA_BRANCH=$(get_version_component_range 1-2)
+ICEDTEA_VER=$(ver_cut 1-3)
+ICEDTEA_BRANCH=$(ver_cut 1-2)
 ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-ICEDTEA_PRE=$(get_version_component_range _)
 
 CORBA_TARBALL="${PV}.tar.xz"
 JAXP_TARBALL="${PV}.tar.xz"
@@ -77,10 +76,9 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk? ( !headless-awt )"
 
 # Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
+ALSA_COMMON_DEP=">=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP=">=net-print/cups-1.2.12"
+
 X_COMMON_DEP="
 	>=media-libs/giflib-4.1.6:0=
 	>=media-libs/libpng-1.2:0=
@@ -89,12 +87,15 @@ X_COMMON_DEP="
 	>=x11-libs/libXi-1.1.3
 	>=x11-libs/libXrender-0.9.4
 	>=x11-libs/libXtst-1.0.3
-	x11-libs/libXcomposite"
+	x11-libs/libXcomposite
+"
+
 X_DEPEND="
 	x11-base/xorg-proto
 	>=x11-libs/libXau-1.0.3
 	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2"
+	>=x11-libs/libXinerama-1.0.2
+"
 
 # The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
 COMMON_DEP="
@@ -104,13 +105,19 @@ COMMON_DEP="
 	>=media-libs/freetype-2.5.3:2=
 	>=sys-libs/zlib-1.2.3
 	virtual/jpeg:0=
+	gtk? (
+		>=dev-libs/atk-1.30.0
+		>=x11-libs/cairo-1.8.8
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.8:2
+		>=x11-libs/pango-1.24.5
+	)
 	kerberos? ( virtual/krb5 )
 	sctp? ( net-misc/lksctp-tools )
 	smartcard? ( sys-apps/pcsc-lite )
-	system-lcms? ( >=media-libs/lcms-2.9:2= )"
+	system-lcms? ( >=media-libs/lcms-2.9:2= )
+"
 
-# Gtk+ will move to COMMON_DEP in time; PR1982
-# gsettings-desktop-schemas will be needed for native proxy support; PR1976
 RDEPEND="${COMMON_DEP}
 	!dev-java/icedtea:0
 	!dev-java/icedtea-web:7
@@ -119,17 +126,10 @@ RDEPEND="${COMMON_DEP}
 	virtual/ttf-fonts
 	alsa? ( ${ALSA_COMMON_DEP} )
 	cups? ( ${CUPS_COMMON_DEP} )
-	gtk? (
-		>=dev-libs/atk-1.30.0
-		>=x11-libs/cairo-1.8.8
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.8:2
-		>=x11-libs/pango-1.24.5
-	)
 	!headless-awt? ( ${X_COMMON_DEP} )
-	selinux? ( sec-policy/selinux-java )"
+	selinux? ( sec-policy/selinux-java )
+"
 
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
 # perl is needed for running the SystemTap tests and the bootstrap javac
 # lsb-release is used to obtain distro information for the version & crash dump output
 # attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
@@ -198,6 +198,13 @@ src_configure() {
 		append-flags -fcommon
 		append-flags -fno-delete-null-pointer-checks -fno-lifetime-dse
 	fi
+	# this patch helps with gcc10 as well
+	# since build system unpacks tarballs itself, this is a way to force makefile
+	# to apply our patch. it expects relative path inside source, so we can't specify
+	# ${FILESDIR} directly.
+	mkdir -v gentoo_patches || die
+	cp -v "${FILESDIR}/openjdk-8-hotspot-arrayallocator.patch" gentoo_patches || die
+	export DISTRIBUTION_PATCHES="gentoo_patches//openjdk-8-hotspot-arrayallocator.patch"
 
 	# For bootstrap builds as the sandbox control file might not yet exist.
 	addpredict /proc/self/coredump_filter #nowarn
diff --git a/dev-java/ini4j/Manifest b/dev-java/ini4j/Manifest
index 19d2d3d153b8..f56964999a9c 100644
--- a/dev-java/ini4j/Manifest
+++ b/dev-java/ini4j/Manifest
@@ -3,5 +3,5 @@ AUX ini4j-0.5.2-remove.patch 799 BLAKE2B 1ab11eb06ca088b2c021df564af1adaeb51c687
 DIST ini4j-0.5.1.jar 61117 BLAKE2B dedeefed13b66d21f185b786ed9cf5b045a06cf6ab8db108258597ed51e2625ec41e9c23fb032b4d77110f415a10641ad3e673f958842dfcde192bfb9d693d68 SHA512 1c4b5218d092cab9374070c8ae55c7a2483b30893f5af5cfe5d74054b2f5261fe2e1a477a650589d2fc7518b4dcce91a2308ab35bba6b3d918f5e5c19a55eb9a
 DIST ini4j-0.5.2.jar 63258 BLAKE2B 130cf84292295138f8893bcc30aed5b5dcd9eadb6d7f0b984a40388a160ce1f007b4728a13b06cb291a67436fad3bd987b28a068c22cb31e480b35378ff95263 SHA512 eab45f21a9f8f8bc8fdb8654e914ffc9e7eb829169f56a7e1b548a4237eb94e616abe84d78649037ff6254fb00e83b9167bafaf1fe5d97fbf3787838e9bf0fab
 EBUILD ini4j-0.5.1.ebuild 576 BLAKE2B 61babe60b320f38587eb3b4de0438f075a2f9d0ec7bc338358beea6f6c3fbe22bac3e8019bce120f90379d850c7977ad48da158ba9c077b8456f722db6d18211 SHA512 3b428d07dfae00a1db50663df64a647f89b0a8f94bd2856bd2668dda0a8f109d61890eca5c18781c7910f63c53902d21ae612669879667c66b794ae257ed2ffc
-EBUILD ini4j-0.5.2.ebuild 576 BLAKE2B 156100c25e6e71ccd479bd786abc0a8a38a09a8ca43bc216f53b9d43e4069a2cf6f2415732538d505d849af48315cfd6a921bd2aadca7d02104255197af3fe2e SHA512 32bf775cd255c1195056cd2c0c6da3d026fb3eab032a0c001271ce21774acf34edab9430ebcfe9bd4a3f587c399050155101d4b59921d5ff53487f2766b7b82c
+EBUILD ini4j-0.5.2.ebuild 595 BLAKE2B a240f611efb2dda072468a90ad322556bc3ad504e64aa5b9fa1493f549ade5252872aa9de0d81f080928bb198fcdd76bcf310d697dc583a517d7a35d5d1cdee0 SHA512 89b0881542da6e66192acdbcab9fe699cfd5a7ed71c5f957d142141e8b851ee7356219517d4b52b7eeddfebfc6559865fdbb71f56077c0ad2447ddf05e3c3aad
 MISC metadata.xml 406 BLAKE2B 078000cb59e2896dd632727b6fcb873dfd63d82f55bdab2c4930d879e0ce7117f0dd08e7b4833569dc270a79abfa045320983bf96e95a87d4872a176e3afb7c8 SHA512 089ac1e2bec5324bf326f74f516e5d60f7019e12598b65a1cbc4004d41bb73bc0b2f0f1934204f3b39b0c92f1dba0a1a6b1c09b9269e03fa7567e0c4b269beee
diff --git a/dev-java/ini4j/ini4j-0.5.2.ebuild b/dev-java/ini4j/ini4j-0.5.2.ebuild
index 25ecc920c18b..adbc494a4746 100644
--- a/dev-java/ini4j/ini4j-0.5.2.ebuild
+++ b/dev-java/ini4j/ini4j-0.5.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Simple Java API Windows style .ini file handling"
 HOMEPAGE="http://ini4j.sourceforge.net/"
@@ -21,7 +21,12 @@ RDEPEND="
 DEPEND="
 	>=virtual/jdk-1.6"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-remove.patch
+)
+
 src_prepare() {
 	default
-	epatch "${FILESDIR}"/"${P}-remove.patch"
+
+	java-pkg-2_src_prepare
 }
diff --git a/dev-java/iso-relax/Manifest b/dev-java/iso-relax/Manifest
index 0ce82419cdef..b6b63f138293 100644
--- a/dev-java/iso-relax/Manifest
+++ b/dev-java/iso-relax/Manifest
@@ -1,3 +1,3 @@
 DIST iso-relax-20050331.tar.bz2 696665 BLAKE2B 4f366818bed5e31fa8fc2f8759a38dddda26b8d379c4ba81ff3679228826890f7383606901440f51d958a2401943822bcb3a03bde9be1a647245563d58316526 SHA512 c327b461785ce647f9913afa6f5b77c41440e806d566884058be76e14a118d14fa305a1bc0157ee150b199b573e75af954311dc79eb8535599544f094526320a
-EBUILD iso-relax-20050331-r4.ebuild 727 BLAKE2B d5f494d6f63f35c639d0a68effadffda47a55fe8d57dd44b89d676e6fee250b23e0954dc1180d798cd539843002113305714b613094ce99befcbf426dd04a4a9 SHA512 e3b6e38d063f2cfda001709ff6294fcf6068e7e46f119a9ca137a037cf8cd92f56afb97230b9553d8cae95fe6c43b9ab7fd461e431e95fa3fd1c05e2ec11ad77
+EBUILD iso-relax-20050331-r5.ebuild 723 BLAKE2B 052213e73e131670bac2ec317cc1be366ba9a0cb1b2f8723806bd002e80bf3e2222c5f7eee4306aa4c16f62d86bbbbf5305d12236519df87949dc4f64278750b SHA512 09a913fbf8a7c3bfe6545e8a999217c22bcb8207432b1f19b5ab1d2b9f0100beafa4c483699a7d51469ef0b7a64833f85f20a4ad458b8fc2f3b91e91065f4822
 MISC metadata.xml 315 BLAKE2B 0c45e5fc5f64ce3a8d20de0be018eda7220ffa15c3880d54e49e8a6ac6cb9de770f5ce66e3e113ee6a6406324b440dee40fa6b98dbf4c2920b8c4c714a891a98 SHA512 08eaff739d58710deda145cdac32ab148112f2364f3f5a898095f0f135bca602354287ebc40ee9ab73d80e344330b810caa87b16b86b3c5696040e16d3a54fd9
diff --git a/dev-java/iso-relax/iso-relax-20050331-r4.ebuild b/dev-java/iso-relax/iso-relax-20050331-r5.ebuild
index 457fe730bf4c..c722dee93a25 100644
--- a/dev-java/iso-relax/iso-relax-20050331-r4.ebuild
+++ b/dev-java/iso-relax/iso-relax-20050331-r5.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Interfaces useful for applications which support RELAX Core"
-HOMEPAGE="http://iso-relax.sourceforge.net"
+HOMEPAGE="http://www.xml.gr.jp/relax/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RESTRICT="test"
 
@@ -22,11 +21,11 @@ CDEPEND="dev-java/ant-core:0"
 
 DEPEND="
 	${CDEPEND}
-	>=virtual/jdk-1.6"
+	>=virtual/jdk-1.8:*"
 
 RDEPEND="
 	${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8:*"
 
 S="${WORKDIR}/${P}"
 
@@ -34,6 +33,7 @@ JAVA_GENTOO_CLASSPATH="ant-core"
 
 JAVA_SRC_DIR="src"
 
-java_prepare() {
+src_prepare() {
+	default
 	java-pkg_clean
 }
diff --git a/dev-java/j2ssh/Manifest b/dev-java/j2ssh/Manifest
index e07b3fa6a034..675d51bbbf58 100644
--- a/dev-java/j2ssh/Manifest
+++ b/dev-java/j2ssh/Manifest
@@ -1,5 +1,5 @@
 AUX 0.2.9-extras.patch 7597 BLAKE2B a3ff2d110ac76e91a7cc3f5287fd80fcd26ea4f073a42c5c430a961afc4ef36beb53a29303b8646cc19370dd318d67065f901fac78818f9b432e326aea51a502 SHA512 e60f449e7cd39c1cc551a012c97f5b1cca229d6a08c06abfea6c47a0e2577d36887ce5e710dae2a1db5d1436b1eb0a13c5bdcef84555c678d3b54124fe6ce17d
 AUX 0.2.9-no-versioned-jars.patch 2187 BLAKE2B 42409b824c8fae59ecf42a531618432f1fa9ca873388b44e7cbbb94e3ad46dedd460b029e802a39a85f3da0d380e16965089e51e544b97495f72b6679f9c62e2 SHA512 5ef6e3f1f51a241f0a45810a561f4a77ddb2fe706e7ae4d0f6e36c28416435eed50cdec33debf7434f788c28f5b147987df3b1a12e59f8a0fade31183f57332f
 DIST j2ssh-0.2.9-src.tar.gz 2182523 BLAKE2B 1c5424ac99a466d3ac114160c133d8d6daed430f67bce35300290e14bc7540c73d5698f728f2cd43f7050877c2f89978c118a420375ffb5bc6c207c397e5afd2 SHA512 d7720766dcf50205089fa22d026721dc25de5def1d451fcb6680832017becc3fc8d76c2ffb5ed2e2190e08c864da24d2544515478956f78ac4d8cf4126cab6e8
-EBUILD j2ssh-0.2.9.ebuild 1015 BLAKE2B d2d738c77687d999e8b42dc5b20e41dc5fa4f341eff4f7ef59ba53ddfd6b69551ab272fe0d748407ac2f0dfcec7703114cbecf2e258dc8ede965b66ec2b416ef SHA512 0fc3e1efd4406c9d54d481dad30a7fa7b852452955059ee2b4e570fcc6fb1d93b0a734613e968825b36f43929ee749fe1493cc0e3be5c0e22e94bc51a77c7547
+EBUILD j2ssh-0.2.9.ebuild 1012 BLAKE2B e70137bd0c8bb3bdbc3eb2be5841316315d7fe3338413e50c1e2e3ac9d6981416681c2fae8dfed8f2467a7234b866562c40bb15dc75a6b84ccdf6ac5955801f7 SHA512 3b4c8c5577fde52092aac8f22c4669f63f28b71c947c4257892d0a9a87e69613be8b4eeabb9963b8c090434fce360363888db31181c85ed32ba6f6b970ae8b63
 MISC metadata.xml 494 BLAKE2B a9ae8d475130ee65e10ad589ab2a28f974463f20822b7d2bd082cea309f658609375ac0b597801c636d9f27917e94f08c9c65e3b48dda4b5ba3ad803df11ef8f SHA512 dc20b956e35a2a5098710ed97d00cd15979a6da488b4618cd262803f093e9281fdeb00f5a828cc0026c7b809c186d10f77683498b2380ed8c46d519696308b18
diff --git a/dev-java/j2ssh/j2ssh-0.2.9.ebuild b/dev-java/j2ssh/j2ssh-0.2.9.ebuild
index 7d4dd4ea6d5a..2decfdada51d 100644
--- a/dev-java/j2ssh/j2ssh-0.2.9.ebuild
+++ b/dev-java/j2ssh/j2ssh-0.2.9.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 JAVA_PKG_IUSE="source doc examples"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 DESCRIPTION="Java implementation of the SSH protocol"
 HOMEPAGE="https://sourceforge.net/projects/sshtools/ http://www.sshtools.com/"
diff --git a/dev-java/jackcess/Manifest b/dev-java/jackcess/Manifest
index 8cecb5987d1a..6919d34c3ab7 100644
--- a/dev-java/jackcess/Manifest
+++ b/dev-java/jackcess/Manifest
@@ -1,3 +1,6 @@
+AUX jackcess-4.0.0-fix-tests.patch 665 BLAKE2B 6e2cc60406b84c64e896478dbed520834b193749121241abd97ea1d54079a1faed4830347ab4d99623244e344ae502a10e8cadcdd4dbd1ffce83fdd273af3e33 SHA512 70a1325cbf955b032fada56a05635175f285e722c4c2a4c0a3d59401fec2b8261ff8c4717cf3e4c05cdbe53517a142ce348bd6309883334519fcf05e37afccce
 DIST jackcess-1.2.14.3-sources.jar 541095 BLAKE2B 60700a7ebb87f371a28d7cfcc588fbd61e28e4744e96a214e0923cd32c1b8e265b87d98048b277e8d9e5f1e582f17dc0962550ec8e5e7ede7adb83d0c417f25a SHA512 a0ccc39187ee94f550760d5640b736cf54d7523bad4eed715166608e18b30acad82a8db2d78f4c9da381c04876571c3d9fdb0418ee2585568c5da18b000f3b1b
+DIST jackcess-4.0.0-sources.tar.gz 12140889 BLAKE2B 44bdd0ba74e9e462364506e563b2e5db8a6581686a0b1ab7d9995d2dfce164593eb533986ac666a7f79180478a8a16ccc8ef57a7af08045cb671a3a5269f84a6 SHA512 514ecf235943183e0b3813550adf801cc4ab1734137ae0b131f5e3dca9f774f2a866bec397ccc8d37d65e9c3f0c4c995baee091480eb8e2bb91e85894c2a27e6
 EBUILD jackcess-1.2.14.3.ebuild 751 BLAKE2B 568a4f0c4e993546100d1ac6e50f69eebd1f276b812e53bcf4cb0759eba938846cd83f891e547b95c229df013318b7e01af6f014f8f24c5edb2fc1d05f188345 SHA512 5bc0776e1128df3619f30a43bd140428f0755547b4a3513724ea7e8b8bfa87bdda1ed7b1adfa709c399e78149605308d5c77d4479a54647ae78cd5b7a31b9475
+EBUILD jackcess-4.0.0.ebuild 1993 BLAKE2B 7c8ff43075e2a443cc3e46d7f5add73c7805e2361f5a55b034133bfee0cc6c4a617f23ff3102429f2ca270896e6194b64883d5df1e06c063901b4ab2b448d2b9 SHA512 037fffd468c3b27c9a3ac90bf284f3efeb5671dcb9541c9dd01c4880e1e3685354ddbf7ac435771e549cc355e660b29fa8aebd587081a6b81884cc3e80ec25e1
 MISC metadata.xml 314 BLAKE2B 0a48c521ff5b9916de7132a86ece393d4c01e648eadfc633bc0e5cea8fe64cc4a1163258b36c0c1e35743fac87224101f5661255bc6c8ca2ba31c59325d75c44 SHA512 84fc5b3b58171d3e96ab9cd24fad7df6ad3181e8099d1e597ad2c5e08e390fc598e5c7d210d05f722c001e4939a73052781c76322e52612d3ff4df126e5c4460
diff --git a/dev-java/jackcess/files/jackcess-4.0.0-fix-tests.patch b/dev-java/jackcess/files/jackcess-4.0.0-fix-tests.patch
new file mode 100644
index 000000000000..221710f4fbe5
--- /dev/null
+++ b/dev-java/jackcess/files/jackcess-4.0.0-fix-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/src/test/java/com/healthmarketscience/jackcess/DatabaseTest.java b/src/test/java/com/healthmarketscience/jackcess/DatabaseTest.java
+index d127f9f..03885f2 100644
+--- a/src/test/java/com/healthmarketscience/jackcess/DatabaseTest.java
++++ b/src/test/java/com/healthmarketscience/jackcess/DatabaseTest.java
+@@ -687,7 +687,7 @@ public class DatabaseTest extends TestCase
+ 
+   public void testAncientDates() throws Exception
+   {
+-    TimeZone tz = TimeZone.getTimeZone("America/New_York");
++    TimeZone tz = TimeZone.getTimeZone("UTC");
+     SimpleDateFormat sdf = DatabaseBuilder.createDateFormat("yyyy-MM-dd");
+     sdf.getCalendar().setTimeZone(tz);
+ 
diff --git a/dev-java/jackcess/jackcess-4.0.0.ebuild b/dev-java/jackcess/jackcess-4.0.0.ebuild
new file mode 100644
index 000000000000..d73cbac271a1
--- /dev/null
+++ b/dev-java/jackcess/jackcess-4.0.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jahlborn/jackcess/archive/refs/tags/jackcess-4.0.0.tar.gz --slot 1 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jackcess-4.0.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.healthmarketscience.jackcess:jackcess:4.0.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A pure Java library for reading from and writing to MS Access databases."
+HOMEPAGE="https://jackcess.sourceforge.io"
+SRC_URI="https://github.com/jahlborn/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}-sources.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+# Common dependencies
+# POM: pom.xml
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+# org.apache.commons:commons-lang3:3.10 -> >=dev-java/commons-lang-3.11:3.6
+# org.apache.poi:poi:4.0.0 -> >=dev-java/poi-5.0.0:0
+
+CDEPEND="
+	>=dev-java/commons-lang-3.11:3.6
+	>=dev-java/commons-logging-1.2:0
+	>=dev-java/poi-5.0.0:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-tests.patch"
+)
+
+JAVA_GENTOO_CLASSPATH="commons-logging,commons-lang-3.6,poi"
+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"
+
+JAVA_TEST_EXCLUDES=(
+	# initializationError(com.healthmarketscience.jackcess.TestUtil)
+	# org.junit.runners.model.InvalidTestClassError: Invalid test class 'com.healthmarketscience.jackcess.TestUtil'
+	"com.healthmarketscience.jackcess.TestUtil"
+)
+
+src_prepare() {
+	default
+	java-utils-2_src_prepare
+}
+
+src_test() {
+	export TZ=UTC
+	export LC_ALL=C
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/jakarta-oro/Manifest b/dev-java/jakarta-oro/Manifest
index 401c8ca1bddc..2e7806ddb769 100644
--- a/dev-java/jakarta-oro/Manifest
+++ b/dev-java/jakarta-oro/Manifest
@@ -1,4 +1,3 @@
 DIST jakarta-oro-2.0.8.tar.gz 345304 BLAKE2B a52b14f2753cb5ce07d16d417e943009dbb9268fddc62850daebb703ba2da3d83a3d05828479c89cab96174582514af75efedc73050a5f933cc0b26fbd51c948 SHA512 a7f6eb6a088765f273df18ccc823f918737f18ec8772275054839a87f8370f1848e795d481f226c712651104d7598ab86c7d90a991fb039df6581f42f1447920
-EBUILD jakarta-oro-2.0.8-r3.ebuild 1009 BLAKE2B ed221ec0082f2b0206c68ef71f31262022869632b757c7d09851addf70ccd2ed6fc9adffa6f15e3dc54be990097081045e2b1ce4d241f75eef635e49b62e6d8c SHA512 561b8c7e33db7decdc5c880e4a990d970616bd84c15c0ac2685cc41b591eeed5f70585c5bad7ca0fdd2c7eeabc3c3e3507171521cea7713e18fdd9d5cde70d76
-EBUILD jakarta-oro-2.0.8-r4.ebuild 832 BLAKE2B be29a0a04a1d3a4c64e47ff950f4cd3837f71a97de1fb2daa9337fb5d7947b4699c66a1a5d831a016c126f1726854fbe5e81509fcf303e5e56f3c2184f2efda0 SHA512 c68f60653137b26f3565eebe0de7610c08a01e1d8774bf7109a2e63a18f974e614aa7790cb4aef726a989f5836d1a529d19eff99d2dc53dc8c7c8c064931ed05
+EBUILD jakarta-oro-2.0.8-r5.ebuild 823 BLAKE2B d37dbd8e6f030baaa688b06e4599cc418b0ace033b4412ede86644815668db40cd116d0cb12d7c2f65c216ad6f1f24bd8a97d3af51eebd2af539dae8065fe3d3 SHA512 a7babba34294519a098fb849a9e0a7cea0591463400c9d47e612dd195784581622ae5cf3e09b19dd1e21edece79d0ccde77ec81a3d3d9a2ba71c9e0befeedd4f
 MISC metadata.xml 513 BLAKE2B 7c56f359436aaddf4ef061d969a24d623a5706526c5c2f7ebdcdf287898271bc40dadf7a0940e2d6bee0c96e53f2d828c9e7030f2b6b9102cbb50daca9ce3e50 SHA512 759a7e18395261364c71cb38e5ff76196588d16913f0992611c952bc0b5ed6dbd47e9a28a51b6ae74ab04b4c548ebbb773d1d813b1dd06a0c8b786cd381e43d2
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild
deleted file mode 100644
index a6e8ec728630..000000000000
--- a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild
+++ /dev/null
@@ -1,42 +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"
-
-inherit java-pkg-2 java-ant-2
-
-MY_J=${PN%%-*}
-MY_O=${PN##*-}
-
-DESCRIPTION="A set of text-processing Java classes"
-HOMEPAGE="http://jakarta.apache.org/oro/index.html"
-SRC_URI="http://archive.apache.org/dist/${MY_J}/${MY_O}/${P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="2.0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.3"
-RDEPEND=">=virtual/jre-1.3"
-
-java_prepare() {
-	find "${WORKDIR}" -name '*.class' -delete
-}
-
-EANT_DOC_TARGET="javadocs"
-
-src_install() {
-	java-pkg_newjar ${P}.jar ${PN}.jar
-
-	dodoc CHANGES CONTRIBUTORS ISSUES README STYLE TODO
-
-	if use doc; then
-		java-pkg_dojavadoc docs/api
-		dohtml -r -A gif docs/*.html docs/images
-	fi
-	use examples && java-pkg_doexamples src/java/examples
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild
index 0b8e0783d9a4..dc1a744bb943 100644
--- a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source examples"
 
@@ -11,22 +11,22 @@ MY_J=${PN%%-*}
 MY_O=${PN##*-}
 
 DESCRIPTION="A set of text-processing Java classes"
-HOMEPAGE="http://jakarta.apache.org/oro/index.html"
-SRC_URI="http://archive.apache.org/dist/${MY_J}/${MY_O}/${P}.tar.gz"
+HOMEPAGE="https://jakarta.apache.org/oro/"
+SRC_URI="https://archive.apache.org/dist/${MY_J}/${MY_O}/${P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="2.0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/${P}"
 
 JAVA_SRC_DIR="src"
 
-java_prepare() {
+src_prepare() {
+	default
 	java-pkg_clean
 	mv src/java/examples examples || die
 }
diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
index 9cc96fd55168..09bb78762d40 100644
--- a/dev-java/jamvm/Manifest
+++ b/dev-java/jamvm/Manifest
@@ -3,5 +3,5 @@ AUX jamvm-2.0.0-env.file 544 BLAKE2B 25197538a4c10d6ae1b0038113c094cdbca9a1a22b2
 AUX jamvm-2.0.0-javac.in 1739 BLAKE2B ff167bfba594dbfb71dd1d09e41ce502ebfcc598fbcef0794cb967c00894745f8b16412adc7b4afbd167878defa29351e99b30a71b4377987c5c8a692f404e30 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb
 AUX jamvm-2.0.0-noexecstack.patch 1387 BLAKE2B afd020772bf627c3dbd6b5da9e03d3b03e8f5c9dc3844279fe325183819cb11deadaedb4920ebfb0c6b25321daeee9f0e4fff45addd162e2b6c02e3f3ea12d31 SHA512 17c38ad0017e5659295dea7ed57f263eb0eee673bbc1f5d1e44e0c8fe588f4172a8a05c832a1fd41f3dc094779fade66aa710c8ce48c754412b0b6afdea6551a
 DIST jamvm-2.0.0.tar.gz 741459 BLAKE2B 9b8b0f8cfd8f56c0b835144c07aaca709ef466fdfe5df18438d05c66cd8a07fecfebf27e1581c67658feb3674a96c2e916b85f13dc434baf2db9be4e4fbfd0cf SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d
-EBUILD jamvm-2.0.0-r1.ebuild 3659 BLAKE2B 0e39e53af22f22efbdaa37908dfaf5a9695ac5ba9d9e020850a7f99a2224d9d70567b1b4f522c7dd84d8668c19ac5c722d1f74ae364b0b8b0110fc96c1e4d3ca SHA512 4f8a572e56bb7afa6141c2d5427f4dc127eeee362e932e5de2df6f923f8d6ef0c7d9d79db69b7bb95945c1146c0843a358ba94c8fe33a2a686995c8e383a8a3d
+EBUILD jamvm-2.0.0-r1.ebuild 3684 BLAKE2B f364cc01b38278dfcc4afb285141d05e117071c9f224c4303d19df7f0c6f23fc4ad77d669090e20840f23decd6b7ee5e70bc07fb1caf88beb8173e9965cc15fa SHA512 0f28cfe291ede4102f41abeecc9e65ba30c09bee96b731f3d7e58f952733f6ee122d3372231a37dac4e7187be290810b2de0d3f946a53cfb453be8e4a11458f8
 MISC metadata.xml 311 BLAKE2B f89901d2404c3d1004a7b53345d8e533059995634d1109f620d6685de9defd6126dc1e619f8c8ba0d8f53d57a1d7b1f2f51b0f93fc12b1afb179385b30b4d514 SHA512 3c73e7134e8adf35e0a1418dfcb0215082b5cfc7e3baabc11d89fb1044996a382c551309e5c04dbc54257a65173384b690ad951ceaec2b8569d89bb8a5e757ee
diff --git a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
index 4c9bd47344b8..4cf9882f3e5d 100644
--- a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
+++ b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils flag-o-matic multilib java-vm-2 autotools
+inherit epatch flag-o-matic multilib java-vm-2 autotools toolchain-funcs
 
 DESCRIPTION="An extremely small and specification-compliant virtual machine"
 HOMEPAGE="http://jamvm.sourceforge.net/"
@@ -44,7 +44,7 @@ src_configure() {
 	filter-flags "-fomit-frame-pointer"
 
 	if use ppc64 || use sparc || use libffi; then
-		append-cflags "$(pkg-config --cflags-only-I libffi)"
+		append-cflags "$($(tc-getPKG_CONFIG) --cflags-only-I libffi)"
 	fi
 
 	local fficonf="--enable-ffi"
diff --git a/dev-java/jansi-native/Manifest b/dev-java/jansi-native/Manifest
index 95eeb7983ba5..5f6c701cfe21 100644
--- a/dev-java/jansi-native/Manifest
+++ b/dev-java/jansi-native/Manifest
@@ -1,5 +1,3 @@
-DIST jansi-native-1.5.tar.gz 205008 BLAKE2B 94f46527165e1956640ceabf10ea6ae90fb461e331389823ebd9f86b2b0cadd0ed777e20787fd5bcc9388fc250be1d5415feefe4953fba9a5610870409940060 SHA512 29d178f013701b7e7844f899530f51486037e3a1403018ba4a41475ceb8d58afec768d177f64cbedd41adfb681ba08e578c2e18d956770bc039dfece8602a212
 DIST jansi-native-1.8.tar.gz 33035 BLAKE2B 0008d1af45e8694d065beb7c55cf5e73aa1bff54aa9b83287490a307553ef6fb28f87011658f9fed54a3ba8d47497e2c267a94a63d50862d9ebf3e231b8eda23 SHA512 e5184bc8f5c819f54550791969df611df0b4fdfcfc6aaebf123d786a08a957e5854b15b2569871d5a9d0d20703a8831c99c42610a83fff77af3cf750b72a7fee
-EBUILD jansi-native-1.5.ebuild 795 BLAKE2B 641ebd29524c19173c9f96c107d5db21cfbe87bbe852621cfb652d20200ef46995cc76c312b927402fd1de909cf1aec7ac22acf68d1641f6ef5bcd5a516e14f0 SHA512 1dfe076ed89b24ad0245bdf77297473f22a1967ce024fdcf7477f9decf21b32f2ecc4342b30bbc29127d725c25fdebbc898203f1c7e7169c8e5cb7c44eb88180
-EBUILD jansi-native-1.8.ebuild 799 BLAKE2B bb73f823a67d01b50b7e7c8bd5d1de735a769a8ec30975a5166374bddb3b62589cf1eca02532bb5f2922b531588fe3964e5fdbb57606a4e265bd667fd650cb0f SHA512 abee1556c580ecfd9926557ec44b005948bf76e7b3697f275a6a44620da857bc77c1846a5d3496720e8d7988a291c3cae3f49b19d333303c907351531c69ba18
+EBUILD jansi-native-1.8.ebuild 796 BLAKE2B ec3b480384c742730ff3c6d4446154f9999836a8903f7f5327bf4b04cf6a73ef4bf76c84a9c4708cdbcf92f521ccafeba9a80c71407ce0619d8fdc11aaa7356c SHA512 1aad66ec8d8ae7b2c2c667708db5a909a9566be4de41d120b2d14668b098044f234dcb3f116062da0e86f1d436d7b01b8a8feaf102364dbcf4d6b6723b67c975
 MISC metadata.xml 334 BLAKE2B 344c274ef2a08d05c659d652711ca3d89e4f8d0fe067cf6dbf024e1ff1c5f3f7228773dee36f57c341ddfef60dfd6c4dd5da1a7bfbef9bb70a3ded7c5412f364 SHA512 0b5b8c67251d880d3a5702dbe70472234f6c83deb557597d6160b5321b1d187fd2752879215c65dd34f8ad6ccfc3fe2ade25804b29a46a584464940942e3ace0
diff --git a/dev-java/jansi-native/jansi-native-1.5.ebuild b/dev-java/jansi-native/jansi-native-1.5.ebuild
deleted file mode 100644
index 1f8a3e844a91..000000000000
--- a/dev-java/jansi-native/jansi-native-1.5.ebuild
+++ /dev/null
@@ -1,40 +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 vcs-snapshot java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Native JNI component for dev-java/jansi"
-HOMEPAGE="http://fusesource.github.io/jansi/"
-SRC_URI="https://github.com/fusesource/${PN}/tarball/${P} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-CDEPEND="dev-java/hawtjni-runtime:0"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="hawtjni-runtime"
-
-java_prepare() {
-	# Easier to use java-pkg-simple.
-	rm -v pom.xml || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-
-	dodoc {changelog,readme}.md
-}
diff --git a/dev-java/jansi-native/jansi-native-1.8.ebuild b/dev-java/jansi-native/jansi-native-1.8.ebuild
index ed594a3e3e58..a519b5eb26b6 100644
--- a/dev-java/jansi-native/jansi-native-1.8.ebuild
+++ b/dev-java/jansi-native/jansi-native-1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 
 CDEPEND="dev-java/hawtjni-runtime:0"
 
diff --git a/dev-java/jansi/Manifest b/dev-java/jansi/Manifest
index 3f171def455c..43a9c325f4aa 100644
--- a/dev-java/jansi/Manifest
+++ b/dev-java/jansi/Manifest
@@ -1,6 +1,6 @@
 AUX jansi-1.11-build.xml 14529 BLAKE2B ea9358a4a64e077ba9173f6f0d0548647489980cff2626760b6c92df9774117bc6ff32f4647c8b89b21b4e37722f018e4f1fd0ca2cfa5915a83e253f9c18d250 SHA512 cc60a9f48f220ee13a22ed814409126524d22f2329c574e61974e26fd70b9a53f703ade06bb6921c13f370016be79c00d111368018132abee20780e99096c0a5
 DIST jansi-1.11.tar.gz 252095 BLAKE2B 72b22392fa6731f49ebb5c2e94cdf7918ca37d5c73ccb14d8810402c9ec120b1220a739e54516eeb5355ad4dd74d01ae398a6003679c60b1dd6f1648691b2efa SHA512 4a19d52055da3ce08b6d797fb8e8241af86f1b9b30e12f4de24655edbd72d256b310d58fc6e106cae1384f9b0ab99cd7f2128d53296875fba5422bfc0e8410f1
 DIST jansi-1.5.zip 211616 BLAKE2B 754105218e62d095f9f070ba7f66b68dd2cfbf1b7d8f95ea6dc40f01e536fd8997e2bfca481a4c57cafabc6fe044de5de171b51429e07081ebe1824a5cd5d3d0 SHA512 784c01b7ab48307cf881439d5c3531949a6459e8a90667f1ee7a73f9cbce72710fcf4af8b4cae610d15085641567c0d51cab487488daa0c1b0a4605864de2775
-EBUILD jansi-1.11-r1.ebuild 1138 BLAKE2B 9d8e6c2f60ec8b124951b75a9ea4185b357c8359d61a295cf9c61e1e3124c03701a3f4a7c0cbd4ed1d8ad5712944d694fa1cf1ab6097e777ee509ef107e70bc6 SHA512 d42fc45b1f33548bfb4da344eb67ad7f177a117112aa8d94280422650dbfec4f6862ca6e3667f25f850f7a7b42b1678835a52062f19083755d77212a42c57d7d
+EBUILD jansi-1.11-r2.ebuild 1152 BLAKE2B 6b0cc2ccc3f4c85455015154a7ee4c2193914084a33a40a286af62f88a032c492807e23618337eedf960dce1ace6452ea4e3798c256594fe5707fedabdd72aed SHA512 a0e1e7424615ce5228acbb4f549e14311c627792b2992cd84d33f95d6460b0f0f17652f325b7c7b7326982abb0f444f460aeebe4d6deaa1a793bebb16067c5dc
 EBUILD jansi-1.5-r2.ebuild 674 BLAKE2B bd3b686e6c35721f33d73357434a37800519b0b370edeb97288be68a98e95b04045c397700fbf78e0d3aa4dad82da714e20dcc30f0bcde1fdd9f666fbd302b19 SHA512 07dd8bc9d822b963be6db3ca5e39bc160ace104741ef0786de3a8482eeb7f075c67fbc60d4f6e5cc46c4ef58f4263960f796c1c0373c07baa0149f09cace0910
 MISC metadata.xml 491 BLAKE2B 57979797604525188358a5e2bbf92bd7cc40e9513710d9907302df960f0fb0961b3c8eca15bc09b53cae259dbe3b512d149a4e9fb2bb5e3b1ad6a13700af3c4b SHA512 46a12388363e4b59001bf8cf67923a4f38d8a4409fe158a813c9403e0da6067a8aff418cda7e0d02dc905e38591ded15e46b8f8095acb62d0a83a65146550669
diff --git a/dev-java/jansi/jansi-1.11-r1.ebuild b/dev-java/jansi/jansi-1.11-r2.ebuild
index 0d9a907524da..0c1149bbd7b2 100644
--- a/dev-java/jansi/jansi-1.11-r1.ebuild
+++ b/dev-java/jansi/jansi-1.11-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 # TODO: Get doc (missing classpath entries) working.
 JAVA_PKG_IUSE="source test"
@@ -10,10 +10,10 @@ inherit vcs-snapshot java-pkg-2 java-ant-2
 
 DESCRIPTION="A library that allows you to use ANSI escape sequences in your console output"
 HOMEPAGE="http://jansi.fusesource.org/"
-SRC_URI="https://github.com/fusesource/${PN}/tarball/${PN}-project-${PV} -> ${P}.tar.gz"
+SRC_URI="https://github.com/fusesource/${PN}/archive/${PN}-project-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="1.11"
+SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 CDEPEND="dev-java/jansi-native:0"
@@ -23,10 +23,10 @@ DEPEND="${CDEPEND}
 		dev-java/ant-junit4:0
 		dev-java/junit:4
 	)
-	>=virtual/jdk-1.7"
+	>=virtual/jdk-1.8:*"
 
 RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
+	>=virtual/jre-1.8:*"
 
 S="${WORKDIR}/${P}/jansi"
 
@@ -34,7 +34,8 @@ EANT_GENTOO_CLASSPATH="jansi-native"
 JAVA_ANT_REWRITE_CLASSPATH="true"
 JAVA_SRC_DIR="src/main/java"
 
-java_prepare() {
+src_prepare() {
+	default
 	cp "${FILESDIR}"/${P}-build.xml build.xml || die
 }
 
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 0bb76ed04eea..a5e5a91e4859 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,4 +1,4 @@
 DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
 EBUILD java-config-2.3.1.ebuild 1081 BLAKE2B ac6894dc4677d4d8591085af5bb627c606ae057694d06170b0d8e14205d5e96345a12b20ec3849c006b926ca2561aeeb3ee8f1224449e8fc93470f68b64c1b8f SHA512 c974b1a60fa584f8b579f060a67a151c2e4966e64cb537296c3790d3630b6019bc412f21609b233a31abfb8a3b6997f9367fb8fa764ba613ba098e7b1fba973a
-EBUILD java-config-9999.ebuild 1206 BLAKE2B 0d96d749eda23b712099c75fa2733af534d55feffbd9b1b4d8895845ec3c58cead368000778b12a8d3f8648652005889c03bfca62e97750d0576d5eea8d61518 SHA512 071e478a7208cd9075ec945e76d310699ad64d698a0109701de242eb747df48512216fc99c636a8d1c04c2300d76e3584c8eb5dbdf35d7d0b1e694199dbec873
+EBUILD java-config-9999.ebuild 1208 BLAKE2B 52dddbec6d35da935c1bd59d940d37616cb3e87e07d5bd5f4f7f9ce8cf626074e9081e89e126f9787dd2defd6044556d212d4dab0c1b04d2f492ebbeb3f5cb94 SHA512 05df8a1a3a987e7bcaec9fcfe09449073a0258476e28b87a969a404fa0fb464e4db188530712e081da4c2ae3173b7d676285f73d9cf7295fa6e63d75c2b70dde
 MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild
index 261a089b46de..44dee61b0d82 100644
--- a/dev-java/java-config/java-config-9999.ebuild
+++ b/dev-java/java-config/java-config-9999.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
-if [[ $PV = *9999 ]]; then
+if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git"
 else
diff --git a/dev-java/java-dep-check/Manifest b/dev-java/java-dep-check/Manifest
index 68424b0b509b..615219556f0a 100644
--- a/dev-java/java-dep-check/Manifest
+++ b/dev-java/java-dep-check/Manifest
@@ -1,8 +1,3 @@
-AUX Main-0.3.java 11702 BLAKE2B f0f67f098fdf20cb6ad78ec6f0e20afa29cae2c7b62bbafea7a0e6ec5c3ab83029e7929d1e7d78b93b7551c62802a5b2a9f7ba40e16d99c7037ebcb8d2d71e1a SHA512 a70c0161fe72e8f4b4476cbdad5ae3074fbb7321214723a7b1b7778fd06de4eb616479de2b5d6ce9a6dab2e919d721ce2b177a515039a0b9592aa2b5e1017e88
-AUX Main-0.4.java 14943 BLAKE2B ec9f08f76a38e16f17e68e05e06985f11700532c6f6827518cd8303635d240f7c425a205dbc2c41df870b1029d83a3b04b5d20a76f10275786a8d7c457472501 SHA512 340e6912285ee5c61116cd838c2abf68c573e57053d0b923fcd3929e19253d7cf29a281b226a3624a69b358f112bdf4a554b6c23b850933d60d7a1fd059f7a1e
 AUX Main-0.5.java 14974 BLAKE2B c8cab47bca61f5c792d214f817768ed9455bb31f407ea5259e760ee8e66c6ab7cd811079bd8d1764fbf0c70da4aad1d9ab5500385c3894292b6e8e8e51c54e6f SHA512 3111783b22e01b357bae675fabd9af86536d4db82cc7dad1f4dac4c3a64efd84f3b6f35e5b5698dafc696d3ecde49589bcb167967130004e3fd1716db9d868f6
-EBUILD java-dep-check-0.3-r1.ebuild 645 BLAKE2B 06181b8bd751a72d4a2876d4d44dbce6a037abcc23a09b9e91994a3987a03442dd58d6b191ea9ead5d2187254455c625c6cca587d61136ae236148e28eb92505 SHA512 6da35a65c72ef3d61f4544d49fadac6d743d8b348130ae811b620d62b428227ad4a8cc889d78dd409291dc59a621f459c27993033d7daa2eee5f23ce4d786ebe
-EBUILD java-dep-check-0.4-r1.ebuild 649 BLAKE2B d16786af2d2378bf0d70520970e3a9d682aeef99befed7387fbebbeffe779b88f2e5d3f7e73a0af92cc27ad2728c5cb9216a46692e229f34e9f8d844b1f51b99 SHA512 b27edcf5cd769cd34d1ab2c4a041cb633ae3b3e6b8c670600e5341fd4f16b253b0d245aa6b32e60aa696c7e800f4739ec3d73172ecf38f4935c68820c9d3cb46
-EBUILD java-dep-check-0.4.ebuild 642 BLAKE2B adffd940e68f3e7653a1b723acb360b31d7d402e3415649608d161c0c5dfa7cbc0ca476ac47b284d2af5f76632300f96d77350e130e8839aad36dd0520b9a842 SHA512 61463bfcced95396791da6dcd12135c0724294956c74743492c4fb8a21199aa855250797e6aa6a5b34ad4a5b2e6c0bc34bd77745e4769f4aae6335821ce048e1
-EBUILD java-dep-check-0.5.ebuild 649 BLAKE2B d16786af2d2378bf0d70520970e3a9d682aeef99befed7387fbebbeffe779b88f2e5d3f7e73a0af92cc27ad2728c5cb9216a46692e229f34e9f8d844b1f51b99 SHA512 b27edcf5cd769cd34d1ab2c4a041cb633ae3b3e6b8c670600e5341fd4f16b253b0d245aa6b32e60aa696c7e800f4739ec3d73172ecf38f4935c68820c9d3cb46
+EBUILD java-dep-check-0.5.ebuild 647 BLAKE2B 58800f4548bd8ab3c08f2048262107bd1e4814272bb5a4bd02e1f1b635ea342dc08056a65b1c1f11e02b57651ca919445d4b40791cbabcf31960c5b30b5d8490 SHA512 ce2333b6507ad80c1a6103ead8a5c684b2d90696199a9ae1449d939136b9c7607a7569f929bb6531fa72b6426d840d018c4b2baf805df9d3d98e76a5149e6499
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/java-dep-check/files/Main-0.3.java b/dev-java/java-dep-check/files/Main-0.3.java
deleted file mode 100644
index e1f02a024eef..000000000000
--- a/dev-java/java-dep-check/files/Main-0.3.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Main.java The main application class.
- *
- * Created on May 1, 2007, 6:32 PM
- *
- * Copyright (C) 2007,2008 Petteri Räty <betelgeuse@gentoo.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package javadepchecker;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
-import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.commons.EmptyVisitor;
-
-/**
- *
- * @author betelgeuse
- * @author serkan
- */
-public final class Main extends EmptyVisitor {
-
-    static private String image = "";
-    private Set<String> deps = new HashSet<String>();
-    private Set<String> current = new HashSet<String>();
-
-    /** Creates a new instance of Main */
-    public Main() {
-    }
-
-    private static Collection<String> getPackageJars(String pkg) {
-        ArrayList<String> jars = new ArrayList<String>();
-        try {
-            Process p = Runtime.getRuntime().exec("java-config -p " + pkg);
-            p.waitFor();
-            BufferedReader in;
-            in = new BufferedReader(new InputStreamReader(p.getInputStream()));
-            String output = in.readLine();
-            if (output!=null/* package somehow missing*/ && !output.trim().equals("")) {
-                for (String jar : output.split(":")) {
-                    jars.add(jar);
-                }
-            }
-        } catch (InterruptedException ex) {
-            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-        } catch (IOException ex) {
-            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-        }
-        return jars;
-    }
-
-    public void processJar(JarFile jar) throws IOException {
-        for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements();) {
-            JarEntry entry = e.nextElement();
-            String name = entry.getName();
-            if (!entry.isDirectory() && name.endsWith(".class")) {
-                this.current.add(name);
-                InputStream stream = jar.getInputStream(entry);
-                new ClassReader(stream).accept(this, 0);
-            }
-        }
-    }
-
-    private static boolean depNeeded(String pkg, Collection<String> deps) throws IOException {
-        Collection<String> jars = getPackageJars(pkg);
-        // We have a virtual with VM provider here
-        if (jars.size() == 0) {
-            return true;
-        }
-        for (String jarName : jars) {
-            JarFile jar = new JarFile(jarName);
-            for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements();) {
-                String name = e.nextElement().getName();
-                if (deps.contains(name)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    private static boolean depsFound(Collection<String> pkgs, Collection<String> deps) throws IOException {
-        boolean found = true;
-        Collection<String> jars = new ArrayList<String>();
-        String[] bootClassPathJars = System.getProperty("sun.boot.class.path").split(":");
-        // Do we need "java-config -r" here?
-        for (String jar : bootClassPathJars) {
-            File jarFile = new File(jar);
-            if (jarFile.exists()) {
-                jars.add(jar);
-            }
-        }
-        for (Iterator<String> pkg = pkgs.iterator(); pkg.hasNext();) {
-            jars.addAll(getPackageJars(pkg.next()));
-        }
-
-        if (jars.size() == 0) {
-            return false;
-        }
-        ArrayList<String> jarClasses = new ArrayList<String>();
-        for (String jarName : jars) {
-            JarFile jar = new JarFile(jarName);
-            for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements();) {
-                jarClasses.add(e.nextElement().getName());
-            }
-        }
-        for (String dep : deps) {
-            if (!jarClasses.contains(dep)) {
-                if (found) {
-                    System.out.println("Class files not found via DEPEND in package.env");
-                }
-                System.out.println("\t" + dep);
-                found = false;
-            }
-        }
-        return found;
-    }
-
-    private static boolean checkPkg(File env) {
-        boolean needed = true;
-        boolean found = true;
-        HashSet<String> pkgs = new HashSet<String>();
-        Collection<String> deps = null;
-
-        BufferedReader in = null;
-        try {
-            Pattern dep_re = Pattern.compile("^DEPEND=\"([^\"]*)\"$");
-            Pattern cp_re = Pattern.compile("^CLASSPATH=\"([^\"]*)\"$");
-
-            String line;
-            in = new BufferedReader(new FileReader(env));
-            while ((line = in.readLine()) != null) {
-                Matcher m = dep_re.matcher(line);
-                if (m.matches()) {
-                    String atoms = m.group(1);
-                    for (String atom : atoms.split(":")) {
-                        String pkg = atom;
-                        if (atom.contains("@")) {
-                            pkg = atom.split("@")[1];
-                        }
-                        pkgs.add(pkg);
-                    }
-                    continue;
-                }
-                m = cp_re.matcher(line);
-                if (m.matches()) {
-                    Main classParser = new Main();
-                    for (String jar : m.group(1).split(":")) {
-                        if (jar.endsWith(".jar")) {
-                            classParser.processJar(new JarFile(image + jar));
-                        }
-                    }
-                    deps = classParser.getDeps();
-                }
-            }
-
-            for (String pkg : pkgs) {
-                if (!depNeeded(pkg, deps)) {
-                    if (needed) {
-                        System.out.println("Possibly unneeded dependencies found");
-                    }
-                    System.out.println("\t" + pkg);
-                    needed = false;
-                }
-            }
-            found = depsFound(pkgs, deps);
-
-        } catch (IOException ex) {
-            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-        } finally {
-            try {
-                in.close();
-            } catch (IOException ex) {
-                Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-            }
-        }
-        return needed && found;
-    }
-
-    /**
-     * @param args the command line arguments
-     */
-    public static void main(String[] args) throws IOException {
-        int exit = 0;
-        try {
-            CommandLineParser parser = new PosixParser();
-            Options options = new Options();
-            options.addOption("h", "help", false, "print help");
-            options.addOption("i", "image", true, "image directory");
-            options.addOption("v", "verbose", false, "print verbose output");
-            CommandLine line = parser.parse(options, args);
-            String[] files = line.getArgs();
-            if (line.hasOption("h") || files.length == 0) {
-                HelpFormatter h = new HelpFormatter();
-                h.printHelp("java-dep-check [-i <image>] <package.env>+", options);
-            } else {
-                image = line.getOptionValue("i", "");
-
-                for (String arg : files) {
-                    if (line.hasOption('v')) {
-                        System.out.println("Checking " + arg);
-                    }
-                    if (!checkPkg(new File(arg))) {
-                        exit = 1;
-                    }
-                }
-            }
-        } catch (ParseException ex) {
-            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-        }
-        System.exit(exit);
-    }
-
-    private void addDep(String dep) {
-        deps.add(dep + ".class");
-    }
-
-    private void addDep(Type dep) {
-        if (dep.getSort() == Type.ARRAY) {
-            addDep(dep.getElementType());
-        }
-        if (dep.getSort() == Type.OBJECT) {
-            addDep(dep.getInternalName());
-        }
-    }
-
-    private Collection<String> getDeps() {
-        ArrayList<String> result = new ArrayList<String>();
-        for (String s : deps) {
-            if (!current.contains(s)) {
-                result.add(s);
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
-        if(superName != null) {
-            addDep(superName);
-        }
-        for (String iface : interfaces) {
-            addDep(iface);
-        }
-    }
-
-    @Override
-    public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
-        addDep(Type.getType(desc));
-        return null;
-    }
-
-    @Override
-    public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-        for (Type param : Type.getArgumentTypes(desc)) {
-            addDep(param);
-        }
-
-        if (exceptions != null) {
-            for (String exception : exceptions) {
-                addDep(exception);
-            }
-        }
-        addDep(Type.getReturnType(desc));
-        return new EmptyVisitor() {
-            @Override
-            public void visitLocalVariable(String name, String desc, String signature, Label start, Label end, int index) {
-                addDep(Type.getType(desc));
-            }
-
-            @Override
-            public void visitFieldInsn(int opcode, String owner, String name, String desc) {
-                addDep(Type.getObjectType(owner));
-                addDep(Type.getType(desc));
-            }
-
-            @Override
-            public void visitMethodInsn(int opcode, String owner, String name, String desc) {
-                addDep(Type.getObjectType(owner));
-            }
-
-            @Override
-            public AnnotationVisitor visitParameterAnnotation(int parameter, String desc, boolean visible) {
-                return Main.this.visitAnnotation(desc, visible);
-            }
-        };
-    }
-
-    @Override
-    public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
-        addDep(Type.getType(desc));
-        return null;
-    }
-}
diff --git a/dev-java/java-dep-check/files/Main-0.4.java b/dev-java/java-dep-check/files/Main-0.4.java
deleted file mode 100644
index ea877e92fce8..000000000000
--- a/dev-java/java-dep-check/files/Main-0.4.java
+++ /dev/null
@@ -1,436 +0,0 @@
-/**
- * This file is part of javadepchecker
- *
- * Copyright (C) 2016 Gentoo Foundation
- *
- * javadepchecker is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package javadepchecker;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.Properties;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
-
-import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-
-/**
- * Main Class of javadepchecker
- * Gentoo Java Utility to scan class files for unneeded dependencies and 
- * ophaned class files
- *
- * @author Petteri Räty <betelgeuse@gentoo.org>
- * @author Serkan Kaba <serkan@gentoo.org>
- * @author William L. Thomson Jr., <wlt@o-sinc.com>
- */
-public final class Main extends ClassVisitor {
-
-    static private String image = "";
-    private Set<String> mDeps = new HashSet<>();
-    private Set<String> mCurrent = new HashSet<>();
-
-    /**
-     * Empty Constructor, sets ASM op code version
-     */
-    public Main() {
-        super(Opcodes.ASM5);
-    }
-
-    /**
-     * Get jar names from the Gentoo package and store in a collection
-     *
-     * @param pkg Gentoo package name
-     * @return a collection of jar names
-     */
-    private static Collection<String> getPackageJars(String pkg) {
-        ArrayList<String> jars = new ArrayList<>();
-        try {
-            Process p = Runtime.getRuntime().exec("java-config -p " + pkg);
-            p.waitFor();
-            BufferedReader in;
-            in = new BufferedReader(new InputStreamReader(p.getInputStream()));
-            String output = in.readLine();
-            if (output!=null/* package somehow missing*/ &&
-                !output.trim().isEmpty()) {
-                jars.addAll(Arrays.asList(output.split(":")));
-            }
-        } catch (InterruptedException | IOException ex) {
-            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-        }
-        return jars;
-    }
-
-    /**
-     * Scan jar for classes to be processed by ASM
-     *
-     * @param jar jar file to be processed
-     * @throws IOException
-     */
-    public void processJar(JarFile jar) throws IOException {
-        Collections.list(jar.entries())
-                   .stream()
-                   .filter((JarEntry entry) -> (!entry.isDirectory() && entry.getName().endsWith("class")))
-                   .forEach((JarEntry entry) -> {
-            InputStream is = null;
-            try {
-                Main.this.mCurrent.add(entry.getName());
-                is = jar.getInputStream(entry);
-                new ClassReader(is).accept(Main.this, 0);
-            } catch (IOException ex) {
-                Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-            } finally {
-                try {
-                    if(is!=null)
-                        is.close();
-                } catch (IOException ex) {
-                    Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-                }
-            }
-        });
-    }
-
-    /**
-     * Check if a dependency is needed by a given package
-     *
-     * @param pkg Gentoo package name
-     * @param deps collection of dependencies for the package
-     * @return boolean if the dependency is needed or not
-     * @throws IOException
-     */
-    private static boolean depNeeded(String pkg,
-                                     Collection<String> deps) throws IOException {
-        Collection<String> jars = getPackageJars(pkg);
-
-        // We have a virtual with VM provider here
-        if (jars.isEmpty()) {
-            return true;
-        }
-        for (String jarName : jars) {
-            JarFile jar = new JarFile(jarName);
-            for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements();) {
-                String name = e.nextElement().getName();
-                if (deps.contains(name)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Check for orphaned class files not owned by any package in dependencies
-     *
-     * @param pkg Gentoo package name
-     * @param deps collection of dependencies for the package
-     * @return boolean if the dependency is found or not
-     * @throws IOException
-     */
-    private static boolean depsFound(Collection<String> pkgs,
-                                     Collection<String> deps) throws IOException {
-        boolean found = true;
-        Collection<String> jars = new ArrayList<>();
-        String[] bootClassPathJars = System.getProperty("sun.boot.class.path").split(":");
-        // Do we need "java-config -r" here?
-        for (String jar : bootClassPathJars) {
-            File jarFile = new File(jar);
-            if (jarFile.exists()) {
-                jars.add(jar);
-            }
-        }
-        pkgs.forEach((String pkg) -> {
-            jars.addAll(getPackageJars(pkg));
-        });
-
-        if (jars.isEmpty()) {
-            return false;
-        }
-        ArrayList<String> jarClasses = new ArrayList<>();
-        jars.forEach((String jarName) -> {
-            try {
-                JarFile jar = new JarFile(jarName);
-                Collections.list(jar.entries()).forEach((JarEntry entry) -> {
-                    jarClasses.add(entry.getName());
-                });
-            } catch (IOException ex) {
-                Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-            }
-        });
-        for (String dep : deps) {
-            if (!jarClasses.contains(dep)) {
-                if (found) {
-                    System.out.println("Class files not found via DEPEND in package.env");
-                }
-                System.out.println("\t" + dep);
-                found = false;
-            }
-        }
-        return found;
-    }
-
-    /**
-     * Core method, this one fires off all others and is the one called from
-     * Main. Check this package for unneeded dependencies and orphaned class
-     * files
-     *
-     * @param env
-     * @return 
-     */
-    private static boolean checkPkg(File env) {
-        boolean needed = true;
-        boolean found = true;
-        HashSet<String> pkgs = new HashSet<>();
-        Collection<String> deps = null;
-        InputStream is = null;
-
-        try {
-            // load package.env
-            Properties props = new Properties();
-            is = new FileInputStream(env);
-            props.load(is);
-
-            // load package deps, add to hashset if exist
-            String depend = props.getProperty("DEPEND");
-            if(depend!=null &&
-               !depend.isEmpty()) {
-                for (String atom : depend.replaceAll("\"","").split(":")) {
-                    String pkg = atom;
-                    if (atom.contains("@")) {
-                        pkg = atom.split("@")[1];
-                    }
-                    pkgs.add(pkg);
-                }
-            }
-
-            // load package classpath
-            String classpath = props.getProperty("CLASSPATH");
-            if(classpath!=null &&
-               !classpath.isEmpty()) {
-                Main classParser = new Main();
-                for (String jar : classpath.replaceAll("\"","").split(":")) {
-                    if (jar.endsWith(".jar")) {
-                        classParser.processJar(new JarFile(image + jar));
-                    }
-                }
-                deps = classParser.getDeps();
-            }
-
-            for (String pkg : pkgs) {
-                if (!depNeeded(pkg, deps)) {
-                    if (needed) {
-                        System.out.println("Possibly unneeded dependencies found");
-                    }
-                    System.out.println("\t" + pkg);
-                    needed = false;
-                }
-            }
-            found = depsFound(pkgs, deps);
-
-        } catch (IOException ex) {
-            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-        } finally {
-            try {
-                if(is!=null)
-                    is.close();
-            } catch (IOException ex) {
-                Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-            }
-        }
-        return needed && found;
-    }
-
-    /** Main method, parse command line opts, invoke the package checker
-     * @param args the command line arguments
-     * @throws java.io.IOException
-     */
-    public static void main(String[] args) throws IOException {
-        int exit = 0;
-        try {
-            CommandLineParser parser = new PosixParser();
-            Options options = new Options();
-            options.addOption("h", "help", false, "print help");
-            options.addOption("i", "image", true, "image directory");
-            options.addOption("v", "verbose", false, "print verbose output");
-            CommandLine line = parser.parse(options, args);
-            String[] files = line.getArgs();
-            if (line.hasOption("h") || files.length == 0) {
-                HelpFormatter h = new HelpFormatter();
-                h.printHelp("java-dep-check [-i <image>] <package.env>+", options);
-            } else {
-                image = line.getOptionValue("i", "");
-
-                for (String arg : files) {
-                    if (line.hasOption('v')) {
-                        System.out.println("Checking " + arg);
-                    }
-                    if (!checkPkg(new File(arg))) {
-                        exit = 1;
-                    }
-                }
-            }
-        } catch (ParseException ex) {
-            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-        }
-        System.exit(exit);
-    }
-
-    /**
-     * Add dependency to deps hashset
-     *
-     * @param dep dependent class name
-     */
-    private void addDep(String dep) {
-        mDeps.add(dep + ".class");
-    }
-
-    /**
-     * Add dependency type to deps hashset
-     *
-     * @param dep dependent class name
-     */
-    private void addDep(Type dep) {
-        if (dep.getSort() == Type.ARRAY) {
-            addDep(dep.getElementType());
-        }
-        if (dep.getSort() == Type.OBJECT) {
-            addDep(dep.getInternalName());
-        }
-    }
-    
-    /**
-     * Get deps not contained in the current hashset
-     *
-     * @return a collection of deps
-     */
-    private Collection<String> getDeps() {
-        ArrayList<String> result = new ArrayList<>();
-        mDeps.stream().filter((s) -> (!mCurrent.contains(s))).forEach((s) -> {
-            result.add(s);
-        });
-        return result;
-    }
-
-    @Override
-    public void visit(int version,
-                      int access,
-                      String name,
-                      String signature,
-                      String superName,
-                      String[] interfaces) {
-        if(superName != null) {
-            addDep(superName);
-        }
-        for (String iface : interfaces) {
-            addDep(iface);
-        }
-    }
-
-    @Override
-    public FieldVisitor visitField(int access,
-                                   String name,
-                                   String desc,
-                                   String signature,
-                                   Object value) {
-        addDep(Type.getType(desc));
-        return null;
-    }
-
-    @Override
-    public MethodVisitor visitMethod(int access,
-                                     String name,
-                                     String desc,
-                                     String signature,
-                                     String[] exceptions) {
-        for (Type param : Type.getArgumentTypes(desc)) {
-            addDep(param);
-        }
-
-        if (exceptions != null) {
-            for (String exception : exceptions) {
-                addDep(exception);
-            }
-        }
-        addDep(Type.getReturnType(desc));
-        return new MethodVisitor(Opcodes.ASM5) {
-            @Override
-            public void visitLocalVariable(String name,
-                                           String desc,
-                                           String signature,
-                                           Label start,
-                                           Label end,
-                                           int index) {
-                addDep(Type.getType(desc));
-            }
-
-            @Override
-            public void visitFieldInsn(int opcode,
-                                       String owner,
-                                       String name,
-                                       String desc) {
-                addDep(Type.getObjectType(owner));
-                addDep(Type.getType(desc));
-            }
-
-            @Override
-            public void visitMethodInsn(int opcode,
-                                        String owner,
-                                        String name,
-                                        String desc,
-                                        boolean itf) {
-                addDep(Type.getObjectType(owner));
-            }
-
-            @Override
-            public AnnotationVisitor visitParameterAnnotation(int parameter,
-                                                              String desc,
-                                                              boolean visible) {
-                return Main.this.visitAnnotation(desc, visible);
-            }
-        };
-    }
-
-    @Override
-    public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
-        addDep(Type.getType(desc));
-        return null;
-    }
-}
diff --git a/dev-java/java-dep-check/java-dep-check-0.3-r1.ebuild b/dev-java/java-dep-check/java-dep-check-0.3-r1.ebuild
deleted file mode 100644
index 54d806570f99..000000000000
--- a/dev-java/java-dep-check/java-dep-check-0.3-r1.ebuild
+++ /dev/null
@@ -1,31 +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="Java Dependency checker"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-COMMON_DEP="
-	dev-java/commons-cli:1
-	dev-java/asm:3"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}"
-
-JAVA_GENTOO_CLASSPATH="asm-3,commons-cli-1"
-
-src_unpack() {
-	cp "${FILESDIR}/Main-${PV}.java" Main.java || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${PN} --main javadepchecker.Main
-}
diff --git a/dev-java/java-dep-check/java-dep-check-0.4-r1.ebuild b/dev-java/java-dep-check/java-dep-check-0.4-r1.ebuild
deleted file mode 100644
index eb7e53a80eee..000000000000
--- a/dev-java/java-dep-check/java-dep-check-0.4-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2016-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java Dependency checker"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEP="
-	dev-java/commons-cli:1
-	dev-java/asm:4"
-RDEPEND=">=virtual/jre-1.8:*
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.8:*
-	${COMMON_DEP}"
-
-JAVA_GENTOO_CLASSPATH="asm-4,commons-cli-1"
-
-src_unpack() {
-	cp "${FILESDIR}/Main-${PV}.java" Main.java || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${PN} --main javadepchecker.Main
-}
diff --git a/dev-java/java-dep-check/java-dep-check-0.4.ebuild b/dev-java/java-dep-check/java-dep-check-0.4.ebuild
deleted file mode 100644
index b9acd52392e4..000000000000
--- a/dev-java/java-dep-check/java-dep-check-0.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java Dependency checker"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEP="
-	dev-java/commons-cli:1
-	dev-java/asm:4"
-RDEPEND=">=virtual/jre-1.8
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.8
-	${COMMON_DEP}"
-
-JAVA_GENTOO_CLASSPATH="asm-4,commons-cli-1"
-
-src_unpack() {
-	cp "${FILESDIR}/Main-${PV}.java" Main.java || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${PN} --main javadepchecker.Main
-}
diff --git a/dev-java/java-dep-check/java-dep-check-0.5.ebuild b/dev-java/java-dep-check/java-dep-check-0.5.ebuild
index eb7e53a80eee..ef6057f4e111 100644
--- a/dev-java/java-dep-check/java-dep-check-0.5.ebuild
+++ b/dev-java/java-dep-check/java-dep-check-0.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEP="
 	dev-java/commons-cli:1
diff --git a/dev-java/java-getopt/Manifest b/dev-java/java-getopt/Manifest
index ccd5b14824af..a600996df280 100644
--- a/dev-java/java-getopt/Manifest
+++ b/dev-java/java-getopt/Manifest
@@ -1,3 +1,3 @@
 DIST java-getopt-1.0.14.tar.gz 45561 BLAKE2B d82234c2e49f6f556ddabd38cd283a63c2f6365ed23c227c42c48c75d834ce7de6a3fdc84c890762f05a63d4e09bab7e584f1cb9d17ef0a4784cd36c62f3128e SHA512 611a08b60ed787eaa1bf6bf6ce45075ed2bd75d7eead941879e019ef12cb4fcd7a196d0e64e9a75adaf35240c872f14590d7afa4e2dda03016fa970bd2e2dc25
-EBUILD java-getopt-1.0.14.ebuild 843 BLAKE2B f0d3aec23849866559ef18009dd93219cda8183fe972866e1b653cecf15f72a769247bb778328938f17da049944c6afc06cc51beb133c4fa4c9deaa6afd3a5a1 SHA512 e58a649a5854fb7f411799e63dc47897de00b55bc92b55e5bc5193f75857c82f2ee231e8de255e4839eb9858b54e739b68f70ca37e2b578edc6558ba50ec43bb
+EBUILD java-getopt-1.0.14-r1.ebuild 847 BLAKE2B 98fb8b8b224bd42b1ad09a751bb24e2b2b70b72707f6e75670dfc0ccca766ffcb061c535f2751999e168d326ec8131df09bb4617d76c911aa643bc136f47996f SHA512 2a8f66fe52ae1b82d6ce76e15c55c30d432a5fc09be297afdaf7f61f51949b140ebf0e0d68c550a07d215c5e205d923303fec6d7dc2e7430955b89212e394d9b
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/java-getopt/java-getopt-1.0.14.ebuild b/dev-java/java-getopt/java-getopt-1.0.14-r1.ebuild
index aa561593096a..2cf4dd980a50 100644
--- a/dev-java/java-getopt/java-getopt-1.0.14.ebuild
+++ b/dev-java/java-getopt/java-getopt-1.0.14-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
@@ -14,14 +14,14 @@ SRC_URI="https://www.urbanophile.com/arenn/hacking/getopt/${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 ~x86-solaris"
-IUSE=""
 
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}"
 
-java_prepare() {
+src_prepare() {
+	default
 	mv gnu/getopt/buildx.xml build.xml || die
 }
 
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index 5aaaa4288958..5bcbc95929e9 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 7033 BLAKE2B dc74a0794917171dd7b
 AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1256 BLAKE2B d1da7d6f8f195d690d687f4d1f48f302b45dd2a12612c75fcce5fae3881469a1dd237baedef5846861deb4c8c697633de3b24598f62ca650deb339f6f2dbb219 SHA512 907f07bcf3debd45d07639ea8b60c21be1190cb7939b28c05eaebdd8713e818402d8da9722be09a7d20fb5598a44d0682bb32a6897b97ef7faf2bd74ca9f8824
 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-r1.ebuild 1437 BLAKE2B 72b09940425e80a16fb72242a3e86c07ec9ff952b888fcae99f84ad9109d91fa0fcaecc3f54b8ad2a88a4a6e529fe94d3af3ecd5feeb15832d32d1ff9fa89f03 SHA512 99108aff91c500390d346ce330fcb241c89eeac636f626fa7b3e529f20d27e18e4c1e8c78607650b110052d189cef2672cc5cfc826fd697930ebee4f2824d73c
+EBUILD java-service-wrapper-3.5.25-r1.ebuild 1429 BLAKE2B 57c933a9bdc7c7626961a238cca4de56718bd8f0414e1f128dbdd8b91c7512f81203b1316a93d96c6ffb4f48b82c110e232430b4c245f83d9e5027ab78553d71 SHA512 e3f2d6ce64feed5fd416a0000054a727e156a6be5d76d421ee2db756e401aea61389e3c45e571e7c4b259acfb9ace7d5689502c15ce9a4f1617307b3508c9b5b
 MISC metadata.xml 639 BLAKE2B 835791890bc6ee84347d2fd82601698b2c1c516b46971df7b567f2000b41ed065bc3bcf3fafb1a97a15ae6ef3c37397580079de48ca56523779f055a99eea8d6 SHA512 4df27ebd9d7503edc1c62e311dbf564bb991963820753df523459baf8e0d65e7464e6b42dbbe1ee6649791c66dae552991eed3cfa1e8e2d100ffe512a8e0df6f
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
index db759bcfd96d..3357c265306f 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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 eutils java-pkg-2 java-ant-2 toolchain-funcs
+JAVA_PKG_IUSE="doc source test"
+inherit epatch java-pkg-2 java-ant-2 toolchain-funcs
 
 MY_PN="wrapper"
 MY_P="${MY_PN}_${PV}_src"
@@ -15,7 +15,6 @@ SRC_URI="http://${MY_PN}.tanukisoftware.org/download/${PV}/${MY_P}.tar.gz"
 LICENSE="tanuki-community"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
 	>=virtual/jre-1.4"
diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest
index bb214c9fd188..d0959ebda2a0 100644
--- a/dev-java/javacup/Manifest
+++ b/dev-java/javacup/Manifest
@@ -1,5 +1,4 @@
 AUX javacup-0.11b_beta20150326-build-xml-svn.patch 1385 BLAKE2B 43ed5b0c75aa308f2301d8e7d633ca69689a1772a7d8f0f7dbd6f914f1bbf571dcef0ac9fb9cacbe07aaa8c50fca69f0fa95f661314dfab2c16ac96ad50f11f7 SHA512 211157370c61995a05ce45e70941d99da9031174fae2b6e4bbacfdd0c402c451009eb5952a8c3cf8a586402aa138e70733dfd46ce9cf6b5fb680edf65657506c
 DIST java-cup-src-11b-20151001.tar.gz 313405 BLAKE2B 126944916d120dd2150e4a665fea6d216f3d55e002a72b581621df726e4bf0e0664f9ff925189c97162582277c08a4f121e056299ea5a3f5c10cc31d7c0feb9c SHA512 70bb6a0e13fe52694980040205fcf5b3e904c4a07e50c7740c55cc3bb481496c5c071377757b94f59807b936b8c4fdde5423d78cc2d12a7ada1870f71cd9f47e
 EBUILD javacup-0.11b_p20151001-r1.ebuild 2786 BLAKE2B 02de56281f4f530ad1e7841f981b1522cb56e5ada96a523cd4dcd08eab16124a2a27ace79633ecc8bf64f47f1191e005fcd0e50751e380d3328c6b3123e84aff SHA512 e18275195a7a01ef05fcd3ce6d9cb5290271f28711edf53a3b6f3f972988ba3b14a5cb53ea8d41a9ec664a6f8dd38ba46166455177b1dfe8504761c5448a8fa0
-EBUILD javacup-0.11b_p20151001.ebuild 2798 BLAKE2B 8bf3e57971595295db4c5af67e9d810577fb1cd017a226ad4bf6f1835fa96d1150f9135e7ac5e4b2b374d2d433f58d6ad55193465a8f092e8d82c83c949f2050 SHA512 cc8885b9d6dfa24f39d9ad9ad28f4af755d1c50182b388f7ce1243125de58aade47872647b2fd5add3a4f80af1b88697da39855fab8d0d95e49e6db75b087bfb
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/javacup/javacup-0.11b_p20151001.ebuild b/dev-java/javacup/javacup-0.11b_p20151001.ebuild
deleted file mode 100644
index 9e50193d6fef..000000000000
--- a/dev-java/javacup/javacup-0.11b_p20151001.ebuild
+++ /dev/null
@@ -1,89 +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 eutils java-pkg-2 java-ant-2
-
-MY_PV=${PV/_beta/-}
-MY_PV=${MY_PV/_p/-}
-MY_PV=${MY_PV#0.}
-MY_P=java-cup-${MY_PV%-*}
-
-DESCRIPTION="CUP Parser Generator for Java"
-HOMEPAGE="http://www2.cs.tum.edu/projects/cup/"
-SRC_URI="http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=virtual/jdk-1.7
-	>=dev-java/ant-core-1.7.0:0
-	>=dev-java/jflex-1.6.1:0"
-
-RDEPEND=">=virtual/jre-1.7"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" taskdef"
-
-S="${WORKDIR}"
-
-java_prepare() {
-	# Bizarrely, you can't build from the tarball without this patch.
-	epatch "${FILESDIR}"/${PN}-0.11b_beta20150326-build-xml-svn.patch
-
-	# The JFlex package name has changed to lower case.
-	sed -i "s/JFlex\./jflex./g" build.xml || die
-
-	# Remove the bundled JFlex.
-	rm -v bin/JFlex.jar || die
-}
-
-src_configure() {
-	EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core,jflex)
-	java-ant-2_src_configure
-}
-
-src_compile() {
-	# Annoyingly javacup bundles an older version of itself that will
-	# break jflex if that has already been built against this newer
-	# version beforehand. Even more annoyingly, the binary download is
-	# built with Java 8, which isn't much use to us. We therefore use
-	# any installed javacup that is newer than the bundled version where
-	# possible. If this approach turns out to be unworkable then we may
-	# just have to use the bundled jflex for bootstrapping.
-	if has_version \>=${CATEGORY}/${PN}-0.11b:${SLOT}; then
-		# Use PORTAGE_QUIET to suppress a QA warning that is spurious
-		# thanks to has_version above. This is Portage-specific but
-		# showing the warning elsewhere isn't the end of the world.
-		einfo "Bootstrapping with installed javacup ..."
-		EANT_GENTOO_CLASSPATH_EXTRA+=":$(PORTAGE_QUIET=1 java-pkg_getjars --build-only javacup)" eant
-	else
-		einfo "Bootstrapping with bundled javacup ..."
-		EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/bin/${MY_P:0:-1}.jar" eant
-	fi
-
-	# Clean everything except the new jar.
-	rm -rv java/ classes/ || die
-
-	einfo "Recompiling with newly built javacup ..."
-	EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/dist/${MY_P}.jar" eant
-
-	use doc && ejavadoc -sourcepath src/ -d javadoc java_cup
-}
-
-src_install() {
-	java-pkg_newjar dist/${MY_P}.jar
-	java-pkg_newjar dist/${MY_P}-runtime.jar ${PN}-runtime.jar
-	java-pkg_dolauncher ${PN} --jar ${PN}.jar
-	java-pkg_register-ant-task
-
-	dodoc changelog.txt
-	docinto html
-	dodoc manual.html
-
-	use source && java-pkg_dosrc java/*
-	use doc && java-pkg_dojavadoc javadoc
-}
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index c6b34326ab9b..753f6770f6bd 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,5 +1,5 @@
 DIST javassist-2.6.zip 1143271 BLAKE2B 05f4e5ebc47420054d4c3d2f77cde33b92e616f3c6740fc030e69b90a697bfbb67be300375d9efc1929a2acfe3493f427222f8a7b1e3137d8bc42f749e51f840 SHA512 8a6da5e2a44cc3bc5b87538a4eda56808d13998d8c9932153f9bb42a1c7844d1a1c7311eb22b0b4ad04649bb7c22156acf851bee638cffbd3328bcef1d2a9f37
 DIST javassist-3.18.2.tar.gz 1179428 BLAKE2B cc7dfebca2e47576f902e6249c1efb65c18823e75ba3698c2d94541bdc910b9b7547e8619c1f19a84c158771230ddd112ddb0445ed97cd64810beacf3468a1ba SHA512 67f22a70584eba31088d63b7862f0f7872a6a7ec57f4397b95044695af75be005e86aa5a5f20fe8e650c2178a9b63b4b922accf940b46ceb1c8e7ce9c51798ca
 EBUILD javassist-2.6-r2.ebuild 756 BLAKE2B 42f0ab587abaa592c82da66bca499abca1c726ed39b9588a8cdfe3a74c78a8d1c30982aaaa8c754af53c9728e0f341b4c4ec7b189249ac161ae63bd220c6a738 SHA512 58373704cb574b16a6bae4c2a1788c565fdfc83eaa6774a21f6dcae1814fd0be1c9306209b08d8aec801e5d4e34ef6a0f190cfa6ff410515230ef626c439c50f
-EBUILD javassist-3.18.2.ebuild 957 BLAKE2B 3ffb97f205573beba1eda412586c01ec7eb45d920190cf10fc290431ae95415be1413788898b6a20f20101592fe3a36281bbdf86878db88a41bab400d6780198 SHA512 c08a4f1d3b7d70b23ed9564f60abf47b565ec02b2947cb80d21cf59c390ecbfd1d1d93895d7697e7283e2e239b2059d31831c2f5bc41c345885b7765c469cb23
+EBUILD javassist-3.18.2.ebuild 995 BLAKE2B 5cccc97d10360d9b2191a01bb2f0e426965c479fc6da87d81e8fd9d018e383959eaf719ef711bb609db320240b2006ec8ac41d1e3938c5105014b3744a54612f SHA512 ce54d3530bb757068a8233df0586e4d48f3005caf3ec19b88e1b113bc94aa1b782ae8d4dc26dfb3c80c4a4f864e6cb36e8762a93ddf420d6d57e0d2869ae4f9a
 MISC metadata.xml 376 BLAKE2B 4f31c9b79818bbba1a766800296ce4cdfa81b1a7f10d4c6cf18b59d99e6e59071552a85ae216f6383b2ed5356f433d029be4ce8e9d6f6575adc60b2dfcb8ee07 SHA512 ebd682e2a4913e15c4c93c7f22c10e8f540fb377f2d90f137291bedd1ed7410b5af36215e94543f6e048803bd4475ee69371ff00255f227c4f2df9432f118ba3
diff --git a/dev-java/javassist/javassist-3.18.2.ebuild b/dev-java/javassist/javassist-3.18.2.ebuild
index 4590c14bc8a6..6205ac4cdea5 100644
--- a/dev-java/javassist/javassist-3.18.2.ebuild
+++ b/dev-java/javassist/javassist-3.18.2.ebuild
@@ -4,6 +4,7 @@
 EAPI=5
 
 JAVA_PKG_IUSE="doc source examples"
+MAVEN_ID="javassist:javassist:3.18.2"
 
 inherit java-pkg-2 java-ant-2
 
diff --git a/dev-java/javolution/Manifest b/dev-java/javolution/Manifest
index 4db58e6ec72d..c93f17d531e1 100644
--- a/dev-java/javolution/Manifest
+++ b/dev-java/javolution/Manifest
@@ -3,6 +3,6 @@ AUX javolution-6.0.0-javadoc-fix.patch 788 BLAKE2B 6b8407412e6825fba02b252568ab1
 DIST javolution-4.0.2-src.zip 556097 BLAKE2B 83f009a60e2b981d488b0b5f95572d3f88f724388b0d09eee10d7f1555379b2b51cf1d2f0f0af74d6944718b7e4b2f609f7866a747c19001edb2466611a6192a SHA512 562e0d364aa6b564341ce197941aaaf51e286712e6b71459ac12eccffbdf1d440f1910826cebf088176562b5dccb865f5d0e652a519814e1357094e253ee2efd
 DIST javolution-6.0.0-build.xml.tar.xz 2696 BLAKE2B 825899c903300dd7d031ab372c85f2824b796305dcf56ea9fc162d883a09f2feedc7498d13b6c803ad43d876dcf3dc457704cf834ff9d48411a67e0bec0a28f9 SHA512 5861e462f24817efec24a784625e240fd4e08117c7b11bf7145f8dae35bb90b0b9fc1e431895ef5d868a1f1d57d96967fd9f39a9b821b51875814f6e118dbdab
 DIST javolution-6.0.0.tar.xz 1308148 BLAKE2B 148bd28e7cd9a0fe16d657cb61fd870e92180f4ad64fb9b1a37fa953309a80c1f3b3b9edbe0c7defa2a3a73ba8d3cf200ee29737769cc31fe87300fbc40f2111 SHA512 86a7a19b13b74cca6ab4871e725a1143d6a1401cc7265390ee66b83f8a9b48f7879b8ccc2d7a3d660e523b64e3779eaf372519ee98268f1bf55df1d7b5a7f034
-EBUILD javolution-4.0.2-r1.ebuild 862 BLAKE2B ce8525edd225cfc331137a736f0629a7baa25a91ffcff2b61ae20c82fb64ca60a9e7cba2ff83562b6684a6747b0af34eacfd9adaa7e76c1697a370342b067f73 SHA512 57633a2a5818ec60a00697ccfae762beb908dceed175e7446fc194bf4e096493aec2e70daa8a7ef9f67f865bf471921736cc882f6d826fca81529d9b6ea7c808
+EBUILD javolution-4.0.2-r1.ebuild 859 BLAKE2B 48f86824d47e4fb7e0a15fee04a58b8cfa8040e855f855b359e3a2132053a527a99e70a1f1d6ea2a47bafcce33da46811db67e262235131c60ccf49ed0355d79 SHA512 c3047c0d3fdf4f5cd592993cc7de2d7e36c2ea3525e7c2200bebf5bc379802b313f66d778f867ba35cb228aff108c6af3a17fc053e0a2173d2394c2053da4b8a
 EBUILD javolution-6.0.0.ebuild 1359 BLAKE2B a03bb5a832d6381b6cea9c55bdbe00d7f4393bb3bb9967d2be57f1c6d9ff844c08cd671459986cd2c53a2adc32a9e55d1f8ea1b9f77246a738ba6f16247d1ac3 SHA512 9719d2ad63d57e897fae5692a08e67cc91da5a89a9e5dfbaf8b9a27dd6dfe07e186791bb4d88ae4ef5d59da58daf80e1a11d4b5da60e31e2d2c8872e97945a4b
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/javolution/javolution-4.0.2-r1.ebuild b/dev-java/javolution/javolution-4.0.2-r1.ebuild
index 80255b4d8561..70885aa5b247 100644
--- a/dev-java/javolution/javolution-4.0.2-r1.ebuild
+++ b/dev-java/javolution/javolution-4.0.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# 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 eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 DESCRIPTION="Java Solution for Real-Time and Embedded Systems"
 SRC_URI="http://javolution.org/${P}-src.zip"
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index d26f6903b243..d9d80b02585a 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,7 +1,8 @@
 AUX jaxen-1.1.4_maven1-build.xml 13148 BLAKE2B c5f6421878e732db00b2d5daede8d93cdf1d349c1dfdbb6f83a607d734dc05f0847ce5f8cc86ec1a2be5855d96dfc1a3128c0811846f4a5c7679dd60ad730c12 SHA512 2f3625a2a14066289b20e1118a87168e6cf1ce252becdccbc6f4eeefac446e528298e1e6af7d1304ff9d1d4ee8c394c2cf67f6799d3062091d53cce7ff5b1e42
 DIST jaxen-1.1.4-src.tar.gz 268493 BLAKE2B ff51cf3b6507f19549ab864fa4cd53d0b2d0c34a21a944d22feed74d58fb71c0273f5b560cc9c02aa50748f672115e77fab24a2d986508841d6a0ba4b8911690 SHA512 11c1c744af030c50579f872d8c8bf437e48ab4a01e6dd34529f2d9039c154533edaa9b5a367a866e2b57f311f1111717be300db8f80423c5492be38e0cffc031
 DIST jaxen-1.1.6.jar 409677 BLAKE2B 55e03939420c103fb5a6d323595ff0cb7653885eb9ba233fd581c5376d2ac90eecde7aa5576f602cdc459cfd9ba9e79c6bb5bfab3ed7805e717a21670a5748ee SHA512 979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48
+DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97 SHA512 cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53
 EBUILD jaxen-1.1.4-r1.ebuild 1082 BLAKE2B 5a63323c265e84a70008b4f44788ab50f0c370906f63d46aecd4e476b23c31aa37162b21d9d6ad950c3e59e758ffd711d204b8d8bf05fe1ee3e4076ec07d5daf SHA512 82a7a8b205958e9e81d28887c747a9731077458f213af8c30551fd9eed78cdcf9cd7e29fe385e3c9513f3421fb222c4aad8f959bc1c59d1e42da38847e3e1f0d
-EBUILD jaxen-1.1.6-r1.ebuild 886 BLAKE2B 9bdcae339d701ba219baa7ba9fea620f6107cbbab7e14baa7533ef14d7b8cb5450af23044cdcb11af32273bf260fd366294a6a5348c957850c657c996e9a6b50 SHA512 2facca63e346083a6842c004d048ca819668668f78dd8444f88a3d6425c785828178a2a482608c4b02395e2340e4405c8a87a78b9643e83fe8f2bdb92ac7c104
-EBUILD jaxen-1.1.6.ebuild 613 BLAKE2B 7f5654f3b927954ff7511664248e6083fa7b3019e1fa893e356175a27fd40d812f8ef0470fbf9c1cff8906e87048b9d808c9d377f8c7e872662339ce821b2690 SHA512 4bb8b4f2c124f9eac8e96ce99cb32d39dd04c46e6e17b7217f8791d417ce8dc87067d611df50967a2caec67265fdb14aac9d0f28a57c4bfe88f941bd860bf91e
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
+EBUILD jaxen-1.1.6-r2.ebuild 864 BLAKE2B b13a456435ae9c5bf982e89c6f6bb84ed44d074e26d8efc762de0bd219d31850561455093e9538b53e0982ab9c4041bdc8f87559cb8da22b9420bb8742691fe0 SHA512 507cc60f4c7f85e6f87f9d1c198a75e04cdf6936f541923c7b0ff8606e0f5fbb9a040a52f4339925e70c9e696a0b59ce92356389c2fbd19ee49df15f57209e17
+EBUILD jaxen-1.2.0-r1.ebuild 1919 BLAKE2B 90a69225c4086bf95f16cb8308842f703970cdc0ebd95e354d6868d29172ec6b9af479fa3ef546f1f8432afc807643bcf2de6ea937524fd32ee26a7f10807d8b SHA512 51df4c02d9ff569fb37b2f4629f2ea9b7817fdb3030d303728401c424f0feec73528b328af05e910de5a9b7b1dee7e48cda55e5662a903a0c0272df842ef3990
+MISC metadata.xml 718 BLAKE2B 14654870dfbaef53f3fc46124c5df04970de2699ed0d3f453a1b98603dee6f805fc6018477b08ea82c01617d17969a06233c0cc1e41038dc43c5ae4ffe3d16b8 SHA512 d37502fe1c0e32f28599da74657433561cddb87d15b80c3fe05242cbb0032a7abcb04180890126f89ff5c30b39f9614b1eb255bce7af01ca51eda3807902aafa
diff --git a/dev-java/jaxen/jaxen-1.1.6-r1.ebuild b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
index c364ebdd0230..e8fcb57853e0 100644
--- a/dev-java/jaxen/jaxen-1.1.6-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
@@ -13,24 +13,15 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
 
 LICENSE="JDOM"
 SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-CDEPEND="
-	dev-java/jdom:0
-	dev-java/dom4j:1"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
 
 RDEPEND="
 	${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8:*"
 
 DEPEND="
 	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
-	jdom
-	dom4j-1
-"
+	>=virtual/jdk-1.8:*"
 
 JAVA_SRC_DIR="org"
 
@@ -41,5 +32,8 @@ src_prepare() {
 	# require jaxen to depend on xom, we end up in a circular dep.
 	# I fear though that removing those classes might bite us somewhere down
 	# the line...
-	rm -rv org/jaxen/xom || die
+	rm -rv org/jaxen/{dom4j,jdom,xom} || die
+
+	# this is now part of jdk
+	rm -rv org/w3c || die
 }
diff --git a/dev-java/jaxen/jaxen-1.1.6.ebuild b/dev-java/jaxen/jaxen-1.1.6.ebuild
deleted file mode 100644
index 77b073b118a4..000000000000
--- a/dev-java/jaxen/jaxen-1.1.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 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 Java XPath Engine"
-HOMEPAGE="https://github.com/codehaus"
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="JDOM"
-SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-CDEPEND="
-	dev-java/dom4j:1
-	dev-java/jdom:0
-	dev-java/xom:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
-	xom
-	jdom
-	dom4j-1
-"
diff --git a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..3722e883f75b
--- /dev/null
+++ b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jaxen-xpath/jaxen/archive/refs/tags/v1.2.0.tar.gz --slot 1.2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxen-1.2.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="jaxen:jaxen:1.2.0"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jaxen is a universal XPath engine for Java."
+HOMEPAGE="http://www.cafeconleche.org/jaxen/"
+SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="1.2"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+IUSE="dom4j jdom xom"
+
+# It seems that most tests depend on dom4j, jdom and xom which all depend back on jaxen
+REQUIRED_USE="test? ( dom4j jdom xom )"
+
+# Compile dependencies
+# POM: pom.xml
+# xerces:xercesImpl:2.6.2 -> >=dev-java/xerces-2.12.0:2
+# xml-apis:xml-apis:1.3.02 -> >=dev-java/xml-commons-external-1.4.01:1.4
+# POM: pom.xml
+# test? junit:junit:3.8.2 -> >=dev-java/junit-3.8.2:0
+
+CDEPEND="
+	dom4j? ( dev-java/dom4j:1 )
+	jdom? ( dev-java/jdom:0 )
+	xom? ( dev-java/xom:0 )
+"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}"
+
+DOCS=( "${P}"/{LICENSE.txt,README.md} )
+
+JAVA_SRC_DIR="${P}/src/java/main"
+
+JAVA_TEST_SRC_DIR="${P}/src/java/test"
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+
+src_prepare() {
+	default
+
+	if use dom4j; then
+		JAVA_GENTOO_CLASSPATH+=" dom4j-1"
+	else
+		rm -rv "${JAVA_SRC_DIR}"/org/jaxen/dom4j || die
+	fi
+
+	if use jdom; then
+		JAVA_GENTOO_CLASSPATH+=" jdom"
+	else
+		rm -rv "${JAVA_SRC_DIR}"/org/jaxen/jdom || die
+	fi
+
+	if use xom; then
+		JAVA_GENTOO_CLASSPATH+=" xom"
+	else
+		rm -rv "${JAVA_SRC_DIR}"/org/jaxen/xom || die
+	fi
+}
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jaxen/metadata.xml b/dev-java/jaxen/metadata.xml
index 952a4b9b605c..e20be5fb7b4e 100644
--- a/dev-java/jaxen/metadata.xml
+++ b/dev-java/jaxen/metadata.xml
@@ -5,4 +5,15 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<use>
+		<flag name="dom4j">Includes org.jaxen.dom4j package</flag>
+		<flag name="jdom">Includes org.jaxen.jdom package</flag>
+		<flag name="xom">Includes org.jaxen.xom package</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">jaxen-xpath/jaxen</remote-id>
+		<doc>https://github.com/jaxen-xpath/jaxen/wiki/Jaxen-Wiki</doc>
+		<bugs-to>https://github.com/jaxen-xpath/jaxen/issues</bugs-to>
+		<changelog>https://github.com/jaxen-xpath/jaxen/wiki/Changelog</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jbitcollider-core/Manifest b/dev-java/jbitcollider-core/Manifest
index 9b93e2f70812..73dd03f8463d 100644
--- a/dev-java/jbitcollider-core/Manifest
+++ b/dev-java/jbitcollider-core/Manifest
@@ -1,3 +1,3 @@
 DIST jBitcollider-0.8.zip 1192489 BLAKE2B cf30002394c83b6748d1a24f92148da46fdb1e84dc14f3b673ed8d3bd6ff2719b5530c890f21cc9e7af9a4553cfbb9cb606799606ea88b40e5b96e768b1c11cc SHA512 272e9e0e6e66d3ac9d17e17d8fcbed82b508e512c5cdada7f18c2920597f31ae5968509c9814c5530ee7c5bea9f3d1b049b922d55056637642bcb515b890a9f7
-EBUILD jbitcollider-core-0.8.ebuild 879 BLAKE2B 743301c5756b2c20dc6411f97ac4c7a88ec6dc08ac80d2e1131ea016fa301de6f91bf7e8128d72f0ab3a94a72105c9ce9bc16422658f61d85529a522af6e9450 SHA512 01f646c32eefdd28a86113e72ed36eb722912155ce13e0e52f0655e2bd4dc6e965be26fb28d849e71a5624d0d3e8da32248cb9cde5aedb1b2a959a3a5c85fa31
+EBUILD jbitcollider-core-0.8-r1.ebuild 924 BLAKE2B e029cdaf5eeb58e8929284f1d493d4b213debff82b1cde3ddcd71a040dec969edbaac7edfc49482069ec4b88869fcb4de748a4aa2fcdd191e2b8cfb3433badc9 SHA512 35abcb35aa222c32f25714a02adb016532b72fab26eda46122d0a49388afa0e6ee2dbf963f9d33a5e3aad124339fb6516fd39258ee7b6d8ada6cdb4265a80cd7
 MISC metadata.xml 337 BLAKE2B 53a438406066fb18a0dfe2c9fc73241de197b084079231d4e22aa1eeb1874b306720d19b31369a716a78326518b926d1b35eb4e2541eb4412cb31eccf5eeac78 SHA512 0efda2836e8f84a62c04efad27a95620f4c91221be25ddc101852a7a2965e173bf728ad9474451b945d333990267f8aec331512bcfb32cf5a002164b01d9e296
diff --git a/dev-java/jbitcollider-core/jbitcollider-core-0.8.ebuild b/dev-java/jbitcollider-core/jbitcollider-core-0.8-r1.ebuild
index 65e47747fcb5..07c846c70b04 100644
--- a/dev-java/jbitcollider-core/jbitcollider-core-0.8.ebuild
+++ b/dev-java/jbitcollider-core/jbitcollider-core-0.8-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 JAVA_PKG_IUSE="doc source"
 
 MY_PN="jBitcollider"
@@ -12,15 +13,15 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Core classes of jBitcollider: org.bitpedia.collider.core"
 HOMEPAGE="http://bitcollider.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bitcollider/${MY_P}.zip"
+SRC_URI="mirror://sourceforge/project/bitcollider/jBitcollider%20%28Java%29/${PV}/${MY_P}.zip"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 BDEPEND="app-arch/unzip"
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-java/jcmdline/Manifest b/dev-java/jcmdline/Manifest
index 9ec9f9ad379f..5c29c47834c7 100644
--- a/dev-java/jcmdline/Manifest
+++ b/dev-java/jcmdline/Manifest
@@ -1,6 +1,6 @@
 AUX jcmdline-1.0.2-gentoo.patch 934 BLAKE2B a7e94aeeb042722c1feae194e396a7083095a017d8dc77d45035c515ac27c5bb8dd54e66fe02158a0154ab7cda964aa2568b844824df48c0586cda2f84bf24b7 SHA512 1326e1867b6fcc0ad37e0f0d557f518c5df5b8a2d87be91c66c2d9e72c044221713df5a864f5500e3820f853b415bea0612f02d8e30525d28aa10bb5002d2608
 DIST jcmdline-1.0.2.zip 397472 BLAKE2B 6c40c27397b11d21400d9e251cb4a84f13281fa8aaa0a772390724fed0fbbad7613a0c13f6dda1b53acb311be37a3a5ed63a4475a271d63d48322572d5215a2b SHA512 b261856eed9426257fd6391d45760f96f0085a40167632bfb2f85d35071e58d766553819bc0f8022b92fa193d47464928d09d2b0772a08ba484dd954b6206fd7
 DIST jcmdline-2.0.0.zip 395547 BLAKE2B 0dd00785a970fe614aef86e0d1fc8a465c9cffc96d2e157a03ed7e68e4f471a6cfdef8d7af5d90171da1fdeb6130f9a5f34b5dfb8765463e2ee7fdcfdd2991b1 SHA512 cbd5fcfa01b733ed1904bf56fa509dbf6d6764091902b31d2a620ba1e302d1ebac8c54d20ebc9031d7724aa1578cc6ca5befb6f38625780fd021e1b002674cb9
-EBUILD jcmdline-1.0.2-r2.ebuild 753 BLAKE2B 053caec253c6d244b6344b18621bddfe08c8595166ec8374218e86b4ee822d3a36c89d0cc0e350a2b8e6b9b2df8a3b52dfb2f0c0bb5ffc9ada7dda63cabaa18b SHA512 8cce1e6185e352cdafcc3704d8eedf7248fc4a19f15b0ef49de53bdcff5e14fbd8318efb3f30162a422a3443d4f636ad85f8fca210a7c411911cfe7aed9029a8
+EBUILD jcmdline-1.0.2-r2.ebuild 750 BLAKE2B 7b63b5a73f7b89be2cddb16f3dd04469936dc046eff2829be68c51fc582364e8dcefc1e9bad6fc55d2c4484393b34051c46d63dac388e6ee90c235de51a13982 SHA512 e16dafb7c4603b9eace2f0216091b1da1cf7527c8d7023f22a89a4a5310350d92b31fcacb951e8a7ab56ebb8950b2975ebc6ddc5fb3e8b7e6abedc6ae8026eb0
 EBUILD jcmdline-2.0.0.ebuild 545 BLAKE2B 98674e04b67b757aeb7f1d18de9e9ef07d346f633fe50a338e7e50f880cfa65da759829a079214bb640a007fc0e018c02596f22ea449b7f03060d22e10d366b6 SHA512 2a148a9d420453e550e7343037d7e607835a539904b53c08ca9d57b32ec09335efb4b9683099a6d6e0d93fb0bd5eefff5836c980ad7d3c5917f45ce4d4b5da01
 MISC metadata.xml 489 BLAKE2B 141339c5c28f928c1dbc166edb8ccb77078b7a5ce578ae4af3188c4f6a39c165cf784774c2916c7ae127e7f71a25a23953917b47646e28854e4a950435754044 SHA512 c332bc5180c891457f2cd34ea744b01771ff771b0ad4b1138ce01a0563d82212fa9f2988967ab0c1b7e41947bf25d8c0f627732dea9dda728fd887c287206430
diff --git a/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild b/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild
index 02429bede5f1..bfb0643d18f1 100644
--- a/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild
+++ b/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 DESCRIPTION="Library for parsing/handling of command line parameters"
 HOMEPAGE="http://jcmdline.sourceforge.net/"
diff --git a/dev-java/jcodings/Manifest b/dev-java/jcodings/Manifest
index 4c391c3f72ce..2c32bb87e8d6 100644
--- a/dev-java/jcodings/Manifest
+++ b/dev-java/jcodings/Manifest
@@ -1,6 +1,8 @@
 AUX maven-build.xml 7254 BLAKE2B 1004cdec7ec80a02f2a0344d748ec0e17e9902be72ea93ac39542b3cc0e8eacd5d95dfc716d5acd20124b9c71aaee2b99bf4bec084301f53897da52758071900 SHA512 0735062e262c9abcb3649ef48d87a9d7489d0d980ee9c77c1e7b6aff4f386344d423403dc54e4d1ae08606adbe1ffea4ac4cf531d4cf1cb2dcf21f1ab95571ad
 DIST jcodings-1.0.11.tar.gz 123802 BLAKE2B 22cde3714da0f1b9434d630905d9a5a8bcdf7ebcab8de5b03ff12d6b31d6fd256f87680743d96e860cd5af34a0b5e70bb1a326000b5440d9b4c4f8a20d9964ee SHA512 6bff29718ff04fd2f52cff767440d87f3dcb0f4acf71ee7b037241af7ef7533284176f53d08da5b1f37c643b766f4a9113651c994d1893ef302a2056d9ff40f3
 DIST jcodings-1.0.5-git.tar.gz 90788 BLAKE2B f1a72a1879e89c60bbb1537d5a6dd174b9f0a2bb4a3eb80520a2b4f7ddae5da359f11ba220b4f64db0413fd423c31623a0863cedbf62f7efd83ce73952557b35 SHA512 a0122eea18077daefdcf38ec9e6f12b000c558837835fe900f6e0c282fdfcf95dbb10652b4cfeb32e556ae8ebe1aec8c10e4a352cdb565837b2f16335140f8e3
-EBUILD jcodings-1.0.11.ebuild 831 BLAKE2B 0961ac2695eea30e64a56cb2e2548ce4aecd2c426f75596e53464d9dcfd4c9817ca17c6c917c96e3d8bc50e1a3d8dd7c1112d64566c57a4a263475f2fcb44810 SHA512 f6ebb86b9e9682f0fad70f3139eb5e11c8da9abbdb30d3866f12beb4f8ee69649d6c0f0c1fdf676363598db12afea57735f9677df05ea37295525b87307f3468
-EBUILD jcodings-1.0.5.ebuild 765 BLAKE2B 162acf18d0e80a70902fa8175232f450d308625781ee9952ed45de1ba38d53409167c1d2f9a38a7cc298966d94087bd3a518ef0ad8a36f0d7a7b53eed19e8e92 SHA512 fe97b0dc11501334d48714495b0cf04c5dd3206129a53d4917f4710f37a29223e2bbee0ce7c9552e1c8b63f338462d9129204374c4ab0ab95cc926e5f21ba624
-MISC metadata.xml 325 BLAKE2B ffc57bb511b07c41330a25a5fbc924232362e45c3206c32e7c3d90cd624a9a2b0cd1e5499b510b19387c5eb43134b01bf501b112964beb629d1f1b0b0e6a3abe SHA512 b0a431f148289e90b6bbf25940157336603658375d13d4a256e224174ddeedac53e6dd625239e51763b467678090a6305463c4c89fd878027ca8c4b369434095
+DIST jcodings-1.0.55.tar.gz 1390865 BLAKE2B 8c10c489f5c64ce0b394f7efa43cf996aa630e90d88329d4955d43c5e41666f665d8ea922b34477b545040417cc2003aacc75b45410f84176b3ee9e4087126e7 SHA512 c450b3df49ff39a974e1ce8eea1adcd8febb0f4d7b8a1b0b69e7f2bb97b365729c282600a04666b03821fc8d1b3df77e75f1611dbed997f6651e6ec481658874
+EBUILD jcodings-1.0.11-r1.ebuild 835 BLAKE2B b78732d1597c4fa7a7bac8b3471507148b7b3227dc082d4f992503ba7f443625b32ad53a3a3138ace8f8d128b98b850b0c796fa59e8ae477d338a0b5ca36db77 SHA512 39f91eec7be87a3fcfc31d2a2c849337b2ee72d01eb468d74efc4dc3beb122bbf6b12e97936a905844cf628221f0e48ea6d485b853265b67999c2756df3e3c4c
+EBUILD jcodings-1.0.5-r1.ebuild 769 BLAKE2B e59c8aaf90ca0b798c99644a1ea877d8323211b636e12b8e075416a102519b257b88ebc9511985a098dd21e043192f597fd2645b767c42d915dff17e8b70cd89 SHA512 e4413b54ddc43f658f4c82823b8b6e5ca9a32dd4671640daeb95228ade05a383fc6b5de2177535d95ab848975989e0f6b6bb3934c26f6bb31134e851e55715e7
+EBUILD jcodings-1.0.55.ebuild 927 BLAKE2B 17156c7dbf4ee544bf10adc9538ca1b735823894c229e502d8a4de8a0b64acd6e8f30d31f4bd5b8035aeb94d9239e594a0836c39cd89f0e2e1323bc8d5aeec7d SHA512 e4189ca918b4e5f752c71ef2b28dc7a8d22b7e266ff2ba9cc2668e0cfdf9c113a32d146e1dbd9143209c293ad21996890ae1b2b53f6f885e5fd93521f112f168
+MISC metadata.xml 377 BLAKE2B 743482f65ef8f86ae27f98eb3ea44c950ec950f15b0699d9e931812486ff7c91231c6d597f3aab3c23e91a33b5401b22c46dc69008e4e4ce3bd6f47a522f7bfe SHA512 9968a7b792d9a0af142a40f40eaf7cff62109ccd018fa90cd92ff8075b2bfdd697d8f3ad5d2b5aab30351fc44d7e6caf74b52c872a4278b1c10d1beb52610e33
diff --git a/dev-java/jcodings/jcodings-1.0.11.ebuild b/dev-java/jcodings/jcodings-1.0.11-r1.ebuild
index 9f3320887a4a..16aeaf0589a1 100644
--- a/dev-java/jcodings/jcodings-1.0.11.ebuild
+++ b/dev-java/jcodings/jcodings-1.0.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,8 +15,8 @@ LICENSE="MIT"
 SLOT="1"
 KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*
 	test? (
 		dev-java/ant-junit:0
 		>=dev-java/junit-4.8:4
diff --git a/dev-java/jcodings/jcodings-1.0.5.ebuild b/dev-java/jcodings/jcodings-1.0.5-r1.ebuild
index 4cfdfa2ba4b7..813a91f20367 100644
--- a/dev-java/jcodings/jcodings-1.0.5.ebuild
+++ b/dev-java/jcodings/jcodings-1.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,8 +15,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
 
 src_unpack() {
 	default
diff --git a/dev-java/jcodings/jcodings-1.0.55.ebuild b/dev-java/jcodings/jcodings-1.0.55.ebuild
new file mode 100644
index 000000000000..a85095ee47b2
--- /dev/null
+++ b/dev-java/jcodings/jcodings-1.0.55.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jruby/jcodings/archive/refs/tags/jcodings-1.0.55.tar.gz --slot 1 --keywords "~amd64 ~x86" --ebuild jcodings-1.0.55.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jruby.jcodings:jcodings:1.0.55"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Byte based encoding support library for java"
+HOMEPAGE="https://github.com/jruby/jcodings"
+SRC_URI="https://github.com/jruby/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-11:*
+"
+
+RDEPEND="
+	>=virtual/jre-11:*
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR="src"
+JAVA_RESOURCE_DIRS="resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="test"
diff --git a/dev-java/jcodings/metadata.xml b/dev-java/jcodings/metadata.xml
index 0214918aa8e0..ce62923cd13f 100644
--- a/dev-java/jcodings/metadata.xml
+++ b/dev-java/jcodings/metadata.xml
@@ -1,11 +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>
-  <upstream>
-    <remote-id type="github">jruby/jcodings</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jruby/jcodings</remote-id>
+		<bugs-to>https://github.com/jruby/jcodings/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index e7d69546be13..fb7147865ed6 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -2,5 +2,5 @@ AUX 5.0.5-dist-target-depends.patch 380 BLAKE2B 2e4d8a025c986dd6bbd1e97b62987561
 AUX 5.0.5-remove-jboss-dependency-from-tests.patch 1541 BLAKE2B 17c84606f144c3aedc6b61986f9f7d215ac539b044d2745682e9f98b22bd6a86996cdb693762b375fd57de21bbe09afeef4ed8a5e91d124a28ecd157a2761a3a SHA512 43e91aa4ff599cb958cb6c098cbc1a28511b2fe12ea44dcee20fffe0efbfd1ce31bb29dfc9330a30d99174ed80abbb8512a0cdf3b4155fbf3d78ef776a5ebcb5
 AUX 5.1.14-java6.patch 1301 BLAKE2B 605199c02b040a07306a26f1701ce3fb317ae7af41480329ae79491f0896847c143ae0e2c04358e291b9288c29a0eeebc613bee9d6b150a6993f6282fc8e7713 SHA512 1b630781201478dee6da3d2322755ff87b2e2c9c1cd49a127bbcd56a0cc25e7bed06ed5f0758709c2e120fc85273755ee28c7ba21ac7b75e97ac6043216413a1
 DIST mysql-connector-java-5.1.26.tar.gz 3724076 BLAKE2B b5477e0f86a04b2135a47e3551cc89fa5f63f46faaccbf1e4473eb59e6d266d22d76a5c256d125feeeccd4625c22bcedaa9e21e613bf9759459e106b7d30db5f SHA512 93b882f5262dc991aa885ed9ae7fead02b9d28431022c86c6724272b508e78eee3df7310e9964e60f68953ed56f4fcdf9159a90f463eb39aea65af2453371879
-EBUILD jdbc-mysql-5.1.26.ebuild 1881 BLAKE2B f581f89265b4a5aa820bbd312462fe0e3ad17ee6b4af06d4358f8a2d83a47e78f6834e748cea85e5f3fffd1ac105dd8782636c25d7d9b311d585435743fd8b29 SHA512 382cfdfa21d387d1aae0f258357c0c205d33b6a1087ad155c06f9d141bd9af8d9f74c0cbe4e424182cf3771ec489ba711126fde431b98849db792fbe9aa59d60
+EBUILD jdbc-mysql-5.1.26.ebuild 1881 BLAKE2B d610892dc558b8d17fd61331ae3d6b5560015b705fa6eb4b4a8f0ed689f6c5f775bff30e0aed2d1f867bb8e379257db93c1f8e3ae3d9650b4f8cbc188cdd2b57 SHA512 3f56080e2b0039474e91cfc4913c9b2fde3594e4e814d057d2a3fbdd146d3205ceb9183c58245f10e99e5f14590bf9a73f9a2c35c5f1b928b6cf642b1f9681e3
 MISC metadata.xml 358 BLAKE2B 634f9354e5f680e4313debca5f05fc117b44f1a43b018b3d71d92430cb8253a9da018f74e888bf535e0dbc64e79d240d4f5748d945a5caa14eba874b9e38dca9 SHA512 4db9ea2f30ecc92b4b97e5159d4338b73c59e3f8640336764d2766a1ca33760b7c0fa6caaac90125102555a5128fff3b2d95e20d92df22e705623f0e2b7914e9
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
index db996676e75d..0080138b8de1 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="source"
 JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
 WANT_ANT_TASKS="ant-contrib"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 MY_PN="mysql-connector-java"
 MY_P="${MY_PN}-${PV}"
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
index 951f91f47be7..6afbdddcfcf6 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -8,6 +8,6 @@ DIST postgresql-jdbc-9.4-1206.src.tar.gz 2029837 BLAKE2B b222a0b2f8f99becaf0ae35
 EBUILD jdbc-postgresql-9.2_p1003.ebuild 1978 BLAKE2B 16e40127eb5113a26752cb5d1cf2fa3fe2894dca80ebaf892fd61793622b89f44aee644b238e9b4e643ec7abb6d7056bbbd9082bb409dc14c193dd7f92e47a52 SHA512 38cba94f33f11c6c22b68cd759e7514f1013a4c247f489e8239f3eed56051b8295604a5bfeaefe76a5aca6226cba32c4033b6761c5efcc1632cb20714218d8d8
 EBUILD jdbc-postgresql-9.2_p1004.ebuild 1981 BLAKE2B 2ccb65c367ac2e25fc03dc69d85e403482ce409352b3aa4b1218ef7849b121b3e989bc0d4029c7129a0fa2ec90731bcb81f3a2a5e8c6a135ab369290bfd188d0 SHA512 d010e27b8d0f51fe5802116e2c27f97940d94228b16e5b4a118f0293008db55b0650cb1aedb3b3097cdca2101d7fddfc62bf3b87ede36e655491018948145f12
 EBUILD jdbc-postgresql-9.3_p1100.ebuild 1981 BLAKE2B 2ccb65c367ac2e25fc03dc69d85e403482ce409352b3aa4b1218ef7849b121b3e989bc0d4029c7129a0fa2ec90731bcb81f3a2a5e8c6a135ab369290bfd188d0 SHA512 d010e27b8d0f51fe5802116e2c27f97940d94228b16e5b4a118f0293008db55b0650cb1aedb3b3097cdca2101d7fddfc62bf3b87ede36e655491018948145f12
-EBUILD jdbc-postgresql-9.4_p1205.ebuild 3127 BLAKE2B becf3c1a4b1b487f6d98e1488271767e9ef93a34d5c2f5f53e6276692f5a72bbe88314f2f8d0730c3e29299495e0639afd82ebbd1ec3bf0478d3ddd185ee17aa SHA512 74098a2f42506e87d322d11912aebf5d434887775c484c017142daf04c74df91541915858bbbeb4c76418999f76f30c74113ca3f83dc3d7fdd49dee9cd9a20e8
-EBUILD jdbc-postgresql-9.4_p1206.ebuild 3124 BLAKE2B 6a55d4555ebd5eb675ca261d893496319dc9399621f9e5457dc3e176270adac3a760cc31999399827f2c76d0b13ae09079b023de8ce7274270e2010bc110b585 SHA512 4e686cf33aa5933556ccc19ae4b059aa58dec11036991d5dd944c7c1262c7c41cf78944cc2e0ce8a94ae22255c9d871fc9ded491b9727d3dc707e4d675d40cc5
+EBUILD jdbc-postgresql-9.4_p1205.ebuild 3124 BLAKE2B 8b5b72bfbbba3782ff4a0aabe03541ea05ace2f3e3b7d35f20e97a9c4e2fcb5a2e30b50154d735d34c3c551859b21db60113774f60e38a46d5c80c269e384513 SHA512 54b5fbe624175d7a236deb5e9628dee50a55d15f0892dbd52655a3cd02f8a5dcf43c418427bf239e591e5e53cf9eb93a64db729ac071892d08d5dec96ce2c9f5
+EBUILD jdbc-postgresql-9.4_p1206.ebuild 3121 BLAKE2B bd1845f1b0531fc35514783f37047221d836363144981b45c86bdcbe75ccf3edc2bbbdb0587f747052a8b6083cb4684a1b000a8da9cb75372dadcad824b6302c SHA512 d14f17263ec87a5a70978b6c53be2612777dadd20800c6c1e08da803f9fbba471906d868bb516c3e337155dc0461efa721795adcddd5fd006674e9931eeac829
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild
index 7d5e2a0e06f3..d7200bc01043 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 MY_PN="postgresql-jdbc"
 MY_PV="${PV/_p/-}"
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild
index d15404c14f40..cb6986cc6773 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 MY_PN="postgresql-jdbc"
 MY_PV="${PV/_p/-}"
diff --git a/dev-java/jdbm/Manifest b/dev-java/jdbm/Manifest
index 30b91698f955..6f944f9985db 100644
--- a/dev-java/jdbm/Manifest
+++ b/dev-java/jdbm/Manifest
@@ -1,4 +1,4 @@
 AUX jdbm-0.12-buildfile.patch 2267 BLAKE2B 156d36b09fe3aadb1128a7c157e5970d2fe8444978018de933006bd45bb49f941da4946a2b797e8bd20b4d1cb3eb61163936f6c05dbfe9d0a292f8522569bc22 SHA512 b54ff93a3af363efef7495fa32aa5fcc0ba1317d3a65059d9b64147393d2a51f5a344e267ec7b660843b66c0bd0c4cc1bcb5d4c5d3a9e32584e6118ab5470063
 DIST jdbm-0.12-src.zip 969490 BLAKE2B c40ec523c0dfbfe617ffb8b6bb91a1c43cc65d735c9e80970ebfc765c4ef304fa71497670b747c42db55b067a6b0600b184f2ca060089ccfd289849c4f515fc4 SHA512 cf65a89d1b3262aba40a2b10cdf3bbc1ed75fd60facfbd22baad2cfbcf81b5d67d3b7a372c7018907eedbcbb0114ddbb8d13b6cb7bc47896c47997996b0d57ec
-EBUILD jdbm-0.12-r3.ebuild 846 BLAKE2B c62d5e095bee69120b2e1eac308b6e7d842f818df6e93338b5a0cc3927e4cd4493afc4d90fb8a84bc7d900c2d95519d1ee61c9c41115d9962fdb90ae2037a134 SHA512 33defd875d4e1deebb4c26a0454e6bad2050e38265ba87c14d58eb59edf72ef442d09c8f712c0a74b12a572463a37da5ca58f54f6533d02009efcdb50e267ece
+EBUILD jdbm-0.12-r3.ebuild 839 BLAKE2B 7fb7f1eca265dabc58b71f91b8d930965e7d45561ab1604696d47cbb51da40943fd1aa9e3cca5266eff27c74c5b5ff791c6abb14b34b72e3b326f0ba425dca1a SHA512 e884de0c8f8d9bf391fa81ee4c0e262b0a4868317cee9dfad9f9c737201026e9b21c5ecc9821408ca7999947f967b5d27fc6f344145cfdfd2ed1a7f35cfd20f3
 MISC metadata.xml 310 BLAKE2B 39f67322e71ef31c835b666cf49f3e80d6c16b122d878ac9f19217664f518f69f64cfcd395f5c61512be2e4362117902feb3c661a9596c15c97934e0aee31445 SHA512 2a8c6e7833374873e0087786096a22d53369de951067051786d9d11fb657c8285d1f3dfc1c5b77a12f3172096eef2cfe4129477990806c7f193dad47a068e724
diff --git a/dev-java/jdbm/jdbm-0.12-r3.ebuild b/dev-java/jdbm/jdbm-0.12-r3.ebuild
index 4a625eb0a266..8549fd23a8d2 100644
--- a/dev-java/jdbm/jdbm-0.12-r3.ebuild
+++ b/dev-java/jdbm/jdbm-0.12-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Jdbm aims to be for Java what GDBM is for Perl, Python, C, ..."
 HOMEPAGE="http://jdbm.sourceforge.net/"
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 5cf3d071e926..218db5fc84d1 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,6 +1,7 @@
-AUX build-xml-2.patch 1529 BLAKE2B 37aee7dc0ab5b130c16a67b2470e8e3d4052b73c9cc944fc5f1e6cf5b1c8d57d046260829f7a785a0f7b35240318fc9bbcb28fc10b245981dd36957637084fa3 SHA512 210f0fa113a75a0bb2f34b50e3893df69e5b7f02174f7f10ea981cd16371da515a6c8514c2f82045c3a6a64c5a11874b2f81e5ad975270f11eb8c12fa707f563
+AUX build-xml-2.patch 1528 BLAKE2B f9ba4714bfe2ad46019c71655128512c639b8dfb54f53ed0e279b4b0d346df6fba33e0f7cafbced54e7b8ac16ed542d2a8cd57bb351ea5db5fa0764da51201a5 SHA512 08c8414a04d849ad8f70519a94ff4a29b7557354903ac38ed1b3e6213a4b996fe235ce36b11b869da13692d0e644ef5afc810dd23736afa9c22cabaf70bd3e8a
 DIST JDOM-2.0.6.tar.gz 8344114 BLAKE2B 0b9a568fe4de1fb9afc5a547d75aa1d3556bf497c76e3d32d1ebd7658634ea02e4fafa3c6261b64d9b803fc6e78ae013fb8a366bcbd5024e8ab0aced83f58e33 SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1
 DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
-EBUILD jdom-1.1.3.ebuild 1246 BLAKE2B 3ef43cd51122845127dce0d1df9dc6917ed9fddcdc33531ce526cd0ed6084594af4af0bb4ab870e14b44a14b5042277dc2337589b94c6bdb984c7cbc5c7aabff SHA512 5d76371202339ad4de3e1562676b075790c76377642ee3dc0e27c508dfd4389d7c9fb5e40c9449fb7b4e1aea1949d78e7324977a2925ea8dd9ac44cbac0f645d
-EBUILD jdom-2.0.6-r4.ebuild 1394 BLAKE2B 03c11737d5b00aa8f9ae9117e45803121cbcb078042ff939e6b5a60f0612bc64483c5cf5acd115e34b1920785b52c3fa56466823aa43c4b0feeebcb4a6bf6100 SHA512 3bfaf4d330f8d4499f3ebc2bc241fce36b985cb4a883f518d6e2cfc912f3fe6e15ce449ca5c1d2774a95c3049b2a123f66444ef13df2b3f7cc8d2bd77c664ada
+EBUILD jdom-1.1.3-r1.ebuild 1252 BLAKE2B 1f13d6f90843dd28a886d5b8158d33602239d6fe7540655166a7bf8aa6f3201cb9a3700a7a1ea669c04a7aa8a94432ed6b8e6c1df5a3b1ed36243ec1bb3d0f1d SHA512 bf245f0d9e759c1c0ebe8937d980e391480687eb53ba0234e5f7b02f124b4a55b61bf6001d391da7fbb58de4a82d7ec90b9bd63a101d869e1d96c14d43a792a6
+EBUILD jdom-2.0.6-r4.ebuild 1394 BLAKE2B 15121dd00dbe1b5b35ed9848d22bbd97483644869a0662712679cb6addb9d6f27f7914e93d0fc2548ababc37b865561ec92dcc420584fcb16139d6f8b4c444b4 SHA512 e5419858ca9241520c7906818e353f309a8ed9687075ed1c41c597e7e1c2a58570c248f612db420b66d19dfafbf88bd02250cb63f371523d3ce2f4e09d99f2b6
+EBUILD jdom-2.0.6-r5.ebuild 1375 BLAKE2B c45228fb66d7a5c68c820029f1d5a65ad57210f74a2830115b9d5d6d210b86742263cde95ed8f66a5c90788b1a6769f2367be7d3e111d066d89de2314aeecd25 SHA512 ea1527f581d69177aa11b4468d7fa0d47298457d3a6d74d38f6f2ced2171c6bf0868d1d6d345935ecdfbb6ce5657b37c4bffadecfee9e96fdda3f8a7042c6a41
 MISC metadata.xml 318 BLAKE2B cbcc3f9c0ce67aa9619d21197006bffc71f6ae3d0707a5bdd3902a0d51f90724f3ce81e21c80f6a011885cd036f397d2cb679335d05a0e1bf7e4bff3470c9019 SHA512 1587f961d80cba775d94e97a9c41516766d6a502f9b144f401ebcd0ee0b21b2e04220730c03a44986af8bc860a0311acdd6e721d4de201defcbc89599df5803b
diff --git a/dev-java/jdom/files/build-xml-2.patch b/dev-java/jdom/files/build-xml-2.patch
index 2e3cb94ef1d2..420f9eff1993 100644
--- a/dev-java/jdom/files/build-xml-2.patch
+++ b/dev-java/jdom/files/build-xml-2.patch
@@ -1,5 +1,5 @@
---- build.xml.orig	2015-02-15 02:58:04.000000000 +0000
-+++ build.xml	2015-08-27 23:11:09.807800249 +0100
+--- a/build.xml	2015-02-15 02:58:04.000000000 +0000
++++ b/build.xml	2015-08-27 23:11:09.807800249 +0100
 @@ -267,7 +267,7 @@
  		</javac>
  	</target>
diff --git a/dev-java/jdom/jdom-1.1.3.ebuild b/dev-java/jdom/jdom-1.1.3-r1.ebuild
index 7d7440c09783..f176d2284a81 100644
--- a/dev-java/jdom/jdom-1.1.3.ebuild
+++ b/dev-java/jdom/jdom-1.1.3-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 JAVA_PKG_IUSE="doc examples source"
 
 inherit java-pkg-2 java-ant-2
@@ -9,17 +10,18 @@ inherit java-pkg-2 java-ant-2
 DESCRIPTION="Java API to manipulate XML data"
 SRC_URI="http://www.jdom.org/dist/binary/archive/${P}.tar.gz"
 HOMEPAGE="http://www.jdom.org"
+
 LICENSE="JDOM"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE=""
 
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
 
 S="${WORKDIR}/${PN}"
 
-java_prepare() {
+src_prepare() {
+	default
 	java-pkg_clean
 
 	rm -r build/apidocs || die
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
index 30bbc1c03e90..8549f9e42e10 100644
--- a/dev-java/jdom/jdom-2.0.6-r4.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 MY_P="JDOM-${PV}"
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 DESCRIPTION="Java API to manipulate XML data"
 SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
diff --git a/dev-java/jdom/jdom-2.0.6-r5.ebuild b/dev-java/jdom/jdom-2.0.6-r5.ebuild
new file mode 100644
index 000000000000..74fde49b3c18
--- /dev/null
+++ b/dev-java/jdom/jdom-2.0.6-r5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="JDOM-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java API to manipulate XML data"
+SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
+HOMEPAGE="http://www.jdom.org"
+
+LICENSE="Apache-1.1"
+SLOT="2"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	dev-java/iso-relax:0
+	dev-java/jaxen:1.2
+	dev-java/xalan:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*
+	test? ( dev-java/ant-junit:0 )"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="jars"
+EANT_TEST_TARGET="junit"
+EANT_GENTOO_CLASSPATH="iso-relax,jaxen-1.2,xalan"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/build-xml-2.patch"
+)
+
+src_prepare() {
+	default
+	java-pkg_clean
+
+	# Remove Android stuff to avoid junit RDEPEND.
+	rm -vr contrib/src/java/org/jdom2/contrib/android || die
+}
+
+src_install() {
+	java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??.jar ${PN}.jar
+	java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??-contrib.jar ${PN}-contrib.jar
+
+	dodoc {CHANGES,COMMITTERS,README,TODO}.txt
+	use doc && java-pkg_dojavadoc build/apidocs
+	use source && java-pkg_dosrc {contrib,core}/src/java/*
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index f7890f4c0838..1dfef32ec829 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -2,5 +2,5 @@ AUX jffi-1.2.8-junit-4.11.patch 700 BLAKE2B 4533e3a8d6a5921b1e39ea20c9b4dcbbc66d
 AUX jffi-1.2.8-makefile.patch 1443 BLAKE2B 9accbdcd70c1c76e3f94a2131728fa83f7c988b5ce52aa7874d012700cfa4ed1cf3c3c2a281ce18c74776639e653f5a18e9c4b1d86baeaa9d10e577ca067e8eb SHA512 02f28b00e1ca6d16046c5f25c38268f78a41b5b202c4f284e8dac10dc245ad150f4639849c0af8c20f50dc3e7cf715bee6dfd2f1edc48496f822d78aaef01b39
 AUX jffi_maven-build.xml 11287 BLAKE2B 01ef4db6fef9d963bd52e0c15317ae836b629d9b22987c2d69a393d5513ab60bf2b062a083bb5b1a04301493c982f3926d5c9225972f7861e4ad668c9fc7a1f1 SHA512 56ebbb915d359f3eacf170d08fc1cf30f6efe900c91df0259a1fb69c6873ae839df829227b55e1538b4435387a82ec3e774180cfb531eb747e05a562aa7b97c7
 DIST jffi-1.2.9.tar.gz 1952668 BLAKE2B 320329b02ee9e93153fc334b73a6216da74ac2d924a64c8a1569f1f1507e1196d0b922f7d158ea91f6bc7164979b2ac12de239adbe98664a3708dd29c8d40f96 SHA512 2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4
-EBUILD jffi-1.2.9.ebuild 3091 BLAKE2B 54dfe33c76e2b9b832d766f7c639b020585e146beb25a5fec0f82df351e6a7f71bc265ada9a0afb8d6e8cbf1455ba09840df613ba5e08543771778b3e06aa69a SHA512 a5ced76cdea6cd51f6455544214bdf33e424d7989e3ef1f379d4af0fd55d83b992cfb993d2786a59e0284b523e5f482ac415e7a28e089d85c23ead405fba9212
+EBUILD jffi-1.2.9.ebuild 3091 BLAKE2B f671ee59386574ed2077375d717b95afa54919e36b8455c3f825b5d02bb647cd7fb291fc54043f545389cfa03ea74f5a1d53f7e2946df3f25dd241670670757d SHA512 67cb052c57447ed866a85299a7ecd6a59d894bf1b4a8e26947699d4aacc8fe88492431c60db9d82cb1fde33db57779933c0dc7c3ed2a2fef63adad8805995927
 MISC metadata.xml 319 BLAKE2B 999865e43b7f7ecf6784131fc903f80f208bf39dc54e96f6f80bd991998ab9694fb92ce8cd5e998a2e0800b64e47068859a7c63d46ea74294f1da77f1a18c46a SHA512 ed411e700c518b64ce76a437771c3a4779ebf47207d839924220ae6174ab7fd9cde92cd347c93b1916849cc2fb7fd4a5e5c29911420bc3485cb2916034d3f71b
diff --git a/dev-java/jffi/jffi-1.2.9.ebuild b/dev-java/jffi/jffi-1.2.9.ebuild
index 7f8b0a351a90..4eff1caf02bb 100644
--- a/dev-java/jffi/jffi-1.2.9.ebuild
+++ b/dev-java/jffi/jffi-1.2.9.ebuild
@@ -5,7 +5,7 @@ EAPI="5"
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2 versionator
+inherit epatch java-pkg-2 java-ant-2 versionator
 
 DESCRIPTION="An optimized Java interface to libffi"
 HOMEPAGE="https://github.com/jnr/jffi"
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index 1bdd37a2465c..5f356dd5e603 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1,5 +1,5 @@
 AUX icedtea-arm.patch 710 BLAKE2B dc479f8db4f1188ecb63708700d1ef0905590aba6b552b573c9fc05027e195d2dc1143542ca1998a5a6feac53af4ef64326da3f746f8aff1149b0bb01a3793a9 SHA512 9ebf22f2771672bb9ef28fcb7eff0d907e9fe4466b18b3ec3915b27caa2edb07934a47311abf41fbe124b484cccbb19ca68f69acd5bd76e46a49b029dbf275b6
 DIST jflex-1.6.1.tar.gz 3027791 BLAKE2B 4262f75c16a847314db8cb175901658ff6b424469e66523b41564179fa30f0e64bcf2d7ad0e06ad918336e5a41e166a74d55f19f7451662d19fbcaa29f716dce SHA512 436840c90d906042205d27e1d3c56dec724bf62cc3d8c8d3445f217af0a50c9ca2bb56ed91f0cd3c37a930f7ca22f4cc50e8c28dbe905f02adf695c8e96fb07b
 EBUILD jflex-1.6.1-r1.ebuild 3545 BLAKE2B 219107bfae4e1bc96e05cc7829ab67e59c343610244e62d5a65232ad711932582213f310b04c4685385c71074ce47fd8a0bb4f6ae2963ffd5a42a2c6211870d7 SHA512 1f429d17f63ce37116fbd0f5a36dfb48434b4bfe5b0a2eab5bd8026634a010b9e03ed87dd08ae91d16cd5c46d37b7f74993b44e8af19c07a3ec19e142ed7b558
-EBUILD jflex-1.6.1.ebuild 3550 BLAKE2B 60652de3c6f2251ce128ff058e36265a5ebc15b98db0f0ec5c1c611adcbf868a2cb3855f535ac15897bae15bdac1cba1dc813720a8adcf5968a3f7a3e2f0a5bb SHA512 5cb6e698518eb0d765c35647766a3cab0550e5c48f7e37330321a22039ba1c99fee64cbbaf26faca01f684cd7fe7ae98a03aa694c6eb32b8f4672541f2ea2977
+EBUILD jflex-1.6.1.ebuild 3550 BLAKE2B 68ff187aaa48cefb2018bd12098d7f334859166d7dd03694613c9ec3cdc4050d93daffda51f2cf8f4d55546314c3f4a11cf3e5927e4df455a58a77d59b0263cd SHA512 92cba8225532e333f950dbf078c6c1b71404b044f058e4be1d0a66c10cc29c3b2cc4dd8d7875db5ad8636854cac4f0800b5b8c41694076a22bda334ab6dfe469
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild
index 6876dc50a7df..32c5d3413238 100644
--- a/dev-java/jflex/jflex-1.6.1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1.ebuild
@@ -5,7 +5,7 @@ EAPI="5"
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit epatch java-pkg-2 java-pkg-simple
 
 DESCRIPTION="JFlex is a lexical analyzer generator for Java"
 HOMEPAGE="https://www.jflex.de/"
diff --git a/dev-java/jid3/Manifest b/dev-java/jid3/Manifest
index 58be3c0e263f..52022e1d8a99 100644
--- a/dev-java/jid3/Manifest
+++ b/dev-java/jid3/Manifest
@@ -1,5 +1,5 @@
 AUX 0.46-javadoc.patch 521 BLAKE2B a185db564d999096252bfc0f382d116b023b45d794083c038127c3d85a8b7bba6fbb0df9243d74b4955fa4ef1fc8d0813de9dcbb50bc63efa5a9612a98a9c70c SHA512 88a57f0c15f1915ac072bec7d420bf8a9eb1ca199175d56828f5439958f474b62d33f49a2eddcbcc01bb39dd07a22febccbfa58aa95be5e6b5413c54b94bca48
 AUX 0.46-tests-and-unicode.patch 17518 BLAKE2B c484cad7507d1b6c3c41d04a100102161d0f3f2cc2c9e64a636f11b61a927fc95e511ca38d4974fa05a34708268d9f6a16a739d57778c72776d78581b484aeca SHA512 d1448b2474af1d404999d1ac1df126814405840d8d80074ec90b7f4e2506a6d3497e2b6defa8c9c04b6fb7d86d815aec7dc3b7d7455f5fde41ade590db4452ff
 DIST jid3_0.46.tar.gz 972609 BLAKE2B f04e2055eeac530ae5256e43ea1cca2d528ee6b3027d43234c60be5150103212cecb68da5f1d6081462a9f215223f4b4377932b77c72b4de1c8dc816603cc9ea SHA512 478a78601613ab0e7965145733f1adec10005ef8069deb0595880feb47b065573d66cb5eb2b810869970a6b0272f8fb3363e4946ba5737ad740e372875cfa707
-EBUILD jid3-0.46-r2.ebuild 1269 BLAKE2B 7fc86e6aae3c11fad0c1c399be46bfb141495e871eeb7f913b15f7912a3ce547f4027afb1ab0b16ca79cbb5c9a05ecba1157bd0bd7e3be5efd64dda7a039b004 SHA512 0babc2575e023d689564d0385805408e489ac5a25cc408e5f37e40bc43870bbd7eca887dd9d4afdaa84350a35aa287c2e85de6610babae041211cf44ea827134
+EBUILD jid3-0.46-r2.ebuild 1266 BLAKE2B 219cee9d35120d0ad928a513f6d2c49873bbb888623332b1d5d22ade532824e95c8db453276fbf120c40a1627a0ed45e611de39b5180ea25878b3f17303a5eb6 SHA512 622dbe7edf46a04fe5110d867353ad972f084a991ca3707a09753405449180e9ad7a7b82dbe36a792a2163b6739e63d9df53e48a5e197745050b9929d67e8bb5
 MISC metadata.xml 458 BLAKE2B e62d6ad7013a3437846647124bed30d2332dd2fa35a8fca6e179f6ecf5282d4c5ba6f2b02299d3936d9c8c596a1f2c60005cdd35f60f87a3148c95f80af0649e SHA512 8dbbc0044f192093b672832681e521d55ff3ea2b3f3c74975cb493b0192c03f76279caf358f702449589d8d836a0b035c590c1fd4e0efc450740b354727fdc1b
diff --git a/dev-java/jid3/jid3-0.46-r2.ebuild b/dev-java/jid3/jid3-0.46-r2.ebuild
index f50f2e94610f..bfa253213049 100644
--- a/dev-java/jid3/jid3-0.46-r2.ebuild
+++ b/dev-java/jid3/jid3-0.46-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source test"
 # To make sure the javadoc patch doesn't break things
 WANT_SPLIT_WANT="true"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 MY_P="${P/-/_}"
 
diff --git a/dev-java/jinput/Manifest b/dev-java/jinput/Manifest
index c38c3d41b2e4..0d158f5e67e8 100644
--- a/dev-java/jinput/Manifest
+++ b/dev-java/jinput/Manifest
@@ -3,5 +3,5 @@ AUX nostrip.patch 431 BLAKE2B 5633db9dd6cf803c8a960dbfa38dce803b247efe107d20430b
 AUX remove-getDeviceUsageBits.patch 4109 BLAKE2B 89518857ae50e74688fa1f9c0f493c8bcd34a0db44b39e5768c581019cced7d9c568813f3add70ba26eb42963291da9131238c9b3c96b703bd73e15897d55663 SHA512 e5d5a2c4715b00a08b909965079fffb2a0797a0a762481c76135692a66f208bc86b7610db525ed82997c90bb5c70f590ba1062833c00104b86112b0a1e0d6176
 AUX unbundle.patch 354 BLAKE2B 87bbc929c3449e786c61810bd4f3ef2beeb9d8bd7efdc006afede6898a6608accea69a6a935ab383cd5d5689f4c0956367043c5d1f856486c379f0b2b997deb1 SHA512 99d933a2bf501fe209df2bdfe8dbc0f756b78715c322f6f4c605e40b96aa3773cb8592c52ac2d752e720245bbb310e7bcf52409e97a74e06175f3c995a55454e
 DIST jinput-2.0.6.tar.gz 1590738 BLAKE2B ceb296af7ca4309913708fac5c67c6fec9cd94ef3dad454c41a99ffee7e390545ab6424354dd0dc9755dfb4c0711b449b29b423b395c0f2f504a73d2d7019645 SHA512 770b3a0724334b9182098797923cc11e575b42cb67c5583d8aac7aeb432ec80189199daf1ef624a56923c4ecce271f05adf0481c13b8cd6997bb1862a7a91eba
-EBUILD jinput-2.0.6-r1.ebuild 1251 BLAKE2B db033a093c70d0262d5f89379a0beb626b70136909aec43b34f53f42428e57f60afa4e33f8d89a00952b18fa54d44f6b993eca6e3650beb75116c5f0dd030c0d SHA512 6143fd69d97b780f2ba8b22eb29ceb636bfdc6249a53828981a73c73d29fa6740457ad217f77c4f7944362285ffd7a1349d140ce16e6fb34073816b7e2fb6b70
+EBUILD jinput-2.0.6-r1.ebuild 1248 BLAKE2B 05e7a789ef2f7037eac0d322a7d166070bc84b828cc63f666d81743ef5d81cf57f72010efe315bff69e9687a236ab8fd11b0d73ddaf84b4e7064da307c5199d1 SHA512 846133445e9202b7d5f6b70a9ce1530fb54e9e97b51cc988c13226ab5a31970a80607ab21fd33fa34698f4faa718d29cbc1870a6ebf3e389ae21fc82ce2e7775
 MISC metadata.xml 657 BLAKE2B 17302de7620eb88fba8aca2a04148cd31cb9176a0e2e539e3e181d68ca0e98f98c6a2a1a2fc254c16e2f19c4a8d206af893e80581c0be3f18c9280376868f08a SHA512 2fa1026b4a776a5c527de51e4291b4cf12f58e0b526e329101b6c1cc9cd05b405919b4187b96b35c93977da3c8e80722984aff841d77a78d5e2ea6e6911073ac
diff --git a/dev-java/jinput/jinput-2.0.6-r1.ebuild b/dev-java/jinput/jinput-2.0.6-r1.ebuild
index c4d0b5e00785..ad374628ffc7 100644
--- a/dev-java/jinput/jinput-2.0.6-r1.ebuild
+++ b/dev-java/jinput/jinput-2.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 COMMIT="790b666"
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils toolchain-funcs java-pkg-2 java-ant-2 vcs-snapshot
+inherit epatch toolchain-funcs java-pkg-2 java-ant-2 vcs-snapshot
 
 DESCRIPTION="An implementation of an API for game controller discovery and polled input"
 HOMEPAGE="https://java.net/projects/jinput"
diff --git a/dev-java/jisp/Manifest b/dev-java/jisp/Manifest
index 7a040f275dca..82aec63d7826 100644
--- a/dev-java/jisp/Manifest
+++ b/dev-java/jisp/Manifest
@@ -1,4 +1,4 @@
 AUX jisp-2.5.1-java15.patch 1828 BLAKE2B fe995052b054f43498911df78b4776c4df7b9a047b5e1f1a6f5c7b99d1d67cba12bb9459dd573e51c1e00c0c94d058f03caef5e0a4b8f524b1ac8cc88c6f830e SHA512 b6221e375ad98ec8d4eb86b3a0d720b898358d9528966b31e8f4f39e8eba595424ecca3d5eaddb0866efbdc056d2dc68b1c1e4e7e09ab2bf637f7e7e00c4b039
 DIST jisp-2.5.1-source.tar.gz 63282 BLAKE2B d2e8bbc91f2db1fbe1c8411dade375a8934f3cc662f1c7604097341ba1f0430b4e450dac7e77f1479d4078be4cb4c2878c243c3d1c84b36f6bd1ee9318046b90 SHA512 b82bea547e6725e37285a5d332daeb8ecf300a6f69004845a308a3ee87f143e7a7e8be34925fd288523e36eea64479010915306ac33871b3bf4310c54a1c26d0
-EBUILD jisp-2.5.1-r3.ebuild 797 BLAKE2B fdbab9e2af85fc29ffc0d56bfce9a2295f3fd885b724ee63f82e70e2f2c7979ee7e7fbba6840f5a7c5e84201e2e85d06ce09fff5778e201b57c3401dab9ae61a SHA512 26d5c32ff26de6b83c79e6bf302349f66db636273ff4a8d430075b1bcd55dfdfef00eff4f4e2e2f6a1df64aad2a5dd242aec92ea314494334b0f8eed183ce390
+EBUILD jisp-2.5.1-r3.ebuild 794 BLAKE2B ce1de7f465223a4731f8b0773e3d568bbefcb405d9774a6885e727e4f869a452768d794ac4c27d8a8929d08d3a3a33f98e39509b5a1cf1f993c12b15846c131f SHA512 5e7b9bbb49d74a777a8f1c04af5bd0454d17cb4028038827317638646687555b588813b7852c5aa01e2a60db7a7b8c393f9acf62d8d57d91d28d4a89e7da9bb3
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/jisp/jisp-2.5.1-r3.ebuild b/dev-java/jisp/jisp-2.5.1-r3.ebuild
index 6577ef618f4d..e2e75426f252 100644
--- a/dev-java/jisp/jisp-2.5.1-r3.ebuild
+++ b/dev-java/jisp/jisp-2.5.1-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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 eutils
+inherit java-pkg-2 java-pkg-simple epatch
 
 DESCRIPTION="Java Indexed Serialization Package: A small, embedded database engine"
 HOMEPAGE="http://www.coyotegulch.com/products/jisp/"
diff --git a/dev-java/jmock/Manifest b/dev-java/jmock/Manifest
index 35f92ca58471..65cd4246e2da 100644
--- a/dev-java/jmock/Manifest
+++ b/dev-java/jmock/Manifest
@@ -1,7 +1,6 @@
 AUX jmock-1.2.0-AbstractMo.patch 1193 BLAKE2B b822ccada923c92a421294549ffb9f02fffeffbd7a57bdc79e0749147a361ad2cd0fed6b5b63166d21078684b235312393fb7af63a3b293d0e8a7a1f18fa70eb SHA512 53ac2c2f603aa8685aa18737b96a05fa590ed9bda8208dc06ceca159eed7dcb609a01cfb113597fad335f5ceed89d796e448c4deaffd3076a29d57c6ed8f15ed
 DIST jmock-1.2.0-jars.zip 153214 BLAKE2B 2c40696229018406f3b60559013b73b5331c223da6e2743830c4c9b8b728484b1ebed8fb347c240f50f6936c2fd1e4ee85b754315682047a87a14414effc3a48 SHA512 5290f1d14cbc3d0f223bdaf59716b037dbc021c8f39a3784d13af8d8be3edbddc5e2eb4754b80e78ae954daf12889210183e7e11c110012b4d9320344efe19da
 DIST jmock-2.6.1-jars.zip 1249841 BLAKE2B 87861dad7151000e1397a54d0ded7e49c3fd81fca64afd74d6176436f336be5b5e89f73be8c124cf086798f74aef4972303137529113e3c85ba93353f95e3a42 SHA512 7cd1d2e89dceb31c68ad3f702ad937b5de6ec77cc37e94be7aa53db2fc61d11aa40ec5aab225a3eeeba5064ad8384f10413ac05a9df97102c8e63f4209ea149e
-EBUILD jmock-1.2.0-r1.ebuild 963 BLAKE2B 53c60bdddb516f45f903006554fe3db2069b8a0f22508849f1af907e8e6489a5928b80e0491ef1cd793cf629d224559224852f1b016d46256296ed5ef5c8c7cf SHA512 a9b123f34046856f913ecfa0fdf70f243b4e0914a56746a95af2738aca3c17756f4c3319978bb7070157be0460c8f59478c8801bafd089572cf9383ddef06117
-EBUILD jmock-1.2.0-r2.ebuild 962 BLAKE2B 6f3efbe2f5e130cac8cd6ce577900104687a3a8d505219fa9d0dee1ba5d2f5332665fee00d88dc637ee53ce3ac77755e56543078306c4780cd2c01b289a7a2d5 SHA512 a6faa57521218c27a9de6a7e5b53ef0267f449bed94f16227d69a379c1dbb6621ab4891e20e63aa3b8d3dedf33a04a7aec3fc9ac515e9ec0fbcb9230e968273d
+EBUILD jmock-1.2.0-r2.ebuild 961 BLAKE2B 66253c0e57e4a2d44378f457e41a613fe8ea76c6c7f8760178ed706bc9b29ff2be3392d52997da22b3cdcef3d845ea4e606a639a9660ba64dc45a91edff9811c SHA512 37f94cfa6c76d6eb5a5053959c68a0e38e9acf6d1f8ada58f022fb79cd84d4c11a7e91acf09950dd86978395ccfad536b28efaf8f9ab923501edf3549ccd8c39
 EBUILD jmock-2.6.1-r1.ebuild 825 BLAKE2B 5e066e2552eceb12ce383abf78f52573636db5c22ef94c2769fdeb48493d5256d68d5183313faa5fc9ef01b91415df0747c2f2ab4479342a949f83467f80dab7 SHA512 52e29c763963f8afce59474aeb77a06aa67695d4cbfb12b08e064813f216445a402b520b497305d7554f00386973c3313a6b00b926d991bf481a7fd15d620c18
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jmock/jmock-1.2.0-r1.ebuild b/dev-java/jmock/jmock-1.2.0-r1.ebuild
deleted file mode 100644
index 3d0abb03985f..000000000000
--- a/dev-java/jmock/jmock-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Library for testing Java code using mock objects"
-SRC_URI="http://${PN}.org/downloads/${P}-jars.zip"
-HOMEPAGE="http://jmock.org/"
-
-LICENSE="BSD"
-SLOT="1.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
-
-CDEPEND="dev-java/junit:0"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src"
-JAVA_GENTOO_CLASSPATH="junit"
-
-src_unpack() {
-	default
-	unpack ${A}
-	unzip "${S}"/"${PN}-core-${PV}.jar" -d src || die
-	mv src "${S}" || die
-}
-
-java_prepare() {
-	find -name "*.class" -delete || die
-	rm *.jar || die
-
-	# This patch isn't changing the behaviour if jmock per se.
-	# Only the formatting is altered.
-	epatch "${FILESDIR}"/"${P}-AbstractMo.patch"
-}
diff --git a/dev-java/jmock/jmock-1.2.0-r2.ebuild b/dev-java/jmock/jmock-1.2.0-r2.ebuild
index caf03adf8377..c2731ac74487 100644
--- a/dev-java/jmock/jmock-1.2.0-r2.ebuild
+++ b/dev-java/jmock/jmock-1.2.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://jmock.org/downloads/${P}-jars.zip"
 
 LICENSE="BSD"
 SLOT="1.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/jna/Manifest b/dev-java/jna/Manifest
index 618ed87d6a09..c5c525091195 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,7 +1,5 @@
 AUX 4.2.2-build.xml.patch 819 BLAKE2B 5f411361cd566360206c996ff5c2c508e829e41bb56868dce428da1347ab91f7fc8e1230b6aca3e82806c80b23a038966f690a16f99b43b5b2594bca543cb606 SHA512 8d2e0552690c9282ce93e39aa489c1fd829e5e63e39c6e6db935b6b5e2308a3ee3cbe1a274ebf2ba59d9819dd4f618d89e22194a9f88dec0763d2a36cd3ca44e
 AUX 4.2.2-makefile-flags.patch 925 BLAKE2B 642982867b5c187345123725f5e19bccb363915aefc5ea6e69f02e9ca86efee1e5f466c7cb9abf1b2871a735c45f8b7adaf999e42a351e01e515ecdc6648387e SHA512 be29adfff3b92875b38cf9bb326d935a189555bbb10315412b2544b43698cf76132554df64f28a18d4910ef1c46daf8b0a2ef9db7a9bca1ab53c421504187e54
-DIST jna-3.4.1.tar.gz 35285043 BLAKE2B 192f893f25c692a80d8b3ea0b469e951ef45ea561a02f1ec2ac8292f37ac32df468c7bb04211f1009314da4d7acba8ab9220114980b3f30b56af5f2310d5a18a SHA512 8164de9d213f670e6408627ec13fc128802351c2b906e1e1e95fd3280917ef1eba24d8b6b913a9df8034d20a5d46f6f823b5ee2d18b83248093a1855c89c5917
 DIST jna-4.2.2.tar.gz 58638853 BLAKE2B 3941202ad7839f748c65f1abf53a335f6de7959def06de27a30520457147af3f70f6de54d640718b8314f6e61ab61ee9b26c39812d5cb1f918b8ff714d6b902e SHA512 11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f
-EBUILD jna-3.4.1.ebuild 2264 BLAKE2B f187ffe9f1bb1040a145d08d453491ae715d2bd65a87968594e8e7789368bc65410ac564e998f05376099d22e5a912f7208b9d2a2204a88a7855f702dbb27a4e SHA512 a0a991c9ac5eb44d5084bc6b9914ae806504cbc59f75b41c9dd5cf9a1b975da4266e03479f4cd3dfac1f9905298352acb0b35ca5a722476bf2278fe5f8b348b1
-EBUILD jna-4.2.2-r1.ebuild 2074 BLAKE2B 369a4568ef98b6d6f5a343f51c8ed1f9dee9d8187e86f9390a55abd79341d9ba83ce7e2876683362e5ed7abd1caa174625ba533ab76ea21b6195e2617a6acdf4 SHA512 a4fb2be3fc96748dee4a18d87d201651cc5c22effb4014882e6836cae5a18ae866f2e5ea8d18973bccea51650a0964b9bef4da745a5f24555a0e2178dfef38ec
+EBUILD jna-4.2.2-r1.ebuild 2067 BLAKE2B 52a6ea3ab351e026ab5fe519abdb6f78cf8a2cef57e02c64334e3ff3223b41321a4d5dc48fa2c5d5886b1e42925300e11f8d9860116217ae6b1fd1f0e20d09cd SHA512 e740f2c8c89c1c573e98a76dec234c54e3b68f8c7537ee18d695f803ef2fad3a341a887e93dc2ddfec89367405076f582e823ae2af2bdcc8d827a0ca698ba41e
 MISC metadata.xml 462 BLAKE2B 7ad9e0cb48ce7fdfae4bdc10bf3cb6d6c25a7f86d62dbb9041d0ad2fe04409477eb27754b5f53218fba657f7ed77b423b34bea92bffb61c37ee2eefdcccc3a3b SHA512 88a027ef32c55e551625950ecb2efffc75a7611568f11a4abdcddd4fe24b894eb7d8fb805cba3fc0f79ddf6fae6116804790fc24b3d5b6097ade9ad92ed4c118
diff --git a/dev-java/jna/jna-3.4.1.ebuild b/dev-java/jna/jna-3.4.1.ebuild
deleted file mode 100644
index 48d35ff519be..000000000000
--- a/dev-java/jna/jna-3.4.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="test doc source"
-
-inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic vcs-snapshot
-
-DESCRIPTION="Java Native Access (JNA)"
-HOMEPAGE="https://github.com/twall/jna#readme"
-SRC_URI="https://github.com/twall/jna/tarball/${PV} -> ${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+awt +nio-buffers"
-REQUIRED_USE="test? ( awt nio-buffers )"
-
-CDEPEND="
-	dev-libs/libffi"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	virtual/pkgconfig
-	test? (
-		dev-java/junit:0
-		dev-java/ant-core:0
-		dev-java/ant-junit:0
-	)"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="jar contrib-jars"
-
-java_prepare() {
-	# This jar is needed for some tests.
-	# So let's make a copy of it.
-	cp lib/clover.jar "${T}" || die
-
-	find -name "*.jar" -exec rm -v {} + || die
-	rm -r native/libffi || die
-	mkdir -p doc/javadoc || die
-
-	# and restore it.
-	cp "${T}"/clover.jar lib || die
-
-	# Build to same directory on 64-bit archs.
-	mkdir build || die
-	ln -snf build build-d64 || die
-
-	if ! use awt ; then
-		sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_JAWT/g" native/Makefile || die
-	fi
-
-	if ! use nio-buffers ; then
-		sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_NIO_BUFFERS/g" native/Makefile || die
-	fi
-}
-
-EANT_EXTRA_ARGS="-Ddynlink.native=true"
-
-EANT_TEST_ANT_TASKS="ant-junit ant-core"
-src_test() {
-	local sysprops=""
-
-	# crashes vm (segfault)
-	sed -i -e 's|testRegisterMethods|no&|' test/com/sun/jna/DirectTest.java || die
-
-	# crashes vm, java 7 only (icedtea-7,  oracle-jdk-bin-1.7)
-	sed -i -e 's|testGCCallbackOnFinalize|no&|' test/com/sun/jna/CallbacksTest.java || die
-
-	sysprops+=" -Djava.awt.headless=true"
-	sysprops+=" -Djava.io.tmpdir=${T}" #to ensure exec mount
-
-	mkdir -p lib || die
-	java-pkg_jar-from --into lib --build-only junit
-
-	# need to use _JAVA_OPTIONS or add them to the build.xml. ANT_OPTS won't
-	# survive the junit task.
-	_JAVA_OPTIONS="${sysprops}" java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-	java-pkg_dojar contrib/platform/dist/platform.jar
-	java-pkg_doso build/native/libjnidispatch.so
-	use source && java-pkg_dosrc src/com
-	use doc && java-pkg_dojavadoc doc/javadoc
-}
diff --git a/dev-java/jna/jna-4.2.2-r1.ebuild b/dev-java/jna/jna-4.2.2-r1.ebuild
index 469cd1d2666e..6ae5356a0b03 100644
--- a/dev-java/jna/jna-4.2.2-r1.ebuild
+++ b/dev-java/jna/jna-4.2.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs
+inherit java-pkg-2 java-ant-2 toolchain-funcs
 
 DESCRIPTION="Java Native Access (JNA)"
 HOMEPAGE="https://github.com/twall/jna"
diff --git a/dev-java/jnr-netdb/Manifest b/dev-java/jnr-netdb/Manifest
index 7e27928c05f3..89847586cd6f 100644
--- a/dev-java/jnr-netdb/Manifest
+++ b/dev-java/jnr-netdb/Manifest
@@ -1,4 +1,4 @@
 AUX jnr-netdb_maven-build.xml 9637 BLAKE2B 0ee947467fc1c8e07d2b98fb29a70de5244e4a92895018f8eb4860413a2c96ab6d5599f1eb39a45f4c43a09e1d6d0c7c1737416f7afbd205d397da17a257d3e5 SHA512 befe514fd332f5eb6495404b0f0d8edc428be34a1745b16dd2a20d2b859d251670e549036099884a810e3b5da0c6a4d311b6b0691409cae1b6c14d20ee763d24
 DIST jnr-netdb-1.1.4.tar.gz 648347 BLAKE2B 08953f93fe4a6146dfc77c463e07a8b9f6e784ffc26165d7409a623756733a7598b4d0a3fa55302b5f9b01c870cee3062f310c74e20f6a8a11ff1b41d38a0d7a SHA512 949a744b1d443cde564a2582baf7b4323c721417f32a45fd7413f791823cac5877bef62ed0d3079345631b908a581a1acf83dd00a926f87ebbd8e61d38a20195
-EBUILD jnr-netdb-1.1.4.ebuild 1133 BLAKE2B f430a9d005436b6d4c6e0ff567bb2c0155d6896a022526bbf4f2b84ab4b09cdda598a2d1d4079fe12b73e1c9afb6808f6c027e023fd1cd45fdf365c9636fd09f SHA512 8083073e3f32192e19787ca01b05278c9e0b7d58016d0018202bbc05a5a6beccadcf543e710d59acf0250cd9526ae7a527438f7daf6765ac4099e76f4afed0e4
+EBUILD jnr-netdb-1.1.4-r1.ebuild 1140 BLAKE2B 1d56c592330fe7da77b7d5e53e321bde6a8b72ddda4af1fb3930b10cfe42230b6c78cc344af123685ffbe6a0301b6c83ec2b94e9d42ddc46ca3cdf97b8025fe5 SHA512 dd8881d0a4ee136ea7389e9f660f53bd9d0dc80e3265e05b0a60abea157ecbe9caa252dd03f471c78a7ed497a26914a0e1bc1e62c960963451990a308bfbfb76
 MISC metadata.xml 661 BLAKE2B d7028fb370aa95b7aa2eedc3e40a3456b8f7cc675de2d0a1eea8fe3d1871a8b9964cfbe27469fec1a28b74f50ff9b90368a82a76762aaf88fc9e78fc377c4b95 SHA512 0c7660f9c73bfbfb9bb766443d175a817e21be2113beed0d2167d3cd630dad0d89efe7ca14808f0db621549836515ad05f1c40f826e0e6c2801d456fdb5b1428
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
index 8bb9e68cb34c..447a17513133 100644
--- a/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild
+++ b/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -19,16 +19,17 @@ COMMON_DEP="
 	dev-java/jnr-ffi:2"
 
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
+	>=virtual/jre-1.8:*"
 
 DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
+	>=virtual/jdk-1.8:*
 	test? (
 		dev-java/ant-junit
 		dev-java/junit:4
 	)"
 
-java_prepare() {
+src_prepare() {
+	default
 	find -name '*.jar' -exec rm -v {} + || die
 
 	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest
index 33ea1e18a893..dc9fd435e23e 100644
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@@ -1,4 +1,6 @@
 AUX joda-time-2.7-build.xml 11231 BLAKE2B 9b7350270773c59f3497be28581408f9984f1151b812f3ddc4bbf8fbfe50505e36cb5fdbfc330f7f07416275adc92a8176b25d7c4cb4cecbdc9d239f711bc9e7 SHA512 c614cc2425b0cefdc5f9def196cd5014d6d65552038dd22f876bbb64ee25131ead57aa94ef967491e292cf1ddefef933d9827dd588056d58c9a311640a5af63f
+DIST joda-time-2.10.10.tar.gz 1052384 BLAKE2B 656efddf6b98f10ce6729c6fa4c76ddfeb86dd94971c2637af3ddcb8a3a47f83948dbd58b04a6249445ef2857c5c5edb994a6d56349ed4ff4130ce9aaebd57e9 SHA512 e7917fd28cd10d7fbee02016b1f13a15a80af099b952cc0e8978bfc7fa389109553804670492c206f2b49bcf910ea093fc1838cb45ce4b7a3a885aac2aaf5943
 DIST joda-time-2.7-dist.tar.gz 4007765 BLAKE2B ed34c988dae1f1fb3359e06cccc148f680a04244987464770024635e72d5693036ec4d1648245f44db2fd57c47d9842a964d39e04e9ba510ecda7ec25c853ee7 SHA512 2a9bf91024bf20c4f1a28c87e5c6e560994ba6f7e131757c83a5ab6984ea79549e1d00452dcf767fc5cab374e531649759703acbaed724a1e49436cae0799209
+EBUILD joda-time-2.10.10-r1.ebuild 1956 BLAKE2B 508bd4cb9e23db7dbfe5562c46c11373cea5fa16034b3976ce31c94b3bd29be4e253c39f8c0d54514faa2d1bea8c506e6f5855a542c162c4e61d0c684c26fa6b SHA512 04f796eb9f496b6161c76005571b8e8aaec916249d32469e8d9abdecc1375666fd816b19679e3157257eb02606a31bf15fc875821f568b3bd3ed1c9af64db938
 EBUILD joda-time-2.7-r1.ebuild 1907 BLAKE2B 3a7d17a4e108eee44161a1cfe148e799e3307fa18e86322626d8a825a7eea1f59c3c5cbaa9183e431a7619c487538507a68f98c22c67f4ea8ad6c178c5b5a58b SHA512 edbaa5dfbcafd27a1899d1759f4488dacb7b007e7f3061eb0ab4ff5eca0be8ba36df0b758d7fead35497e3cabaec91ba483ee656a6a59b4c92ba5cf5a50ac977
-MISC metadata.xml 384 BLAKE2B 298d00eca8bdd34de1a3c30a423051cd62923963b1d239640690cf12c3ddbbe661bfaa689f1b225a968747bcc7d3b28aa53ccd90fa406322aeaa3e1f3703f4a6 SHA512 441aa3d5876d8ff91b9f9d368e817bf6869266c27f7f8686e9eb47812f899f37c5fa2e65337e979dd3247932b61d84e4b4f0d7325ea2659d54221ab428c9c089
+MISC metadata.xml 496 BLAKE2B 1305c141e2009564578f1028c915296d4a1d12c75b350bb2d37e3e5e4fba89631ed750c58944285a493b7b3590d76ba6b72cae1dd711e3a021226c5b1b6e6944 SHA512 b411a78e0160f6866682e6f5df59b9e06835250710182a66e5f4d1527f81820f88ac1a8d13e93021a05161b8b72587205404902db97afa2a239d1fe7bc8a84f6
diff --git a/dev-java/joda-time/joda-time-2.10.10-r1.ebuild b/dev-java/joda-time/joda-time-2.10.10-r1.ebuild
new file mode 100644
index 000000000000..c1d6e61dba70
--- /dev/null
+++ b/dev-java/joda-time/joda-time-2.10.10-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom joda-time-2.10.10/pom.xml --download-uri https://github.com/JodaOrg/joda-time/archive/refs/tags/v2.10.10.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" --ebuild joda-time-2.10.10.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="joda-time:joda-time:2.10.10"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Date and time library to replace JDK date handling"
+HOMEPAGE="https://www.joda.org/joda-time/"
+SRC_URI="https://github.com/JodaOrg/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+
+# Common dependencies
+# POM: ${P}/pom.xml
+# org.joda:joda-convert:1.9.2 -> >=dev-java/joda-convert-2.2.1:0
+
+CDEPEND="
+	dev-java/joda-convert:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}"
+
+JAVA_GENTOO_CLASSPATH="joda-convert"
+JAVA_SRC_DIR="${P}/src/main/java"
+JAVA_RESOURCE_DIRS=(
+	"${P}/src/main/java"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_SRC_DIR="${P}/src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+	"${P}/src/test/resources"
+)
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# Generate the missing "org/joda/time/tz/data/ZoneInfoMap"
+	# Arguments from https://github.com/JodaOrg/joda-time/blob/v2.10.10/pom.xml#L413-L427
+	"$(java-config -J)" \
+		-cp ${PN}.jar \
+		org.joda.time.tz.ZoneInfoCompiler \
+		-src "${JAVA_SRC_DIR}/org/joda/time/tz/src" \
+		-dst "${P}/src/main/resources/org/joda/time/tz/data" \
+		africa \
+		antarctica \
+		asia \
+		australasia \
+		europe \
+		northamerica \
+		southamerica \
+		etcetera \
+		backward
+
+	java-pkg_addres ${PN}.jar "${P}"/src/main/resources || die
+}
diff --git a/dev-java/joda-time/metadata.xml b/dev-java/joda-time/metadata.xml
index 78620eff5573..b64115a9a19c 100644
--- a/dev-java/joda-time/metadata.xml
+++ b/dev-java/joda-time/metadata.xml
@@ -1,12 +1,14 @@
 <?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">JodaOrg/joda-time</remote-id>
-    <remote-id type="sourceforge">joda-time</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">JodaOrg/joda-time</remote-id>
+		<remote-id type="sourceforge">joda-time</remote-id>
+		<bugs-to>https://github.com/JodaOrg/joda-time/issues</bugs-to>
+		<doc>https://www.joda.org/joda-time/userguide.html</doc>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/joni/Manifest b/dev-java/joni/Manifest
index 9e5f54062f73..2e0b34a06041 100644
--- a/dev-java/joni/Manifest
+++ b/dev-java/joni/Manifest
@@ -1,3 +1,5 @@
 DIST joni-2.1.0.tar.gz 125084 BLAKE2B 4f5fa651f2a2c898b29c311f8bdabe10ded3dc86ededbdf35d703a08618e2dcc57e34a9ab928f0f69e4f47d59a287e138dcf2ec7d2bb71e1152637f174f5fa8e SHA512 dd40b3a857deb02848d4a87de010ec6b9c96fb962643ea1022833a1bb5ebd76ffac403ff2a54497df288998939ed81910c22c02a2df1f7290112bb2ea506db0e
-EBUILD joni-2.1.0.ebuild 784 BLAKE2B 8f2e4992882ed740bc6a725aeec84f0828cebc366fcc9e174f1a61f8b227bff2097759434aa946805ddd0d7bcfe0babb7cce2f9ebe26f5a0e2872d072836559a SHA512 ca6bc1c029ba81937fd36a5abdac67c985fb8bc1d5abbf21e88b030327387859584e254f7b7eb74e970f02f82b01af2196e170911c4c8bbbb561f2a1332a0a40
-MISC metadata.xml 321 BLAKE2B 15b171202803285938651636b3f078b2b45566a9f2ab03a4f720860c7c72f228705cf125014ada485f8b99e57a46fd73e0e86fc5c07c03a4ea8a19bd670e62c1 SHA512 4d54ecb85b209420ffcae97f976124f7ab297d96bd7eb3f38efba72ba112bdb790c470289c7df005fd09eaafd8c89ad857a2c1bfd2cc95be4233638359a517bc
+DIST joni-2.1.41.tar.gz 178366 BLAKE2B a83b9df9fb481a8b1650f9542bd88028d638042946c68a03add8f64449136b655ca0425e488487803f48f8bb1a9101d5d1531350ba534fa081fb9e61cb3795f7 SHA512 6306a871b1d34cf6bb838220ad0cf4824d75a055412740848d02a89ce3198fb7a0d909838a31e33d85f504cc43fa26ee73d9665b4cf81481226c19f5186dab53
+EBUILD joni-2.1.0-r1.ebuild 783 BLAKE2B 1e96286d845a6db3ae30f8714822a133f88d125cf34793cf5d90d0ecf4751895775223b29191cc7a4c4f67543d88ec4c01027c8a4f493e00e6fb21c16e1f270b SHA512 f7156d9deb61dadcf0891af4d73c65c07aeddf20ed49e8202a2f48aff2694e8bf3c77c9de29bfebd510854ed11c5440c63dda7792be1cc0323e93f188c021e5f
+EBUILD joni-2.1.41.ebuild 1097 BLAKE2B cac64e79699ecc17551dcb46935012ebb566ad721b3e59aefb296b26ba7e9e44a86ccccc27b26a915b234b578a533152ac6feae07fbdbb27b05b682383e2d62f SHA512 fd1fc34c7e696b959f9c0d4455406aeaf946b5a39d072fb3aa78637080454320574eff76348848509989d6048805ca0e2d19a97578b38f38e3067acf8b0772b5
+MISC metadata.xml 369 BLAKE2B 9254ee4c514ca62a901d9ce60c94eec0a84d4461633064b854ba21c5d8764dd1d06a3d97f4a0724cfd9e6d93d27f1af0a2922280f96f102d0ca1734f37ac5870 SHA512 ce1cc67cadd1f3a1018dbdb5e47ddf9f22db7eec4d2257c75a0b80ceda2f621f996250f7153b02b4fe86f6ab14112101c7b0ce11e5c5db04716d2f13084b4571
diff --git a/dev-java/joni/joni-2.1.0.ebuild b/dev-java/joni/joni-2.1.0-r1.ebuild
index 3b88d67b34f0..cf7f00117692 100644
--- a/dev-java/joni/joni-2.1.0.ebuild
+++ b/dev-java/joni/joni-2.1.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="source"
 
@@ -15,20 +15,20 @@ LICENSE="MIT"
 SLOT="2.1"
 KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
-CDEPEND="dev-java/asm:3
+CDEPEND="dev-java/asm:9
 	dev-java/jcodings:1"
 
 RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
+	>=virtual/jre-1.8:*"
 
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5"
+	>=virtual/jdk-1.8:*"
 
 S="${WORKDIR}/${PN}-${PN}-${PV}"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
 EANT_BUILD_TARGET="build"
-EANT_GENTOO_CLASSPATH="asm-3 jcodings-1"
+EANT_GENTOO_CLASSPATH="asm-9 jcodings-1"
 
 src_install() {
 	java-pkg_dojar target/${PN}.jar
diff --git a/dev-java/joni/joni-2.1.41.ebuild b/dev-java/joni/joni-2.1.41.ebuild
new file mode 100644
index 000000000000..65d03d06022a
--- /dev/null
+++ b/dev-java/joni/joni-2.1.41.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jruby/joni/archive/refs/tags/joni-2.1.41.tar.gz --slot 2.1 --keywords "~amd64 ~ppc64 ~x86" --ebuild joni-2.1.41.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jruby.joni:joni:2.1.41"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java port of the Oniguruma regular expression engine"
+HOMEPAGE="https://github.com/jruby/joni"
+SRC_URI="https://github.com/jruby/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2.1"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# org.jruby.jcodings:jcodings:1.0.55 -> >=dev-java/jcodings-1.0.55:1
+
+CDEPEND="
+	dev-java/jcodings:1
+"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-11:*
+	${CDEPEND}"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_GENTOO_CLASSPATH="jcodings-1"
+JAVA_SRC_DIR="src"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="test"
diff --git a/dev-java/joni/metadata.xml b/dev-java/joni/metadata.xml
index 4a0a963f41af..4fff4866bf68 100644
--- a/dev-java/joni/metadata.xml
+++ b/dev-java/joni/metadata.xml
@@ -1,11 +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>
-  <upstream>
-    <remote-id type="github">jruby/joni</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jruby/joni</remote-id>
+		<bugs-to>https://github.com/jruby/joni/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jspeex/Manifest b/dev-java/jspeex/Manifest
index 8450be585dfb..c40c285cf961 100644
--- a/dev-java/jspeex/Manifest
+++ b/dev-java/jspeex/Manifest
@@ -1,5 +1,5 @@
 AUX jspeex-0.9.7-remove-junit-report.patch 530 BLAKE2B 2ebc0fcdd0713615bdcb1c829e0f26437af3829cdf4d01f453a6f8a4df9b0728f2f4d746214d44a8fa63f61ccda1c7812fe22ee6c67b8b141021adb61d6076e9 SHA512 8a38a6033ca138a131ee716712efd463c2fda87829d46eabd8fa561af0327fd8718a673075eaa0f6a08a931bfd142be23c65e16959a36e1a845dc002744010aa
 AUX jspeex-0.9.7-remove-proguard-taskdef.patch 1655 BLAKE2B 3ec50cada7bfd9b69a448f12fc1c07fc23003952e190ddafad4d58cb3cb1f13e746c02846cc17e2323d5c4ec7f76f049edb038e559c45f92854a23f72946b2e1 SHA512 d8c6358d01c659bf2e83d99d7831f1177383701ea34c76e8b39fa83a85477f8712b6911b6bea5da4e07b0e677816a1b7b4e90e51ee3c71fb7d0faffc9fc9b0d1
 DIST jspeex-0.9.7.zip 733580 BLAKE2B d5bfabb0857975ab8ca74d54401f6d4008c7386d8e2464c7386ecccfde8dcf3b92580d6168e4ff06cf8c1a27ca848abc7f630be7f19c6a0245beb8a9cb66c3f6 SHA512 9673bef155f1cccc45bc0a0d5596e79b48ba044309ba3446548b570bc7bad60b4b22cc7761749b0769114c7341b9fab6db8e8a155070f9de6fe2730c843199fe
-EBUILD jspeex-0.9.7-r1.ebuild 1128 BLAKE2B 63ccb61ad93710e592be7845c5e3dd93afd425014d621ada0e1270e9fe42bbb7e823103d9744229b3b862766df254b998cbeba4b050b149f6addb994a00a1f33 SHA512 0b889a02983a970eb66e0be3464e96e3280641ae4d16a61f5fec11216e303dacea41af37e68417b2773a7a7ae05cbbc6614cc33dede51cb14e1b4734dbdcfcb5
+EBUILD jspeex-0.9.7-r2.ebuild 1098 BLAKE2B 2176c6e27a452c1b312f1e20475b341ea636fdbba4f9533f295ed821a4f1931cbf343de0beb4c7123ce21fe2735fe622391a116943b0a9135851290b1f44209d SHA512 72b0ea90ea7d78cf6eae25dbbde4ed3df96afbbf62d4d898771708a72a11ad0d7f9daecfb2603a1e5e898f89f5def94c01af92ff358829e55fe55a039f2afd0f
 MISC metadata.xml 312 BLAKE2B 030ecc0c42a9dc6ecfaa663b6e25d35bc2364cfb1f7c59a5aeb46728d5819c29f9c5389370782f30a5598553e7d1822b7a6d2018006aa7a69e8e0a1a98ee8e68 SHA512 bf48f9daeb64e474b08e897e502436b21db0f65ba4cee4987654e811b6b71a3a82c3ccf9ee49b37babc9a8d8f3c6d13978d9c2e19b4ae27da51c1fc28f15aec5
diff --git a/dev-java/jspeex/jspeex-0.9.7-r1.ebuild b/dev-java/jspeex/jspeex-0.9.7-r2.ebuild
index 9d3390743ccd..404e7773e708 100644
--- a/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
+++ b/dev-java/jspeex/jspeex-0.9.7-r2.ebuild
@@ -1,43 +1,49 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit base java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Speex speech codec library for Java"
 HOMEPAGE="http://jspeex.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 CDEPEND="dev-java/ant-core:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.4"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.4
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*
+"
+DEPEND="
+	${CDEPEND}
 	dev-java/junit:0
+	>=virtual/jdk-1.8:*
 	test? (
 		dev-java/ant-junit:0
-	)"
+	)
+"
+BDEPEND="app-arch/unzip"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
 EANT_GENTOO_CLASSPATH="ant-core"
 EANT_BUILD_TARGET="package"
 
-S="${WORKDIR}/${PN}"
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-junit-report.patch
+	"${FILESDIR}"/${P}-remove-proguard-taskdef.patch
+)
 
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-remove-junit-report.patch
-	epatch "${FILESDIR}"/${P}-remove-proguard-taskdef.patch
+src_prepare() {
+	default
 
-	find . -name "*.jar" -delete || die "Failed to remove bundled libraries."
+	java-pkg_clean
 
 	cd lib || die
 	java-pkg_jar-from --build-only junit
diff --git a/dev-java/jta/Manifest b/dev-java/jta/Manifest
index 54742100044b..49a6b372f230 100644
--- a/dev-java/jta/Manifest
+++ b/dev-java/jta/Manifest
@@ -1,3 +1,3 @@
 DIST jta-1_1-classes.zip 13236 BLAKE2B f2e1ffd531fce804d562c4cdcbe9b260d08eb2bcd79a879f94fbd3e23801849cbf311d8f7410a9776f9a8866027dcedcac479a64444321e8c6b2b23bd9a69054 SHA512 fb8b76223ccdec0ef97b00d7248d74b6316dd67c570667f3a644d03b05cd28af061a191cf71b6624fd4a4195f7bc107281eb847fc4c0ee4606c85c414da79a14
-EBUILD jta-1.1.ebuild 1036 BLAKE2B c6e27226b7f362dfb2bdd7e7d89284c178b8c43952e1d195395d8df2f6fc1de38de54ee72490606d6eca4d7146eae61747ef459b7bea564280cd1df78e8cd006 SHA512 efb82ee10a79e4d93b44c8138fd2e913f8baf1af1796e4d31b4a15e9f862564feb2d088c9eb5afc5c0ef045c982a8b4f82523eba49dcbb0f28c3679e34bf1fc1
+EBUILD jta-1.1-r1.ebuild 1054 BLAKE2B 06aa582fb26604b4b30f787ac421bb060d5dec9d939448715d4a432217359a96c9a6449037834733caf18e413adacc6dfa6f08bea1fe380db3e8ce1bc4fbd449 SHA512 8ee977ec0de8662d03b0445edd3de42131f7089aab87a1d0318dcd63c772dd63f70bc3eaec20c2c06f4ba01488f4818db9dd284563edaa2b80983c8ba1143960
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jta/jta-1.1.ebuild b/dev-java/jta/jta-1.1-r1.ebuild
index 6826cc091f2f..4d3770f9bca4 100644
--- a/dev-java/jta/jta-1.1.ebuild
+++ b/dev-java/jta/jta-1.1-r1.ebuild
@@ -1,21 +1,23 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 JTA_ZIP="jta-1_1-classes.zip"
 
 inherit java-pkg-2
 
 DESCRIPTION="The Java Transaction API"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javaee/jta/index.html"
+HOMEPAGE="https://www.oracle.com/java/technologies/jta.html"
 SRC_URI="${JTA_ZIP}"
+
 LICENSE="sun-bcla-jta"
 SLOT=0
 KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
 
-DEPEND=" >=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
 
 RESTRICT="fetch"
 
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index d184100a4cc3..3349a2fc5370 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,7 +1,9 @@
+DIST junit-4.13.2.tar.gz 1077147 BLAKE2B c083982cd604812ba3375f90e0486bb3683ecbc3b08e3d14d4541845c5b91cd85100fe86028c70a7cec4e1ab6f6794bcb9333686b3c9b0705eacb75ac36e64da SHA512 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb
 DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
 DIST junit4-r4.12.tar.gz 443804 BLAKE2B b36248266eb83d8f2dfb1c525f635a4fce5a46c6042652ef27a5d405b83c471848edf83e799a4d1e950d83e127caa288f453edf19959a9a8aa5a9e26eeb4e771 SHA512 ba612598fa6c328e8f4bbea3afda08b459a110837ca3805a62e811535f7bca8d04509f8fe51a413c7bc855fccee35d6946c9eece4dd01726d12454c002a4de32
 DIST junit4-r4.13.1.tar.gz 1072560 BLAKE2B d7a8ecf804f83461c281a494c1ad85e6797af64fd1344ba41a919a2783c28fc7c36b6c85984aaff66d41a99fde0141532be2e9bb00f3f53ae467f6dbde937f4a SHA512 a4c284f756916077100181af1dd8c0febdc855e21ea600366e5fda3904919ec2c4a5e828961c322f080f177eb53485c9ad01bfc65c7489a741be63c96cd472bb
 EBUILD junit-3.8.2-r2.ebuild 842 BLAKE2B 01cc39cca58291852a2bd71b97283ce344656648c741792013e7daaf50cccad14551e4d0885d9fa4c3dfe52cfccd18c0943a55c0d479cd49b1d182eaa8252f75 SHA512 25a498140852340c429d965b8770a1844fdcff906164fcdf873e32cd303871b446d80d88fef2772c765254c7396fdd6a3688e9b253f04cf02c289c5a85e99ebe
 EBUILD junit-4.12-r1.ebuild 1477 BLAKE2B 92482da40156f07c657f3f9463f7e9763330ad496032b74199084f8fb4bd521e236332050c461a06270b3574086d5dd2b3413f55cbf9c6361c171e31aafccdbb SHA512 418decaf336841e80eb82a8905d99fb897155fc2bc1ec45f7be72324f03cc63e6f07b9e1ecd3b12e9d8149291970ab2f27b0c482a96e48d1bc7e8301e8190f35
 EBUILD junit-4.13.1.ebuild 1559 BLAKE2B 3446879568e259253e7c9d8048ce3eb5d9fe0ace907e550dc6efc6b8ac6145d53250f32d0a14eff559664530cfba699eb912b17084224a976f0ed618d64b02fb SHA512 7e6cd806937252998eb5fbd39eb0fa8562435bd0fb15d2310113453fcfff8fa83ff8dc5997a425aea1dae8cca86584310e2dc9a3dc4b68bac0f803f66f3c93f7
+EBUILD junit-4.13.2.ebuild 1962 BLAKE2B c744aa8a38662b22f7adc9d3cff01bbf453179572ac46709c59d288963a4aca7d275c338f9a5084f5b8efb833db3a0c90333485e418e734de2886ed80483dbd4 SHA512 5369aa803cf5ce518293995c70764068e218f81197421bb0e8efcebfadab005619b5c9bb0f3962d461ffa614c7a6a577e7ecbb167e7bf275e860ab11cf5dab75
 MISC metadata.xml 368 BLAKE2B 8461f82cd98863df6643a7727fdef984d30f6cd8f9cf7cb37453fbae186896b2845bda742864eadaab1fc932604a48957b0c7f7b80ecfa8ca107276287abc602 SHA512 f9bf527c63c7c4cfb4c0967918b23e6c2abe6c9239d2a873bf2ccefe31be8224c38d4062c71b6ee2692f5b36a27c348e3fc24d48279bc392a9efae2a8d17e077
diff --git a/dev-java/junit/junit-4.13.2.ebuild b/dev-java/junit/junit-4.13.2.ebuild
new file mode 100644
index 000000000000..e710a4bf5827
--- /dev/null
+++ b/dev-java/junit/junit-4.13.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom junit4-r4.13.2/pom.xml --download-uri https://github.com/junit-team/junit4/archive/refs/tags/r4.13.2.tar.gz --slot 4 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild junit-4.13.2.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="junit:junit:4.13.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Simple framework to write repeatable tests"
+HOMEPAGE="https://junit.org/junit5/"
+SRC_URI="https://github.com/${PN}-team/${PN}4/archive/refs/tags/r${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+# Common dependencies
+# POM: ${PN}4-r${PV}/pom.xml
+# org.hamcrest:hamcrest-core:1.3 -> >=dev-java/hamcrest-core-1.3:1.3
+
+CDEPEND="
+	dev-java/hamcrest-core:1.3
+"
+
+# Compile dependencies
+# POM: ${PN}4-r${PV}/pom.xml
+# test? org.hamcrest:hamcrest-library:1.3 -> >=dev-java/hamcrest-library-1.3:1.3
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/hamcrest-library:1.3
+	)
+	${CDEPEND}"
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"
+JAVA_SRC_DIR="${PN}4-r${PV}/src/main/java"
+JAVA_RESOURCE_DIRS="${PN}4-r${PV}/src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3"
+JAVA_TEST_SRC_DIR="${PN}4-r${PV}/src/test/java"
+JAVA_TEST_RESOURCE_DIRS="${PN}4-r${PV}/src/test/resources"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_test() {
+	cd "${JAVA_TEST_SRC_DIR}" || die
+
+	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_TEST_GENTOO_CLASSPATH})"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	java -cp "${CP}" -Djava.awt.headless=true org.junit.runner.JUnitCore junit.tests.AllTests || die "Running junit failed"
+}
diff --git a/dev-java/jvyamlb/Manifest b/dev-java/jvyamlb/Manifest
index 98df65ae22a0..8fa93c1faf31 100644
--- a/dev-java/jvyamlb/Manifest
+++ b/dev-java/jvyamlb/Manifest
@@ -1,3 +1,3 @@
 DIST jvyamlb-0.2.5.tar.gz 526052 BLAKE2B 8b55748eb4e9b03b1e5ca78fd41145456d1329a3edb0a7d02c6b5e37a15c4a25e93cae9337ee9aeedb6611ee87ba09157e00ef4a55ed4a8202f8282e287b56dc SHA512 28d707255ca7447ad00f29bf1215e28fa485557e76795c47cbf309a5b1b97ba4c901ddc7b1507d06301b4f544bfc437c4926f457516832f953aff6b29b01b711
-EBUILD jvyamlb-0.2.5-r1.ebuild 999 BLAKE2B 58a96151c0bc23787b38f85c87b35d831966e8fe296a7af59508bb3db7bce0fd9e334f0904cbb0fb0c2f44058e6a91a3cb641802cc3df240cf8fc1e55402465c SHA512 09924482c7eee018c1da3001e163e3b37f1ffa246cfff209bff761fb1d735df18e607c9b665117c21364605e41f29444bb7688ed87650c91aa3ec77c9643298d
+EBUILD jvyamlb-0.2.5-r2.ebuild 1006 BLAKE2B ea6416dc66eebbc096af5f9b93e54dfc02444c72473c435db0b698b529ed547a3bbaafea377723644d9f2910f88f96c22ff6bd39391ae6485e9f0ebe05aa8200 SHA512 d35583a8a28259ca8489c2b45d0d55132260b00bebe1aede68e988bd3c7561ffea945f146af4422a2f4f7598f2e51ed484366cce8feb9ba87e69b8afb693188c
 MISC metadata.xml 348 BLAKE2B 82f0d57c39dbdc2501bffc728986883387457858b9f044ed924efbe526a7ea282d872001695a7050b99c44707ac956d66e086426b98a071501c2a286c1299df8 SHA512 50cc0581097381b62f98172a0c876c5835dbcad92e6c1f966bcb2bf48614d9768a4577a511e49f83c3f9ed1679adf708ef709c1aecba40b5abb69626cd906e22
diff --git a/dev-java/jvyamlb/jvyamlb-0.2.5-r1.ebuild b/dev-java/jvyamlb/jvyamlb-0.2.5-r2.ebuild
index 9a0b11e6951e..d0f8d8558026 100644
--- a/dev-java/jvyamlb/jvyamlb-0.2.5-r1.ebuild
+++ b/dev-java/jvyamlb/jvyamlb-0.2.5-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 JAVA_PKG_IUSE="source test"
 
 inherit java-pkg-2 java-ant-2
@@ -9,26 +9,27 @@ inherit java-pkg-2 java-ant-2
 DESCRIPTION="JvYAMLb, YAML processor extracted from JRuby"
 HOMEPAGE="https://github.com/olabini/jvyamlb"
 SRC_URI="https://github.com/olabini/jvyamlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 CDEPEND="
 	dev-java/bytelist:0
-	dev-java/jcodings:0
+	dev-java/jcodings:1
 	dev-java/joda-time:0"
 
 RDEPEND="
 	${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8:*"
 
 DEPEND="
 	${CDEPEND}
-	>=virtual/jdk-1.4
+	>=virtual/jdk-1.8:*
 	test? ( dev-java/ant-junit )"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="bytelist jcodings joda-time"
+EANT_GENTOO_CLASSPATH="bytelist jcodings-1 joda-time"
 
 DOCS=( CREDITS README )
 
diff --git a/dev-java/l2fprod-common/Manifest b/dev-java/l2fprod-common/Manifest
index 4db5feac1252..ac3054380e0b 100644
--- a/dev-java/l2fprod-common/Manifest
+++ b/dev-java/l2fprod-common/Manifest
@@ -1,4 +1,4 @@
 AUX l2fprod-common-6.9.1-nodeps.patch 1776 BLAKE2B c7cf298871612ea9c168555fb5d0536fae85de786ae9cb3206f83816bfce86d8657dc36992e9864d342a2f7e97985d8d99f6ae72fcaa684addf02334c11131ea SHA512 636ac2851bc24b776fdcb54b2786879216cf112d400a67b032ef50b44dd3988fa0d35ba31044e74174906242aaeab1a8563900d23b0cee728d54eaace13f4086
 DIST l2fprod-common-7.3.tar.bz2 475662 BLAKE2B 40e41e7fc335220c437befd866bd4c5ff9413235f8efc6cc64922f8f9dbb8661f2acee0491ca9d90599bf314038bf0b2a30099e5ff2a323c39d8d60c3a6b0433 SHA512 685dff4cd7a171fbc92d31c6ca25faa2feda2c5a10d5f646e8fa649f53c532d83bd97388518a2720a3b4b8b87c0fa54a63ced23aedbf500e19aa0f618b938a3a
-EBUILD l2fprod-common-7.3-r2.ebuild 1170 BLAKE2B 86d6debfcd9e58d6960ace5ffc79287c0ec90ee008100b297970b5a4d1d71791bdf0d1e1589a816d6f2591194fdd8da8380b93e3fe62bef9e27ebf2ed97506e0 SHA512 32008a30149c1dd7a3f6c7e4210098cc18746de94ddb937d363aae271858040dc468c086f3f14249cfb2428bb516c33f54b472f2060460c6d25d9e6a04c7f91d
+EBUILD l2fprod-common-7.3-r2.ebuild 1170 BLAKE2B 316924656377447943da3eba4f4c0a8362f24fd2dfd064542ff94aa725c5e1ba00f5e4ccd4e639ca9df7553038ab3f25f2f84c6798c1cf6b03054a301e7e2ba7 SHA512 c1f0b8f4c400860f99b9f5c29955e7f79f77b9d38c33fdf00d21662b2dd6f6b8d02b5bfb4483ca25effef0095085c7acedee39f1093c1b2f6f3d52c2a4f8d83a
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild b/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
index 9e20e1fd5e83..d80325c1fae9 100644
--- a/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
+++ b/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 DESCRIPTION="Java/Swing GUI components and libraries for building desktop applications"
 HOMEPAGE="http://common.l2fprod.com/"
diff --git a/dev-java/libmatthew-java/Manifest b/dev-java/libmatthew-java/Manifest
index 580abd35457f..fa584308f0d2 100644
--- a/dev-java/libmatthew-java/Manifest
+++ b/dev-java/libmatthew-java/Manifest
@@ -1,4 +1,4 @@
 AUX libmatthew-java-0.7.2-makefile-fixes.patch 2545 BLAKE2B 9662d03e04b55a3041807661b9503644b0595e3cf0ae4479eef9818dbd9edbfa5d7c4a9886e51c1adfc194dec5c06746ac18c559bd4d6768a49c3a8bfef802c9 SHA512 698883f9f0a6485c7d751c70441d0791ddeb78260eceeefff1661983d04d81960c652f9dd64522cd3431981549689b8c9d3051674da5b0871124c912b4d9e3f3
 DIST libmatthew-java-0.7.2.tar.gz 40601 BLAKE2B 92686eb0136ab72c7a7a9bb93a142099f9fa8207a0abe8052a824f46601aa88412bc132be424886b6dc6f7d1b48f5b84f800132031b42ae1c17d5a63c8589393 SHA512 d4a0024fb17221dff4d787b83fd5d9b4a189db0b3110291066f037dc33c009d479a3b94ec8d7c00ab5a39731ec8015dba212f367a858f4329e9d203325fec02a
-EBUILD libmatthew-java-0.7.2-r2.ebuild 1351 BLAKE2B 5d6ca2a5d0fc989208765dbea60a0e6ea22ae5c45d25ffafbc442054b66b8d4b4ee43695ac6fbed6c89f8620bb8401ac13686ec2523afa688d0d268d414e45af SHA512 55cedb239ebe764c9281f3b91861303a7e42631cc17e4b2765ebca60385c2fe1e4628e540a65f57bfab742b54dae07f634feab80ed3d07052b4bcc01f6dfbeef
+EBUILD libmatthew-java-0.7.2-r2.ebuild 1344 BLAKE2B 8be14f4753f0115a80917a799e154ebcc74de813ebfa74182238d729b011c790630d1889794e4586330013b2362711c534187ade14f160ba9899ff3c6e1ae950 SHA512 cbe3f643bd0ba0f03d5b0a8996408979e056d31ac7fe30b694d42106fd5c3fa7dc6e68a2bd505e2e4a232becaa770617e013c495f5dd7ed374735c9e5b27e615
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/libmatthew-java/libmatthew-java-0.7.2-r2.ebuild b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r2.ebuild
index 083085e8d325..2145bc2cde7a 100644
--- a/dev-java/libmatthew-java/libmatthew-java-0.7.2-r2.ebuild
+++ b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 flag-o-matic toolchain-funcs
+inherit java-pkg-2 flag-o-matic toolchain-funcs
 
 DESCRIPTION="A selection of libraries for Java"
 HOMEPAGE="http://www.matthew.ath.cx/projects/java/"
diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest
index d971d1971d07..974faf0e5574 100644
--- a/dev-java/log4j/Manifest
+++ b/dev-java/log4j/Manifest
@@ -1,3 +1,3 @@
 DIST log4j-1.2.17.tar.gz 2864448 BLAKE2B 233763dbe53f92b5408d3e278b291dff8a7d74657f367ec8b7c7ae1e685ddc0170783c8a5e4b48ec2590b6dda13f45e91bd66066f2c6b515e5d692caca31660b SHA512 7df8dca721f960b9fd22dd5f642dbe7d89167f167aa11604c5f9fe54d649a26dd05af88d7188b47abfb91d501535a4b3665dd84d7e0058ef77159713a10b5af8
-EBUILD log4j-1.2.17-r3.ebuild 1417 BLAKE2B 4601f6d91064d97ac84b5ba7ec83ba0bddc8aeb7b6fd788a6f8401394cff1dcbfe494e6eaa34157aa3561b637bfd42e221869d7d9f8e99c5cec5279c83b6f1d9 SHA512 1f9cdfc8782930a1f04bf5944aed24c6b21efc3313d7a05fe695bda76bb45bf611451561d795a9c5988fc037598c14014c30766ef9ad9a69be4166ebd7416a42
+EBUILD log4j-1.2.17-r3.ebuild 1444 BLAKE2B 4a054c942e2aeef1e869c8e1344485ebeeb0836db214dff9887c5f8027036cd6c733c4a4dbacc04b875d283b0bb8c7b08d78d792a7d8bab09c494ebcaae70721 SHA512 00fd7c4612b730b6ee5fe8561222985a39e6125f18aaf30ffe1f75b648816e53989036b62d59ab8c4ce85585608ea398162aec8eab6cbbcb9b74c4a93ef56a3d
 MISC metadata.xml 365 BLAKE2B c7d4eddda426c4ba6e5749a60c60c1ec3a169e545e119b4987703c13bbbea8fb59ea52055c1dad743b0374a13b32869fb39ee846e5fad2237cd11426b612f69e SHA512 0a4edf2fd6a980baad45c3282db2f991b7c806d8a36a06bed355a4491472b58e0e79f96c5dd2210d0ea51f5f4e83731165345c21b0b439bb2a36584b543b18a7
diff --git a/dev-java/log4j/log4j-1.2.17-r3.ebuild b/dev-java/log4j/log4j-1.2.17-r3.ebuild
index fb7e7820dbe2..0fa931af9d40 100644
--- a/dev-java/log4j/log4j-1.2.17-r3.ebuild
+++ b/dev-java/log4j/log4j-1.2.17-r3.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="log4j:log4j:1.2.17"
 
 inherit java-pkg-2 java-ant-2
 
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 0890e0065128..de1d58c222bb 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,11 +1,3 @@
-DIST apache-maven-3.0.5-bin.tar.gz 5144659 BLAKE2B a109f1ab8656d031c4c904b9972b5dae7955956f95a383c93342bcd3b823e4355fd446150df60b19fc5754b4b19ca4f38bc11357e061e31b0a66b927611a5a6f SHA512 748c7deb8f56dd968a4dbc289b012adea3621f7b3847dc19004995c2f540bae68fb100c0f28caa57b0f9d15b74ae81eaa27c71e342342aa57afe23b41e80d35f
-DIST apache-maven-3.1.1-bin.tar.gz 5494427 BLAKE2B 39b8b29a4747562d96231f575ff5cac2f57a5faee6e74df3054df3fd71b8ada691586def77df7d8f0ab88f4ba464a0d3ba382f3259aa19e2a80e1b1d60322221 SHA512 507d340930cc32268128e8969742dbba34a0144f3e7a561b45f71e254ebff2e6f926fd5c7925081fc94995c3f5b4807caf2204ab70297374857bc66c582610a1
-DIST apache-maven-3.2.5-bin.tar.gz 7956528 BLAKE2B 41313c35859946c8387b0e58f4a25b38d97d48065deb1db9ddbb576417beef1c3391e0a06526c51878f0a7e451b949f8f8ebc001611429b68332dcef24b594ee SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5
-DIST apache-maven-3.3.9-bin.tar.gz 8491533 BLAKE2B c6947c379dd2d64fe28eeab52da443d771c276553d40f70cced2637df17b18c95108932cbb88d4b747f6a8c0a47150849360ffa9095f6ce50724abeaa2369152 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0
-DIST apache-maven-3.6.3-bin.tar.gz 9506321 BLAKE2B 45892ef05cc1e4578c05a794376fdda730a800070389a1be213cf58c8f8df87be5e22cb2e8fdcf718eed344eff3e133dc72a252b0bbb7dcaf4e0e184539f7b0d SHA512 c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
-EBUILD maven-bin-3.0.5-r1.ebuild 1288 BLAKE2B 5df56d1fb434fa78f2e31b706923a954f3eb544287ef2f2c903972d1f12b107c166b1415a04f9aadfaac0e1bd5d9c57b9227ee3eb1da8b950f4d3925f6f375d4 SHA512 d661caf7691165fceddb6b469d36ecc533b52dc2ee376cbc3bc1d158e5ea37f37c07212d6c6f79269d5101cf953c1b025b81703fc1a6493ceb88ebcefc9d652a
-EBUILD maven-bin-3.1.1-r1.ebuild 1234 BLAKE2B 4e3435b9bbfb4661f36cf1375211fc2818d0fcc937319bd918615c9ade29ad913ce570bb2ba3bb32a76bf52941a4e45c02c08a5617eac6f5745714ab1620e6f9 SHA512 d02c484ce95bff8e37d9c360ad49a987796e1332a7a9a33dcf69a7d472db4b50bc2f7f715c48786238b39bceac7ee707f690f47091aee290885703470b6ef114
-EBUILD maven-bin-3.2.5-r1.ebuild 1232 BLAKE2B 7e0fc95a813cd06342c77aef9aa137e06ac50f9dcd7089f175ece037583085f8d63fbd4e6cbdb3a0e779ce5eb018b19b6b6139aa8fa8dc80eaacae6561bf1862 SHA512 66a6e136376517e82b862bfca3033dcb92366bec865b51fafb19ce27a4e8d50e97ebef916b39b4c8438a69984698c71e8a146969cb16aa6a2d963675a054c992
-EBUILD maven-bin-3.3.9-r1.ebuild 1236 BLAKE2B 9641f5146ef168f7b1edb7616940f492011adc2d96d5c9852ec22171f2d3ab45452ab0ff2801348f82c726fe12c43160f2056b06d973b05c2d4f871e13d4fc16 SHA512 fe144d82cde207dca1b10cb072a747e8bc3649e493301bc9f45280e767a0ff85946f3702d1e86ea047a430fe8d088d2adae28a651e2c04e16a7f78e06c5f5b62
-EBUILD maven-bin-3.6.3.ebuild 1522 BLAKE2B 8bddaf9aa58bb4af704eae85e6bb1501aeb225c214936327a01eb2da6a54bf80123436511947ec94eb4a5358a528042b4cce4e4e15490b2214b25febde9bb910 SHA512 2ec374dcd0e0365c67256a7b7ab7b79207101c730bed39a0b9de1f569d43def4f8edfe092e26dcf3f70a0af871077f8aaed46905a963f4f0e85dc013080aa661
+DIST apache-maven-3.8.1-bin.tar.gz 9536838 BLAKE2B a6b464d44d577e126ea042ea37aa07a6ea18c56252627b3a266c6c25cc3520421c01d372930948bd2d784ace330f888fb6a8a5a1012946015c8d16d465bb5953 SHA512 0ec48eb515d93f8515d4abe465570dfded6fa13a3ceb9aab8031428442d9912ec20f066b2afbf56964ffe1ceb56f80321b50db73cf77a0e2445ad0211fb8e38d
+EBUILD maven-bin-3.8.1.ebuild 1526 BLAKE2B 6d256f07b449def93a2769a2f8856e17e14aeab6ff47a60fc221ef54e5842f54030fc4aae7d90bd03f993b33a5a776703c6d6c41f13181c4ee19526e5128707b SHA512 f42b3ee7d7b1c89b6080bb2f9c9f54e78d674fb53ab518fec5b53c1f438259c8e9a996fcdb78ca4245c922bee04888f8488f7640c5ff085687a9c518575af7ef
 MISC metadata.xml 610 BLAKE2B 84180dd51fc9e6b9089111a4f79aae2f2e8339a50b3db00cebb103714e7bb87c99a7fbfbd2401a5646f044b6d78cf370b1a1af7e524be91b7065176cf6b8673f SHA512 e761707a3985b90298ab8511d26458c9c04c7c1750b861f2c866862db07345d645953559b6ca8c1cdcd75c4aae1e84a7646eb376c32f0fe87427d4938d44a083
diff --git a/dev-java/maven-bin/maven-bin-3.0.5-r1.ebuild b/dev-java/maven-bin/maven-bin-3.0.5-r1.ebuild
deleted file mode 100644
index c17509652106..000000000000
--- a/dev-java/maven-bin/maven-bin-3.0.5-r1.ebuild
+++ /dev/null
@@ -1,63 +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=apache-${PN%%-bin}
-MY_P="${MY_PN}-${PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8
-	app-eselect/eselect-java"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-src_prepare() {
-	default
-	rm -v "${S}"/bin/*.bat || die
-	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
-}
-
-# TODO:
-# we should use jars from packages instead of what is bundled.
-
-src_install() {
-	dodir "${MAVEN_SHARE}"
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE.txt README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# bug #342901
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.1.1-r1.ebuild b/dev-java/maven-bin/maven-bin-3.1.1-r1.ebuild
deleted file mode 100644
index 22a30f299033..000000000000
--- a/dev-java/maven-bin/maven-bin-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,59 +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=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8
-	app-eselect/eselect-java"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-# TODO:
-# We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.2.5-r1.ebuild b/dev-java/maven-bin/maven-bin-3.2.5-r1.ebuild
deleted file mode 100644
index 1c7cfabd20fb..000000000000
--- a/dev-java/maven-bin/maven-bin-3.2.5-r1.ebuild
+++ /dev/null
@@ -1,58 +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=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.2"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8
-	app-eselect/eselect-java"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-# TODO: We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.3.9-r1.ebuild b/dev-java/maven-bin/maven-bin-3.3.9-r1.ebuild
deleted file mode 100644
index 966eaa23b60a..000000000000
--- a/dev-java/maven-bin/maven-bin-3.3.9-r1.ebuild
+++ /dev/null
@@ -1,59 +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=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.3"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8
-	app-eselect/eselect-java"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-# TODO:
-# We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.6.3.ebuild b/dev-java/maven-bin/maven-bin-3.8.1.ebuild
index e6cf194b7619..e06ebe56a590 100644
--- a/dev-java/maven-bin/maven-bin-3.6.3.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,15 +15,15 @@ SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
 HOMEPAGE="https://maven.apache.org/"
 
 LICENSE="Apache-2.0"
-SLOT="3.6"
+SLOT="3.8"
 KEYWORDS="amd64 x86"
 
 DEPEND="
-	>=virtual/jdk-1.8
+	>=virtual/jdk-1.8:*
 	app-eselect/eselect-java"
 
 RDEPEND="
-	>=virtual/jre-1.8"
+	>=virtual/jre-1.8:*"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-java/metainf-services/Manifest b/dev-java/metainf-services/Manifest
index 0686ef5971e1..548c3d0718f0 100644
--- a/dev-java/metainf-services/Manifest
+++ b/dev-java/metainf-services/Manifest
@@ -2,6 +2,6 @@ AUX metainf-services-1.6-build.xml 8356 BLAKE2B 1f73238ca0f06f0a9b31d756313a4923
 AUX metainf-services-1.7-build.xml 8356 BLAKE2B a9ee4ed2d959885fd2cb81a827f709152ce656f3864af8949ef47fc32fe9932dddac08cdc44887115444069b5852383177b17de162404c6d1c46a073558bcead SHA512 183ea6c131bc9d63172d34966950f6d7eca5aeb4b23e2b9fc4f6045ac2688cc8e2931ab7d1a986c36bedbc0521a7fc13263be3e5cebbf915b07d12c4e6aac5ec
 DIST metainf-services-1.6.tar.gz 5282 BLAKE2B e5d0231bb90e72200780eef67a631146d10281f4a29e61a09c0cabd5a00205974f351445a7cfd88146862c3d84ad5340e2e259f469374a3d4942a4c33744b5fb SHA512 237f37b8eaa384dfd7df6d0a31fa7e5d086c6923c5eb2435317701402b14ba472839d0e49b9ce9da25c265d6e128679f7d637d41439756242ae591d3b15e1108
 DIST metainf-services-1.7.tar.gz 5301 BLAKE2B dabb2229e5123b535c81f5796d92365eba609e696c0c513666c105534eb1430420b71768436ed53078dc72a2261ed821010ffea0098a4a65f81c5f1c2c118a6e SHA512 d6162e94ff5efcf61e56e0c1e1d22c51854fa7f98662b6ac0cc7d230b7f11b0d3c7c7238b640693d8d6f5e6e6f508bf5116ea22e73487d00145cd5a87853b3df
-EBUILD metainf-services-1.6.ebuild 577 BLAKE2B d0c9157467fb86df109cb5a10169992c4e0f8dab09d2273d09ec6026b5ad93aaa65a1c78ba4c74301934c77888036877cd9dd1785e3c49bfb3e732416dd59bdc SHA512 0845ce1d6f6f0bc69968361ca533d33b2ca5f87f166ef033117b0a951a597b4bf3bb22baee0101b75c91edca8f7b92130cc1f46459a13494abde838bf6af8bb2
-EBUILD metainf-services-1.7.ebuild 579 BLAKE2B 668c9e89475694915479a2b88bb23eabdc9c8d11828eb8bc1cfb8520da91f23948311653baaee59032445c311d3d1a0cd9ff9e4ca9ce6fdf9675aa1af8a50445 SHA512 2985d856e58088c9051fee25cc2336ff9529529597161e33df7eefdc0158041eeaec073430661f6fa380c0df28fe7f13ed727448d9ce77765cebd80cf44ce81b
+EBUILD metainf-services-1.6.ebuild 567 BLAKE2B a1fddf4bd500d0a536839e8bf5bd0d59915b378ae6878b85872c71693b606e064dfb786f22d69c55131054e9a5d81eecdb2a4b1152fad6c95491bf06e8f4ee9b SHA512 ee6c26b10fa347d7ffcfb067a7f363f90032c462e7956a3289b16651f48b526b08e36350fce8fa9b8e6218ade065c4b7ca6bbfb857b97bbd4ea19c79e41d31ca
+EBUILD metainf-services-1.7.ebuild 569 BLAKE2B 50ecf097920c3ab248fd7f5b0d1e99bb26f18648cfd64eceaec2fa806b1d9ceb98529ca28292c336cbea8ba5c88447db6cd6c4228b2588908ebc549b2352fb16 SHA512 1fd05a9dbad8d60b06362be0876869751558268cd816409a5495592816b271ee256ec26e507ab60931192681a54a978380eb01534877111090bc69c27481f7e8
 MISC metadata.xml 335 BLAKE2B 6b80ceaeaef798225f8d929e5e86677482395de9bb24ad765759f68e7a788ade7de997d230a35aa92b97145ef7dd0c8d319a9c1c2597149e161adbcdab373947 SHA512 7dda5e5b222befb2e0a0040429d96d8e9bcc721a22576400b0ee16d827011dbbed85edd85383ed3b398564645d94da56ea48fc7aa3c8a65655334df74b8a6f5a
diff --git a/dev-java/metainf-services/metainf-services-1.6.ebuild b/dev-java/metainf-services/metainf-services-1.6.ebuild
index 28fb9e4748ea..bb7d68cfe2f2 100644
--- a/dev-java/metainf-services/metainf-services-1.6.ebuild
+++ b/dev-java/metainf-services/metainf-services-1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Generates META-INF/services files automatically"
 HOMEPAGE="http://metainf-services.kohsuke.org/"
diff --git a/dev-java/metainf-services/metainf-services-1.7.ebuild b/dev-java/metainf-services/metainf-services-1.7.ebuild
index 976442a825fb..a10038783c8f 100644
--- a/dev-java/metainf-services/metainf-services-1.7.ebuild
+++ b/dev-java/metainf-services/metainf-services-1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Generates META-INF/services files automatically"
 HOMEPAGE="http://metainf-services.kohsuke.org/"
diff --git a/dev-java/nekohtml/Manifest b/dev-java/nekohtml/Manifest
index 32a1163d7a55..a50547043c93 100644
--- a/dev-java/nekohtml/Manifest
+++ b/dev-java/nekohtml/Manifest
@@ -1,4 +1,4 @@
 AUX nekohtml-1.9.18-remove-obsolete-xerces-bridges.patch 533 BLAKE2B 891239b5b4586ccf542394da265036d29b8e4850258e697f6289f42e1bf2aeb924be92f912f064431165632e5fd8c7f027d36b7553320b4591f478fbe5138fa1 SHA512 21c077f13c5157928f6cdc1be45f729e05b42d5b33cae7394d0d8c1167045f27e8baab89a5aefe33b907d1c3e2146030ee54a48da6d1a3bdde6c75f729dc7937
 DIST nekohtml-1.9.18.tar.gz 10471968 BLAKE2B b033158c2ae6742c615d6bcc58ef05eb18f2395cab5052de20a485adb573b924202ed04dfbcf39bfefb4eec524aa0d5d9216fdd151c4a8722b5277c2808cc878 SHA512 f7321ad853eb63e327ef8bada52892caf58372f11136df72f46d8a7cd6918492cc66243002955525ac05fd669b3c4389e9067421f749f99f928629cc7f88e0eb
-EBUILD nekohtml-1.9.18-r1.ebuild 1226 BLAKE2B 7de840c88baa799596cb3fae642263bbb65be17eb28f8ac5ac7eabe0de5c7646826235bd414196fa4653827efccf1a32c7fa19384fc69192fa54c20372abc0e9 SHA512 650cebaba5acba5ce87885c3589fe9e3f8efe4ca21e5aa96ced484667399643e6609e155cfb0adbbb59128b41cafbfd6e912d1aed6f7f56dc6d7b73d609dffe5
+EBUILD nekohtml-1.9.18-r1.ebuild 1223 BLAKE2B a50e7ae4c211359f51859cdc95e30aa5af836987ade913f8ee28380d2e78c5ca05011822f4b09b65ade48da8591ec434532dc1299a94616580f270b2ace038e0 SHA512 100c619240755354db61c82b8a9edc445153bbcb5fa95a1fe2f4df11767295890011a2aeba77b69e22cf885113eb258f4c7fc6a7bb70a6091ffc78f4f17ab828
 MISC metadata.xml 314 BLAKE2B 073d261d268fe26737f695f2c376829add4b29affddea58a4ad61764facd3bcf32eb5f5f7a80b26f989c8722da1cff4247672b2fecf535b59afd9e21235b1b55 SHA512 a8b454129fe31dd7b221ea1094a331ad78feb7cbf558e256fad7a49a28c7ceb99874504c4430c1fad04e854b25a5e1005005f3c2320eafe985ee934c758351f6
diff --git a/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild b/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
index fd1401c96ca6..1b787d352632 100644
--- a/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
+++ b/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# 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 eutils
+inherit java-pkg-2 java-ant-2 epatch
 
 DESCRIPTION="A simple HTML scanner and tag balancer using standard XML interfaces"
 
diff --git a/dev-java/objenesis-test/Manifest b/dev-java/objenesis-test/Manifest
new file mode 100644
index 000000000000..ff4be4234786
--- /dev/null
+++ b/dev-java/objenesis-test/Manifest
@@ -0,0 +1,3 @@
+DIST objenesis-3.2.tar.gz 123629 BLAKE2B d875224d7a9fcf6173787edaca35f58f72d6c85ee443831be8050170ba826e8a155c7983c62ef5d01a1bb8331943dd6da5cb50eefb87cc0c7d3db540b01fcac3 SHA512 8f0bf9449191bce1823be0cbae85438edf595bde0483bb2fb4415a880b6715ae60826473bd5ee15789a7d0638932878dbdaaf7b42a6d582aa7bbf09124e97e3b
+EBUILD objenesis-test-3.2.ebuild 874 BLAKE2B 97c2b626baa3e5722d89c46da067dcd622c04e82353d3af35068521ba6f52d81ed439a649ac25b2463d3b91bde2157d9afcdccd43b594e4bb3f64efcba169fbb SHA512 be987d2000f36e26bc456f24422c19d5b17b2f3b75d3575e510e6759ab3373a62b6912cd68f8051960f2933361a1fe740cecda9a1b702e92b072c73104bce3b1
+MISC metadata.xml 385 BLAKE2B 21b4ff5cdc9b66726d00f32aec998bd89bff2a75929eb15bed2aa688bfe1a04ac5a5df209ad2e732c0b168f0af0124fa7e74512721222a94fe5d155bd8a48d4c SHA512 51de98336149b818cfd1ba47b9a7ee5d09cba8669273f673db5491aa1d9e9b675cbcabae43a4bb4061ca2654f03ff998d01480b71e741ebe7cdaead2f786710a
diff --git a/dev-java/objenesis-test/metadata.xml b/dev-java/objenesis-test/metadata.xml
new file mode 100644
index 000000000000..36a0882f4080
--- /dev/null
+++ b/dev-java/objenesis-test/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>
+	<upstream>
+		<remote-id type="github">easymock/objenesis</remote-id>
+		<bugs-to>https://github.com/easymock/objenesis/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/objenesis-test/objenesis-test-3.2.ebuild b/dev-java/objenesis-test/objenesis-test-3.2.ebuild
new file mode 100644
index 000000000000..0bc4aa01ca67
--- /dev/null
+++ b/dev-java/objenesis-test/objenesis-test-3.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom objenesis-3.2/test/pom.xml --download-uri https://github.com/easymock/objenesis/archive/refs/tags/3.2.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild objenesis-test-3.2.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.objenesis:objenesis-test:3.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Test library for Objenesis library"
+HOMEPAGE="http://objenesis.org"
+SRC_URI="https://github.com/easymock/objenesis/archive/refs/tags/${PV}.tar.gz -> objenesis-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="objenesis-${PV}/test/src/main/java"
diff --git a/dev-java/objenesis/Manifest b/dev-java/objenesis/Manifest
index 47a7bde4e230..573e3181c74a 100644
--- a/dev-java/objenesis/Manifest
+++ b/dev-java/objenesis/Manifest
@@ -1,3 +1,5 @@
 DIST objenesis-1.3-bin.zip 287452 BLAKE2B d3f6cce9ad46d8578e24077df8a19fcdf2f9456ef732f73fe234ae688c9ceca7277e5376657efcdaba1a7b5a80ddf106aff52f291a6b2f698a010a288e961e33 SHA512 48f838e00cfe0d12c6c73fb3d1d8482ccd8de71742a86c3afbba832c6b73e1f7b1604f8c209386e00f7751cd568e9ef4d61b543db66c927f3d61f9e6ee0a4193
+DIST objenesis-3.2.tar.gz 123629 BLAKE2B d875224d7a9fcf6173787edaca35f58f72d6c85ee443831be8050170ba826e8a155c7983c62ef5d01a1bb8331943dd6da5cb50eefb87cc0c7d3db540b01fcac3 SHA512 8f0bf9449191bce1823be0cbae85438edf595bde0483bb2fb4415a880b6715ae60826473bd5ee15789a7d0638932878dbdaaf7b42a6d582aa7bbf09124e97e3b
 EBUILD objenesis-1.3-r1.ebuild 649 BLAKE2B 12ba0512f6eaa5327d423b69d7ef4c98dd0a3fa6d3aae8b6cf786495714dc9ae41bf43bf283010f7bdd5edfff5f22737e1da13021ab9392220f2d052003fd2bf SHA512 8ff4f36ef08630a495091a48752d570a777545222fdd3c0ad939677ba41a4136598d9509f84044b9db5ddd691406341133baab6d2124349b75cccfd52a188f27
-MISC metadata.xml 315 BLAKE2B 2190fc553786144aad4a8887b7d040a8597cb48aacb4f9ad04261bab6b7752d2d43779edd3f4bfb8fc700c7decbb0e82f80216dd8f1722f6bae6f2522aeb8a50 SHA512 21adb506d9c4eb3d989497eccc9ae6d052753e880afa8b7800dc86d54128173b288c1788579f1d8e1be4acf7b03a1fee2e15ade6551241062e8a908ae9a6c7ed
+EBUILD objenesis-3.2.ebuild 1217 BLAKE2B 3a0f85790da3164e27ef7110d9f724d987a0f3d98dedc204e7f3bd7420b7348a1463f3cfca829ba5fcdd49f34f8d259c2c4f7163eba2cbd7ceffeeb196b9f228 SHA512 bb767ddf276919f78c3b9df4712c904d0876a7175298b6159a398d96b0138c8309aa82c7741337cde6a5ab70bb01155c2fe130d9a9baf8eb40a900cfd8d7f692
+MISC metadata.xml 385 BLAKE2B 21b4ff5cdc9b66726d00f32aec998bd89bff2a75929eb15bed2aa688bfe1a04ac5a5df209ad2e732c0b168f0af0124fa7e74512721222a94fe5d155bd8a48d4c SHA512 51de98336149b818cfd1ba47b9a7ee5d09cba8669273f673db5491aa1d9e9b675cbcabae43a4bb4061ca2654f03ff998d01480b71e741ebe7cdaead2f786710a
diff --git a/dev-java/objenesis/metadata.xml b/dev-java/objenesis/metadata.xml
index 5edcde2bc350..36a0882f4080 100644
--- a/dev-java/objenesis/metadata.xml
+++ b/dev-java/objenesis/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="google-code">objenesis</remote-id>
+		<remote-id type="github">easymock/objenesis</remote-id>
+		<bugs-to>https://github.com/easymock/objenesis/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/objenesis/objenesis-3.2.ebuild b/dev-java/objenesis/objenesis-3.2.ebuild
new file mode 100644
index 000000000000..ce6d04ce8dc8
--- /dev/null
+++ b/dev-java/objenesis/objenesis-3.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom objenesis-3.2/main/pom.xml --download-uri https://github.com/easymock/objenesis/archive/refs/tags/3.2.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild objenesis-3.2.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.objenesis:objenesis:3.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A library for instantiating Java objects"
+HOMEPAGE="http://objenesis.org/objenesis"
+SRC_URI="https://github.com/easymock/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: ${P}/main/pom.xml
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+# test? org.objenesis:objenesis-test:3.2 -> >=dev-java/objenesis-test-3.2:0
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		>=dev-java/objenesis-test-3.2:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="${P}/main/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,objenesis-test"
+JAVA_TEST_SRC_DIR="${P}/main/src/test/java"
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 46ea537c8b07..21a4eda96c04 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,24 +1,25 @@
 AUX openjdk-bin-11.env.sh 496 BLAKE2B 6a99de9730f8e84f6082a08fc925126a2fa1579f040b7f083af371218c4523956d5a86777e1bfbca7a63a717992d1a170d539d04f26f5317c3fbb9a14972c191 SHA512 94ec17c26c7305c57fb53356a4477711fd987c4d48af114f481579f316c20ed487ec40124361bd0cf2c947f59eaf93ca629975f9e999d47f5025269187db82ad
 AUX openjdk-bin-8.env.sh 705 BLAKE2B 0e155706fa9633a9a2e54ae2c9ecb95516c0b46ead84e24dc4c4d79a1b67644eedc6b97e6d4e17da4f6162e2ce7bfafe60dddc950e7f76a666af46920a8a5025 SHA512 ca6fc7b0889ae3d2be386696eadaf9f25fdedaf94cb24696a2de56214695cb0211226bc87671449bf366763f568229b22409201e532d14394c641164c48ffe2d
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz 190883956 BLAKE2B 404236a3448a64b3f8a74543179dff076d0eb226250525dd5988f5884f25d9d02fd561d3155144082aca61f825b5565593a4aa6e31a70b864dbe504af6151673 SHA512 043195ceb116380dd6ef1a51cfc172f798f7494913af074eb959a8871aebf9e89b2396bfba018cb39d3e5792274ba518c49c0ca3cdbc1ee08839af295dbfd2be
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.9_11.tar.gz 190728488 BLAKE2B beda483e90e733932ca9cf9631ae3f97b7106fd3c80b4a70465f9d32d52bf2ba4f395fa5ad7b08a4998e5c72f3794e0189750a883422aaeaf42877750d7c4647 SHA512 a9fbd1336357bf7880e6eebaab9649ca2b5db5ea93bb184e9fa682d64f18bfa0addb87de5a04e13bc337536b2edce5189bba703c8eb3a524567073add6d29a95
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz 182395059 BLAKE2B 585a5bb34c61526e1ff233b86bb8be9757a3aad14ffe3c7825b77a3f3d6aaa02dd3db5f6c1a033c83808f0b3df56d5b1c1913c159a09ef7e5448731120bb5689 SHA512 65bfc7949c6d2b04d06076dce903ae8036afc73980b709cd7a925b36815adc565c160362c421c13bca077a54ba13861ac1434e13f23eec6394f9f84e8a49edbb
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.9_11.tar.gz 182835103 BLAKE2B 2b8849c5b9f490bf7700317525d3538ace19abcd73436a5c27251a282348345dba3c438c062ee60a2070f64c8c8e93a5d5d632a44f410775ed4fff1d691219f8 SHA512 707efc9d0660f0c06d4955e56761422b9da41b5afacfa337711c6a2500441f80fad1c65d8a4b0a1334ec6d5c6e55d464fc1cff1ade21e8cca42cffd0c161c1e2
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.10_9.tar.gz 176435718 BLAKE2B c99ed49a093d9bbb30ece0d7157dd2664eca0fe334d379b282410a5ddb90d80a52ba85da6c32d16a1b08be37cb098b34d5465c2de593b4562c1c46f60e626fb6 SHA512 0bd978a09886078f646cab2fb856e99a08498e7170e2031df9d1e3c813200f8d9d152737e3d7cf8c6bf845f59c792f1aa13f7a6693de9f87ebe6a12c25e80af8
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.9_11.tar.gz 177065013 BLAKE2B 04bb16a464a7984df770c52c5e2b8b1d9ec79142eb8a9c9a95a8ea02656b823a2505085e1521d94b9d994a1f5675fb524b917c9fdea46269e45a43d10c066947 SHA512 45619214cfc54be5b68e1ac8112a239a156be5a126631b2ff994a3b70e2e0aa899e5f9a4d31381eba2eb743790e4bdc2014ac342419a004502ce40945b3f4890
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz 194069769 BLAKE2B b537bdf553b1da11c06ba8aed7f2baa498da384209b5c94b22995a6d05e1d83b4fee215c6c27e1975e6d2e04805916f85c8fa244f53a6f002d3eb42d56898b74 SHA512 993881259ba470030c589f272d239aa185b1b460c4d505a266cb99f7107de2aa646b3cb8bb8d38fa454d226228c6d3dd8245301c8535c7f6b3bec766cc555bf9
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.9_11.tar.gz 193980586 BLAKE2B cc927d923ca29ca41ea9cfc38bf07761904fb9f31fa59b5c882ec260d982a9af6c49034d80e6ed4d141c5ece1a1d297c3c153358ad940e61a4f667c53d6c040c SHA512 1ccaba9673a85287953a6ffbedf7caec4c2d64e0a121277bca6e40a6d47eaf414ed7470971f271e28309b97e95268348a7ad4fb2a03861eeb193d1f0536f2727
-DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.10_9.tar.gz 186160219 BLAKE2B 5a044db5ff02dadd8a1677254c8653e14f41e09e4180dc8726d35dd293193e8a332db54aede19d7a2c2bd3c3b3c799cb0faa315bfd9deda03c231fd01670ff61 SHA512 cd115893162a9db3e7e5763028a0040eb83773ae82cd056fdb9400ae3a2b720e7e1bee24a0251ea29eb01923400a1c459d3fbca08bf563d15f7434f5a4d6c69f
+DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz 189549576 BLAKE2B 9eb55593643911573dbb7aa0f69169cf63c0cd8d0a4b4d3a4bf42131f2dfa51305c55c26e802f07fddd70911dba20c4d7b57983782aa2da61fa730f12258a94c SHA512 f2aa4514bad0a4116d0b703adef866f420b1bf264781b58d4075c54747856a657ec7fd1ef622712419823f76a87b9965426f59e5c66b21dbc073387e66f949a9
+DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz 180784025 BLAKE2B c15ae126f1c2bb00f97571d4bb3316ecf5ee36a18895eefb48db616996dcdf363acbbd8ac17ecb6a507cc0f3a811f476cd72993b42e0a0b857b82c3e2d4d5279 SHA512 33cdc99dcf119a3f5161cdc08853ed1b8a1630f884577b6a167cf79621b0fa6f87ec652452fce0e27ee550b63952fcf75a3a6bd70c61564faafc0e8e1c74c0bf
+DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz 174865783 BLAKE2B 717168b8b2dc326495dc41f3af2d85b515c10774ae58f35bcdf86694d89b1e11db50be24f4c046add5223e912448d67c2ecac8a3a6f3ca2dca3e915fa61f9654 SHA512 dafd40c133fd83c06a29816f4e45ff63e588ea5e6046fe331acbee4eb5efac4b3fc7da0f0fd55e4044846a053644a71efa00e45cf4ba39106b8d1018f9bca0ec
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz 192792051 BLAKE2B b11a0934d358d255df743e241fa5040bbc48746b5fd131e98a9b253add114d3504a0f4b10887d9b86189da4f2bccfc65134247b0580d96e2fa7ae9374d44ff38 SHA512 b79eb8a672706b643773711a59a756de88eadd54e74bfef7dad14a0f7ab7412ee6c457b4d3489f6c530abbd442307a9355b5d4a01d2610f90cfd614b614f6507
+DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.11_9.tar.gz 186275966 BLAKE2B 09c54989a7d1c4989946bd1afe26c3254e2a0294ed4a8ae92e1e3e62f7e53eff7e30739b362d8a07cfe601633850efa4ad91445d474e1de196fd5b88d4e14338 SHA512 04bd14301bc9e1601096141c4c8d8b1637a8a99f8bf66d60081e5a36360440d6eb87d595df6b4b34fb44446746681774b2761fe837f3353a4e5bd5669182a09e
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u272b10.tar.gz 103598972 BLAKE2B 34ee2fc6a1cf23c9c04522a82f74ba60c53cc461e370c8aa88d6b62b4c4539e96d233a232f38390b9f0932768c5fb662a44e425d0f5bebbf982c657686b163d7 SHA512 5b44f094219daf383743d463c50917c2d60b289187e363748c3a4dc16471d84e4d28b6bc30879d137b79645f7ce977c755e8a5714bc272e012bce900f3db8ea4
+DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz 102423506 BLAKE2B dab839491d359e4366d316fd1a0eb3b7009e1739d7c6d4dc3ded47bd44fc7af36068d76183d9656d748beec0117bf95f09a78e577c3e1f685f0fb3c2e2d45e28 SHA512 6ca2dddd371223c0bae6caea1f4841d7d718b9ea812d914ec8fe3f03671e2176454ca094c05e55286ba0560e2897a515714bf607e868b4b0405b6bce03c5c22c
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz 102312570 BLAKE2B b4280d8c1e2132956ec103899defb9000bfda303350b72c9797cc1634429cefe173b17617f687eadcb7c8259d7423cef8b68ce9c89e2b31340fa9e3c6e8ad265 SHA512 d2e6795daa7b413d7ee0fb217d3210b809ac87df11e2ecb3a9befaabc7cd501b67c5526b1498666476a3a7526648d85f43a28a170fa870b3e738daecbc8c41a5
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz 99368824 BLAKE2B 970a0859a09002978b7603beb9cd94556fcdbb8923a88e48dca167e5ecc1495fddd00c786c7b9c0e608de48d485b2e8b4da7491d4e85e488fd1baf7ddc021951 SHA512 6974c06644aed4c7fb8f6004f4d8fd7790252e148ecfb3e1d29a7251429e413e8adbd910231b3cd5b9dd195a570b3fbeb95e6ab09b3ae318f3f842eb7ac418c6
+DIST OpenJDK8U-jdk_arm_linux_hotspot_jdk8u282-b08.tar.gz 98247854 BLAKE2B de96234507ae2831548c8bfc04d46ddca19d17dad6292cc51021f6001338ddd0722e16bba886cf06187f5df7e8dca34a972696be74dc1ba23be7dbad91c8d3ce SHA512 9cc2240c04f0945beb75536ee85b8e1d19acc9357e2ba844000db7e9f64c6247bd57cd0193c1ac66cbbd79e6f1197d68604519689fdff88a8b90193dba3237ef
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u272b10.tar.gz 100818464 BLAKE2B b2666ed3bf564bdbac874320805f622a1bd80809cf2c402ee393ed585c7ae9e7aa6fcf0e69f70fde16ef5d3a2059ff2979013865112c455cb64761c521a04578 SHA512 bfc138bbb979c23fdb154fa3f7e61ae71b0703a839c9495a470544205c80511ab090f0e52e228050e38606e24c2912092ef601347a9a3979f3a7a25d1ca15ce3
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz 100365310 BLAKE2B 0b7621ba2f5a68d936039d20228b8c7cdddfa528a2b0e5471952ab96ff4d91f30a5892f5deca9b1e1ef88ce334fee5720f0e06bfed67ad9cd170ee0cbb6e65a5 SHA512 36b5fb22c1859710f520255bb6a2c8d4e6b650f77ac2ce988cb9dca570622753c8eae9d27c2955af2f37e6379532babd942ff82863cd771d3f4e247b57a93f84
+DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz 100518660 BLAKE2B 11b1d1b32f76359362bc101678b0123d29d32bd720a10b806a55cf9b4cd3e9d5cf2ec50f985a4de85ae41ec4b90376e7b7e2f501bfe86ad9ba832813444a8f9a SHA512 2999972ecd574169d50afc6c7ff3e7b3f892939b125a9d02184b09ac11ed32b741e1bacac64f93fd4fce75bb4b16130290c1011d3948c66095132208cfc05839
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u272b10.tar.gz 103650413 BLAKE2B 6fd50cdefa5daf6d155000b653b695511953d486ba9f4bf7426caf8dc6d7b7d3cf46c4426982a400c19a6fe0f6eb557a232853c3e4211e1961e8aa890c1721cf SHA512 22a4b5c27d2fad79b7bf8a8ae896a9b30e3d303bb4ca30611dbbb1f5811f4524a98c44a68c4546906f566b7d672f6ab48d10cf270870c1b86e7a7688d249c555
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz 102873064 BLAKE2B 2331a8c4fd404ea6d44ae5e9f168e7955b96888ebceaa0d72cc1ae044972869bdede26e1d69b926fbac1ad54cdfa4080b2dffd41e6667717a34ceb5da96c8eb3 SHA512 c56b4106f6f21c116d5229973f562e93aec91ae815b9f61291ae052540cd6c473ce74da9f9404c4d9028b313a70beae6bf328d2cdcc5c8ec8ebaca8d0fd3e892
+DIST OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz 103026380 BLAKE2B 4aca546720c8cdb9f8ca5ffe59eca4a2f4a5d36716faa3f3dff7517ebcb9cc13dc6749f16c3f7da9d0d7dbce28a7b4405cef9c5d96306fa79bf87ebefb4c6113 SHA512 44d36d221c4fe660f3f5b5627c6629d4716e7ae1fdc2d2c2b74c1235aae3c2b2f1ad28b9fb882ad574c7d6dd579a24ffdfab6809b2be6f02e4d6e802dab7e3ba
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u282b08.tar.gz 101808251 BLAKE2B 7abcbe6b0f061f9b5d4cd4709fa2d6a53184c41a313a5bf861ff0796b2673bb2a8c783e56769aab20954258c5e505c6a057b3838408cc948500ea9f3e723f646 SHA512 7fb53d3cc6994d87769c53c992ef7fc4adf2488b6a0c41e3c2004ce334a86da7e9fb4955b58c9e06566c5999f317579736ad0f346dd8dd56037d3ec0d5689812
-EBUILD openjdk-bin-11.0.10_p9.ebuild 3511 BLAKE2B 37160845edf57ff8bc990a40545106628af6feaaf41c93a2a1a74fbf19998f5b05a90a194ed16c8ff68c255ddb213a60e2cebbd1958ad99e44ac139fd725a5da SHA512 5c5601dac2dee4c2f8fca804de5183efcc8b3701fd0f2d0d0435d49271f63a0ccd8dab5b812cf780f6b09fd25113675dd8b1f91b1bb8f06d57d48746bc5d7d6b
-EBUILD openjdk-bin-11.0.9_p11.ebuild 2979 BLAKE2B 079df8fd920641207a0f5473e1bf98d9ec399152a26135d77bb3a4890d773d270d3e43899327201b6d15e64075a34004bf00fbfa3f901eab877fe5286c23e096 SHA512 0b5c6642d6896025b6ecfbef4ab78c680391fd52b1b26a9cc3370403fefe0e83e5ce92c745e06b68a9ea96a72143c1827bb620fd9862a6819fb90d9b4ccfefcc
+DIST OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.tar.gz 103785976 BLAKE2B 81f4b24f2b201478dbd439603e19df2c0b699cbceb679dd2fae14f72a19550c78cf52e7932f4816491bd04ec6556e157b7010518d1ffde4a3e99fcd9e183a721 SHA512 044ffada083a0ca32209513d7bb4ad51af9667611635a2a343e01b0d07d30257493ec1439ed104b094ef88844c1ed69671e3a8f413b51468e15f6172220747ae
+EBUILD openjdk-bin-11.0.11_p9-r1.ebuild 3625 BLAKE2B 4397d7271d15583b6f47fa5235ea55a240e53bcdbf23a59df15a0be7087278de2bb28776922243702ae2ca2bb750f2d85358c6704ac9e47ae65e20440c60596a SHA512 d8a7aff506f41ecd1f69c13ba36d64e33b93b96879740c3cf00f2af16a5a12381f2743c7613d96b392f1bccc85d23afc0eb722a1538412050408a09164a5fc38
 EBUILD openjdk-bin-8.272_p10.ebuild 2150 BLAKE2B e5491e066b77dba9da871523bfbcda4c54ae8c1a81b714fecaf8e9dba08a4a13034ad512e0fa1bae65e4d6148015a8118a314b8fc1476acc1a66e9649a7545fe SHA512 406c0f47ec88471786a7742290ee20723b66e09fcff0ec867bc010085144a643d22cd69d208e1466f6475daf2a3f8e8878cffff03a392bfb6c988f97bc68fafd
-EBUILD openjdk-bin-8.282_p08.ebuild 2984 BLAKE2B f7ee3c47ade97bc482d836ebc8d04d5a76a8888de8846c98ec4f1754d7310ae755c7338ee09b0e4d5eadaf2fb0bb5a379b98dcf3f9930b41e7db37cbfac1f613 SHA512 849748924f899d3d86a6e8ed7bd0e2b287c855cc3e9ca5e83eeb7c788ec86761b2578a21a3385f33557836d631ffa2fab8ab120eb9c3b8c6a18b201238cb0ad4
+EBUILD openjdk-bin-8.282_p08.ebuild 3021 BLAKE2B 735b8008dfc7ebaf4fe04eeeed41fb1f3f4a4ce511aa5df1872f06cecf5adf1358c73b32bf9dd66196a081951eb8bb0c4e171935f329bd41416da40f55b34e3c SHA512 4d8465e324810fa5f828a6aca1a6bb3a8547741ba87e59e80bf722398106a97bbbd0ab3bc81099795052fac78c5a3a492ebe1fcd300cc51002e6d0a41432f51c
+EBUILD openjdk-bin-8.292_p10.ebuild 2970 BLAKE2B 93bd2ef441bbf89f2d71a80028e6788eeed179d9d8a038f2b09d2e4df9f1cef5723c02a8497cc6df46a5a191714e4c5a80a9487ea9d4d1507ecc23e1ddff2459 SHA512 a67a1adc40d1efdfd5650549c302659d27545f452d270fcae7391972daac04bf7af9db533aa840afc6e2e8834610e3bb6e80ab2531924d52ec9fc127a18e8e59
 MISC metadata.xml 940 BLAKE2B 0b643a9707b0f85db0717d766c1491a4a6110342024a3fcca4455852d96c73e62e44607fdbc7f7069514d796134f1b0b82a36d1c88e166a4d2506646f17dc9f0 SHA512 990f19188c833dbcc6a4dac9f63e8d20604bf4ba1c74f6d42227e1f41528447cf5ea040b55cd813d073dfcd80c12f5ad626f97014fca99365fadc8539d446b2c
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.10_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.11_p9-r1.ebuild
index 3eaf868c6d29..b48f46e2a16e 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.10_p9.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.11_p9-r1.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
 	kernel_linux? (
 		media-libs/fontconfig:1.0
 		media-libs/freetype:2
+		media-libs/harfbuzz
 		>=sys-libs/glibc-2.2.5:*
 		sys-libs/zlib
 		alsa? ( media-libs/alsa-lib )
@@ -84,6 +85,9 @@ src_install() {
 		# also has an explicit dependency while Oracle seemingly dlopens it.
 		rm -vf lib/libfreetype.so || die
 
+		# prefer system copy # https://bugs.gentoo.org/776676
+		rm -vf lib/libharfbuzz.so || die
+
 		# Oracle and IcedTea have libjsoundalsa.so depending on
 		# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
 		if ! use alsa ; then
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild
index 861deb4537cb..fa7d21f0c5f1 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild
@@ -27,13 +27,14 @@ DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
 HOMEPAGE="https://adoptopenjdk.net"
 SRC_URI="
 	$(abi_uri aarch64 arm64 jdk${MY_PV})
+	$(abi_uri arm arm jdk${MY_PV})
 	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 amd64)
 	$(abi_uri x64 x64-macos)
 "
 
 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-bin/openjdk-bin-8.292_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild
new file mode 100644
index 000000000000..fe4ec8f15061
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver java-vm-2
+
+abi_uri() {
+	local os=linux
+	case ${2} in
+		*-macos)    os=mac      ;;
+		*-solaris)  os=solaris  ;;
+	esac
+	echo "${2-$1}? (
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_${os}_hotspot_${3-${MY_PV/-/}}.tar.gz
+		)"
+}
+
+# they have different tarball names for different arches...
+# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz
+# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
+SLOT="$(ver_cut 1)"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
+HOMEPAGE="https://adoptopenjdk.net"
+SRC_URI="
+	$(abi_uri aarch64 arm64)
+	$(abi_uri ppc64le ppc64)
+	$(abi_uri x64 amd64)
+	$(abi_uri x64 x64-macos)
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="amd64 ~arm64 ppc64 ~x64-macos"
+
+IUSE="alsa cups examples headless-awt selinux source"
+
+RDEPEND="
+	>=sys-apps/baselayout-java-0.1.0-r1
+	kernel_linux? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+		>=sys-libs/glibc-2.2.5:*
+		sys-libs/zlib
+		alsa? ( media-libs/alsa-lib )
+		arm? ( dev-libs/libffi-compat:6 )
+		cups? ( net-print/cups )
+		selinux? ( sec-policy/selinux-java )
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+	)
+"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk${MY_PV}"
+
+src_unpack() {
+	default
+	# 753575
+	if use arm; then
+		mv -v "${S}"* "${S}" || die
+	elif [[ ${A} == *_mac_* ]] ; then
+		mv -v "${S}/Contents/Home/"* "${S}" || die
+		rm -Rf "${S}/Contents"  # drop macOS executable
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED%/}/${dest#/}"
+
+	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
+
+	# on macOS if they would exist they would be called .dylib, but most
+	# importantly, there are no different providers, so everything
+	# that's shipped works.
+	if [[ ${A} != *_mac_* ]] ; then
+		# this does not exist on arm64 hence -f
+		rm -fv jre/lib/*/libfreetype.so* || die
+
+		if ! use alsa ; then
+			rm -v jre/lib/*/libjsoundalsa.so* || die
+		fi
+
+		if ! use examples ; then
+			rm -vr sample || die
+		fi
+
+		if use headless-awt ; then
+			rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+				{,jre/}bin/policytool bin/appletviewer || die
+		fi
+	fi
+
+	if ! use source ; then
+		rm -v src.zip || die
+	fi
+
+	rm -v jre/lib/security/cacerts || die
+	dosym ../../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/jre/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 9450a7d7e9be..5897ba6f5d89 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,11 +1,15 @@
 AUX openjdk-jre-bin-11.env.sh 513 BLAKE2B b7dfc571fda637776479ca4f8a8f0eb1fa0f03f453b48e0079670aa20f5a5bc83ed73194508aeda596a62805e5a6273b4668b870d6b7aaa99ddc72498e384c54 SHA512 dfc012876174108b768d6fbd9deaf8b9e20965c2b5dfc2ea4ded556597c0ee4807537f7b29ca1e6f92ba800313457844299fab770b833d8b3a5b3d576369411f
 AUX openjdk-jre-bin-8.env.sh 675 BLAKE2B 66fb3b2690af2cb8bfb959bdd6edf66e130cd5e2c8968c96aa8d6cd09e01d193c6ab9973803e97105da4cb573b4221528d1cc830e044feac1b2c8ebe9f17d405 SHA512 ad361aeea566fd23fc21a607c9cdf63b164ad9d38a63fa01f435640af90e49cdb6562cb64409ab873a6603def04f8ecfc164340988c1a0660e8c6bdda500cd9d
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.10_9.tar.gz 43146855 BLAKE2B eab22a4134dd94143adc5f6da6932d015874ec1ae58fda927279c85190b9c90a13de2c08e9f1d6d2d91f9c13f3999d2e76b8fd511c17f66e4d18f687d0bc2047 SHA512 2cb56a58aa9c0644374d437d20eb908a8a997f6b8e49e4a3589e4d79d0d15eb4dc574e815cbba2cffce62e4e20fefec706e0c4a76d42212e10365ed90f8b6263
+DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz 42432277 BLAKE2B 18138eb163db4609790286cfe7bc951da9ea244eed50bafa10e5d84ec43e7a80ebc2f759f3e1547b9d785b1a6d560b5399a0449a8fe301e19625c2b98abba928 SHA512 5b8c1c16c5faa467bbb35a1d1e694afc50b0c2dbbe77abb29620f30602187a1a903f60169e2b691dcc81b6d902ed5a17239318f27765f19351281209befb0e96
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.9_11.tar.gz 43086814 BLAKE2B 20785b5edb3fbfae99c7cdc76fba964a7a00eb148e68125138281c0995d6a82cfe9924c7f653dd188ab97da41135004546ec822bfa845f599135c8a9ec5e9336 SHA512 b0c53febc2628b91763cd5304cce782adaa71ff466c4dd9d056c7f1ac18e8f1f4ad2fc355882b2990fbd71e7792134697bcd1204eb9e03c12cf3b287ac33c3f0
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u272b10.tar.gz 42139854 BLAKE2B 52e7a594aab1a70d351daf9dc42598b4952894a9a72ed996e261e347eece4337fe95c5f63850a0dde2d8862045d22ef41832a6af51df5113b81713bab20c797e SHA512 2fd45a9b967e96309c79724fea047d7c35f31da8e0290bd5cdafeea47b83941b9269129d0d557ee488526c0667ba581dee860381fc344374971e1005105db376
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz 41371208 BLAKE2B a6ca557a33a9d917a3e26824d7c1e3c8b17b90eb4fad8a3d63dac4e2f5a024c9b4328194a366b28c05605f249f35efd332145706696d3721b8883ac023deb10c SHA512 4717ed22d9716ab24175cec7091b400254d633045c8e64e45d05112566a5b489d716cd9af1e4572d7da70cd06d048d84a0fd735402ea60b9210d8214f4ba53d0
+DIST OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz 41355668 BLAKE2B 761358d7e5dd9c96ed13d7302ea5f39719f044a37add7fcadb76ed799d41b17faee014c9e4bec3ce388d4a6965e2c14dd4ddf029baa6dd1f5f84cde7e7b1fcd5 SHA512 fd63dceddcd32b0f48b6d35c14ab3165f2b45152fdbc2bcaf833ed2624d833592cf1001627029fd04f9b77a033e2d4e993830d54c2e7c08adde5cd7a684447fd
 EBUILD openjdk-jre-bin-11.0.10_p9.ebuild 2659 BLAKE2B bb9e36d5912be413bd89340832029a5cf1f4d88cd053986a9e49f0215c8b9e2e528078acd751e580b978d42724c66550cf9d046f3c4cd902e50e12cee0abfcf7 SHA512 d8220b1f36b6aff13b9c0279110a06f9344cced376fa8e2ce3ed91fb21a23c95e4be0f0fe1f4f4d060782a372472f87e0da4c2d8536644013662412e14c7296c
+EBUILD openjdk-jre-bin-11.0.11_p9.ebuild 2659 BLAKE2B bb9e36d5912be413bd89340832029a5cf1f4d88cd053986a9e49f0215c8b9e2e528078acd751e580b978d42724c66550cf9d046f3c4cd902e50e12cee0abfcf7 SHA512 d8220b1f36b6aff13b9c0279110a06f9344cced376fa8e2ce3ed91fb21a23c95e4be0f0fe1f4f4d060782a372472f87e0da4c2d8536644013662412e14c7296c
 EBUILD openjdk-jre-bin-11.0.9_p11.ebuild 2659 BLAKE2B 64af93f9838f36e31f67aea9c0cebbe74932bb6f88eded2f2b3e5efc820808adabac60bf4b44276d305caf01803b3f36185fb2da0466f973bccbc035c3723c7b SHA512 a78a4445c19ef5fe09810f0ad2f00d072658d2cb82aa985cca995a7a69a52599f38785c43673f5cc36f4bb43e169491f8956682af38fef801b3c7648d6f3add2
 EBUILD openjdk-jre-bin-8.272_p10.ebuild 1802 BLAKE2B 290351a68bb64e3e4d7f48a8c5c2262ac81d6ebd9e48ef24a2248fa8463d0c8e0e303d4becff1f24d63256ee47d9518d69d989fcd5d4c14641606b29a604986e SHA512 90a02c3138c1bd1e55407a1f2a099b65905b67d282d20088b416065e8508e7cc8453b64256b2221aa5cfd55c1504bc7d582cd029a00e595fa42dfc599e200355
 EBUILD openjdk-jre-bin-8.282_p08.ebuild 1803 BLAKE2B 79a0d0b9c88426451bae46b1b39260c0e3b7e5cea9a48a5f27c153dcc9a2427f8814801d015afcec5bbdfc00dfc44f0bab0467055bd5a1e94bedc85a1d84912d SHA512 8b383a4b580eeecc9253e1a45d5f1b2994b15b26ff036b75cd5e277947cfc1934ba1cd9c0bc74aa5da93593074ed245f7ff8c740b4e8d4a8a83f84ab880c8e9f
+EBUILD openjdk-jre-bin-8.292_p10.ebuild 1802 BLAKE2B d7b2300d8b5896e2aaaa17f67bd2b436aba77be2fbd68a0035dc66ee24ee48a220da5e609d2e2185509abc94ec5ba43bda9494bd205e1dc29505704a77551ac2 SHA512 7bb823c6144ec8aa219782cbae8b73a2ae662aa056ce79524cc4efd37a81ff65d3cf9f8364013b78c49419ac53f684ded95c8eb2ef0d1bb8b48c51c07eee6676
 MISC metadata.xml 895 BLAKE2B 894e6ab5eb085e8f732946b64f5685a972919a4e715705420150e758910534a08246e3565521023f8b36d9d7030ec226f72c89483fe407a73d18594cd47b8582 SHA512 407d287db80d5d7d2139d2c0b1d478ab85dab99bb219bce49e8b3d3e6bb4d8c5efdf4a9bdd891e655fd29d70a885639eab755ed7a990b3429e4acf16fad2bc28
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.9_p11.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.11_p9.ebuild
index 94b04394047d..441b2550e44a 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.9_p11.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.11_p9.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit java-vm-2 toolchain-funcs
+inherit java-vm-2
 
 abi_uri() {
 	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
 		)"
 }
 
@@ -15,21 +15,19 @@ MY_PV=${PV/_p/+}
 SLOT=${MY_PV%%[.+]*}
 
 SRC_URI="
-	$(abi_uri arm)
-	$(abi_uri aarch64 arm64)
-	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 amd64)
 "
 
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
+DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-IUSE="alsa cups +gentoo-vm headless-awt selinux source"
+KEYWORDS="~amd64"
+IUSE="alsa cups +gentoo-vm headless-awt selinux"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
+	>net-libs/libnet-1.1
 	>=sys-apps/baselayout-java-0.1.0-r1
 	>=sys-libs/glibc-2.2.5:*
 	sys-libs/zlib
@@ -47,13 +45,7 @@ RDEPEND="
 RESTRICT="preserve-libs splitdebug"
 QA_PREBUILT="*"
 
-S="${WORKDIR}/jdk-${MY_PV}"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
+S="${WORKDIR}/jdk-${MY_PV}-jre"
 
 src_install() {
 	local dest="/opt/${P}"
@@ -74,13 +66,8 @@ src_install() {
 		rm -v lib/lib*{[jx]awt,splashscreen}* || die
 	fi
 
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
 	rm -v lib/security/cacerts || die
-	dosym ../../../../etc/ssl/certs/java/cacerts \
-		"${dest}"/lib/security/cacerts
+	dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
 
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
@@ -98,14 +85,13 @@ pkg_postinst() {
 	java-vm-2_pkg_postinst
 
 	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break"
-		ewarn "many java ebuilds as they are not ready for openjdk-11"
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
+		ewarn "recognised by the system. This will almost certainly break things."
 	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
 		ewarn "will not be recognised by the system. For example, simply calling"
 		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
+		ewarn "fully supports Java 11. This JRE must therefore be invoked using its"
 		ewarn "absolute location under ${EPREFIX}/opt/${P}."
 	fi
 }
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.292_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.292_p10.ebuild
new file mode 100644
index 000000000000..acb70caacff7
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.292_p10.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
+		)"
+}
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
+SLOT="$(ver_cut 1)"
+
+DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
+HOMEPAGE="https://adoptopenjdk.net"
+SRC_URI="
+	$(abi_uri x64 amd64)
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="amd64"
+
+IUSE="alsa cups headless-awt selinux"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>net-libs/libnet-1.1
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk${MY_PV}-jre"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED%/}/${dest#/}"
+
+	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
+
+	# this does not exist on arm64 hence -f
+	rm -fv lib/*/libfreetype.so* || die
+
+	if ! use alsa ; then
+		rm -v lib/*/libjsoundalsa.so* || die
+	fi
+
+	if use headless-awt ; then
+		rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
+			bin/policytool || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym ../../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 16b91c3bf8b0..9e92f62eda11 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,42 +1,57 @@
 AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
 AUX openjdk-8-insantiate-arrayallocator.patch 647 BLAKE2B b2403d842ace7198520a25bf7c2027e6d74b5d418b52321722b21cac866df883d47e53e4f5e040aed55a9cc4bf03b5a62d008a0877add6c649a41f6230d78a38 SHA512 4bf002ec25844f4e55b588d0516e658c548700d3bcae79be74bf75d9cf30cf9cd448767db36935924dd3b07f34d0cf087321cb35abb4943690353d11485ab0de
 AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd65c64469b3a49a520686ff8d884c0b3d5dd9017ff4027d2fc1d78d57f062a4cf8910e0bab3ed444cc SHA512 2c65d1875406deabbfadb798501de15850775a4a049f073cdfda684ca1bff4b531b93596ee91a7caf77ff6c377457093f72c7bde4b995bce9ffbc4a8fcceb6dd
-DIST openjdk-11.0.10_p9.tar.bz2 95141294 BLAKE2B f35cd0392b433210eb06b023bd92a168e17363635e27addcdcf1f1f9de7091a9f447a15b0fbbd1b0e3425377cb770de8dedf31c3a1cb1d7ecfc944175be4464d SHA512 755d6b9789ddca274fefa1762a68892ec0597e581d16fa2a26cfce0e5c10232c73706f3beb99fcaf99e80a051d0db7365e3c5402e952c2dec4405626ac2a4ef7
-DIST openjdk-11.0.9_p11.tar.bz2 91638327 BLAKE2B a04b7fb5ebde3b6c024e5f3931a2efe796e08ad66c0190cddfa4268d5181f46f24685d9d51ae328547916e8ece723967bf653feeac87347ee14ecbe213ad657a SHA512 a0a6726d5adbe95904b78d8b4319bc4386c594a563f80f63d59072cf72d00928b451163b91258b44193a80851400ce8b8d142fecfd2bd902ff7a5e47cb4a9976
+DIST openjdk-11.0.11_p9.tar.bz2 95298760 BLAKE2B 7572d297fecffa9d38998c79dda00ea9361c1cf2f6c8bf51bac782da17cd3b6b272d08ab57fff96d523a1299f5514cb3788d05eeb37ef467ee7ad8bbb156d98e SHA512 72deecf32b793fa331deb6a1c0294b1efc68b72af9aebc1ba0528189e0097ff6d226cd0c3947d3cdc35c3cf28b3450cc538d375be0b9d43dca379f244894d20e
 DIST openjdk-8.272_p10.tar.bz2 457222 BLAKE2B 51e487d36c1922c5fc04d8922f1000a776e4872142517933ef5e8d5fd825f221fa02325bd755bf3f48f7f3221a2da3ca182301fb303675cb7d712d7b2f1c7751 SHA512 488b7fa0ed725936d483efd54242dbf4409752c685f29277023fb47c4375b5700b34e743d819d7d7c2406a2f8845d1c3d4fc548c156b6c7c30e43574c1b51527
 DIST openjdk-8.282_p08.tar.bz2 457358 BLAKE2B 4451b2de340136ceb152615a32e33a3db60ff0f000d00e758d992f549af0110c4f64e3724abdd6ca7d679862e927557d475a2a36e923f0c3c5dd48fcb81b9b45 SHA512 40ccce0a25da6a6eef5cadfc0d6b208d0243ccd1fbc2a7aaef4c627802144122dbda96677c2d3ba45e05c5ac123a058ed37f59b8f035f0afcf34e832d50e8c35
+DIST openjdk-8.292_p10.tar.bz2 457861 BLAKE2B 043c1d6f7d040dedaadd05091ce4fdf3f516c1cd241e3603c81f2c49fd81df9c4f1082822a5471255381d56f3ab838a24e499b4ec647f3354ee051078c496b2c SHA512 6e1ac380db32fa5f1decc80291dcdb5e1d3d9afb0dc4587966c5a1b840588a984bc07109c23cb0c69c60509c6db8152e7306509280063f7d2e853aed41e391cc
 DIST openjdk-aarch64-shenandoah-8.272_p10.tar.bz2 462755 BLAKE2B abeabf704d2135da9df6746545209f5a658ec547be5852041bb9bd1dfc4546cef143541df61b4705b6d2181ae7ec91a8c64e2b27347c24d146da49bbf8c228ef SHA512 7cae0cf80e09e1d2ad3eef8bf6740942788d0af4d3c9821bb0785ea42d4b38319d0ec57a8d21add25a40eebdc5ecba8234c9f04e6922e87c80480f71b04e2e3d
 DIST openjdk-aarch64-shenandoah-8.282_p08.tar.bz2 463565 BLAKE2B dfdcadb0fc914fd9dbe61b20cc94c4298dce7f1875073a545a3e9ec043914514be54e9934465df4ec827881c35e10dc0ae4b21778a991ab42a1709a36b2cb49e SHA512 3e430c93726a12f60eeb27b1693c0c61fedabf0f19512df4b14732565b910a660bd9e776651caf7c0154ad93e0c90ac26aae1d5155a35ed29dda0cd601070d6a
+DIST openjdk-aarch64-shenandoah-8.292_p10.tar.bz2 464164 BLAKE2B 3f50f20517ef7b4599f9062330b3bc86900c137751e65d3047d165ad153032447b5f9c88e0d390c0ed758ad10d818295ce2cde04150da5036dd6b05fa26c2745 SHA512 074e9ea2fe83f4edb4d0de72f0d1a9c9091c28707c17b08ffab11cad2620790e740bfe53cef41a07d04b31cc32c1388e52e09eb07ca0b9929300d611c514619e
 DIST openjdk-aarch64-shenandoah-corba-8.272_p10.tar.bz2 1052989 BLAKE2B 8d6f79758ccf1719396fb56fd47c258c2440beea79516025b4911027a59b6cf4b5826c5eb01ba3a4c45847915531989c74665cbedf6349541df38732e7b828de SHA512 12547c8b5f1fe4efcc58f5b148977d519c954b964e814fc3fce717bd6d6221c2e7eda98a0e1e8157ed2f509f3b89e1e7b529da81cd1ee768daf4ad6369c57e8b
 DIST openjdk-aarch64-shenandoah-corba-8.282_p08.tar.bz2 1051633 BLAKE2B 0f4ea71b4bfcb87f7305876065bee4184939e09c5d2b38728f28e1e6407d850a70de1840d10f5c98a6d4709403838a42cd3f104a6a38c1a32f65ac127cc3271a SHA512 dd4e31baf81ed286b45ab2ac0a96f23306fb51b8d387ce6a846c7e1134ca45811fbe1842379bd54f486c97df8cc76a674941f4fe07ce5e5bc1ce3e8c85c9c782
+DIST openjdk-aarch64-shenandoah-corba-8.292_p10.tar.bz2 1052188 BLAKE2B b4acda6a4d97cdfb4cfe16e1442dac6989af5fec82143dabb914ee31632b5421bc091708b06e37f95d552b21dbf24ed681b026635e96d32f05ac7d964eb53ac0 SHA512 9f4cfdf8a2580414f90ce0b128fd2ebbeb46977994605d3182ee5033be92898f3b292bafe6c0ca3a0fc767c03de598c93e25cbbc06726383b35961d40c601cee
 DIST openjdk-aarch64-shenandoah-hotspot-8.272_p10.tar.bz2 8767088 BLAKE2B 85b2dcbd696c58db72a7aeb4dc9a4752d742ed90bfd2e06ce5ddd8ed4ec5c63ab2de40a41aab5747fa120d8865c1d57f02a99b27a6ebf7c68c0891e19f5a7f27 SHA512 7866495487b271228f1a2d95cecfa6b76bb912d8c1c63d3d92e7b2cda88dd151b3b6c4c3bc717e37a0bd972762620ae7fb456c1aee281772a145a1dd1b11758b
 DIST openjdk-aarch64-shenandoah-hotspot-8.282_p08.tar.bz2 8771899 BLAKE2B 436b57d6c405fa43a08f36221175e86d0cac7880cff964216f627c62e6fc59795906624241d3e73909dc633ff40176ed4560fd6d8f98eb2d7987fed99bb935a1 SHA512 d99b034288a857250d5054f1d2342f79f75efa400c9776fe75a139cd94faddf7abe407dca80a776cef975ab3608168f6d21b31c8a0602b302be3d600b24c9fd3
+DIST openjdk-aarch64-shenandoah-hotspot-8.292_p10.tar.bz2 8787501 BLAKE2B 628c84ad165e82b782a66c159ea2bfc2e739eafa41981d353272911bce3338b8eedeb204bf5c8238270ef22259c215301dbf30bcbcc366bbb1c1ed05c6bcf0fc SHA512 50a97c8bbf225c7b2dae50d398eb17831ad761fafb210a481942101bac54164604c76353ca4f0ec7c3a601039eb80164afdfc62f509c0b87e9c948970c0e6140
 DIST openjdk-aarch64-shenandoah-jaxp-8.272_p10.tar.bz2 2718084 BLAKE2B 1e6cc999d84a49c03731a2a2ca73dfe684940509a64199ad52571ef51b3da035e41b41bf262ea88af9f77418c7b1b5721724d86f67a5f737e53eaf3673f4eab8 SHA512 a73e5a4628c936cf9b19082ad49ed2134984d15a1165c45206c74dff45118c50922fd0a668efe93a46c3839775ec567d56eee19cd0e3a9f90e7995d1b6a42f11
 DIST openjdk-aarch64-shenandoah-jaxp-8.282_p08.tar.bz2 2726328 BLAKE2B 27325d12954e94baaed304fd7b4782a0028e71352b2357ed0710df5e61b0ba7b9d26110cc8424b85d987f723c2ee46b04ff03d0445ca7e654e480d0328e8546b SHA512 5e66838889f3e22ceb11ef6dbd7a20f9f090c51526440c2e54b9b2d733a7e10da47c36df1dbc0b33ea38fb324f1f32475f0448a24feb9aede211be92f4d72057
+DIST openjdk-aarch64-shenandoah-jaxp-8.292_p10.tar.bz2 2726660 BLAKE2B dc720b115212084ab59a4af6b257b485592a84e630650445ed3bdc0c471d529bdc8a1f2b73c5e38fbdd65ff1c221309e814adbba851c59279c8b3740b4560d90 SHA512 43c0e6327c3f7ff2d6320e7d1504f1575c0993c53a207dcabc75a0e1785fcca2aac7f78856db374198e3e95bce4bb05520a9a4e94f2ec03446b28f4d65cd69b6
 DIST openjdk-aarch64-shenandoah-jaxws-8.272_p10.tar.bz2 2558262 BLAKE2B 3b00ca162f3b758ee65090011551f074f7675f499f179ae0d4c8c62b1d70c942d7d2082d48e84cece6cd2be7ea319c1707fc6239e82fd5e79297f796838688e4 SHA512 d64a15cf35df014c4dca2edddea2015905bafe252d3d2bdfd1bc8f72683ac827e5d0347e36d5d94cda354b31a6b0782017b1cea6571443e073caf9f26c7bebda
 DIST openjdk-aarch64-shenandoah-jaxws-8.282_p08.tar.bz2 2559051 BLAKE2B cf808ef4d6aa5e5bb699fde4cd36ce9032f9d5c14b7151279170a3a1556fcb56ded67d03865b2d093950f0f64c638b41d0cebb873d2a7e8563e711249e64484b SHA512 09b01fa9c967aa771f2d14b4613a5b5d26c396b47c7726b707bb87f0c1ddae406a400c3ee9a93caec3ec8d41deab030ffca101f64865d8ecba3325f9cacd0ef5
+DIST openjdk-aarch64-shenandoah-jaxws-8.292_p10.tar.bz2 2560138 BLAKE2B 6e40ca6fd363c6ef9500b6b40c7f6c836b496899d289d0626f0e52412924498eb6b000291b58af8d42b9bc7dcc2beb1374ef6b8ea18d483841568d3848230842 SHA512 0ffbe33f375f18679797a7e724b621015650a6a9374ff231814f8e8ad0eafe42f281f76a83e87e234604c266ccbc15bd6e84692c3d7e272e702be316ce0048b2
 DIST openjdk-aarch64-shenandoah-jdk-8.272_p10.tar.bz2 48370921 BLAKE2B 98026a28463ce3f520feab2b146830bf91acdccac5aa28488ffdbe4328b9a2cbbc17e95eeb36a60364cab470eeb26efcfa06a588e1bebcb6e978821459536feb SHA512 1bc5baa799282a2d7c0014d2cf55b350c7d99dbd129643d2cfeadebd467b2f6f9a8b8a97d34f66c656103db3ee3d5a57d6ff57dc45bc655258dd5093506d89b5
 DIST openjdk-aarch64-shenandoah-jdk-8.282_p08.tar.bz2 48636508 BLAKE2B cd2b5e1b3a10eab1fd869dd707c8c7f3970bec3559f6699f9b68b2715a279e1c5d4ee37a172e62ab32abe5608813d72e9bac91fe5670f6596dfa8debabd26cc3 SHA512 70c2e327f602249e3472a8b0ed2391ab7ea08cddab28ad3f04bbccec76bfa7f749f7b1ac1eac7440da9723f824f4d564e6f19db3520260875137b7f95798afde
+DIST openjdk-aarch64-shenandoah-jdk-8.292_p10.tar.bz2 48705934 BLAKE2B ab8995ef30267d635f670791417124ce63435f4cde095c057e4b506cbc23b879bf308986ea0960392836acd46aa6fd7be9a09fea011a85c981388ad58a876f0a SHA512 7f76a8e81cf759989657101a4b71ae0e896273571e5d61790100e412dc1c211118251b6f068da3764ff1059635f98079d88c6cdddf04f676c5db3a665d3d9d8b
 DIST openjdk-aarch64-shenandoah-langtools-8.272_p10.tar.bz2 2397200 BLAKE2B 1d985e852f07ab69e0af01a17cc3874cf903b1e3e2c4a909b7403087b3243beaf57a1e9b7792b52469a80764c7db614e3bb6ec4b43527d022219f3e79af21457 SHA512 76118b6c56481bcd3a6a709006d0d114faeef2b2a3c353e4a5ef2af5f03429dddd78d2d5951e9245fb5e41443e871e43634921825c0dbae8907f3f49fb3dea0c
 DIST openjdk-aarch64-shenandoah-langtools-8.282_p08.tar.bz2 2400152 BLAKE2B d1f5752bab7a2bd01f220796e24bec018a44ed69bc10d4c0b8deab28c3ae18eb573b71ad7d48ac2219fde0c23170a593b050f53d87e6bfc8dacd323c25c76468 SHA512 48e861ba9d98f3c48d6f70ea13aa34e0cbb25272a5bdf20fe5f9e6daf1a2d2a4b754816bd1be1d1c251bb56849487ac494582e2eb94c8c04eecf60aea4b8a6e7
+DIST openjdk-aarch64-shenandoah-langtools-8.292_p10.tar.bz2 2402059 BLAKE2B 707654793fa26f2a992c2ded6130d5710efac6a91661914bde150a91720fcf08a54931fcd1a56fbc31dc1a61a5216b61e3871d963a2b03803ae8cbcfa8b095ab SHA512 6dc82a18edeb5390d078a3113d2f7c7510737b9a9761b1a714d855d36afe4530b41a6e980af0bb090b31e8f95f67e097190d656d265c8518f3971526ee5e4001
 DIST openjdk-aarch64-shenandoah-nashorn-jdk8.272_p10.tar.bz2 2838876 BLAKE2B 40d011a11122b2dd19349282468c756a58afbc1ff2a33424d6c4e82cde1f664e3317eb1616533b0d2bc24604c68ffd0b1b92d3271dd633f3a39aad22c84ca781 SHA512 1f50c2c1a6a5d271d63906cb1cf3e87d7b6fe61e92c90cf2974ec40e956be0e8388c2694d189c85ec7072abfd21566671498b8652c2ae9cb2021c6ec4d548f66
 DIST openjdk-aarch64-shenandoah-nashorn-jdk8.282_p08.tar.bz2 2839986 BLAKE2B 9c42469bab74ef6c36702499017b7ae3f98fb86f04b7336659d6f1fbe132a8513de5308c0c2bb4065063f05a8c0fe2acb81d2b2daf0610ac58cc309879475d57 SHA512 424b764e0b9360df972305a1df8b7655fe69697c69250beeebd1e719e42bc94681d21331c92b47e3d38a9650bbe7cd39311230c3eda2aac090f3a83e0ad04acc
+DIST openjdk-aarch64-shenandoah-nashorn-jdk8.292_p10.tar.bz2 2841484 BLAKE2B 4d95d38c6af366fa4be8e9ad2d3cf09d6ad1ac05d25ca94d15200a051cdfcc67af666420a5487f0b2782040dc3483475bf2515b0b5d40e520f162e78f768d5c5 SHA512 523e1292169a6a791c2b90672295cd3210a09b8c973cc038e9ebda7e89afc0339568a993909eb108985998060ccdd13601a9bd9a8e4890ac606febf07578a887
 DIST openjdk-corba-8.272_p10.tar.bz2 1033649 BLAKE2B db9d72dabe4b1727dbbe1de01e46f62676c48668e7ec960e10643c19374a2553dee3c2b5b576f85d09b541b570756b20980e1307fc614e4b4bee9789affc650e SHA512 1426b3ce6983429fe6399da77fb102fb5d54ebf65ab83ad4e3c0ee789e33e2a0afc1bbfb7b8f942334ff9b03be0696494919c374ce1b793b179ecc43e2c4384a
 DIST openjdk-corba-8.282_p08.tar.bz2 1034749 BLAKE2B 394e1d6fcccf1e512a0c241c4053ebf1da7df65e3d05d75c243c184ac6990b61fe9e55596513baf291d2dcc99d01d7ba94f31247d617b1cd316dfcdc8ecc663e SHA512 aa0eea3f1efb4c4da8d03b902cf5cdbbe475365427a96ff74bbac21af4c2f4eff1fa8b05a0f4b1cfb64385860aa963e53736e4a3ff314cec2e141524f3001613
+DIST openjdk-corba-8.292_p10.tar.bz2 1033217 BLAKE2B f6ac60ad0aab0c1ca149fdf2b26648d38ab083ee6fa36b2f82aca19e79037ac7166c43f91c193493923ea4dabd57de3bcccd75a73aeb6439c1d464729afa957b SHA512 7bbc2b61421a81ca2f0e1080bf5c3bd065f737c0dbc822f123875f2675515b947b4f8efbf0ddb3b8d887b90ab5c646fbb12ae35607ff295d9ca489737ff4fac9
 DIST openjdk-hotspot-8.272_p10.tar.bz2 8206390 BLAKE2B 6822635a29f919696c7a260bf7db20a749ec8598e6c751a8a5e3973c780c17f3ff16a1ed64eb44353be72136fd1ea945dc6620f18d0d876a5773c897bca8705f SHA512 48444d86bacaef503303fb160dca538546e74f7bd71fd34fc2b9faa4e0b1cf7710a6262e9ead161c1b0e8e02e8f96e56a6407d442bbfb01ff8ab835cd840d834
 DIST openjdk-hotspot-8.282_p08.tar.bz2 8207755 BLAKE2B 1cf5e81275199a6659aca8ee29092131572797dcf71d2ea9fa61bcc00d8ba7c056ae96787aa684fc6f9d68cd1d628ab2d2fd4a9837a6750b91d5c008d9860139 SHA512 c2f2a62348aacfc022ade44d7b1bf733723ccd0f2388153ba595cfecb38a1c3abca3349ac2388274830614ca17c428981beb6c5cf2efbd1eb95d3a2be277776b
+DIST openjdk-hotspot-8.292_p10.tar.bz2 8558678 BLAKE2B 02aaa0cef73dc7aa7e9db426fb021d00f25321426438365f672e0fcbec476826d62c92d897b520f0162ab63f2bf72ecdbf6d8e8a7241d455900d427aafa22bb8 SHA512 ae1e174fad6c41f30593abb4c0be17752d6f7de0fa0a1b83c383cb7cd0848e462ca88feb391c9a8427e167c06e6c3d01230fb769f711dcfddd007f8e43d4c481
 DIST openjdk-jaxp-8.272_p10.tar.bz2 2692905 BLAKE2B e8fa9e6a7fd4c4ebeba82a3c55b17e4eba9cb03660baa8d478a8cfced1ab9673465faa1a0f690ebbe2634b2cf2741d7321f2c20c748339237eba7b772a2cea14 SHA512 15efb3db0dc28fd375d769037f248b3527e40d2c190fed57ca1d6a09e59aa79465c0e6516d2a122f6c7ee55f7cfeadaa76669884f74fa34b11ccfdfd76e71f6d
 DIST openjdk-jaxp-8.282_p08.tar.bz2 2682951 BLAKE2B 91c50452d450bb748d42b2e5e556aa9f7356aa66554ac45766e7a573cda901bda038acd984587cc150990cd2b8a02e7069d0fdd5d5ed44fbb433f4b45338efaa SHA512 ab17c2be397505a944d3b2d8090fa9b7c3db97f5b301fe8a485956318d6acfe065447959cfb7261e58e8506c25da7c0a7bef6075082ad6c89c52463284d1d227
+DIST openjdk-jaxp-8.292_p10.tar.bz2 2684063 BLAKE2B 7130d33afb81d83f0ec3afb5e6e161c318e7c6b36189dd7f88410a7edc07a17ebe2d5c15c5991b31d180d4d1c70c683953a9cfcac1c3eded64a4ab679d4a0366 SHA512 92a15a693440cda28aebe9033675aadcbc099a913f9148b26eae90004d54b246152b326e0005b3da6178286ee21f71f12ecd2f395c09b6707679239506154849
 DIST openjdk-jaxws-8.272_p10.tar.bz2 2543199 BLAKE2B 3deae4cef17a5f3d513c1a748a72b50bacb3a0d9b6fb33e5ded121f4d209cc2eb2d59d7b7c182015811426e49eb3e2b463279fa201992c51a5c4a94a184931c9 SHA512 51c0ee76a7e0587ac9c2533d62717f24224ec8bc643df6af2e2fac89cd79cc4f228c7c57427e43f354a594568d16bb5bbf3295af9ce52717339c35b56d6c375a
 DIST openjdk-jaxws-8.282_p08.tar.bz2 2543297 BLAKE2B 69db522a4bd508ad6d15fd0272bcc29a84ad3829fa4496501f8351cad3acfaae24a440dd3c98638b7807cc8270f0eadbe8aec44700a5386cb0a75f240b475607 SHA512 d17163f42dc617187376962e9a99fecb6b71c3119a84bb0d57d43a09eabc090dc9e120ad4546b7b7b03ba832c54fa148f6751053d6eede69f7ac804c3fb78792
+DIST openjdk-jaxws-8.292_p10.tar.bz2 2543680 BLAKE2B f39b7e939de9ba19f9ff53d2748e2fee7acc82bd4d85a4d8e1f49e3b0919daa03c4996e63a46e908da966dbebbf7051955104b291178f9b059d60e8208dce51c SHA512 5106a28819da3708f8a71e4595cb0191099a7d2e06b7190981beea6af504681927be6c07ebcbe77340735bb22c365e1cf001709311c0a57940247d9584a0ee48
 DIST openjdk-jdk-8.272_p10.tar.bz2 48273590 BLAKE2B 80717a644df7d9741e5786708c816483f4fea1cfeb02438df17fb4183c0702fe6e3fcbeaefcee84a4f847d5cbafb0a9e80af63b56cf0c6381e0fbeb535d2f147 SHA512 85d20763f6cda66f2eac3b2a1e672e6b828c437386575d16a1c70b27a56c718fc0f44c712e6261eb89f6dd273fd2c21a2c4baa3f562cafa2911a5e2467d7ba13
 DIST openjdk-jdk-8.282_p08.tar.bz2 48584190 BLAKE2B 6c5949abe6a18c4f633f2ef5c3e93db8421845f4578f6ddc783fe0af581b2df0ec6e7c833716c4b181547c289f9cb74b0b6b96893c45120a13061a45a70fbda3 SHA512 99adf9270f132e4a59c466b56069598058ffd4b41c7b0698ba8362e92d4b9529fbc9a166b5ae70d518b1c56eba80e4d5e51efef82df919df63bde42e8e6df296
+DIST openjdk-jdk-8.292_p10.tar.bz2 48746031 BLAKE2B a54a832a305b87cbd4ceda4eb5bcea07e2a3d4b9f5648f21f52b4e29cf6053b830f876591a0c2c1a6447473354bfcf79d70c260c7bb24505743bd3ba67ba2568 SHA512 c10a64086e0fd63f2ecab884b7baa88c3dcdaad83f2240d7fe3d590913af252a57c9d735268acb1e75bda2883c4c41d47f405db0c15f82d833d33d08c824b9d6
 DIST openjdk-langtools-8.272_p10.tar.bz2 2399755 BLAKE2B 34ffa30993fa9f42ed2fa96ae658c3c43ecbc54750c3b854cc90efdbd3c4d5abdda012d55c4e81d4ab805d9184b5ea7429fba5927bf3192fcce2a17d9ef11744 SHA512 54698e8a74119f39971024ee165707fa9e27cd0008b59801f05a194362d723ba67269b1f34c181e2a0b1ce9cd36f52cf3ad3ad980c4670f7cfa476a0fa78fec8
 DIST openjdk-langtools-8.282_p08.tar.bz2 2399247 BLAKE2B 5f2fe1eb3422053df33ce3df2ce99c6334d9867098485e90e08cc84d8df81399efd8c8169b9665b42df84048bfcdd964643861d93bc27c3be67e7a732704b5ef SHA512 9b29e6bfd6e12dc810a5e5339a92410b0f6fbf20e4f0e727da25f954ec8d3dfccc4f7decf285a7f8b1e6710971ae363c0ee1f8d2738dc54b57989699300dfe59
+DIST openjdk-langtools-8.292_p10.tar.bz2 2401270 BLAKE2B b4043862df04e9f0056d420116e47f4f1515d1e935bfb6830a67a9de3894c94a6289a7952153bef971369cdbdf2374154cd4895950fe49f8a21af5e3316dfa8a SHA512 ba66be7f37ca8268d1dd0b8d4e68c90ae19f815ac3b64aa1f1abf02a722a09ec46c7605d5124ac960bd44335b053da12b36d4b0562b3675ac503fd838d4924d7
 DIST openjdk-nashorn-8.272_p10.tar.bz2 2850055 BLAKE2B 2348c0f45916101d9fcb4aaa283d2c03be5b28decf12248ec930b9d726e346d0884dd64a22627e2f2fd8260c8755d0bc46a1cf6fecf691a30a7f4b54f6a293a9 SHA512 754fcdca5e0ce523d73cbdfbdcaaa13677ed8c2b72c5ae04ff1cc77fd73469f3366e51add68b13bac3c43800fecfcbb93bf4fcf7469258c4adc57e414b105ef5
 DIST openjdk-nashorn-8.282_p08.tar.bz2 2850710 BLAKE2B c3a4eab94946d43e4b1f3b78d16c016dfd3e84addc7be79a70a083266f2e87948a2b704ce2131c4603739828d613a9f91374af9ae5c915bbb9a0771115016321 SHA512 f46a17dd811276c381ab3af333a901a18fe10ea67f487dcb7c7696c0b3c6247569ebbd1a438cfb056d4e42a6f4e509fb8c21e3b1bfad675a743dbf404f298464
-EBUILD openjdk-11.0.10_p9.ebuild 7720 BLAKE2B 93d375856956a1552900a5e4ac4c3e5468018e846e005c1e576a73676ef4879973e2e493cc1747a1ff2e71cf7871a520e84cb1841514198754602a52ec300143 SHA512 e21e1f17e29c5ce7a23a61db9878b50637727d16593ff554db7a29545e1235eb1769a9f88ea78169f2ea5c932a97e0607f873fb213a950d1cb015e4db635d81c
-EBUILD openjdk-11.0.9_p11.ebuild 7720 BLAKE2B 93d375856956a1552900a5e4ac4c3e5468018e846e005c1e576a73676ef4879973e2e493cc1747a1ff2e71cf7871a520e84cb1841514198754602a52ec300143 SHA512 e21e1f17e29c5ce7a23a61db9878b50637727d16593ff554db7a29545e1235eb1769a9f88ea78169f2ea5c932a97e0607f873fb213a950d1cb015e4db635d81c
-EBUILD openjdk-8.272_p10.ebuild 7220 BLAKE2B e422f75f627b71053f241c4cb5ef7e1fe80cfd6bdadb2771d1f9058bd3ba8778d5e9758e1f39c26f2d818b56e626e1353ce6524aba7de51e131f3ada77499bb6 SHA512 39c9dc46a39e4aefaa2f80a061df046cd4ac74c792a771e229aea63b0c3a7b755d090c4b35b8e6aeb22999abcd137aea444373afeb88a8d18761bb810d88a030
-EBUILD openjdk-8.282_p08-r1.ebuild 7293 BLAKE2B 7278d1823ca30603c539a75a86ab34e5919db8078327f4c88f097c9941a65c12707f9b3a986b268561ca9261c33a5624df73b51a9d32b0f039503edf46031ee8 SHA512 21f5fd611bca7b116754276b09469557b840076b06601ebf85809ceb79ca6ac014d2ab90e733f8aa27bca292c4dfaba0bb31a0bf2b9766e404d01b25de101460
+DIST openjdk-nashorn-8.292_p10.tar.bz2 2849397 BLAKE2B d875dea02ec8a3a3cba49f173f42ad7d73d15492cb86a15b095063ad327655ab9c260571c8a8ed35daf4078d52eb24d58b04125d3cea148bbc9e3fe924375c45 SHA512 4b707059bc6b217bdae2d9ea685c18b9cc3759180d5dcb5e51ad4eb00e6e660ca6181a68427f1e53c81b9636a323c1229e19de35b51e14a5d599cb64412ae11f
+EBUILD openjdk-11.0.11_p9-r1.ebuild 7795 BLAKE2B 302d1b466151f220899fa03e0a1da8a25c399499a9594264b474d0fac46557fe3327d5977fd2167bbcc899edc7dd924237fa99d243b29cf578f2d8725e615802 SHA512 f286fc0657a2a43405ce040829fb0c196ed8ecbc6affe833484bcd0091a4e645cd1e1d492d466ff58b5dcbe19f832f3529cbcd8d481e80daaa133aee42c4ea85
+EBUILD openjdk-8.272_p10.ebuild 7239 BLAKE2B e1543b8b5f1a15ead1feb98a03cde07657734ec0fcd33066d425d7f704ddb906ca5ffd99e3c14fdde4bae7924552616ee7fea0c189a935d5b71a8903afdd445b SHA512 f59a740c3acec9a47e13dfa1be11ad14a14f24576313add1fb9092bf0bf9cc2f55be0e17c2ead9004f154b3fa4f5bd7c717bfc93baaa052203e12f7fb9d59bbf
+EBUILD openjdk-8.282_p08-r1.ebuild 7312 BLAKE2B c2771e19437b22e234a5be8deec7642688f377bc66d67a81cfb0911addf16c7a71560966ac5321268876244525ac47a6f136224136772b3d88272eb135dbaa56 SHA512 abf540f2160c45add83e8e64dc9c9d7605ee6e46ee879c16664bcb9008e6bd5deae0a5352c3bfb6b3bc5e9bd9f1f0cc9cd43235b10757cad839f3d9a48df9552
+EBUILD openjdk-8.292_p10.ebuild 7310 BLAKE2B ddaf356f767b609865dca4d1d77886f9f825ea659c813f82cbc669aab8f6dd7617fe9657347593abc8fc67eba921b7aa7596f65513516812e90638eb17307066 SHA512 6bd4f0bdd41bbe8c3c198284abc61814c9895a956094138d813ce9644423d229c37d7f3b3e675f8fa81791364a8575983a504f744bad1b55624b50d388a04acf
 MISC metadata.xml 1432 BLAKE2B 36a11642c99127a5f97fc0b095a142705c6b4e077ed24604f1886e4d1beaa47b4fa30359600797d5e6a085befd11a2851196fe97a75a0f0907461679946b4cbf SHA512 ecc66015da3a0fc616b91dd5aaffb5b050c9f66e936cad02ec12fb56dd7c6b3b3c331d8856402c0deee16c415ea083e088cce7414703f9d659f551883b055ff0
diff --git a/dev-java/openjdk/openjdk-11.0.10_p9.ebuild b/dev-java/openjdk/openjdk-11.0.11_p9-r1.ebuild
index ca908bb4c188..e6cf8c5cdf7b 100644
--- a/dev-java/openjdk/openjdk-11.0.10_p9.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.11_p9-r1.ebuild
@@ -22,6 +22,7 @@ IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pc
 COMMON_DEPEND="
 	media-libs/freetype:2=
 	media-libs/giflib:0/7
+	media-libs/harfbuzz:=
 	media-libs/libpng:0=
 	media-libs/lcms:2=
 	sys-libs/zlib
@@ -152,7 +153,9 @@ src_configure() {
 		--with-extra-cflags="${CFLAGS}"
 		--with-extra-cxxflags="${CXXFLAGS}"
 		--with-extra-ldflags="${LDFLAGS}"
+		--with-freetype=system
 		--with-giflib=system
+		--with-harfbuzz=system
 		--with-lcms=system
 		--with-libjpeg=system
 		--with-libpng=system
@@ -172,7 +175,7 @@ src_configure() {
 	)
 
 	if use javafx; then
-		local zip="${EROOT%/}/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
diff --git a/dev-java/openjdk/openjdk-11.0.9_p11.ebuild b/dev-java/openjdk/openjdk-11.0.9_p11.ebuild
deleted file mode 100644
index ca908bb4c188..000000000000
--- a/dev-java/openjdk/openjdk-11.0.9_p11.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
-
-# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
-# set build version properly
-MY_PV="${PV%_p*}-ga"
-SLOT="${MY_PV%%[.+]*}"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-
-IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	media-libs/libpng:0=
-	media-libs/lcms:2=
-	sys-libs/zlib
-	virtual/jpeg:0=
-	systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	javafx? ( dev-java/openjfx:${SLOT}= )
-	|| (
-		dev-java/openjdk-bin:${SLOT}
-		dev-java/openjdk:${SLOT}
-	)
-"
-
-REQUIRED_USE="javafx? ( alsa !headless-awt )"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
-		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
-	else
-		if [[ ${MERGE_TYPE} != "binary" ]]; then
-			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
-			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-			JDK_HOME=${JDK_HOME#*/}
-			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
-			export JDK_HOME
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	chmod +x configure || die
-}
-
-src_configure() {
-	# Work around stack alignment issue, bug #647954. in case we ever have x86
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Work around -fno-common ( GCC10 default ), bug #713180
-	append-flags -fcommon
-
-	# Enabling full docs appears to break doc building. If not
-	# explicitly disabled, the flag will get auto-enabled if pandoc and
-	# graphviz are detected. pandoc has loads of dependencies anyway.
-
-	local myconf=(
-		--disable-ccache
-		--enable-full-docs=no
-		--with-boot-jdk="${JDK_HOME}"
-		--with-extra-cflags="${CFLAGS}"
-		--with-extra-cxxflags="${CXXFLAGS}"
-		--with-extra-ldflags="${LDFLAGS}"
-		--with-giflib=system
-		--with-lcms=system
-		--with-libjpeg=system
-		--with-libpng=system
-		--with-native-debug-symbols=$(usex debug internal none)
-		--with-vendor-name="Gentoo"
-		--with-vendor-url="https://gentoo.org"
-		--with-vendor-bug-url="https://bugs.gentoo.org"
-		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-		--with-vendor-version-string="${PVR}"
-		--with-version-pre=""
-		--with-version-string="${PV%_p*}"
-		--with-version-build="${PV#*_p}"
-		--with-zlib=system
-		--enable-dtrace=$(usex systemtap yes no)
-		--enable-headless-only=$(usex headless-awt yes no)
-		$(tc-is-clang && echo "--with-toolchain-type=clang")
-	)
-
-	if use javafx; then
-		local zip="${EROOT%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
-		if [[ -r ${zip} ]]; then
-			myconf+=( --with-import-modules="${zip}" )
-		else
-			die "${zip} not found or not readable"
-		fi
-	fi
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		myconf+=( --enable-precompiled-headers )
-	else
-		myconf+=( --disable-precompiled-headers )
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images product-images)
-	)
-	emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}${dest#/}"
-
-	cd "${S}"/build/*-release/images/jdk || die
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	# must be done before running itself
-	java-vm_set-pax-markings "${ddest}"
-
-	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
-	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${S}"/build/*-release/images/docs/*
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break"
-		ewarn "many java ebuilds as they are not ready for openjdk-11"
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
-	fi
-}
diff --git a/dev-java/openjdk/openjdk-8.272_p10.ebuild b/dev-java/openjdk/openjdk-8.272_p10.ebuild
index 4e2309327cdd..73cd8367b504 100644
--- a/dev-java/openjdk/openjdk-8.272_p10.ebuild
+++ b/dev-java/openjdk/openjdk-8.272_p10.ebuild
@@ -74,6 +74,7 @@ DEPEND="
 	app-arch/zip
 	media-libs/alsa-lib
 	net-print/cups
+	virtual/pkgconfig
 	x11-base/xorg-proto
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/dev-java/openjdk/openjdk-8.282_p08-r1.ebuild b/dev-java/openjdk/openjdk-8.282_p08-r1.ebuild
index 88eb48ba9b1d..94a4e170e54b 100644
--- a/dev-java/openjdk/openjdk-8.282_p08-r1.ebuild
+++ b/dev-java/openjdk/openjdk-8.282_p08-r1.ebuild
@@ -74,6 +74,7 @@ DEPEND="
 	app-arch/zip
 	media-libs/alsa-lib
 	net-print/cups
+	virtual/pkgconfig
 	x11-base/xorg-proto
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/dev-java/openjdk/openjdk-8.292_p10.ebuild b/dev-java/openjdk/openjdk-8.292_p10.ebuild
new file mode 100644
index 000000000000..973bab562b1b
--- /dev/null
+++ b/dev-java/openjdk/openjdk-8.292_p10.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
+
+# we need latest -ga tag from hg, but want to keep build number as well
+# as _p component of the gentoo version string.
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)
+MY_PN_AARCH64="${PN}-aarch64-shenandoah"
+MY_PV_AARCH64="$(ver_rs 1 'u' 2 '-' ${PV/_p/-b})"
+MY_P_AARCH64="${MY_PN_AARCH64/#${PN}-}-jdk${MY_PV_AARCH64}"
+
+BASE_URI="https://hg.${PN}.java.net/jdk8u/jdk8u"
+AARCH64_URI="https://hg.${PN}.java.net/aarch64-port/jdk8u-shenandoah"
+
+DESCRIPTION="Open source implementation of the Java programming language"
+HOMEPAGE="https://openjdk.java.net"
+SRC_URI="
+	!arm64? (
+		${BASE_URI}/archive/jdk${MY_PV}.tar.bz2 -> ${P}.tar.bz2
+		${BASE_URI}/corba/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-corba-${PV}.tar.bz2
+		${BASE_URI}/hotspot/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-hotspot-${PV}.tar.bz2
+		${BASE_URI}/jaxp/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxp-${PV}.tar.bz2
+		${BASE_URI}/jaxws/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxws-${PV}.tar.bz2
+		${BASE_URI}/jdk/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jdk-${PV}.tar.bz2
+		${BASE_URI}/langtools/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-langtools-${PV}.tar.bz2
+		${BASE_URI}/nashorn/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-nashorn-${PV}.tar.bz2
+	)
+	arm64? (
+		${AARCH64_URI}/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-${PV}.tar.bz2
+		${AARCH64_URI}/corba/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-corba-${PV}.tar.bz2
+		${AARCH64_URI}/hotspot/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-hotspot-${PV}.tar.bz2
+		${AARCH64_URI}/jaxp/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-jaxp-${PV}.tar.bz2
+		${AARCH64_URI}/jaxws/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-jaxws-${PV}.tar.bz2
+		${AARCH64_URI}/jdk/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-jdk-${PV}.tar.bz2
+		${AARCH64_URI}/langtools/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-langtools-${PV}.tar.bz2
+		${AARCH64_URI}/nashorn/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-nashorn-jdk${PV}.tar.bz2
+	)
+"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm64 ppc64 ~x86"
+IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap +pch selinux source"
+
+COMMON_DEPEND="
+	media-libs/freetype:2=
+	media-libs/giflib:0/7
+	sys-libs/zlib
+"
+# Many libs are required to build, but not to run, make is possible to remove
+# by listing conditionally in RDEPEND unconditionally in DEPEND
+RDEPEND="
+	${COMMON_DEPEND}
+	>=sys-apps/baselayout-java-0.1.0-r1
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	app-arch/zip
+	media-libs/alsa-lib
+	net-print/cups
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst
+	|| (
+		dev-java/openjdk-bin:${SLOT}
+		dev-java/icedtea-bin:${SLOT}
+		dev-java/openjdk:${SLOT}
+		dev-java/icedtea:${SLOT}
+	)
+"
+
+PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
+
+PATCHES=( "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch" )
+
+# The space required to build varies wildly depending on USE flags,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+	local M
+	M=2048
+	M=$(( $(usex debug 3 1) * $M ))
+	M=$(( $(usex jbootstrap 2 1) * $M ))
+	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	openjdk_check_requirements
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
+	fi
+}
+
+pkg_setup() {
+	openjdk_check_requirements
+
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
+	JAVA_PKG_WANT_SOURCE="${SLOT}"
+	JAVA_PKG_WANT_TARGET="${SLOT}"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	default
+	mv -v "jdk${SLOT}u"* "${P}" || die
+
+	local repo
+	for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do
+		mv -v "${repo}-"* "${P}/${repo}" || die
+	done
+}
+
+src_prepare() {
+	default
+
+	# new warnings in new gcc https://bugs.gentoo.org/685426
+	sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
+		hotspot/make/linux/makefiles/gcc.make || die
+
+	chmod +x configure || die
+}
+
+src_configure() {
+	# general build info found here:
+	#https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
+
+	# Work around stack alignment issue, bug #647954.
+	use x86 && append-flags -mincoming-stack-boundary=2
+
+	# Work around -fno-common ( GCC10 default ), bug #706638
+	append-flags -fcommon
+
+	tc-export_build_env CC CXX PKG_CONFIG STRIP
+
+	local myconf=(
+			--disable-ccache
+			--enable-unlimited-crypto
+			--with-boot-jdk="${JDK_HOME}"
+			--with-extra-cflags="${CFLAGS}"
+			--with-extra-cxxflags="${CXXFLAGS}"
+			--with-extra-ldflags="${LDFLAGS}"
+			--with-giflib=system
+			--with-jtreg=no
+			--with-jobs=1
+			--with-num-cores=1
+			--with-update-version="$(ver_cut 2)"
+			--with-build-number="b$(ver_cut 4)"
+			--with-milestone="fcs" # magic variable that means "release version"
+			--with-vendor-name="Gentoo"
+			--with-vendor-url="https://gentoo.org"
+			--with-vendor-bug-url="https://bugs.gentoo.org"
+			--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
+			--with-zlib=system
+			--with-native-debug-symbols=$(usex debug internal none)
+			$(usex headless-awt --disable-headful '')
+			$(tc-is-clang && echo "--with-toolchain-type=clang")
+		)
+
+	# PaX breaks pch, bug #601016
+	if use pch && ! host-is-pax; then
+		myconf+=( --enable-precompiled-headers )
+	else
+		myconf+=( --disable-precompiled-headers )
+	fi
+
+	(
+		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
+		CFLAGS= CXXFLAGS= LDFLAGS= \
+		CONFIG_SITE=/dev/null \
+		CONFIG_SHELL="${EPREFIX}/bin/bash"
+		econf "${myconf[@]}"
+	)
+}
+
+src_compile() {
+	local myemakeargs=(
+		JOBS=$(makeopts_jobs)
+		LOG=debug
+		$(usex doc docs '')
+		$(usex jbootstrap bootcycle-images images)
+	)
+	emake "${myemakeargs[@]}" -j1 #nowarn
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+	local ddest="${ED%/}/${dest#/}"
+
+	cd "${S}"/build/*-release/images/j2sdk-image || die
+
+	if ! use alsa; then
+		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	# build system does not remove that
+	if use headless-awt ; then
+		rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
+		{,jre/}bin/policytool bin/appletviewer || die
+	fi
+
+	if ! use examples ; then
+		rm -vr demo/ || die
+	fi
+
+	if ! use source ; then
+		rm -v src.zip || die
+	fi
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+
+	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+	if use doc ; then
+		docinto html
+		dodoc -r "${S}"/build/*-release/docs/*
+	fi
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+	einfo "JavaWebStart functionality provided by icedtea-web package"
+}
diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
index 6bf843f7755f..530b201cbb86 100644
--- a/dev-java/openjfx/Manifest
+++ b/dev-java/openjfx/Manifest
@@ -12,10 +12,9 @@ AUX 8/0003-fix-cast-between-incompatible-function-types.patch 3383 BLAKE2B 5a0f9
 AUX 8/0004-Fix-Compilation-Flags.patch 1126 BLAKE2B 0f3d17a5ce7c501c55c7af0c39c48eda76812052ebdf0ec315663d71faf8d7435c8a88ca7b28900e512bbe6c6e4ebb7a580aa34ab6f0a1031cabd62180fa4701 SHA512 56a83b8aeae1f2767d1013e1ccab8acc0bbce172148b80c9c6121784f7ea35cc69f5d4a924f74720fe3d5b98bc6128a6db75c6f950a72b17202e5b9078e94d9e
 AUX 8/0005-don-t-include-xlocale.h.patch 886 BLAKE2B e55a1695618136442f50bb7c57e0928d8a70154d54cdffcb65a5bc8923a967eabcce74f00c7cbf75f1a583a685fac136b3c0433e096df4809c925f80c7d540fc SHA512 a7959a25c3102c022c16cd259152b64f3edbad9085d93d5146cdaa891db1a3e573afcbc47a1ecfc1b338876fd1cac25d22633001cd3357c254f4c6701e8aa531
 AUX 8/06-disable-architecture-verification.patch 950 BLAKE2B 7cb4a1bb01d347203c3640c541ceb9d1a88b4e1ce6ba4300153e6b66ee010f96c6c392c86e56049283d49a1a28d2a7818f038481143ef1f0afada7999bc46fb0 SHA512 ee8c18fb10eeabe75cfc1d4894fff21ae9d2b0d34e1ffc596a6e58a8fad6159df9ac2fe13d2bdcbd061295a804c56dd4f98f81696bbe6b3318ed427aaffd08d0
-AUX 8/07-disable-assembler-on-unsupported-archs.patch 664 BLAKE2B 516eff1fca4580ba9073603586d7262d7d7dd0f0f6cf0862d4ca0e967b321a8423be0b7c141c2577a61152132ed45a167bd77a70ee78b53b0d9b078d3863f543 SHA512 96405afc3cf4718b32042e2c373370af219d4d0c52f6d4c63d4f71c22ba962b48603799ea7e3a043ea08ccea0d7e48b85001cf6bd8fd72ba3ce314b59457b948
 AUX 8/10-javadoc-locale.patch 768 BLAKE2B e674c8c613eb518dd5de7b6cb253d7f0d6dafd0e8a5f3ae9b619c99b9a87ec0e565f4908aabba8f996d960c2c6fe7010457da5a5bd3c6a9313e9e83843e9df05 SHA512 b97de0f5bcd1a8dcfab8e39694d02c7cdc20619efd5bb1d5fc5928a47e1495e3682ba0474ae064a1db42b9f79d0caab5214747214bacb512ed657773ce510aef
 AUX 8/99-sysdeps.patch 1467 BLAKE2B afb49b067754e93ea3309b10217fd67589f3838a3772f425fac5f3c985cbca8f305bdedd7b9792059e62046d05687e9652047ff83eff01fe52dd3f5fe5ad86e3 SHA512 26d4ca4cc9c860c5d8d1ca9f2d6a13821498bb0f9a709b46b9e1d6fb04d90e74efb35093c1d084099d71343f158a122a2936297883294bc743a65ae81fff4b74
-AUX 8/Wno-error.patch 5055 BLAKE2B 07061a25ac190d3f0546eb7811b98a1b634d7e58686a48e5de5497fe244076e745250d860d577213a14bbf52e8db3b9e7cadfd78cf74b895d171ef5d9a1cc692 SHA512 cd61c99c275648399a0c779aa8efabd8b58320ac939fc305bbca75f4cb33b7a43246251ef9e3e3848d801a3c3588d4508796a2f97eea94a61d2b3f63906cf423
+AUX 8/Wno-error.patch 3491 BLAKE2B 6f39fe018b8cb3e89d77ee937bba38907115bac7736b44d7da9955a9276d81b4757d64b291256178ee18a33c8e1c837423a57b0026d3eba0225ac7331f8eb629 SHA512 0efd318a36ab69b119b4824c229d89e64205d58d21d2dd44f97d80e3df87e1899ba4e8b7e35e535c0c76ee3f748f750fbee717681d644270333421e0c6dd39e0
 AUX 8/disable-online-repos.patch 1886 BLAKE2B 2959fd2d324a66430ada639890de5563c987dfea4878d21666df54d0e107f021dfd47e6c29da44c23b934603f543f839f16af67c9e35526990cf11b6092c0455 SHA512 ce377c6fc25157e4e8b7ebc7a030411cef1c9fe0f8051ec4b02c8c6fa0505adc4ae3ed3a62a562019652b4d9d6279d168c0df1acc5a2a36272fea6fe114aea83
 AUX 8/don-t-force-msse.patch 2416 BLAKE2B 20380651c8c05b116aa936776a96b4fab390dce4e054fb75c902a51987a9c7ed9be09d8a419863c7d693e4363c274df65ea3d2fca459379ea3099613590e5e80 SHA512 5a94ed21a7d7ffc55c69f8d956351a0ba162d7ceb7ede5c85e53f39a4c48cd7fc4fea9665d2c60dfe2942250b2fd3be92b79bc47d8ee340a514bb35271ef295c
 AUX 8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch 842 BLAKE2B 7c7b5d5291f51dbedba6b836b3adf863533cc1cac53b17ae39e0c045a0d902a622f71339dd31614c6a0a9ca43528f973a037c0e645b9010c90b721c5d468e259 SHA512 ea2f6b9171ba8c19e92b0972e06ac7774bcce3dfd1e76ce845f387670da3894cbb4236fcef4587f1ed4889cf49c777a4e443eea7578fca06ab03a4387bb293f7
@@ -30,8 +29,8 @@ DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b
 DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68
 DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500
 DIST openjfx-11.0.9_p0.tar.bz2 64148934 BLAKE2B 317fb1c9ea99816ecbd8ab64ed3a6ad0aaa319bedd17bf71ee192c5e610fea14611f3938302f1caf666980bcc7d4787f770e36aec1884a73dac3ddba8e1a878f SHA512 8b6d339131f096b4490d7a8c4a20c15362b4f6c6aa4ddd74f610f3b5a8b8c7aac3ab123dcdd5488cc37dc38f1536ce1db95286f4233ee4db1845d1bd560b2236
-DIST openjfx-8.999-backports.tar.xz 2794912 BLAKE2B cdcef2e443dce274b90ce5d0d148e7d10e73eebd9a62ec1514bc13017defa624ce6486f00de80f03d055d2294c9656de9bd3965bb07393d4397a201023a52a69 SHA512 eabbce2f230ef37d392d564d272a95d0f5225cfad0441268b020200e63fbb15b1883df3f21b5f75e34e8b2cf61bc3d843451315a51f1ec2cd487abaae3ee7893
-DIST openjfx-8.999.tar.bz2 62286455 BLAKE2B c9a714a618d9ae02768dae6128756d64b2b6299a36a6ad9828bf2213dc641cbbcaa2d3f3e0b4913bb60893419a2d5c730ca2db88f759bbd94b3e83112199278c SHA512 6049730b72e569939fed3d62b46a409e949b4c2309f4355253c8c891799c7fb5138e20aa217454fbbd78b1dd99c254b34b3fe6c9cbb35854bd8656993655bf32
+DIST openjfx-8.1000-backports.tar.bz2 9142182 BLAKE2B 58ea420ec015c49d2755105a3d11675a92ecab337c7bda5a1ad72e84d0b35f04ed4252cee24da89b1e7b1b5b8b8b9fea7db93364434800246b87827b21970cc3 SHA512 077392368947cb9da1b5c7e14b641d6edcddd9821eb4f16dbea33e8986568211e93799aca29e70b490c8ef2125d69f8372abd1b1ce428a95420f62ff15c414d6
+DIST openjfx-8.1000.tar.bz2 62286455 BLAKE2B c9a714a618d9ae02768dae6128756d64b2b6299a36a6ad9828bf2213dc641cbbcaa2d3f3e0b4913bb60893419a2d5c730ca2db88f759bbd94b3e83112199278c SHA512 6049730b72e569939fed3d62b46a409e949b4c2309f4355253c8c891799c7fb5138e20aa217454fbbd78b1dd99c254b34b3fe6c9cbb35854bd8656993655bf32
 EBUILD openjfx-11.0.9_p0.ebuild 6529 BLAKE2B ff736eb45f3c448c54c918da73ca36b49b917a0e4e7181f79bd3d0665fed434295e43ec09c9054f07d546a28312ab7bb92d28e4d2714608b355080dd5471e476 SHA512 1e34a7876c9dadf87edc96ae2e3c3159069c9fb2d057f2a98546f231e67724c338fb06e1a9c7045e5da390c45d2c84232fb7241d6442d5fc48f14b0581c493aa
-EBUILD openjfx-8.999.ebuild 5657 BLAKE2B 824c9b5160602081472cb794ecbe0c52ffc26522c10c5bf7eb3b4fae26aa034cfc22d17728af3368512dee369a427f9621ab3173c752a9113d6f272b45cd0917 SHA512 c5d595cc267cd76e9309cd88557444848fe7f6f0ae9613e50645222ad7faaf203ea91031aaaa91658366f9f37aaae0e99aea542fd45aa72bc294d96ff22fa036
+EBUILD openjfx-8.1000.ebuild 5593 BLAKE2B 94aa4d3f54e66afb33d0abf7a46c3adfefb8d0bc3cc4150798502f967f69df37a88bdd3c915e1169ad616b188c4a7f6bb59d1c12f0fb61e5347a4281db85ce25 SHA512 ef058af9f7fdc56f8f5d1ea80e11180ec3c8a35403e555143ea3181336946d347d5b307ac77bb66bf3695fb62eece9737e5a552c9c0745269aff6a93744834b4
 MISC metadata.xml 678 BLAKE2B 2b7537a59f3d6cb5b465322c68d374e664291178dad94a527a625243c1abe5846b3d0e066e9a715ccf8d5b12a9a58c46c58d00b13881265973e20a29c4f5b720 SHA512 889ad3984e64acb24e01041d98c1f9273d02256bf89810c8e84607911ba35bcac239fdc8341e839b91d7af999e575d06249d87a64c78a3684f63ad5a3003bd8d
diff --git a/dev-java/openjfx/files/8/07-disable-assembler-on-unsupported-archs.patch b/dev-java/openjfx/files/8/07-disable-assembler-on-unsupported-archs.patch
deleted file mode 100644
index 551a1e82ba50..000000000000
--- a/dev-java/openjfx/files/8/07-disable-assembler-on-unsupported-archs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Disable assembler in WebKit on unsupported architectures
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: no
---- a/modules/web/src/main/native/Source/WTF/wtf/Platform.h
-+++ b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
-@@ -325,6 +325,12 @@
- #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
- #endif
- 
-+#if !CPU(ARM_THUMB2) && !CPU(ARM_TRADITIONAL) && !CPU(MIPS) && !CPU(X86) && !CPU(X86_64) && !CPU(SH4)
-+#define ENABLE_ASSEMBLER 0
-+#define ENABLE_JIT 0
-+#define ENABLE_YARR_JIT 0
-+#endif
-+
- /* ==== OS() - underlying operating system; only to be used for mandated low-level services like
-    virtual memory, not to choose a GUI toolkit ==== */
- 
diff --git a/dev-java/openjfx/files/8/Wno-error.patch b/dev-java/openjfx/files/8/Wno-error.patch
index 208411508d87..edc9389ee9ce 100644
--- a/dev-java/openjfx/files/8/Wno-error.patch
+++ b/dev-java/openjfx/files/8/Wno-error.patch
@@ -73,37 +73,6 @@ index 0bb8a530..38e98303 100644
          "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten();
  def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten()
  def glassCFlags = ["-ffast-math"]
-diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle
-index f233b817..0f9d5252 100644
---- a/buildSrc/linux.gradle
-+++ b/buildSrc/linux.gradle
-@@ -203,7 +203,7 @@ LINUX.glass.javahInclude = [
-     "com/sun/glass/ui/gtk/*"]
- LINUX.glass.glass.nativeSource = ft_gtk_launcher.getFiles()
- LINUX.glass.glass.compiler = compiler
--LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags,  "-Werror"].flatten()
-+LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags].flatten()
- LINUX.glass.glass.linker = linker
- LINUX.glass.glass.linkFlags = [linkFlags, "-lX11", "-ldl" ].flatten()
- LINUX.glass.glass.lib = "glass"
-@@ -211,7 +211,7 @@ LINUX.glass.glass.lib = "glass"
- LINUX.glass.glassgtk2 = [:]
- LINUX.glass.glassgtk2.nativeSource =  ft_gtk.getFiles()
- LINUX.glass.glassgtk2.compiler = compiler
--LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags, "-Werror"].flatten()
-+LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags].flatten()
- LINUX.glass.glassgtk2.linker = linker
- LINUX.glass.glassgtk2.linkFlags = [linkFlags, gtk2LinkFlags ].flatten()
- LINUX.glass.glassgtk2.lib = "glassgtk2"
-@@ -219,7 +219,7 @@ LINUX.glass.glassgtk2.lib = "glassgtk2"
- LINUX.glass.glassgtk3 = [:]
- LINUX.glass.glassgtk3.nativeSource =  ft_gtk.getFiles()
- LINUX.glass.glassgtk3.compiler = compiler
--LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags, "-Werror"].flatten()
-+LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags].flatten()
- LINUX.glass.glassgtk3.linker = linker
- LINUX.glass.glassgtk3.linkFlags = [linkFlags, gtk3LinkFlags ].flatten()
- LINUX.glass.glassgtk3.lib = "glassgtk3"
 diff --git a/buildSrc/x86egl.gradle b/buildSrc/x86egl.gradle
 index 6bf6196b..ff24207d 100644
 --- a/buildSrc/x86egl.gradle
diff --git a/dev-java/openjfx/openjfx-8.999.ebuild b/dev-java/openjfx/openjfx-8.1000.ebuild
index ce6834e5b30a..4763fb1c16ee 100644
--- a/dev-java/openjfx/openjfx-8.999.ebuild
+++ b/dev-java/openjfx/openjfx-8.1000.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Java OpenJFX 8 client application platform"
 HOMEPAGE="https://openjfx.io"
 SRC_URI="
 	https://hg.openjdk.java.net/${PN}/8u-dev/rt/archive/${EHG_COMMIT}.tar.bz2 -> ${P}.tar.bz2
-	https://dev.gentoo.org/~gyakovlev/distfiles/${P}-backports.tar.xz
+	https://dev.gentoo.org/~gyakovlev/distfiles/${P}-backports.tar.bz2
 	https://services.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip
 "
 
@@ -67,7 +67,6 @@ PATCHES=(
 	"${FILESDIR}"/8/0004-Fix-Compilation-Flags.patch
 	"${FILESDIR}"/8/0005-don-t-include-xlocale.h.patch
 	"${FILESDIR}"/8/06-disable-architecture-verification.patch
-	"${FILESDIR}"/8/07-disable-assembler-on-unsupported-archs.patch
 	"${FILESDIR}"/8/10-javadoc-locale.patch
 	"${FILESDIR}"/8/Wno-error.patch
 	"${FILESDIR}"/8/don-t-force-msse.patch
diff --git a/dev-java/oracle-javamail/Manifest b/dev-java/oracle-javamail/Manifest
index c31040e73601..312ca54c2d19 100644
--- a/dev-java/oracle-javamail/Manifest
+++ b/dev-java/oracle-javamail/Manifest
@@ -1,4 +1,3 @@
 DIST oracle-javamail-1.5.6.zip 1812631 BLAKE2B 9fd43058b10726db9359c4b59fd42226da329268ec4974a510940a4e7d6bd16afc3a3a73b6ee17914cd5d3577c42ddf22f29bc93e2ca185660ea03196ed2bd28 SHA512 3fde7901f5975f4a58d675d94e397bf1a169db227b138bfd684c0e2d0f6522ea1c8e2a5425b23fc08775a6824a9e9e68b2d6e6312f20c53af127f00a897363e2
 EBUILD oracle-javamail-1.5.6-r1.ebuild 1316 BLAKE2B a7165622d773eac307a5ca900b53c68473c6ffee19c3bfd13b6de77fa79986ac87fd162dcb802b624eb571c8f1ebdc338086db53901b6dc9062fa5ded2f20748 SHA512 673ea0ccecdbae8e2bb424f0b59f7d64af22f6cb5f624d2cd78e10f1c732e3971e0621cc9189ff98a565f9634a292ed612186c35bfcb05d14daf49a15ba3ef3c
-EBUILD oracle-javamail-1.5.6.ebuild 1267 BLAKE2B e38cd94322db3a9956b1bafc14050a2b8eb518e70797e2d6e8c0469458dc6c39306045159dfe9be9cbbbb5cd5274fb185ae0268e0efc88cfa162fe8e4d2903bf SHA512 9fa439502505d45c147e388cbc34f6867fc4f39c19b62fd0a94e78b00baed4089e27e90ef2bb04be1d1d9c5d5fe232b1824a719eab9bc947ed48e5056dabe5c6
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
deleted file mode 100644
index 50ea5b36cd6b..000000000000
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.6.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-ant-2
-
-DESCRIPTION="A Java-based framework to build multiplatform mail and messaging applications"
-HOMEPAGE="https://java.net/projects/javamail/pages/Home"
-SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-${PV}-src.zip -> ${P}.zip"
-
-# either of these
-LICENSE="CDDL GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.6
-"
-
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	default
-
-	# build.xml expects it here
-	mkdir -p legal/src/main/resources/META-INF || die
-	cp mail/src/main/resources/META-INF/LICENSE.txt \
-		legal/src/main/resources/META-INF || die
-}
-
-EANT_DOC_TARGET="docs"
-EANT_EXTRA_ARGS="-Dspec.dir=doc/spec"
-
-src_install() {
-	java-pkg_dojar target/release/mail.jar
-
-	dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt
-	dohtml -r doc/release/{*.html,images}
-
-	use doc && java-pkg_dojavadoc target/release/docs/javadocs
-	use source && java-pkg_dosrc mail/src/main/java
-}
diff --git a/dev-java/pdf-renderer/Manifest b/dev-java/pdf-renderer/Manifest
index 6e693b86984c..6c2fca86af6f 100644
--- a/dev-java/pdf-renderer/Manifest
+++ b/dev-java/pdf-renderer/Manifest
@@ -1,3 +1,3 @@
 DIST pdf-renderer-1.0.5-sources.jar 1736806 BLAKE2B b897d4f30ae0143a6eb7c3499c5d7c165cd4e81c950fbe3185066d5ab6dbe68d874a5ff7561d35a65e014a6d8b82f92de73574018f58dd3817a32488c5b09ed7 SHA512 086355441df0d59306839de3097d1e557870435dcb4ee878d4e7f3f46352a103ecfc1da4055f107c2c53a61f815f985f3e1e176dc9f99634afd58cf1faca940b
-EBUILD pdf-renderer-1.0.5.ebuild 510 BLAKE2B a32c1ded27a21c2ebc2441ea17244c14042ed7e14d63205f7a8034ab4d6019ba0a5cf3a62c421f9300ced5a07ccfb6319876780f26bd10bce35d8d82b3c10803 SHA512 a90db5250b1bb984889eea66861c1718699714b49b59448cd667e43727d0fd90365ad4e028ba369391c408dd3afa6980a433ae63d99359a6e2262bfd8a0affc2
+EBUILD pdf-renderer-1.0.5-r1.ebuild 518 BLAKE2B 2849658e1e676f035531f8a3a878a5f98e58c7cfa7e22c89675f0abc3d263bea9f16269d869977392f50d735d083c520252b58021b0c724991a60255967897a3 SHA512 232d27d426cf02d6d7f7c9201aadefba1a0347b16673e0e0b16adf638835818bc3c87be96bcefa55487c5e1ddebf6bf0b8f6c0d8fdb62bcd46399c0ab101101d
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/pdf-renderer/pdf-renderer-1.0.5-r1.ebuild b/dev-java/pdf-renderer/pdf-renderer-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..0c7ca8c0ea49
--- /dev/null
+++ b/dev-java/pdf-renderer/pdf-renderer-1.0.5-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="a 100% Java PDF renderer and viewer"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="https://repo1.maven.org/maven2/org/swinglabs/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
diff --git a/dev-java/pdf-renderer/pdf-renderer-1.0.5.ebuild b/dev-java/pdf-renderer/pdf-renderer-1.0.5.ebuild
deleted file mode 100644
index 822016676742..000000000000
--- a/dev-java/pdf-renderer/pdf-renderer-1.0.5.ebuild
+++ /dev/null
@@ -1,23 +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="a 100% Java PDF renderer and viewer"
-HOMEPAGE="https://java.net/projects/pdf-renderer"
-SRC_URI="http://repo1.maven.org/maven2/org/swinglabs/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-
-S="${WORKDIR}"
diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest
new file mode 100644
index 000000000000..19f1d918f203
--- /dev/null
+++ b/dev-java/poi/Manifest
@@ -0,0 +1,3 @@
+DIST poi-5.0.0.tar.gz 111429369 BLAKE2B b29e754fb709d01ff4d68e9227f4c4739384bd02934b6860e8a0e96552d9e9ff1c5c665bc0b701f79226505fd98373fe6ad160c72735903eae388f0cd6618337 SHA512 e79d15b42d8ec389fd15b7714faf7b49b9fb4d57014cb341fff0f061393f4ea7dfcbd3810a6ec19539eabddbb1d0690aa56de4a1a412d05a527e11797047023a
+EBUILD poi-5.0.0.ebuild 1951 BLAKE2B b59a6ea1ce24694423774923d2858f98d94535829c0c6178e93e029a437b3df629399bb31c0f796327aa4f6aedb87dc344b1631406c05b49675e2cd746336591 SHA512 4b797b7c977bf0d9fb921661a0c1fd90c5f9d8d276be2fa55f4ee9e47b17af9f38f5ac914a0bc838907728b4b719e3ebf72aa00b49dccd2d418741d34d0c2f69
+MISC metadata.xml 428 BLAKE2B 3c635a18242ab2a097c37707bc6ce85d05144fe8142b6b2fed764f785ca9885171d84bc2c8422160eaa0b8d868180295f49de953ada22c26d85a72b39e11e3ff SHA512 f43292d507ae9a54941544ac52d678907440c5c663a50131cd170b97159f2d8045f38a5f9dda418a518c6ab711a77c600062416438fcf802ee03cd69801252bc
diff --git a/dev-java/poi/metadata.xml b/dev-java/poi/metadata.xml
new file mode 100644
index 000000000000..393300ad48a0
--- /dev/null
+++ b/dev-java/poi/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>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">apache/poi</remote-id>
+		<bugs-to>https://bz.apache.org/bugzilla/buglist.cgi?product=POI</bugs-to>
+		<changelog>https://poi.apache.org/changes.html</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/poi/poi-5.0.0.ebuild b/dev-java/poi/poi-5.0.0.ebuild
new file mode 100644
index 000000000000..dbbddd8ed6b0
--- /dev/null
+++ b/dev-java/poi/poi-5.0.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom poi-5.0.0/sonar/main/pom.xml --download-uri https://archive.apache.org/dist/poi/release/src/poi-src-5.0.0-20210120.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild poi-5.0.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.poi:poi-main:5.0.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Maven build of Apache POI for Sonar checks"
+HOMEPAGE="https://poi.apache.org/"
+SRC_URI="https://archive.apache.org/dist/${PN}/release/src/${PN}-src-${PV}-20210120.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: ${P}/sonar/main/pom.xml
+# com.zaxxer:SparseBitSet:1.2 -> >=dev-java/sparsebitset-1.2:0
+# commons-codec:commons-codec:1.15 -> >=dev-java/commons-codec-1.11:0
+# org.apache.commons:commons-collections4:4.4 -> >=dev-java/commons-collections-4.1:4
+# org.apache.commons:commons-math3:3.6.1 -> >=dev-java/commons-math-3.6.1:3
+# 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="
+#		!!!artifactId-not-found!!!
+#		>=dev-java/commons-codec-1.11:0
+#		>=dev-java/commons-collections-4.1:4
+#		>=dev-java/commons-math-3.6.1:3
+#		>=dev-java/slf4j-api-1.7.30:0
+#		>=dev-java/sparsebitset-1.2:0
+#	"
+CDEPEND="
+	>=dev-java/commons-codec-1.11:0
+	>=dev-java/commons-collections-4.1:4
+	>=dev-java/commons-math-3.6.1:3
+	>=dev-java/slf4j-api-1.7.30:0
+	>=dev-java/sparsebitset-1.2:0
+	dev-java/commons-logging:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="sparsebitset,commons-codec,commons-collections-4,commons-logging,commons-math-3,slf4j-api"
+JAVA_SRC_DIR="src/java"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index d8b2c701598a..d47f8bf94870 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,10 +1,24 @@
-DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
-DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
 DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
 DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5 SHA512 9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11
-EBUILD protobuf-java-3.12.2.ebuild 1396 BLAKE2B 77fe72f17c38e32636c675c393768be36c5ba6ad9594db38a6abfce618117ea6ed84f350d68e702cddaa8bf5ced10514d5852ad3935375c35d9ad4d430af5f47 SHA512 b4a79a688be8818c0f7ca3ceee0fabc7eb8ee4b3480194c7113babb8fc5c7f4270e029df57eb8d96fd077c4e131b2e2de5ebd11eeb7b355ad72ee16fe6317751
-EBUILD protobuf-java-3.12.4.ebuild 1478 BLAKE2B 8cdc4e335d0cb6b9e5002fc6ac099c03efda106e0f5af768a9a9745e7c45d17554bc0482b363696bfd4569a3956a86ed1fd8a74d5f9f0ceedc0ecf3850c9b83d SHA512 1ac0ce79cfe4615719a86d1ac7e09827777e8ce4a60999ad480d71d9c8d90acb02b3cfc57bf7d5b4139364fefb897e93fad214e675b94d99a9e6e93f6ce8a106
+DIST protobuf-3.15.0.tar.gz 5284848 BLAKE2B 6c1135499dd73b6d1764f47ded6415f8073841bccf5d5626e751fc159b67a6103d71a84096f563053c34c9e4235504238fcdc86ebb757d38b2f4bc1674d08674 SHA512 f52dfbfabdff3306d26ec05cbba7cd47bf3db8b08f4fb27e2cbd5a594de57f0a7ab2212dcea2055a9adfddc94ae4df2d0b1caea311ead75bb850ef8458b1b74a
+DIST protobuf-3.15.1.tar.gz 5284851 BLAKE2B 5e3f487ba1c3f6a3d2d87f2421f9b07aa4618df0853b05364d7f29e93d8e7dc4c3ece08ba3b7cd0bf69d0faaa32ccc952218a8df7575b74aa6216977f2b2219b SHA512 24efeec969ee72833c377e6287e3b06a431d54d9b3be50635685f6903534f15c2957d78cdbf4bcc6482732ecdbc735dc894c0b9095486419b8d11d6df6169180
+DIST protobuf-3.15.2.tar.gz 5284455 BLAKE2B 433ac18774395174798d110e4eaae95c44bc8be89cfae85648497f8531cf19513f4c7745a6afc27d6d49a07e7e1fb4faeff73530fa082665727095e837f11940 SHA512 34e82ece83f47249fd5398a955e4f0a32d0722abcaa4e90c741bdc5106a0bd92088babe3d10d818dd89e2e9254cecbb68ae0c182ea408d4f1e2d70318e7baf37
+DIST protobuf-3.15.3.tar.gz 5283923 BLAKE2B f7b7b22200a4fffe6bb89e6d15fdcdb7e53ad91d4b8dc4c0b9ec7e64de39f0e3854c649edfd5a6eca040f35ccbb2bea6a3b86c7e22a9ba011db2dc11117646f6 SHA512 ca403cc2ed28b67c4219021273be59d36a3f4382a8111aeb6152fc0ded30dfc203d96c3c60977d19ff00a1d1524b8ed4c183e8badb56c942e599f78aaf6745f6
+DIST protobuf-3.15.4.tar.gz 5283753 BLAKE2B 256eb365b26a864755b43925bd4336fc76f1fb122aacdb01243b24ecc163541fd7d2105ba66f7fa0c14ced0166cf4bc8f480ac5d9f2cea13e4cc925dab6e1810 SHA512 d98d1ed408a6f3d15fb3a60d11df896632dfdffa06759c761bc227a8c8053ec9db6c62c21b115dc109c7d9139df239b19e29aff5783b585101bcab3f4d687547
+DIST protobuf-3.15.5.tar.gz 5283712 BLAKE2B 0da6255302014c885aee47d48344a75ee4808cb91fa6cdebef15150e0b8ce7f7835d21bdc8f42fd1ba5f5c5401e6fc60b9410ff1ea8bd0d0f698d3cf7d10dd2b SHA512 b9d3b261047c354f0f8735638041562e05d93691cdfdc295622fd30aa04c859a9e3d4200981807ea0d4926d0e4a31a918b4851ebc25bfb9709494a3699002531
+DIST protobuf-3.15.6.tar.gz 5284018 BLAKE2B 5895f618e233edd5744253821036857aa23f64b76ee3318b99f3530d9dd0c49cc8c386ef15c7394475c2bf0fa33fb631e481fa3fb927c2ab8a88af31234bd0b1 SHA512 673d61b492ce0e85f5c63f3fd7a0174737cc65f7871f79d24380bffa59ea1b312065137ecc63b0f4d4ffa3eb168a09e9c1129c21b0e6c5c3a8c2fabb2cecabb5
+DIST protobuf-3.15.7.tar.gz 5284817 BLAKE2B 43821bb283a0c1f87930593046a5c55f6efae3f644337289fd438c0612a9b7ef9531b61e48940b74dc5d20253ee1b6a805b902284a442dec2efe8c79f82c5aad SHA512 2b18ccba1ff8a0623c52abed0e0674bc6cfa2cd10d49764031a47e68f654f54083f4a4f9e3a94d833a6808426904ee642f173641063e79cb41a61fc348d603ac
+DIST protobuf-3.15.8.tar.gz 5285277 BLAKE2B 798fc011ac03cdc2406acf5845c667d8482082044bdace06c2c1d02b5b1b69c1b1f30e29774180dc1801a1d21d62e2ce50325105859564a1e36d3fe478e64d8b SHA512 56fc6df2dae14eee0fb67dd4204fc1ec54a18d994a69c9e42c7888d0cd50d269d1c5e1445d74f0fa705850d4ac86a22d86781e09769a716e5c6f829b15b05592
 EBUILD protobuf-java-3.13.0.ebuild 1477 BLAKE2B 669066ea60706166627b293179241302d89a4b7241e438a7f98c49992b5283eb201df25b0ee93273276324c3974e64062c80b108168e64606258e2d59f6e30f4 SHA512 a4883fd56780e65ea4cdb48a8e830a996c1bab4b92ab7a5faec99bc0e6711ddd03b094e5607a23bdd8d946161282ea12f19920f14943542c085256e6d2f8131c
-EBUILD protobuf-java-3.14.0.ebuild 1478 BLAKE2B eff459444ef91a15f63b6d3cb2f8d1afebf3695e4f98f793f3fc855a5b81d89923af0ea6d7c09928452913239c8234380111c4de3a1387c4ebf51f16d96aab1a SHA512 3b5c168862ed9b7d208ba14515dfcf450c3764a2ee7b562d05bf274ffba0f8c691b8a48821169b75a000c1a165fe2b028ccc0ac0b76b79462b2787edb28e7e5f
+EBUILD protobuf-java-3.14.0.ebuild 1477 BLAKE2B d5d8bedf978eeb76193bb80eeb09bab5c88f61e1c84d7f4e01e28000dcc3915b3d8c88d123adf0eb2184dfe6a9260d4102492ba78ee99e2a819f38f85fb2dd41 SHA512 fe8bcf262d3b3a6667bd7d81dc37b09a38626e9f97567485a682fbbd148cd822fb76eacafb4044a3b561aca29631ffbefe83ba6e7e4b20ba3397d872b5bf0535
+EBUILD protobuf-java-3.15.0.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
+EBUILD protobuf-java-3.15.1.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
+EBUILD protobuf-java-3.15.2.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
+EBUILD protobuf-java-3.15.3.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
+EBUILD protobuf-java-3.15.4.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
+EBUILD protobuf-java-3.15.5.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
+EBUILD protobuf-java-3.15.6.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
+EBUILD protobuf-java-3.15.7.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
+EBUILD protobuf-java-3.15.8.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
 EBUILD protobuf-java-9999.ebuild 1415 BLAKE2B 2b9a19943db37248fefd4fe65c15e2a3ced5748a5340f572108e3b0f9013aa46982421d3e7a4b044a0949742b90dd9014045486761ee2d8654c70fa605c06e14 SHA512 c4f6d08af080dcb0c93c5f03242bca8662db069aeebd0d42c06dc80386c17867021db7f67104405d9d58a71659a94c3fbcef8bd5463d44c647e2f21bdcdb976d
 MISC metadata.xml 549 BLAKE2B 3b081008d6ff92b24f670c1b8861400871454e96c5f0ca170c3825d6dda8d356f341fbfad7b5a9f330a7f9891d0e3b91a9f4842c480ee8a74f6aaf371884dcc2 SHA512 37ecf8aa151f5d08443a07c40188ec7061947a06453e39d07fa9b0da0cbeb2ccb76e517e7e2c2e3a2afe07874c817cf644dcd8775ad78f18b5f55496bc198b72
diff --git a/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
index 08a2ccdb477a..6b33107b79ac 100644
--- a/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/25"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/protobuf-java/protobuf-java-3.12.4.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.0.ebuild
index f0450a860f47..dfd68dd9ecf0 100644
--- a/dev-java/protobuf-java/protobuf-java-3.12.4.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.15.0.ebuild
@@ -22,8 +22,8 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/23"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+SLOT="0/26"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/protobuf-java/protobuf-java-3.12.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.1.ebuild
index 86a815cade2c..dfd68dd9ecf0 100644
--- a/dev-java/protobuf-java/protobuf-java-3.12.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.15.1.ebuild
@@ -22,7 +22,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/23"
+SLOT="0/26"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
@@ -39,7 +39,10 @@ if [[ "${PV}" == "9999" ]]; then
 fi
 
 src_prepare() {
-	default
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply_user
+	popd > /dev/null || die
+
 	java-pkg-2_src_prepare
 }
 
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.2.ebuild
new file mode 100644
index 000000000000..dfd68dd9ecf0
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.15.2.ebuild
@@ -0,0 +1,56 @@
+# 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/26"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+BDEPEND="~dev-libs/protobuf-${PV}
+	>=virtual/jdk-1.7"
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+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.15.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.3.ebuild
new file mode 100644
index 000000000000..dfd68dd9ecf0
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.15.3.ebuild
@@ -0,0 +1,56 @@
+# 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/26"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+BDEPEND="~dev-libs/protobuf-${PV}
+	>=virtual/jdk-1.7"
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+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.15.4.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.4.ebuild
new file mode 100644
index 000000000000..dfd68dd9ecf0
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.15.4.ebuild
@@ -0,0 +1,56 @@
+# 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/26"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+BDEPEND="~dev-libs/protobuf-${PV}
+	>=virtual/jdk-1.7"
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+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.15.5.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.5.ebuild
new file mode 100644
index 000000000000..dfd68dd9ecf0
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.15.5.ebuild
@@ -0,0 +1,56 @@
+# 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/26"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+BDEPEND="~dev-libs/protobuf-${PV}
+	>=virtual/jdk-1.7"
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+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.15.6.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.6.ebuild
new file mode 100644
index 000000000000..dfd68dd9ecf0
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.15.6.ebuild
@@ -0,0 +1,56 @@
+# 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/26"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+BDEPEND="~dev-libs/protobuf-${PV}
+	>=virtual/jdk-1.7"
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+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.15.7.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.7.ebuild
new file mode 100644
index 000000000000..dfd68dd9ecf0
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.15.7.ebuild
@@ -0,0 +1,56 @@
+# 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/26"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+BDEPEND="~dev-libs/protobuf-${PV}
+	>=virtual/jdk-1.7"
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+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.15.8.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild
new file mode 100644
index 000000000000..dfd68dd9ecf0
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild
@@ -0,0 +1,56 @@
+# 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/26"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+BDEPEND="~dev-libs/protobuf-${PV}
+	>=virtual/jdk-1.7"
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+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/qdox/Manifest b/dev-java/qdox/Manifest
index 4b4a5928329f..f21e77967154 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1,6 +1,6 @@
 AUX jflex-1.6.1.patch 680 BLAKE2B 2dba9bdba8ce77ebe28a608b505891ff49d51e9d7549bb17f21935ad9511fcdf4428a79b5243e5eb8cfb5747eaaaafb97eb6edca980ce337d37ed48772ff5ea5 SHA512 73e8067a31392a1975877470a2a239c9ca0913f807faa3e5c660bc2487dca9a46c1753ab86526e66581111fcded89229a4e9e3a16fa787ce3669ef6c07a28081
 DIST qdox-1.12.1.tar.gz 519833 BLAKE2B 83a732f1582b714cf943ede61bacc5216804c00cfbb642a479afb74739564f4fdbcd923dd7cb84a9626a97c5ad0a0f04895e0ae68252891cb25299e1fe1c9c72 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5
 DIST qdox-1.6.3.jar 63731 BLAKE2B 77d117f0f76f531f9320b5eb3650db315aab838d5d79a9df8997649b498b375db3fb0c694ea8b5911512097dd2325554d7599bed51a978e38af6fa55600d7c24 SHA512 0b05620809e3830c7e12c289cd4765f96d845adabc1f09497993bd9f39852784f454eb4aff1deecb325608a5773e86fbb1f5863e0f25387805472b59b46cf965
-EBUILD qdox-1.12.1-r2.ebuild 2187 BLAKE2B 919894dbd7ff1d8f7fed1b3de66a2c2dcb5d3f53d9c1d28cc2480c8e083de977d35f9adb5ac669f06eb6f4dc38abd5fbd3d8cb52f70f18603979fc010b3cf0f5 SHA512 6e005a309d52fd3153989bdbadf57d17556d02fba59e8bbb5e67941905b30938951dcd3d39824b27ab5560f33a47322e46b415d536a437d3662a6270440f707d
+EBUILD qdox-1.12.1-r2.ebuild 2180 BLAKE2B 56dc79ef274fcdd857eedaa49386831e091a2d095f67a7967a207b0f98c7fa3d5c5afeb54df8e086b50c858f6f3cae70d52e41f8cb915ba646af2bb540a5d04c SHA512 585e5c92a4cf237cdb5a8e5da7a6fae018b27b2479b34895a0dc1d2813b66b164ac22946f617319da492ffd0d03042d0cd16a827d02b938eb2914db134c795e0
 EBUILD qdox-1.6.3-r2.ebuild 687 BLAKE2B e4cb8a16f5f5c116b7d4a6247b5c9a8aae67ea29725a25c8d6a6ee5e3bbdd19140d1ed4b33c32d6c5c0c81deb4b7d391e04af784eb3f0ca26d6458b061a9a72c SHA512 e154d9ae1c0528d248e24ffb3063dee953be8f3b69e93ff1331f2d111f61c7337210a2421192027066307caa6341f307e50b0bee4f41d29047736ee6d05c2913
 MISC metadata.xml 489 BLAKE2B 88377b6fe8ec7278767a18b227778e6f5ec320221fc7293090c67ea268b695de6b131a08172031cc08d3baf8bfd347da0d18bc2ae5c632026eccf20b9d958267 SHA512 709f38b7f8bb7fabd77d9c17a15e537b7c5b46d6c3e203f24847377980ad6afe55adede125b703215b3ab00ad6cb02b8994b75a3db2a4b1b556775bb9f00ee8d
diff --git a/dev-java/qdox/qdox-1.12.1-r2.ebuild b/dev-java/qdox/qdox-1.12.1-r2.ebuild
index e0bbd55bedd5..39a712868027 100644
--- a/dev-java/qdox/qdox-1.12.1-r2.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Parser for extracting class/interface/method definitions"
 HOMEPAGE="https://github.com/codehaus/qdox"
diff --git a/dev-java/randomized-runner/Manifest b/dev-java/randomized-runner/Manifest
new file mode 100644
index 000000000000..a36eacfeef3c
--- /dev/null
+++ b/dev-java/randomized-runner/Manifest
@@ -0,0 +1,3 @@
+DIST randomized-runner-2.7.8.tar.gz 1501825 BLAKE2B e375d4509d8be914829c4ebfad5584e16f8f03be480ed21b52a0ad3db363b7f2761ae6442bb9baa8c929bc182c422963a6e8480165f53b7b820f9f4e2954a243 SHA512 5627f14dc70a6341838ad1ade0fa0f152ec6a5a7f3da4bc31e0ff040ea2c62aeafd669460f61f37db31de379db857ce3d58f0deed22d1cf714f1461988a92cdc
+EBUILD randomized-runner-2.7.8.ebuild 1479 BLAKE2B abab28f7fce02837dad4107cbc562b9b0283dee842840b03b7eaa726ee8781517ae7b8472e9f8a4e092fb86429cf0677816a4d22b1b92677dabc9752bf8728ed SHA512 897d847c369267db9ddcd1f677e7f3b08d10e8799f60dfd5f3681509e5b3decf91f7fde138d20ec23085ff4ba5ea81612c12e0d6c5d82d5f1c224a06ca2250a5
+MISC metadata.xml 216 BLAKE2B da3631f8f6582ec2aad6497bbadf58b72bd143f39387aa3a5ee5842db7dc470f1693503286c6c1cde6e4f1ac72c271afabd139d1cb6f25de7d06a5469dd66c03 SHA512 241c7b10d088e8d6b9ace6781434e64c4a5d2eb80e5dfceea04e09a9637475e927ebd804588e5624622b24ef60a29331ad07f995360b0c1c2d5ffa25033a9f4d
diff --git a/dev-java/randomized-runner/metadata.xml b/dev-java/randomized-runner/metadata.xml
new file mode 100644
index 000000000000..0d49beafc75d
--- /dev/null
+++ b/dev-java/randomized-runner/metadata.xml
@@ -0,0 +1,7 @@
+<?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>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild b/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
new file mode 100644
index 000000000000..638cef4a653e
--- /dev/null
+++ b/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/randomizedtesting/randomizedtesting/archive/refs/tags/release/2.7.8.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild randomized-runner-2.7.8.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.7.8"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JUnit test runner and plugins for running JUnit tests with pseudo-randomness."
+HOMEPAGE="https://github.com/randomizedtesting/randomizedtesting/randomizedtesting-runner"
+SRC_URI="https://github.com/randomizedtesting/randomizedtesting/archive/refs/tags/release/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# junit:junit:4.12 -> >=dev-java/junit-4.12:4
+
+CDEPEND="
+	>=dev-java/junit-4.12:4
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? org.assertj:assertj-core:2.2.0 -> >=dev-java/assertj-core-2.3.0:2
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+	test? (
+		>=dev-java/assertj-core-2.3.0:2
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}/randomizedtesting-release-${PV}/${PN}"
+
+JAVA_GENTOO_CLASSPATH="junit-4"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="assertj-core-2"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/rat/Manifest b/dev-java/rat/Manifest
index f02b2079722b..52b701529bc8 100644
--- a/dev-java/rat/Manifest
+++ b/dev-java/rat/Manifest
@@ -1,4 +1,5 @@
 DIST apache-rat-core-0.11-sources.jar 124710 BLAKE2B 354755c1e9be4952f3313ae948bd0ef034d0b5ca653f646af33f78b3ec0db4b137b44fa9d30352b82c25c94b0f097a2f533697aee5307b91df710ed7977ecdf0 SHA512 1f75e6830bffa7b1a2410aa421a548a4c78db6686c8f940471e38d1bb455201cbfd797be3bb5da027966ee39bb93e7c7b393e3d7ff330866235fafffe1ee6991
 DIST apache-rat-tasks-0.11-sources.jar 17602 BLAKE2B c960c73e708db5888bea6c12b19958ce7549d54fe2df644ebfc46d86b6724aaf2307a99e58cb1e8530ff1ff1ada57d9bdf26b00a3e902da516652125492e0ba3 SHA512 54430fd7f8c227fe9fa14bbd44adc1222e8b7de0bbc5a5b861f4df773f5db0fdaf80b6ab327e17cdf57af54447d13f3431e8cdf86728af6f8a84e85c89376565
 EBUILD rat-0.11.ebuild 1094 BLAKE2B 417f48a30848de17e555600e7957eb35e11cdad8094cd75a9b2268073f20725f2f2af03aa7ffc32196e089561c0a3f9773317a278d00bb49970ce912ee4427d8 SHA512 cc665ba195edf8b8b67b9a67e2ed0e677788edc9924336f943621ecdd469caaa5fe1bf521a90fade4aa336dff6bffcb83409565daed4e31ae097a475a22ee837
+EBUILD rat-0.13.ebuild 656 BLAKE2B 0886ecbc2b0e9eaaaf2f0f1bf1d4e35a8230efcba6b728b42998f54cd7e6e3ef295ed8b7a64406605f57771e92823c997708ebca419ebc6fed859330454651f8 SHA512 4630928f8550e7efed7d3a1dfd542c9459bfe11699d398698ebe905f205c2eaa137d16f326a5ccdec681e07533ceb1227269856fac4cb8305b5cc625a7e37eca
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/rat/rat-0.13.ebuild b/dev-java/rat/rat-0.13.ebuild
new file mode 100644
index 000000000000..ece22ac8b664
--- /dev/null
+++ b/dev-java/rat/rat-0.13.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+DESCRIPTION="Apache Rat is a release audit tool, focused on licenses."
+HOMEPAGE="https://creadur.apache.org/rat/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	~dev-java/apache-rat-core-${PV}:0
+	~dev-java/apache-rat-tasks-${PV}:0
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}"
+
+src_compile() { :; }
+
+src_install() {
+	default
+	java-pkg_register-dependency apache-rat-core,apache-rat-tasks
+	java-pkg_dolauncher "apache-${PN}" --jar $(java-pkg_getjar apache-rat-core apache-rat-core.jar) --main org.apache.rat.Report
+}
diff --git a/dev-java/sblim-cim-client/Manifest b/dev-java/sblim-cim-client/Manifest
index f1854af78455..2a3afbb6137d 100644
--- a/dev-java/sblim-cim-client/Manifest
+++ b/dev-java/sblim-cim-client/Manifest
@@ -1,5 +1,5 @@
 AUX 2.2.1-no-network-tests.patch 2189 BLAKE2B 279e37abe9d43333099ed671a4652283f125d1aba243beaa236e430cfb3b3996ca3b9815477347d747e834de2393f16b26e7ed2c3d980af0e8b631831dba9b60 SHA512 bc3834d913d168c66a71d993d1673dfcac2c752860c08f74f13defd51cf73298675d357d503ae4af2064e158123e4f04b37ea4590bd16d859a91323112875160
 DIST sblim-cim-client2-2.2.1-src.zip 1082959 BLAKE2B 7750fc15e5f8da1f98496e99a5b5adacb89ac72782af88d8fb467c1071c2a4a736f2ab68a00bc381f91e20b756eb98ad96540bdd4836ba35ca2759cc2848277c SHA512 b7e1f56b87fa24c97d8b3e97261195ff04ce13839e72f4b8824daa8b9854158ba10c0bddd16e0650197125510d68adf6f4458089d132278510e10bd2b25b4aa7
-EBUILD sblim-cim-client-2.2.1-r1.ebuild 981 BLAKE2B f75c061f6d13607b9b02f09053002ce62031817cccaddee5f0e63a7ae0024599211b4604355049bc1b480a6f700a97efc2fec6be48d48022548e80d21a57faf8 SHA512 5ff70f1d806a25e59dbe1dcfef91a1482e8b6009f1fbe35c423ccd891892152c287b45365d50f435f15db5469823e68dba3a52967c93d12afb68ab7514935cce
+EBUILD sblim-cim-client-2.2.1-r1.ebuild 981 BLAKE2B 104a1ffb9ff7c88528f6ac2cedb03cb43f97a03f3c45b752ac371adf70ba5c838b2f88d4ea284c1f7145236a340cd6884fa4b65e88aac26645f8c0d81145f57c SHA512 30e641fa4c5f83cd71e0dc503f930e4e641ae3258e73c4d02f234cb5ea2f58859c6e383b18d512f65ad1dfc5087192fc6b8403ce864c41bb4a316677e4972fa6
 EBUILD sblim-cim-client-2.2.1.ebuild 903 BLAKE2B fd7682148248b6aafb7e5c70f5d2feabfbbe940882042ca9a3e1b037f2a3d4d0142dc0dcb2c7cdba4167d340a8d133fce3b27c15775f77b1362c3b02e9ed73f6 SHA512 ab8f73955cccf307ccd1e16eda8166c2e32d7755dc2f8de7755a4d0fa3d83cbc6445f5d05bec53ee2226e02f40d6011547d2bee3bd01de02a283c97fecb45d25
 MISC metadata.xml 311 BLAKE2B 8b486e7644b87a394ec5ccc61dab397aefb22e4db94bc1a42ef764b072897f71143a992c7dae561da05b4d3c04a361583584f4401b8687b982e8e87f3baa7891 SHA512 8675574db0408285a6c8ea63bbd507d1f594f3d67b33769fd31fda4ff215d4bf451922b45f2adb92a714f89c27e0296776938aac5fcd38667ee35cb5ee36d111
diff --git a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild
index 26f86a2fa00a..006a7007097f 100644
--- a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild
+++ b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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 eutils
+inherit java-pkg-2 java-ant-2 epatch
 
 DESCRIPTION="A WBEM services client that includes an SLP client for CIM service discovery"
 HOMEPAGE="http://sblim.wiki.sourceforge.net/CimClient"
diff --git a/dev-java/sbt/Manifest b/dev-java/sbt/Manifest
index abbeca832b59..236154087807 100644
--- a/dev-java/sbt/Manifest
+++ b/dev-java/sbt/Manifest
@@ -8,6 +8,6 @@ DIST sbt-0.13.18-sbt-deps.tar.xz 34787436 BLAKE2B aba63ee1f7ec3f105bae0fa882dc19
 DIST sbt-0.13.18.tar.gz 952783 BLAKE2B 31648c2cbbeb5d57db03c10bd4ac25344ae2d0351fc592e85e053e9ac0deb063e1b1e700a8dfa4a242243dd06fa491f721852ddbc2ea1d7fd4174e01febad25e SHA512 0eeb6fddc2454c2fff2eee06a80179495c0210d97fd3677bfe0f8833524ac707515b9e8f3c19e0d0372f503ef9b9f19dbe4cf15b6f8b48181ad730685004267c
 DIST sbt-launch-0.13.13.jar 1210231 BLAKE2B 754abad78cec4f6b040fb63dcb62e549768174b22cf3f9ab7d2419736d4f09b53863cf645b38d7d534deb1c6e897f55d8b1b5fa82462ca9d906c410d22c0c198 SHA512 78e7ce21c610e83a532b04491e13d53b4193205328adce473252d523fe0ca0f3892dba900f01ff6e28d94a17c3ba1ebbe7d85fd6ce9900c48263bc4816da37ef
 DIST sbt-launch-0.13.18.jar 1210278 BLAKE2B b3c03f0c823576db51eda51a494edeb771f7ab762afe74fa95f19a4581d80cfdf3c6d6bfacd76e195de34f420912d18b505b74414fbc02550c9331fe4b3e07e3 SHA512 2b1e27f8d873ee45cc168ab19f6e82421d6896116c7b7af60974b97f41edd034fa008e668c83f83d2ce3a501986674821d8a427ccbcda291c8c33b576d64921b
-EBUILD sbt-0.13.13.ebuild 5677 BLAKE2B 77ab2c5de7b1098ed49eb9a2570c423e07089eee4cadb4882346b7f654452141e528dbfd5375fe67183faf9d2b06255527f7eb81678c8e81c0cb8683ce35b114 SHA512 3b95619c3a561cba59734f851d2b7d9df5e59073d793d28c3907936b725a540602ec6e8ceab02c037a987dba0920c13cf7c10408785636fc343bfc955cb1d68b
-EBUILD sbt-0.13.18.ebuild 4913 BLAKE2B 003d8fef0ee9255a82de41b8a9b30c674664a8216c0d79608b104c3d8f8606e24788ca2386395c31588e39e7f99c360df7de6e99027192c37d482894337e27d6 SHA512 c2b3a53cdfe91f65d09dffdfeb552b2fb7c7a27267bad0497a7b7653d6bcb04da3d6385e447cc3f49262f7b5da0ecbe1346eefaf5c6091fb272e21712dbb4e67
+EBUILD sbt-0.13.13.ebuild 5670 BLAKE2B 0447138d640ae8ee54ae7818c78c34ba7f6ed1b9535be53241308a7803f18c732d6d6f041d7d35baadf670b4f6df14e2dc87c526f47d08ac2309521382265a3b SHA512 6851e0463519ced88b12ba0d23018b1e36209a37ec65f11c5d0210b74ee403346eef1c3335dd33a240398dc985229ca2fc3c1fce82cca5430cbe4662421f2068
+EBUILD sbt-0.13.18.ebuild 4906 BLAKE2B 2f0d5ff09e519c16b02e13149847acea22f2394781084e16ace31263802968ab0108595aa0fbaf2931186ecbee2f34a494e6a4284cdd4706d40260c16c7bf492 SHA512 ad81be5f6f4a79f80bd6aae5d98769cb22281a8721618315c0d25a5f1b07f180367a3e9661f1cef15630caa8f208021b8fd8673ad91336bc2896a0bac9e0da83
 MISC metadata.xml 525 BLAKE2B c70c7e88be5a5b06cbc422d6f354535711d06590780285ee1fd7e6668a0205795a4295869d61fb91b201df9ec2c275e4d74a07734fcc39bac9d4fbf2632f4b9d SHA512 53269c8f362ba0415988cfb9889a7af2c67a6788d85fbe4d9008fbed1cc0a3d3bddc2a6049c6d0ba23c28e3ad2d65f240a9085ceaccc5d55d4387e4dd90c5505
diff --git a/dev-java/sbt/sbt-0.13.13.ebuild b/dev-java/sbt/sbt-0.13.13.ebuild
index 7191e9414ff8..65292f4be54a 100644
--- a/dev-java/sbt/sbt-0.13.13.ebuild
+++ b/dev-java/sbt/sbt-0.13.13.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 # repoman gives LIVEVCS.unmasked even with EGIT_COMMIT, so create snapshot
-inherit eutils java-pkg-2 # git-r3
+inherit java-pkg-2 # git-r3
 
 L_PN="sbt-launch"
 L_P="${L_PN}-${PV}"
diff --git a/dev-java/sbt/sbt-0.13.18.ebuild b/dev-java/sbt/sbt-0.13.18.ebuild
index f6976d5d9d1a..c4f3a8c3e8bc 100644
--- a/dev-java/sbt/sbt-0.13.18.ebuild
+++ b/dev-java/sbt/sbt-0.13.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit eutils java-pkg-2
+inherit java-pkg-2
 
 L_PN="sbt-launch"
 L_P="${L_PN}-${PV}"
diff --git a/dev-java/skinlf/Manifest b/dev-java/skinlf/Manifest
index 9a28fdd9e94c..b838330ce1b1 100644
--- a/dev-java/skinlf/Manifest
+++ b/dev-java/skinlf/Manifest
@@ -2,5 +2,5 @@ AUX skinlf-6.7-build.xml 10712 BLAKE2B c9fd2045a56b230ce4acb836a90bed998b39ee2d0
 AUX skinlf-6.7-common.xml 5452 BLAKE2B a71f3553dc85a0a08b6926389a87574133b004d642d28007699eafc51f120bc3e59af860d23d0bf4cfb3cbc3313accaa998b468ddd554b32de405a4c55da8b46 SHA512 0703e8b463d62355aabba1705d7c05aeb8c700c3a494d3898c356f781172dd09e777d1357ddeb0225753b85242f2d15052733c73c5656f263875570a3c4d896d
 AUX skinlf-6.7-image-utils-without-jimi.patch 2935 BLAKE2B e9d8a10a5f5848bb9c1d4b13c8e294907d72b93a98cd69fd6bea89bed997b8aa676f275d4c7244257b5b46092381461a30cd1f8b8d3099e173228d1a41eba493 SHA512 b05e63e4decb26e325c3a902d8f1391c0026c41114146462fa1cb87e9ff5431941a69615da96751689c8f3ff10fb31f277711b355778c621a7a3d38bfecba033
 DIST skinlf-6.7-20060722.zip 827174 BLAKE2B 72ada5c0b04023b0e51778698ce0b93da1d02457837cd5aedcb6f651e231e1c1a9dede2490bc182d18af9849f8f182542f71d6c864e02d4c2abbfc4c8bdab7f5 SHA512 e4df9c6a85b5bbdbd40af177595641a5ad55a5cb16e5a31217fb3f5badd25727e4b48fa78ba2374f4eb55224068807b5bd6df9fba7f2418b7b810b25cf2043b6
-EBUILD skinlf-6.7-r1.ebuild 1352 BLAKE2B a1244046912d197523d77b32b396b673fae9fb94e9198e53f935531ef6a4fe8aff6602509d9dd90aa976c5f4244b1573ad76e752a1b3a5e7f973d7cafa69e6f2 SHA512 dbd5674d2d1fcbb854c7336abd4cd1880a49d1277c119e7a0791c91db5b389cc7bda958d416f464c945b047d603ff7614ee1dbc02b75ae1213ba7c1b24bf3ad6
+EBUILD skinlf-6.7-r1.ebuild 1352 BLAKE2B c51246820585a86b3c16e2a48ede8e5e58152869bdf315a5f36a7b196834f509a8cc7ef77f7fd6d0cc4c5e1c7fdb7b1ec6b146634eaf0b4194de9a2521e26005 SHA512 c11d99cb647f59d5cc02ea4ad6cb2f61159d4cbeba69e5e7459ac1aa123f03c5882da26e8863d1dda42bd6b1f5dc6bacb088d6567927f6efadfee0b7ca41df35
 MISC metadata.xml 230 BLAKE2B f980b23f7e5db048ac5b7b660bd9140a5212c9648c15ffcb566afcd151bb8f136ccbede3513a61cb587ab9bdd793622183b30718465fdb42d22491443ffb7d35 SHA512 476218dbd8032db6ef1b9ff1fe425808b717eb4b19668ffd21fea661bed536104bfb0c0766fd98de7c99be9677af6b17a5209ee70c7e9568e814bc6ed85d6a3e
diff --git a/dev-java/skinlf/skinlf-6.7-r1.ebuild b/dev-java/skinlf/skinlf-6.7-r1.ebuild
index f04ab512d1bc..7d30b4c15a99 100644
--- a/dev-java/skinlf/skinlf-6.7-r1.ebuild
+++ b/dev-java/skinlf/skinlf-6.7-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 JAVA_PKG_IUSE="examples source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 MY_P="${P}-20060722"
 
diff --git a/dev-java/slf4j-api/Manifest b/dev-java/slf4j-api/Manifest
index 0bb6580325a0..386872b99478 100644
--- a/dev-java/slf4j-api/Manifest
+++ b/dev-java/slf4j-api/Manifest
@@ -1,4 +1,3 @@
-AUX 1.7.7-build.xml 8474 BLAKE2B d6651256fe317ca494c30901f8b71c932c58580a26a6f94a49da76377045a17ee096c81f2069728f2ab49409dbf0108d4294c68aeeea4bcc5cc50c2346f7f4b3 SHA512 9810581760b885c9d0cd8c99da566a8d144b2e612a9a66401a9cf9e9868135bca1d8b98b5e5a237acf0d65029ba6e510bbab85c03e36742f3b1ba15380852d95
-DIST slf4j-1.7.7.tar.gz 3031017 BLAKE2B 55020b493f9f0df534d199d86e8d312dcd64831155f6d18d5f2de6f5157ecb20853cc96689e25ded8c7f4f858481567eb67a21a1cf96a7c3a33ed1ddf9aa47eb SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418
-EBUILD slf4j-api-1.7.7.ebuild 1020 BLAKE2B 7b222c87e16da78a1659a11532b92d92cb5f31f959318a8d16c04d0660ac48570f6aed005545a09d00a30ba618c1b948f103f288957d970bc41f8db24f292b44 SHA512 4a693df3997bf91be71a56a5baceb0276a4b8aaa2bb09fa3fb915d35afff981c4781f6d6ccf469e2ce498c150b6b9c726b140ff1dc52d14661705f5ee503b673
-MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
+DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
+EBUILD slf4j-api-1.7.30-r1.ebuild 1366 BLAKE2B c64200dd8cf2359c7b1af7dcb7a0d9fb15e2ef6e06657c6412b2f3516b2abe27717945467f567583300807bc0fddd1f90df4fa60aa2c1b757dd69b1174adf617 SHA512 613c39180fd45c9df7862946d0d1fbfb9591a55e7385dbfa7d6337c1efb0ed718f8c2fa0307d2bc579283efaadad83df1a2d06271fcc3dd6e6bcf6e3e40f4470
+MISC metadata.xml 366 BLAKE2B fcc9f77c9b83f1d612815cd6e9e8814ba364c8407422ec822f0c60ccc2176dc724e826ce9fdbdd7fb1290f669fd332b93a74650628840d30d1dd2d68184d9893 SHA512 628c4e1ed007e31d4b8a3769fb2f4bd5c4f8041d99ef656508927302345a16573713abe0da228546f8a976d8e3e5de4538f838437623149c7f5b14bfee12abd1
diff --git a/dev-java/slf4j-api/files/1.7.7-build.xml b/dev-java/slf4j-api/files/1.7.7-build.xml
deleted file mode 100644
index fdd87b89bfed..000000000000
--- a/dev-java/slf4j-api/files/1.7.7-build.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="slf4j-api-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="slf4j-api-1.7.6"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath"/>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}"
-           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>
-    <delete dir="${maven.build.outputDir}/org/slf4j/impl" />
-    <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}"
-           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>
-  </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="**/AllTest.java"/>
-          <exclude name="**/PackageTest.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/AllTest.java"/>
-          <exclude name="**/PackageTest.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"
-         manifest="${basedir}/target/classes/META-INF/MANIFEST.MF"
-         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"/>
-</project>
diff --git a/dev-java/slf4j-api/metadata.xml b/dev-java/slf4j-api/metadata.xml
index 37998bf40746..801406cdb66a 100644
--- a/dev-java/slf4j-api/metadata.xml
+++ b/dev-java/slf4j-api/metadata.xml
@@ -1,8 +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>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<doc>http://www.slf4j.org/docs.html</doc>
+		<bugs-to>http://www.slf4j.org/bug-reporting.html</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild
new file mode 100644
index 000000000000..b1522d481d56
--- /dev/null
+++ b/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild
@@ -0,0 +1,55 @@
+# 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-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
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.slf4j:slf4j-api:1.7.30"
+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"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+BDEPEND="app-arch/zip"
+
+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"
+
+JAVA_TEST_EXCLUDES=(
+	# java.lang.InstantiationException - not run by upstream anyway
+	"org.slf4j.helpers.MultithreadedInitializationTest"
+)
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# remove org/slf4j/impl/ from the jar file
+	zip -d ${PN}.jar org/slf4j/impl/\* || die "Failed to remove impl files"
+}
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
deleted file mode 100644
index 23430992caad..000000000000
--- a/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
+++ /dev/null
@@ -1,47 +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
-
-DESCRIPTION="Simple Logging Facade for Java"
-HOMEPAGE="http://www.slf4j.org/"
-SRC_URI="http://www.slf4j.org/dist/${P/-api/}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	test? (
-		dev-java/junit:4
-		dev-java/ant-junit:0
-	)"
-
-S="${WORKDIR}/${P/-api/}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-EANT_TEST_ANT_TASKS="ant-junit"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-java_prepare() {
-	cp "${FILESDIR}"/"${PV}"-build.xml build.xml || die
-	find "${WORKDIR}" -iname '*.jar' -delete || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/slf4j-ext/Manifest b/dev-java/slf4j-ext/Manifest
index 68d3b403780d..b3b059507e22 100644
--- a/dev-java/slf4j-ext/Manifest
+++ b/dev-java/slf4j-ext/Manifest
@@ -1,7 +1,9 @@
 AUX 1.7.5-build.xml 4262 BLAKE2B b234c7a2bef328485ec3213bb7af1d1403a8dffa8f4d4b5187a6cbf4b2ab52ad1c3e10295f160d3393c9220f1426b6429a76cb63d3d2775655986019cc091685 SHA512 06b9f3342928c58b10b0dfc70b1f990209da58e14b6293b2d7b7add6db0463698b473d33c305d2469dc96f3d9c8b5cac98e931ddbdcc2c100c82a30c26fa6547
 AUX 1.7.7-build.xml 4262 BLAKE2B b234c7a2bef328485ec3213bb7af1d1403a8dffa8f4d4b5187a6cbf4b2ab52ad1c3e10295f160d3393c9220f1426b6429a76cb63d3d2775655986019cc091685 SHA512 06b9f3342928c58b10b0dfc70b1f990209da58e14b6293b2d7b7add6db0463698b473d33c305d2469dc96f3d9c8b5cac98e931ddbdcc2c100c82a30c26fa6547
+DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
 DIST slf4j-1.7.5.tar.gz 2862186 BLAKE2B b594581435ed4a0aca8730e248cee1f41d6cd36ead03fb0744edb6c2ef42d6dc99e4c7851a212350487fd64db648675ab484c05124cf7f22249d09d4c031b07f SHA512 2ef078f505b626273bd22fe683b4a2527ce2d97b345ffb8cd9f23e7375cb11588623e67e15de90ceacfa02689e40c59749f22e5e0b44b8a9fd7492d3f120d9d7
 DIST slf4j-1.7.7.tar.gz 3031017 BLAKE2B 55020b493f9f0df534d199d86e8d312dcd64831155f6d18d5f2de6f5157ecb20853cc96689e25ded8c7f4f858481567eb67a21a1cf96a7c3a33ed1ddf9aa47eb SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418
+EBUILD slf4j-ext-1.7.30.ebuild 1948 BLAKE2B 42b89c9bb03e813f02759e9ba98988a688b4c8fc651dd1e753495ad831136d23e4cc7fb45866087fb011fc1eb32740fa1b7c208849f6fd66578ecbd82d6bc8ab SHA512 0c9a012187bff4a7f284e802dfed67c550580de627acab73b4ee128666f3cb476bdb989e296ff6453820190d78fd20333bc7198176e8960388028f1b39f395a8
 EBUILD slf4j-ext-1.7.5.ebuild 1129 BLAKE2B 4f9db88e1ffc85cb0a83a096ade025551008c09a0a08d8b10ba40a5f729b6617e26eb6e1d16111f5030ddef1f265caa852f60f042425a4f03cc3535f96159d59 SHA512 9a4d0f93acf858157d59207d6f1e5fc9678a2ec24056743fe57d9d89c3fdda2908cfe125763d05f9b0dde5cfbf8218e01058d71f020117757515d9ab20e47de2
 EBUILD slf4j-ext-1.7.7.ebuild 1133 BLAKE2B 01611669345b83168180d8291a72bd1556d9793c9d13d3edcc3df2c83f0949973f5ec4e497c91cf506cf65506b2c8f1f0b875f93a5a6629d6ef4cd7dbb2853fb SHA512 bf5435e1cca6dc861477cf81489753e59b470694e85d21351abb44ab2d1f9133997e2d896f005b50d50cccaabe4524a8efa0ee4f1f7c952077423635d8aa0e7c
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/slf4j-ext/slf4j-ext-1.7.30.ebuild b/dev-java/slf4j-ext/slf4j-ext-1.7.30.ebuild
new file mode 100644
index 000000000000..2c2711ced4b1
--- /dev/null
+++ b/dev-java/slf4j-ext/slf4j-ext-1.7.30.ebuild
@@ -0,0 +1,71 @@
+# 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-ext/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-ext-1.7.30.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.slf4j:slf4j-ext:1.7.30"
+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/refs/tags/v_${PV}.tar.gz -> slf4j-${PV}-sources.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: slf4j-v_${PV}/${PN}/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.30 -> >=dev-java/slf4j-api-1.7.30:0
+
+CDEPEND="
+	>=dev-java/cal10n-0.8.1:0
+	>=dev-java/commons-lang-2.6:2.1
+	>=dev-java/javassist-3.18.2:3
+	>=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-log4j12:1.7.30 -> >=dev-java/slf4j-log4j12-1.7.30:0
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+	test? (
+		>=dev-java/slf4j-log4j12-1.7.30:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}"
+
+JAVA_GENTOO_CLASSPATH="cal10n,commons-lang-2.1,javassist-3,slf4j-api"
+JAVA_SRC_DIR="slf4j-v_${PV}/${PN}/src/main/java"
+JAVA_RESOURCE_DIRS=(
+	"slf4j-v_${PV}/${PN}/src/main/resources"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,slf4j-log4j12"
+JAVA_TEST_SRC_DIR="slf4j-v_${PV}/${PN}/src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+	"slf4j-v_${PV}/${PN}/src/test/resources"
+)
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
diff --git a/dev-java/slf4j-log4j12/Manifest b/dev-java/slf4j-log4j12/Manifest
index 8d7f6b779ab0..33f7d3c6aaea 100644
--- a/dev-java/slf4j-log4j12/Manifest
+++ b/dev-java/slf4j-log4j12/Manifest
@@ -1,4 +1,3 @@
-AUX slf4j-log4j12-1.7.7-maven-build.xml 10522 BLAKE2B 3396e8ae9452a54072457696261ac59745fbf11ca10e240b9b81de7e37441cf83185115b8d37d2662bffca02a7ee4e99c90ba9c1f02878c3aa0fc2706ce836f4 SHA512 169e6b50e5ec5e44047dae2be9144e1626e2a5e95a0fb92c61e01164804433887e7e8b1c0108ef3bcc7dbbadeff9eab86c85977572a80825bdb5ac2914d65ce9
-DIST slf4j-1.7.7.tar.gz 3031017 BLAKE2B 55020b493f9f0df534d199d86e8d312dcd64831155f6d18d5f2de6f5157ecb20853cc96689e25ded8c7f4f858481567eb67a21a1cf96a7c3a33ed1ddf9aa47eb SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418
-EBUILD slf4j-log4j12-1.7.7.ebuild 1193 BLAKE2B aa9c7265313e458f004300b2874611bda741694e60a50ccf53cac19da0adc9d46eea7f315f94162c6b9ba86f7bee0f317e84d21ec56b2b950f0cbf77fc595c01 SHA512 156043e2934400584932ded6a3a3fdc9c8cafba79dc85dbb594663f2947ca36138881295086a63caeac826ecd77b0388587c1f320fd7654f53200c62b42f1a05
+DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
+EBUILD slf4j-log4j12-1.7.30.ebuild 2000 BLAKE2B fb2d9e89ccfc18581fa98e602532ea3086d74ce6a8b42c438f5396152d42fe28832cbc7508194b5aa5b031abde8133c729b895306db2354e8950f7d8bb34ebce SHA512 80a141c03b23b4652f07489a8a8dcf76a635c32daab75b28873362dc37737d1642da68b625cae56b3aeeb20bfa9587068c6650205b8f7bf11b15f0e45047937c
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/slf4j-log4j12/files/slf4j-log4j12-1.7.7-maven-build.xml b/dev-java/slf4j-log4j12/files/slf4j-log4j12-1.7.7-maven-build.xml
deleted file mode 100644
index e88e8b290cc4..000000000000
--- a/dev-java/slf4j-log4j12/files/slf4j-log4j12-1.7.7-maven-build.xml
+++ /dev/null
@@ -1,241 +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 3/12/14 1:54 AM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="slf4j-log4j12-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="slf4j-log4j12-1.7.7"/>
-  <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}/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar"/>
-    <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar"/>
-    <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.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"/>
-  </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}" 
-           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" 
-          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}"/>
-    </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="**/AllTest.java"/>
-          <exclude name="**/PackageTest.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/AllTest.java"/>
-          <exclude name="**/PackageTest.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" 
-         manifest="${maven.build.resourceDir.0}/META-INF/MANIFEST.MF" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-</project>
diff --git a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.30.ebuild b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.30.ebuild
new file mode 100644
index 000000000000..cd3336b11a69
--- /dev/null
+++ b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.30.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom slf4j-v_1.7.30/slf4j-log4j12/pom.xml --download-uri https://github.com/qos-ch/slf4j/archive/refs/tags/v_1.7.30.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild slf4j-log4j12-1.7.30.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.slf4j:slf4j-log4j12:1.7.30"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SLF4J LOG4J-12 Binding"
+HOMEPAGE="https://www.slf4j.org"
+SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf4j-${PV}-sources.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+
+# slf4j-v_1.7.30/slf4j-log4j12/src/test/java/org/slf4j/impl/Log4j12MultithreadedInitializationTest.java:35: error: cannot find symbol
+# import org.slf4j.helpers.MultithreadedInitializationTest;
+#                         ^
+#   symbol:   class MultithreadedInitializationTest
+RESTRICT="test"
+
+# Common dependencies
+# POM: slf4j-v_${PV}/${PN}/pom.xml
+# log4j:log4j:1.2.17 -> >=dev-java/log4j-1.2.17:0
+# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
+
+CDEPEND="
+	>=dev-java/log4j-1.2.17:0
+	>=dev-java/slf4j-api-1.7.30:0
+"
+
+# Compile dependencies
+# POM: slf4j-v_${PV}/${PN}/pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
+# test? org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+	test? (
+		>=dev-java/slf4j-api-1.7.30:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}"
+
+JAVA_GENTOO_CLASSPATH="log4j,slf4j-api"
+JAVA_SRC_DIR="slf4j-v_${PV}/${PN}/src/main/java"
+JAVA_RESOURCE_DIRS=(
+	"slf4j-v_${PV}/${PN}/src/main/resources"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,slf4j-api"
+JAVA_TEST_SRC_DIR="slf4j-v_${PV}/${PN}/src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+	"slf4j-v_${PV}/${PN}/src/test/resources"
+)
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
diff --git a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild
deleted file mode 100644
index e3f0c750c20c..000000000000
--- a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild
+++ /dev/null
@@ -1,53 +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
-
-DESCRIPTION="Simple Logging Facade for Java (SLF4J) log4j bindings"
-HOMEPAGE="http://www.slf4j.org/"
-SRC_URI="http://www.slf4j.org/dist/${P/-log4j12/}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-java/log4j:0
-	dev-java/slf4j-api:0"
-
-RDEPEND="${COMMON_DEPEND}
-	>=virtual/jre-1.6"
-DEPEND="${COMMON_DEPEND}
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/hamcrest-core:0
-		dev-java/junit:4
-		dev-java/ant-junit4:0
-	)"
-
-S=${WORKDIR}/${P/-log4j12/}/${PN}
-
-EANT_GENTOO_CLASSPATH="log4j,slf4j-api"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},hamcrest-core,junit-4"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-maven-build.xml build.xml || die
-	find "${WORKDIR}" -iname '*.jar' -delete || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/slf4j-nop/Manifest b/dev-java/slf4j-nop/Manifest
index 5e721245d5a0..8929d238eeae 100644
--- a/dev-java/slf4j-nop/Manifest
+++ b/dev-java/slf4j-nop/Manifest
@@ -1,4 +1,3 @@
-AUX 1.7.7-build.xml 4261 BLAKE2B 400a954f4214f7282c4c0fd3b5dedb4af8703f58fa817865c14ec8e79aebaaaec957183285550c68f346534795095dcb3de239f2c43c667eea206bb8bd04ae95 SHA512 dc29b7acbc159eb592417a9457875d9f7c33ac21df87885f6a3faa8047f68550f16f2b8a24f5b8efaa123b1c8507ec6cd9d61ed154aff0406bdb008d62132120
-DIST slf4j-1.7.7.tar.gz 3031017 BLAKE2B 55020b493f9f0df534d199d86e8d312dcd64831155f6d18d5f2de6f5157ecb20853cc96689e25ded8c7f4f858481567eb67a21a1cf96a7c3a33ed1ddf9aa47eb SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418
-EBUILD slf4j-nop-1.7.7.ebuild 1080 BLAKE2B 066eed03353322d1c0f6ebe75120f887fc5809f29549297e009bb1f8ec5725b6d02b5d87dceb68f9b8c184d2799489b1a138f9169cbff3ff5a7ad3e94b1ebaed SHA512 d2436dcb4b5118743c425445d56a16073d0c68322fdf57262643119e84592ab9f0a2439a6308f3e6edd6d521284fb4722cf39f2678b2d877fb57048152b32b75
+DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
+EBUILD slf4j-nop-1.7.30.ebuild 1432 BLAKE2B 074c5051999ae6c2d11ef083ae5db626f54180cf18464952663f6796223406c1dff385fba375ca22341165a5eb838669d4bf529a349e138dd7b06c6dcc55bfbe SHA512 adcd49eaff11a1a3a9d9fe2136b0843f7c56042ed72cc8e16e90f8bca6d24549a157201b8fa42dce514e36883572da9b45bcfd0a304507cc4676562116f329aa
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/slf4j-nop/files/1.7.7-build.xml b/dev-java/slf4j-nop/files/1.7.7-build.xml
deleted file mode 100644
index 9d898d340d34..000000000000
--- a/dev-java/slf4j-nop/files/1.7.7-build.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="slf4j-nop-from-maven" default="jar" basedir=".">
-	<property file="${user.home}/.m2/maven.properties" />
-	<property file="maven-build.properties" />
-
-	<property name="maven.build.finalName" value="slf4j-nop" />
-	<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" />
-
-	<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.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>
-
-	<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>
-
-	<target name="test" depends="compile-tests" 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="**/AllTest.java" />
-					<exclude name="**/PackageTest.java" />
-				</fileset>
-			</batchtest>
-			<batchtest todir="${maven.test.reports}" if="test">
-				<fileset dir="${maven.build.testDir.0}">
-					<include name="**/${test}.java" />
-					<exclude name="**/AllTest.java" />
-					<exclude name="**/PackageTest.java" />
-				</fileset>
-			</batchtest>
-		</junit>
-	</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="jar" 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>
-</project>
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild
new file mode 100644
index 000000000000..97c5dc067abb
--- /dev/null
+++ b/dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild
@@ -0,0 +1,58 @@
+# 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-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 ~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.7.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild
deleted file mode 100644
index 417575df7e97..000000000000
--- a/dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild
+++ /dev/null
@@ -1,51 +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="Simple Logging Facade for Java"
-HOMEPAGE="http://www.slf4j.org/"
-SRC_URI="http://www.slf4j.org/dist/${P/-nop/}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-CDEPEND="dev-java/slf4j-api:0"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)
-	${CDEPEND}"
-
-S="${WORKDIR}/${P/-nop/}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="slf4j-api"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-EANT_TEST_ANT_TASKS="ant-junit"
-
-java_prepare() {
-	cp -v "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die
-	find "${S}" -name "*.jar" -delete || die
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
-	use source && java-pkg_dosrc "${S}"/src/main/java/org
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/slf4j-simple/Manifest b/dev-java/slf4j-simple/Manifest
index 6f2f42baac24..52486715be4a 100644
--- a/dev-java/slf4j-simple/Manifest
+++ b/dev-java/slf4j-simple/Manifest
@@ -1,4 +1,3 @@
-AUX 1.7.7-build.xml 8491 BLAKE2B 585e41d7760e2d05fee17fb4c35de203eced8f9298bfd880d5f2e4a698cd78f8e00488227dad96dba805ce646f2d2fd1444fb87e29f929fc2cb96d919efd5c1d SHA512 8961b303c86000433af761d448c016c13d105d99547e67ace24bdb2f9f95427bdf4a0d4e02fdaefced1a574d2968f9af7e4429e33fb85d1ceb8439036c888917
-DIST slf4j-1.7.7.tar.gz 3031017 BLAKE2B 55020b493f9f0df534d199d86e8d312dcd64831155f6d18d5f2de6f5157ecb20853cc96689e25ded8c7f4f858481567eb67a21a1cf96a7c3a33ed1ddf9aa47eb SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418
-EBUILD slf4j-simple-1.7.7.ebuild 1120 BLAKE2B 5a068ac3357e5d18ae85f2d210ba2f83a68d05395e176b6ab1a5d8a4851534051a631bbd2d5b97f5ca38f36073a901035c64e4d60390eb42e1f05ca119a8d67c SHA512 06e6dfdb72ad88e9eb69fb97e093b479cf2cfc2d2168ad37573c430f2edd92677473f97a8a8444430e7acfdfd4e38e15fd05e037b342e2a6070357fb00e15786
-MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
+DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
+EBUILD slf4j-simple-1.7.30-r1.ebuild 2030 BLAKE2B 4eabd1b02aa23d49ed2d11e4caf1eab79abee7f8548451fa1a902d34cdb2ae620fbcec570456374270fbb948ade6b429c10c6e9981c416b320582a142918bee1 SHA512 f01fccb8e116c8e8ee5c08334ca9165404dab6585ce8297f8a2494b30ca33849804d58e6318fec2a3e16c66d316f1add6820b41469223e66020e8ca47fa8db6f
+MISC metadata.xml 366 BLAKE2B fcc9f77c9b83f1d612815cd6e9e8814ba364c8407422ec822f0c60ccc2176dc724e826ce9fdbdd7fb1290f669fd332b93a74650628840d30d1dd2d68184d9893 SHA512 628c4e1ed007e31d4b8a3769fb2f4bd5c4f8041d99ef656508927302345a16573713abe0da228546f8a976d8e3e5de4538f838437623149c7f5b14bfee12abd1
diff --git a/dev-java/slf4j-simple/files/1.7.7-build.xml b/dev-java/slf4j-simple/files/1.7.7-build.xml
deleted file mode 100644
index f91d565e170a..000000000000
--- a/dev-java/slf4j-simple/files/1.7.7-build.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="slf4j-simple-from-maven" default="package" basedir=".">
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="slf4j-simple-1.7.6"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}"
-           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}"
-           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="**/AllTest.java"/>
-          <exclude name="**/PackageTest.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/AllTest.java"/>
-          <exclude name="**/PackageTest.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"
-         manifest="${maven.build.resourceDir.0}/META-INF/MANIFEST.MF"
-         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"/>
-</project>
diff --git a/dev-java/slf4j-simple/metadata.xml b/dev-java/slf4j-simple/metadata.xml
index 37998bf40746..801406cdb66a 100644
--- a/dev-java/slf4j-simple/metadata.xml
+++ b/dev-java/slf4j-simple/metadata.xml
@@ -1,8 +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>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<doc>http://www.slf4j.org/docs.html</doc>
+		<bugs-to>http://www.slf4j.org/bug-reporting.html</bugs-to>
+	</upstream>
 </pkgmetadata>
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
new file mode 100644
index 000000000000..2bbc08d8cc79
--- /dev/null
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.30-r1.ebuild
@@ -0,0 +1,74 @@
+# 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 ~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.7.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
deleted file mode 100644
index 792d3f30f513..000000000000
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
+++ /dev/null
@@ -1,52 +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
-
-DESCRIPTION="Simple Logging Facade for Java"
-HOMEPAGE="http://www.slf4j.org/"
-SRC_URI="http://www.slf4j.org/dist/${P/-simple/}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-java/slf4j-api: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}/${P/-simple/}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="slf4j-api"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-EANT_TEST_ANT_TASKS="ant-junit"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-java_prepare() {
-	cp "${FILESDIR}"/"${PV}"-build.xml build.xml || die
-	find "${S}" -name "*.jar" -delete || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index 54e5970060bb..589c8a95c95f 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1,3 +1,6 @@
+AUX snakeyaml-1.28-fix-test-check.patch 728 BLAKE2B 3c2e1607f03cfb00dba8808fec19b7a705afcc6ad8b1a3c2ee9b2b38e05e0e4e50b00413e5da236827ba4d7ca715b27158d0354dd7ce3950645a2a3bc9057540 SHA512 81bd69b9780e75df4d0964119a0c15684b54533ce2eebc94de3d481b7cf521b26f82f62279eabf3fc0e41eefb9c1648fb2700d6f07ae3b1fd99c6a5f55cbecd8
+DIST asomov-snakeyaml-b28f0b4d87c6.tar.gz 397832 BLAKE2B 054c228cd739e0d7ae89227cba7ae1aba76e5b6a7aae4915a765816d916ab3a47e80d6c2795a5e9bcaee96a70c1751fb9e67523e7faed2db5a6d2123d773d04a SHA512 2d19aee8c3aef2c4c300382451c1241dd2452180fe28c39eb9fe1bbc9d6c615bb8504535d3cf1cf5fe2ad55def8c43b709e8ecd97f760403cfaee7db977f074c
 DIST snakeyaml-1.16.tar.bz2 234954 BLAKE2B dea06c3501ceab4e92b4d125dc882ce7b7773d67ac5526fdf39fafb421f339fe892cfd3f8e80e413aa080fecbc94425842ccabd099d97e1c705eab7025c489e9 SHA512 77ef0b1fa2ebe7ab1618745c407436ac6965159e29e1271b0d571006b967bcd94658eb3a8047180ea7c3160eb66ecbac1f24414537a24a81c11fb735ce65e3a4
 EBUILD snakeyaml-1.16.ebuild 1330 BLAKE2B bc4ec2b97f5e12b611340669485f71e44fe56905c554761dd9628f14bfb8d501e57d2f322b8d0ef8bc8159720e05d643f7cc5626358ec71e029bd4fb73497608 SHA512 65553fab3d53a9feba2dbf1a5754a68710d796b8d5f182696869aa2c6224291b81156753c8cce6807c9c622b214bf9ab4dba70cdffdfdf36ecc6a0ffe7bf32a5
+EBUILD snakeyaml-1.28-r1.ebuild 2949 BLAKE2B 1d7e3c60472fe80e9d5b2a2bc8f22da593aac2c9fd395e48934a51f3aaa06aea6a06dfb7a90d6d8333387469f2e044ab2546ac7e717d1824a979fd2e2294abd8 SHA512 5baa8e3330d69f29d59f3f7fee4813955968b32c817d095333de39933ecbfc929da1ec4848ed7503d881a09bf77f1c31506564a34dd32e874ba17642a4f73bb9
 MISC metadata.xml 320 BLAKE2B f5e0df5b735f9728165a2b8a6cd9c5f6d0142878f75ace80705d73e6948654f4761ef4fa4715b23ae4f5d97ed25e2ab6aa72582a80790a3f7a13d8c59f73ad40 SHA512 149372d821a11d3dfce7ec38ddb98c9b5b5e64c513fdd1e27b74dce17f398eec6d24b5a61ad62fb5e6e0ee31f206f1ed005db953f5f2358177f1a1d56420d5cc
diff --git a/dev-java/snakeyaml/files/snakeyaml-1.28-fix-test-check.patch b/dev-java/snakeyaml/files/snakeyaml-1.28-fix-test-check.patch
new file mode 100644
index 000000000000..fe903380fd61
--- /dev/null
+++ b/dev-java/snakeyaml/files/snakeyaml-1.28-fix-test-check.patch
@@ -0,0 +1,14 @@
+diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java
+index e87f330..28c836b 100644
+--- a/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java
++++ b/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java
+@@ -69,7 +69,8 @@ public class BillionLaughsAttackTest {
+             map.toString();
+             fail("Expected overflow");
+         } catch (Throwable e) {
+-            assertTrue(e.getMessage().contains("heap"));
++            final String message = e.getMessage();
++            assertTrue(message == null || message.contains("heap"));
+         }
+     }
+ 
diff --git a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
new file mode 100644
index 000000000000..f7a00cefc146
--- /dev/null
+++ b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://bitbucket.org/asomov/snakeyaml/get/snakeyaml-1.28.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild snakeyaml-1.28-r1.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.yaml:snakeyaml:1.28"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_COMMIT="b28f0b4d87c6"
+MY_P="asomov-snakeyaml-${MY_COMMIT}"
+
+DESCRIPTION="YAML 1.1 parser and emitter for Java"
+HOMEPAGE="https://bitbucket.org/asomov/snakeyaml"
+SRC_URI="https://bitbucket.org/asomov/${PN}/get/${P}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? commons-io:commons-io:2.5 -> >=dev-java/commons-io-2.4:1
+# test? joda-time:joda-time:2.10.1 -> >=dev-java/joda-time-2.10.10:0
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.1:4
+# test? org.apache.commons:commons-lang3:3.4 -> >=dev-java/commons-lang-3.4:3.4
+# test? org.apache.velocity:velocity:1.6.2 -> >=dev-java/velocity-1.7:0
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		>=dev-java/commons-io-2.4:1
+		dev-java/commons-lang:3.6
+		>=dev-java/joda-time-2.10.10:0
+		>=dev-java/velocity-1.7:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-test-check.patch"
+)
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="commons-io-1,joda-time,junit-4,commons-lang-3.6,velocity"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	"examples.spring.TestEntityDescription"	# Invalid test class
+	"org.yaml.snakeyaml.constructor.TestBean1"	# Invalid test class
+	"org.yaml.snakeyaml.introspector.TestAnnotation"	# Invalid test class
+	"org.yaml.snakeyaml.introspector.TestBean"	# Invalid test class
+	"org.yaml.snakeyaml.ruby.TestObject"	# Invalid test class
+	"org.yaml.snakeyaml.issues.issue154.TestBean"	# Invalid test class
+	"org.yaml.snakeyaml.issues.issue193.TestYaml"	# Invalid test class
+
+	# initializationError(org.yaml.snakeyaml.constructor.TestBean)
+	# java.lang.IllegalArgumentException: Test class can only have one constructor
+	"org.yaml.snakeyaml.constructor.TestBean"
+
+	# testTemplate1(org.yaml.snakeyaml.emitter.template.VelocityTest)
+	# java.lang.NullPointerException
+	"org.yaml.snakeyaml.emitter.template.VelocityTest"
+
+	# yamlClassInYAMLCL(org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest)
+	# java.lang.ClassNotFoundException: org.yaml.snakeyaml.Yaml
+	"org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest"
+
+	"examples.spring.TestEntity"	# Invalid test class
+
+	"org.pyyaml.PyImportTest"	# No tests found in org.pyyaml.PyImportTest
+)
+
+src_prepare() {
+	default
+	java-utils-2_src_prepare
+}
+
+src_test() {
+	export EnvironmentKey1="EnvironmentValue1"
+	export EnvironmentEmpty=""
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/sparsebitset/Manifest b/dev-java/sparsebitset/Manifest
new file mode 100644
index 000000000000..7b70957455c0
--- /dev/null
+++ b/dev-java/sparsebitset/Manifest
@@ -0,0 +1,3 @@
+DIST sparsebitset-1.2.tar.gz 1669439 BLAKE2B abfd88fb21f72d22bbb1f7bff11bd2a9b4e2af84689cbe8013f27f1f138512ecf843a60b8c5c196b622d024614e7f197b349a6cd510eb1c17bd757f7c1a0d90d SHA512 0c7c182556240886e0732626561401aa8695fd46ba90e5e95c5b28c90abaf5f6fd4c3b791171cdde71f61111c6b08ae8f56de105779f71d0448635cbe3b0b247
+EBUILD sparsebitset-1.2.ebuild 1048 BLAKE2B ea084644f3f3206d025cf1509be612f5fce41b6b74e5bfed25f7357b47ef4a7be79a2d1fda58d097b27ac75d710257c8ca0075c0c8e17e855129813bcbfcfa3e SHA512 b17658632de742c2ec00d14a28ceccea8c5c1305a1fb4875ce0964c07409a0f02af70f7da499cbf79ba0e0902dc1352afc49b8a186a8e58a25939eab7acbff72
+MISC metadata.xml 385 BLAKE2B 7c290911ac6a6ab2657efba2c525b9b5f72cdb730f3612f452ac97d635a51784421e43c64a601fd7c5a73a25642c7c7c2cd550553de34d6bf6d2888571a4c395 SHA512 74d05d5f3c3595a9a686e5d807910ed1d73ff29c4bcf875dc08ec2e05c7e0495b48208d81e075f8fe7d0ca9de6420acb506684ac5e673e33086e0f7276d1d940
diff --git a/dev-java/sparsebitset/metadata.xml b/dev-java/sparsebitset/metadata.xml
new file mode 100644
index 000000000000..aaa5eb8a4b75
--- /dev/null
+++ b/dev-java/sparsebitset/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>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">brettwooldridge/SparseBitSet</remote-id>
+		<bugs-to>https://github.com/brettwooldridge/SparseBitSet/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/sparsebitset/sparsebitset-1.2.ebuild b/dev-java/sparsebitset/sparsebitset-1.2.ebuild
new file mode 100644
index 000000000000..5e8549ea0ab3
--- /dev/null
+++ b/dev-java/sparsebitset/sparsebitset-1.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/brettwooldridge/SparseBitSet/archive/refs/tags/SparseBitSet-1.2.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild sparsebitset-1.2.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.zaxxer:SparseBitSet:1.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An efficient sparse bitset implementation for Java"
+HOMEPAGE="https://github.com/brettwooldridge/SparseBitSet"
+SRC_URI="https://github.com/brettwooldridge/SparseBitSet/archive/refs/tags/SparseBitSet-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/SparseBitSet-SparseBitSet-${PV}"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/spec-alpha/Manifest b/dev-java/spec-alpha/Manifest
index 239001a0b178..6fd763098adb 100644
--- a/dev-java/spec-alpha/Manifest
+++ b/dev-java/spec-alpha/Manifest
@@ -1,6 +1,8 @@
 AUX build.xml 1397 BLAKE2B 12b251335c0b4303eced7a3263d20fb69da00d4856bc5068b8d91f0fcba6fcee9b5f1ae4374d8c4e804799079286c32886eca5a29e22c851186e2722704e44cd SHA512 d5e493a970774888aea8df15614068a533da6c30f76ef8628b8848782ba9b9bc5b6b54271e569458d7f6468af68ab454b7926266e9fa88389b7b3eff50e66e46
 DIST spec-alpha-0.1.143.tar.gz 35568 BLAKE2B f63fdd2b3c83dbd3936e36ff57b6ea399b7173fe805c60a6ecbd8e4aef5942f051a8551c259d89885a202c20045f67921b66c4dc9e361aacc8903c6542d7c7b5 SHA512 87887d72bc7343f96fad937b90feb4cc1be1eeaad8b7c01ae090ebe5cb17c30612e63797ea9eb39e6fe4c07870dcba9e153a98777d372923e95163f3219a976c
 DIST spec-alpha-0.2.176.tar.gz 37055 BLAKE2B 0588772e4a47a5b122984abefaf5ef2d0fffbacaf277b22737c94889e646c16a029017d405b72b829e88bcf03b12f689cb2053884b24b47193a26978ab54a318 SHA512 decf0dbff09bf8ee12503e6117ab635b98cd8dd2c389acf7aeebf00f32b5fd8250d66c2ec54cfe5da45e727e39480ae738a3ee7fcad71684d8c3acf464fe21e7
+DIST spec-alpha-0.2.194.tar.gz 39101 BLAKE2B 86de07fd83495b72d3b7d85b803ee9ecafba9a72d8541b5c62f22ad32d4e16b0c7be758ea8d30b743eba6fe994e09898e2f59b2b720913e7e1ab3732b496423f SHA512 3170883c1d62acf9af1435a5ca1ced34a318c53d1cd443d58a74afdcae4888553b9dba91fb81ccea8824c3a0c2396a0efbfaeb8ab408d8bbcf1aea0d3da9c82e
 EBUILD spec-alpha-0.1.143.ebuild 869 BLAKE2B d901bd0b70f0312d0e4d581b45d7d6350265200533dd6bf157705aad03ea3878e772a8995d0054cdb928a8ee45d92d2c47c46c2989472e8f7500c641729f649e SHA512 efc9183c36885f20caba13f61514afc0f2b05bb663bb4790c779be15a8c82a8a08b99a64ff30c8a37f673fa1c55dfefa4a267a08adbffe30f0057aaf8483bebf
 EBUILD spec-alpha-0.2.176.ebuild 869 BLAKE2B a67b4f7a48c6ec63f39c474e57734c255be135ce0b400f8e7c958f1dadd7f7a7d46aae1fd4d7d298fb7083fcebecde093f987a6426c0b8975c2b5176530311bd SHA512 ffb2c5f5fae16ca5f18bd439b4087eda56f0c4aabaffbafea253d76e10806790558c573716cba07c29fcf2b6fa03a12c5a46525654e0d96c7346a9a16205a2ba
+EBUILD spec-alpha-0.2.194.ebuild 810 BLAKE2B d5924c9ba50ca29a1288b5eb288eb7e4253373768b428df7e780ec5cc42ba33c6df3f54f3792c018b8790cf80c7b6fcb1513850c3b1df9ba750b197f11baf6dc SHA512 c3ae5f4b207762968ae58db54d574f85f649909feb110532480679852f50c493c92ef4c31b1d10823b89c9b671e169f00067154084d066d53bb5267cc8a661a4
 MISC metadata.xml 475 BLAKE2B 990e8c578a8ef2de5631891132aff9a4e1cf481ad51dfdebe13833f2064dd785d07a01b6b8d1dee160146f667df8b27d62adbcb1d30aab5b4959ada49c67287e SHA512 6516536797ad86d28d3f5837506dc9e3bf8b99287b1d984ead967fac98fa9ff555b5ea878de354aec0e5a6c97691eae397a8f13df7371d20cc40ba359fe98112
diff --git a/dev-java/spec-alpha/spec-alpha-0.2.194.ebuild b/dev-java/spec-alpha/spec-alpha-0.2.194.ebuild
new file mode 100644
index 000000000000..cab6d8cad0c7
--- /dev/null
+++ b/dev-java/spec-alpha/spec-alpha-0.2.194.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 java-ant-2
+
+EGIT_REF="fb55378"
+
+MY_P=spec.alpha-${PV}
+
+DESCRIPTION="A Clojure library to describe the structure of data and functions"
+HOMEPAGE="https://clojure.org/ https://github.com/clojure/spec.alpha"
+SRC_URI="https://github.com/clojure/spec.alpha/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0.2"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND="
+	dev-java/ant-core:0
+	>=virtual/jdk-1.8:*
+"
+
+S="${WORKDIR}/spec.alpha-${MY_P}"
+
+EANT_TASKS="jar"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${MY_P}"
+
+src_prepare() {
+	default
+	cp "${FILESDIR}/build.xml" . || die
+}
+
+src_install() {
+	java-pkg_newjar "target/${MY_P}.jar"
+	einstalldocs
+}
diff --git a/dev-java/spymemcached/Manifest b/dev-java/spymemcached/Manifest
index b96dcc062dda..9234e71e07aa 100644
--- a/dev-java/spymemcached/Manifest
+++ b/dev-java/spymemcached/Manifest
@@ -1,3 +1,3 @@
 DIST spymemcached-2.9.1-sources.jar 305723 BLAKE2B fb79ecc9d808a47da09e749bb54ef73b40638735a04e827c8b0487a8e44c5baf1daf4ddd434920b9d97ee81f65baefaf23f36f14da79d0ceeaa405938603a32f SHA512 3d7b593a095094e4b564eef8112f8f9ad0e812f313b5a943e669115c1aa4662795e9321a75e030ab7bb954a810ffb92c399041ed4b29e8f703aecf80d7603614
-EBUILD spymemcached-2.9.1-r1.ebuild 710 BLAKE2B 7150c81b8f97da0bf6264affa9a625359e98dd0660309b40073e9103c05b979349f8bb8f03bb40b4f2026a59cc58c3021cad2eb34dcefd0e580d46a61debbd11 SHA512 771319e8fc31a81f2d5e1ee12a8018c4ab896fcb45d64041b8c623e8409d8da0dcdcf4171fcb5620da50a549eb0f66232641e3018a0d6d95035bd54ba8bd17ef
+EBUILD spymemcached-2.9.1-r1.ebuild 700 BLAKE2B 5c873009ac449c10b0db409f4ec407309a1e9209494b39ab860f2862b31a6118ca004335be5d3d06121032bd027e5ac2fc96a89965553ede2cf9b1b7e955dbc9 SHA512 141808b4ea57d7f0a887f17a2cc066d2fb1bf5677158a5de6558c85fb8b5593e977c94524b5fee47cdc5e446c2a1db2477e1126cc7022d25e6745398b0f40c4d
 MISC metadata.xml 318 BLAKE2B e35924d7b1c657bbc0a445352156bc420ba501ad86c0b6812122c2780d8dec5b1d704062c24c0049ce0d23ce01c1187d1c706f07b3b9b125bc282857232a9850 SHA512 67100a68ab4d88b02e279fb87b835a6fef444a8893cba844d1217784379830e0d73df6625ed4fd9e782fe85d665b7ef0f3e3d178266074bfa266128667f9867e
diff --git a/dev-java/spymemcached/spymemcached-2.9.1-r1.ebuild b/dev-java/spymemcached/spymemcached-2.9.1-r1.ebuild
index bb946411bb78..7268e56ee81f 100644
--- a/dev-java/spymemcached/spymemcached-2.9.1-r1.ebuild
+++ b/dev-java/spymemcached/spymemcached-2.9.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A simple, asynchronous, single-threaded memcached client written in java"
 HOMEPAGE="https://code.google.com/p/spymemcached/"
diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index 506e985be74e..d19fe70405c8 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -3,6 +3,6 @@ AUX 4.0.8-test-fixes.patch 1503 BLAKE2B 3d5e19d7084e0553b0d94fcfc3278bda55744271
 DIST antlr-3.5.2-complete.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0 SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
 DIST stringtemplate-3.2.1.tar.gz 1039803 BLAKE2B 6f6ab7e1d5bc1e2bb01960c0baaea0bd07267af26ff481c1e1586392e0a8938676cab3e54c22b2804bed2806befd938d4d09715de45cea12212e424e2e30fc4c SHA512 fe4c50584dd3695514034845ba7b8fa300cf582b6b302797afadce990f2665759323f6a29ece1bc07dfab244cc00455b4106fe3ad6851165edbb8736ad7ec714
 DIST stringtemplate-4.0.8.tar.gz 147305 BLAKE2B 0c09326f4eecfc86db8588a9b8db801bac8d8e128f8ef004a3691813d1dfcbd1e397acd5cad47e4c9d44d7ee8c17b8f6b66386fb897e4137df43dc46f46dc3f3 SHA512 21e4936356a6d374bf92645f09351a495a5900a408ead8dce1903ed81d7fc70eb4b44b206b587b05ed87edb2d4792c1cf72907a9cb527e18373ba2e5f31b5724
-EBUILD stringtemplate-3.2.1-r1.ebuild 1476 BLAKE2B c23c3f8c720f63050495e3d41c9ea65c384f205a4b56a73e4a18255383b285255a4b7539083cb4d9fc1f1bc06e7a72b03bde88147f8d2d4bc9206aa528d5c02c SHA512 0a78ce3012be779491f11ac47fb0543dd0e96c971e5dd23258b27c82b1cc79d376dffefca33cf443305f08706eb2e35007b5dd345a19b3be6103c5c2e5b5c3ef
-EBUILD stringtemplate-4.0.8.ebuild 2179 BLAKE2B dbd3644e8503f0cf9130665bd23f180f3d196d74fa1ade4ef386127b772b82ee10b33ed514b0bd127e1d60705c308c7478da8419de2608637211b4ace0248b6e SHA512 b4ab6b0f73ecdb1764000372ce909da1c52fa4b02359a853f4eab6c7bdc47d8de8258070d1be596ca48eb58934c288ee8a0f0efaef006618a278e035107e029e
+EBUILD stringtemplate-3.2.1-r1.ebuild 1476 BLAKE2B 24dbc49a93f0e63d886adbb12c06769b6015554eb1c74756a6f48642e92f3489b06e4524287503c2bdafa7bff4349c419afff66710ace2b425feeec593214fbe SHA512 fd1ff2ae25cbcaf37a1f193f8791415f8605e548a2e3f6fe5e310fad8b8720f19d279935c927589829b5957bceea686076f750d5f8d94d648ae9cd6158aece99
+EBUILD stringtemplate-4.0.8.ebuild 2179 BLAKE2B 4c75c9863cfef6fc6baf77ec421f4c9e4a484b1454f473c7b5e86c7cc9fa8518a7dea32c13d288d7180849cdd5a817da5a54c7eca85756f22a5a32666d72edf0 SHA512 e903e57beb2a5975715873b2f13a4c83f2cf65304f36d37c8028e5f7782ed214bcccd75aabe321d6bfb88f9ea5d81facbdf160bb7f092e4bd0385061656afb80
 MISC metadata.xml 322 BLAKE2B a9d59ec72b635debef4618887bd9389b4db013017a0a952b28b5f07e7a2caef78976b51de098085b94cc16046fe5642a5b6da9e2a197aa51d39daac6b25f1c19 SHA512 76ac99f8c99d34b533c08ae008a9eb2ac2a3b64589df3d43460c93b78c3c53c45b944837cc7f5514e90afc2117554fb545306e74a2b2bcb5c8339c656998c449
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
index 0b96d950c8a1..9b357c47389c 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit epatch java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A Java template engine"
 HOMEPAGE="https://www.stringtemplate.org/"
diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
index c29b32ef39e9..30f96503ef2e 100644
--- a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,7 +6,7 @@ EAPI="5"
 ANTLR3="3.5.2"
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit epatch java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A Java template engine"
 HOMEPAGE="https://www.stringtemplate.org/"
diff --git a/dev-java/sun-jai-bin/Manifest b/dev-java/sun-jai-bin/Manifest
index f1283bef84e3..892eaed76c7b 100644
--- a/dev-java/sun-jai-bin/Manifest
+++ b/dev-java/sun-jai-bin/Manifest
@@ -1,5 +1,5 @@
 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-r1.ebuild 1099 BLAKE2B 0257abd4b7fd290f56200786782459183a09c1c55e7cfe8702b85447f8f05b8e80e21a688e26bdb000b5ae28cae43bd9f9ea3b234df2cc5e3723781c6f0c3e34 SHA512 621448fc993b3376701632312d1efc7d8e675b7f3eeaf1ed2391a58b3e0e10e212a8dae9b69f2d52473703ff695e1c0edd5fc416ba9fcf8dd4e98dd2c74e0150
-EBUILD sun-jai-bin-1.1.3.ebuild 972 BLAKE2B 5a01a6d125320dfceef4871770b63dbcc55502f9d9d5ceb59303d1750ce4f8b4616e85379e7b2afea8160f901a279b157cf979491c657978b07ae33d0dfe14e3 SHA512 520e8987eec54ad7e6c379e39a209e3cc9baf3ef5e1e54da7c108f0fd74f65a018fec5081b3f1ca41e17bd6f41cf6761495fb91a09840f043c69bb8c5b362420
+EBUILD sun-jai-bin-1.1.3.ebuild 973 BLAKE2B 07e9e2c6e99b48b56f5ea8dc8d1bc8efc9d5a353b79b398ba078d92e1d92e286d61bad00a81a580e108a64317b3c87644889cb87dd1a69f51683f59380ab4a83 SHA512 2a2e4756e1b32c14d25642d912cba5b08371d4722b69fd0bf0db0f8c8d0348a7f4bbd136b9d28fe9355f3baeed54492c3b22bffce8f616c3d3c992feb518bc0e
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
index f244a96c1c95..1e21ce70574f 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 RDEPEND=">=virtual/jre-1.3"
 
 RESTRICT="bindist mirror"
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 6f92c213849b..0ba7144e5b2f 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -22,7 +22,7 @@ DIST swt-4.2-gtk-linux-ppc64.zip 5935799 BLAKE2B 6b1ca0d25d81134239e56ead6733030
 DIST swt-4.2-gtk-linux-x86.zip 5561088 BLAKE2B cf8bda6a48d5d8e389c387162bf2aafde5a95c43d76e444a4b79008e1154348d2c99850851b3d0e428890e6b2da1e4bec53a7f9050169ad4866a5a8352e9ed2b SHA512 e3d53bcd0521411c40f4c37719917f3570a17fb3ea5c617560986273fd155b99d9b0790ba27c57da26663d49ebec4c6a8387b41bd01b0ba934b21724ba98e133
 DIST swt-4.2-gtk-linux-x86_64.zip 5867140 BLAKE2B 994bf18799297529329637c1b9ebf15638187339b4f56bf8cc1dedfc97c25a1ea4a1664605cac1374fe3d79b321dc450c6129ebef00ddd6f9507f238b7836316 SHA512 56c5ec4ca2ddeed5256dd6ff350dc3911034ecbc414a06ba879f04ab53d6380ca9da9037097f76228ca8182f6076bcd9cc4cb9b01c10766c10048e6576fc5f50
 EBUILD swt-3.7.2-r3.ebuild 4437 BLAKE2B f488c4f50f7019580f29cbbc374d440444a699934193db8f6251d76c2342c5a26a5b65cc7c993ffb90155f771bc9039075b6a202c06d98abbdf7a2ff5959f63a SHA512 afdf8e0de244d457b4aa857bc1f045d0a3aa304158ece0a147c7b20308a27c79b5f614dd7ab0143c4372f7155679019cd972ab28a997cd9fe666f0d2985ea21b
-EBUILD swt-3.8.2-r3.ebuild 4240 BLAKE2B 200a47aee302fb32a3fb8000177d036e426d929e20ad5646879e252e10a8537bc87902951f4f2bf4380a430ce8031e576bd36bc3db810bc3ec8bc8db62b10b7b SHA512 15b59cee721bb901ca2e3ca8697c813747f345387bc31fcb397da152c131b7a70fd8f3d740c71bda54bc51f11f9458ed4d41179907f77ee29af8b3c3e2791ba2
-EBUILD swt-4.10.ebuild 4620 BLAKE2B 4a9c169e7ed2c3c9fc124ba5ebca315dd923336e2bb5ec30aa4e73f58222db72495e0d92af1a6939ba9a085df8062b4834033713cd94071135aff910a798a831 SHA512 d9c92cc3bbc5741a942c284a9bf4f63783ce7f495d2db582ee9ce09739a61d4d7bcc868c979d53b405e789dc09983565cf0e82c8563f5eaa4fad811020689bff
-EBUILD swt-4.2-r4.ebuild 4489 BLAKE2B ac412f8ae913a503bc5e5264a6f28967bfcab630351c0a571df3f7cd8c45c7847ad5c5d66302ab97f8ff66207d21000c85387c268092b0080bcdb92a7c47a705 SHA512 2629590b0679a5372f1974c7f5644e576497b1282672d3902fa680dfc9d302148b9a3049a23f9de2c0014a65f93a644146ed33ed1f5ca4161307867f9e87ad8f
+EBUILD swt-3.8.2-r3.ebuild 4240 BLAKE2B 3c08a0ee771d859e07af9d01c9796571ec9295bc0be4058abb330bd62194f20c77744795fcd27412a7397e7a341b7556080d3a7589faa9548ab1f1ac97433005 SHA512 f5c8f79cb9c801062d21d17f6ccdc30b28d5d1716e63ecae00872fce2c7c1b8a6152882ab90ddf6a39d4f525429462415cef6597a9425ec59060d6d0fdbe5099
+EBUILD swt-4.10.ebuild 4613 BLAKE2B b666b2a3bc964012c12b568c24f3a9239b9de956df76c804a76029ad30a0279f240d2b967ac86e51500a8f524dca31c4982b77be3268fcfaada4dc8212de7416 SHA512 b4b1c33f0cb51603730ae2b950c652b27bd1e669ad2e6b62e08c4d640ae98393d442b41a2eb88f42a136c2952582f9240154f7ffc06ebca9a943b71248bffab8
+EBUILD swt-4.2-r4.ebuild 4489 BLAKE2B 29fe9c52dcb4ac30c65bc460fd11ac733c72de267cc34a126598ab7684a116f55398d5a0828c513c7ab2464ff6d75c151d810af8a4b7794973afce382a5fc0dc SHA512 0232bf5353f6ca2bbb1705377c2b6de7b946271c93df5acb9a258c06dac0115edfadb3b372b27d39497f52b0fda69b02e99647ca57428fd90723b235c31fa6a6
 MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
diff --git a/dev-java/swt/swt-3.8.2-r3.ebuild b/dev-java/swt/swt-3.8.2-r3.ebuild
index 6234e6e49421..d65297c3817c 100644
--- a/dev-java/swt/swt-3.8.2-r3.ebuild
+++ b/dev-java/swt/swt-3.8.2-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+inherit epatch java-pkg-2 java-ant-2 toolchain-funcs java-osgi
 
 MY_PV="${PV/_rc/RC}"
 MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800"
diff --git a/dev-java/swt/swt-4.10.ebuild b/dev-java/swt/swt-4.10.ebuild
index a029c5bc5084..13b1abd63b38 100644
--- a/dev-java/swt/swt-4.10.ebuild
+++ b/dev-java/swt/swt-4.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
 
 MY_PV="${PV/_rc/RC}"
 MY_DMF="http://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815"
diff --git a/dev-java/swt/swt-4.2-r4.ebuild b/dev-java/swt/swt-4.2-r4.ebuild
index eff2fb275a5e..3b48a85ba055 100644
--- a/dev-java/swt/swt-4.2-r4.ebuild
+++ b/dev-java/swt/swt-4.2-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+inherit epatch flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
 
 MY_PV="${PV/_rc/RC}"
 MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201206081400"
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 54f68c0753c1..ceb3adc1528e 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,3 +1,5 @@
 DIST tomcat-native-1.2.26-src.tar.gz 423135 BLAKE2B 84be9b04e73b9e9e2f8c751a2fbcd6469d4ecb265639973801502d7b7cc9f0202e1761a0bdae6526da182afb8135b6d5693475e6ba7a2d187f602247c0b26dc4 SHA512 cad9d9efdb6c980afcf304bd78e5ea572271075e153e2015d393dd5e6f4612992c7d0ac499c9aeafe0c3874832356e197564717df15b36a48aba775960659ac2
+DIST tomcat-native-1.2.28-src.tar.gz 423848 BLAKE2B f0528817e1ea7e90ce67d8e181c0f620211d36529809a4c89ae687f4cefe4b0f977eb53b87e70bd0132ef1a5a000df82fc8c70e08f9bb568644b47cbf8817470 SHA512 16b8659dcd228ea153d05c9ae19e3d97add944315f3b8b42905162d0e4e8a28fd51a172d59d7da8508271ecad0b8ac025a386895565acaf8e2ba11fba77492bb
 EBUILD tomcat-native-1.2.26.ebuild 1178 BLAKE2B ed2752ed6f5563bb2cb5c7554cfda37c98a16dff1581559011350f55520662b33431bf347476c80ea2d7e9ab45e4232359229ae573dcce748e2d65793d2e8bd2 SHA512 0ff1066ee666702b936d467a44d077f6b258e1cd9750f07f2b528e9988cedb14b03c677d4dbbe22e145f3f137337b7da546887a8c1f9aea3a8fa1b041d475d89
+EBUILD tomcat-native-1.2.28.ebuild 1183 BLAKE2B 3fe9fa721ae862875f026e4a0c47e2b04cea7a0f4e3cea4dea9a253b5142e34a6676209ef3d1557ef397a186897b1f6c992464e70962b01b4364d6760553b1cd SHA512 486bffb651f11774551d532b008f343411f812d692b3301e3f474e60a5a2678b26ca1869ccc42317201cd48cdf5d3db345fda5f79609d9dff9b182cc71a90ce9
 MISC metadata.xml 806 BLAKE2B 7f193bb62b100b0c141677fcfe9671122b70bf5091663757fca98941ca2a7c195c0b7f4f1fd95c96706a8a8c8508a7a6b63858d2eb7a3afb75b4ec21f5eae021 SHA512 7bedd98efaa696458ae80b5bd844a569b2bda8903a7d4e7c9ee9ea197b80abacf7f257ff91aa14d4cf6df830425df58f08cac7c3e9ded79823424b352fd9e978
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.28.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.28.ebuild
new file mode 100644
index 000000000000..76a4520b2d1f
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.28.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/apr:1=
+	dev-libs/openssl:0=
+	>=virtual/jre-1.8:*"
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${P}-src
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_configure() {
+	local myeconfargs=(
+		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
+		--with-ssl="${EPREFIX}"/usr
+	)
+
+	cd native || die
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	eant jar
+
+	cd native || die
+	default
+}
+
+src_install() {
+	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
+
+	cd native || die
+	default
+
+	! use static-libs && find "${D}" -name '*.la' -delete || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog "For more information, please visit"
+	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
+}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 8966aa4f4320..ef4b240b214a 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -3,24 +3,26 @@ AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1
 AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
 AUX tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch 718 BLAKE2B f6e5fb4b569cb54dd6274023e155abf988c1efe724b4e42e31d96e897f8a1cc8afb64ca673d32ef30e2b44d74afcafd8cf7e1fb33372e95b802e17d9c6354270 SHA512 c7d5d2babde536adff9c5fa2ff41405ef7ab8013ebf91cd5f9ff7aeb5f5bfebe6e1e0dd9ceb7c031a4905258701156060a26ee5555ca1e3077181afe4d351c9f
 AUX tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch 710 BLAKE2B 177affee37d70208942c709324c4a7a4c561a28197792683a1f21dd747cb90f2d9fc2c32cf28cab0ad575c22dfa93efeaf7ba7f5254dbe67fe1a8b6fe5fd504f SHA512 0233b3fa6f6e3de36d62056035c84f9a22e866ff61e4cfd0976b7aa7e8ae019421bad25e49430e47a0476d09b5c1037d453e807ea02605a4f161d876f303c24a
-DIST apache-tomcat-10.0.2-src.tar.gz 5954905 BLAKE2B fa7ca630b287c96538955848ab0ef109beb22a381e884eae96fa5246c134164b543003669c65d716f453ffa7a0e72f119354d1f023b529a948befb11c5e375a1 SHA512 402e942b9a1006535fd0e1416a4606d880ca1af473d7c394d54aa3dff60ecfe80823a0bb14f354049e008fdf29ea67a1490d0828fbc50eaf39ea159ef36cbc53
 DIST apache-tomcat-10.0.4-src.tar.gz 5964416 BLAKE2B 23332b90316cedd1916b59b1b31b1c16e34c193ba61660c7c8e41e3b983a35873660eaf8e3f0777704d5663f0ede2dc39b81997a73ee726ff73d6c6392582163 SHA512 677b978afd51fe1756b486c9d5576b9fa03b5b775c462263237aef6d17f36d7e718cfb5e46a49da942b1bf6681b166a4af781138f55d89a019bf12b48eb22882
+DIST apache-tomcat-10.0.5-src.tar.gz 5976090 BLAKE2B 5441bec39ddaa74a7a4b39e48ecb524f6edb230760272678e6bf8d0a26b4a39e9a6c276b591d5d7962d8cae7d211486d65a334f363931d7cd8750a902c8aaf98 SHA512 177e497b2355b260fc59cfcfb8b1fc2fabf5fe5a0f5705b5feee2c330881545aad359a746074c9fb180acb54035d0c2f25b23daac84202788178a256e48f0c9f
 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.108-src.tar.gz 5313375 BLAKE2B 200a1ccbc39a572ca7e4f7805bf3d27e0bd645156d8886b0fcbee5e64279a4d2f4e2ad847d67a70e1c65a8d88fa5bd4757a0066ceff367fe92914e22cc809aa5 SHA512 bdd957ca5b3b7dd152efa6406dbb6397ed62661ec44c83b6a8f6e9e3c33362c51ff5e0451a57d6aa3874cd745811f2afe78d08825ddaba8e29cb38ef922c48e2
-DIST apache-tomcat-8.5.63-src.tar.gz 5853051 BLAKE2B d007d9922d54578bdebcbbaec3e7c0ffcafdce913e52fdd93d5c174c9d1304980b5eb7f126e957c5975a59dfb126857dcc87ef3ca5e479e44cd7910b6183e469 SHA512 d78a140117844675239e834a0890641c0ef0d6fc3c89eb4512536fece2c128f088edfdea15f79ba7a31e0478431f155230f8f60a57bfea0aed191298a95310c4
+DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
 DIST apache-tomcat-8.5.64-src.tar.gz 5863485 BLAKE2B c297c0803c74a969e96b99c379bcd050d6e08cb1036d69b5c49c64311d6f17695754631738130a76def849da6c2de70a49d4452b24ee34c5720d9474f8d4d41b SHA512 ffcc8e97b56730e7e15daa8c4ce628547afcf0bb008bb8d8142ae684c963ed6a366c1dfdbaaca9080201c3c1bcda60c759b76447dd72493f0ec922a034b75f08
-DIST apache-tomcat-9.0.43-src.tar.gz 6042010 BLAKE2B 78c0e7d711dd826ba93b12db6a96929ddeeb0df189a12e907c51f02baa08d84757915b8744b5ebd027892ff2823b955d7b1c3c749ab54b588686dfd8d3157640 SHA512 8c23f8a371b3ffbc1ab4d5f24be08ecf2c9e6ba466ef36ef97e075bd0f12b1ffc93f63b9ff1def9953b3f791319c7c355a76e7a54061a21d25be37a5dc22da26
+DIST apache-tomcat-8.5.65-src.tar.gz 5874743 BLAKE2B 8a605b0fe5026315aa0a5463d42c01eac164c91737cc81f8df4e174075783a829ddd30a8fc9f5129cf1f83a98d85fa33cb7ec9223f365de0ad91ecffb319d187 SHA512 df6ea4e8e04fe1f787ef105cb3e453516ad25d32ad3d559c86997b44492c9a1e93e8c22c88ba2203dcfefc14404f7d1bb28a9e2e20d44ba85adf8c374a4456fa
 DIST apache-tomcat-9.0.44-src.tar.gz 6047722 BLAKE2B fda3081d66c9018a49e5a07bfb5d54b133fe51dff69b692480065d8d9a4877ce5b5b152e33f6d4cfaf28940ec6b556c9a2455c8fda56ea0552e4d1f83f0f9cbe SHA512 68f6a6edecc0469e21cf062cd4b5aacd2df4903fe98aea052acfc9f725268490d5a6917ac1565f26e15a513afa09814014aed267dc1b5aa92733a51ef52b305f
-EBUILD tomcat-servlet-api-10.0.2.ebuild 3163 BLAKE2B a740d5c8115af1cf018d739b6f8f189d793c68195b3502ada99afbe6a70420bd0b9139fe534b9439c7b303c576ffc5ca262a9e144aaf80738bc8d139c36fcc91 SHA512 4f7ccf5bdc9d89f9444c45b6c3573f8807100a0001beff824ef3a4415fbd986c65430b40148e6e0b77719a63f1ba4798833c8a4882e80c6dadee33b69a05fb98
-EBUILD tomcat-servlet-api-10.0.4.ebuild 3173 BLAKE2B 29212c3e8101cf949bb6d5a111e7a9b1525f38d9c8eb103d5e2f4971456159d3f0f3de8908b9adbf831ad7e672b95397783a988d81297fa98da18f7313440938 SHA512 2e532ae99f36940a7a228798c4f7f0e66dbbb9d05793bbbb68117d16c74809da0b842d2648703aa0ec1d599b46a4d91a1411a76276f8885137b8dca988ebaf31
+DIST apache-tomcat-9.0.45-src.tar.gz 6055044 BLAKE2B 66ca4ee2c0a3bbd1f73d7257c55105e28d1619c8e533f945438cdb283cb8ccdceada163698641b034b5e43b513fcdd16e331c4c11ea300501276a5247f8ef682 SHA512 e3edfd6ab9e3ddf6a15f63a4e11f5237e03d7cacdec11805f4a901bd325c0edeca1ee0b62bee92d53e521af0a9d5a7b10ce12a8262a57fd7faa69d93ca1c066e
+EBUILD tomcat-servlet-api-10.0.4.ebuild 3164 BLAKE2B f515eb28cb5147b27b882e3bf83dd205e5b829fa75859d97f85a900776f384ac68c4b10da65c1bee2c4d2c00dd9b3f0693b3dd367597b0c20400916e6bbf53f3 SHA512 01241faac7be775e936a788068f824431de9a46c5ba7e7cdb64dda93c22eecf86c5d021fd231f4f7982b2e649becdc03be47db683eea53126c36c9d946ecfcc5
+EBUILD tomcat-servlet-api-10.0.5.ebuild 3170 BLAKE2B 40c03eb67e43ce9dc5761f73e905f8b252144c16622262b576a8ffc81d21289fed1984862934e01fc5a371b305a9a578849c4a81b97c709f1c5be9eb409e190b SHA512 32a43e27703152cf72d85d5d4d8092acb97f138c16a565b5167b4cfffdf8f51b31c119fc09aa2a4447d9ed011b0dde9f8a503d5056ba1507d9a1b93fd9def532
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae751ad7e2f4d7dcff941e28c4eb7ef4d614ae5f626235bf7cfdeb56eaf3bba608913bf12bde46b2a9e576c7cf1d886c275336a SHA512 b36e97e60cb546ef2a980d1b9787dda5b21e5c788555d9a696ca166632315a870477fb8c52fa24c1698dcf43bb096201b6d4835113ec87192287eff9f5664e3b
-EBUILD tomcat-servlet-api-5.5.36.ebuild 1426 BLAKE2B 02098b91f21bde7a24d0cf38bb224cfeca5218d53c943c24db8a342cb54a7658016e127a0719b0206b9cdc14c73b8066f335400202710d5a82ea3db91cd4b2f6 SHA512 d70314124ddd901892fb92163ba78d719d875582704868870c74b94163da96e56f17eadd1a833a64058467f0de9c39ccb3f8892970221fb946d8a645db174218
-EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cacbb95bfc439c63ba7cc3ee594209cb22927374e184edb90804ad1f55aa6721f98aa927f3bd8ca713463085233db1b233837acb07 SHA512 7a45a663f00ae5a71bea3002a72bd11a640583af44c0ab6a3dfbd6551bbf3a6de5f35e880643294c56027ecb3b7757425a2c26f34a96fbf8cd26df4a545086c0
-EBUILD tomcat-servlet-api-7.0.108.ebuild 2994 BLAKE2B 4e8f86d3f068f2e1dd1029ba8fa6d7df7b628a26ed5366d940b20d5375070d09caf2efd3429e8784fd1777d771a107a9184d7a46113966a994e4c496106bf37e SHA512 dde6491804e3f3ecae22d42fc35f40e64d867af0962fa0f9f4e91eedeb4df973175b3eccd45e59ed00eb3e7ec676326861540da6a8176e8275bbd6abfd8da6eb
-EBUILD tomcat-servlet-api-8.5.63.ebuild 3006 BLAKE2B 5a5ace1a95a190f6de2b56f42eaa80a0c35e4bec8905143350cf0f98af9e1d5d110622579b1164ea3f1af65581f06f886fa49d589e81f676694ed67178f613f2 SHA512 73d09c2d4aac971b1f00f9d4f6028d19270c343dcd0e4048585c2addd33b781bae4be3a9376739763fee8432479a4a1ad85a8e63c46dcf8b1b17b22ee872456c
-EBUILD tomcat-servlet-api-8.5.64.ebuild 3013 BLAKE2B eaafab16ad5d3abd8548472444dde131df8aa69d8c76e5791fe9411649e5e0d02f6c2acfceedb46a437b9f6751b881aac947cec86df75d585bcba767f937a659 SHA512 59cfd4b848df3ca159c9cedb031d15fb9d5b0f28e9d2c8e7d6e2244ff0d4a70f2d39033bf49857ab4cd55406bca5ecc6de82d9c50e82acd6a04ff4709fbe0a44
-EBUILD tomcat-servlet-api-9.0.43.ebuild 3172 BLAKE2B 28700a17edaf81fa47d08083fa506c89cc81a876dd4cc29310bba7487454317c271bef7641c0fc93f99b9a53155c2d99c4ebfa90c5f73d2e0188b75211f46625 SHA512 11cf7359592cf2ff2e2ff453fb90f649f6c9f2e444c5e58dfb84808256f13557be9dfadb188669fae88856af6aca9ecd242d043f9d43f96574715c35db9ef17f
-EBUILD tomcat-servlet-api-9.0.44.ebuild 3178 BLAKE2B 340842e202037af6b9df88fb08a73e7aaf9c52e1ddaab5034aa5611f70df1d8aa5213eb1d783c38fce546dcf3fb6658c224342a4b00310b042b6fac5232e4d37 SHA512 63f9e79717f395a40ab5d9ea9429273ec902ec1866c43551099095298e1a8c4d0e603dc61bc7ea914ad1957d8a794a52826ef23ea6376dfbdadf777dbbd39bca
+EBUILD tomcat-servlet-api-5.5.36.ebuild 1419 BLAKE2B e512a93e76e7e675606f112baad26f0c5013654293bf0a95085d255911c444b8ede5f0c283237810e025a9877dd41ae7285c57e0ce781ab434f29a98d3f58122 SHA512 d64b2289bdd50b8e320bc2927580080e70b532c25ffd4743342401527c4e90b7db2b6ffec35598d4e6e9e426880f7b0e10ccffc711ae05c06043586f06972ee2
+EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 955 BLAKE2B e7046e9afdfc33a906b44bcc98d092f75d3c6cae4ca7263b5e0605318aa19257edeaf83c2ea7a3639852c0ff140b6b65d16dc04433d94bbccce9db12ad82a9c6 SHA512 3a3d5450df02d079c04406cb3a4b63e986ce4f2d591ab12ee8918d4fecc6337634cf5627539bd277d9fda07ed4b6398c70dd87c322ae598649b61a8fd7cab58a
+EBUILD tomcat-servlet-api-7.0.108.ebuild 2987 BLAKE2B 58215b6b83dd299746d8a57bb9dd09b0ca04868f8de442b894d2a06ee68d901041a12594390bf87bc291f96f78cc6e5c207d01766948e9eaa0fbd29d1f194e6a SHA512 c93c1e035d0fce24fcb6a2fa28cb6713d8f38114a6ba76081d6eb1b5e42b2087fa9920c7a443c8b36fdf5d2d157886d70e2ddefbf901c33c53236c5e8901cb11
+EBUILD tomcat-servlet-api-7.0.109.ebuild 2990 BLAKE2B 08f62ce9a014e01926a2d2eaac5daf393e8df8f2dff737d1215b5304b9ab8bc92f794bd00a3bb6f2fd17b00b921b3445d86c44743a5e915a8e4fb33c762ac81f SHA512 c4db6d1df1fedf89adbbb90e8197dde37c5f656034e3629420096ad40af1e50644de527b0eab432e20463d811192ff889a06a72fe949084168bcbcc3e5ea5b79
+EBUILD tomcat-servlet-api-8.5.64.ebuild 3003 BLAKE2B b8bbaaed51e3d2d25497f6a5f4ba493cd249edef833ac72171d5f8e19c83c11ce00928ceff8ff1348842ea85c3196791103608fc3b7ceca184519a6eaa2e8364 SHA512 68ae1a904dc5c9cf2824db5fe7ef4ce1a07b41becbb69ea14f3717cc02b0f8d5ced6c860bac740c78a4ee80c5862811465850772d741841e4b4dd9d91e55edb5
+EBUILD tomcat-servlet-api-8.5.65.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac
+EBUILD tomcat-servlet-api-9.0.44.ebuild 3176 BLAKE2B 2d46d2a1415c0f9630753640566fe9b48a7eb328313b74a485f3aff1ba6fb96639db988c4e46da715e0dbd7500140d6a882c23309a368c3104d6ee9574ac6e28 SHA512 065a69a32047c890e49c4f09ad620d024364b8bd39591f0c451a8ef0b08a1a19b4738e2e71ece9491ed69625b834a1c1424a5b2dceb089ce5d503849e06120dd
+EBUILD tomcat-servlet-api-9.0.45.ebuild 3178 BLAKE2B b2d3652b91c3e8acc96b387ffb6375cf013694f4ffce215d2f1138b006befac9eff922bc25cf717d00bd0f65f6922256a6aa5f4eb643a37656b0026c1e829289 SHA512 5bf275389da0c1dccb3605cc66eeb416416dc8a65e34252d0f7f321c938b4ef02e9c2accb1eafc3fc349fb58d2b4c1418ff10f31146cf5b7086f4afb9daf6a32
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild
index 30dd1169f097..0b2df8987699 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple
 
 MY_A="apache-${PN}-${PV}-src"
 MY_P="${MY_A/-servlet-api/}"
@@ -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.2.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.5.ebuild
index e3eab2f9260e..222dab67e501 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.2.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple
 
 MY_A="apache-${PN}-${PV}-src"
 MY_P="${MY_A/-servlet-api/}"
@@ -15,17 +15,17 @@ 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"
-RDEPEND=">=virtual/jre-1.8"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/${MY_P}/"
 
 # we don't have the aQute.bnd.annotation.spi packaged
 PATCHES=(
-	"${FILESDIR}/${P}-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch"
+	"${FILESDIR}/${PN}-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch"
 )
 
 JAVA_TEST_SRC_DIR="src/test"
@@ -43,7 +43,7 @@ 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
+	# 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} \
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild
index b0bb3dc1838e..d30225f7f48a 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils java-pkg-2 java-ant-2 java-osgi
+inherit java-pkg-2 java-ant-2 java-osgi
 
 MY_P="apache-${P/-servlet-api/}-src"
 DESCRIPTION="Tomcat's Servlet API 2.4/JSP API 2.0 implementation"
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 58e80d34a727..3a00b7cfd701 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
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 JAVA_PKG_IUSE="source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 MY_A="apache-${P}-src"
 MY_P="${MY_A/-servlet-api/}"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild
index ea5e1f0781ef..c750d5ea6f6f 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 JAVA_PKG_IUSE="source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple
 
 MY_A="apache-${P}-src"
 MY_P="${MY_A/-servlet-api/}"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.109.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.109.ebuild
new file mode 100644
index 000000000000..e168928a7d05
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.109.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+	default
+
+	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
+
+	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+		${EL_API_SRC} ${EL_API_RESOURCES} \
+		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
+		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+	pushd java || die "Failed to cd to java dir"
+
+	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
+	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+	popd
+
+	for file in $(find src -type f | grep -vE "\.java$"); do
+		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+		mkdir -p ${target_dir} || die "Failed to create resource directory"
+		mv $file ${target_dir} || die "Failed to move resource file"
+	done
+
+	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.64.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.64.ebuild
index 9d54d656a065..d5d3aa1096eb 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.64.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.64.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple
 
 MY_A="apache-${P}-src"
 MY_P="${MY_A/-servlet-api/}"
@@ -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.63.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild
index 103bec9be301..eaffc40f4037 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.63.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple
 
 MY_A="apache-${P}-src"
 MY_P="${MY_A/-servlet-api/}"
@@ -15,11 +15,11 @@ 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"
-RDEPEND=">=virtual/jre-1.8"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/${MY_P}/"
 
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild
index 5b8c94f2e0c3..da566ddf7e37 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple
 
 MY_A="apache-${PN}-${PV}-src"
 MY_P="${MY_A/-servlet-api/}"
@@ -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 ~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.43.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild
index f26d8de4e6b2..91497ceece0b 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.43.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple
 
 MY_A="apache-${PN}-${PV}-src"
 MY_P="${MY_A/-servlet-api/}"
@@ -15,11 +15,11 @@ 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 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"
-RDEPEND=">=virtual/jre-1.8"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/${MY_P}/"
 
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index c8c029c6844d..e99a35ffbbe0 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,3 +1,5 @@
 DIST velocity-1.7.tar.gz 5882643 BLAKE2B 4c1499bb015fe1c6b87257a60d247b1b0fb8558e6f879a3d04cf9ef0561ed69b89491c9ebba55cc54d14f6d377b300ee0f7e55ae4118236bba60dc632b5686b3 SHA512 542c9cc0efa118693bf1c952ac4b0c7c3d0229ef804afaa4f0f1c01ad40b0112055c21df7f800c302bf173d58461a864b29b9bc4b9174029d9748f88f2fcf9ab
-EBUILD velocity-1.7-r2.ebuild 1158 BLAKE2B fd1b951233aa2b2c141bb49d4835d04cf089239ebc6445d8f21bb7e5927bbc952f0ab53456e0ac122e3d4669ff792f5b0414d8931c35d553be921f67dfefb061 SHA512 64a0917d557e3e9b8fb0621d853c72be3b5ec51cbc9694f32e69d322a313a31ee3492049c70e1f5b0ce61eff4262372f94b641371cf15a235567d4805f02483f
+DIST velocity-2.3.tar.gz 443754 BLAKE2B 16b7aaa87eb6be899f40d09ee8aa50b2ac24dd59c33f29b944d46ea84a77de07cd69f344632b4b829b92a92fe6ccd75cf79e021787b2ca59a79040aa08a53eed SHA512 987f2991a96fa8fae43ff2f72d6a57b25b1cb7d98b7def7a1a6e9a308c8b5b86e394444c47ee0eca8b70d41b341759c7309404dc4b952dbc65fc3a5b92d46cdb
+EBUILD velocity-1.7-r2.ebuild 1199 BLAKE2B 9f49ea54fd948039507d236e2b1cc9519212d9ed3b3075dd8b209974ed4ddbe6190d22b5b5a6621a890d8b6eed04853f78d028fc4029c6626c3e18924a372a9c SHA512 39d3fa723ec7dfb4c98c91025364836b8e0c3ec03cc19de744aca2504960fab9f4aefe37828df14dee8377096067c1573f99568dd9941d64d38525dc116a4ea1
+EBUILD velocity-2.3.ebuild 5213 BLAKE2B 3a159172994cbaf4d0ef6c3e5150ffaf64eb34b11a41133ca1e11254f007351a309419bdbfd16827049c076ae255d1549c4ec3dbb42c7b495cda5fe37cc67b17 SHA512 de97e153f3fe9d807791a0a7e01abd35d0888828ca15c19c25371669088c63c678f4dcc18a88041d4c8cd2f5f327f1117482cdcad94bfae987b21f4de4721e7e
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/velocity/velocity-1.7-r2.ebuild b/dev-java/velocity/velocity-1.7-r2.ebuild
index fd655d63ddbc..facc1a8d7f55 100644
--- a/dev-java/velocity/velocity-1.7-r2.ebuild
+++ b/dev-java/velocity/velocity-1.7-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 JAVA_PKG_IUSE="examples doc source"
+MAVEN_ID="org.apache.velocity:velocity:1.7"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild
new file mode 100644
index 000000000000..495e3056411d
--- /dev/null
+++ b/dev-java/velocity/velocity-2.3.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/apache/velocity-engine/archive/refs/tags/2.3.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild velocity-2.3.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.velocity:velocity-engine-core:2.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Velocity is a general purpose template engine."
+HOMEPAGE="https://velocity.apache.org"
+SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1
+# org.apache.commons:commons-lang3:3.11 -> >=dev-java/commons-lang-3.11:3.6
+# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
+
+CDEPEND="
+	>=dev-java/commons-io-2.8.0:1
+	>=dev-java/commons-lang-3.11:3.6
+	>=dev-java/slf4j-api-1.7.30:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+# test? org.hsqldb:hsqldb:2.5.1 -> !!!groupId-not-found!!!
+# test? org.slf4j:slf4j-simple:1.7.30 -> >=dev-java/slf4j-simple-1.7.30:0
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+	test? (
+		dev-db/hsqldb:0
+		>=dev-java/slf4j-simple-1.7.30:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+BDEPEND="
+	dev-java/javacc:0
+"
+
+S="${WORKDIR}/${PN}-engine-${PV}/${PN}-engine-core"
+
+JAVA_GENTOO_CLASSPATH="commons-io-1,commons-lang-3.6,slf4j-api"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,hsqldb,slf4j-simple"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# org.junit.runners.model.InvalidTestClassError: Invalid test class, No runnable methods
+	"org.apache.velocity.test.RenderVelocityTemplateTest"
+	"org.apache.velocity.test.provider.TestNumber"
+	"org.apache.velocity.test.provider.TestProvider"
+	"org.apache.velocity.test.sql.TestDataSource"
+	"org.apache.velocity.test.misc.TestContext"
+
+	# java.lang.IllegalArgumentException: Test class can only have one constructor
+	"org.apache.velocity.test.misc.TestLogger"
+
+	# junit.framework.AssertionFailedError: Class org.apache.velocity.test.sql.BaseSQLTest has no public constructor TestCase(String name) or TestCase()
+	"org.apache.velocity.test.sql.BaseSQLTest"
+
+	# requires configured jdbc
+	# junit.framework.AssertionFailedError: Exception in constructor: testSimpleTemplate (java.lang.NullPointerException
+	# junit.framework.AssertionFailedError: Exception in constructor: testNullTimestamp (java.lang.NullPointerException
+	# junit.framework.AssertionFailedError: Exception in constructor: testMacroInvocation (java.lang.NullPointerException
+	# junit.framework.AssertionFailedError: Exception in constructor: testRenderTool (java.lang.NullPointerException
+	"org.apache.velocity.test.sql.DataSourceResourceLoaderTestCase"
+)
+
+src_prepare() {
+	default
+
+	cp -v "${JAVA_SRC_DIR}-templates/org/apache/velocity/runtime/VelocityEngineVersion.java" \
+		"${JAVA_SRC_DIR}/org/apache/velocity/runtime/VelocityEngineVersion.java" || die
+
+	sed -i "s/\${project.version}/${PV}/g" \
+		"${JAVA_SRC_DIR}/org/apache/velocity/runtime/VelocityEngineVersion.java" || die
+
+	# fix paths for tests
+	sed -i \
+		-e "s%System.getProperty(\"test.compare.dir\")%\"${S}/target/test-classes\"%g" \
+		-e "s%System.getProperty(\"test.result.dir\")%\"${S}/results\"%g" \
+		"${JAVA_TEST_SRC_DIR}/org/apache/velocity/test/TemplateTestBase.java" || die
+
+	sed -i \
+		-e 's/\${parser.basename}/Standard/g' \
+		-e 's/\${parser.package}/org.apache.velocity.runtime.parser/g' \
+		-e 's/\${parser.char.asterisk}/\*/g' \
+		-e 's/\${parser.char.at}/\@/g' \
+		-e 's/\${parser.char.dollar}/\$/g' \
+		-e 's/\${parser.char.hash}/\#/g' \
+		"${S}/src/main/parser/Parser.jjt" || die
+
+	# File "StandardParserTreeConstants.java" does not exist.  Will create one.
+	# File "StandardParserVisitor.java" does not exist.  Will create one.
+	# File "JJTStandardParserState.java" does not exist.  Will create one.
+	jjtree -GRAMMAR_ENCODING=UTF-8 \
+		-JDK_VERSION=1.8 \
+		-BUILD_NODE_FILES=false \
+		-MULTI=true \
+		-NODE_PACKAGE=org.apache.velocity.runtime.parser.node \
+		-NODE_USES_PARSER=true \
+		-STATIC=false \
+		-OUTPUT_DIRECTORY="${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node" \
+		"${S}/src/main/parser/Parser.jjt" \
+		|| die "Code generation via jjtree failed"
+
+	javacc -GRAMMAR_ENCODING=UTF-8 \
+		-JDK_VERSION=1.8 \
+		-STATIC=false \
+		-DEBUG_PARSER=false \
+		-DEBUG_LOOKAHEAD=false \
+		-DEBUG_TOKEN_MANAGER=false \
+		-BUILD_PARSER=true \
+		-TOKEN_MANAGER_USES_PARSER=true \
+		-OUTPUT_DIRECTORY="${JAVA_SRC_DIR}" \
+		"${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node/Parser.jj" \
+		|| die "Parser.java code generation via javacc failed"
+
+	# Avoid "error: duplicate class: org.apache.velocity.runtime.parser...."
+	rm -v "${JAVA_SRC_DIR}/CharStream.java" || die "cannot remove 'CharStream.java'"
+	rm -v "${JAVA_SRC_DIR}/ParseException.java" || die "cannot remove 'ParseException.java'"
+}
diff --git a/dev-java/werken-xpath/Manifest b/dev-java/werken-xpath/Manifest
index 09ad09addb20..833423214199 100644
--- a/dev-java/werken-xpath/Manifest
+++ b/dev-java/werken-xpath/Manifest
@@ -2,7 +2,7 @@ AUX werken-xpath-0.9.4_beta-gentoo.patch 1313 BLAKE2B 77a304e9d140ab67e1d32d0fc9
 AUX werken-xpath-0.9.4_beta-jdom-1.0.patch 2325 BLAKE2B f3a7f3b02830cbb3705f501bed9fe135b37e75ca9f07e927b83490e25047c5863e9108a2c630680888b41b2e71ce0e8892f76ffb2c613ca862828cfbd1fbc61f SHA512 29c3d85870d0c49b36823ba633c9a3440a5c61f140c0827aee7b78c3a241a97f3cf5e285d43deed2f85487cb38b9682b4298d1dfd3934c038ca1be90dbb086bc
 AUX werken-xpath-0.9.4_beta-jpp-compile.patch 1189 BLAKE2B ae2c82957a0651084f918a79407418b18191876a7113f9ffe9968ebe24e89eb2fd368571997605e68473836caf21dfbfa96e9d0c3ae78a420cc2585590e06c13 SHA512 e7dbb75305a22463f7a3a975ca21002fb9aa19fcaff8cff07890a74cadcde292023d8e714c801019e1cd42c1f69270f7ae31c547feabfae2d4972dc99d5719a4
 AUX werken-xpath-0.9.4_beta-jpp-jdom.patch 3606 BLAKE2B 619f023176c841c876a7d0e7fd181b686a2d42b815ea3caa7973ed94bfe8ad5cc1264890e5032ef017aaa548b317c28d9e709101a2599ccee5bca9d5b65081e3 SHA512 de979a742d7d8f7fbcc68613ba4697fc4a4dc7d146d86712d71ae09c4e0b6f09c27361bd80743534aa5f2e864def2c5b8a09bd1d6fa2e15a852b74b73ff616c6
-AUX werken-xpath-0.9.4_beta-jpp-tests.patch 353 BLAKE2B 2b941351292a8fadb8b48ad3c3836cf9420db30fcf1a449a9d53aecd7f724ff76d7cbbf80fddd7330adbf3a7d98ac42b6ed3155a4fd266e1f01caed1fcc1163c SHA512 80adb52ad882970be6177cd1f8ea3ece8fbd3388b02b1c1766f3c5c869c42e358be9682fdd4a189225158d75d59b558ac0cfe55d8e9530de383ef86b654c99e4
+AUX werken-xpath-0.9.4_beta-jpp-tests.patch 357 BLAKE2B 1e7be890d118b4c470e36ffc6aa289cdff8f24a95bd94473f68493d84d887c3b6f8c660765d5c92a8be1f01a4296da42389fc985fb964916aa762a96417c8eee SHA512 45269db14477adea79892f06400c564a09e5bcce52350af7aff16b69d92227d3752c6326f00a4fc42828268389dad7243b0bd8b1b59e6b82d331b83e9d6dbe11
 DIST werken.xpath-0.9.4-beta-src.tar.gz 1652916 BLAKE2B 4dde7f4be8c4cf401d1edb69b96d6ffffd4c3d53c75194db04a7351ee0ffd90d94bc59855d14dd45162cd2f4b29b02b373ecb4f7a00bf267ed58e2c1e7aece33 SHA512 c58878ee0b6e88651335e2be60d0afcd65fc164864e826bb209ec660e97315233b25341733a4118ed3ee003f61998d84e480706bda5be4630c599efb616b845d
-EBUILD werken-xpath-0.9.4_beta-r4.ebuild 1355 BLAKE2B 24fbe9aa3e66fe735ce9997a07e7cd0c85001aefd1cd884cf5b30131cb59591024a799953d17b45efcdca4dd7ff5ac1212066a9ab8b2ea61359f707e7de05cda SHA512 9872d9584539c631629f213e60fae1da24d96487dba38cc6e1fa818ef585ec07767b4415f771c4890b76ad98fa06d9274adcf24744a38c06e65857d974358270
+EBUILD werken-xpath-0.9.4_beta-r5.ebuild 1322 BLAKE2B 3e9695d26af0b47da7b743d1c2df6cf5c27ca5969fead91afff4244dadf0b80de99c0f47da1e64fb8e14fefe98d935ccd37eafb8d5314ddc1315d9efc5f53592 SHA512 d5ac201cc7a456fcab18bf018c2875dbbdf23b81ad2f7046d4b215fd37627ab1bfd53b42ca2ac752c94fb3422dd4ce0201c35b07bc732b6ab98f882bd9e255f2
 MISC metadata.xml 318 BLAKE2B be2cb60066e3fbccd9201112d37d447b49de3fd37a9c42a287f0b7f7b7466efdbe9c179f0ced41d7af9b0119be17328a234997377dfefb481596355fa1c3838c SHA512 64e77592f9351e55f3775ec892c2d0b6967ddd0f98cac9ae4b75f023cf24be1cc3df514062ccd5d247f8202d33b71965fb09878dee0c07edfc84734cdebe11b3
diff --git a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-tests.patch b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-tests.patch
index d26e6185aff3..bcb84f1ee237 100644
--- a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-tests.patch
+++ b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-tests.patch
@@ -1,5 +1,5 @@
---- runtests.sh~	2000-10-31 23:42:01.000000000 +0200
-+++ runtests.sh	2003-03-02 01:59:55.000000000 +0200
+--- ./runtests.sh~	2000-10-31 23:42:01.000000000 +0200
++++ ./runtests.sh	2003-03-02 01:59:55.000000000 +0200
 @@ -9,6 +9,6 @@
  XPATH_CP=./build/werken.xpath.jar
  TEST_CP=./build/test/classes/
diff --git a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r5.ebuild
index 904444297829..97f1586aa696 100644
--- a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
+++ b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r5.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 JAVA_PKG_IUSE="doc source"
 WANT_ANT_TASKS="ant-antlr"
 
-inherit java-pkg-2 java-ant-2 eutils versionator
+inherit java-pkg-2 java-ant-2
 
 MY_PN=${PN/-/.}
-MY_PV=$(replace_version_separator 3 '-')
+MY_PV=${PV//_/-}
 MY_P=${MY_PN}-${MY_PV}
 
 DESCRIPTION="W3C XPath-Rec implementation for DOM4J"
@@ -23,9 +24,9 @@ KEYWORDS="amd64 x86"
 COMMON_DEP="
 	dev-java/jdom:0
 	>=dev-java/antlr-2.7.7-r7:0"
-DEPEND=">=virtual/jdk-1.4
+DEPEND=">=virtual/jdk-1.8:*
 	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
+RDEPEND=">=virtual/jre-1.8:*
 	${COMMON_DEP}"
 
 S=${WORKDIR}/${MY_PN}
@@ -34,15 +35,16 @@ EANT_BUILD_TARGET="package"
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 EANT_GENTOO_CLASSPATH="antlr,jdom"
 
-java_prepare() {
+src_prepare() {
+	default
 	# Courtesy of JPackages :)
-	epatch "${FILESDIR}"/${P}-jpp-compile.patch
-	epatch "${FILESDIR}"/${P}-jpp-jdom.patch
-	epatch "${FILESDIR}"/${P}-jpp-tests.patch
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	eapply "${FILESDIR}"/${P}-jpp-compile.patch
+	eapply "${FILESDIR}"/${P}-jpp-jdom.patch
+	eapply "${FILESDIR}"/${P}-jpp-tests.patch
+	eapply "${FILESDIR}"/${P}-gentoo.patch
 
 	# API updates to support jdom-1
-	epatch "${FILESDIR}"/${P}-jdom-1.0.patch
+	eapply "${FILESDIR}"/${P}-jdom-1.0.patch
 
 	java-pkg_clean
 	rm -rv lib/bin || die
diff --git a/dev-java/wsdl4j/Manifest b/dev-java/wsdl4j/Manifest
index b305738746f9..aa33563686c7 100644
--- a/dev-java/wsdl4j/Manifest
+++ b/dev-java/wsdl4j/Manifest
@@ -1,5 +1,5 @@
 AUX 1.6.2-tests-sandbox.patch 548 BLAKE2B aba74bdc87f3a35b46a80e20968e926f604a2dc13bfd48569f62fc72b7c8e2bbcb5df33af712c19a548a8c9668195cc340be92fa60e21ab36b0ab0c089de1d23 SHA512 bed0bcf00856309d8f628d4a41774a112bd26c651e9fdfa00af3113d780f430e6b50213fe0f743b486aafb78f11cdd924c4dd8eef64300715a8e88c64c11368b
 DIST jwsdltck-bin-1.2.zip 599377 BLAKE2B 0f99dc93a1b22019c572fe55585ee285c72e1dabcecc5cf93fa635b12a39a43686f0ff704a0c9ea25c682a882c4580fd82cf2015a9d4417dd28bc87d0b32a670 SHA512 a8f86d9895c588d752d266413e77c2a8db241e9cf9c199909f2e9d1d1b3b1b03eaa6b5841c62b0e7a7c779089eb6721797fdb4f2db841789a6a19884bd48711b
 DIST wsdl4j-src-1.6.2.zip 172400 BLAKE2B 96fa6a9098993ba20a277004515a4cd29bae84450b86398ceb1dc7835f14f17b39e5daf87d557b4378860c9d24e5928a80bb30b2d953fdc8fcae7d97ae8454f5 SHA512 55d0b8eb6a08cecd4a48223a9f29fe6ed0e00ec4dca99f44a04882efdba448601bb7dadcaa347e32e3ff5bb9e3334503d6666ca2a6276c7bb48b80acea57b751
-EBUILD wsdl4j-1.6.2.ebuild 1372 BLAKE2B 6b51c82b5212dc88f52e26403a726c34cab12c3aad1ecaa544581be15ca41a1ca701c8f1240bebb85837e3d1d9e030e0cec0808d13890013f3a17c35c851e714 SHA512 67e9173dc5bf7191730eac1cf1fdc4dd85365db39ce7bbefeea51062919cf6a1ada646b64ce9e7fa0fb6d64eb2e6c49da62565c48cda905ca4f00f3ab3d00c00
+EBUILD wsdl4j-1.6.2-r1.ebuild 1376 BLAKE2B cb0628a913a4d93b32f8d2db8e59757bf31500ebfc7bbf7899e2f08e60e82ecfef6609dba997ec17aeaa9a96782326e3055e8a7808c52d9257010249d0cc53cb SHA512 32e0c7d1cd69884104ae305d7dd3e24e92fbb6f26c7e2eda07ba4ddc814f700b8c8986a8cfadc89bd4b57203b6219abcc2db30104ec929677036e63153303e00
 MISC metadata.xml 314 BLAKE2B 0148774951355ef90d4345572a6a0fecfcc8340b6fd88ed7a18f40b719844e1e9c530b0dfc4917f9b11640871642e4cae06714f7083161136efbe56b2c15caa4 SHA512 2d7d312851cbed77b5a2156bb5d157f8f8fe911ef9c4eb16b645ca4b17892a7d70a02a9d07f8c36fb92a285717c68718e798d37eb140f2391e4ab828a60110fa
diff --git a/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild b/dev-java/wsdl4j/wsdl4j-1.6.2-r1.ebuild
index 671b3781782a..2543074e32b0 100644
--- a/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
+++ b/dev-java/wsdl4j/wsdl4j-1.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,10 +22,10 @@ KEYWORDS="amd64 ~ppc64 x86"
 # tests fail with encoding errors
 RESTRICT="test"
 
-DEPEND=">=virtual/jdk-1.4
+DEPEND=">=virtual/jdk-1.8:*
 	test? ( dev-java/junit:0 )
 	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/${P//./_}"
 TCK_S="${WORKDIR}/${TCK}-${TCK_V//./_}"
diff --git a/dev-java/xalan-serializer/Manifest b/dev-java/xalan-serializer/Manifest
index fa4d58d9aa1d..cc382f5a2305 100644
--- a/dev-java/xalan-serializer/Manifest
+++ b/dev-java/xalan-serializer/Manifest
@@ -1,4 +1,3 @@
 DIST xalan-j_2_7_2-src.tar.gz 8416261 BLAKE2B be67c9f2f7ec1140965dc148aea94347e60a2969deb1fac5834c1458d10b3dca91b448a44ed6ebbbb227e4f04780ce0142e812cd99d8862a4cbbf5e8e2af4cb3 SHA512 2f1fa105b3cb8082594e3121a245464e1b7c15464b1ead2d10e306e51ef61ded5d7fcd70c034fa46f41c4a8c14316e376cc14d8045c8aadfce80f2e4bd1b61d8
 EBUILD xalan-serializer-2.7.2-r1.ebuild 1147 BLAKE2B 9d4fceb7c3aa480a13a2b597aef4180180c33ed563191e9913f5da7f8c2477c43ce618a5fe77226b48971df000d4726620b9c5e1796161685a5ae860a5e7e6c7 SHA512 af5b65e28b3673c2da32c1ef11db6e73666a7fa36d06daf7b2d83b0ec5b3d491b4d04b0f3e3afcb6430e5c60c4b2f04805738015600a46f78a2b613ccd7dbfdc
-EBUILD xalan-serializer-2.7.2.ebuild 1172 BLAKE2B 0363376283dc843270c2aa5727a416bdf630fe32a1479d1f95da735a869ea3630cca1d09e03f7cebf905fa0fbcd692e51e57713e85214943a3450b0581f383bc SHA512 f2a5960b5d0d9e8f59286f96d167d40ba932a6aaccb88b48bd2eee14f0223c3b59dc7deada3b8b23b2a5ee3975c6130810d72d24c590de82f47e884ab8cd8d84
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild
deleted file mode 100644
index 5ae253dbf05c..000000000000
--- a/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild
+++ /dev/null
@@ -1,43 +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-ant-2 versionator
-
-MY_PN="xalan-j"
-MY_PV="$(replace_all_version_separators _)"
-MY_P="${MY_PN}_${MY_PV}"
-
-DESCRIPTION="DOM Level 3 serializer from Apache Xalan, shared by Xalan and Xerces"
-HOMEPAGE="http://xalan.apache.org/"
-SRC_URI="mirror://apache/xalan/${MY_PN}/source/${MY_P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=virtual/jre-1.3"
-DEPEND=">=virtual/jdk-1.3"
-
-EANT_BUILD_TARGET="serializer.jar"
-EANT_DOC_TARGET="serializer.javadocs"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	# kill all non-serializer sources to ease javadocs and dosrc
-	find src/org/ -type f ! -path "src/org/apache/xml/serializer/*" -delete || die
-
-	# remove bundled jars
-	find -name "*.jar" -delete || die
-	rm src/*.tar.gz || die
-}
-
-src_install() {
-	java-pkg_dojar build/serializer.jar
-
-	use doc && java-pkg_dojavadoc build/docs/apidocs
-	use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 96fbcf645441..50bf95df2daf 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,4 +1,6 @@
 AUX xerces-2.12.0-overrides.patch 1526 BLAKE2B 837bba05c47933fa4cc44a5a326fe6a7c872028181ec11c8da7e8ec182c8bcabeead38b1ad336ae20ec47dffb30e98a8d2c181e4dfbffa12d14bfe017fff4e19 SHA512 b81fb06ba89b6ef374205d623d655309778c9713f0ff11fa392d9f53d6331eaa342ce4145433c2e187f26145b3d9b8de7d48778bfd0c29497900ab47556d2bf9
 DIST xerces-2.12.0.jar 2113705 BLAKE2B 4224b9c00b9c7f388fc40f3bebe6520a21011f36ee1ffcf62e864fe370bbcac8c45b3627d2aff20655f467661a252e1bfd5cb9613f9bbe5b08f1917d09493fa7 SHA512 21f5218f71b3423a883e2bf5c99f7badd5a004a09454d0b218f57f463daf8fe83e7a186b64dd4c19388795a6e6e995f6ed133bbe4c81aab07b0a0d33cf2f7dbb
-EBUILD xerces-2.12.0.ebuild 851 BLAKE2B 9755ce17d188c07894bc6041c666776f342d1236222b3f1f81722bf9d6b661091804701ac0b64998fbb6f7eae950703abbce7ebb0a3b4bcc1c4a344c480db74a SHA512 4fac8c7f9b83911e0d53dc0f64d1df08f9454e87b15638231349f2bf391c847bbdc5856ed9db772b8fa74c5dea55861b5501c6ee99019307837910a676287562
+DIST xerces-2.12.1.jar 2149927 BLAKE2B b02c518754bcab1da9200122b398496c273a84c07a60945c0eea5524a230f5f4815b619685fc41bf48a124f9147803b9452d5d0105b57d535c9c666c52196571 SHA512 2c4ce274904eda6eb4b0b8800dc8383bc6504e215eb9603c45a25c32335651c8ea4d69539b984c048c1974d2aed3d852fff168eb44e2a9b1087ded578394b849
+EBUILD xerces-2.12.0.ebuild 917 BLAKE2B 3def60cd9da9f91d4750595b0373053095b764e9e84e485d184093fc81b61f73655c4a84465259c4e791d7cc45d9e6a345afa4bebf15c6c800beb26d292e287c SHA512 520d71a67bcc9c0a7d195513d2b6160ca279b5ef4901ffcb8ced3de688db66af58f1db713a25c50c462504800dd1d5aa8e40d41cc279b3c1e0f9fdd90d6755b9
+EBUILD xerces-2.12.1.ebuild 784 BLAKE2B 2b1fc5fe458e4b064e8149de5c4b9f691210e8947f4a8e70f72715e0ba6e92ef4f3be2b61474947f5ea29dfafeb55ca6d707a94f7cd2a10c1e3f4562f13d20f5 SHA512 81acd3d9ea6587c9851800606d82279846b7eb6f55483b83a007c54be7959d8a0ae38f0fc1406e07d0905208beb43c50e54660a47ba317722a66f1247d59a869
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xerces/xerces-2.12.0.ebuild b/dev-java/xerces/xerces-2.12.0.ebuild
index 92df4f503cd6..638b1ea00e7f 100644
--- a/dev-java/xerces/xerces-2.12.0.ebuild
+++ b/dev-java/xerces/xerces-2.12.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="xerces:xercesImpl:2.12.0"
 
 inherit java-pkg-2 java-pkg-simple
 
@@ -40,8 +41,12 @@ JAVA_GENTOO_CLASSPATH="
 
 S="${WORKDIR}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-overrides.patch"
+)
+
 src_prepare() {
 	default
 
-	epatch "${FILESDIR}/${P}-overrides.patch"
+	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
new file mode 100644
index 000000000000..0d5e000fae02
--- /dev/null
+++ b/dev-java/xerces/xerces-2.12.1.ebuild
@@ -0,0 +1,42 @@
+# 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/xom/Manifest b/dev-java/xom/Manifest
index 79ed4cf15093..7bfd89cf10cf 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -1,8 +1,11 @@
 AUX xom-1.2.6.patch 2096 BLAKE2B 041c55199398e37fcb4a481d7deb1c8c3fb8d980fa6ebc207236cf1e85e91c7b28f2c5e551153ac52b17272b8f02324dce7ae2b9948f9c0880a900eed84d9f62 SHA512 7d864f9178a5fd846572a17eb345a74510e7a3880c203054d7156849c10c678421ed688965d821daafcff91888be9a485c5409937055a56139066aaa6d32aca0
+AUX xom-1.3.7-disable-invalid-test.patch 672 BLAKE2B a58012a6152e0b9d8b064c32b5dfa0de3c5c008c44001963c6d4f81a7230c9d4b0aacedf99936ccb8ceb84ef5926eaee228e488846c15b47ee1caeaa47ce6279 SHA512 bd6bc466b36f5095b8b74109ea5b5e740317b81d1a844571c7dd6212536d8abaaf576e4c57b66eb997efa2b24fffcbf8c79a2c28361785e710ba6736c9b8491d
 AUX xom-strip-fallback-parser.patch 690 BLAKE2B c8135a026905fc16560be949598a48e02000aa29b3d1ddc6b40bd16ceb7ae60983ce703715f01e550fa2b643bcb1febb032387ab5431367d9dbc54079ed5f551 SHA512 e61defbc5c8da65561709be6431b0b15069759ec94de2f1f356d518b8b9d90a7ab1ccfd6db6148a3dbcc999b19c9607cd7586ef4c30f70e627968e726e953830
 DIST jaxen-1.1.6-src.tar.gz 204211 BLAKE2B 02e3ca40f3d6a41d417ae7f40b70ca74b4dff0bb254d5d7a80aeb725595564805bda795ee9d1b1c92ec3b1d59aad3a9cb82d8f2bac5ef0e66a3feca04bb63345 SHA512 84a3beb521c8729d7ad9bcb76a252e12d624614277eee9d5e844f79fcdfc58f5f49eac902256b17c0af6563d4c255249d9124a47c3b02827189a7489f3172309
 DIST xom-1.2.10.tar.gz 11717279 BLAKE2B dd66d423563abd717c0a663db3300b5baccf549f9dd71e42cc86b9c222f60faed1fc8525dbab04c27f271a3f048dcc01fbcb20da6ec6efd093e192c7a4b90685 SHA512 edaa4abbb929f4eba1ee092be7a196ba1c7a359b233a38abbf100dc519a9a6ca2b9a4947497e412f96ceaf509bbd03c0ce25b17e401b6cd0a95fc355bbdc7680
 DIST xom-1.3.2.jar 317416 BLAKE2B cd891743b6c83eaf39be0e7c973b0221330532464dc433f64b769d07e7dd4f43341e01cb6bc4c237b7cab2a939280acde2dfc7f1da4467f87af6458409e7b37c SHA512 958c25262d297280ab87b000a8a9a0fa0842c062a52229f818568f937d5adc69f7b2214b9463a9a75b5d1714487ecc2b434a47c4627d9350e497367787e98aa4
+DIST xom-1.3.7-src.tar.gz 5898676 BLAKE2B 963190849bcdb1b4e786a099dd2abd2ed8f17e5b486bce9df48d9f6ddab4f381c3c5c7d70388f9d74710547ff7a62bbd6a2eb9c2a6d6ff8cd06156b83e98aba0 SHA512 9b574f23c9394f5b54dc9b33e41e89638d041337c08336f44f968a55a1633dcc90ff1b520f7ad57cdbe68a1f81e221ac7e83336eb472876ab43939d9ce940262
 EBUILD xom-1.2.10.ebuild 2166 BLAKE2B 65380004dc447dd45c034599259b11e28ebc3988be9528782de0568b73b6e31632101d024b941b2acec78a8736dff7ad2b4a01d1303b9ba96c7c1b5c6c0e02ac SHA512 0858697d6ff1fc61930e42162d4e67b67e662b29e166d2e15da0fa51cf8563e06599359e6b04bd470902363988d6d61730a78a94244ff7b0ffca778afdeebeab
 EBUILD xom-1.3.2.ebuild 819 BLAKE2B 95c1a0236273676e598936b570f6304ed86b51b03b7368c6e1d112c6234bb92f3c0d1e5d36bb271e264fcf869d8d990124ffedaee7dcf0067a959a66d6374326 SHA512 92cfc4188b4b1d59d169481ec95c63bf6534f42df3f98c680beb8a69b3ecb7dd26b9ffaf0386e8536191008dd8789bc4312a750decbc867eab5c3e0639c959a3
+EBUILD xom-1.3.7.ebuild 1671 BLAKE2B 5b7516cf4626f3213a2105b6cf17b0223f948948ef7336db09e7c3dd1727d7417ffe12b8b55a63e752474cd594ee63d5fef09451537fdf9de2fe75599dac188f SHA512 f2fea9d1218bdb5672b6789f7f722aa8a2066261e107659f809d7f76890676e99af1fe32178808116f74b48d1d744db0969e141f6752f4d2e619319787b4f3b2
 MISC metadata.xml 407 BLAKE2B 2486554418b17502be636181d1dc619a50143016a72e05d5bef8a42c631b9f09913040bc868cefae0759075f26853c605e6a11179b20f3ca3081dd091536b56e SHA512 4ec08597d54cbea6121f240565ff7b7ee614c370357b551bebd18d31749c1863e30bc8b7935caa00051f9946cc927cd34c1bad02be07eca40c89d2c6e0e7b2f6
diff --git a/dev-java/xom/files/xom-1.3.7-disable-invalid-test.patch b/dev-java/xom/files/xom-1.3.7-disable-invalid-test.patch
new file mode 100644
index 000000000000..ef897ae004c9
--- /dev/null
+++ b/dev-java/xom/files/xom-1.3.7-disable-invalid-test.patch
@@ -0,0 +1,22 @@
+diff --git a/XOM/src/nu/xom/tests/XSLTransformTest.java b/XOM/src/nu/xom/tests/XSLTransformTest.java
+index 443c058..56f7b6e 100644
+--- a/XOM/src/nu/xom/tests/XSLTransformTest.java
++++ b/XOM/src/nu/xom/tests/XSLTransformTest.java
+@@ -765,7 +765,7 @@ public class XSLTransformTest extends XOMTestCase {
+         
+     } 
+     
+-    
++    /*
+     public void testIllegalTransform() 
+       throws XSLException, ParsingException, IOException {
+         
+@@ -784,7 +784,7 @@ public class XSLTransformTest extends XOMTestCase {
+         }
+         
+     }
+-
++    */
+     
+     public void testRemapPrefixToSameURI() 
+       throws IOException, ParsingException, XSLException { 
diff --git a/dev-java/xom/xom-1.3.7.ebuild b/dev-java/xom/xom-1.3.7.ebuild
new file mode 100644
index 000000000000..87dbb6c9df9b
--- /dev/null
+++ b/dev-java/xom/xom-1.3.7.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XML Object Model"
+HOMEPAGE="https://xom.nu"
+SRC_URI="https://github.com/elharo/${PN}/releases/download/v${PV}/${P}-src.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+
+CDEPEND="
+	dev-java/jaxen:1.2
+	dev-java/xerces:2"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	dev-java/junit:0
+	>=virtual/jdk-1.8:*"
+
+JAVA_GENTOO_CLASSPATH="jaxen-1.2,xerces-2"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+PATCHES=(
+	"${FILESDIR}/${P}-disable-invalid-test.patch"
+)
+
+src_prepare() {
+	default
+
+	java-pkg_clean
+
+	# removing directories based on build.xml
+	rm -rv XOM/src/nu/xom/benchmarks/ || die
+	rm -rv XOM/src/nu/xom/integrationtests/ || die
+	rm -rv XOM/src/nu/xom/samples/ || die
+	rm -rv XOM/src/nu/xom/tools/ || die
+
+	# reorganize the code and resources so that it goes well with java-pkg-simple
+	mkdir -pv ${JAVA_SRC_DIR} ${JAVA_RESOURCE_DIRS} ${JAVA_TEST_SRC_DIR}/nu/xom || die
+	mv -v XOM/src/nu/xom/tests ${JAVA_TEST_SRC_DIR}/nu/xom/ || die
+	mv -v XOM/data . || die
+	pushd XOM/src || die
+	for file in $(find -type f -name "*.java"); do
+		cp --parents -R ${file} "${WORKDIR}/${JAVA_SRC_DIR}" || die
+	done
+	for file in $(find -type f ! -name "*.java"); do
+		cp --parents -R ${file} "${WORKDIR}/${JAVA_RESOURCE_DIRS}" || die
+	done
+	popd
+}
diff --git a/dev-java/xpp3/Manifest b/dev-java/xpp3/Manifest
index 21772c283bff..41380b3ac048 100644
--- a/dev-java/xpp3/Manifest
+++ b/dev-java/xpp3/Manifest
@@ -1,4 +1,4 @@
 DIST xpp3-1.1.4c.jar 128334 BLAKE2B a0c1d871216e44f7196ae8edd4c0ca2503a16821b6f592e4af0fcc1da346135fd5023fa5210abe1ce772d0001274c0f6a3d2383b7ebad1a65ffa967ac31c1d5e SHA512 743d2a0b20d16e97b640d9ad3e20e56a7446cdaf4ca0ebba072bdbe3eed0ef90289c2829376b4a209b35e0960adee5e01f11e8f361798333d8b4eaf4f1038445
-EBUILD xpp3-1.1.4c-r3.ebuild 666 BLAKE2B 6bebe7aff5a9ea049b6ed491c006f0b4bc8116c18d28f1367e701eb0884fbe12c5d112872edae84b458da8f56783fbaea403c84b5b100382a5bfa32cd7640a5a SHA512 7333d61225cc34e21563b4911c8f91bfb0f4edb7f4fd6091810310f7ee7560a41a3028846ce8aee0cbb5ff3679eebbe2759ace52807d21eb245939650717311a
+EBUILD xpp3-1.1.4c-r3.ebuild 659 BLAKE2B 20f11ffa6f50b9a4310b36733ecf2c78b1f98822d37f737577d806f5a675c1eadc3ade32dd2cc46790d809bcd337302028cc7311f234b479e132f74f13bf7e5f SHA512 5c68fb355b688dcd19666195ac83180b4f4f4d6383a7aabf0eff8ec734a7f1be04f5e9f17aa9670d8526c4554faa598327702cad125fa22e992b6ffc226de73d
 EBUILD xpp3-1.1.4c-r4.ebuild 620 BLAKE2B 76251bc15120f9bfc4119940e29efe44a6f9c8077f4f664df557502e0c748d06b1b736aa9a13d3d1d2fb03f66d27af62ab4795c7e5876d0a0e3b099216b88985 SHA512 c5c17fdf198df62d3240be2f34920eca4d3e2cee8f9c058641c7b486d11b29e81ce00cbe7a38037138149a8c924865bb06bb1e325fa9aeecf7a61b82775433c6
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
index d392231d1098..a52b851aeb9e 100644
--- a/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="An implementation of XMLPULL V1 API"
 HOMEPAGE="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html"
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/xpp3-1.1.4c-sources.jar -> ${P}.jar"
+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"
diff --git a/dev-java/zstd-jni/Manifest b/dev-java/zstd-jni/Manifest
index 594c32a27938..064568beae33 100644
--- a/dev-java/zstd-jni/Manifest
+++ b/dev-java/zstd-jni/Manifest
@@ -1,3 +1,3 @@
-DIST v1.4.9-1.tar.gz 9283717 BLAKE2B 1f5f397e6ee78d029110b98aadbf77e8acaf3b3721ff0729b1b382f193367c8ffb20e08c1f7f905c34a5128e6e061652792cdd4f83dd292e3a3b19906f3bf86b SHA512 2a3a2020e46fbf654796ca065ec84fdce05c308d7925a667b239aa0cc8607f78d8944230578e3c663cdd7932bce05e056895f8457af523d939afb24f68f8087b
-EBUILD zstd-jni-1.4.9.1.ebuild 1151 BLAKE2B 192577cddf42c0acd44a379e44df9ab4795770948359f92f17825b61b304241b9169dc3a28a10d4544a1923020e945abb3dc7bb3ce8a3caf2f4c2b7a60116d88 SHA512 8ec83561effb39657aae0dff182059f14938474ad9e1832da7cfc5f7a9f0b7a3cbcef30859c27682053599a4b6ac793bdc1b5f0c5deed194144158b6c9a27c00
+DIST zstd-jni-1.4.9.1.tar.gz 9283717 BLAKE2B 1f5f397e6ee78d029110b98aadbf77e8acaf3b3721ff0729b1b382f193367c8ffb20e08c1f7f905c34a5128e6e061652792cdd4f83dd292e3a3b19906f3bf86b SHA512 2a3a2020e46fbf654796ca065ec84fdce05c308d7925a667b239aa0cc8607f78d8944230578e3c663cdd7932bce05e056895f8457af523d939afb24f68f8087b
+EBUILD zstd-jni-1.4.9.1.ebuild 1177 BLAKE2B dc9b42cbdb4580fdd067952cbd55efff985d13d254e27a685565b9bff80f055a68996251711a0a5e172499b55e8c024f9ecf4fcb714ecb465f5537af8be3ab80 SHA512 5761e72056c1c226db6cb5ec3e02a7d35d285ebacb9f1f1b77dc7b53dd70689cf8c80fef7b298ecbaf7e1f148506d09218e49ea3485cfc23ba682be211ab6143
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild b/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild
index ee4f35125cc7..df596aa3d20b 100644
--- a/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild
+++ b/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild
@@ -11,13 +11,12 @@ inherit java-pkg-2 java-pkg-simple cmake
 DESCRIPTION="JNI bindings for Zstd native library"
 
 HOMEPAGE="https://github.com/luben/zstd-jni"
-SRC_URI="https://github.com/luben/${PN}/archive/v${MY_PV}.tar.gz"
-
+SRC_URI="https://github.com/luben/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND="${RDEPEND}"
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-java
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)