gentoo resync : 15.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
commit: d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree: 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /dev-java
parent: e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
111 files changed, 890 insertions, 1902 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index c79386ab1caf..2b6027df5837 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/animal-sniffer-annotations/Manifest b/dev-java/animal-sniffer-annotations/Manifest
index b703ecd1e7b4..3a88a634f18a 100644
--- a/dev-java/animal-sniffer-annotations/Manifest
+++ b/dev-java/animal-sniffer-annotations/Manifest
@@ -1,3 +1,3 @@
 DIST animal-sniffer-parent-1.15.tar.gz 77766 BLAKE2B 6d99959c457d032e69f5a5109dc9ae80660db0a3fa34e2ebfdd7e3941a33e19f0078a05f3c6d561760a89584b2826bca6ef40dd7f5ea943b32ae43a4f2ed403b SHA512 8d0f6baa86fcb79fc54b826eff0f7c390d236d3cfc285914d3645e3bd9c72612c039eb0f1c3c2a9fbaca43040d967a2a69e10a9e5713682d1e441e44f3b55eb1
-EBUILD animal-sniffer-annotations-1.15.ebuild 643 BLAKE2B b76e4153ac78f0ae12a75587bb47a685e5bbf32c50e90f3d3f524bd4ddd4e7f5e57862c9a4c2565099073910796e92f89376ac6842274b6e74b521660739f054 SHA512 9143c756eb1f273ce2668db1949b715e6a8c74787a71223d303507cfc4010c07736a4029295bf812972b248b5f0e9b48cf2d0fcc3f03183e44c1c9c13358babb
+EBUILD animal-sniffer-annotations-1.15.ebuild 647 BLAKE2B 601078d6bb59c7a386d5ba9d5534c03e7c23617cc60b8b2d1b7045630f5f0f74a6745fcbc6f628b3ae4a8f99237c86a4ab454d8c69e5e9f8e39b1658f5558016 SHA512 e36300a5bfe835156b4474fc7b2ee0873a406376fbfbc1abc7cf29ef2709e074d6411a176e722d4c9cecb8a9deda9397f31780f0e98171c5d32b56283b86afc9
 MISC metadata.xml 324 BLAKE2B c75c7c8d638080ab23d4eae8221d2d38fc797a29c73ce4fe1f57a59907bb3aad34dcfae556e6b99ce64c728c18b57edb03f03c37d925ae867a69c7e6c2a19d7c SHA512 e56ef2e924143c68bec47d876972176b2eb5650fd1bdb5528dcafcb7c607523a6c29662cd320d8cecd6c0f85404e9e7cf059ae1d03bb77bacb34f0376e939a8a
diff --git a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild
index 465628dcbe99..97a7b209dc8f 100644
--- a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild
+++ b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/"
 SRC_URI="https://github.com/mojohaus/${MY_PN}/archive/${MY_PN}-parent-${PV}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.7"
 RDEPEND=">=virtual/jre-1.7"
diff --git a/dev-java/apache-rat-core/Manifest b/dev-java/apache-rat-core/Manifest
index 93ea642d9eb5..4c3103f93fb8 100644
--- a/dev-java/apache-rat-core/Manifest
+++ b/dev-java/apache-rat-core/Manifest
@@ -1,4 +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 1995 BLAKE2B 8e29838e3292e23693b7539127c532da62233673051103a60edd14b2a22cfd49149af18415709a8678484ff2ef5afdbae54465612a81d06123b2e9d7bb8364d9 SHA512 641c440c87861578a94a9687383b688ccd8fae13ae085b5a85312deca16e76b4d61d213a93ed599cf90670843fa8faffcc32cb5155cc1b9dd56756a91901c9b7
+EBUILD apache-rat-core-0.13.ebuild 1993 BLAKE2B ca130b38169df33fb92e5529949bcc5db87db42dbe84777eaff9ca30f11752497292430d1d4fcc52a4e1773fcc244bc7700672e96238a85845ad25f8af4fed53 SHA512 a7479db10e8cf614215d7b7dc18db5f4a07278721d546538c7d2cde4d3a5855c3bb8ce11f4666c9eeba48b584aee30168a79b0edf8b093463478ef54f05eef5e
 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
index 3e4f0b9bf595..5e67269064c2 100644
--- a/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild
+++ b/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild
@@ -17,7 +17,7 @@ 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 ~x86"
+KEYWORDS="amd64 x86"
 
 # Common dependencies
 # POM: ${PN}/pom.xml
diff --git a/dev-java/apache-rat-tasks/Manifest b/dev-java/apache-rat-tasks/Manifest
index a42db8ccde86..4f9ad989a151 100644
--- a/dev-java/apache-rat-tasks/Manifest
+++ b/dev-java/apache-rat-tasks/Manifest
@@ -1,4 +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 1830 BLAKE2B 0e6bc3926726a31c7a4a1580207fc7db7ea34feca088f491ee93cfcf6557c1be68e07c9a151eb8485050ca88cb5f4187cc6f076b3c4df095cc14f26cd999ac68 SHA512 30d933fdf3904cb47f7a39186e080cf90e362b45a1713d0c9af3fc80afb0d88570e17d3925a96150fb7037036dc69f99c93143dc98fd8b2a96d80d3a55feedaa
+EBUILD apache-rat-tasks-0.13.ebuild 1828 BLAKE2B d419513a4ed125dd2a7e6a257beddac01b84a9d928470904b1d82ac90d456bfde2878b6807b2b824de786871967b7b6de194dbac4763c47472ec50c50724e226 SHA512 2a2cc1934790d3392ec9cab9767a51bcad84634c8f76881e6e874c8fbc93c9dd2b44ca4fb7ed3cd5f662bc10e51c2ef5ebfa368197fca01c033eb0c478d2afca
 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
index eb400924c5c0..cdc925c1a2f0 100644
--- a/dev-java/apache-rat-tasks/apache-rat-tasks-0.13.ebuild
+++ b/dev-java/apache-rat-tasks/apache-rat-tasks-0.13.ebuild
@@ -17,7 +17,7 @@ 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 ~x86"
+KEYWORDS="amd64 x86"
 
 # Common dependencies
 # POM: ${PN}/pom.xml
diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
index 0ef8a71df868..478492a5d638 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -1,9 +1,5 @@
-DIST bcmail-jdk14-138.tar.gz 386478 BLAKE2B 2fee04eee66ab352aa08f72063e0088e61b2e76e389ab0d599ca0496798ef5fbdeba4b1865921045405d886ad928cf1e83782324adcbc8464fb7c3af3f1f566a SHA512 1d79aebee02a8d0017dc0b05f68e49fc031a797043eec173aa68ef0148e06b6ebe4d001a1494d6ed95114b1534ece7c47982e119ad8aec2485323babe34f3a13
 DIST bcmail-jdk15-145.tar.gz 483519 BLAKE2B aed9d4ef1ede10b97979652a012f18e45b7d4d597cb8b3ad168e847563ce14f7effe429b7f213adb77befeb144c4c3a279738b76718bde85ce04265d62ef8e75 SHA512 2d3232d5eb1cd75ad56a7316beb32880f3f935fcd3ed0a6cb2cc3e1861dc9f0bece0cbae53471760246505adb5c28328691eb82e11fedb0b160c1248d21c48bb
 DIST bcmail-jdk15on-150.tar.gz 221760 BLAKE2B 48c5d3b692295dcf2ce1e73ce58097b20c11cc353a8e13da9b8987f19eb69f1dbb37747e778e9323c170c0a3baa2ec7257681beea8da4e95343f71c5c6ed186a SHA512 91727ddc4bf932cfaedd3cb90a807b5fec3120e56fde3e5fc73bb5bf2e97db50a35a63e0b5e342fe29e4b974579c5cdd5d427d01c9dd8e7abd521ccd3d1959f1
-DIST bcmail-jdk15on-152.tar.gz 240800 BLAKE2B eb7077f742a8746a1ce13c37bcb936c16f49f6a5eec7421d8f3f93048091d123f416a732add10ed5596fc150d3f129e6b216190c48f6bb1b9d226a0e2bf19637 SHA512 e7301991071709b5788e5a813ea765a5e59bb089104a031ca91a509036e7823b851f854e5f96de6a2d2ef817aad4435f78742dea3a9b1dbeb95a6cddf250619e
-EBUILD bcmail-1.38-r6.ebuild 904 BLAKE2B da5a8b5f4dbd354fc1ebb0a27470e9237b9798a710f1ba19b43515e50b28c0270466a2db0db3d072d4eccc4016485a1b25e6360efb32ba3c54023d4d40378dd7 SHA512 a10aed0ceeed055a40df8dc7c900580484ced08a60363d4f5f138eda3cba8b7ad4ab52ac64306d6666d1b542160f6cf96d24dc47e90fca7be28bc88ac064f620
 EBUILD bcmail-1.45-r5.ebuild 912 BLAKE2B ef76eb9c860233cc5e90b84123eeca0317ea2690e03d09a90bebbd13adfdb0ec3c84335b3ea886306b64caf20b20460158b84d260417fc7f0496cfb75bc63731 SHA512 7936c6be67385f5d97d639697c4295bfa2c886c40b4271ab54cb58fde64233c22184a18ef1e4c247a016d12db16fab2d4a846e4e1039d545730bf22d41f03bfc
 EBUILD bcmail-1.50-r3.ebuild 1194 BLAKE2B 5e040e7cf8852f8398aa6526a11533a57340abbf324be1658ac57d86f805e6fd5d197f8ae154830d1c09fbc6d7310fa71f8e0d6ac905672646dec4b7b1a25334 SHA512 c22936d51fead1ad4a5350bd11614e3efe7ff7dcc2378d7047f1b5fc8e650c18b57b9649f199fc735a7314b010e7da6fd3040c80ad9e011c5fba581aeb10614c
