gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /dev-java
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
193 files changed, 876 insertions, 1314 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 9fdc3403c1e0..c780c18288c6 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-antlr/Manifest b/dev-java/ant-antlr/Manifest
index 216d76a06752..a59875310716 100644
--- a/dev-java/ant-antlr/Manifest
+++ b/dev-java/ant-antlr/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-antlr-1.10.8.ebuild 509 BLAKE2B 382010024ebac15206e88425901709268edf4e5514e8bf55bc88264e17de8109a743d625d69518a5bd6f09bcbf676f9e4e68afb83bbc1ac65bf548584d3b639b SHA512 6cfcc8170d9c024344482d2ad32180ebd38fc3280fe85cabfba34b9dde5650eb4bd8725dba461ce0770aaa93a94a08b260a86d2d74cc853c226ddc4353f70b3a
-EBUILD ant-antlr-1.10.9.ebuild 512 BLAKE2B a399875d4d7910f576bc26476c1f72536985b50d32afbbbeb2123bf2b145f344bb2e9b25cb3e9f12cf52b374a2882d681acdf2581bdc5df70d5b4510fb118771 SHA512 04518bf3775bf1b4efcb99e2517c6c3678f4fa9f78d97738fd5b99cfad263fc93e5b0b28a809466770adf359bfa713c175def99c64d6efd194d703aa5aab9981
+EBUILD ant-antlr-1.10.9.ebuild 509 BLAKE2B 382010024ebac15206e88425901709268edf4e5514e8bf55bc88264e17de8109a743d625d69518a5bd6f09bcbf676f9e4e68afb83bbc1ac65bf548584d3b639b SHA512 6cfcc8170d9c024344482d2ad32180ebd38fc3280fe85cabfba34b9dde5650eb4bd8725dba461ce0770aaa93a94a08b260a86d2d74cc853c226ddc4353f70b3a
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-antlr/ant-antlr-1.10.8.ebuild b/dev-java/ant-antlr/ant-antlr-1.10.8.ebuild
deleted file mode 100644
index dd99b484b40b..000000000000
--- a/dev-java/ant-antlr/ant-antlr-1.10.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for Antlr"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=dev-java/antlr-2.7.7-r7:0"
-
-src_install() {
-	ant-tasks_src_install
-	java-pkg_register-dependency antlr
-}
diff --git a/dev-java/ant-antlr/ant-antlr-1.10.9.ebuild b/dev-java/ant-antlr/ant-antlr-1.10.9.ebuild
index 5c9652cd583e..dd99b484b40b 100644
--- a/dev-java/ant-antlr/ant-antlr-1.10.9.ebuild
+++ b/dev-java/ant-antlr/ant-antlr-1.10.9.ebuild
@@ -10,7 +10,7 @@ ANT_TASK_DEPNAME=""
 inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for Antlr"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-java/antlr-2.7.7-r7:0"
 
diff --git a/dev-java/ant-apache-bcel/Manifest b/dev-java/ant-apache-bcel/Manifest
index 847457c37475..25e872b2ee5e 100644
--- a/dev-java/ant-apache-bcel/Manifest
+++ b/dev-java/ant-apache-bcel/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-bcel-1.10.8.ebuild 394 BLAKE2B 8529d26584263f69378e6cf4ad01a1148295bd3fdde89b83035701e497c45409c7590932de65274802194beaecb395b0e2c8261c8ba7ab53f24ff8e5df162c66 SHA512 32f7714998d7c30af49cd3498a1c37861d57ac0d4cd186eef0633c7262cf2f9125d92f9f133a61dd7f5a5b676785a271f01480efd4804d8be4fe04abbe43a96f
-EBUILD ant-apache-bcel-1.10.9.ebuild 397 BLAKE2B c21d40a7e8f41c3f0c879e9ffee7ab34cbb5d87950e3d63a4ab2eececd9b075554a76f1420c1950c8b6bef64b95943e0ef0f5c6ef73d4f93c0ed09dcd9735837 SHA512 2927c8e369469b57a8ba1e3363c6a5417660df1e0ebdd3ec3f17ee9c86e1914b3d955d589d9e12a4d04777bf60fc8cc424b0b0bdaa6d8c42e67983505b61447b
+EBUILD ant-apache-bcel-1.10.9.ebuild 394 BLAKE2B 8529d26584263f69378e6cf4ad01a1148295bd3fdde89b83035701e497c45409c7590932de65274802194beaecb395b0e2c8261c8ba7ab53f24ff8e5df162c66 SHA512 32f7714998d7c30af49cd3498a1c37861d57ac0d4cd186eef0633c7262cf2f9125d92f9f133a61dd7f5a5b676785a271f01480efd4804d8be4fe04abbe43a96f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.8.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.8.ebuild
deleted file mode 100644
index 52db2870e204..000000000000
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.8.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="bcel"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/bcel-5.1-r3:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild
index 1dc654ff0b8d..52db2870e204 100644
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild
+++ b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="bcel"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/bcel-5.1-r3:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-bsf/Manifest b/dev-java/ant-apache-bsf/Manifest
index ac2b84993c3e..060645ca52c8 100644
--- a/dev-java/ant-apache-bsf/Manifest
+++ b/dev-java/ant-apache-bsf/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-bsf-1.10.8.ebuild 673 BLAKE2B 27bb3543a976716d6fe96aeaa567bf3dc2febbc9da0c837e7946417ff87da33287ffe0355dedc6c7e44e7fc67813dcd307968276f92e0b15fe1f804d134b9935 SHA512 ba0cb12f7a14c441abad47eac5ab8e5be767ed059d2cf8625d86038d005cba96594622ec4b413ec5b51cbf847fd92d9790e71fc4770e90d0c388811c4cc4d74e
-EBUILD ant-apache-bsf-1.10.9.ebuild 676 BLAKE2B a0be42ee7a1e9a09dce30358a823d120fe2b15e258dfd7b025945fb640b501fab9d584a28b49de3a1b2d5fd9f2d8942db43cb534f8c1631bf4f2209d2329e7eb SHA512 ca276880b47b3a37e27ad811d7eaac47027272d057f34a088e681c1a8d6b1b868f06245100899e4c309233ed27fed93420523d6503e6667a091cfac17f8d68f8
+EBUILD ant-apache-bsf-1.10.9.ebuild 673 BLAKE2B 27bb3543a976716d6fe96aeaa567bf3dc2febbc9da0c837e7946417ff87da33287ffe0355dedc6c7e44e7fc67813dcd307968276f92e0b15fe1f804d134b9935 SHA512 ba0cb12f7a14c441abad47eac5ab8e5be767ed059d2cf8625d86038d005cba96594622ec4b413ec5b51cbf847fd92d9790e71fc4770e90d0c388811c4cc4d74e
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.8.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.8.ebuild
deleted file mode 100644
index 3c8fb636298f..000000000000
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="bsf-2.3"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="python javascript tcl"
-
-DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Also, >=dev-java/bsf-2.4.0-r1 adds optional support for groovy,"
-		elog "ruby and beanshell. See its postinst elog messages for instructions."
-	fi
-}
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild
index 4fd4bd7de77a..3c8fb636298f 100644
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="bsf-2.3"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="python javascript tcl"
 
 DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
diff --git a/dev-java/ant-apache-log4j/Manifest b/dev-java/ant-apache-log4j/Manifest
index ae368ce55b6c..008adb4d80b9 100644
--- a/dev-java/ant-apache-log4j/Manifest
+++ b/dev-java/ant-apache-log4j/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-log4j-1.10.8.ebuild 399 BLAKE2B def5a4c83548a081aab549ed3d87ab251c0b7fb9ce628f75e5347e9ff3029e5a509f34566b6207c82221afae0c1d0ea6577ce5711391b341244baf5ab0e0f97f SHA512 ba59ffe39c8dda3bbb4f122df9941618b70d637f560c639cfad5772da3c1bbb0bc5ee58336bc4400a2e9e0b1fa855e1b8f2062c41e26079b42a50d6bed5bae23
-EBUILD ant-apache-log4j-1.10.9.ebuild 402 BLAKE2B 1e9827101b1a813af62f27a5cdb9d169121cb267db1f2907d3dad9596209d11298f44f6c4d7e80938fdcfb7735705dd88e5019034ca4bd94a2569807371a526f SHA512 fbaa52d7be2ddd5b1f7123f4d4e0de8281b49e47979cd7ca5da1a0e01dac4ecbdd3545db607c96279c568046d99f38e93cf613e726aae3af98bd5ebb4995d84c
+EBUILD ant-apache-log4j-1.10.9.ebuild 399 BLAKE2B def5a4c83548a081aab549ed3d87ab251c0b7fb9ce628f75e5347e9ff3029e5a509f34566b6207c82221afae0c1d0ea6577ce5711391b341244baf5ab0e0f97f SHA512 ba59ffe39c8dda3bbb4f122df9941618b70d637f560c639cfad5772da3c1bbb0bc5ee58336bc4400a2e9e0b1fa855e1b8f2062c41e26079b42a50d6bed5bae23
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.8.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.8.ebuild
deleted file mode 100644
index 29c114551b97..000000000000
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.8.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="log4j"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/log4j-1.2.13-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild
index ed32b97a9daa..29c114551b97 100644
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="log4j"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/log4j-1.2.13-r2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/Manifest b/dev-java/ant-apache-oro/Manifest
index f4ec3f61c4bd..0a1ddbfb18fc 100644
--- a/dev-java/ant-apache-oro/Manifest
+++ b/dev-java/ant-apache-oro/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-oro-1.10.8.ebuild 416 BLAKE2B 6714977612eb50aa76efcb89c474e6799a1bd9804a5ee5147ef7d852df27a8e83ebb0ea6fbe075d9ac05b5e3e33328104f82313d84bf9607579dfeab287db392 SHA512 a80fa7d13f87ecc615bdfd56c18bc5bcc3b5c988d2b1031aa3f548975809d06bd342b25c83d433ad6666534f0f3405d6ed855bf27597a86489cde682bcc36779
-EBUILD ant-apache-oro-1.10.9.ebuild 419 BLAKE2B b99b0827b5edd816809146e03d11fcc020f08e2a7dd46c58656cb2bd9c2ec0e871f33fc816bf7a33ca32a27ee931b3f2aaa9b1031bbc602cd1b8387dd9803cf6 SHA512 f347155aa6043d9b3bfcb2767fa8af71d787e713f4eb83f1b25d2b5991f248763649b9946c7bdfa47e0d0115c0b0dd7ed618ccd3c8e6a35a0d2b2e45687e8ced
+EBUILD ant-apache-oro-1.10.9.ebuild 416 BLAKE2B 6714977612eb50aa76efcb89c474e6799a1bd9804a5ee5147ef7d852df27a8e83ebb0ea6fbe075d9ac05b5e3e33328104f82313d84bf9607579dfeab287db392 SHA512 a80fa7d13f87ecc615bdfd56c18bc5bcc3b5c988d2b1031aa3f548975809d06bd342b25c83d433ad6666534f0f3405d6ed855bf27597a86489cde682bcc36779
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.10.8.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.10.8.ebuild
deleted file mode 100644
index ed7069776e54..000000000000
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.10.8.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="jakarta-oro-2.0"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild
index 98ea50b1d731..ed7069776e54 100644
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="jakarta-oro-2.0"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/Manifest b/dev-java/ant-apache-regexp/Manifest
index 04e2d0cf5572..e7a38c406c59 100644
--- a/dev-java/ant-apache-regexp/Manifest
+++ b/dev-java/ant-apache-regexp/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-regexp-1.10.8.ebuild 420 BLAKE2B 427d9a9ec5c7a631a8d56c371ce8e829209803dee9373a93192405f0dc6ed715b87cf206d4045c7959a6768c8823a72fa03cb8ae78ef8857464b247dbc4df1be SHA512 b0a1c1c15eeca17b6e3a2b74a786ed3569afea11593450d9aa4fac3b6ad13bcd04ca454a9e59d34ab2f526692ac2e356bfedea2f7571c31cf25112bd370603be
-EBUILD ant-apache-regexp-1.10.9.ebuild 423 BLAKE2B 39079d487dc37f3473710dee2d89a55f79a55e848492333d501519eda30780a0b1a57a58d99e5e32c52beed0e91271c84508c526e98c140cff23cdb53ea9d3a0 SHA512 64fec780c4a20be362d4d7df9baccaf9d2b50e00e44b62ddd1e8c535b4bacdfa6c34da9b579c31160769fd67b99acb8234fb0ec0296d0654a20a673cbdfc1f79
+EBUILD ant-apache-regexp-1.10.9.ebuild 420 BLAKE2B 427d9a9ec5c7a631a8d56c371ce8e829209803dee9373a93192405f0dc6ed715b87cf206d4045c7959a6768c8823a72fa03cb8ae78ef8857464b247dbc4df1be SHA512 b0a1c1c15eeca17b6e3a2b74a786ed3569afea11593450d9aa4fac3b6ad13bcd04ca454a9e59d34ab2f526692ac2e356bfedea2f7571c31cf25112bd370603be
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.8.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.8.ebuild
deleted file mode 100644
index d5abad147f74..000000000000
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.8.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="jakarta-regexp-1.4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild
index b098bce35acd..d5abad147f74 100644
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="jakarta-regexp-1.4"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-resolver/Manifest b/dev-java/ant-apache-resolver/Manifest
index 68f76e97c127..9777154784e9 100644
--- a/dev-java/ant-apache-resolver/Manifest
+++ b/dev-java/ant-apache-resolver/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-resolver-1.10.8.ebuild 423 BLAKE2B 6ae838c8a01fae3255d266009ee660766e82909669792349780b4c5eac502cd12382df69a92a5dd89a9132e6b8de5a111d78b8be30f40ff976380c1dd057353a SHA512 00649af844f43d17a8c144ca5efaec30a608db04e4c5234c9e7718ea01cbbe9b7e08572918bddfc05a58aae6ab88d309553f3f66dd4b8060f6074c5204ec97ca
-EBUILD ant-apache-resolver-1.10.9.ebuild 426 BLAKE2B ed70bb9eaac853391de8e30cb717ce6812dcdc146250b7c5ab7ac1ac02449b9371f36c8945ebc09ebd3118924f7f7e0c7522ed5832b2a4b01424634dee2478f2 SHA512 4e1b6d261e154f4955ec7fcc078ec3d4843ea2edaaf5a174aecbfb36480e3a0715019f86f8b251a958bfe078a074e41bb13c10ee79d7de0b872f4e51f85f43bc
+EBUILD ant-apache-resolver-1.10.9.ebuild 423 BLAKE2B 6ae838c8a01fae3255d266009ee660766e82909669792349780b4c5eac502cd12382df69a92a5dd89a9132e6b8de5a111d78b8be30f40ff976380c1dd057353a SHA512 00649af844f43d17a8c144ca5efaec30a608db04e4c5234c9e7718ea01cbbe9b7e08572918bddfc05a58aae6ab88d309553f3f66dd4b8060f6074c5204ec97ca
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.8.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.8.ebuild
deleted file mode 100644
index f52a019bb575..000000000000
--- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.8.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="xml-commons-resolver"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/xml-commons-resolver-1.2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild
index 12677e429825..f52a019bb575 100644
--- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="xml-commons-resolver"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/xml-commons-resolver-1.2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-xalan2/Manifest b/dev-java/ant-apache-xalan2/Manifest
index ddc141b6aacc..c2ea9421360e 100644
--- a/dev-java/ant-apache-xalan2/Manifest
+++ b/dev-java/ant-apache-xalan2/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-xalan2-1.10.8.ebuild 497 BLAKE2B fc10000278cd6ae799c38cbda8daa0fa9b7fa08ff55a0a1e65f971d0e918088ab90f336d7d4db508dca7d8f45dc75af368f30070a3d71365ab7956788f37550e SHA512 98ebc376bda78b4a3910e4f063ed6f034b07d6753db33f37ecf0edd141cc0a85c92f59423c41fd7d2edaf7829c845fdf16627feba88791f57528ae615623629a
-EBUILD ant-apache-xalan2-1.10.9.ebuild 500 BLAKE2B de040e88d0cb4a50445ebe7d4f031b1da430a45807873a32b566acbc1e590240927bde232980b0fae40e234ecd469d2e783fc8631075a6628ef7994060d2091a SHA512 bac424180c1138414e9bad7aaed1bf6c584bc00833524512d59abac7e29f71458059d6ff5ec6ca46c8662570d6df43f8d07f2d18cd832b219b4bc471306d869f
+EBUILD ant-apache-xalan2-1.10.9.ebuild 497 BLAKE2B fc10000278cd6ae799c38cbda8daa0fa9b7fa08ff55a0a1e65f971d0e918088ab90f336d7d4db508dca7d8f45dc75af368f30070a3d71365ab7956788f37550e SHA512 98ebc376bda78b4a3910e4f063ed6f034b07d6753db33f37ecf0edd141cc0a85c92f59423c41fd7d2edaf7829c845fdf16627feba88791f57528ae615623629a
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.8.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.8.ebuild
deleted file mode 100644
index 2977f62607c5..000000000000
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.8.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="xalan"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="dev-java/xalan:0
-	dev-java/xalan-serializer:0"
-
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	ant-tasks_src_unpack all
-	java-pkg_jar-from xalan-serializer
-}
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild
index 69c89e747407..2977f62607c5 100644
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="xalan"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-java/xalan:0
 	dev-java/xalan-serializer:0"
