gentoo resync : 12.07.2021

35 files changed, 692 insertions, 44 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 39528d16d80b..8d50b6e6f8c2 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
index 101f11729d0c..8ee0905c2c67 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -1,3 +1,5 @@
+DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
 DIST bcmail-jdk15-145.tar.gz 483519 BLAKE2B aed9d4ef1ede10b97979652a012f18e45b7d4d597cb8b3ad168e847563ce14f7effe429b7f213adb77befeb144c4c3a279738b76718bde85ce04265d62ef8e75 SHA512 2d3232d5eb1cd75ad56a7316beb32880f3f935fcd3ed0a6cb2cc3e1861dc9f0bece0cbae53471760246505adb5c28328691eb82e11fedb0b160c1248d21c48bb
 EBUILD bcmail-1.45-r5.ebuild 912 BLAKE2B ef76eb9c860233cc5e90b84123eeca0317ea2690e03d09a90bebbd13adfdb0ec3c84335b3ea886306b64caf20b20460158b84d260417fc7f0496cfb75bc63731 SHA512 7936c6be67385f5d97d639697c4295bfa2c886c40b4271ab54cb58fde64233c22184a18ef1e4c247a016d12db16fab2d4a846e4e1039d545730bf22d41f03bfc
+EBUILD bcmail-1.69.ebuild 1492 BLAKE2B 0787163f0fb64653e9f73a9611132236de5626d694439f440db9ae17c4ced40688f7b796f3bbfc67c024efbc3c772b7a0ac3675d825f3b8efa5c412c95cbf750 SHA512 50af4b5bf36511c817895a40a2d1271dab7daeb255751fb5f4a5dd490c4e624f615618b6a7a8e2cb3a5ea850b25c936dc9903b07e6c0fe946bdbf74282a13e6f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcmail/bcmail-1.69.ebuild b/dev-java/bcmail/bcmail-1.69.ebuild
new file mode 100644
index 000000000000..26c40175c4ae
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.69.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.bouncycastle:bcmail-jdk15on:1.69"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
+SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CDEPEND="
+	~dev-java/bcpkix-${PV}:0
+	~dev-java/bcprov-${PV}:0
+	~dev-java/bcutil-${PV}:0
+	dev-java/jakarta-activation:1
+	dev-java/oracle-javamail:0
+	"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( ../{README,SECURITY}.md )
+HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.html )
+
+S="${WORKDIR}/bc-java-r${PV/./rv}/mail"
+
+JAVA_GENTOO_CLASSPATH="bcpkix,bcprov,bcutil,jakarta-activation-1,oracle-javamail"
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"src/main/jdk1.9"	# https://bugs.gentoo.org/797634
+)
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_RUN_ONLY="org.bouncycastle.mail.smime.test.AllTests"	# OK (106 tests)
+
+src_prepare() {
+	default
+	cd ../ || die
+	java-pkg_clean
+}
+
+src_install() {
+	default
+	einstalldocs
+	docinto html
+	dodoc -r ../docs
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest
index 0f1cd43694ef..dbb0ba3385be 100644
--- a/dev-java/bcpg/Manifest
+++ b/dev-java/bcpg/Manifest
@@ -1,4 +1,6 @@
+DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
 DIST bcpg-jdk15on-150.tar.gz 691012 BLAKE2B ee566fb6deb44177e31bfe80b6bd1f13d39d6820cffe3693bd85314ccfd65c4805275b3925d52a6bda6b1ad7e3ea267f1f0bed3926420b5920e5f300020ecd9a SHA512 763d253b9bb45b7e7fab75d557daa784c3d4a503ced979adc986e5688c3939db248853c864a2f4bec6d5b1dd9ed668d5f278c91b5607774fc703971d0b330fe6
 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.69.ebuild 1419 BLAKE2B a85ca6dcd4741c74a6a2ab620e763211bba69d292e0ef48ed6cb76345bcf42b10a4f5f436839e7780ee726838b7f2133404e3039f539f1fb5a209f54cfa2887e SHA512 c09551bb1ca704e4b571811c470adf9cddff0e2b7f606ef2ba18a30099ab1ec59c2853d68e0d9a960c283a43137b8ad7753a4c5b33c921adce27a54cb8e6a31b
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcpg/bcpg-1.69.ebuild b/dev-java/bcpg/bcpg-1.69.ebuild
new file mode 100644
index 000000000000..6b97042eda53
--- /dev/null
+++ b/dev-java/bcpg/bcpg-1.69.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.bouncycastle:bcpg-jdk15on:1.69"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
+SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CDEPEND="~dev-java/bcprov-${PV}:0"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( ../{README,SECURITY}.md )
+HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.html )
+
+S="${WORKDIR}/bc-java-r${PV/./rv}/pg"
+
+JAVA_GENTOO_CLASSPATH="bcprov"
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"src/main/jdk1.9"	# https://bugs.gentoo.org/797634
+)
+#	JAVA_RESOURCE_DIRS="src/main/resources"	# Does not exist
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_RUN_ONLY=(
+	"org.bouncycastle.openpgp.test.AllTests"	# OK (19 tests)
+	"org.bouncycastle.openpgp.examples.test.AllTests"	# OK (6 tests)
+	"org.bouncycastle.gpg.test.AllTests"	# OK (1 test)
+)
+
+src_prepare() {
+	default
+	cd ../ || die
+	java-pkg_clean
+}
+
+src_install() {
+	default
+	einstalldocs
+	docinto html
+	dodoc -r ../docs
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
index 01755952592c..88d16a17bedc 100644
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@@ -1,3 +1,5 @@
+DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
 DIST bcpkix-jdk15on-1.50-sources.jar 401716 BLAKE2B 7a656218b96da46027c82a023404c32b92a640aa0ed5a1256213139e8dc54f9ef07453478dcc66372a0a49562b92165148f18a5063c24f7569a3e40f649494ba SHA512 6dc6d63db649a94f54c7739144b4120db4255e0a0a713389d54fcd427b95a3ff5ec326ae066cb5aa8a6cf19ccb959cbb22f9f898d39bfe5bf8e20c4d9de6931c
 EBUILD bcpkix-1.50-r2.ebuild 719 BLAKE2B 96642caf10144d1b4d24a4680e3ff2bad09eb12b6c5646d1e12878dcc5d71316a4807aa955df410aebb41092d4560e7ae4ec8a97a6a054ee081002a7de829e42 SHA512 98a55dac21d68a1d529d3d239a531d4d4856a68dad8b2f2f8ab4ce42ade8938863ab63f1ffc9fc77eff0cd9f4f6aab060742dc7e09bd09b1a40b66e20ad5e97e
+EBUILD bcpkix-1.69.ebuild 2141 BLAKE2B 647c94dccd7a48de23ddd57fa89eb8f120993e35bacd248c380f0a1fd8938e432eb7c540d5cc27a1e3931db4360f88cf8c4fbe95beaadddfd79275bfe064522f SHA512 1222ddee8a6406c3e6805622ecb59276eff14a108441ab07a9521e0b77f24d880e155fcebbb6ffbe5a41c5e6459673d7a0baf852870556b3df811cc3208bea11
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcpkix/bcpkix-1.69.ebuild b/dev-java/bcpkix/bcpkix-1.69.ebuild
new file mode 100644
index 000000000000..461d901edcf5
--- /dev/null
+++ b/dev-java/bcpkix/bcpkix-1.69.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.bouncycastle:bcpkix-jdk15on:1.69"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
+SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CDEPEND="
+	~dev-java/bcprov-${PV}:0
+	~dev-java/bcutil-${PV}:0
+	"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( ../{README,SECURITY}.md )
+HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.html )
+
+S="${WORKDIR}/bc-java-r${PV/./rv}/pkix"
+
+JAVA_GENTOO_CLASSPATH="bcprov,bcutil"
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"src/main/jdk1.9"	# https://bugs.gentoo.org/797634
+)
+#	JAVA_RESOURCE_DIRS="src/main/resources"	# Does not exist
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/../core/src/test/data"
+
+JAVA_TEST_RUN_ONLY=(
+	"org.bouncycastle.cert.cmp.test.AllTests"
+	"org.bouncycastle.cert.crmf.test.AllTests"
+	"org.bouncycastle.cert.ocsp.test.AllTests"
+	"org.bouncycastle.cert.path.test.AllTests"
+	"org.bouncycastle.cert.test.AllTests"
+	"org.bouncycastle.cms.test.AllTests"
+	"org.bouncycastle.dvcs.test.AllTests"
+	"org.bouncycastle.eac.test.AllTests"
+#	"org.bouncycastle.est.test.AllTests" # (16 tests) org.bouncycastle.est.ESTException: localhost.me: Temporary failure in name resolution HTTP Status Code: 0
+	"org.bouncycastle.mime.test.AllTests"
+	"org.bouncycastle.mozilla.test.AllTests"
+	"org.bouncycastle.openssl.test.AllTests"
+	"org.bouncycastle.operator.test.AllTests"
+	"org.bouncycastle.pkcs.test.AllTests"
+	"org.bouncycastle.tsp.test.AllTests"
+)
+
+src_prepare() {
+	default
+	cd ../ || die
+	java-pkg_clean
+}
+
+src_install() {
+	default
+	einstalldocs
+	docinto html
+	dodoc -r ../docs
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index 9584c76980b0..fbc0262ce8d7 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -1,3 +1,4 @@
+DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
 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-168.tar.gz 9716574 BLAKE2B 54c4fec3d614bfe6449a10789bf7fd8d01d8d03f0a133dfd01bb7a30d3545d4dda3bbd2b2543a3827ac8988d9c9000cf7c0ebe7d5d462c6f9145c467d3f53ddb SHA512 3cdb6e486f6d1afb8c98c08809d142430191feeb757608f4abf27640fc706decf3975e3bf3f36c2a00bbc77ad2564ff9652bdc5e13662638c66a87bd250302db
@@ -6,5 +7,6 @@ EBUILD bcprov-1.45-r2.ebuild 1341 BLAKE2B 7012f9298f272a44572585ea8c66a8cc61b79e
 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 1167 BLAKE2B 507893e4ca2f6d15e4cb4b8bbd637a7af71f6e70fc7f678f153991a685093596373e8b3fdef971780ef80d343e28b1a2f6c1904f8dc581ed8c9aacd2d5257b53 SHA512 38097266a95b0c9bc3b922da84ce8b9f3c87dd266b869a3a7fc80688b53f9f6925acf9db02a25248bad7116d818437d676e95155ffed2907be4c9cd919639b7e
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
+EBUILD bcprov-1.68-r2.ebuild 1166 BLAKE2B f8ffaf33eaa23a1ce5938a6b5f6412d605826536551735d919fe091aab221e6a4e70b1e23fa117098c3d6c2d316ea85061c86b373911e87a502a16a86d42dacf SHA512 3f992af0e197f0a020606b7023ea44354ffeffde3856cf1fc5711ee9c313cc129351134f92f666849110f164fe77405c1a2e58acc6279310374ef4dad9abf341
+EBUILD bcprov-1.69.ebuild 2471 BLAKE2B 006b71d25b7f8245b8b04c29251719fc4369a5625b030d5864ef39d7057e7c01cfd3d21dc72452b2c98e8328c8084a4dd4a512e86c2f5eaff6059de7417e249b SHA512 1345a8cefbef03b7cd379c76f9c63055ee5389d5d6b8835d5ed8e016371ce3a13353ad61ceb6ab8d3da2ad0eeaa6994f5d440db7776035b8cb8d5c03f9c077a0
+MISC metadata.xml 481 BLAKE2B 28abdd8dda620f2fe86c83ba5912c0e560ec40332ee443db8235ddcb3632327475e84fdc6311d9892a7f24fa07ef40b902c510fd7a5611b6ae997a801745003a SHA512 3b414b3faf0ca03ab0f06ab850332f72a554ddf0a1b548827619df018cd6e3a6c1bbac6704fe9a578baab843cdde81c76b9dd0d8bcd82b27af4fd488541e5116
diff --git a/dev-java/bcprov/bcprov-1.68-r2.ebuild b/dev-java/bcprov/bcprov-1.68-r2.ebuild
index d444f124b7cc..d1c8bd9d9e62 100644
--- a/dev-java/bcprov/bcprov-1.68-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.68-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/bcprov/bcprov-1.69.ebuild b/dev-java/bcprov/bcprov-1.69.ebuild
new file mode 100644
index 000000000000..c0ba00351a41
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.69.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.bouncycastle:bcprov-jdk15on:1.69"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
+SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/zip"
+
+DOCS=( ../{README,SECURITY}.md )
+HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.html )
+
+S="${WORKDIR}/bc-java-r${PV/./rv}/prov"
+
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"../core/src/main/java"	# package org.bouncycastle.asn1 does not exist
+	"src/main/jdk1.9"	# https://bugs.gentoo.org/797634
+)
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR=( "src/test/java" "../core/src/test/java" )
+JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" "../core/src/test/resources" )
+
+JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/../core/src/test/data"
+
+JAVA_TEST_RUN_ONLY=(
+	"org.bouncycastle.asn1.test.AllTests"	# OK (18 tests)
+	"org.bouncycastle.crypto.agreement.test.AllTests"	# OK (14 tests)
+	"org.bouncycastle.crypto.ec.test.AllTests"	# OK (1 test)
+	"org.bouncycastle.crypto.prng.test.AllTests" # OK (1 test)
+	"org.bouncycastle.crypto.test.AllTests"	# Time: 126.95 OK (6 tests)
+	"org.bouncycastle.jcajce.provider.test.AllTests"	# OK (29 tests)
+	"org.bouncycastle.jce.provider.test.AllTests"	# OK (1 test)
+	"org.bouncycastle.jce.provider.test.nist.AllTests"	# OK (283 tests)
+	"org.bouncycastle.jce.provider.test.rsa3.AllTests"	# OK (11 tests)
+	"org.bouncycastle.pqc.crypto.lms.AllTests"	# OK (17 tests)
+	"org.bouncycastle.pqc.crypto.test.AllTests"	# OK (81 tests)
+	"org.bouncycastle.pqc.jcajce.provider.test.AllTests"	# OK (89 tests)
+	"org.bouncycastle.util.encoders.test.AllTests"	# OK (15 tests)
+)
+
+src_prepare() {
+	default
+	cd ../ || die
+	java-pkg_clean
+}
+
+src_install() {
+	default
+	einstalldocs
+	docinto html
+	dodoc -r ../docs
+
+	# These files are not present in the upstream jar but are used for tests
+	# Removing them from the jar file after testing
+	zip --delete "${S}"/bcprov.jar \
+		"org/bouncycastle/pqc/crypto/ntru/*" \
+		"org/bouncycastle/pqc/math/ntru/*" \
+		|| die "cleaning after tests failed"
+
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/bcprov/metadata.xml b/dev-java/bcprov/metadata.xml
index 952a4b9b605c..956cd381f68c 100644
--- a/dev-java/bcprov/metadata.xml
+++ b/dev-java/bcprov/metadata.xml
@@ -5,4 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<longdescription>
+		"The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. This jar contains JCE provider and lightweight API for the Bouncy Castle Cryptography APIs for JDK 1.5 to JDK 1.8."
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/bcutil/Manifest b/dev-java/bcutil/Manifest
new file mode 100644
index 000000000000..1f2f7b957387
--- /dev/null
+++ b/dev-java/bcutil/Manifest
@@ -0,0 +1,3 @@
+DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
+EBUILD bcutil-1.69.ebuild 1348 BLAKE2B 731850a9a653aee7f6c96916d8dc0e9f85a33f3f48a51ae71b688dea62e4a8341f70da3881662782064e13f04165a0d2a56debf73db65bb4ba99d337c7de251d SHA512 f5947385dcb15f4a6918f7a474508ab2270d2c94d7ad4cd35712955b33007c1fc8bbe47a2c8077c62c28976e34ba571cfd7053051a4d6fd1032f29180eb80515
+MISC metadata.xml 216 BLAKE2B da3631f8f6582ec2aad6497bbadf58b72bd143f39387aa3a5ee5842db7dc470f1693503286c6c1cde6e4f1ac72c271afabd139d1cb6f25de7d06a5469dd66c03 SHA512 241c7b10d088e8d6b9ace6781434e64c4a5d2eb80e5dfceea04e09a9637475e927ebd804588e5624622b24ef60a29331ad07f995360b0c1c2d5ffa25033a9f4d
diff --git a/dev-java/bcutil/bcutil-1.69.ebuild b/dev-java/bcutil/bcutil-1.69.ebuild
new file mode 100644
index 000000000000..938f7b0a7f43
--- /dev/null
+++ b/dev-java/bcutil/bcutil-1.69.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.bouncycastle:bcutil-jdk15on:1.69"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java APIs for ASN.1 extension and utility APIs used to support bcpkix and bctls"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
+SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CDEPEND="~dev-java/bcprov-${PV}:0"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( ../{README,SECURITY}.md )
+HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.html )
+
+S="${WORKDIR}/bc-java-r${PV/./rv}/util"
+
+JAVA_GENTOO_CLASSPATH="bcprov"
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"src/main/jdk1.9"	# https://bugs.gentoo.org/797634
+)
+#	JAVA_RESOURCE_DIRS="src/main/resources"	# Does not exist
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_RUN_ONLY=(
+	"org.bouncycastle.asn1.util.test.AllTests"
+)
+
+src_prepare() {
+	default
+	cd ../ || die
+	java-pkg_clean
+}
+
+src_install() {
+	default
+	einstalldocs
+	docinto html
+	dodoc -r ../docs
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/bcutil/metadata.xml b/dev-java/bcutil/metadata.xml
new file mode 100644
index 000000000000..0d49beafc75d
--- /dev/null
+++ b/dev-java/bcutil/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index abe324bd1669..174d58981dde 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,4 +1,6 @@
 AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12404 BLAKE2B 294ef11924310e2e63865018843faf199521f619e0859cc2c857d8a9fb038fbc44d88b06cf2df44b05cc6891c9e9d1bba5898071a873fc0dd774427afb0a2de2 SHA512 af18eeb48d8da55fc63526a528b88f626d9fad2369a6a8f570fe2dfee76384a5d86a9bab4883e557a1acd0a866859c4bd075476f9cfaff8e8465de6db0f2848d
 DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490
+DIST httpcomponents-client-4.5.13-src.tar.gz 824131 BLAKE2B 1507c81749a92afcf8b170b606761236d71b02d8b8b257d753a0f09abbdc297057df39661e827dee52804a2138de7d201b2a837418cbec21085fd3ffd558b51c SHA512 421e413fb2206fa95b6428ff067cdf2b440d2d3d4503cc3ca9bcf70ccd8ed1b8273ec4fe0703e6a8cd7612940b7ed966d9f163dbfeb8bf699ae2a8b2e0866d05
 EBUILD commons-httpclient-3.1-r2.ebuild 1680 BLAKE2B 39796278c783e63835011467992fc9d8891bd2c691924078b909d409cd5567a8ebe505a834bfe65617936b4196cc99bcd12770e6a0462c237b5a5ff0f33cef11 SHA512 c1c327018aa78ccadd57a06845771ce12eef99106092823763eb7285d9bee587aa654b3fafcfabc7e725d36a5db7cda5e276bc6c6c7c291bf19bfbb553116244
+EBUILD commons-httpclient-4.5.13.ebuild 2178 BLAKE2B d67eabd14e654db2e07113230008c9730024a4e7aff9b03259f3c9a973a7c2a1422dc47d9add60ec9f901da12df40b34f31a45b8085f4c1adbe6251bc4d37e0b SHA512 b19206d4ab9498d79a5737aa9057fbdb03acba110dbbdfc33f4ae820f10c54b2ecf8c27d8ecd4e69300ff6dc2ff12116f11dc89a6cba454ce94550a591a05fe9
 MISC metadata.xml 456 BLAKE2B b4e2261943e4bd92d413eae20f60f23b79e7deb961d9c7e08f855f28cf69f0b45c5113a308138122a9cc4b42da1498e67c8be2093ce0252f60d5ef56ea55e72a SHA512 27c629a07a007dd4336cd50f4ea32156ec301b02f398b008c057532b36bc0698132282e32007ee31f0dd21f3f5664b3d7c9607fe43a4dfbbffb67d3000c3a661
diff --git a/dev-java/commons-httpclient/commons-httpclient-4.5.13.ebuild b/dev-java/commons-httpclient/commons-httpclient-4.5.13.ebuild
new file mode 100644
index 000000000000..736ff629cee5
--- /dev/null
+++ b/dev-java/commons-httpclient/commons-httpclient-4.5.13.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom httpcomponents-client-4.5.13/httpclient/pom.xml --download-uri https://github.com/apache/httpcomponents-client/archive/refs/tags/rel/v4.5.13.tar.gz --slot 4 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-httpclient-4.5.13.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.httpcomponents:httpclient:4.5.13"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache HttpComponents Client"
+HOMEPAGE="https://hc.apache.org/httpcomponents-client"
+SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: httpcomponents-client-${PV}/httpclient/pom.xml
+# commons-codec:commons-codec:1.11 -> >=dev-java/commons-codec-1.15:0
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+# org.apache.httpcomponents:httpcore:4.4.13 -> >=dev-java/httpcore-4.4.14:0
+
+CDEPEND="
+	dev-java/commons-codec:0
+	dev-java/commons-logging:0
+	dev-java/httpcore:0
+"
+
+# Compile dependencies
+# POM: httpcomponents-client-${PV}/httpclient/pom.xml
+# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
+# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/mockito:0
+	)"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt )
+
+S="${WORKDIR}/httpcomponents-client-${PV}/httpclient"
+
+JAVA_GENTOO_CLASSPATH="commons-codec,commons-logging,httpcore"
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"src/main/java-deprecated"
+)
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# Tests run: 929,  Failures: 1
+	# javax.net.ssl.SSLHandshakeException: Remote host terminated the handshake
+	"org.apache.http.conn.ssl.TestSSLSocketFactory"
+)
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/httpcore/Manifest b/dev-java/httpcore/Manifest
new file mode 100644
index 000000000000..a5d04bdbc38e
--- /dev/null
+++ b/dev-java/httpcore/Manifest
@@ -0,0 +1,3 @@
+DIST httpcomponents-core-4.4.14-src.tar.gz 591869 BLAKE2B d6f4900d8781cf7189edb2dfa9c1157b02584e8c66cde02dc261b0e29cdfb971e0323ce4478966b8e125df475ab1014fbee5b4bdf411eb118647f47f95c8f1a7 SHA512 9c713c7ea4e966a35ed391bc2a3aa10a0963cd21978c028dbd0790c9c2a6592385c7b2f135ea2836e6c495d9faea1bdcc65aa994bd5548bc2d84db38d5dbb713
+EBUILD httpcore-4.4.14.ebuild 1592 BLAKE2B 692c414be0d6b732716b480552937a1bf7bad992d9c10825a63f0c881b706dbebe880515b0f7e23dbe22ff84b0db5f05884a30a2b55f3a8d2986c86677a2a7eb SHA512 cf8aa04377e6c60954f36e58126cfca7501a921a3e967cf183aa5723481737dc2ab7d9713df0632c0f98134883daf73d59f3e02ac10164c472645ff47d40b456
+MISC metadata.xml 216 BLAKE2B da3631f8f6582ec2aad6497bbadf58b72bd143f39387aa3a5ee5842db7dc470f1693503286c6c1cde6e4f1ac72c271afabd139d1cb6f25de7d06a5469dd66c03 SHA512 241c7b10d088e8d6b9ace6781434e64c4a5d2eb80e5dfceea04e09a9637475e927ebd804588e5624622b24ef60a29331ad07f995360b0c1c2d5ffa25033a9f4d
diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild
new file mode 100644
index 000000000000..5584b7dab67a
--- /dev/null
+++ b/dev-java/httpcore/httpcore-4.4.14.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 httpcore/pom.xml --download-uri https://mirror.netcologne.de/apache.org//httpcomponents/httpcore/source/httpcomponents-core-4.4.14-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild httpcomponents-core-4.4.14.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.httpcomponents:httpcore:4.4.14"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache HttpComponents Core (blocking I/O)"
+HOMEPAGE="https://hc.apache.org/httpcomponents-core-ga"
+SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: httpcore/pom.xml
+# test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? (
+		dev-java/commons-logging:0
+		dev-java/mockito:0
+	)"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt )
+
+S="${WORKDIR}/httpcore"
+
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"src/main/java-deprecated"
+)
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="commons-logging,junit-4,mockito"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/httpcore/metadata.xml b/dev-java/httpcore/metadata.xml
new file mode 100644
index 000000000000..0d49beafc75d
--- /dev/null
+++ b/dev-java/httpcore/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jakarta-activation/Manifest b/dev-java/jakarta-activation/Manifest
new file mode 100644
index 000000000000..fd92c5d55590
--- /dev/null
+++ b/dev-java/jakarta-activation/Manifest
@@ -0,0 +1,3 @@
+DIST jakarta-activation-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
+EBUILD jakarta-activation-1.2.2.ebuild 1632 BLAKE2B a5122207e08efb6002c9ed52610cd7e9bec37be0d67db90b6ded5f23f5f102d025b573ad051e702c3ffc3470b90b8bda3fd1f697605475d6d35e57f577f946cc SHA512 e3256beb5818d9d8a318fe714470d72a12f89534c27759b6c195624945e82bf05dea8b60a572c47b560b3dc8be7f1588b2dc981690d54c18bb3cae7ca464dda8
+MISC metadata.xml 361 BLAKE2B d3bf866111d68c231bb0f2468c6caa6ad0898d222c1807a9e853e32573e0d4e3b8c1f668bf1b36e85ac466869873acdf976379a490e7cb4fb0eab377484f19b9 SHA512 e493232219ce389523bd77123bbb11ef5e4c06a05c191beef3fe9829803f0c70211bc68b99cf49d575865f0929621d9c745c81325f3ded6f25888daab72faf4f
diff --git a/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild b/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild
new file mode 100644
index 000000000000..6c2ae11e3b08
--- /dev/null
+++ b/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/1.2.2.tar.gz --slot 1 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-1.2.2.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.sun.activation:jakarta.activation:1.2.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Activation"
+HOMEPAGE="https://github.com/eclipse-ee4j/jaf/jakarta.activation"
+SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CDEPEND="dev-java/jakarta-activation-api:1"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+BDEPEND="app-arch/zip"
+
+DOCS=( ../{CONTRIBUTING,LICENSE,NOTICE,README}.md )
+
+S="${WORKDIR}/jaf-${PV}/activation"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_GENTOO_CLASSPATH="jakarta-activation-api-1"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+src_prepare() {
+	default
+	find ${JAVA_RESOURCE_DIRS} -name "*.default" -delete || die "Failed to delete *.default files"
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# we remove API classes from the jar file
+	# removing javax sources in src_prepare does not work - compilation fails with:
+	# src/main/java/module-info.java:12: error: package is empty or does not exist: javax.activation
+	#    exports javax.activation;
+
+	zip -d ${PN}.jar "javax/*" || die "Failed to remove API classes"
+}
diff --git a/dev-java/jakarta-activation/metadata.xml b/dev-java/jakarta-activation/metadata.xml
new file mode 100644
index 000000000000..55432e8ce804
--- /dev/null
+++ b/dev-java/jakarta-activation/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">eclipse-ee4j/jaf</remote-id>
+		<bugs-to>https://github.com/eclipse-ee4j/jaf/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index d1b5d5108494..c89311189535 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-r2.ebuild 2141 BLAKE2B b80cb145b52cf495a2f7ca147cd68f6e1462ba2a7b32439049607447c227b0ebfb03f6a6a9008a23315602ca1864b96b0c4faa327da85bf113f5a7e63c98d568 SHA512 1080ffb4e91249e12f72ea7c45a47997d10011bf91e802451681e7a124ed10b7f4bd5269f79e3e0ae9b94171ab21dd43ecca8e95753520562cc0315b86538dcc
+EBUILD jna-4.2.2-r3.ebuild 2143 BLAKE2B fc92ccc827c1d4118707c76477119d0c0d31d3783fc6f900c49bfaa8fa5359cc1a05c9a72febdcd9831363b3a1353992df35e9fa1446135e90a43d613b2b5e12 SHA512 23106b242b13f8927a928b18cecc87d9422275a7b82b59eaf9d143c5f57d13a65a44991357d04dc5a60e4da78cee837d7bfb1a496bd52bad4a3bb0fcbf60defe
 MISC metadata.xml 462 BLAKE2B 7ad9e0cb48ce7fdfae4bdc10bf3cb6d6c25a7f86d62dbb9041d0ad2fe04409477eb27754b5f53218fba657f7ed77b423b34bea92bffb61c37ee2eefdcccc3a3b SHA512 88a027ef32c55e551625950ecb2efffc75a7611568f11a4abdcddd4fe24b894eb7d8fb805cba3fc0f79ddf6fae6116804790fc24b3d5b6097ade9ad92ed4c118