-EBUILD bcmail-1.52-r3.ebuild 1194 BLAKE2B 87ccbd4cefcbd13e0677d550bb48f9295cb2afc501b91892138a2c96a2f2b82854168f7fec3fac27759d292150347c115ac025a3c596ae667a844637bdea9ec0 SHA512 4d30572e003a9de4553f41e5cdb70a777fdecf7acd420ee785cfdbd1f01c75b1b6188ffb7148ce5c5e52446aca8c54cd858b0627251b61d31ef7c3b0a7064307
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcmail/bcmail-1.38-r6.ebuild b/dev-java/bcmail/bcmail-1.38-r6.ebuild
deleted file mode 100644
index acac0b50528f..000000000000
--- a/dev-java/bcmail/bcmail-1.38-r6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk14-${PV/./}"
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.38"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-CDEPEND="
-	dev-java/junit:0
-	dev-java/oracle-javamail:0
-	dev-java/bcprov:${SLOT}"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="
-	junit
-	bcprov-${SLOT}
-	oracle-javamail"
-
-src_unpack() {
-	default
-	cd "${S}" || die
-	unpack ./src.zip
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcmail/bcmail-1.52-r3.ebuild b/dev-java/bcmail/bcmail-1.52-r3.ebuild
deleted file mode 100644
index a0af7f956ed5..000000000000
--- a/dev-java/bcmail/bcmail-1.52-r3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.52"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-CDEPEND="
-	dev-java/junit:0
-	dev-java/bcprov:${SLOT}
-	dev-java/bcpkix:${SLOT}
-	dev-java/oracle-javamail:0"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="
-	junit
-	bcprov-${SLOT}
-	bcpkix-${SLOT}
-	oracle-javamail
-"
-
-# Package can't be built with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
-	default
-	cd "${S}" || die
-	unpack ./src.zip
-}
-
-src_prepare() {
-	default
-	rm -rv \
-		org/bouncycastle/mail/smime/test/* \
-		org/bouncycastle/mail/smime/examples/CreateSignedMail.java || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest
index b21ac5d01952..0f1cd43694ef 100644
--- a/dev-java/bcpg/Manifest
+++ b/dev-java/bcpg/Manifest
@@ -1,7 +1,4 @@
 DIST bcpg-jdk15on-150.tar.gz 691012 BLAKE2B ee566fb6deb44177e31bfe80b6bd1f13d39d6820cffe3693bd85314ccfd65c4805275b3925d52a6bda6b1ad7e3ea267f1f0bed3926420b5920e5f300020ecd9a SHA512 763d253b9bb45b7e7fab75d557daa784c3d4a503ced979adc986e5688c3939db248853c864a2f4bec6d5b1dd9ed668d5f278c91b5607774fc703971d0b330fe6
-DIST bcpg-jdk15on-152.tar.gz 748424 BLAKE2B f847fa95ae4eff6c9c95f23ad318d3b967bd224a5dbaea20f8e904a50173076e16723519e8985d4afd2ac02c6a7fe83399e0c6005971bd460b41055c4866a506 SHA512 1619a8cd4024129876266415406882ac5df3dd84fd3e01d7593304874ad641fe72ae95150d0e4414b294e2e5ca8eb39e41a25658f9502b4cd9622fbf0f3d45a0
 EBUILD bcpg-1.50-r1.ebuild 1515 BLAKE2B 25e57aba985350e8922eb0edf9f6a12dbc8f5a2750e4d45c1cb9eb0df0b9ba909ac1eb8d2aa151bdaaa123e7e6accce4eb6182fdd9105c39a2414de9eda46c07 SHA512 eddecb8d3365fe745bf132119d52a46d12a835973e5c9e3e0121822f53b525e8ee24a2b3a6c98920082c24cdc7daf2da6d9d27784abcc424dc41dfbd6a185558
 EBUILD bcpg-1.50-r2.ebuild 1536 BLAKE2B 00122a19f7a787b43507a1a73ae345bd1783efca518818511ea8d8717b42706a2c30f9af202811be5ca60317e3e18250459aa9dd82564daff4e7cd27e36207af SHA512 ad42a74689b4012041e201121ccd134af357b6296f32a4bcba1faad79b03c4ed17579e0e514bdd8c9bcf7f628ad9602a1d8de0f0ff52841a984c408f3ed858cb
-EBUILD bcpg-1.52-r1.ebuild 1515 BLAKE2B 72b4bf72e59b56261b478537c5a29ac660a1504ba824c69c17355d61bdc9284b90e4aaac577856c145576eceff0ed1d453fad2fd22f6fffa70b2c4ec0f00cd3d SHA512 fe5f38bbb296c0217acf3564e403b184dae5e3e87f7a782b55a19e316869fd41853e9c8d7825e51a6825020965c5a7f30c884ba36ccfbb030555d5ddcc948814
-EBUILD bcpg-1.52-r2.ebuild 1536 BLAKE2B e98881a8414cd34669bbe93ef2e2d70b5cf6c69ed1233b1eb6e7f019cc2e3162d6564087c1c594222eb1a9c7c18e88f8d52331ef00ca42a4803c5bf62529f3b5 SHA512 992062b60f1d753f497739101032404483e86af1a1f01121d541d17b6b122f6c16b2e5ab553e67a6292b3644b69137a8c1ff38d7551d36b22bc490f4d8d2a95c
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcpg/bcpg-1.52-r1.ebuild b/dev-java/bcpg/bcpg-1.52-r1.ebuild
deleted file mode 100644
index 74354a732de7..000000000000
--- a/dev-java/bcpg/bcpg-1.52-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.52"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-# Tests are currently broken. Appears to need older version of bcprov; but since bcprov is not slotted, this can cause conflicts.
-# Needs further investigation; though, only a small part has tests and there are no tests for bcpg itself.
-RESTRICT="test"
-
-CDEPEND="dev-java/bcprov:${SLOT}"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	test? (
-		dev-java/ant-junit:0
-	)
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
-
-src_unpack() {
-	default
-	cd "${S}"
-	unpack ./src.zip
-}
-
-java_prepare() {
-	if ! use test; then
-		local RM_TEST_FILES=(
-			org/bouncycastle/openpgp/test
-			org/bouncycastle/openpgp/examples/test
-		)
-		rm -rf "${RM_TEST_FILES[@]}" || die
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	local cp="${PN}.jar:bcprov.jar:junit.jar"
-	local pkg="org.bouncycastle"
-	java -cp ${cp} ${pkg}.openpgp.test.AllTests | tee openpgp.tests
-	grep -q FAILURES *.tests && die "Tests failed."
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcpg/bcpg-1.52-r2.ebuild b/dev-java/bcpg/bcpg-1.52-r2.ebuild
deleted file mode 100644
index a819a8dcd7e9..000000000000
--- a/dev-java/bcpg/bcpg-1.52-r2.ebuild
+++ /dev/null
@@ -1,73 +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
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://polydistortion.net/bc/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.52"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-# Tests are currently broken. Appears to need older version of bcprov; but
-# since bcprov is not slotted, this can cause conflicts.  Needs further
-# investigation; though, only a small part has tests and there are no tests for
-# bcpg itself.
-RESTRICT="test"
-
-CDEPEND="dev-java/bcprov:${SLOT}"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	test? ( dev-java/ant-junit:0 )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
-
-src_unpack() {
-	default
-	cd "${S}" || die
-	unpack ./src.zip
-}
-
-src_prepare() {
-	default
-	if ! use test; then
-		local RM_TEST_FILES=(
-			org/bouncycastle/openpgp/test
-			org/bouncycastle/openpgp/examples/test
-		)
-		rm -rv "${RM_TEST_FILES[@]}" || die
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	local cp="${PN}.jar:bcprov.jar:junit.jar"
-	local pkg="org.bouncycastle"
-	java -cp ${cp} ${pkg}.openpgp.test.AllTests | tee openpgp.tests
-	grep -q FAILURES *.tests && die "Tests failed."
-}
-
-src_install() {
-	einstalldocs
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
index 4de13138b32b..01755952592c 100644
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@@ -1,5 +1,3 @@
 DIST bcpkix-jdk15on-1.50-sources.jar 401716 BLAKE2B 7a656218b96da46027c82a023404c32b92a640aa0ed5a1256213139e8dc54f9ef07453478dcc66372a0a49562b92165148f18a5063c24f7569a3e40f649494ba SHA512 6dc6d63db649a94f54c7739144b4120db4255e0a0a713389d54fcd427b95a3ff5ec326ae066cb5aa8a6cf19ccb959cbb22f9f898d39bfe5bf8e20c4d9de6931c
-DIST bcpkix-jdk15on-1.52-sources.jar 422301 BLAKE2B 10a1b16d0d1f7560ce71f9f99c6efaede73250a1ae298c22396c6ac1eeebe0d51c52f8a6a6b1ff68cfd11ab076d5dc97182fb0accd53e769ef9fa65c6764961c SHA512 55f33846e16f7367a25df0933c904b435933e96d0e881bb949c3e3812618fc0d0b5a2901efa779e02a6f48157231da197e2bf5d8037b22169330fa374b07a988
 EBUILD bcpkix-1.50-r2.ebuild 719 BLAKE2B 96642caf10144d1b4d24a4680e3ff2bad09eb12b6c5646d1e12878dcc5d71316a4807aa955df410aebb41092d4560e7ae4ec8a97a6a054ee081002a7de829e42 SHA512 98a55dac21d68a1d529d3d239a531d4d4856a68dad8b2f2f8ab4ce42ade8938863ab63f1ffc9fc77eff0cd9f4f6aab060742dc7e09bd09b1a40b66e20ad5e97e
-EBUILD bcpkix-1.52-r1.ebuild 719 BLAKE2B 333255aec4325341af338ff0c60b565132f45a7fcb40b013d13ef5090385eafd339ca6afd56c80408ae19a8cd8df8d43f2237629633822525b241497a3a1ba90 SHA512 3ae6f18ff1baf32f203e97aa82f48ed172d2cb3ee0aa5f6e1c050ccade118781aba6c95cece719dded31af0e43d9ef6233888bbbf3422ad84801408577ffbdd7
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcpkix/bcpkix-1.52-r1.ebuild b/dev-java/bcpkix/bcpkix-1.52-r1.ebuild
deleted file mode 100644
index 70751f754308..000000000000
--- a/dev-java/bcpkix/bcpkix-1.52-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="${PN}-jdk15on"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
-
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-LICENSE="BSD"
-SLOT="1.52"
-
-CDEPEND="dev-java/bcprov:${SLOT}"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
-JAVA_ENCODING="ISO-8859-1"
-JAVA_SRC_DIR="org"
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index 1db1b96287e6..4705f9651c21 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -1,18 +1,10 @@
 DIST bcprov-jdk15on-150.tar.gz 4629743 BLAKE2B 7ab18e83f90db38b9af9530246806b4d413718531ce4b34b7aefa7189e28ade8a2afd5d3b3dc25c8cb2d5ef23a8c7f8157ac947ae7d0a46356b00ea7dd6d5f76 SHA512 95400c338a65cbb7d1e80c776de41d3d372b4237aee91526a06774c3d4beb735dcfb4c1ed182a12f2ccac8204b9c546863d79eb99723394d48c415fa32b6ee0e
 DIST bcprov-jdk15on-152.tar.gz 6334971 BLAKE2B 5ef7db891c29147ac48689a1f15e907f4a91d15ac63e8f6a031847d92ddad22cef3dff791d4036b74cd39550e9b48b1926033449beca240db2d7ac78510c22c7 SHA512 df769d2647c1c0b535b1f6922df3f02ed7e13c941f8d954256fddb2ff31d5682924fedf2f2908bc09ebd20058413f40a4c2d62190b63542aa7840b860aeab07c
-DIST bcprov-jdk15on-154.tar.gz 6903567 BLAKE2B 12039cc6c7dbe06b74a0be8f9482209590ef134b37ef0bc64e97ee34f10ecd7c185bf1129f471e06347ea647d9b2d2dc5b845e0c1cefb5b99ebbe44442de3877 SHA512 3d3bf2a1d174a40941a99d1ac6ac6696e9866964bde0cb23e987e3fbd51e3dca220e16f609c29ef9e761faac670164fa9cccf90e1e0f795c33a3ce80e2783151
-DIST bcprov-jdk15on-166.tar.gz 9684238 BLAKE2B 68d75f8a8e418310179cac2e3d367f759567da280624ac9868ac265779126fa8b722f4291fe254623d92fc304ea057955180ac29a343ee628d9bd36c344fa2b7 SHA512 522cce6d381a51ff7212aa7fd7a99f85cee972a71e2c37c0dcea7e3c2dd4e44f5fa013cd759a11868dec3b6b4bd4f02bedd31ef2dd9379ce89a0d92ec8df2d8e
 DIST bcprov-jdk15on-168.tar.gz 9716574 BLAKE2B 54c4fec3d614bfe6449a10789bf7fd8d01d8d03f0a133dfd01bb7a30d3545d4dda3bbd2b2543a3827ac8988d9c9000cf7c0ebe7d5d462c6f9145c467d3f53ddb SHA512 3cdb6e486f6d1afb8c98c08809d142430191feeb757608f4abf27640fc706decf3975e3bf3f36c2a00bbc77ad2564ff9652bdc5e13662638c66a87bd250302db
-DIST bcprov-jdk16-1.38-sources.jar 1197644 BLAKE2B 758b3c894d648dce357d27f20522f8df9c70e87d83702a4eebf5a96529ba3df7fb65dfd62555544fe5f2757ed3194bccc5bc6d97a074036f8b188d84f1f85a42 SHA512 e8ab0b6f47b9737f19ee548dfc6cf09087d1b9339bc48b599fac05d0eb3b00d355f203787a84ee3a504eff2dffd707237a0cc5e26c64a672a362b9161077326f
 DIST bcprov-jdk16-1.45-sources.jar 1286663 BLAKE2B da19e2343761f10248f315f6966d071a87660f22fe3e51a35308a3b51f907990ef339f05f0c2367babcb06322ffb4600247ecb22b5a19bba3f5c820ed6fe2d2a SHA512 541b390efafba17c21a25bdf84725fd0f9808555eec9c4db51b0642c348d552417d9ba8d584d54690146f3e72fe3b348ab49f92ca263ea8a7a8f7b27bb7b8e5d
-EBUILD bcprov-1.38-r4.ebuild 1336 BLAKE2B 805b34cea2e31c685e8e241cc39bd81545f5de7421006b12f86b3274a09822c42b16a391c7a9506917cb728126dc80c34c2dfacc4a0f21f4ba26b76e5c685fc0 SHA512 dd26a429c403e8e5af917ee25c3ba56891176fd62455e839a9ca3b5046f88d30b8261cb1126a29f37571f290c3232a1789e145e2384f98ffc41805363f750a4f
-EBUILD bcprov-1.45-r2.ebuild 1343 BLAKE2B 1f4e510474a375d532313eb6c6da68fa8b039ee361103d3c44bbc85061ccfce58979118a3be71e190e7ce68bb6c8a291561952a89016bc8a1f3654ceb901ae6b SHA512 d2c2dd791cdcbe27d98b804bfbe5caf5ee04f0a58568ad9917bc0eee43d9547e01cfcd059eba55b39e0e1cde821e75fcb71c15c3bce0afce9213326490341c96
-EBUILD bcprov-1.50-r2.ebuild 1347 BLAKE2B c242438b0f9a8b1802971c1b44424e76bf6c2c11cf359cef7bcb317024c39c7828d6aa901f309055f8c51a180495cf4c3e9e41a788cab4e0a1ae15c3daa83d03 SHA512 3ad3610ab9b2459797bb1fb864582e9e38f85897982f8b1db0ceccb01a80393968a778f11efe04cd59e9b93c5cad2d684e31ac62cc2de6f12192804c847ef1fb
-EBUILD bcprov-1.50-r4.ebuild 1325 BLAKE2B fb30ce92623bec2ebf9b94b7e912224ca2889beb20ab18b72e48a5b9e26a1f204481bc58fbf617af97c0d09297769c0ee303a8c2e3cb5f98edc57f880fe0f7b9 SHA512 19f3a18ec7f7394d75a3943783bf5c84c12b539e560b05492b9affbc946551bd4efa51a38968067a703fac93e7e07c0b29c8b317dc104423543c1c68f5a37191
-EBUILD bcprov-1.52-r1.ebuild 1347 BLAKE2B 53b6e67db4ad60cd847a4d4ff23231d19fd158d2a396ee002b91f55a917e5eefc2e1cd9c9c4e5b3dc4b0c1eb0899d693281e0098146de2a448353191092cb50a SHA512 005e608991619786a105699c981c0ac63ae3cd22bd1355aed66693a482b7da25e6474f60dbc11d38c6ab9f8b1202ff3d1b8b6b38f2e404512439b646998957c7
-EBUILD bcprov-1.52-r2.ebuild 1352 BLAKE2B b64efb5bacd2a605e35bb242e4009cdc65009dd023f2bd50f3cf5978b8db4be55f8baff925abb09cd1e0b3245da34f48c44dc733ad47f710f99977a73645309b SHA512 7e070f559ffe303268f20a21b9f3258f983daa367d727ff91757c4fd2dd55c5008bb7e9bd52bb645fc6f369791853cc7862db1b54c98b05aa64effea2be1b0ac
-EBUILD bcprov-1.52-r3.ebuild 1325 BLAKE2B 5617350d06e52736b19b1ccc87aafc4bbfa5b02a3c06fe7dc4ed33f46dd8fa7a6d85e8f3546be83e14790d8068439c3e0f923e6f95cac1839e077dd004a45777 SHA512 cff73472e90c3bdb219a926fb65bc49685c42def85dbb5fa5d936f82a7dc3916f82c2f27e401cf94bbd32773b9d451c14c0392e49b433251bd631e81b4718c98
-EBUILD bcprov-1.54.ebuild 1332 BLAKE2B b7575fc50709ff5c4250b07b8e72ed008d426236746e8a037ae75693a4496d4a519152878090b922c18aae8ac68056edb47788f49f9e8f7f2bc7cddd1f43f8d6 SHA512 f38d0fa76c72147986c206a1363c8e90f65a7a7efa85a07b91e569dbea4cd55a4702fb9e2323ef95b2423d9c8809073a4233fb5999ed0688994c686d5415a376
-EBUILD bcprov-1.66.ebuild 1340 BLAKE2B b42730a69ac44de04f9e7f006055936f40935a11409f7f6610717637aca7fa265995a604beaf4ae968bfdc3d24a8ac63ca9082f14d7107b20fd13ca4e47701a2 SHA512 7ff6b9d93cab3464478e720cc636bec5da40444bc03867cb4e3642f1c63039f0e1869c3ab1972c1717865c39fc2021c6ec25277f2c6d90aa7aa828c6074014d8
-EBUILD bcprov-1.68.ebuild 1213 BLAKE2B 427ce6742af15cd32a92fafe74e119a134f0203a170736e7afbe4f7ef6c65bac1b027f4d0f149ac61664faaafcb77fa4da3236e9c883a8b4ba8c4ab253e4f97f SHA512 f39ea32e386c2d46a84cafab19f72ebf9b9b517f04ee70dcd2fda75b5695376bc196a23ad39c8258ac657daca4ee3ccbb7a6e75f761d62722ac63ef61739d0a7
+EBUILD bcprov-1.45-r2.ebuild 1341 BLAKE2B 7012f9298f272a44572585ea8c66a8cc61b79e77d026e70a90438f54ce7bca1c88afb5d45c1558797e15bdc687a6c59b3fcba2ffb74e16c822a4728a9ea409ad SHA512 2ad36124570b18e0d294eafeedb0a8d198a72520d58eaf3e93a5e311928f2b0ba7b86c684ade27ab1b9654be359024de13279de3095568bdaec458babb8b2fcc
+EBUILD bcprov-1.50-r2.ebuild 1345 BLAKE2B 6e0103ebcfa6a52bdba02bb40f7085d0361b988e0087ae2d07be9980c2d28825b0014595151cfa23bb24e8f6af2af55b518c64c349b0c6539b97ee3b8a9117b5 SHA512 ad7a4d8cb6ee19336768ffb8eed5ed9f44110fccc0dcd3768ea06419cbbad05de344f2a832333f686f2f00ffaed1f33e1cca9b948be87883208434d77bc5e286
+EBUILD bcprov-1.50-r4.ebuild 1326 BLAKE2B dbd3892976d4eaff7e3af566e13c5f38d5b74bf27cbb3290f3846d560dd0393156c41e6fd92f435ca6bf6609692c195c75743f6c87698bf99cb843369ad7ee92 SHA512 7dfed9b2cae7ea3914278b7be298e517796d8623a33109dbb62ddc87b6d284bcaadf4f4b88d890a1bb8d9447c3b6dfdc80239bdf0b3d5b74e3b96bf99a9485f2
+EBUILD bcprov-1.52-r2.ebuild 1350 BLAKE2B 145f54219d8596d18127ceb1b626bae03bd4cceec442a1e04c5f8f64ce53017ddeb78e2dc33e9d781123e8392dbd249914cd9614f6da6c010665950b8fb1f6a1 SHA512 cd874722a978e52fda5ee92424cd8a0b430c9b9e4c6ab797fa1b0bd63cea199e0f40d4cb4ae1a62d2eb22921665e6580cebe7ec7f5c681ffc349f73b4d9cd334
+EBUILD bcprov-1.68-r2.ebuild 1168 BLAKE2B 33c9797b85d28424bf6f20ac3a34740f14e60a8978fefd0c0fbd8c259637b059587a429d74f67a22f0380f367965ba6ea21c85cd945305de8f025f23211b6f24 SHA512 c1e47f1a31d667564d8fc62c671fb949af30122a1d216fe0b4c44cce038c4d92d4c56ad931b07a9c338fdc4e484571572ce699503166ae8d60a1f338a15e7389
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcprov/bcprov-1.38-r4.ebuild b/dev-java/bcprov/bcprov-1.38-r4.ebuild
deleted file mode 100644
index e44ab2704b0a..000000000000
--- a/dev-java/bcprov/bcprov-1.38-r4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="${PN}-jdk16"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
-LICENSE="BSD"
-SLOT="1.38"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-CDEPEND=""
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-JAVA_ENCODING="ISO-8859-1"
-JAVA_SRC_DIR="org"
-
-# Package can't be built with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-java_prepare() {
-	if ! use test; then
-		# There are too many files to delete so we won't be using JAVA_RM_FILES
-		# (it produces a lot of output).
-		local RM_TEST_FILES=()
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Test*.java" -type f -print0)
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Mock*.java" -type f -print0)
-
-		rm -v "${RM_TEST_FILES[@]}" || die
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcprov/bcprov-1.45-r2.ebuild b/dev-java/bcprov/bcprov-1.45-r2.ebuild
index 2722165d64d1..3fe4eb54c7a3 100644
--- a/dev-java/bcprov/bcprov-1.45-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.45-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ MY_PN="${PN}-jdk16"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
 SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
 LICENSE="BSD"
 SLOT="1.45"
diff --git a/dev-java/bcprov/bcprov-1.50-r2.ebuild b/dev-java/bcprov/bcprov-1.50-r2.ebuild
index 1eba489d573b..a2a400806d60 100644
--- a/dev-java/bcprov/bcprov-1.50-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.50-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 MY_P="${PN}-jdk15on-${PV/./}"
 
 DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
 SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-java/bcprov/bcprov-1.50-r4.ebuild b/dev-java/bcprov/bcprov-1.50-r4.ebuild
index 03655298b7de..dce87d213ba8 100644
--- a/dev-java/bcprov/bcprov-1.50-r4.ebuild
+++ b/dev-java/bcprov/bcprov-1.50-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
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 MY_P="${PN}-jdk15on-${PV/./}"
 
 DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
 SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-java/bcprov/bcprov-1.52-r1.ebuild b/dev-java/bcprov/bcprov-1.52-r1.ebuild
deleted file mode 100644
index 2ac1295addb8..000000000000
--- a/dev-java/bcprov/bcprov-1.52-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.52"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-CDEPEND=""
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ENCODING="ISO-8859-1"
-
-# Package can't be build with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
-	default
-	cd "${S}"
-	unpack ./src.zip
-}
-
-java_prepare() {
-	if ! use test; then
-		# There are too many files to delete so we won't be using JAVA_RM_FILES
-		# (it produces a lot of output).
-		local RM_TEST_FILES=()
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Test*.java" -type f -print0)
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Mock*.java" -type f -print0)
-
-		rm -v "${RM_TEST_FILES[@]}"
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcprov/bcprov-1.52-r2.ebuild b/dev-java/bcprov/bcprov-1.52-r2.ebuild
index 6c5634bd30cc..7f00aae4ba51 100644
--- a/dev-java/bcprov/bcprov-1.52-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.52-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 MY_P="${PN}-jdk15on-${PV/./}"
 
 DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
 SRC_URI="http://polydistortion.net/bc/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-java/bcprov/bcprov-1.52-r3.ebuild b/dev-java/bcprov/bcprov-1.52-r3.ebuild
deleted file mode 100644
index 4f24d02ae549..000000000000
--- a/dev-java/bcprov/bcprov-1.52-r3.ebuild
+++ /dev/null
@@ -1,61 +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 test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.52"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ENCODING="ISO-8859-1"
-
-# Package can't be build with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
-	default
-	cd "${S}"
-	unpack ./src.zip
-}
-
-java_prepare() {
-	if ! use test; then
-		# There are too many files to delete so we won't be using JAVA_RM_FILES
-		# (it produces a lot of output).
-		local RM_TEST_FILES=()
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Test*.java" -type f -print0)
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Mock*.java" -type f -print0)
-
-		rm -v "${RM_TEST_FILES[@]}" || die
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcprov/bcprov-1.54.ebuild b/dev-java/bcprov/bcprov-1.54.ebuild
deleted file mode 100644
index 45c74236f28e..000000000000
--- a/dev-java/bcprov/bcprov-1.54.ebuild
+++ /dev/null
@@ -1,61 +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 test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.54"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ENCODING="ISO-8859-1"
-
-# Package can't be build with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
-	default
-	cd "${S}" || die
-	unpack ./src.zip
-}
-
-java_prepare() {
-	if ! use test; then
-		# There are too many files to delete so we won't be using JAVA_RM_FILES
-		# (it produces a lot of output).
-		local RM_TEST_FILES=()
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Test*.java" -type f -print0)
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Mock*.java" -type f -print0)
-
-		rm -v "${RM_TEST_FILES[@]}" || die
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcprov/bcprov-1.66.ebuild b/dev-java/bcprov/bcprov-1.66.ebuild
deleted file mode 100644
index 73e8d4e2db3f..000000000000
--- a/dev-java/bcprov/bcprov-1.66.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 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-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="https://www.bouncycastle.org/java.html"
-SRC_URI="https://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.66"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DEPEND=">=virtual/jdk-1.8
-	app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ENCODING="ISO-8859-1"
-
-# Package can't be build with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
-	default
-	cd "${S}" || die
-	unpack ./src.zip
-}
-
-src_prepare() {
-	default
-
-	if ! use test; then
-		# There are too many files to delete so we won't be using JAVA_RM_FILES
-		# (it produces a lot of output).
-		local RM_TEST_FILES=()
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Test*.java" -type f -print0)
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Mock*.java" -type f -print0)
-
-		rm -v "${RM_TEST_FILES[@]}" || die
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcprov/bcprov-1.68.ebuild b/dev-java/bcprov/bcprov-1.68-r2.ebuild
index 97794d5fabf4..9a985d3a815a 100644
--- a/dev-java/bcprov/bcprov-1.68.ebuild
+++ b/dev-java/bcprov/bcprov-1.68-r2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-JAVA_PKG_IUSE="doc source test"
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.bouncycastle:bcprov-jdk15on:1.68"
 
 inherit java-pkg-2 java-pkg-simple
 
@@ -14,21 +15,17 @@ HOMEPAGE="https://www.bouncycastle.org/java.html"
 SRC_URI="https://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="1.68"
+SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
-DEPEND=">=virtual/jdk-1.8
-	app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.8"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${MY_P}"
 
 JAVA_ENCODING="ISO-8859-1"
 
-# Package can't be build with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
 src_unpack() {
 	default
 	cd "${S}" || die
@@ -38,7 +35,7 @@ src_unpack() {
 src_prepare() {
 	default
 
-	if ! use test; then
+#	if ! use test; then
 		# There are too many files to delete so we won't be using JAVA_RM_FILES
 		# (it produces a lot of output).
 		local RM_TEST_FILES=()
@@ -50,5 +47,5 @@ src_prepare() {
 		done < <(find . -name "*Mock*.java" -type f -print0)
 
 		rm -v "${RM_TEST_FILES[@]}" || die
-	fi
+#	fi
 }
diff --git a/dev-java/cldc-api/Manifest b/dev-java/cldc-api/Manifest
deleted file mode 100644
index 849525836a34..000000000000
--- a/dev-java/cldc-api/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cldc-api-1.1.tar.bz2 142368 BLAKE2B 3f17d5edba61d8caed820a230156485b995985b4bd04e01982bc84de9c28d890e4ba8d30c24c2b1c211d43c666b7e92163c0442a2cfcf1540ac404816145990f SHA512 b2baae07c037692b2e9ef418728817b60c39fcef7bbb2ccdfacb5551aef2022d342458434042154cc4b4f82895a427fab2f277b6269fa651ec3bcdb23a771e7e
-EBUILD cldc-api-1.1-r1.ebuild 883 BLAKE2B 83818d42b3a4dc2685c987273ac6bea38e99123aaf582fabbcd1ff1c620cd087640e22ee70cfb69f3ccfa6eb8ddb9ca85886363695c33cde04760b38e8618937 SHA512 530df8267ba39c9c6a6fdeac2333dbf5239fe6a55caee592e732c257e5c3988160c2637219dd35c1ceecf375217ed7fde5567cdc38f6cebb9f0529a552baa5a2
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/cldc-api/cldc-api-1.1-r1.ebuild b/dev-java/cldc-api/cldc-api-1.1-r1.ebuild
deleted file mode 100644
index d502d5ee9bc9..000000000000
--- a/dev-java/cldc-api/cldc-api-1.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java ME Connected Limited Device Configuration API"
-HOMEPAGE="http://java.sun.com/javame/reference/apis.jsp"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-# mkdir cldc-api-1.1 && cd cldc-api-1.1
-# you need a login on dev.java.net - use --username username if different from your local login
-# svn export https://phoneme.dev.java.net/svn/phoneme/components/cldc/trunk/src/javaapi/cldc1.1
-# svn export https://phoneme.dev.java.net/svn/phoneme/components/cldc/trunk/src/javaapi/share
-# cd ..
-# tar -cjf cldc-api-1.1.tar.bz2 cldc-api-1.1
-# move tarball to distdir, scp to d.g.o...
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc64 x86"
-SLOT="1.1"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/cldc-api/metadata.xml b/dev-java/cldc-api/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/dev-java/cldc-api/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index b56c4f3b7113..8514f348ff79 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -1,8 +1,6 @@
-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.12.0-sources.tar.gz 1072858 BLAKE2B d6b7ee9ef165e60f61d8d0dfaaf38919877f2edc6742cd58b2b70d379e807e75d9dc24e19f23db1b174d1797d6ef0af7700d686dd835d7a40bf2b2a91346e215 SHA512 80d1b960ae0b02859be329ea60d68cef33f3c7be7ec19752b3c9cfef442adef480878317ce2cfa309a27e662e2c72cab22023eaa3702e27970a1e5d55ca43f57
 DIST commons-lang3-3.1-src.tar.gz 638619 BLAKE2B f971afc9bdd3896178bc4be0b6c5d8809f1c1ac0d69ad73ba0d71c185c600ca7a55c3b4877af64b552ccebed9567aa7830f236f2c0d9c38f259870b894c9d745 SHA512 4d201c695a9b908a1809bbab689f80c6aa508b221b4c2786974eada08e647936f5879841c64eed509032ffdd5410735480e7ecb2910295d0f79e857c27019560
-EBUILD commons-lang-2.0-r3.ebuild 839 BLAKE2B 0d2d338ce391a152b73127792904096a744f18aa0ab5cf426bf8e48226a13924de745e43c91866db7e7b5a70cf558285654e2fb4efcac352b9faa323bcf65d9f SHA512 c8f1172157f4ecc2c2b44443a4c9fe14d824164869692b6e3d52684d17792f19c125b23bbebf5b5ab67d4a4e2718f629d9d5600ad98663e024040f0246acc41d
 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.12.0.ebuild 1036 BLAKE2B 23160f04bf20a6431d0b569a93c56bbdd08a4ea5ea3a135d1da55c52800fda51524877c507ac244e8e0cba93c7cae8d9210e13df1590ab5021cd2b0e01b9e706 SHA512 530f95c61531f1a1dd96e15dfc48e1224908bb76cb2d1e1edd3b6cf7ab629a8c482344f0a78b28a74bc196fc8606a838e5a86f9c3061620f1d49174ab7b26097
diff --git a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
deleted file mode 100644
index 27621bd3d6a4..000000000000
--- a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
+++ /dev/null
@@ -1,33 +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
-
-DESCRIPTION="Jakarta components to manipulate core java classes"
-HOMEPAGE="http://commons.apache.org/lang/"
-SRC_URI="mirror://apache/jakarta/commons/lang/source/${P}-src.tar.gz"
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/ant-junit )"
-RDEPEND=">=virtual/jre-1.4"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-S="${WORKDIR}/${P}-src"
-
-java_prepare() {
-	java-pkg_clean
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-
-	dodoc RELEASE-NOTES.txt
-	java-pkg_dohtml DEVELOPERS-GUIDE.html PROPOSAL.html STATUS.html
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-vfs/Manifest b/dev-java/commons-vfs/Manifest
index 577e9b31ca6c..f9020e6424b1 100644
--- a/dev-java/commons-vfs/Manifest
+++ b/dev-java/commons-vfs/Manifest
@@ -2,6 +2,6 @@ AUX commons-vfs-2.0-build.xml 14505 BLAKE2B adcdc22f6d65d5c98676bde1598d0cfe48c9
 AUX commons-vfs-2.0-incompatibility.patch 2699 BLAKE2B 09e8762553ce25d02942b2a70780ab68aacb5e6126df3e3f7b9f0bf8feae8e8809653c2a52eb09b58510944b87c1609d0120397ba7ac4f5d68317c18060a7d0b SHA512 ca554a098d4aaa6b8848927bfb4f70707dcaa0ba61d174ac517ac9864aa9b3f3e899e3890eab920582098aeea379cdf9ff1279ee7f8ddd37906fd24260954095
 DIST commons-vfs-1.0-src.tar.gz 278588 BLAKE2B a92be28e02758bd271d7bf76f8b90c741dad0f1c15c71ab3624e16c6c30a47bbe189ef93c99b1f413034c47dbfdefbc155a526abf9897b85cb7352d1a92b4bef SHA512 5826ccd3faf574d7573b22fbab5f7f3ddc83b22504eb0822efbcc4570059db410d1a32811bf411414d275bdeb16ce39fd7cca2150d8537841cd888b1aef2b5a1
 DIST commons-vfs-2.0-src.tar.gz 335255 BLAKE2B 01c8bba3340487672682af5c6b341ab1e8335070a9b711b5c85cca659854d05881a0ff10c4b168497e3a75867a7225740edc6e56019e55c499256401fb0a53c5 SHA512 433828b9eba73df14dbedaa4037e3da1c69bf1892553c1ae4d213ba864e4ee579e0c7799f39e3cb4ec087d7c9223f54442be46de9c4916d7b7ff8a51214d6346
-EBUILD commons-vfs-1.0-r1.ebuild 926 BLAKE2B 015548e9af71869d3fbbcb86fd2b26357c134f9fc0eff582eda19bda7b57252e05242f519e7e62d5f6600e3df27c8a182c415e23dcd9ceb11b6463be1db583ca SHA512 fbb4861ec1710b7de93d5690be2fa91920833b3274f5d47a558c94c95a912083b494f6bc40d5606b4a2c07ce17d10c46d7ef41105034290beaa0cfc3671bb2f7
+EBUILD commons-vfs-1.0-r1.ebuild 962 BLAKE2B a14b7e3b69aac36f0c3f99d4b3ef842e48d2997193b74be6610df3e885ff1f4d19a4faa2bd9e69310327a4e20115a7c07d7a91f87e629ecd96ec786fec96cb07 SHA512 02230fc7312f024e751e3873ded62d30c1bde28a36a2ee62f425118b582c3d7cd4cef931f235a8459f0b11975096fe325b7405bd15781f1ef03d2203002b4acd
 EBUILD commons-vfs-2.0-r1.ebuild 1555 BLAKE2B 6b63d2ba8e44911ee0bbb849b2818b9db99c7e054d5fa4c8f70d1a041f8ee6c32ce34ed94e4e5b6ea135c803b4b1cdf1b842f9a7fd1a6ed6fcac3ddf2d34a371 SHA512 717232ee5632658753e44637acd0edc9424782311bc370ffc2f3dd494ca46c188d79347dc67c1ea67c658809170fb452f4d522bd3d60029d0d3fa0a8b07f945b
 MISC metadata.xml 522 BLAKE2B b4fa8415246b36a13af5f876f6fb75a49d867247d47d39fa26652917f0dc6e0fd48e99518cb7406375ea9b5715a8beb0f798dd9d95825969fa320aded7da50e3 SHA512 1c1c96edc32537d782e66dcf44b14081f2cdd249e5bb398dcc711b4dabac745db15af7fee7ceaaf0d758738b99f3fee8be7b9e1561887426c3ae8988bc1900a1
diff --git a/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild b/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild
index 0387c4902d78..acc513af4c25 100644
--- a/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild
+++ b/dev-java/commons-vfs/commons-vfs-1.0-r1.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=6
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="commons-vfs:commons-vfs:1.0"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest
index 6f8e725af6b4..de1a58b03393 100644
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@@ -1,3 +1,3 @@
 DIST error-prone-2.0.14.tar.gz 677991 BLAKE2B e247249b385b4d5ff46cd9faaeb88b7c2053204c17a2a81846c554e2eb95389a17ca340f02dbab187f7b9e297fb13c030912e49bfbe5b29c7158391b1a7c50da SHA512 0bf2c869638e03fea5395e2b84a690c42df320903e48a171537e68a60ae7a47a8a83de07fa0a8dfb03340c035878b4380fd6677ba3bf1d13eeffcfaee4e63658
-EBUILD error-prone-annotations-2.0.14.ebuild 599 BLAKE2B 11e987bf8062ee9f978620396c3b8a8b5dce81fbe106591387d24432a9683e544d85def6210d8df2defce9c7d25f71f1c4bcbba98625dd73304542e834d1d4bb SHA512 496b67dc1a6ecaf723ffb5264a1867da3d910cb6b0bf93bb9c1c88747edd4400171eddc58e20155e44271dfa977e9d51111c2af3bf7566028f7814131e5bddc9
+EBUILD error-prone-annotations-2.0.14.ebuild 603 BLAKE2B da8cecf785fd3292b6b62e422fa54817ba9ac1276571dda005f5272e8f3052fccd03bdada317c4f52b196c5a50be637c17bd32584523dddc389d95e9e218609a SHA512 48fdef6dc711cf89f9f4c56c10c98f40ea051df61bf1cdc88f5ba17f5631e9fc6cce8236e7901fd3b88908d45e991f5fdffa07c30ce5d7f4ac44ca3b0bd45381
 MISC metadata.xml 319 BLAKE2B 727cec3df9c56a586a06b2f4ac39febe65520ecdf569e1b0e721dc57d90f3a6103b6de61877c60d8f283dd68644f8832d889c703d8f16a563f936ccec21b1e62 SHA512 0ae8aaa5ccf52264fd07cc4086c8d60eddafca5fa65c1769e5f810a63f5477914ba1f4e27f88836207ebb21cc595f8fa94bcc3e5c955a53b20afea8555ee73f4
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild
index bde172d25913..5f84c472f4bb 100644
--- a/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="http://errorprone.info"
 SRC_URI="https://github.com/google/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.7"
 RDEPEND=">=virtual/jre-1.7"
diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest
deleted file mode 100644
index c357cd76d56e..000000000000
--- a/dev-java/freemarker/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX build.xml.patch 2160 BLAKE2B 15221b65f00871e3e01b30b735d9ac3498644eb5570e4d8ac5e75ad4dc995719f40832fe9a58fa367aee8a8a2a0d854ea99370cd1def119c30371c3f503b2a69 SHA512 ae01462ed0a8fc61fc6e34b99b536bf7d36da73744a070ad63f555af07de5dec3a0926b97fc984ab481db7b7c8807db53998f83e17a5717e805c87a49047731a
-DIST freemarker-2.3.25.tar.gz 1873971 BLAKE2B 52c64938c67ac0303b07f4aa74c3fc7ccc0be68bd37a7c6c663ac0849acc9f2236d1028abb377efa6fdb518840b1961e71c1a02a37388864f9be14b3b443f28a SHA512 32a41a73a2f71a4e0ae8829da2c09e07204aa2b4a6899e2c7a3db0bde5d3e129ec7b44b7299a20165d7eb88f4f7d1bd9f0b7a1fd116dc11493134bec2306d1ac
-EBUILD freemarker-2.3.25.ebuild 1521 BLAKE2B c2bfe59271f782fbdf032ae0bef290652b02cc360a597190fb08fa404823272a6f2ba5dbecac0c86ee6a2be1f3ebcfdd259ea37a1bd801daf44b1cca78b41d4e SHA512 dab420734ea60b4b26781240046a5791a48d0346ec30526563e6caa656062a550948a61232664f96544cc4b6f4a865626d0bd21ab1ef60d1e3743da7b32c0039
-MISC metadata.xml 383 BLAKE2B 673f786e4169d8ce1dfa9b341738f6b30cab82a6c0c86cbb53e6b3ef7fb853285ad33551d0a1f436a77eb5fd029f5a50120a4a3dc29e0edd8643a6248af540f5 SHA512 6159fec9f927ef733fb89aa11bf0fc6e9920d9b4d33601bf728d6f0c32a625ed673a4c1db0fd4d364664479da85c3bd0a11e26debdb0664a88659970740c8202
diff --git a/dev-java/freemarker/files/build.xml.patch b/dev-java/freemarker/files/build.xml.patch
deleted file mode 100644
index 33701f89175d..000000000000
--- a/dev-java/freemarker/files/build.xml.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Naur a/build.xml b/build.xml
---- a/build.xml	2016-06-14 19:48:01.000000000 +0100
-+++ b/build.xml	2016-12-22 22:41:41.988262564 +0000
-@@ -27,6 +27,10 @@
-   xmlns:u="http://freemarker.org/util"
- >
- 
-+  <path id="gentoo.classpath">
-+    <pathelement path="${gentoo.classpath}/"/>
-+  </path>
-+
-   <!-- ================================================================== -->
-   <!-- Properties                                                         -->
-   <!-- ================================================================== -->
-@@ -143,13 +147,11 @@
-     />
- 
-     <mkdir dir="${_javaccOutputDir}" />
--    <ivy:retrieve conf="parser" pattern="build/javacc-home.tmp/[artifact].[ext]" />
-     <javacc:generate
-       target="src/main/javacc/FTL.jj"
-       outputdirectory="${_javaccOutputDir}"
-       javacchome="build/javacc-home.tmp"
-     />
--    <delete dir="build/javacc-home.tmp" />
-     
-     <replace
-       file="${_javaccOutputDir}/FMParser.java"
-@@ -271,6 +273,7 @@
-       verify="yes" stubversion="1.2"
-     />
- 
-+<!--
-     <ivy:cachepath conf="build.jsp2.0" pathid="ivy.dep.jsp2.0" />
-     <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" 
-       debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8"
-@@ -286,6 +289,7 @@
-         freemarker/ext/jsp/FreeMarkerJspFactory21.java,
-         freemarker/ext/jsp/FreeMarkerJspApplicationContext.java"
-     />
-+!-->
-     
-     <!-- There's no build.jsp2.0, as those classes are part of the common build subset. -->
-     
-@@ -301,6 +305,7 @@
-         freemarker/ext/jsp/FreeMarkerJspApplicationContext.java"
-     />
- 
-+<!--
-     <ivy:cachepath conf="build.jython2.0" pathid="ivy.dep.jython2.0" />
-     <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" 
-       debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8"
-@@ -325,6 +330,7 @@
-       includes="
-         freemarker/ext/jython/_Jython22VersionAdapter.java"
-     />
-+!-->
-     
-     <ivy:cachepath conf="build.jython2.5" pathid="ivy.dep.jython2.5" />
-     <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" 
diff --git a/dev-java/freemarker/freemarker-2.3.25.ebuild b/dev-java/freemarker/freemarker-2.3.25.ebuild
deleted file mode 100644
index 8c7f2fd962de..000000000000
--- a/dev-java/freemarker/freemarker-2.3.25.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="incubator-${PN}"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A Java tool to generate text output based on templates"
-HOMEPAGE="http://freemarker.org/"
-SRC_URI="https://github.com/apache/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2.3"
-KEYWORDS="amd64 x86"
-
-CP_DEPEND="dev-java/avalon-logkit:2.0
-	dev-java/commons-logging:0
-	dev-java/dom4j:1
-	dev-java/jaxen:1.1
-	dev-java/jython:2.7
-	dev-java/log4j:0
-	dev-java/rhino:1.6
-	dev-java/slf4j-api:0
-	dev-java/xalan:0
-	java-virtuals/servlet-api:2.5"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.7"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.7
-	dev-java/javacc:0"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/build.xml.patch
-)
-
-EANT_BUILD_TARGET="compile"
-EANT_EXTRA_ARGS="-Ddeps.available=true"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_prepare() {
-	default
-
-	rm -rv \
-	   src/main/java/freemarker/ext/jdom \
-	   src/main/java/freemarker/ext/xml/_JdomNavigator.java \
-	   src/main/java/freemarker/ext/beans/JRebelClassChangeNotifier.java || die
-
-	sed -i \
-		-e '/<ivy:cachepath/d' \
-		-e 's/"ivy\.dep[^"]*"/"gentoo.classpath"/g' \
-		-e "s:javacchome=\"[^\"]*\":javacchome=\"${EROOT}usr/share/javacc/lib\":g" \
-		build.xml || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	jar cf ${PN}.jar -C build/classes . || die
-	java-pkg_dojar ${PN}.jar
-
-	dodoc README
-	use doc && java-pkg_dojavadoc build/api
-}
diff --git a/dev-java/freemarker/metadata.xml b/dev-java/freemarker/metadata.xml
deleted file mode 100644
index e471a93e212d..000000000000
--- a/dev-java/freemarker/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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="sourceforge">freemarker</remote-id>
-		<remote-id type="github">apache/incubator-freemarker</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/gin/Manifest b/dev-java/gin/Manifest
index e5d5c84b93b5..3cd87cfdba6b 100644
--- a/dev-java/gin/Manifest
+++ b/dev-java/gin/Manifest
@@ -1,3 +1,3 @@
 DIST google-gin-2.1.2.zip 5495552 BLAKE2B 3e07fc2e8f2e93872cb022dc57d5b06cfb81cfd855e8027fbcc312e2b95e0c8c35a783c6deb842fd1f40ae8c94e5c120f463c36e20d873a415ef62b0e717f490 SHA512 eb661760078d2053dd1f6cf0d96e9c2895c7d7fd805c14f4da63c28801b8aabb6a9cf6baff020bee3830a3ba1451bdf44d53d41cae1d720bded06f7d013d59c0
-EBUILD gin-2.1.2.ebuild 1513 BLAKE2B 48e0974df47c0c2779928e599de64f11d4e5a191c8ab62cacd694532bee89dd56d9c49f7973cd93a728ef8a416bcaa68a08df35809010117a41d6588459960c9 SHA512 98f19d22a51507e6849c3c27ba7d4f666c095b4bedde0a33e7c2135ec0ca49ac348e381db6e06ef3a2008f2b06ecb89686d29f9f5de69ef655d46fa0b57cd0c4
+EBUILD gin-2.1.2.ebuild 1546 BLAKE2B 3bd59051fcdc0c81327d26f98787bf5901157c3ed1b7de107112e1fe4ec0c54728f08fa3284178bcff148bf2ce7882edec3fcc6aa6e2f4c1904687c5cc1220f8 SHA512 6f9c19ffee1a5b679c0076f5a659b6bb104c5b5645ff9ffa69786e314be006d300b0f121517af992a9997913c25d6fb9d3f7fd690b9a308913f674c73f301350
 MISC metadata.xml 557 BLAKE2B fbfae465245ee9fb076c37a02f6b9af1e47f304c1dd0e73a698638b1403a4665c9ac8a6cbe4202adf50ddbdbeb78f201c6330b70fcf453d6eaa1cfd2fdf374c3 SHA512 620701117b492028e619f8826d8efcb24c7861f3ac936d7a2506b2ed1da238555c74bb403ef60b333a2421515e891a9619338cd0b4f772ce2a72c0daa7c985c3
diff --git a/dev-java/gin/gin-2.1.2.ebuild b/dev-java/gin/gin-2.1.2.ebuild
index ef0a80cfdee8..a13c8f0e9aa6 100644
--- a/dev-java/gin/gin-2.1.2.ebuild
+++ b/dev-java/gin/gin-2.1.2.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
@@ -27,13 +27,13 @@ CDEPEND="
 		dev-java/gwt:2.8
 		dev-java/validation-api:1.0
 "
-
 RDEPEND="
 		${CDEPEND}
 		>=virtual/jre-1.8:*"
 DEPEND="
 		${CDEPEND}
 		>=virtual/jdk-1.8:*"
+BDEPEND="app-arch/unzip"
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 EANT_BUILD_XML="build.xml"
@@ -55,15 +55,15 @@ JAVA_RM_FILES=(
 
 src_compile() {
 	local EANT_BUILD_TARGET="compile"
-	GWT_HOME="${EROOT}/usr/share/gwt-2.8/lib" \
+	GWT_HOME="${ESYSROOT}/usr/share/gwt-2.8/lib" \
 		java-pkg-2_src_compile
 	EANT_BUILD_TARGET="jars"
-	GWT_HOME="${EROOT}/usr/share/gwt-2.8/lib" \
+	GWT_HOME="${ESYSROOT}/usr/share/gwt-2.8/lib" \
 		java-pkg-2_src_compile
 }
 
 src_test() {
-	GWT_HOME="${EROOT}/usr/share/gwt-2.8/lib" \
+	GWT_HOME="${ESYSROOT}/usr/share/gwt-2.8/lib" \
 		ant test || die
 }
 
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index 34b6759280f7..38ea998e40ba 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1,3 +1,3 @@
 DIST gson-parent-2.7.tar.gz 437390 BLAKE2B 596331eb829797ecb172c55bef3bca0710c1461f504d1ff6170f332c3a77fbe8cf79b85b8ca16867040b86c46d6dcef09b0bf29d213fa82dfb911feeeeff57eb SHA512 663365566234bff0a94eac6ad4cd6e772b8fd542af2cccba2c2f75081935247eebf1a2502d5ce5dd0a0e75e140e17a689880a3aa04fa7c47a1e7bc834edd415e
-EBUILD gson-2.7-r1.ebuild 564 BLAKE2B 8bc434205dbc59572fd7db97bb64612b6ecd20b365a195afe7d296bfcebbf63e9790214c51bb1cc8081e9b0bdaaa92e4f2b036aa39477b9655a942070d7747a8 SHA512 ba0cbcf61eedf061ccb78eaae4fb238d1ce077228a96cb5e4f5cd83c9e272e5e06cb2153e791ea28d7871c1a272bcc70b081ac88b6984e3caa8ee3c1149594ab
+EBUILD gson-2.7-r1.ebuild 571 BLAKE2B 4822c5d75ea5822d20a3b48e6ccd64e792efa32a2810fc1ccc88f430d5183b7b9a756744a8239d74a3fa3b550707ba9fe7d43d9180ae56638d814b4f1d76e1a3 SHA512 76945946101257ecfbef0c3cf97a3badc2a3e15a9def7e863a551b8ecd52f323fe8b2fdf7a4f4bf912a5d35503a5eefb0c7a71a658567b02d40f9767bf6d9fed
 MISC metadata.xml 629 BLAKE2B 4e0b0c0f59d898923ef06924e2de1e5bab0cfed3ac891d739ddb16641f927ab878bcea986020c95d8c535114ec232260ddcba2e4100e0a6ff0d92284c66d73ba SHA512 66089434169cfb86acf2e024d61e4cbe90022350223111589d72de9301a6dfc2f3a66596e2e9e4ec4e91ec70932b3aa9ac0fb130f6c1a7ed47efd2e6b81fef76
diff --git a/dev-java/gson/gson-2.7-r1.ebuild b/dev-java/gson/gson-2.7-r1.ebuild
index 7d902a246532..54f042e16ae5 100644
--- a/dev-java/gson/gson-2.7-r1.ebuild
+++ b/dev-java/gson/gson-2.7-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/google/gson"
 SRC_URI="https://github.com/google/${PN}/archive/${MY_P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2.6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
index fba99b74e002..b04dfd6984c2 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 835 BLAKE2B 2ed4fca37b4e138f104976ce3ab0d7ebce990e35cfaebf910bc57530092c482e1f9fa03adc61deb050be663f5ee8912810cd23ca74676a1c7c18feed35ed64e2 SHA512 2e5a66cb220421463e10526b0358c0f8091b887c482c06963dc14eec1987818e681853e0a451e045c7ccce9451fc5a21bc6340773280eeacdf45ca1650c79d2c
+EBUILD guava-20.0.ebuild 842 BLAKE2B 7ce9df91ea55b66c9e0b2705d5f1969d2d91cd66bf57ef4e50cf934bab587ce2d6838cd553720597bacdae6349beb834bd7f78047a169620bcf004ef81089e6a SHA512 10c9e67adc9461f82efd10502ce687c7284b3103893ec80de979f705ab8b1a17cd75d527bfcdbb3aa1d39f9d931c044febe15f16183d642af3d8c9292ac70821
 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 f07428f2619f..a7e19f2e33f1 100644
--- a/dev-java/guava/guava-20.0.ebuild
+++ b/dev-java/guava/guava-20.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/google/guava"
 SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="${PV%.*}"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 CP_DEPEND="
 	dev-java/animal-sniffer-annotations:0
diff --git a/dev-java/gwt/Manifest b/dev-java/gwt/Manifest
index 2563bf23f91e..bd92d7ebc1c1 100644
--- a/dev-java/gwt/Manifest
+++ b/dev-java/gwt/Manifest
@@ -1,5 +1,10 @@
 AUX gwt-2.8.2-build-system.patch 758 BLAKE2B b1aca717473f2ebee42bfc2902c8eb0012698c8f7a059f5c9d29944b154c1a85ae296d8639271aaa6f749e5fa84de8e4e8ad5da45c90495e1f5ab429eff13740 SHA512 c469c23ded60e5f844abda0001f4ca99fd6756f9bd433f3e8a433c9441db3dd62d0523ab90b3f2eb1bf2b26675ef0f01a3ddf7dd371df844037a9f249c5b59a5
+AUX gwt-2.9.0-jsinterop-classpath.patch 1045 BLAKE2B 8efec183d5d7f2d2196d176d13e53c4356af3551838c3f32f586c673e03c8d3aa029d53ef490c2961482ed6ab1a4c53838f4060e1438cbd540823cfd11380f6b SHA512 85a0aad95157f0ab8adcefc43b6fa9d98d3970719ff7cc488e700ad23c0b3944c72ea837c689f4f50829d04c54b4693123a610a6f3600f522eb3026a1add4056
+AUX gwt-2.9.0-remove-git-usage.patch 1284 BLAKE2B cf06867ab6917e04a90a6f98f6868467dab8a54eda93847cf77a2e45917a59329c5be0857e3ad38eab942c90f696f9d6e8fd8509174b16c1cc72d242a01fcc3c SHA512 b32c808cf6514893aad5fdd07aa2724a9a3f0c9dede9aa1092ffe2470db02f481f6d2cba8b1521f221dfff0f2353dbe41aa1169eba28512f7c8feaf1dffba879
 DIST gwt-2.8.2.zip 22017212 BLAKE2B b112df08885e607c975f9585d6b83e2a12894e974850ada052918e4b946b11bfc8d9cf9d71f4e684121d9d16714885be549eed44d77a119e695c2b50cd6bc6c3 SHA512 ac16311c3b00b36d421eef914e73ad8dea01f022c87fc7ed722fdfee8eed391f1987cc1c34522978afc542cdb90eee791efcdcc725d9a395ab468e458b708074
+DIST gwt-2.9.0.tar.gz 13081965 BLAKE2B 8b18e4cad6df9b1a2336bdf537a26def021ccd950299a6064e9a7328d0161c093f56284cce7b8a0e0a0c72b0dc9604e5e5527332d1878afd19a3c95eed5129a7 SHA512 424484a42f28387734a89a3a12b48716031e194e3a712a5e7cbdb66f77ab68e72ff8751f70a4048f4b9f35d92948c285490fd8e23c34d5c5e5558fee33952bf5
+DIST gwt-tools-194772ed94078802d8030136796de344eb1fdbe1.tar.gz 575902138 BLAKE2B 518ed1752cc82a527521525e181db712a641d36db203f511bdcc5206de314aa1eb693415b690fc42f38c9beabaffc484ad6ec3444e3cd8b4f2a3fa2ab9505f11 SHA512 0365d664b4b14ec833c922c8fab5df269e69ac8f1526315810f4922132439b880ee15e7e8b80e8b505469a374ba4a47998c7ed07b5f53227d50100247fade82b
 DIST gwt-tools-f42d2729a3a8e6ba9b9aec069957bce5dc0f6f6d.zip 577453206 BLAKE2B 83a3824d6418727876b4708ed44ab1f58513a5b39d4e48f9bf21290ca358f76ec2ccd98ce2aee76afe7f621fb1f703bf459b8c3d6a3d4f32d4be807bc723513e SHA512 f4f033c972d955da40258020a9fb84ae90f30b7afeb1ae8044cf00f4f5f45200129bf84e2f69660a4eb80bb60f3a5a1d3c5af69fe9e07e0b985de0e708ca933f
 EBUILD gwt-2.8.2.ebuild 1855 BLAKE2B 3aaa9cc77f59b1de68576ffb181b79cea5df324bca29149430dfca81c114fe07401136e5afb8ee78dddaa7242c0ca00da4263483b7aabd756ff6c87daffb61b5 SHA512 806919aefcd54194e9c1b53066f2c7bd7585151c54b0a7706211dec59bf31e4ec4992a8a26df6217a9265019705c1ef777d1728314344e2dfa08bd42050491ee
+EBUILD gwt-2.9.0.ebuild 2239 BLAKE2B 4c3a7ee2474cdacbafebdf1107750f37e9e73573d032746fad912f2a40ab77773572b648592d567c8cf7105281a40af774f4bacd349f25f069306281d51ee877 SHA512 0c28f0495b51d5789524529f91f2eed43d92ef059990fa7d747b58b46f1157f8dd2fec912d6c773959a7fa3b8a03040923de5edd47471b1e8e73776c2754eca9
 MISC metadata.xml 766 BLAKE2B e023f4897d31fa31c961563600b21d9a03a26b1ac70b75859c66e558177e7b42b747cfb40d22760eb132b44ac5ec2ee8906a48ea09b591e8a5cc1dd7a91cc55e SHA512 c4fdbf613e76d4be2c71a15fc9f99f0cd744aa4508725dc36a11421eee6029a22af833c360b525002a5be76b74494b14ec093945e1c5f25a9c2fb71867cf3f32
diff --git a/dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch b/dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch
new file mode 100644
index 000000000000..5e69341210cf
--- /dev/null
+++ b/dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch
@@ -0,0 +1,20 @@
+# It's unclear how upstream gets their "dev.compile.test" target to compile
+# without this - it could be that their testing is done with the local tools/
+# dir, and that some assumptions are made somewhere in the bulid system that
+# don't apply when the tools dir is elsewhere. Either way, this fixes it.
+#
+# a Pull Request (of sorts) has been issued with upstream to incorporate this
+# change. I would list the PR link here, but they use gerrit, and i don't
+# understand what happened to my submission after I issued
+# `git push upstream HEAD:refs/for/master`
+
+--- a/dev/build.xml
++++ b/dev/build.xml
+@@ -60,6 +60,7 @@
+         <pathelement
+             location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/>
+         <pathelement location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar"/>
++        <pathelement location="${gwt.tools.lib}/jsinterop/jsinterop-annotations-2.0.0.jar"/>
+         <pathelement location="${alldeps.jar}"/>
+       </classpath>
+     </gwt.javac>
diff --git a/dev-java/gwt/files/gwt-2.9.0-remove-git-usage.patch b/dev-java/gwt/files/gwt-2.9.0-remove-git-usage.patch
new file mode 100644
index 000000000000..9ebbafb99099
--- /dev/null
+++ b/dev-java/gwt/files/gwt-2.9.0-remove-git-usage.patch
@@ -0,0 +1,26 @@
+# This git stuff in the ant configs is useful during development, since it does
+# something or other withe git revision and sets some sort of sentinel file.
+# Since this package is for a release, we don't need it.
+--- a/common.ant.xml
++++ b/common.ant.xml
+@@ -277,16 +277,16 @@
+ 
+   <macrodef name="gwt.getgitinfo" description="Identifies the GIT info of a workspace">
+     <sequential>
+-      <exec executable="git" searchpath="true" outputproperty="gwt.gitrev">
+-        <arg line="rev-parse --short HEAD"/>
+-      </exec>
++      <!-- <exec executable="git" searchpath="true" outputproperty="gwt.gitrev"> -->
++      <!--   <arg line="rev-parse - -short HEAD"/> -->
++      <!-- </exec> -->
+       <!-- Generally, filtering requires a sentinel file so that changes to git rev will
+          be noticed as invalidating the previously-generated filter output.  This property
+          names where such a sentinel lives; it is tested with <available/> and created
+          with <touch/> -->
+       <mkdir dir="${project.build}/sentinels"/>
+       <property name="filter.sentinel"
+-                location="${project.build}/sentinels/gwt-${gwt.version}-git-${gwt.gitrev}"/>
++                location="${project.build}/sentinels/gwt-${gwt.version}"/>
+     </sequential>
+   </macrodef>
+ 
diff --git a/dev-java/gwt/gwt-2.9.0.ebuild b/dev-java/gwt/gwt-2.9.0.ebuild
new file mode 100644
index 000000000000..b3a3173ebca2
--- /dev/null
+++ b/dev-java/gwt/gwt-2.9.0.ebuild
@@ -0,0 +1,96 @@
+# 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-ant-2 java-utils-2
+
+GWT_TOOLS_COMMIT="194772ed94078802d8030136796de344eb1fdbe1"
+GWT_TOOLS_PN="tools"
+
+DESCRIPTION="Google Web Toolkit library"
+HOMEPAGE="http://www.gwtproject.org/"
+SRC_URI="https://github.com/gwtproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/gwtproject/${GWT_TOOLS_PN}/archive/${GWT_TOOLS_COMMIT}.tar.gz -> ${PN}-${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}.tar.gz"
+# While the test suite does compile and does execute with an exit status of 0,
+# there are many tests that end with FAILED status. It is unclear if this is
+# expected from upstream or not, but in order to keep things honest, the test
+# suite is being restricted
+RESTRICT="mirror test"
+SLOT="2.8"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+CDEPEND="
+	dev-java/json:0
+	dev-java/guava:20
+	dev-java/rhino:1.6
+	dev-java/asm:9
+	dev-java/eclipse-ecj:4.5
+	dev-java/validation-api:1.0
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+DEPEND="
+	${CDEPEND}
+	virtual/jdk:1.8
+"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="build"
+EANT_GENTOO_CLASSPATH="
+		json
+		asm-9
+		guava-20
+		rhino-1.6
+		eclipse-ecj-4.5
+		validation-api-1.0
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.9.0-jsinterop-classpath.patch"
+	"${FILESDIR}/${PN}-2.9.0-remove-git-usage.patch"
+)
+
+src_prepare() {
+	default
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	# the default setup assumes that you've placed these in ${S}/tools. We put
+	# it in ${WORKDIR} though
+	export GWT_TOOLS="${WORKDIR}/${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}"
+	export GWT_VERSION="${PV}"
+
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	local -x ANT_OPTS=-Dfile.encoding=UTF-8
+	local -x TZ=America/Los_Angeles
+
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local i18nCreater_launcher_args=(
+		i18nCreater
+		--main com.google.gwt.i18n.tools.I18NCreater
+		--jar gwt-dev.jar
+		)
+	local webAppCreator_launcher_args=(
+		webAppCreator
+		--main com.google.gwt.user.tools.WebAppCreator
+		--jar gwt-dev.jar
+	)
+
+	java-pkg_dojar build/lib/*.jar
+	java-pkg_dolauncher ${i18nCreater_launcher_args[@]}
+	java-pkg_dolauncher ${webAppCreator_launcher_args[@]}
+}
diff --git a/dev-java/icedtea-sound/Manifest b/dev-java/icedtea-sound/Manifest
index d3a7d809dd29..f6f2502b5bcb 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 877 BLAKE2B 17b124f4aa001c3f8dcd7c1d8857f4ec62849f0cecb766a84db94062f24d2f13bdcc4626f32404e30cf6b85c25711ed48fb2cc8704d43eba149f483d7c22b725 SHA512 88b02f1e9948ef9f698e44762c6e18df5a22b852de53b92c2a572799d2629863cd3f73a240841e83ddbdc7dfa33ceb92378653af9aa1d947d7072270c8c23e25
+EBUILD icedtea-sound-1.0.1.ebuild 882 BLAKE2B f99da70389da19d3bb85e7562e818ceb900524e90b3ad250285834c2a7c3c0146c8e80b9436538166fc51cdeaf76e352d356ace0943dcb37503cb57d07f78409 SHA512 8f88bbd9d26a34067d4fce8c7fed64c4c3c84b7d6470cd4fc7a178b7bade00da3debcb62ba4157aaa8cc561b00e136a8d6eafaea7898c1c453c1850d1adac7b6
 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 a891e3577f34..c480a1189a79 100644
--- a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
+++ b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
@@ -35,7 +35,7 @@ pkg_setup() {
 src_configure() {
 	econf --with-jdk-home="${JAVA_HOME}" \
 		$(use_enable doc docs) \
-		--htmldir="${EROOT}usr/share/doc/${PF}/html"
+		--htmldir="${EPREFIX%/}/usr/share/doc/${PF}/html"
 }
 
 src_compile() {
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 367c91c42af6..9dc9ffd822b9 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -11,7 +11,19 @@ DIST icedtea-3.18-nashorn-3.18.0.tar.xz 2323912 BLAKE2B ab0c7dc3635a6eb7feb350d5
 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-3.19-aarch32-3.19.0.tar.xz 7199408 BLAKE2B c079eb55ca198f2d34b73e6ef80f1507e50e9ad2140d1af86c64da54e6b85d1345fed347d207205806a86728afde37ab3ae13830625da4d488d6db4bc841ff28 SHA512 9f364c0d51eb57168009ca08d74b598e553885d42f11df0fc1ac563e6a5234207a85fddf3fe315b3ac4cbdf8b50bcfdfd1bbb4fdea5e6f8b6988624cbe6c0b33
+DIST icedtea-3.19-corba-3.19.0.tar.xz 948912 BLAKE2B 888443236851c96934f9513ae28e1908cb49d4fc211426f78ddf9a31a9815c382d38a196ddc69c7e9573b840fc5533c95a55ded3a3bc3d6f55a8d25ac2587fea SHA512 9127268d519dd95fc5eeb6904b54dab3bb5472610e26c2b691a7306d25169dc82ce6de26ec3fe396a7f19726f73c5597fbf79d33027d905a3a1533316c4a3f1a
+DIST icedtea-3.19-hotspot-3.19.0.tar.xz 7113752 BLAKE2B 4a5603e64e4df6e7e0beebc762bc73868d736367540dac332196e736e1de371b63c9f3b7f1c167450536b6e195befee10136515027774fde789e90ade198020e SHA512 5995a905f9e886d9b2138f112ad9e03ce580f646f58601e354ebc5e0f2fc3f37b61847e64f258e9c31ab479e0e617604fb21d990c33b906d4cd1853fe9f1a0fa
+DIST icedtea-3.19-jaxp-3.19.0.tar.xz 2267888 BLAKE2B b64d615813e42e55eafda4374a8959b24b47614a158dc88d4ff188c09d6cc6f6d23ec6ae613ebdc52bd7fc02bcd8b96e517f163bf397b94eb36e68af9f7a7285 SHA512 78cfb56662e6b76632b746ff3b53496a7fa82daf2fe24d0988eda0552758f6c71d434ececd50fc7baf2e4e8a03b4febe8d489b2b6e1ac791c07170d72f7a881e
+DIST icedtea-3.19-jaxws-3.19.0.tar.xz 2277616 BLAKE2B 5fbca1daed96ef603e9605b9d2565c0a6be92771c862bda45c8cb532cd493d9f1e46f008a070ff6276ba68378427e5e82d0f5efd6a1098db7ff14a29a5854d1a SHA512 fca97468d4e73f7b5d345edf35422ea5a417cba2d1441656d2ab2ffdeb814a2641c2bc732b8e76a9a62566f95e1ef2a2d6281a3a6f8bffa900549f6ed6e86444
+DIST icedtea-3.19-jdk-3.19.0.tar.xz 40689020 BLAKE2B f85005bef6d2c22b57fffe5b403278dfd18b8a244da0b8e4f6d7ce574dd2d14da453d14ec02c131697b639f8155962755ef924690ae9fb5aa302ba84bf140a56 SHA512 aa8fdb3d2f43a54bc39f9f243392fcf161d3ad0f568681f0baccc8c99ab667d621b905fd4f32b0787107ab70f402978e0cf06b364a625c05a8358e86c0080a14
+DIST icedtea-3.19-langtools-3.19.0.tar.xz 2080888 BLAKE2B 06d9a2efb9bbad4e47b8f3f19d6b51eae5bc88b652175fe7a8fa98e72fc01a547c1db4efef7e0c2f9b8d0e27ba8f6f4b9ff6fe59197da39bdb8b77c60cec4057 SHA512 b96e24fe6e03e3522f3ccab956539fc518f9d4fd24d0c476c42c76fac1adee7cc367f9ca451f6dc97877f5bc28bc5d8810fedddf69548781c6429cae348ab736
+DIST icedtea-3.19-nashorn-3.19.0.tar.xz 2326776 BLAKE2B 5dfb09fffbec8f36eccaa81cea8e539004f523c35eef566330c9067f1136f54e4aa313bddc3093e3ec17a7d2d37298f92750286a6f601ce9bf4dbe6ed9f77ff5 SHA512 d831c844c5cf5fb778cf34f25dca855ba7c7dea9d72c6b59b402a7e19e3d3a2b7aa5b57d218f549aa82c1a1a733f450c3ed78820b2930e1c7d17eb08dd9dec7a
+DIST icedtea-3.19-openjdk-3.19.0.tar.xz 365128 BLAKE2B 8abc4d77d961810df0ac8a1c5fcc4eea0e0cc888b4471b987d708569116cba4871d37fdb9e7d115f5b2bb387e73e71593e04bad2d3ed2e33ab2938192251506a SHA512 90dea98d26279a5d0a5869a8d53234bc27a4fdcb0682ebc3baba1670ccca2035e41d24d0d67a7ee5d9304058516136c11177eb8190edb35f03ce8b8f63e56357
+DIST icedtea-3.19-shenandoah-3.19.0.tar.xz 7286788 BLAKE2B d1df26c9c25930a19ad1acad3c3a7b249456c1732981b5aa9f77f847c7e0c53010a7eea646ea0b63293985af238309c72320b0ac71678c0ca88c211d2adb601d SHA512 7db3b3f9c3e42fef50f1a84e9db1d1c2b5322f15ea26e7f0bcbbae8011365faf7f0ad4bf0bcf861c2d5eb1fe2845d57f9355b1b2e0203558f47a3564ae4709a0
+DIST icedtea-3.19.0.tar.xz 1568996 BLAKE2B 0ded447c674aa5dbfba690652de474b13f2107c221e0a7a9d98912ac374efbd44093c482abc5e4d4dcde0f9712020d8bdd9de98b347145217e719edf801e9afc SHA512 27d7c4c8e025a2c9320c0a47f3c521f51b49bf55d021c7a08aea9b7cb3d522cfc3e10d438b837669eeb5d427e950e7643c5ce4f817567d5e9fe39b56cdce8835
 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.18.0.ebuild 12385 BLAKE2B 1dd24c16d4c280249ce3adbc183b347318ed7f101fadfd11a04031a31e2957b0df438882bc200b6d8837358ab5f1cb7cf554b6fb666c5ded4fc1377d49b9158c SHA512 3dfaf9dd4bd5a7dd54ec71061561d94706ad27ec923aaf1e510a51b19b242a1fcad5d6b05f3cf5d90e599a6819b9ff1cb24eb80c26bf40eb359a1b723ee39f5e
+EBUILD icedtea-3.19.0.ebuild 12385 BLAKE2B 1dd24c16d4c280249ce3adbc183b347318ed7f101fadfd11a04031a31e2957b0df438882bc200b6d8837358ab5f1cb7cf554b6fb666c5ded4fc1377d49b9158c SHA512 3dfaf9dd4bd5a7dd54ec71061561d94706ad27ec923aaf1e510a51b19b242a1fcad5d6b05f3cf5d90e599a6819b9ff1cb24eb80c26bf40eb359a1b723ee39f5e
 MISC metadata.xml 2108 BLAKE2B 3160040a91a46f2b5dc9be02405ad35849b5c02ddfae81a17ec47a15bd9103cb17bcd0c1065a660e3ffcd4e8d815fffab4c020d3dfbe5e9936826bb15072e00d SHA512 fdcb8411daaabf953bbb75d8b58137ab1f7a3755a1c016ba431ab366177eb91e9cef365fc921d989384f076c589fc46358838d4a4c86cd50955cfcfc9b97dd74
diff --git a/dev-java/icedtea/icedtea-3.19.0.ebuild b/dev-java/icedtea/icedtea-3.19.0.ebuild
new file mode 100644
index 000000000000..505db1a198f0
--- /dev/null
+++ b/dev-java/icedtea/icedtea-3.19.0.ebuild
@@ -0,0 +1,385 @@
+# 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)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
+# *********************************************************
+
+EAPI=6
+SLOT="8"
+
+inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix toolchain-funcs xdg-utils
+
+ICEDTEA_VER=$(ver_cut 1-3)
+ICEDTEA_BRANCH=$(ver_cut 1-2)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+
+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 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=
+	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= )
+"
+
+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} )
+	!headless-awt? ( ${X_COMMON_DEP} )
+	selinux? ( sec-policy/selinux-java )
+"
+
+# 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
+	dev-libs/openssl: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
+	# 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
+
+	# 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/j2objc-annotations/Manifest b/dev-java/j2objc-annotations/Manifest
index 58985796844e..7468f589cda8 100644
--- a/dev-java/j2objc-annotations/Manifest
+++ b/dev-java/j2objc-annotations/Manifest
@@ -1,3 +1,3 @@
 DIST j2objc-1.2.tar.gz 9718769 BLAKE2B 370a52fe9821814c12dd7a13072930f178e041d14baa2e912de3379030828ae62114b213f38f849934e68060fa51d8017a28772a794658aa23272ac5d254d933 SHA512 d2b4d12ba8107728ca33cfe18124eae092a2c2b9ce0b588374180d35816d83d6d6c9d029c3524537ac48f052dfa4c88b273405cddf56c54966216b1ed1a160eb
-EBUILD j2objc-annotations-1.2.ebuild 593 BLAKE2B a4bffdd15f2089fda55b038a4a2d89778fa839640ce3eeb8f2470deff4e08c2e558443858921f73c947b447360663e9e0812a757dd8f0ca7da80ed9b25d628b8 SHA512 75a8d461061652252c86a4d433e8089e579463feb565caf5eb341b6ec0876f9c9985dfbb6e3853e4eb3b4c928453aa84082408c2964915dff87042a1ce958040
+EBUILD j2objc-annotations-1.2.ebuild 597 BLAKE2B f6fb9ba8a8c2c148bfe2a005fb726d0d5f5d390dc673b0d5f1baf5728868bae538bb2974e8bec877e3655e62dd5fd3e9f733f0c7e58688fc3873bde46623f21a SHA512 2c40461941457d5a9ec96a8d37e741169695bcc7c243098738d8be3fd77f4d7bda9c0c419bbd2b2a072c52c89efd285aba5e685ce90f87890d37ecb3b236aa98
 MISC metadata.xml 314 BLAKE2B 2101f8ca7fe894128dd8976032ea460eb58477566332a7b95e8e7bdc75938d351542243fac2b40242d11d40020af74829d42c63f7daf95f4f8a094ccda7323cf SHA512 94b8ffdfdd1c9dcba7553bf36af43cc1104ee95d2bff819e14a7e6cbb533f36cbd6e5befe377aa346afef29e54dbccda4a98265a887a5c80cc4e4d1f250c1885
diff --git a/dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild
index 03340d482d2e..94d15d90b4cc 100644
--- a/dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild
+++ b/dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="http://j2objc.org"
 SRC_URI="https://github.com/google/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.7"
 RDEPEND=">=virtual/jre-1.7"
diff --git a/dev-java/jakarta-oro/Manifest b/dev-java/jakarta-oro/Manifest
index 2e7806ddb769..7919d3380d1a 100644
--- a/dev-java/jakarta-oro/Manifest
+++ b/dev-java/jakarta-oro/Manifest
@@ -1,3 +1,3 @@
 DIST jakarta-oro-2.0.8.tar.gz 345304 BLAKE2B a52b14f2753cb5ce07d16d417e943009dbb9268fddc62850daebb703ba2da3d83a3d05828479c89cab96174582514af75efedc73050a5f933cc0b26fbd51c948 SHA512 a7f6eb6a088765f273df18ccc823f918737f18ec8772275054839a87f8370f1848e795d481f226c712651104d7598ab86c7d90a991fb039df6581f42f1447920
-EBUILD jakarta-oro-2.0.8-r5.ebuild 823 BLAKE2B d37dbd8e6f030baaa688b06e4599cc418b0ace033b4412ede86644815668db40cd116d0cb12d7c2f65c216ad6f1f24bd8a97d3af51eebd2af539dae8065fe3d3 SHA512 a7babba34294519a098fb849a9e0a7cea0591463400c9d47e612dd195784581622ae5cf3e09b19dd1e21edece79d0ccde77ec81a3d3d9a2ba71c9e0befeedd4f
+EBUILD jakarta-oro-2.0.8-r5.ebuild 848 BLAKE2B 090c3b7f2dbded4c2b76fc61f2418526aa45f03eae9df9b6a2d639a8f1abaa008fd0ade91132285fa349ce29d0db772bef04d8a11dfd920933410771bf758896 SHA512 f9e6a74e228b84626d92616d3c80ad3726e5e9517de28f4da28e8168ff48716bd9f5669e4ea69b8c3ffcf431de308304f00b03996e4b3257f6f7ad730f196af1
 MISC metadata.xml 513 BLAKE2B 7c56f359436aaddf4ef061d969a24d623a5706526c5c2f7ebdcdf287898271bc40dadf7a0940e2d6bee0c96e53f2d828c9e7030f2b6b9102cbb50daca9ce3e50 SHA512 759a7e18395261364c71cb38e5ff76196588d16913f0992611c952bc0b5ed6dbd47e9a28a51b6ae74ab04b4c548ebbb773d1d813b1dd06a0c8b786cd381e43d2
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild
index dc1a744bb943..1f821c693d20 100644
--- a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 JAVA_PKG_IUSE="doc source examples"
+MAVEN_ID="oro:oro:2.0.8"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index fb7147865ed6..f2d6a1b313b9 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,6 +1,3 @@
-AUX 5.0.5-dist-target-depends.patch 380 BLAKE2B 2e4d8a025c986dd6bbd1e97b629875614ea9be28c0fc51bc24dca85244fc089798c09f3fdb125bbc94ba19355b133b2119e5e4e1573990616d1dc960fd2dacfa SHA512 407ba02b1e2b3a514a9e270356a15f97eaa19197117a9f2752ee6b78fba0dd7cab150f7eaac02f8d6cb9d3bfe6d0edd3e68f38457310d69123c97b9231d621c4
-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 d610892dc558b8d17fd61331ae3d6b5560015b705fa6eb4b4a8f0ed689f6c5f775bff30e0aed2d1f867bb8e379257db93c1f8e3ae3d9650b4f8cbc188cdd2b57 SHA512 3f56080e2b0039474e91cfc4913c9b2fde3594e4e814d057d2a3fbdd146d3205ceb9183c58245f10e99e5f14590bf9a73f9a2c35c5f1b928b6cf642b1f9681e3
-MISC metadata.xml 358 BLAKE2B 634f9354e5f680e4313debca5f05fc117b44f1a43b018b3d71d92430cb8253a9da018f74e888bf535e0dbc64e79d240d4f5748d945a5caa14eba874b9e38dca9 SHA512 4db9ea2f30ecc92b4b97e5159d4338b73c59e3f8640336764d2766a1ca33760b7c0fa6caaac90125102555a5128fff3b2d95e20d92df22e705623f0e2b7914e9
+DIST jdbc-mysql-8.0.25-sources.jar 1556319 BLAKE2B 75eb4837f6916247650a925f87d52e49848e3bc52cfa683a149624e4b749c3c4b3a7336a5659dd0c894f0285254c915364d9ffd7b4779c87e0894053a2854a5c SHA512 c4384213845c43a494360131dcb7b9b424473237b65504d5ed4a7929cb8bb7b4b3c7cce6fde2c20a7026891751e76c78ea64af746a053ca42567a7e68782280e
+EBUILD jdbc-mysql-8.0.25.ebuild 1569 BLAKE2B bc43d39641921dccf2d4bf61124d1c37fc0f89f98b581fc233ed82bedf833e09d295fdf52ce98436ef26edf850a53263ef603d18298866420a230bc8d5553e86 SHA512 cfdf865113f68213f45970553eb47f6d81bcb0811182d789589079759902c848f7c1eb5ad06fe316da0ae0b613017ee3394d0c8ffc5082fd8dc7c74389ef4a5f
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jdbc-mysql/files/5.0.5-dist-target-depends.patch b/dev-java/jdbc-mysql/files/5.0.5-dist-target-depends.patch
deleted file mode 100644
index 28ffc7ad0dab..000000000000
--- a/dev-java/jdbc-mysql/files/5.0.5-dist-target-depends.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build.xml.orig	2007-05-07 19:59:49.000000000 +0300
-+++ build.xml	2007-05-07 20:01:21.000000000 +0300
-@@ -291,7 +291,7 @@
- 		</if>
- 	</target>
- 
--	<target name="dist" depends="init, compile">
-+	<target name="dist" depends="init, compile-driver,compile.integration">
- 
- 		<delete file="${buildDir}/${fullProdName}-bin.jar" />
- 		<delete file="${distDir}/${fullProdName}.jar" />
diff --git a/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch b/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch
deleted file mode 100644
index 394830701fee..000000000000
--- a/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- mysql-connector-java-5.0.5/src/testsuite/regression/DataSourceRegressionTest.java	2007-03-01 17:48:47.000000000 +0100
-+++ mysql-connector-java-5.0.5-no-jboss-test/src/testsuite/regression/DataSourceRegressionTest.java	2007-04-12 09:53:05.000000000 +0200
-@@ -52,7 +52,6 @@
- import testsuite.simple.DataSourceTest;
- 
- import com.mysql.jdbc.NonRegisteringDriver;
--import com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker;
- import com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource;
- import com.mysql.jdbc.jdbc2.optional.MysqlDataSource;
- import com.mysql.jdbc.jdbc2.optional.MysqlDataSourceFactory;
-@@ -315,28 +314,6 @@
- 		assertEquals(testIntFlag, thawedDs.getBlobSendChunkSize());
- 	}
- 	
--	/**
--	 * Tests fix for BUG#20242 - MysqlValidConnectionChecker for JBoss doesn't
--	 * work with MySQLXADataSources.
--	 * 
--	 * @throws Exception if the test fails.
--	 */
--	public void testBug20242() throws Exception {
--		if (versionMeetsMinimum(5, 0)) {
--			try {
--				Class.forName("org.jboss.resource.adapter.jdbc.ValidConnectionChecker");
--			} catch (Exception ex) {
--				return; // class not available for testing
--			}
--			
--			MysqlXADataSource xaDs = new MysqlXADataSource();
--			xaDs.setUrl(dbUrl);
--			
--			MysqlValidConnectionChecker checker = new MysqlValidConnectionChecker();
--			assertNull(checker.isValidConnection(xaDs.getXAConnection().getConnection()));
--		}	
--	}
--	
- 	private void bindDataSource(String name, DataSource ds) throws Exception {
- 		this.ctx.bind(this.tempDir.getAbsolutePath() + name, ds);
- 	}
diff --git a/dev-java/jdbc-mysql/files/5.1.14-java6.patch b/dev-java/jdbc-mysql/files/5.1.14-java6.patch
deleted file mode 100644
index 49343706ad80..000000000000
--- a/dev-java/jdbc-mysql/files/5.1.14-java6.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- build.xml.orig	2010-01-20 19:45:30.000000000 +0100
-+++ build.xml	2010-02-13 00:34:30.000000000 +0100
-@@ -131,7 +131,7 @@
- 		</if>	
- 	</target>
- 
--	<target name="init" depends="-compiler-check, -init-copy, -init-no-crypto">
-+	<target name="init" depends="-init-copy, -init-no-crypto">
-		<!-- We need the following for source distributions as there we
-             can't dynamically alter the classpath, and not having this
-		     directory present causes the build to fail -->
-@@ -746,7 +746,8 @@
- 		<javac sourcepath="" srcdir="${buildDir}/${fullProdName}" 
- 			destdir="${compiler.output}" 
- 			deprecation="off" 
--			debug="${debug.enable}">
-+			debug="${debug.enable}"
-+			bootclasspath="${gentoo.bootclasspath}">
- 			<include name="**/*.java" />
- 			<exclude name="testsuite/**" />
- 			<exclude name="com/mysql/jdbc/integration/**" />
-@@ -763,11 +764,7 @@
- 		<javac destdir="${compiler.output}" 
- 			deprecation="off" 
- 			debug="${debug.enable}"
--			fork="yes"
--			executable="${com.mysql.jdbc.java6.javac}"
--			compiler="modern"
--			sourcepath="" srcdir="${buildDir}/${fullProdName}"
--			bootclasspath="${com.mysql.jdbc.java6.rtjar}">
-+			sourcepath="" srcdir="${buildDir}/${fullProdName}">
- 			<include name="**/JDBC4*.java" />
- 			<include name="com/mysql/jdbc/exceptions/jdbc4/*" />
- 			
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
deleted file mode 100644
index 0080138b8de1..000000000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
-WANT_ANT_TASKS="ant-contrib"
-
-inherit epatch java-pkg-2 java-ant-2
-
-MY_PN="mysql-connector-java"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MySQL JDBC driver"
-HOMEPAGE="https://www.mysql.com/products/connector/j/"
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-J/${MY_P}.tar.gz"
-
-LICENSE="GPL-2-with-MySQL-FLOSS-exception"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-IUSE="c3p0 log4j"
-
-COMMON_DEP="
-	dev-java/slf4j-api:0
-	log4j? ( dev-java/log4j:0 )
-	c3p0? ( dev-java/c3p0:0 )"
-
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.6
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	epatch "${FILESDIR}/5.0.5-remove-jboss-dependency-from-tests.patch"
-
-	# http://bugs.mysql.com/bug.php?id=28286
-	epatch "${FILESDIR}/5.0.5-dist-target-depends.patch"
-
-	# Use java6 for everything except jdbc3 - #283848
-	epatch "${FILESDIR}/5.1.14-java6.patch"
-
-	find . -name '*.jar' -print -delete || die
-
-	cd src/lib
-	java-pkg_jar-from slf4j-api
-	use log4j && java-pkg_jar-from log4j
-	use c3p0 && java-pkg_jar-from c3p0
-}
-
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="dist"
-
-src_compile() {
-	# Cannot use rewrite-bootclasspath because of the jdbc4 part.
-	java-pkg-2_src_compile \
-		-Dgentoo.bootclasspath="$(java-pkg_get-bootclasspath 1.5)"
-}
-
-# Tests need a mysql DB to exist.
-RESTRICT="test"
-
-src_test() {
-	cd src/lib
-	java-pkg_jar-from junit
-
-	cd "${S}"
-	ANT_TASKS="ant-junit" eant test -Dcom.mysql.jdbc.noCleanBetweenCompiles=true
-}
-
-src_install() {
-	# Skip bytecode check because we want two versions there
-	JAVA_PKG_STRICT= java-pkg_newjar build/${MY_P}-SNAPSHOT/${MY_P}-SNAPSHOT-bin.jar ${PN}.jar
-
-	dodoc README CHANGES
-	dohtml docs/*.html
-
-	use source && java-pkg_dosrc src/com src/org
-}
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.0.25.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.0.25.ebuild
new file mode 100644
index 000000000000..417722c0319f
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-8.0.25.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom mysql-connector-java-8.0.25.pom.xml --download-uri https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.25/mysql-connector-java-8.0.25-sources.jar --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jdbc-mysql-8.0.25.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="mysql:mysql-connector-java:8.0.25"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JDBC Type 4 driver for MySQL"
+HOMEPAGE="https://dev.mysql.com/doc/connector-j/en/"
+SRC_URI="https://repo1.maven.org/maven2/mysql/mysql-connector-java/${PV}/mysql-connector-java-${PV}-sources.jar -> ${P}-sources.jar"
+
+LICENSE="GPL-2-with-MySQL-FLOSS-exception"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+# Common dependencies
+# POM: mysql-connector-java-${PV}.pom.xml
+# com.google.protobuf:protobuf-java:3.11.4 -> !!!groupId-not-found!!!
+
+CDEPEND="dev-java/c3p0:0
+	dev-java/protobuf-java:0
+	dev-java/slf4j-api:0"
+DEPEND=" ${CDEPEND}
+	>=virtual/jdk-1.8:* "
+RDEPEND=" ${CDEPEND}
+	>=virtual/jre-1.8:* "
+BDEPEND="app-arch/unzip"
+
+DOCS=( META-INF/README )
+
+S="${WORKDIR}"
+
+JAVA_GENTOO_CLASSPATH="c3p0,protobuf-java,slf4j-api"
+
+JAVA_SRC_DIR="com"
+JAVA_RESOURCE_DIRS="res"
+
+src_prepare() {
+	default
+	mkdir --parents "${JAVA_RESOURCE_DIRS}" || die
+	cp -r "${JAVA_SRC_DIR}" "META-INF" "${JAVA_RESOURCE_DIRS}"
+	find "${JAVA_RESOURCE_DIRS}" -type f -name '*.java' -exec rm -rf {} + || die
+}
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jdbc-mysql/metadata.xml b/dev-java/jdbc-mysql/metadata.xml
index a285c6ded942..952a4b9b605c 100644
--- a/dev-java/jdbc-mysql/metadata.xml
+++ b/dev-java/jdbc-mysql/metadata.xml
@@ -1,12 +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>
-  <use>
-    <flag name="c3p0">Enable c3p0 support</flag>
-    <flag name="log4j">Enable log4 support</flag>
-  </use>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index c5c525091195..d1b5d5108494 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,5 +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-4.2.2.tar.gz 58638853 BLAKE2B 3941202ad7839f748c65f1abf53a335f6de7959def06de27a30520457147af3f70f6de54d640718b8314f6e61ab61ee9b26c39812d5cb1f918b8ff714d6b902e SHA512 11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f
-EBUILD jna-4.2.2-r1.ebuild 2067 BLAKE2B 52a6ea3ab351e026ab5fe519abdb6f78cf8a2cef57e02c64334e3ff3223b41321a4d5dc48fa2c5d5886b1e42925300e11f8d9860116217ae6b1fd1f0e20d09cd SHA512 e740f2c8c89c1c573e98a76dec234c54e3b68f8c7537ee18d695f803ef2fad3a341a887e93dc2ddfec89367405076f582e823ae2af2bdcc8d827a0ca698ba41e
+EBUILD jna-4.2.2-r2.ebuild 2141 BLAKE2B b80cb145b52cf495a2f7ca147cd68f6e1462ba2a7b32439049607447c227b0ebfb03f6a6a9008a23315602ca1864b96b0c4faa327da85bf113f5a7e63c98d568 SHA512 1080ffb4e91249e12f72ea7c45a47997d10011bf91e802451681e7a124ed10b7f4bd5269f79e3e0ae9b94171ab21dd43ecca8e95753520562cc0315b86538dcc
 MISC metadata.xml 462 BLAKE2B 7ad9e0cb48ce7fdfae4bdc10bf3cb6d6c25a7f86d62dbb9041d0ad2fe04409477eb27754b5f53218fba657f7ed77b423b34bea92bffb61c37ee2eefdcccc3a3b SHA512 88a027ef32c55e551625950ecb2efffc75a7611568f11a4abdcddd4fe24b894eb7d8fb805cba3fc0f79ddf6fae6116804790fc24b3d5b6097ade9ad92ed4c118
diff --git a/dev-java/jna/jna-4.2.2-r1.ebuild b/dev-java/jna/jna-4.2.2-r2.ebuild
index 6ae5356a0b03..672aa2f06bb6 100644
--- a/dev-java/jna/jna-4.2.2-r1.ebuild
+++ b/dev-java/jna/jna-4.2.2-r2.ebuild
@@ -1,19 +1,22 @@
 # 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="net.java.dev.jna:jna:4.2.2"
 
 inherit java-pkg-2 java-ant-2 toolchain-funcs
 
 DESCRIPTION="Java Native Access (JNA)"
-HOMEPAGE="https://github.com/twall/jna"
-SRC_URI="https://github.com/twall/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/java-native-access/jna"
+SRC_URI="https://github.com/java-native-access/jna/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="LGPL-2.1"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+awt +nio-buffers test"
+
 REQUIRED_USE="test? ( awt nio-buffers )"
 
 # The tests stall immediately on some systems (not current stable?) when
@@ -23,20 +26,18 @@ REQUIRED_USE="test? ( awt nio-buffers )"
 RESTRICT="test"
 
 CDEPEND="dev-libs/libffi"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7
+	virtual/jdk:1.8
 	x11-libs/libXt
-	virtual/pkgconfig
 	test? (
 		dev-java/ant-junit:0
 		dev-java/guava:20
 		dev-java/javassist:3
 		dev-java/reflections:0
 	)"
+RDEPEND="${CDEPEND}
+	virtual/jre:1.8"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-build.xml.patch
diff --git a/dev-java/jsch/Manifest b/dev-java/jsch/Manifest
index 52469107288a..7d1b5ce8ba1a 100644
--- a/dev-java/jsch/Manifest
+++ b/dev-java/jsch/Manifest
@@ -1,3 +1,3 @@
 DIST jsch-0.1.54.zip 365455 BLAKE2B 5cd6fa012e5a511bad8f23a233559e6ad6d600f39ea7b519e66e118b1fdb997491b7ac8cff5bc1491c28f7ee99f0f4a3b4727f5d8ec02030576f34949d74e203 SHA512 2ed29f07495fbc28d6eb7b4fe414e8a9a96b911b2feea5b1513cc48a9439adba12341bceb23a3ea9ab307e32d48bfd4356c7bc877c56e77f6f55d69214db3a9e
-EBUILD jsch-0.1.54.ebuild 1168 BLAKE2B 5692f38e7b87cb4ce1450e3bfaa51a0c81583639581bfa677cc31f871c654df756839ea5cfdb45a1e3d3aef8a6a14002d3ab4d4e253cdaf987a29c775c570c0b SHA512 f1619aeb0437166592651069637dd1adad001215e83b406b6afbe2e1486fe3862c8c14cd0882eeae35404ce388a2e7ef7246e606cef10553a2daf12edc0f5b80
+EBUILD jsch-0.1.54.ebuild 1202 BLAKE2B 118bff8b932f70f9fb70f2aab5c934870e89a806c3c8620554093735a2a5c0f6b7341737edbe0784fb215a8c8a18649d26aec29da1c3485b4d7d0621df0d49a2 SHA512 b0b9e7253f695136afbddf241a8690aba1790301dc849eb30f3fd3dd5d319efc1f8e3395f8da6eeed6764b55e72669f08dceef009eaa83196496c5046b30b3fa
 MISC metadata.xml 310 BLAKE2B 6b76bef1eadb48caec1f3314829856f655be55da55fddeec91c3d3fd14f3eecf65dd2508de12a01fc75e2089e8ce1107481bbdb6f3c92eeac74fe85e5ba02aee SHA512 5051c200e3f618fda4991704418d902b513cf94b96917a1c23c1e552e1443cf9ccbf8a0a2ceddc8db46d7104284b43689be62dee0353d50b207c7c6ad3336262
diff --git a/dev-java/jsch/jsch-0.1.54.ebuild b/dev-java/jsch/jsch-0.1.54.ebuild
index d87b476d9f7c..42b5f979f56f 100644
--- a/dev-java/jsch/jsch-0.1.54.ebuild
+++ b/dev-java/jsch/jsch-0.1.54.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 
 JAVA_PKG_IUSE="doc source examples"
+MAVEN_ID="com.jcraft:jsch:0.1.55"
 
 inherit java-pkg-2 java-ant-2 java-osgi
 
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 23de2fc06167..fc4caa20d5cd 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -1,9 +1,5 @@
-DIST lucene-1.4.3-src.tar.gz 768320 BLAKE2B 8017b672b0104be007582a67cff5cb130187afcf9608bec0cb2b6bae9b3ea8c67486b324740c99e4db8f23879dd614a098f778f6b52b429d3dd1906387e9b61e SHA512 426539a4b4a8887485c4301b2127ad4815646d1a81bca877ed2b0e68d886fcaf844449532a080754b79696c0f9e9c5f304be28487e0f9aa11178565a20f29911
 DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
-DIST lucene-3.5.0-src.tgz 39564076 BLAKE2B 5018f0e07a9df3f2f55c540e94e349e64e2c02c99acf14946e4471e16ace4f17a18e306aca6187028cde4434f0d6b38090442baaddaa79ef12ff34a8461f9e98 SHA512 58846190ed0e8c0747e14cb46bf27255d0e4ee93aa0969cf16140713ce20c8fc3f451353437313f14416c92b7b6825d4ce3416d9c7ce4cb1854f31877c2af275
 DIST lucene-3.6.2-src.tgz 32139784 BLAKE2B 48fe88efeae8396e084f827aa66530480f40aee3a2e59c8524420059f004a73be4c1e50c98345ad0ad4808ff8a0a996f9406523bf5c124616657ec91f9797f70 SHA512 e9a08a1b5303c44e4feecc0bb6e7013e4a9420517ae4e98999bd318ec25b5b2ff3b6de8b51db8f68afc0fdc3149829297023a95b103d4f99e7db68deee4c3965
-EBUILD lucene-1.4.3-r4.ebuild 981 BLAKE2B c506d4a98402026bca8e4c968bb9d56ecaf5ab5f37891834b587db8069c32bc41ac2d8f75a7c63f26a4eb80929a3fe9b6310ba3577bad32cf505809971cbd568 SHA512 abcbbadabe7dd9dccd2fa59c8888b6871e0104d803139a53549341f2a691975de2a3e9092c7dd4c2738dd89038fa154fd32dc91c293a8373bd012408bf2d1d69
 EBUILD lucene-2.4.1-r2.ebuild 1802 BLAKE2B 71e720f396d65c1621d956d0536c3655a1530014861df0350dc506b7e03f2acd4f75ab70f0f7768ae867523ee49e1b7fac11095502fbba65d350ecf8223d1d41 SHA512 2551db0ac39d6ca7516b71e86202cef50e7784ee49f715f03703b205509e89983e735cc66ce3970abca9212390edbb06a948399310845e758855fb4764e2c985
-EBUILD lucene-3.5.0-r2.ebuild 3512 BLAKE2B 9f30115ea1ce8570213517a3e841675c761654e23d81cdb5c30a0111dad97b2ed41bcd3fbb316bc8716836f82fc14f4dc6c30012ec7fb41e8fd5bcca3637af9d SHA512 f7bc1e244f8f4f19d2c8674a17382fc425ef34cb2957489e8216d4ddc009ebce77b191ee1357f60719158020d098a8d0fe7239648f96014126e68111a22f10e8
 EBUILD lucene-3.6.2-r2.ebuild 5553 BLAKE2B 4602e1ddf43e0fc5b71093bbc88069fe7f016187e78b61fd7a1fbd7ed03f1ce54b1dcf42e918f128c3bb58cc7eadfdd4fcb3ba455d5567788a9866834c805db4 SHA512 92d2a8aa60347ae964ed8d99e50c57addb4b3621fee34262a865565c6280f381dfc9f14792ddb330d89a1b7fbaaf07d4031bf6cbbd2ddfffa62634fd84779b49
 MISC metadata.xml 319 BLAKE2B 5849f61f420a09c73072e0890994385a5934d1ade144e107c85e1bda6a2348c79942a4a38ab8a138e19759a11870f47c563404fc34d5b95764fae42f968af7cf SHA512 785aafb20d068f923fe86429caa45c645940b956988461b331fb6d41fba8dcaebbb25ee37511d11f8184ec15a20f59453fb0b8aeeaa112188de2d289a528d946
diff --git a/dev-java/lucene/lucene-1.4.3-r4.ebuild b/dev-java/lucene/lucene-1.4.3-r4.ebuild
deleted file mode 100644
index a5604d395c7c..000000000000
--- a/dev-java/lucene/lucene-1.4.3-r4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured Java text search engine"
-HOMEPAGE="https://lucene.apache.org"
-SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="Apache-1.1"
-SLOT="1"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	test? ( dev-java/ant-junit:0 )"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_compile() {
-	eant jar-core $(use_doc javadocs)
-}
-
-src_test() {
-	java-ant_rewrite-classpath build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" \
-		ANT_TASKS="ant-junit" \
-		eant test
-}
-
-src_install() {
-	einstalldocs
-	java-pkg_newjar build/lucene-1.5-rc1-dev.jar
-
-	if use doc; then
-		dodoc -r docs/*
-		java-pkg_dojavadoc build/docs/api
-	fi
-
-	use examples && java-pkg_doexamples src/demo
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-3.5.0-r2.ebuild b/dev-java/lucene/lucene-3.5.0-r2.ebuild
deleted file mode 100644
index 6d0031e124b3..000000000000
--- a/dev-java/lucene/lucene-3.5.0-r2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test contrib"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="https://lucene.apache.org"
-SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="3.5"
-KEYWORDS="amd64 x86"
-
-CDEPEND="
-	dev-java/junit:4
-	dev-java/ant-junit:0
-	dev-java/ant-core:0
-	contrib? (
-	          dev-java/jakarta-regexp:1.4
-			  dev-java/commons-compress:0
-	          dev-java/commons-collections:0
-	          dev-java/commons-digester:0
-	          dev-java/commons-logging:0
-			  dev-java/commons-beanutils:1.7
-	)"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/junit:4
-		dev-java/ant-core:0
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DOCS=(
-	CHANGES.txt README.txt
-	NOTICE.txt CHANGES.txt
-	JRE_VERSION_MIGRATION.txt
-)
-
-# All tests fail with the following error:
-# junit.framework.AssertionFailedError: ensure your setUp() calls super.setUp()!!!
-RESTRICT="test"
-
-src_prepare() {
-	default
-	java-pkg_clean
-	sed -i \
-		-e '/-Xmax/ d' \
-		common-build.xml || die
-
-	# FIXME: contrib builds do not work if junit not included
-	#java-pkg_jar-from --build-only --into lib \
-	#	junit-4 junit.jar junit-4.7.jar
-	java-pkg_jar-from --build-only --into lib \
-		ant-core ant.jar ant-1.7.1.jar
-	java-pkg_jar-from --build-only --into lib \
-		ant-junit ant-junit.jar ant-junit-1.7.1.jar
-
-	if use contrib; then
-	  cd contrib/ || die
-	  java-pkg_jar-from --build-only --into queries/lib \
-	  	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-compress commons-compress.jar commons-compress-1.1.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-collections commons-collections.jar commons-collections-3.1.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-digester commons-digester.jar commons-digester-1.7.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-logging commons-logging.jar commons-logging-1.0.4.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
-	fi
-}
-
-src_compile() {
-	# FIXME: docs do not build if behind a proxy, -autoproxy does not work
-	java-ant_xml-rewrite -f common-build.xml \
-		-c -e javadoc \
-		-a failonerror \
-		-v "false"
-
-	ANT_TASKS="none" \
-		eant -Dversion=${PV} \
-		-Dfailonjavadocwarning=false \
-		jar-core \
-		$(use_doc javadocs-core)
-
-	if use contrib; then
-		ANT_TASKS="none" \
-			eant -Dversion=${PV} \
-			-Dfailonjavadocwarning=false \
-			build-contrib \
-			$(use_doc javadocs-all)
-	fi
-}
-
-src_test() {
-	# FIXME: test does not get run, even when selected
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \
-		ANT_TASKS="ant-junit" \
-		eant test-core
-}
-
-src_install() {
-	einstalldocs
-	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-
-	if use contrib; then
-		local i j
-		for i in $(find build/contrib -name \*-${PV}.jar); do
-		    j=${i##*/}
-			java-pkg_newjar $i ${j%%-${PV}.jar}.jar
-		done
-	fi
-	if use doc; then
-		dodoc -r docs
-		java-pkg_dohtml -r build/docs/api
-	fi
-	if use source; then
-	     java-pkg_dosrc src/java/org
-	  	 use contrib && java-pkg_dosrc contrib
-	fi
-}
diff --git a/dev-java/miglayout/Manifest b/dev-java/miglayout/Manifest
index 401a1212f40f..f9496faaced1 100644
--- a/dev-java/miglayout/Manifest
+++ b/dev-java/miglayout/Manifest
@@ -1,4 +1,4 @@
 DIST miglayout-4.0-sources.jar 194675 BLAKE2B 9d0a4fce1b76e49f4a2962fccf323676172fc9fa084060d8b3507031635b7979d8b29ce598a0a484e3707eefdf90721162e67d36be5702e9309ef067fd39aab3 SHA512 27284ceac254707428351fb2451ffd5f2ebd580374df59624bb6af06011f70d87b27849900c2573aff782ebe6d84e1806c18a59741213948f0b238ee5a51ec2f
 EBUILD miglayout-4.0-r1.ebuild 1274 BLAKE2B 8d7d2db7d2fe14b4a827ff1f089083476fee8daf84c5ce96cae6ebc886d37234e106da7d8f72693d77a321d5675c6b6e99ba58d2f06ac7cfeeea0f71e4862ee9 SHA512 a51a700c956e4693eded18a36c848da2b8e6582c5527b75ada686f00fb8ad95b313f6fcd3de725d46f113bfacdcc9d62b7e06f3e7e7f6c5d920cd0b02ec5d572
