gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-java
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
151 files changed, 749 insertions, 922 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index c06d887995e6..082616f16198 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 6bf3751ac2de..f59e62f3fd4d 100644
--- a/dev-java/ant-antlr/Manifest
+++ b/dev-java/ant-antlr/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-antlr-1.10.7.ebuild 509 BLAKE2B a42e17423275fd66170751d4ed6c40ab14b5e614d0eba30f813af9f562e48b28dd4a552ebde0505d9edf474bff91a199416bdcb0703db3661a26facef40905f1 SHA512 8564474bccccee47185a14ecf4f06e9b259ab89b874852060fc3895ffbd68a9f6cb21496c40bf4567cff08305f5dbbbe17c243c0a362c93fca7ecc5ac4ff20c6
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-antlr-1.10.8.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.7.ebuild b/dev-java/ant-antlr/ant-antlr-1.10.8.ebuild
index fa304c149cc2..dd99b484b40b 100644
--- a/dev-java/ant-antlr/ant-antlr-1.10.7.ebuild
+++ b/dev-java/ant-antlr/ant-antlr-1.10.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=7
diff --git a/dev-java/ant-apache-bcel/Manifest b/dev-java/ant-apache-bcel/Manifest
index 4b4e28e61768..e8a31d3e081e 100644
--- a/dev-java/ant-apache-bcel/Manifest
+++ b/dev-java/ant-apache-bcel/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-apache-bcel-1.10.7.ebuild 394 BLAKE2B 9e9810422e9179883e31de48f35c4bf177cdf0b394f9b9618ae9f9e683cfb8699bfdf2507472fc00721668717ab3c462a73fb38e7a00b992cf118ea65d89d9e0 SHA512 82d4e4de216358d8ea472f8813a31b9fd5f312c073b7e921fd2473f5c523a462e5cae94c8c5936d884bc118b3df88c549bca267462e92723d26531adbba494b1
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-apache-bcel-1.10.8.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.7.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.8.ebuild
index c597ab560b2d..52db2870e204 100644
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.7.ebuild
+++ b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.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=7
diff --git a/dev-java/ant-apache-bsf/Manifest b/dev-java/ant-apache-bsf/Manifest
index 0a76e04e7ea9..4276c5d7316b 100644
--- a/dev-java/ant-apache-bsf/Manifest
+++ b/dev-java/ant-apache-bsf/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-apache-bsf-1.10.7.ebuild 673 BLAKE2B c205ddfbd7c75ad7e9394f8fcaa500eec4052e209adbe4e04b4ee613051b215e2789872a90e1ab719e9259adb74534fd3362fbd1f6dc8ac789e8f3e9599dc2c1 SHA512 da7b6e9974aa9dcb99d77b508df79518d03e1c577014a7dcccc20e5fb8fb08c843db4209dc93d3fe9050fc5c689c7b59a4db2dd6c62c3b67378f1b81032704bc
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-apache-bsf-1.10.8.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.7.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.8.ebuild
index e6990e06c9cb..3c8fb636298f 100644
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.7.ebuild
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.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=7
diff --git a/dev-java/ant-apache-log4j/Manifest b/dev-java/ant-apache-log4j/Manifest
index 2f3fa86d82ae..1376166a7125 100644
--- a/dev-java/ant-apache-log4j/Manifest
+++ b/dev-java/ant-apache-log4j/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-apache-log4j-1.10.7.ebuild 399 BLAKE2B 3e7eb53c82576e7473a4f803195ec2f6fad0202db7900ef15774e9adca9316a1f19d638f38390d9f3cb4181327b922e8e503370793e7337f99c1964e47629fa5 SHA512 c36300f7707ac4f6dc475f3dad47f920320495883c11b883e25b2dc4267a6063e07d9f09dc7a6bdeb706ac3c758122a32ca83b906472be4b7085df4250790dc2
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-apache-log4j-1.10.8.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.7.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.8.ebuild
index b4660cdfcd66..29c114551b97 100644
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.7.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.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=7
diff --git a/dev-java/ant-apache-oro/Manifest b/dev-java/ant-apache-oro/Manifest
index a51f3a5b737f..4a465734dbee 100644
--- a/dev-java/ant-apache-oro/Manifest
+++ b/dev-java/ant-apache-oro/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-apache-oro-1.10.7.ebuild 416 BLAKE2B 8f3b0534a397c17e3ecf73181286f17b7e48f869f3246635ef6545eb971dece352406ccca2b98398cd0455e968f6f49cc48a89cef6f24b3f17c6709e837140c9 SHA512 7362c1f237a6c239c8e1fc5554a231bf33ec436d54825f9eaf95e09475d7c2bae8205a30a7a450832c901610adfc263005a119a9ed3a9e5f3330ee46afb2c4b5
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-apache-oro-1.10.8.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.7.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.10.8.ebuild
index 6ef87dbdb5fb..ed7069776e54 100644
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.10.7.ebuild
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.10.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=7
diff --git a/dev-java/ant-apache-regexp/Manifest b/dev-java/ant-apache-regexp/Manifest
index d77d55143c5a..ba1ab89d60fa 100644
--- a/dev-java/ant-apache-regexp/Manifest
+++ b/dev-java/ant-apache-regexp/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-apache-regexp-1.10.7.ebuild 420 BLAKE2B 56ab64ba83537bab4ade70301f6051a36812c217c121f9934705b27fbc71b54dad2663f346a28949d8c263742bc1ec0c9a51bb2afa7eaac2c57d862a6b2901ed SHA512 671ad75644e51bddccb7f5837674bdadf8d46312d347cd4ac6179abc7b1d660bb1698f71d14840578a68e60986422d62c6065e12c92480c2620100923c365fb9
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-apache-regexp-1.10.8.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.7.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.8.ebuild
index 0bfb1bd995c0..d5abad147f74 100644
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.7.ebuild
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.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=7
diff --git a/dev-java/ant-apache-resolver/Manifest b/dev-java/ant-apache-resolver/Manifest
index 0b0569e4ab8b..05e9300864c6 100644
--- a/dev-java/ant-apache-resolver/Manifest
+++ b/dev-java/ant-apache-resolver/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-apache-resolver-1.10.7.ebuild 423 BLAKE2B e93e091e0c6837f7d21566c7fdb2d4a54a23c752be822cdf938a8e329dd9d4557d2a2b80375ac6ebb9676aa6caebf641281b962215f1fdb9987bf1aabaaab29a SHA512 3895124361b3b85b381f1444d06b059b07994d52127b0ebb19ff36c23f486f1a1a4c01a561e4c04e5bef9d5c12ea6a33cf2f07f0b76799335cf92fbaec1f5563
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-apache-resolver-1.10.8.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.7.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.8.ebuild
index 2cbcd9742868..f52a019bb575 100644
--- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.7.ebuild
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.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=7
diff --git a/dev-java/ant-apache-xalan2/Manifest b/dev-java/ant-apache-xalan2/Manifest
index 2e7e64840b94..f804a93af583 100644
--- a/dev-java/ant-apache-xalan2/Manifest
+++ b/dev-java/ant-apache-xalan2/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-apache-xalan2-1.10.7.ebuild 497 BLAKE2B b783f7a57de54f74d3624c31eb7882f1099b3def59bdfe1cc6230804ce8b2b31988112b3b232f7aee4a9f9fa6a4159a7a5a95316029914eec8365770118a1efe SHA512 c93f41d5af958ce1fc7977388bb889daf2551e269cc6e5fe40267e6ae292d4393ad8b309639b5998e50e6860c6fd4a9ffbbcd5753eee66a02de155da9ec085df
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-apache-xalan2-1.10.8.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.7.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.8.ebuild
index 59d4d903a2b0..2977f62607c5 100644
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.7.ebuild
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.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=7
diff --git a/dev-java/ant-commons-logging/Manifest b/dev-java/ant-commons-logging/Manifest
index c0809b470058..125d06489484 100644
--- a/dev-java/ant-commons-logging/Manifest
+++ b/dev-java/ant-commons-logging/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-commons-logging-1.10.7.ebuild 383 BLAKE2B c325b9d179d7141f34d01d4a3ca114c26f779da53a687f02fb8f49f74abb4fbe882c53d205dcb6de14f15533786c6dbb608f7e00b9f03223e99d541f19b749be SHA512 2dd5598fa05802283e11a2ba12f07181a9f9b83e073b6b223c47e083cf98264ae65d7948847b5ebaaf6300fc2cd4ffb3e5ad9d0fa0a6b2c9134e4d68a352c584
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-commons-logging-1.10.8.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.7.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.10.8.ebuild
index e0947d69ad09..f36466b895fa 100644
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.10.7.ebuild
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.10.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=7
diff --git a/dev-java/ant-commons-net/Manifest b/dev-java/ant-commons-net/Manifest
index 15225f759e50..03fc8cc4a48d 100644
--- a/dev-java/ant-commons-net/Manifest
+++ b/dev-java/ant-commons-net/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-commons-net-1.10.7.ebuild 379 BLAKE2B f87705c6d98492e6ca9f1b7d0a351a087daab2291a107610b1aebe7954208d54d5f1f485ddd24787c8a953cb9012754208a9e03d60d14b74d390189f97c58a0e SHA512 ff37dc41e48c74996fa671c9cf5b6eb4fb085bcbdd02da0848e14c3c4994fab0b0d0ef1fd2b9c5bc169c111b812756bd38f24dbd867edc6464e4bd1148dca755
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-commons-net-1.10.8.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.7.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.10.8.ebuild
index 6de2db6bfff8..fbaa9bfdc458 100644
--- a/dev-java/ant-commons-net/ant-commons-net-1.10.7.ebuild
+++ b/dev-java/ant-commons-net/ant-commons-net-1.10.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=7
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 62038705bf74..47c07dd5ed1c 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,6 +1,4 @@
-AUX 1.10.7-cmdline-args.patch 6257 BLAKE2B 4c517dc5ce15177ac66a343265fdb8753fbdd17e43e1ccb8ad802fcff04a507af6cb9ebbeb8097d0f1bce5e34a3d07689cc19d07fb252891da2b38a92f716704 SHA512 5ceedd8ef20f094f68d75764b4e6ab1295f535c521019df094a02bbe64a4a0ca0492b70ca1b884fd579e30aa2ae5317c1e183cf5e0947d709a080a84217b4344
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-core-1.10.7-r1.ebuild 2816 BLAKE2B 8c3ed79f26ddd6d2185da1909b283a2cc1c0e4b6cdbe247007797d641d2451882e10f16eda558a4c49d6f7a9533552ce972a85258cd97a1955979330495f2797 SHA512 a568d364fc5f44dc726d8cb032e1ccac07e2bc6bce637544f1cf5342321056650eb6fdf3832a69b4f89eb19020a61bb48486e74d25135322681e23584026df0d
-EBUILD ant-core-1.10.7.ebuild 2768 BLAKE2B 188fdb5427548cdf155bcbe6c16627aad533189eb2ac1f85fc8e8112de1571dacf83ca4388a1c9f367ee28f71e8c2a29f84d7cc481b3daa928f15759b22cd642 SHA512 50eba5fe3077ae9ada0f71d2739ba0179df19e4ebf70f3b8b2cc79da91353f22a76d7e9891104856e1b34c2046ff325b08fc2c41a08f1c5559417780345a1307
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-core-1.10.8.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.7-r1.ebuild b/dev-java/ant-core/ant-core-1.10.7-r1.ebuild
deleted file mode 100644
index 64a382b259f4..000000000000
--- a/dev-java/ant-core/ant-core-1.10.7-r1.ebuild
+++ /dev/null
@@ -1,110 +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=( 
-	"${FILESDIR}/${PV}"-cmdline-args.patch
-	"${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.7.ebuild b/dev-java/ant-core/ant-core-1.10.8.ebuild
index 4c9e8245d240..12b283e416e4 100644
--- a/dev-java/ant-core/ant-core-1.10.7.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.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=7
@@ -31,7 +31,10 @@ S="${WORKDIR}/${MY_P}"
 
 RESTRICT="test"
 
-PATCHES=( "${WORKDIR}/${PV}-build.patch" "${WORKDIR}/${PV}-launch.patch" )
+PATCHES=(
+	"${WORKDIR}/${PV}-build.patch"
+	"${WORKDIR}/${PV}-launch.patch"
+)
 
 src_prepare() {
 	default
diff --git a/dev-java/ant-core/files/1.10.7-cmdline-args.patch b/dev-java/ant-core/files/1.10.7-cmdline-args.patch
deleted file mode 100644
index 1be6f0bc5e79..000000000000
--- a/dev-java/ant-core/files/1.10.7-cmdline-args.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 729692d37a72c84998cfc65a6da6e078bbe0910a Mon Sep 17 00:00:00 2001
-From: sergiys <sergiys@amazon.com>
-Date: Wed, 23 Oct 2019 13:24:19 -0700
-Subject: [PATCH] Fix regression introduced by commit "Use commandline argument
- file for all options, but -J, for case javac"
-
----
- .../ant/taskdefs/compilers/JavacExternal.java | 35 +++++++++-------
- .../taskdefs/compilers/JavacExternalTest.java | 42 +++++++++++++++++++
- 2 files changed, 62 insertions(+), 15 deletions(-)
-
-diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java b/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
-index 9569c7fe8f..637e9bdf6c 100644
---- a/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
-+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
-@@ -66,7 +66,7 @@ public boolean execute() throws BuildException {
-         int firstFileName;
- 
-         if (assumeJava1_2Plus()) {
--            firstFileName = moveJOptionsToBeginning(commandLine);
-+            firstFileName = moveArgFileEligibleOptionsToEnd(commandLine);
-         } else {
-             firstFileName = -1;
-         }
-@@ -77,31 +77,36 @@ public boolean execute() throws BuildException {
-     }
- 
-     /**
--     * Moves all -J arguments to the beginning
--     * So that all command line arguments could be written to file, but -J
-+     * Moves all -J and @argfiles arguments to the beginning
-+     * So that all command line arguments could be written to file, but -J and @argfile
-      * As per javac documentation:
-      *      you can specify one or more files that contain arguments to the javac command (except -J options)
-      * @param commandLine command line to process
--     * @return int index of first non -J argument
-+     * @return int index of first argument that could be put into argfile
-      */
--    private int moveJOptionsToBeginning(String[] commandLine) {
--        int nonJArgumentIdx = 1; // 0 for javac executable
--        while(nonJArgumentIdx < commandLine.length && commandLine[nonJArgumentIdx].startsWith("-J")) {
--            nonJArgumentIdx++;
-+    private int moveArgFileEligibleOptionsToEnd(String[] commandLine) {
-+        int nonArgFileOptionIdx = 1; // 0 for javac executable
-+        while(nonArgFileOptionIdx < commandLine.length &&
-+                !isArgFileEligible(commandLine[nonArgFileOptionIdx])) {
-+            nonArgFileOptionIdx++;
-         }
- 
--        for(int i = nonJArgumentIdx + 1; i < commandLine.length; i++) {
--            if (commandLine[i].startsWith("-J")) {
--                String jArgument = commandLine[i];
--                for(int j = i - 1; j >= nonJArgumentIdx; j--) {
-+        for(int i = nonArgFileOptionIdx + 1; i < commandLine.length; i++) {
-+            if (!isArgFileEligible(commandLine[i])) {
-+                String option = commandLine[i];
-+                for(int j = i - 1; j >= nonArgFileOptionIdx; j--) {
-                     commandLine[j + 1] = commandLine[j];
-                 }
--                commandLine[nonJArgumentIdx] = jArgument;
--                nonJArgumentIdx++;
-+                commandLine[nonArgFileOptionIdx] = option;
-+                nonArgFileOptionIdx++;
-             }
-         }
- 
--        return nonJArgumentIdx;
-+        return nonArgFileOptionIdx;
-+    }
-+
-+    private static boolean isArgFileEligible(String option) {
-+        return !(option.startsWith("-J") || option.startsWith("@"));
-     }
- 
-     /**
-diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/JavacExternalTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/JavacExternalTest.java
-index 53aac6377c..a893fb49c6 100644
---- a/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/JavacExternalTest.java
-+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/JavacExternalTest.java
-@@ -28,6 +28,7 @@
- import java.io.File;
- import java.io.IOException;
- import java.util.Arrays;
-+import java.util.stream.Stream;
- 
- import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.assertTrue;
-@@ -131,6 +132,47 @@ public void allJOptionsAreMovedToBeginning() throws Exception {
-         }
-     }
- 
-+    @Test
-+    public void argFileOptionIsMovedToBeginning() throws Exception {
-+        final File workDir = createWorkDir("testSMC");
-+        try {
-+            final File src = new File(workDir, "src");
-+            src.mkdir();
-+            createFile(src, "org/apache/ant/tests/J1.java");
-+            createFile(src, "org/apache/ant/tests/J2.java");
-+            final File modules = new File(workDir, "modules");
-+            modules.mkdir();
-+            final Project prj = new Project();
-+            prj.setBaseDir(workDir);
-+            final Javac javac = new Javac();
-+            javac.setProject(prj);
-+            final Commandline[] cmd = new Commandline[1];
-+            final TestJavacExternal impl = new TestJavacExternal();
-+            final Path srcPath = new Path(prj);
-+            srcPath.setLocation(src);
-+            javac.setSrcdir(srcPath);
-+            javac.createModulepath().setLocation(modules);
-+            javac.setSource("9");
-+            javac.setTarget("9");
-+            javac.setFork(true);
-+            javac.setMemoryInitialSize("80m");
-+            javac.setExecutable("javacExecutable");
-+            javac.add(impl);
-+            javac.createCompilerArg().setValue("-g");
-+            javac.createCompilerArg().setValue("@/home/my-compiler.args");
-+            javac.execute();
-+            assertEquals("javacExecutable", impl.getArgs()[0]);
-+            assertEquals("-J-Xms80m", impl.getArgs()[1]);
-+            assertEquals("@/home/my-compiler.args", impl.getArgs()[2]);
-+            assertTrue(Stream.of(impl.getArgs()).anyMatch(x -> x.equals("-g")));
-+            assertTrue(impl.getArgs()[impl.getArgs().length - 2].endsWith("J1.java"));
-+            assertTrue(impl.getArgs()[impl.getArgs().length - 1].endsWith("J2.java"));
-+            assertEquals(3, impl.getFirstFileName());
-+        } finally {
-+            delete(workDir);
-+        }
-+    }
-+
-     private File createWorkDir(String testName) {
-         final File tmp = new File(System.getProperty("java.io.tmpdir"));   //NOI18N
-         final File destDir = new File(tmp, String.format("%s%s%d",
diff --git a/dev-java/ant-jai/Manifest b/dev-java/ant-jai/Manifest
index 500077fdce1f..7c957fdc08be 100644
--- a/dev-java/ant-jai/Manifest
+++ b/dev-java/ant-jai/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-jai-1.10.7.ebuild 365 BLAKE2B f4ee2442dba7df688ded1f1b23fc80d14a91dd34084d7fce303f5ccc9bcaff130fa504e1eadf425fa9e71fa45a12fa2467ce4a3448f8c9c619e979b4701e5829 SHA512 fb1c82e6dd89e134a2983cc1ee28b6f2823a198eb82a3b2bdbb6ee1f76def106a1c808d17d1a0c17f2bfb4c73d97cc82e43f4751797bf8bc0a4de38c3bb9fb04
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-jai-1.10.8.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.7.ebuild b/dev-java/ant-jai/ant-jai-1.10.8.ebuild
index 65eabb258f33..3a2873b650bb 100644
--- a/dev-java/ant-jai/ant-jai-1.10.7.ebuild
+++ b/dev-java/ant-jai/ant-jai-1.10.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=7
diff --git a/dev-java/ant-javamail/Manifest b/dev-java/ant-javamail/Manifest
index 21a06a2fa8d8..2c6daf77d8fb 100644
--- a/dev-java/ant-javamail/Manifest
+++ b/dev-java/ant-javamail/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-javamail-1.10.7.ebuild 529 BLAKE2B 11926a8e6bbb86ac17517be775cb29c39c61ce6638101ad8f7374ea95c334fb85730b9c07499253845fd4a0825dc50c42f197d42506e274b98bcdb15e19894a4 SHA512 92015b3e212d01de9c01fa811ba4edbe4fda7433ce12842365835fc1c9c5114425b78316f61d2efaf1fe3466baaa04e2ea2d9bb09bf7301f429f38cb3624afc7
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-javamail-1.10.8.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.7.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.8.ebuild
index a376cbf43cca..77606f4804c2 100644
--- a/dev-java/ant-javamail/ant-javamail-1.10.7.ebuild
+++ b/dev-java/ant-javamail/ant-javamail-1.10.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=7
diff --git a/dev-java/ant-jdepend/Manifest b/dev-java/ant-jdepend/Manifest
index 0822e345efad..dd8b7f116148 100644
--- a/dev-java/ant-jdepend/Manifest
+++ b/dev-java/ant-jdepend/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-jdepend-1.10.7.ebuild 373 BLAKE2B 1350dcf27709643920e3b0560da5a20b0b1e1b79712fdeed67ef19686c0f88abcf6938749eb089a84bbc2d817b1b323bca2989ee7d7795f407aac926fd1f666f SHA512 e2d9e355bed80c10783c7cde4079b78126c6c66747ccdee54b483e17423fc3631be2e24021f4586be593ebe0aa924c0d91bbd7d432eb9efb8d95ea3fa891c79b
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-jdepend-1.10.8.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.7.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.10.8.ebuild
index 62714bc65d9f..67fe2f25dbb0 100644
--- a/dev-java/ant-jdepend/ant-jdepend-1.10.7.ebuild
+++ b/dev-java/ant-jdepend/ant-jdepend-1.10.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=7
diff --git a/dev-java/ant-jmf/Manifest b/dev-java/ant-jmf/Manifest
index c56903ab8785..66950112d43e 100644
--- a/dev-java/ant-jmf/Manifest
+++ b/dev-java/ant-jmf/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-jmf-1.10.7.ebuild 477 BLAKE2B d459cbd23be12db89687f3d3e771d8bd6ff0cfcdd26c01c98821f341f75820287b895e70341d7836efdae4e878bf89dfb1d08bc5d327e5b05753a578def06c65 SHA512 99b6963ddbeeedcb4a3bdcb0d8a877c732ae796398373e2c65625e0f4bbe1d862f505670457dd9252167d3285971536a877ae036e7ddcf8a95d9304df43525bb
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-jmf-1.10.8.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.7.ebuild b/dev-java/ant-jmf/ant-jmf-1.10.8.ebuild
index ad64f691d610..eb69314716d0 100644
--- a/dev-java/ant-jmf/ant-jmf-1.10.7.ebuild
+++ b/dev-java/ant-jmf/ant-jmf-1.10.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=7
diff --git a/dev-java/ant-jsch/Manifest b/dev-java/ant-jsch/Manifest
index 89e74f7e4409..4730142bf194 100644
--- a/dev-java/ant-jsch/Manifest
+++ b/dev-java/ant-jsch/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-jsch-1.10.7.ebuild 370 BLAKE2B 93a0b9c02e2650b09359c38c44579693c69e8614b52a8c2ed0a2fa20d3f9870e4d0d88a09b53c6f8ac191787deec45eb400c111ae70c1ce67f35c6ff895b99fa SHA512 3c82cdfecdb2c34ee3ddbd4ab62c436dd339f5a85429f6d27912150ddac1405222d484c0b174827ab299c3911a3d2526150e69e04315d2f5c65b8ad4d0486c20
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-jsch-1.10.8.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.7.ebuild b/dev-java/ant-jsch/ant-jsch-1.10.8.ebuild
index 9ae89c252c39..1cef81e7b4fd 100644
--- a/dev-java/ant-jsch/ant-jsch-1.10.7.ebuild
+++ b/dev-java/ant-jsch/ant-jsch-1.10.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=7
diff --git a/dev-java/ant-junit/Manifest b/dev-java/ant-junit/Manifest
index aca375ab0a61..8a4dae153b41 100644
--- a/dev-java/ant-junit/Manifest
+++ b/dev-java/ant-junit/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-junit-1.10.7.ebuild 496 BLAKE2B 286ed5603b8fdde53f11a056b47c05fb5c0423fa38b7b5a22168d5db47a892f9f41ac9be814f79cc3fc8986ce1d8955b755a88fe988d4ddb0732061295857577 SHA512 5ba204c07a7079c70ef36b8729fb15411862a5ce808b148eb1514973dd216b359ae60b61821a77a65e6280b9dd85d0641f2e0dea25da10318736ca0d3bd2551a
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-junit-1.10.8.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.7.ebuild b/dev-java/ant-junit/ant-junit-1.10.8.ebuild
index e2d1e14ddca2..e02101593cf1 100644
--- a/dev-java/ant-junit/ant-junit-1.10.7.ebuild
+++ b/dev-java/ant-junit/ant-junit-1.10.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=7
diff --git a/dev-java/ant-junit4/Manifest b/dev-java/ant-junit4/Manifest
index bfe667632dd9..83b48a5f7418 100644
--- a/dev-java/ant-junit4/Manifest
+++ b/dev-java/ant-junit4/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-junit4-1.10.7.ebuild 939 BLAKE2B 7ccbe217a1cfef571a1c11aba47c16a78d671abac94b8e4a8a1027dc0c4e941e3f91a1a5e80ceb47aba59319313b1bc37189ec04e442607ca04c605ac1b4890d SHA512 18936a5e9143e89587f9f98619a37b919f6ecce39d02941b8e1cec26f5169ae81edf969a1b465783cc63a625145b9e633cc774a92ec9053904aab1c0ddb02bac
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-junit4-1.10.8.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.7.ebuild b/dev-java/ant-junit4/ant-junit4-1.10.8.ebuild
index 756310d347a2..71513c67cad9 100644
--- a/dev-java/ant-junit4/ant-junit4-1.10.7.ebuild
+++ b/dev-java/ant-junit4/ant-junit4-1.10.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=7
diff --git a/dev-java/ant-junitlauncher/Manifest b/dev-java/ant-junitlauncher/Manifest
index c62004cef0dc..487a8e460cf8 100644
--- a/dev-java/ant-junitlauncher/Manifest
+++ b/dev-java/ant-junitlauncher/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-junitlauncher-1.10.7.ebuild 346 BLAKE2B 4882eb2f9ed7abecf58f9ea98ef86b52ed0481b6caa8364db07e99f1686f8d12cf0a9db809423083faa4bb7fca5b4be59c5851666155b8c5a0e014addaf6c7e7 SHA512 150a38ff54a34a8d8f47d5a8647291de91468083f270a15688ca7cb847fcfcbd2f1c58131dbeb015ce55acf17714c5afae3fdaa886906fd2eadc24114a16ce14
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-junitlauncher-1.10.8.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.7.ebuild b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.8.ebuild
index d319ec030706..c60d0d72e416 100644
--- a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.7.ebuild
+++ b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.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=7
diff --git a/dev-java/ant-swing/Manifest b/dev-java/ant-swing/Manifest
index 8270545aa8d0..f503017f7b76 100644
--- a/dev-java/ant-swing/Manifest
+++ b/dev-java/ant-swing/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-swing-1.10.7.ebuild 413 BLAKE2B cc6ba1db31ce3cc5c01cde417670ca54ea994c08bc597270fa1018e272e02447cf2d408020f29c4e5844cb7eab203904b798abe8cc3b564750bd994d06c56fc6 SHA512 d2778a9c7fd320f5b81c4672578ae263dcbb5c118de62f8cde23435162f79662e9905eca9ddb0ae63d901992dfecb6ef1e8ace1e36eec787c579895c2de44e7d
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-swing-1.10.8.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.7.ebuild b/dev-java/ant-swing/ant-swing-1.10.8.ebuild
index 4faaf9336b35..379248be9a9c 100644
--- a/dev-java/ant-swing/ant-swing-1.10.7.ebuild
+++ b/dev-java/ant-swing/ant-swing-1.10.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=7
diff --git a/dev-java/ant-testutil/Manifest b/dev-java/ant-testutil/Manifest
index 113786cd311f..84a76d7f6360 100644
--- a/dev-java/ant-testutil/Manifest
+++ b/dev-java/ant-testutil/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-testutil-1.10.7.ebuild 968 BLAKE2B c4eeba752d2d8c7784cdd239a18aaa663fd974f0bedc35038c05060c79faeec616680a6236aa23b50347086d08c2d276966608d8a29af7bba88f302811db3907 SHA512 5904f6a4f99db8860832ec876c91baf3135ff1dd91f2cb2cc059bb8949f977837545fbf25654924b625a2374848c672c7f675895fc39a630a98733e1877d8bc0
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-testutil-1.10.8.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.7.ebuild b/dev-java/ant-testutil/ant-testutil-1.10.8.ebuild
index d35b6c6ae953..dce4d1840353 100644
--- a/dev-java/ant-testutil/ant-testutil-1.10.7.ebuild
+++ b/dev-java/ant-testutil/ant-testutil-1.10.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=7
diff --git a/dev-java/ant-xz/Manifest b/dev-java/ant-xz/Manifest
index df89000e34b0..a137c3391e5e 100644
--- a/dev-java/ant-xz/Manifest
+++ b/dev-java/ant-xz/Manifest
@@ -1,4 +1,4 @@
-DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-xz-1.10.7.ebuild 462 BLAKE2B feb8dab91aa15ca136f3cc99738ffa9594ed13de7abca26d42e05a55eebef51141948689b29046959d80937c4ef8c127ecc373c7a44dd4b9a6ecb86df6854c1b SHA512 ce44870b61bb72c4dfb3d0ff60dc022dfba927c04e1cf67e1be67ba6a81a172cc1f106e5b29aac8b3874fdd93aa04bb3bf1eead1914e5b437d6a3991664ab889
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+EBUILD ant-xz-1.10.8.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.7.ebuild b/dev-java/ant-xz/ant-xz-1.10.8.ebuild
index 23e0ee3ff29a..91ceb9835ab1 100644
--- a/dev-java/ant-xz/ant-xz-1.10.7.ebuild
+++ b/dev-java/ant-xz/ant-xz-1.10.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=7
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 2cf8f95ca24d..8cd384256187 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,2 +1,2 @@
-EBUILD ant-1.10.7.ebuild 1642 BLAKE2B 6c723227e7c6fe13b2c006bdd60a8a8e89e17eb3d6670a464e4ff4a6cba8ed524f409e8171b13861c38a977fb142e5e7b963bdbb37c6e1c4f2698a7e6a9d8ebe SHA512 3d251bfe8a1700516ca4a508231b673b46d7d52df51172a419106790256b55ab632080fb9384a0919cb63fe1fc440556e82e04b5c96ea6dbebbb5b85e20a6987
+EBUILD ant-1.10.8.ebuild 1642 BLAKE2B d31e2db667b00077054a439ccda45dc2926275438b3f8af2a28509001e21352dcfcdc56f66acb8a59e2938b4f9688a00fa7fec25d98bc10924a43e7be1dd990f SHA512 82188aefc10f3f00c4ef1720bcb94015b8594dc38fc4bc5885c6092c2bcf0379486664510415f2687d2afb972253d808b5bf61d2817daf8da2f00576314262dd
 MISC metadata.xml 1540 BLAKE2B 5536e37e8d4b18a8b744b88968c8f5f87973dedd25dfc5a0c96202bed4991034e93b57ad9a8737b5dfab6526adfa1e563768f08c6b85442f87f0b4ebc87345a4 SHA512 651f97c959e8322e51a7d937dd5886604e3118249907cbd7c0695e65b91b39c22539aeac2870c4f8ffe49e6f4edb8736459eb68266cfc4cb0baac9e439d0a4e5
diff --git a/dev-java/ant/ant-1.10.7.ebuild b/dev-java/ant/ant-1.10.8.ebuild
index b11e25c8c08b..20c1a2ead30c 100644
--- a/dev-java/ant/ant-1.10.7.ebuild
+++ b/dev-java/ant/ant-1.10.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=7
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 857ed56a0c50..cad284ad52d2 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -13,7 +13,7 @@ DIST antlr-4.5.3.tar.gz 6760401 BLAKE2B d436b4a964c527e230912a0ba23146af19947857
 EBUILD antlr-2.7.7-r7.ebuild 1087 BLAKE2B e866bec6a53c4476202468cdb009b266a3ef0748b5ed79c71e6baa2d30da07572804ebe59e332a569b2afdb97073268b0947e0747421140f792425bf61868152 SHA512 c06da2c925aae9677b26a216f3e3fc297bc40212f7255ad7b19b303895ef13a0905588b02b3f9c2521b03b82092f6692d28517bdabcefcfaf7d87e32b88fa16c
 EBUILD antlr-2.7.7-r8.ebuild 1098 BLAKE2B 4ac646f7bac4b5ef9c614436eb39f0fbb83629ef2861e1875d0901aa48f28ad0d618ab3476be5efa2c4de8c31a7d0d6428ed99923f6d8e4025b6d12fd67d442f SHA512 92e22ad8ef1ca16072bf1d436779a868149bffcc2e9e5c1ca7b9c6ac3b10a0fceafd40f33ec2e0195c422174d9929abd50e5c3d17610a63c03adb6cb5033aa3b
 EBUILD antlr-3.2.ebuild 3269 BLAKE2B 235e24e79fcc6548e1663f4ab04b28d990c9bf326ae6ba34a6360edb9ea85fba98aa150b0f191d7c98919fc8c96bf9ff003eaac44dbb12c5d22fc23bbf85cb35 SHA512 6baafe3168efbc63d11e36d719550a36b9c2c2d36c955d52502113142a7fa51b30928de00d2ac3cdb17669652966aa81427ed70f82e5abedb0569cd3dda46ffa
-EBUILD antlr-3.5.2.ebuild 3021 BLAKE2B 330626b14527d4935f30acee8dd725996f00b461eed5572e55aac7ef552fd20bab50d78ba698d4f58f0bb3bf33d7c9643ceb6714c9ed7b96337bf777d9dc36c2 SHA512 e51a96e9e3a690a9de88fb2a071bdb518c8a16ed288b276dbb782afd61e033b2cf4d9e68ae34a444011cdf579e84e7da684e7de836c21a8e65416ffba6b1dcda
+EBUILD antlr-3.5.2.ebuild 3028 BLAKE2B c446dcfab240b878e5d93a88f4cede8cf32c145f74522906d4291d17da93b1e4bbb4c23c7e86b68295d4a4ed1f22eba9610927b257e18ee0d629a8d76ae7102f SHA512 0b3611e506b785d8326e78602b439da96ff4db75ff72f723d34aec8196ba2356b7c03c4c71561e956fdb6d05e543ec03de1d7b16bcd7043660718d019b43705f
 EBUILD antlr-4.5.1.ebuild 2478 BLAKE2B e36feaf0bf7eb33d4e5fcc7e1f9c498b937e037a5a72e2049eaab57269f09dc20cb7e9a5ddb57055611bb7e1aadeb91173129fda355351d3e26e12c4db245157 SHA512 51e8489bb173e237ba78be7bd9b3667a6c5522583d64ecf88b902b20006c089e4134bf278369a30f32507680ed1628321c672b06f4dacc7e9f89d0f1caa26b11
-EBUILD antlr-4.5.3.ebuild 2481 BLAKE2B f7796f007f9d6895a29b3e23b6aef08f34fec373d1b424305669b1d8aa1ef68dcb0a63e89a0181bad95b59685a8772a8c4d7ac4252e66e5c1c3e7f2944e9a5c8 SHA512 14f93b7d1c64257b8c3307ef6e67e7da3b1d027701a8ed861b7be0a0067e0f0f6de799688fb60feff7195d39dc947da0456c9997a094fe9dbf2dac300c2fc5eb
+EBUILD antlr-4.5.3.ebuild 2488 BLAKE2B 04c6919146076e7340c99045b99ac44f0afa0bb46ed26e03f644498ebbcd3d925f6468eb019ebcce23eae0afa3e969a1558668e8939da23877cde5d249f7a99b SHA512 34671e7dda01baadec294a388dca769e6e05710a3522f61bd9beec931e57c5b9d627bf0beb36bca06aa25cc36af485ec0bec53144437712509f40128b9377439
 MISC metadata.xml 313 BLAKE2B 211bde607161c54e23a30950b17cda11291e84a9f745a2c44c17c7c224ad8ef309786ec4952f094e90cc569d86e0186bd2fa426fc1de6718541e207be12c3fd0 SHA512 01f11b9e45bc3c331d445213704287f1f034087930d4b55cbde700a483dcb64260d4805a4c2ec3686a99b59f3225999409d499cb63a40b3d8278d8a2e6213f57
diff --git a/dev-java/antlr/antlr-3.5.2.ebuild b/dev-java/antlr/antlr-3.5.2.ebuild
index 330d0ce8f429..43986264fbcd 100644
--- a/dev-java/antlr/antlr-3.5.2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2.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"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz
 	https://www.antlr3.org/download/${P}-complete.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="amd64 ~arm 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"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/antlr/antlr-4.5.3.ebuild b/dev-java/antlr/antlr-4.5.3.ebuild
index 5c66074f5d0e..b250b7871a00 100644
--- a/dev-java/antlr/antlr-4.5.3.ebuild
+++ b/dev-java/antlr/antlr-4.5.3.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"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
 	https://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 9ab18dd6a0d8..22c91b3286e5 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -4,5 +4,5 @@ DIST asm-5.0.3.tar.gz 781742 BLAKE2B a2d3f0e59244d27c090be8cfab67f86369a6dae0c49
 DIST asm-5.1.tar.gz 791417 BLAKE2B 90ee3e28b20ce649763c43cf1b0bb495995dcfc31a534d774c727d201a913b8ae25f4c015e580c9d73b6f3a847ce32720a0c2b0ea61eab8b35e92be4beaab2fe SHA512 de702516f9e16686c027c9a200a1750e6dcaee96bb1ed8bc0591673404d015b8817e37f210be645681dff7a2c31f7ddce8b406ccc8c6e11f1424e19c04c38f1e
 EBUILD asm-3.3.1-r1.ebuild 870 BLAKE2B e51b652599a40b8845d5c35ba37d6f20202c92092fab393040dfc7f9fbd17834d8afc73869065956bb4b2bf2d14b62f3d0c200b3dc8524bd029d4d98c244db8a SHA512 55384ff316829c25d191ec5d6280a487627ae2354436ff9ebd7ad0d10efb32d734a9dd33bb6cfa0cf823bf4d4b84b7651605cf3ea7b2a6022aba848f849afb43
 EBUILD asm-5.0.3.ebuild 1209 BLAKE2B 79453429c1e78192909435ae7247f0e11e4464ed38f4a0d2d1c2cfe5714ec1e433aed16ad5f0433abb07bee40369a5b5b135d644bbcf36719336d658937343e5 SHA512 3c03125070730ce4d554d163afde459b1f862235fddbff7788fb50556772c8709107c84eb56948c5c4d2bb2e86c9e98be18417ea70b573e562efac971f97003e
-EBUILD asm-5.1.ebuild 1205 BLAKE2B 2fc237ee6ad8d607b484b69034da962ea5136894b564e143ff51f7170f85a856c85a40da78eb43209e8472ffb0f0dd873cf6da87553381e73ac6a6521445ad2a SHA512 45710856d07d89fecd60c97605792eb723e4ce0c30301c38eebcffc36427851b0ce58c546cda2a075cd8c5bf639dfcf65c07945793da872b05bb53207204ab41
+EBUILD asm-5.1.ebuild 1209 BLAKE2B 67b2b998cbe6c063362c8c1ad52d1a7d0c315e953f7086a167c4d53ed6a39340596f12b2ff57b9c6808062f8ad19f6b95c3bd642ed6b5fbe834f2aad881fb7f1 SHA512 eef56477abf698df89d26b18dadab6a13d6bdb624262f711cff34f22a7b61aa8881ee5d679fe8759bb2442cf7552a05ea355677a7dd19e316b0c3c2215951c8a
 MISC metadata.xml 978 BLAKE2B 6b111138552526b7876570392f2cf2bc1ff8fd72909c8565746e6f193c0e929f7a06e2e3654fd3fa02ae86250d4cc98c838217d4b4f22fc63143ec64f979b7a6 SHA512 79bd031562a3e6208ca10683f6ca33edb8d542461d96058f36e8c218b667b9815fedd006f02a94572118444023c169c466dc9bd5eade325654bd274be23e5a61
diff --git a/dev-java/asm/asm-5.1.ebuild b/dev-java/asm/asm-5.1.ebuild
index e71765b94842..e210b62e4860 100644
--- a/dev-java/asm/asm-5.1.ebuild
+++ b/dev-java/asm/asm-5.1.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
@@ -14,7 +14,7 @@ SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz
 LICENSE="BSD"
 SLOT="4"
 IUSE=""
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
index 897442c23902..460f5582d86c 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -4,6 +4,6 @@ DIST bcmail-jdk15on-150.tar.gz 221760 BLAKE2B 48c5d3b692295dcf2ce1e73ce58097b20c
 DIST bcmail-jdk15on-152.tar.gz 240800 BLAKE2B eb7077f742a8746a1ce13c37bcb936c16f49f6a5eec7421d8f3f93048091d123f416a732add10ed5596fc150d3f129e6b216190c48f6bb1b9d226a0e2bf19637 SHA512 e7301991071709b5788e5a813ea765a5e59bb089104a031ca91a509036e7823b851f854e5f96de6a2d2ef817aad4435f78742dea3a9b1dbeb95a6cddf250619e
 EBUILD bcmail-1.38-r6.ebuild 918 BLAKE2B 76256eb09047227c4762af8e3c8c209a55b01b434b5c2fb1f4f484e4684604e264700b13efe1c0ca64935b93bcb2057d9113036b486642a250d588f946089782 SHA512 2a3500d4c8b22e574e97a4fdc6d6c77ecf641ce36080e49f2b1c693addb601dc0dd607828dbd3880293fb4b56257fe8d8d7781dbe304c31078be435b864409bc
 EBUILD bcmail-1.45-r5.ebuild 926 BLAKE2B 4f3ffde3e41a70c37d9e8529e881ef08d89645d78253cc63677ca6d699c6f2040c62a51fe2a158d3f1872ef4ccc81dc2582e4b84b7dedf87f79d80c4faf69863 SHA512 c4f846ae38bb7862ac39ae7472f5d25d1487cc67cc2731cc9bdf05e03d3356425f7e3e323650422b4f88f1e5d0dfb754465d8e953757cd1493a319ebe44a344f
-EBUILD bcmail-1.50-r3.ebuild 1190 BLAKE2B de5dce6dcce067dbe08ae08eca5c5769814bc4dece868c136b84703be1c12191048650044432ff2ce27276a3c76ae9e0267b6bd02fc9c1b0ceb1ca93719143c3 SHA512 d9b391bd4b4076d57b8109fd046a95e354273e1061a239915707305f175327260d7063b0951f606bd8e204232fdd61f4e30aead42147afad6873dca1a661fa50
-EBUILD bcmail-1.52-r3.ebuild 1190 BLAKE2B 23b0b40fa5af147ccf7b70fd4e5f10bf3f873cf1e4a4f73f8429f1b68b7eba65e8f5d2a1675a5f12827189eed2a2c43ac92b1a65eca5bdca701a8f7be57ad8ad SHA512 325d3e340faa4efe028447703ae9e8c33f3de0a1f311d6c4512eab65c4c830235ac68b2f9380b41bd97d56cf5d4d5cf93de5ec495337c0015c7756146783d4e6
+EBUILD bcmail-1.50-r3.ebuild 1194 BLAKE2B 5e040e7cf8852f8398aa6526a11533a57340abbf324be1658ac57d86f805e6fd5d197f8ae154830d1c09fbc6d7310fa71f8e0d6ac905672646dec4b7b1a25334 SHA512 c22936d51fead1ad4a5350bd11614e3efe7ff7dcc2378d7047f1b5fc8e650c18b57b9649f199fc735a7314b010e7da6fd3040c80ad9e011c5fba581aeb10614c
+EBUILD bcmail-1.52-r3.ebuild 1194 BLAKE2B 87ccbd4cefcbd13e0677d550bb48f9295cb2afc501b91892138a2c96a2f2b82854168f7fec3fac27759d292150347c115ac025a3c596ae667a844637bdea9ec0 SHA512 4d30572e003a9de4553f41e5cdb70a777fdecf7acd420ee785cfdbd1f01c75b1b6188ffb7148ce5c5e52446aca8c54cd858b0627251b61d31ef7c3b0a7064307
 MISC metadata.xml 369 BLAKE2B 878e0ea0c58e12199e0370cd6898f990ec0b7c884e9937d11e8dac850e203e18f892f3a4e19e9fa98d9607899e4284c6f2760e8f4da352840702a27c07326e8e SHA512 d97ce68b00b528488ba871164a2fc5aee28d7128e756e381c2f1d1d0abd31c67204bbbfb2e61b0d3484a9545d279493f197e0254833353378aa88aacf3fba018
diff --git a/dev-java/bcmail/bcmail-1.50-r3.ebuild b/dev-java/bcmail/bcmail-1.50-r3.ebuild
index 7a0136a1aa48..8cf8473d44ec 100644
--- a/dev-java/bcmail/bcmail-1.50-r3.ebuild
+++ b/dev-java/bcmail/bcmail-1.50-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
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.50"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND="
 	dev-java/junit:0
diff --git a/dev-java/bcmail/bcmail-1.52-r3.ebuild b/dev-java/bcmail/bcmail-1.52-r3.ebuild
index 8f6f1ad4c443..a0af7f956ed5 100644
--- a/dev-java/bcmail/bcmail-1.52-r3.ebuild
+++ b/dev-java/bcmail/bcmail-1.52-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
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.52"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND="
 	dev-java/junit:0
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
index fd987248372e..4de13138b32b 100644
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@@ -1,5 +1,5 @@
 DIST bcpkix-jdk15on-1.50-sources.jar 401716 BLAKE2B 7a656218b96da46027c82a023404c32b92a640aa0ed5a1256213139e8dc54f9ef07453478dcc66372a0a49562b92165148f18a5063c24f7569a3e40f649494ba SHA512 6dc6d63db649a94f54c7739144b4120db4255e0a0a713389d54fcd427b95a3ff5ec326ae066cb5aa8a6cf19ccb959cbb22f9f898d39bfe5bf8e20c4d9de6931c
 DIST bcpkix-jdk15on-1.52-sources.jar 422301 BLAKE2B 10a1b16d0d1f7560ce71f9f99c6efaede73250a1ae298c22396c6ac1eeebe0d51c52f8a6a6b1ff68cfd11ab076d5dc97182fb0accd53e769ef9fa65c6764961c SHA512 55f33846e16f7367a25df0933c904b435933e96d0e881bb949c3e3812618fc0d0b5a2901efa779e02a6f48157231da197e2bf5d8037b22169330fa374b07a988
-EBUILD bcpkix-1.50-r2.ebuild 715 BLAKE2B f2c0de3af8417fe27d20ba8f167fb2077a2f9dd1cf813b19559f6a163a30eca41803021bcd2b784ab1d8dd9f36de09bebc25287c47eb3f9cc2eb0b1d6bca9f5b SHA512 e9e7eff9f0cc68bb263b17af42dac1daa3864b5d50072dd7f9e48262a86c38bf1aa3fc8d61722b538ddd5f8ef70107605fd2d67fbbbfd5d08b7acd8379d4e84f
-EBUILD bcpkix-1.52-r1.ebuild 715 BLAKE2B dac94d79e39ff06e6fd097337774a8aecc02a96ee4960dd52bf9c2d81c7d18db3d0a3006486cd71b55cb55469e26af1b9134a101fcabc63914b45cdba5cc468e SHA512 d49f72ca1073cf56257e0c6abab3cb734ad9c2458c03579c0f6772428d0ceba62591b1516b0790a288f6be7aaff403bc8a8064898d74422a93c119c23aeb0779
+EBUILD bcpkix-1.50-r2.ebuild 719 BLAKE2B 96642caf10144d1b4d24a4680e3ff2bad09eb12b6c5646d1e12878dcc5d71316a4807aa955df410aebb41092d4560e7ae4ec8a97a6a054ee081002a7de829e42 SHA512 98a55dac21d68a1d529d3d239a531d4d4856a68dad8b2f2f8ab4ce42ade8938863ab63f1ffc9fc77eff0cd9f4f6aab060742dc7e09bd09b1a40b66e20ad5e97e
+EBUILD bcpkix-1.52-r1.ebuild 719 BLAKE2B 333255aec4325341af338ff0c60b565132f45a7fcb40b013d13ef5090385eafd339ca6afd56c80408ae19a8cd8df8d43f2237629633822525b241497a3a1ba90 SHA512 3ae6f18ff1baf32f203e97aa82f48ed172d2cb3ee0aa5f6e1c050ccade118781aba6c95cece719dded31af0e43d9ef6233888bbbf3422ad84801408577ffbdd7
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcpkix/bcpkix-1.50-r2.ebuild b/dev-java/bcpkix/bcpkix-1.50-r2.ebuild
index 4689c228fa4f..a1a5de24b451 100644
--- a/dev-java/bcpkix/bcpkix-1.50-r2.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.50-r2.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"
@@ -14,7 +14,7 @@ DESCRIPTION="Java cryptography APIs"
 HOMEPAGE="http://www.bouncycastle.org/java.html"
 SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 LICENSE="BSD"
 SLOT="1.50"
diff --git a/dev-java/bcpkix/bcpkix-1.52-r1.ebuild b/dev-java/bcpkix/bcpkix-1.52-r1.ebuild
index e99938a8a878..70751f754308 100644
--- a/dev-java/bcpkix/bcpkix-1.52-r1.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.52-r1.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"
@@ -14,7 +14,7 @@ DESCRIPTION="Java cryptography APIs"
 HOMEPAGE="http://www.bouncycastle.org/java.html"
 SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 LICENSE="BSD"
 SLOT="1.52"
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index e86e75f1dc97..eb10cf874eb3 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -3,6 +3,7 @@ DIST bcprov-jdk15on-149.tar.gz 4329897 BLAKE2B d2e13099db63bca877c92e60cab5e6611
 DIST bcprov-jdk15on-150.tar.gz 4629743 BLAKE2B 7ab18e83f90db38b9af9530246806b4d413718531ce4b34b7aefa7189e28ade8a2afd5d3b3dc25c8cb2d5ef23a8c7f8157ac947ae7d0a46356b00ea7dd6d5f76 SHA512 95400c338a65cbb7d1e80c776de41d3d372b4237aee91526a06774c3d4beb735dcfb4c1ed182a12f2ccac8204b9c546863d79eb99723394d48c415fa32b6ee0e
 DIST bcprov-jdk15on-152.tar.gz 6334971 BLAKE2B 5ef7db891c29147ac48689a1f15e907f4a91d15ac63e8f6a031847d92ddad22cef3dff791d4036b74cd39550e9b48b1926033449beca240db2d7ac78510c22c7 SHA512 df769d2647c1c0b535b1f6922df3f02ed7e13c941f8d954256fddb2ff31d5682924fedf2f2908bc09ebd20058413f40a4c2d62190b63542aa7840b860aeab07c
 DIST bcprov-jdk15on-154.tar.gz 6903567 BLAKE2B 12039cc6c7dbe06b74a0be8f9482209590ef134b37ef0bc64e97ee34f10ecd7c185bf1129f471e06347ea647d9b2d2dc5b845e0c1cefb5b99ebbe44442de3877 SHA512 3d3bf2a1d174a40941a99d1ac6ac6696e9866964bde0cb23e987e3fbd51e3dca220e16f609c29ef9e761faac670164fa9cccf90e1e0f795c33a3ce80e2783151
+DIST bcprov-jdk15on-166.tar.gz 9684238 BLAKE2B 68d75f8a8e418310179cac2e3d367f759567da280624ac9868ac265779126fa8b722f4291fe254623d92fc304ea057955180ac29a343ee628d9bd36c344fa2b7 SHA512 522cce6d381a51ff7212aa7fd7a99f85cee972a71e2c37c0dcea7e3c2dd4e44f5fa013cd759a11868dec3b6b4bd4f02bedd31ef2dd9379ce89a0d92ec8df2d8e
 DIST bcprov-jdk16-1.38-sources.jar 1197644 BLAKE2B 758b3c894d648dce357d27f20522f8df9c70e87d83702a4eebf5a96529ba3df7fb65dfd62555544fe5f2757ed3194bccc5bc6d97a074036f8b188d84f1f85a42 SHA512 e8ab0b6f47b9737f19ee548dfc6cf09087d1b9339bc48b599fac05d0eb3b00d355f203787a84ee3a504eff2dffd707237a0cc5e26c64a672a362b9161077326f
 DIST bcprov-jdk16-1.40-sources.jar 1221202 BLAKE2B a046d9ac06ed6087c39c9e2d9ae5bf932727b093b5138f6226a4ebcd95640d7b6b6607cf1bd70e6b7b342b5f4d59c358e35225e77ebe8133e8e81a61f632b4ca SHA512 ed94e54cd7a53b5219d0eebb1651f93201c177faf26724613a520e045987e74c462e7adde491bda5bd092fd651b9a7abef93bfac2fd6f0765fb7651525c199ce
 DIST bcprov-jdk16-1.45-sources.jar 1286663 BLAKE2B da19e2343761f10248f315f6966d071a87660f22fe3e51a35308a3b51f907990ef339f05f0c2367babcb06322ffb4600247ecb22b5a19bba3f5c820ed6fe2d2a SHA512 541b390efafba17c21a25bdf84725fd0f9808555eec9c4db51b0642c348d552417d9ba8d584d54690146f3e72fe3b348ab49f92ca263ea8a7a8f7b27bb7b8e5d
@@ -13,9 +14,10 @@ EBUILD bcprov-1.48-r2.ebuild 1354 BLAKE2B 118806a94e85354cdbe83fab557ae506625cdc
 EBUILD bcprov-1.49-r4.ebuild 1354 BLAKE2B c60a6a2e643aa5a426b154a39071db242c5361e99d8d9ff72853f6071f78f070b9ccbe8a71964b790601900d46e114836dc9110c6610531cf7708b6be7ae800e SHA512 b12cb9c84fd0a89f91850ba8a5ce9b60af846e70ea911adfa510715dcc4535e277c3c841a4e5afc8409dba31d705da3a545e1fa19a8a47f87475a1d33ff6e383
 EBUILD bcprov-1.50-r2.ebuild 1347 BLAKE2B c242438b0f9a8b1802971c1b44424e76bf6c2c11cf359cef7bcb317024c39c7828d6aa901f309055f8c51a180495cf4c3e9e41a788cab4e0a1ae15c3daa83d03 SHA512 3ad3610ab9b2459797bb1fb864582e9e38f85897982f8b1db0ceccb01a80393968a778f11efe04cd59e9b93c5cad2d684e31ac62cc2de6f12192804c847ef1fb
 EBUILD bcprov-1.50-r3.ebuild 1351 BLAKE2B 3092f94f003db082923aaba5140d7b6b5df3247d67ec8b5237c2bb954132fb72a40daecd32e59667c1c3b03c944de6c11d5863902928e80f70137e0921731a71 SHA512 97e407686a4f4fc58cf1a69876944d57a84c564e5cbd1ff06eb94da65afdb0c0f66a6a6e9a1ba379eef21368e072ef8777d550837eee7e115cf50d6ceb40cad5
-EBUILD bcprov-1.50-r4.ebuild 1321 BLAKE2B 3fb23d92770957225bd91d3ddbb81a70bf04a56f890b40e78849fd61c892d148c3f590444475c7afd26ba33a92e1bfb24a3ddd4b8735b7114d205328b479179c SHA512 410204b40d501bfc22d16798bff642b2c9db93f7a08a2b68213737553b17483f472cfc342bffe40ddb5b82b486ddd9198274cc0a8c548ad4f6ea96208a8cbc05
+EBUILD bcprov-1.50-r4.ebuild 1325 BLAKE2B fb30ce92623bec2ebf9b94b7e912224ca2889beb20ab18b72e48a5b9e26a1f204481bc58fbf617af97c0d09297769c0ee303a8c2e3cb5f98edc57f880fe0f7b9 SHA512 19f3a18ec7f7394d75a3943783bf5c84c12b539e560b05492b9affbc946551bd4efa51a38968067a703fac93e7e07c0b29c8b317dc104423543c1c68f5a37191
 EBUILD bcprov-1.52-r1.ebuild 1347 BLAKE2B 53b6e67db4ad60cd847a4d4ff23231d19fd158d2a396ee002b91f55a917e5eefc2e1cd9c9c4e5b3dc4b0c1eb0899d693281e0098146de2a448353191092cb50a SHA512 005e608991619786a105699c981c0ac63ae3cd22bd1355aed66693a482b7da25e6474f60dbc11d38c6ab9f8b1202ff3d1b8b6b38f2e404512439b646998957c7
 EBUILD bcprov-1.52-r2.ebuild 1352 BLAKE2B b64efb5bacd2a605e35bb242e4009cdc65009dd023f2bd50f3cf5978b8db4be55f8baff925abb09cd1e0b3245da34f48c44dc733ad47f710f99977a73645309b SHA512 7e070f559ffe303268f20a21b9f3258f983daa367d727ff91757c4fd2dd55c5008bb7e9bd52bb645fc6f369791853cc7862db1b54c98b05aa64effea2be1b0ac
-EBUILD bcprov-1.52-r3.ebuild 1321 BLAKE2B 82624cae6b6b36512f5c6df7b142da19e9def5dc4994a54b90496152273252cbf969df84404be2e584204ec90dec617eb3e85525adcae69ab5334fb09c77d25d SHA512 4f15bae3a89e35a3b1fa0e5530273570a82e48d945e412181a0dda6344b80fd416967aef1bae5783b45e6599bf03b6046e1ee316d28d34e9eae93504f3a38408
-EBUILD bcprov-1.54.ebuild 1328 BLAKE2B 9dc47ddea0ac595232d2037d5eefa5da6a643838d4204ce73062743d3426eb7adf0dfaa18f74d71538193c55df6c49e1cf4ebf24b12c6985cdc8d2d14aba367f SHA512 8102dbf7060f6f71f2a696e3624938e659e9fd6823b23390247a86b36286b693c96e7d3ba6e3fe7b771eea9b79b4d1d6fa3c4002ad5755d232be6b0c4651e507
+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 1343 BLAKE2B f3a219a442e18fd399243fb2a6b6d2ea60795805c01aa97cd1d061d06dcf7039c2347a93fc9f0b5aabc6172c7c063aa805d063d35a34d5fa99719a12ba1383de SHA512 2cfcb9b3cbe7863b2f788ab8323ddc8a72d39373c6406c2fb233e45240a3ad6517913128de2455152d4627603c937fe48a6b91a8ef508426968f4c0cb7bcbfc0
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcprov/bcprov-1.50-r4.ebuild b/dev-java/bcprov/bcprov-1.50-r4.ebuild
index 72fcc048689a..03655298b7de 100644
--- a/dev-java/bcprov/bcprov-1.50-r4.ebuild
+++ b/dev-java/bcprov/bcprov-1.50-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.50"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip"
diff --git a/dev-java/bcprov/bcprov-1.52-r3.ebuild b/dev-java/bcprov/bcprov-1.52-r3.ebuild
index a3cf4ff83b52..4f24d02ae549 100644
--- a/dev-java/bcprov/bcprov-1.52-r3.ebuild
+++ b/dev-java/bcprov/bcprov-1.52-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
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.52"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip"
diff --git a/dev-java/bcprov/bcprov-1.54.ebuild b/dev-java/bcprov/bcprov-1.54.ebuild
index 0b89cd3146bc..45c74236f28e 100644
--- a/dev-java/bcprov/bcprov-1.54.ebuild
+++ b/dev-java/bcprov/bcprov-1.54.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
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.54"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip"
diff --git a/dev-java/bcprov/bcprov-1.66.ebuild b/dev-java/bcprov/bcprov-1.66.ebuild
new file mode 100644
index 000000000000..4ef9b5431d1f
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.66.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
+SRC_URI="https://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.66"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+DEPEND=">=virtual/jdk-1.8
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+# Package can't be build with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}" || die
+	unpack ./src.zip
+}
+
+src_prepare() {
+	default
+
+	if ! use test; then
+		# There are too many files to delete so we won't be using JAVA_RM_FILES
+		# (it produces a lot of output).
+		local RM_TEST_FILES=()
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Test*.java" -type f -print0)
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Mock*.java" -type f -print0)
+
+		rm -v "${RM_TEST_FILES[@]}" || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bndlib/Manifest b/dev-java/bndlib/Manifest
index fb62f35e87cf..df57163f8e91 100644
--- a/dev-java/bndlib/Manifest
+++ b/dev-java/bndlib/Manifest
@@ -1,3 +1,3 @@
 DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e
-EBUILD bndlib-2.1.0.ebuild 1629 BLAKE2B 0043daccb6de03e935f975eb5e75b27c4ef10ea56384f6dbda7d55f955aa0e0e69b0c2e04d7af9ced6452d90e7decafff71130761bf488ff2c93f08b7b2ccffa SHA512 acd9ea13ccb4636c537d392fdbb49ad1c0b9aebb0ad7adcf9d5ac277aae840cf5e221b62a96e940790ba6d10613325dcde311c61a9cae37ba05e726874479ba4
+EBUILD bndlib-2.1.0.ebuild 1633 BLAKE2B d3612e6f1f296b7326f8fccd826d5fb791bb3ea07a62213968c09315aec1bca37c79b40c8782a3947feb1eb1011bb8133c455bb49edb4b3cb0a5ebd83f3c943f SHA512 957f9543060c2f51e50641b3663d334efd20cf8ec04cdceb18824e82e125b33e330eba1346f8784b0ab5757e1ab868f00cf5450df515701cd3100c792cdcc6ad
 MISC metadata.xml 323 BLAKE2B b7a6a3bf3330da14a229f4b8e178c7f5da2bdab8d7249b92daa4a6d414471b001d21441465852b21f9abbbb6bdff229a8c7dbe162e4ae820d5feccf2684c19f8 SHA512 b9affc0513759478d6db10968d574cc820ac19476a539d27e279884314805f663f0807abd01ce8107154fae445ad3e4fd37f485004130f04aa890c0607f85fcf
diff --git a/dev-java/bndlib/bndlib-2.1.0.ebuild b/dev-java/bndlib/bndlib-2.1.0.ebuild
index c9a398337963..aaac79713088 100644
--- a/dev-java/bndlib/bndlib-2.1.0.ebuild
+++ b/dev-java/bndlib/bndlib-2.1.0.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"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 CDEPEND="dev-java/libg:0
 	dev-java/osgi-compendium:0
diff --git a/dev-java/byaccj/Manifest b/dev-java/byaccj/Manifest
index 001d6612e53f..fa135d9c2104 100644
--- a/dev-java/byaccj/Manifest
+++ b/dev-java/byaccj/Manifest
@@ -1,5 +1,4 @@
 AUX Makefile 2003 BLAKE2B e57447ec26975954239e92509fa1491fb31235a150d56db7fdefbd4fb61bd53e13df5d0b6157843c094ff8b691de00515e92fdf4c95c9ea6e71fc122c4d27efb SHA512 d48f81fcf89ca5f6524572b75dcde4866cea5f434059233c234a664f56e80c0daadc8f314711cb9c55430a947cc9dbf48f4a0bead0433da5b333f5fd73fcbc68
 DIST byaccj1.15_src.tar.gz 53646 BLAKE2B a57cdb85253f2ea8485c05687222cf99912494841cdfb6deb13d80d49f87a3dd8f1eb3350bf2501c7c86b70a198415e339019930301bd8d2a770e10ca9bb850f SHA512 6423ecca70d21dd0c1dd8366361f6c4420536e099090b18738013fbb6e8e0710ee739e51dfd7f603a64f8761f48cdd1d8dc7844d1b5ec6b792535254d290addc
-EBUILD byaccj-1.15-r1.ebuild 687 BLAKE2B 3693ccdc5136bcc216a31e3a545a08c7a99a90176c6b8f0594b9d4df37f2dd28f44cb935116eb13130c133b21983e65fd913e67dc196bcad09503cf27fa6bf75 SHA512 3436b921566c3326fc13716fe55d95c927873bb02cbb1b7b6f98799b6dc9ae2f64f7aa0b0a5593646edae9966f31364840419263c1c813ea6578950ca69e27cb
-EBUILD byaccj-1.15-r2.ebuild 689 BLAKE2B 35c584fc17cce2f86791b04afa95739bb3c8ceb8e52c382fc893daa238c1449823e1a8abbc9213bcc36ea84a1b140c1503aaf43c9af5681d3ed70b75817931a9 SHA512 68171f4a6f331241e33148019c7c6d8baccd832c1b12fb9342657313eba5da61c3e3507f30536d4f8e1e8018038513e64d2d46d0ba5c5cc94e5d8998f2282434
+EBUILD byaccj-1.15-r2.ebuild 685 BLAKE2B c848cbfd8225c810e4a07dbe43ccec1cd751fd5a8c3ca4f3b17f3f68cd5fe4e605ec8b91c9746965a765e936f036b819ab09fa81af774f70e4a57df804de1a55 SHA512 059e5e1b0068a1cad2fc2dc947862cf347da27a7c4ba76fbf0f251310b6193270e30095f194fb9f7f99402773bfd40e50e79310aebafc904ea6fc898d1670c7c
 MISC metadata.xml 312 BLAKE2B 1148e4e9d86c4155c8413261aa2bd091a462baac98b22bbe6e7d609088c5dbe3fc3d0f8d4d537f2052c87571c29a95ffeeeebabbbaa6a623559bc5ba463c6171 SHA512 3ce25507ed5012c2f4c4961a9a9b739b04762e0a34bef6db4202240a65e6c1212a459ab35fa1c680dea52928c88f88301e36abc780228fb4b3591a37b3cff749
diff --git a/dev-java/byaccj/byaccj-1.15-r1.ebuild b/dev-java/byaccj/byaccj-1.15-r1.ebuild
deleted file mode 100644
index f848e9b072e0..000000000000
--- a/dev-java/byaccj/byaccj-1.15-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A java extension of BSD YACC-compatible parser generator"
-HOMEPAGE="http://byaccj.sourceforge.net/"
-MY_P="${PN}${PV}_src"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-S="${WORKDIR}/${PN}${PV}"
-
-src_compile() {
-	cp "${FILESDIR}/Makefile" src/Makefile || die
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" -C src linux
-}
-
-src_install() {
-	newbin src/yacc.linux "${PN}"
-	dodoc docs/ACKNOWLEDGEMEN
-}
diff --git a/dev-java/byaccj/byaccj-1.15-r2.ebuild b/dev-java/byaccj/byaccj-1.15-r2.ebuild
index 25089c90a947..0acb95262191 100644
--- a/dev-java/byaccj/byaccj-1.15-r2.ebuild
+++ b/dev-java/byaccj/byaccj-1.15-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 S="${WORKDIR}/${PN}${PV}"
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index 211ff8e7b6d6..581346e21c1a 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -9,5 +9,5 @@ EBUILD commons-lang-2.6-r1.ebuild 841 BLAKE2B d21f73d96b0335a1048056fd0c1570e8f0
 EBUILD commons-lang-3.1.ebuild 836 BLAKE2B 5f864be126f1baf7c8451507ac8dc5c944a0fa236ebe17b1e0e5dae2bb1118a80e3994f103463632df0bd5060bdbd3ac8e7aaa372ea85bdc93a60a28d7c048cf SHA512 4a2e8154186bf9d4f47154a887108b34f83e6ee3c8ff3dfdb52c12c628862e3b0133e8abd7c2dad93823a745050c27b70ab2b3f86f98fcb63ef6d98ae8b4dfe4
 EBUILD commons-lang-3.3.2.ebuild 1111 BLAKE2B fecd7695bede1dbaf79d944466678d0671bfa248979e52264c05201aca89db664fd9c21e15f242662dc0908d73eee16bad165dd8a028e8c571fe505042b4433b SHA512 3d50c00b2e0c6795a454a39c0fd3ff9651a04c8243cb1ebc208835a5b2e929857af153870cf2ad7ed097630a422fc0734b059ea06aad3aa0c2b5ee36e76864f9
 EBUILD commons-lang-3.4.ebuild 1109 BLAKE2B 7106a50e065ec2be273259cee1f7b3af8646cddbb7c5bcbe859a16f0b8bcd68c5e63d0f323b7437b2df8eb6361397a69917e2b612409885fae3d643f496578ce SHA512 5789acfafd94d8d5cba8a8dc7748007f86147835eb08968d6083fc7c407ef7ae9849a21f42f53d8f226577d322798ab80c9341ae870f69c10d4b44bd400287a0
-EBUILD commons-lang-3.6.ebuild 957 BLAKE2B 70397b21b4bbb9e46bfcd3a2f9731486a94efcb9ef3a24f5000e3d7140c153d94782c4d630291c11c7b2da0e23017ef0a472d422ef1927d8cee89821fd1ac22c SHA512 15abf5f5fb7c29fcaf85e6fda4fd64f6352a88e4547839e00aa75dfe4f284a9ae37ea5efcfd557486f1f857c2a92c0c2dfd274b05ad6b1914172ee367d739c13
+EBUILD commons-lang-3.6.ebuild 964 BLAKE2B 6da111f596d1bf32428bb18beb8838b710c564624f3426eb040000e13ff3535c229fd08d22df4b5e8cd1640ee46c35e9f236475462b1983021443cc5e6912351 SHA512 6bde85e60105b256bfb6956373c9067d6f329d273ee0f906716aafa59fb8b43f5f5bf04e8652f36c334756c0bb050201446a9e87bab27e220be2904b8ce79fd7
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-lang/commons-lang-3.6.ebuild b/dev-java/commons-lang/commons-lang-3.6.ebuild
index f6817c81ee26..6bdc27250953 100644
--- a/dev-java/commons-lang/commons-lang-3.6.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.6.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=6
@@ -14,7 +14,7 @@ HOMEPAGE="http://commons.apache.org/lang"
 SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="3.6"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 
 CDEPEND="
 	dev-java/easymock:3.2
diff --git a/dev-java/commons-vfs/Manifest b/dev-java/commons-vfs/Manifest
index 00643efc7003..577e9b31ca6c 100644
--- a/dev-java/commons-vfs/Manifest
+++ b/dev-java/commons-vfs/Manifest
@@ -3,5 +3,5 @@ AUX commons-vfs-2.0-incompatibility.patch 2699 BLAKE2B 09e8762553ce25d02942b2a70
 DIST commons-vfs-1.0-src.tar.gz 278588 BLAKE2B a92be28e02758bd271d7bf76f8b90c741dad0f1c15c71ab3624e16c6c30a47bbe189ef93c99b1f413034c47dbfdefbc155a526abf9897b85cb7352d1a92b4bef SHA512 5826ccd3faf574d7573b22fbab5f7f3ddc83b22504eb0822efbcc4570059db410d1a32811bf411414d275bdeb16ce39fd7cca2150d8537841cd888b1aef2b5a1
 DIST commons-vfs-2.0-src.tar.gz 335255 BLAKE2B 01c8bba3340487672682af5c6b341ab1e8335070a9b711b5c85cca659854d05881a0ff10c4b168497e3a75867a7225740edc6e56019e55c499256401fb0a53c5 SHA512 433828b9eba73df14dbedaa4037e3da1c69bf1892553c1ae4d213ba864e4ee579e0c7799f39e3cb4ec087d7c9223f54442be46de9c4916d7b7ff8a51214d6346
 EBUILD commons-vfs-1.0-r1.ebuild 926 BLAKE2B 015548e9af71869d3fbbcb86fd2b26357c134f9fc0eff582eda19bda7b57252e05242f519e7e62d5f6600e3df27c8a182c415e23dcd9ceb11b6463be1db583ca SHA512 fbb4861ec1710b7de93d5690be2fa91920833b3274f5d47a558c94c95a912083b494f6bc40d5606b4a2c07ce17d10c46d7ef41105034290beaa0cfc3671bb2f7
-EBUILD commons-vfs-2.0-r1.ebuild 1551 BLAKE2B 43e4cb03cff172de62bddc07ccc970de8cfa599084b3588c3cb7564cd1834b3ac8e65e673de534cd21ffdff0b4f5a4b30d1988de9c8e9b9d2952de7417d32530 SHA512 dc4545c9ff8170375a338780e6f7756e99a454e87d5eb9594367c08d1fc36001b681a760f521ff9c48441d337eefff505106e04acfe9cb79cc8dbcb38a52d758
+EBUILD commons-vfs-2.0-r1.ebuild 1555 BLAKE2B 6b63d2ba8e44911ee0bbb849b2818b9db99c7e054d5fa4c8f70d1a041f8ee6c32ce34ed94e4e5b6ea135c803b4b1cdf1b842f9a7fd1a6ed6fcac3ddf2d34a371 SHA512 717232ee5632658753e44637acd0edc9424782311bc370ffc2f3dd494ca46c188d79347dc67c1ea67c658809170fb452f4d522bd3d60029d0d3fa0a8b07f945b
 MISC metadata.xml 522 BLAKE2B b4fa8415246b36a13af5f876f6fb75a49d867247d47d39fa26652917f0dc6e0fd48e99518cb7406375ea9b5715a8beb0f798dd9d95825969fa320aded7da50e3 SHA512 1c1c96edc32537d782e66dcf44b14081f2cdd249e5bb398dcc711b4dabac745db15af7fee7ceaaf0d758738b99f3fee8be7b9e1561887426c3ae8988bc1900a1
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild
index dfb280409533..e8991f3641cf 100644
--- a/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild
+++ b/dev-java/commons-vfs/commons-vfs-2.0-r1.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"
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/vfs/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 CDEPEND="
 	dev-java/ant-core:0
diff --git a/dev-java/glassfish-persistence/Manifest b/dev-java/glassfish-persistence/Manifest
index 1a0d0791c9f0..4726c7762b4e 100644
--- a/dev-java/glassfish-persistence/Manifest
+++ b/dev-java/glassfish-persistence/Manifest
@@ -1,4 +1,4 @@
 AUX glassfish-persistence-1.0-python2.7-sax-parser.patch 286 BLAKE2B 49667ba4e41eadfea73fc8b53cf61f5fafd4654292ecd1b2e2b653411d252b1ff8bc40e6c9e0cd8fdd1375ba86a358495415a68ff1466f857d96cfd90ce5605a SHA512 ba7c32d86991407d45a86d640d95007cc47dcd28c74f441e38840206093653dc31e4824d4986cd9cd60d44fba0c1f4365f9348a9362529531fa9410e9fd5cad1
 DIST glassfish-9_0-b48-src.zip 35162972 BLAKE2B ff96f2135c6bbdc60eadab6a6bd60b623ac1a3635e4465591ee75f6c1229e83f9f6424b46e42eb333eb6edd3ba1aba51897ab80ca5bd5c754e516a27a03381d9 SHA512 512ccd1c89a1bbd88ca1e45b1e60693bd3c4a6c6ffa19376febb786eb73556f27bc0ce4f0e760d6d80b0711206f6701e7c7da70ef3a5e0084ad0482246506a48
-EBUILD glassfish-persistence-1.0-r1.ebuild 810 BLAKE2B 1deaeff209d96ac7c5fccf60e6c5f884e2aa5cccab66b2ca4d8a6e7144b800994e2feba13f878bae0369e439deb70d21b23f528ea9ed2a5c2d1047f82886226f SHA512 a28365904170c86507fc5f3be45de8e805bdfbdd3fe36d06bc7d6d46e332a98996297c3d2e0beb1447a2ebe32eb7e8946e4c6bcd47042d995bd30af04484154a
+EBUILD glassfish-persistence-1.0-r1.ebuild 814 BLAKE2B cdd2d0a552118d855c34056983e69a1453506abc535cd2cf49a1f9460dce7e809805172bea2f6fcf7c3efdd32a30441be1a2b3a6b6229f37e861c6ddb33b975f SHA512 92366fb448d2a99342c812b80edad37c0ca8c4486fbe561252f443c91ac585fd8b63abb82ed8a58b03d44d9199d930e2a6be38779732fae2448290a657934000
 MISC metadata.xml 214 BLAKE2B 5452fb11be445b7579865f9777af292067658bf101f6321db48ab1b478101fe031bb7914c6c24215bcdbe369dda396c164fcbbc4253ecb315de82141ee25f8b0 SHA512 d2b6ecfbbd79440de1909d9f195e5d4a6f9886b685ac1e6d7a1db39b8925b29942fac2998cde06040c921f2cc9ef2cbfbf836b60e191d894b00f75628476b1f7
diff --git a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild
index cbb04e8d159b..f7157f5db556 100644
--- a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild
+++ b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.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=4
@@ -11,7 +11,7 @@ SRC_URI="http://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 60cbed197a9d..77052d537a99 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,9 +1,3 @@
-DIST gradle-3.3-all.zip 91388147 BLAKE2B 15539ec06cadcdaee9d54928381d5626bf06bae3251eb304fee095e6d0362f23759e99e3841dac2b9a1eed50b6057ecce78230dafb45711bfe764bf107b1f704 SHA512 4b852eaf4030c780516fe9214c289e49fc93fc62672da70b7fd6bbbcd128e6912dd196195ce32570984503ea53b48593a41fbf4ec69b0f18b5e32c2fe9e556b3
-DIST gradle-3.4.1-all.zip 91604607 BLAKE2B 1c4aaae4899f3faa94fc3ead84c4fd4bdb6212c0f579a255c7494896fd2a498890c58e853315892c3c9d78635b58da5423b1b2211b991639474d19eca1f2992f SHA512 bdaabf747e60ae1cf2c9fedb0730a2e3deb914609db05ffc7e4cbd5402bc44e84d2c98154f14fdd7f944c2f49eb5dead0f44c119ac5a16bd7491c3369d784f5c
-DIST gradle-bin-5.2.1.zip 132549774 BLAKE2B c6d6fa9975bc28030672a99f22f0e9c4c2cb3d667ae3658c1062428d0ab2fd8c3b4df0479f4fde7b2d75b8fcb64c7f5b208e53c5b30a9b3c7afb5ad7e1a4139d SHA512 e2a17072c10d27acbe4a0282dfdfed907ab5c57109668595feaec681ab1d4be017ac0f6090c2c2b64a057d71c1e244bb50f4047509d36c5930e894837a96171b
 DIST gradle-bin-6.3.zip 145161013 BLAKE2B f840bda2c1e2a6dd5306b9f7ad6fc8ae8c3d7342de57bd813b8dff64f733fc058af8dc7c9c5a138eac4eef3d5d12074976db81fe7eeb51b52d726502af04d036 SHA512 9796c14f8d4559128b4cb7e676883d83ef99b67242ae8156abebdb38bb7a561e8b3df3f93b24aa53274b7d78a7b04ea51e73268c2465799daa9da53ef73de24d
-EBUILD gradle-bin-3.3.ebuild 1009 BLAKE2B 52be8dfd2f4c90aee207631115a7af3fe564889a4cd76b6358637b367ccbd8db19d4a3b8568b60e50da12b5f6d68d1a14b1e130569deebf467c07b0c17587e74 SHA512 6d390f7527be2fd68da1fb7a2152b8863988b63e94558b0bc2e4fd6aaefa7c417dbfcf43871e2c7c7acc406762f9854a3e796198e2532d4dc1dc889f02c5f684
-EBUILD gradle-bin-3.4.1.ebuild 1017 BLAKE2B 381faa269feaa7900aef4b4983e5dfde0711334da1b5b3e28f942a503bb582b3ec674b48b96036e0d8fa110e9dbc0c1d38a9ded98539fc061f6a05319238588e SHA512 6d64be5e536b33257e8cba0adc076bc7d1b1208fce5fe80306c8ad92c8712de040cf75bb79d50d005c282cea7b48fa74c739d3f73fcc3a4d5dbb527785466840
-EBUILD gradle-bin-5.2.1.ebuild 1052 BLAKE2B 6abb286cfd8165ada2c79e7be5527390ee4e0c7538230a738e406dc53eda5f45d8601681eeec2b9838837e527f581a0a3d0c02c8a73cdd1e6131d3b68e4eb90c SHA512 d6fbf5b75afbef0aa997217dcc9dc2f9862d35e50b7d83a103ed76d5cefd0f7570223ba03bc988481863c995acda04cb1aa499bdbfb90b32326dec58716c14cd
 EBUILD gradle-bin-6.3.ebuild 997 BLAKE2B 14539daf17d39d17d539561cb6d6d4ab586f3e8a6a084d3684b8b1f8bdfb160bdd3f7c3091ce0f362c93c3ba5b3c0d3641aa3e6fab1ea58338f3973c7fb0270a SHA512 7bedadebec8b2df5bc94cd2b674965edd5529fb4cf9eca8328c117cde83bcfa2baf96eda3ea8ec4b75ccbdec3e504b84d54d1861dec69586f781a6508e121a5b
 MISC metadata.xml 435 BLAKE2B 22a7527b15ef2974a3e389977eb4056c03f7575ec9866848b90ef9e98bb7d2d645e83408f0ab4cbb139699757e7e3a1b5eb458a389563597ae3fa0ff5c310c0b SHA512 2a8b7c438d8aed952350c0a08660bde349363bb80794de9197c7ac107409021c1e38f0168e13213d730c6251ed9e39f644c42d6de050f0e58e862efaa46b2a43
diff --git a/dev-java/gradle-bin/gradle-bin-3.3.ebuild b/dev-java/gradle-bin/gradle-bin-3.3.ebuild
deleted file mode 100644
index e14942e03d7e..000000000000
--- a/dev-java/gradle-bin/gradle-bin-3.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2
-
-MY_PN=${PN%%-bin}
-MY_P="${MY_PN}-${PV/_rc/-rc-}"
-
-DESCRIPTION="A project automation and build tool with a Groovy based DSL"
-SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip"
-HOMEPAGE="http://www.gradle.org/"
-LICENSE="Apache-2.0"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/zip"
-RDEPEND=">=virtual/jdk-1.6"
-
-IUSE="source doc examples"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}"
-
-	dodoc docs/release-notes.html getting-started.html
-
-	insinto "${gradle_dir}"
-
-	# source
-	if use source ; then
-		java-pkg_dosrc src/*
-	fi
-
-	# docs
-	if use doc ; then
-		java-pkg_dojavadoc docs/javadoc
-	fi
-
-	# examples
-	if use examples ; then
-		java-pkg_doexamples samples
-	fi
-
-	insinto "${gradle_dir}"
-	doins -r bin/ lib/
-	fperms 755 "${gradle_dir}/bin/gradle"
-	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${MY_PN}"
-}
diff --git a/dev-java/gradle-bin/gradle-bin-3.4.1.ebuild b/dev-java/gradle-bin/gradle-bin-3.4.1.ebuild
deleted file mode 100644
index ab78e3f8790e..000000000000
--- a/dev-java/gradle-bin/gradle-bin-3.4.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2
-
-MY_PN=${PN%%-bin}
-MY_P="${MY_PN}-${PV/_rc/-rc-}"
-
-DESCRIPTION="A project automation and build tool with a Groovy based DSL"
-SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip"
-HOMEPAGE="http://www.gradle.org/"
-LICENSE="Apache-2.0"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/zip"
-RDEPEND=">=virtual/jdk-1.6"
-
-IUSE="source doc examples"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}"
-
-	dodoc docs/release-notes.html getting-started.html
-
-	insinto "${gradle_dir}"
-
-	# source
-	if use source ; then
-		java-pkg_dosrc src/*
-	fi
-
-	# docs
-	if use doc ; then
-		java-pkg_dojavadoc docs/javadoc
-	fi
-
-	# examples
-	if use examples ; then
-		java-pkg_doexamples samples
-	fi
-
-	insinto "${gradle_dir}"
-	doins -r bin/ lib/
-	fperms 755 "${gradle_dir}/bin/gradle"
-	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}"
-}
diff --git a/dev-java/gradle-bin/gradle-bin-5.2.1.ebuild b/dev-java/gradle-bin/gradle-bin-5.2.1.ebuild
deleted file mode 100644
index 0f029927d1f2..000000000000
--- a/dev-java/gradle-bin/gradle-bin-5.2.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2
-
-IUSE="source doc examples"
-
-MY_PN=${PN%%-bin}
-MY_P="${MY_PN}-${PV/_rc/-rc-}"
-
-DESCRIPTION="A project automation and build tool with a Groovy based DSL"
-SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
-HOMEPAGE="http://www.gradle.org/"
-
-LICENSE="Apache-2.0"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=virtual/jdk-1.6"
-
-DEPEND="
-	app-arch/zip
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}"
-
-	dodoc docs/release-notes.html getting-started.html
-
-	insinto "${gradle_dir}"
-
-	# source
-	if use source ; then
-		java-pkg_dosrc src/*
-	fi
-
-	# docs
-	if use doc ; then
-		java-pkg_dojavadoc docs/javadoc
-	fi
-
-	# examples
-	if use examples ; then
-		java-pkg_doexamples samples
-	fi
-
-	insinto "${gradle_dir}"
-	doins -r bin/ lib/
-	fperms 755 "${gradle_dir}/bin/gradle"
-	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}"
-}
diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest
index 3256db6d3de8..e64a7acd3a45 100644
--- a/dev-java/hamcrest-library/Manifest
+++ b/dev-java/hamcrest-library/Manifest
@@ -1,4 +1,4 @@
 AUX 1.3-remove-targets.patch 2263 BLAKE2B 17fb19da0f70f8d265a4e68f28ca530748af3372bcace0e7e04e04c46097abe2cf61265dd2b84f56467a83e0dc9c72bda2d94da25fa5abbb88f6f31f04d1321d SHA512 e403068cba91964dc7895c111a292a135ad27790da480c8779961075de559163052fa8ca5a997d3cfc278455ab3b8051bd3d4eb069f850dad2780a7ca974e551
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
-EBUILD hamcrest-library-1.3-r1.ebuild 1347 BLAKE2B 968339145ca9c96fefdd00cd2a1dc4653ba4233b2519fe4f95b205be42a941701bb54c4fd25506bca0930632544afcb2baaf0d7ebbdc122327b8c010aa0f4752 SHA512 11d211cdf75a7643d4ef7f856ea9200a6f7a14b3fddccd8704fe75e0b2629e0f7700d75a9f36023ad5d74c4596e4f2a09b60893354faa10db48a21e85b9c2a71
+EBUILD hamcrest-library-1.3-r1.ebuild 1349 BLAKE2B 7f4fe6555c6ca63e30104c0c705f8e6d3f92336c5edaee489171123e783bf0083eaaecb234a5ca59915af7278fa11a5c066c8eb759f0c53ce389bfbbb16da672 SHA512 a2b724168ede126135ede9a9054a476c783fb2c4afd491ff198083f31f4b47315a9d0c163a4fef4313f74a4cf83717abf6fe8bc68c5f572ea05ec8ae85a4a01a
 MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
index 89a57bc7315f..a19db7fcea85 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-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"
@@ -17,7 +17,7 @@ SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 CDEPEND="
 	dev-java/hamcrest-generator:${SLOT}
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index ea22261325b4..108033effc3c 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -3,5 +3,5 @@ DIST icu4j-55_1.tgz 23617640 BLAKE2B fe22524761e0c6be4ea440f90ffe5fba8a2f3448420
 DIST icu4j-56_1.tgz 23189284 BLAKE2B d53aa869d6cde8cc9c83e66b55986b61736fbaf7a890e3c7bacab5abb23623ec64b5a23fd740dca8e51fd2336ced5e79546b4c08edca25beced22e6560f7814d SHA512 9ecc36c03a6713dbfb909e109b5e982525958b6137bd7006c93ff3b8578d816c59fa331555b43c94248f392ba9b456b1adb37be74e02e9ea818c8a9a7c669f4a
 EBUILD icu4j-54.1.1.ebuild 1213 BLAKE2B d47fef652684c16d29b82b733f31ebfcbcaf983117a4a7034f9b29dbb2dc03a5de7c5c342c0b1f9300fd8c5cc600e45fe3a67ec832fc9b972157ff7d636177d4 SHA512 af5cb4dd46107792562c6c9460a09e728b8c79b0cb974ef90cb58c33cfaba621b38a06099b793d2976f608d1d6308bd8e5184f794f24b4a2ec5f2179733b81df
 EBUILD icu4j-55.1.ebuild 1136 BLAKE2B c942cd5c30cf3f12b10deb63edd95f7680d837a5515130bd5f160311859bfba269fe7376927efa0c07dcd56843a8ca6b134bf94ed77a35215848cc6cdef5508d SHA512 11157e68e4c11522c6af2ec1015ed0b63d0a13ad03a5bffb7296026d66ae6da0fbae153529c7305a8b6dc386366dcab9e35c2b8b9831de0a1c92f20354400cd7
-EBUILD icu4j-56.1.ebuild 1081 BLAKE2B 916737c2e0db890bb1e399629af6f0c6c0cf084cbaa3429388e357942c9ed602d8be0c5584c2f68ceb37e4e5f063da2b6ee66cddbcee6019d0ca847b7cdbffb3 SHA512 77bd9ebfd71a0c7a0ebe6683110246e1ef987a8f77f94ff4bb8e0f892fd2801e4cc4243dada495305a0d22fef13b465e426c04ff4eae7db836c9f2b8a7a7d20f
+EBUILD icu4j-56.1.ebuild 1085 BLAKE2B 27c74cacb5d5174b2cfd25cc240621bbaa2074e538c7cd5ac4c86c2786794516ca28a786ef67bf1750ffd3ff97bcf1c5c70d1dcff3fcc9e29581aa7107ebe10a SHA512 53db9342761a2a177f6bba391b9249ed297dd1133be45343002398514d6fa229ba2ce9d0c2b5109c015448a45f8928be79f627f7910e48c6aaefa57b20fc2374
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/icu4j/icu4j-56.1.ebuild b/dev-java/icu4j/icu4j-56.1.ebuild
index 3e0a98276d16..f4ff61c4113f 100644
--- a/dev-java/icu4j/icu4j-56.1.ebuild
+++ b/dev-java/icu4j/icu4j-56.1.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"
@@ -13,7 +13,7 @@ SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
 
 LICENSE="icu"
 SLOT="56"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/iso-relax/Manifest b/dev-java/iso-relax/Manifest
index 6e748ecf59bf..b1eca4d58dbf 100644
--- a/dev-java/iso-relax/Manifest
+++ b/dev-java/iso-relax/Manifest
@@ -1,3 +1,3 @@
 DIST iso-relax-20050331.tar.bz2 696665 BLAKE2B 4f366818bed5e31fa8fc2f8759a38dddda26b8d379c4ba81ff3679228826890f7383606901440f51d958a2401943822bcb3a03bde9be1a647245563d58316526 SHA512 c327b461785ce647f9913afa6f5b77c41440e806d566884058be76e14a118d14fa305a1bc0157ee150b199b573e75af954311dc79eb8535599544f094526320a
-EBUILD iso-relax-20050331-r4.ebuild 726 BLAKE2B 49b1abfd191e4296c40c316ed544f9c7e4db1163cdb4b4bfc688a57cded852ded42c25d548591f3347971128e4ddc8cd15b0c6cd68c867515fcd6e679b089ca6 SHA512 951652fce95d1943108e54ec8fafe431d2a568cece0b20c6d8e961499c4177ad6aec67260c0dde64d950367f5862aafef07ff389a98b1b7f62617adf1c7c519d
+EBUILD iso-relax-20050331-r4.ebuild 738 BLAKE2B ce50c12f0340cd1ebd66c7355b016747b14172356ee015c2942749beb9a74fe1230f8cabc780ef888cc1f97fa0dcac8c05b9f01395dd471bebe385edf8751b85 SHA512 d52a117f49bde791b271d65144e41ab8a2c203bc0e3647c45359968269bf1b5f9e93729a28a35471c66a32bb33d9b6094645d334c8dde8b869c5a4453a07618d
 MISC metadata.xml 315 BLAKE2B 0c45e5fc5f64ce3a8d20de0be018eda7220ffa15c3880d54e49e8a6ac6cb9de770f5ce66e3e113ee6a6406324b440dee40fa6b98dbf4c2920b8c4c714a891a98 SHA512 08eaff739d58710deda145cdac32ab148112f2364f3f5a898095f0f135bca602354287ebc40ee9ab73d80e344330b810caa87b16b86b3c5696040e16d3a54fd9
diff --git a/dev-java/iso-relax/iso-relax-20050331-r4.ebuild b/dev-java/iso-relax/iso-relax-20050331-r4.ebuild
index b202adc2bbe0..a408e3253220 100644
--- a/dev-java/iso-relax/iso-relax-20050331-r4.ebuild
+++ b/dev-java/iso-relax/iso-relax-20050331-r4.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"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RESTRICT="test"
diff --git a/dev-java/jackrabbit-webdav/Manifest b/dev-java/jackrabbit-webdav/Manifest
index 611d0cca4143..3d7db43ecad5 100644
--- a/dev-java/jackrabbit-webdav/Manifest
+++ b/dev-java/jackrabbit-webdav/Manifest
@@ -2,5 +2,5 @@ AUX jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch 674 BLAKE2B 1d3275a45d9f472
 AUX jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch 696 BLAKE2B e888cacb419050b6bf412ecd70df42ea13a11937bcf00d7e716e36e1842003a2a53626179a6e642ab2df7aec84a2c7f9bc660754456e0ba4ad4912ea80dc1ffd SHA512 ab32fefc4f24d422eab5c399355e4188c0f8b7171e0e1ad9cacb5d031e1cee01ff3312d0df47cccc15a949d374e7c07749e5dc020a7e6d1e9fab7a86289d0d19
 AUX jackrabbit-webdav-2.10.1-build.xml 17644 BLAKE2B c878975d2f1ffe74752b36873d0625c73605469e5d8a1287568b461fe402e4a91ea0f2c6334514d526a011dbe4311b0b49439d508c9ea99e127cad49abe6ebee SHA512 5b22661e3d36d227edb618b553671964be14f34dd245f1749caf9b6f3c9981fdc9fad11659ae98cdd5fb3b343b6bc450478d3655054b055f7ffb3663378b7a8a
 DIST jackrabbit-2.10.1-src.zip 13437021 BLAKE2B 3542bbe5f7c8ab8feb585fecdaca028a4908eb664d01cb9fb32156c71756973671969b1141e796fbc165f7f6f305db25f74d36657e4d86dac6766e4d79b888dd SHA512 c371ff941054f3a916f43f7020f0aebd8146422835a75ab2ad9f9f716c4ef0a94b3b962f9b6e4fadef87b9e82e8143b4ece27280714a4eb71a6b0a38c47d48e9
-EBUILD jackrabbit-webdav-2.10.1.ebuild 1260 BLAKE2B bcc9f8b594ac6a208edcce6d834ae6068920c5168bc2ed3432a172bb66635f12203223646262ba0414dac94c61aaf3b0f7fa86151495371b1024fac48b6b4fb6 SHA512 0135329c1d74019952200330ed816ef5d1f2c637cec3f287b780e379f0e89327742294f7155e863b27ec081d5891cd1973da554bf8e4f305b4aaa0a89fccbb84
+EBUILD jackrabbit-webdav-2.10.1.ebuild 1264 BLAKE2B 154ede9b836795eef7ebfe23bac873e765a948a9a969f423e0e769de2794dfe4c3b1228d416cb9030b3e6d6475cadfd6b43be1717fe1d42f4d0d327862f26188 SHA512 4b8bb9ac87bc6b65f6de46740b704781df056ca1488fc55f892a9cd9614c7cb61a46d6caa3eefe09533819787dcc3a0937a660a7ac90937f7b3fdcaccc0b3fc5
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
index 369a18bb374a..f05838167a52 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.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"
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
 
diff --git a/dev-java/jansi-native/Manifest b/dev-java/jansi-native/Manifest
index d383924d8f3a..95eeb7983ba5 100644
--- a/dev-java/jansi-native/Manifest
+++ b/dev-java/jansi-native/Manifest
@@ -1,3 +1,5 @@
 DIST jansi-native-1.5.tar.gz 205008 BLAKE2B 94f46527165e1956640ceabf10ea6ae90fb461e331389823ebd9f86b2b0cadd0ed777e20787fd5bcc9388fc250be1d5415feefe4953fba9a5610870409940060 SHA512 29d178f013701b7e7844f899530f51486037e3a1403018ba4a41475ceb8d58afec768d177f64cbedd41adfb681ba08e578c2e18d956770bc039dfece8602a212
-EBUILD jansi-native-1.5.ebuild 792 BLAKE2B b0738fa53a01e60725efac9edf8ad846139572e843838ce0a7a71bc01c88a8b326b35232e55f67646c4f858280a4241235616dd08c427c3490387dea8fa7a8a9 SHA512 8af851e639ac7096c28992ee4dd3880e7295c84aa4e2afd5254b84f203b4ef73de8135977c96395c270f6275704bf0aa1a3dbb22285988722a9089d03767a963
+DIST jansi-native-1.8.tar.gz 33035 BLAKE2B 0008d1af45e8694d065beb7c55cf5e73aa1bff54aa9b83287490a307553ef6fb28f87011658f9fed54a3ba8d47497e2c267a94a63d50862d9ebf3e231b8eda23 SHA512 e5184bc8f5c819f54550791969df611df0b4fdfcfc6aaebf123d786a08a957e5854b15b2569871d5a9d0d20703a8831c99c42610a83fff77af3cf750b72a7fee
+EBUILD jansi-native-1.5.ebuild 795 BLAKE2B 641ebd29524c19173c9f96c107d5db21cfbe87bbe852621cfb652d20200ef46995cc76c312b927402fd1de909cf1aec7ac22acf68d1641f6ef5bcd5a516e14f0 SHA512 1dfe076ed89b24ad0245bdf77297473f22a1967ce024fdcf7477f9decf21b32f2ecc4342b30bbc29127d725c25fdebbc898203f1c7e7169c8e5cb7c44eb88180
+EBUILD jansi-native-1.8.ebuild 799 BLAKE2B bb73f823a67d01b50b7e7c8bd5d1de735a769a8ec30975a5166374bddb3b62589cf1eca02532bb5f2922b531588fe3964e5fdbb57606a4e265bd667fd650cb0f SHA512 abee1556c580ecfd9926557ec44b005948bf76e7b3697f275a6a44620da857bc77c1846a5d3496720e8d7988a291c3cae3f49b19d333303c907351531c69ba18
 MISC metadata.xml 334 BLAKE2B 344c274ef2a08d05c659d652711ca3d89e4f8d0fe067cf6dbf024e1ff1c5f3f7228773dee36f57c341ddfef60dfd6c4dd5da1a7bfbef9bb70a3ded7c5412f364 SHA512 0b5b8c67251d880d3a5702dbe70472234f6c83deb557597d6160b5321b1d187fd2752879215c65dd34f8ad6ccfc3fe2ade25804b29a46a584464940942e3ace0
diff --git a/dev-java/jansi-native/jansi-native-1.5.ebuild b/dev-java/jansi-native/jansi-native-1.5.ebuild
index c8f3b978c70f..1f8a3e844a91 100644
--- a/dev-java/jansi-native/jansi-native-1.5.ebuild
+++ b/dev-java/jansi-native/jansi-native-1.5.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"
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
 inherit vcs-snapshot java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Native JNI component for dev-java/jansi"
-HOMEPAGE="http://jansi.fusesource.org/"
+HOMEPAGE="http://fusesource.github.io/jansi/"
 SRC_URI="https://github.com/fusesource/${PN}/tarball/${P} -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
@@ -18,10 +18,10 @@ KEYWORDS="amd64 ~arm64 ppc64 x86"
 CDEPEND="dev-java/hawtjni-runtime:0"
 
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5"
+	>=virtual/jdk-1.8"
 
 RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
+	>=virtual/jre-1.8"
 
 S="${WORKDIR}/${P}"
 
diff --git a/dev-java/jansi-native/jansi-native-1.8.ebuild b/dev-java/jansi-native/jansi-native-1.8.ebuild
new file mode 100644
index 000000000000..ed594a3e3e58
--- /dev/null
+++ b/dev-java/jansi-native/jansi-native-1.8.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit vcs-snapshot java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Native JNI component for dev-java/jansi"
+HOMEPAGE="http://fusesource.github.io/jansi/"
+SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CDEPEND="dev-java/hawtjni-runtime:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="hawtjni-runtime"
+
+src_prepare() {
+	# Easier to use java-pkg-simple.
+	rm -v pom.xml || die
+
+	default
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	dodoc {changelog,readme}.md
+}
diff --git a/dev-java/jansi/Manifest b/dev-java/jansi/Manifest
index b232999b34b1..3f171def455c 100644
--- a/dev-java/jansi/Manifest
+++ b/dev-java/jansi/Manifest
@@ -1,6 +1,6 @@
 AUX jansi-1.11-build.xml 14529 BLAKE2B ea9358a4a64e077ba9173f6f0d0548647489980cff2626760b6c92df9774117bc6ff32f4647c8b89b21b4e37722f018e4f1fd0ca2cfa5915a83e253f9c18d250 SHA512 cc60a9f48f220ee13a22ed814409126524d22f2329c574e61974e26fd70b9a53f703ade06bb6921c13f370016be79c00d111368018132abee20780e99096c0a5
 DIST jansi-1.11.tar.gz 252095 BLAKE2B 72b22392fa6731f49ebb5c2e94cdf7918ca37d5c73ccb14d8810402c9ec120b1220a739e54516eeb5355ad4dd74d01ae398a6003679c60b1dd6f1648691b2efa SHA512 4a19d52055da3ce08b6d797fb8e8241af86f1b9b30e12f4de24655edbd72d256b310d58fc6e106cae1384f9b0ab99cd7f2128d53296875fba5422bfc0e8410f1
 DIST jansi-1.5.zip 211616 BLAKE2B 754105218e62d095f9f070ba7f66b68dd2cfbf1b7d8f95ea6dc40f01e536fd8997e2bfca481a4c57cafabc6fe044de5de171b51429e07081ebe1824a5cd5d3d0 SHA512 784c01b7ab48307cf881439d5c3531949a6459e8a90667f1ee7a73f9cbce72710fcf4af8b4cae610d15085641567c0d51cab487488daa0c1b0a4605864de2775
-EBUILD jansi-1.11-r1.ebuild 1127 BLAKE2B 36c514f4e6797c2ac98e7d98ac7ad671f87613afad98083dcdbc0dcea883e14b47d0d7a3170f5177d783eea89849d2167f70695e06396654a6f84c870d7aa93a SHA512 127446458448ddb88333e4425b28475e6e9dd31f1dd7e90bd6e6b7aeec9040deafd96fae931064e922fc478f9d0cde33649da99787287c74b6de464863908434
+EBUILD jansi-1.11-r1.ebuild 1138 BLAKE2B 9d8e6c2f60ec8b124951b75a9ea4185b357c8359d61a295cf9c61e1e3124c03701a3f4a7c0cbd4ed1d8ad5712944d694fa1cf1ab6097e777ee509ef107e70bc6 SHA512 d42fc45b1f33548bfb4da344eb67ad7f177a117112aa8d94280422650dbfec4f6862ca6e3667f25f850f7a7b42b1678835a52062f19083755d77212a42c57d7d
 EBUILD jansi-1.5-r2.ebuild 674 BLAKE2B bd3b686e6c35721f33d73357434a37800519b0b370edeb97288be68a98e95b04045c397700fbf78e0d3aa4dad82da714e20dcc30f0bcde1fdd9f666fbd302b19 SHA512 07dd8bc9d822b963be6db3ca5e39bc160ace104741ef0786de3a8482eeb7f075c67fbc60d4f6e5cc46c4ef58f4263960f796c1c0373c07baa0149f09cace0910
 MISC metadata.xml 491 BLAKE2B 57979797604525188358a5e2bbf92bd7cc40e9513710d9907302df960f0fb0961b3c8eca15bc09b53cae259dbe3b512d149a4e9fb2bb5e3b1ad6a13700af3c4b SHA512 46a12388363e4b59001bf8cf67923a4f38d8a4409fe158a813c9403e0da6067a8aff418cda7e0d02dc905e38591ded15e46b8f8095acb62d0a83a65146550669
diff --git a/dev-java/jansi/jansi-1.11-r1.ebuild b/dev-java/jansi/jansi-1.11-r1.ebuild
index 521a8813c78f..0d9a907524da 100644
--- a/dev-java/jansi/jansi-1.11-r1.ebuild
+++ b/dev-java/jansi/jansi-1.11-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"
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fusesource/${PN}/tarball/${PN}-project-${PV} -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="1.11"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 CDEPEND="dev-java/jansi-native:0"
 
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 2d5c7b271a3e..436505734709 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,7 +1,4 @@
-AUX java-config-2.2.0-prefix.patch 653 BLAKE2B 837f741e45b8228944e6287a57b05e933d85db00375ea68690e32b101da45b8150bcc6665d1d03ed6836724bbe43c4bfe1e89fb9449723fb4532dca4f4dcf01a SHA512 591591828ddadf76b5ed65811f7ed9e1e60583c5575926edf175ebc7ed1d76562ec980ec3bb530dedc7626f841dc7d143383bad25303399eac2ad49328d63dc0
-AUX java-config-2.2.0-py38.patch 1685 BLAKE2B 3fe59a1839a9fe1f954e6c96bdf42bd28f795881601b0e53353864ee4cdec57d891a5c1fee7e7f7060aba521da23934be8b5ea2717339e16f291671937df1af7 SHA512 9fa254fd108ec05d69d39260841fb8f946d6405b3fa37223af3b53117383bad94243c7a20f3f53de1a5d0609f433a14deb50fb7b9f857c56b41d1f3e8d5c4ef0
-DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B 7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
 DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
-EBUILD java-config-2.2.0-r4.ebuild 1063 BLAKE2B ad07cf002078f3adba19c4c59d00f084640349d64a728758bfe968eedd372e3a6e47ef0ef9b45751ec9a51c17851c764e6edd5a1d6ccf063fbc2beae25165f52 SHA512 e2976feaf12b9e208f39b33457e72a410bc74844e1ac283efefb989d0028083c6c663f96b5eb1ac15c2b13214dfe18b44c1f8621bf2ed6b82ec1ac58713825b2
-EBUILD java-config-2.3.1.ebuild 981 BLAKE2B 70fda09145a45807c9f8c45e3a77a2350640ab4694f45c7fe41d6a81198f71ac0d184e708c813747238d9ad1e26e257371e8f6444589ca37b9914338200476e6 SHA512 07c75d5aff5c125046303376f049a9020ce75f2434a19e5d92498e312a2ac4fe3fd2011a52f849fe90d435af5bbc7f2e52702b282044afa4f1715f35fa1aa2ee
+EBUILD java-config-2.3.1.ebuild 977 BLAKE2B 7d64a9145f01bc7d1503b3a298b2bf70c4fe2aeb9b8bc0b6880f3733b664bd2791292bd7aeb1301c825d962c5596e976a3c5aefb25bb3df0d57d5f85ea2245e5 SHA512 cecb6e7434838fdf43c835ea73afd83707ef2dd1820eee5ec9ac1e2c28ffb3d023500a82244d440f5f8a856225fac01b756207d1e1d1bc73db7e80186fff662d
+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/files/java-config-2.2.0-prefix.patch b/dev-java/java-config/files/java-config-2.2.0-prefix.patch
deleted file mode 100644
index 068538a69f91..000000000000
--- a/dev-java/java-config/files/java-config-2.2.0-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Wait for the java team to upstream this patch.
-Bug: 591156
---- /setup.py	2013-02-15 07:12:09.000000000 +0900
-+++ /setup.py.new	2016-08-13 16:38:22.000000000 +0900
-@@ -87,8 +87,8 @@
- 		elif arch in ['hpux']:
- 			defaults = '*= hp-jdk-bin'
- 
--		os.mkdir(self.root + '/usr/share/java-config-2/config/')
--		with open(self.root + '/usr/share/java-config-2/config/jdk-defaults.conf', 'w') as f:
-+		os.mkdir(self.root + eprefix + '/usr/share/java-config-2/config/')
-+		with open(self.root + eprefix + '/usr/share/java-config-2/config/jdk-defaults.conf', 'w') as f:
- 			f.write("# This files contain the default support jdk's\n")
- 			f.write(defaults + "\n")
- 
diff --git a/dev-java/java-config/files/java-config-2.2.0-py38.patch b/dev-java/java-config/files/java-config-2.2.0-py38.patch
deleted file mode 100644
index cb59e1f36be1..000000000000
--- a/dev-java/java-config/files/java-config-2.2.0-py38.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 5e7cc49184e657bd446998f4b08e9106e5215ce5 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Thu, 7 May 2020 02:45:57 -0700
-Subject: [PATCH] replace is with ==
-
----
- src/java-config-2 | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/java-config-2 b/src/java-config-2
-index 8ad2539..84ecd30 100755
---- a/src/java-config-2
-+++ b/src/java-config-2
-@@ -199,7 +199,7 @@ def set_user_vm(option, opt, value, parser):
-     if not vm:
-         fatalError("Could not find a vm matching: %s" % value)
-     else:
--        if os.getuid() is 0:
-+        if os.getuid() == 0:
-             fatalError("The user 'root' should always use the System VM")
-         else:
-             try:
-@@ -227,7 +227,7 @@ def user_classpath_target():
- # Deprecated
- def set_system_classpath(option, opt, value, parser):
-     deprecation_notice()
--    if os.getuid() is 0:
-+    if os.getuid() == 0:
-         pkgs = value.split(',')
-         manager.set_classpath(system_classpath_target(), pkgs)
-         
-@@ -252,7 +252,7 @@ def set_user_classpath(option, opt, value, parser):
- # Deprecated
- def append_system_classpath(option, opt, value, parser):
-     deprecation_notice()
--    if os.getuid() is 0:
-+    if os.getuid() == 0:
-         pkgs = value.split(',')
-         manager.append_classpath(system_classpath_target(), pkgs)
- 
-@@ -277,7 +277,7 @@ def append_user_classpath(option, opt, value, parser):
- # Deprecated
- def clean_system_classpath(option, opt, value, parser):
-     deprecation_notice()
--    if os.getuid() is 0:
-+    if os.getuid() == 0:
-         manager.clean_classpath(system_classpath_target())
-         update_env()
-     else:
--- 
-2.26.2
-
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 8a71761b2180..87732bf9ecf0 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild b/dev-java/java-config/java-config-9999.ebuild
index 8f03a425121d..e60c556878bf 100644
--- a/dev-java/java-config/java-config-2.2.0-r4.ebuild
+++ b/dev-java/java-config/java-config-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # jython depends on java-config, so don't add it or things will break
 PYTHON_COMPAT=( python3_{6,7,8} )
@@ -9,13 +9,19 @@ DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
+if [[ $PV = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
 DESCRIPTION="Java environment configuration query tool"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="https://dev.gentoo.org/~gyakovlev/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -27,11 +33,6 @@ RDEPEND="
 	sys-apps/baselayout-java
 	sys-apps/portage[${PYTHON_USEDEP}]"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.0-prefix.patch
-	"${FILESDIR}"/${PN}-2.2.0-py38.patch
-)
-
 python_install_all() {
 	distutils-r1_python_install_all
 
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index 304ee707b99f..65156130865f 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -3,8 +3,9 @@ AUX javatoolkit-0.3.0-python2.6.patch 413 BLAKE2B 0520b5ee7ebed18e0c3531d99d89a7
 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-9999.ebuild 699 BLAKE2B 77a591ed4a4cae93afac3e9737d272766bf0fa4ed67f89febfed2ab831889a5b9006b4fb7b40bc7c79cf21ba35cdd76e9e888bf1e12a958e648293de4f613a46 SHA512 dda2ad7c044a672e1d3d01cee943cc7c6ada410c7bb4efc9648371bc982e78abf7e28c0b6b06ccbbd6d61dd81756ea942b15b8ff6dde48361c80f1e83bf32802
+EBUILD javatoolkit-0.6.3.ebuild 833 BLAKE2B d9393adbe3a3ee7a6e48c2d8b4520b10a8da54da6bc0ba4b9a41f079417f85b9f1a41b63a37c46a7d4d31e3c20f5756db97b4b1bd0389ebeb9877cd19465fbac SHA512 dc16286fbb22fe7e85437f5accbffed3d909977ba77df8494dd6dcab584a3deb5f41de72f0a90b9f53766dec849ee48b9f9c3b61292f26b6e26cbdecf79fe3f3
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/javatoolkit/javatoolkit-9999.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.3.ebuild
index d0473d8271c7..e43396d777cf 100644
--- a/dev-java/javatoolkit/javatoolkit-9999.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.3.ebuild
@@ -1,30 +1,28 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="xml(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 
-inherit distutils-r1 multilib prefix git-r3
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/javatoolkit.git"
-SRC_URI=""
-KEYWORDS=""
+inherit distutils-r1 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
+		--install-scripts="${EPREFIX}"/usr/libexec/${PN}
 }
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 2ae27c15ffae..5cf3d071e926 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -2,5 +2,5 @@ AUX build-xml-2.patch 1529 BLAKE2B 37aee7dc0ab5b130c16a67b2470e8e3d4052b73c9cc94
 DIST JDOM-2.0.6.tar.gz 8344114 BLAKE2B 0b9a568fe4de1fb9afc5a547d75aa1d3556bf497c76e3d32d1ebd7658634ea02e4fafa3c6261b64d9b803fc6e78ae013fb8a366bcbd5024e8ab0aced83f58e33 SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1
 DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
 EBUILD jdom-1.1.3.ebuild 1246 BLAKE2B 3ef43cd51122845127dce0d1df9dc6917ed9fddcdc33531ce526cd0ed6084594af4af0bb4ab870e14b44a14b5042277dc2337589b94c6bdb984c7cbc5c7aabff SHA512 5d76371202339ad4de3e1562676b075790c76377642ee3dc0e27c508dfd4389d7c9fb5e40c9449fb7b4e1aea1949d78e7324977a2925ea8dd9ac44cbac0f645d
-EBUILD jdom-2.0.6-r4.ebuild 1382 BLAKE2B 3c600a0e572d247b11bd180987000c5b7694bb1b6fc6fe143497e5522f9f4241ad8f94164e4ae49523834122dcbe69e8c0dfffaf7f32b1804e67f8d1fcf62975 SHA512 2db797004eab417c2d8aea1771a36504c8b2c5eeb960efe80e414cd7f2747e8eea1d487be4d3fef21dd82659e87256c3897c3bb9fbc012cdbc89163e8b28386e
+EBUILD jdom-2.0.6-r4.ebuild 1394 BLAKE2B 03c11737d5b00aa8f9ae9117e45803121cbcb078042ff939e6b5a60f0612bc64483c5cf5acd115e34b1920785b52c3fa56466823aa43c4b0feeebcb4a6bf6100 SHA512 3bfaf4d330f8d4499f3ebc2bc241fce36b985cb4a883f518d6e2cfc912f3fe6e15ce449ca5c1d2774a95c3049b2a123f66444ef13df2b3f7cc8d2bd77c664ada
 MISC metadata.xml 318 BLAKE2B cbcc3f9c0ce67aa9619d21197006bffc71f6ae3d0707a5bdd3902a0d51f90724f3ce81e21c80f6a011885cd036f397d2cb679335d05a0e1bf7e4bff3470c9019 SHA512 1587f961d80cba775d94e97a9c41516766d6a502f9b144f401ebcd0ee0b21b2e04220730c03a44986af8bc860a0311acdd6e721d4de201defcbc89599df5803b
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
index 518050c95023..30bbc1c03e90 100644
--- a/dev-java/jdom/jdom-2.0.6-r4.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
 HOMEPAGE="http://www.jdom.org"
 LICENSE="Apache-1.1"
 SLOT="2"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/jgoodies-common/Manifest b/dev-java/jgoodies-common/Manifest
index 1fc7fae1dfa3..226668281137 100644
--- a/dev-java/jgoodies-common/Manifest
+++ b/dev-java/jgoodies-common/Manifest
@@ -1,3 +1,3 @@
 DIST jgoodies-common-1_8_0.zip 575972 BLAKE2B c197f35e495c7f638f9601aa29041271522c8382b97151ea3a4f78a38a17e8dd45d0b6baf8d74bfa0ac3deeefac77c8da3cc8c956495d3443e87461e876e66bc SHA512 c00ffb6498b40b214bccad3ee8f0f3a9231bb8e67243be5ea15956694466485ac75aeed09f340aea323c6989190c10015b7a72b82d5a251bb5ea12ddaedb6b25
-EBUILD jgoodies-common-1.8.0.ebuild 688 BLAKE2B ef68362ebe56fb5b9daa2f4d8081f41425952ca33650b3bb5041c4301a47eb836906673f8849c4637e02cd2d9c55639664439a3beefa69f32e0a0e9a882a3c0e SHA512 c2c9f27c3d8b37fe5bb6679849ba8d8576d9f5b6ab9817b64d09f7a0ce4ca33fd15266dcf7e8dce6d7ead1d86e4e77b8fdf669ed8049be7a13b5743de14218f6
+EBUILD jgoodies-common-1.8.0.ebuild 692 BLAKE2B 0a04152d1a665ca0e78dcf9ed8a4b4692bb29c3f778f71b39c30e41541841cafd504dfdb165b30fe4a4270d1229578b37b5bec02091859055a19ef6c094243f5 SHA512 aec03eefbfeadb1b7756d21555658f0ff905f1e8e83fd66df8d4f2f00ece76d38ea0b4578ea5efc890981a9255c7d22c2f3078ef0e9e6be1c4f5c725954f9185
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild b/dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild
index da63d80e25a4..0c830c5581e9 100644
--- a/dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild
+++ b/dev-java/jgoodies-common/jgoodies-common-1.8.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"
@@ -17,7 +17,7 @@ SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="1.8"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 RESTRICT="test"
diff --git a/dev-java/jgoodies-forms/Manifest b/dev-java/jgoodies-forms/Manifest
index 668e98ab08dc..a898219b4047 100644
--- a/dev-java/jgoodies-forms/Manifest
+++ b/dev-java/jgoodies-forms/Manifest
@@ -1,5 +1,5 @@
 DIST forms-1_3_0.zip 1320397 BLAKE2B a520ffe8a5487d125a53bed8d8524b68f68aaf1444389e4038af5f9a035ce800fdb1a470d172ec442240d5530e4c34cd34a0523a5ab92888daa57f543defd296 SHA512 d155cc85ec77f23f55e59d4651ef1f9df2ab749bc6cffd4dd7cfbc0035587a2e6bf03427e7bace6feb71e6c43efc87115d393fa54ea6da331ded21996b32a6e8
 DIST jgoodies-forms-1_8_0.zip 1668539 BLAKE2B eed78fccd151322737b0f9e5fe39bf7e50f2b4a761b406059af5b62c564f28c44cd4a4efbd5485389d31948b26661aae641066020ed8d460f1c297ef9223be7c SHA512 dced4ddaea7e9157f99b7c27ad06bfed53c307181bfc21cee8f454ba8cececa3f5fd5186947fe5bb299c4de2032bd7489248e3e77623785ac47388306e3d6933
 EBUILD jgoodies-forms-1.3.0-r1.ebuild 791 BLAKE2B 6c598f31f2dc88f67d296e8e0cd9655b7b3efc84bbc161722df6c17a6c57c71e71b258f6ecd83a17d81805ee486cbce1e1b5aba931ae4bc69e21b8c15e094f95 SHA512 09da514783b6a49ac980401305f6dd700c46a5d5a3f381344d70fffaa42a2f9fdc7ebedd2a68f30febd239d0dd02d8486acbb6ab1d97be9f7fd4ebe21af760cc
-EBUILD jgoodies-forms-1.8.0.ebuild 801 BLAKE2B 9fb4a0f91f597cea541f3480bd506e2a1d0bcab23b39be153b357ab4eaf1310b92008ad687ec5cfbb968d68906c160671827f1791980a652b14a00af56b0cf69 SHA512 313407c53c0a99b97d6d1d1fe6a1ff084390f8e1b48720db98f07dc305d7a18ee4f1fb7194ebd32e46d99e8321efcb4c31b2bb3a67d00ac5262848b5376e0a10
+EBUILD jgoodies-forms-1.8.0.ebuild 805 BLAKE2B 7eb489f3c4f95941523bb902838c3071ac9fdf5be72919b73586d3c33463c72138c816e38d3d98d0089d1589190466974289b2990a8199c66e884dee1b8dbecc SHA512 b72ac77b3b9124f3ad25f700653a5839b3820f73604c5727ab0331b6732a26b1d04c08f9ff2da2d139f48440e14e107bfb9a3b1b75c455f6fc0da398472254d9
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jgoodies-forms/jgoodies-forms-1.8.0.ebuild b/dev-java/jgoodies-forms/jgoodies-forms-1.8.0.ebuild
index fc01183201ac..15575fc1f3e3 100644
--- a/dev-java/jgoodies-forms/jgoodies-forms-1.8.0.ebuild
+++ b/dev-java/jgoodies-forms/jgoodies-forms-1.8.0.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"
@@ -17,7 +17,7 @@ SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="1.8"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="dev-java/jgoodies-common:${SLOT}"
diff --git a/dev-java/jmock/Manifest b/dev-java/jmock/Manifest
index 34b4baeabe05..6d40a8ec52f1 100644
--- a/dev-java/jmock/Manifest
+++ b/dev-java/jmock/Manifest
@@ -2,5 +2,5 @@ AUX jmock-1.2.0-AbstractMo.patch 1189 BLAKE2B d10edde92384c86c2cbf9605cffcf25aa0
 DIST jmock-1.2.0-jars.zip 153214 BLAKE2B 2c40696229018406f3b60559013b73b5331c223da6e2743830c4c9b8b728484b1ebed8fb347c240f50f6936c2fd1e4ee85b754315682047a87a14414effc3a48 SHA512 5290f1d14cbc3d0f223bdaf59716b037dbc021c8f39a3784d13af8d8be3edbddc5e2eb4754b80e78ae954daf12889210183e7e11c110012b4d9320344efe19da
 DIST jmock-2.6.1-jars.zip 1249841 BLAKE2B 87861dad7151000e1397a54d0ded7e49c3fd81fca64afd74d6176436f336be5b5e89f73be8c124cf086798f74aef4972303137529113e3c85ba93353f95e3a42 SHA512 7cd1d2e89dceb31c68ad3f702ad937b5de6ec77cc37e94be7aa53db2fc61d11aa40ec5aab225a3eeeba5064ad8384f10413ac05a9df97102c8e63f4209ea149e
 EBUILD jmock-1.2.0-r1.ebuild 982 BLAKE2B 3a54d28e26962d0d42eae18358300b6d4e34a580d1b57969e6e3aba55cd0fb3c3f3752d0b645c736a420ad370e25a826813f929feda25574552b3f22ccabf42c SHA512 794064652eccec3db0b5ba1aa34b3abfc942ae3a8df5b9b415703919f2cfd46915a45736949a9fbbb0c804312e049df3dfe9bc0342a828d2c431e0e689ecb9e2
-EBUILD jmock-2.6.1.ebuild 812 BLAKE2B 3d72677eb23caf056604dc2c799b1344cc38080fad875edbfe87c3e4f6dcb5f94dc7ad6ad8204f58770d1dbfef57061e0a47e84707511d837a71dfbba917d7b2 SHA512 a1cad09703ea22c47a6e898daa43764c708eb2ab400674e7efeb4b0d61451de1d0153495f81d42ccfa23a73ca4884df841f5262a148cf7c284d609874a9624c7
+EBUILD jmock-2.6.1.ebuild 828 BLAKE2B c76836b50142234275461ef7e3801bf2d4e698f63d826496db984dd514234278b6307d49d340e5941ad3cdf00e4a0307c3ca17fef9409344668417fccf345242 SHA512 13a6f4ef2997353cb0761d5da4fc571324cd401375a54fdb629135ae09cfca077d6ba266a681bb1d737ca3c927707bb64dea79599e825095793485b0e51314f7
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jmock/jmock-2.6.1.ebuild b/dev-java/jmock/jmock-2.6.1.ebuild
index 2213fe41255e..750c4115862f 100644
--- a/dev-java/jmock/jmock-2.6.1.ebuild
+++ b/dev-java/jmock/jmock-2.6.1.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
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.jmock.org"
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 CDEPEND="dev-java/hamcrest-core:1.3
diff --git a/dev-java/libg/Manifest b/dev-java/libg/Manifest
index e0ae1ecbf44e..a4108039fffa 100644
--- a/dev-java/libg/Manifest
+++ b/dev-java/libg/Manifest
@@ -1,3 +1,3 @@
 DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e
-EBUILD libg-2.1.0-r1.ebuild 1365 BLAKE2B bc2e2bb471a8b427b3200ef39d6ca363ae0faea4ac55f66bd1742ab6bbddadc528897ab51a8d310a3aadd2b51b72c86769d880f7a3046add50938da0cbb091c3 SHA512 34d78f327d082e95c09cacb764b34391311d76b76aeea147ab1488fd781aa4955bc7d6f6baa09ce364953f2b13f424096fc0658b7a974b4adc88b429213ca829
+EBUILD libg-2.1.0-r1.ebuild 1369 BLAKE2B 7703fc056c22d0c5417a7cdced6851f71836c4fb4bd52e635c40ede56f6aac2c94ad2937d5aa152ab2fd3ae4ba4f2e7e30fe53639cc3ab6e60dcf561872019c1 SHA512 286f20fec71db18023e3301d737bc178cfbb77c7712befb922b09807af6c8137d9aaadf97533bb943b596c5b95ee3bef5f0c4c44694990ed153196b2b6494ad7
 MISC metadata.xml 323 BLAKE2B b7a6a3bf3330da14a229f4b8e178c7f5da2bdab8d7249b92daa4a6d414471b001d21441465852b21f9abbbb6bdff229a8c7dbe162e4ae820d5feccf2684c19f8 SHA512 b9affc0513759478d6db10968d574cc820ac19476a539d27e279884314805f663f0807abd01ce8107154fae445ad3e4fd37f485004130f04aa890c0607f85fcf
diff --git a/dev-java/libg/libg-2.1.0-r1.ebuild b/dev-java/libg/libg-2.1.0-r1.ebuild
index 0595fc1a9fc6..8b7b14cea8d2 100644
--- a/dev-java/libg/libg-2.1.0-r1.ebuild
+++ b/dev-java/libg/libg-2.1.0-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"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> bndlib-${PV
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 # Tests depend on biz.aQute.junit, which depends on biz.aQute.bndlib, which on
 # its own turn again depends on aQute.libg again; we can temporarily assume that
diff --git a/dev-java/netty-tcnative/Manifest b/dev-java/netty-tcnative/Manifest
index d33fb7794347..5e30a7322247 100644
--- a/dev-java/netty-tcnative/Manifest
+++ b/dev-java/netty-tcnative/Manifest
@@ -1,3 +1,5 @@
 DIST netty-tcnative-1.1.33.Fork15.tar.gz 186153 BLAKE2B 3d769a04e659c09aa32059fc2a2eede84f6105469de33ef7d26df436de6a1f6290a6640268934f63f77a969eb6aa024651380cca6dc69099c4016ed61f7d5310 SHA512 592c70a926473a4903b704be920aac1a4fd5a032a8d821a77800b6922b374cb28decf496a65ef62867c027dbac93f0e563e9bb4ecf6659bc70cc33663bb979f5
+DIST netty-tcnative-parent-2.0.31.Final.tar.gz 175283 BLAKE2B 421b8228fb30da7f2983771e3c20e2442ae0c3ef8d12a139a7c01cb43056e916c889294622dbde04443382965750db0195dc667deb34ffcce998ef6381b54eb3 SHA512 0b11d6ec82636e8db09142d345df4b50dbbb7b7a2543f8e4e4d8793205fb22f2f631f454f70b78e93d24a9aeebe55098635c0e9d7a0daf1786b63fe3580aa236
 EBUILD netty-tcnative-1.1.33.15.ebuild 1656 BLAKE2B c077032763915bf88dfb38701a85ccd5d7e38f1827282141dff9f8d10c079e7f3f76f433fcc220eea05985ab1712e6c09f4aaf92b10b24c5e8efaf13ed190732 SHA512 6191cd52dbb0efc90219d1167a5430ecc5afefe22ca21d5376e1c12a1bbc810e31f15b349f3e93d7745b1324a7389cf17adc0149c3d289fcd06f5dbc1d1b2bf6
+EBUILD netty-tcnative-2.0.31.ebuild 1677 BLAKE2B a8ebe60715a25d8b938358fbb24cc64f77cbca8b1bae183095bec9222eddb4ba33747256d3b4684116e51c8421df15a9e6c82e0ac2e5a713d456b3d39a3d329c SHA512 e4e87470af1ec798410fcf0759e18a42040eb1bbfaba41dcca659e5fec5176e8bc2fef06a0b37dd0a1d4f6294977871581dbdff6bad1fc1a21097bc2d8a162a3
 MISC metadata.xml 321 BLAKE2B d5ef2b6901e18ae4fcbb63df20a62edbe59169783a0ae50553194b6e4760b421078ad26fefb1fe38527a71d2e0053b3ee24683e166660cdd2b8ca1d9e1b47d94 SHA512 cafd11002a29f2a3f485ea8c2abc2c338811c0c9e9f6fe416f089d545971b44dbd6490cdbf9c9f3be75fb1fbad56c533d9d3e6141721027545b6e1ae31bdddd5
diff --git a/dev-java/netty-tcnative/netty-tcnative-2.0.31.ebuild b/dev-java/netty-tcnative/netty-tcnative-2.0.31.ebuild
new file mode 100644
index 000000000000..da142b72aac4
--- /dev/null
+++ b/dev-java/netty-tcnative/netty-tcnative-2.0.31.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit autotools java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-parent-${PV}.Final"
+MAVEN_ID="io.netty:netty-tcnative:2.0.31"
+
+DESCRIPTION="Fork of Tomcat Native that incorporates various patches"
+HOMEPAGE="https://netty.io/wiki/forked-tomcat-native.html"
+SRC_URI="https://github.com/netty/netty-tcnative/archive/${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-libs/apr:1=
+	dev-libs/openssl:0="
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8
+	app-arch/unzip
+	dev-java/maven-hawtjni-plugin:0"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+JAVA_SRC_DIR="${S}/openssl-dynamic/src/main/java"
+NATIVE_DIR="${S}/openssl-dynamic/src/main/native-package"
+
+src_prepare() {
+	default
+
+	cd "${NATIVE_DIR}" || die
+	ln -sn ../c src || die
+	ln -sn . project-template || die
+
+	# Provides missing m4 files and Makefile.am template.
+	unzip -n $(java-pkg_getjars --build-only maven-hawtjni-plugin) project-template/\* || die
+
+	sed -i \
+		-e "s:@PROJECT_NAME@:${PN}:g" \
+		-e "s:@PROJECT_NAME_UNDER_SCORE@:${PN//-/_}:g" \
+		-e "s:@PROJECT_SOURCES@:$(echo src/*.c):g" \
+		Makefile.am || die
+
+	# Avoid dummy version and tedious symlink.
+	sed -i "s/-release @VERSION@/-avoid-version/g" configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	cd "${NATIVE_DIR}" || die
+	econf --with-apr=/usr/bin/apr-1-config --with-ssl=/usr
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	emake -C "${NATIVE_DIR}"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_doso "${NATIVE_DIR}"/.libs/lib${PN}.so
+	dodoc README.md
+}
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index f689805341d5..972dab4e3398 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.7_10.tar.gz 190134743 BLAKE2B 294ff3be6e68f14e9c53df04e7c4092a73fc27bfb5e1c35ab686ce6a30c69d0f7e9133815ddfdc0217098af287e1cd50353aaa204d3a813052d7c4375a8b8f1b SHA512 71054ff5c996a2ab4409d06d84900525ddd66e6b68bb2c558f0054343fb5fdc92efb4727ef6d9b91b1359e2b9c719ff3eb224eb1a9c5096753e723f12604535b
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.7_10.tar.gz 178497327 BLAKE2B 59d84c0c09368e4bae499469efb0bc2f1f9c6f518fbcfbf75190e6e06eb4592b9da021b9101c769e6e6bd4c83e88217f177b489103f36f0ba92ba757df216989 SHA512 1ecc0b25295708af3011a5428f811a5c6c14f7edf17f853c7ed286687a3b2f982d4f8b0a45d9c7c24b476ccc60143f5e71c75464fab4d2d8be16c186f1e48341
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz 176497292 BLAKE2B 2bf45400c5d201cb6530d01b234da28078cf3a8e8bb23470a3c698b982ca700828baf653d00cf4aa1933193742474fc81b5df9054f33706545c46733a1ccc79d SHA512 adc40402de81f49fd691c7c07e805f6ee3a4298353417c5e92dd14d791253f4eaafcdb68837d614d7850f82006701b048df04cd6a1d25a16d125a2a38bc277d5
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz 193346198 BLAKE2B 506fc32c3c1ea729e79a044f31bafad995aaf7ac23bda47b21926493aa8d473195067a2d7989b0eafb91d7054222ebd5d924567b1d4b6935be7cff9fd25b1e90 SHA512 fa19880289ce8fa4a72fddd5633cf86a33d9f81346a5a7e51c06d7fc48f1953da01f020d15151d74a624ecc22a9f8f2c8ee4f996a4b3ac2ec79f0fb5207a40f8
-DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u252b09.tar.gz 102238546 BLAKE2B ffa0aec56e4f6fe03cab88e0423e5b1ee24ccbe9eb0bd37d37449c596095d69e7fcb9044c0846a750d3d1a842c2f719d18a28510bd226a8aa9b383e4ae29993b SHA512 a6ef9864cde15e96abcb94f2e72db77f473e609fd162934fc3d35225223a20e20c464e44ce0c022dbf15f6d68d25bf2187271d8643e5cff2894f1839929050ae
-DIST OpenJDK8U-jdk_arm_linux_hotspot_8u252b09.tar.gz 96925784 BLAKE2B 3e294a9a38729e453dd74d691bad4abd043fefd2a850a1d8fa142e5e5c2b908a1c7a0d9f2ebf1760ecf065cb615a59a930c84e86e86a339da01a794f1f3319ed SHA512 a361cb07b43ebaf7d1aa277c15ee41493fb25ff78dcad1801436ef68a54c4a89f2361c3f57ce328c507b9f36c81a301d95d9315d32aa888163d533d7d741effd
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u252b09.tar.gz 99444051 BLAKE2B 87f691298c7335c0adb285db6eff8ecb3897bb7b229bc6491b992375bd63c93eef126702ee461609b3a781240747d3f1372b4ed711a420cca1248878a82a2b6f SHA512 875d0d74088744a0a56a4706cd86a78ef2c5eb1a5792ba94ef2f51bf894a94123e761ab8fa0e5e74272c2f350a881073e4054e9f1c504421f43bb93b837d26a4
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u252b09.tar.gz 102170196 BLAKE2B 529630d67553064d302a81079eb61f10da8fc7fbcb69375020f5572fa4e9a46a679e6b0de99b7f67d9f40305a5347e9337cb6dec1c3cac5576671f52866beb2e SHA512 923a3122aa15db27f1605d1f988efa4a5bc920ad132121ba906f9d4cea11b8bfdcfe5b777ea7f37f5789e0be85135f24f1ddf7cbdff40594336fde7fc0474a6d
-EBUILD openjdk-bin-11.0.7_p10-r1.ebuild 3154 BLAKE2B 0bc992ac9a262043a1e1cd7289ceed6f58d9f64580358e8c8d78cff313cad0d8b8fff602e62743cbb05a3bf33994fd0d70dc43ff45d0b4d6daea14e28d1490ff SHA512 70b4fe98021cbe4dc671b2229c82bbfb05a15acf1bbcfd523335851d4af58970dd2b70f78594c3ff7c47a959b0eb9197585659ce57c1da10ff17bf23f966c6a6
-EBUILD openjdk-bin-8.252_p09.ebuild 2155 BLAKE2B d5832197b20177c54ea2fff0f636695f9755ebac665fb7eb72e2c010bda94d71aef30152ef41ffa6970292a56c73999587c3edee859cea7378da44a4c19417a8 SHA512 798bdc975d8b4073da3ee575b0a17ba929da4da9ccbbcdbbae0ec6fb32aed37f894707a3c16ab51ed3f61a6126d84a03b38ae6f6f988c9dc52e1cf619fc76e66
+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 3154 BLAKE2B 0bc992ac9a262043a1e1cd7289ceed6f58d9f64580358e8c8d78cff313cad0d8b8fff602e62743cbb05a3bf33994fd0d70dc43ff45d0b4d6daea14e28d1490ff SHA512 70b4fe98021cbe4dc671b2229c82bbfb05a15acf1bbcfd523335851d4af58970dd2b70f78594c3ff7c47a959b0eb9197585659ce57c1da10ff17bf23f966c6a6
+EBUILD openjdk-bin-8.265_p01.ebuild 2192 BLAKE2B 11b930ccf8a10ce61709f8b133a45e389e69eb0a2aabfe834ce1139fd0423939f84352cb614d9750e680fe0e83a30198f81d21e3b8344992930793c32b929969 SHA512 261fe03b409acf9dec6e4d3d7a2436f5531ee9897edde3e35e13ed9a7a8032c7ca33ab72b3aab0c9fa7476ac3ebb20dfc8c094c2d20ecb7928a7fab46bbef8aa
 MISC metadata.xml 1025 BLAKE2B d7678bc38651044e8551f51b82f628f6c682cd15305fbe4bc9a9fa9b8f66417e526da18d46ff092d1b82a13a83465d060ef6ffbcfa562ba82bfe6fb9e59de60e SHA512 809731d43dcecd74f45e328780e35ba70b4ae384aea3a28c796a84c6ce2ad8bfc7cf0a6920f150cb4096f61147e9d5326128aeddcc14836752694cf5cdd6e7e0
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.7_p10-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild
index 4ccc0089139d..4ccc0089139d 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.7_p10-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.252_p09.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild
index 31d2a22f51d4..1d7080434ca7 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.252_p09.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.265_p01.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 nsplugin selinux source webstart"
 
@@ -35,6 +35,7 @@ RDEPEND="
 	>=sys-libs/glibc-2.2.5:*
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
+	arm? ( dev-libs/libffi-compat:6 )
 	cups? ( net-print/cups )
 	selinux? ( sec-policy/selinux-java )
 	!headless-awt? (
@@ -43,7 +44,8 @@ RDEPEND="
 		x11-libs/libXi
 		x11-libs/libXrender
 		x11-libs/libXtst
-	)"
+	)
+"
 
 PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
 	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index b4ad32b7cca5..31badb8df4fc 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.7_10.tar.gz 42917723 BLAKE2B c5635b3727e10462396891cab89e257ded57c59f56e9bcb84a3d040ce8a27d7d67d6b78e5f55b63806dd93f6151b767df42e4428d12e763f9722196ca0736a08 SHA512 a776dd9168e3c2635a8492405d58628713e646292d7ee16454681d46866e7ea41afa712227e94ed2e8ce52c727e445f4631db63a02408aa817f1c79af8057dbe
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u252b09.tar.gz 41104123 BLAKE2B 52a9f288054c4a96ed5d70c2c9c6cf14ceb32262ec3a38f547286518ccc14a4695d330adc19e272436c0a7154771cddd9b0672b05beb6d5013c44c69be0ad25a SHA512 b1b0627e8495b11e0ef3e4ecb387d92537bb97b3f3045213658d48b6f2dffa0bc975b1bc92e84c487152b43d1f0ee0449730bf84dd62d98d13354bf73d3a0a20
-EBUILD openjdk-jre-bin-11.0.7_p10-r1.ebuild 2789 BLAKE2B 6268a58c4546fae96623f74b6b1b9a79ab620f281def5be76fd5bf8b9f002624815fde2a4d0a94f4746b3c915ff40024efa7541bfd903b88e9230fe242c89fc2 SHA512 95c655d90572b0fe94c95fa71af5e6623045ef291c2b350c533a6979c464a968c0d03454f72ce37a11ffd191e87dac86f8020c825b9773482821926c0178f4d5
-EBUILD openjdk-jre-bin-8.252_p09.ebuild 1934 BLAKE2B 4886fad419ce981cc39af9c791c00fa4fed1aff50a55fa26c4c607d7be35cfedfd1ad583e8502a01e3edbd568fe3ec32f9897d3e9f110271d4cc5735a654cd89 SHA512 4cca4b3bd3ec8958e8cf0cbe9873b11727d75a92a1edbe174e9d7275b6febe5cf273a4414fdf1b649d48d8c62d7e93a7267f5b78440189d4815634c853da3768
+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 2789 BLAKE2B 6268a58c4546fae96623f74b6b1b9a79ab620f281def5be76fd5bf8b9f002624815fde2a4d0a94f4746b3c915ff40024efa7541bfd903b88e9230fe242c89fc2 SHA512 95c655d90572b0fe94c95fa71af5e6623045ef291c2b350c533a6979c464a968c0d03454f72ce37a11ffd191e87dac86f8020c825b9773482821926c0178f4d5
+EBUILD openjdk-jre-bin-8.265_p01.ebuild 1934 BLAKE2B 4886fad419ce981cc39af9c791c00fa4fed1aff50a55fa26c4c607d7be35cfedfd1ad583e8502a01e3edbd568fe3ec32f9897d3e9f110271d4cc5735a654cd89 SHA512 4cca4b3bd3ec8958e8cf0cbe9873b11727d75a92a1edbe174e9d7275b6febe5cf273a4414fdf1b649d48d8c62d7e93a7267f5b78440189d4815634c853da3768
 MISC metadata.xml 980 BLAKE2B bedd68b0facaa23d89578762fc5fd80dea94a3dce51e8afdd70dde4fb949168694e633564384a506afce44de11f81bc46ad33c324ff2e8e4c37b2fafd246bac3 SHA512 fbf6411ee2bf3f0aa6d7f475a883c7316b87fe20c54ee43200034268a7f57f8454e1aba5ce272645e08ef41dc35e61a4b965543215ed8278c4b8606fdbaf5f00
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.8_p10-r1.ebuild
index 23e7a0fbadc0..23e7a0fbadc0 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10-r1.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.8_p10-r1.ebuild
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.252_p09.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild
index 512f8678a758..512f8678a758 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.252_p09.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index e23805b44f0b..9f86ebbfc1db 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,16 +1,14 @@
-AUX openjdk-11.0.7_p10-sigsegv.patch 2639 BLAKE2B 70750a312fbacabc7e7131d135347864fc1807f397278e614427d1ef7c401c8020aa762bfea996307f24137fab09b44c6d2478e8e4bd548401bc9856a2e74859 SHA512 94babc6fd566f366ad3531b18512c06b6d79003d3692490158f9c2a3f9ed83dfe2ffd472999a3a4f00044ce1c4fa0c950bfb147ede7b9edce758c013820835bc
 AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
-AUX openjdk-8-detect-gcc10.patch 2463 BLAKE2B c7c8f62dfc78894c9808fae2a517b2b45008054bf5a6349b9745da3f30db799280a6751dc532a17e1f0341dcc96fa8512d56bef4d087a54a77920ff1f5d7abac SHA512 660d8e2564cefa24b58923ef21b4691650efeeb555bdc6103995a5c634c7175de3ab019ddb3eb8661d3e4b9de6f6fac1b1d1c8a3fef7ef29a4c86a76c7fdb821
 AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd65c64469b3a49a520686ff8d884c0b3d5dd9017ff4027d2fc1d78d57f062a4cf8910e0bab3ed444cc SHA512 2c65d1875406deabbfadb798501de15850775a4a049f073cdfda684ca1bff4b531b93596ee91a7caf77ff6c377457093f72c7bde4b995bce9ffbc4a8fcceb6dd
-DIST openjdk-11.0.7_p10.tar.bz2 91317054 BLAKE2B 113f6d0b1ea97aa6c3a619a3f4183b72f5e0448422d17b6ffc4d778ce50eee68e4495d610845d1f3aace2e5660703dad96583203c6d12b5528e0f33f78df7cec SHA512 c6776bd05e2cbb42134ccf5cd522e4b73d1662e3cf136a8718c5d302b9c44e76b74a554b81aa14c5deda20bee76abc80a144f5c2e1941b70c9503579c325aa12
-DIST openjdk-8.252_p09.tar.bz2 454656 BLAKE2B 7132af72a09da9ded1759ccf92da6237a24e3fd15209b8d5aecb7011b890cd3484b4724f6b6a144e4bc5cb41931076985f75a9089c178938be62ac1a1d2a7f07 SHA512 0f03f1549dea1577cb01895d4e34721d16443977c5e7b3f0744af9cf2c0b09e60cb6d91b35a5e474c593d518d5610fb4c14fc4b9a907a7e13bb2351cea51bd06
-DIST openjdk-corba-8.252_p09.tar.bz2 1034367 BLAKE2B d281a0b2e092c637adae4a206ac4b3f7beeb65f0fce5862f996ac71a814c5c3ee3261dd1145660cb50fde0398e42ca1e8c86d6aad07e43b44aa1f903c204b21c SHA512 08f348849eeadefee3dce9658b519091a14b9f972a1ee1dc51c37a3cd766e5265faed1931b967410ebff2132dd18cedf8840277d804b402ee43a862e37575ab1
-DIST openjdk-hotspot-8.252_p09.tar.bz2 7954548 BLAKE2B a791d3c3385be3c8543bea1fc8d5bee9b3de873122ec850c3ad0082430083ec9dff2aa7c0cae33e628047a18a76fca8146b68aa52f32845cf7a61a45fdc8d9eb SHA512 53079cc255f75f246a67937bdf2b7715882f9baf8bcbc46ab2963c259359b1008642aeeae7ba7705c39f7a04e69ba286421a83b90294e81071f8e630db48ba7c
-DIST openjdk-jaxp-8.252_p09.tar.bz2 2736174 BLAKE2B c198f144be7d0e7439e2184768db8649973f9e6869e67d3a950abd4872584160f4aaec1f4bec727f0d38830d34a4be7bd2f3e897b8ca10c758212262fa1672c3 SHA512 8027676e2928087a7d396c4f1edd3366336aaf8e3f201e2006cb7ddf91e518c9258d7ab6cc1c4fcc27e3e87bcecd96c55b2550d49f28b98beabf7553ea54ba3f
-DIST openjdk-jaxws-8.252_p09.tar.bz2 2542417 BLAKE2B cf898e0c56269ea1f468c6b9e6cfbdf552caea562f833ade234d207f05be6f39f86d9d6794cc8b365ed3fde4bac5df41949e76cbaef61553f5557ec86dd593e6 SHA512 cadeec8825073db1fea13f1d83903ba2799324cfa8e25012c5dc98ec31976bd91b22526f98fc871d0ee01156943f4fc4ec115f7a81feb10e9f7d96f3f39a9313
-DIST openjdk-jdk-8.252_p09.tar.bz2 47507382 BLAKE2B 4638256df52aa48a1ccace15fe65b284cb2a1e3a3c45f32ae69a807ae4bd9b9ce3cf9f464a9b8a87d07c49f2d7c48c8516b43d9d4372f578ad1cd4dfa17abb80 SHA512 96188acc8078c312c7118abfbc39874429f71e63c2e282fef2da9df29731ee13396bda28a8a1041b17b50da4bb00b1fe88404d682b0a850e5db10e59e39994f2
-DIST openjdk-langtools-8.252_p09.tar.bz2 2399354 BLAKE2B aa3f0cb647986490612b9574fb0c78955f5ffb8969dbd06dfae5406436d6fecdbbb09896bdb0acc18d56f51bcd4ad1eadb19cc544185762ad623a47fde2e4a85 SHA512 d84ff97294ac612cd4e49deb2d7470026a564208c0e1fa23d5692db45efaaf564483966921ce642506a97aa90a2a8593617f944ebc6d18c9db5a808fd3946864
-DIST openjdk-nashorn-8.252_p09.tar.bz2 2852104 BLAKE2B 570fbe605ed27c4b3a5db5f6e9dbb4269ad2c895654a989d366a4a6f238ea06fec398140563ca2700303856dfa795ae40dbf9485dd9e9a46ef438f5418fd8b8b SHA512 996e7068d8c6f8ca192e6037eaf7f98ff94188c02670caadf1042e4e0909a3d51835a8cd2250d1f0a8bbdedb107f3713b614466ba4d2915b955e19fdcc2cbb91
-EBUILD openjdk-11.0.7_p10.ebuild 7832 BLAKE2B 6dd4fe2d18646f941320729eb2e013e4607b838f86a5d944e238064ad69e7b5417e7c523baeb3d786d20b76d93ab6c42f129f55aba29d0121cd866bf79369b15 SHA512 1e64f61d8623de658e52c861ba2c663155cb4f8ad6c1f8505ed7b3820f16db533f4ffa5f0d2124ca9d2c1c60e458aaad9ea7234843667f177e0f69fd9563a61f
-EBUILD openjdk-8.252_p09.ebuild 6128 BLAKE2B bf07a7e457673ce56ab493cf36701357c0301ef0053488cce5f4f70730f9c19bbe6a793e74ada978c67fb9583b68364903a5b6aa8b3ebb61572a20e372e9460c SHA512 92aaa45aba9d64b5fac22a0d27f59ef249a9e98f043daf4f171396866d3816e6a39811f14663c6d92c24dc80e4633a3f9edc3386fd7d72eae3e24ab4b8766528
+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-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 7785 BLAKE2B c777da7f26aa85dad821799fd32523e958d6e4f525f299dd49854892bbb4a01329d3a77ebfb60f0b12f006f0b0c1d34a553d5c6eceeb0ae8a9d8a1d52e524bd4 SHA512 89413c17eb82991b3b597e74b6097e3ffaaef5a7f18326a18188b2df7bd416055b094f91135ac9e1efb400432dd331a1565aefd993a47dd7f92ea1fcc048f044
+EBUILD openjdk-8.265_p01.ebuild 6044 BLAKE2B ef734afa0c13e6ce7fe43ab981466d0acb5816e561c1415539da2c911069cca62b327ff8e5d2e7d71f6056cfb17a8171965b0dea4602fe531520a21e31e791f9 SHA512 2cdb07b134decd2a17d0e316f1987e3b957ec80e1fd2b4a49a1785b208144477b4639b76211a4804d9ca05e30ca8a37005cc56deb3b5f56637aed6f6fea61c45
 MISC metadata.xml 1398 BLAKE2B 7b99e080f6dc261c94314c7f7a0314ee25b48752ca494dd23d1534c5e8e3f930601262a0316ed674786c5fd960dfbc25dd6c6768cd06325ef45c0b41f920eafc SHA512 1747f484c6f784cb551f0969aab9ca1e6c42509c06b6187b72f3e16861ce3e2e71e131deb1ae6ebe2eda1c768276794cd5a0db7918eb419b9502a3c45bf78959
diff --git a/dev-java/openjdk/files/openjdk-11.0.7_p10-sigsegv.patch b/dev-java/openjdk/files/openjdk-11.0.7_p10-sigsegv.patch
deleted file mode 100644
index 04c61c06589e..000000000000
--- a/dev-java/openjdk/files/openjdk-11.0.7_p10-sigsegv.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-
-# HG changeset patch
-# User ccheung
-# Date 1564075552 25200
-# Node ID f1332f6025515e4fc9e42fbf79f983d782abaaf0
-# Parent  966fc6d784a737ec25cd0b1be48109a4a3fa02ad
-8228407: JVM crashes with shared archive file mismatch
-Summary: Stop processing other header fields if initial header check has failed.
-Reviewed-by: dholmes, jiangli
-
-diff -r 966fc6d784a7 -r f1332f602551 src/hotspot/share/memory/filemap.cpp
---- a/src/hotspot/share/memory/filemap.cpp	Mon Mar 02 12:30:59 2020 +0100
-+++ b/src/hotspot/share/memory/filemap.cpp	Thu Jul 25 10:25:52 2019 -0700
-@@ -1287,7 +1287,9 @@
-   }
- 
-   init_from_file(_fd);
--  if (!validate_header()) {
-+  // UseSharedSpaces could be disabled if the checking of some of the header fields in
-+  // init_from_file has failed.
-+  if (!UseSharedSpaces || !validate_header()) {
-     return false;
-   }
-   return true;
-diff -r 966fc6d784a7 -r f1332f602551 test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java
---- a/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java	Mon Mar 02 12:30:59 2020 +0100
-+++ b/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java	Thu Jul 25 10:25:52 2019 -0700
-@@ -385,8 +385,16 @@
-         output.shouldNotContain("Checksum verification failed");
- 
-         copyFile(orgJsaFile, jsa);
-+        // modify _jvm_ident and run with -Xshare:auto
-+        System.out.println("\n2b. Corrupt _jvm_ident run with -Xshare:auto\n");
-+        modifyJvmIdent();
-+        output = TestCommon.execAuto(execArgs);
-+        output.shouldContain("The shared archive file was created by a different version or build of HotSpot");
-+        output.shouldContain("Hello World");
-+
-+        copyFile(orgJsaFile, jsa);
-         // modify _magic and _paths_misc_info_size, test should fail
--        System.out.println("\n2b. Corrupt _magic and _paths_misc_info_size, should fail\n");
-+        System.out.println("\n2c. Corrupt _magic and _paths_misc_info_size, should fail\n");
-         modifyHeaderIntField(offset_magic, 0x00000000);
-         modifyHeaderIntField(offset_paths_misc_info_size, Integer.MAX_VALUE);
-         output = TestCommon.execCommon(execArgs);
-@@ -395,7 +403,7 @@
- 
-         copyFile(orgJsaFile, jsa);
-         // modify _version and _paths_misc_info_size, test should fail
--        System.out.println("\n2c. Corrupt _version and _paths_misc_info_size, should fail\n");
-+        System.out.println("\n2d. Corrupt _version and _paths_misc_info_size, should fail\n");
-         modifyHeaderIntField(offset_version, 0x00000000);
-         modifyHeaderIntField(offset_paths_misc_info_size, Integer.MAX_VALUE);
-         output = TestCommon.execCommon(execArgs);
-
diff --git a/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch b/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch
deleted file mode 100644
index b47e012d4a39..000000000000
--- a/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 6d96aaac5662f734b0a933397ebb8cd4ff66606d Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Sat, 23 May 2020 20:48:10 -0700
-Subject: [PATCH] backport gcc10 fix
-
-https://hg.openjdk.java.net/jdk8u/jdk8u/rev/39a7914e14a0
----
- common/autoconf/generated-configure.sh | 4 ++--
- common/autoconf/toolchain.m4           | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
-index 5e71c50..90c017d 100644
---- a/common/autoconf/generated-configure.sh
-+++ b/common/autoconf/generated-configure.sh
-@@ -27955,7 +27955,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO
-     COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
-         $SED -e 's/ *Copyright .*//'`
-     COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
--        $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'`
-+        $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'`
-   elif test  "x$TOOLCHAIN_TYPE" = xclang; then
-     # clang --version output typically looks like
-     #    Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
-@@ -29696,7 +29696,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO
-     COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
-         $SED -e 's/ *Copyright .*//'`
-     COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
--        $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'`
-+        $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'`
-   elif test  "x$TOOLCHAIN_TYPE" = xclang; then
-     # clang --version output typically looks like
-     #    Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
-diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
-index e3a82c8..c0a4af5 100644
---- a/common/autoconf/toolchain.m4
-+++ b/common/autoconf/toolchain.m4
-@@ -433,7 +433,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
-     COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
-         $SED -e 's/ *Copyright .*//'`
-     COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
--        $SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\) .*$/\1/'`
-+        $SED -e 's/^.* \(@<:@1-9@:>@@<:@0-9@:>@*\.@<:@0-9.@:>@*\) .*$/\1/'`
-   elif test  "x$TOOLCHAIN_TYPE" = xclang; then
-     # clang --version output typically looks like
-     #    Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
--- 
-2.26.2
-
diff --git a/dev-java/openjdk/openjdk-11.0.7_p10.ebuild b/dev-java/openjdk/openjdk-11.0.8_p10.ebuild
index b5d448dd9e84..35a2c27c3f85 100644
--- a/dev-java/openjdk/openjdk-11.0.7_p10.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.8_p10.ebuild
@@ -77,10 +77,6 @@ REQUIRED_USE="javafx? ( alsa !headless-awt )"
 
 S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-sigsegv.patch"
-)
-
 # The space required to build varies wildly depending on USE flags,
 # ranging from 2GB to 16GB. This function is certainly not exact but
 # should be close enough to be useful.
diff --git a/dev-java/openjdk/openjdk-8.252_p09.ebuild b/dev-java/openjdk/openjdk-8.265_p01.ebuild
index 45c3e3cc90ca..d88de6a02a77 100644
--- a/dev-java/openjdk/openjdk-8.252_p09.ebuild
+++ b/dev-java/openjdk/openjdk-8.265_p01.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="alsa debug cups doc examples headless-awt +jbootstrap nsplugin +pch selinux source webstart"
 
 COMMON_DEPEND="
@@ -80,11 +80,6 @@ PDEPEND="
 
 S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
 
-# bug 721970, JDK-8244760
-PATCHES=(
-	"${FILESDIR}/openjdk-8-detect-gcc10.patch"
-)
-
 # The space required to build varies wildly depending on USE flags,
 # ranging from 2GB to 16GB. This function is certainly not exact but
 # should be close enough to be useful.
diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
index 9c7bda6bae97..3dd98b603f18 100644
--- a/dev-java/openjfx/Manifest
+++ b/dev-java/openjfx/Manifest
@@ -1,3 +1,4 @@
+AUX 11/11.0.9_p0-version.patch 691 BLAKE2B 33cfcd3c615e9dec14e2df985b48dc85b895d12ff127ffc3df08b670ad1bcc3790efec63c68b639288c44f7cf5da8dcb2de72195df24c049692df109b20e42ac SHA512 472bb5debb929d4191b2dc2bd0b2e2370f3c93671e581fe42616e4ed6fc3e4a34638a90f04ed756acb5e10d404694267cd861ecf698c7c926cd4c6fe6d6fe8ba
 AUX 11/disable-buildSrc-tests.patch 534 BLAKE2B d1cb4da89602fa9a48e5509586d1909d10b9d62e167bdd4d57b9615f2896704dd0ee925d14a86753bf53182f85fc9c21f195c3f044a0c6d38c960ee4f5494332 SHA512 ffbc3d671cea448ffddd8d92e4a4031a941008c067d5a7acb358fb82ed217c9388ef1916aa04cf4693ff2a83e0bdcf3fc5bdc919196a6231d57c8341e44ddede
 AUX 11/glibc-compatibility.patch 547 BLAKE2B e63e83d708765dc7ad5013ff3a5bf0885fa426290e4fa164684739c15e7c15652c41256b98e9720c35682193086ec19c0225dd202fabc9bd9c9f99fb0fd6d5ff SHA512 abb08198b94e38fe8fb16229f506e2cad78869ed9c4fcabe22490a87884b1851373ee4a92ae4d7dbecaf3fc9a784911d932fad2457b0611a102e63a983113981
 AUX 11/respect-user-cflags.patch 8609 BLAKE2B 865e8c2b10cc24c7ce45a4d6b039a1e852902f702fee06102273565f22ed870391f5f072c59db51fa48077516a8072b41252fdce961cde20581d8f520eb67afe SHA512 ab77752add6fe7b708d7e7eb94cad722b6016d50bc3ba40505107db0e70e642dfd7d48550cba344ee2e88bf2ea7f55d58140f5eeb7b025c112b87be0ce71e74c
@@ -12,6 +13,8 @@ DIST lucene-grouping-7.1.0.jar 87200 BLAKE2B 93f4ca6938b3fbc74752e22ee9d53022a60
 DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b967243289d9bded5e9768cb441a35fabbe63641d00b72a8c14aace0bad402df49c21b853f620bf81bc1e829dcecdb SHA512 34df5eccf0577ed037ef347adc9c2552c49d57e35dbff629fdbb860926765be48f8b06fd693bdacfc2edcd9c6ad711c13fe98e5317cb1d1f2157dcab938e34ea
 DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68
 DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500
-DIST openjfx-11.0.7_p1.tar.bz2 64302415 BLAKE2B 1a0705b5a668025dd73cc92af35b9e33d698adb1130dace1c079e20f6f6a848517102fe28f7e5e62a141fdfbd6f8086e9a2bb96573a597245d935e5d80918c4c SHA512 ff2b0af1d4b18963bd8ce26c20ab1def268fec8e6030732336edec3aedf58f8bdc25b61b3cd1d70c7d814a3ee96413965f26fba2426c083338c62d8483e93564
-EBUILD openjfx-11.0.7_p1.ebuild 6464 BLAKE2B a9f744e7110f9ba603be95bece2ed38c7ade228aebf0ce08717e53c05fd416ac565b35b3186fadc7e953b6d354c41e4cf039784c0937c4946aa60d8e51a5ee4e SHA512 896d9ce23679f4649bdec58e40682393e508bdafb265728cb318d52443351342dc0be79a8c20d5164d40032c80b4ee2779b2def73be2a22f097e77bae4c3506b
+DIST openjfx-11.0.8_p2.tar.bz2 64151301 BLAKE2B 045dcfa35c52fe6f293713420147dd1a69b1851c8e1a1d09f0be1e0237d510e8d7b67d8c0ad36bcf23e1504a540c905a95c706faf0919da4de5005f3046e6cce SHA512 d693e1f4215e9ba42b3241f50581dbc3e7a3e6bf8ccda6f3c43c6a976389d321e6ca3d393138b62f6defd240b9d1aaef7ab26083520ed404d0d439ac9478341d
+DIST openjfx-11.0.9_p0.tar.bz2 64148934 BLAKE2B 317fb1c9ea99816ecbd8ab64ed3a6ad0aaa319bedd17bf71ee192c5e610fea14611f3938302f1caf666980bcc7d4787f770e36aec1884a73dac3ddba8e1a878f SHA512 8b6d339131f096b4490d7a8c4a20c15362b4f6c6aa4ddd74f610f3b5a8b8c7aac3ab123dcdd5488cc37dc38f1536ce1db95286f4233ee4db1845d1bd560b2236
+EBUILD openjfx-11.0.8_p2.ebuild 6464 BLAKE2B a9f744e7110f9ba603be95bece2ed38c7ade228aebf0ce08717e53c05fd416ac565b35b3186fadc7e953b6d354c41e4cf039784c0937c4946aa60d8e51a5ee4e SHA512 896d9ce23679f4649bdec58e40682393e508bdafb265728cb318d52443351342dc0be79a8c20d5164d40032c80b4ee2779b2def73be2a22f097e77bae4c3506b
+EBUILD openjfx-11.0.9_p0.ebuild 6502 BLAKE2B b64405041784dc2a1eaeca4ff789259378bd11428182aaa719d1def547194445b1c2e22efa20ba63546df7730b677319bd63e344a803e37c0cf7a22953682934 SHA512 b6b0f5a5b2829bd061f2f127be0489ced00fe0caf5e6ef40a7110ef3e1d2394e5ffcff95d6851ce84188375c5d152e327d40159e0c54670fbb7b8ab9eb59b852
 MISC metadata.xml 678 BLAKE2B 2b7537a59f3d6cb5b465322c68d374e664291178dad94a527a625243c1abe5846b3d0e066e9a715ccf8d5b12a9a58c46c58d00b13881265973e20a29c4f5b720 SHA512 889ad3984e64acb24e01041d98c1f9273d02256bf89810c8e84607911ba35bcac239fdc8341e839b91d7af999e575d06249d87a64c78a3684f63ad5a3003bd8d
diff --git a/dev-java/openjfx/files/11/11.0.9_p0-version.patch b/dev-java/openjfx/files/11/11.0.9_p0-version.patch
new file mode 100644
index 000000000000..fbcbb3890499
--- /dev/null
+++ b/dev-java/openjfx/files/11/11.0.9_p0-version.patch
@@ -0,0 +1,22 @@
+
+# HG changeset patch
+# User jvos
+# Date 1597927682 -7200
+# Node ID c0fe72db97a8924c906e4237881aa3c1d5669d19
+# Parent  38425dc30b9a25d52fbb0548ea1b0d098888aaed
+8252067: Change JavaFX release version in 11-dev to 11.0.9
+Reviewed-by: kcr
+
+diff -r 38425dc30b9a -r c0fe72db97a8 build.properties
+--- a/build.properties	Thu Aug 20 10:24:03 2020 +0200
++++ b/build.properties	Thu Aug 20 14:48:02 2020 +0200
+@@ -41,7 +41,7 @@
+ # UPDATE THE FOLLOWING VALUES FOR A NEW RELEASE
+ jfx.release.major.version=11
+ jfx.release.minor.version=0
+-jfx.release.security.version=8
++jfx.release.security.version=9
+ jfx.release.patch.version=0
+ 
+ # Note: The release version is now calculated in build.gradle as the
+
diff --git a/dev-java/openjfx/openjfx-11.0.7_p1.ebuild b/dev-java/openjfx/openjfx-11.0.8_p2.ebuild
index 5f211eba215c..5f211eba215c 100644
--- a/dev-java/openjfx/openjfx-11.0.7_p1.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.8_p2.ebuild
diff --git a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild
new file mode 100644
index 000000000000..be554f4fb9cf
--- /dev/null
+++ b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild
@@ -0,0 +1,223 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_p/+}"
+SLOT="${MY_PV%%[.+]*}"
+EGRADLE_VER="4.8"
+
+inherit flag-o-matic java-pkg-2 multiprocessing
+
+DESCRIPTION="Java OpenJFX client application platform"
+HOMEPAGE="https://openjfx.io"
+
+SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
+	https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar
+	https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar
+	https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="-* ~amd64"
+
+IUSE="cpu_flags_x86_sse2 debug doc source +media"
+
+RDEPEND="
+	dev-java/swt:4.10[cairo,opengl]
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	media-libs/freetype:2
+	media-libs/fontconfig:1.0
+	media-video/ffmpeg:0=
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/cairo[glib]
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	x11-libs/pango
+	virtual/jpeg
+	virtual/opengl
+	|| (
+		dev-java/openjdk-bin:${SLOT}[doc?]
+		dev-java/openjdk:${SLOT}[doc?]
+	)
+"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/zip
+	>=dev-java/ant-core-1.10.7-r1:0
+	dev-java/antlr:0
+	dev-java/antlr:3.5
+	dev-java/hamcrest-core:0
+	dev-java/stringtemplate:0
+	virtual/ttf-fonts
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="cpu_flags_x86_sse2"
+
+PATCHES=(
+	"${FILESDIR}"/11/disable-buildSrc-tests.patch
+	"${FILESDIR}"/11/glibc-compatibility.patch
+	"${FILESDIR}"/11/respect-user-cflags.patch
+	"${FILESDIR}"/11/use-system-swt-jar.patch
+	"${FILESDIR}"/11/wno-error.patch
+	"${FILESDIR}/11/${PV}-version.patch"
+)
+
+S="${WORKDIR}/rt-${MY_PV}"
+
+egradle() {
+	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
+	local gradle="${GRADLE_HOME}/bin/gradle"
+	local gradle_args=(
+		--info
+		--stacktrace
+		--no-build-cache
+		--no-daemon
+		--offline
+		--gradle-user-home "${T}/gradle_user_home"
+		--project-cache-dir "${T}/gradle_project_cache"
+	)
+
+	export GRADLE_HOME
+
+	# FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist
+	unset ANT_HOME
+
+	einfo "gradle "${gradle_args[@]}" ${@}"
+	# TERM needed, otherwise gradle may fail on terms it does not know about
+	TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
+}
+
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
+	JAVA_PKG_WANT_SOURCE="${SLOT}"
+	JAVA_PKG_WANT_TARGET="${SLOT}"
+
+	# The nastiness below is necessary while the gentoo-vm USE flag is
+	# masked. First we call java-pkg-2_pkg_setup if it looks like the
+	# flag was unmasked against one of the possible build VMs. If not,
+	# we try finding one of them in their expected locations. This would
+	# have been slightly less messy if openjdk-bin had been installed to
+	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
+	# file but disable it so that it would not normally be selectable.
+
+	local vm
+	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+			java-pkg-2_pkg_setup
+			return
+		fi
+	done
+
+	if has_version --host-root dev-java/openjdk:${SLOT}; then
+		export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
+		export JDK_HOME="${JAVA_HOME}"
+		export ANT_RESPECT_JAVA_HOME=ture
+
+	else
+		if [[ ${MERGE_TYPE} != "binary" ]]; then
+			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+			JDK_HOME=${JDK_HOME#*/}
+			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+			export JDK_HOME
+			export JAVA_HOME="${JDK_HOME}"
+			export ANT_RESPECT_JAVA_HOME=ture
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack "${P}.tar.bz2"
+	unpack "gradle-${EGRADLE_VER}-bin.zip"
+
+	mkdir "${T}/jars" || die
+
+	local line jar
+	for line in ${SRC_URI}; do
+		if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then
+			jar=$(basename "${BASH_REMATCH[-1]}")
+			cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die
+		fi
+	done
+}
+
+src_prepare() {
+	default
+
+	local d="${T}/jars"
+
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core
+
+	sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die
+}
+
+src_configure() {
+	append-flags -Wno-error -fcommon
+
+	#FIXME: still calls gcc, pkg-config etc by name without chost prefix
+	#FIXME: should we enable webkit? doubt so
+
+	# build is very sensetive to doc presense, take extra steps
+	if use doc; then
+		local jdk_doc
+		if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then
+			jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api"
+		elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then
+			jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api"
+		fi
+		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
+	fi
+
+	cat <<- _EOF_ > "${S}"/gradle.properties
+		COMPILE_TARGETS = linux
+		COMPILE_WEBKIT = false
+		COMPILE_MEDIA = $(usex media true false)
+		JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api
+		JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "")
+		BUILD_LIBAV_STUBS = false
+		GRADLE_VERSION_CHECK = false
+		LINT = none
+		CONF = $(usex debug DebugNative Release)
+		NUM_COMPILE_THREADS = $(makeopts_jobs)
+		JFX_DEPS_URL = ${T}/jars
+		COMPANY_NAME = "Gentoo"
+	_EOF_
+}
+
+src_compile() {
+	egradle zips $(usex doc "" "--exclude-task javadoc")
+}
+
+src_install() {
+	if ! use source ; then
+		rm -v build/sdk/lib/src.zip || die
+	fi
+
+	insinto "/usr/$(get_libdir)/${PN}-${SLOT}"
+	doins -r build/sdk/.
+	doins build/javafx-exports.zip
+
+	if use doc; then
+		docinto html
+		dodoc -r build/javadoc/.
+		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+	fi
+}
diff --git a/dev-java/osgi-compendium/Manifest b/dev-java/osgi-compendium/Manifest
index e4857e4fcb61..7dc05e509d59 100644
--- a/dev-java/osgi-compendium/Manifest
+++ b/dev-java/osgi-compendium/Manifest
@@ -1,3 +1,3 @@
 DIST osgi.cmpn-4.3.1.jar 741615 BLAKE2B 6f6058c07fd7744f0369d05cdf607b4d4fe51bbdf567c6a6c951413b0627eb1dbb6e56f65641a8472198d0aedca378da4715c26ebe05aa4e7ef80adb1020175f SHA512 803e929b4b7cfee13a3ffa2c60ad03775afd8409c972bf26e3f79abc590466c2d885bdc339d9af2a3e8fda9cdf082d23a298362ac37935b0ede0719dee27e9f9
-EBUILD osgi-compendium-4.3.1.ebuild 837 BLAKE2B b0f26321ea27ff14f1c4929475305f89a45a9700a458a0c882407dcd2f9ca84fd00a94b218c401b483aa0103f3becac36b7248a1619b9cf21cfc1ac2e0a7a193 SHA512 cff2849dc1d4c9c853b47b28c5b7f0056f0ba94f518a72cf3b7d5f6be3d9cc6b18c4033c7efc5d13c753f9da82de305e4c98b8a15774f8ae0e2426d0611f36df
+EBUILD osgi-compendium-4.3.1.ebuild 841 BLAKE2B 8e4ac270b156bd54e69922653f8da7921244657e069a028bd005e8087522ac41b180e14f7cc20244d1d5aea8ba0f61b659e9f5c71ccd31f1671dce3dc11e5757 SHA512 20dbe33a8c648312bec5474dcd571400f545b98c197df0936ba7d5a0896f8faaa1b2756cdfe96df2c55f8630c99b31731e231b64e870f30e6fa7cb6d3d1b5d51
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild b/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild
index 29c598b6ed44..058539ddac15 100644
--- a/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild
+++ b/dev-java/osgi-compendium/osgi-compendium-4.3.1.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"
@@ -13,7 +13,7 @@ SRC_URI="https://osgi.org/download/r4v43/osgi.cmpn-${PV}.jar"
 
 LICENSE="Apache-2.0 OSGi-Specification-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 CDEPEND="dev-java/glassfish-persistence:0
 	dev-java/osgi-core-api:0
diff --git a/dev-java/osgi-core-api/Manifest b/dev-java/osgi-core-api/Manifest
index 6a6f1fbd772d..c99548631cb4 100644
--- a/dev-java/osgi-core-api/Manifest
+++ b/dev-java/osgi-core-api/Manifest
@@ -1,3 +1,3 @@
 DIST osgi.core-5.0.0.jar 418232 BLAKE2B d7cfb8b2c6ff955ffc8252f248eb7bec562d16598e1a56fb50f12c099adae8b5268bc26003e166794eaee8fa6cb116ce388eb1981ef5a09394c05b7ea8655f0d SHA512 de7c5aa327a4361b81d953951488b84071e525cfd3e50f0334450b8c1b25733248de9459239ee7091f8961ac8b047a0492d692fb7cd408a0ec07df090ea9e2c3
-EBUILD osgi-core-api-5.0.0-r1.ebuild 573 BLAKE2B 3dda6dddda39e67478de66c50274bc8b4edfcb7b0be2927187e3da2aaaff9945f31e11e9bf0dfbcf213e8d411e2a4d368d27d8f62f5ef14fd42ca39e7397c29f SHA512 8dffdca34200090664cc8d0134bf6d852cc8245102c2bca7bc298f0282451e1f567da54492493e06919f1e3e1f1b7a7331698b7d866aae702082d554392f3a89
+EBUILD osgi-core-api-5.0.0-r1.ebuild 580 BLAKE2B 0a4938075d4317681763c0527211e81c1974c44fbdbd8b54aea169523a1320890ec75b26f1d707344e1f75a15358c2497df255d692897d337dbaab1e058125f5 SHA512 4f9043052ce2a2508dd630b0e132195b2068055cc8dd1cb481fa5e8c5aaa1047007302f04c153dbae97cd3cf78d4f5e0b1640275ca6e6ffd511aded5299a99cd
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild
index 4ba35b58ab77..b6dbedd21ac1 100644
--- a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild
+++ b/dev-java/osgi-core-api/osgi-core-api-5.0.0-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
@@ -13,7 +13,7 @@ SRC_URI="http://www.osgi.org/download/r5/osgi.core-${PV}.jar"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/osgi-enterprise-api/Manifest b/dev-java/osgi-enterprise-api/Manifest
index b5c9d01d1318..67365f2899bc 100644
--- a/dev-java/osgi-enterprise-api/Manifest
+++ b/dev-java/osgi-enterprise-api/Manifest
@@ -1,3 +1,3 @@
 DIST osgi.enterprise-5.0.0.jar 479506 BLAKE2B 2bd53b50e469388d132a6d3ebd78d4040093f8c1d79299fd87412853d959f7559f04287567eeea47635fe287a3e9d3812ac9303a5d39ec35135ab3c58bd0b010 SHA512 0404c05afd8cb3ef8b826b0f08deeb03b0027ca99e091953d39ef69674809c5b899e0f2c8efb685df5fce070c2aafcf813e470fbb538d4ec3b480a8060351144
-EBUILD osgi-enterprise-api-5.0.0.ebuild 1045 BLAKE2B a78f0809cfc055eeb5b04122be3f26bc7a9e6bc2237ff7c421731b8fc643430a0adbb699215d670d7d5530272a53e8f551b1f9037b652ec39a2d69893a054b96 SHA512 c72d78a9262839e70109ff7a893864467261e711a66e7343d354078fc30d015cc71d9e933a5bdbb7df19046ef00c9161b65f2d869cbadfaf839a06e14a020041
+EBUILD osgi-enterprise-api-5.0.0.ebuild 1049 BLAKE2B ed9e90dffd1612cd2015b29d96eee846edb4ede516c12beedd2083bc98e4a1c7c847126fc52b28ad8ba2a32a3c67975ef726d5b4382f847897fea61e91836acf SHA512 1631e3fd424c3ab264b0c7921eea60ff53ea8b0ae2f1dd908b6ad513671e81945093089a5c3a18da5bc1fa558affd7fbf38e959bd19ec5ac1f3b7a80897db3e6
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild
index 5ef88db0e2f5..54d3162af6cd 100644
--- a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild
+++ b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.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"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.osgi.org/Main/HomePage"
 
 LICENSE="Apache-2.0 OSGi-Specification-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 RESTRICT="bindist fetch"
 
diff --git a/dev-java/osgi-foundation/Manifest b/dev-java/osgi-foundation/Manifest
index 9f91bdc42101..f8b5c84d94ad 100644
--- a/dev-java/osgi-foundation/Manifest
+++ b/dev-java/osgi-foundation/Manifest
@@ -1,4 +1,4 @@
 AUX osgi-foundation-1.2.0-build.xml 9886 BLAKE2B aacff8e000b02c742ee7e5d03d2c057b6baf56bce9cc1b9cd0031c39550e9ef07bcf85a7d89dd265cc523d638063e425b1553f146b5ce6af107440b1e0d61d43 SHA512 5f106bd612a65033e35beb4fb635d07199e10b69e692db5949424ecf7a8baf2bd6af0f35898bd465334356333d82d5c4941ef6ce7ce16c3939f425f4e58c6fcc
 DIST osgi-foundation-1.2.0.tar.xz 45176 BLAKE2B 4b5432dfaad9134f402b5f448a8d7ba5f626a7b160bbc953914352a28f745725da851b6c5f2122f820b52f2fd8ad463c2df5c8ae3e2b46ef8bb9d56d89d90f1b SHA512 6523dd6b4cd8205aa3359fae4640ff6b17a1944aec6bf23acf0d6e4eb33839a9b9049e8df0c55a4f35013b40b1df2391a53ed68df682a317c35dca504e9b996b
-EBUILD osgi-foundation-1.2.0-r1.ebuild 634 BLAKE2B 58f8045c4130ae1045c157dcc91ee1455c6f0ef55ad381e8b8da66a6a185e7b21ac3f9eb46990e1fbb755c8497f044f961bde92aa73ca4da6ce8ec6b697d4029 SHA512 1d19329f42a1dd4be69e250c31c7eea04facc05e03d1fe6a96ad5de43eeb2433fc5c82115c2b19818b6a4e063856c15143302fd0546ab8bc5b0ce95b5b2e3f2c
+EBUILD osgi-foundation-1.2.0-r1.ebuild 638 BLAKE2B ee50d921757639f377331bc2fe39b08d4580bd2aafe556088576b2924a8f825418974f9ae2052e747300627fad3cc0c544d6cc4bc1eb79ede9dbe2a781d13f53 SHA512 c1c038eebe4686d90d2745bdfb23d813d1c4fe4f20b1cc4497ecb1e66f85baaadf99f33d2bb8fb8776bc1656245861d83b30f1f19ab2a9bda693ad3808a6a766
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild b/dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild
index de894898fc85..ee652a6205c6 100644
--- a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild
+++ b/dev-java/osgi-foundation/osgi-foundation-1.2.0-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"
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
 
 LICENSE="Apache-2.0 OSGi-Specification-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index edc59395ab55..ebaecdaea6a0 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,6 +1,8 @@
 DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
 DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
+DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
 EBUILD protobuf-java-3.10.1.ebuild 1406 BLAKE2B 2f8480fbaabbe978827ccc7ad5705dc0d84b7e399cb2e6bd8fc71ed913c1aeb8539de5d3dcecc2f0675090d9697fca3992002498e4600e0fc99ec277d29a0a77 SHA512 fcfdf674f13bf0ed963066b720c584a10f815e1c9f849448f7ab47b8530240036636f324598e8f9a2aed2076ff95312fca96da416a3a24b3a3ee4a537dfcb475
 EBUILD protobuf-java-3.11.4.ebuild 1406 BLAKE2B e340b1b5f90c401c29928ec99e4214f1f59dc20e759004af30dcde4d1666879b6399addd932dda56311c3e1aae258e4f7708edb4ce79c70e6c191c496a56510d SHA512 6946b5d21e0f6a3e79d324db108a425ebdc1517eb39cd89574a088814c0e87f74ef72094545a1860e2b8e86a14c1e9a61824c1171e39f0975ef05e74629443f3
-EBUILD protobuf-java-9999.ebuild 1333 BLAKE2B fb6b6a03d5c0b542d675ffbfce077e1af4ce209f41571f72fadfd102c885e5619f1efaff550f41140c122745d17e52fd5d6fd525b5b5d08122f83bb9a8f1f632 SHA512 5b82121c95ba38591ffde5fc6567752c8793e517a1e94ecd076c9394a01b9f01669b0853f8a6a391baa9ba08de74088468f2ff0b28f2d8779dbb93978112e451
+EBUILD protobuf-java-3.12.2.ebuild 1407 BLAKE2B 8cb3425f46c6abe6e0c45b8ca5c0b6e460f99b6bfaaa5e505364ed75e7da2411729c84ebd0e9a4cb082672c04f0cff74a025a43a3f9ca6f3746e75765b393e5f SHA512 965bdbc69bda2810a809672bfb1c35bd58bb89d9bc9abf3e959d42385d82745abe5a15eaac50c7ee7e3ea0306e29e70fc36d9a2d8713d07b95049d43297264e0
+EBUILD protobuf-java-9999.ebuild 1331 BLAKE2B e0844dbc8e68248c33131d2738940b29308180e6915e76fd4e2226ae1ff41a58cbd686246286f2da8655d0295e0de995537b831f33cec37155865dca8473463c SHA512 4898ef42ac269dede35e5bef0ccf36fa3801df0cc8c7f4367575ba138b5ff9783a9f2e9086f7c0d1bda2d3d247b6f9ee8c3bcfb1eead59af6a63c2a7cc0a4e29
 MISC metadata.xml 535 BLAKE2B 9a137dca0f060e7fbede894aefb4dc4d05d0264cabc4dbcf65c240c6b9f130ce0a4287eedd0306aeea8d76009611d61ea4ab472a3163f93fddbeec8830e7bfae SHA512 22c4efebb2ac24924eff53af66c8a77439a8743cdd22636d1fa78b35482d0821c1fcf79268e75736a742da52b8c5d4a402ca8befef269436013bcdb8591fbed8
diff --git a/dev-java/protobuf-java/protobuf-java-3.12.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.12.2.ebuild
new file mode 100644
index 000000000000..09a8150fe7e7
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.12.2.ebuild
@@ -0,0 +1,53 @@
+# 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/23"
+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() {
+	default
+	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 ffe2c1d9ca17..f4a234c2ae7b 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -22,7 +22,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/22"
+SLOT="0/23"
 KEYWORDS=""
 IUSE=""
 
@@ -44,7 +44,7 @@ src_prepare() {
 }
 
 src_compile() {
-	"${EPREFIX}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+	"${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
 }
 
diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index 66704e02ff4f..506e985be74e 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -4,5 +4,5 @@ DIST antlr-3.5.2-complete.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac74
 DIST stringtemplate-3.2.1.tar.gz 1039803 BLAKE2B 6f6ab7e1d5bc1e2bb01960c0baaea0bd07267af26ff481c1e1586392e0a8938676cab3e54c22b2804bed2806befd938d4d09715de45cea12212e424e2e30fc4c SHA512 fe4c50584dd3695514034845ba7b8fa300cf582b6b302797afadce990f2665759323f6a29ece1bc07dfab244cc00455b4106fe3ad6851165edbb8736ad7ec714
 DIST stringtemplate-4.0.8.tar.gz 147305 BLAKE2B 0c09326f4eecfc86db8588a9b8db801bac8d8e128f8ef004a3691813d1dfcbd1e397acd5cad47e4c9d44d7ee8c17b8f6b66386fb897e4137df43dc46f46dc3f3 SHA512 21e4936356a6d374bf92645f09351a495a5900a408ead8dce1903ed81d7fc70eb4b44b206b587b05ed87edb2d4792c1cf72907a9cb527e18373ba2e5f31b5724
 EBUILD stringtemplate-3.2.1-r1.ebuild 1476 BLAKE2B c23c3f8c720f63050495e3d41c9ea65c384f205a4b56a73e4a18255383b285255a4b7539083cb4d9fc1f1bc06e7a72b03bde88147f8d2d4bc9206aa528d5c02c SHA512 0a78ce3012be779491f11ac47fb0543dd0e96c971e5dd23258b27c82b1cc79d376dffefca33cf443305f08706eb2e35007b5dd345a19b3be6103c5c2e5b5c3ef
-EBUILD stringtemplate-4.0.8.ebuild 2172 BLAKE2B ce3f2349df3c9b7b0c5e06abd3c1322c73f835a3120cca4bc6a66d55d1bde83af84e5e917f7ba6dc6534395f9c5f8237b350ccda9bed74162044b20d7f41034a SHA512 36bd30d02a9e9a29b487cf167f544aaebaf6cbc440587746d4509ccfea0f7f1b8e915a3432abdd3ad53862a8238b42cf44553e3fc37c51404f4ed286bbf3dde6
+EBUILD stringtemplate-4.0.8.ebuild 2179 BLAKE2B dbd3644e8503f0cf9130665bd23f180f3d196d74fa1ade4ef386127b772b82ee10b33ed514b0bd127e1d60705c308c7478da8419de2608637211b4ace0248b6e SHA512 b4ab6b0f73ecdb1764000372ce909da1c52fa4b02359a853f4eab6c7bdc47d8de8258070d1be596ca48eb58934c288ee8a0f0efaef006618a278e035107e029e
 MISC metadata.xml 322 BLAKE2B a9d59ec72b635debef4618887bd9389b4db013017a0a952b28b5f07e7a2caef78976b51de098085b94cc16046fe5642a5b6da9e2a197aa51d39daac6b25f1c19 SHA512 76ac99f8c99d34b533c08ae008a9eb2ac2a3b64589df3d43460c93b78c3c53c45b944837cc7f5514e90afc2117554fb545306e74a2b2bcb5c8339c656998c449
diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
index f15d93c44e9f..c29b32ef39e9 100644
--- a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
 	http://www.antlr3.org/download/antlr-${ANTLR3}-complete.jar"
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 498726c6b65c..f8e5acf21950 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -23,6 +23,6 @@ DIST swt-4.2-gtk-linux-x86.zip 5561088 BLAKE2B cf8bda6a48d5d8e389c387162bf2aafde
 DIST swt-4.2-gtk-linux-x86_64.zip 5867140 BLAKE2B 994bf18799297529329637c1b9ebf15638187339b4f56bf8cc1dedfc97c25a1ea4a1664605cac1374fe3d79b321dc450c6129ebef00ddd6f9507f238b7836316 SHA512 56c5ec4ca2ddeed5256dd6ff350dc3911034ecbc414a06ba879f04ab53d6380ca9da9037097f76228ca8182f6076bcd9cc4cb9b01c10766c10048e6576fc5f50
 EBUILD swt-3.7.2-r3.ebuild 4392 BLAKE2B 70df10c87dc15097c330b521eac0348c19778bc9b2abd3868c3b4faa488b1ca6727411df26ea9226173c1d59f94cc2e6137a1e7532ccbb641b1e5eeb0c8b1445 SHA512 83a6562632fe653c556084bf1413fae2be1b8fd0351241e4b5198d317cca2cc753d6798a74fcccbc5c2b50f088ad02ad6989183ca94bcb1d1ef26a8f74f52310
 EBUILD swt-3.8.2-r3.ebuild 4240 BLAKE2B 200a47aee302fb32a3fb8000177d036e426d929e20ad5646879e252e10a8537bc87902951f4f2bf4380a430ce8031e576bd36bc3db810bc3ec8bc8db62b10b7b SHA512 15b59cee721bb901ca2e3ca8697c813747f345387bc31fcb397da152c131b7a70fd8f3d740c71bda54bc51f11f9458ed4d41179907f77ee29af8b3c3e2791ba2
-EBUILD swt-4.10.ebuild 4534 BLAKE2B e331f67fa0516ad79467543694f22ee36ee2621200ecb30b84abf493ddce28d5ba10a20195a42e9a32271ae86f578555ad31b730e3140ff83d7e1f642ef5d853 SHA512 13ae51af08ac1653a8ca5c226cb7b69e8f9d64b50a311b74e30b90f3d30376d486e132299e2de8853efc4074d422419b71d65ac53c1f5777c98198e2367b5dfa
+EBUILD swt-4.10.ebuild 4592 BLAKE2B 67488fd6d7b6ad25efcc2aeec388851d6d8e10c7ce067694147d97beb3f55b182fff6c58b8b93d8c0c6900ec2d3169225e965b7c7d973106af4667e9485e8462 SHA512 5adb2848bff4d4a22b319975d59cae88fade7f3e16db1d5b34ac4e2c1c542644ada45695f929421d9339d482bbbee0572ae3001bf6d2d5d99da0e643ed2d7876
 EBUILD swt-4.2-r4.ebuild 4489 BLAKE2B ac412f8ae913a503bc5e5264a6f28967bfcab630351c0a571df3f7cd8c45c7847ad5c5d66302ab97f8ff66207d21000c85387c268092b0080bcdb92a7c47a705 SHA512 2629590b0679a5372f1974c7f5644e576497b1282672d3902fa680dfc9d302148b9a3049a23f9de2c0014a65f93a644146ed33ed1f5ca4161307867f9e87ad8f
 MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
diff --git a/dev-java/swt/swt-4.10.ebuild b/dev-java/swt/swt-4.10.ebuild
index 4559e6bb888c..4b2c5aafc0e2 100644
--- a/dev-java/swt/swt-4.10.ebuild
+++ b/dev-java/swt/swt-4.10.ebuild
@@ -80,6 +80,8 @@ src_prepare() {
 }
 
 src_compile() {
+	append-cflags -fcommon # https://bugs.gentoo.org/707838
+
 	# Drop jikes support as it seems to be unfriendly with SWT
 	java-pkg_filter-compiler jikes
 
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 7c150203f331..a13a8546b3f0 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -7,15 +7,13 @@ AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e
 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.103-src.tar.gz 5279592 BLAKE2B a8ab36fb84cf158fcd8b888276576cd523d211ab0f6fe0933f600d1990a8f68076f192177a574987e52440037c0ebefd3edaf3c84fee541afb076c5ad33cce9b SHA512 812fce83c7242ebc16dc2365f0b363f1fb2691cd6a2f19f1209ea467557c42ee2d108c8bef89f23bb4a20c800d0ecdb4afc37567ef8079966b4eec0331a2ef9b
-DIST apache-tomcat-7.0.104-src.tar.gz 5309794 BLAKE2B 0d4d5d668e1131bb533af1d56fe37ee1f5c252c2c4dd987e24aae67484f27805f88750b27248c6acfd0585eacd0d3f2155c723e9a25c8613652101944add2a15 SHA512 788eab3ac343815362decf4c0d5db91f3697cc669e7e051f93bf82905cc52f9b040d00b7e07f7b85bcf470e802418896a678f991e523e08a3ae5a2f212a53257
-DIST apache-tomcat-8.5.56-src.tar.gz 5724546 BLAKE2B 623dc2d1f6808f012f19fdd0d914c4bb200e8328ab6b6855666c1db1704e198d069ff74d227bf51e8376c20daf0640002e5d6907edadfde294d8c62a64d55f83 SHA512 75529e567a7be48f2c1034f3eeada571478d0babb63fb2d368061573d7e64d5fc0a937304e2e2ffa956b5d8a403936c1543a93ee78b258b532939fb9ce80ef3d
-DIST apache-tomcat-9.0.36-src.tar.gz 5890912 BLAKE2B 18962c7d4dcd75a04476acd306002977bf039d832aa1ed5551ffcaa0612e612e6b11db6d80cea149b9fb5df9d0f76284d55a1745760df8f4fa7449999e095c61 SHA512 f8263594bc679f75cecf5bcf4ad8e8ccfea42ad8e90eaeb7004c63875c6b700b0f863d68f1cdd932ebc7b303bdfb86d70afe88686e576c8ea7ccd9574c74e25b
-EBUILD tomcat-servlet-api-4.1.40.ebuild 996 BLAKE2B 0820bfc92a49246c9d35774e8efcb02eb64a7a98b1276c847bdd42528f0331bfd9d3e8d8f4d6320667cc0fbb52552ca52fdee6735cf0ce97d6d975377061af91 SHA512 c3cca19f2a4206dd68328f6d6c902b15f6fb4a8b740dab698b8d668354f98c6fc272b19ec1df4bb7c4c65e729460b41a512d4d13ca765ee4be8879108b14766c
-EBUILD tomcat-servlet-api-5.5.36.ebuild 1430 BLAKE2B 2bceaac608b1e285da260b9041596b18d5c360d9d7ff596f1b558fcddb6a4c38865ef1a384bcc98b8187e9ac4fb0ac45d57676fab2001bb7f595c6fb9080e0cc SHA512 b9745c4beb9d3ce8645c495345d7dd76fb9d930ce72c8f7387d9cc73e615b62f40a2f470b46cef407ed0b097b050413451763acb81edb0c87d0d95ffb28c9319
+DIST apache-tomcat-7.0.105-src.tar.gz 5312024 BLAKE2B 0eaad66c6dcc3e2f6a2d8e142a7832cbd413724cab8b10f00e87d5535f4f20d5ba4712794e09444a8b3e0cf23f036da7c6923f038a6a11714682b129ed4ac5dd SHA512 249e039775e833d75b631cec26132b42e4aed25491a29f2349fa41b81737688b0a2e453072d8e3c5fc28763a9d1922f59da7529378ce8fd472eca7bbc73a6bd2
+DIST apache-tomcat-8.5.57-src.tar.gz 5730658 BLAKE2B f9bd2e159abc6af62c8681c38ea4eae8155f95df11f7c244e45018929189ef6b6a37a11e84119c3ddcb134a8ab58773add19cbab7506bb87c43b0039899fde60 SHA512 8bf4334b190c36900b708ee7097097e513f2d4572f119173bee732c76b5b660350fe516e58ac867250c2ef7a1371b55c116d3a1abd18323ceb92337f1dcb0f60
+DIST apache-tomcat-9.0.37-src.tar.gz 5894559 BLAKE2B 63148418ef96e90f212ce8a00dc6a274a8da2a1aa8a53ad0f6d3960efc8e876dd2812f425c0f21c73ee291752c5fd3bc8025eed46d18d31ae72e8bbe6dc1ba10 SHA512 6e819fe255c467b0081e91c17a53fa383fe84d922492c62d7dd93cabf00e22ab30872ecaa298a9b12977b8c7518f36c8429091b24c9fb5200db64e80e853ce98
+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.103.ebuild 901 BLAKE2B d0ee4ec8ba0e77f5c555ce53b1dad3558371a7667e55a3991b9753e135eedd67af5627b7c819620ea5f52c741f14b53fbc1fb1a6cd0cc680f62e0d651de6b22c SHA512 57e57d722ed3ae8c3cd99c0a0351242c6c74bc556babb4719db51ace5b73ea57eb538e69ce3b19c32cb33defcd1ffbaea99bf401d856539560c0a4cc9f5bd685
-EBUILD tomcat-servlet-api-7.0.104.ebuild 902 BLAKE2B 67cf14b835e7ce4ee75dc7739a31ffbc5c80d858087296ea98a1d1bc080079967350683f79d8b1db67977b9d82458a720cf7213a2ae4df8de72792fb81d3d771 SHA512 ab872c195c057c032267e3b1ac6e8093823f63d3b1e268dba9be610126b88ed0de2b3419d62ebc7379835c8cff0e109bdfa272abc777d67f70ada13daddae9a4
-EBUILD tomcat-servlet-api-8.5.56.ebuild 1005 BLAKE2B 81ce97c43775137f7c4760a58abe4d7a6192dded9e9cbcef8d29fa10b5cc0868740aa0683c94a349494232c64e42dfc0b09aeac3571260dcb6d8405dc233ec6e SHA512 520be8a3bb582a0b3dc783f5bc1763076d94a84a71e7678dc9d2def1d1c2be228097282667ecd9c3a5ba84b57b2403c5a446d45cfa249468932576df81e9d0ad
-EBUILD tomcat-servlet-api-9.0.36.ebuild 1000 BLAKE2B cf72ff5044130696fc74a4ee7cfd28e55e82077d8972c56ce9324007e5d5776e4ed7fc4d00e10ba8c08ffdcf6fc862ecd8a86f177d41fc5264d4a1f9d110f6d4 SHA512 a72ac598d71fd597c238b4fd9d7aa6365540874cb8f1ae5aff63f6bf32d0f7f8195c9a1248d05bf2fa7d03a7d12a11e18c4641ce29b0a60939f03110c9ac454d
+EBUILD tomcat-servlet-api-7.0.105.ebuild 906 BLAKE2B 275c28cec529a0e2eb3a1dfab4faca4a557555744ef8cf3a6b68c88fbd48233e67bd414c809d03aec790a33536117605d5c199a10f5224c15e07976d19384503 SHA512 37763c6d8945329c26fa0c3222b58ad5e5944fd35708a58c149269cdd1596bdca80db0c450a9db6604bca6ec87da4c9abc4f53fddf1decc94b25d4b9dfd7205f
+EBUILD tomcat-servlet-api-8.5.57.ebuild 1010 BLAKE2B a366fb083a2773dc36ea015153eeeb3938baa9f660f156ced603f854cf75b2ad515e8c0a900a1230b96c3eb99b9af8df130cb7c94208a1b0ecd6f1885b4c5813 SHA512 955beccf5a490a86c20fc3d77bb9aaf6e115ab2cebbb8a05b85ea4a8cb22cb1267fe323bfd0cd97576f8e581276e2f15d6f4cdd7e5fa9cbf62bb808b8c4759b9
+EBUILD tomcat-servlet-api-9.0.37.ebuild 1012 BLAKE2B 0bfd9e19febd187f1a79298e5c051e8eba1bb4f72c64cda5bd90f64b34772b851008241b3866ebcec0a59aee0c0d4d29d2b883ce2f9c9a3253280e58577fe3b6 SHA512 4831af547dce2d5372fb7fe9f79cbb2bafc1c5bba3435477adf71c06ebf9498792f06e2ae321bab32a4cbad6eef64961c1bf6c4db611c796f036bdc5ff8bcde7
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild
index 4b96052744f5..bd2584d3f9a2 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild
@@ -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=7
@@ -15,7 +15,7 @@ DEPEND=">=virtual/jdk-1.8"
 RDEPEND=">=virtual/jre-1.8"
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 S="${WORKDIR}/${MY_P}/servletapi"
 
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild
index a7c8aefd34b8..c2ae1a37f16b 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild
@@ -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=7
@@ -12,7 +12,7 @@ SRC_URI="https://archive.apache.org/dist/tomcat/tomcat-5/v${PV}/src/${MY_P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="2.4"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.8
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.104.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.104.ebuild
deleted file mode 100644
index 647023740d07..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.104.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 ~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.103.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.105.ebuild
index 0bd7295e539b..a24b8965371b 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.103.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.105.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 ~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-8.5.56.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.57.ebuild
index 085f83e7999e..05c60361600c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.56.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.57.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.36.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.37.ebuild
index 146f9bc7ea9f..585a158ab74f 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.36.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.37.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 ~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/treelayout/Manifest b/dev-java/treelayout/Manifest
index d86496db03ca..080b85eb26c8 100644
--- a/dev-java/treelayout/Manifest
+++ b/dev-java/treelayout/Manifest
@@ -1,3 +1,3 @@
 DIST treelayout-1.0.2.tar.gz 1007086 BLAKE2B c5ef3f0bc2a7c99a983f648efcca65a4a4fd9d72710b7a1a8263629435da6a79a328778983475565dfc23738978bf658067e3e63e7c36db84a54189821c0da07 SHA512 89a627d8ab2f248bb9b22139de0a28f310deb555f78825f29f4acfd0df7b4c212c8df241b004f8452a4be8a0f7717ee996df3eef4dd88ca905f4ad211df92655
-EBUILD treelayout-1.0.2.ebuild 997 BLAKE2B 6e989c85a5dbb00463f738ef625e72a00f0389250096299388069f16cf7c72c558af8e5401d22af7cdfa491e81a95a7e20cc41f5c771f94f56cb6d54feaf635f SHA512 03f72d722133252e6df276759f518a7fe97ed8a2f108907f6f90b083b05af0a8e138f6fb3a1d2c3921772fa5074ab10719e0a392be2e23101fbf2b3bf8518dec
+EBUILD treelayout-1.0.2.ebuild 1004 BLAKE2B 7eafdbac19bf6141d67a96d666cd592946b4a93e9bf3cd4b35221b5a3df1eadeadaaec698d748c7bc7b8a8ed9c525b13d351566916dfd4e3e0a2a157ba242f00 SHA512 a7ee265033e143173d1cb0e2f59d88c9e66cc57b9fb1f4b3ab6fe7eb6893e42a3db235455a115d5eed64c6fa177ac5ae04adb06c2801a3f4b54be622103a47ec
 MISC metadata.xml 677 BLAKE2B d1ed5c57f1b7ca4678e569abeefa3fe9ef1fe8113b6152ce27d5daa34faf84a90a612b3cc7f6f4977015cacb71c55457f2e4b26a5d5d07dc25424b8e3cb9bc7d SHA512 2abe1f3836f0efbfa2d52873e93d396b496e4bf52b7b0ac2b7c1641329a7756a04295a6600473160b863dc64866dbd2d69b8443599090dd36a77dee99fc9d42b
diff --git a/dev-java/treelayout/treelayout-1.0.2.ebuild b/dev-java/treelayout/treelayout-1.0.2.ebuild
index df9581ab4eb1..a055bd951140 100644
--- a/dev-java/treelayout/treelayout-1.0.2.ebuild
+++ b/dev-java/treelayout/treelayout-1.0.2.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/abego/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 HOMEPAGE="https://github.com/abego/treelayout"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-java
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)