diff --git a/dev-java/ant-commons-logging/Manifest b/dev-java/ant-commons-logging/Manifest
index 18206bc4dd30..76eb7c9dafb9 100644
--- a/dev-java/ant-commons-logging/Manifest
+++ b/dev-java/ant-commons-logging/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-commons-logging-1.10.8.ebuild 383 BLAKE2B 179ad021736948afc1ea6f2ba4893e3926da07fd08c8c34bc5ed2b9a054b479ec6d1f184eca3b70e129317f76918baf13da8b9fb30a70c54a2b98e984f0739cc SHA512 6c8bf36ea6642fcbe2e4552705666c89bb770c86d8bebced7b8500cf52aa86b6c2dfee7d8dd2baef802af39008897324f3e5dbd13b0e455a5c775d822f803807
-EBUILD ant-commons-logging-1.10.9.ebuild 386 BLAKE2B a3928427815a7f3de9b9c7d5594d5102287b2292123c58ec5505f3fdccbaa96f110c382d9efe58acdf126a70316b854277ed183dfa580cba92214577d6ed3a7f SHA512 eda290517b87d8d89fabb37b06252e56686e916d7166953f8bff7aa8ecd5eee0a34b7136a7155564e397aeac7bfb0244f3a935c9af66dd3dd627273e84f0537e
+EBUILD ant-commons-logging-1.10.9.ebuild 383 BLAKE2B 179ad021736948afc1ea6f2ba4893e3926da07fd08c8c34bc5ed2b9a054b479ec6d1f184eca3b70e129317f76918baf13da8b9fb30a70c54a2b98e984f0739cc SHA512 6c8bf36ea6642fcbe2e4552705666c89bb770c86d8bebced7b8500cf52aa86b6c2dfee7d8dd2baef802af39008897324f3e5dbd13b0e455a5c775d822f803807
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.10.8.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.10.8.ebuild
deleted file mode 100644
index f36466b895fa..000000000000
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.10.8.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild
index 945cd57c2845..f36466b895fa 100644
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-net/Manifest b/dev-java/ant-commons-net/Manifest
index 5319569db8c0..2a7203e0434d 100644
--- a/dev-java/ant-commons-net/Manifest
+++ b/dev-java/ant-commons-net/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-commons-net-1.10.8.ebuild 379 BLAKE2B 39fe7f6abe1f4cb00b74832a12b84f9d48c8e3507b581a66f007baff50c31efa54f5890faebdd2c360108bc61640b41b4855f8b55c0e123fc10a90aba91e9a4e SHA512 548e734576955ff3c2c5ac97c1f2e1d750fb45f59da95d44e471b404f9783c3fa6fe25793846aa0e74d9a73d3b963c55aefd78ce9f79f5aa1896cc385221b4de
-EBUILD ant-commons-net-1.10.9.ebuild 382 BLAKE2B f1cb2e4636ce98d7df31c929340969bfef86fc757b111ba15c97428810ec59bd2e42fcc08cdfe21a35b4342501e2e9518957b48a6b86fcb15c9c7feed70ed46c SHA512 1a6d05d358c80ea9acb71494776982df5970182deae27299fe3a46a382f032e36fc0f1f7fce990e5fdae46ef3c03bbaa018797b601563365ec2014a1dd694757
+EBUILD ant-commons-net-1.10.9.ebuild 379 BLAKE2B 39fe7f6abe1f4cb00b74832a12b84f9d48c8e3507b581a66f007baff50c31efa54f5890faebdd2c360108bc61640b41b4855f8b55c0e123fc10a90aba91e9a4e SHA512 548e734576955ff3c2c5ac97c1f2e1d750fb45f59da95d44e471b404f9783c3fa6fe25793846aa0e74d9a73d3b963c55aefd78ce9f79f5aa1896cc385221b4de
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.10.8.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.10.8.ebuild
deleted file mode 100644
index fbaa9bfdc458..000000000000
--- a/dev-java/ant-commons-net/ant-commons-net-1.10.8.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/commons-net-1.4.1-r1:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild
index ef7f3b2a5bea..fbaa9bfdc458 100644
--- a/dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild
+++ b/dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/commons-net-1.4.1-r1:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 7e405cabdb5a..c47126c17425 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-core-1.10.8.ebuild 2770 BLAKE2B c411d5fda4c57fb1534484bb2fd771b9f88b6f4bf60764c0adacdb84d7b1c39abb54fef5fc55f1ed4db5b4209ee69a11b797de6c1c748237c68689c90a88e05e SHA512 08485230f04dc5f12978be44f27a0ae39774ee6be355fc2cdb75531e944a61eb9048baeecffb9f3d322d3b5b0ea82bde2d5246174c28e708e9422044bb0dd9ab
-EBUILD ant-core-1.10.9.ebuild 2774 BLAKE2B b2c827c519c579ea332d36b8869a1d82f20c68023c5360b89f3138efbf52d8188b0ec7485d06aec50883a3f746cd957284b56e2bcafc51c568d3e0127b4fe69f SHA512 07beb52f90c0a95eeec68050a30a86d68835c6a02cc2a800cd3747d48e7475668eab32d0eaf563153cca70d0bc1c984fcda9eb23bf60c5dba64b36fe25d3a2c6
+EBUILD ant-core-1.10.9.ebuild 2770 BLAKE2B c411d5fda4c57fb1534484bb2fd771b9f88b6f4bf60764c0adacdb84d7b1c39abb54fef5fc55f1ed4db5b4209ee69a11b797de6c1c748237c68689c90a88e05e SHA512 08485230f04dc5f12978be44f27a0ae39774ee6be355fc2cdb75531e944a61eb9048baeecffb9f3d322d3b5b0ea82bde2d5246174c28e708e9422044bb0dd9ab
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-core/ant-core-1.10.8.ebuild b/dev-java/ant-core/ant-core-1.10.8.ebuild
deleted file mode 100644
index 12b283e416e4..000000000000
--- a/dev-java/ant-core/ant-core-1.10.8.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Don't depend on itself.
-JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
-
-# Rewriting build.xml files for the testcases has no use at the moment.
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-ant-${PV}"
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
-HOMEPAGE="https://ant.apache.org/"
-SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-gentoo.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-CDEPEND=">=virtual/jdk-1.8:*"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${WORKDIR}/${PV}-build.patch"
-	"${WORKDIR}/${PV}-launch.patch"
-)
-
-src_prepare() {
-	default
-
-	eprefixify "${S}/src/script/ant"
-
-	# Fixes bug 556008.
-	java-ant_xml-rewrite -f build.xml \
-		-c -e javadoc \
-		-a failonerror \
-		-v "false"
-
-	# See bug #196080 for more details.
-	java-ant_bsfix_one build.xml
-	java-pkg-2_src_prepare
-
-	# Remove JDK9+ stuff
-	einfo "Removing JDK9+ classes (Jmod and Link)"
-	rm "${S}"/src/main/org/apache/tools/ant/taskdefs/modules/{Jmod,Link}.java
-}
-
-src_compile() {
-	export ANT_HOME=""
-	# Avoid error message that package ant-core was not found
-	export ANT_TASKS="none"
-
-	local bsyscp
-
-	# This ensures that when building ant with bootstrapped ant,
-	# only the source is used for resolving references, and not
-	# the classes in bootstrapped ant but jikes in kaffe has issues with this...
-	if ! java-pkg_current-vm-matches kaffe; then
-		bsyscp="-Dbuild.sysclasspath=ignore"
-	fi
-
-	CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal \
-		$(use_doc javadocs) || die "build failed"
-}
-
-src_install() {
-	dodir /usr/share/ant/lib
-
-	for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
-		java-pkg_dojar build/lib/${jar}
-		dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar}
-	done
-
-	dobin src/script/ant
-
-	dodir /usr/share/${PN}/bin
-	for each in antRun antRun.pl runant.pl runant.py ; do
-		dobin "${S}/src/script/${each}"
-		dosym ../../../bin/${each} /usr/share/${PN}/bin/${each}
-	done
-	dosym ../${PN}/bin /usr/share/ant/bin
-
-	insinto /usr/share/${PN}
-	doins -r dist/etc
-	dosym ../${PN}/etc /usr/share/ant/etc
-
-	echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
-	doenvd "${T}/20ant"
-
-	dodoc NOTICE README WHATSNEW KEYS
-
-	if use doc; then
-		dodoc -r manual/*
-		java-pkg_dojavadoc --symlink manual/api build/javadocs
-	fi
-
-	use source && java-pkg_dosrc src/main/*
-}
diff --git a/dev-java/ant-core/ant-core-1.10.9.ebuild b/dev-java/ant-core/ant-core-1.10.9.ebuild
index b7a55bbe6631..12b283e416e4 100644
--- a/dev-java/ant-core/ant-core-1.10.9.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND=">=virtual/jdk-1.8:*"
 DEPEND="${CDEPEND}"
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 173a2552eb74..47dfc2729ce9 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,13 +1,16 @@
 AUX ecj-4.10 342 BLAKE2B c69e9a66c9239e7ff4b7b35a4dcddec7cdec02ccf782862a0428e7e4d720dc22a931b58d40db5027e186a6129d0598702d9a95b1fc85ac38957ab6769377054b SHA512 c5ed672288d957ff52d6b44e2758dd589aba050e5915ebc1be92c112ef91c7506051893ac03f08115e9a75e16f91a68d26837e8e8e1e84c6bdb5fd8f4b953474
-AUX ecj-4.13 348 BLAKE2B 6faabe227677bccec08ae3c6a04dc08e30fbf8b2469908b73d63f2f7a2c03f04fb1e0bd9bec74312fec26cbeafab83b37d714a4cbe4069def5d9ab00276ac8a1 SHA512 9866236b6ae4923b3bd4d6147d1babb039f46dd2488a01d0495b5ee19c5900d64c809d1dcfdc958017afb4002fd8908984543deea237e9f52e7f79b13ca5f2a3
+AUX ecj-4.13 348 BLAKE2B 8c591be42a3f2fbe414ca7f8ea3546d99bf5bf88c65a802992ddf7eed4da4642f245215b44b64e1781de33550f48459a5288feb58fd079214a59f5d3a4537c51 SHA512 2a318687de82cdd314e5a7036a59ee6638d4983c8cd1458574fba01eedd589fa265b5ebefd1bdb4a9d0e0488d39fcc71e164598d66d9423431b4293b068de8fa
+AUX ecj-4.15 354 BLAKE2B e8ddbe928140e99fa36f0e4937cf1e9bf06bc3660ffdfba91099b35e4effaae3df1cb582a3cc8e9b26415d129d3c7e6b43f69e80f714ec1770ff593aebe4d5a8 SHA512 a8c159538a280ddc3616dce8fe6d1677ac45d7a72b27c23c85224a1d7e3acbb73912f2013be99b075f7b91e7ab52b4d871280246f1af56cf3718e3ce24b8ccc0
 AUX ecj-4.4 314 BLAKE2B 9855d136e85d003ef85e2b0e854d0ea6d29ee37e4221ca612d1ed6c51f89e6f2268f9082dd946468119129240166394122f54618e1a6a799dded0eeb9f0046cc SHA512 a0023e61ed3b1174e7ab7ebc9eb2bc42e9df6a23e5010ede6c2456eca60c4f4a9e11633fcc6438824fe1db4c881499b5f384715c19381411460e78e78ddca678
 AUX ecj-4.5 322 BLAKE2B 2941d70de68459d2bea21ae10680dbbee7888e156753e2bb7bae89b4c2aa41e453106b6ab0ae3660790cf70799550e09fd612a8736b0ac07a3859cdc25446e86 SHA512 d46976eb709a65e1d01af6b48d095325daf10a1ee4ff5da22de12593a253ba21e9550538ff13d1b7844fdb2604462d28133011301ba6a69cab83b2de7c7324f2
 DIST ecjsrc-4.10.jar 2036945 BLAKE2B cf9e50e53dac970a0b6b1231024a4efdc9adc92e02585aa4767c6511b367b32eefaf6fb3461c3c5c8160cf7205c0f708af0c433f4636b5a49caf637ba60fa092 SHA512 e85cacf6d2e21d464ff0226eac12bab8388df7a1413cb16d2982e255eb7369341792562f5080354279be0643c08fd80564a8eb2d8f59b72c8443c02577e4e1ee
 DIST ecjsrc-4.13.jar 2074963 BLAKE2B d74caf3b81543ac12497148a477dcd99fb6d14bd1d601b9e2baa0fb82d12f1211533f5ee909465b190c780ac18f1fbc1f8e12c22cddfce10501923effd7a4cc1 SHA512 f7e49b29e8aa80d627230059c9aba3f1e1fe3824bfd43eac962331d545471df5af0ac49b489aa3795e79e161101a3c6406b29f71a06143914f241916ae6953a9
+DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
 EBUILD ant-eclipse-ecj-4.10-r1.ebuild 1247 BLAKE2B fec5a58b0569cd24b4f992cce0aa3b3957365ac8e33e9ecd44d1198ee4c368272d8b7c825181519c573a1878d131608acc2bd9b06cf07e4f6007a906d3fe5077 SHA512 04f59d6699ec060918496fdfecfd3214f45ef41e86f81bd80b7d5e29dde9c65bd46cc8346b3751bbb5bd00d2456583a967b31428feeb24f525d10b4ccec9a297
 EBUILD ant-eclipse-ecj-4.13.ebuild 1252 BLAKE2B 697a4bfae3f28eda5f91137c1f31198c64f530374218f1b69f2ec3dadc04fd085583f950ef852c410abd0688355c31c5cf715a359ceaf8b2f2422d03c00535dc SHA512 3f6897bc51f8c1b641dee6c7735a38b4d00903d8920c2112f863b185f62fcb67a79a1feedcd09bd103cf9f3d58bfd818f10d3043f862f775df9643b9d01757e8
+EBUILD ant-eclipse-ecj-4.15.ebuild 1252 BLAKE2B de96e1f93f2992a3c9052413e0f87d708ccaeddf1a92f5fa1e9bc8113fe4af43f182e258e92e17fff1b8950dd16f7353896a25c3a46118d686ff26c7fe184971 SHA512 723278db7ebc5c3b812923cfd71e1db9526ad3f05dcfa840d9dba27696b271771f63496e9d67206ee644267853ffa7f9f77980053bbd0a46b00e99de55d3b491
 EBUILD ant-eclipse-ecj-4.4.2.ebuild 1248 BLAKE2B dd7249882bbb0c2511e424165dcc12ccdee58baf9985da2182d31d451fa1fb94f736407e303bc1a61d9d43355a7142fd7af1078ff7277122540e1bc0a47786f5 SHA512 310dd8cb237d922b55186fcfad23136e0861464dc6aaa252ea8615a9dcf61a3f6042c5edc463af1147fb1f9d4c76b61fca15a035b8b9718252cc8d9ef85c4277
 EBUILD ant-eclipse-ecj-4.5.1.ebuild 1249 BLAKE2B 4f0fd6db9c642716d87396a421521a5087d014c41235436596a1e3d81c32ffc71d6734d1dd858b1d3c4ec088b8adf1cf2920402575910f51f1bda35c6a6f964d SHA512 45c87738ac2c850d2fbbcf1fb2cdbb03b271900b63324f6d9418337431da7fb260371a39814354e6abae1115fa9e84ffd43d6036be7bca724ff0e32780bef69f
 MISC metadata.xml 546 BLAKE2B 1d3e6201cf0f0e87bf1ede2db78c4c706d9a59df9321a0820a9d180c7da9736c4af6a3442c1abf175e45969447ef9c8e0a0f8d73ce50985405c445f14c694903 SHA512 999312c6cfed7b52584e3e80ac1a9f5b372a05b1f6523f859b367080e7989c988e2773fd2b0f5ec5fb11da42386e37dffedf761324a41b43c309b3ab5a57fd36
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15.ebuild
new file mode 100644
index 000000000000..27aab2586f93
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 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 prefix
+
+DMF="R-${PV}-202003050155"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.15"
+IUSE=""
+
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+	dev-java/ant-core:0"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-11"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-11"
+
+JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
+
+src_prepare() {
+	default
+
+	# Remove everything but the Ant component.
+	find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
+
+	rm build.xml || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	insinto /usr/share/java-config-2/compiler
+	doins "${FILESDIR}/ecj-${SLOT}"
+	eprefixify "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.13 b/dev-java/ant-eclipse-ecj/files/ecj-4.13
index 08d3a4aaa9cb..d9c479e37367 100644
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.13
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.13
@@ -3,5 +3,5 @@ PACKAGE="=dev-java/ant-eclipse-ecj-4.13*"
 SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12"
 SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12"
 ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.10,ant-eclipse-ecj-4.13"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.13,ant-eclipse-ecj-4.13"
 GENERATION="2"
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.15 b/dev-java/ant-eclipse-ecj/files/ecj-4.15
new file mode 100644
index 000000000000..f943dedcc19b
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.15
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.15"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.15*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.15,ant-eclipse-ecj-4.15"
+GENERATION="2"
diff --git a/dev-java/ant-jai/Manifest b/dev-java/ant-jai/Manifest
index cbf0a58d5131..2ba1082a6825 100644
--- a/dev-java/ant-jai/Manifest
+++ b/dev-java/ant-jai/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-jai-1.10.8.ebuild 365 BLAKE2B 87332418de20a4b6208bd0d09a69b335cc67c3af1528ab059f580e27840c9bc12b4aed44cbf25b4037d7d14f3b3c1b22cd1881c775bd17c31b9daca2d373a590 SHA512 b405ebede92afd868c05b014d5e4494f598cca15418cae0893f677c4b2a110cc7f1a3819264952e241bfabfc9de0a6d5b0c2d454bb9539b98d11c000d378deb5
-EBUILD ant-jai-1.10.9.ebuild 368 BLAKE2B 3dd0bbfcfc9c9d03fb0b25019c9d52b45fad39c200814fb01255ba25e58dd0639f6ad0b40cd1dd7c7068c80098f63a79d99aa45b977c1cf357458e511223b1df SHA512 cb5304d7774e1601503628b0017bfbf85f354bfe11946f635d913550d2a79f0662dee5a2b69a87f01bfeb303c22c682d905db63bafa7f540635fb81f29203371
+EBUILD ant-jai-1.10.9.ebuild 365 BLAKE2B 87332418de20a4b6208bd0d09a69b335cc67c3af1528ab059f580e27840c9bc12b4aed44cbf25b4037d7d14f3b3c1b22cd1881c775bd17c31b9daca2d373a590 SHA512 b405ebede92afd868c05b014d5e4494f598cca15418cae0893f677c4b2a110cc7f1a3819264952e241bfabfc9de0a6d5b0c2d454bb9539b98d11c000d378deb5
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jai/ant-jai-1.10.8.ebuild b/dev-java/ant-jai/ant-jai-1.10.8.ebuild
deleted file mode 100644
index 3a2873b650bb..000000000000
--- a/dev-java/ant-jai/ant-jai-1.10.8.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="sun-jai-bin"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86"
-
-# Unmigrated, has textrels and there's also some source one now too.
-DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jai/ant-jai-1.10.9.ebuild b/dev-java/ant-jai/ant-jai-1.10.9.ebuild
index 944faa9eca69..3a2873b650bb 100644
--- a/dev-java/ant-jai/ant-jai-1.10.9.ebuild
+++ b/dev-java/ant-jai/ant-jai-1.10.9.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="sun-jai-bin"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # Unmigrated, has textrels and there's also some source one now too.
 DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1"
diff --git a/dev-java/ant-javamail/Manifest b/dev-java/ant-javamail/Manifest
index 63677fd2089e..5933537d0401 100644
--- a/dev-java/ant-javamail/Manifest
+++ b/dev-java/ant-javamail/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-javamail-1.10.8.ebuild 529 BLAKE2B a336d71337cf901ee93a2f5945bd35bf213dd8d5a138e53ae0a032f76f63e4913f9dd0fc2ab8adea5f92dec827466c4a8ac43f00bd6f672b235a3350572e4f9f SHA512 8f3668b28c7e1b62fcfa32df9f324891d00f84f772e077d562092b4bfb87efeb1f36f8591a5eac0dd9f11c6966ea274fffa675c7945373974a638e18b665a2e8
-EBUILD ant-javamail-1.10.9.ebuild 532 BLAKE2B 7b8d1191e0e36000b388887ce980f20c60163a3216e45eb7fb68e3cdf967108ffa564029c72073e18f03d55bb168fecfaffc50e1382314cb4d69707e3793037c SHA512 0289643be3959fac7d2ab5a112130ef1bd2f39f2ab126516a904a0303f1bbca2d85bd0cbeb0e6220d626d70b9e86d903ccb8f40ca4ec5f4ffa7bf2247872b9e9
+EBUILD ant-javamail-1.10.9.ebuild 529 BLAKE2B a336d71337cf901ee93a2f5945bd35bf213dd8d5a138e53ae0a032f76f63e4913f9dd0fc2ab8adea5f92dec827466c4a8ac43f00bd6f672b235a3350572e4f9f SHA512 8f3668b28c7e1b62fcfa32df9f324891d00f84f772e077d562092b4bfb87efeb1f36f8591a5eac0dd9f11c6966ea274fffa675c7945373974a638e18b665a2e8
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-javamail/ant-javamail-1.10.8.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.8.ebuild
deleted file mode 100644
index 77606f4804c2..000000000000
--- a/dev-java/ant-javamail/ant-javamail-1.10.8.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME=( "gnu-jaf-1" "oracle-javamail" )
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# needs some classes from javax.activation.* which are not in jdk 11
-DEPEND="virtual/jdk:1.8
-	dev-java/gnu-jaf:1
-	dev-java/oracle-javamail:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-javamail/ant-javamail-1.10.9.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.9.ebuild
index 43f91c21316d..77606f4804c2 100644
--- a/dev-java/ant-javamail/ant-javamail-1.10.9.ebuild
+++ b/dev-java/ant-javamail/ant-javamail-1.10.9.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME=( "gnu-jaf-1" "oracle-javamail" )
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # needs some classes from javax.activation.* which are not in jdk 11
 DEPEND="virtual/jdk:1.8
diff --git a/dev-java/ant-jdepend/Manifest b/dev-java/ant-jdepend/Manifest
index 9d12539c121a..5b2f66041a4a 100644
--- a/dev-java/ant-jdepend/Manifest
+++ b/dev-java/ant-jdepend/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-jdepend-1.10.8.ebuild 373 BLAKE2B f53cd0fd7695e89dc9a91eff00a7b7c180cbd7ea4317924d01f5863d5fae7024be89873f3962febc1c67c1a22d9273d1aae8609dca671294b5ed70e6720a65c4 SHA512 8b93a135dc8410486c20168ebf7f8d9cb190b40ee942c71622e449de97608fc589fda568591c76924e87ffbe82354d094a50b75fb6d8fb14b5ba055e78d055ac
-EBUILD ant-jdepend-1.10.9.ebuild 376 BLAKE2B 84547dd752a84558dda6464de76e9f748d33fceaa107624743ef2e987e7ace6db227face68e407ef84b78a61ccb31bd63afd49aa5f1c27f72327bdd0327df5a0 SHA512 d35c71e211238b89720ecc57b2d1ad54f1dd1426c9953108717b4331b51adc81b5ae2c703f4758d847d277b875d210db769d2c6aef4b936a58d71eeb2f9dcf8a
+EBUILD ant-jdepend-1.10.9.ebuild 373 BLAKE2B f53cd0fd7695e89dc9a91eff00a7b7c180cbd7ea4317924d01f5863d5fae7024be89873f3962febc1c67c1a22d9273d1aae8609dca671294b5ed70e6720a65c4 SHA512 8b93a135dc8410486c20168ebf7f8d9cb190b40ee942c71622e449de97608fc589fda568591c76924e87ffbe82354d094a50b75fb6d8fb14b5ba055e78d055ac
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.10.8.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.10.8.ebuild
deleted file mode 100644
index 67fe2f25dbb0..000000000000
--- a/dev-java/ant-jdepend/ant-jdepend-1.10.8.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/jdepend-2.9-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild
index 7d83e53d76be..67fe2f25dbb0 100644
--- a/dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild
+++ b/dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/jdepend-2.9-r2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jmf/Manifest b/dev-java/ant-jmf/Manifest
index 3289f9f3bf1b..9dd532f28ae9 100644
--- a/dev-java/ant-jmf/Manifest
+++ b/dev-java/ant-jmf/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-jmf-1.10.8.ebuild 477 BLAKE2B 0e09afeaea8d9b263324d777dbc17d01931552fa91c83e8079c1d5d5b0ed497b3f620b4bbe2f666913a127afb66d2aa1f78fbc86b69c0ce4b5d5c8cf326d6431 SHA512 b0ca8fb0becd35fa65fcc72c46b8799a60c9b70f9773946923c0a2f74e990739aa8df5e94603a55a2092e5ced0045182cc483b89f83a5a21e5b1158fe76d996d
-EBUILD ant-jmf-1.10.9.ebuild 480 BLAKE2B c10e06848340d7a28b4f4b61bf417d3677fa193d110f5fd0969003db878aec18e48fffa291a3d120181d43a0d653e6eeeea51a63ada6ff1d9630ffc401ea58b4 SHA512 82b7fdbad0cfff4154ea7880f7767e2b505276ba2527553bd2b1c21f3bdefb33eca1727693d8f289d4202bf5ba5cbc0a81b97fc8b6519f5945dce4935f83e913
+EBUILD ant-jmf-1.10.9.ebuild 477 BLAKE2B 0e09afeaea8d9b263324d777dbc17d01931552fa91c83e8079c1d5d5b0ed497b3f620b4bbe2f666913a127afb66d2aa1f78fbc86b69c0ce4b5d5c8cf326d6431 SHA512 b0ca8fb0becd35fa65fcc72c46b8799a60c9b70f9773946923c0a2f74e990739aa8df5e94603a55a2092e5ced0045182cc483b89f83a5a21e5b1158fe76d996d
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jmf/ant-jmf-1.10.8.ebuild b/dev-java/ant-jmf/ant-jmf-1.10.8.ebuild
deleted file mode 100644
index eb69314716d0..000000000000
--- a/dev-java/ant-jmf/ant-jmf-1.10.8.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-# Seems we don't need to depend on jmf-bin, the classes ant imports are in J2SE
-# API since version 1.3.
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)"
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-java/ant-jmf/ant-jmf-1.10.9.ebuild b/dev-java/ant-jmf/ant-jmf-1.10.9.ebuild
index 8e604704a6f3..eb69314716d0 100644
--- a/dev-java/ant-jmf/ant-jmf-1.10.9.ebuild
+++ b/dev-java/ant-jmf/ant-jmf-1.10.9.ebuild
@@ -13,4 +13,4 @@ inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)"
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-java/ant-jsch/Manifest b/dev-java/ant-jsch/Manifest
index 580949eb6bc6..82760eddd873 100644
--- a/dev-java/ant-jsch/Manifest
+++ b/dev-java/ant-jsch/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-jsch-1.10.8.ebuild 370 BLAKE2B f0c689423ffcf5a6824ab216fe3063ebdec47c6e5c764b13896d956d28183170732d6db981d02cded4242e9ed9368fe43919c0f5f043a59ab842677388d3b29b SHA512 8bf481ddb00ea7acbdeaf767201ad73aa3fd4e8459684c2f3b85ff3e14061dcc876d1667a6163998197500f976815f8db9f52c06ab50e21a51c8da5c407749c8
-EBUILD ant-jsch-1.10.9.ebuild 373 BLAKE2B 4c496b07e882cddc662e490c73fe85c76eeb48a3daed349d9197df7583e0d6157b18a6a429680f55e2989806fffcdd32dac813b124a52c317c196a506a42dd89 SHA512 c8ec3b7838b7cd7f15a2e9f598343e50b98b7c5b6e9d5ebd74d1556fd5e0118392a9e27ae01685181865353f755f53449863191375bcbe7951680da23be3b2bf
+EBUILD ant-jsch-1.10.9.ebuild 370 BLAKE2B f0c689423ffcf5a6824ab216fe3063ebdec47c6e5c764b13896d956d28183170732d6db981d02cded4242e9ed9368fe43919c0f5f043a59ab842677388d3b29b SHA512 8bf481ddb00ea7acbdeaf767201ad73aa3fd4e8459684c2f3b85ff3e14061dcc876d1667a6163998197500f976815f8db9f52c06ab50e21a51c8da5c407749c8
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jsch/ant-jsch-1.10.8.ebuild b/dev-java/ant-jsch/ant-jsch-1.10.8.ebuild
deleted file mode 100644
index 1cef81e7b4fd..000000000000
--- a/dev-java/ant-jsch/ant-jsch-1.10.8.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/jsch-0.1.37:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jsch/ant-jsch-1.10.9.ebuild b/dev-java/ant-jsch/ant-jsch-1.10.9.ebuild
index d6a324a766ef..1cef81e7b4fd 100644
--- a/dev-java/ant-jsch/ant-jsch-1.10.9.ebuild
+++ b/dev-java/ant-jsch/ant-jsch-1.10.9.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/jsch-0.1.37:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-junit/Manifest b/dev-java/ant-junit/Manifest
index 0db94e4f93ea..4f83918f7292 100644
--- a/dev-java/ant-junit/Manifest
+++ b/dev-java/ant-junit/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-junit-1.10.8.ebuild 496 BLAKE2B aaf3d938343f4fa82ad5021630b602fc004f84afa73784efd8c65d5ba36f7fcd41e111499f14731a897d6a78261c62ae34087cd3b3dffacb84834037b83e4fbc SHA512 2d84e047ac431b74c31fdf337cbfb3c68a1da851bc54b518625619467faec3b1cb83a3b299df4d4562928d0a39ce4000486aad14968fb80cc92213528f57c854
-EBUILD ant-junit-1.10.9.ebuild 500 BLAKE2B de046ac17fee8881c6bf13a216457ec5670f58883cf7ae107319ee8cbe68e23474a613fe4562c971288d476a5d4fcbdbb3c36d11b54a5892e7ac5888f0556c29 SHA512 6ff978b6c34aa84dc9a39cd8da5d0866445e008e1c52348c131b2ad701fe56da3a81a4102f5c41633b5129f712cf8f637afc50a8b9338112ee357295a38a53f7
+EBUILD ant-junit-1.10.9.ebuild 496 BLAKE2B aaf3d938343f4fa82ad5021630b602fc004f84afa73784efd8c65d5ba36f7fcd41e111499f14731a897d6a78261c62ae34087cd3b3dffacb84834037b83e4fbc SHA512 2d84e047ac431b74c31fdf337cbfb3c68a1da851bc54b518625619467faec3b1cb83a3b299df4d4562928d0a39ce4000486aad14968fb80cc92213528f57c854
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junit/ant-junit-1.10.8.ebuild b/dev-java/ant-junit/ant-junit-1.10.8.ebuild
deleted file mode 100644
index e02101593cf1..000000000000
--- a/dev-java/ant-junit/ant-junit-1.10.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="
-	dev-java/junit:0
-	dev-java/junit:4
-"
-RDEPEND="${DEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="junit-4"
-
-src_compile() {
-	eant jar-junit
-}
diff --git a/dev-java/ant-junit/ant-junit-1.10.9.ebuild b/dev-java/ant-junit/ant-junit-1.10.9.ebuild
index 65978134b5b6..e02101593cf1 100644
--- a/dev-java/ant-junit/ant-junit-1.10.9.ebuild
+++ b/dev-java/ant-junit/ant-junit-1.10.9.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-java/junit:0
diff --git a/dev-java/ant-junit4/Manifest b/dev-java/ant-junit4/Manifest
index 05b8d19adca7..cc8892207ca3 100644
--- a/dev-java/ant-junit4/Manifest
+++ b/dev-java/ant-junit4/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-junit4-1.10.8.ebuild 939 BLAKE2B 8e38457d3e6778051c2f4186c6bef6cf94e6e2af7b6435056d2f5bf09568d9b6f4380d40cef4d26a8cd9684fdbd4c5f72dfbe523aa321d7bee300299c0deb116 SHA512 f7134fe9d7f4b9f935a734d5b83e01c315239cfd7cb0d3645f3cd5df5f2c38536c019aba78db45daa5b95f46accaaa6e4a3c8af100a6a33dbb7e86a74f07afa6
-EBUILD ant-junit4-1.10.9.ebuild 943 BLAKE2B bf07b687bf581e944ba35493ce9d3fa3d84185044bd3c6f7b8aa9a671f18336edef43e32d316c6203f722aae8d05d7333e9031190cbfaeafb9e629d44b94e1e8 SHA512 312250d6f7ff943d2baecfe9e804d9e0b980861e3fe248f296b160aef05556860dca3423d2253bfafd19e2058d2f049d8a21b1cb16b9181269446fcc1ca4aeb0
+EBUILD ant-junit4-1.10.9.ebuild 939 BLAKE2B 8e38457d3e6778051c2f4186c6bef6cf94e6e2af7b6435056d2f5bf09568d9b6f4380d40cef4d26a8cd9684fdbd4c5f72dfbe523aa321d7bee300299c0deb116 SHA512 f7134fe9d7f4b9f935a734d5b83e01c315239cfd7cb0d3645f3cd5df5f2c38536c019aba78db45daa5b95f46accaaa6e4a3c8af100a6a33dbb7e86a74f07afa6
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junit4/ant-junit4-1.10.8.ebuild b/dev-java/ant-junit4/ant-junit4-1.10.8.ebuild
deleted file mode 100644
index 71513c67cad9..000000000000
--- a/dev-java/ant-junit4/ant-junit4-1.10.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="junit-4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-DEPEND="dev-java/junit:4
-	~dev-java/ant-junit-${PV}"
-
-RDEPEND="${DEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="junit-4,ant-junit"
-
-src_prepare() {
-	default
-
-	java-pkg_jar-from --build-only --into "${S}/lib" ant-junit
-}
-
-src_install() {
-	# No registration as ant-task, would be loaded together with ant-junit.
-	java-pkg_dojar build/lib/ant-junit4.jar
-
-	# As we dont't want to depend on and-junit in package.env, because it depends
-	# on junit:0. Instead, we "steal" its jar and record it to our package.env as
-	# if it belongs to this package's classpath.
-	java-pkg_getjar --build-only ant-junit ant-junit.jar
-	java-pkg_regjar $(java-pkg_getjar --build-only ant-junit ant-junit.jar)
-}
diff --git a/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild b/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild
index 5dcdbe73523e..71513c67cad9 100644
--- a/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild
+++ b/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="junit-4"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 DEPEND="dev-java/junit:4
 	~dev-java/ant-junit-${PV}"
diff --git a/dev-java/ant-junitlauncher/Manifest b/dev-java/ant-junitlauncher/Manifest
index ac5d3d10c073..a794def48b67 100644
--- a/dev-java/ant-junitlauncher/Manifest
+++ b/dev-java/ant-junitlauncher/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-junitlauncher-1.10.8.ebuild 346 BLAKE2B 391e4443a390204f71ffef2e0513a8db4ff4aee5861e7625f016f7aaceda1fc97769448a990801d67520fe7f0833fe3a82cbfeaabe1a124cd0375e1b95d46368 SHA512 d80ea1121230a5f5a73a3de8b1a9f84cb5c90e5cae09a715d4fbe15db1fceefa65d33b5c93fdf5cc3314de062463ff54f1e7785677dca006a3413eb897ea8f9e
-EBUILD ant-junitlauncher-1.10.9.ebuild 350 BLAKE2B 40c1c80da3e52be3f953873cc2ede0ddcdfbfd767f3c60706409a2218aa8e16a703125fc7d4effb510fb4de6279afeda827d23c16a3e2caa108d428144ed78d9 SHA512 da818ceddf9c8e13ae9eb7385a085c03c0f73c0222c07f006908f09ea0589d4b7e66930609722a08dbc03c41a1fb3a46e36ada2bbae5d996866b02c6e6517e02
+EBUILD ant-junitlauncher-1.10.9.ebuild 346 BLAKE2B 391e4443a390204f71ffef2e0513a8db4ff4aee5861e7625f016f7aaceda1fc97769448a990801d67520fe7f0833fe3a82cbfeaabe1a124cd0375e1b95d46368 SHA512 d80ea1121230a5f5a73a3de8b1a9f84cb5c90e5cae09a715d4fbe15db1fceefa65d33b5c93fdf5cc3314de062463ff54f1e7785677dca006a3413eb897ea8f9e
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.8.ebuild b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.8.ebuild
deleted file mode 100644
index c60d0d72e416..000000000000
--- a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.8.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild
index 09716cb8ae78..c60d0d72e416 100644
--- a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild
+++ b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild
@@ -9,4 +9,4 @@ ANT_TASK_DEPNAME=""
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-swing/Manifest b/dev-java/ant-swing/Manifest
index 11dff8998f1e..4f59d17a02ed 100644
--- a/dev-java/ant-swing/Manifest
+++ b/dev-java/ant-swing/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-swing-1.10.8.ebuild 413 BLAKE2B fe807fdc573239981ef98c58766b37de0fb209cf04c29c3a8e1bf418460648d1fd484deb295190e859abfba5c76c66c44d7fab970cd38e76a2ecfa1e34cc9a53 SHA512 ec01716885802298afa399a52cbef744a789c5f214db8caea6faf7510cdaa1d76ef98fe524f4025d5933295aed8455553024dc28515928ea0c2512e435ce48e0
-EBUILD ant-swing-1.10.9.ebuild 416 BLAKE2B 844ad9d231127079ee23b9e72b75e0e73035a7efd35e4ffc5073fe8c2a5d34a863ea4c6d59e95c34c8cda01538625cdc97616caac537bd1f66073374b8a75dbb SHA512 23569170732f17ea68637b899093e1d9501e7c5ff48235cb790c711d98bc391918f6a4d8af4411a32da63f2075147d998e4f5a83a00d6ec1b74b59879ed1f6c4
+EBUILD ant-swing-1.10.9.ebuild 413 BLAKE2B fe807fdc573239981ef98c58766b37de0fb209cf04c29c3a8e1bf418460648d1fd484deb295190e859abfba5c76c66c44d7fab970cd38e76a2ecfa1e34cc9a53 SHA512 ec01716885802298afa399a52cbef744a789c5f214db8caea6faf7510cdaa1d76ef98fe524f4025d5933295aed8455553024dc28515928ea0c2512e435ce48e0
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-swing/ant-swing-1.10.8.ebuild b/dev-java/ant-swing/ant-swing-1.10.8.ebuild
deleted file mode 100644
index 379248be9a9c..000000000000
--- a/dev-java/ant-swing/ant-swing-1.10.8.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-# No extra dependencies are needed.
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for Swing"
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-swing/ant-swing-1.10.9.ebuild b/dev-java/ant-swing/ant-swing-1.10.9.ebuild
index fb6c2dfced0f..379248be9a9c 100644
--- a/dev-java/ant-swing/ant-swing-1.10.9.ebuild
+++ b/dev-java/ant-swing/ant-swing-1.10.9.ebuild
@@ -12,4 +12,4 @@ inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for Swing"
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-testutil/Manifest b/dev-java/ant-testutil/Manifest
index f4faf88e4fc4..c92deeef4d7e 100644
--- a/dev-java/ant-testutil/Manifest
+++ b/dev-java/ant-testutil/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-testutil-1.10.8.ebuild 968 BLAKE2B 9597a535a9b1eecde71073494284aa17f12ce7f428f6cdc64bdb31c34c53e2cd149fa60705528885507f45ee1c37141a0039970ba0205002a82bfba90a90d14c SHA512 31b9149420d6042af0d3c4aec00a6891cdc9b7f225cebb9caa4c6a6870913325035e4d89161dd9fee391ce81e4472de8a0a6a7bc277da93dfec2c1899cc58e1e
-EBUILD ant-testutil-1.10.9.ebuild 971 BLAKE2B b1ad9f0015e1a8e3b9cc3576f8a32a8581dbff6b76eebda39eda65703fd2a71b245ad6225ddd24b286e8023aabbf1579b1645698031dbc9d86925ce661387833 SHA512 2f44e02643d503cd99e1acff1c4008e9fc7d0908c2af0028fc998fd4b6f7f4d513776d0ce7c0dfe764c1d9e5bb5775f5d5f7d497129fec6a21278ef5169c70fd
+EBUILD ant-testutil-1.10.9.ebuild 968 BLAKE2B 9597a535a9b1eecde71073494284aa17f12ce7f428f6cdc64bdb31c34c53e2cd149fa60705528885507f45ee1c37141a0039970ba0205002a82bfba90a90d14c SHA512 31b9149420d6042af0d3c4aec00a6891cdc9b7f225cebb9caa4c6a6870913325035e4d89161dd9fee391ce81e4472de8a0a6a7bc277da93dfec2c1899cc58e1e
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-testutil/ant-testutil-1.10.8.ebuild b/dev-java/ant-testutil/ant-testutil-1.10.8.ebuild
deleted file mode 100644
index dce4d1840353..000000000000
--- a/dev-java/ant-testutil/ant-testutil-1.10.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-CDEPEND="dev-java/ant-core:0"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8
-	>=dev-java/junit-4.11:4
-	~dev-java/ant-swing-${PV}
-	~dev-java/ant-junit4-${PV}
-	~dev-java/ant-junitlauncher-${PV}"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8"
-
-# The build system builds much more than it actually packages, so there are many
-# build-only deps, but since those are quite common, it wasn't worth to patch it.
-
-src_unpack() {
-	ant-tasks_src_unpack base
-	java-pkg_jar-from --build-only junit-4,ant-junit4,ant-junitlauncher,ant-swing
-	java-pkg_jar-from --build-only ant-core ant-launcher.jar
-}
-
-src_compile() {
-	eant test-jar
-}
diff --git a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild b/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild
index e8763ba32556..dce4d1840353 100644
--- a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild
+++ b/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_JREVER=1.8
 inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND="dev-java/ant-core:0"
 
diff --git a/dev-java/ant-xz/Manifest b/dev-java/ant-xz/Manifest
index 2dc96ba436d1..25ad8a0402f1 100644
--- a/dev-java/ant-xz/Manifest
+++ b/dev-java/ant-xz/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-xz-1.10.8.ebuild 462 BLAKE2B 98a7e96e154739b13716b8583b6279115eac954e86aa9bab9535732713a43c6c17e3ee4cb7e39e3bd6421e7687dd3c080526fa85c03a7e54e6fb25bc9351efc8 SHA512 4d21618ef4ce885eed4b063543fccda4d94d4366b36848080cd46fa277d875d3875101c7b80825a1cdd1721108bffa61c63585ae09813459b714551436d3834d
-EBUILD ant-xz-1.10.9.ebuild 466 BLAKE2B f8a8fa8b687b230dbde04918b9ac86bec8ebc3c9122e726d469122d332597d0c2c5f810761d2e86a85af2a478f8b32ce4b302365843a3e48fc010fe0a8310d8f SHA512 9a25b6f9b00fdb3410e663cf717e951421c5e420d5656d02e057cd0f76ecdb2586182dd3dc7bb445151f4c33f4355e27a048f119cd12c39063e14e546ea15073
+EBUILD ant-xz-1.10.9.ebuild 462 BLAKE2B 98a7e96e154739b13716b8583b6279115eac954e86aa9bab9535732713a43c6c17e3ee4cb7e39e3bd6421e7687dd3c080526fa85c03a7e54e6fb25bc9351efc8 SHA512 4d21618ef4ce885eed4b063543fccda4d94d4366b36848080cd46fa277d875d3875101c7b80825a1cdd1721108bffa61c63585ae09813459b714551436d3834d
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-xz/ant-xz-1.10.8.ebuild b/dev-java/ant-xz/ant-xz-1.10.8.ebuild
deleted file mode 100644
index 91ceb9835ab1..000000000000
--- a/dev-java/ant-xz/ant-xz-1.10.8.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="xz-java"
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for XZ compression"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="dev-java/xz-java"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-xz/ant-xz-1.10.9.ebuild b/dev-java/ant-xz/ant-xz-1.10.9.ebuild
index 2a299ab6dc1b..91ceb9835ab1 100644
--- a/dev-java/ant-xz/ant-xz-1.10.9.ebuild
+++ b/dev-java/ant-xz/ant-xz-1.10.9.ebuild
@@ -11,7 +11,7 @@ inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for XZ compression"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-java/xz-java"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 824d1b12821a..7e05ff7f3512 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,3 +1,2 @@
-EBUILD ant-1.10.8.ebuild 1642 BLAKE2B d31e2db667b00077054a439ccda45dc2926275438b3f8af2a28509001e21352dcfcdc56f66acb8a59e2938b4f9688a00fa7fec25d98bc10924a43e7be1dd990f SHA512 82188aefc10f3f00c4ef1720bcb94015b8594dc38fc4bc5885c6092c2bcf0379486664510415f2687d2afb972253d808b5bf61d2817daf8da2f00576314262dd
-EBUILD ant-1.10.9.ebuild 1645 BLAKE2B b7996e32d4c692f46019ebcee31f6d7019c132125e14088e2f6af8ec1c4ed56038022b89a477f671ce2ac97f7ad7f55cdb0bb8919396be7a90b712b9acebab04 SHA512 313ef117a8634993b07dd439eaca03c9503ad960921d03b4a06a9b8178e3fdd37e89c6c7da8ed38bf9ed381c73d524a5866880399db137f76bc606601b134f8d
+EBUILD ant-1.10.9.ebuild 1642 BLAKE2B d31e2db667b00077054a439ccda45dc2926275438b3f8af2a28509001e21352dcfcdc56f66acb8a59e2938b4f9688a00fa7fec25d98bc10924a43e7be1dd990f SHA512 82188aefc10f3f00c4ef1720bcb94015b8594dc38fc4bc5885c6092c2bcf0379486664510415f2687d2afb972253d808b5bf61d2817daf8da2f00576314262dd
 MISC metadata.xml 1540 BLAKE2B 5536e37e8d4b18a8b744b88968c8f5f87973dedd25dfc5a0c96202bed4991034e93b57ad9a8737b5dfab6526adfa1e563768f08c6b85442f87f0b4ebc87345a4 SHA512 651f97c959e8322e51a7d937dd5886604e3118249907cbd7c0695e65b91b39c22539aeac2870c4f8ffe49e6f4edb8736459eb68266cfc4cb0baac9e439d0a4e5
diff --git a/dev-java/ant/ant-1.10.8.ebuild b/dev-java/ant/ant-1.10.8.ebuild
deleted file mode 100644
index 20c1a2ead30c..000000000000
--- a/dev-java/ant/ant-1.10.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
-HOMEPAGE="https://ant.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
-	+jsch +junit +junit4 +junitlauncher +log4j +oro +regexp +resolver swing testutil xz"
-
-DEPEND="~dev-java/ant-core-${PV}"
-
-RDEPEND="${DEPEND}
-	~dev-java/ant-core-${PV}
-	~dev-java/ant-junit-${PV}
-	~dev-java/ant-apache-xalan2-${PV}
-	antlr? ( ~dev-java/ant-antlr-${PV} )
-	bcel? ( ~dev-java/ant-apache-bcel-${PV} )
-	bsf? ( ~dev-java/ant-apache-bsf-${PV} )
-	commonslogging? ( ~dev-java/ant-commons-logging-${PV} )
-	commonsnet? ( ~dev-java/ant-commons-net-${PV} )
-	jai? ( ~dev-java/ant-jai-${PV} )
-	javamail? ( ~dev-java/ant-javamail-${PV} )
-	jdepend? ( ~dev-java/ant-jdepend-${PV} )
-	jmf? ( ~dev-java/ant-jmf-${PV} )
-	jsch? ( ~dev-java/ant-jsch-${PV} )
-	junit? ( ~dev-java/ant-junit-${PV} )
-	junit4? ( ~dev-java/ant-junit4-${PV} )
-	junitlauncher? ( ~dev-java/ant-junitlauncher-${PV} )
-	log4j? ( ~dev-java/ant-apache-log4j-${PV} )
-	oro? ( ~dev-java/ant-apache-oro-${PV} )
-	regexp? ( ~dev-java/ant-apache-regexp-${PV} )
-	resolver? ( ~dev-java/ant-apache-resolver-${PV} )
-	swing? ( ~dev-java/ant-swing-${PV} )
-	testutil? ( ~dev-java/ant-testutil-${PV} )
-	X? ( ~dev-java/ant-swing-${PV} )
-	xz? ( ~dev-java/ant-xz-${PV} )
-"
-
-S="${WORKDIR}"
-
-src_compile() { :; }
diff --git a/dev-java/ant/ant-1.10.9.ebuild b/dev-java/ant/ant-1.10.9.ebuild
index 28e798b5fdde..20c1a2ead30c 100644
--- a/dev-java/ant/ant-1.10.9.ebuild
+++ b/dev-java/ant/ant-1.10.9.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://ant.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
 	+jsch +junit +junit4 +junitlauncher +log4j +oro +regexp +resolver swing testutil xz"
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index 0e6d7602dcfe..d731c8fd4e35 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -19,5 +19,5 @@ EBUILD bcprov-1.52-r1.ebuild 1347 BLAKE2B 53b6e67db4ad60cd847a4d4ff23231d19fd158
 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 1341 BLAKE2B b6e8fa6fe16ee1905aec54602c325f5f4b484be63b9e8e5e6f79827a1aa5121ed2d369b49506dc7d4091000e0c6753391934f634b026aac9c04e7152b7efa486 SHA512 64556678ad3ead8a9b139672db2fe31d934084e48680298212a77dba9e816e88408b1932098dddfc6407bb8f648f411d141687485c72d924bca3bee7adebaac0
+EBUILD bcprov-1.66.ebuild 1340 BLAKE2B b42730a69ac44de04f9e7f006055936f40935a11409f7f6610717637aca7fa265995a604beaf4ae968bfdc3d24a8ac63ca9082f14d7107b20fd13ca4e47701a2 SHA512 7ff6b9d93cab3464478e720cc636bec5da40444bc03867cb4e3642f1c63039f0e1869c3ab1972c1717865c39fc2021c6ec25277f2c6d90aa7aa828c6074014d8
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcprov/bcprov-1.66.ebuild b/dev-java/bcprov/bcprov-1.66.ebuild
index 2dad26804214..73e8d4e2db3f 100644
--- a/dev-java/bcprov/bcprov-1.66.ebuild
+++ b/dev-java/bcprov/bcprov-1.66.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND=">=virtual/jdk-1.8
 	app-arch/unzip"
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index eb3a73387996..2d600a109f7e 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,9 +1,11 @@
 DIST ecjsrc-4.10.jar 2036945 BLAKE2B cf9e50e53dac970a0b6b1231024a4efdc9adc92e02585aa4767c6511b367b32eefaf6fb3461c3c5c8160cf7205c0f708af0c433f4636b5a49caf637ba60fa092 SHA512 e85cacf6d2e21d464ff0226eac12bab8388df7a1413cb16d2982e255eb7369341792562f5080354279be0643c08fd80564a8eb2d8f59b72c8443c02577e4e1ee
 DIST ecjsrc-4.13.jar 2074963 BLAKE2B d74caf3b81543ac12497148a477dcd99fb6d14bd1d601b9e2baa0fb82d12f1211533f5ee909465b190c780ac18f1fbc1f8e12c22cddfce10501923effd7a4cc1 SHA512 f7e49b29e8aa80d627230059c9aba3f1e1fe3824bfd43eac962331d545471df5af0ac49b489aa3795e79e161101a3c6406b29f71a06143914f241916ae6953a9
+DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
 EBUILD eclipse-ecj-4.10.ebuild 1678 BLAKE2B 933c353919c86dd1d1a8adff7604bb42a35ed0de363134d8a3169dfefd91c90f6827a0bd661371515da6b9a63fd55745578dd70c50e808ccb29f1e5e1ffa4fb1 SHA512 2bd4398ccc15505ef35081e5afce5302001a0eec585c8c5463b233922e3faf234fc982293d873b4c181785f23b883993e157555202c0e2c1f823b68aa844f87f
 EBUILD eclipse-ecj-4.13-r2.ebuild 1738 BLAKE2B fc8b94e3d55e1a72473c9723b496fef18a5122af2f94c34ed52c929fce8be6703d2a4c8f99ef836a896bbc0c7e6e93d5675db2588f79beb9551e918b251c5864 SHA512 5a4e6e40cd35e1d815f2eb83ca15ad638d5f931a3ad1539147aa716dbae82a89763b51ffcd59490ceee6e80846475ce550654acb45cac5444be1835b080b8ea5
+EBUILD eclipse-ecj-4.15.ebuild 1738 BLAKE2B 2b1eea89420428e432bf7a834f47a04836d491d6dd8049d466c02027cfe9faf83f3a3a5e0e63109e674e600711034e3bec790ee92fc74be5d3ed9944d16a473c SHA512 672d74a8f2a29b1f4d6d3ecd0de797bc08e5e680d6369c9968204a26447fd672abe3980aaa36ba76d53193c6da3d1b8d8c38a39eb2c77cba4a1adcbcdd495db1
 EBUILD eclipse-ecj-4.4.2-r1.ebuild 1361 BLAKE2B 3f2fea077ce628cb057ee841d6a19b06f9b56344c085a5fd7533fa084d3f7cf92a5ac6edc31632e31c470852f742b383cc913371e927d59aabfbb38e42496f6e SHA512 9a870d4ce61c4a5ed3f9c0e9b7b75f0006a1649269849a08a5b5b809f980abb3773be37338564578e4fc8ee8921e231c93b5cfc0f72e99f71190c7a91ff86eef
 EBUILD eclipse-ecj-4.5.1.ebuild 1628 BLAKE2B 19a0422c19a19998e199dae7170e3b89954d412e62523ec4742fbf514015afdfe01a9c932b044dfd4f6971a96ba1bf3bf98697732b677f567c3d2a83368d575e SHA512 ba5ded5ba46b10e1467c42ad8f63f67f065acd08f3e39541e3794e97a0f8974edc1d4e3eff474916922b83e8fd9656cba6f34b67c3febc4ea15bf08c933ca2ff
 MISC metadata.xml 645 BLAKE2B f774dea11925d1031013a012083f962369714c32d58ce7480f114dd732ec4f19465c174ce4387ce54d138b8a38072c767c18e21ab47e6f92480085f1104a974c SHA512 0ba8d7ccd7280fc72bf485c5450a3e6bcd09713c432867439aaa7ebed6db5530ee15a0687c381a9191b533abebba4a6a06d9fbfa6ee3e01dae9dc2936de6836a
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
new file mode 100644
index 000000000000..0ddd9051340a
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 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
+
+MY_PN="ecj"
+DMF="R-${PV}-202003050155"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.15"
+IUSE="+ant"
+
+COMMON_DEP="
+	app-eselect/eselect-java
+	dev-java/ant-core:0"
+RDEPEND="${COMMON_DEP}
+	virtual/jre"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-11
+	app-arch/unzip"
+PDEPEND="
+	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+
+JAVA_PKG_WANT_SOURCE="1.8"
+JAVA_PKG_WANT_TARGET="1.8"
+JAVA_JAR_FILENAME="${MY_PN}.jar"
+JAVA_GENTOO_CLASSPATH="ant-core"
+
+S="${WORKDIR}"
+
+# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
+src_prepare() {
+	default
+
+	# These have their own package.
+	rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -r org/eclipse/jdt/internal/antadapter || die
+
+	# JavaCore is not distributed in the jar
+	sed -i -e '/import org.eclipse.jdt.core.JavaCore;/d' \
+		-e 's|JavaCore.getOptions()||g' \
+		org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
+		org.eclipse.jdt.internal.compiler.batch.Main
+}
+
+pkg_postinst() {
+	einfo "To select between slots of ECJ..."
+	einfo " # eselect ecj"
+
+	eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+	eselect ecj update
+}
diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest
index d05df4844861..aa363e528d41 100644
--- a/dev-java/hamcrest-core/Manifest
+++ b/dev-java/hamcrest-core/Manifest
@@ -1,7 +1,7 @@
 AUX hamcrest-1.3-empty_generator.patch 1227 BLAKE2B 4e0bc6d085f6d26de9f2da8e09eb061c451a58d99385a2c41be28a137b209783affd76e1e0bd901a5497d40b290ac219d61046fc65931ea056c725ae0f835ee1 SHA512 766f57a449d4535432ab192c40a37ff9a09fe760b06ce5beb6a68b2b804c77ce232e8003fb3f3ef7b71df1cd2ceae7ff13fd3de28d20ec0ced1274c912d414b5
 AUX hamcrest-core-1.3-fix_javadoc.patch 3036 BLAKE2B ee65eb88f113a5f6fd93b49dafb76d8c1c39266f6fb2f220849eeabec7ce5b084d2411c51102fa5b47853aed66acd6d237497c0c8bb2c688c93b7eb0785e27a3 SHA512 f50fe8f2ba32e17118c42e438ef96973f7c04b70321353ed2c19c7ec8f61ba0c801b49920295d0d30add50fb18dbab5cd079b1879f71f4d569b8253ca40b4ce3
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
-DIST hamcrest-core-1.1.zip 1344232 BLAKE2B de9d346ff12ff29c4d1a13138eb8a80a527865b003f5d738cdfba4927714170720e2a778aecefeb895b82d0c40feeb1980c2ae5ab17a7caf2c27e19a0fcf6188 SHA512 af8d5d3a82df70a446f79f7247252595368820b0b54d8f612aa5b9bb3166c4664b97aaae338278f8f5d84add2d58d9c7a764e5e03a93588d3eba4472eaaa712b
-EBUILD hamcrest-core-1.1-r1.ebuild 726 BLAKE2B 0bf2ceff64edd7c6359d06c2019e34dfea5862c0055f86865162127ed8946dafb71481d7fa37786bc613386cae965df060448841805e8f4c599097e47c09fc9e SHA512 7fa43c784e0ce93356d60704e1e1146fbfb34448252ea9d94849749a6f876a99c830fd3154fa37692fb14b12f2dc67c995b9047e067e968e59ccab04f318dc0c
-EBUILD hamcrest-core-1.3.ebuild 1517 BLAKE2B 7954ea5feca44fcd1b83e8d1a7f90036ff0351f4d7d4519d6fcc3e2d06ee702b3d58bbe6e6227623e745d931bd8e7b8026df54d9cf9724fcf7ee5c774a08ebbf SHA512 436023213e773fa3f92ca941225955b14ce8b8b6e7332a62965f121b735d2e4b3aef01978bc59f288a3a6d1c0e12667da106b0e6675cb70b2e757a99d02e60de
+DIST hamcrest-core-1.1.tar.gz 1247348 BLAKE2B 07b874ca2e61808cd1a30246cbfe7baa220a9c83df7be94dbb50c4df0279bcf906a32cc1b69aed0ebd81d51392af28050d070b7fabb50f8063964b0782b5e105 SHA512 d86080f1ef5982faee728e29675676a89b42a02c4b00783c67be948076e502e70a2b435568502d8ed3c5b1bcc5441b3cdd8817dab841cac537087edeee47632f
+EBUILD hamcrest-core-1.1-r3.ebuild 727 BLAKE2B dab3d360c689e3d084d2d9b07dec1c92233145c07305c2f3714462079b88ef4e833c9c0ee24afa266c29f39b99963ef58ff159f80b616c614e7a48d373c83eff SHA512 10f6bcf35293d321e42924924cb88f9341912e4ceb66a3e4bebfb8b29e7076c00f2166ce416969872f697b787ecf780b7388bceb233ef9a5f9924938b8c3f66e
+EBUILD hamcrest-core-1.3-r1.ebuild 1519 BLAKE2B fa37495a272a3a4e95450fd21e59fefa924b0d6577e71fd6724b935129e2cdc85457b29d09de6c502c783b2cdd97e0b38862b5af79e30f49a87c6103755c301b SHA512 6951d5260fc2de6348ce1271ccbbd1eb140aa083b668c03aba7f43bc4de04c9fad1d5ddb2f75a8668de667fb7138c6d5466bfb027a6a641807e0791dc3fa7b8e
 MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild
index 78621915ae72..b5d72a4ea12b 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Library of matchers for building test expressions"
 HOMEPAGE="https://github.com/hamcrest"
-SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -20,10 +20,10 @@ KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8"
 
 DEPEND="
-	>=virtual/jdk-1.6
+	virtual/jdk:1.8
 	source? ( app-arch/zip )"
 
 S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}"
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild
index c57f1153be9d..f6a4828bbca6 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,11 +19,11 @@ LICENSE="BSD-2"
 SLOT="${PV}"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
 
-DEPEND=">=virtual/jdk-1.5
-	~dev-java/hamcrest-generator-${PV}
+DEPEND="virtual/jdk:1.8
+	~dev-java/hamcrest-generator-${PV}:1.3
 	userland_GNU? ( sys-apps/findutils )"
 
-RDEPEND=">=virtual/jre-1.5"
+RDEPEND=">=virtual/jre-1.8"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
 JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
diff --git a/dev-java/hamcrest-generator/Manifest b/dev-java/hamcrest-generator/Manifest
index df7e92a74d88..7fda27119d54 100644
--- a/dev-java/hamcrest-generator/Manifest
+++ b/dev-java/hamcrest-generator/Manifest
@@ -1,7 +1,4 @@
-AUX 1.1-build.xml.patch 4213 BLAKE2B cf48828ccc8b46ce9488f79462492a03b1a3ec8b5c0b4a1d86b1b8ff2bc605034bfd70e22df09c82044c12d2d59e508e6d8fb775081c017e5b631214bdd6fd78 SHA512 a4b9bcf15588f41ba39ca5f2d9ab70ee1a19eb295904b4da96f3bf66ad83ca14b38f0866de6689e8f1a2cca0530c90301e2ec7d7a172e880f51be34251a3b18a
 AUX hamcrest-generator-1.3-no_jarjar.patch 982 BLAKE2B 4c09b64a6b824025771682dad6875b8c048f488fd777545d7c8f7219de04193fe40eaea63b7e319d5c00843175f66033e26216f68436c2d99e256fe06218daba SHA512 26b77758ab603b02dde03ec7a51f6b1f1077aa45580e8a21ffa671fc385c54ff00b3a79f8a3be037f28a8b77289d1290493469a1c8c856a9b61846d4cedac58f
-DIST hamcrest-1.1.tgz 1670123 BLAKE2B 2b1242a782949e084374918778c17f20b3b09746521949c12153cf1e599ab38a2a5a2bf0174d9676a8146cfab1e3f7c91a8a1b3ec829dd617f34f92c6852b931 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
-EBUILD hamcrest-generator-1.1.ebuild 1274 BLAKE2B 717dff6fd73252c1c6d347e3aca112a3f6bd998ba06062c793c251356d59a943b43f73cba2410d2e5f22a341ac4836e4cd8ead1014bb07578cd9b4d59f7b4a1d SHA512 377f209ef46d2754954e01dd969ac04226c464584ec8d92ea76d36cc2ce1462ef49af2b7159dd1da82b8a1481b08fdff5f3973aea1b4652964e4d2c0ecfe48d1
-EBUILD hamcrest-generator-1.3-r1.ebuild 1335 BLAKE2B fb8a85358fb10b39d4ff60cede789cc205f32abecff2d359b5e6de5b8b000e63a4150e70c7392b471c8b86e92df13189fa3ca9ea69f10ef557f5d66ce8afaeaa SHA512 c031ed09243682d55fce77f2ffa8226268e19afa30a8d15b1f8bff3cdbc24fc8bcb6f00d369d67c8e429e6d5634667e269760d9e41d427a7ddf4bc6eb7a6398f
+EBUILD hamcrest-generator-1.3-r2.ebuild 1335 BLAKE2B 4ca588b8727111656c541964dece54669b80f0b2109783b23088d59a77d2e047bb2224cff3f4df1c4c32832a2108b09f6169568407c55e5239f23e10e5ff0f65 SHA512 eff44e5a4f8caaebcf8f7f32a7c455f40b16faf375e4a144f6945aefca6b38b65dfb6f56f88f6e68ec00601f219ed1baae7f7c81b90d8e99942c05feda2d53e3
 MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
diff --git a/dev-java/hamcrest-generator/files/1.1-build.xml.patch b/dev-java/hamcrest-generator/files/1.1-build.xml.patch
deleted file mode 100644
index c8f087ba8f12..000000000000
--- a/dev-java/hamcrest-generator/files/1.1-build.xml.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml
-index f819d3d..18fba83 100644
---- a/hamcrest-1.1/build.xml
-+++ b/hamcrest-1.1/build.xml
-@@ -28,18 +28,6 @@
-                      classpath="
-                        lib/generator/qdox-1.6.1.jar;
-                      "/>
--        <taskdef name="jarjar"
--                 classname="com.tonicsystems.jarjar.JarJarTask"
--                 classpath="lib/generator/jarjar-1.0rc3.jar"/>
--        <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care
--             about it's existence. Uses JarJar to place classes under a different package
--             to prevent conflict. -->
--        <jarjar jarfile="build/hamcrest-generator-${version}.jar">
--            <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>
--            <zipfileset src="lib/generator/qdox-1.6.1.jar"/>
--            <rule pattern="com.thoughtworks.qdox.**"
--                  result="org.hamcrest.generator.qdox.@1"/>
--        </jarjar>
-     </target>
- 
-     <target name="core"
-@@ -94,16 +82,16 @@
-                      classpath="build/hamcrest-core-${version}.jar"/>
-     </target>
- 
--    <target name="text"
--            depends="core, library"
--            description="Build text pattern matcher">
--        <java-to-jar srcdir="hamcrest-text/src/main/java"
--                     destjar="build/hamcrest-text-${version}.jar"
--                     classpath="
--                        build/hamcrest-core-${version}.jar;
--                        build/hamcrest-library-${version}.jar"/>
--    </target>
--	
-+    <target name="text"
-+            depends="core, library"
-+            description="Build text pattern matcher">
-+        <java-to-jar srcdir="hamcrest-text/src/main/java"
-+                     destjar="build/hamcrest-text-${version}.jar"
-+                     classpath="
-+                        build/hamcrest-core-${version}.jar;
-+                        build/hamcrest-library-${version}.jar"/>
-+    </target>
-+	
-     <target name="integration"
-             depends="core, library"
-             description="Build integration with external tools">
-@@ -121,7 +109,7 @@
-                      destjar="build/hamcrest-unit-test-${version}.jar"
-                      classpath="
-                         build/hamcrest-core-${version}.jar;
--                        build/hamcrest-library-${version}.jar;
-+                        build/hamcrest-library-${version}.jar;
-         				build/hamcrest-text-${version}.jar;
-                         build/hamcrest-integration-${version}.jar;
-                         build/hamcrest-generator-${version}.jar"/>
-@@ -164,7 +152,7 @@
-         <jar jarfile="build/hamcrest-all-${version}.jar" duplicate="preserve">
-             <zipfileset src="build/hamcrest-core-${version}.jar"/>
-             <zipfileset src="build/hamcrest-library-${version}.jar"/>
--            <zipfileset src="build/hamcrest-text-${version}.jar"/>
-+            <zipfileset src="build/hamcrest-text-${version}.jar"/>
-             <zipfileset src="build/hamcrest-generator-${version}.jar"/>
-             <zipfileset src="build/hamcrest-integration-${version}.jar"/>
-         </jar>
-@@ -221,7 +209,7 @@
- 
- 			<packageset dir="hamcrest-core/src/main/java"/>
- 			<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
--			<packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
-+			<packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
- 			<packageset dir="hamcrest-integration/src/main/java"/>
- 			<packageset dir="build/generated-code"/>
- 			
-@@ -251,14 +239,10 @@
-                 </classpath>
-             </javac>
-             <copy file="LICENSE.txt" todir="build/temp/@{destjar}.contents"/>
--            <!-- Put Java source in Jars for user's convenience. -->
--            <copy todir="build/temp/@{destjar}.contents">
--                <fileset dir="@{srcdir}"/>
--            </copy>
-             <jar jarfile="@{destjar}">
-                 <fileset dir="build/temp/@{destjar}.contents"/>
-             </jar>
-         </sequential>
-     </macrodef>
- 
--</project>
-+</project>
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
deleted file mode 100644
index 19e54674594e..000000000000
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="hamcrest"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Code generator for Hamcrest's library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
-SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-CDEPEND="dev-java/qdox:1.6"
-
-DEPEND=">=virtual/jdk-1.5
-	userland_GNU? ( sys-apps/findutils )
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-EANT_BUILD_TARGET="generator"
-EANT_TEST_TARGET="unit-test"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/temp/${PN}-${PV}-nodeps.jar"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PV}-build.xml.patch
-
-	find -iname "*.jar" -exec rm -v {} + || die "Unable to remove bundled JAR files"
-
-	# These jars must be symlinked.  Specifying them using gentoo.classpath
-	# does not work.
-	java-pkg_jar-from --into lib/generator qdox-1.6 qdox.jar qdox-1.6.1.jar
-}
-
-src_install() {
-	java-pkg_newjar build/temp/${PN}-${PV}-nodeps.jar ${PN}.jar
-
-	dodoc README.txt CHANGES.txt
-
-	use source && java-pkg_dosrc ${PN}/src/main/java/org
-}
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r2.ebuild
index 14529ec5b9f8..ddc289d736b6 100644
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -21,11 +21,11 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
 
 CDEPEND=">=dev-java/qdox-1.12-r1:1.12"
 
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.8
 	userland_GNU? ( sys-apps/findutils )
 	${CDEPEND}"
 
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.8
 	${CDEPEND}"
 
 EANT_BUILD_TARGET="generator"
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index fdee87883ecd..eb2c8d2c5c52 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,16 +1,16 @@
 AUX icedtea.env.sh 954 BLAKE2B 4cb0d8baef5f9a6527b8d15e7258805bb859cd79aec1ee0dbbb2aa369d0ecc83cb11a482d6bf5a17a6692da1bdf40ec1544ecdf31d46bcded7a3832d0553ee1a SHA512 80161624e52e705cab16edf04e304906dc0a37b86442e63a9ff8fdda321c4888ab12e8b66dc2f4487fe9bd86bb9f33d597b489d2d486894a36e91ed7563ef23a
-DIST icedtea-3.16-aarch32-ecc1eb1dc760.tar.xz 6854900 BLAKE2B a4b0a4fec267f0dd64618aa83a2cf487e83bfa133e03914a079d451abb6be573e4d157f12372d6d2eaa66f834d4a1ec0bad8f1a65d2619468bb3de8567863036 SHA512 20ba1980a4f4161c632e8ec02330c3b0c971a5eff19456a568b2df4622fcfedb18594c7e350318a15a31a5395c0544899160d71805f0a3d3886ae7a16019c010
-DIST icedtea-3.16-corba-ea3169880d70.tar.xz 947604 BLAKE2B 22e7fdab5168b01501791c9537b72f884cdd008ec912e1e7afb05c410e47ab9fffc37aeeab78400a39b6216612927eb63bdc6ba2169fc7e74fe8d6c60b1af978 SHA512 bf90c95f401d4628e32b9a7ea78b7d43944f82882818a81d2ff368f09e49148091bf823d78ed56c343c175fe6d25492d9b78e25b725f218592ea94c4ae285e56
-DIST icedtea-3.16-hotspot-eeb08cfebded.tar.xz 6906968 BLAKE2B 78bd9ecef9801a190ce2993d1023d6eb3db8276cc7fc726cccbf406e630a4bc62401299885de42df85f92611da10c732ae50600af9e337dcf3014472777ba38a SHA512 19490ccc377fde5dc3d4396425e945f32e121ad0cc4be394b07f8698a7e3805b16fc41e427bab5fa290cb84efc7edb62acf8ca98072176343f5584d692592d2d
-DIST icedtea-3.16-jaxp-883803235596.tar.xz 2293880 BLAKE2B c749477661d9e492ab15e0b773d641f68865196c8d2897eceeafd341cacf143e73c6b55face57d528ca5d1a648798db4533e7b924daa918c2ce62d26b407bf5b SHA512 86e8c18741c1f4baca27d784b068765e404a5c2ee6ecb172c826fc1d6192b5776133f103b749839c39154fcaec87a0df95e8fd5bcb56b1e9b811711b296a4836
-DIST icedtea-3.16-jaxws-e5d96dc9988a.tar.xz 2276192 BLAKE2B 79c33b530f95ab098297d0cdb5844660df4330555195c366611cadde8478711cc4a0fef3b68a23bbd710d4213298cd4293cdec3d12a07c0682f6e264489e9d11 SHA512 824ef15aa70ec629406fd9b98a69e5699fe8f6a8ab06be00ac546bcda1daf485b20de6ea0310064e000efbaf35b1cebee25bf69033634fdce8434efb3bb16f1d
-DIST icedtea-3.16-jdk-bb9b9a0ad162.tar.xz 39849832 BLAKE2B 2b9b3ca3988955015760c82481a86af73c13b37b0c26714fbdac33de73b70ecf2fb3abcd908406dfe7dc202b02c70d66ba6b64f838b8e0b2ecb55a46944998c3 SHA512 9202f88b360637ad474920d8a6f85740e6a425679617ef713efd67778b4c7ca0b3eba7e4fc9d33de0bbd5dacda4862c8a9b63a13880204388b01af29d5fb6a55
-DIST icedtea-3.16-langtools-e47d37e5fe0b.tar.xz 2078808 BLAKE2B 2f7286c15c90607e67eea8b8ca560cc83a21e4a3ebbb5846afeb79ccfefe0713fe27ebe56a505f263276476e0a99c470171030cbaa406fbbc7cdef13acbf89b1 SHA512 1858bb3b7dd37edd817a52c67a878b48bc9b790623e77d9a6107f54b141638cb101ae3b8df560e3352c9ca2925aa5d493b4924e36a238be5a9628c714cc23642
-DIST icedtea-3.16-nashorn-1d70dcb4ab53.tar.xz 2319492 BLAKE2B c328c3a99fbd49be1efbecbb12e46be57d4cb78c65ca778f95644e2d193a4390ed1ad1ce3cddc6f737241d5e02b18b50adbc37748907db3eabe406a4880a6afb SHA512 4bf87e7441ac747f133612e1fba5c06946c6731bae76132ffc614b41fcb689fda9d9ceb1e1fee3765765c6109894c85cf0f6e6fa9eb301f9a2d640ea6cd1c16c
-DIST icedtea-3.16-openjdk-bca1f7228ce8.tar.xz 363112 BLAKE2B aff804d5b5d58dcb25f9a576aa0a23355d2229f89d5dc69142580d5fab3bdd688225d2e33090714a3d292d9d98758867feaef9c179a4c77b5cab37c21c5f0610 SHA512 76b32457958c2cdbb0006629bb41652286a1a9bfbda862665eddf822d4653d4858f9f2565e849b0e49f031b7667be73be8fe8c71abc65e1795eb570a96d1fd1e
-DIST icedtea-3.16-shenandoah-e4e81ae21643.tar.xz 7081200 BLAKE2B bbbd4f3cc7f3adb34a3c3497c62eeb1336d554f7396b952b94ad8f573295c1537e9c3416fc2d2881efef6d6a1750bd069da0fac37a0d556eeb55a0ace9b7b385 SHA512 adbb279d59d4978403b222caf9f0823b3ae2a0d6e27911a38243fe6ef9b1a7f0d8640d71b67fa510c341dc175031e52b4b6aa6187a37ac467372a55946ae37d3
-DIST icedtea-3.16.0.tar.xz 1534432 BLAKE2B ef8ffc6773c2ea1d71a2bad1f425f891edd65cb61fd22b1c36b06539b9656f211422d897e35b707bac1b0005eaa95d31bab3079c5e31454383be01d9750394ba SHA512 67964f283b5a220ded7c86141ac359fc51f41077686d3e68568a9f303d2e5e6d62472bef2d6f5f9d53897a55589c84d3212983194607b9a6704192752f8ad2ac
+DIST icedtea-3.17-aarch32-3.17.0.tar.xz 7054840 BLAKE2B 461939116607f82b5aef6dd093204dcf383e209630945f6f0ff0360bbe306e7afc2b1ae339911954c2b80446d37e0d25a587912cbfbebe0ace2e701c2e9e9f67 SHA512 493d9a98166255a630306bf1e67e681e0b2ece42b6e7a96c75b2cfb6cb0639b8c9ed8918eb129c9543fab1805a4ac33774f25ecb2272703eabd6eeb680327717
+DIST icedtea-3.17-corba-3.17.0.tar.xz 948464 BLAKE2B 97050f07a9ee39c763cff67dcb19ad772fa2529103647b0ec7cdfd40f926cea67e6e02d3f10e7d5aefd8221476c923630f4b9fd6d5f95ae4c74b46e44c911520 SHA512 cec56b02b47f96ac97d6485fc18ea30100ba64c0acd509d408ddfe43e36e14ebf2345b3fefcf001af378af9ed3628ca8c45add604bd435806eba47c9f2945993
+DIST icedtea-3.17-hotspot-3.17.0.tar.xz 7107508 BLAKE2B 61148d11c2cea5fa18e9d115be7dfefa68825cb5396465c2b1c991402ba1a000f2e780773a83a95741571a38992839206e21f26954773fa2306e1a6d4d7eaad9 SHA512 cb1bdf3ab9aee48e745108d2762992c2a6be21e22bf6633a512f4bff28becb61e4cdd3662e7301aa7067271c6c80a8ac2a65fdb5b432b8c02d38b6fd74c7f9e8
+DIST icedtea-3.17-jaxp-3.17.0.tar.xz 2268024 BLAKE2B c1fe1e2a6f28d7108dcbdead86e5ef0836877ebb89ba0446045aad3797616e5a16125d6d6dba425b244710bba77ce8a5ac4c6780dd0ab2b9b35f51d551f291b3 SHA512 a7d69f94cb7ce63522dbe1d16376ff0f39e5e5f013f3a895070dcb05d524f63ecbb1ab3d109edbd48e3bfc6e5758200c95b7ec18ceb84cc580a93395760b975a
+DIST icedtea-3.17-jaxws-3.17.0.tar.xz 2277156 BLAKE2B 0ea611d90eac928c974d80ae366a95ba7d13b958b7b5e31766ede059015478c3bd87bce4cee2f4350e7dbc8ab27ac2a6e7190efdb61b4e595e8741ab28fa8b1f SHA512 65821e62a2f25e77f3345894d1982e2b6d877ee6ddd2b1dba77b94f1175f7d88fd77ca2d2727f625765702846711f85821f87f62fb6359d2502f57436a22290c
+DIST icedtea-3.17-jdk-3.17.0.tar.xz 40601488 BLAKE2B 18c0629aba53b763680fb2e0dd4ad500db286e584d6aaaf43339559907636f8cd4cae9445131164be810ac2518445c8025d4e361e4c6f31d5436bbea1cb254e3 SHA512 42d5387b228ea3143eb91e4fe661a1d578b879b884f098045b8248c77d1f4a583921c520cfab078847b74615732f2e9318bd532b00ce266dad2364f5a640251d
+DIST icedtea-3.17-langtools-3.17.0.tar.xz 2079284 BLAKE2B 0e1d435a54167cf9b3cd381cf12d156ce59da99dd3f02d72422329ee70d7f00dbb25713c315b36a4569408a7ab376de21f0ae525bf7cb3ef54c5fa51ebe50eb1 SHA512 7cd63565adb0beb0a7bf6efc35dacc9bcc8cc48e0e6462c4f295783a48de999fe877964509b81375603fbae18c231084c82cf22c1ee3bb4309360ec2685cebe0
+DIST icedtea-3.17-nashorn-3.17.0.tar.xz 2320268 BLAKE2B d77ea15aa6d1b268fcd06a3222f7f526cb46887e0454a612ddf7fd57465c166ebe1ce16436c90ada71a097292be334e25622b223fb40708976f3d3cd7514e23a SHA512 50c5a4e4faa377e8b61395062a7b86856553e48a66d32d83730a536bb8c09f768a78dfc604e679c8fa5c9297887d6432012b2db2f7810b00aaebee3c775960b3
+DIST icedtea-3.17-openjdk-3.17.0.tar.xz 364764 BLAKE2B c0bb286b691c50ca9d0e6982dab73929065a3af13f1974bd661a51e4959eec38a045fa7032854a65a17cc3f8a826f881c46eda062225af551da7c22f9591ee4f SHA512 4b074a6b14efcb23476a1fed56d52e8f2defea16f840a714324cfd0c3302e3a742123e86f8964a5708600f0856ae1c4daacd0513eaed35d299512277eed7eca8
+DIST icedtea-3.17-shenandoah-3.17.0.tar.xz 7277048 BLAKE2B 034d27ce07b48d27302180da2b100cdf97adc7109a56e9cb67ee37f93957f009f65a460b706ff563c0022efdfd1749322caee069916df4e090aee217ca60b1cd SHA512 ce7df9784a48028ea69f6a2b0f5b08a13456e71ce3e8773b14e5a7c801b0917dd7f5609e2dcdf574836ec2d69bc0acec0648ee087283052c200822b3786e155d
+DIST icedtea-3.17.0.tar.xz 1565156 BLAKE2B f2b5f0b0ac1de70ddd5faa1215fcb17b5b7bee726ca5dd81bc2e3948c7fd342dfe1d7c9dbd232696bf0f2d68f214b0132f386d182b1fe15ec72cdb77cc0ba67c SHA512 4183037d6829f7fdd25b970853e84bfeecb45adca7fb78e773c431e401c155c212b78bc6daf80d8479c13e9ca63ad5446122a8ec2d6e6b1bede8ee747ba7a91b
 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.16.0.ebuild 12291 BLAKE2B b079701037aa68c3b5c7658faaccffd19c706c6be2971bf712c7b838bb166d9001d40f1e4103f5dd39d1f447c32519b2ae49bcbd49fd11c51c4fcdfda53cb1d3 SHA512 0fb5fcea871a064db66321da2ba5db7b640c2893d36bf7bc6b08241606768f272c8a31f581e1c24d839abd8ec1451b53daeeed9389e234f45d28067a4f5a3a38
+EBUILD icedtea-3.17.0.ebuild 12309 BLAKE2B 749c85a4365c8ce9330de196578f8a7b4cdaac48608e24c50df9244e27e95f62ef97c5b5652cf1af25b3042dfe537344acb617efe54b5cd481b971bb620f7a6f SHA512 9770ce5deb3950ceda3d5fd4089c09feaea93c2181751a561a4166333f727f7afd3a46d0b49bd15174184e1a4b5a72f866d2fdf679886b0e8cd52f8445b29ac7
 MISC metadata.xml 2078 BLAKE2B 62fdcb5253303938fdb76f663ddc6f3916435a3c9ed96bd4dbace4def75710e6dfe651466cf2ec9783cb897e13347c64eed12b20c90b68635865c395979bd67a SHA512 1e7b759aa3b3e5a50347cfd788c50435a28dbe094cead897e35c7be4fc85dcc47fab0091592d8ca74f7274e77e57b75658ad97385faaa7d3287579f88a198cf1
diff --git a/dev-java/icedtea/icedtea-3.16.0.ebuild b/dev-java/icedtea/icedtea-3.17.0.ebuild
index 436fb8fe611e..0699e1a02b52 100644
--- a/dev-java/icedtea/icedtea-3.16.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.17.0.ebuild
@@ -17,16 +17,16 @@ ICEDTEA_BRANCH=$(get_version_component_range 1-2)
 ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
 ICEDTEA_PRE=$(get_version_component_range _)
 
-CORBA_TARBALL="ea3169880d70.tar.xz"
-JAXP_TARBALL="883803235596.tar.xz"
-JAXWS_TARBALL="e5d96dc9988a.tar.xz"
-JDK_TARBALL="bb9b9a0ad162.tar.xz"
-LANGTOOLS_TARBALL="e47d37e5fe0b.tar.xz"
-OPENJDK_TARBALL="bca1f7228ce8.tar.xz"
-NASHORN_TARBALL="1d70dcb4ab53.tar.xz"
-HOTSPOT_TARBALL="eeb08cfebded.tar.xz"
-SHENANDOAH_TARBALL="e4e81ae21643.tar.xz"
-AARCH32_TARBALL="ecc1eb1dc760.tar.xz"
+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"
@@ -137,10 +137,10 @@ RDEPEND="${COMMON_DEP}
 # 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
-		dev-java/openjdk:8
-		dev-java/openjdk-bin:8
 	)
 	app-arch/cpio
 	app-arch/unzip
@@ -179,8 +179,8 @@ pkg_setup() {
 	icedtea_check_requirements
 
 	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-8 icedtea-bin-8
-		openjdk-8 openjdk-bin-8"
+		openjdk-8 openjdk-bin-8
+		icedtea-8 icedtea-bin-8"
 	JAVA_PKG_WANT_SOURCE="1.5"
 	JAVA_PKG_WANT_TARGET="1.5"
 
@@ -299,7 +299,8 @@ src_configure() {
 
 	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
 
-	econf ${config} \
+	# 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}" \
diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
index f1d7e5d33e24..9cc96fd55168 100644
--- a/dev-java/jamvm/Manifest
+++ b/dev-java/jamvm/Manifest
@@ -3,5 +3,5 @@ AUX jamvm-2.0.0-env.file 544 BLAKE2B 25197538a4c10d6ae1b0038113c094cdbca9a1a22b2
 AUX jamvm-2.0.0-javac.in 1739 BLAKE2B ff167bfba594dbfb71dd1d09e41ce502ebfcc598fbcef0794cb967c00894745f8b16412adc7b4afbd167878defa29351e99b30a71b4377987c5c8a692f404e30 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb
 AUX jamvm-2.0.0-noexecstack.patch 1387 BLAKE2B afd020772bf627c3dbd6b5da9e03d3b03e8f5c9dc3844279fe325183819cb11deadaedb4920ebfb0c6b25321daeee9f0e4fff45addd162e2b6c02e3f3ea12d31 SHA512 17c38ad0017e5659295dea7ed57f263eb0eee673bbc1f5d1e44e0c8fe588f4172a8a05c832a1fd41f3dc094779fade66aa710c8ce48c754412b0b6afdea6551a
 DIST jamvm-2.0.0.tar.gz 741459 BLAKE2B 9b8b0f8cfd8f56c0b835144c07aaca709ef466fdfe5df18438d05c66cd8a07fecfebf27e1581c67658feb3674a96c2e916b85f13dc434baf2db9be4e4fbfd0cf SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d
-EBUILD jamvm-2.0.0-r1.ebuild 3650 BLAKE2B 1faefeed925b84c261645a07dd9e4888bac7e7ca6e4a6b551d420e77897e3ba54347eba2ac7f9fc6019364b11489f0696d5c63e791789d5fe0efba04cb6d23ea SHA512 d68421e7462f76880c3643056420f6db693c3aad605a3283f40607c6698b7aa269ffd297b3a2e795ba7cf297e82cf8ac857d3bcab4fd4fde230b09a5689ec9d8
+EBUILD jamvm-2.0.0-r1.ebuild 3659 BLAKE2B 0e39e53af22f22efbdaa37908dfaf5a9695ac5ba9d9e020850a7f99a2224d9d70567b1b4f522c7dd84d8668c19ac5c722d1f74ae364b0b8b0110fc96c1e4d3ca SHA512 4f8a572e56bb7afa6141c2d5427f4dc127eeee362e932e5de2df6f923f8d6ef0c7d9d79db69b7bb95945c1146c0843a358ba94c8fe33a2a686995c8e383a8a3d
 MISC metadata.xml 311 BLAKE2B f89901d2404c3d1004a7b53345d8e533059995634d1109f620d6685de9defd6126dc1e619f8c8ba0d8f53d57a1d7b1f2f51b0f93fc12b1afb179385b30b4d514 SHA512 3c73e7134e8adf35e0a1418dfcb0215082b5cfc7e3baabc11d89fb1044996a382c551309e5c04dbc54257a65173384b690ad951ceaec2b8569d89bb8a5e757ee
diff --git a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
index 9585dcebb6e8..4c9bd47344b8 100644
--- a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
+++ b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
@@ -16,9 +16,9 @@ IUSE="debug libffi"
 
 DEPEND="dev-java/gnu-classpath:0.98
 	|| ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:* )
-	libffi? ( virtual/libffi )
-	ppc64? ( virtual/libffi )
-	sparc? ( virtual/libffi )"
+	libffi? ( dev-libs/libffi:= )
+	ppc64? ( dev-libs/libffi:= )
+	sparc? ( dev-libs/libffi:= )"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 436505734709..361c6f3a2a7f 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,4 +1,4 @@
 DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
-EBUILD java-config-2.3.1.ebuild 977 BLAKE2B 7d64a9145f01bc7d1503b3a298b2bf70c4fe2aeb9b8bc0b6880f3733b664bd2791292bd7aeb1301c825d962c5596e976a3c5aefb25bb3df0d57d5f85ea2245e5 SHA512 cecb6e7434838fdf43c835ea73afd83707ef2dd1820eee5ec9ac1e2c28ffb3d023500a82244d440f5f8a856225fac01b756207d1e1d1bc73db7e80186fff662d
+EBUILD java-config-2.3.1.ebuild 979 BLAKE2B 2029c0220fb368462a057f3b6f6fc68e7d8754b7f3d9a49af6e70c8c213af4ab63d546cae822b0df2e1e15745b9a032591fb999c93e1cc7f4fe3177ad41eed4a SHA512 6e1ea605acf67757d27f31a9c14771d3f7d3f71705f0c70eb32291cd87d4719d1cc7c854035118b11fef6f2c7ad28834fc7a2996bb68987cbfe754dae5bd0510
 EBUILD java-config-9999.ebuild 1104 BLAKE2B 830f732cd34402a73b926f689e7e2812b6653eba77e9a8989c89f62a56a36e517132072b1c3f8f2afef1dd48926b0449b2d6ac14d5efd4345ec20d005823e033 SHA512 ddfa3421ff2c657f49e1d5db449988e0a1156de2e232521193bc139f86852557ae91b40e8233fd253a6f758f996cec60d5a9746b1fe31193bf64e00ed7c6299a
 MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild b/dev-java/java-config/java-config-2.3.1.ebuild
index 87732bf9ecf0..51075d6fd153 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index 65156130865f..b81756c1de7c 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -1,11 +1,5 @@
-AUX javatoolkit-0.3.0-no-pyxml.patch 1128 BLAKE2B f0bad195ad20c5158f1ec84269b421f8664e46d43cff7548ab65139c9078a933d9039422be6c6c8048baec1ccdd352a9ee97e575940359a95fbc49e2690f70bd SHA512 edb135c6008a24d22bf5116bc73944fddf5a8c44354b80800425457c9c9ee8ef4f55413ca88507c991ed835945bc7d162f6b1b3a30c57fc5f41f278e0c5afe16
-AUX javatoolkit-0.3.0-python2.6.patch 413 BLAKE2B 0520b5ee7ebed18e0c3531d99d89a790d68277003713ff8dc9034adc2f4756b5f514ffcb464eb52ed827ad9d2e61d54ad5e4f401af4e7084c2a41fa591801ff0 SHA512 54df3c263a4b8f42457eb848f3fd79ef83953cfc1069c9229e339a178d2363bdaa636ec11ea49dbf5693c5eafe4d123942bf06f3b77b80b0cd8de2177045952c
-DIST javatoolkit-0.3.0.tar.bz2 16823 BLAKE2B a19307053e0ae4e2415449470c16fced90440fbc9f36d250be3c22a82b901b7f46486c8c7512784f9fe462bf3ab3109ecd7482bff13737a1c7dda57ef0aaf3eb SHA512 e7bbe04e39ab277d0aab89f0eea963c4b0341a336660dab08bfad0510ad1b2b49ce7410a2363bcf9ebad5f8757ee254ddc27af642b4bfb374db52d82cf02c3b1
-DIST javatoolkit-0.6.1.tar.bz2 26036 BLAKE2B 1e63a848ff5941e34fe5c4d449b5494cb9cc3e7a42c4654af94e602f3557775f2cfe1d2db7f96e1352c891e2c20822be973ee1246f879bccf611c4db724ca028 SHA512 ddf61c23f9a31007afc672cb762fd7a655c168d73616bc703a9a8a8c27d8a836b0340dd109af0c2a311e0237a57967785d85b09f8059187ba9b4a6ca6f2a52f3
-DIST javatoolkit-0.6.2.tar.bz2 26046 BLAKE2B 9e6eec5e055fe63191cdb67b7103c4f27df4569256da0e6231eece55f1d0c32f754b9b4784c2a7f79224404dea41d9583eace8aebab6e1e10bf0cfc875d74591 SHA512 70eede9a700fa8db48fef62116eff2cc89b637991c0691e5385a66ed1830788dff355c6f6d343533e58bd89bf1fbf017d5bcc6867f6d4cf23bd56d5ee857d145
 DIST javatoolkit-0.6.3.tar.bz2 26071 BLAKE2B 50adb0871e814ad1716fedec1e1429b1da69349ea502139bed75c175a89142e1f10abbecfb434875eda46e21c86ae49d273beeb5aaddd10a903ffe153a1adc4b SHA512 b4e57d26e30455587c7bc8273420c3300c1a776f3321d8ed36638f6aae41c13ba785b37650be5577908e24aa2bf4fa4e11d3157211dc64b6e3c814c4df3b7d6a
-EBUILD javatoolkit-0.3.0-r9.ebuild 888 BLAKE2B 046e65b74a8cf478d6c3bcda668c47be15818c63b95fd32b357b9c4a24d458d8be24a48937d4f4fab6326fe5ac4f649e5571049de74602b7d4a620f82b90c04a SHA512 73692e960858bc62c61aca95f224021552f74298a11667f1e48e0ba514fea47bc2e4118adcbb590b5e5425fda7b20a17d33e4e0ca1c931375a05a3b9fdc46f92
-EBUILD javatoolkit-0.6.1.ebuild 822 BLAKE2B 1b1908a5dc168629a445b7bfbf40ee96c36bceecebae3300423b52f240d14bb6990ae104e1df4fa185dc1ac397767823ca8bf0ab4a9f065642f1d3bcc976f023 SHA512 b4e4663a7f64f3c45a63f80385d71d8d094042c7e960323a8453d623fe360bd024bb0fcde639d1b27eb294fb5db00edf049060145e43e24dcd648ad78ccaf872
-EBUILD javatoolkit-0.6.2-r1.ebuild 833 BLAKE2B d9393adbe3a3ee7a6e48c2d8b4520b10a8da54da6bc0ba4b9a41f079417f85b9f1a41b63a37c46a7d4d31e3c20f5756db97b4b1bd0389ebeb9877cd19465fbac SHA512 dc16286fbb22fe7e85437f5accbffed3d909977ba77df8494dd6dcab584a3deb5f41de72f0a90b9f53766dec849ee48b9f9c3b61292f26b6e26cbdecf79fe3f3
-EBUILD javatoolkit-0.6.3.ebuild 833 BLAKE2B d9393adbe3a3ee7a6e48c2d8b4520b10a8da54da6bc0ba4b9a41f079417f85b9f1a41b63a37c46a7d4d31e3c20f5756db97b4b1bd0389ebeb9877cd19465fbac SHA512 dc16286fbb22fe7e85437f5accbffed3d909977ba77df8494dd6dcab584a3deb5f41de72f0a90b9f53766dec849ee48b9f9c3b61292f26b6e26cbdecf79fe3f3
+DIST javatoolkit-0.6.4.tar.bz2 24363 BLAKE2B a740bf92dfab4250033e71075d5ddfce1f049c225e05197eb5169189e4bb95982b3c4c64dd676f8a1478c1df13bfab4d16cbd822b4aa8472ab8aa7af8c7f80ff SHA512 e1d45b7f754680887296a7b3770fd371d91738f8e9b806dc37b6559a317ddb9646b113a9dd8715f7d5f2b19813d9a936ae4ca2d867fc6e0bfc3f131977ba2674
+EBUILD javatoolkit-0.6.3.ebuild 828 BLAKE2B b8284438bba4f9539b4435d98ca0aa83676f6a51ba5ea6efbfcc061990b128de0997f061f2efb0f3724729cc1079878c688f6cfa6b0159c519d5139ece1aa1a7 SHA512 a8f2167aac2ce4d33be6906250ed3e02bf2ec3a03cf28c4b6946289176581741d95c1836da783fdac9b90598e3e4552cd13b038660d8683e4e1b53d191fab0e1
+EBUILD javatoolkit-0.6.4.ebuild 835 BLAKE2B 5ea4e9da5188d8732efd7b2083f9602fc3819582ceabd8d9a73b2f166c8e26808fa0a5b7232a42d70b0be1a4d2ec46e166d4c0ab619e06252ad7c7cecacd2524 SHA512 a2ddb04978fb8b49aac4eaafe43293c4aded094d20389694c2f5a07a379b7abf83122b33ecfeb8570b8a6c96f18de02bfed5f04e1a3ba2850081c778fcdaf85e
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/javatoolkit/files/javatoolkit-0.3.0-no-pyxml.patch b/dev-java/javatoolkit/files/javatoolkit-0.3.0-no-pyxml.patch
deleted file mode 100644
index 3218d1702033..000000000000
--- a/dev-java/javatoolkit/files/javatoolkit-0.3.0-no-pyxml.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: src/py/javatoolkit/xml/DomRewriter.py
-===================================================================
---- src/py/javatoolkit/xml/DomRewriter.py	(revision 8310)
-+++ src/py/javatoolkit/xml/DomRewriter.py	(working copy)
-@@ -78,7 +78,6 @@
- 
- 
-     def write(self,stream):
--        from xml.dom.ext import PrettyPrint
--        PrettyPrint(self.document,stream)
-+        stream.write(self.document.toxml("utf-8"))
- 
- # vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap:
-Index: src/py/javatoolkit/maven/MavenPom.py
-===================================================================
---- src/py/javatoolkit/maven/MavenPom.py	(revision 8310)
-+++ src/py/javatoolkit/maven/MavenPom.py	(working copy)
-@@ -185,10 +185,7 @@
-                     for build_node in build_nodes:
-                         build_node.appendChild(plugins_node.cloneNode(deep=True))
- 
--        from xml.dom.ext import PrettyPrint
--        self.write = self.__write
--        PrettyPrint(xmldoc,self)
--        self.write = None
-+        self.__write(xmldoc.toxml("utf-8"))
- 
- 
-     def create_element(self,xmldoc,element_name,text_value=None):
diff --git a/dev-java/javatoolkit/files/javatoolkit-0.3.0-python2.6.patch b/dev-java/javatoolkit/files/javatoolkit-0.3.0-python2.6.patch
deleted file mode 100644
index d73c94bb6683..000000000000
--- a/dev-java/javatoolkit/files/javatoolkit-0.3.0-python2.6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr py.orig/maven-helper.py py/maven-helper.py
---- src/py.orig/maven-helper.py	2009-03-07 10:36:10.000000000 -0430
-+++ src/py/maven-helper.py	2009-03-07 10:35:25.000000000 -0430
-@@ -21,7 +21,7 @@
- import sys
- import StringIO
- from optparse import OptionParser, make_option
--from javatoolkit.maven import MavenPom
-+from javatoolkit.maven.MavenPom import MavenPom
- 
- __version__ = "$Revision: 1.1 $"[11:-2]
- 
diff --git a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
deleted file mode 100644
index f85943441ca1..000000000000
--- a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=(python2_7)
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 eutils multilib prefix
-
-DESCRIPTION="Collection of Gentoo-specific tools for Java"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-python2.6.patch"
-		"${FILESDIR}/${P}-no-pyxml.patch"
-	)
-	hprefixify src/py/buildparser src/py/findclass setup.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--install-scripts="${EPREFIX}"/usr/$(get_libdir)/${PN}/bin
-}
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.1.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.1.ebuild
deleted file mode 100644
index f1231d0905e5..000000000000
--- a/dev-java/javatoolkit/javatoolkit-0.6.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multilib prefix
-
-DESCRIPTION="Collection of Gentoo-specific tools for Java"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-python_prepare_all() {
-	hprefixify src/py/buildparser src/py/findclass setup.py
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--install-scripts="${EPREFIX}"/usr/$(get_libdir)/${PN}/bin
-}
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.3.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.3.ebuild
index e43396d777cf..265eb8295359 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.3.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_prepare_all() {
 	hprefixify src/py/buildparser src/py/findclass setup.py
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.4.ebuild
index e43396d777cf..ce3df6ba5a07 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="xml(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/dev-java/jbitcollider-core/Manifest b/dev-java/jbitcollider-core/Manifest
index 38ada41316be..9b93e2f70812 100644
--- a/dev-java/jbitcollider-core/Manifest
+++ b/dev-java/jbitcollider-core/Manifest
@@ -1,3 +1,3 @@
 DIST jBitcollider-0.8.zip 1192489 BLAKE2B cf30002394c83b6748d1a24f92148da46fdb1e84dc14f3b673ed8d3bd6ff2719b5530c890f21cc9e7af9a4553cfbb9cb606799606ea88b40e5b96e768b1c11cc SHA512 272e9e0e6e66d3ac9d17e17d8fcbed82b508e512c5cdada7f18c2920597f31ae5968509c9814c5530ee7c5bea9f3d1b049b922d55056637642bcb515b890a9f7
-EBUILD jbitcollider-core-0.8.ebuild 855 BLAKE2B 9e054a14a2334104483ab65aa63701e51a055537b50b8c6212a7cebf543117bdef459734eaa9f6684558a9378b654be319cfbf0ae2756f8ed67f0ad10dbb6903 SHA512 fafce74a6d67a07fa646f9c45fedc10bee0ce0e2a211a8d841b169c48d18a73dfa7fd1383acc80447c476f4a30bb5724b41db907d25f754a38b1ce6d2ece3018
+EBUILD jbitcollider-core-0.8.ebuild 879 BLAKE2B 743301c5756b2c20dc6411f97ac4c7a88ec6dc08ac80d2e1131ea016fa301de6f91bf7e8128d72f0ab3a94a72105c9ce9bc16422658f61d85529a522af6e9450 SHA512 01f646c32eefdd28a86113e72ed36eb722912155ce13e0e52f0655e2bd4dc6e965be26fb28d849e71a5624d0d3e8da32248cb9cde5aedb1b2a959a3a5c85fa31
 MISC metadata.xml 337 BLAKE2B 53a438406066fb18a0dfe2c9fc73241de197b084079231d4e22aa1eeb1874b306720d19b31369a716a78326518b926d1b35eb4e2541eb4412cb31eccf5eeac78 SHA512 0efda2836e8f84a62c04efad27a95620f4c91221be25ddc101852a7a2965e173bf728ad9474451b945d333990267f8aec331512bcfb32cf5a002164b01d9e296
diff --git a/dev-java/jbitcollider-core/jbitcollider-core-0.8.ebuild b/dev-java/jbitcollider-core/jbitcollider-core-0.8.ebuild
index 5ac725f32594..65e47747fcb5 100644
--- a/dev-java/jbitcollider-core/jbitcollider-core-0.8.ebuild
+++ b/dev-java/jbitcollider-core/jbitcollider-core-0.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 JAVA_PKG_IUSE="doc source"
 
 MY_PN="jBitcollider"
@@ -17,14 +17,16 @@ SRC_URI="mirror://sourceforge/bitcollider/${MY_P}.zip"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
+BDEPEND="app-arch/unzip"
 DEPEND=">=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	default
+
 	rm -v lib/*.jar || die
 	rm -v plugins/*/lib/*.jar || die
 	rm -v plugins/org.bitpedia.collider.*/bin/org/bitpedia/collider/*/*.class || die
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 8fbe06c446b0..24440d390546 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -2,5 +2,5 @@ AUX jffi-1.2.8-junit-4.11.patch 700 BLAKE2B 4533e3a8d6a5921b1e39ea20c9b4dcbbc66d
 AUX jffi-1.2.8-makefile.patch 1443 BLAKE2B 9accbdcd70c1c76e3f94a2131728fa83f7c988b5ce52aa7874d012700cfa4ed1cf3c3c2a281ce18c74776639e653f5a18e9c4b1d86baeaa9d10e577ca067e8eb SHA512 02f28b00e1ca6d16046c5f25c38268f78a41b5b202c4f284e8dac10dc245ad150f4639849c0af8c20f50dc3e7cf715bee6dfd2f1edc48496f822d78aaef01b39
 AUX jffi_maven-build.xml 11287 BLAKE2B 01ef4db6fef9d963bd52e0c15317ae836b629d9b22987c2d69a393d5513ab60bf2b062a083bb5b1a04301493c982f3926d5c9225972f7861e4ad668c9fc7a1f1 SHA512 56ebbb915d359f3eacf170d08fc1cf30f6efe900c91df0259a1fb69c6873ae839df829227b55e1538b4435387a82ec3e774180cfb531eb747e05a562aa7b97c7
 DIST jffi-1.2.9.tar.gz 1952668 BLAKE2B 320329b02ee9e93153fc334b73a6216da74ac2d924a64c8a1569f1f1507e1196d0b922f7d158ea91f6bc7164979b2ac12de239adbe98664a3708dd29c8d40f96 SHA512 2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4
-EBUILD jffi-1.2.9.ebuild 3133 BLAKE2B 1008f67f92a9a34efdc0d3c2236383702554ee83bc4d327de61557a7d70dab9bca2d1745807498e9b69e7a2f9221380f21090df11a60424bf2548d4865161d9d SHA512 d19837738e4db90dc762ea76e6e067e6270d6d11d8f50d72c52c18c542cac2a07bda089935fccd1c0392eff1b056097e5d3a1bf18e10a08de8bd0ced188bdd2b
+EBUILD jffi-1.2.9.ebuild 3132 BLAKE2B 9435a7ff901330d34f7703df0cf9ee1be5089f7e8eb603bc07017d96d5f87b956aa9f6c3f789eda3a6aa9cd4b423606439266b14f9c1a0486a4c23b623382853 SHA512 3c628345ae454ebc164b4ae6f850cc8f0593c81e25608fe1d0031759e1ef4a8ae5194d4e55b9ffa56b5f4660094f15352d899f29d64ca131c45fe45d607f2460
 MISC metadata.xml 319 BLAKE2B 999865e43b7f7ecf6784131fc903f80f208bf39dc54e96f6f80bd991998ab9694fb92ce8cd5e998a2e0800b64e47068859a7c63d46ea74294f1da77f1a18c46a SHA512 ed411e700c518b64ce76a437771c3a4779ebf47207d839924220ae6174ab7fd9cde92cd347c93b1916849cc2fb7fd4a5e5c29911420bc3485cb2916034d3f71b
diff --git a/dev-java/jffi/jffi-1.2.9.ebuild b/dev-java/jffi/jffi-1.2.9.ebuild
index 51bc215bdac7..27466b724b68 100644
--- a/dev-java/jffi/jffi-1.2.9.ebuild
+++ b/dev-java/jffi/jffi-1.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ LICENSE="|| ( Apache-2.0 LGPL-3 )"
 SLOT="1.2"
 KEYWORDS="amd64 ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
 
-CDEPEND="virtual/libffi:0"
+CDEPEND="dev-libs/libffi:0="
 
 RDEPEND="${CDEPEND}
 	>=virtual/jre-1.6"
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index c2a7ce38bfe7..618ed87d6a09 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -2,6 +2,6 @@ AUX 4.2.2-build.xml.patch 819 BLAKE2B 5f411361cd566360206c996ff5c2c508e829e41bb5
 AUX 4.2.2-makefile-flags.patch 925 BLAKE2B 642982867b5c187345123725f5e19bccb363915aefc5ea6e69f02e9ca86efee1e5f466c7cb9abf1b2871a735c45f8b7adaf999e42a351e01e515ecdc6648387e SHA512 be29adfff3b92875b38cf9bb326d935a189555bbb10315412b2544b43698cf76132554df64f28a18d4910ef1c46daf8b0a2ef9db7a9bca1ab53c421504187e54
 DIST jna-3.4.1.tar.gz 35285043 BLAKE2B 192f893f25c692a80d8b3ea0b469e951ef45ea561a02f1ec2ac8292f37ac32df468c7bb04211f1009314da4d7acba8ab9220114980b3f30b56af5f2310d5a18a SHA512 8164de9d213f670e6408627ec13fc128802351c2b906e1e1e95fd3280917ef1eba24d8b6b913a9df8034d20a5d46f6f823b5ee2d18b83248093a1855c89c5917
 DIST jna-4.2.2.tar.gz 58638853 BLAKE2B 3941202ad7839f748c65f1abf53a335f6de7959def06de27a30520457147af3f70f6de54d640718b8314f6e61ab61ee9b26c39812d5cb1f918b8ff714d6b902e SHA512 11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f
-EBUILD jna-3.4.1.ebuild 2263 BLAKE2B ecdbbf064945810575ce5cae385185fee2e3acf425bd127e75dad0181c3ecdacb7e937e5447172a66721882df8732e16d52df42fe6e18dd0fe48f98b9dac842f SHA512 51aca45d95b0bdd64ebff7d169ee212de37665565865f5081568481bed9045b4b1a35da0b525f8d8ecce27f1bab4fed97e79f5dd54556e1b1f3f6e4ecc4dc9b5
-EBUILD jna-4.2.2-r1.ebuild 2076 BLAKE2B b85f776feb0e705df3ca22af489d9095c30bd5085f08619de393edc8401ff4f1494d33988607b8c7cd815fd2ca0a03888723d87e93dee1a1d2a4aa85fb02fa8a SHA512 6b6485c517432b2e03c620dcab0fbec437dda6dfffe856b097d9bb71d9ba64a97609fd2f84afd152b14f2c3acc3c52ce67e701e2f026ceaff056c5185202c135
+EBUILD jna-3.4.1.ebuild 2264 BLAKE2B f187ffe9f1bb1040a145d08d453491ae715d2bd65a87968594e8e7789368bc65410ac564e998f05376099d22e5a912f7208b9d2a2204a88a7855f702dbb27a4e SHA512 a0a991c9ac5eb44d5084bc6b9914ae806504cbc59f75b41c9dd5cf9a1b975da4266e03479f4cd3dfac1f9905298352acb0b35ca5a722476bf2278fe5f8b348b1
+EBUILD jna-4.2.2-r1.ebuild 2074 BLAKE2B 369a4568ef98b6d6f5a343f51c8ed1f9dee9d8187e86f9390a55abd79341d9ba83ce7e2876683362e5ed7abd1caa174625ba533ab76ea21b6195e2617a6acdf4 SHA512 a4fb2be3fc96748dee4a18d87d201651cc5c22effb4014882e6836cae5a18ae866f2e5ea8d18973bccea51650a0964b9bef4da745a5f24555a0e2178dfef38ec
 MISC metadata.xml 462 BLAKE2B 7ad9e0cb48ce7fdfae4bdc10bf3cb6d6c25a7f86d62dbb9041d0ad2fe04409477eb27754b5f53218fba657f7ed77b423b34bea92bffb61c37ee2eefdcccc3a3b SHA512 88a027ef32c55e551625950ecb2efffc75a7611568f11a4abdcddd4fe24b894eb7d8fb805cba3fc0f79ddf6fae6116804790fc24b3d5b6097ade9ad92ed4c118
diff --git a/dev-java/jna/jna-3.4.1.ebuild b/dev-java/jna/jna-3.4.1.ebuild
index b1305657b0db..48d35ff519be 100644
--- a/dev-java/jna/jna-3.4.1.ebuild
+++ b/dev-java/jna/jna-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ IUSE="+awt +nio-buffers"
 REQUIRED_USE="test? ( awt nio-buffers )"
 
 CDEPEND="
-	virtual/libffi"
+	dev-libs/libffi"
 RDEPEND="${CDEPEND}
 	>=virtual/jre-1.6"
 DEPEND="${CDEPEND}
diff --git a/dev-java/jna/jna-4.2.2-r1.ebuild b/dev-java/jna/jna-4.2.2-r1.ebuild
index 4e55ccbbcd70..469cd1d2666e 100644
--- a/dev-java/jna/jna-4.2.2-r1.ebuild
+++ b/dev-java/jna/jna-4.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ REQUIRED_USE="test? ( awt nio-buffers )"
 # fine. Someone bisect it please. :)
 RESTRICT="test"
 
-CDEPEND="virtual/libffi"
+CDEPEND="dev-libs/libffi"
 
 RDEPEND="${CDEPEND}
 	>=virtual/jre-1.7"
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 78c1eb728817..0890e0065128 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -2,12 +2,10 @@ DIST apache-maven-3.0.5-bin.tar.gz 5144659 BLAKE2B a109f1ab8656d031c4c904b9972b5
 DIST apache-maven-3.1.1-bin.tar.gz 5494427 BLAKE2B 39b8b29a4747562d96231f575ff5cac2f57a5faee6e74df3054df3fd71b8ada691586def77df7d8f0ab88f4ba464a0d3ba382f3259aa19e2a80e1b1d60322221 SHA512 507d340930cc32268128e8969742dbba34a0144f3e7a561b45f71e254ebff2e6f926fd5c7925081fc94995c3f5b4807caf2204ab70297374857bc66c582610a1
 DIST apache-maven-3.2.5-bin.tar.gz 7956528 BLAKE2B 41313c35859946c8387b0e58f4a25b38d97d48065deb1db9ddbb576417beef1c3391e0a06526c51878f0a7e451b949f8f8ebc001611429b68332dcef24b594ee SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5
 DIST apache-maven-3.3.9-bin.tar.gz 8491533 BLAKE2B c6947c379dd2d64fe28eeab52da443d771c276553d40f70cced2637df17b18c95108932cbb88d4b747f6a8c0a47150849360ffa9095f6ce50724abeaa2369152 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0
-DIST apache-maven-3.6.2-bin.tar.gz 9142315 BLAKE2B f8b4ad4148a508b076cdb9f5ca322860157d6c3517c1ac7bd7d369066cc1567681761e1b638ea74f20461f8c111ff488e1478399a2ebfd406e91a10ace582d86 SHA512 d941423d115cd021514bfd06c453658b1b3e39e6240969caf4315ab7119a77299713f14b620fb2571a264f8dff2473d8af3cb47b05acf0036fc2553199a5c1ee
 DIST apache-maven-3.6.3-bin.tar.gz 9506321 BLAKE2B 45892ef05cc1e4578c05a794376fdda730a800070389a1be213cf58c8f8df87be5e22cb2e8fdcf718eed344eff3e133dc72a252b0bbb7dcaf4e0e184539f7b0d SHA512 c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
 EBUILD maven-bin-3.0.5-r1.ebuild 1288 BLAKE2B 5df56d1fb434fa78f2e31b706923a954f3eb544287ef2f2c903972d1f12b107c166b1415a04f9aadfaac0e1bd5d9c57b9227ee3eb1da8b950f4d3925f6f375d4 SHA512 d661caf7691165fceddb6b469d36ecc533b52dc2ee376cbc3bc1d158e5ea37f37c07212d6c6f79269d5101cf953c1b025b81703fc1a6493ceb88ebcefc9d652a
 EBUILD maven-bin-3.1.1-r1.ebuild 1234 BLAKE2B 4e3435b9bbfb4661f36cf1375211fc2818d0fcc937319bd918615c9ade29ad913ce570bb2ba3bb32a76bf52941a4e45c02c08a5617eac6f5745714ab1620e6f9 SHA512 d02c484ce95bff8e37d9c360ad49a987796e1332a7a9a33dcf69a7d472db4b50bc2f7f715c48786238b39bceac7ee707f690f47091aee290885703470b6ef114
 EBUILD maven-bin-3.2.5-r1.ebuild 1232 BLAKE2B 7e0fc95a813cd06342c77aef9aa137e06ac50f9dcd7089f175ece037583085f8d63fbd4e6cbdb3a0e779ce5eb018b19b6b6139aa8fa8dc80eaacae6561bf1862 SHA512 66a6e136376517e82b862bfca3033dcb92366bec865b51fafb19ce27a4e8d50e97ebef916b39b4c8438a69984698c71e8a146969cb16aa6a2d963675a054c992
 EBUILD maven-bin-3.3.9-r1.ebuild 1236 BLAKE2B 9641f5146ef168f7b1edb7616940f492011adc2d96d5c9852ec22171f2d3ab45452ab0ff2801348f82c726fe12c43160f2056b06d973b05c2d4f871e13d4fc16 SHA512 fe144d82cde207dca1b10cb072a747e8bc3649e493301bc9f45280e767a0ff85946f3702d1e86ea047a430fe8d088d2adae28a651e2c04e16a7f78e06c5f5b62
-EBUILD maven-bin-3.6.2.ebuild 1522 BLAKE2B 8bddaf9aa58bb4af704eae85e6bb1501aeb225c214936327a01eb2da6a54bf80123436511947ec94eb4a5358a528042b4cce4e4e15490b2214b25febde9bb910 SHA512 2ec374dcd0e0365c67256a7b7ab7b79207101c730bed39a0b9de1f569d43def4f8edfe092e26dcf3f70a0af871077f8aaed46905a963f4f0e85dc013080aa661
-EBUILD maven-bin-3.6.3.ebuild 1524 BLAKE2B 98e733774ff50a1994bfdff4e00b519a3dbcca1a6b0e6d8d43d90667cfb23d4c3f226f4c66205a683b572a947d17c162fe9a9a5ddef0cbd2cc72e502025da807 SHA512 b9c54d1c00454a8a78acb7e80b473502a5672174b440eb93617ec8ca0c7a57f7093d6083034e5534a135b8a57d46c994da481ee540383f565b73e26f8fbd3fb3
+EBUILD maven-bin-3.6.3.ebuild 1522 BLAKE2B 8bddaf9aa58bb4af704eae85e6bb1501aeb225c214936327a01eb2da6a54bf80123436511947ec94eb4a5358a528042b4cce4e4e15490b2214b25febde9bb910 SHA512 2ec374dcd0e0365c67256a7b7ab7b79207101c730bed39a0b9de1f569d43def4f8edfe092e26dcf3f70a0af871077f8aaed46905a963f4f0e85dc013080aa661
 MISC metadata.xml 610 BLAKE2B 84180dd51fc9e6b9089111a4f79aae2f2e8339a50b3db00cebb103714e7bb87c99a7fbfbd2401a5646f044b6d78cf370b1a1af7e524be91b7065176cf6b8673f SHA512 e761707a3985b90298ab8511d26458c9c04c7c1750b861f2c866862db07345d645953559b6ca8c1cdcd75c4aae1e84a7646eb376c32f0fe87427d4938d44a083
diff --git a/dev-java/maven-bin/maven-bin-3.6.2.ebuild b/dev-java/maven-bin/maven-bin-3.6.2.ebuild
deleted file mode 100644
index e6cf194b7619..000000000000
--- a/dev-java/maven-bin/maven-bin-3.6.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.6"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8
-	app-eselect/eselect-java"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-QA_FLAGS_IGNORED=(
-	"${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
-	"${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
-)
-
-# TODO:
-# We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-
-	# remove broken useless files (bug #734906 and #704618)
-	rm -r "${ED}"/${MAVEN_SHARE}/lib/jansi-native/freebsd* || die "Failed to remove FreeBSD files"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.6.3.ebuild b/dev-java/maven-bin/maven-bin-3.6.3.ebuild
index 80d5384a1aee..e6cf194b7619 100644
--- a/dev-java/maven-bin/maven-bin-3.6.3.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.6.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="3.6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8
diff --git a/dev-java/mina-core/Manifest b/dev-java/mina-core/Manifest
index d84945ad43d6..4c45ffc01624 100644
--- a/dev-java/mina-core/Manifest
+++ b/dev-java/mina-core/Manifest
@@ -1,5 +1,5 @@
 DIST mina-core-1.1.7.jar 272148 BLAKE2B 08017722d3e85f233725c0f3495372d4c189a18bea346ff56ab2911dd35fa65df3697101a577424c8702b4fe52dee2701a13bdb2a90f187ff9df0f038fdfa02e SHA512 44f2f94aa356ce1b4ac0379ecec7b76b15210e54314c911bd8ba6d48910415363c9a34dc50e29b8e04ad08a371398ad9e2a00065a44b71c25caa3ef14a72b832
 DIST mina-core-2.0.7.tar.bz2 1953751 BLAKE2B 973e7d67f2328a8bc9fec31f693280b7f640fc3856912e7186b9c7f1d4b506303c4857304f26138a07b0cc10b6e6ff7516be504388980e4042f0ac450ddb5fbd SHA512 406f5fe9c389dc0a2ebe602207e1c914fee308368d5a1e15815ae4c160a986a30a453a1bfb4e010452de87aa28a6817c02f0b5a669ad272fdf603084e994e57e
 EBUILD mina-core-1.1.7-r1.ebuild 507 BLAKE2B c4952376f87b5cc28d69f72e019ad3f0c6b628f72c3372f60cda7a4a3cc04f5ba4b74a65b3602d778edc72bda1a473da017dc5b29231455d66b0ce5544dc0685 SHA512 80b5b73bd90119d97b2344852e7a801970f540ffcafb90f4fa4c255dbac4c56d3afd3f017ce63a62500f342161720ac6521b376a620e94bc355f6c22bdcf6e8b
-EBUILD mina-core-2.0.7-r1.ebuild 700 BLAKE2B 3a9384b57f4531adffebbccbe5d13d789576289b4df876e43ea2c06093f78e3d5fb9af2e03ab54b44b961bb12ec24e695c698dba474f825cbccc12f63ed0cc31 SHA512 2fd051b46e9c29ae8a68dc3f89387e629ab24baa9a31ca22f336f029b55685b9fc7fab0e04b6697b8bb98a24d2008484c4a1e1ff070b07dc4e3e912556f42a64
+EBUILD mina-core-2.0.7-r1.ebuild 707 BLAKE2B 5106efd49f179bbb72aa5e5cb9c04fd8f96231400f0ee11348380935c531230aa460d67fb61b17b66a0185ed3e48bb131500d2e6a659f4a5e63e72807794a185 SHA512 7f8fb2ffca16e6fb671fa80f52c26cd57824566197d31bf6660991e3bbd8a18f5f6802551df564beda6ba7c48e9580eddd355d639f48f5b22a8881ba32508391
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/mina-core/mina-core-2.0.7-r1.ebuild b/dev-java/mina-core/mina-core-2.0.7-r1.ebuild
index 1f8be1737439..48dab710680b 100644
--- a/dev-java/mina-core/mina-core-2.0.7-r1.ebuild
+++ b/dev-java/mina-core/mina-core-2.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ MY_P="apache-mina-${PV}"
 DESCRIPTION="Apache MINA Project"
 HOMEPAGE="https://mina.apache.org/"
 SRC_URI="mirror://apache/mina/mina/${PV}/${MY_P}-src.tar.bz2 -> ${P}.tar.bz2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-java/offo-hyphenation/Manifest b/dev-java/offo-hyphenation/Manifest
index 788178938449..caec46feaea5 100644
--- a/dev-java/offo-hyphenation/Manifest
+++ b/dev-java/offo-hyphenation/Manifest
@@ -1,3 +1,3 @@
 DIST offo-hyphenation_v2.0.zip 858046 BLAKE2B 193ef92fd55a4c5e8f840d29f96417a725e678e5bd03473ff22a116894b94a40aee8b12ef7a0534020746f21db8304a2840ce09417f2182259c78a03109e63ad SHA512 8a907a38dcb54ef1578973293efa2fcd771e3c77faedd537381f04f6f543b3f04ff8b8f96fb692274e9fe9cbdb2d3d8e5c7b29caae412271d9d8c023c079421b
-EBUILD offo-hyphenation-2.0.ebuild 995 BLAKE2B 754a31b96ed1f845222c98e94198bdd425b341d85d32d07af2d5182e3648c23c57ba444d7225b1f803d881df6d77aab05684af34bb187a92225b8ad6024425ed SHA512 cc62e89925ef5cc9a91652b76639388837ad7b884af805d4e53c92b6bb1b95131182b82bd295658619aa3b537528a0b31da14dc2080cf53ab809a69dcea27cd3
+EBUILD offo-hyphenation-2.0.ebuild 967 BLAKE2B f06d2b76a64cf84408ee07996d5ba97b86a2feb353d22288698c51d0f8d7cdd7cc1c022ed5aac08ded07c94057560b6f766501f555ba99cfe778f3e0fe54f4c4 SHA512 a1950dd4e1d7dae149893e33bfb715d6899fd60c575ba941f54710fb39a47aa709e182dd7c86b742a641962469f7722e78269eea054f791575c41d808e0d322d
 MISC metadata.xml 310 BLAKE2B 29b282b6cbcd61925f963cd75bfc6cb5f7955593281bda8f327d6afad6762fca4a09e6a1cf4c2aa3abebb8fb323bff23fc1bb0cab5df6229ea62558d0f7c3485 SHA512 1f1c8172b99df046c63f3b23e7a0331954433fa05dfd106b8e97d5f6039635f378714ae49ddaf8b58a4512d3d1789b3df5798570619f5f241bbf564f4c5e6a03
diff --git a/dev-java/offo-hyphenation/offo-hyphenation-2.0.ebuild b/dev-java/offo-hyphenation/offo-hyphenation-2.0.ebuild
index e68c0ee10fa8..a70c0911e6b8 100644
--- a/dev-java/offo-hyphenation/offo-hyphenation-2.0.ebuild
+++ b/dev-java/offo-hyphenation/offo-hyphenation-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,6 @@ S="${WORKDIR}/${PN}"
 src_compile() { :; }
 
 src_install() {
-	dodir /usr/share/${PN}/
 	insinto /usr/share/${PN}/
 	doins -r hyph
 
diff --git a/dev-java/okio/Manifest b/dev-java/okio/Manifest
index e215e34be6de..1fae7157850e 100644
--- a/dev-java/okio/Manifest
+++ b/dev-java/okio/Manifest
@@ -1,4 +1,4 @@
 AUX okio-remove-maven-animal-jre.patch 1631 BLAKE2B e43c497a63d598ceb825716de40a6f1869e39a45eccbb4759c128805bfcf52a5b95658bb776299a32e7ef2970dc6466dcfb5d422032c460675d416ec2412fc09 SHA512 5bd6cacf2ca9cf51ee7b80fc5deead8174fb579dc3a8422f65b7af80492f37d24ccad4605896f0653984852db89c2ca9ce0b78bd0ea2630ad8c71e1808b9a3f7
-DIST okio-1.11.0.zip 147483 BLAKE2B 776b77f12d72eafd573793b3a7e146d042cd07c38bdc96dd549ce82018cf128e40aee0a19bf019ffd174d73e75b35508c96684d87f443e4fb28da2964276eb4d SHA512 c8f440284d683a04e3d75d6f6715e229c06caad5e7f2bc544348703cdfbd8fe5bfb19f0c316ea4cfb473a933b03bda2277de8c0b7c956b143cc04826e61cf0b6
-EBUILD okio-1.11.0.ebuild 752 BLAKE2B f3e34217c1887e7616852f54ab2b4a53ded8b3927a45ed699819519465d0b870312dc8b2404a3437f7b13452f36afcf651a35b2f018a6da2b988a6c2137732f2 SHA512 c2ec52ed00ee26e9e840bc685352b184da6ac7ae4c2394bbb89a8d01242bcee74c72ab2905f85ca57a26a56cde03cfc11de3603d65196afa536f3811e151afb2
+DIST okio-1.11.0.tar.gz 95398 BLAKE2B 6d31d61f1ac0d34289e601bdf4a35768f81ada35883958d0a7fddd6ba9fcbbe36ca75f87ad1879a207d3b587d22a096b41945102c5c8829b094e9954901fe87e SHA512 12b6d63cf037be2679c01e71bd6318ea1f8bd19f7f2a38f58c210d6bbb4650db6ba5aa527808c109ca02af2ccd663dc31102dd1b8ea6c6ce326dd7be7c1d8071
+EBUILD okio-1.11.0.ebuild 755 BLAKE2B 7777f501f8fe43dc54c5b24d1bca2bae4e2dcbd4007523eefc51354265b1b17b01f1c90f046670b7e30e0600341d723fecfb389f7ec55ef01b1835f9aa0e2a51 SHA512 7ae388363ea125b514d162ae30cf2600d9f80e21d8dc169ae7e408b0b63ccd79e9045b96d73f147d8fd35a2b28a6ad17007f1042182262c2d3708f2f57492413
 MISC metadata.xml 312 BLAKE2B 4d749d9fd3b69a6e7cd51d9c1c9fbca98d6d6363147f0ee55ff767a3a8880d53cb0f4ab41fb8338e2c2d5aa3234b28fa61608d2332fcf9e1491e9f411c6d6a25 SHA512 595713b72b25fddd2950c667f082fef0ce861354c44a878efcaf721abdb8761c2496a9b975c21824cfebdea6d9d4fc39560c2f8747a868ccbf08b49ff7dbbb25
diff --git a/dev-java/okio/okio-1.11.0.ebuild b/dev-java/okio/okio-1.11.0.ebuild
index ce07c77a5885..743f89f4b4cb 100644
--- a/dev-java/okio/okio-1.11.0.ebuild
+++ b/dev-java/okio/okio-1.11.0.ebuild
@@ -11,22 +11,19 @@ MY_P="${PN}-parent-${PV}"
 
 DESCRIPTION="A modern I/O API for Java"
 HOMEPAGE="https://github.com/square/okio"
-SRC_URI="https://github.com/square/${PN}/archive/${MY_P}.zip -> ${P}.zip"
+SRC_URI="https://github.com/square/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=virtual/jre-1.7"
-
 CDEPEND="
 	source? ( app-arch/zip )
 	dev-java/jmh-core:0
 	dev-java/junit:4"
-
 DEPEND=">=virtual/jdk-1.7
 	${CDEPEND}"
-
 RDEPEND=">=virtual/jre-1.7
 	${CDEPEND}"
 
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index c35d80374157..21f9341e60b8 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,13 +1,13 @@
 AUX openjdk-bin-11.env.sh 496 BLAKE2B 6a99de9730f8e84f6082a08fc925126a2fa1579f040b7f083af371218c4523956d5a86777e1bfbca7a63a717992d1a170d539d04f26f5317c3fbb9a14972c191 SHA512 94ec17c26c7305c57fb53356a4477711fd987c4d48af114f481579f316c20ed487ec40124361bd0cf2c947f59eaf93ca629975f9e999d47f5025269187db82ad
 AUX openjdk-bin-8.env.sh 705 BLAKE2B 0e155706fa9633a9a2e54ae2c9ecb95516c0b46ead84e24dc4c4d79a1b67644eedc6b97e6d4e17da4f6162e2ce7bfafe60dddc950e7f76a666af46920a8a5025 SHA512 ca6fc7b0889ae3d2be386696eadaf9f25fdedaf94cb24696a2de56214695cb0211226bc87671449bf366763f568229b22409201e532d14394c641164c48ffe2d
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.8_10.tar.gz 190206674 BLAKE2B 1e5ac030b23cdcd16e9efb696bf4f22da1178234241c4951b36d19e9567c8e838e99311be0aafe336b92cd5cecd2a53bb4dcfdd40f7ad13a26abaf41dddc5cbc SHA512 e81cc6a0d3aa3afdf021b8a5c39fc821827eba3010c437d97ad219336749b15cbb057bc92b129b0899da104066003554065e5591a6fda622b9852db2ad895237
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.8_10.tar.gz 182327847 BLAKE2B ad71bfd979f27ffd05abea804069402a7a47906cff70cbe68c29a8185d97043e4e28471d6444af757955c9be5d73d8d17f3f73120b8d2997dc5fb5b21f9045dc SHA512 32843b32d89125da14c8e77509e4dfb86b1aae55407edabb52a592a29ecb3ba17d300b91751f937189f370edfd57d60fa622cb9da2a9e190f35b219d0cd58774
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.8_10.tar.gz 176566452 BLAKE2B 584adc02d816cda72e5396d9e2a34768fe9c1ad3f6b37ad4b599ee45ee008389d7bec93ca983aec3e91995fa05548137f4ecb5c84b524333e0c7a35c5fc917ec SHA512 ab7768556488f0d13c3868e65ee22bedfaffc904d2b6af6d1c0ad48a382c2bc761dce99bd3a196e4ddd2a67f56019774a84edeab7db3e9e4650ef020f0d2e0a5
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.8_10.tar.gz 193398310 BLAKE2B 079f48381bf58edb7b9b75f4305df72184710c90101588fccce4edb0535b976b2f6332b66fdd8cf8b442eebbeee5a6044e0445519f9bbd8ed20b02f50e9fc203 SHA512 115b5627d6d1245f8393e3cd869bdb7accb42c35bc0e9030fb60701f61253ea8ce382edec75ded85ff5b0a0c8bbfbecdec81b16aef87fb6fc76c684628abf1e5
-DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u265b01.tar.gz 103150208 BLAKE2B 70880514e63402b740554cde3eba80106e2494d354751a620e54cde0376cebbf1ca5c2b10b0c340f59d9d1f390791c07ba39b13e72c938872e2a8b102b608f34 SHA512 37d9efe9c087dae9c180ee47e9f4f010e7726f4578edb5638d40ab4aea450912e3fa5e1d9254f6290779f43ffb5b0c6d1e3e9ac42c889b0c50072645deadbddb
-DIST OpenJDK8U-jdk_arm_linux_hotspot_8u265b01.tar.gz 97641656 BLAKE2B 76d24e975c2ec173b6b4806d145f79d02828e12e2dd412b60a921648fba20920b3b69b03630ece8d5cefeaf408dad01573b15db7f4a7bbdd024806a7b01bd6ae SHA512 8f96d73038579d2873b84d19bfbcc7f481b031a91c35d86d35e127951b6c743a6a1d5230a61ebcacddf854b73c55b18cc53112b9a2759b283254bf93fd691459
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u265b01.tar.gz 100453105 BLAKE2B e57230d5f90821cb8f4c35baf0e5a9580164ad7df10ac67a528b959154317ea14b7bc0dd5c530a2b826ab6322611ddf2387617bc8dd1f444039b00a778a30025 SHA512 6de5694d0415e905848cc99ec6863e96640fca3ded4e851528c794dad82a0961e097f64f8338304d9325357729ae9ea5bc5d2eceecefebdad69a14bc7b50194a
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u265b01.tar.gz 103157351 BLAKE2B efd8a4bcab5472c9775997713b09ab9e94ef4636564f07392263d6963850e07dc07569b2c066856846c16229f1641c169eecedcbb61533067af330262f07b927 SHA512 932fe2702aa3575bcb08d01e384fbd6a49768280931fdc1fb56314656343dc2f8e5b2650c8d72369d0294ac6024df0a142fd14cb0768f9aa7831aa986679e9ae
-EBUILD openjdk-bin-11.0.8_p10.ebuild 2979 BLAKE2B 079df8fd920641207a0f5473e1bf98d9ec399152a26135d77bb3a4890d773d270d3e43899327201b6d15e64075a34004bf00fbfa3f901eab877fe5286c23e096 SHA512 0b5c6642d6896025b6ecfbef4ab78c680391fd52b1b26a9cc3370403fefe0e83e5ce92c745e06b68a9ea96a72143c1827bb620fd9862a6819fb90d9b4ccfefcc
-EBUILD openjdk-bin-8.265_p01.ebuild 2062 BLAKE2B aa603f7bf1aa0dd9f1e236cc1ef1804c9aa860fae780a0a1d3c63ef07e2b369c0721fa36ee57259803579590ad421426ba117c4ce7bb2f849cfcac44558c9dc5 SHA512 17ee3f142dcfe56bd723654e701f28a74089d887f069f5eafe823c103542154d8c672636881b496b1d46b44bf766347cc93917677b48d027044800cdef690dc5
+DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.9_11.tar.gz 190728488 BLAKE2B beda483e90e733932ca9cf9631ae3f97b7106fd3c80b4a70465f9d32d52bf2ba4f395fa5ad7b08a4998e5c72f3794e0189750a883422aaeaf42877750d7c4647 SHA512 a9fbd1336357bf7880e6eebaab9649ca2b5db5ea93bb184e9fa682d64f18bfa0addb87de5a04e13bc337536b2edce5189bba703c8eb3a524567073add6d29a95
+DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.9_11.tar.gz 182835103 BLAKE2B 2b8849c5b9f490bf7700317525d3538ace19abcd73436a5c27251a282348345dba3c438c062ee60a2070f64c8c8e93a5d5d632a44f410775ed4fff1d691219f8 SHA512 707efc9d0660f0c06d4955e56761422b9da41b5afacfa337711c6a2500441f80fad1c65d8a4b0a1334ec6d5c6e55d464fc1cff1ade21e8cca42cffd0c161c1e2
+DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.9_11.tar.gz 177065013 BLAKE2B 04bb16a464a7984df770c52c5e2b8b1d9ec79142eb8a9c9a95a8ea02656b823a2505085e1521d94b9d994a1f5675fb524b917c9fdea46269e45a43d10c066947 SHA512 45619214cfc54be5b68e1ac8112a239a156be5a126631b2ff994a3b70e2e0aa899e5f9a4d31381eba2eb743790e4bdc2014ac342419a004502ce40945b3f4890
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.9_11.tar.gz 193980586 BLAKE2B cc927d923ca29ca41ea9cfc38bf07761904fb9f31fa59b5c882ec260d982a9af6c49034d80e6ed4d141c5ece1a1d297c3c153358ad940e61a4f667c53d6c040c SHA512 1ccaba9673a85287953a6ffbedf7caec4c2d64e0a121277bca6e40a6d47eaf414ed7470971f271e28309b97e95268348a7ad4fb2a03861eeb193d1f0536f2727
+DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u272b10.tar.gz 103598972 BLAKE2B 34ee2fc6a1cf23c9c04522a82f74ba60c53cc461e370c8aa88d6b62b4c4539e96d233a232f38390b9f0932768c5fb662a44e425d0f5bebbf982c657686b163d7 SHA512 5b44f094219daf383743d463c50917c2d60b289187e363748c3a4dc16471d84e4d28b6bc30879d137b79645f7ce977c755e8a5714bc272e012bce900f3db8ea4
+DIST OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz 99368824 BLAKE2B 970a0859a09002978b7603beb9cd94556fcdbb8923a88e48dca167e5ecc1495fddd00c786c7b9c0e608de48d485b2e8b4da7491d4e85e488fd1baf7ddc021951 SHA512 6974c06644aed4c7fb8f6004f4d8fd7790252e148ecfb3e1d29a7251429e413e8adbd910231b3cd5b9dd195a570b3fbeb95e6ab09b3ae318f3f842eb7ac418c6
+DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u272b10.tar.gz 100818464 BLAKE2B b2666ed3bf564bdbac874320805f622a1bd80809cf2c402ee393ed585c7ae9e7aa6fcf0e69f70fde16ef5d3a2059ff2979013865112c455cb64761c521a04578 SHA512 bfc138bbb979c23fdb154fa3f7e61ae71b0703a839c9495a470544205c80511ab090f0e52e228050e38606e24c2912092ef601347a9a3979f3a7a25d1ca15ce3
+DIST OpenJDK8U-jdk_x64_linux_hotspot_8u272b10.tar.gz 103650413 BLAKE2B 6fd50cdefa5daf6d155000b653b695511953d486ba9f4bf7426caf8dc6d7b7d3cf46c4426982a400c19a6fe0f6eb557a232853c3e4211e1961e8aa890c1721cf SHA512 22a4b5c27d2fad79b7bf8a8ae896a9b30e3d303bb4ca30611dbbb1f5811f4524a98c44a68c4546906f566b7d672f6ab48d10cf270870c1b86e7a7688d249c555
+EBUILD openjdk-bin-11.0.9_p11.ebuild 2979 BLAKE2B 079df8fd920641207a0f5473e1bf98d9ec399152a26135d77bb3a4890d773d270d3e43899327201b6d15e64075a34004bf00fbfa3f901eab877fe5286c23e096 SHA512 0b5c6642d6896025b6ecfbef4ab78c680391fd52b1b26a9cc3370403fefe0e83e5ce92c745e06b68a9ea96a72143c1827bb620fd9862a6819fb90d9b4ccfefcc
+EBUILD openjdk-bin-8.272_p10.ebuild 2150 BLAKE2B e5491e066b77dba9da871523bfbcda4c54ae8c1a81b714fecaf8e9dba08a4a13034ad512e0fa1bae65e4d6148015a8118a314b8fc1476acc1a66e9649a7545fe SHA512 406c0f47ec88471786a7742290ee20723b66e09fcff0ec867bc010085144a643d22cd69d208e1466f6475daf2a3f8e8878cffff03a392bfb6c988f97bc68fafd
 MISC metadata.xml 940 BLAKE2B 0b643a9707b0f85db0717d766c1491a4a6110342024a3fcca4455852d96c73e62e44607fdbc7f7069514d796134f1b0b82a36d1c88e166a4d2506646f17dc9f0 SHA512 990f19188c833dbcc6a4dac9f63e8d20604bf4ba1c74f6d42227e1f41528447cf5ea040b55cd813d073dfcd80c12f5ad626f97014fca99365fadc8539d446b2c
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.9_p11.ebuild
index 94b04394047d..94b04394047d 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.9_p11.ebuild
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.272_p10.ebuild
index 9374723c43ca..e4bdf87e57ca 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.272_p10.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
 
 IUSE="alsa cups examples headless-awt selinux source"
 
@@ -52,6 +52,14 @@ QA_PREBUILT="*"
 
 S="${WORKDIR}/jdk${MY_PV}"
 
+src_unpack() {
+	default
+	# 753575
+	if use arm; then
+		mv -v "${S}"* "${S}" || die
+	fi
+}
+
 src_install() {
 	local dest="/opt/${P}"
 	local ddest="${ED%/}/${dest#/}"
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 4bd833b31f70..a6e8a8e0da37 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,7 +1,7 @@
 AUX openjdk-jre-bin-11.env.sh 513 BLAKE2B b7dfc571fda637776479ca4f8a8f0eb1fa0f03f453b48e0079670aa20f5a5bc83ed73194508aeda596a62805e5a6273b4668b870d6b7aaa99ddc72498e384c54 SHA512 dfc012876174108b768d6fbd9deaf8b9e20965c2b5dfc2ea4ded556597c0ee4807537f7b29ca1e6f92ba800313457844299fab770b833d8b3a5b3d576369411f
 AUX openjdk-jre-bin-8.env.sh 675 BLAKE2B 66fb3b2690af2cb8bfb959bdd6edf66e130cd5e2c8968c96aa8d6cd09e01d193c6ab9973803e97105da4cb573b4221528d1cc830e044feac1b2c8ebe9f17d405 SHA512 ad361aeea566fd23fc21a607c9cdf63b164ad9d38a63fa01f435640af90e49cdb6562cb64409ab873a6603def04f8ecfc164340988c1a0660e8c6bdda500cd9d
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.8_10.tar.gz 42904191 BLAKE2B cfd04b2a422e95465cd2938449f7632d29fe655eadadf5745045db6eb74625dffa0e02d8713a93e0bc8fa7da6dc57116fbbd9217a9b30723becd5b9eaceefccd SHA512 55ab4c6122422f4765542df747bce5c65bc78e0e5f4fff4b7efc95342d81eb34d72dbdc13c820781c626f92a2c3687161d0c7edfbe4f83c455c75fcecf8ae3d0
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u265b01.tar.gz 41757024 BLAKE2B 39c184654dd5c4c17c617a48e962a392e3a4aaebe56a4286b6e5b0e980345b7260effbc54e2b197f8b747c57856e5260a048cf572cd4f375a2b38f3abebbde2f SHA512 01090a26bb18d226da19c82fca173f0d994ba56562178757347b565d39989b6735f5ff37bb22163c9ea270380fe922098bd0efa87d52615b50cde9f0e8291095
-EBUILD openjdk-jre-bin-11.0.8_p10-r1.ebuild 2659 BLAKE2B 64af93f9838f36e31f67aea9c0cebbe74932bb6f88eded2f2b3e5efc820808adabac60bf4b44276d305caf01803b3f36185fb2da0466f973bccbc035c3723c7b SHA512 a78a4445c19ef5fe09810f0ad2f00d072658d2cb82aa985cca995a7a69a52599f38785c43673f5cc36f4bb43e169491f8956682af38fef801b3c7648d6f3add2
-EBUILD openjdk-jre-bin-8.265_p01.ebuild 1802 BLAKE2B 290351a68bb64e3e4d7f48a8c5c2262ac81d6ebd9e48ef24a2248fa8463d0c8e0e303d4becff1f24d63256ee47d9518d69d989fcd5d4c14641606b29a604986e SHA512 90a02c3138c1bd1e55407a1f2a099b65905b67d282d20088b416065e8508e7cc8453b64256b2221aa5cfd55c1504bc7d582cd029a00e595fa42dfc599e200355
+DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.9_11.tar.gz 43086814 BLAKE2B 20785b5edb3fbfae99c7cdc76fba964a7a00eb148e68125138281c0995d6a82cfe9924c7f653dd188ab97da41135004546ec822bfa845f599135c8a9ec5e9336 SHA512 b0c53febc2628b91763cd5304cce782adaa71ff466c4dd9d056c7f1ac18e8f1f4ad2fc355882b2990fbd71e7792134697bcd1204eb9e03c12cf3b287ac33c3f0
+DIST OpenJDK8U-jre_x64_linux_hotspot_8u272b10.tar.gz 42139854 BLAKE2B 52e7a594aab1a70d351daf9dc42598b4952894a9a72ed996e261e347eece4337fe95c5f63850a0dde2d8862045d22ef41832a6af51df5113b81713bab20c797e SHA512 2fd45a9b967e96309c79724fea047d7c35f31da8e0290bd5cdafeea47b83941b9269129d0d557ee488526c0667ba581dee860381fc344374971e1005105db376
+EBUILD openjdk-jre-bin-11.0.9_p11.ebuild 2659 BLAKE2B 64af93f9838f36e31f67aea9c0cebbe74932bb6f88eded2f2b3e5efc820808adabac60bf4b44276d305caf01803b3f36185fb2da0466f973bccbc035c3723c7b SHA512 a78a4445c19ef5fe09810f0ad2f00d072658d2cb82aa985cca995a7a69a52599f38785c43673f5cc36f4bb43e169491f8956682af38fef801b3c7648d6f3add2
+EBUILD openjdk-jre-bin-8.272_p10.ebuild 1802 BLAKE2B 290351a68bb64e3e4d7f48a8c5c2262ac81d6ebd9e48ef24a2248fa8463d0c8e0e303d4becff1f24d63256ee47d9518d69d989fcd5d4c14641606b29a604986e SHA512 90a02c3138c1bd1e55407a1f2a099b65905b67d282d20088b416065e8508e7cc8453b64256b2221aa5cfd55c1504bc7d582cd029a00e595fa42dfc599e200355
 MISC metadata.xml 895 BLAKE2B 894e6ab5eb085e8f732946b64f5685a972919a4e715705420150e758910534a08246e3565521023f8b36d9d7030ec226f72c89483fe407a73d18594cd47b8582 SHA512 407d287db80d5d7d2139d2c0b1d478ab85dab99bb219bce49e8b3d3e6bb4d8c5efdf4a9bdd891e655fd29d70a885639eab755ed7a990b3429e4acf16fad2bc28
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.8_p10-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.9_p11.ebuild
index a6aade59d9e1..a6aade59d9e1 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.8_p10-r1.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.9_p11.ebuild
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.272_p10.ebuild
index 16aae21f0a4a..16aae21f0a4a 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.272_p10.ebuild
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index dd145904dc62..c277b18e26fd 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,22 +1,22 @@
 AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
 AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd65c64469b3a49a520686ff8d884c0b3d5dd9017ff4027d2fc1d78d57f062a4cf8910e0bab3ed444cc SHA512 2c65d1875406deabbfadb798501de15850775a4a049f073cdfda684ca1bff4b531b93596ee91a7caf77ff6c377457093f72c7bde4b995bce9ffbc4a8fcceb6dd
-DIST openjdk-11.0.8_p10.tar.bz2 91141175 BLAKE2B eeef0f6b6a8f804e043cde01de256c86ed35d5a391588100caea49c8c2b617c3f06aa37df894feaa89734e68c32fe28d8bc5337755050c457d657cf88fcff7f3 SHA512 f8fd26a11cb044197d3b04a1347e27e177e79cb58436e67116f63025a2a5c39c0083ac17362e7d2234caf89df530422ead088e3fc4546f8d9f68482fc75eb7a0
-DIST openjdk-8.265_p01.tar.bz2 456095 BLAKE2B 8de4d0293f3062583654da99a29d5be02197c323772f663d37ab21bdfdf32a723412d301094e6f70cbba99883241f52406a799a91c3d7c2a69ab7b35932c0a38 SHA512 686b869f9278462c6cb52036c4c9261e1689b917ce0afd4e6b47bb3d3207b2e79b2d03c2d3808a5853ab2fa070ac2206877849f5837282cb6deb80f610ba67f5
-DIST openjdk-aarch64-shenandoah-8.265_p01.tar.bz2 461443 BLAKE2B 169cc30062efd93e93a16c909494d5817e3f6108ed22d4cb09f618732b990091a47c1149fff0f3e5657c2e21443d357e5d11091ef1d4f8eb61a14bcc35d74951 SHA512 b85714731f9a102585308d2df5b271243b523daa7541635f5d4a22e7322890bc024f8abafbacbd1885c07cec479e00b5edb936936fcfefcfe0f6e2e6e2211689
-DIST openjdk-aarch64-shenandoah-corba-8.265_p01.tar.bz2 1050861 BLAKE2B 6803ee3ad1e3804cec3a1008f38538d793b2ae4f0a3c22d48d3c9885af37f4baf2ba94b91824e2e2bb170a5c9a59b28edc5d0c94646fd6265fe2b32fad759cb7 SHA512 859afe2ef587f7151a1fce4a43617a3afa0d8b9e04a07332c8a412b1b8deba4e00d7676cf1579cb2a8a18a307d094d22938ea9a3d70acb9094e268e701c35982
-DIST openjdk-aarch64-shenandoah-hotspot-8.265_p01.tar.bz2 8757379 BLAKE2B aefc9c9b9f5a369db14cc5a22ea54373518daf594b794f74533ea4365416b8adc91cdd6c79934d93f5e0f019d7b07723630f849ab93464d7416d15de54a5c65e SHA512 3f44dadc5a5d9a75d4b6b632991b9fbbcae499e19139e1d902f8f2df101141060bc063996e995b22c462c76962b1312e719495eae99b392da3080c7d875deae5
-DIST openjdk-aarch64-shenandoah-jaxp-8.265_p01.tar.bz2 2696501 BLAKE2B 1b1a459a4400d78c7921593a173059156b53a2cfc5fce695571e5c827bf609c08e02accdd56e1585723d50d93cae6ed0b5cef91f7597de21a16daa9b951046c5 SHA512 a377505e17299ba8fdd9e24fb9d3f786f1e6288e485319f2accf6abe9be957814ceb08c14867839bfd29690e91afb70f2aadfd9cc43db81e924960275792d61c
-DIST openjdk-aarch64-shenandoah-jaxws-8.265_p01.tar.bz2 2556505 BLAKE2B 70a963e625b04717a7dfd8f913d8dad20158abb1c7d5ea474c53692181d5ba099c9c6ebec0efa28d6732275d02380fda613ba446f854052476fdb2b8cd80fbaf SHA512 db06c192bc6b753209870dddf43d896444a1dddb0f04ddec6ec4317034cf8b33173ccfeb6e50f18f76d6f28eb93ca08d8fade299416d3ed2ccb9d65e03d867f4
-DIST openjdk-aarch64-shenandoah-jdk-8.265_p01.tar.bz2 48064316 BLAKE2B 9623b5ea954dfd4c732b35683f859bdfe823e8fe3697f859e73c220e2931e2047271a6382c096d29bd357c5b9f681ce85053cd349c44332db77a53232f56e748 SHA512 9b90dc0d1e7ba0215628687d0594f2e1316bd190b4ff20b22cf0d20269180a160e46810c7ad2bca43603283d3140567a1cd2a1c222a6ffc8c4bc413ae4da5347
-DIST openjdk-aarch64-shenandoah-langtools-8.265_p01.tar.bz2 2396374 BLAKE2B 0aeb7c979824773a7de1ff3ae5f0b47ee965011ff29144a1ff83b84f33bfbfe850bea32aaede1ac174ee9d6850a5bfb88c194db7e4a10b6c800716d854871fb8 SHA512 f97b21a5e369239b11ccb122b6256f1b71edec3cbc6d41c0bd90c43b67126846917c795ba2e954a62d72285b50d9bfa74748488a95c2d51aacebe78575ffd833
-DIST openjdk-aarch64-shenandoah-nashorn-jdk8.265_p01.tar.bz2 2831216 BLAKE2B 02eb3f916feacaf32feb75e4c3a6bb8915e4247dd07bfd3085feb6575c5152c41d0bef46bf51a8465a2555990a7f63315d61e1733d2f36a09293ec8bab30330d SHA512 610b99e04e0afe3fa78907af20d6d297896b9ab7cfbb5bddeefeb2301e733078b147c1d547cb5c3cb08b6f208acfdbf3559ba561b8a3907cf2c6506bb7daf08e
-DIST openjdk-corba-8.265_p01.tar.bz2 1034140 BLAKE2B 4b176bf2d9ff461b5682ad7f4b994091acf017df2caabf292dcda9baa34abd7d8016f56f2aff0866508eac565f4079e6f8ba8cbd8167abf1e38cd1fac727e141 SHA512 d92b69ab33176c29c5b7c0a5a21947d5d28dafa32a5933414bea5d16d4e68e1a381b2a73114952d507e7ee76c132e70dc8234175edfd3a086c4775417eaa7d9a
-DIST openjdk-hotspot-8.265_p01.tar.bz2 8204133 BLAKE2B 3c574da38c9c787e2b40dafa6d7885f9632804a158de26fb4e6f9b5266c955adad8adb1917043eecba97fbb1e53c063da08231e806f5ba8f6c0ef762e88c45b6 SHA512 a3fbc527456aeb8566db24f910e6a64f976e3434fe3717058ee91e66e88d03d77641d342801002f7fa35fb8bb94ce397c95ac2abb86c0616ff25f167878b478b
-DIST openjdk-jaxp-8.265_p01.tar.bz2 2735823 BLAKE2B 84a1248b4eb56f4afff62c5dc0f3517c98a6dc5c7e434012c667d59f05a1719372f68594d9d6b13c04e98887913a01b05eefcdadb3a028275555b2a9720502ba SHA512 d0f9da699d4141fa5535abbdf244b4da0fd466b8b5eca3fcaa7cc739326d79a5aa5ffac90988f8bedb39f80d7d4f1feaac3cf5fb1b019203cc96eae9746d9bbc
-DIST openjdk-jaxws-8.265_p01.tar.bz2 2543597 BLAKE2B c83256ab68837cc44d65414343d4bfa7d908926b1a092416cb16551593ed58eb4e28333a6e0417fdad7426ea2b648cffe9e8ef9531f76b7ff9a29851cb27918b SHA512 3a23ae92cbc1f5f47a1f2dffaaef1999acc34125176f67139040f17c3b6fe4cf78ee8c506a73c8fd38ddbb59bfb22c61f2e45ebf8739be7eb7df83cc65303433
-DIST openjdk-jdk-8.265_p01.tar.bz2 48017864 BLAKE2B b30a573a79a06abfe98e5963521f762e3517bda2bf6849af758285b7ea61cc57d89290ec47538b1082eea99646d3dd6295b98ad65edd62d1b1fd2480c0928a74 SHA512 44ad75bf3b3c6fd6b782ee5383edfa60fb49ac2e40493b18487bcb8a4dac926ffcf5b663adbb8d3267021bd47d5b60652771a88257fbaff77aa2e1f627252418
-DIST openjdk-langtools-8.265_p01.tar.bz2 2399426 BLAKE2B 550a3dcee38b41feaf8c5b6b88f700c52f870ed0c3f25fa23f34bb3f40c333965e911ac126f4b038057472acea2b684917692a6881e46e4aa68b05cd7e4346da SHA512 24d0978a8e6254a96a5399420831d320ea2b2f5b7055ceba030802b85fcb9630031499504ca72305361fa3a386c2ca0a8c38082ee2b15b8569fdf7e815730be6
-DIST openjdk-nashorn-8.265_p01.tar.bz2 2852124 BLAKE2B 380202d487e62e08784b7fd5cb720c22a2b93d802898b90bf2686bac803fe2bc41d8d4b3d56b45bfb45686a2976d208359818b17b96ccce73fd55b389f4d04af SHA512 12522a06f16f1c63d6b6df525011d01ff91ba05f06ee7ade239faa31527ca9aaa9fa609c1ad261f0ae8d75cc195fe1af66e026815bdc0669fb6a286a49f86a5e
-EBUILD openjdk-11.0.8_p10.ebuild 7665 BLAKE2B 087fead2616959a22311b7749a05ac3f03b3bcce437bc2717440e1ce128258df7cd31fcc94c5a6087270b50ec52b8e7a9039d2788f0eaafed579dc1d437d7514 SHA512 0efd99c0557f17e643e6bf209212fa5541a7a28ae48a006238c50a5fdf376215ae4e530473cb528d5f6694c32448fbe3b26d4bd0ae615efc8bb9e148c0464858
-EBUILD openjdk-8.265_p01.ebuild 7165 BLAKE2B 8d7318c14d51eb2e3ba3bd6f0d0074142c5afe47e8b7a24f13f37119d6ba50102531c16860acae7e95238ddbe1102b1467c7f41cdb34b26b2b8450632d445701 SHA512 0a92e089258ee125225c6baed40cc0e132a193912491a25d5c1f8c22f62b3f26aa5e0a0056b226d65ae933c4eeac18d60db254d4489c9e758831313446fc79b1
+DIST openjdk-11.0.9_p11.tar.bz2 91638327 BLAKE2B a04b7fb5ebde3b6c024e5f3931a2efe796e08ad66c0190cddfa4268d5181f46f24685d9d51ae328547916e8ece723967bf653feeac87347ee14ecbe213ad657a SHA512 a0a6726d5adbe95904b78d8b4319bc4386c594a563f80f63d59072cf72d00928b451163b91258b44193a80851400ce8b8d142fecfd2bd902ff7a5e47cb4a9976
+DIST openjdk-8.272_p10.tar.bz2 457222 BLAKE2B 51e487d36c1922c5fc04d8922f1000a776e4872142517933ef5e8d5fd825f221fa02325bd755bf3f48f7f3221a2da3ca182301fb303675cb7d712d7b2f1c7751 SHA512 488b7fa0ed725936d483efd54242dbf4409752c685f29277023fb47c4375b5700b34e743d819d7d7c2406a2f8845d1c3d4fc548c156b6c7c30e43574c1b51527
+DIST openjdk-aarch64-shenandoah-8.272_p10.tar.bz2 462755 BLAKE2B abeabf704d2135da9df6746545209f5a658ec547be5852041bb9bd1dfc4546cef143541df61b4705b6d2181ae7ec91a8c64e2b27347c24d146da49bbf8c228ef SHA512 7cae0cf80e09e1d2ad3eef8bf6740942788d0af4d3c9821bb0785ea42d4b38319d0ec57a8d21add25a40eebdc5ecba8234c9f04e6922e87c80480f71b04e2e3d
+DIST openjdk-aarch64-shenandoah-corba-8.272_p10.tar.bz2 1052989 BLAKE2B 8d6f79758ccf1719396fb56fd47c258c2440beea79516025b4911027a59b6cf4b5826c5eb01ba3a4c45847915531989c74665cbedf6349541df38732e7b828de SHA512 12547c8b5f1fe4efcc58f5b148977d519c954b964e814fc3fce717bd6d6221c2e7eda98a0e1e8157ed2f509f3b89e1e7b529da81cd1ee768daf4ad6369c57e8b
+DIST openjdk-aarch64-shenandoah-hotspot-8.272_p10.tar.bz2 8767088 BLAKE2B 85b2dcbd696c58db72a7aeb4dc9a4752d742ed90bfd2e06ce5ddd8ed4ec5c63ab2de40a41aab5747fa120d8865c1d57f02a99b27a6ebf7c68c0891e19f5a7f27 SHA512 7866495487b271228f1a2d95cecfa6b76bb912d8c1c63d3d92e7b2cda88dd151b3b6c4c3bc717e37a0bd972762620ae7fb456c1aee281772a145a1dd1b11758b
+DIST openjdk-aarch64-shenandoah-jaxp-8.272_p10.tar.bz2 2718084 BLAKE2B 1e6cc999d84a49c03731a2a2ca73dfe684940509a64199ad52571ef51b3da035e41b41bf262ea88af9f77418c7b1b5721724d86f67a5f737e53eaf3673f4eab8 SHA512 a73e5a4628c936cf9b19082ad49ed2134984d15a1165c45206c74dff45118c50922fd0a668efe93a46c3839775ec567d56eee19cd0e3a9f90e7995d1b6a42f11
+DIST openjdk-aarch64-shenandoah-jaxws-8.272_p10.tar.bz2 2558262 BLAKE2B 3b00ca162f3b758ee65090011551f074f7675f499f179ae0d4c8c62b1d70c942d7d2082d48e84cece6cd2be7ea319c1707fc6239e82fd5e79297f796838688e4 SHA512 d64a15cf35df014c4dca2edddea2015905bafe252d3d2bdfd1bc8f72683ac827e5d0347e36d5d94cda354b31a6b0782017b1cea6571443e073caf9f26c7bebda
+DIST openjdk-aarch64-shenandoah-jdk-8.272_p10.tar.bz2 48370921 BLAKE2B 98026a28463ce3f520feab2b146830bf91acdccac5aa28488ffdbe4328b9a2cbbc17e95eeb36a60364cab470eeb26efcfa06a588e1bebcb6e978821459536feb SHA512 1bc5baa799282a2d7c0014d2cf55b350c7d99dbd129643d2cfeadebd467b2f6f9a8b8a97d34f66c656103db3ee3d5a57d6ff57dc45bc655258dd5093506d89b5
+DIST openjdk-aarch64-shenandoah-langtools-8.272_p10.tar.bz2 2397200 BLAKE2B 1d985e852f07ab69e0af01a17cc3874cf903b1e3e2c4a909b7403087b3243beaf57a1e9b7792b52469a80764c7db614e3bb6ec4b43527d022219f3e79af21457 SHA512 76118b6c56481bcd3a6a709006d0d114faeef2b2a3c353e4a5ef2af5f03429dddd78d2d5951e9245fb5e41443e871e43634921825c0dbae8907f3f49fb3dea0c
+DIST openjdk-aarch64-shenandoah-nashorn-jdk8.272_p10.tar.bz2 2838876 BLAKE2B 40d011a11122b2dd19349282468c756a58afbc1ff2a33424d6c4e82cde1f664e3317eb1616533b0d2bc24604c68ffd0b1b92d3271dd633f3a39aad22c84ca781 SHA512 1f50c2c1a6a5d271d63906cb1cf3e87d7b6fe61e92c90cf2974ec40e956be0e8388c2694d189c85ec7072abfd21566671498b8652c2ae9cb2021c6ec4d548f66
+DIST openjdk-corba-8.272_p10.tar.bz2 1033649 BLAKE2B db9d72dabe4b1727dbbe1de01e46f62676c48668e7ec960e10643c19374a2553dee3c2b5b576f85d09b541b570756b20980e1307fc614e4b4bee9789affc650e SHA512 1426b3ce6983429fe6399da77fb102fb5d54ebf65ab83ad4e3c0ee789e33e2a0afc1bbfb7b8f942334ff9b03be0696494919c374ce1b793b179ecc43e2c4384a
+DIST openjdk-hotspot-8.272_p10.tar.bz2 8206390 BLAKE2B 6822635a29f919696c7a260bf7db20a749ec8598e6c751a8a5e3973c780c17f3ff16a1ed64eb44353be72136fd1ea945dc6620f18d0d876a5773c897bca8705f SHA512 48444d86bacaef503303fb160dca538546e74f7bd71fd34fc2b9faa4e0b1cf7710a6262e9ead161c1b0e8e02e8f96e56a6407d442bbfb01ff8ab835cd840d834
+DIST openjdk-jaxp-8.272_p10.tar.bz2 2692905 BLAKE2B e8fa9e6a7fd4c4ebeba82a3c55b17e4eba9cb03660baa8d478a8cfced1ab9673465faa1a0f690ebbe2634b2cf2741d7321f2c20c748339237eba7b772a2cea14 SHA512 15efb3db0dc28fd375d769037f248b3527e40d2c190fed57ca1d6a09e59aa79465c0e6516d2a122f6c7ee55f7cfeadaa76669884f74fa34b11ccfdfd76e71f6d
+DIST openjdk-jaxws-8.272_p10.tar.bz2 2543199 BLAKE2B 3deae4cef17a5f3d513c1a748a72b50bacb3a0d9b6fb33e5ded121f4d209cc2eb2d59d7b7c182015811426e49eb3e2b463279fa201992c51a5c4a94a184931c9 SHA512 51c0ee76a7e0587ac9c2533d62717f24224ec8bc643df6af2e2fac89cd79cc4f228c7c57427e43f354a594568d16bb5bbf3295af9ce52717339c35b56d6c375a
+DIST openjdk-jdk-8.272_p10.tar.bz2 48273590 BLAKE2B 80717a644df7d9741e5786708c816483f4fea1cfeb02438df17fb4183c0702fe6e3fcbeaefcee84a4f847d5cbafb0a9e80af63b56cf0c6381e0fbeb535d2f147 SHA512 85d20763f6cda66f2eac3b2a1e672e6b828c437386575d16a1c70b27a56c718fc0f44c712e6261eb89f6dd273fd2c21a2c4baa3f562cafa2911a5e2467d7ba13
+DIST openjdk-langtools-8.272_p10.tar.bz2 2399755 BLAKE2B 34ffa30993fa9f42ed2fa96ae658c3c43ecbc54750c3b854cc90efdbd3c4d5abdda012d55c4e81d4ab805d9184b5ea7429fba5927bf3192fcce2a17d9ef11744 SHA512 54698e8a74119f39971024ee165707fa9e27cd0008b59801f05a194362d723ba67269b1f34c181e2a0b1ce9cd36f52cf3ad3ad980c4670f7cfa476a0fa78fec8
+DIST openjdk-nashorn-8.272_p10.tar.bz2 2850055 BLAKE2B 2348c0f45916101d9fcb4aaa283d2c03be5b28decf12248ec930b9d726e346d0884dd64a22627e2f2fd8260c8755d0bc46a1cf6fecf691a30a7f4b54f6a293a9 SHA512 754fcdca5e0ce523d73cbdfbdcaaa13677ed8c2b72c5ae04ff1cc77fd73469f3366e51add68b13bac3c43800fecfcbb93bf4fcf7469258c4adc57e414b105ef5
+EBUILD openjdk-11.0.9_p11.ebuild 7665 BLAKE2B 087fead2616959a22311b7749a05ac3f03b3bcce437bc2717440e1ce128258df7cd31fcc94c5a6087270b50ec52b8e7a9039d2788f0eaafed579dc1d437d7514 SHA512 0efd99c0557f17e643e6bf209212fa5541a7a28ae48a006238c50a5fdf376215ae4e530473cb528d5f6694c32448fbe3b26d4bd0ae615efc8bb9e148c0464858
+EBUILD openjdk-8.272_p10.ebuild 7164 BLAKE2B 93f12c6c6af373829ef8286c3c73320db3fd7bba15cb242986ef59c139645bf6801f0b90505f2e5be1a2ec6e3d9f66cccbae83aec23e2c8f2617765f3276ed5c SHA512 8be4179f609e0e75a8e6bb867699fe4052a2d07df79377247055100e1d8b4691f958f289114f6dc8bf9356678d6b94204249eb188827b8c4029521b28b1d7f35
 MISC metadata.xml 1432 BLAKE2B 36a11642c99127a5f97fc0b095a142705c6b4e077ed24604f1886e4d1beaa47b4fa30359600797d5e6a085befd11a2851196fe97a75a0f0907461679946b4cbf SHA512 ecc66015da3a0fc616b91dd5aaffb5b050c9f66e936cad02ec12fb56dd7c6b3b3c331d8856402c0deee16c415ea083e088cce7414703f9d659f551883b055ff0
diff --git a/dev-java/openjdk/openjdk-11.0.8_p10.ebuild b/dev-java/openjdk/openjdk-11.0.9_p11.ebuild
index bce9c577d492..bce9c577d492 100644
--- a/dev-java/openjdk/openjdk-11.0.8_p10.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.9_p11.ebuild
diff --git a/dev-java/openjdk/openjdk-8.265_p01.ebuild b/dev-java/openjdk/openjdk-8.272_p10.ebuild
index 93129b459fd5..3ada98beb8d3 100644
--- a/dev-java/openjdk/openjdk-8.265_p01.ebuild
+++ b/dev-java/openjdk/openjdk-8.272_p10.ebuild
@@ -43,7 +43,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap +pch selinux source"
 
 COMMON_DEPEND="
diff --git a/dev-java/oracle-javamail/Manifest b/dev-java/oracle-javamail/Manifest
index 29c8a03bd5d7..a5de7c0c24c2 100644
--- a/dev-java/oracle-javamail/Manifest
+++ b/dev-java/oracle-javamail/Manifest
@@ -1,3 +1,4 @@
 DIST oracle-javamail-1.5.6.zip 1812631 BLAKE2B 9fd43058b10726db9359c4b59fd42226da329268ec4974a510940a4e7d6bd16afc3a3a73b6ee17914cd5d3577c42ddf22f29bc93e2ca185660ea03196ed2bd28 SHA512 3fde7901f5975f4a58d675d94e397bf1a169db227b138bfd684c0e2d0f6522ea1c8e2a5425b23fc08775a6824a9e9e68b2d6e6312f20c53af127f00a897363e2
-EBUILD oracle-javamail-1.5.6.ebuild 1258 BLAKE2B a275dffb12bc1bd57feb8477bfab10e51959b3b0ede40e3004b406a24e18a8aba23e2dd9540453e95bae31408714f32c4944fc2e90a382bb8ed326c3480fba1b SHA512 4b4b4b29779215c8502501d8eb823f42aedf43d4020ba8ac90d39630ea1643c4f36ac659b7878a406704df76320d38e0b6dfac7ce1b2f5a32198e5cebc1a4c10
+EBUILD oracle-javamail-1.5.6-r1.ebuild 1327 BLAKE2B 6c9f2a14dff965fb7c797f0cf531088c0a4e216d01af0857d9747a352670f684276c674967f969754ddb03fb016f2075f026ad993fec559d40c79fdd1d924628 SHA512 5f7ca1e1d8265a60d424b9e96800e23098362bf71182d079359171dc6c6ad421b80677742ef1f288f9952528bc626e0bc0487d675c04fe7495708c8e76da32b2
+EBUILD oracle-javamail-1.5.6.ebuild 1278 BLAKE2B bfa5841cc6141d5ca53a6a61d5398c3fd4af8826d5ec923d5539194de901b624c286f50620d3e232dd46c2ae7c1d3ef6f7034bc0eeb273ac3c2b12bc66d4d1f7 SHA512 eb734778ddf1d7476dd379cf2853158f4384149d207dcb56e682e8fdad6fa2ffe43867887abbe668b9e404767888fb5524b52681e82cd4a639f9a9304097fa31
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
new file mode 100644
index 000000000000..1bd60ad7f79b
--- /dev/null
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java-based framework to build multiplatform mail and messaging applications"
+HOMEPAGE="https://java.net/projects/javamail/pages/Home"
+SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-${PV}-src.zip -> ${P}.zip"
+
+# either of these
+LICENSE="CDDL GPL-2 BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="
+	app-arch/unzip
+	virtual/jdk:1.8
+"
+
+RDEPEND="virtual/jre:1.8"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	default
+
+	# build.xml expects it here
+	mkdir -p legal/src/main/resources/META-INF || die
+	cp mail/src/main/resources/META-INF/LICENSE.txt \
+		legal/src/main/resources/META-INF || die
+}
+
+EANT_DOC_TARGET="docs"
+EANT_EXTRA_ARGS="-Dspec.dir=doc/spec"
+JAVA_PKG_BSFIX="off" #https://bugs.gentoo.org/698954
+
+src_install() {
+	java-pkg_dojar target/release/mail.jar
+
+	dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt
+	dohtml -r doc/release/{*.html,images}
+
+	use doc && java-pkg_dojavadoc target/release/docs/javadocs
+	use source && java-pkg_dosrc mail/src/main/java
+}
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
index 7343cc9b90cd..cc7c61cbb4a9 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
@@ -16,7 +16,11 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND=">=virtual/jdk-1.6"
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.6
+"
+
 RDEPEND=">=virtual/jre-1.6"
 
 S="${WORKDIR}"
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 3a5afcbb6860..244f12bb7a44 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -2,9 +2,11 @@ DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b
 DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
 DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
 DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
+DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5 SHA512 9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11
 EBUILD protobuf-java-3.11.4.ebuild 1406 BLAKE2B e340b1b5f90c401c29928ec99e4214f1f59dc20e759004af30dcde4d1666879b6399addd932dda56311c3e1aae258e4f7708edb4ce79c70e6c191c496a56510d SHA512 6946b5d21e0f6a3e79d324db108a425ebdc1517eb39cd89574a088814c0e87f74ef72094545a1860e2b8e86a14c1e9a61824c1171e39f0975ef05e74629443f3
 EBUILD protobuf-java-3.12.2.ebuild 1407 BLAKE2B 8cb3425f46c6abe6e0c45b8ca5c0b6e460f99b6bfaaa5e505364ed75e7da2411729c84ebd0e9a4cb082672c04f0cff74a025a43a3f9ca6f3746e75765b393e5f SHA512 965bdbc69bda2810a809672bfb1c35bd58bb89d9bc9abf3e959d42385d82745abe5a15eaac50c7ee7e3ea0306e29e70fc36d9a2d8713d07b95049d43297264e0
 EBUILD protobuf-java-3.12.4.ebuild 1489 BLAKE2B d614cccadfeb776ad3a0ce67472a15034c89f07102ae766190710b89013ecae6bc7eeb691f37fd08080bbe2a4faeb70b669f822ee06078a680cb0e182a785d47 SHA512 a647dab84ade743212c3a726391023b9e2807017f75727df7225c7249af0a4b8960e9f6af6b3fe74bb4359501e0ed33c253a751dcfb17e6a657ddf0f428221cf
-EBUILD protobuf-java-3.13.0.ebuild 1491 BLAKE2B 89744945affadfedc119a4f3cbb81d052a49ac36637b685ecde9fb624517c983c94e7270d266db29407f1eaa32ea1c423c733176efbfb28f54d0cc41d473b0a0 SHA512 df3c43ad470392787c3a1f014d985101bed023fb47e04b1b1e0caf491a7bb24901f3ab13a400cc5ad3b5eefb87d528fd1b679de8d4a9679850f843fbf7774dc2
-EBUILD protobuf-java-9999.ebuild 1415 BLAKE2B 4c53b7d0594d82a3a0e6f2e2420a88855149ea7964bb5e9143e38f6dee438583e1e60a9e8b5c8dd011542512e7f62a4eff213012a9cd7fb3f6db6c3bfd1ffd9f SHA512 ee91c5417bfa9e26df1c83832babb9e0aa51cae7fbef8b1c22aa84cef538442d06c4953ee076a951c5d4843be265545ec1305800a8370aa4016021a690ff5bff
+EBUILD protobuf-java-3.13.0.ebuild 1488 BLAKE2B aaf459f56556a36f440b8d413100220035022d58f4354e1e301012d389a23f10e96cae3b1a48d028e7bd8392bae5057db94509b70c5b14aab191d0420235ae76 SHA512 cf0c8d423649de8dadc62867a40b83bf4b98fb66b65c9c82f956dc9c101d5eced3e2d9dd6020eefffb887d04bf9fd690106ce899e14d5bd96f4159f801d76c7e
+EBUILD protobuf-java-3.14.0.ebuild 1491 BLAKE2B 4215a44b5668a2ae9b96370a6b5ee5b4faa9435f6e64cb166b275813aaf5328b07cf29603832c024e985cf5f0330fca6f796b2f3eee4ff002e2cc0b1cd721d4d SHA512 93e50be3da3a650a971dfbf40da425b3a83aaa8d5307324c08d0af8cc41e0b28fefe3c7305f7cf377bd618d8aea5e77b65f22cb16f9dede641d9aab82e18141e
+EBUILD protobuf-java-9999.ebuild 1415 BLAKE2B e5d0f477b6bf5ba696b07c2ea7e85c56d47027f42041230496c76705e5df4a986278fe08ea5d802e25595bfdd052a9a09435d196bc8eee67b5993bf3f6a8a452 SHA512 bdfe81f22c4a512704e5b41abbb84bb9196552a38f4df0a305a6a63a80383a9bf33f62dc48230ca39befa734150443d5e7415bf328e3c6d7ec4b1eee9c09f293
 MISC metadata.xml 535 BLAKE2B 9a137dca0f060e7fbede894aefb4dc4d05d0264cabc4dbcf65c240c6b9f130ce0a4287eedd0306aeea8d76009611d61ea4ab472a3163f93fddbeec8830e7bfae SHA512 22c4efebb2ac24924eff53af66c8a77439a8743cdd22636d1fa78b35482d0821c1fcf79268e75736a742da52b8c5d4a402ca8befef269436013bcdb8591fbed8
diff --git a/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
index e26dfe9374b2..8cca8e54e398 100644
--- a/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/24"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
new file mode 100644
index 000000000000..3f0a2dec4807
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2008-2020 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 ~x86-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-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index 8f4365200b10..afc573227167 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -22,7 +22,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/24"
+SLOT="0/25"
 KEYWORDS=""
 IUSE=""
 
diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index dcf274366141..87ebab437007 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1,6 +1,6 @@
 AUX jflex-1.6.1.patch 680 BLAKE2B 2dba9bdba8ce77ebe28a608b505891ff49d51e9d7549bb17f21935ad9511fcdf4428a79b5243e5eb8cfb5747eaaaafb97eb6edca980ce337d37ed48772ff5ea5 SHA512 73e8067a31392a1975877470a2a239c9ca0913f807faa3e5c660bc2487dca9a46c1753ab86526e66581111fcded89229a4e9e3a16fa787ce3669ef6c07a28081
 DIST qdox-1.12.1.tar.gz 519833 BLAKE2B 83a732f1582b714cf943ede61bacc5216804c00cfbb642a479afb74739564f4fdbcd923dd7cb84a9626a97c5ad0a0f04895e0ae68252891cb25299e1fe1c9c72 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5
 DIST qdox-1.6.3.jar 63731 BLAKE2B 77d117f0f76f531f9320b5eb3650db315aab838d5d79a9df8997649b498b375db3fb0c694ea8b5911512097dd2325554d7599bed51a978e38af6fa55600d7c24 SHA512 0b05620809e3830c7e12c289cd4765f96d845adabc1f09497993bd9f39852784f454eb4aff1deecb325608a5773e86fbb1f5863e0f25387805472b59b46cf965
-EBUILD qdox-1.12.1-r1.ebuild 2186 BLAKE2B 1e382e501f402279c3986fe567a951fe94383768c25eb2f4450b8d3ec51f6f05f09c98a7e78b97416399a7a05b614c72821e7fed36e0eda43388b2eec0665707 SHA512 1b17f679a68677f14c8a974190037b8600573436e1560160225b3b77db21fbbe97efde507a2aaa32952387df186a693c993869383623137d7f13513bb4c39e1a
-EBUILD qdox-1.6.3-r1.ebuild 698 BLAKE2B b51415e7d79d1b5fcfe10cb86c53496b1dfeaab7178650aade8fe3bdce3e578ac65a13e9c1ed4dde6b88b8be8dc7fc8c3a1c539d183201a92e38c2aa40e802da SHA512 debff8504912983d3c3cd0bad1be81d852f9674ab30b293879fc34384fa8913f98c842d8ff07697fa156546784bef70a201090936007dc03f24bb423c296d03a
+EBUILD qdox-1.12.1-r2.ebuild 2198 BLAKE2B 7c6e6d3aebf33d47e431201b4dc2291d684038b14fe4bd78dc9db1ec454a54f78f6dc19fe67896af8a9ad7273169816c6a9926b88a37980251db7f3c9b92b982 SHA512 0ee7dd134a057c71403e2b04d7c03c81773390710e75082ba7199c359d01522988ec31001f6541be2bbd75b392d28004ec7517fa181a3166a95782750ea91842
+EBUILD qdox-1.6.3-r2.ebuild 698 BLAKE2B 7e412768a012d82d2450676355741a545d0a593a62e9da192dfa3494a0f016d3855c89748eecfcf8fb75a37fe9cd9f1c68fee85a4f95d409535b20c9ef88f6b9 SHA512 2fa55ff9ee7df3058c7e00cbb144387f15ef21a523a6f7757ba0b416afa14b5a63b74886b60a2fb7309c3b05c3c91cf7ed2fbe6817855a618145ad7b9bbb539f
 MISC metadata.xml 489 BLAKE2B 88377b6fe8ec7278767a18b227778e6f5ec320221fc7293090c67ea268b695de6b131a08172031cc08d3baf8bfd347da0d18bc2ae5c632026eccf20b9d958267 SHA512 709f38b7f8bb7fabd77d9c17a15e537b7c5b46d6c3e203f24847377980ad6afe55adede125b703215b3ab00ad6cb02b8994b75a3db2a4b1b556775bb9f00ee8d
diff --git a/dev-java/qdox/qdox-1.12.1-r1.ebuild b/dev-java/qdox/qdox-1.12.1-r2.ebuild
index 7100ae1aba62..559d80d7961e 100644
--- a/dev-java/qdox/qdox-1.12.1-r1.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${PN}-${PV}"
 
 CDEPEND="dev-java/ant-core:0"
 
-DEPEND=">=virtual/jdk-1.4
+DEPEND=">=virtual/jdk-1.8
 	app-arch/unzip:0
 	dev-java/byaccj:0
 	>=dev-java/jflex-1.6.1:0
@@ -27,11 +27,15 @@ DEPEND=">=virtual/jdk-1.4
 	test? ( dev-java/junit:0 )
 	${CDEPEND}"
 
-RDEPEND=">=virtual/jre-1.4
+RDEPEND=">=virtual/jre-1.8
 	${CDEPEND}"
 
-java_prepare() {
-	epatch "${FILESDIR}"/jflex-1.6.1.patch
+PATCHES=(
+	"${FILESDIR}/jflex-1.6.1.patch"
+)
+
+src_prepare() {
+	default
 
 	if ! use test ; then
 		rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java
diff --git a/dev-java/qdox/qdox-1.6.3-r1.ebuild b/dev-java/qdox/qdox-1.6.3-r2.ebuild
index 214262e8879c..8159998cc6ce 100644
--- a/dev-java/qdox/qdox-1.6.3-r1.ebuild
+++ b/dev-java/qdox/qdox-1.6.3-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
@@ -16,10 +16,10 @@ SLOT="1.6"
 LICENSE="Apache-2.0"
 
 DEPEND="
-	>=virtual/jdk-1.6"
+	>=virtual/jdk-1.8"
 
 RDEPEND="
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8"
 
 S="${WORKDIR}"
 
diff --git a/dev-java/relaxng-datatype/Manifest b/dev-java/relaxng-datatype/Manifest
index 25508998baed..1f9639e09f00 100644
--- a/dev-java/relaxng-datatype/Manifest
+++ b/dev-java/relaxng-datatype/Manifest
@@ -1,3 +1,3 @@
 DIST relaxng-datatype-1.0.zip 74033 BLAKE2B 15b488e914cab28fb9ade71b491d961ffa4f683f66759e96cd53dcf69edd39d423b5562831698bb3e03191396c86a2a93369f14d278f3c55a90728031d1921d3 SHA512 712b99209e927e8929c46797cf3733993cc2740bfbafb458c518e5e130a7860a19dee45acd360a9d7179137f9340c3edeb514cacf501233cca515b38e60d6b79
-EBUILD relaxng-datatype-1.0-r2.ebuild 761 BLAKE2B 2ae6c9eda961aed9f0ca5efc6811fdad5cc150db9c8189152dcf2620a6992c76f464bbf3ddf209a1c6390624ff142240cc8901263e5fb64f52f679e5cf4a4dba SHA512 0e72a551b78cb1a6f2ea7e58911c3b9cdde2f16f1f2e0a9d9c95d56be57ef9fe3944cf2113c7d2ee5808a763c5e611e91694b6bb2c813b9c7ce6b06f0b70172c
+EBUILD relaxng-datatype-1.0-r2.ebuild 780 BLAKE2B 86632ad635a8595655fd5b58070e057c5fd5ad58d9a30b03f1a5cefcde39b132286414179e96e887cc776db8d9eb7d980dc99141fb50c7bcd80b22dd70ab3301 SHA512 1dedc42b1723f75ea2e1815a0aecbbb47f1b0de12a4f6a7aa73fe90138211807220f10e8bf849ed65e4c00c8c82f3f97dd72ec2f7154e89592c82b7e54a7ec08
 MISC metadata.xml 313 BLAKE2B 151379a0c11efd556a9c630fdbc52358ba2ca7baa4a4701526d65d394c1fcc0ccce38f4b874e47b669c3cade9c6faaf0b5bb42ff1a652809c60cc039eac9a582 SHA512 97bbf1c308f5f2436f0c24dac17f5219cc71a8e9882037f9bf59689f75524521ea42c63989491779ca59fd2878e2c478779ed6945fcf2eab661f28be3d9e2a4b
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild
index 304bd7ade70b..8843497dd97f 100644
--- a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild
+++ b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild
@@ -18,7 +18,10 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-mac
 LICENSE="BSD"
 SLOT="0"
 
-DEPEND=">=virtual/jdk-1.7"
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.7
+"
 RDEPEND=">=virtual/jre-1.7"
 
 DOCS=( README.txt )
diff --git a/dev-java/rome/Manifest b/dev-java/rome/Manifest
index f92bc392e821..4028d812f344 100644
--- a/dev-java/rome/Manifest
+++ b/dev-java/rome/Manifest
@@ -1,4 +1,4 @@
 AUX rome-0.9-build.xml-test-upstream.patch 527 BLAKE2B 5c5d4f057298071912472b4a7bdfd7a8a184a78bc45bdb75e892497dd297771ff4a633f0ff9904545fdb12d43f1c0364fa55598670ea8d56e06cd1863b53c36c SHA512 bdbe4232e443228cb64be2f108ec021a9e8654e28c1c9a50f2bf453cb62d090cbfa47df1a0df14e01780c8b8c460331b45a4a974e121ac3d4ee93b82beca0781
 DIST rome-0.9.zip 248755 BLAKE2B dcd19b49a9c5aa9849f5807508e4d10c7effaa9ec9247ffd5039cda7a08afb525a095ac7bbb72d0443566d08a0ebf75919b3dae018aba8957a94c4389d7df82d SHA512 d4bc9945e2b77bdc38eca609ec353379c279cd700d8d85220a1723d1b019da2c18bd93ff98b062e519e7d87f2d2b6853f373fc7178cec0f83b34af45fce5f3ff
-EBUILD rome-0.9-r3.ebuild 937 BLAKE2B 85f5f1be90a88f1e089067feb0d8e5adf8b315bed86405b4b9dc614850064f7b556c09697f77f48aa56d954d5e64267072b85d14122587358479135fe575c833 SHA512 70d16f8c8b04a823b278d76b095bebad3e9fdafff45c5c42e606ed42ec12ea0e7c7db82d0170043892f589535ff0134bdb876e48f6fa3a0a4cf7173a88ec5c8d
+EBUILD rome-0.9-r3.ebuild 953 BLAKE2B 39bf7d53a8e6b5a2182e978a52e8c8e4df74748a5074881a7c19d3dd657f921ee000a596afe5997bdaf62deeb8fe45e28636a4a7f9187087223c8ddfd6bd498d SHA512 3ce722cac645508e768c9c6788d26ee8032e6b5710fd0bd363bbc4d45dfe67614e7dd86171b2fe03596dbfc2bc6896b24ea948997be0c651e053d7cd7a15587b
 MISC metadata.xml 214 BLAKE2B 5452fb11be445b7579865f9777af292067658bf101f6321db48ab1b478101fe031bb7914c6c24215bcdbe369dda396c164fcbbc4253ecb315de82141ee25f8b0 SHA512 d2b6ecfbbd79440de1909d9f195e5d4a6f9886b685ac1e6d7a1db39b8925b29942fac2998cde06040c921f2cc9ef2cbfbf836b60e191d894b00f75628476b1f7
diff --git a/dev-java/rome/rome-0.9-r3.ebuild b/dev-java/rome/rome-0.9-r3.ebuild
index abd3aaa7e8e5..15f76e221046 100644
--- a/dev-java/rome/rome-0.9-r3.ebuild
+++ b/dev-java/rome/rome-0.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,6 +18,7 @@ CDEPEND="dev-java/jdom:0"
 
 DEPEND="
 	${CDEPEND}
+	app-arch/unzip
 	>=virtual/jdk-1.6
 	test? ( dev-java/ant-junit:0 )"
 
diff --git a/dev-java/rundoc/Manifest b/dev-java/rundoc/Manifest
index f2060acb80f0..fca15b98d72f 100644
--- a/dev-java/rundoc/Manifest
+++ b/dev-java/rundoc/Manifest
@@ -1,3 +1,3 @@
 DIST rundoc-0.11.zip 47013 BLAKE2B 1e4a9c90c71f2768c5f189bae947e5fa01cdb8141de94f529ef3837aad7642383603c015fcd54a0eff85e1509f8cdde3d1b0330993175f9834b6ff4341c2a758 SHA512 d16aef5455ac2c6bbae16e4a12df798eca88e9c15225af8dc28edfa0b88b73ca6119ca22c6c4319665fef1203b986f1401029318fb094fe30fe985497fb1c269
-EBUILD rundoc-0.11-r1.ebuild 724 BLAKE2B 153255b8cc9b6277efc3f0fb034635a9d78f5dd4ddd3261a31855f2c93cb84ba581a9cad505e1407962b8fcaec9d77c47871ea4f6ba53a1fad14343b44d47269 SHA512 60f602e0be62c6133d6fc8f509827bf0edb5778c7dcc8eea1c9ed4ebf2f88f23c7561e26912e54e9edbf27a89801ceeca2a9090b1042392a575e89c0f66fa818
+EBUILD rundoc-0.11-r1.ebuild 737 BLAKE2B 0d01be4f47c21155c6d7b77b7c0dc4ceba0eb72e1505368e003c6ea5d460433e4a9f6dd65ec815abbed4e8ad4a67b122521b8ff237c6dd6984a0b91532e5d74a SHA512 206ba6c5ae936ad80f50dfb3091734db82d9fefd1a3f3d8ffaba5d61ef5176abef74845e742fc857fda4212faf133086f1d181ba15f7f95eb246865c6f920f3f
 MISC metadata.xml 533 BLAKE2B 93747d0b48b9fb7b4cb3a11500df062dbc62cb372e9e9dc6b0d5cda39388e437fcc91c32447ef996fb91e4e044b8754da09454581a7835567154c9e0b9a78a26 SHA512 ffee15d0c974e775c7698764cf1fb97c6c5876dd0b2f5ef549a88488055930885ae0aad12b8f74add87effa2f617cc45626a1fbacf118941097d1c7d129601f8
diff --git a/dev-java/rundoc/rundoc-0.11-r1.ebuild b/dev-java/rundoc/rundoc-0.11-r1.ebuild
index 9da02b564ff8..84d3a8aaabe3 100644
--- a/dev-java/rundoc/rundoc-0.11-r1.ebuild
+++ b/dev-java/rundoc/rundoc-0.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,6 +24,7 @@ RDEPEND="
 
 DEPEND="
 	${CDEPEND}
+	app-arch/unzip
 	>=virtual/jdk-1.6
 	source? ( app-arch/zip )"
 
diff --git a/dev-java/sac/Manifest b/dev-java/sac/Manifest
index b1bba814e8dc..187e8059729f 100644
--- a/dev-java/sac/Manifest
+++ b/dev-java/sac/Manifest
@@ -1,4 +1,4 @@
 DIST sac-1.3.zip 163617 BLAKE2B d52ae09cfa7a60afb66ebebb395a93f2e69fb0fc2cdec3153b34350339d179c1621f9cb613889664e008a1ed9d121520431df13938b5d8d9d722e40da01eeb12 SHA512 e179d2e672f1e9e134c4bec92742410bcf2c5d423e5d236856bb53e849d7fcdb2bb09518796d30862685a9ab2344bfeea9b4c7f3c3dd4a1007c8056e120c87b9
-EBUILD sac-1.3-r2.ebuild 562 BLAKE2B 9c8ec80aaf5c5ae8b6122cc2eb2d17ee60977c8a02341ee9478219abe22d7e4322ae0da62ede15352b46c00148d9296bb463b19ee60a8ad1bd20fbe3e6633594 SHA512 2bcaf8dde6695b5aa684016768309e6a68a6cbb22fd2bb126d8165fdd3caf3d5796b50068a71ed5f1ab4b5833c8975f56ab58e2c98447c7b5a145550e36ded1e
-EBUILD sac-1.3-r3.ebuild 540 BLAKE2B 4a37cdafe23b541c68219e9fa8e1a64fd77b54a992c46a360c3b129ddb6af3d787d4b4f2f08f765e75ae3f5b4a64fa55c200813bd23ad15c3122614f4c98471e SHA512 cbe84690c3280ca58b8d11a63e257116f0e732db7d2878696ff35c177dd4b735571233981a947d906e6fda74dd68a0f99880081e61db74e15ce95d32495f9e62
+EBUILD sac-1.3-r2.ebuild 573 BLAKE2B 99b41c787f0a257b68041bbcc3d5861ab40df88fdeb8cc1a0448dfc05705d8099df924df16eb49456547e61e9d0d8f271daae4ca19624a6499866989f10726ab SHA512 a679ac0fd19c578d74df57aee5e348ddcb897e832651905133c3174974712ef2cdb1031d5398d1bbd1f42ed2dfbff144550914a373e532eb5fdf2912879a76dd
+EBUILD sac-1.3-r3.ebuild 551 BLAKE2B 23f3e04eadcefc1bbcedb7e07414efa71b9452b1f1e3900c40feb43f0501035ccccb6de4d5abc505637dcbd9272ccf72cfcf665f7c08405cc8f59d669a3b04b3 SHA512 b2432e4a3b92c7c11ab5d6ec8237d91ad9a4f68ee63790b8b09bbbbbfa73b50ba89dc7b20bc929239c90e69416f94a5a7f6e436300cdb62276c347d93ae5c44f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sac/sac-1.3-r2.ebuild b/dev-java/sac/sac-1.3-r2.ebuild
index 919b79855870..395631671fe0 100644
--- a/dev-java/sac/sac-1.3-r2.ebuild
+++ b/dev-java/sac/sac-1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,6 +19,7 @@ IUSE=""
 RDEPEND=">=virtual/jre-1.6"
 
 DEPEND="
+	app-arch/zip
 	>=virtual/jdk-1.6
 	source? ( app-arch/zip )"
 
diff --git a/dev-java/sac/sac-1.3-r3.ebuild b/dev-java/sac/sac-1.3-r3.ebuild
index 5d076a366599..8e4b59d4a0b9 100644
--- a/dev-java/sac/sac-1.3-r3.ebuild
+++ b/dev-java/sac/sac-1.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ RDEPEND="
 	>=virtual/jre-1.6"
 
 DEPEND="
+	app-arch/zip
 	>=virtual/jdk-1.6"
 
 S="${WORKDIR}/${P}"
diff --git a/dev-java/saxon/Manifest b/dev-java/saxon/Manifest
index f4c03b15a18d..ed644b10edb2 100644
--- a/dev-java/saxon/Manifest
+++ b/dev-java/saxon/Manifest
@@ -2,6 +2,6 @@ AUX 9.2-build.xml 2061 BLAKE2B fb4e505f9308caf2300b7a1159ff20a973576d974544b1be0
 AUX 9.2-edition.properties 74 BLAKE2B d468841c782fa7bf1b39cbeeac01d983a8d6891a13a97b2994496dd80e1c4e3cac893b35f813bccf4e0a877c7c3f1a6c5c12a9c6005b82efb2c42a70a49e93dc SHA512 2c95fc288bb35f68819edc95e8ce30f921b17196123ee7ce0c9908d210e8758c51204bc7dd222d6b7e4803dceb331bcd83120622fa2bcb6587d150a0f479ca02
 DIST saxon6-5-5.zip 3346162 BLAKE2B 63d49545d101c3b595ff3f3db6d781158b8a51862ccdc294e782ac0935010a841405fb21663bd35853042c53548991dfefa7f789be292fe8497a29253c87ee09 SHA512 2d76ab6da8fc8ca8502139f6b620d4c9e94732a520083480e3936f6bd0a9f069252a7a05df53dab49aabec505764b2ec4ca1b36022bb56df568883a0491f495a
 DIST saxonhe9-2-0-6source.zip 2942625 BLAKE2B 45f9cc12591ebb94076392b16edba52811d911c41f2f197ffe864e37c1ef478670ff276b7dc8dff316dcd2986f777b4cc2d43989e5d300510ee0edfe7e54103d SHA512 6c59c0cbed905cf561387acb54bb31f0a251432deb0edf498ec4f4d9955bbcc12d1765ace594090d3ccb0416e3e72349466e430bb4f799b51fd12ce8fc5a144e
-EBUILD saxon-6.5.5-r2.ebuild 867 BLAKE2B a5879fbeb51e113e05dfbfe4dff8088e26621278c76f83cde4b47b6744cf83e9fb94fd25f661f25e57a3f8a5d513d903f3808dfb6fb6ba79d6e450cbccb03b5a SHA512 a8a6978c47998380b6c7ec09f7102584007aedd829cd95d0ff629d2df9062c5eb46ceecff88b2bb0fa575907810fb21fa14dc1253ff0da3f9962687935f53df1
-EBUILD saxon-9.2.0.6-r2.ebuild 1961 BLAKE2B 354e76f42bf4f4b7d3cb578349810c55b7a1266bb74f5531522877bf055fe10574417e2484a290916515775003c4bfd19a8deb36c93de11e9c0a506800af3821 SHA512 b608604e1a13138534f4bde9ca0fe8496a7f6fa914571897d355d8d68aa289aadb7c0081f32f7c66fbbdb185697ef4779044aa77c9267d292911680246f52f53
+EBUILD saxon-6.5.5-r2.ebuild 880 BLAKE2B 2916359129a0460531c31e5b7d511ba1685bc685b569e5c76d342423b3ecf5c8a357840cf45f4e0d92cc3954ce7bb457da51dcd06cdc55d5fe4ba2657a2efabd SHA512 978932d30eb0374bd527e40bb6be7a27c59c64c60e105bd815778a40d1cddd6f99ad70ed35371fe00637878951797969db3fdb9b1e2f492612c1286ac2dad50e
+EBUILD saxon-9.2.0.6-r2.ebuild 1977 BLAKE2B da97c782b3c1654b5baf8833de0c5e007f40b55780cc02a4eef056991cf1d250c9f82237615642ba71c30acb7d3bb4146f0ad01c314070b058dcdc9b14ec03ac SHA512 88cd0d289c424aea55ca46abee3cfe6f16a9e73976a68c23c2c84431cdbe151cef36f476ab14c10ac8f7c47afb5ba023a4db5548c1a21fffece73b6cf7ddb5b6
 MISC metadata.xml 311 BLAKE2B fdce161da5c8394b66ee6b1bcebbccd863cd5e70291afab04400c4d806afc955f803b5c5aa15601157f2784e434baf505dcbebdbff9817fe960961f8108d3b63 SHA512 2fc12b71b9e977a095610f8f784f19252d44e31442cc5d5ce513f601a2394f4bf491fc9065de88bbf45afe7b8f1ca33ea907e31aa26875f48846856f1bf51126
diff --git a/dev-java/saxon/saxon-6.5.5-r2.ebuild b/dev-java/saxon/saxon-6.5.5-r2.ebuild
index 6ea74c425702..e33a43038e65 100644
--- a/dev-java/saxon/saxon-6.5.5-r2.ebuild
+++ b/dev-java/saxon/saxon-6.5.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,7 @@ RDEPEND="
 
 DEPEND="
 	${CDEPEND}
+	app-arch/unzip
 	>=virtual/jdk-1.6"
 
 JAVA_GENTOO_CLASSPATH="jdom"
diff --git a/dev-java/saxon/saxon-9.2.0.6-r2.ebuild b/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
index d872fb71a280..4332edc035b1 100644
--- a/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,6 +29,7 @@ RDEPEND="
 
 DEPEND="
 	${CDEPEND}
+	app-arch/unzip
 	>=virtual/jdk-1.6"
 
 S="${WORKDIR}"
diff --git a/dev-java/sblim-cim-client/Manifest b/dev-java/sblim-cim-client/Manifest
index 108fdcb6eb8d..f1854af78455 100644
--- a/dev-java/sblim-cim-client/Manifest
+++ b/dev-java/sblim-cim-client/Manifest
@@ -1,5 +1,5 @@
 AUX 2.2.1-no-network-tests.patch 2189 BLAKE2B 279e37abe9d43333099ed671a4652283f125d1aba243beaa236e430cfb3b3996ca3b9815477347d747e834de2393f16b26e7ed2c3d980af0e8b631831dba9b60 SHA512 bc3834d913d168c66a71d993d1673dfcac2c752860c08f74f13defd51cf73298675d357d503ae4af2064e158123e4f04b37ea4590bd16d859a91323112875160
 DIST sblim-cim-client2-2.2.1-src.zip 1082959 BLAKE2B 7750fc15e5f8da1f98496e99a5b5adacb89ac72782af88d8fb467c1071c2a4a736f2ab68a00bc381f91e20b756eb98ad96540bdd4836ba35ca2759cc2848277c SHA512 b7e1f56b87fa24c97d8b3e97261195ff04ce13839e72f4b8824daa8b9854158ba10c0bddd16e0650197125510d68adf6f4458089d132278510e10bd2b25b4aa7
-EBUILD sblim-cim-client-2.2.1-r1.ebuild 968 BLAKE2B 736eda2fb5b383e38ffbbf454bfa64b1ae518ae16667c0f53ffcf28b170d598562f21f52bfebc8d18c678beb17b1c3b97eea7b9c1e8a70eb64894f2ea52e30ac SHA512 619ea7d2d9c2b6bfdedf545a725d0974a01204a92c18e777cabdebc969a5ad197fe6c14a15f3e822421dfa699358578fdcde88b563f396a2f5a8cf4430314731
-EBUILD sblim-cim-client-2.2.1.ebuild 890 BLAKE2B eab501209ba82371ae0ac7f2ac646f513c06c8fa86a19dd03ea8b8f91de43cc1bde4a5084e64520d8b96e3e9c13fd67e423e3e8074f3e1173e6b2b03e9d94f65 SHA512 27a228fc5eeb7a2341d0abeb65124153c21377514949580835304b27fe636056dbe76df08110f8ba646e9303a6b898dea475d6f7f8cb45e5cc3b7bb790d0f9d7
+EBUILD sblim-cim-client-2.2.1-r1.ebuild 981 BLAKE2B f75c061f6d13607b9b02f09053002ce62031817cccaddee5f0e63a7ae0024599211b4604355049bc1b480a6f700a97efc2fec6be48d48022548e80d21a57faf8 SHA512 5ff70f1d806a25e59dbe1dcfef91a1482e8b6009f1fbe35c423ccd891892152c287b45365d50f435f15db5469823e68dba3a52967c93d12afb68ab7514935cce
+EBUILD sblim-cim-client-2.2.1.ebuild 903 BLAKE2B fd7682148248b6aafb7e5c70f5d2feabfbbe940882042ca9a3e1b037f2a3d4d0142dc0dcb2c7cdba4167d340a8d133fce3b27c15775f77b1362c3b02e9ed73f6 SHA512 ab8f73955cccf307ccd1e16eda8166c2e32d7755dc2f8de7755a4d0fa3d83cbc6445f5d05bec53ee2226e02f40d6011547d2bee3bd01de02a283c97fecb45d25
 MISC metadata.xml 311 BLAKE2B 8b486e7644b87a394ec5ccc61dab397aefb22e4db94bc1a42ef764b072897f71143a992c7dae561da05b4d3c04a361583584f4401b8687b982e8e87f3baa7891 SHA512 8675574db0408285a6c8ea63bbd507d1f594f3d67b33769fd31fda4ff215d4bf451922b45f2adb92a714f89c27e0296776938aac5fcd38667ee35cb5ee36d111
diff --git a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild
index 952d9e55d464..26f86a2fa00a 100644
--- a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild
+++ b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,6 +19,7 @@ IUSE=""
 RDEPEND="
 	>=virtual/jre-1.5"
 DEPEND="
+	app-arch/unzip
 	>=virtual/jdk-1.5
 	test? ( dev-java/ant-junit )"
 
diff --git a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1.ebuild b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1.ebuild
index 93c55739e841..9d80134c7297 100644
--- a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1.ebuild
+++ b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,6 +19,7 @@ IUSE=""
 RDEPEND="
 	>=virtual/jre-1.5"
 DEPEND="
+	app-arch/unzip
 	>=virtual/jdk-1.5
 	test? ( dev-java/ant-junit )"
 
diff --git a/dev-java/snip/Manifest b/dev-java/snip/Manifest
index eb29f15bd336..3e2c6c73ca42 100644
--- a/dev-java/snip/Manifest
+++ b/dev-java/snip/Manifest
@@ -1,3 +1,3 @@
 DIST snip-0.11.zip 56801 BLAKE2B cf8c94fe9269faaf34f8377a626786a96387c5a253c98ce1591de80a22337ff0f9d75da6d9e264b2222d4e1c1a749cfd907f5239d6608b9541a2a61c6c4decc4 SHA512 43ded00e411247c69882494cec1ee5322a0be273982ee37b2501d143259686f6d5f52c99b430ebad96d799aa42bb240b4a5130cba0b3fc47d21c70513e97ba93
-EBUILD snip-0.11-r1.ebuild 724 BLAKE2B 153255b8cc9b6277efc3f0fb034635a9d78f5dd4ddd3261a31855f2c93cb84ba581a9cad505e1407962b8fcaec9d77c47871ea4f6ba53a1fad14343b44d47269 SHA512 60f602e0be62c6133d6fc8f509827bf0edb5778c7dcc8eea1c9ed4ebf2f88f23c7561e26912e54e9edbf27a89801ceeca2a9090b1042392a575e89c0f66fa818
+EBUILD snip-0.11-r1.ebuild 737 BLAKE2B 0d01be4f47c21155c6d7b77b7c0dc4ceba0eb72e1505368e003c6ea5d460433e4a9f6dd65ec815abbed4e8ad4a67b122521b8ff237c6dd6984a0b91532e5d74a SHA512 206ba6c5ae936ad80f50dfb3091734db82d9fefd1a3f3d8ffaba5d61ef5176abef74845e742fc857fda4212faf133086f1d181ba15f7f95eb246865c6f920f3f
 MISC metadata.xml 638 BLAKE2B 74eca64d6be100044468c0243df90ca060058de5181d6dcb51649ba664418192246606759ed21fc29f4a21b0c3b1c9f602d4bcd7f9eb436958e304a5190b9484 SHA512 198940a6ae7c17c2833b429e6003ecd0821b8d687a568b3f487fd4d3bf616556814b07481954e0abdeddccf411101ed3351bbe29e28e0b0e4f6024b3abd2d1c4
diff --git a/dev-java/snip/snip-0.11-r1.ebuild b/dev-java/snip/snip-0.11-r1.ebuild
index 9da02b564ff8..84d3a8aaabe3 100644
--- a/dev-java/snip/snip-0.11-r1.ebuild
+++ b/dev-java/snip/snip-0.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,6 +24,7 @@ RDEPEND="
 
 DEPEND="
 	${CDEPEND}
+	app-arch/unzip
 	>=virtual/jdk-1.6
 	source? ( app-arch/zip )"
 
diff --git a/dev-java/squareness-jlf/Manifest b/dev-java/squareness-jlf/Manifest
index fbb31127a9b7..0025913c99cb 100644
--- a/dev-java/squareness-jlf/Manifest
+++ b/dev-java/squareness-jlf/Manifest
@@ -1,4 +1,4 @@
 AUX build.xml 455 BLAKE2B d7dab4d19f0764c4f96b9329f57b4132cc53ec7e819b38d1c4829dfbb718d89969a1aac8e7a6be4ec9c224b12c1f5f18f220e304e0334bab0ef2447baa72bcb2 SHA512 af90575487cc91fb601e537c9e85af8d500a0f27321997af10c6f5182e95e029f954b85a29d03d18553bded6cb9bc5d505e31ffc51dc88c89f0db1b1fe95cfcb
 DIST squareness_jlf_src-2.3.0.zip 67307 BLAKE2B c7719eae69fd710e0f30fc2f4cee025a56c846bbc78631a390292730bb82d2b753bc24a367e5568e5ddec0f7444a3903fda9e4d09a5e0d57a46561ed713bdf74 SHA512 9c3d1de6f682968b2e2db37afdaa571f53857897415df04489ecac1c545ddc0a8342df94c658797979a6024e6e69bbc9a8828029ec428248848c933c9f901a71
-EBUILD squareness-jlf-2.3.0-r1.ebuild 731 BLAKE2B b4c1bf6a77adf5544eda6de33a042e99f0faca19107f195cb5f93c7144ad6422c2e097007fcd479b9be8c05e92c9586ee9a1c8d58da047e3d922e01116278292 SHA512 18900c1cbcb86da2eecf57c47d1ec9e097e463ffa2715fcdc834a4c22d2af8182cced06ae1fb9fcf17dc17c2f123bb6710c9c7728518b7508a47acad86cd5ec9
+EBUILD squareness-jlf-2.3.0-r1.ebuild 746 BLAKE2B 37d9e13b8e91a5969d65b79c7b07d3b0a9d4b6bb2ab3c984cc2fafbd582c45fd52640213161def2219804402198a962cc87d146aab352e514b810528c709a5e5 SHA512 27d9d4ddaf6298262186d82d95488151eafeb84cd222ca3770f0b2322108fb3a3de40500cf0c1c73c9ced551c887db2220101826a68595daaaf3606a6eaea22c
 MISC metadata.xml 296 BLAKE2B 815f4376df03d1dad4e3f5de1b64f2e8ea1f222973895e65c81547461038d126faba90f5f240b39010545853f066c176792d7146aea617a5ccfc5c8c96c2384b SHA512 f6dbd063144823d97b76ecbda9dee65e629f11b5c151da9d4cc83bce53f61307368fecf9089c1ca6e8d968068a21577d940bd3591347c023e1693480e40aae20
diff --git a/dev-java/squareness-jlf/squareness-jlf-2.3.0-r1.ebuild b/dev-java/squareness-jlf/squareness-jlf-2.3.0-r1.ebuild
index 0bcbf798fece..de776af3a056 100644
--- a/dev-java/squareness-jlf/squareness-jlf-2.3.0-r1.ebuild
+++ b/dev-java/squareness-jlf/squareness-jlf-2.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -22,7 +22,9 @@ S="${WORKDIR}"
 RDEPEND=">=virtual/jre-1.4
 	dev-java/laf-plugin:0"
 
-DEPEND=">=virtual/jdk-1.4
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.4
 	dev-java/laf-plugin:0"
 
 EANT_GENTOO_CLASSPATH="laf-plugin"
diff --git a/dev-java/sun-jmx/Manifest b/dev-java/sun-jmx/Manifest
index 2f7c263e599a..df7db77ba31a 100644
--- a/dev-java/sun-jmx/Manifest
+++ b/dev-java/sun-jmx/Manifest
@@ -1,3 +1,3 @@
 DIST jmx-1_2_1-ri.zip 1624569 BLAKE2B 7262ee10ab49d7371da988f6f636c22e7ad8cc06bd61db5490659899424465f2ed85000d176e6dc5cb7631942079fde19cde35837cda677fa463cdf53c94780c SHA512 39c933ec39f3fcc631d6d8f3aa88724bb0aa11ff62dfbac61762d07c718dff4ba1e16b1b565c7aa1ede7d616516e68d0dbe8c227db34a6d30bd8f29880c7a5d1
-EBUILD sun-jmx-1.2.1-r3.ebuild 1276 BLAKE2B 5fb15955b2c398f9f710a67f8e4ba2a8982e07a9a2070d6c22fe7f6dd873c5ab3e84d44bf654ca4bf393cb0bc94db75a647b5a01027c1caa1a50e2334db959ce SHA512 59d99ff0e1ec1a40f0aab1a9f29247d81904fe10dc3663d06c29068f8f0a95394ec107efdb504103c631526d2b9faa69bea111ef6b2f217ab96b4d1a70279d99
+EBUILD sun-jmx-1.2.1-r3.ebuild 1295 BLAKE2B 51de4c252171ba8ad48504b4cfee139e53d7c75317adbec77cf4cf16e2266d2fc0e0ce9d701a3ecfd837e160c42fc652165d540da1f8557f30aeb82bc9e28609 SHA512 1aa7c206a76ff0e98f81320c302ebd44c8afbbddb7d90c6b9bf9db026c66ecc157f772477cb9a628cb83ce902314baa1abe011d186acb64485b606ace8422d3a
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
index 42e2b32f5178..4bc3e8a1ac7c 100644
--- a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
+++ b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 JAVA_PKG_IUSE="doc examples"
 
@@ -15,8 +15,8 @@ SRC_URI="${MY_P}-ri.zip"
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
 
+BDEPEND="app-arch/unzip"
 DEPEND=">=virtual/jdk-1.4
 	app-arch/unzip"
 RDEPEND=">=virtual/jre-1.4"
@@ -42,9 +42,11 @@ pkg_nofetch() {
 
 src_install() {
 	java-pkg_dojar lib/*.jar
+
 	if use doc; then
 		java-pkg_dojavadoc doc/api
 		java-pkg_dohtml -r doc/doc doc/index.html
 	fi
+
 	use examples && java-pkg_doexamples examples
 }
diff --git a/dev-java/tagsoup/Manifest b/dev-java/tagsoup/Manifest
index 69ea5c27d5d7..16d1c65ed77c 100644
--- a/dev-java/tagsoup/Manifest
+++ b/dev-java/tagsoup/Manifest
@@ -1,3 +1,3 @@
 DIST tagsoup-1.2.1-src.zip 222757 BLAKE2B 79a43edfa9aed7f08bfaedbe758b2a08d5ff596e268cc415707aee9076bcdbf8de0b4c2a855b9558ff2cf598ed4811a7a690aef6c5004e34484ffe3087bef8e9 SHA512 3bb1608746270663f6ed45318457e3ee27419929411689d962cffc0ab0c32ec4b858020043be46e929014b696c753a01b49d6eea9a98f18d81fb9205e99ac0a1
-EBUILD tagsoup-1.2.1.ebuild 1081 BLAKE2B c19d0ebb62307942249e5995d246136cdd0fd66f86aa2b3783b79fa3147e251796a8e534fd7a6b8fe293745e129992b92117c1304883e8d19c69df7d628f5203 SHA512 353d1bc5218d169b6334a5c1a8a54f622e417af726555965f31a8498e448e0d4c6131d417de79eb4074becd91240464efb58a78ede9c18d5b31d1af5d265b9c2
+EBUILD tagsoup-1.2.1.ebuild 1082 BLAKE2B 600a6159b72a8b236f6d77fea2fdab8d482779671e049ac772b3fc03bae324cb49bb3c20983dff70dff00714caef3612c2d7e2a60cd370db776fee50a92dc780 SHA512 9112bd30013d5c6e3feb81914aaba6fdc6848d89e7c04787a015df97321b1a0df913822fc226f3b4a2c4ea2b02721f0fd71d122a6552e5e24eb7b06243cd579a
 MISC metadata.xml 501 BLAKE2B e343c2ff8cc35280a493830bff0fbd4486a37fcc22d79eb8b74e6712250e9c879b50f8beede300189d233cdfa9579f02b921573f6e3af1bb399d34099764caf6 SHA512 e8abb4f880b76ee62dd56e0caa65868efa920f080cae9c137a9ff2646e77c2e22e5bb687e584f1b9621bb10140d6725626b01adad7df85f19ce55d80b4706ba1
diff --git a/dev-java/tagsoup/tagsoup-1.2.1.ebuild b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
index 0377d35022df..fe10a18fcad1 100644
--- a/dev-java/tagsoup/tagsoup-1.2.1.ebuild
+++ b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
@@ -14,14 +14,13 @@ 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 ~x86-macos"
-IUSE=""
 
+BDEPEND="app-arch/unzip"
 RDEPEND="
 	>=virtual/jre-1.4"
 DEPEND="
-	>=virtual/jdk-1.4
 	dev-java/saxon:9
-	app-arch/unzip"
+	>=virtual/jdk-1.4"
 
 EANT_BUILD_TARGET="dist"
 EANT_DOC_TARGET="docs-api"
diff --git a/dev-java/tapestry/Manifest b/dev-java/tapestry/Manifest
index 904d84ed504d..dc654c08346f 100644
--- a/dev-java/tapestry/Manifest
+++ b/dev-java/tapestry/Manifest
@@ -2,5 +2,5 @@ AUX Version.properties 162 BLAKE2B ebc22304b272f3862d87d0f838408c8e1d839c80d76f8
 AUX build.properties 1141 BLAKE2B 02c5b606d35bf1e94b147f04da4f6c626276fd85e8634514c00c7a610726c734ee83ef8c9e5f283703eaf12bfa958ebce345ef2d74138d49b1524ca5fa29f642 SHA512 3cfe36782bed225811884e97a2261719c6d7c82470621e54701114c0e4e18ca0ba673f5f97861840c0e822ede9dd86097d8c77aecf3a392de82cd5573049d0bc
 AUX common.properties 2850 BLAKE2B e1745cd8c7cc162f3c8d8d797b88ecbc1fa4e35831d581639fbab512c31311793f8beee3f147c267d675e0960f0a753c3f5e74230f825551973d58c9367b0623 SHA512 a00b28fde7e90100c017238150fd7c830cacc4bc6a24e7a9bd90fbd32bd6bf8a3787a8a178f6ed78033621a47503b1517e9485ffc60d5ffbfe5752254713283b
 DIST Tapestry-3.0.4-src.zip 1174780 BLAKE2B 2f2ad5e3860ed6852962b282431df15ae4f6f17f0d08e4246dcef69bcdd033acafe881ea3ba33bd38c2dcf8843caf37fb0b46da84c5b107c2d1c4a0d77aaf89a SHA512 ab94cee9745fceeecbc98a27ace90567b3bc8ab880408da0a32526ba3a68b24f90daeca5d2ea0180b5693ae4fd12f01f0db98e78f176cdc0a0370b5554aa9d10
-EBUILD tapestry-3.0.4-r3.ebuild 1683 BLAKE2B e921c3f2c0941d673980b5feecf12aee3de03b661f3b34bf8193bb556d7e82d411e635245bb37cd98d0a445dcabe79ecbb318b7bcbb585db0d3b703d419e8539 SHA512 a1fc2c507a330c0469902627b56ff7884901ca957645c4dc582dd9c3784b0eb0640b584ea656e49bb6d2e419b2f26667f2fd64a2c50ed51649c3c59793b393ee
+EBUILD tapestry-3.0.4-r3.ebuild 1696 BLAKE2B a58b497e0b93d8a4d976590087e5fe35cfd8a37011fb53dc86cf5d925a83cb40344acd6bd21645d354c8f39dc7181d8b4cb5b9065ac9592cc74f48b9d1087f32 SHA512 212b05c25ff7d036c73574597fb91c72bea5616abea5616cc1deeee97d1a2c99544fa3602be0b7481965cb147b7d4b08685415dc61d335423b7fb3ee3eb569ae
 MISC metadata.xml 750 BLAKE2B 57a35e8c3abe2476a1d35896ef702db76748f91065a68fca93b8f9f5117c7bc6d3ad9a100bf9c4164e2aea8e2f51db5ae77debe651e5a915d48aa6b120c19f4e SHA512 65e251c97e3c5fff6f3bd40910a5ee7b2e5152a86d3638aeb870283f8e415c833da3666647fc25add19e96c0534d5fac39090646cccc9cc10a2b07f5bcc5885f
diff --git a/dev-java/tapestry/tapestry-3.0.4-r3.ebuild b/dev-java/tapestry/tapestry-3.0.4-r3.ebuild
index 19824e4645a7..0d12ef740137 100644
--- a/dev-java/tapestry/tapestry-3.0.4-r3.ebuild
+++ b/dev-java/tapestry/tapestry-3.0.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,6 +35,7 @@ RDEPEND="
 "
 DEPEND="
 	${CDEPEND}
+	app-arch/unzip
 	>=virtual/jdk-1.4
 "
 
diff --git a/dev-java/tomcat-jstl-compat/Manifest b/dev-java/tomcat-jstl-compat/Manifest
index 59b0210a6e46..2ea188a81bda 100644
--- a/dev-java/tomcat-jstl-compat/Manifest
+++ b/dev-java/tomcat-jstl-compat/Manifest
@@ -1,4 +1,4 @@
 AUX tomcat-jstl-compat-1.2.5-build.xml 8436 BLAKE2B 7441db9ba5fcd306024dbdcc6777b09e3d0d1bd47ab25842c4eebc6799a7d9c46210dd38749c38fc38e64a0f64e552a2942b5faa93de8d5378c7303296c88f49 SHA512 a03eb25054c14fef478c6ed90b0c814c0bb48f39e778f225974a426fa86c39bfc53ded15dbc83ac45bf010f22b47cbf23384f96b1352f920297e680e77ebf6a2
 DIST tomcat-jstl-compat-1.2.5.zip 615779 BLAKE2B f5c307625a84a7170659683913282df1cf7e8b6a021ffed9895aa0e770a35d8db5351660c96668091ed59e5be35d2e8ad9359f524cbfe5a380e89ebe4fe08b43 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0
-EBUILD tomcat-jstl-compat-1.2.5-r1.ebuild 1473 BLAKE2B df58f94f08ae757732ea61ec534611f60aa7ef65831ed491d8ef936dbacc14a0b8d48ebe586bd41448fb6c004e12f362fdfa29e90bf378e31669b0859b9771b6 SHA512 f0a2ec87b9788f6ffb80b7c3aabea661a2b0267b2f8f87cb170067ea7efa8addbe21b8f34585832fb4fcbca30f87b72a2987f8eecf83df5f6a4049ed0a86b74b
+EBUILD tomcat-jstl-compat-1.2.5-r1.ebuild 1489 BLAKE2B 2cd98a7907de70c40254b19a856e16201ecb0baca0fba90e330f483a7df1e5c2a24aa94d77dbd555de754a845a0e2d6eb6ff0a08bd0fc61e4a829376823d1991 SHA512 031911b505e848acfcbae0ecf36c4121a6fb7d339339557bf700a0d24a338e1448b90881859c32d43c4dbf78355555dddbb70c9829f97e5f38dcb22eee87c7c1
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
index 279a08d9fcb8..993a59235a07 100644
--- a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -32,6 +32,7 @@ RDEPEND="
 
 DEPEND="
 	${CDEPEND}
+	app-arch/unzip
 	test? (
 		dev-java/ant-junit:0
 		dev-java/easymock:3.2
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index e2a8568dd6fd..723e5583c2d7 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -4,22 +4,23 @@ AUX 3.1-build.xml 3193 BLAKE2B 2bd250b67ae737c0197eb00b0aff4452444a9b5c99e3d25eb
 AUX 4.0-build.xml 3193 BLAKE2B 2bd250b67ae737c0197eb00b0aff4452444a9b5c99e3d25ebb3a16f7c31f4a65fc7d45b1f4abb7b7530e00ebc9334491f9eabb793d46ab144c718cad61b8f01f SHA512 efa6753a44e7f18c04bff98b68262112ee192857a8b15899e6927de1754c25788fb551251207433f0a7cf69703e310e6f577853d6eb6f6f6e48f2a57ca4921c8
 AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1e0b8193fa80d70a776c0cf24b2eee585cf77292bc2112b60075414a4d05ebe16dc26eb3c2976a44420774 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41
 AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
+AUX tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch 710 BLAKE2B 177affee37d70208942c709324c4a7a4c561a28197792683a1f21dd747cb90f2d9fc2c32cf28cab0ad575c22dfa93efeaf7ba7f5254dbe67fe1a8b6fe5fd504f SHA512 0233b3fa6f6e3de36d62056035c84f9a22e866ff61e4cfd0976b7aa7e8ae019421bad25e49430e47a0476d09b5c1037d453e807ea02605a4f161d876f303c24a
 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.105-src.tar.gz 5312024 BLAKE2B 0eaad66c6dcc3e2f6a2d8e142a7832cbd413724cab8b10f00e87d5535f4f20d5ba4712794e09444a8b3e0cf23f036da7c6923f038a6a11714682b129ed4ac5dd SHA512 249e039775e833d75b631cec26132b42e4aed25491a29f2349fa41b81737688b0a2e453072d8e3c5fc28763a9d1922f59da7529378ce8fd472eca7bbc73a6bd2
 DIST apache-tomcat-7.0.106-src.tar.gz 5302091 BLAKE2B f60975ef5570501b03e71645969170c44450f2b56f37688001ad1b4dce3a394f6800e9b28a8fabf59241116345fb7e2a287441f3eace020bc5c0203d57630c91 SHA512 5ce5a5af93c58e69c4758c2c0dedeadeceb6be920421b9d3b3d071d32fc8eb59ba8312c98d037b8434fe43d57a9f720ad8790de29a26ed2959f6c761fe1fd573
-DIST apache-tomcat-8.5.57-src.tar.gz 5730658 BLAKE2B f9bd2e159abc6af62c8681c38ea4eae8155f95df11f7c244e45018929189ef6b6a37a11e84119c3ddcb134a8ab58773add19cbab7506bb87c43b0039899fde60 SHA512 8bf4334b190c36900b708ee7097097e513f2d4572f119173bee732c76b5b660350fe516e58ac867250c2ef7a1371b55c116d3a1abd18323ceb92337f1dcb0f60
-DIST apache-tomcat-8.5.58-src.tar.gz 5773000 BLAKE2B e361cc359f86bb02fa4c39ebd51b52b4552aa78603c4d8fa5c5c8d87bcb89f6ed391408e3713a5011b7b8cc29506ad65f25b6047ec1009267ce8a68d396b3bc6 SHA512 f9e21c0c60b80e1a15049ff4ee6a4914036d19ed171c40bc614fc999c81c59c394c0a6595ac969a5b86662fa6c366676e7ecb2695c28518473b3f6c79e9a0e05
-DIST apache-tomcat-9.0.37-src.tar.gz 5894559 BLAKE2B 63148418ef96e90f212ce8a00dc6a274a8da2a1aa8a53ad0f6d3960efc8e876dd2812f425c0f21c73ee291752c5fd3bc8025eed46d18d31ae72e8bbe6dc1ba10 SHA512 6e819fe255c467b0081e91c17a53fa383fe84d922492c62d7dd93cabf00e22ab30872ecaa298a9b12977b8c7518f36c8429091b24c9fb5200db64e80e853ce98
+DIST apache-tomcat-7.0.107-src.tar.gz 5312698 BLAKE2B 1f2712ddce6aa604692aaf6a6c706469d3dbcb2266a99e62346c15b8347fff573608440473be8e20b8632a431f8838dd29f24f6bf630a13d262c444be68e0d2c SHA512 820923697c487367786c595d3aeaa58981d25b56529c6739b9388ad771f3264e6995f7659805cc5b2ef9456dbd42bad92ad2cfa3c7f741920a5b7bff2cc1bb1b
+DIST apache-tomcat-8.5.59-src.tar.gz 5787634 BLAKE2B 8ca1aa8b4d12d0e73c0d7937e906530037168ac349b196e172935332e632b1e9ab15379f532cb8fb1b2f853d01567332af9c031393882c833dcea65f9e626b09 SHA512 bed80e86c4dc972fd6ad414a804ed2bffc797e22b0a5e0e6e93c8540fb87cffb2fd2f1f8d97873a3ee24397f7961a8fdeb6756c542a532e4b73468bccec6e626
+DIST apache-tomcat-8.5.60-src.tar.gz 5837412 BLAKE2B 0c2200412900f7f6d318051333b15b8c6236e00f6194c21fc45bb95b565c4146e2682b879f3a293de3ab65524013f786a7f69dd7e91f1c4cc903179075253cc4 SHA512 43222e5d04b3de400429d6f1792d418172b6ff15dcc17e392cd66a5444d740a323b9c426a9f39678b3460452545fda4d784f56961d5ea56b9c0e1ca466d49040
 DIST apache-tomcat-9.0.38-src.tar.gz 5948083 BLAKE2B ac076684f10a51bf0e0b5b0dbf18ee476ec900bead0089010de7b4a7d380a1e18035eaa0d0f661c863aa53491e51f719c2a5985e4791bcc9dada4c421db39fe7 SHA512 13c79abed71ead564b108ec8a046e78374611acd906f4b6e775ac0427446117192be6b25f29894e625e2dc13f79abbc97bc52b32120ce5701cbe0f5ae05bc57b
+DIST apache-tomcat-9.0.40-src.tar.gz 6017562 BLAKE2B 1c90511911363bb3b154124382f6401851c3a0e7925e06cc8f2b4f02a7b4c1c59bc75007a8b387f06742cbeca7f840b6860d84dc7c6fdb1e7774b22dbca6082f SHA512 61b8e191315cee2bc0437013dbe7d1fb3451182e0b316fb377581c7d47a59cefb7f2ff30d96a2d6326a99c86f4151b26d1ef76bda5029b30d81c8297a0b362fb
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae751ad7e2f4d7dcff941e28c4eb7ef4d614ae5f626235bf7cfdeb56eaf3bba608913bf12bde46b2a9e576c7cf1d886c275336a SHA512 b36e97e60cb546ef2a980d1b9787dda5b21e5c788555d9a696ca166632315a870477fb8c52fa24c1698dcf43bb096201b6d4835113ec87192287eff9f5664e3b
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1437 BLAKE2B b4c1e56e9d529fe47a4705255bdde6845603605e473ed2e07d7fafe1b470123e7c186f8ca80ee98bf52ab43c504c0fff4ad996601646082735b7155a6cd4f928 SHA512 4d7033bd7aab26684b0e81d2f16eb1870813ea515f7024fe189469d48406a09fdd4a9497a89e254f8567c11f3a62c7e0d561246933bf07c242161c88daa31061
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cacbb95bfc439c63ba7cc3ee594209cb22927374e184edb90804ad1f55aa6721f98aa927f3bd8ca713463085233db1b233837acb07 SHA512 7a45a663f00ae5a71bea3002a72bd11a640583af44c0ab6a3dfbd6551bbf3a6de5f35e880643294c56027ecb3b7757425a2c26f34a96fbf8cd26df4a545086c0
-EBUILD tomcat-servlet-api-7.0.105.ebuild 906 BLAKE2B 275c28cec529a0e2eb3a1dfab4faca4a557555744ef8cf3a6b68c88fbd48233e67bd414c809d03aec790a33536117605d5c199a10f5224c15e07976d19384503 SHA512 37763c6d8945329c26fa0c3222b58ad5e5944fd35708a58c149269cdd1596bdca80db0c450a9db6604bca6ec87da4c9abc4f53fddf1decc94b25d4b9dfd7205f
-EBUILD tomcat-servlet-api-7.0.106.ebuild 908 BLAKE2B 603ab40aba15acba98d8028b81a16220f789f748e0f411db0a7ea7b91f1b11b434915f8d52ddccbd5ee62010c86e0558a2fe450f1cff49cbd59e77466ebd8cd7 SHA512 1ea3549ca5280987c97eb13be26f5e0194370495e16343a521084c2e868b6272ffeee707125582ba75dbd784b574cd01d6b2c69c5d7de624583d65dd646f8636
-EBUILD tomcat-servlet-api-8.5.57.ebuild 1010 BLAKE2B a366fb083a2773dc36ea015153eeeb3938baa9f660f156ced603f854cf75b2ad515e8c0a900a1230b96c3eb99b9af8df130cb7c94208a1b0ecd6f1885b4c5813 SHA512 955beccf5a490a86c20fc3d77bb9aaf6e115ab2cebbb8a05b85ea4a8cb22cb1267fe323bfd0cd97576f8e581276e2f15d6f4cdd7e5fa9cbf62bb808b8c4759b9
-EBUILD tomcat-servlet-api-8.5.58.ebuild 1013 BLAKE2B 01c959704db8d43db38477022598b7806d864a368b06d07abade1e550efe7e8917fb9027cf2d4aea05dfdf3bac72bc50d613c8df5d219c4e6555b26a9d09e999 SHA512 8e27db7deeee4afa07ba50ad6e75e5065401095cf6fd6e4990ba9b32d2ce54ea83ce66b90b79709c156e555f9d60292208126670b901ff08b9a2b120ce20214f
-EBUILD tomcat-servlet-api-9.0.37.ebuild 1012 BLAKE2B 0bfd9e19febd187f1a79298e5c051e8eba1bb4f72c64cda5bd90f64b34772b851008241b3866ebcec0a59aee0c0d4d29d2b883ce2f9c9a3253280e58577fe3b6 SHA512 4831af547dce2d5372fb7fe9f79cbb2bafc1c5bba3435477adf71c06ebf9498792f06e2ae321bab32a4cbad6eef64961c1bf6c4db611c796f036bdc5ff8bcde7
-EBUILD tomcat-servlet-api-9.0.38.ebuild 1013 BLAKE2B a4d9758bbc5144a2f1bd07e5b6f9f52669e93fb659157e094d8b18b20c789206a90998ab288289d08585660604a4f1fd2741fc7184365c147d9155cf56ce0e05 SHA512 b3be9c5ceeed3c2f52e6861b1d353b213b77a3b5eb0828060a69ae97b1b481b523baf644e1c73322266492b6f58bf724ef5a992b58215a4ef83ce2f47bf3cc1a
+EBUILD tomcat-servlet-api-7.0.106.ebuild 905 BLAKE2B 9957aa960b21b87cefbe5cc3fb979e9c9489e35caaf47b53e66a6cc37b71f5412fe43a84d6530f4841446c2a7a1b6387af610ef3b00ee54284c696c91b123b11 SHA512 2f0fb2ec3f2026c33efeedda13aed94283a8ad1d958c44af873b2b41c43521fc59e4696a049e25465df9233a4458d84ce6f73d7dc70935fe5347ad3bcdac4370
+EBUILD tomcat-servlet-api-7.0.107.ebuild 2997 BLAKE2B f3f4d7bfab2ab5290da8bf0d3cd318f40811080c67017921ef23ca08b20a8064c9d3e533d0068de10d0404617d069088c035d7d1ba022cd230058afd1f044ae4 SHA512 769a9cfcca2baed04d1a0e5a91fc2d81c7bf29545ec52544c5e5004f0d4f79c354ef655cdd5a843f2a7298508cd57584e10f0a60318cb3829e436759bd2a3160
+EBUILD tomcat-servlet-api-8.5.59.ebuild 1010 BLAKE2B a366fb083a2773dc36ea015153eeeb3938baa9f660f156ced603f854cf75b2ad515e8c0a900a1230b96c3eb99b9af8df130cb7c94208a1b0ecd6f1885b4c5813 SHA512 955beccf5a490a86c20fc3d77bb9aaf6e115ab2cebbb8a05b85ea4a8cb22cb1267fe323bfd0cd97576f8e581276e2f15d6f4cdd7e5fa9cbf62bb808b8c4759b9
+EBUILD tomcat-servlet-api-8.5.60.ebuild 3009 BLAKE2B 73382c67d346ac48e0a3cc8fc35fd48be7c2a9bfe8fc9b18da0dec532f0d131875dd169916eea4f32aa82005e025c5b1073d6cdb3da25b9886b9687287cb7284 SHA512 e085c0821b6635da8c3201c472d883d40900828780f0ab8143c17c87c86d837a9602da05e0574a2af3fca268a3bf73de71be2ed5f6798c59aea3b97497220c60
+EBUILD tomcat-servlet-api-9.0.38.ebuild 1011 BLAKE2B d5a942f88d3e07432b5ad8d71bf254ee99d37adfa7a556ef770217ab8639ea81071f554f5d80dfe3b2ed91144d6f90fc5fba8a7e56c3a82990ca31813f529755 SHA512 42710ac1b7ff3a70992fd9b112a012aad285aae2ac6e547f313f437d04198d88cb8655e5b63d3ef8b8181e418e312fe68ebd9b7f0ab988a1e0ca8c1793a78824
+EBUILD tomcat-servlet-api-9.0.40.ebuild 3174 BLAKE2B 51d67f7713bc5179e3a3e317b5c1ab47c8e1e7f1f733a560bdf495f07951d2d19bae34141b0f49e637aca382d4e6f4d0ef9d7fe587f4423cd862d7c5a00f5572 SHA512 5066130bf7306e0f70877b8d6438b1fe1b1ccc1dd3630b4fbc4e1dfac070001f213d28ade37c982b25cdc292f6a0d8a4bc5b354236e64873559fccce0c98c1e0
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch b/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch
new file mode 100644
index 000000000000..86e9eeb8f19f
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch
@@ -0,0 +1,20 @@
+diff --git a/java/javax/el/ExpressionFactory.java b/java/javax/el/ExpressionFactory.java
+index 2f42de7..5d52580 100644
+--- a/java/javax/el/ExpressionFactory.java
++++ b/java/javax/el/ExpressionFactory.java
+@@ -36,13 +36,13 @@ import java.util.concurrent.locks.Lock;
+ import java.util.concurrent.locks.ReadWriteLock;
+ import java.util.concurrent.locks.ReentrantReadWriteLock;
+ 
+-import aQute.bnd.annotation.spi.ServiceConsumer;
++//import aQute.bnd.annotation.spi.ServiceConsumer;
+ 
+ /**
+  *
+  * @since 2.1
+  */
+-@ServiceConsumer(value=ExpressionFactory.class)
++//@ServiceConsumer(value=ExpressionFactory.class)
+ public abstract class ExpressionFactory {
+ 
+     private static final boolean IS_SECURITY_ENABLED =
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.105.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.105.ebuild
deleted file mode 100644
index a24b8965371b..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.105.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-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.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml ||die
-	java-pkg_clean
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.106.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.106.ebuild
index 8da54889a0bd..f370da59b91b 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.106.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.106.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.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.107.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.107.ebuild
new file mode 100644
index 000000000000..101f0a953182
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.107.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+	default
+
+	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
+
+	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+		${EL_API_SRC} ${EL_API_RESOURCES} \
+		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
+		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+	pushd java || die "Failed to cd to java dir"
+
+	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
+	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+	popd
+
+	for file in $(find src -type f | grep -vE "\.java$"); do
+		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+		mkdir -p ${target_dir} || die "Failed to create resource directory"
+		mv $file ${target_dir} || die "Failed to move resource file"
+	done
+
+	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.58.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.58.ebuild
deleted file mode 100644
index bfc2b5c24170..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.58.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-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}/"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml
-	einfo "Removing bundled jars and classes"
-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.57.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.59.ebuild
index 05c60361600c..05c60361600c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.57.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.59.ebuild
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.60.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.60.ebuild
new file mode 100644
index 000000000000..ffa23dfbfdf6
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.60.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+	default
+
+	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
+
+	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+		${EL_API_SRC} ${EL_API_RESOURCES} \
+		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
+		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+	pushd java || die "Failed to cd to java dir"
+
+	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
+	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+	popd
+
+	for file in $(find src -type f | grep -vE "\.java$"); do
+		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+		mkdir -p ${target_dir} || die "Failed to create resource directory"
+		mv $file ${target_dir} || die "Failed to move resource file"
+	done
+
+	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.37.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.37.ebuild
deleted file mode 100644
index 585a158ab74f..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.37.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml
-	einfo "Removing bundled jars and classes"
-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.38.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.38.ebuild
index 7adcc0c40e9f..03712ddc01a2 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.38.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.38.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 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.40.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.40.ebuild
new file mode 100644
index 000000000000..03de50ee0b26
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.40.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+# we don't have the aQute.bnd.annotation.spi packaged
+PATCHES=(
+	"${FILESDIR}/tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch"
+)
+
+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/toolbar/Manifest b/dev-java/toolbar/Manifest
index 9b6463b91fe3..3765b2ec6ab7 100644
--- a/dev-java/toolbar/Manifest
+++ b/dev-java/toolbar/Manifest
@@ -1,3 +1,3 @@
 DIST toolbar-1.1.0.zip 72829 BLAKE2B 8ea170b5c1643dc2e9bd914c3267f964640ab75fd5d179e7fb751b1b85985533fd2425b20df777c8c1e087cf223af46b9e5ddc02f2123948a5cfd27067fc6a30 SHA512 57f4b7970beb78f979bd3970dfc528e0a26e38828dcb8a2cc81c8f886e900f81fe53ca6cae7b5cfa3ce93cc273fa2f440cb0bd720ba6052e84e9f2df1e77099e