-EBUILD miglayout-4.0-r2.ebuild 1273 BLAKE2B d196a79d9846086ddfed5d887c828711365b4004e8d5cc02feca6e150d2d8c3fcac6c0f45e08ca737a0104ad71bb86a2fb428e1a6c7608b75152d01f43c85aad SHA512 862bda7cddea4ce4dce7be1849b28600bf6eaabed710889eab5b008cd23a7530da813d77a650ee0d8f0a82a66644864c58972fabbc0f0006272c4017e007e01a
+EBUILD miglayout-4.0-r2.ebuild 1139 BLAKE2B fb03d2d32ebae5e306c67ed7a2b382ad44abd64bd505d3440251c5860e1d895fae0e28943c4b5c5fd5a8627f5a77a412612abc245f3fcfb6d4395c0f0b61fe32 SHA512 bf163dbf9aa64bd8d5c8d5f0ea5422f9c014d5d3d0de94431d175b813f0f32c28e1c4e7dbbe04c1f3c57c09ba1302d75a6c37bfe7941cd06b2f22c40a3381af8
 MISC metadata.xml 751 BLAKE2B 2fdfc28e91176b4c7e1dcc4a1d61c491c1e7a5d835fb1bdc89e340db57dcabbf951da958ac0ae728658fffcc6aada76194745282245a066adc8d9c792ac09a49 SHA512 b097936cfa00fa8468489722f2d9557ee93efdf0d9ac852fbcf745814d35b294d0a8b5f559c4aecc62480c6f59e8329013e133a7dc7618c4f665b79c3b03375d