diff --git a/dev-java/jna/jna-4.2.2-r2.ebuild b/dev-java/jna/jna-4.2.2-r3.ebuild
index 672aa2f06bb6..6ba89af05328 100644
--- a/dev-java/jna/jna-4.2.2-r2.ebuild
+++ b/dev-java/jna/jna-4.2.2-r3.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="test? ( awt nio-buffers )"
 # fine. Someone bisect it please. :)
 RESTRICT="test"
 
-CDEPEND="dev-libs/libffi"
+CDEPEND="dev-libs/libffi:="
 DEPEND="${CDEPEND}
 	virtual/jdk:1.8
 	x11-libs/libXt
diff --git a/dev-java/sun-jai-bin/Manifest b/dev-java/sun-jai-bin/Manifest
index 6c246c83b682..de77a75c7e81 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 1098 BLAKE2B df294ee2f8d42e2f14d05a85263d16e995ccff915ccf68f9d17f2b378afcb0c9341f68c8fc9b2c09c57736a06799032e9354484e1d84554e9fea9b6218efb8cd SHA512 3e664d5a3bf1585e7e8014a93bba9468ed7fd0bd21f4c11f85d7ea09eabde526a8b0bb8761d28b896170a63419722d5e97514a6fc660702fdca736e93caa4a71
+EBUILD sun-jai-bin-1.1.3-r2.ebuild 1097 BLAKE2B 6bd63c72f815f2e3c96ee7e74757e3e2bf23135c61d0fc09855069490935cb4ad752aee342e0dbe5168a5ed5da92e8479f2e0284aebf3e689f758906f6a5ba7e SHA512 f36c961a1c2de6786818febf77572ca6b57bbbd2a4c97044c27a77bc394b314ede408e9753762c6001616bbc6bea4bdc7247c301b844fec0484a1286385fd143
 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 dda39756714c..55b5518402a6 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 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 DEPEND=""
 RDEPEND="virtual/jre:1.8"
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 51219f963a58..138271183792 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,5 +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
+EBUILD tomcat-native-1.2.30.ebuild 1182 BLAKE2B 9a7261837690e5b5a1bc07019bcf27f1c34e9c08740ede80ce86e844132736515c4ce9f18e940509f67f8f85616b376806180901da445a57f1026ceb1c085a02 SHA512 75b69feb9bd93291cd8d834394c8344fd792205d28ab6e381f07f0139b241a27c32befd5f63b3db40fac5365d22f79024ee08e6b9b38d38d4702cbab5b1f064b
 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