-EBUILD toolbar-1.1.0-r2.ebuild 566 BLAKE2B c3676cfc152301de9623b96b1a49c9ff98245edd5c7aa60838abb4072816e6b2348720e0d02d129286884dc39bb371c10818b14e65a2574a737e6a86b2350af3 SHA512 b01ebbea7010bacb83a7a3aedf86554b23849816e8ac5cdd2f3dd2e8edd5d52fcd54a373012decdf04fddc3b13793ced41d8f75a1945d7f63790adae0aa47a78
+EBUILD toolbar-1.1.0-r2.ebuild 579 BLAKE2B 16f7f2de360a6bdeda433174d4cd8c91d7cd885134af08b2de5a24706ce4ec9ebcc0f8ef5ec00d77a66bb4b3900884448912957e0e94dbd450639f103803fc7c SHA512 2a5364f6420fa2bd8a68486472b559e144eb6444af98e32e944a8626f8a4c6d9ec3433d3066a6aea9fe0bbf0c918c86b8eb77550009f32cf2b69c096157223e2
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/toolbar/toolbar-1.1.0-r2.ebuild b/dev-java/toolbar/toolbar-1.1.0-r2.ebuild
index 057a3016ebfc..ea0e1cf62628 100644
--- a/dev-java/toolbar/toolbar-1.1.0-r2.ebuild
+++ b/dev-java/toolbar/toolbar-1.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,6 +20,7 @@ RDEPEND="
 	>=virtual/jre-1.6"
 
 DEPEND="