diff --git a/dev-java/miglayout/miglayout-4.0-r2.ebuild b/dev-java/miglayout/miglayout-4.0-r2.ebuild
index 863e44285ea3..d65b8a08ff17 100644
--- a/dev-java/miglayout/miglayout-4.0-r2.ebuild
+++ b/dev-java/miglayout/miglayout-4.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-JAVA_PKG_IUSE="doc examples source"
+JAVA_PKG_IUSE="examples source"
 
 inherit java-pkg-2
 
@@ -49,16 +49,11 @@ src_compile() {
 	mkdir classes || die
 	ejavac "${classpath[@]}" -d classes @sources.lst || die
 	jar -cf ${PN}.jar -C classes . || die
-
-	if use doc; then
-		javadoc "${classpath[@]}" -author -version -d api @sources.lst || die
-	fi
 }
 
 src_install() {
 	java-pkg_dojar ${PN}.jar
 
-	use doc && java-pkg_dojavadoc api
 	use examples && java-pkg_doexamples examples
 	use source && java-pkg_dosrc net
 }
diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest
index e786ecd10ef1..985fe732b18d 100644
--- a/dev-java/mockito/Manifest
+++ b/dev-java/mockito/Manifest
@@ -1,3 +1,4 @@
 DIST mockito-1.9.5.zip 6453870 BLAKE2B b577c4a82f03b5c345462ecc10e9fe25c03836d08d57d633d95a1eaba17f52d4306603f50f332df360d0a4880c85c65bad4503503df0acad8f7b437694a2b887 SHA512 93768992c74fbc2e2653b46b3afb526ab816b9c707cb5f9608564299ffd206e256182be146c590b4777a624379f576d7117ed7d43b11f8d2974e87c402eede51
 EBUILD mockito-1.9.5-r1.ebuild 844 BLAKE2B b8ed4f84aaece678fcf10167dc29df664f5d484a302cdb560f64337833bfc93c26094550be04adfbe69e49d35c5c7b794c02e82886ee5a0cfe25b5e0f7031d8b SHA512 2caa56ec15407184643ebd9204d19c2536773c371bfad8e936012957b84f79612fc75ef96c60b0f3756a2e4643d215c058f0f91a479c187242fa40c51b96b74f