index 76a4520b2d1f..fd32b6403ca4 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.30.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.30.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Allows Tomcat to use certain native resources for better performanc
 HOMEPAGE="https://tomcat.apache.org/"
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="static-libs test"
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index f99be7db14db..b04b8f6cad4f 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -10,6 +10,7 @@ DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
 DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B bfef20872bd19ffa2bb34b98a1da875fdd5f232e681458f0aef093b7eecd63a95c1cd26130f54251f149249e639d0da2577770e43314d2a86b8ee9b48b675f0d SHA512 322fda683197898f873feb375791092d33c90aac08a54889fabab0f59ecbc7b27784f027b37008c6893fdbf8ca7973b73268f42673d7e8df762419b5a536593b
 DIST apache-tomcat-8.5.68-src.tar.gz 5907026 BLAKE2B 2312edb94f98ee98b594325fbc32521776e9cadc4422a3a46f3651f1fee072a99c5f6874378ac06215396504d34ad750edd6ec3399a3931554068195a8ee15ef SHA512 579a35f944ead756995d288b66ea8a4ab30289a90c32aa01119abcea85a8524f6594ce5cb7ac9df6d352c1e3b54a18c814b5d3a6409dce6a43614e3a89284066
+DIST apache-tomcat-8.5.69-src.tar.gz 5916996 BLAKE2B 4a3ef958b6bb0089149877c25baaa2c1a0bcee473c0942b419c5c1d7071dcae4f8a6e6f1805efdee1201042feedc64e213fffbcdb35cf2b7f9a67217b8dcad48 SHA512 467dd38bd77d8b5ac6fa2acf9f6ee71d04467a3182647757fa47f5d1d9576c96e5061db61ba08b04318f1db9ee4f2bcac7b45f1f9f4f81cd1807a57483dd7bbb
 DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 400814281aedd588c008a1363199f8602e856870d4c39d536b13f8a357c2390d2db689940f4a6971ec74a84e8e400174e72610e0d64a220de41f2dff419dda3c SHA512 dc380e23aa87273c6ba32e79659e768c551b07812635c2f1c62d2c34b493b1d3d51b4548fec5014fdb36f8461fc90942aa7917874ddf3d6f5c5345d8ca02dfc1
 DIST apache-tomcat-9.0.48-src.tar.gz 6080015 BLAKE2B 9b2cac8143ca8186857d7d53e8737f2f7d2ec8e0ca03d32447ad25b429cbf37c1c7b39bc6e4b93679c08bd5f4940280d00946a70e9fa82f8c2a596ea18a2a4c6 SHA512 9b762f6d1a1f6c75e10f1bc05c39a647ae2165f3b81c09ff73cc286f3c487b034b9d14c73b808c73b35f55f642848831a0329d9d611c8bbb3928559e552a3ff3
 DIST apache-tomcat-9.0.50-src.tar.gz 6086608 BLAKE2B 59b5eb1616d377193f330fd8c5abb6e98926ab0a2f75b1ea14251d249837aad733f55a0b79f2a67de57f612dd1afdeae53836be97e81701d8dc27ecb0a381d4a SHA512 1032d2d5c342fb495b76426fdc301e0e5546815e709e604061d7aa2cdab19bcd376adc957fd25dee1d574306186eafd2e9d24140dd5e725b130128592cac47a2