+	app-arch/unzip
 	>=virtual/jdk-1.6
 	source? ( app-arch/zip )"
 
diff --git a/dev-java/touchgraph-graphlayout/Manifest b/dev-java/touchgraph-graphlayout/Manifest
index 36cb467970fe..78f71b291991 100644
--- a/dev-java/touchgraph-graphlayout/Manifest
+++ b/dev-java/touchgraph-graphlayout/Manifest
@@ -1,3 +1,3 @@
 DIST TGGL_122_jre11.zip 202777 BLAKE2B 108b09934a5463460147f82409b09d5d2e755ac30996c6bffbfe07b89abea11d2c609e2d9f6d79ed4f425961898cdf3a8b46a8b7ee2191782d96f5cb5496cf42 SHA512 5c638972264ada2cb91ea1667c0b770629120a01496f7834ef3e4999ad5867ff911e772ea1361e33c168d8681c6f19f46ada33ea637daf4474f66a5cc97610a5
-EBUILD touchgraph-graphlayout-1.22-r1.ebuild 639 BLAKE2B 10886a1e536461546a6f066cd4d5d9172be684f631987b1b5bac60840329dd7f8a3ffc593e9ef7ab240be7fad463bdb1db789b52d6d208ccbc79cd77ed13cb82 SHA512 543beb1f93c8a8c194bc900bf89a6d2d0569e200cdb9bb82a49035a5803ec6f9d38cede2aa95912a7feb6c206447f5132029dba47a642c6cd83800a7d547dcd5
+EBUILD touchgraph-graphlayout-1.22-r1.ebuild 655 BLAKE2B 2b24c048af141177dc991a744ea70024cc2959975802f1e245d5412c4cc08cf353b477933eb94ec3156fbf7c1658ccedea166fe0069caad6d56a8377424d108d SHA512 1ea6a01cd3d748f8b638fff000b0a94ed230c582299b2057e7ec2030e32d194b92945938ab24795ce0d6e15fc4a2bd2c526a20ac6eee4cab676e546fdf326e52
 MISC metadata.xml 316 BLAKE2B f368004d8bf0f3f4b836ce366f5474629d0f2e77ba031ff48236bb8173bd24e64cefd109615bc52edbcaeac634f381359493293f7a262c24585f03393209ef72 SHA512 aad7058d0838227cb1bd18470dea28eeaceeb4a07a36a7cd86964ea77a7a3cebadef9af42a99fe817618f5d3f2fe7fd1703fe6752561057a5cd8fd83bddfa26b