+EBUILD mockito-1.9.5-r2.ebuild 849 BLAKE2B 3e315682add72a455809c5dadac111e6b3a03ab78566abcb66b3b7ed75e2999a351de73a1e07df6ef4c43ee476ea271bd1cdffc7ffdee8e387e10066456e29d4 SHA512 11bbf4faf9dc1804f526fbac5e195f16075f4d552658979575f0f25d7f44d611558b408af00adb178475f721d4bb6b1e30635b4ba744694972d5b465e7ce9733
 MISC metadata.xml 368 BLAKE2B b76278732bfbed14a8ec62d1b339971836efbaf3565e6b93dd61a09c18749fa30c815c283f633321cf0ddbc818ccfbeb92fed293f6e43137eeb2d3b8efa9ed04 SHA512 371a02c769989a221b89405e852f627a4cd9953f1529b8e6890056b6ca83e2526a82752ab3ed9b36f40a3d88d460360e20762d2a4cdcba359116c036f1d7cc7b
diff --git a/dev-java/mockito/mockito-1.9.5-r2.ebuild b/dev-java/mockito/mockito-1.9.5-r2.ebuild
new file mode 100644
index 000000000000..1076b1486ea3
--- /dev/null
+++ b/dev-java/mockito/mockito-1.9.5-r2.ebuild
@@ -0,0 +1,43 @@
+# 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 mocking framework for Java"
+HOMEPAGE="https://github.com/mockito/mockito"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/hamcrest-core:0
+	dev-java/junit:4
+	dev-java/objenesis:0
+"
+RDEPEND="${CDEPEND}
+	virtual/jre:1.8"
+DEPEND="${CDEPEND}
+	virtual/jdk:1.8"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="src"
+JAVA_GENTOO_CLASSPATH="junit-4,objenesis,hamcrest-core,ant-core"
+
+src_unpack() {
+	unpack ${A}
+	unzip "${S}"/sources/${PN}-core-${PV}-sources.jar -d src/ || die
+}
+
+src_prepare() {
+	default
+	find "${S}" -name "*.jar" -delete || die
+}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 7b050d7b529c..577be5988978 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -19,5 +19,5 @@ DIST openjdk-jdk-8.292_p10.tar.bz2 48746031 BLAKE2B a54a832a305b87cbd4ceda4eb5bc
 DIST openjdk-langtools-8.292_p10.tar.bz2 2401270 BLAKE2B b4043862df04e9f0056d420116e47f4f1515d1e935bfb6830a67a9de3894c94a6289a7952153bef971369cdbdf2374154cd4895950fe49f8a21af5e3316dfa8a SHA512 ba66be7f37ca8268d1dd0b8d4e68c90ae19f815ac3b64aa1f1abf02a722a09ec46c7605d5124ac960bd44335b053da12b36d4b0562b3675ac503fd838d4924d7
 DIST openjdk-nashorn-8.292_p10.tar.bz2 2849397 BLAKE2B d875dea02ec8a3a3cba49f173f42ad7d73d15492cb86a15b095063ad327655ab9c260571c8a8ed35daf4078d52eb24d58b04125d3cea148bbc9e3fe924375c45 SHA512 4b707059bc6b217bdae2d9ea685c18b9cc3759180d5dcb5e51ad4eb00e6e660ca6181a68427f1e53c81b9636a323c1229e19de35b51e14a5d599cb64412ae11f
 EBUILD openjdk-11.0.11_p9-r1.ebuild 7792 BLAKE2B e56b763df2fd4006fb19f4ee4fcbc661bd7e2cb30bba2ccf203685bb7e194540d9cc39d53c6e1f7b8f19353a9dbf964a47d43b816d45cfbf22a339a373e3e28b SHA512 e11ee803045f9fd994ccf4ee617aceb31a527a64b568290a46f7f36a260c2a0587dc65c1104780a54d4d73110027d83dc077e2c1703ec2e932ca090b54390db4