@@ -22,6 +23,7 @@ EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 955 BLAKE2B e7046e9afdfc33a906b44bcc9
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
 EBUILD tomcat-servlet-api-8.5.66.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
 EBUILD tomcat-servlet-api-8.5.68.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac
+EBUILD tomcat-servlet-api-8.5.69.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac
 EBUILD tomcat-servlet-api-9.0.46.ebuild 3009 BLAKE2B 6a687dee6eeb283532ccffe1e29c248755c2aa639d7a716b21b6097a99c2bdca62fc6b1acf017cff5de27d2a7e91037f2b1212d6bbb5699b3ba9f1b04f9d909e SHA512 e330e8959e3d3d2d7f3639160065e35963515df5bb886672c4359c26562fc2fab9d77ff40c8fb23e6ecdf9a67adcf1ee77f69da8fed681b7b2e0acc67d02b945
 EBUILD tomcat-servlet-api-9.0.48.ebuild 3013 BLAKE2B de9767718af5e643a912a112bde60431cf461d02bdcc157834a3806299f3ebebf8df8b467278727c1eb5ef588874c70f3637f8ce2f1fe4e0b5cb169aa3954683 SHA512 7d5febfe5fd7d4760e03449dfc177f1c0aa21d9752f49429ca2ecfc3f9b8bef45381cc83f6bbd1a132b0d9366d65fb45c32ff4e3b1d87f922bb6b71fed7f3a3d
 EBUILD tomcat-servlet-api-9.0.50.ebuild 3013 BLAKE2B de9767718af5e643a912a112bde60431cf461d02bdcc157834a3806299f3ebebf8df8b467278727c1eb5ef588874c70f3637f8ce2f1fe4e0b5cb169aa3954683 SHA512 7d5febfe5fd7d4760e03449dfc177f1c0aa21d9752f49429ca2ecfc3f9b8bef45381cc83f6bbd1a132b0d9366d65fb45c32ff4e3b1d87f922bb6b71fed7f3a3d
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.69.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.69.ebuild
new file mode 100644
index 000000000000..eaffc40f4037
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.69.ebuild
@@ -0,0 +1,99 @@
+# 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.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}/"
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+	default
+
+	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
+
+	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+		${EL_API_SRC} ${EL_API_RESOURCES} \
+		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
+		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+	pushd java || die "Failed to cd to java dir"
+
+	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
+	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+	popd
+
+	for file in $(find src -type f | grep -vE "\.java$"); do
+		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+		mkdir -p ${target_dir} || die "Failed to create resource directory"
+		mv $file ${target_dir} || die "Failed to move resource file"
+	done
+
+	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 50bf95df2daf..77d01a19c1aa 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,6 +1,6 @@
 AUX xerces-2.12.0-overrides.patch 1526 BLAKE2B 837bba05c47933fa4cc44a5a326fe6a7c872028181ec11c8da7e8ec182c8bcabeead38b1ad336ae20ec47dffb30e98a8d2c181e4dfbffa12d14bfe017fff4e19 SHA512 b81fb06ba89b6ef374205d623d655309778c9713f0ff11fa392d9f53d6331eaa342ce4145433c2e187f26145b3d9b8de7d48778bfd0c29497900ab47556d2bf9
 DIST xerces-2.12.0.jar 2113705 BLAKE2B 4224b9c00b9c7f388fc40f3bebe6520a21011f36ee1ffcf62e864fe370bbcac8c45b3627d2aff20655f467661a252e1bfd5cb9613f9bbe5b08f1917d09493fa7 SHA512 21f5218f71b3423a883e2bf5c99f7badd5a004a09454d0b218f57f463daf8fe83e7a186b64dd4c19388795a6e6e995f6ed133bbe4c81aab07b0a0d33cf2f7dbb
 DIST xerces-2.12.1.jar 2149927 BLAKE2B b02c518754bcab1da9200122b398496c273a84c07a60945c0eea5524a230f5f4815b619685fc41bf48a124f9147803b9452d5d0105b57d535c9c666c52196571 SHA512 2c4ce274904eda6eb4b0b8800dc8383bc6504e215eb9603c45a25c32335651c8ea4d69539b984c048c1974d2aed3d852fff168eb44e2a9b1087ded578394b849