diff --git a/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild b/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild
index 252ec5063ff4..2119402430f9 100644
--- a/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild
+++ b/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,10 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
-DEPEND=">=virtual/jdk-1.6"
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.6
+"
 RDEPEND=">=virtual/jre-1.6"
 
 S="${WORKDIR}/${MY_PN}"
diff --git a/dev-java/typesafe-config/Manifest b/dev-java/typesafe-config/Manifest
index d0f0c8b4e6c6..512926eaaad3 100644
--- a/dev-java/typesafe-config/Manifest
+++ b/dev-java/typesafe-config/Manifest
@@ -1,5 +1,5 @@
 DIST typesafe-config-1.2.1.zip 287878 BLAKE2B bf4d1001bb84d0102b91b7ff383d9313302d95fd854928a40ecfbaae7a18309cf3f8509af0968fa21cedc485a1691c135395ccea5f9e6ba1c94856f2bb7ce81c SHA512 178f0df81f081b9355951debd3a5435c7d6aae25893f049917a25861015eba18a305d5370d914b89a7c46e55b5d9f3939ddd0656cfa9a4691bd16cf32c796502
 DIST typesafe-config-1.3.0.zip 363061 BLAKE2B 94c3f1f4eaaa831a15ef10619b672fb1882cfc472ab4d4ebb3494805f281152f7d01c56cee5f06a70319822d3e4254d540d4a5dde0f1c321b79fc4fbc18da6b8 SHA512 8b9821de442dc24b8b7be4c5ebc91d57214a32dceda8dc160cfaf801f70b34d2a2df6f8b2cbb744d18be3fbc887f1666f431b52882edcbde408d8adf3681fec4
 EBUILD typesafe-config-1.2.1.ebuild 513 BLAKE2B 4ffefc33dd21ce468a19f2e1ff4dd05859bbfa19d7580cd4c24b3502bb98cee083f6e89e5cc53977cda5b4cd8b60350e867492916136b02b872a5b3c1d0232df SHA512 3325f637f60431c531ecdfdc8f865c83d11efc5c42a91fd36dcbbb6c42267381736cbdbc44cf4d9be97fbaad9dc32d24d986b06b6755713046a4946e275ce20c