-EBUILD openjdk-8.292_p10.ebuild 7308 BLAKE2B cd181ac6880639f21fb6d91eb78bf3539c9221a3a271da18be8888b504e8ce5e098d5a6084be16f20f9e657b84517314151c444a13cd971b8e1202fcbdbf25fa SHA512 68fba677c735e3a5b11e352112bdcba32cb9c0d228bca094bda3b15b6d4e31e92d800587471573eb8874f946d1c77cda10daf555911eb44099603c409d5cd2fb
+EBUILD openjdk-8.292_p10.ebuild 7313 BLAKE2B 1c5db4f660ab13a3bdd21e009900fd6f4f7b79005f89da8c802e611cb325929f42eb60f59c88220fc2d865fa5554d0b88c09846767e907c11d787a9433b6cee1 SHA512 eb35e875c863ba47d1a1b6de1f493ff2efdd5bc82a82be775f9977ffc46cb64854f9576498aba8cf424bdb78003c1301efae487c7223b4ef138f1efbe7e51b2b
 MISC metadata.xml 1432 BLAKE2B 36a11642c99127a5f97fc0b095a142705c6b4e077ed24604f1886e4d1beaa47b4fa30359600797d5e6a085befd11a2851196fe97a75a0f0907461679946b4cbf SHA512 ecc66015da3a0fc616b91dd5aaffb5b050c9f66e936cad02ec12fb56dd7c6b3b3c331d8856402c0deee16c415ea083e088cce7414703f9d659f551883b055ff0