-EBUILD xerces-2.12.0.ebuild 917 BLAKE2B 3def60cd9da9f91d4750595b0373053095b764e9e84e485d184093fc81b61f73655c4a84465259c4e791d7cc45d9e6a345afa4bebf15c6c800beb26d292e287c SHA512 520d71a67bcc9c0a7d195513d2b6160ca279b5ef4901ffcb8ced3de688db66af58f1db713a25c50c462504800dd1d5aa8e40d41cc279b3c1e0f9fdd90d6755b9
+EBUILD xerces-2.12.0-r1.ebuild 1243 BLAKE2B 2f7141d2a08249d6b293e99b2648b7dcc8a54f6e1d9edf3d1289a0c556d9a0c263520f844fd76e2e2a3a16250af3314351be9a493d94cc7cbafe72233aaae7d6 SHA512 92a01a9ab116180ac968c2474823cf9041f6d4bef5ad093cd2a7bb167e77550472e8d3eef615b79c7042998b79f83dda02e0cf6df609e7c8e3c1d9d7639f5ed3
 EBUILD xerces-2.12.1.ebuild 784 BLAKE2B 2b1fc5fe458e4b064e8149de5c4b9f691210e8947f4a8e70f72715e0ba6e92ef4f3be2b61474947f5ea29dfafeb55ca6d707a94f7cd2a10c1e3f4562f13d20f5 SHA512 81acd3d9ea6587c9851800606d82279846b7eb6f55483b83a007c54be7959d8a0ae38f0fc1406e07d0905208beb43c50e54660a47ba317722a66f1247d59a869
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xerces/xerces-2.12.0.ebuild b/dev-java/xerces/xerces-2.12.0-r1.ebuild
index 638b1ea00e7f..60f2bd89f71a 100644
--- a/dev-java/xerces/xerces-2.12.0.ebuild
+++ b/dev-java/xerces/xerces-2.12.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 MAVEN_ID="xerces:xercesImpl:2.12.0"
@@ -20,22 +20,21 @@ SLOT="2"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CDEPEND="
-	dev-java/xjavac:1
 	dev-java/xml-commons-resolver:0
 	dev-java/xml-commons-external:1.4"
 
 RDEPEND="
 	${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8:*"
 
 DEPEND="
 	${CDEPEND}
-	>=virtual/jdk-1.6"
+	>=virtual/jdk-1.8:*"
 
 JAVA_SRC_DIR="org"
+JAVA_RESOURCE_DIRS="resources"
 
 JAVA_GENTOO_CLASSPATH="
-	xjavac-1
 	xml-commons-resolver
 	xml-commons-external-1.4"
 
@@ -47,6 +46,10 @@ PATCHES=(
 
 src_prepare() {
 	default
+	mkdir "${JAVA_RESOURCE_DIRS}" || die
+	cp -r "${JAVA_SRC_DIR}" "${JAVA_RESOURCE_DIRS}" || die
+	find "${JAVA_RESOURCE_DIRS}" -type f -name '*.java' -exec rm -rf {} + || die
+	rm "${JAVA_RESOURCE_DIRS}"/org/apache/xerces/{dom/org.apache.xerces.dom.DOMImplementationSourceImpl,xs/datatypes/package.html,parsers/org*} || die
 
 	java-pkg-2_src_prepare
 }
diff --git a/dev-java/xpp3/Manifest b/dev-java/xpp3/Manifest
index 7037fbb4829c..312dcc6c4e1e 100644
--- a/dev-java/xpp3/Manifest
+++ b/dev-java/xpp3/Manifest
@@ -1,4 +1,3 @@
 DIST xpp3-1.1.4c.jar 128334 BLAKE2B a0c1d871216e44f7196ae8edd4c0ca2503a16821b6f592e4af0fcc1da346135fd5023fa5210abe1ce772d0001274c0f6a3d2383b7ebad1a65ffa967ac31c1d5e SHA512 743d2a0b20d16e97b640d9ad3e20e56a7446cdaf4ca0ebba072bdbe3eed0ef90289c2829376b4a209b35e0960adee5e01f11e8f361798333d8b4eaf4f1038445
-EBUILD xpp3-1.1.4c-r3.ebuild 659 BLAKE2B 20f11ffa6f50b9a4310b36733ecf2c78b1f98822d37f737577d806f5a675c1eadc3ade32dd2cc46790d809bcd337302028cc7311f234b479e132f74f13bf7e5f SHA512 5c68fb355b688dcd19666195ac83180b4f4f4d6383a7aabf0eff8ec734a7f1be04f5e9f17aa9670d8526c4554faa598327702cad125fa22e992b6ffc226de73d
-EBUILD xpp3-1.1.4c-r4.ebuild 648 BLAKE2B a1a0916c40ba9ddcbadc1114bcba6858b4cb416b867756ce3c7b8ffc5f453dcd2de3a75c8a4daa9c05a5cb097da2f1aa2f93226220174f78040426d8a12ae7ae SHA512 0c9050b2ce897b135d778c9906c405831d3defadfd8aa518e10f7da0887b8b6958e8f626336bd9cf7c9b6836652a4c29823df10b880f697e48c32a820d91f5e2
+EBUILD xpp3-1.1.4c-r5.ebuild 775 BLAKE2B 4904458b949700ab454da89f332c7e2e6e114ceaea21f53886f85d28d05d60fd0b0b515fd5c0519c408ad872c1c04d2d33748e27c0427efbcea075a697b6ee0a SHA512 85ca3d9ad08ca1f65f346593245c41d07614893a56b77d605e714f0046e15253fa953a5af9a4169854f8895e77629960ead6b81b171f28e35bda185b4566c5c5
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
deleted file mode 100644
index a52b851aeb9e..000000000000
--- a/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An implementation of XMLPULL V1 API"
-HOMEPAGE="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html"
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	source? ( app-arch/zip )"
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r4.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r5.ebuild
index 6dc6ad5bd4e6..3f30d6b9c176 100644
--- a/dev-java/xpp3/xpp3-1.1.4c-r4.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c-r5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 MAVEN_ID="xpp3:xpp3:1.1.4c"
@@ -17,5 +17,13 @@ SLOT="0"
 
 KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+	default
+	mkdir "resources" || die
+	cp -r "META-INF" "resources" || die
+}