-EBUILD typesafe-config-1.3.0-r2.ebuild 509 BLAKE2B f0696ec35b225513b6752aa0b00a2ef9de02953ba1ccc33f534f4b47626d8ab83e613a83c89935f9cdc6a1bb8561fd763db52acf53304e8f05437a7e0185d099 SHA512 1929afe71a44f7a2d1cc6907de131887c7adfd60b947dc5be85c66bb4e25888c03aef87faba5cbcb39f18bb5c20eca908da23c9a01d83b9e64b56eb3704ba531
+EBUILD typesafe-config-1.3.0-r2.ebuild 513 BLAKE2B 86ed7bdaf3f047441746fad30620efeadcef2fb32d5484f0a1a97277251b980b4dfbc9eccccd919dfcf0432a2f9b61521bf385174a74300fa42c83c24baaa368 SHA512 e8eefc1c7a9e8aa12e10bce89c8e16791c4c7d6b21359eaaa42d76785163f1b0e3358f92641e1ab42d554170ae7ceb2be981eb901fbaba785a53916c09173bf5
 MISC metadata.xml 329 BLAKE2B 81388ae70dc17275e60d222ce636859b7f6dd9d58a3754018cdd648720d58549ada91a444fa92bdb0bb4750e23d98643334119a06044d490883087a6659fe25e SHA512 3cd9eea5ad8ba9ff81a44829541064af00336c217a17cfdd95dc0384211de25884054d2b45af68f333655c5dd469fc44f27245a74d0d0aa136941b017fc8bc5a