diff --git a/dev-java/openjdk/openjdk-8.292_p10.ebuild b/dev-java/openjdk/openjdk-8.292_p10.ebuild
index 4cf0ec14f0b5..898080f8d64f 100644
--- a/dev-java/openjdk/openjdk-8.292_p10.ebuild
+++ b/dev-java/openjdk/openjdk-8.292_p10.ebuild
@@ -189,7 +189,7 @@ src_configure() {
 	fi
 
 	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
+		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
 		CFLAGS= CXXFLAGS= LDFLAGS= \
 		CONFIG_SITE=/dev/null \
 		CONFIG_SHELL="${EPREFIX}/bin/bash"
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 14374813b8f4..c6d74ee328c4 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,24 +1,14 @@
-DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
-DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5 SHA512 9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11
-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 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 1478 BLAKE2B d617e38efc90574bd768311d74fa430c3b63e16b4c52c0f73e8ae22eed797822d1dd6e03fd89960762d3eef6c40c1d6adbf4592c03ccc3f9fcc3c087e97e9880 SHA512 2377ca511591d13fd9dd600b460d55481e80e086578e3d5d278cc8304d609d8869d02b608e65d33310d4efc9b884f23e026e54630c38c6a56be775c5a0072932
-EBUILD protobuf-java-9999.ebuild 1415 BLAKE2B eb06a6a5c6fd59bc30ab6b2c828afec993e3643a9761d752e95898f5bcb8d0aaa7225c0cc6e6a2e1519f0ca7e65a962ce5f43b6577535ced88436f43c6472c6b SHA512 fdc0efd31cfa8494351379343031a3d27cb7a5ec6a2650a6014e8bb8b5f76be6178e319c382aa0931eb3ff32aeed98a4c9690c449dc9bf7cda919601d9a29635
+DIST protobuf-3.16.0.tar.gz 5299781 BLAKE2B 9ace02a6038c31b7393671fb2ccd6a4866a3f8b7d87d2bc8371f49d65b9180f10792ca2430a83449dfa7d785a1244dac23c20756414c9d1e7c7e871a8038b123 SHA512 0191e5a6a23d03f691e883e259f6d06a0ac8eef427455bc7d1cc70b6f0ed260e4ad8f360c836fd4bdc95ec0ca314c887cbf7acbcda60e03cdfe69e4cd275bff5
+DIST protobuf-3.17.0.tar.gz 5185780 BLAKE2B a168619df72cdf097c7ddfd50aca96a2101bf73e7c1c842c020e6ee08a853db8674a86ca999b7706da3dd21d4d3d2159241c93232efc693701962f3a54a382e9 SHA512 36ed2de641849ce01531ff1207f62a0748f811519c40622a119a17a1e709864382de81481fb58f374a025948971c48416e7e6de9c00512a78633c7a8a3aa3a36
+DIST protobuf-3.17.1.tar.gz 5192666 BLAKE2B 7f912db7e0835aaa42628fcf564a5666e2cbfa021bb35638a5eec53c3c457f1e747225dea54f732b7239a1520febca9bc20c824b1938f100796caa3ac2133bc1 SHA512 5a18aa3c1dab040dc6d22310a8503241081106acf7ca89079d7b416533d7c2cdd47719dc9023e6bc26969f0f1c796550260a04034a403c69752f6a3a7a651bb8
+DIST protobuf-3.17.2.tar.gz 5192779 BLAKE2B 97f9561848e70b8d26ebcc7fc4fa8da51c4b8267efbe1d2d386c2785308e7ba7edc05f1b3863c274dc8838866d58b58509606d72c51a22b956d1d528584c4c95 SHA512 b3e7ad50ed772668df70a3a20ad1af13a5e82f23b109e4fecd34e6a74947bed300963c9f084907fbfafe28fc18365cde7df1975e2ff9538d2f5a3d2b458bca98
+DIST protobuf-3.17.3.tar.gz 5235236 BLAKE2B 2495e678c8f9436d4e5a30ccee8b6226125d418ac7ecf7df20b078a1a16c221cbccab7d846dcd56a90220c106617fa75c410a21b62612fedec378cd7e8571350 SHA512 b4030b4474cc5fb5a62501200725dd488e6e66e3ced4ed12ab4ee029fcfed305e92ec966adafbdd343afffd186908163849422b95eaa500e7e741ac325d01d12
+EBUILD protobuf-java-3.15.8.ebuild 1498 BLAKE2B e3e42bc2d5a80adfd042dfc39b3e864517aef340432098c12859a9af83c2da2d66fc7439837efde9623343dfdb05c8870e2dd05c86db6682f963b7aed69e00c5 SHA512 a1552b542ba396f983ecda47dcc4ab368a9e523c8759edaf4da5c481e1639718a2646e4332d99fe4a7b545c8d5feb23a6bb6f535d0be8eeec152adf6f8ce4065
+EBUILD protobuf-java-3.16.0.ebuild 1454 BLAKE2B 72947e022e40f1584a085c0b04a4d14f7cbc5481efb650ef6554287aef504d0de7ebc39fd4c6696f75f8d621e2f960c4cd823cc385320e6d31bac51705249612 SHA512 634b18db5449411fed2546618bcd702cd5a8283f0ae00906655784c16de0fc56b39da567daf471833073635be31b152d0ff3149dbe4a18edb86c8c2660bd763e
+EBUILD protobuf-java-3.17.0.ebuild 1454 BLAKE2B 8677e5ec0fdc53308a9a219ba1ffd719112e46075f6c376a1d88c542039559173bd9a7b7e386021a78e3ea0c41a66af2effb263d8cb6ff11a4da851a2d7d5dd1 SHA512 125deb6bfb83d79ae3f6169c92ab9d17ea0c4c5f47123024e418811a1460c2c8e96e872c340c19b43991d9b566c5fac5a422278e15944b14cf5a7a6e73610575
+EBUILD protobuf-java-3.17.1.ebuild 1454 BLAKE2B 8677e5ec0fdc53308a9a219ba1ffd719112e46075f6c376a1d88c542039559173bd9a7b7e386021a78e3ea0c41a66af2effb263d8cb6ff11a4da851a2d7d5dd1 SHA512 125deb6bfb83d79ae3f6169c92ab9d17ea0c4c5f47123024e418811a1460c2c8e96e872c340c19b43991d9b566c5fac5a422278e15944b14cf5a7a6e73610575
+EBUILD protobuf-java-3.17.2.ebuild 1454 BLAKE2B 8677e5ec0fdc53308a9a219ba1ffd719112e46075f6c376a1d88c542039559173bd9a7b7e386021a78e3ea0c41a66af2effb263d8cb6ff11a4da851a2d7d5dd1 SHA512 125deb6bfb83d79ae3f6169c92ab9d17ea0c4c5f47123024e418811a1460c2c8e96e872c340c19b43991d9b566c5fac5a422278e15944b14cf5a7a6e73610575
+EBUILD protobuf-java-3.17.3.ebuild 1454 BLAKE2B 8677e5ec0fdc53308a9a219ba1ffd719112e46075f6c376a1d88c542039559173bd9a7b7e386021a78e3ea0c41a66af2effb263d8cb6ff11a4da851a2d7d5dd1 SHA512 125deb6bfb83d79ae3f6169c92ab9d17ea0c4c5f47123024e418811a1460c2c8e96e872c340c19b43991d9b566c5fac5a422278e15944b14cf5a7a6e73610575
+EBUILD protobuf-java-9999.ebuild 1389 BLAKE2B 3ed9ebe10fa9926d513e6f9367c6054cea58b33f007cc4250d251376c2a69b0e9aa305dfa88c7db109ce3262d0563d345ba4bdda98e004cf2ffdb699bf81eca9 SHA512 b8df11ef1583f01bb9633e67e5c6aa9b89782a0e42a15c94d5d826926887b45a068b8ef563ba08ded7c14ae1ddafc6f36dab761d607fcbb7122195b41d2edf67
 MISC metadata.xml 549 BLAKE2B 3b081008d6ff92b24f670c1b8861400871454e96c5f0ca170c3825d6dda8d356f341fbfad7b5a9f330a7f9891d0e3b91a9f4842c480ee8a74f6aaf371884dcc2 SHA512 37ecf8aa151f5d08443a07c40188ec7061947a06453e39d07fa9b0da0cbeb2ccb76e517e7e2c2e3a2afe07874c817cf644dcd8775ad78f18b5f55496bc198b72
diff --git a/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
deleted file mode 100644
index 73f37de7f484..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/24"
-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.14.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
deleted file mode 100644
index 6b33107b79ac..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/25"
-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
deleted file mode 100644
index dfd68dd9ecf0..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.15.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-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
deleted file mode 100644
index dfd68dd9ecf0..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.15.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-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
deleted file mode 100644
index dfd68dd9ecf0..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.15.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-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
deleted file mode 100644
index dfd68dd9ecf0..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.15.7.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-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
index 198c4df6bd5b..6c648819d2d6 100644
--- a/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
+
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.protobuf:protobuf-java:3.15.8"
 
 inherit java-pkg-2 java-pkg-simple
 
@@ -23,14 +25,13 @@ fi
 
 LICENSE="BSD"
 SLOT="0/26"
-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}
 	>=virtual/jdk-1.7"
 DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
+RDEPEND=">=virtual/jre-1.7"
 
 S="${WORKDIR}/protobuf-${PV}/java"
 
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.16.0.ebuild
index dfd68dd9ecf0..96752936a170 100644
--- a/dev-java/protobuf-java/protobuf-java-3.15.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.16.0.ebuild
@@ -22,15 +22,14 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/27"
 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(-)]"
+	>=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/protobuf-${PV}/java"
 
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.17.0.ebuild
index dfd68dd9ecf0..d24b960991a9 100644
--- a/dev-java/protobuf-java/protobuf-java-3.15.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.17.0.ebuild
@@ -22,15 +22,14 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/28"
 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(-)]"
+	>=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/protobuf-${PV}/java"
 
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.17.1.ebuild
index dfd68dd9ecf0..d24b960991a9 100644
--- a/dev-java/protobuf-java/protobuf-java-3.15.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.17.1.ebuild
@@ -22,15 +22,14 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/28"
 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(-)]"
+	>=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/protobuf-${PV}/java"
 
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.17.2.ebuild
index dfd68dd9ecf0..d24b960991a9 100644
--- a/dev-java/protobuf-java/protobuf-java-3.15.3.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.17.2.ebuild
@@ -22,15 +22,14 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/28"
 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(-)]"
+	>=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/protobuf-${PV}/java"
 
diff --git a/dev-java/protobuf-java/protobuf-java-3.17.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.17.3.ebuild
new file mode 100644
index 000000000000..d24b960991a9
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.17.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2008-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/28"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+BDEPEND="~dev-libs/protobuf-${PV}
+	>=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/protobuf-${PV}/java"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
+
+src_prepare() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply_user
+	popd > /dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
+}
diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index cf89398a1afb..11d9796bf900 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -22,15 +22,14 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/27"
+SLOT="0/28"
 KEYWORDS=""
 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(-)]"
+	>=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/protobuf-${PV}/java"
 
diff --git a/dev-java/rat/Manifest b/dev-java/rat/Manifest
index 07864bac68ca..52ee3e96c289 100644
--- a/dev-java/rat/Manifest
+++ b/dev-java/rat/Manifest
@@ -1,5 +1,2 @@
-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 661 BLAKE2B 7c44626518c60c78b3717ebfd2756bb8131ce8d47d5b9f9fa2cfe9972ab1eb21165fb56835a9d45a487d14ff35eb99e81bea57ba63c5603e8dcd60a7b0e22edc SHA512 f7921b7a0362b936f0f9bbf3e0f8e33764ba1f386dffb9532c8af7254fcd6b8434efeaa2a80f889ee5391b6fc2050f566f209dceaa8debbf51d5e9c739c10d8a
+EBUILD rat-0.13.ebuild 659 BLAKE2B 51f0b992ff7ee1bf289d39ce9c2dad1e794f95c7caca2063c4f54a3febe1466f031e0a68e3c634f1a80881c032317b63ad181af4dc4088a701e46fe6f30886dd SHA512 ed9676736f720cc6b9d6727f070f7ef9aa0fb7efd6d042b370553eac76b4876cb83b516915d600f0bb1e41cf849bfc7e113214a7bb4e4889f052f2256043d8ed
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/rat/rat-0.11.ebuild b/dev-java/rat/rat-0.11.ebuild
deleted file mode 100644
index c5275947926b..000000000000
--- a/dev-java/rat/rat-0.11.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="apache-${PN}"
-
-DESCRIPTION="Apache Rat is a release audit tool, focused on licenses."
-HOMEPAGE="https://creadur.apache.org/rat/"
-
-SRC_URI="
-	https://repo1.maven.org/maven2/org/apache/${PN}/${MY_PN}-core/${PV}/${MY_PN}-core-${PV}-sources.jar
-	https://repo1.maven.org/maven2/org/apache/${PN}/${MY_PN}-tasks/${PV}/${MY_PN}-tasks-${PV}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="
-	dev-java/ant-core:0
-	dev-java/commons-io:1
-	dev-java/commons-cli:1
-	dev-java/commons-lang:2.1
-	dev-java/commons-compress:0
-	dev-java/commons-collections:0
-"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
-	ant-core
-	commons-io-1
-	commons-cli-1
-	commons-compress
-	commons-lang-2.1
-	commons-collections
-"
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher "${MY_PN}" --main org.apache.rat.Report
-}
diff --git a/dev-java/rat/rat-0.13.ebuild b/dev-java/rat/rat-0.13.ebuild
index be441fd30aaf..ad082bb240bc 100644
--- a/dev-java/rat/rat-0.13.ebuild
+++ b/dev-java/rat/rat-0.13.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://creadur.apache.org/rat/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	~dev-java/apache-rat-core-${PV}:0
diff --git a/dev-java/reflections/Manifest b/dev-java/reflections/Manifest
index 28eeb90b7df3..5c607a8f9c08 100644
--- a/dev-java/reflections/Manifest
+++ b/dev-java/reflections/Manifest
@@ -1,3 +1,3 @@
 DIST reflections-0.9.10-sources.jar 53049 BLAKE2B 23491098dc648206161d983148bf11a1c4523df0593c903f9dbf03672b481d85aabaed7733a5d829b7f334e51d53dadde3fd439e62f9873ceb11f49f40a2cfef SHA512 940b80ed43aa900177e6c3551980eafe10f7ea16a1e5c0d24fc8c1e29f1e0155aae83e24f60af10f9743449ed38d2d3b211f3668fafbd95a6a2cb9c5581f56bf
-EBUILD reflections-0.9.10-r1.ebuild 710 BLAKE2B 8240c9fb9336f01b74837486e2d217af9e77510f3c08737afb7d1542e9c4df8bc6e7426ae5d7585fa83c47b16b0fa67a6e7a5ba4b9a35dc9fa58778cc3724c49 SHA512 fe11da9fc5ff0ba4565279056fb80caa5b5c99fb6c02c593d51fcbf38c782d9d15b851650ca058af949c0e9efadd5f432d15180f4822c2f80e3ac845227d29cb
+EBUILD reflections-0.9.10-r1.ebuild 714 BLAKE2B efccbab2cbbf812e21acdc7d2359af04c75d9dba37a593a9b7568832eafcd86978e9160ea819c39fd365924b6b33b084a7b795ba9e8ff99006e9835982cb8d5a SHA512 fa900b4ea01bbc0895214df06f74ecb1be6836cd330fadf43b3b80f7643dc59596324750490fc80d821e3406167e648d11ddd36e4f2840ffd6053074bba7ebc6
 MISC metadata.xml 526 BLAKE2B 9d7cbd06f623684dc7bac9b98720c7cf16a8a48fe7507f65af4657cc7e1ccea992be23023c3b7d8d324a946eac87adc3c039c0b9d7f81af88608970af4d5673e SHA512 9627a7b711bc69d1175ebcc1cefe5a1241c3de4ca833d6f0778f8264d65a5835d8b9ed8efa7d1e98400299c02772e02e6528acccbd9c7c5bc59f13d530ef2e4a
diff --git a/dev-java/reflections/reflections-0.9.10-r1.ebuild b/dev-java/reflections/reflections-0.9.10-r1.ebuild
index 4750a28d85da..8ca41b4098f7 100644
--- a/dev-java/reflections/reflections-0.9.10-r1.ebuild
+++ b/dev-java/reflections/reflections-0.9.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/ronmamo/reflections"
 SRC_URI="http://search.maven.org/remotecontent?filepath=org/${PN}/${PN}/${PV}/${P}-sources.jar"
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 CP_DEPEND="dev-java/commons-vfs:2
 	dev-java/dom4j:1
diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index fbff1f032f22..b11ef4314301 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -5,6 +5,6 @@ DIST antlr-3.5.2-complete.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac74
 DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435 SHA512 76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
 DIST stringtemplate-4.0.8.tar.gz 147305 BLAKE2B 0c09326f4eecfc86db8588a9b8db801bac8d8e128f8ef004a3691813d1dfcbd1e397acd5cad47e4c9d44d7ee8c17b8f6b66386fb897e4137df43dc46f46dc3f3 SHA512 21e4936356a6d374bf92645f09351a495a5900a408ead8dce1903ed81d7fc70eb4b44b206b587b05ed87edb2d4792c1cf72907a9cb527e18373ba2e5f31b5724
 EBUILD stringtemplate-3.2.1-r1.ebuild 1476 BLAKE2B 24dbc49a93f0e63d886adbb12c06769b6015554eb1c74756a6f48642e92f3489b06e4524287503c2bdafa7bff4349c419afff66710ace2b425feeec593214fbe SHA512 fd1ff2ae25cbcaf37a1f193f8791415f8605e548a2e3f6fe5e310fad8b8720f19d279935c927589829b5957bceea686076f750d5f8d94d648ae9cd6158aece99
-EBUILD stringtemplate-3.2.1-r2.ebuild 1561 BLAKE2B 3e2674b791144f38cf05a6eb7d519e07022281522b11eb204cc7828532759f7d6d3ab88c46b9b3a5a0d578b27d33fbe2c9a346fe927a7fe499bdece9d0680003 SHA512 5ad8941f4c4669b1ffcb341ace024d0c7572f6bec3e9ee982843d837f7699b7b300b5a66a776c514d1e69e48402d8e35e2c45ed68ae567a55975d89dbb6f1c69
+EBUILD stringtemplate-3.2.1-r2.ebuild 1558 BLAKE2B 1c6e7681fd3393fbbc01b6bac14bb8594324f4de415e1a4d51517b543fc30c0e77ac159bbfb0b9a7612149634784e9744cb7aa4985b1e429dab6c87bc369e673 SHA512 d44ebe7633e4f05560ad626d2540f4350d05443048e76d9f125229ceaf84686ddd4c790e1d9c9c89de8310b755330560965f54869f6bfb0436201ed9da7ebc3c
 EBUILD stringtemplate-4.0.8-r1.ebuild 2227 BLAKE2B 10d792caffab1e99e83eb551fc53603107f9be7f662fab164bc8b1573fbe577c777d509e8dbf1b1ea0e2cc899cf1c1b168f7314a5d98c817a74b019772ae785e SHA512 281ce1c2835412d72dd327dce4fb1df38a5e493ebb2f76ee59ce75945ecf4b4c4a45c6ea2e417e287ca1f422dd319bf693eafe19b4c52e84e04876454dab8b97
 MISC metadata.xml 322 BLAKE2B a9d59ec72b635debef4618887bd9389b4db013017a0a952b28b5f07e7a2caef78976b51de098085b94cc16046fe5642a5b6da9e2a197aa51d39daac6b25f1c19 SHA512 76ac99f8c99d34b533c08ae008a9eb2ac2a3b64589df3d43460c93b78c3c53c45b944837cc7f5514e90afc2117554fb545306e74a2b2bcb5c8339c656998c449
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
index 5ad6b886170b..e3e792562312 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/antlr/stringtemplate3/archive/${MY_COMMIT}.tar.gz ->
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/sun-jai-bin/Manifest b/dev-java/sun-jai-bin/Manifest
index 0e8b76d8be0e..6c246c83b682 100644
--- a/dev-java/sun-jai-bin/Manifest
+++ b/dev-java/sun-jai-bin/Manifest
@@ -1,6 +1,6 @@
 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-r2.ebuild 1091 BLAKE2B dc4eaaa13002d5c337ebf76af5804a17505c2d5d6bf57d5b51a574bb37b46531b709d650f84d0d5d1b04f95fb9409c53a055a4b2f6ca4ef97fea054ebe121f32 SHA512 4b3bb1f789012d207d9d8ad0b407a9491195f079f7c2df72024bedae8003bc8f0767898f77fe8e8bf854b8f8eac040d1eb7a5de464d8c76d5e7cfdb1ef025740
+EBUILD sun-jai-bin-1.1.3-r2.ebuild 1098 BLAKE2B df294ee2f8d42e2f14d05a85263d16e995ccff915ccf68f9d17f2b378afcb0c9341f68c8fc9b2c09c57736a06799032e9354484e1d84554e9fea9b6218efb8cd SHA512 3e664d5a3bf1585e7e8014a93bba9468ed7fd0bd21f4c11f85d7ea09eabde526a8b0bb8761d28b896170a63419722d5e97514a6fc660702fdca736e93caa4a71
 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-r2.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
index 1f5ba79b8b0c..dda39756714c 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="sun-bcla-jai"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64"
 
 DEPEND=""
 RDEPEND="virtual/jre:1.8"
diff --git a/dev-java/tagsoup/Manifest b/dev-java/tagsoup/Manifest
deleted file mode 100644
index ef4908cbef6e..000000000000
--- a/dev-java/tagsoup/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tagsoup-1.2.1-src.zip 222757 BLAKE2B 79a43edfa9aed7f08bfaedbe758b2a08d5ff596e268cc415707aee9076bcdbf8de0b4c2a855b9558ff2cf598ed4811a7a690aef6c5004e34484ffe3087bef8e9 SHA512 3bb1608746270663f6ed45318457e3ee27419929411689d962cffc0ab0c32ec4b858020043be46e929014b696c753a01b49d6eea9a98f18d81fb9205e99ac0a1
-EBUILD tagsoup-1.2.1.ebuild 1071 BLAKE2B 3205b951406d934b0f00686454e44474bc71df8d027150a24f1a042aa5d698f4de9dd23aba37a47727904449e0a6b785ba4e8f3d278c26c8ea66dc2ff71e2339 SHA512 a01329a96bae4547379027d079fadbc1b9276c543bc98aabbbd0ad0d18e6a6145906b9df77c053da1f3e61fbd42f609bf8ca9950edc89f51b95c7a572fd20966
-MISC metadata.xml 501 BLAKE2B e343c2ff8cc35280a493830bff0fbd4486a37fcc22d79eb8b74e6712250e9c879b50f8beede300189d233cdfa9579f02b921573f6e3af1bb399d34099764caf6 SHA512 e8abb4f880b76ee62dd56e0caa65868efa920f080cae9c137a9ff2646e77c2e22e5bb687e584f1b9621bb10140d6725626b01adad7df85f19ce55d80b4706ba1
diff --git a/dev-java/tagsoup/metadata.xml b/dev-java/tagsoup/metadata.xml
deleted file mode 100644
index 6ba5054b0614..000000000000
--- a/dev-java/tagsoup/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>
-		This is the home page of TagSoup, a SAX-compliant parser written
-		in Java that, instead of parsing well-formed or valid XML, parses
-		HTML as it is found in the wild: nasty and brutish, though quite
-		often far from short.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-java/tagsoup/tagsoup-1.2.1.ebuild b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
deleted file mode 100644
index 501db89baf9e..000000000000
--- a/dev-java/tagsoup/tagsoup-1.2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A SAX-compliant parser written in Java"
-HOMEPAGE="http://mercury.ccil.org/~cowan/XML/tagsoup/"
-SRC_URI="http://mercury.ccil.org/~cowan/XML/tagsoup/${P}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="app-arch/unzip"
-RDEPEND="
-	>=virtual/jre-1.4"
-DEPEND="
-	dev-java/saxon:9
-	>=virtual/jdk-1.4"
-
-EANT_BUILD_TARGET="dist"
-EANT_DOC_TARGET="docs-api"
-# Fails to detect a TransformerFactory. #421733
-# See also https://issues.apache.org/jira/browse/XALANJ-1549 for why the default is no good either.
-EANT_ANT_TASKS="saxon-9"
-EANT_EXTRA_ARGS="-Dtransformer.factory=net.sf.saxon.TransformerFactoryImpl"
-
-src_install() {
-	java-pkg_newjar dist/lib/${PN}-1.2.jar ${PN}.jar
-	java-pkg_dolauncher
-
-	doman ${PN}.1
-	dodoc CHANGES README TODO
-
-	use doc && java-pkg_dojavadoc docs/api
-	use source && java-pkg_dosrc src/{java,templates}/*
-}
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 81b4b430c4ad..51219f963a58 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,3 +1,5 @@
 DIST tomcat-native-1.2.28-src.tar.gz 423848 BLAKE2B f0528817e1ea7e90ce67d8e181c0f620211d36529809a4c89ae687f4cefe4b0f977eb53b87e70bd0132ef1a5a000df82fc8c70e08f9bb568644b47cbf8817470 SHA512 16b8659dcd228ea153d05c9ae19e3d97add944315f3b8b42905162d0e4e8a28fd51a172d59d7da8508271ecad0b8ac025a386895565acaf8e2ba11fba77492bb
+DIST tomcat-native-1.2.30-src.tar.gz 425741 BLAKE2B d39c7762db0f8c6b3422d1a4811d65793e2315e0d34fae8a37f250ff41a2c11a0c89ccaf8a361cda7cb16434dcd9678289ecec60cc5322a5fae2d6963c76f36c SHA512 51a8c55214de166cace193c3330abe77cabea56c2d05efc8c3408bc06369c328899376c94c572725ebe2887f2faf99fea05d1819fa84c712d57fd309d0476953
 EBUILD tomcat-native-1.2.28.ebuild 1182 BLAKE2B 9a7261837690e5b5a1bc07019bcf27f1c34e9c08740ede80ce86e844132736515c4ce9f18e940509f67f8f85616b376806180901da445a57f1026ceb1c085a02 SHA512 75b69feb9bd93291cd8d834394c8344fd792205d28ab6e381f07f0139b241a27c32befd5f63b3db40fac5365d22f79024ee08e6b9b38d38d4702cbab5b1f064b
+EBUILD tomcat-native-1.2.30.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.30.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.30.ebuild
new file mode 100644
index 000000000000..76a4520b2d1f
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.30.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 35ab56dd4dc7..ce64bd925e6e 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -8,21 +8,19 @@ DIST apache-tomcat-10.0.6-src.tar.gz 5987333 BLAKE2B b955d3708555c5530ebccaf9c6e
 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-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
 DIST apache-tomcat-8.5.65-src.tar.gz 5874743 BLAKE2B 8a605b0fe5026315aa0a5463d42c01eac164c91737cc81f8df4e174075783a829ddd30a8fc9f5129cf1f83a98d85fa33cb7ec9223f365de0ad91ecffb319d187 SHA512 df6ea4e8e04fe1f787ef105cb3e453516ad25d32ad3d559c86997b44492c9a1e93e8c22c88ba2203dcfefc14404f7d1bb28a9e2e20d44ba85adf8c374a4456fa
 DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B bfef20872bd19ffa2bb34b98a1da875fdd5f232e681458f0aef093b7eecd63a95c1cd26130f54251f149249e639d0da2577770e43314d2a86b8ee9b48b675f0d SHA512 322fda683197898f873feb375791092d33c90aac08a54889fabab0f59ecbc7b27784f027b37008c6893fdbf8ca7973b73268f42673d7e8df762419b5a536593b
 DIST apache-tomcat-9.0.45-src.tar.gz 6055044 BLAKE2B 66ca4ee2c0a3bbd1f73d7257c55105e28d1619c8e533f945438cdb283cb8ccdceada163698641b034b5e43b513fcdd16e331c4c11ea300501276a5247f8ef682 SHA512 e3edfd6ab9e3ddf6a15f63a4e11f5237e03d7cacdec11805f4a901bd325c0edeca1ee0b62bee92d53e521af0a9d5a7b10ce12a8262a57fd7faa69d93ca1c066e
 DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 400814281aedd588c008a1363199f8602e856870d4c39d536b13f8a357c2390d2db689940f4a6971ec74a84e8e400174e72610e0d64a220de41f2dff419dda3c SHA512 dc380e23aa87273c6ba32e79659e768c551b07812635c2f1c62d2c34b493b1d3d51b4548fec5014fdb36f8461fc90942aa7917874ddf3d6f5c5345d8ca02dfc1
 EBUILD tomcat-servlet-api-10.0.5.ebuild 3168 BLAKE2B 0ccf3292c4a661229d1c9f8341dddeefc7e8247169397f59d2e9e039ea65f24782a60f4d806cead97364b9d9e4080329e5f24cff6b75024e11637fb202b6dfb0 SHA512 aecc5b1b3a2ffc970aadad28e0f0fb6961f93259ae77a8af76d124204cbf11f5eac46effdfb6e9b8460be3948b002d542a95a35b78bbe04168688c97126da4f2
-EBUILD tomcat-servlet-api-10.0.6.ebuild 3018 BLAKE2B 1b0a0ae5ade523a746c6f9d62a805ef1332a5d021fbb3f2b3893ce7c5204afa140da818010676bbd0751f64a56b135557f6f4af509b826bda21aa0eb4d4f172c SHA512 fdee126c42bde90a7265f3ea7d742a58552c6a578724157e35e76233a9b0299e522778659e8d9a0468a15eac762c0acebb2564eec08697d49bdfa542debdc803
+EBUILD tomcat-servlet-api-10.0.6.ebuild 3015 BLAKE2B d00f9dd42643a5ac88e522cc7c8b6dae88a11b59189d5424d248859d2223432af20ad966f9173a7419cee39eeb7b4bb04dbef9b261eacfe3e1f3fbeda6500820 SHA512 479cad183a31ab15d32d24d125aa00e472d8264656ba6013f383fcc6163ffdc79307bd10ed991620b1e4c60e102337d4cbb6dd3111e2e9761c6fa02df3b2bd43
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae751ad7e2f4d7dcff941e28c4eb7ef4d614ae5f626235bf7cfdeb56eaf3bba608913bf12bde46b2a9e576c7cf1d886c275336a SHA512 b36e97e60cb546ef2a980d1b9787dda5b21e5c788555d9a696ca166632315a870477fb8c52fa24c1698dcf43bb096201b6d4835113ec87192287eff9f5664e3b
 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 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
-EBUILD tomcat-servlet-api-7.0.109.ebuild 2987 BLAKE2B 58215b6b83dd299746d8a57bb9dd09b0ca04868f8de442b894d2a06ee68d901041a12594390bf87bc291f96f78cc6e5c207d01766948e9eaa0fbd29d1f194e6a SHA512 c93c1e035d0fce24fcb6a2fa28cb6713d8f38114a6ba76081d6eb1b5e42b2087fa9920c7a443c8b36fdf5d2d157886d70e2ddefbf901c33c53236c5e8901cb11
+EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
 EBUILD tomcat-servlet-api-8.5.65.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
-EBUILD tomcat-servlet-api-8.5.66.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac
+EBUILD tomcat-servlet-api-8.5.66.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
 EBUILD tomcat-servlet-api-9.0.45.ebuild 3174 BLAKE2B 8142c3911554979940a3ef71fd28d834cd10dd7cbe6c2ecaa46198a8873b5a1b787c499f59e1f4ae42ad1b2a9f8fded31f93e9af8fbec6e486b214ae526e6ef7 SHA512 cc57dd3eb335d5fc4d650ddf85bda93472330b86b7f91513efcdfa006df4f3e360e85a7984ad44a53fdf5df06616e157b83a17c46920982170921bcf9251ea16
-EBUILD tomcat-servlet-api-9.0.46.ebuild 3013 BLAKE2B de9767718af5e643a912a112bde60431cf461d02bdcc157834a3806299f3ebebf8df8b467278727c1eb5ef588874c70f3637f8ce2f1fe4e0b5cb169aa3954683 SHA512 7d5febfe5fd7d4760e03449dfc177f1c0aa21d9752f49429ca2ecfc3f9b8bef45381cc83f6bbd1a132b0d9366d65fb45c32ff4e3b1d87f922bb6b71fed7f3a3d
+EBUILD tomcat-servlet-api-9.0.46.ebuild 3009 BLAKE2B 6a687dee6eeb283532ccffe1e29c248755c2aa639d7a716b21b6097a99c2bdca62fc6b1acf017cff5de27d2a7e91037f2b1212d6bbb5699b3ba9f1b04f9d909e SHA512 e330e8959e3d3d2d7f3639160065e35963515df5bb886672c4359c26562fc2fab9d77ff40c8fb23e6ecdf9a67adcf1ee77f69da8fed681b7b2e0acc67d02b945
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.6.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.6.ebuild
index fb739b89bf7a..e360880764ab 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.6.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild
deleted file mode 100644
index 0a4f99352d99..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${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-7.0.109.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.109.ebuild
index c750d5ea6f6f..0a4f99352d99 100644
--- 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
@@ -14,7 +14,7 @@ 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"
+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.66.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.66.ebuild
index eaffc40f4037..8846bfbc900c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.66.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.66.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.46.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.46.ebuild
index 4a8d22d12869..4811db9874c5 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.46.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.46.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
commit	d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree	4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /dev-java
parent	e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)