diff --git a/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild b/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild
index af863fe4372a..a8d9faf9ac95 100644
--- a/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild
+++ b/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/typesafehub/config/archive/v${PV}.zip -> ${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="doc source"
 
 RDEPEND=">=virtual/jre-1.8"
diff --git a/dev-java/velocity-dvsl/Manifest b/dev-java/velocity-dvsl/Manifest
index 328b29ac8752..b1411e634ff9 100644
--- a/dev-java/velocity-dvsl/Manifest
+++ b/dev-java/velocity-dvsl/Manifest
@@ -1,3 +1,3 @@
 DIST velocity-dvsl-1.0.zip 91539 BLAKE2B 747c735804b24d6d775c658e505a5fbe22289e98ede55577354da7ec0a7908031312febeef8f698aba033d0c9b1553b4e46eb6a5cbf6683ba4f16f87b178fa32 SHA512 0f431347706143a76d93d58f44a534a566780e27ba3ec43e48e4268b88a5fc523850a693800b730bee3a26d1c03339b24603f7eacabf716d199a9974d95c1d01
-EBUILD velocity-dvsl-1.0.ebuild 907 BLAKE2B 6c9f6d111248907a9d1df34d64aef9029d51ad0c213d2d09f2985359ee51c8c891f150a558cfe4ab6cda6cd3b05b11e50547ce17b2978be2108e865010b2a327 SHA512 084301cf6bbae94261e0ca65ba69c3d4c6631cb98ff2ba93d912d349681a0e10609e80c736fb76307ac6d79abc36382742335ec5b5b97fa52b466f5e446aa686
+EBUILD velocity-dvsl-1.0.ebuild 920 BLAKE2B 7de327ee1fb19d7f227616dfc2e3e78294a85f0363a4f6cb4c693db1f821b8e5d27da518b0423a05de3f5385f02bb347bb505fc9bb3a5e22279db429e68b412f SHA512 1ab3c58b1245d13f8145cd9bbe681dc525c6464df301e819dbca6bfd1549a0a02d284e43833973593158c03599c3709753a42324961eba7152c6db23f58e493d
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild b/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild
index 42c7d261a5bc..c771f2541a41 100644
--- a/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild
+++ b/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,8 +7,8 @@ JAVA_PKG_IUSE="doc source examples"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="Declarative Velocity Style Language."
-HOMEPAGE="http://velocity.apache.org/dvsl/devel/"
+DESCRIPTION="Declarative Velocity Style Language"
+HOMEPAGE="https://velocity.apache.org/dvsl/devel/"
 SRC_URI="mirror://apache/velocity/dvsl/${PV}/${P}-src.zip -> ${P}.zip"
 
 LICENSE="Apache-2.0"
@@ -25,6 +25,7 @@ CDEPEND="
 
 DEPEND="
 	${CDEPEND}
+	app-arch/unzip
 	>=virtual/jdk-1.6"
 
 RDEPEND="
diff --git a/dev-java/xml-security/Manifest b/dev-java/xml-security/Manifest
index 6554f99489f4..491e083a8200 100644
--- a/dev-java/xml-security/Manifest
+++ b/dev-java/xml-security/Manifest
@@ -1,4 +1,4 @@
 AUX 1.5.7-build.xml.patch 1124 BLAKE2B e51aa373776a51657f6047c8baf15ff0041aa82dcf660846e4218b85b67f7049d4e138c789f24094e170db5a29656fdd6be5501f38197d64fdcef748884a78a9 SHA512 9fd53bf8efde00c0602b007e5d54d00c923432357eb56c727f6f09845a43557b8b168704842e206ac5c78d6718bfd8f3629ee808b6e08e9f18e3097aa7f099e1
 DIST xml-security-bin-1_5_7.zip 9164667 BLAKE2B ea0756f745c27767634bafaae1b3584ba6843cd9d6fe4d9c7cb080058015a576dc8a3f117d32ed3b139a42373057d7dc4ad33f0e25db4abbbaf140a0cc115e01 SHA512 ae8e538fe7c90013a89d139358efc06d8921b1b0050a686dcacd123f5a8a8f100be163e88fef59998ea0ba27ebe9855f06d1f33b1ac92fa3f31acbce9934bd36
-EBUILD xml-security-1.5.7-r1.ebuild 1527 BLAKE2B c276fcef727f2f6850136bfc2d1301def71799bca71cf6e00889a372b77eb26e3b21366cb3d877eddd341a62e5acf91097a19098a00851b5885edda5efedbb0a SHA512 bcf0de359de308d8988e7c5911eb0975cb95eeb566c4803b4c1ffd45b35a3b92cf82168b41022feb76b42dbddc91fb5b1b45326f949a70063052c1d38433d33a
+EBUILD xml-security-1.5.7-r1.ebuild 1540 BLAKE2B 193a3e3e0c9d7363040e314ab66fa8a23cfbef908824915cb71ce8e4d9fc3321d0489fa096dd9db4f8462020b8fc3f081488872c12bde76c9111345b52b6d8a9 SHA512 cbf0401c097e6e06274833a2fc6539c5b82d7c9b87bc60a70b4aeabaa46c8a31ba762d9554cdd133f15b7daa0589559f3609f8acc4a395f19cbf0ec30ed9bd20
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xml-security/xml-security-1.5.7-r1.ebuild b/dev-java/xml-security/xml-security-1.5.7-r1.ebuild
index 2f0dfc584976..0754ce115bfb 100644
--- a/dev-java/xml-security/xml-security-1.5.7-r1.ebuild
+++ b/dev-java/xml-security/xml-security-1.5.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -26,6 +26,7 @@ CDEPEND="
 RDEPEND="${CDEPEND}
 	>=virtual/jre-1.6"
 DEPEND="${CDEPEND}
+	app-arch/unzip
 	test? (
 		dev-java/ant-junit:0
 		dev-java/junit:4
diff --git a/dev-java/xml-writer/Manifest b/dev-java/xml-writer/Manifest
index 161c9c0073a3..f7e0f9b07a51 100644
--- a/dev-java/xml-writer/Manifest
+++ b/dev-java/xml-writer/Manifest
@@ -1,3 +1,3 @@
 DIST xml-writer-0.2.zip 51666 BLAKE2B 7b2655f18878ab2c13e42538b07faf463c581dae10fda416bf0548d7baaa13ae457c2a7636b54297826b2c4622aa9d9770886ccf512f7b8e337b288a07cd1928 SHA512 6097d3515b0b6b06710c0913dbd378b2008a485d28000f7397151464747f0156f7e427efd33a8d0f43494b6c3d80470207fcbc742b338f3adec7d4d0f3a2b6d5
-EBUILD xml-writer-0.2-r1.ebuild 652 BLAKE2B a589dbd3e6608655b158ad0b67401f3b2f260986b7b5bac534a295e32845453acfc662eb0d3ff51c722d0d241e8b93d902c6cf16ce0b4285f2dc22c3f398e691 SHA512 964df4000c73f96791d2eee136bf1cb19988651a774b72076e11008d005c9dbbc0854b6d9ccf2e26d3205ef0878791b94ebbb03861e7337ac5082b541f56ea79
+EBUILD xml-writer-0.2-r1.ebuild 665 BLAKE2B 9cecf20b2d823cf80592638de100688ee6e13868ed0ceb1be78b1bfd22723da7a1dc5e94d59ad6336ae1b1815cb865a50f28ba31e7fd6c3e7fa7f068a6c72509 SHA512 c2b7bf270f3952e2249068ca874a9527d314a25ebea13f98e86f6f67afe8b8c60174f2715ba71faa4251833a966f27b1cf61efc80ab328ce0c9b7b736e60e75f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xml-writer/xml-writer-0.2-r1.ebuild b/dev-java/xml-writer/xml-writer-0.2-r1.ebuild
index 1aea28db10e2..5d086d4ac2f1 100644
--- a/dev-java/xml-writer/xml-writer-0.2-r1.ebuild
+++ b/dev-java/xml-writer/xml-writer-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,6 +19,7 @@ RDEPEND="
 	>=virtual/jre-1.6"
 
 DEPEND="
+	app-arch/unzip
 	>=virtual/jdk-1.6
 	source? ( app-arch/zip )"
 
diff --git a/dev-java/xml-xmlbeans/Manifest b/dev-java/xml-xmlbeans/Manifest
index 41567bbec037..cfc6d17e8189 100644
--- a/dev-java/xml-xmlbeans/Manifest
+++ b/dev-java/xml-xmlbeans/Manifest
@@ -3,5 +3,5 @@ AUX xml-xmlbeans-2.6.0-jam.patch 3594 BLAKE2B 426b7a1d4051aa029abe56f377604216f0
 AUX xml-xmlbeans-2.6.0-piccolo.patch 776 BLAKE2B e7a7795099c710a249136e3831c0f5198e4b41c03709445e0917508cbe82d5d84558a8b8e309937cd3926062ef60a260d400e61d7e8182537f3dcc6529f7ee2c SHA512 e32ac926cae60ff5d10e0647988c3dcfea986a9b0cab9667dd3c73bad6b49fb74585350022b43e24dbc30fef09d87823210e9dc38e830486145924904431e6be
 AUX xml-xmlbeans-2.6.0-remove-jamsupport.patch 1656 BLAKE2B 35ef1a12f1e8c4dbf03ac3870b714fc246cc81d609aa7453ac5755476fe8a1fe7d46fb7e8e725cbdd06282cebbdb0c6ab85c394202004f7e91dcff54545bc827 SHA512 54b570f2960340eecf4368caeaf5d7c84ece7e691bda7460532d5d778e78a6b41a7e776de02b53fa5d5385f66639353758d76d710c1c3e2332ceb2854b9c84fe
 DIST xmlbeans-2.6.0-src.zip 9005098 BLAKE2B e8fb7b22eab718245a24856893268dbc1a09b3228596f274e470ea55aca4c0d01c05ef8e3cbd2ddbdedfd16c66991ee5f8c4001cb68ff9876d5749f47d640006 SHA512 162dc3d283ebf9f7fae823a2ae8d835b708c2cbeed48349c85996e60b2b8dfe0e51b17bd37eb34327c6452b2c0fc7df8a4902816b145993e36ca614ceb43b2b7
-EBUILD xml-xmlbeans-2.6.0.ebuild 2339 BLAKE2B 9ce6a87c268fe18b0ff45f6053ccafaa716197d4421fbdfc8283a9d27ab9365f40edbe7bd922cc79c9c1010db759b751fbe0133efd801c6b26122800f9a7e23c SHA512 4a8a0c89c1c537cd9b6a30bb526761f2b06c95d80442397293c05be145e37f8989ce57ce397757c13f780610e3a989ba0f44e7673f6586a34ce36051e83324a2
+EBUILD xml-xmlbeans-2.6.0.ebuild 2354 BLAKE2B c8b8de40ea32e5daa71208357cff9027c58c92eddbc0913dce75bb340b9d26385380eeae2ef83cdd1b37932c11dfd77398304d4b98cda467ba618ed44571d41d SHA512 dcae21f5ecaaeea1da23831c4916600bf23d85cc5a244e0b6bd293d7b88b64bd48ff7b2e3bdbdb4fadce9e0b9a6c8b4c24fc05e589cf1565117b6cf7993b80e4
 MISC metadata.xml 1185 BLAKE2B 0647d5d81e325691c54342510e249e98b26e07157d5f892d5b34ed54be045a7971ec925825afe9062d38bf5278bb316385c2e46901f6b65890cab3559b30897c SHA512 5f4554c860fb8b6b2bcf0b7cb8b0f8f147c187091cd64597aede3a3543570f586eb3c0fa4d69e2e2391bd5e839bb8ab089d05a05099554d206691c120c9321ff
diff --git a/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild b/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild
index caeeefcb60e9..9c2f973e212d 100644
--- a/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild
+++ b/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,8 +9,8 @@ inherit java-pkg-2 java-ant-2
 MY_P="xmlbeans-${PV}"
 
 DESCRIPTION="An XML-Java binding tool"
-HOMEPAGE="http://xmlbeans.apache.org/"
-SRC_URI="http://archive.apache.org/dist/xmlbeans/source/${MY_P}-src.zip"
+HOMEPAGE="https://xmlbeans.apache.org/"
+SRC_URI="https://archive.apache.org/dist/xmlbeans/source/${MY_P}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="2"
@@ -30,6 +30,7 @@ RDEPEND="
 
 DEPEND="
 	${CDEPEND}
+	app-arch/unzip
 	>=virtual/jdk-1.6"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-java/xp/Manifest b/dev-java/xp/Manifest
index 361719c07dcd..2e718148909c 100644
--- a/dev-java/xp/Manifest
+++ b/dev-java/xp/Manifest
@@ -1,4 +1,4 @@
 AUX xp-0.5-fix-jdk-1.7-enum.patch 1320 BLAKE2B a69336ffcbbed7b41981b6beb29562b94f408ea9e7ab5145c32612b73702b091ea665ad2c2b2d6af8e6b83e46db90a773a0058d3b2ab37d68158e84b4e098802 SHA512 37f9b6969edb07d8b824aabcf07b182f77cd0cdac1bec2e84133526fe48fc2cc5fc15d050ee16e7ab46def72a9d1fcb627d426049b258d2bf063feed9928ca14
 DIST xp-0.5.zip 281324 BLAKE2B c9bf54836b67773f2bcdf34cd0548acc9e2cad039aaae1ff397f63b9f3715742ad9e0494b696415f83ffc50d14e47462c0efcf52e9332f8cf469441094bceb74 SHA512 5bf354967a1135209d5c6b3be979a311aa5c909493dea16a0efd31a1838dda12be4005ac7e919620ed68266a333fdc93a07853ec1e0af0e83b329bd40bda74b6
-EBUILD xp-0.5-r4.ebuild 536 BLAKE2B b855ec36a79d3dfa56ac801c1ff70c0661c1a75716e4b903420703cf3890c4e2b5b157bc3957809c547f990496c8f634b0fe0c4b7508927e6e1d2be32329898c SHA512 e91ec6508506814073d9007f5e2bd0e48a258892c0ee7589cd72eedb55ae6116d7a28d05b24c6428f1745cd6e1f0e8cb0244c60d6836adfa71fca5d0c92f6efe
+EBUILD xp-0.5-r4.ebuild 552 BLAKE2B 433ffba6744be80b9bd7c9fb8361f04c6e5128d883829c990a5787a15fdd4d202d7c9eb94d3aaa5bf0fa8cd30feef1242dbc8b933500a7d0fdab028e80ef14c0 SHA512 832ca2ffd77c0b051659e2953ff31580361c80fc527520a2930c49b2d767f7eeccf0e75f49c51b8d78ac5e64d482edbab58ca41cd283030e7311f727cad1b857
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xp/xp-0.5-r4.ebuild b/dev-java/xp/xp-0.5-r4.ebuild
index c39c99adaa5b..ae0095ad000a 100644
--- a/dev-java/xp/xp-0.5-r4.ebuild
+++ b/dev-java/xp/xp-0.5-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,10 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.6
+"
 
 PATCHES=(
 	"${FILESDIR}/${P}-fix-jdk-1.7-enum.patch"
diff --git a/dev-java/xz-java/Manifest b/dev-java/xz-java/Manifest
index 76d8b04b4d03..27fba322e563 100644
--- a/dev-java/xz-java/Manifest
+++ b/dev-java/xz-java/Manifest
@@ -1,3 +1,3 @@
 DIST xz-java-1.8.zip 152470 BLAKE2B 601e3292936cb8b3a885551a275248628171f0fa15829785e2fb99d5dfefab59fd2283df4040f090a9d96d30bef5dacd5f4aed4f9d3163ee17dea4a72ad1b0f8 SHA512 3d30804baf9bf743347d87befdbf103107f413c4460639171257e87c4ac96c5e9bc6401a85c44939cd40a25b965162d916a552ae9967f1ff1c71ed389508f5b0
-EBUILD xz-java-1.8.ebuild 661 BLAKE2B 66e4e27578b1032045e02de05a4b8c87fba109863813fc7c9f8d780578a781f1ca6f9af82a252776195e2905bc544cfc9a28daeee9dff701eb3c257a27685799 SHA512 560a21f2a16d4b08b4f649faf20c19418abb956ada1945295260e8499543b8a643e8888e7f0c889c45df738f38788bab7529b6062baa5d97451f37e7328582be
+EBUILD xz-java-1.8.ebuild 677 BLAKE2B 8313b394a56ff0b9227e73fccefdbfac9698f1b15586caa66ebe1523fc55a6f21d5bb4a0bda95d0c298dd067f6d868298db48681ed8385cfc6a6d0326ec96d61 SHA512 6faf205c18ab9cfe09ddbc22f51fc05705543669b4822ae9df99c59aae267c271795498d8ea626ac5005039e0b04dda66f0145ac3f607b3d253b4e6c41dab401
 MISC metadata.xml 352 BLAKE2B 8390000455654697f473905c14903172230b9667fd16c4db74dd32643b096cb7c8efa21f8614b30d676fb32e052a76c613298e2a28c362d6135f61a4fe27c242 SHA512 a3c6ce3cd97b39644238700277dd416e1ee79df975184de3429810ca4d77f7160112adef6a9b56f77243a003187f6642798b278cf8501d55da766ccfbaa861cf
diff --git a/dev-java/xz-java/xz-java-1.8.ebuild b/dev-java/xz-java/xz-java-1.8.ebuild
index 1213425ffb94..36cba78282b6 100644
--- a/dev-java/xz-java/xz-java-1.8.ebuild
+++ b/dev-java/xz-java/xz-java-1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ RDEPEND="
 	>=virtual/jre-1.6"
 
 DEPEND="
+	app-arch/unzip
 	>=virtual/jdk-1.6"
 
 S="${WORKDIR}"
diff --git a/dev-java/yanfs/Manifest b/dev-java/yanfs/Manifest
index 7597f3664500..cf13c298178e 100644
--- a/dev-java/yanfs/Manifest
+++ b/dev-java/yanfs/Manifest
@@ -1,4 +1,4 @@
 AUX 1.0-make.patch 2620 BLAKE2B 5514ed5b8b247499d4b94bbdf340fbcbdb66a5d72cff48b1264ab8d1a59fd7917991f9c374cc673e50e928839b69bcafdbaf999fef77b272504729c2d470e2db SHA512 85ad4c443800a33ffb16fee52bd1a2fd89dc8d3de8f6adbc184ca72ad3ee8c877d4658b4c2c82ebdb54b333c16dd54534f47d193e9b808a16f92a97bfd5b427a
 DIST yanfs-1.0.tar.bz2 107232 BLAKE2B 4c344f03e52c4a5eb3cee87e05e4a5b33cdec78ef49427de5ac6a1a44b87444744b0e619963c67ca494092831474587e29dc506bc7261fa98dec05b6cd8c9ebd SHA512 e7031ba630360240de136f588c337a3a4b551320f5e121c1910fc58ba08c7b7c6fe95fb87b57263c19e00a3e44fe81c36d9e8e8971d4fdf910bb3797c0a1eeeb
-EBUILD yanfs-1.0.ebuild 1030 BLAKE2B d4fa33c1b5367f33481ab5a79d8222bbc37b0163f291ffbfb78d0cea96c81d845557d79222fe59de93f2af0afb3cfd6499eeb03677a189b0b29d8aa7724fc423 SHA512 28fcb33d53374eb1c94cbbe50f42b576ad09eb30f4b3c4fcac042c2da096a8d8b0d7e7b308a8413d38d3215d9e03eff482e22b4e16bb3ede6fe89f3b00eeeaa3
+EBUILD yanfs-1.0.ebuild 1022 BLAKE2B ad914f7c6c4dfa05dcc48efc9257b5807a6920851211ee8d3f69da4800836d4abfcef355f32c2617a0bae07ddb90ab70a4b3315993ab2e999196ddb3a3ce8569 SHA512 7f68d117ee306c5fd9dc031ea3dd60f5e3dff7da2325ca04a584ab037a110e457687c157464b1bdfe7fc3ea667a96fbcdb13518c9ff7f544645ecdf1454d66da
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/yanfs/yanfs-1.0.ebuild b/dev-java/yanfs/yanfs-1.0.ebuild
index 9c248cd2c3ad..477c34c8a244 100644
--- a/dev-java/yanfs/yanfs-1.0.ebuild
+++ b/dev-java/yanfs/yanfs-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Yet Another NFS - a Java NFS library"
 HOMEPAGE="https://java.net/projects/yanfs"
-SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/dev-java/yanfs/yanfs-1.0.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/dev-java/yanfs/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-java/zeus-jscl/Manifest b/dev-java/zeus-jscl/Manifest
index b1a13a74c35c..15346cf67059 100644
--- a/dev-java/zeus-jscl/Manifest
+++ b/dev-java/zeus-jscl/Manifest
@@ -1,3 +1,3 @@
 DIST zeus-jscl_v1_64.zip 585558 BLAKE2B 10b106d34953a9306b10ef4d73b2c8d34eadb0849a5facb0ac3682a1f6cd3e39c7ef789da0b32ce2e720698694c466385d32c33a57785c7603e67af18375e8da SHA512 e756df28da39322121575041a949965f47eecea6106e7dd619a4f0764a239131e1ab8a9dcf7c6d461fc4861ea86acaceb19a5a51c8002c990999193050e03b10
-EBUILD zeus-jscl-1.64-r1.ebuild 650 BLAKE2B ead619229f5e02198c35238ca1c24a4728b305cfb6ea63ce8e103e3b7871ef9d98ac3c01f741869f1033e6ce5c1092db27478ae63a1e54d828fca56d88c25647 SHA512 585f0b2039d52c27e2eb24725061431cbe52d177133dd52d956cc2a79ee56fe9297bda3a762981bc9ee390e88a2e2aa3530099eb5f38d90b12a4dc3b0b99cbeb
+EBUILD zeus-jscl-1.64-r1.ebuild 666 BLAKE2B 7e51c511de0d3f9239f5fd7cee0bb054f393f6209cdedb378e064b014eadc1b541c94584c8372b80eaa5964b5ea98348d2ed1b4a20bc46dbcca69f312a6ed258 SHA512 b763303f1912f2846bf1e8e1237fa5c5a84c11040b2ee0f03c4f270516718b56c9a1790de5a3d1b977ad1d7280501c7942c20a91cc90d6138a6e8bebeb07adf4
 MISC metadata.xml 315 BLAKE2B e8b708785f1dbf82874f5d77edad7b916d085116cf0f7a9967e23cdb7983a946d7cfaae994bd8f39eb945f83a63404e30b56774658422d119d689cb3a04a8078 SHA512 411cfa7471ea811aca7e961c1896af9ec7efc9b3fc042e7ef897039601e769d8ff3f7a7ae3290656cba4792394d9ff1af8fd9b598613fe6a36ee71de635010e0
diff --git a/dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild b/dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild
index 0b481c266c9d..219e7e9f13c4 100644
--- a/dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild
+++ b/dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,10 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.5
+"
 
 S="${WORKDIR}/${PN}"
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /dev-java
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)