gentoo resync : 08.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
commit: 24fd814c326e282c4321965c31f341dad77e270d (patch)
tree: 033d63b33c21a3209964ab56005bb9bdd523630d /dev-java
parent: 129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)
269 files changed, 463 insertions, 503 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 1ff438ae0224..754234bc0704 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 a59875310716..46fe743d2ffd 100644
--- a/dev-java/ant-antlr/Manifest
+++ b/dev-java/ant-antlr/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-antlr-1.10.9.ebuild 509 BLAKE2B 382010024ebac15206e88425901709268edf4e5514e8bf55bc88264e17de8109a743d625d69518a5bd6f09bcbf676f9e4e68afb83bbc1ac65bf548584d3b639b SHA512 6cfcc8170d9c024344482d2ad32180ebd38fc3280fe85cabfba34b9dde5650eb4bd8725dba461ce0770aaa93a94a08b260a86d2d74cc853c226ddc4353f70b3a
+EBUILD ant-antlr-1.10.9.ebuild 498 BLAKE2B 4b777aaa241db1faae8083ddbd62bfbc7a7ffaf8776f6a27de0cd638f7db9a2c59baa5dd1f47d322a9fbe4a71fd709a6316869c260af56d0b61429bc2d329715 SHA512 180c747334c126438770d5413dd14514183abd5eaede21b72a066c7c1550d4f4553f33d8d4b4cef8d3e5409bf2c36a65acd1873dc25db6cf3f71e18472fdd31b
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-antlr/ant-antlr-1.10.9.ebuild b/dev-java/ant-antlr/ant-antlr-1.10.9.ebuild
index dd99b484b40b..3ce97311a972 100644
--- a/dev-java/ant-antlr/ant-antlr-1.10.9.ebuild
+++ b/dev-java/ant-antlr/ant-antlr-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ ANT_TASK_DEPNAME=""
 inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for Antlr"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-java/antlr-2.7.7-r7:0"
 
diff --git a/dev-java/ant-apache-bcel/Manifest b/dev-java/ant-apache-bcel/Manifest
index 25e872b2ee5e..647499ac228b 100644
--- a/dev-java/ant-apache-bcel/Manifest
+++ b/dev-java/ant-apache-bcel/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-bcel-1.10.9.ebuild 394 BLAKE2B 8529d26584263f69378e6cf4ad01a1148295bd3fdde89b83035701e497c45409c7590932de65274802194beaecb395b0e2c8261c8ba7ab53f24ff8e5df162c66 SHA512 32f7714998d7c30af49cd3498a1c37861d57ac0d4cd186eef0633c7262cf2f9125d92f9f133a61dd7f5a5b676785a271f01480efd4804d8be4fe04abbe43a96f
+EBUILD ant-apache-bcel-1.10.9.ebuild 383 BLAKE2B 42e3d1f16f3110041585b4096a5e77a41c6c4f99909350fff1d8f32739cdb2230073b180944695ff216a37c385e1565a96800df991158995826f450efa322aff SHA512 5c2d70adb0f30038544320009fff6aa27ceabdbdbb889fae6ec598d2dc6d15203ff9922070756b4fbd4ca104c06d9762c36a02b34f1b81f41a8a54389d0b9cab
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild
index 52db2870e204..50062198e79c 100644
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild
+++ b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="bcel"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/bcel-5.1-r3:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-bsf/Manifest b/dev-java/ant-apache-bsf/Manifest
index 060645ca52c8..0ba9713cefbe 100644
--- a/dev-java/ant-apache-bsf/Manifest
+++ b/dev-java/ant-apache-bsf/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-bsf-1.10.9.ebuild 673 BLAKE2B 27bb3543a976716d6fe96aeaa567bf3dc2febbc9da0c837e7946417ff87da33287ffe0355dedc6c7e44e7fc67813dcd307968276f92e0b15fe1f804d134b9935 SHA512 ba0cb12f7a14c441abad47eac5ab8e5be767ed059d2cf8625d86038d005cba96594622ec4b413ec5b51cbf847fd92d9790e71fc4770e90d0c388811c4cc4d74e
+EBUILD ant-apache-bsf-1.10.9.ebuild 662 BLAKE2B 2b70f86ef0754bebd87b12b2a2ecd12185b43f7d625ab175e7c15ab09a808795f9e9ac659efce9c9bcd1b22dca1cc981a6bfae4c2af13c1abb056db74ed07bab SHA512 6ab8319f93823b5568640ed25c46564f5149ab11f7fe67589711ebfdd2bd334c28a9ebe52225372e346f040461fd100b97f7ae736e4efc6023e6b2c7f67ffcde
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild
index 3c8fb636298f..4d3aa5991cf6 100644
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="bsf-2.3"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="python javascript tcl"
 
 DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
diff --git a/dev-java/ant-apache-log4j/Manifest b/dev-java/ant-apache-log4j/Manifest
index 008adb4d80b9..4c67d64eb9a2 100644
--- a/dev-java/ant-apache-log4j/Manifest
+++ b/dev-java/ant-apache-log4j/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-log4j-1.10.9.ebuild 399 BLAKE2B def5a4c83548a081aab549ed3d87ab251c0b7fb9ce628f75e5347e9ff3029e5a509f34566b6207c82221afae0c1d0ea6577ce5711391b341244baf5ab0e0f97f SHA512 ba59ffe39c8dda3bbb4f122df9941618b70d637f560c639cfad5772da3c1bbb0bc5ee58336bc4400a2e9e0b1fa855e1b8f2062c41e26079b42a50d6bed5bae23
+EBUILD ant-apache-log4j-1.10.9.ebuild 388 BLAKE2B 4c25ff0efc34bff1fd224d7dea4fb3216b0a1f7c42796edbcdee9eb2bfbca95c441a52fee03dc381a5999905048f5092813db9b359e82ee8ff1423f30c0ad927 SHA512 a9925cb6bd56d0aeb25a398f3640d9867048b1555f9f7970f4294e8eee3cdb4ad0d1747ca4a1fde48346ddf51d1d6a58df8c02125554612cda6eddbd9966fe7c
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild
index 29c114551b97..d30b5fb9410a 100644
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="log4j"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/log4j-1.2.13-r2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/Manifest b/dev-java/ant-apache-oro/Manifest
index 0a1ddbfb18fc..d8aa790851fa 100644
--- a/dev-java/ant-apache-oro/Manifest
+++ b/dev-java/ant-apache-oro/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-oro-1.10.9.ebuild 416 BLAKE2B 6714977612eb50aa76efcb89c474e6799a1bd9804a5ee5147ef7d852df27a8e83ebb0ea6fbe075d9ac05b5e3e33328104f82313d84bf9607579dfeab287db392 SHA512 a80fa7d13f87ecc615bdfd56c18bc5bcc3b5c988d2b1031aa3f548975809d06bd342b25c83d433ad6666534f0f3405d6ed855bf27597a86489cde682bcc36779
+EBUILD ant-apache-oro-1.10.9.ebuild 405 BLAKE2B a05bc5c00e6d11c919b04d6074fbba3d2dc674d85bd27af9cf3ca34def34a46c5e211ef069653a75d1fe3ac17f4138737dc01f861f7d58f4301971e3816bd488 SHA512 ac7c3a08acb377219b952cee94902f7f68181c4a74b050391263c06176cf3c6dced54a3754902007d045a89ba28217120e30d49f741499748428add58e3aa8c0
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild
index ed7069776e54..17605232d18d 100644
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="jakarta-oro-2.0"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/Manifest b/dev-java/ant-apache-regexp/Manifest
index e7a38c406c59..12d877e66b6f 100644
--- a/dev-java/ant-apache-regexp/Manifest
+++ b/dev-java/ant-apache-regexp/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-regexp-1.10.9.ebuild 420 BLAKE2B 427d9a9ec5c7a631a8d56c371ce8e829209803dee9373a93192405f0dc6ed715b87cf206d4045c7959a6768c8823a72fa03cb8ae78ef8857464b247dbc4df1be SHA512 b0a1c1c15eeca17b6e3a2b74a786ed3569afea11593450d9aa4fac3b6ad13bcd04ca454a9e59d34ab2f526692ac2e356bfedea2f7571c31cf25112bd370603be
+EBUILD ant-apache-regexp-1.10.9.ebuild 409 BLAKE2B 56e68fbacbbc938b17429d21efd769d30a6034d51f8c4fa7a4458328674ee50aaf7b6d3ff6e887e5163776199107aa916e3b69071d119702e0354247b44ed1b1 SHA512 f3100a30cf8df0403ba1d6524544dc828b43b79da5188bb26c2668943f00bcfb1d3d546a6d8bfc33a9766debad2bd3858d07e8ea1c9c3bd5381f57c333e2fc37
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild
index d5abad147f74..c3e9f34c688f 100644
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="jakarta-regexp-1.4"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-resolver/Manifest b/dev-java/ant-apache-resolver/Manifest
index 9777154784e9..426887326a9d 100644
--- a/dev-java/ant-apache-resolver/Manifest
+++ b/dev-java/ant-apache-resolver/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-resolver-1.10.9.ebuild 423 BLAKE2B 6ae838c8a01fae3255d266009ee660766e82909669792349780b4c5eac502cd12382df69a92a5dd89a9132e6b8de5a111d78b8be30f40ff976380c1dd057353a SHA512 00649af844f43d17a8c144ca5efaec30a608db04e4c5234c9e7718ea01cbbe9b7e08572918bddfc05a58aae6ab88d309553f3f66dd4b8060f6074c5204ec97ca
+EBUILD ant-apache-resolver-1.10.9.ebuild 412 BLAKE2B 791e083278817a77a7d2683bfc4a7d349ae4f5fbfca5a45ac241d48f047ab72a6b8eabac0d805f3c9660798b02ed26f50be4a0deba8141c3653b9dd1c0339776 SHA512 ab026645617742f3f09f0390d34368cd4ede0d53144e1b36a3f61dc5687e5da8e69d321903d42d4a14c42b8f780b7a0f1b546881774ea6506e0b6cf87abd3f5e
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild
index f52a019bb575..de1b69fee991 100644
--- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="xml-commons-resolver"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/xml-commons-resolver-1.2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-xalan2/Manifest b/dev-java/ant-apache-xalan2/Manifest
index c2ea9421360e..63d76b801afe 100644
--- a/dev-java/ant-apache-xalan2/Manifest
+++ b/dev-java/ant-apache-xalan2/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-xalan2-1.10.9.ebuild 497 BLAKE2B fc10000278cd6ae799c38cbda8daa0fa9b7fa08ff55a0a1e65f971d0e918088ab90f336d7d4db508dca7d8f45dc75af368f30070a3d71365ab7956788f37550e SHA512 98ebc376bda78b4a3910e4f063ed6f034b07d6753db33f37ecf0edd141cc0a85c92f59423c41fd7d2edaf7829c845fdf16627feba88791f57528ae615623629a
+EBUILD ant-apache-xalan2-1.10.9.ebuild 486 BLAKE2B 15b90ffdad5e11d2022b0c3f56863e680c156006d8ac85a8b542da72c386c0449813d1303424bcf3603f307d1925226a371dc5732aff25563de88b3bfa0d5450 SHA512 87587b0f9a2c3002dbac4b5c576fd1d6c127efd0b7ab64883936de470b1f0bad3592110267a58b4548c8c20a551aa268627a5533a4971e1d918263606d0cdc94
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild
index 2977f62607c5..ead0fda47fce 100644
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="xalan"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-java/xalan:0
 	dev-java/xalan-serializer:0"
diff --git a/dev-java/ant-commons-logging/Manifest b/dev-java/ant-commons-logging/Manifest
index 76eb7c9dafb9..8bffba283559 100644
--- a/dev-java/ant-commons-logging/Manifest
+++ b/dev-java/ant-commons-logging/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-commons-logging-1.10.9.ebuild 383 BLAKE2B 179ad021736948afc1ea6f2ba4893e3926da07fd08c8c34bc5ed2b9a054b479ec6d1f184eca3b70e129317f76918baf13da8b9fb30a70c54a2b98e984f0739cc SHA512 6c8bf36ea6642fcbe2e4552705666c89bb770c86d8bebced7b8500cf52aa86b6c2dfee7d8dd2baef802af39008897324f3e5dbd13b0e455a5c775d822f803807
+EBUILD ant-commons-logging-1.10.9.ebuild 372 BLAKE2B 6b38d9a8c4494f28be606f64b3b9cfd846383ea48a23cfa26dec24dc1e76cbba8739568d9dc0ba8de49a818ef0fe6ef84e5421839f256d552ecd80b12f209f42 SHA512 88e0d97b87a0e0cd2c9cfb32aec24a44d168c4c73f49ef87686355092e1d67a84adce047ec20c66157d522c3d94720722c96b4e765f7d24ddac2fb50d477b9dd
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild
index f36466b895fa..ccf0ff8e4db5 100644
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-net/Manifest b/dev-java/ant-commons-net/Manifest
index 2a7203e0434d..0e72b6175dee 100644
--- a/dev-java/ant-commons-net/Manifest
+++ b/dev-java/ant-commons-net/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-commons-net-1.10.9.ebuild 379 BLAKE2B 39fe7f6abe1f4cb00b74832a12b84f9d48c8e3507b581a66f007baff50c31efa54f5890faebdd2c360108bc61640b41b4855f8b55c0e123fc10a90aba91e9a4e SHA512 548e734576955ff3c2c5ac97c1f2e1d750fb45f59da95d44e471b404f9783c3fa6fe25793846aa0e74d9a73d3b963c55aefd78ce9f79f5aa1896cc385221b4de
+EBUILD ant-commons-net-1.10.9.ebuild 368 BLAKE2B 3e8a58b056ff1fe96486b1260cf89a5f7e103ad45d69ac12d4effc75a6f64d8fe83b1ffcfc3c716bad786e385d8d3d1b9d1f648551f404378ae94ad28c80ecca SHA512 a5e727666426ee23b65cc95a4803af386a2ae5629175d3c3806a2d43a0e1c4fa2756da1e2d803bdd285b78b020742047593a7afc9a5314f4a36aec78b8dbf2c5
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild
index fbaa9bfdc458..41b732a1847a 100644
--- a/dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild
+++ b/dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/commons-net-1.4.1-r1:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index ac63dbfdf63c..a291de3af722 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1,4 +1,4 @@
 AUX tests-visibility.patch 755 BLAKE2B 57a0815dc7881b5e5b1ebccf20a139624bc237aa67553634f9a2f91d45065694c655c8a63fc78c64c27e389f31c5a9356cafed8864aa56f720d648eff72a005f SHA512 a848c5573ffc9e02b77dd63c74d4314be5c35e47da7646d048d7e28a098290bc50d30287928ef3e06d8dcbba758b7ec1e87118ebac29bf72b04021f20e8c371d
 DIST ant-contrib-1.0b3-src.tar.bz2 3298187 BLAKE2B 0572d583a770c239880fb7e8e4a1e91331dfe80a52d7cf83a90d108f1e717caa26699dce43b72fb1944a74c8c738ad659f60864e2e8e945c8e91569d80c1214b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8
-EBUILD ant-contrib-1.0_beta3-r2.ebuild 1825 BLAKE2B b539c4fc5b1b53cf69de7b251191d1c354cf0945eef305ecb367252aa9418c1609ce796602acf952e924a8735ad19c497aafccadab30cefbf21f9b4149669b90 SHA512 8ea1e499c12976ee023e36434690a993d04344839a94e8ab92030a39c32e4cf759c402c0dd3c179b175baf8d8169b436bc373926914a2cbd3057b4e6643bedd4
+EBUILD ant-contrib-1.0_beta3-r2.ebuild 1814 BLAKE2B a2bb1cab559d3e71813493337aa09865010665855ea4321e8cbd4132105d09c169da9fc1a4dccee2931d586fc63f225a39d95151f4d23e8a86bd4d5d9b556c17 SHA512 e46e91963aa9f9fb1fcfa61e4689fa9fa06b2c880ee4c21bfb70bc1f55725d0e59153b8a978856bad417afcb7ea07b30035e64fee2b5ee84fdfb91fa86185d85
 MISC metadata.xml 317 BLAKE2B 7a5bf5450578fb6d057233a53ba7f3e7fa6c3f969f7fa0eba8c22ac17b4efa19b270a765043d61635780b0da1f22e8a0d0304f0c15d468f72fafee1341b8131d SHA512 4f45c942983f0ebb77130dc40a6407ec9781bb2657ac24bdebeddcb21135b7f0b39b560015ce5c7b0df3302c1c6d2e5783cf86d73aa372b9e24c8d1df28249c8
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
index 8bab213a6bd8..68d5f869ed7b 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 #	test? ( dev-java/ant-junit dev-java/ant-testutil )
 CP_DEPEND="
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 12bfc79d9ef8..37e7a2818bc3 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-core-1.10.9.ebuild 2761 BLAKE2B 15dfa89cae92ddf074f225b9c09affdbb5aa14d99717d15bf8b058b0cb1f9c1d5080619bdc0c48da52d31aa26c9c2441f4e76621c7255fc2093de12a100e8a04 SHA512 f3fbe0d13d94a3fc6e008eae1845781076e6dccc42c2c1709f854636fa786a83902d939579b5b915b6e094a657c558350c77d98a9fe68f2d0bebfebdddb9f2ab
+EBUILD ant-core-1.10.9.ebuild 2750 BLAKE2B c1f2bb02aaade6e5865a977736da3afb5445b3d11632e70373c8440bc75046cfa314cb47bdf0a2dcfd3a565e2d3067443f30399d8f5c46fe89324f8d2abf87e7 SHA512 2010355e71305bbd3b658e3922bab96894132b34817b371854056e58b4814ad03ca62184735be8d691c4d86f7882f6b7d1cc0791a591f5b0c6f857ed66df4e37
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-core/ant-core-1.10.9.ebuild b/dev-java/ant-core/ant-core-1.10.9.ebuild
index 7dd9454c91a9..1ced096f0bd1 100644
--- a/dev-java/ant-core/ant-core-1.10.9.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND=">=virtual/jdk-1.8:*"
 DEPEND="${CDEPEND}"
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index 9099f34def70..1012874719e9 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,6 +1,6 @@
 AUX 1.4.1-javadoc.patch 500 BLAKE2B 9954ccef76c45a403d444a730986c15d9fc5c6106908a209691a04c1e3b24af21eddccf217c46120cc2c89eabe0cfe277fe245b7e174974de29ec2bd5affca2b SHA512 e50463fb7bb7ffd493ad212cf2fbdef89e454de48521c6903ddbd9c7ba1a799172cf36265c6131e3a81136c0872977c63e654b7ce2913aac3672357718b8f93f
 DIST apache-ivy-2.3.0-src.tar.gz 2790722 BLAKE2B 87a79bad15b9b74517ce240fcfd0ae9e58b67816f0ec1fbd14081a17bd837c497da419d0b45ad63b3782b151e86c85b79cafa11f8c1170ab0287597be78cabe7 SHA512 fde43ff288cd8c77f2bdecdcbf52f180247ed99a8526be9d875d60e209b66155d5526e968400382d2cef22cabb8899c3b0912e049ae7d23e2cb79be8a81fe00f
 DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d
-EBUILD ant-ivy-1.4.1-r1.ebuild 1753 BLAKE2B 2afc0d371421bb16452fcb0bbe5883e31d827c57166841cf8a34f4055f1a5a57eb6262eab4346b21a438f6ba52581ee58f90950128134cb98708405e6d786e07 SHA512 e356329d0712fb5e79c9eeaf91ef9fcc9d02fb361120e8a1f91d7fa38aff92946b2b31101534f0187a7b85c0a7350f7fba1ae71ce98d6d23b14aecf0cbcbfd87
-EBUILD ant-ivy-2.3.0-r2.ebuild 2216 BLAKE2B dcc9f39656185a5a0e56c30bc75231e12a8fca7f50ca1b6687795855c774c8ce39177fd0128887f2c9b87d028e3321cd6577aba5036fb8576330ba370639fcbe SHA512 7c7f55b44592a7cf60e82202d4d882867758936304a93a11c3677c39c486b1c28a2df4891a87c7e8d408ebf4ad70926959e05a5d4a9ac6ac03ca7de6f40d3b87
+EBUILD ant-ivy-1.4.1-r1.ebuild 1742 BLAKE2B 3e2afbb8620bb69395b7869790b7e65866784b94835e59779e24817f1e5b3c44c62eba0e6dfe586362cfcbe55f26434f60dcc101e992f1c451b3ee7020c7ba76 SHA512 fc9c5b8b9da85c510af2540b074d511460302d538dbde9bbcc805aa6cada0e69d0c2b516cd85cebc72a08d5e3e935eb1bdd3a858bdacb9def22fd5dd581cd0ea
+EBUILD ant-ivy-2.3.0-r2.ebuild 2202 BLAKE2B 92b2dfcb3e3cf3bcf5879d649062770ba2f72c08a52d9ba686858de31f315031921da9baedabd01efe3406950c1633464b1fab466b8843f2c3595d7c3ecf321f SHA512 5057ecea8ae376b67e1b415899ea959336370bba4dea50198380e9d392d1a7c4847d84c6b33cb60484567c6968c61ea44deb17f19cc90279b49f6a5564c18185
 MISC metadata.xml 655 BLAKE2B ae710cffd6d182e1f67df6734f0bb1e3b61daa87629b8259f8d75f7476fa732904cd73d2ef02d496448191e33c069d3d284a79aeedb87323e28c029e8ceaa40f SHA512 81eb7f4ce41f17a43b32ac6e4ade9677397696cab06ae94964d1756d6745aadc9d61df9ef3b0749eb547b62fdc5bb19a98484268fbce9d56773be09a03671c0d
diff --git a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
index 8316de61c4d7..92df6ba8e8ba 100644
--- a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -22,7 +22,7 @@ SRC_URI="http://www.jaya.free.fr/downloads/ivy/${PV}/${MY_P}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEP="
 	dev-java/ant-core:0
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
index 23bf9f5f7c28..d39bf4890818 100644
--- a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -22,7 +22,7 @@ SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 # We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet.
 RESTRICT="test"
diff --git a/dev-java/ant-javamail/Manifest b/dev-java/ant-javamail/Manifest
index 5933537d0401..e08fccc4920c 100644
--- a/dev-java/ant-javamail/Manifest
+++ b/dev-java/ant-javamail/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-javamail-1.10.9.ebuild 529 BLAKE2B a336d71337cf901ee93a2f5945bd35bf213dd8d5a138e53ae0a032f76f63e4913f9dd0fc2ab8adea5f92dec827466c4a8ac43f00bd6f672b235a3350572e4f9f SHA512 8f3668b28c7e1b62fcfa32df9f324891d00f84f772e077d562092b4bfb87efeb1f36f8591a5eac0dd9f11c6966ea274fffa675c7945373974a638e18b665a2e8
+EBUILD ant-javamail-1.10.9.ebuild 518 BLAKE2B 6f4246e708ddb2b3de9971dccca451957f90d4d3ef09214b782ed31e6375a3dabfa729a262abc4388a67d210b3c7657a45697722da9e99fa8e29b557de92f846 SHA512 8959fc1ef8b032140cef7ccb356a907b6a935a3811bc6ccb26781754520103652cd0b39e7077e3251bafaabd91d37280ff47265cc5ab71e83163363a917bbf24
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-javamail/ant-javamail-1.10.9.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.9.ebuild
index 77606f4804c2..5619e69090d8 100644
--- a/dev-java/ant-javamail/ant-javamail-1.10.9.ebuild
+++ b/dev-java/ant-javamail/ant-javamail-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME=( "gnu-jaf-1" "oracle-javamail" )
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # needs some classes from javax.activation.* which are not in jdk 11
 DEPEND="virtual/jdk:1.8
diff --git a/dev-java/ant-jdepend/Manifest b/dev-java/ant-jdepend/Manifest
index 5b2f66041a4a..cb1e46b34acc 100644
--- a/dev-java/ant-jdepend/Manifest
+++ b/dev-java/ant-jdepend/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-jdepend-1.10.9.ebuild 373 BLAKE2B f53cd0fd7695e89dc9a91eff00a7b7c180cbd7ea4317924d01f5863d5fae7024be89873f3962febc1c67c1a22d9273d1aae8609dca671294b5ed70e6720a65c4 SHA512 8b93a135dc8410486c20168ebf7f8d9cb190b40ee942c71622e449de97608fc589fda568591c76924e87ffbe82354d094a50b75fb6d8fb14b5ba055e78d055ac
+EBUILD ant-jdepend-1.10.9.ebuild 362 BLAKE2B 854284bec3366c0d88dd2ec7c69235ad9f544d064d4234a29d25d8a92e34031a52c5c6a435036de9e63c6bc3130fc2f9aa40659c92c8b919740a6a9718305315 SHA512 864e9b9949d0ca3eb26d962fbef3f23df54a6a51e6de6279150de74ca74cb277c8dbb0e246548c01c348b274b683aff478844a3c2d8f55a90f5fd18de9b1c278
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild
index 67fe2f25dbb0..7f521961431b 100644
--- a/dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild
+++ b/dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/jdepend-2.9-r2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jmf/Manifest b/dev-java/ant-jmf/Manifest
index 9dd532f28ae9..dfe412bbf5f5 100644
--- a/dev-java/ant-jmf/Manifest
+++ b/dev-java/ant-jmf/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-jmf-1.10.9.ebuild 477 BLAKE2B 0e09afeaea8d9b263324d777dbc17d01931552fa91c83e8079c1d5d5b0ed497b3f620b4bbe2f666913a127afb66d2aa1f78fbc86b69c0ce4b5d5c8cf326d6431 SHA512 b0ca8fb0becd35fa65fcc72c46b8799a60c9b70f9773946923c0a2f74e990739aa8df5e94603a55a2092e5ced0045182cc483b89f83a5a21e5b1158fe76d996d
+EBUILD ant-jmf-1.10.9.ebuild 466 BLAKE2B 93678ec49c40eeab3867f385ffcfacb7859199a3000ef17c208a1094287dd89f9f7db05c5759e6f796d1485ebc0356d19c9a09242dcdfcee636211c8855f63af SHA512 ba63f145f9f5e438edbb327f16ccdb32acb86e8bdb6fc7e5237943b081f88834cf9cf1e4153639ef78233ed43d31f3c527c57bf595730f18b8c3afc4ea7f05fc
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jmf/ant-jmf-1.10.9.ebuild b/dev-java/ant-jmf/ant-jmf-1.10.9.ebuild
index eb69314716d0..279b33742d1e 100644
--- a/dev-java/ant-jmf/ant-jmf-1.10.9.ebuild
+++ b/dev-java/ant-jmf/ant-jmf-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,4 +13,4 @@ inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)"
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-java/ant-jsch/Manifest b/dev-java/ant-jsch/Manifest
index 82760eddd873..394b8ac217cd 100644
--- a/dev-java/ant-jsch/Manifest
+++ b/dev-java/ant-jsch/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-jsch-1.10.9.ebuild 370 BLAKE2B f0c689423ffcf5a6824ab216fe3063ebdec47c6e5c764b13896d956d28183170732d6db981d02cded4242e9ed9368fe43919c0f5f043a59ab842677388d3b29b SHA512 8bf481ddb00ea7acbdeaf767201ad73aa3fd4e8459684c2f3b85ff3e14061dcc876d1667a6163998197500f976815f8db9f52c06ab50e21a51c8da5c407749c8
+EBUILD ant-jsch-1.10.9.ebuild 359 BLAKE2B f36fdcbb78bb8d7ca9d6b4c90da09a1b12bf9f4d95495d21c4e54fc99e70919ce9738906fc88b42d9fed041b3101ca847545032871b5945f7a0d611b4d1daa59 SHA512 e7b7c755cc449d6a1bce30aaedef06ea862dd6e1c67805c6f2dad8bff162658e5fde5e12d52c2397fbd2ea925a33086f51e0571e3aa2b1bafe5f8d49a6161939
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jsch/ant-jsch-1.10.9.ebuild b/dev-java/ant-jsch/ant-jsch-1.10.9.ebuild
index 1cef81e7b4fd..5ba0611ed55b 100644
--- a/dev-java/ant-jsch/ant-jsch-1.10.9.ebuild
+++ b/dev-java/ant-jsch/ant-jsch-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/jsch-0.1.37:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-junit/Manifest b/dev-java/ant-junit/Manifest
index 4f83918f7292..b3775490a3b4 100644
--- a/dev-java/ant-junit/Manifest
+++ b/dev-java/ant-junit/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-junit-1.10.9.ebuild 496 BLAKE2B aaf3d938343f4fa82ad5021630b602fc004f84afa73784efd8c65d5ba36f7fcd41e111499f14731a897d6a78261c62ae34087cd3b3dffacb84834037b83e4fbc SHA512 2d84e047ac431b74c31fdf337cbfb3c68a1da851bc54b518625619467faec3b1cb83a3b299df4d4562928d0a39ce4000486aad14968fb80cc92213528f57c854
+EBUILD ant-junit-1.10.9.ebuild 485 BLAKE2B fbbf4490dded43ad6e9ff7e635c2ccb08f3bbad969fe9a8a5b498d7a640af1f338314075074047cdd37fcd88eef0ebd4b1b66fe76778ed13dc7a47b8106ae03a SHA512 339b14f3561983a5872a54a91dd39d01b91ac4c4e1535a2fa7f1b46b41be20f7d17ec0ad7327da5f125aaa632bd0a9df3067019127e26ae69f75cc515a36cb87
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junit/ant-junit-1.10.9.ebuild b/dev-java/ant-junit/ant-junit-1.10.9.ebuild
index e02101593cf1..4e1f18fac3fc 100644
--- a/dev-java/ant-junit/ant-junit-1.10.9.ebuild
+++ b/dev-java/ant-junit/ant-junit-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-java/junit:0
diff --git a/dev-java/ant-junitlauncher/Manifest b/dev-java/ant-junitlauncher/Manifest
index a794def48b67..39d4e7cd590c 100644
--- a/dev-java/ant-junitlauncher/Manifest
+++ b/dev-java/ant-junitlauncher/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-junitlauncher-1.10.9.ebuild 346 BLAKE2B 391e4443a390204f71ffef2e0513a8db4ff4aee5861e7625f016f7aaceda1fc97769448a990801d67520fe7f0833fe3a82cbfeaabe1a124cd0375e1b95d46368 SHA512 d80ea1121230a5f5a73a3de8b1a9f84cb5c90e5cae09a715d4fbe15db1fceefa65d33b5c93fdf5cc3314de062463ff54f1e7785677dca006a3413eb897ea8f9e
+EBUILD ant-junitlauncher-1.10.9.ebuild 335 BLAKE2B 200bce03dc484351e9a128205ca61e80d284f8d14d3cb46dff57e181d6d7055461d6968e88ed88d111951b7f80022192042cc7745964e4903075bb85fc839fd4 SHA512 baf5374c4d7388eea101be42e2ec569dbc0cd0641e59a4f5e03b920e9e8c1b109378404d74a319d935668cb30f02187acdca007830805e85d52c8fe7ab99a15b
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild
index c60d0d72e416..678678ee3bb9 100644
--- a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild
+++ b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,4 +9,4 @@ ANT_TASK_DEPNAME=""
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-owanttask/Manifest b/dev-java/ant-owanttask/Manifest
index 17da93cd3ff0..582590f00729 100644
--- a/dev-java/ant-owanttask/Manifest
+++ b/dev-java/ant-owanttask/Manifest
@@ -1,3 +1,3 @@
 DIST ow_util_ant_tasks_1.3.2.zip 1170518 BLAKE2B bf0792c7ea18f8122a6a8755d976e109bf0d4bc6b26e8ae5dd7e9bdc8d6f1e16e4e0ff40ded79ebb571b57a433e96dd9e259843091be1efa18ac4bb227ea8e89 SHA512 c2ca84d34864b075c39e9699ac1a41c2980615ea6d813d007ee503fe19cfd5c869cdd0f6be27cbfdafc33aa49c32022b99ced2387381fdb6816925957207a603
-EBUILD ant-owanttask-1.3.2.ebuild 872 BLAKE2B 2f271ca7df182e8e98dbbe7b6e1e5b8a5d8ce2b412e11e70f755433a8d57fefdcc44460cb20d3b748e34c010aa0d61a491f1c3d6669b41b788014be7bda83ad2 SHA512 b7eeaf61829e0686a3690e11c19ebdcc17addee299a8def640ce0a2229b93c7f6c5f13938ed4e2290539ac09e7f0c39b05007465c0660e9e1cf918dc10a47fa4
+EBUILD ant-owanttask-1.3.2.ebuild 858 BLAKE2B d0daab63fbfa81c27ec0cc32c961bd4ae48f2c72d7db9ecc7c57d6bb4c4e213a13cd8fb3c08e0b26a99db751109448208fa574122adab30f5fb052c7e24223e0 SHA512 acf214fb6afc3174c15ade508d414ea9af08fb32430b83898cf3e4f2286441b785e475c6ed849923acd32b97cf37828c646d55b1cc73859adebd17ce48bb3249
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild b/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild
index 0a15fae99035..86f6b6170ee6 100644
--- a/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild
+++ b/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_${PV}.zip
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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"
 
 COMMON_DEP="dev-java/xalan"
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/ant-swing/Manifest b/dev-java/ant-swing/Manifest
index 4f59d17a02ed..cdc1069f9e2c 100644
--- a/dev-java/ant-swing/Manifest
+++ b/dev-java/ant-swing/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-swing-1.10.9.ebuild 413 BLAKE2B fe807fdc573239981ef98c58766b37de0fb209cf04c29c3a8e1bf418460648d1fd484deb295190e859abfba5c76c66c44d7fab970cd38e76a2ecfa1e34cc9a53 SHA512 ec01716885802298afa399a52cbef744a789c5f214db8caea6faf7510cdaa1d76ef98fe524f4025d5933295aed8455553024dc28515928ea0c2512e435ce48e0
+EBUILD ant-swing-1.10.9.ebuild 402 BLAKE2B 737ab63364481ba4acb2883e178b245574098dfc756a9e1e55a32a42e7c97d40f657dfa3751e1c15c281c2518f6a2d789129a0ab6ef9221931f713cbb1fc2f3f SHA512 39fb44ef7d885ab788563111a2eb58d82481feb57944fba1186551997cf4366a89bd05f6e3836c8757e58f848e1bee06d46946edfcee532c70a22548a4be9aa5
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-swing/ant-swing-1.10.9.ebuild b/dev-java/ant-swing/ant-swing-1.10.9.ebuild
index 379248be9a9c..c5ca8815b298 100644
--- a/dev-java/ant-swing/ant-swing-1.10.9.ebuild
+++ b/dev-java/ant-swing/ant-swing-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,4 +12,4 @@ inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for Swing"
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-testutil/Manifest b/dev-java/ant-testutil/Manifest
index c92deeef4d7e..2a5aeb71575c 100644
--- a/dev-java/ant-testutil/Manifest
+++ b/dev-java/ant-testutil/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-testutil-1.10.9.ebuild 968 BLAKE2B 9597a535a9b1eecde71073494284aa17f12ce7f428f6cdc64bdb31c34c53e2cd149fa60705528885507f45ee1c37141a0039970ba0205002a82bfba90a90d14c SHA512 31b9149420d6042af0d3c4aec00a6891cdc9b7f225cebb9caa4c6a6870913325035e4d89161dd9fee391ce81e4472de8a0a6a7bc277da93dfec2c1899cc58e1e
+EBUILD ant-testutil-1.10.9.ebuild 957 BLAKE2B 33143dd8f3a2798938d5716a6a81e88f0fcbf3239b2371c02e985e274e2f05bbf0092130deeb38600561d71994dd4d7ef4a4542c3c17a8c529f5b142e7dd985f SHA512 df27bce70918e1247d9b09c16cfac2461e627e678ff24af12c8267dc9674e5be29d1ee0b994f3efd04d9215fcb211f2e189f27d1be9af78ed745c6c334e511ba
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild b/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild
index dce4d1840353..f9e728d3b51d 100644
--- a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild
+++ b/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ ANT_TASK_JREVER=1.8
 inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND="dev-java/ant-core:0"
 
diff --git a/dev-java/ant-xz/Manifest b/dev-java/ant-xz/Manifest
index 25ad8a0402f1..e3048782193c 100644
--- a/dev-java/ant-xz/Manifest
+++ b/dev-java/ant-xz/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-xz-1.10.9.ebuild 462 BLAKE2B 98a7e96e154739b13716b8583b6279115eac954e86aa9bab9535732713a43c6c17e3ee4cb7e39e3bd6421e7687dd3c080526fa85c03a7e54e6fb25bc9351efc8 SHA512 4d21618ef4ce885eed4b063543fccda4d94d4366b36848080cd46fa277d875d3875101c7b80825a1cdd1721108bffa61c63585ae09813459b714551436d3834d
+EBUILD ant-xz-1.10.9.ebuild 451 BLAKE2B ab808bd633681eed631ed613eaaab23dd693baf7f49c06b3bf78bafa0bf53f57499212fe99e049b7017e74dae87d95e6c50a8bbb4d60370ddf080f0a4b7eba31 SHA512 ac0b5edd5f86cd8f98c512e85394f56385ea9af9eeeeb5740ceb16031497a6e78179000bcd4a0e5b9f4ca3b67f5041e87be9313cb330479f9685ad2f3183fb43
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-xz/ant-xz-1.10.9.ebuild b/dev-java/ant-xz/ant-xz-1.10.9.ebuild
index 91ceb9835ab1..5cf55ddc8731 100644
--- a/dev-java/ant-xz/ant-xz-1.10.9.ebuild
+++ b/dev-java/ant-xz/ant-xz-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for XZ compression"
 
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-java/xz-java"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 7e05ff7f3512..078ec4c1c363 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,2 +1,2 @@
-EBUILD ant-1.10.9.ebuild 1642 BLAKE2B d31e2db667b00077054a439ccda45dc2926275438b3f8af2a28509001e21352dcfcdc56f66acb8a59e2938b4f9688a00fa7fec25d98bc10924a43e7be1dd990f SHA512 82188aefc10f3f00c4ef1720bcb94015b8594dc38fc4bc5885c6092c2bcf0379486664510415f2687d2afb972253d808b5bf61d2817daf8da2f00576314262dd
+EBUILD ant-1.10.9.ebuild 1631 BLAKE2B 25012a0af0520d666de8edc1a5288de72084d932d61fafa7e8f921c7fee8ef6774cdf86b4a9233657240980f0b9f1105aa5b01488bf4d63a840da224f5fb27fc SHA512 2563e24e69e6a66cdb5e6090c3461e52c6f3d73d1214031d294a84bf1eed7b7818cbd305d4cfce534d7bea1e67a930db7ccd87fb54e9bf9b302b2c25440511ce
 MISC metadata.xml 1540 BLAKE2B 5536e37e8d4b18a8b744b88968c8f5f87973dedd25dfc5a0c96202bed4991034e93b57ad9a8737b5dfab6526adfa1e563768f08c6b85442f87f0b4ebc87345a4 SHA512 651f97c959e8322e51a7d937dd5886604e3118249907cbd7c0695e65b91b39c22539aeac2870c4f8ffe49e6f4edb8736459eb68266cfc4cb0baac9e439d0a4e5
diff --git a/dev-java/ant/ant-1.10.9.ebuild b/dev-java/ant/ant-1.10.9.ebuild
index 20c1a2ead30c..335f26ca2924 100644
--- a/dev-java/ant/ant-1.10.9.ebuild
+++ b/dev-java/ant/ant-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ HOMEPAGE="https://ant.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
 	+jsch +junit +junit4 +junitlauncher +log4j +oro +regexp +resolver swing testutil xz"
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index a5c26cd476e3..58308e41c2d2 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -10,10 +10,10 @@ DIST antlr-4.5.1-complete.jar 1478820 BLAKE2B 7f6ab8d1bad6b75ede4930fe594a3302bd
 DIST antlr-4.5.1.tar.gz 6158475 BLAKE2B 17cf84a60393c786d8b8addd93b87998178cea55f2a6bcc4ca244655a6d2aacc15226111b00fc0a8a6424f8a7c6eb3bfa49172e3b2149714a5c0c6ad69943cd9 SHA512 949306b0ee87a0c002664ee7ac0f32c43385c501b4e28f181417559ce09b07cc12a8441c3bb81f8a72feba3d4ccc693a3c03bcccad7fc81223cddb19e10468a9
 DIST antlr-4.5.3-complete.jar 1485121 BLAKE2B 84d41b17bd30dfad7a79e9759802c76d986299cc592c7b2c859225ed00989bb2709b14635ee40c8ecfe79e2441ecb697b2d17b7e6e789a7549868b93a3876f77 SHA512 53dcadf3007c9bdbeb391ea72fb9bab7c086fa0b9d1d93b83050b2ebb726c2f52743b5ba944c68f6da513d915ab5e8721676d74d823c32484928ccad2a28f1e4
 DIST antlr-4.5.3.tar.gz 6760401 BLAKE2B d436b4a964c527e230912a0ba23146af199478570cf5491eadeb5025e814642658cc71d71e6a09b5df3cc18e9b8991abf930cab70677d117a112e0922e046e07 SHA512 d0e61baebb338e5e4e8eaf87aa6ef52a568ec51bc86bc07acf8f82be0c173ea4f0f85978dfd034c2642505888c0849663f6b6fb030c4c19e0571f29277fb54f7
-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-r1.ebuild 3040 BLAKE2B 65aad4afa41608181e02aa61a43cc5b4cc9b5ed5131bf6a7ddd57ed7e3655514d2bbff5ec1343f8aba38788aff04ad25126d847c4f41daae63a089acb70e7f0a SHA512 f61b63f4907050c442a963ac35227714985e401b8dc0a6f8ccdaf4d29a3df0cf3e538774b1363ae765ca2d4aa5db199ecdb2841cd4b4eefc86ff9e92c95ebf0c
-EBUILD antlr-4.5.1.ebuild 2478 BLAKE2B e36feaf0bf7eb33d4e5fcc7e1f9c498b937e037a5a72e2049eaab57269f09dc20cb7e9a5ddb57055611bb7e1aadeb91173129fda355351d3e26e12c4db245157 SHA512 51e8489bb173e237ba78be7bd9b3667a6c5522583d64ecf88b902b20006c089e4134bf278369a30f32507680ed1628321c672b06f4dacc7e9f89d0f1caa26b11
-EBUILD antlr-4.5.3.ebuild 2488 BLAKE2B 04c6919146076e7340c99045b99ac44f0afa0bb46ed26e03f644498ebbcd3d925f6468eb019ebcce23eae0afa3e969a1558668e8939da23877cde5d249f7a99b SHA512 34671e7dda01baadec294a388dca769e6e05710a3522f61bd9beec931e57c5b9d627bf0beb36bca06aa25cc36af485ec0bec53144437712509f40128b9377439
+EBUILD antlr-2.7.7-r7.ebuild 1076 BLAKE2B 49124667f298ebfad5989d19972baed8e3f66c0cdb6ff4027d4c0b1692430debbe2844d87fcfd04d885b728aeaa38554337bff7a1ec227151f43fccdb0559653 SHA512 b9fe195653c78a3bd7ae0ffcee143ccd8bfb770567fb83fe9ff9e7e2201c0ae4683520addaeddd759e0f82fcfb034788c1e933776b3d87e0206eb05cc5f60b08
+EBUILD antlr-2.7.7-r8.ebuild 1087 BLAKE2B c6bdc1f7d552392aa67ef176906a1166015198d5fd2ae67c1c323d664f3313d7333e8669a2b5f354953b7618045a1bd6d9a5dc733c393dcba00732b5745c6852 SHA512 01d07904b06d66fe88467846734466ff8510c0e3c6bec84d03f52ce9db38bbc2e761157ccb5480a59647da4605b6093673c0d71ce0d9290fc545a2251db37b5f
+EBUILD antlr-3.2.ebuild 3258 BLAKE2B 63c9e7d7506252e47f456f531bf76925af20d9d90bf1ac76f7b2f7f65e99879175a040ec4562f9c6fc35723e876a7887b3a053b52465c9fa82bc572533eafd20 SHA512 361f21b60d25073bf153dfaaf0313a578ce34e061695e568f8b60f530450b73bc3dedb6ad1d8e934214d1fbe5855e7d88cd7c991f52f5018b6de6eaba323c03a
+EBUILD antlr-3.5.2-r1.ebuild 3029 BLAKE2B 2fa039df22471e9ba12588c1d100e0fc32d5e28b0ff523ba37c85f755205433c52548e4b6db40f4400c38a048e5b071753950918520e21e67c6399084247de15 SHA512 ab3b66ad840f08535063e45f51b9ae5415a61b7ac41c685d2e8e84512892f538969fac0ef2caa50831c4648dd0211be7df8a66c817fa6c33339cb499749d01c7
+EBUILD antlr-4.5.1.ebuild 2467 BLAKE2B 176f21576d433466f221190f71bb27a7600904efef43d182a025698e30420345b244f5c2e353d49fb25937bceca683aa30e18d5ee3b0b44c5f89baf1e8bc742c SHA512 74174f4ee6fe803c4e243be51562339e530934a6aed38a8024ed687fbc888b2f01c942558e8de90d42f28a5ae0801d95b148497310304466686c087cd4eb8d7a
+EBUILD antlr-4.5.3.ebuild 2477 BLAKE2B 35b5131ef9c787d3108c8fcfc7ae661b36a980768d506ab82af401b416e2be7eaff49d77da211dbc82efdaa14766996539950d7096641af6be0583d450f585f1 SHA512 4023335147de01ca8606b168af681aad5a860fde3729e93bf02ca0cc2be80b9201c00105d63ef904c13707ba66f9a672b1d94ec134297c136817dbf40b1653d9
 MISC metadata.xml 313 BLAKE2B 211bde607161c54e23a30950b17cda11291e84a9f745a2c44c17c7c224ad8ef309786ec4952f094e90cc569d86e0186bd2fa426fc1de6718541e207be12c3fd0 SHA512 01f11b9e45bc3c331d445213704287f1f034087930d4b55cbde700a483dcb64260d4805a4c2ec3686a99b59f3225999409d499cb63a40b3d8278d8a2e6213f57
diff --git a/dev-java/antlr/antlr-2.7.7-r7.ebuild b/dev-java/antlr/antlr-2.7.7-r7.ebuild
index c999d7417a30..dfa69c648825 100644
--- a/dev-java/antlr/antlr-2.7.7-r7.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.antlr2.org/"
 SRC_URI="https://www.antlr2.org/download/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples source"
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/antlr/antlr-2.7.7-r8.ebuild b/dev-java/antlr/antlr-2.7.7-r8.ebuild
index de3952a26d09..3ca31ab70cf0 100644
--- a/dev-java/antlr/antlr-2.7.7-r8.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.antlr2.org/"
 SRC_URI="https://www.antlr2.org/download/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/antlr/antlr-3.2.ebuild b/dev-java/antlr/antlr-3.2.ebuild
index 594e6c4cb1a1..0d962209926f 100644
--- a/dev-java/antlr/antlr-3.2.ebuild
+++ b/dev-java/antlr/antlr-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="https://www.antlr3.org/download/${P}.tar.gz
 	https://www.antlr3.org/download/${P}.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/antlr/antlr-3.5.2-r1.ebuild b/dev-java/antlr/antlr-3.5.2-r1.ebuild
index 72eaa9b7c8be..922af348137f 100644
--- a/dev-java/antlr/antlr-3.5.2-r1.ebuild
+++ b/dev-java/antlr/antlr-3.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/antlr/antlr-4.5.1.ebuild b/dev-java/antlr/antlr-4.5.1.ebuild
index 4949c2284c33..4c411e077bb3 100644
--- a/dev-java/antlr/antlr-4.5.1.ebuild
+++ b/dev-java/antlr/antlr-4.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -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 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 b250b7871a00..bf5db82387ef 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-2020 Gentoo Authors
+# Copyright 1999-2021 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 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/avalon-framework/Manifest b/dev-java/avalon-framework/Manifest
index 16c8049f4ef4..cec769b9d7a4 100644
--- a/dev-java/avalon-framework/Manifest
+++ b/dev-java/avalon-framework/Manifest
@@ -2,5 +2,5 @@ AUX build.xml 1838 BLAKE2B aa6ad2f58ef4bc96837c5f616376e2bc6dca2b338d0bdbff575b4
 DIST avalon-framework-4.1.5.src.tar.gz 99475 BLAKE2B c57c89661042137dd0f5b8d6fe4295030a861499b300d84a8c2dc6364d6bdca443cda96e954816da0351fda3d3ce70d47734656949bffba8d823f7e1c9f4ead9 SHA512 7a15dc2f7c691d7daaa5cbb589eb21e23ef8d6232b5bd1b6b3bb1d6962f4a4dd2dff0c0a1793309d7e8f3aaf4e75de65a9705431e1103c2e33c575770131471b
 DIST avalon-framework-4.2.0-src.tar.gz 68887 BLAKE2B da71631548bf725315c57439c5db017107d4dac529fbfdd59f68da6b97faa8b9a78fc5d89b05ccd05c7ec68b2de05d286ece6654137278b3e8873c78c65adf6c SHA512 b53dc20ecec058ef0b35a626bea6e04f85f6ae8b3645d7dc5c33c194db49b42071093cd305ef718f925b948ec1b885b2a0d8bec534592f97dc48d6e93db45671
 EBUILD avalon-framework-4.1.5-r2.ebuild 912 BLAKE2B 21826ee57ae0b7416c9f788023df6ddef04179b7f57fb92c6cdc95996e44c89f2c8a3a5e0b447c41484aba6aa512369a652dd73987911165425de90bba6516a5 SHA512 f9bf863f6bddf52aed8b471916c6e4ea97dd6140820081235011ffeebe1331c337deb11762f1f1b0457490296827532dcd173ab352da732c311ff02ef795b992
-EBUILD avalon-framework-4.2.0-r2.ebuild 991 BLAKE2B 6c5478cc63638ae97a5d0c008f8454d4eb33f00520d118fca12e80d014326bb7c1b9a8d8a51175f501c77bf481c3e2c17b9b8b7adc4dd780104dcdbc3991dc93 SHA512 7b4750a7c28b91796c7ead3731b3f8220d399504eb9c7ab3210a5156efbe4e4685ae70d39722e9e3c48534b853e62ea53119406ae4cc0546305f85f7efe2c35e
+EBUILD avalon-framework-4.2.0-r2.ebuild 980 BLAKE2B f370e2378c75139af859c0095ec886fa35053651b2425e684a788b69fdf4befb38d55bbf52c3e211fb526cc0b7bda87a5335e43a27baf04d17ab307f0e816c20 SHA512 00d74942a47021077d7bbc7a6175e68d0dc2e9e7e5f16f1f219edc7fdecb650c96367ac8081ed9ee24cd50e39c0dd5b4a6bd20362b3e7d5964f7ed4c162781c6
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
index 7d691bd713eb..71b22b19ab46 100644
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.2"
-KEYWORDS="amd64 ~arm64 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 ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 CDEPEND="dev-java/avalon-logkit:2.0
diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest
index beb1269a4f67..4635523d3952 100644
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -1,4 +1,4 @@
 AUX avalon-logkit-2.1-java7.patch 1155 BLAKE2B 8e5a7756fed565d23cb7d9265171ad7c42c7c1a1f1f81284461aaad1d85718d77a7767f51d8e5cc7a3724c2a0b15dabc541d1c6c8fbfad670fe56765ac3beda4 SHA512 155bd7d65a2eb59528067605f1c40b1f176228af2fbc11f6560ad929cf5344d74ba79bbd58c7cb35b6065c74ec4e579cea590c0cc23082979d79cd70ce8414e7
 DIST avalon-logkit-2.1-src.tar.gz 60218 BLAKE2B 1c35b38a22d95cffabb19e099d42697adf7aa6ad471f6cb62e02a30b6612c8405b9f7473ca61ea4f7f9c1f3b1ece6ee68f7ec711b79672330db3ac9e57642e0d SHA512 9977a3a172ca4fb5c3ad1f623ff109214f71900d2e244f175cc5d140f5f9993caca7e5ca3220728f18a1d6242d11a48990f9ce0150c36b7a9bb10a7a6d5a905a
-EBUILD avalon-logkit-2.1-r8.ebuild 1403 BLAKE2B c7886b499be92a24d299f86c040709a387caa925fd8db8c0676d2046b9e5a80053ffa3f32fc197dffca18829de1047f56c2bd048ccc7d41c87d029b42cfebf8e SHA512 132b042be721384a2686cd483aefcfd10236c58dd8fc0560d415d6f8fd3d5b913f67eadd6eca1a689cfce3a244f7c8875b7f5c2128f1d53c8612dcd8ae21a255
+EBUILD avalon-logkit-2.1-r8.ebuild 1389 BLAKE2B 7440cec67828be34bb23d118077063c83f4f6255dc97179c0582b8faac488648d064aa8e54f7f674f9f7d0c0eba8521644a7c86bb4443332680a73320cb9e17f SHA512 35e8a04aeda74b52514cc3272647199d192b3f16b273896fdcb2150359804e2c1ad09388a86a60886e9ae091291b936a3fbbf01682d5d71e0e0d427dcd64ccb3
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
index 4db25f78e353..35ac0446b01c 100644
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ DESCRIPTION="Easy-to-use Java logging toolkit"
 HOMEPAGE="http://avalon.apache.org/"
 SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz"
 
-KEYWORDS="amd64 ~arm64 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 ~sparc-solaris ~x86-solaris"
 LICENSE="Apache-2.0"
 SLOT="2.0"
 IUSE=""
diff --git a/dev-java/backport-util-concurrent/Manifest b/dev-java/backport-util-concurrent/Manifest
index b492fc930a0b..f313d09c636e 100644
--- a/dev-java/backport-util-concurrent/Manifest
+++ b/dev-java/backport-util-concurrent/Manifest
@@ -1,5 +1,5 @@
 AUX backport-util-concurrent-3.0-notest.patch 491 BLAKE2B ea587be0736cd1aa4fcbc4095c31dd321816cbefa0cec4d6f0c8969e24e9e96038b30db4baec0d386ba18828cafad0c2d084b48d69c7db77414dd5282f1197f0 SHA512 f2f53a87283c1a6b13e360ba0140a93b0580a023cefbcb5dcd8658ddc7e80c401878229a323416213368f493226b445b5896bb0ff51f1a2bd95ef460f4ddd080
 AUX backport-util-concurrent-3.0-test.patch 380 BLAKE2B 5e1e437564035e652d6c41f8ab75b0589257e955aa06f2b83d8fb488ec7f2d7c4879fdc1556a47599231bf2ab1497243cdacfb7f64f5142bb4728265c296790a SHA512 01ad87f71b07c25193faf1d67de159233b2b298ef4ea31013f3af8d326a09b83f73bdbcfa5629f5531ffc0a0c02b20843c11377f1260448a9758be05c64420fe
 DIST backport-util-concurrent-Java60-3.1-src.tar.bz2 622882 BLAKE2B 49dd1065fb80d697dc917aeff1bf653a1c82bc24e3edf6d1eb272f3cee17130a6db20f562f40e7911a6382f8c545bdf37e1ce34b69a6a7ddf5a569e114a78e87 SHA512 caef9eef43d0de5ee3d05a84b44d3d2f6bb9498bdc82105626bd2631494fcd0347387da9beb6000fe9c80efacbbf2c2c3603a97b53e4c74037eaf629d790cd54
-EBUILD backport-util-concurrent-3.1-r1.ebuild 1160 BLAKE2B 5cf10a9820525fc1b97808272aec07a9eb23c3a2b796d25118aaee113a930109b97025a4c6a23cdff8ba82801e12f44d48f8b8f879adeca7615bcd5993c12fbf SHA512 52802c3287279592a7647a210fc4b7dfcf50d91bb5e3f57e3600e21bf9c0848a19cc8889b00fd6709339305894f6059c0e53c14530553ff8ab0793396c15818a
+EBUILD backport-util-concurrent-3.1-r1.ebuild 1149 BLAKE2B ab3674b7ae8ebab1e80d2027886b09341a29f8fdf8d17a1a507b871a31eb60a1219e43e3008351f263bdd99ecdebc29ea5a0d400a1766ac437ad0a277c584a80 SHA512 165954565cd6be020313d38b88f30400b2d34e1ed866b74c7da650c5574c7ffa1250b08110d5a60f9123bf9b4cbbc65e32d6d5760777e73f4cdf3591f29c3277
 MISC metadata.xml 490 BLAKE2B 8c30e55ff1a4b70180d42e365d9eba3405a1591438e0fc801383b8a1ee65daf759b2544c1edb3b2a03cfe8f7932b5c4de8d12980c630fd5b625ad2f6a674c291 SHA512 81d2a6f504093869e765c56667feb53583a85c7cfe98bf12f571b2d4e202e5ab247e24b8a92ad5141654069d3a66179fbb28790781464dd43821ab55dee62eb9
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
index 397c69e9e9b5..eb44fa337d70 100644
--- a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${SF_PN}/${PV}/${MY_P}-src.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 898f4bb7e7fe..2291a414a752 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,4 +1,4 @@
 AUX batik-1.9-ImportInfo.patch 439 BLAKE2B 2d1c13f8ffa944c9f303932818b4df5b2c9c10f2903b67500971413e9e3460340b4c6d9bb3e84875ce06845f6646d0ce566a295a5982e88209bf692266dabbb8 SHA512 ff390670537fd631dbd0041a4496e0a33daa1bbd9390867285d2a817ee7794d19c0d634dbfcf4a1e777db072a0f1b6bc2b68e475bbe590bce825aa7b7d76f643
 DIST batik-src-1.9.tar.gz 16748072 BLAKE2B 4e23c0de3d56ba130c5bc9ef80a01549e8c11ab4db3b1ac5dae8525cf0a3a8b7f4df3161c12f1f0df9c74229aaf2034fb6c9c2f91b7fc7407a0af580d144e606 SHA512 96a5c16bd3d61ea33ed5013fd0b00f1724470d9b667f0f84ef4a29dcaaa19b1cc8ffcc92dc49767f4e29d77a47f99df5afca479336ac5619778b51a6fb6cd952
-EBUILD batik-1.9.ebuild 2608 BLAKE2B fafaccf8e95594e59b37e39d367a2461f01ab2c0c847d7482afa544e1c96aea539fef9493823510d5aa52ae0796d0b88d7937b023523f7f9429a852dd292becd SHA512 6dee45bb334ede236b28e376b68526d30c5347441c62687c9f2f062f888174ca59ebe382075df5d14e860384ccc103d1ebdc907dfd40d25d5e87fc78f05834b7
+EBUILD batik-1.9.ebuild 2594 BLAKE2B 831bd1e125ddf89158b3f7b092f430f4a5d478c5c820e499e0bfa30f9d972a713809dd527baf326e8af0f5ad518456abb751f40bfddc876cd29afbc41e24bb89 SHA512 913a694b467d5a853f5c5364aeaed6ecab8df869d1cca03f3cd81539be806a10d3eda65d40dc0f5b6655fa694a1666ffe63fccfdafe5ac74c74232484ef837b2
 MISC metadata.xml 449 BLAKE2B 44566acbbaba426170f7f8690216a45cb7809590fd62af0e87eef9cedb6caea2d896507925ec98ed278b90001f92cc38c968795a7b6fc5627c9c4e322da17743 SHA512 e437217b578831129aa80be572fd1044db0ee1c0afb0af0538dbed3e7d2ba739062eca68053426c79433ec03128ea0116a4a92be4d1946e20968be3fe89a4e02
diff --git a/dev-java/batik/batik-1.9.ebuild b/dev-java/batik/batik-1.9.ebuild
index ab95a4c9432a..0582d79cb471 100644
--- a/dev-java/batik/batik-1.9.ebuild
+++ b/dev-java/batik/batik-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/sou
 
 LICENSE="Apache-2.0"
 SLOT="1.9"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc python tcl"
 
 CDEPEND="
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index 322a141d85aa..dca6cafdd355 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1,3 +1,3 @@
 DIST BCEL_6_0_RC3.tar.gz 929878 BLAKE2B 05e2e307f226785cda54c06e80b47b8f738d2f5117deb4492cc758e4bfc2b046068f2aa7836336c26514f56c99525732c62acb02ed982e7f446dc254a5aeab3f SHA512 05ccf95ebf6b374fb112296509b4011d741acf2315b331aa971f8c3bc6be2f73b39592721a8c769b6b9d631e78e348c124c56f567adc2338ed5508d5ec3bed77
-EBUILD bcel-6.0_rc3.ebuild 1218 BLAKE2B 42a06568a7591d3fce18c6906dba36a7fbbe4791d9ff85c64c1d14089b4fd3b03e5b7741aed8f0127d8c5298f275dcf6c574bca08f3177167820a0ebaa8c3452 SHA512 aaa11d61771a5187927f70cfad4fcf3bb4088899d648ae7a7c0d59a37dffdd6387d2e5eb33cae8e1fe63555917f70f734264db51bb39cef5fbc558bd2976b745
+EBUILD bcel-6.0_rc3.ebuild 1207 BLAKE2B 99192e908a274cc224f30452a28edd6931f31a570204f51aa1023e6498e062476610485ff9cb2006dd54235522f52bdcd6dab3e7136d45855ccad845450ddf8c SHA512 ebab70ad29898ef6494147629cb08d843da4c566faaea64941e8293ecec8151f8c1ffd745d082d8155f63c008b4209202b887ee14423d3e7f093ed24dda96e14
 MISC metadata.xml 819 BLAKE2B e997d77649047065ba6102ad1e4c71a3622fb20544234f529566e665c6c97830bead40f81fb4664f3565225f07abb6d7829b9a6a9f2b7d5365c9fdd02572b020 SHA512 2dd8f3339c680fe11255c65ea92b2ad808ec4cb59d49b47ea533092119fef14424859368feee8ce94e7621a607ef71c4499ab78e518ce07886388def593e7281
diff --git a/dev-java/bcel/bcel-6.0_rc3.ebuild b/dev-java/bcel/bcel-6.0_rc3.ebuild
index ad7829dbc886..29554308da99 100644
--- a/dev-java/bcel/bcel-6.0_rc3.ebuild
+++ b/dev-java/bcel/bcel-6.0_rc3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/apache/commons-${PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
index 32aa2135d762..0ef8a71df868 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -2,8 +2,8 @@ DIST bcmail-jdk14-138.tar.gz 386478 BLAKE2B 2fee04eee66ab352aa08f72063e0088e61b2
 DIST bcmail-jdk15-145.tar.gz 483519 BLAKE2B aed9d4ef1ede10b97979652a012f18e45b7d4d597cb8b3ad168e847563ce14f7effe429b7f213adb77befeb144c4c3a279738b76718bde85ce04265d62ef8e75 SHA512 2d3232d5eb1cd75ad56a7316beb32880f3f935fcd3ed0a6cb2cc3e1861dc9f0bece0cbae53471760246505adb5c28328691eb82e11fedb0b160c1248d21c48bb
 DIST bcmail-jdk15on-150.tar.gz 221760 BLAKE2B 48c5d3b692295dcf2ce1e73ce58097b20c11cc353a8e13da9b8987f19eb69f1dbb37747e778e9323c170c0a3baa2ec7257681beea8da4e95343f71c5c6ed186a SHA512 91727ddc4bf932cfaedd3cb90a807b5fec3120e56fde3e5fc73bb5bf2e97db50a35a63e0b5e342fe29e4b974579c5cdd5d427d01c9dd8e7abd521ccd3d1959f1
 DIST bcmail-jdk15on-152.tar.gz 240800 BLAKE2B eb7077f742a8746a1ce13c37bcb936c16f49f6a5eec7421d8f3f93048091d123f416a732add10ed5596fc150d3f129e6b216190c48f6bb1b9d226a0e2bf19637 SHA512 e7301991071709b5788e5a813ea765a5e59bb089104a031ca91a509036e7823b851f854e5f96de6a2d2ef817aad4435f78742dea3a9b1dbeb95a6cddf250619e
-EBUILD bcmail-1.38-r6.ebuild 918 BLAKE2B 76256eb09047227c4762af8e3c8c209a55b01b434b5c2fb1f4f484e4684604e264700b13efe1c0ca64935b93bcb2057d9113036b486642a250d588f946089782 SHA512 2a3500d4c8b22e574e97a4fdc6d6c77ecf641ce36080e49f2b1c693addb601dc0dd607828dbd3880293fb4b56257fe8d8d7781dbe304c31078be435b864409bc
-EBUILD bcmail-1.45-r5.ebuild 926 BLAKE2B 4f3ffde3e41a70c37d9e8529e881ef08d89645d78253cc63677ca6d699c6f2040c62a51fe2a158d3f1872ef4ccc81dc2582e4b84b7dedf87f79d80c4faf69863 SHA512 c4f846ae38bb7862ac39ae7472f5d25d1487cc67cc2731cc9bdf05e03d3356425f7e3e323650422b4f88f1e5d0dfb754465d8e953757cd1493a319ebe44a344f
+EBUILD bcmail-1.38-r6.ebuild 904 BLAKE2B da5a8b5f4dbd354fc1ebb0a27470e9237b9798a710f1ba19b43515e50b28c0270466a2db0db3d072d4eccc4016485a1b25e6360efb32ba3c54023d4d40378dd7 SHA512 a10aed0ceeed055a40df8dc7c900580484ced08a60363d4f5f138eda3cba8b7ad4ab52ac64306d6666d1b542160f6cf96d24dc47e90fca7be28bc88ac064f620
+EBUILD bcmail-1.45-r5.ebuild 912 BLAKE2B ef76eb9c860233cc5e90b84123eeca0317ea2690e03d09a90bebbd13adfdb0ec3c84335b3ea886306b64caf20b20460158b84d260417fc7f0496cfb75bc63731 SHA512 7936c6be67385f5d97d639697c4295bfa2c886c40b4271ab54cb58fde64233c22184a18ef1e4c247a016d12db16fab2d4a846e4e1039d545730bf22d41f03bfc
 EBUILD bcmail-1.50-r3.ebuild 1194 BLAKE2B 5e040e7cf8852f8398aa6526a11533a57340abbf324be1658ac57d86f805e6fd5d197f8ae154830d1c09fbc6d7310fa71f8e0d6ac905672646dec4b7b1a25334 SHA512 c22936d51fead1ad4a5350bd11614e3efe7ff7dcc2378d7047f1b5fc8e650c18b57b9649f199fc735a7314b010e7da6fd3040c80ad9e011c5fba581aeb10614c
 EBUILD bcmail-1.52-r3.ebuild 1194 BLAKE2B 87ccbd4cefcbd13e0677d550bb48f9295cb2afc501b91892138a2c96a2f2b82854168f7fec3fac27759d292150347c115ac025a3c596ae667a844637bdea9ec0 SHA512 4d30572e003a9de4553f41e5cdb70a777fdecf7acd420ee785cfdbd1f01c75b1b6188ffb7148ce5c5e52446aca8c54cd858b0627251b61d31ef7c3b0a7064307
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcmail/bcmail-1.38-r6.ebuild b/dev-java/bcmail/bcmail-1.38-r6.ebuild
index 7a441755a8bb..acac0b50528f 100644
--- a/dev-java/bcmail/bcmail-1.38-r6.ebuild
+++ b/dev-java/bcmail/bcmail-1.38-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.38"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 CDEPEND="
 	dev-java/junit:0
diff --git a/dev-java/bcmail/bcmail-1.45-r5.ebuild b/dev-java/bcmail/bcmail-1.45-r5.ebuild
index 88f13dd1b289..58f360aa517e 100644
--- a/dev-java/bcmail/bcmail-1.45-r5.ebuild
+++ b/dev-java/bcmail/bcmail-1.45-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.45"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 CDEPEND="
 	dev-java/junit:0
diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest
index acbb531e751b..c21d393c9ed8 100644
--- a/dev-java/bsf/Manifest
+++ b/dev-java/bsf/Manifest
@@ -1,5 +1,5 @@
 AUX bsf-2.4.0-PyJavaInstance.patch 1650 BLAKE2B ceb772a69d454d1d85e05486d28d13824724813e7875f731a165aaf97bdd7f0c006baa927e849f82de7fa16228c3de5847f8d59013142f8df4823a951b42c785 SHA512 7946622658473ef4cf6b5921f58d224f7378cb00c345a748653306d2648a89b5ab3ed68786d09bbb170b95dc657f7f55501013c854536d6dfd6b38e6a1f3963e
 AUX bsf-2.4.0-build-properties.xml 1984 BLAKE2B 6db0c1ca7f899e95a0728d61b79ef6c0a1320ee747b5479c9c50a7bd258dc7fee0b6b569e3813f323cbc694d405f9af1d269dd5370ac82e6eca2bde5072d905d SHA512 d262daec432d7a22c217e24089f22e4c349be0487fd00a2e6992e77770a3699e7e2b5977e2108455d7f73c31b372d6a73febdff2856e256f93b25f3781e11679
 DIST bsf-src-2.4.0.tar.gz 299749 BLAKE2B 41f3cfe77b1ccf6b78493df7f5f288b397234b3236977c4b7d2e6c85b330e40319474419f560eefa1632da4d0524593b8c3e0c66cd27b852749b1405c20df5a6 SHA512 a1e7564fd14abbf725fee75c4b0ba5f92d7eada0e242ad05897753bb4afe639d859c42cae1d684e8dd9151409d4cc68e1a422a70bc74d8016144cc30d03a2d43
-EBUILD bsf-2.4.0-r2.ebuild 2706 BLAKE2B 03ab668138f79de45283b5ff7e041a8c4f749d11c9ab4448ec310b2a0eab44095972b320108c5083c01a3162b2fce1d3daf0fbf5e0cdecb37102b67925e026f9 SHA512 f14c6867976af5d14416792036cf0ef4fdf9533a83e43545561a6a3cddd89f50cf44bfd43dd83d854f40cf0a49cdb5926ef9ad8ac7a6b7d659995e231f26db84
+EBUILD bsf-2.4.0-r2.ebuild 2692 BLAKE2B 5d10fbd9e260c34b2e2f8afa5d67a443e4fc91dd139fd9acdf3e807771c0a2b2b374577d05312992e6376250b55208dd60bfa5a9eeaf682bf97509b5a6bb2ca3 SHA512 dd1aab0cf9c43311a2eea954fc43b1da1474ba5688e23a878022e9c97877f1d895104c2b15fdbe7de9b6426d5ec8cbe49a54508b9b1499b22bf411d0cccfcb60
 MISC metadata.xml 903 BLAKE2B 65b2684054dd53636f1fddfa7b83c5fc9bf9c10253f12d426a8641fbf431418c24acaf6762e02159f5a2f3e1bd3c16fe97d4b44093ff04a518a79d2645f11515 SHA512 f55f803d1d0fc7a1ce20ea5d46ee89afe46b738362a2b78adfd5f6a4e9d09360f3522de148c56a9b2fae9370df1ed003611d7b68b8ba8e2e4cd7ff5683696abf
diff --git a/dev-java/bsf/bsf-2.4.0-r2.ebuild b/dev-java/bsf/bsf-2.4.0-r2.ebuild
index 66799c831bf6..2cb3ea0c4a21 100644
--- a/dev-java/bsf/bsf-2.4.0-r2.ebuild
+++ b/dev-java/bsf/bsf-2.4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ HOMEPAGE="http://commons.apache.org/bsf/"
 SRC_URI="mirror://apache/jakarta/bsf/source/${PN}-src-${PV}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # If you add new ones, add them to ant-apache-bsf too for use dependencies
 IUSE="javascript python tcl"
diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index 3ea8f9efce11..8f8ae15b497b 100644
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -1,3 +1,3 @@
 DIST bsh-2.0b6.tar.gz 1720334 BLAKE2B 7ade7d35ac66dad8c79dd2cb541c8851b321601bc6239f4d82e6b37269fdefc5cfa5efd1198f58030bb9dcc4712b42c1ca07071f0b042a59ebdbc4168e472fb0 SHA512 3d4458153f5e2a3b30d9afd79f0fe28862effa8e490fd1649d435c03bf90b060c255949a49780afee95069da4e8e8d2e4e2c5d979908370a525b3ca9a396458c
-EBUILD bsh-2.0_beta6-r1.ebuild 1314 BLAKE2B 18c385182eb1ca8b721b97a3038503302fe3a0b4b62139d7e605ad448fd3688bf88520631dec6d5079a4a7851e8bca6278acf8c58797be6024db7160809760ad SHA512 97efbdceef57cdd8e7154fcdb2109bffc5ae0c9acb0db298d57b1e6bc44a67d8f2a87ab03ceb3e4cf3d3f2a0bb757d946acce83b909f9d9be2a97bcb00f6dbea
+EBUILD bsh-2.0_beta6-r1.ebuild 1303 BLAKE2B a74bca95046e027ce0f462b559ebd8c679545d034f3b4057759e96b32c61898e5c707444e40965e2b0e7cd5df7e4c78b97eb68e419305d18df48c4d62694ce18 SHA512 847ec48e9c52470178835285f7cd1b575cb73af4f206efaa9007adb6d4306057aea26516ab5f804adf379ddf2d12736b00831b562e200743f245dcd804dece1c
 MISC metadata.xml 330 BLAKE2B 4295b9afc957d9b69add3267ff62910a7cb8bed9b918dec04d0f56612f452b669639462479e9627c2fd451977c4f74b2ddbf031b395e34e11a0af34a70405d8b SHA512 5c495c72dfc5d55c63b0af0740b0b82306e047817965a8c095dc6ae89324af842d5f8ccaa218107ff715544051e9c984fd1997ca11786a9c0fd070d72441b7be
diff --git a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
index d98757feaf2a..6453015fe973 100644
--- a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/byaccj/Manifest b/dev-java/byaccj/Manifest
index fa135d9c2104..be354a6b6c29 100644
--- a/dev-java/byaccj/Manifest
+++ b/dev-java/byaccj/Manifest
@@ -1,4 +1,4 @@
 AUX Makefile 2003 BLAKE2B e57447ec26975954239e92509fa1491fb31235a150d56db7fdefbd4fb61bd53e13df5d0b6157843c094ff8b691de00515e92fdf4c95c9ea6e71fc122c4d27efb SHA512 d48f81fcf89ca5f6524572b75dcde4866cea5f434059233c234a664f56e80c0daadc8f314711cb9c55430a947cc9dbf48f4a0bead0433da5b333f5fd73fcbc68
 DIST byaccj1.15_src.tar.gz 53646 BLAKE2B a57cdb85253f2ea8485c05687222cf99912494841cdfb6deb13d80d49f87a3dd8f1eb3350bf2501c7c86b70a198415e339019930301bd8d2a770e10ca9bb850f SHA512 6423ecca70d21dd0c1dd8366361f6c4420536e099090b18738013fbb6e8e0710ee739e51dfd7f603a64f8761f48cdd1d8dc7844d1b5ec6b792535254d290addc
-EBUILD byaccj-1.15-r2.ebuild 685 BLAKE2B c848cbfd8225c810e4a07dbe43ccec1cd751fd5a8c3ca4f3b17f3f68cd5fe4e605ec8b91c9746965a765e936f036b819ab09fa81af774f70e4a57df804de1a55 SHA512 059e5e1b0068a1cad2fc2dc947862cf347da27a7c4ba76fbf0f251310b6193270e30095f194fb9f7f99402773bfd40e50e79310aebafc904ea6fc898d1670c7c
+EBUILD byaccj-1.15-r2.ebuild 674 BLAKE2B 2a8ac5a59ffc24078ffccdd726a06adddf5da882c2db44008c11eb193d21464395bec9d1c6a521a180b05429c038897c557cd6d76cdf6403af0fac9ce549d749 SHA512 af73b399fa6c1eb54442b4596afe51b47814916fd75605b298d41a880c191306a117465336287893b164a9ce79608cfa8b200252876c9de878aa37c952db0f0c
 MISC metadata.xml 312 BLAKE2B 1148e4e9d86c4155c8413261aa2bd091a462baac98b22bbe6e7d609088c5dbe3fc3d0f8d4d537f2052c87571c29a95ffeeeebabbbaa6a623559bc5ba463c6171 SHA512 3ce25507ed5012c2f4c4961a9a9b739b04762e0a34bef6db4202240a65e6c1212a459ab35fa1c680dea52928c88f88301e36abc780228fb4b3591a37b3cff749
diff --git a/dev-java/byaccj/byaccj-1.15-r2.ebuild b/dev-java/byaccj/byaccj-1.15-r2.ebuild
index 0acb95262191..ed88c9ebb229 100644
--- a/dev-java/byaccj/byaccj-1.15-r2.ebuild
+++ b/dev-java/byaccj/byaccj-1.15-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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"
 IUSE=""
 
 S="${WORKDIR}/${PN}${PV}"
diff --git a/dev-java/c3p0/Manifest b/dev-java/c3p0/Manifest
index 16e47112a13c..c7793f833f99 100644
--- a/dev-java/c3p0/Manifest
+++ b/dev-java/c3p0/Manifest
@@ -1,3 +1,3 @@
 DIST c3p0-0.9.5.1.src.tgz 839657 BLAKE2B b8cf89ecb5b3766852355cdeb234698b0d1d8327233152e2e51ddcfe4a6e3be5f0fe4cc12a70d0df90d8ead90b3506b405f267f83bbb4a2a0ea1ac9d86051c64 SHA512 1843696d48e68f6120a68c42f0eb60c342ed8d1ddcc1d78c500d85c3d7e5e48358d100ecb1e0efa192aba34c5d9221437d53c2a968a42b797ff84bc12db4a724
-EBUILD c3p0-0.9.5.1.ebuild 1152 BLAKE2B fe58ab3e84f29b2f53a49064df6ef04f2397870cdc7063c183b4a06d36d05aad82defdd24bf7d7f8c37ead28295e6250f080eff813917a09ac269f3286897d03 SHA512 749db00f3a6a3bf365f9a8d09ef453a6b972dc18dbe2b7710b313c4bc6c9d56fac95268f6bca40799efcee01693946a691f2d9165bc2d7df07ac7b133877d896
+EBUILD c3p0-0.9.5.1.ebuild 1138 BLAKE2B 7004df7dc46daa60676e330eb4d55db11710cfc5d63a376c6156e2099d384d7e6d88aa960b5096aa235086f4f275d97717332b9f823947942113027265c1ea9d SHA512 41cffb39931a0def7f702c761754ec6ec569ebf77b59092b2b5718e0564921c6554f4b7807b7f8562bab12e7a1cb760843a4dae3dab086690371df8bb35ebff6
 MISC metadata.xml 310 BLAKE2B 75764bb0c3ddf44fc236047688d00826ba32fd0df3eca79db98cf0c3379dcb2e2a779607d7bd1b318759b77a86b5075747a0d5882998de9cb8e829cb7cec761b SHA512 5b2e9c58158f6f2c1d912ff5f9dc6b25906b32aad32608927d03f61fd90b935d7988bf54fe32d5c86dd5410ada1f5de8abd9ac0d15e277aa7345149edc83283b
diff --git a/dev-java/c3p0/c3p0-0.9.5.1.ebuild b/dev-java/c3p0/c3p0-0.9.5.1.ebuild
index 70cde9d852e1..15e63cf24a7e 100644
--- a/dev-java/c3p0/c3p0-0.9.5.1.ebuild
+++ b/dev-java/c3p0/c3p0-0.9.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ MY_P="${P}.src"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/commons-beanutils/Manifest b/dev-java/commons-beanutils/Manifest
index e193abd1dad7..8ab6cc77fba0 100644
--- a/dev-java/commons-beanutils/Manifest
+++ b/dev-java/commons-beanutils/Manifest
@@ -1,3 +1,3 @@
 DIST commons-beanutils-1.9.2-src.tar.gz 396910 BLAKE2B 1324c49605c9640aa3eee5c016a43bbb45b1984dd49eeab8f9b7a4ef1c5284ff8869228dda51719c2e6b3576517fdd02018a4f36654efc7f92d3fb7432008d05 SHA512 cf43aace33eb91368f86445874b16d977e827451f1355bb00e9b33bf0707855b5d757b0d58ad617f3a7f86f9065e7c900907dd604ba4de5ae61473d40cb758a9
-EBUILD commons-beanutils-1.9.2.ebuild 1890 BLAKE2B f4c77ac0328f6d4b151f379901cd4cb958d1bddbb38a0bd64714afb6295ffa4c7d36c407b78a2ddb9a85c4bb1e162b2c3ede4d85bd822f312957ade3c34b8892 SHA512 1976d1e28454b6c95a7dd8bd079214cbc19a601ff04fb699b5d34dc2f0265e36623a6ea79e25a3cfdf53112cdc53084a2983e76a0cfe490fd8d72b8797734958
+EBUILD commons-beanutils-1.9.2.ebuild 1876 BLAKE2B abadfdf70cb32bf8385eca4096c188a020152fd006e95128cd6607683add92727bfc3d2491e3baad51f0d588f7346043604ad06a6feb92dd59beda2c558652eb SHA512 a0c985e6a3d945b5479e2e46a1c7c77090dd4756a23a75cdd37fb232dd826606a895bf8212fe29cbab8b4072592c5535eb56309877ad4961860f4f30211b5582
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
index 9391c5af9925..e487ab99a70a 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/commons/beanutils/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.7"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 CDEPEND="dev-java/commons-collections:0
diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
index ce02a002a09c..6846955e211c 100644
--- a/dev-java/commons-cli/Manifest
+++ b/dev-java/commons-cli/Manifest
@@ -1,5 +1,5 @@
 DIST commons-cli-1.3.1-src.tar.gz 145886 BLAKE2B 951dd516a2b80089cbd3029e456dec295adef12a6e2225a99cf3acf88cb7434bbe0ea3b2dd40190ac1cbbaaf099a88405ac7c4cd9ae096ceeb13c9a13bd0198e SHA512 b5c569bea3c213a1959ae698894f2234477a7a5ed246f8e81142041173f668802959be018011bce6aa2a5631081378e67d69eeba9136fa19c96193dbdf2a7d15
 DIST commons-cli-1.4-src.tar.gz 148530 BLAKE2B 72460ee073b4e8c5179da03c3d599cf04b37b5b3aff89e4927b07765bd879acc9ac56f52e7dee03214e21f7ba9e5af3adf54d2f943aebb266bfa9b4983ba0380 SHA512 a5db856f6154e4340aab1865e3b34c752c0dceb8063faa64740ed470d8e6b3e7782242ae51d6bb57a535a6d6dad2943cc3130d7202223b8f89b8cbecdc3d9d4f
-EBUILD commons-cli-1.3.1.ebuild 1045 BLAKE2B f319b09adecfd2fcc3418768067b742d5b5803bf8a81d4b3c6f7d3b7a39a61fc08c4536b98d49ca7c69fc084a636e3dfb2dc3cd278e8f62e182dc0754e06f7c9 SHA512 288e57d8087eff46b3aa61f17b54f7d45856e220af92bd7d245029d7014a296032880696c2536335c774fa6a85643591297b3ac8e0af15a706317fd51086d09a
-EBUILD commons-cli-1.4.ebuild 1048 BLAKE2B bc46b123e82de6e8842622ba63b808455990b7adb6fb1e195c7356482976d32aed17265e284d3acec9d9cb9b0a9ef9c6aa5c37e33b898bdaacaa221a11abb4b3 SHA512 bf38005a8e233cd5c8edb50c0d74ac9d8506b1d1d1e5101e0a083629eb08c89c9abddad1c776851fe76df0989110625e4e89e2b6da6ab355efcbc8c092783fde
+EBUILD commons-cli-1.3.1.ebuild 1034 BLAKE2B 3ddfdd24fab59fb465ca2ab32ec4e28ca3163c02dc2f8b12e0edbea07db3865a97e83bf6926bd05b06d65fb074eb0704dec986a7a58719ae9e306f057e9822ff SHA512 5c8220f30de277050e08dd7c967803f2632f0dae894f4dbe7bf2212f6723f520a810001718e52242005b5b1fc864ebb20da9b795a5096bbf1ff03aff7283a76e
+EBUILD commons-cli-1.4.ebuild 1037 BLAKE2B ccf5841b2c6b0ed25f25daf3b1fe067aab98814f7944ff7f343843044880b9df4699bddf5a7c6f1cacec3ed56514ab5a883828fa9d4eb070c8f5e8b2771b33b2 SHA512 83837a446eaac5befc6858d6ebd4645608055718a68470a2471fc7da59f47664edbaf9709cf674e6f0bc99f167a02e09dfab8cf8b74f91c873ed9f1629e126d7
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-cli/commons-cli-1.3.1.ebuild b/dev-java/commons-cli/commons-cli-1.3.1.ebuild
index 514f882b5b6a..cea9eeb2d25c 100644
--- a/dev-java/commons-cli/commons-cli-1.3.1.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="http://commons.apache.org/cli/"
 SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/commons-cli/commons-cli-1.4.ebuild b/dev-java/commons-cli/commons-cli-1.4.ebuild
index 997d2c07fd44..d6caadee84f0 100644
--- a/dev-java/commons-cli/commons-cli-1.4.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="http://commons.apache.org/cli/"
 SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest
index 497ee8beb052..c295d97ddd6a 100644
--- a/dev-java/commons-codec/Manifest
+++ b/dev-java/commons-codec/Manifest
@@ -1,6 +1,6 @@
 AUX commons-codec-1.11-build.xml 8949 BLAKE2B f1a5dfadeebbc183c075d96a8769218e98745936b45d38de1d0da8034a052ca99c3def82c2360857849ba7daefa1bf5d7aae1288ec71505de7154b0ab9e87aef SHA512 fc22470e625e7405308d2a21f0dbdf4bf565cc8db623bb3c4dba08d55da3a0884bc3da744cd029716af2ba51d708d0ed309f7c6a21a7df6f0e5027d5c6f646a5
 DIST commons-codec-1.11.tar.gz 369538 BLAKE2B 6b77cb3c69c81a9684b298ac5233b788d6651ecc96b70ac7fda9face5af5a60970c5bb2531fd285d20dce7732829f7470b9e4941d63025faf47247410f1ffba2 SHA512 b3159308f28b2fc50208421412d8cc81f439cc07dc3d071df7b50f2d862aab65b3d20bc8eb2906367a05ecf5138c56b5f12c6cf9c224def8b8286fe12ac5346f
 DIST commons-codec-1.7-src.tar.gz 291251 BLAKE2B b8fecdb9b88a21ceb3106a13332493617ecd2c8064c84a1514dec1c1c254e18116ff4926f7445bef4171000ba77da411efd6a93fe80a4795e887832035373e10 SHA512 31358283ac2827cb05486b8ff1512242153f61deb086f7fe145ee3ca38d96e43fba080a1e89a3b8cd44d09761015ff4dbe5226d29b7f9fcd59e68ca7701b28d6
-EBUILD commons-codec-1.11.ebuild 1048 BLAKE2B f742d3ac245d6561e53fef06b73472ccde6ea21ce33e5b26777f74db1ca92d6788d782e3e38ed4a972bc1cb41595cc82f23674d8b47d1a54ddd259d93999dca2 SHA512 ec45f17ca4f6517343389136407dc1ef5745b7ffef3d7e69f69c8f0139e470ae7d59ba1bc77dc894e39a864520ab0e7ba50685b334ee40e054fb8034c6aec607
-EBUILD commons-codec-1.7.ebuild 919 BLAKE2B 52fc0eb97e191db5b1d74b6122789a1da01786e0ed8e1f758e56df2a3f879de851f5ac4994f3bed01a661c6b12d7e93c2350ba8f117acf95cd1439637f3d9f81 SHA512 e4f9fc611fba68b649bf06aab9bfb969545fa461395b9ae09e229f1dfa07e7c960239bb60c617f180308338b2691f51394538aa1a7c6cb4e0faae439a13b2459
+EBUILD commons-codec-1.11.ebuild 1034 BLAKE2B 075abe16652088856f9937a3cda1f729b43ff4c034352946bc7f51c8ecdae592282540a1ce051adb453399979174da6630ecfdd035f0c42c0d27e1455436a0ba SHA512 74b6d629ac8bc566e7968c3e8321d2d3a558a3a4680b50aa24a2e9e402cf1ff9727595cac87a2c88cb087989e45f6d7e9309f0e051804d8b52347795ffd68bf8
+EBUILD commons-codec-1.7.ebuild 908 BLAKE2B 54d95f6e45fb34815077188bd9ba7b0370d565ab9a2175715e8e90f2b0d3fffcdb4d0fbe547b68bea1e70e996716bf7187dd06dc6510e5873b0a1309aaa08ec5 SHA512 8f0fd884b856b8c1796fcb6c905b70869fee94d753f442f94531045fa39f4f32ff30dc9aadbdba24135139b59c9bc6e5b6d618b335563149e22e7ee05d6e6c8e
 MISC metadata.xml 1360 BLAKE2B 5e996a35877486521352b61fdb44872970caab9497267c9d95d1364bd299838486f1853b46f35ec140259d33e7158bca7224488f21c388caa4fa9e7a153006bb SHA512 d16f70860d4880e50d25e6297823fb71955c147eedd115ca7eda0a0bf6c4cbc6121bf8b12062241192facd4583f10df56a838c84940b5914f75d13f10c96e9ae
diff --git a/dev-java/commons-codec/commons-codec-1.11.ebuild b/dev-java/commons-codec/commons-codec-1.11.ebuild
index 7abed459fb4e..6fd721a8942c 100644
--- a/dev-java/commons-codec/commons-codec-1.11.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-java/commons-codec/commons-codec-1.7.ebuild b/dev-java/commons-codec/commons-codec-1.7.ebuild
index 02146ba0a65f..600806b1cef7 100644
--- a/dev-java/commons-codec/commons-codec-1.7.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index 7d3e7576d225..98809818ae7e 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -1,7 +1,7 @@
 AUX commons-collections-3.2.1-Java-8.patch 7059 BLAKE2B c2dd3d388b15cd61224e96eb8b380f881ad4629ce58082c1b80cb843372741f10eaa4f3a71689a3f7817d7a702a82ef61dc7634187992fb03b2a8730262035ff SHA512 1007c9c46944c4b0104b0b13c4c2acdfc9791274019b20bd38b95769095843e4be1ee29d81ff61517d9a7d9b2ad5bd77c92a2f25ebe3bab68f9a04d3a986a44d
 DIST commons-collections-3.2.1-src.tar.gz 609930 BLAKE2B 547b785b82e16f1c318fafb5761292c5fe8beb57dd4a4881cc16ef7df7328df279713442cd1fc4a64fad0d84457c06d5536c084fd8084f62495ce44bfde19a34 SHA512 8b9b5344528b3b8a53142abd944ff6b89cc149a3fa0c1eadf3f2172509499af5820ba86859e47fe7f15f994f680fa3c577c21891540b64f41f826babe81a0fc0
 DIST commons-collections4-4.1-src.tar.gz 704671 BLAKE2B dea1b630168373013ca937c9b02414b92845fdd9ddf7a22a05c4d7f8d30ff26d73f3a2d399d7a4c026f8ec43a282120fdf3d3cb1042a311c3b490ffed1774e30 SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b
-EBUILD commons-collections-3.2.1-r1.ebuild 1745 BLAKE2B cf353fe324ea17e1c9213fd3c894d279b0fca09563500528e4bdf13488aa07cf489e6b666b2787efcc8416a1e0e10dfe66f5395775359f906130a267760917b4 SHA512 94aa87794739723dd4323c5ec86d47365a9587c0896e5d446089ed9f9979e119b807e2b9d32fa9e3d305944fc075aa7efbb3c4a898004fc39475963347809bde
-EBUILD commons-collections-3.2.1-r2.ebuild 1318 BLAKE2B 09af538d0f2f8e5fff792965299b1246e6e9df01118c6023770c7b8cd208941eb9dd105ce1635a2e868c87766c7f3754d0dcfee210a402a56bb662c76c23c26f SHA512 e5c5fc51fecdd033dc9dcf261285e2bda153f682b837dbb2ea115f05a2e1d41947e1a32f80d9c539faca63192a812cee2427eb3e56beeb481fa4a4a0177e89c1
+EBUILD commons-collections-3.2.1-r1.ebuild 1734 BLAKE2B 624b691c7e76da723412a8f5bad7afe669e1cc28a162aba5dfe212368c4564872055c6b70efeecaf83d0ac4d8ddd96a55a69c1ab7d8abe7b027b848a93a22476 SHA512 b8a51864fbab75f24f7ed488d7ca627dd2682f791f8791e65cbb8300f66734a95a633759b6d4403ff830ba4c76c825c2323452a2cb51f720a464c9d49d6ada89
+EBUILD commons-collections-3.2.1-r2.ebuild 1307 BLAKE2B a565fa83dc992131050b2352a193ae4ff7d2f0d13575469db234631e37ef960a468be139b01a5fc366eea98f7ff44286840bc4408372785ef328826fe48c7ae2 SHA512 c7eb3febfa99cae218849a1a41b126712b4cbac056fec501afba305b6bce2b24671d273dfeeb2a900bf87c774820a07aa739c24872c9434e04ee8f49a9b7d259
 EBUILD commons-collections-4.1.ebuild 1206 BLAKE2B 595e0add9f94d0a7c452625e6f550455dfebf209dbe0d9561f6b4537ce9c8e87077af889d7a79d4a412de7e56cc1606b3fc9cba2e4fdcd7ab2b609c8643ead52 SHA512 78b082d24ce429ab517e85148d7bdb66506a1224469ad6e9cdb160542ca2a5d4397c27cccf82398d5e2add638451007b77fca1588f36fd9201ab1f25db6865ca
 MISC metadata.xml 325 BLAKE2B af3d8863d79f6cb8290734821ff82fbff7b65ec3d017f7f530e5c74d745d94f4a15713fa06b24b7e3dcd092dedc10f6642a0a480ee13e916bbd5895c52f1fab0 SHA512 23d211dbb0efeb5909d6d43ddf7a58ab34d33d25fc80216e0e6d7722424c06df89912947105070e63a64d44b6ad37e3053e19bcddc4c808d9cfc234f4d923645
diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
index 9d19658925d7..3db3f7201fd2 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test-framework"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
index 2c5e6d18421e..9dac8440d36b 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index 6ad37d5e0003..d2f420e59b90 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,4 +1,4 @@
 AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12400 BLAKE2B 76cd9cff541adc08b987119de99e23ae50e2b849432aaab9431a760da67d4cb3ac53199ac7ca74393ee5d55a5d3c2148ffbffbfde005b7ff936da00620b94dac SHA512 3f20161688bcd40497747fc2e5802d12881d10a071c04a151d56b3603f81b4c14f56962b83ee72cc38d1e7a4e7e43e51426f00d06ec983feb23d8771df237c2a
 DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490
-EBUILD commons-httpclient-3.1-r1.ebuild 1632 BLAKE2B a584dbf8ce2bacef3cbcb749a8e5d889df7c26cafb2d166d99a6779b1f18ebad39553f2ed6187a845df608f91a523197be993862738311476953e078f0944fd6 SHA512 bea8370ae920285691edec3c10062f585fc5537f3e4a038e79aa6f9fb6d4c23dbebfaf97ca75384467dee96519bd9cd454fa547379b22158783ce1db08357329
+EBUILD commons-httpclient-3.1-r1.ebuild 1618 BLAKE2B e82e0b6ad99f5800d38edcb9225b36853b5fcb38b02aafecc7ac24380e15f4eaeb3fd9e4c79322c3032649dc1ce0be78e7a6afce1d6a3c59a454259977ed667f SHA512 406fd3fd24975f136ef9b80f65e6a7adb9ea36699ff6e9683cdd49bba9fc15f0c46d5448c8de9ce5ec5e3559dc1b46842e8215017ebd46f8e1beb0cc7c8f8f3f
 MISC metadata.xml 456 BLAKE2B b4e2261943e4bd92d413eae20f60f23b79e7deb961d9c7e08f855f28cf69f0b45c5113a308138122a9cc4b42da1498e67c8be2093ce0252f60d5ef56ea55e72a SHA512 27c629a07a007dd4336cd50f4ea32156ec301b02f398b008c057532b36bc0698132282e32007ee31f0dd21f3f5664b3d7c9607fe43a4dfbbffb67d3000c3a661
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
index 9afa77321024..0c9f3363633b 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="http://hc.apache.org/"
 SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # doesn't work with IBM JDK, bug #176133
diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest
index e4b2a480ecf8..dc6b6225d127 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -1,3 +1,3 @@
 DIST commons-io-2.4-src.tar.gz 330961 BLAKE2B 1a1ae7c968bfc38b4a4f3c4c131de088c4efdd8fff0858e7493e057909076c74d4b0ebee1999ef01af9636d88600ecca71bb0808686a6f9c1a20f4d7a5cbe6e6 SHA512 69ac5f7b8de952d8b519ad89d4e9a33a9d269af0e68b735c0180ee8853a30e2a09147ceac362626a2fb3a041bd46eca094be2661ff280c1bab54a0548cae0aee
-EBUILD commons-io-2.4.ebuild 1582 BLAKE2B cc175b3fd6ab639dc9cd773bafc6ff75f0455541ef330b3a260e3e08d9d031713b9934d84a044a910508a4afb33b1c76560a257f58a684889899e46390ab0e8e SHA512 b62d2f3faed6dd8a2500c07847123429f198cc69c4e85342f466075da97fffcd1375997079788d02fcfe5e8c3eb1321c7e577a54d00ec2de7b1e809fabb7e52d
+EBUILD commons-io-2.4.ebuild 1571 BLAKE2B db7712b9a8fae484ac0e42053c545cb5ddaf18bece53cb13c24b9c111e2e38a5fc58552b337cf21960600d096db7d98461e7ecae616fad0031e25fa5eba88c6b SHA512 1aee82477b69219e265ebffc9e9e78f892852d7eeedf47a98a6bc7b0803cc5ae1f038d9a7318d16e7efbbd3a60ac3ab29b6cc57e66bf9710480ff73620418a6e
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-io/commons-io-2.4.ebuild b/dev-java/commons-io/commons-io-2.4.ebuild
index 5e934a66a868..6b4ce6ef64d4 100644
--- a/dev-java/commons-io/commons-io-2.4.ebuild
+++ b/dev-java/commons-io/commons-io-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/io/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index 581346e21c1a..d8d57d23c6e6 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -4,10 +4,10 @@ DIST commons-lang-3.6.tar.gz 852347 BLAKE2B 4a3ad5f557d27e4a109f6e65f9fe8d792b01
 DIST commons-lang3-3.1-src.tar.gz 638619 BLAKE2B f971afc9bdd3896178bc4be0b6c5d8809f1c1ac0d69ad73ba0d71c185c600ca7a55c3b4877af64b552ccebed9567aa7830f236f2c0d9c38f259870b894c9d745 SHA512 4d201c695a9b908a1809bbab689f80c6aa508b221b4c2786974eada08e647936f5879841c64eed509032ffdd5410735480e7ecb2910295d0f79e857c27019560
 DIST commons-lang3-3.3.2-src.tar.gz 740462 BLAKE2B dbf8fe7f6a4bb0cf462e2281d709e4ecd65e5fa116bb707af14a2b7b248eb1877f872f937fde2e5743bbe9b4775fabd1d0897ebeb8ebe92af235914cac7dbc2f SHA512 be889e0e9d7aaa7d6635e41c17d19dd1e5f9e03fd78eac61fd5f5483321170b9a72007ad0bfa7023e6ff55ae418b40eaa01dae350641c4e88138ac59d4001667
 DIST commons-lang3-3.4-src.tar.gz 771275 BLAKE2B 870f9c5aa18cb68cb88edc28d426df258af69eb6efc3dfe77bab40e2e81bddd4e56b1244a5ad4433f9dd4c0d533dc7b3b10c865fcaaefd9602e1f681bb48538b SHA512 44e93f2d8f7e6a54becaa797ee3348c6125ccdce96d772158f2a1e5ba2a7ecaecf00a6290f2e0fe2fa61db422313709ec6bc836d9296e2f16c5acf6635bb12b5
-EBUILD commons-lang-2.0-r3.ebuild 853 BLAKE2B b3b1ef307f8f400e60549b30742f950e9768eb9f98f05221906fc911e66e75c5c29e4e5dd852c689923becb69ae02a126948d630992942adf5f6397290f9930d SHA512 8474d22076ad123848ad765100b5f84c0a76d74980451c6a2fe983bb7bbff5b5ec28968e86cb422dd07390af4eb6b0bdb0db7d904cc46a514a1fb835887517e8
-EBUILD commons-lang-2.6-r1.ebuild 841 BLAKE2B d21f73d96b0335a1048056fd0c1570e8f0961f4a9f9bc820fd41cf68e34cf85fad1d8aa3585a3d4437e585c727abb5b91dc4da04b59c26f9fd297e29c3e5671f SHA512 2a47b5444859beed98e249fd48d06c6c97178503607a740e2265d95da062d8fb6ee139edac3f76ed00bd7d44f7a8d7c18525fb2300b83195ff1f441297e0030a
-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 964 BLAKE2B 6da111f596d1bf32428bb18beb8838b710c564624f3426eb040000e13ff3535c229fd08d22df4b5e8cd1640ee46c35e9f236475462b1983021443cc5e6912351 SHA512 6bde85e60105b256bfb6956373c9067d6f329d273ee0f906716aafa59fb8b43f5f5bf04e8652f36c334756c0bb050201446a9e87bab27e220be2904b8ce79fd7
+EBUILD commons-lang-2.0-r3.ebuild 839 BLAKE2B 0d2d338ce391a152b73127792904096a744f18aa0ab5cf426bf8e48226a13924de745e43c91866db7e7b5a70cf558285654e2fb4efcac352b9faa323bcf65d9f SHA512 c8f1172157f4ecc2c2b44443a4c9fe14d824164869692b6e3d52684d17792f19c125b23bbebf5b5ab67d4a4e2718f629d9d5600ad98663e024040f0246acc41d
+EBUILD commons-lang-2.6-r1.ebuild 827 BLAKE2B 991053bb232631eeafb475a9b9009debdd9061a48b95cf6af5ca13d22fb1b971f9fa0c84e3682af8cc535902ac5a173e36f732b4902024c14e69829e68847b53 SHA512 ee4d564cf8534a349d8a226fb7bdd7223c0fb5270e9ed34ec133861b2e4be5a65dcc07cd56a28fa05e042f9741a8f049e75382e465fd4bcc742f8d52749e934a
+EBUILD commons-lang-3.1.ebuild 825 BLAKE2B 828fefecb0daecd2c0dee1da07be43d676a55e152ff630e967626fa74e6a58abd6918a6e558e8bf6120435c62b64956aa6e9c05fdd0c44917dbe0241ad4a33a4 SHA512 7d2158fabad2919520b3fe56c78c6b6fe584711fbb0a2f21335f785bc82f842ab947078c0c93a7e641918f3c6d8c0152c41e2f2e09d43524aee44afb5900915b
+EBUILD commons-lang-3.3.2.ebuild 1100 BLAKE2B 1a62aaf270ae857c17bfd2e1b0523605cc522f0d8c90ca531ef5a1d520a6ce877a41070570a615e59bd0cb18e328703e166a9f7127e82b2a7a5218f591fee69f SHA512 4ff45b980f45fa148d8c96070cf9702c51fa704d2233bc918f957cd811275522a755526bff5f91d5b398ff204419fd089c7b7cda5416406ee635e49e4d8e0687
+EBUILD commons-lang-3.4.ebuild 1098 BLAKE2B 730dc1990a6fbb1b1a5e2adfdcb894cf13204c97c4155a1db010534564aa9e6923c92da1d7ba6e72298c1de5f6d28a46c6ce609f6a7574528a3548c8546cd06a SHA512 7f258175bc790a329ab8ebe5e9723c1b77d07492c78614fd394bda06062bc7d23f56fe7927ff1ae1c31da686efa2aef4fcb0330f2a17c7803445861a6793b984
+EBUILD commons-lang-3.6.ebuild 953 BLAKE2B 133a34d3bcaf126e47bc77bb4c576d8694fcc3280879557de4cd2191b921728b768ae1929a10ee48a8c42e9e7bc562c0984a0ab59f0a1c752718b029d3e20948 SHA512 ebfa6e7974747646c039afce008bde32b571146f7d710952d8c7e845a0fe77310e097c4c81985e034738570e43aee1ddef921a175097b2f9a68b29f48ad6e8c2
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
index 6fe664f4a31a..27621bd3d6a4 100644
--- a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,7 +14,7 @@ DEPEND=">=virtual/jdk-1.4
 RDEPEND=">=virtual/jre-1.4"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 S="${WORKDIR}/${P}-src"
diff --git a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
index 0d01911f7fb3..9e6ffed902c1 100644
--- a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ HOMEPAGE="http://commons.apache.org/lang/"
 SRC_URI="mirror://apache/commons/lang/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 SLOT="2.1"
 IUSE=""
 
diff --git a/dev-java/commons-lang/commons-lang-3.1.ebuild b/dev-java/commons-lang/commons-lang-3.1.ebuild
index ec1a4a37c148..7c135f524ce8 100644
--- a/dev-java/commons-lang/commons-lang-3.1.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,7 +19,7 @@ RDEPEND=">=virtual/jre-1.5"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 S="${WORKDIR}/${MY_P}-src"
 
diff --git a/dev-java/commons-lang/commons-lang-3.3.2.ebuild b/dev-java/commons-lang/commons-lang-3.3.2.ebuild
index 40adb7c1f814..477194ec9605 100644
--- a/dev-java/commons-lang/commons-lang-3.3.2.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -27,7 +27,7 @@ RDEPEND=">=virtual/jre-1.6"
 
 LICENSE="Apache-2.0"
 SLOT="3.3"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 RESTRICT+=" ppc? ( test ) ppc64? ( test )"
 
 S="${WORKDIR}/${MY_P}-src"
diff --git a/dev-java/commons-lang/commons-lang-3.4.ebuild b/dev-java/commons-lang/commons-lang-3.4.ebuild
index d614bf91c656..9a70bac5f9a7 100644
--- a/dev-java/commons-lang/commons-lang-3.4.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,7 +27,7 @@ RDEPEND=">=virtual/jre-1.6"
 
 LICENSE="Apache-2.0"
 SLOT="3.4"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 RESTRICT+=" ppc? ( test ) ppc64? ( test )"
 
 S="${WORKDIR}/${MY_P}-src"
diff --git a/dev-java/commons-lang/commons-lang-3.6.ebuild b/dev-java/commons-lang/commons-lang-3.6.ebuild
index 6bdc27250953..0cade53ae7f2 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-2020 Gentoo Authors
+# Copyright 1999-2021 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 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 CDEPEND="
 	dev-java/easymock:3.2
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index ac0930825acb..c831e394f32a 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,6 +1,6 @@
 AUX commons-logging-1.2-gentoo.patch 825 BLAKE2B 154927ebbda77a76007fe9b448fc2801404717fa933002a69916b9a0558af82b0172039ef294ba01b4cb98bcc93bf40b54681d4c2343e4a404e58772e8a8585d SHA512 1886a28bbccf0f8aa42a147628aeac444a672cb3dc006604088a67d536c376a03781b22394770c580d80c5616569b751e63c91d86cbff6f5caa47100897cd027
 AUX commons-logging-1.2-servletapi.patch 1783 BLAKE2B 5f8bc256542335b5d955d998ef2ee49d8becca46b367ba0ac1152f68ea4fccc226afcd2475331cf292c3f0f11471052e6917c9508a6737c6482c556c2ec87363 SHA512 bf2f0aca771b7278f2d80ae3c149492040c137c1ab190513fd9894fad315f75e4b0423f65a5ffaff04faed3f7256728b5f474cfbe0aefc2a53d60337a6344d39
 DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
-EBUILD commons-logging-1.2-r1.ebuild 2211 BLAKE2B b08909ddee2e5a33b14e08a414b4ead6e28a6cdcb1a0636c5c45e953dcf1508c89b767f117d524282e822fd0893b4ff379f66e87139555f39a42c786db1716b3 SHA512 f9cf0941c6b8637980734ef0c26fc043a443d496e91017c56bcddee9cfb65d3eb92c588e39737aa98505d4edd65f47b2cd4a7f4444c36847e2d71b0841f6770b
-EBUILD commons-logging-1.2-r2.ebuild 2316 BLAKE2B 9cdec18e702b826e1981a555e25921fcf76492dcde0d12bd5c40a7117786202f8faccd18981a85b0046fa83c39e6ce396f4890e47c7cd3920ca2a0952d6a41bd SHA512 ee663d8d3c443a19f5bbbcc004e68cd22d536acb566a6e77c9ee4111279802a4a2276b234e1bf20c08a231295b2fd7b66a8efe50aafe14924234e6b675590fc4
+EBUILD commons-logging-1.2-r1.ebuild 2200 BLAKE2B 00edbc2be3dbf082669f84234fb6e198f6f0209e3b668e227294e25632eafafdc242fce9b56d6cde269bfa2bab3e9110ee5d5d8dd99d268ad11257e144cfd095 SHA512 e3501a786040b5db5d6b323edfc80e8bfab2b9347a8dd3303fe874ad4f05e62ce7f27e723aeec8f25dedf7e5525a6cabd1f43f6169f0efe58b8366c917121e4b
+EBUILD commons-logging-1.2-r2.ebuild 2305 BLAKE2B 9d8e30b92dfec19347cc8e35aee59b1534485b9d2ade447a2e117b1b932e295454e7cf386afcf56944843af95de19761f4dadf33b92bc108423c87feb8ebb593 SHA512 4e6a834f0230fe4ae5e21228a0fb80b86dddf2806b8b26eb891e10fe3462cc9c30c24de3f27d8c7feb9523293e240b99b98b6e3a6ba3c2a212b6eba7cfc3dd9d
 MISC metadata.xml 551 BLAKE2B c48c3681129ce8ab7a497385bc3bed8a16ca0f5f4557ebda30565db471b25fea1b6c48ad43a470cf27930a0b2dc3a282242600aee3f60eff66291e6d0c80491f SHA512 1ea71763a6890b1f01fb357a7427b99bcb4918eb87290997e61918808daea37dab371b7fd5b6fee114104b2ee4445e022c0f090a2a58017a3d8b755f8dfcd5bd
diff --git a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
index b0c5a76ff00c..890c4bea49ac 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 RESTRICT="!test? ( test ) !servletapi? ( test )"
 
diff --git a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
index 22f763911556..e36cb359aada 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 RESTRICT="!test? ( test ) !servletapi? ( test )"
 
diff --git a/dev-java/commons-math/Manifest b/dev-java/commons-math/Manifest
index 5ccbdd4755bd..987dea34fe94 100644
--- a/dev-java/commons-math/Manifest
+++ b/dev-java/commons-math/Manifest
@@ -5,5 +5,5 @@ DIST commons-math3-3.2-src.tar.gz 2602474 BLAKE2B a818ca5ab1b9799359bad1c84d2774
 DIST commons-math3-3.6.1.jar 2514690 BLAKE2B ce5dc1a5bdccf85aa780dd648b64c0ed78b4d5a36d15d9737f661135f4f1ec962c3c44a0c4d8fc7d12c667e62b19860cb2a47f507c8c3e6da6cce57e1b9caf54 SHA512 eab6003834c0f1b7e67eee242d33db43f85d388ac32e37caa6bd16d74340db5c189ff5c7fd112ef13b9009d2fbcf2bad6650b6e5d9124316b59493b2d07d065d
 EBUILD commons-math-2.1-r2.ebuild 903 BLAKE2B 2b390b4109fd875bc79f957b2fc22a0e3ce1536476ed331bd57e32d1e90417200002f14045cd7af145f0a1a172e23773531682ac427f0a20e905cb10b8ae305f SHA512 aacd02d27d30d7f27c5bb35cad318b21a4235b0264282527244d892f509e3e0032eaf5407bfbab9b6c4f548c7e9efcbe68629bf0502899c1e9c6d32fb8ad9a4e
 EBUILD commons-math-3.2.ebuild 1331 BLAKE2B 455f0a53dbbea8b5d7ca7d5ee16920489381495edd5e830c542bac42997a59c0affcc47daebbd6a2777c3f7d2ff0e7d45f79f8565f375b1118fd36cc442c8832 SHA512 447a793d84a98442e647a1e77cdc06bf6b69de8a337aaa40fa3fbe713f031686cba4ff3a21c5500346a29072976ff77d209f09f7057324727ac97818f43af8aa
-EBUILD commons-math-3.6.1.ebuild 693 BLAKE2B da9523bb624ece2699913f23672a5374ec63ef447252fdbc27e67efedfb3c402d7679b55cabfc883000e758f8845e16128ab503dc3eb1b5e76be9fb72e858d65 SHA512 7e927986aa818cd297864fb3ceef5f23a75befa6001b924df7256448c2f021888bd13f406ef31339ff8dc4eb89954ee5807ebdb1a4fe0ae763c18fa9d90e5bd0
+EBUILD commons-math-3.6.1.ebuild 679 BLAKE2B b6d558f2fe0edbc77485c91373f19efbae1376be998784465af3f3af34c00ad8dee37bae75469667b3231694dc643c9777aed596331d65c5817718b47ac6ba36 SHA512 932b097cb351466fbe4d5b9e25154ae8bb889a88477e5e93194a0895ae46bd3f42301a501954db5756a7f5a059df2f93c2a23f6e8003b2719b3c902a62887e17
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/commons-math/commons-math-3.6.1.ebuild b/dev-java/commons-math/commons-math-3.6.1.ebuild
index 5578f6ffa3a0..71c61da8a32a 100644
--- a/dev-java/commons-math/commons-math-3.6.1.ebuild
+++ b/dev-java/commons-math/commons-math-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,4 +20,4 @@ RDEPEND=">=virtual/jre-1.6"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest
index 0de387995e64..14074172a8e0 100644
--- a/dev-java/commons-net/Manifest
+++ b/dev-java/commons-net/Manifest
@@ -1,6 +1,6 @@
 AUX commons-net-3.2-build.xml 12390 BLAKE2B 849ddf4c6525fdb7e7d8a753c5c0e854471c7f6b257bdc506d89be0dd81bc5c02f69c75e23051e283e74a2e66ac07c77a3432899e3de4e30dc93566a85eed554 SHA512 e4784b083ce86b5a22d5bfba0b0d71d811abf55f8375b9982f5ac1b11bb93f4be15ec0ff4bcb8cac58681a68a03cd6b598c998251097e9bf634674712887bdbe
 DIST commons-net-3.2-src.tar.gz 378351 BLAKE2B f40ad73ef7d9865cdbe9da94a458f0c9ce636b0b71dcab3b48b52716aa141de3215581b75b9283d4d918ad0dbbd2761c9b0d9eee1703a2bbc545718c129511d5 SHA512 2152b0c524320702c336b21308bb8166e00487938430b83e08d65b836ab775c372c9251957c674e0bccff6815fc3ed3bdb7113a0d2a140c53f64c2f557eef2ba
 DIST commons-net-3.6.jar 435798 BLAKE2B a8c28909715d76469ad4760ece6f7b3515c56badf8ce19fcadb5b776e0cf341b3f970689a22267d19f22dc12fc8d5e2a071347df1850f290231747d0712263b7 SHA512 50006ebef259c9d4f514bfd4e6b4578f8867e2a105edfcf30542a039e385a02e9c48dfeee0b287c39c375e1418817290713f7d0792b357267723a977a07062c5
-EBUILD commons-net-3.2.ebuild 1260 BLAKE2B c78c4c247038135b24d70b60d660b5d5bf98df859894e574f149f86ca9dafaaee81439ac394fff5143c732c18e8ca1103200105c135792dc1a0676926e049410 SHA512 f5cae63603d9fc2423431c21913b584103bf1d15a67c744a7012b9b0fc7ae303e51ebdcec162c260f005a58fe1a52a4a9215e801d3944c051f40e8788240de51
-EBUILD commons-net-3.6.ebuild 653 BLAKE2B 5a213d1165cec70de88d22f101ddf30d2486885e6cda3d40fcc670e1ffec7a4cafbe80cffb7b33a8474c96fcd4e27d3b93291badc8b18e9ba4436b7105ee5c3d SHA512 9380e5630043664be8d9db21825d005cc860d85b29e06f7068c9a9ba7840162012fe53da3184c92369ff79e6f28b634592a41cb4a839d7de7b8f5547db0f87aa
+EBUILD commons-net-3.2.ebuild 1246 BLAKE2B e6e296e93a81094787aaee0f2077a74e5173fb788665603c6905b8b1ed44a23e2a359015242d4022c2bf883cb8c50ece48bd949bddb4a054399eb00ef18fdb67 SHA512 00de691849af50b8a1896f8aaae945d4da794ff9152aeb2cbd319feb232d09c1dd865884108ef37cf21de093c6035a622929b3b501329e5e404fe124cbf06b37
+EBUILD commons-net-3.6.ebuild 639 BLAKE2B 1dd80ef5a2cdc10cdede682f20e11c1a3d67feae3f3f277283a0f2a50f7761935cbed79bdb3427b58f8ad8831ce24cd4579a7fd66ecc60398f90defde4ff3537 SHA512 8fe13f3c880a47fa91174f961e88a1032ff8d34d0e3cfa7907077e7c0877c2576a23aed9705106f3528a7aec302153e80248639d4ec06eaab8255b032b9c96ad
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-net/commons-net-3.2.ebuild b/dev-java/commons-net/commons-net-3.2.ebuild
index ea92d47ba45c..84c210c9adf3 100644
--- a/dev-java/commons-net/commons-net-3.2.ebuild
+++ b/dev-java/commons-net/commons-net-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -20,7 +20,7 @@ RDEPEND=">=virtual/jre-1.5"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-java/commons-net/commons-net-3.6.ebuild b/dev-java/commons-net/commons-net-3.6.ebuild
index f102092a49c8..50471f703f01 100644
--- a/dev-java/commons-net/commons-net-3.6.ebuild
+++ b/dev-java/commons-net/commons-net-3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,4 +18,4 @@ RDEPEND=">=virtual/jre-1.6"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index 7b3c9d9e542a..c82ae3611c57 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -1,4 +1,4 @@
 DIST dom4j-1.6.1-java5.patch.bz2 2900 BLAKE2B cdd7dc901f5292af3ef7f0ea200c3d22bbc8c0adc27606da3c8fbadc44625b114c995321723dca331f0b23d5248e1f9177f0def2f4138eebcbd4aaac0495d4dd SHA512 38da606d77b62976366cd089e5194a922e348ec396e7b9af4dceb0a536c47f66e0900cfa59c91df04aade6076630077a8f88c713b9c20224d69316109b293a96
 DIST dom4j-1.6.1.tar.gz 9687211 BLAKE2B 3daa3729ea071aa87c7c1e1e2b91f1635109774dd2bd564a85265a0286f1369373084b945409d9d5213d66a7e14224033d42c58d80125b7982eef8961eb29248 SHA512 95c5a7105a81734f77b4bf27f8bb0af116bf43d8ad5297a0902a6687a54109a87dffe2953cf430d14947cdaa590aa0fdf083b46a91d1d98d48431cfae4459d94
-EBUILD dom4j-1.6.1-r7.ebuild 1867 BLAKE2B 7230fff7a2b43fe300a542c5373c4f781108705fd89b87f3a6c117e4ce6fc97753b9bbb8622f76259c0a6a344aa6a6f1bcf88268b30e0345af1ab098d4f81fab SHA512 03d6a354fa1b0e4d9f5dd4f836521830574e20ce3c95dba631571496453eec3298d5429089ecd86a129e47c86bdc19e8027cb2b7270aa9dbb333c779e53298be
+EBUILD dom4j-1.6.1-r7.ebuild 1856 BLAKE2B bd1a95d0a70b20ed36a4652de930ff196926cdfa511aaabbc561cae4919e978f6062072de90254706ee2d5a66e57a1a9c18278831a1633b2fa7c0707d299236c SHA512 d25f76b76da53a44b5b9e69360fed19ce9bb761d96ed5ffa1d96ec8b2bcb8840e254a80f6ef2bf6f8d6236ddf889024f54e3670acde4356890a5a745fc14b704
 MISC metadata.xml 529 BLAKE2B 27e8a2aa0c95e7690b99386698f800291371b9962a1a667899c425e58ce73c8eb21dac1c589d47449242f0e2522b66c66379d6dd3b01708015e66278d634a480 SHA512 a9845c5229efbf48ac83b5b8fd0a769d90275de1f336b52147330cc2652a858df2689e17895e2fca5af067288413102de67316e49108c7d9eaf232e9dda31bbd
diff --git a/dev-java/dom4j/dom4j-1.6.1-r7.ebuild b/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
index d287d177e66e..b74f951b8209 100644
--- a/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
+++ b/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="dom4j"
 SLOT="1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/ehcache/Manifest b/dev-java/ehcache/Manifest
index 6660722efdb7..38b267bf5110 100644
--- a/dev-java/ehcache/Manifest
+++ b/dev-java/ehcache/Manifest
@@ -1,4 +1,4 @@
 DIST ehcache-1.2.4.tgz 1330344 BLAKE2B 60dbf5f3463562f1a326b13ac10d37d5d9fc1d5faa343e4bf5b197adfc45624832d740270753646e2c08be2e661610512f74fa7b6aa8f26ef3afbeee0d89af72 SHA512 a8d3e7c47eeeab568fbe2f4b923db96cf0f93d8ae0f727aa107b0ce5c5abd035a3967ea58617ff10e9c81109dcb8d904cbad86ec2c77d9be159e1a0a2c44d4ed
-EBUILD ehcache-1.2.4-r3.ebuild 943 BLAKE2B b476a05660943b22e8ec6dcdaf6cbc098ff1840b4a2a4f8794c398df587421bb2ab23d979cb6180362c688ccc2086e6061964773edbb16d93a29575fca3fff1f SHA512 6b157bf437c0802af43768a03c773a8d15142c40519dc70e0b0a9c80cfc78f84456cee1627072936ceeb44cea7d41c755d9725d617199bc35717d0ae56e26744
-EBUILD ehcache-1.2.4-r4.ebuild 834 BLAKE2B 27fa18a745995da17f670114564c192d972b5958a447da20b4cb5b74f32dbf4e8a2b10cf891799fe2bb75880e1e66ee306245be352e74d7bec47af2b7ebfce01 SHA512 ca5dd8196d312b67f2ba78f450d904152b0382f8b590c99a23266bf653124fec6139a2dfd6bd6f3121120da125ed1e111cd5273138a70a4fad61e98f65a94f8b
+EBUILD ehcache-1.2.4-r3.ebuild 929 BLAKE2B e2a9616e3b9082fdea0788dcb56bd4d46a02a8b360d16dfc2d8ba7cf98b53e1a6224d58156a709d9f4622b6e91368e0f90f430d76b428bd457f36dc63262fd97 SHA512 2eb0e4f53fb90aa03e9d0d0013e9c87e42b0e3f99a32288386d4ac901bb11c2f6191cf0d6c82153dd30e624759b125fcf3a29aceff10d0ee4289b1c2a2a0506e
+EBUILD ehcache-1.2.4-r4.ebuild 820 BLAKE2B 0bdf8fff6f02ea2ccc09cb3766c798522a34aca701b1c952f6ccadb5225d5d706c60bab1ef9ad59e663eae179c07e9ef0bd1aa3784f2f3f545bd76a5f328ffd0 SHA512 15d6f73a0e6cc5150122a650a1b07fbf31a6ee00c1ed4e2347ba7f7625bd26f1c13f3eda49b9c6a19696c00ca40af5dca0bb3aa517f66361fa4f394c1aaa4c47
 MISC metadata.xml 313 BLAKE2B d2ded32988d3cb8913c205d47805e270afe93cfd28bd3177dabf0efc3601f052b218f0ca57370435fcbd68f3e6caad88587b0ffc700ee1b969b7d77070f09459 SHA512 6bc82a76cb9ebccb0253e19e3d1f9aa09bd0a3f2aa16e86f61dbbd76449cc77cda7fbca3fe04e8523f5ada48a5d3bfd89b12ba907ae37290bac6b87af2383da6
diff --git a/dev-java/ehcache/ehcache-1.2.4-r3.ebuild b/dev-java/ehcache/ehcache-1.2.4-r3.ebuild
index ca21347361af..3afcb16647d7 100644
--- a/dev-java/ehcache/ehcache-1.2.4-r3.ebuild
+++ b/dev-java/ehcache/ehcache-1.2.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ HOMEPAGE="http://ehcache.sourceforge.net"
 
 LICENSE="Apache-2.0"
 SLOT="1.2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/dev-java/ehcache/ehcache-1.2.4-r4.ebuild b/dev-java/ehcache/ehcache-1.2.4-r4.ebuild
index 561749bb3911..c9b41849308d 100644
--- a/dev-java/ehcache/ehcache-1.2.4-r4.ebuild
+++ b/dev-java/ehcache/ehcache-1.2.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ HOMEPAGE="http://ehcache.sourceforge.net"
 
 LICENSE="Apache-2.0"
 SLOT="1.2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND="dev-java/commons-collections:0
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 9356ec9e0115..b28a110b3de1 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,4 +1,4 @@
 AUX headless-launcher.bash 67 BLAKE2B 29ea0750d057e9a914ce26a14f1d6d1c4d49967aa553d6f55b115df0ebf1b77d693e01a7a06dbe92de4a589ff5847b176ccb820c23acde06b336e302a763d089 SHA512 d3a6635105ea62a62f1ff690a457bfbdebe3d15f8fd220f5508a4ec20b8a5c46e66bf9189562661d5053c6ac31a6998d1f4a117e0ac6087b336a0475635d7d3a
 DIST fop-2.0-src.zip 26381859 BLAKE2B 8500de6a23e93c14fdb4f27c59bafba27a64e6aaffb7a761f16de5bd523e2fdb83593ab53a66de79bf7b7d6c2b887ab97a34accb18be416b26448753babe2395 SHA512 428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a
-EBUILD fop-2.0-r3.ebuild 3071 BLAKE2B 0eac2ff75d934a9e8fde6c4e93fdfbe83dd73107418b94f829e7d6d8aadb3979f82c042d66fb678105d6a58c020e241684ead0858ac790ea2d0b6ad869ae081d SHA512 2c8379748ea5a75274037011089863951d3fbe23d95ac37d22c784f5432774d3f7addb877f21aeafeb73cce21e0a0b5720a82761033c0a69230ba7faf1046e98
+EBUILD fop-2.0-r3.ebuild 3057 BLAKE2B cf853cefd30ad6ed2e470a0c4fcbdd452a2b0c4a51602b2209aff4615effc32989152f70d503aaceb860a7c3bbbf82731b7ec26edddd516ff4d98370507f0722 SHA512 7b1355901b87ed3a0efab003f9220bd84c5c791aaf2c9a770b3ec151580263086b319cceaaacf6f769d20d7a991e63a9512dbe86d9bfd0bc32111ec9575d5381
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/fop/fop-2.0-r3.ebuild b/dev-java/fop/fop-2.0-r3.ebuild
index 308735bc50b0..bd3c03ab2e9d 100644
--- a/dev-java/fop/fop-2.0-r3.ebuild
+++ b/dev-java/fop/fop-2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot
@@ -15,7 +15,7 @@ DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
 HOMEPAGE="https://xmlgraphics.apache.org/fop/"
 SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-java/glassfish-transaction-api/Manifest b/dev-java/glassfish-transaction-api/Manifest
index 05106b850f35..62cdd76b71ff 100644
--- a/dev-java/glassfish-transaction-api/Manifest
+++ b/dev-java/glassfish-transaction-api/Manifest
@@ -1,3 +1,3 @@
 DIST glassfish-v2ur2-b04-src.zip 39817113 BLAKE2B 4aeb0df44f838c91fa8dd52e2a4985e86457f75cec3cd5d527de54f672afcd2824cefaad9d9e67c5ce096515e389bb2fc0874d76ce2ec86a956233f2c3508439 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8
-EBUILD glassfish-transaction-api-1.1.2.2.04-r1.ebuild 903 BLAKE2B 18b306de152875fbad94346bd36a1073b3f3775ad8fa277a7656f74648a8c61ba500b10a02b730b18cec98ce0c6e0a58bf4ff1521a1f5c1ce4225261f7f2011a SHA512 1afb1d7abe18ede9c9d5aedae753b08c931e5a3eab7bc317716a33f853ab4d9431a636c949e87e92023c5fe1fee99dd7e47f0951b6e044414acfb23e20496e0f
+EBUILD glassfish-transaction-api-1.1.2.2.04-r1.ebuild 889 BLAKE2B f9b056253d4603ecf69ed0bbea21e975e65d7ba5ede613050c32a60a0621b4f6b483a5558d89fb875152e8868f2147749f8c82c54508807e313dc3da10d9058e SHA512 2337115e6caefa96faeda8430f037e95826ef0a18fe3bc843122ee0c49d958c4197aeb1edff2c183c954533d1d98f8032a68dbb908e28b651b8ed3a06c9fb4ce
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild b/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild
index 4ce2f85f2770..b8002d2c97ba 100644
--- a/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild
+++ b/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ SRC_URI="http://download.java.net/javaee5/${MAJOR}/promoted/source/${ZIP}"
 
 LICENSE="|| ( CDDL GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index 092fe5b2771d..06d8ca59c442 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -1,4 +1,4 @@
 AUX gnu-classpath-0.98-freetype-2.5.3-support.patch 1192 BLAKE2B 18a8c2a6516def598c614a50c7c260c13ba7304a1d189ef0d0d7ffbea37b2c8972fdb0449eacfe49deb58c3aaaac44b36593d2b3df745066f64889a957e08d51 SHA512 5832a27caf0a064a29fb00a186d116193af98c0f2a97ef868be7ca0cab1aa51bd32df90f32ee43f9ecdbda52ea3b264f6f3bbd48d8b8f7cb4d1e0a1444f716fb
 DIST classpath-0.98.tar.gz 11021342 BLAKE2B 8bd0c55153569b34dfde767233ed48f6ebf0f507d34d991a410b0e40a2ddfbd20d4568697265f8544823337f568a916288e92c096b39fcd5c67afc82ddfc3cc3 SHA512 0d98f87cd78c166d566ecd8d0372f2d6cdf422e8c4c806ca01d3a77dafbdd80ee936de78a2c5d4226174027efdc053fe92669514bdd8acb3290a7b3ec002d31f
-EBUILD gnu-classpath-0.98-r6.ebuild 2921 BLAKE2B a2740a417dde3f84d416ac9d3ab78b9f316d192db1470e6621837dfeeda024c7a28e6e21904d37daab040f46465ea2df9e4d788b40939ecca4fe198f68abef76 SHA512 a67ffbdd6fa4b6fdc1edf32fa52e7fb0d8dd3fcaf361182cfed8710bde58bcc6db12fac8eeb5c80764eddcbdd2a6b4424ff02fae7441fb5b1bb9a0f41d941de3
+EBUILD gnu-classpath-0.98-r6.ebuild 2910 BLAKE2B 3d13e6a160c20818b804c01cda619701fe9c6c83005b533167ac31ae9c4d57f5b321244256c3c7816ed1f5e6d573381de5fcb7f355642e81b5ae9776b450c5ff SHA512 1ef171e814e4ff9189a69d66277dfc7eed210d49e879efd38b80419d327a2f6b863fd51f0fb111190ec4473dd9d9cff4976984c23a83605617a72a8b3619d118
 MISC metadata.xml 703 BLAKE2B 221917dd1d999eb06d4cd4d896f1ae60f06f425442c27cea566c2f19a4366064fc45545e43dd72983ae3810cb8c8753c128f3b690a5234910828dcda2f03131e SHA512 e97e2eb0800c588b0b50a108559cc164df1ae33f626b089c5ed93476e69ce0dc9d47f043988beed9db9c79e6bc9479f0923f8dfbd61c4a6c619dacc8d7863865
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
index e90cd2dce215..7efae955959b 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnu.org/software/classpath"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0.98"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="alsa debug doc dssi examples gconf +gjdoc gmp gtk xml"
 REQUIRED_USE="doc? ( gjdoc )"
diff --git a/dev-java/gnu-crypto/Manifest b/dev-java/gnu-crypto/Manifest
index 48e3ee8d57c6..6f3469df66d4 100644
--- a/dev-java/gnu-crypto/Manifest
+++ b/dev-java/gnu-crypto/Manifest
@@ -1,4 +1,4 @@
 AUX gnu-crypto-2.0.1-jdk15.patch 1551 BLAKE2B 9111fdc0ca8eff845c61a298b92fc1abc39c88caf0cbd04e2adb4ca50aa025a21c3f2694854df54c250505bab580cf40a40db9b67ab0ec881d65aa3baea3ca36 SHA512 f30f33e29bf400eb8bdd465ffd649fd2aec03ab6d3a315c5da2a8b6375524f1cc20f6ec3f813a9940fbdecf4364c8985bed946ada633d73bda9508c0dc198923
 DIST gnu-crypto-2.0.1.tar.bz2 3895714 BLAKE2B 4838f7aa58cbd34d97afb7f503a29b7393ae3085f1b83c8ae65110f20ff7143928351f0aaf2a61a2abb363f764dc67dbd12955fbd0f86dd685dafda550e0e7f1 SHA512 c14aa73fb23663559195e8fc7f85a220b25078fa8ab4e7cf43b84febe96599d990ccf52fcf1f6f66f2b547d9b644bbc99b3d44dc4a777dcb72530e58c8509015
-EBUILD gnu-crypto-2.0.1-r3.ebuild 1238 BLAKE2B 301eb79891ff1580da7fdafa88fc44e743a5df88e250d86606dcc02d647db5910bca22511c5875625b1a79bee5ea81b8c33cafc85b66adde0044b26024f54c25 SHA512 01b474db07874cd33fda2671c147c965f445e08c5c51b2ccd34377f34c639bf06fde2875762e1c4166d62de0f450bfac20c56e75d9793bc35b5f6b7bfccd2828
+EBUILD gnu-crypto-2.0.1-r3.ebuild 1224 BLAKE2B 43fa61e3e37a1a19338cf8d16aae31557801f937dd88f15d20c3db2d6ba028b74e9efa320de6f3fcf8e892d9acea84e351809b6bae3512a849b4260ae1be0154 SHA512 e60e0444d971e896da5f17e9901fd5fe7e3ae83f9fce16e0bb17107aedde8a66a0ea63310c81dca87a189fd8d097b58baf117d0521ae54d8b3f8e3d1075421b4
 MISC metadata.xml 535 BLAKE2B 2271d87cef0c6759b2e79d1f22025c8f5899990f5689f9e4343c45e1c039a22a7e242ca0adb95950899e222671dda176c1d5248b8f3d2a9134a58b481b7a5bb2 SHA512 113c98ec48fed10332c9677b90df1803bbcaae3311e5f71be6c681f89bb449618f66b11736bc76bfea5d21828671d30879fe56c49278e9f75b137c62ccb5eb22
diff --git a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild
index e717650d7a82..89c2e86670c5 100644
--- a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild
+++ b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.gnupg.org/GnuPG/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/gnu-regexp/Manifest b/dev-java/gnu-regexp/Manifest
index bb5c16727327..a32028d98507 100644
--- a/dev-java/gnu-regexp/Manifest
+++ b/dev-java/gnu-regexp/Manifest
@@ -1,3 +1,3 @@
 DIST gnu-regexp-1.1.4.tar.gz 164741 BLAKE2B b6183e8b12d283616d55112e0cbc8ca9de069c75b793066066606d2e824c4cd182de1e65c6529bc323a58717a7a72d4a97dc303d5a4572dfc53613c2a06adcad SHA512 4397ecd2a485f67213ee74e1c942a1bfd1af5f261f964546cb3c7bc32fe88702a557d717f07d2a4d7d1db2d684ddc4191c120b35b44d1a68a126f7b81d8b0331
-EBUILD gnu-regexp-1.1.4-r3.ebuild 862 BLAKE2B 99f3be59a1ad2b69ebb46ce6369dbee06602396a94eaa91d5b484548d0dc287e8d4ec90ef6e772df748d2ab0af1027856195b03a0a58cf100cfe8692668844ac SHA512 c6516b55be37296222af59991a9c86356e1515230b0333b8d94da580b995f5867621f60d7024fa832b16b7e040508bd44da4f26e6760b49f22c3898eb4933bfc
+EBUILD gnu-regexp-1.1.4-r3.ebuild 851 BLAKE2B bb37fac5256b1be346feec991f3214c41162dcbc38e19a6ed49455bd3c8eb9e57573d08d26e4ae1ae8f599afec736b63cec51418717839edf4e588bba2368e69 SHA512 d261dcbea41fc374088b78410923d62c65a462168cca1c26b7a85b361cfcb247c51e6d3d38585911e319322e8ce8926a12bbe7b829dd3746f7496bdc7352c1ed
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild
index 04dd950d0f94..a5e84dd6cc24 100644
--- a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild
+++ b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 CDEPEND="dev-java/java-getopt:1"
diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest
index aa363e528d41..e47cae3095ad 100644
--- a/dev-java/hamcrest-core/Manifest
+++ b/dev-java/hamcrest-core/Manifest
@@ -2,6 +2,6 @@ AUX hamcrest-1.3-empty_generator.patch 1227 BLAKE2B 4e0bc6d085f6d26de9f2da8e09eb
 AUX hamcrest-core-1.3-fix_javadoc.patch 3036 BLAKE2B ee65eb88f113a5f6fd93b49dafb76d8c1c39266f6fb2f220849eeabec7ce5b084d2411c51102fa5b47853aed66acd6d237497c0c8bb2c688c93b7eb0785e27a3 SHA512 f50fe8f2ba32e17118c42e438ef96973f7c04b70321353ed2c19c7ec8f61ba0c801b49920295d0d30add50fb18dbab5cd079b1879f71f4d569b8253ca40b4ce3
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
 DIST hamcrest-core-1.1.tar.gz 1247348 BLAKE2B 07b874ca2e61808cd1a30246cbfe7baa220a9c83df7be94dbb50c4df0279bcf906a32cc1b69aed0ebd81d51392af28050d070b7fabb50f8063964b0782b5e105 SHA512 d86080f1ef5982faee728e29675676a89b42a02c4b00783c67be948076e502e70a2b435568502d8ed3c5b1bcc5441b3cdd8817dab841cac537087edeee47632f
-EBUILD hamcrest-core-1.1-r3.ebuild 727 BLAKE2B dab3d360c689e3d084d2d9b07dec1c92233145c07305c2f3714462079b88ef4e833c9c0ee24afa266c29f39b99963ef58ff159f80b616c614e7a48d373c83eff SHA512 10f6bcf35293d321e42924924cb88f9341912e4ceb66a3e4bebfb8b29e7076c00f2166ce416969872f697b787ecf780b7388bceb233ef9a5f9924938b8c3f66e
-EBUILD hamcrest-core-1.3-r1.ebuild 1519 BLAKE2B fa37495a272a3a4e95450fd21e59fefa924b0d6577e71fd6724b935129e2cdc85457b29d09de6c502c783b2cdd97e0b38862b5af79e30f49a87c6103755c301b SHA512 6951d5260fc2de6348ce1271ccbbd1eb140aa083b668c03aba7f43bc4de04c9fad1d5ddb2f75a8668de667fb7138c6d5466bfb027a6a641807e0791dc3fa7b8e
+EBUILD hamcrest-core-1.1-r3.ebuild 716 BLAKE2B a0442ff57be2628e59b831794fb9e48cb54d1ae88abd9ab69bdfe39195e55c16da9234241af00378345e21dd4b98421b625a3e42ffe254f57b2b4fd0a4b8cb55 SHA512 8138d54074543ccbf142647639eb45efd304b0bceffcd0fbe942e3dfcfe565d15c184178661495717aee507196284543a7d4f596e0ea828f1b1871d6ba29f260
+EBUILD hamcrest-core-1.3-r1.ebuild 1508 BLAKE2B 9d6f9a554c9194ae529da1323cb299012e0c9e24eb824abc81c97832d6bb3388278b1d2b70c2ab63a881d90e7e37051ab8a77775ebe58b6718f60a19a02a39cc SHA512 0c4e858cabb30eb516ee565bc12a34b3a10c160b8604a6c2ea7c64fdf1ef7f18f307bfd1f6dde9689606fc1396b67c54ed129c49bf92affa91917033ffddd510
 MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild
index b5d72a4ea12b..5d747d9d15f4 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.ta
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild
index f6a4828bbca6..977e37eca2f5 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,7 +17,7 @@ SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 
 DEPEND="virtual/jdk:1.8
 	~dev-java/hamcrest-generator-${PV}:1.3
diff --git a/dev-java/hamcrest-generator/Manifest b/dev-java/hamcrest-generator/Manifest
index 7fda27119d54..63ea5851c3d9 100644
--- a/dev-java/hamcrest-generator/Manifest
+++ b/dev-java/hamcrest-generator/Manifest
@@ -1,4 +1,4 @@
 AUX hamcrest-generator-1.3-no_jarjar.patch 982 BLAKE2B 4c09b64a6b824025771682dad6875b8c048f488fd777545d7c8f7219de04193fe40eaea63b7e319d5c00843175f66033e26216f68436c2d99e256fe06218daba SHA512 26b77758ab603b02dde03ec7a51f6b1f1077aa45580e8a21ffa671fc385c54ff00b3a79f8a3be037f28a8b77289d1290493469a1c8c856a9b61846d4cedac58f
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
-EBUILD hamcrest-generator-1.3-r2.ebuild 1335 BLAKE2B 4ca588b8727111656c541964dece54669b80f0b2109783b23088d59a77d2e047bb2224cff3f4df1c4c32832a2108b09f6169568407c55e5239f23e10e5ff0f65 SHA512 eff44e5a4f8caaebcf8f7f32a7c455f40b16faf375e4a144f6945aefca6b38b65dfb6f56f88f6e68ec00601f219ed1baae7f7c81b90d8e99942c05feda2d53e3
+EBUILD hamcrest-generator-1.3-r2.ebuild 1324 BLAKE2B 80e8b7ef81afe127b0cb4cd17db60e376f448d304695f9ff65a4e9c5571a1a57a1cdf292612bf4671d6c260b377be68d72895a3dee9a15527028f7a390581a8e SHA512 acae20ed327ca7555e47d676ef768991dab7fde73c8156b9f0b167f4ea6fac5079c155148c84bfd4df8c6569be8a7812853e05b25d889ef42c3634a9e2916e11
 MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r2.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r2.ebuild
index ddc289d736b6..256b9b9a0b54 100644
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r2.ebuild
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,7 +17,7 @@ SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 
 CDEPEND=">=dev-java/qdox-1.12-r1:1.12"
 
diff --git a/dev-java/headius-options/Manifest b/dev-java/headius-options/Manifest
index f8c09b8b3005..4dbbf8e5e1f1 100644
--- a/dev-java/headius-options/Manifest
+++ b/dev-java/headius-options/Manifest
@@ -1,4 +1,4 @@
 AUX headius-options-1.1-build.xml 9534 BLAKE2B 39b450a29528dc4272bf96412cc854da8861e117733671d9de9bee7957ff8ae18b5453004ff16696ce24a20c49148a318c5b92778a0a8822a8c86bd91ec8f87e SHA512 d0ddbef8e5b3cf77d9687e0ed704bea167d8ebe4cc849daf87f0f95a0088548dce21e1104f5aa93fb9049d53cd89327fc8824115d199f2c52886e2b8f854874c
 DIST headius-options-1.1.tar.gz 6590 BLAKE2B 71635dcbd6ee10987ab590edf2918d906b1171a148e7fa60d5be0901b20ecedab7fadf8f3d9e15d7fb61e955b698577501e3383a032c717d01c44942d54fedab SHA512 561be8ecf02e132436a94bf60595d66839c8e86f49c6a121f8714403fea6d22369f46dbfb15b7834a8430ac6aeaddf4e6aca5b0998c51e3b7ad71c60ac6c1bf4
-EBUILD headius-options-1.1.ebuild 993 BLAKE2B 1cf94c504cc09fc3b533cbb10c7b9d68ccd1defc06f8b8f05f6bab32f5becac989f279a98e961b6c7c7f9103704561426220e027491117b4dbd29e2d037293ed SHA512 e78f30288f1a034c6c04555f2eb3e1250f61068583fbee939bd3df8aa67851148a879a77351c89bf54c45df642d4439cc9711ec1fe495ccb6352ca0938595032
+EBUILD headius-options-1.1.ebuild 979 BLAKE2B 4f43f77c38f2b7045e72f2264fd9aedf9dfd12c177e7b5d43c2af1e965b6ac6070b1388f40467faedfb6bf4e1dfcc616715057c0056a235ae249b09a6763473c SHA512 9b3a879ba4f619efd02a1a9b23444a4acdabe6aef421bcdbdd9429782381d1c1f77ee89b4626bfe471bc417a6a3d24e4cbe12482b692b516d4f41b98bd407edf
 MISC metadata.xml 326 BLAKE2B 672ec3d08fa9e8946820c2ddd4b8ce7cfb740a363a8fdd6a052acd287d1e99fa54e7ee8ab08a2ff5095f6be581a9a7c086d82179b742a637e35bb7940615d41f SHA512 fcdd1c355309839001898fb85882291e093e5cd66429abdd8117ad74478e53df81039f952d89508f0e827bf57b5b14ed40cb7cdff5e0fa54f349afc2b8c34535
diff --git a/dev-java/headius-options/headius-options-1.1.ebuild b/dev-java/headius-options/headius-options-1.1.ebuild
index afd567018a47..92fbf3253933 100644
--- a/dev-java/headius-options/headius-options-1.1.ebuild
+++ b/dev-java/headius-options/headius-options-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/headius/options/archive/options-${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/options-options-${PV}"
 
diff --git a/dev-java/hoteqn/Manifest b/dev-java/hoteqn/Manifest
index 12c4f2419238..799ff4ee5e65 100644
--- a/dev-java/hoteqn/Manifest
+++ b/dev-java/hoteqn/Manifest
@@ -1,3 +1,3 @@
 DIST hoteqn-4.0.0.tar.bz2 98714 BLAKE2B 7b9f7c606475331b1ad1e27ac829bddb15ef2b9bc7bb8b7fa51d7138824914794cf49d8cbba0b5e3529ad44d2244c01cfb2833e636021776e246a9eeeeeef69d SHA512 a0277340bec5ca0c5535d79e091218b88eb7d3c809859fc234de59b65d3b8b6c00fac667e00f3a2f6d0b3613f8a079bdfe7ea7e40a1bf484797a09a59de0323d
-EBUILD hoteqn-4.0.0-r1.ebuild 744 BLAKE2B f85b81b97138f3012d2f73fa0049cdc2de8a1baee744820f11d844dab2278210d9d7795294e50f0241d455f11d435a9e35c05bcb11814503fd19d3c102f5e0b3 SHA512 e40ba28a2e2401ae7ce6160371883381b57070f5d61b12f24b5db5c32e0b62a2eacbb7bfe1f2f4807d7c2c3c163fab12f9fd0bef940ea371cf037e6698651488
+EBUILD hoteqn-4.0.0-r1.ebuild 730 BLAKE2B 440c31e0fe592a3964fd8716d72c16d90aa3cb7aa1f9c524f0c56b802160421a880169f2a4bb3d17d9087d7827d950d08ae635344ce90049c471f52cb37e0e4b SHA512 71e13f9d38f74ac07c218a8057910cd4c654f614c49151a0add7f4fa61c35165f040a8d929cf6e889055c450a5ba1f906bf7a56d4d35e601f54b1890fc12158e
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/hoteqn/hoteqn-4.0.0-r1.ebuild b/dev-java/hoteqn/hoteqn-4.0.0-r1.ebuild
index be485169ede2..cd3573ce4932 100644
--- a/dev-java/hoteqn/hoteqn-4.0.0-r1.ebuild
+++ b/dev-java/hoteqn/hoteqn-4.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.atp.ruhr-uni-bochum.de/VCLab/software/HotEqn/HotEqn.html"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT=0
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index c98fe7c74e27..9b0baa31ef22 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -11,5 +11,5 @@ DIST icedtea-web-1.6.2.tar.gz 1824557 BLAKE2B 897155b528a873b2e0166f47973136c5cc
 DIST icedtea-web-1.8.4.tar.gz 2358591 BLAKE2B a62a88cfce49f473a0ab768ca386c4733d69fd3b603b29a8d5e7478b33030e2d016a0577bfc0fa4657bb0b3f99a2524d1b46cad7a8e4f97c1404eff5ca218613 SHA512 d155ec6ed9a007b2c59fd09fed9f4005a79640016ae62287eab7076c05b5ddd56d07b0ff86babf732f1bb82653fc0f7cf434550eabdaac8d666e64feabe4f890
 EBUILD icedtea-web-1.6.1-r1.ebuild 2245 BLAKE2B 86e91baf340e3ac8fd2e88dbc16b3f0d04565a0a5011167be5487676c3821b142b4b187167ee4eebd519310e61c8facfc680413cc3e1bb347f66b08ab4bd020f SHA512 37c9aefae8a58b59e455ae6614d6e57367f5f461f3f71c0bb1cdb8d5988fc3b513ec2977a953af7b1f20e0e4a8322413d8f8dd8feecb576768ec1624d99b8255
 EBUILD icedtea-web-1.6.2.ebuild 2110 BLAKE2B b0d8c5d7f7fda90e25f842f7da8e8676cb0bf8ff19d7eeae886679901fe8a919b1189439a55572c8dcad59a05f82b1a8ab383a5d5472656ffb0b059e107989fe SHA512 06b66744888ae211123c107ec2e012442872481e9d0897e1d505028b48ee13d4279b7acb8a8e5e0fb93d79700784ac880700e470be61776e393ebb40bbf32067
-EBUILD icedtea-web-1.8.4-r1.ebuild 2369 BLAKE2B c3ee179fa847cea338038e91a46455e1ee430060eb67cad4626b60aaa1c0697abfb4807686a53dea8e48e64a10bd09836ce36d98df8f5057cf888a2a5b14ba1f SHA512 740f82359a81a92ee26d1aa91a950676b7d514a32f7b8f23c980aed783e22a23c7ce1869b1497f05f238a2d2df88e898c5a349ffa808b6680a062f2f6335ad67
+EBUILD icedtea-web-1.8.4-r1.ebuild 2402 BLAKE2B 84299c51d0eb13327b0b8e61913632cca1e11cbb001bfe95df8f38c91d1bed67f4f185fa83a150d34bff5ce9af0ff5b126639a2215a270f35e1421c6b93b1567 SHA512 b7dcebf90e912183b8dffc25b38dd15be014d19ae9d1f84be45a7b2910b4f11d2c5a183534ecdeb16c52258f0f448a692ed7e54ce0af1ee07467f9b26c6d9166
 MISC metadata.xml 742 BLAKE2B 77af156387b358bd5d7193c7ff3d1860ad18dd4f3b65eb2a4437f4278222b61dcd821e3ac680e49f49e28cffac46a880d6b1820bafca47a82ee6f27e4accc70e SHA512 10f58fcaced19937c90c9fbf9b23bb7d8cea129d14261d95c9d8cff24ffa0faa52435ff34577636eb9fd7257e62f71c4f93f856cb9d3af19b0226eb9a0c01f64
diff --git a/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild
index 297c3d95ea68..59471a081976 100644
--- a/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 README_GENTOO_SUFFIX="-r2"
 CRATES="dunce-0.1.1"
 
-inherit autotools bash-completion-r1 cargo readme.gentoo-r1
+inherit autotools bash-completion-r1 cargo readme.gentoo-r1 xdg-utils
 
 DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
 HOMEPAGE="https://github.com/AdoptOpenJDK/IcedTea-Web"
@@ -46,6 +46,7 @@ src_prepare() {
 }
 
 src_configure() {
+	xdg_environment_reset
 	# some functionality (tagsoup rhino) is disabled, because dev-java is
 	# unmaintained and a lot of things simply does not build anymore.
 	# native plugins also disabled, modern browsers no longer support it.
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index 108033effc3c..674668deef8d 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1,7 +1,7 @@
 DIST icu4j-54_1_1.tgz 23457651 BLAKE2B f200d170c32065d2f678247d595085283446e401da2c2433b426466fc5c6f93f5ce629bce23d1114cad7d360aa4d127060750d380da8cc3e7fa1e529b454bae9 SHA512 c41f7f9fb0819767da48ac21c4883a628da8397e0ad5b0d75e51d9185b5511608c9a635933c4ae2e0c8911b2cdecf47bc661050935bbae2ba58abfb5ad04dadf
 DIST icu4j-55_1.tgz 23617640 BLAKE2B fe22524761e0c6be4ea440f90ffe5fba8a2f34484207248762ab127c3bb7e4328ced3502a336edd7d3a1026804381cd2b8738b15cd1745af0cee813dc60d7893 SHA512 706daed61d9d3722a0813d175fa66b24570abba492c32704d4df924861e5d2592a4a5ff40fdec2bd3fb662c3679dbc9addd580966c3cc69470d14e3fce27a054
 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 1085 BLAKE2B 27c74cacb5d5174b2cfd25cc240621bbaa2074e538c7cd5ac4c86c2786794516ca28a786ef67bf1750ffd3ff97bcf1c5c70d1dcff3fcc9e29581aa7107ebe10a SHA512 53db9342761a2a177f6bba391b9249ed297dd1133be45343002398514d6fa229ba2ce9d0c2b5109c015448a45f8928be79f627f7910e48c6aaefa57b20fc2374
+EBUILD icu4j-54.1.1.ebuild 1199 BLAKE2B 7612a378d369776fe5582968a77af47c36d8c01b98d8f536191e426db0cbb1f2fe8feabaffb53e89466126269ad7161ee4e9f4881665bb8b87677b2d66670c76 SHA512 ca85754e65904369431f23759bdc3af849294a746f0c02cb4f4fb427bc586ead07a513556e67b2bd362ff0e3b02398a80855ac3af844c625f4128da2cb1a763a
+EBUILD icu4j-55.1.ebuild 1122 BLAKE2B 8e4bbd842f673a1618f95d1dcad6d96379d58aa265fb06aa7c0e7bfb46f9bab940a7e3b8c169a1f2751289e29c16e700d87d01c860f0688d726b47620741228e SHA512 b8426a6b8103c2cb107f4c216b27cc10609004f6624246773ffacb202a595437b3e10e2567d834b754bd96d74465627897047cd0f794264d0e809f58b116eaf4
+EBUILD icu4j-56.1.ebuild 1074 BLAKE2B 99d5c953645ffb08a744b74f865fe9d068f7949c09f4e7d9d9757a665337703b8f450a7bf1ea841115b093a73c7762c9c0a78dc957724432f22e65a1ba7c3778 SHA512 c475b899d49043fb3929a49f9ac1aff4e42ab8bf1ce2a8cd906930d04e8f9b700e224cc3e44f3c078739680440f00074907dd96796bd0ab5c00c998f68aff36b
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/icu4j/icu4j-54.1.1.ebuild b/dev-java/icu4j/icu4j-54.1.1.ebuild
index b7808b26f206..e58375be105d 100644
--- a/dev-java/icu4j/icu4j-54.1.1.ebuild
+++ b/dev-java/icu4j/icu4j-54.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
 
 LICENSE="icu"
 SLOT="52"
-KEYWORDS="amd64 ~arm64 ~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 ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 # Beware of jdk version dependant code #361593
diff --git a/dev-java/icu4j/icu4j-55.1.ebuild b/dev-java/icu4j/icu4j-55.1.ebuild
index 5c57a734de39..025701c00218 100644
--- a/dev-java/icu4j/icu4j-55.1.ebuild
+++ b/dev-java/icu4j/icu4j-55.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
 
 LICENSE="icu"
 SLOT="55"
-KEYWORDS="amd64 ~arm64 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 ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 # Beware of jdk version dependant code #361593
diff --git a/dev-java/icu4j/icu4j-56.1.ebuild b/dev-java/icu4j/icu4j-56.1.ebuild
index f4ff61c4113f..870e9f7a2de0 100644
--- a/dev-java/icu4j/icu4j-56.1.ebuild
+++ b/dev-java/icu4j/icu4j-56.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
 
 LICENSE="icu"
 SLOT="56"
-KEYWORDS="amd64 ~arm64 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 ~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 b1eca4d58dbf..0ce82419cdef 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 738 BLAKE2B ce50c12f0340cd1ebd66c7355b016747b14172356ee015c2942749beb9a74fe1230f8cabc780ef888cc1f97fa0dcac8c05b9f01395dd471bebe385edf8751b85 SHA512 d52a117f49bde791b271d65144e41ab8a2c203bc0e3647c45359968269bf1b5f9e93729a28a35471c66a32bb33d9b6094645d334c8dde8b869c5a4453a07618d
+EBUILD iso-relax-20050331-r4.ebuild 727 BLAKE2B d5f494d6f63f35c639d0a68effadffda47a55fe8d57dd44b89d676e6fee250b23e0954dc1180d798cd539843002113305714b613094ce99befcbf426dd04a4a9 SHA512 e3b6e38d063f2cfda001709ff6294fcf6068e7e46f119a9ca137a037cf8cd92f56afb97230b9553d8cae95fe6c43b9ab7fd461e431e95fa3fd1c05e2ec11ad77
 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 a408e3253220..457fe730bf4c 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-2020 Gentoo Authors
+# Copyright 1999-2021 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 ~arm ~arm64 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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RESTRICT="test"
diff --git a/dev-java/jackcess/Manifest b/dev-java/jackcess/Manifest
index fffc59199298..8cecb5987d1a 100644
--- a/dev-java/jackcess/Manifest
+++ b/dev-java/jackcess/Manifest
@@ -1,3 +1,3 @@
 DIST jackcess-1.2.14.3-sources.jar 541095 BLAKE2B 60700a7ebb87f371a28d7cfcc588fbd61e28e4744e96a214e0923cd32c1b8e265b87d98048b277e8d9e5f1e582f17dc0962550ec8e5e7ede7adb83d0c417f25a SHA512 a0ccc39187ee94f550760d5640b736cf54d7523bad4eed715166608e18b30acad82a8db2d78f4c9da381c04876571c3d9fdb0418ee2585568c5da18b000f3b1b
-EBUILD jackcess-1.2.14.3.ebuild 765 BLAKE2B 72186e51221b6f8459dcd0965a342555c4a41d41c5cac157961fac0636ab3cca5492a1940de06f1965d1089885bf59fb8ba79341d71e51809406137c9bb9ae15 SHA512 56ee74aee1f86d43eb9356e8a54ccb7664dc6b0e8d6f502a40ed86ef93082d7f0532cf6a7366671efbf5151a562963448b9d5a2706718c4ba80d810561de1c6b
+EBUILD jackcess-1.2.14.3.ebuild 751 BLAKE2B 568a4f0c4e993546100d1ac6e50f69eebd1f276b812e53bcf4cb0759eba938846cd83f891e547b95c229df013318b7e01af6f014f8f24c5edb2fc1d05f188345 SHA512 5bc0776e1128df3619f30a43bd140428f0755547b4a3513724ea7e8b8bfa87bdda1ed7b1adfa709c399e78149605308d5c77d4479a54647ae78cd5b7a31b9475
 MISC metadata.xml 314 BLAKE2B 0a48c521ff5b9916de7132a86ece393d4c01e648eadfc633bc0e5cea8fe64cc4a1163258b36c0c1e35743fac87224101f5661255bc6c8ca2ba31c59325d75c44 SHA512 84fc5b3b58171d3e96ab9cd24fad7df6ad3181e8099d1e597ad2c5e08e390fc598e5c7d210d05f722c001e4939a73052781c76322e52612d3ff4df126e5c4460
diff --git a/dev-java/jackcess/jackcess-1.2.14.3.ebuild b/dev-java/jackcess/jackcess-1.2.14.3.ebuild
index fd69eced5bcd..e35244013eca 100644
--- a/dev-java/jackcess/jackcess-1.2.14.3.ebuild
+++ b/dev-java/jackcess/jackcess-1.2.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 CP_DEPEND=">=dev-java/commons-lang-2.6:2.1
 	>=dev-java/commons-logging-1.1.3:0
diff --git a/dev-java/jakarta-oro/Manifest b/dev-java/jakarta-oro/Manifest
index 7fb9219c3254..401c8ca1bddc 100644
--- a/dev-java/jakarta-oro/Manifest
+++ b/dev-java/jakarta-oro/Manifest
@@ -1,4 +1,4 @@
 DIST jakarta-oro-2.0.8.tar.gz 345304 BLAKE2B a52b14f2753cb5ce07d16d417e943009dbb9268fddc62850daebb703ba2da3d83a3d05828479c89cab96174582514af75efedc73050a5f933cc0b26fbd51c948 SHA512 a7f6eb6a088765f273df18ccc823f918737f18ec8772275054839a87f8370f1848e795d481f226c712651104d7598ab86c7d90a991fb039df6581f42f1447920
-EBUILD jakarta-oro-2.0.8-r3.ebuild 1023 BLAKE2B 8994de05a1a2f24bf4a3f32e8152b3b15c2f801fde2e9c63d39ada08bc75f8c7cc59f12ce55348957b13b57d0e01f64ef7300077a1065b1ffcad651239cbdb6f SHA512 9c0582f359a973d97dcc8dae6632bb23d977671f03d9d0c22d6964121e0c3be5e471c156805aa1609052ff654fdaffa1aacf45ff4718ee1e3af94c5ce9465905
-EBUILD jakarta-oro-2.0.8-r4.ebuild 846 BLAKE2B b62c9f3e1ea2cafaf8f510d1ee8a80d2e6c92088600c1d42897f77eec741abb8330f29bb9ffc318f13eb4537cefb0f2c879cb85bc9eced647358b033f10c000e SHA512 744f0f3f6e48d5d1714e68c2f3730bd66fe538426ece8c2883b699780f9cee7227ed55047a6083d0ebb8e53ba557fac0dae5adda63e41e597a190c7de65f0007
+EBUILD jakarta-oro-2.0.8-r3.ebuild 1009 BLAKE2B ed221ec0082f2b0206c68ef71f31262022869632b757c7d09851addf70ccd2ed6fc9adffa6f15e3dc54be990097081045e2b1ce4d241f75eef635e49b62e6d8c SHA512 561b8c7e33db7decdc5c880e4a990d970616bd84c15c0ac2685cc41b591eeed5f70585c5bad7ca0fdd2c7eeabc3c3e3507171521cea7713e18fdd9d5cde70d76
+EBUILD jakarta-oro-2.0.8-r4.ebuild 832 BLAKE2B be29a0a04a1d3a4c64e47ff950f4cd3837f71a97de1fb2daa9337fb5d7947b4699c66a1a5d831a016c126f1726854fbe5e81509fcf303e5e56f3c2184f2efda0 SHA512 c68f60653137b26f3565eebe0de7610c08a01e1d8774bf7109a2e63a18f974e614aa7790cb4aef726a989f5836d1a529d19eff99d2dc53dc8c7c8c064931ed05
 MISC metadata.xml 513 BLAKE2B 7c56f359436aaddf4ef061d969a24d623a5706526c5c2f7ebdcdf287898271bc40dadf7a0940e2d6bee0c96e53f2d828c9e7030f2b6b9102cbb50daca9ce3e50 SHA512 759a7e18395261364c71cb38e5ff76196588d16913f0992611c952bc0b5ed6dbd47e9a28a51b6ae74ab04b4c548ebbb773d1d813b1dd06a0c8b786cd381e43d2
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild
index 6cd4191d288c..a6e8ec728630 100644
--- a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ SRC_URI="http://archive.apache.org/dist/${MY_J}/${MY_O}/${P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="2.0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.3"
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild
index bb4bd7f86dad..0b8e0783d9a4 100644
--- a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ SRC_URI="http://archive.apache.org/dist/${MY_J}/${MY_O}/${P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="2.0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jakarta-regexp/Manifest b/dev-java/jakarta-regexp/Manifest
index 2b2d6618db0a..81a10ea07f49 100644
--- a/dev-java/jakarta-regexp/Manifest
+++ b/dev-java/jakarta-regexp/Manifest
@@ -1,7 +1,7 @@
 DIST jakarta-regexp-1.3.tar.gz 127069 BLAKE2B c6bb7383459a4cacc3af40ec65d83f7d16ae723585fee06b4c874995455924e000d8bdc0b07615028f81fc7d6ba2927755e11bc9e7a726ffb4adf34be034ce63 SHA512 20e932856a2e761ac2c8b62617a0e661eb9ef309230ea8379cf3582a1a9308b50334bea66405fa47fade9b92a3cf9609c0a3e42cb7db85af4af63acaec553112
 DIST jakarta-regexp-1.4.tar.gz 137768 BLAKE2B f6732f6a856736d1394b429453fd8958deb9f3f651f24accf641fee8b5ccc39e9807510135b07452f80fff55423406afc1aed88cef7d80e16ac013a1436b2649 SHA512 209b3f960cd16f05d3fd609b3b6ddb119e056f428b831788caaed6ebcb64c00279b18484845456dd07b8b761a7181f6772dbe9fd578f0401a5d8b1dcf98afc35
 DIST jakarta-regexp-1.5.tar.gz 170142 BLAKE2B f245a3d53eb0be3ed2494269eee956aec7a7459872219f1bb8ecb3e5f544070b0792a690b4a52f70f0e2ba6963842868cfcbf40cdfea0155831f216636d943cf SHA512 428e5971140dd29246ec41e698813d244efc0e871c69d2d83685d8ae3691f0e20ac44aedad3c59f3c356d24384461de83921e40f0cc4d69c95813f02e8aaba82
-EBUILD jakarta-regexp-1.3-r5.ebuild 653 BLAKE2B 8145e0dbb90652da7689ef4bdf2d79a2edba5a19079af1c3bd1e2c9adb910df15320c591bcccedf3f783b9da912c6f5c309ee59b9fbeb48e5761d88dbd3b4971 SHA512 8d7e0e05770e1b4eafcfe8d3ea7927bb929d177adb3c4cffa6ff56b179ed66baa0812acd61d9396cd6db7118ec29a3eb8895e20ce38e82d2cfc9a36753302212
-EBUILD jakarta-regexp-1.4-r2.ebuild 653 BLAKE2B 8145e0dbb90652da7689ef4bdf2d79a2edba5a19079af1c3bd1e2c9adb910df15320c591bcccedf3f783b9da912c6f5c309ee59b9fbeb48e5761d88dbd3b4971 SHA512 8d7e0e05770e1b4eafcfe8d3ea7927bb929d177adb3c4cffa6ff56b179ed66baa0812acd61d9396cd6db7118ec29a3eb8895e20ce38e82d2cfc9a36753302212
-EBUILD jakarta-regexp-1.5.ebuild 653 BLAKE2B 8145e0dbb90652da7689ef4bdf2d79a2edba5a19079af1c3bd1e2c9adb910df15320c591bcccedf3f783b9da912c6f5c309ee59b9fbeb48e5761d88dbd3b4971 SHA512 8d7e0e05770e1b4eafcfe8d3ea7927bb929d177adb3c4cffa6ff56b179ed66baa0812acd61d9396cd6db7118ec29a3eb8895e20ce38e82d2cfc9a36753302212
+EBUILD jakarta-regexp-1.3-r5.ebuild 639 BLAKE2B db437320c32c11251eaebedc14de6bd049bf978bfe66e53f5ee3f9283bc4348029f7b119b97a2b79623eef3c10b28d1b3c6960d828ef34a368a47932be4214a4 SHA512 f7e6b8e1de65ade622b7b5446e856aa5fb6a9167b0ea2a08a7f9d2165de512f59a8a7913221b9111f680d04012dc6378087f4ccdc922f8ef1b377a62ed63414e
+EBUILD jakarta-regexp-1.4-r2.ebuild 639 BLAKE2B db437320c32c11251eaebedc14de6bd049bf978bfe66e53f5ee3f9283bc4348029f7b119b97a2b79623eef3c10b28d1b3c6960d828ef34a368a47932be4214a4 SHA512 f7e6b8e1de65ade622b7b5446e856aa5fb6a9167b0ea2a08a7f9d2165de512f59a8a7913221b9111f680d04012dc6378087f4ccdc922f8ef1b377a62ed63414e
+EBUILD jakarta-regexp-1.5.ebuild 639 BLAKE2B db437320c32c11251eaebedc14de6bd049bf978bfe66e53f5ee3f9283bc4348029f7b119b97a2b79623eef3c10b28d1b3c6960d828ef34a368a47932be4214a4 SHA512 f7e6b8e1de65ade622b7b5446e856aa5fb6a9167b0ea2a08a7f9d2165de512f59a8a7913221b9111f680d04012dc6378087f4ccdc922f8ef1b377a62ed63414e
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
index c510ef52deba..ddfe39278ff9 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ HOMEPAGE="http://jakarta.apache.org/"
 SLOT="${PV}"
 IUSE=""
 LICENSE="Apache-1.1"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=virtual/jre-1.6"
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
index c510ef52deba..ddfe39278ff9 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ HOMEPAGE="http://jakarta.apache.org/"
 SLOT="${PV}"
 IUSE=""
 LICENSE="Apache-1.1"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=virtual/jre-1.6"
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
index c510ef52deba..ddfe39278ff9 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ HOMEPAGE="http://jakarta.apache.org/"
 SLOT="${PV}"
 IUSE=""
 LICENSE="Apache-1.1"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=virtual/jre-1.6"
diff --git a/dev-java/jarbundler/Manifest b/dev-java/jarbundler/Manifest
index 639c1b03b060..e72b86ec1265 100644
--- a/dev-java/jarbundler/Manifest
+++ b/dev-java/jarbundler/Manifest
@@ -1,5 +1,5 @@
 DIST jarbundler-1.8.1.tar.gz 132101 BLAKE2B 0cd223ca9a63604f93d6bb2d6e89d0e48b48b43befaf510181fc8f435dc2f61388995f11c9efe4439e784b66c60a1395a43ef2041c690967b226a0212e77ef68 SHA512 f18657aaaae749846544fc35b65fe5e548a0471d85bf4e1d671bf1c7309f2392487069e880ce5f9c1a0e076637dddd9274d536969a9df5401331835f881553b4
 DIST jarbundler-2.3.1.zip 159874 BLAKE2B dbfa00a930a0f1e4c26e4372254f380d67279edbb6bc885db2a964f7fda744a68b9c6dc0a088ca851e62ed55048d33413186f6f340b5c80b52b8d9b4c589a355 SHA512 8b8b45533c601d10b6f986b913b824bb05617ac0901f178ee3fcfbdffa41ca060325228f71e62c4dfade778d50dd2040504eabf49311d386d75b82f77a535280
-EBUILD jarbundler-1.8.1-r2.ebuild 869 BLAKE2B cea2b3042a88685ffd2c6b939b872cee25cc5bbcdf5b69626994c0b6db257ed46a2f5a4ae726e2cb0a4b6d8bb2525121e06eec66567f7869d30e87c2cedd74f5 SHA512 d326dbcccda173844be07dd606d4c4ac25be57716a800fd71fe117d647ce80848d9f677caf73c253389899f811d50e746174f135e63e5925b922f78dbf4fdbd3
-EBUILD jarbundler-2.3.1.ebuild 868 BLAKE2B 35226bd7fad4d88d3a446c068cddb9f6f16eeb3991edbe6371afc56a373903f7ce165bacdf42c33d01fc7e901904104fe386ed4c0b34304d384c5bbee538121e SHA512 0aa78d641b828d97cfd9fea08b852c0208899b91ef54f74047fee7d176d832b4f4f9fbe890c7987ac94d44757ae36930428deff75b20cb8a979ed6dee07fcc2c
+EBUILD jarbundler-1.8.1-r2.ebuild 858 BLAKE2B 7628d00b2a2305bb2ce03bf924255aeb8499c0bdbc6008c00a0823f62f1055d54d58c638df34ca08938cd4c9c912291b4eaa1cf6d0077f8d42a79d561b85fedf SHA512 463872852f0aa9bfb42104a5849c3c504262416623d19936820ccd23130f1627f16116bd63bf3a902e4ee38dee89caf483b909034d1d39a87c20913d95abf92a
+EBUILD jarbundler-2.3.1.ebuild 857 BLAKE2B cbb9f259ab1d89966536101bfa7b5f878bc2417ff50d96d97c912be86de6d54d8c0ee07a8ad7b3cdf9a8795f3cd94ac605607866eb886140cd6b5ded1e56dfc6 SHA512 af06e14cb5fdf291cbc3d84616120871fe84393064d605cf355a4d89421b8a00eb7d62c14b76672f7884362b0371fc2c906e25fcc1f8b0d07a7a173b0bda814e
 MISC metadata.xml 322 BLAKE2B 6ea89460d4813d9c2db72652dc86a873698694cd3f3059db367be4493d959992d97467e546495cca4b2dbcf2e589d0e21abe698119b52412db2f7dbc14fb5d67 SHA512 acb71ede8573f755de74312313f408b689412ad7d045759b847be295374150608cda014779b38c47cdf408792bf794c26d4c53ba81294990f78fdd770e375f67
diff --git a/dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild b/dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild
index 30564a2f5c5c..c3f4540720f3 100644
--- a/dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild
+++ b/dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-java/jarbundler/jarbundler-2.3.1.ebuild b/dev-java/jarbundler/jarbundler-2.3.1.ebuild
index 85b6c77d7df3..84ded171f5c0 100644
--- a/dev-java/jarbundler/jarbundler-2.3.1.ebuild
+++ b/dev-java/jarbundler/jarbundler-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-java/jarjar/Manifest b/dev-java/jarjar/Manifest
index 75b92639f7a0..52ca6ff43e65 100644
--- a/dev-java/jarjar/Manifest
+++ b/dev-java/jarjar/Manifest
@@ -1,5 +1,5 @@
 AUX 0.9-bootclasspath.patch 630 BLAKE2B a4f65fe4d76ca51c5b5f41b707c52e9dcbb579d08d50eb63be54e7ce15ad0516847f1bc0e1d84ee0767ee068d9a5863e93d8bd5ce20d563a4e3b2ce7c340a43c SHA512 07225e41b1497c369fcd924ea6ff612388c020f89181e583bd5dc55d5219fe81a196c76df3bf5b8bdf882bf3a25b5b874110d231c5a3e5d387bdff16b2d0cc27
 AUX 0.9-system-jars.patch 790 BLAKE2B 702240e131e2e22fe5b32e52493d87e6f88c9025f782cc74579f2027b20f6bc44dc2e229dfd8cbd20fcc8bb9310bc87d24d04b9db779059c0a599e329989fb98 SHA512 6dfcd74af809b85e11a4f9c0cf5aea176ef1dff86705346e26a0f4be6f2b9f45dba82d304d83dd5be6e8def37947217bcebe408fd7627f9a1511a3d6d721d992
 DIST jarjar-src-1.4.zip 339014 BLAKE2B 88694826dad529396cd4471aab135782aca7455daa56f2f8d66dbcef2630466b1f3030c95c79ba8cb054f44bbf5dca39652283c41e982eb63f264d5d163ff1d2 SHA512 62af4f07c3fe2b887da959b8251a94fbd1c142e56b3332ad81865eef9ba32ded47883fc37d943c0081a4496ab71ef044022d13f21ccdb8db690638c26fc52c31
-EBUILD jarjar-1.4.ebuild 1242 BLAKE2B 7abfc5cb95ddde03bc4241a2317c21b9d2108527d07bb45a7406f63bc9a6f29dfb1df540247ab2afc5f4a2e9208e9bc628953ce472153753368ddac172af8865 SHA512 0036720b57b00a730ba1f67084205851a5234f179e07e018dadf1098edadbac44d76552ddf5ca588c1084a55763bfe38dceccb6e62b97e89a72db019c0377b10
+EBUILD jarjar-1.4.ebuild 1228 BLAKE2B 840fab7b957f997bf106308cb68253916c4110cf083aaa2c8223f8b4ca6df952c285ecdc4f11706448afdb0b055377ad9938a5c76cc669298110ee46fc1515e2 SHA512 424de9d8c07c16f0e16882b3b31e74e04eb11fe29aac2215ec907f425d3b3e96ba1f8d2c3b20b10939a1e1a7162a52049b5ab51fb721c040b41c932b4b73210a
 MISC metadata.xml 312 BLAKE2B bc12f682c75d74033efbbf7b5a286d8903c59e78bf0733416c29a3d6190c1c95538ce72158ab3a0d1d6c3e644ee8f221ffdc01b25b180c10be2606c682e869c3 SHA512 6e73ffaf397ce44fbfc20a9d676eb0e751da1a48e8c1e6d7bd074704b647cb7f7f87464023d71fc4f27e2cb3468b729aeb005f5d0c66e94a6bde035eeebfb211
diff --git a/dev-java/jarjar/jarjar-1.4.ebuild b/dev-java/jarjar/jarjar-1.4.ebuild
index 51487a4f2fa2..96536661f674 100644
--- a/dev-java/jarjar/jarjar-1.4.ebuild
+++ b/dev-java/jarjar/jarjar-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="https://jarjar.googlecode.com/files/${PN}-src-${PV}.zip"
 HOMEPAGE="http://jarjar.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 RESTRICT="test"
 
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index eb4e46c29092..f4df5e58f921 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,4 +1,4 @@
 DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
-EBUILD java-config-2.3.1.ebuild 1094 BLAKE2B cecebc371ca2d2e74dc51f7f93a2af103793c0e99b2e04c530dfa048dfcfde2660ec784b7668306a8640acc4b6a055f7c0105b8e63aac9402a3199488710f639 SHA512 aebcaedecfbde203d4ca857f4dc3f1848553f91fa404059c2a63d6266a02b3968b63b1dc364576807c2f3ec92d67296000136dbc7fa5ea2a629a408f87dc06d1
-EBUILD java-config-9999.ebuild 1219 BLAKE2B 8661e165198b6a62744808cb0ce24b2e01ad43841519eba6dabb456da0132b711f153551c06abbab36de4f0d52c3e009a3e7679a780a6d692ce544f73000805f SHA512 2b3ceab1c45194c994887a27d7fceac6e039518d67c702954cf9465de088681f784a05bbd30e2871d19032a0937732c987fe0e8cd6d74501a960029f7a2c9064
+EBUILD java-config-2.3.1.ebuild 1083 BLAKE2B caf096297c3aea42c0bea3adb9990383063264f3faa7b728c2813918cdb13681124a93ba79a6f632c7882c0ab64bc3b457346fd5ce711d495fdaf355c3cfd29c SHA512 6fef17271e69e77503347357425e4ad9a92870245f3f6265e85ae74b1e0d3f1302faeda0a212def07313a9ddabf8a5d2f614a2784d0f479adfbc042e93e122a1
+EBUILD java-config-9999.ebuild 1208 BLAKE2B bd77b5e1083b40c0248f9372214976e590ab6a1c619c5a02e3a3f91252e0ab0575dbaf628a5a40f0deb89223bcdf1ab4e8351810d52e10deed5c6821213a91fb SHA512 944440c27f153101a1f72c639173c13e25f319a3fdc4a7e0a6f079a1366e03d5450aacb65af33545e9295322ed7b724e929bd357f10c5df44ca6992b54a5c8c9
 MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild b/dev-java/java-config/java-config-2.3.1.ebuild
index dc9ffcad70ce..351302f2a78f 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild
index 5d6a98ef9770..839d56c3ef1c 100644
--- a/dev-java/java-config/java-config-9999.ebuild
+++ b/dev-java/java-config/java-config-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ $PV = *9999 ]]; then
 	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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Java environment configuration query tool"
diff --git a/dev-java/java-getopt/Manifest b/dev-java/java-getopt/Manifest
index f5c0abef0789..ccd5b14824af 100644
--- a/dev-java/java-getopt/Manifest
+++ b/dev-java/java-getopt/Manifest
@@ -1,3 +1,3 @@
 DIST java-getopt-1.0.14.tar.gz 45561 BLAKE2B d82234c2e49f6f556ddabd38cd283a63c2f6365ed23c227c42c48c75d834ce7de6a3fdc84c890762f05a63d4e09bab7e584f1cb9d17ef0a4784cd36c62f3128e SHA512 611a08b60ed787eaa1bf6bf6ce45075ed2bd75d7eead941879e019ef12cb4fcd7a196d0e64e9a75adaf35240c872f14590d7afa4e2dda03016fa970bd2e2dc25
-EBUILD java-getopt-1.0.14.ebuild 854 BLAKE2B 9957c406ce02a777d74cfbbcb508244ee26f5c8ab1abd3de9c09228c78e86996b0921e6e84ad4b26509c75bc73c826daaf934e0bf8b73e04919ca7f0a6301df4 SHA512 8e6dd6c78ba59f8fa98babe48148e10bde44fc582d7bcba9b52f78968feb394d30c7efb6051d511dd79f8b9335244b4982fac8cfca96b908968dbd8651d5f593
+EBUILD java-getopt-1.0.14.ebuild 843 BLAKE2B f0d3aec23849866559ef18009dd93219cda8183fe972866e1b653cecf15f72a769247bb778328938f17da049944c6afc06cc51beb133c4fa4c9deaa6afd3a5a1 SHA512 e58a649a5854fb7f411799e63dc47897de00b55bc92b55e5bc5193f75857c82f2ee231e8de255e4839eb9858b54e739b68f70ca37e2b578edc6558ba50ec43bb
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/java-getopt/java-getopt-1.0.14.ebuild b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
index d8fd667cc8fc..aa561593096a 100644
--- a/dev-java/java-getopt/java-getopt-1.0.14.ebuild
+++ b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://www.urbanophile.com/arenn/hacking/getopt/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest
index 15d1e9888ca7..0a370ffe62dc 100644
--- a/dev-java/javacup/Manifest
+++ b/dev-java/javacup/Manifest
@@ -1,4 +1,4 @@
 AUX javacup-0.11b_beta20150326-build-xml-svn.patch 1385 BLAKE2B 43ed5b0c75aa308f2301d8e7d633ca69689a1772a7d8f0f7dbd6f914f1bbf571dcef0ac9fb9cacbe07aaa8c50fca69f0fa95f661314dfab2c16ac96ad50f11f7 SHA512 211157370c61995a05ce45e70941d99da9031174fae2b6e4bbacfdd0c402c451009eb5952a8c3cf8a586402aa138e70733dfd46ce9cf6b5fb680edf65657506c
 DIST java-cup-src-11b-20151001.tar.gz 313405 BLAKE2B 126944916d120dd2150e4a665fea6d216f3d55e002a72b581621df726e4bf0e0664f9ff925189c97162582277c08a4f121e056299ea5a3f5c10cc31d7c0feb9c SHA512 70bb6a0e13fe52694980040205fcf5b3e904c4a07e50c7740c55cc3bb481496c5c071377757b94f59807b936b8c4fdde5423d78cc2d12a7ada1870f71cd9f47e
-EBUILD javacup-0.11b_p20151001.ebuild 2809 BLAKE2B 76a0cc3771df9024b9a7235aee6bcef6f4801e134cf556007250d7fd6d376dbc85c5e422ebf092593836326adda8513cae75b045db1719ee864c2607f20d9645 SHA512 edd6c3e780a36fb98ba7b51c9415b5b88852aed0f1ddbdc6519910f9dc697af3af11de0475a02fffaebc90be468e659f3a34eae570616992d247136721d198f7
+EBUILD javacup-0.11b_p20151001.ebuild 2798 BLAKE2B 8bf3e57971595295db4c5af67e9d810577fb1cd017a226ad4bf6f1835fa96d1150f9135e7ac5e4b2b374d2d433f58d6ad55193465a8f092e8d82c83c949f2050 SHA512 cc8885b9d6dfa24f39d9ad9ad28f4af755d1c50182b388f7ce1243125de58aade47872647b2fd5add3a4f80af1b88697da39855fab8d0d95e49e6db75b087bfb
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/javacup/javacup-0.11b_p20151001.ebuild b/dev-java/javacup/javacup-0.11b_p20151001.ebuild
index 0f29803d09c1..9e50193d6fef 100644
--- a/dev-java/javacup/javacup-0.11b_p20151001.ebuild
+++ b/dev-java/javacup/javacup-0.11b_p20151001.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,7 +17,7 @@ HOMEPAGE="http://www2.cs.tum.edu/projects/cup/"
 SRC_URI="http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.7
 	>=dev-java/ant-core-1.7.0:0
diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest
index 44160c61a50c..68237b2e8832 100644
--- a/dev-java/javahelp/Manifest
+++ b/dev-java/javahelp/Manifest
@@ -1,3 +1,3 @@
 DIST javahelp-2.0.05_p20170719.tar.gz 6045243 BLAKE2B 3cea100e6087f7f8884a04cc1b046f2611e4c516be0086faec685a85311f2cfd9ca49ee9f3fdff37d7e9a496685dc288601521047a3d4c2ae6b31faee2ad7390 SHA512 6d98c33f831052133176cf50419aae6dc1f5715485bcfd33f7e346cb694f5483b1f7a159f47799a72933db8ca42d83cb73b23946179aa6ccaee946d524b3bd36
-EBUILD javahelp-2.0.05_p20170719.ebuild 1686 BLAKE2B b7a276d8d1428d94afca75e57c7971ce1fe3152bb34131269fc61b25440a19c90c193a439e5a1af892cab9e4824e6437a1e7d861a7e16e37ebb67e7a34693dd8 SHA512 23fa924b8a5d32efc3888eea20ca1c5bb6ca6cbaf18f5e66283eab7d06aa5a42d33a09f9863791fc485abf86ae932d01cef44026c968fc9bc0b2b5445d9fc5db
+EBUILD javahelp-2.0.05_p20170719.ebuild 1675 BLAKE2B f34208c7916f586887ec1aaa8406f901b13091e39cc95968c79b8edaf9a24fe95d1e87ebd3e0b98b8f0aac1b830a77dbb40abd87edd4d68877e06e9492e63b05 SHA512 096d8d05f423741b3b7cacbe672c6b2d42a44ede611cff8aaa3252da75f0a0c391f184a8a9f7a93266d5054c0e39c708afdd251a1b984efdacf246de7df2b8fe
 MISC metadata.xml 624 BLAKE2B 0c06c71189c699c3baf3f8d307f8b077ec8e6e03acb4e0ede09c7537354ab6b7bc043824fa6052be49ccbd6f0debc1cbf2b1e46f42f69a95a1906be6e43639b8 SHA512 bd475a0c41855b34bb58ae6d6a3e2d164abbb97348d809f2fc305e77ca80495bccb4d71ad0aeb0b5586565c71649c6e3775b83c92272dbe8518949864120f484
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
index 1ad3e64a20b4..4761d095147b 100644
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/javaee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 CDEPEND="java-virtuals/servlet-api:2.4"
 
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index 4f3014f460f1..c6b34326ab9b 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,5 +1,5 @@
 DIST javassist-2.6.zip 1143271 BLAKE2B 05f4e5ebc47420054d4c3d2f77cde33b92e616f3c6740fc030e69b90a697bfbb67be300375d9efc1929a2acfe3493f427222f8a7b1e3137d8bc42f749e51f840 SHA512 8a6da5e2a44cc3bc5b87538a4eda56808d13998d8c9932153f9bb42a1c7844d1a1c7311eb22b0b4ad04649bb7c22156acf851bee638cffbd3328bcef1d2a9f37
 DIST javassist-3.18.2.tar.gz 1179428 BLAKE2B cc7dfebca2e47576f902e6249c1efb65c18823e75ba3698c2d94541bdc910b9b7547e8619c1f19a84c158771230ddd112ddb0445ed97cd64810beacf3468a1ba SHA512 67f22a70584eba31088d63b7862f0f7872a6a7ec57f4397b95044695af75be005e86aa5a5f20fe8e650c2178a9b63b4b922accf940b46ceb1c8e7ce9c51798ca
 EBUILD javassist-2.6-r2.ebuild 756 BLAKE2B 42f0ab587abaa592c82da66bca499abca1c726ed39b9588a8cdfe3a74c78a8d1c30982aaaa8c754af53c9728e0f341b4c4ec7b189249ac161ae63bd220c6a738 SHA512 58373704cb574b16a6bae4c2a1788c565fdfc83eaa6774a21f6dcae1814fd0be1c9306209b08d8aec801e5d4e34ef6a0f190cfa6ff410515230ef626c439c50f
-EBUILD javassist-3.18.2.ebuild 971 BLAKE2B 661a130dd6945499104fc8538e041dee22708b5286b6e0ceb24fe1a4e98495bce832c040c69890bc5d03e19cd3470f06fcb1c8fa72f69f5fef6435eae4e23e6c SHA512 233566ebfc48c0d425f2b7a9ff01f1cea115c852a9386c7a5a0493fff14b6d37188ae853b523fac70509194f713ecb2cd216f1f26eecfd58ca0220f272051521
+EBUILD javassist-3.18.2.ebuild 957 BLAKE2B 3ffb97f205573beba1eda412586c01ec7eb45d920190cf10fc290431ae95415be1413788898b6a20f20101592fe3a36281bbdf86878db88a41bab400d6780198 SHA512 c08a4f1d3b7d70b23ed9564f60abf47b565ec02b2947cb80d21cf59c390ecbfd1d1d93895d7697e7283e2e239b2059d31831c2f5bc41c345885b7765c469cb23
 MISC metadata.xml 376 BLAKE2B 4f31c9b79818bbba1a766800296ce4cdfa81b1a7f10d4c6cf18b59d99e6e59071552a85ae216f6383b2ed5356f433d029be4ce8e9d6f6575adc60b2dfcb8ee07 SHA512 ebd682e2a4913e15c4c93c7f22c10e8f540fb377f2d90f137291bedd1ed7410b5af36215e94543f6e048803bd4475ee69371ff00255f227c4f2df9432f118ba3
diff --git a/dev-java/javassist/javassist-3.18.2.ebuild b/dev-java/javassist/javassist-3.18.2.ebuild
index d2f8df82b49d..4590c14bc8a6 100644
--- a/dev-java/javassist/javassist-3.18.2.ebuild
+++ b/dev-java/javassist/javassist-3.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga_
 
 LICENSE="MPL-1.1"
 SLOT="3"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index ba31b5f6268b..4b5f063f4c6f 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -1,3 +1,3 @@
 DIST javatoolkit-0.6.5.tar.bz2 24380 BLAKE2B 69442b45e32e63e9f4f8104570ae644d6dd5571b6b909fd751a7060abddfedf84cc147f342a40ade8c4e04764f1a8362d853fae91353171708d5daf68ef3f8e1 SHA512 8a9cf0f2b7951bfe9ab544b48eecf5857ae4bddf129a1a0b928a2b37df7960b082495c44f42954cffe885d48f850b070781593352f09221d1b35b9a94ba5b55b
-EBUILD javatoolkit-0.6.5.ebuild 821 BLAKE2B 681c9526f03d031e8fda801d33165b255680b967a57c7009c3e348679c71288a99756000ee55925a493ef3d1efb5a3287c0b953706aa2ea043bfe1fbf278381a SHA512 5e5e4c8cd275b8b6f68c6f86c5e6dabdaf791bd0f7862e0b70e58107d9e6c4ff9d80f412e7a184a071ab813242d33a292e7b48b94b3ed216d61f226bae245d73
+EBUILD javatoolkit-0.6.5.ebuild 810 BLAKE2B 3d05bf8539e2011873748b9fc1ec1ffe7b936328e8f58d9e85ccffac5c4ce92f8b882df1c55f9f871517b7d82eabb3d17c1762fbb43634f56aa14dbb3ea30daf SHA512 ebda325240056371c32bc74b3280b790f5cf4f51dcb501a050f92dec2a9594ddfc9699b52a9e3c4569cd65d5b0c72274f571a38833285f3728c19611b94d5ac8
 MISC metadata.xml 260 BLAKE2B b37eb6d2d2182a4b64e7c3a9881a08a7072533de1f0920927c3c197f53db2a0ad57a44bdf47cf75cf08a93d6c55b2f6e0694227bcf07a606e337345131719cee SHA512 c4b63e127973fa92d06e9e1efb5d42571a9963a23c60e50039d8a4fc31b2ddfeac407deae9e03c2c1636957b3b3c53ba3944c03978958bada06a7996337fbb7c
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.5.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.5.ebuild
index 68412cd4bfcf..b09e6e44987d 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.5.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_prepare_all() {
 	hprefixify src/py/buildparser src/py/findclass setup.py
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index a1a9995068a1..d26f6903b243 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,7 +1,7 @@
 AUX jaxen-1.1.4_maven1-build.xml 13148 BLAKE2B c5f6421878e732db00b2d5daede8d93cdf1d349c1dfdbb6f83a607d734dc05f0847ce5f8cc86ec1a2be5855d96dfc1a3128c0811846f4a5c7679dd60ad730c12 SHA512 2f3625a2a14066289b20e1118a87168e6cf1ce252becdccbc6f4eeefac446e528298e1e6af7d1304ff9d1d4ee8c394c2cf67f6799d3062091d53cce7ff5b1e42
 DIST jaxen-1.1.4-src.tar.gz 268493 BLAKE2B ff51cf3b6507f19549ab864fa4cd53d0b2d0c34a21a944d22feed74d58fb71c0273f5b560cc9c02aa50748f672115e77fab24a2d986508841d6a0ba4b8911690 SHA512 11c1c744af030c50579f872d8c8bf437e48ab4a01e6dd34529f2d9039c154533edaa9b5a367a866e2b57f311f1111717be300db8f80423c5492be38e0cffc031
 DIST jaxen-1.1.6.jar 409677 BLAKE2B 55e03939420c103fb5a6d323595ff0cb7653885eb9ba233fd581c5376d2ac90eecde7aa5576f602cdc459cfd9ba9e79c6bb5bfab3ed7805e717a21670a5748ee SHA512 979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48
-EBUILD jaxen-1.1.4-r1.ebuild 1093 BLAKE2B 0e47f2c480364aba8866fbe784575a2ab06551c6887a74039937729f5e0a73e9a5d99db8dfaf31deccf13274433bdd1b350879d0bb6edde88c8ce6cf0300fb3f SHA512 ef571e18bd273a59d179dcfeebb52babfc31696ab9329abbd7a27b63be4be9af22c39050490b644f01becb13057aec1c9425a99283107c472dbd1a0587d863d9
+EBUILD jaxen-1.1.4-r1.ebuild 1082 BLAKE2B 5a63323c265e84a70008b4f44788ab50f0c370906f63d46aecd4e476b23c31aa37162b21d9d6ad950c3e59e758ffd711d204b8d8bf05fe1ee3e4076ec07d5daf SHA512 82a7a8b205958e9e81d28887c747a9731077458f213af8c30551fd9eed78cdcf9cd7e29fe385e3c9513f3421fb222c4aad8f959bc1c59d1e42da38847e3e1f0d
 EBUILD jaxen-1.1.6-r1.ebuild 886 BLAKE2B 9bdcae339d701ba219baa7ba9fea620f6107cbbab7e14baa7533ef14d7b8cb5450af23044cdcb11af32273bf260fd366294a6a5348c957850c657c996e9a6b50 SHA512 2facca63e346083a6842c004d048ca819668668f78dd8444f88a3d6425c785828178a2a482608c4b02395e2340e4405c8a87a78b9643e83fe8f2bdb92ac7c104
 EBUILD jaxen-1.1.6.ebuild 613 BLAKE2B 7f5654f3b927954ff7511664248e6083fa7b3019e1fa893e356175a27fd40d812f8ef0470fbf9c1cff8906e87048b9d808c9d377f8c7e872662339ce821b2690 SHA512 4bb8b4f2c124f9eac8e96ce99cb32d39dd04c46e6e17b7217f8791d417ce8dc87067d611df50967a2caec67265fdb14aac9d0f28a57c4bfe88f941bd860bf91e
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
index 7b7eabf75220..8968d7a7d6f0 100644
--- a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}-src.tar.gz"
 
 LICENSE="JDOM"
 SLOT="1.1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/jdepend/Manifest b/dev-java/jdepend/Manifest
index 774e079c5d27..3e49174945d0 100644
--- a/dev-java/jdepend/Manifest
+++ b/dev-java/jdepend/Manifest
@@ -1,3 +1,3 @@
 DIST jdepend-2.9.zip 302836 BLAKE2B dcf3b9c37037926d3792932327ddeb1e95fbbc47beaffb2197653b32bb919a0f3bb4d80c3b32d8e8d83f58e3c216ae5ae6e7ad923971adb460ef0d7fd6036149 SHA512 93ae1ca82422be0dce9794f25ad98c078da7437bca59c697405806a462f81b52028e0536075e2a2f428d8f8c5a27ae50fa7a580b75edbd4e8c9c750315b1c919
-EBUILD jdepend-2.9-r6.ebuild 850 BLAKE2B b86b0393e004e6ae102ad404261da9f703c44c5d361d7199303c3a39efb6839d8dd2369161121770aed18f2955d018411642d00d218fcb0c930dc0bbd610614a SHA512 56047b6a741f1a58930ad25ef1a1a9ddbd9fb508b2a05f8184a1af9af9c89b1926f9f8490e9bbd284c67c3f5843fbc33aa8f8d76ec7300f73e152f1dcad5af26
+EBUILD jdepend-2.9-r6.ebuild 839 BLAKE2B cb87f50a0c2666436ffd4a7e27bd92489283ddc202a287503fe2a3a216f07d3c09e31bc8408999987b74da9f06063be7bf3be0d5a4581ed83ed5e6ee60457789 SHA512 de72b9ea1decd14bce618299aaffd13ce3baff49801928157448cfe28f151faa7fa81d7b5c87566c8449b77ae316173aca4096f0c28404b3328b5359b9adc860
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jdepend/jdepend-2.9-r6.ebuild b/dev-java/jdepend/jdepend-2.9-r6.ebuild
index 354bfbb7ce15..39c2010bf34f 100644
--- a/dev-java/jdepend/jdepend-2.9-r6.ebuild
+++ b/dev-java/jdepend/jdepend-2.9-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://www.clarkware.com/software/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 24440d390546..f7890f4c0838 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -2,5 +2,5 @@ AUX jffi-1.2.8-junit-4.11.patch 700 BLAKE2B 4533e3a8d6a5921b1e39ea20c9b4dcbbc66d
 AUX jffi-1.2.8-makefile.patch 1443 BLAKE2B 9accbdcd70c1c76e3f94a2131728fa83f7c988b5ce52aa7874d012700cfa4ed1cf3c3c2a281ce18c74776639e653f5a18e9c4b1d86baeaa9d10e577ca067e8eb SHA512 02f28b00e1ca6d16046c5f25c38268f78a41b5b202c4f284e8dac10dc245ad150f4639849c0af8c20f50dc3e7cf715bee6dfd2f1edc48496f822d78aaef01b39
 AUX jffi_maven-build.xml 11287 BLAKE2B 01ef4db6fef9d963bd52e0c15317ae836b629d9b22987c2d69a393d5513ab60bf2b062a083bb5b1a04301493c982f3926d5c9225972f7861e4ad668c9fc7a1f1 SHA512 56ebbb915d359f3eacf170d08fc1cf30f6efe900c91df0259a1fb69c6873ae839df829227b55e1538b4435387a82ec3e774180cfb531eb747e05a562aa7b97c7
 DIST jffi-1.2.9.tar.gz 1952668 BLAKE2B 320329b02ee9e93153fc334b73a6216da74ac2d924a64c8a1569f1f1507e1196d0b922f7d158ea91f6bc7164979b2ac12de239adbe98664a3708dd29c8d40f96 SHA512 2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4
-EBUILD jffi-1.2.9.ebuild 3132 BLAKE2B 9435a7ff901330d34f7703df0cf9ee1be5089f7e8eb603bc07017d96d5f87b956aa9f6c3f789eda3a6aa9cd4b423606439266b14f9c1a0486a4c23b623382853 SHA512 3c628345ae454ebc164b4ae6f850cc8f0593c81e25608fe1d0031759e1ef4a8ae5194d4e55b9ffa56b5f4660094f15352d899f29d64ca131c45fe45d607f2460
+EBUILD jffi-1.2.9.ebuild 3091 BLAKE2B 54dfe33c76e2b9b832d766f7c639b020585e146beb25a5fec0f82df351e6a7f71bc265ada9a0afb8d6e8cbf1455ba09840df613ba5e08543771778b3e06aa69a SHA512 a5ced76cdea6cd51f6455544214bdf33e424d7989e3ef1f379d4af0fd55d83b992cfb993d2786a59e0284b523e5f482ac415e7a28e089d85c23ead405fba9212
 MISC metadata.xml 319 BLAKE2B 999865e43b7f7ecf6784131fc903f80f208bf39dc54e96f6f80bd991998ab9694fb92ce8cd5e998a2e0800b64e47068859a7c63d46ea74294f1da77f1a18c46a SHA512 ed411e700c518b64ce76a437771c3a4779ebf47207d839924220ae6174ab7fd9cde92cd347c93b1916849cc2fb7fd4a5e5c29911420bc3485cb2916034d3f71b
diff --git a/dev-java/jffi/jffi-1.2.9.ebuild b/dev-java/jffi/jffi-1.2.9.ebuild
index 27466b724b68..7f8b0a351a90 100644
--- a/dev-java/jffi/jffi-1.2.9.ebuild
+++ b/dev-java/jffi/jffi-1.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-3 )"
 SLOT="1.2"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 
 CDEPEND="dev-libs/libffi:0="
 
@@ -49,7 +49,6 @@ java_prepare() {
 		# don't mess with deployment target
 		# set install_name
 		use x64-macos && uarch=x86_64
-		use x86-macos && uarch=i386
 		use ppc-macos && uarch=ppc
 		sed -i \
 			-e "/ARCHES +=/s/=.*$/= ${uarch}/" \
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index 56dc541b8727..f6d3ad857c40 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1,4 +1,4 @@
 AUX icedtea-arm.patch 710 BLAKE2B dc479f8db4f1188ecb63708700d1ef0905590aba6b552b573c9fc05027e195d2dc1143542ca1998a5a6feac53af4ef64326da3f746f8aff1149b0bb01a3793a9 SHA512 9ebf22f2771672bb9ef28fcb7eff0d907e9fe4466b18b3ec3915b27caa2edb07934a47311abf41fbe124b484cccbb19ca68f69acd5bd76e46a49b029dbf275b6
 DIST jflex-1.6.1.tar.gz 3027791 BLAKE2B 4262f75c16a847314db8cb175901658ff6b424469e66523b41564179fa30f0e64bcf2d7ad0e06ad918336e5a41e166a74d55f19f7451662d19fbcaa29f716dce SHA512 436840c90d906042205d27e1d3c56dec724bf62cc3d8c8d3445f217af0a50c9ca2bb56ed91f0cd3c37a930f7ca22f4cc50e8c28dbe905f02adf695c8e96fb07b
-EBUILD jflex-1.6.1.ebuild 3561 BLAKE2B 81a856b2da4e16fa09e939797757a10ed77c3f47a8382511732b2f854b959706b5198972fb460b49ff5e39ee3f90771e75cb214822075eb1cf4625924123a11a SHA512 9f392e643ece0f86ee089dbf6fd4722cdc635bed73f75de8b7424b5cc73ac6596d082bc1eb59da348a503a2fa9bfbe784086837b18fbbc7b7fea475b5a533894
+EBUILD jflex-1.6.1.ebuild 3550 BLAKE2B 60652de3c6f2251ce128ff058e36265a5ebc15b98db0f0ec5c1c611adcbf868a2cb3855f535ac15897bae15bdac1cba1dc813720a8adcf5968a3f7a3e2f0a5bb SHA512 5cb6e698518eb0d765c35647766a3cab0550e5c48f7e37330321a22039ba1c99fee64cbbaf26faca01f684cd7fe7ae98a03aa694c6eb32b8f4672541f2ea2977
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild
index 2fc529849fe4..6876dc50a7df 100644
--- a/dev-java/jflex/jflex-1.6.1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.jflex.de/"
 SRC_URI="https://${PN}.de/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 IUSE="examples test vim-syntax"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/jibx/Manifest b/dev-java/jibx/Manifest
index 4f7c0ef588cb..a01ca73a7888 100644
--- a/dev-java/jibx/Manifest
+++ b/dev-java/jibx/Manifest
@@ -2,6 +2,6 @@ DIST jibx-1.1.5.zip 6788994 BLAKE2B 0b579e6eb9f6037c92dce3acbec4e9fd5a6aec179cb0
 DIST jibx-bind-1.2.6-sources.jar 450003 BLAKE2B 01dac23fe19f59f634bbf4c78c5f8bbdd5f61cb20e3fdc0d7a08d18614220b84b0512624019e29d3c2c2500c2d7278613260ce70601f8aaa0a863cbca38dff6a SHA512 8a93aed76d00c465f4fa1d4929bbecc37497b05d7e094b68745bd740bf06cfe87919f3c02b83311766852845e763a2ed51f9ed1d543d03921dea1b67526e7668
 DIST jibx-extras-1.2.6-sources.jar 61737 BLAKE2B 4a9a5f3d2f0490b7322a911bf245e9081c1aeea112908014a64dd32792a5ae2519b5a2d1f29119774ad4d9947ff6ed30304f401a984d677619837139fa4ad4bf SHA512 355e387f92766e2cdd8686e9ed26e80584c668ca6c670532f8f24ae758bc4713cfd505890f0ea634b3380f41429725e2ca719652700b0dc3562d5966b108b3ed
 DIST jibx-run-1.2.6-sources.jar 194660 BLAKE2B 4a5cafab6ed7a75e88151c141bd1b41cad12523c353fe7803de3a0d334c186a86884bb3969b6a0ae17a50f48a360368043b6bf8a2f2a00181650da9f15ecca2b SHA512 623ef57cc411464fe1b936d9795ba982fb221334ad8ea8448afa73d9c229a2b3dacde1ee424864d1c12830d59ca2e9431d54b5cb0d1e8273b4fd6fbc47a3cf5a
-EBUILD jibx-1.1.5-r3.ebuild 1090 BLAKE2B 338c630eba01b2166c7a6c86b29dfc9dc672382e818f379f06a22544228ac45f5c3b7028434188f30fb6b7ca57ed6c5adeecd1be328093aa396d08d795b0fd9a SHA512 f41ef60c7a4497c3a91076b2b3ca0d775734bde53ae797dd44f37bcfbb11c77b60e029264925a87eeaa3bff4a7c4c035a615e75b407779952d9d0d476ec293c8
-EBUILD jibx-1.2.6-r1.ebuild 960 BLAKE2B 077e2dcaccaa07fe6e377273ae66144840a4d2fa75527c3746595f9911635189f049dc920e2dc9287ec949547adadb2207eb21b3bd76eb3390e986abd255d138 SHA512 2eb8dbbe4bb26d83e664bc98b2d57190eea9b333a406753af8268a08275a253f2b84d205b2b023de887a0c6c3f004c33733affa670aade2f47a7bbb44c9a64f3
+EBUILD jibx-1.1.5-r3.ebuild 1076 BLAKE2B 52407c457b23258303dd72bba618292555575666cb4475d63fe8334ad4082ea9a7c4ccc3f07ac551f8f956f86579df0c0f598b42cb236305df5ff171ef43138a SHA512 0d3a204b03c633640ace73b550d211c01062cee0b7685e0bc749c12bf25b43b5ba86620b62c3e9707aea64a8fca52773ac9f97e933559a91613f048b86911188
+EBUILD jibx-1.2.6-r1.ebuild 946 BLAKE2B 308dc784ea0ffc8d7e52e2f42e03a0b2eb83d245e4a5fadbcfa676e3908f8ec5e7f044fd6efb169d5879647a86352770bf430eb814086b569c718a3ae4ef1da0 SHA512 6faf8fe868e26f2dffad68482f9faaa31425532a6ed1b0b4084659c04d840d6526b9daa3f5135fe0885d2fc607516a4a32e19031000d0ecfd70e4c2f17f5b91a
 MISC metadata.xml 310 BLAKE2B 553d575c998235bcf718e558a48fd802b683298ac6075d165488a6173dab86c73169a761673ebd6307b3e3ad446034cb418e5515b1aeb147505e98410b3466cd SHA512 40d0f9f66393bca25216d7953624b713aa0ecce6badf7a8021ac269813131cd630d90b48e042f31b27b8681e2286c50f24c15938b14fc7a4fdbc224a626d75dd
diff --git a/dev-java/jibx/jibx-1.1.5-r3.ebuild b/dev-java/jibx/jibx-1.1.5-r3.ebuild
index 08b38a263037..26e71325f618 100644
--- a/dev-java/jibx/jibx-1.1.5-r3.ebuild
+++ b/dev-java/jibx/jibx-1.1.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.zip -> ${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 CDEPEND="
 	dev-java/bcel:0
diff --git a/dev-java/jibx/jibx-1.2.6-r1.ebuild b/dev-java/jibx/jibx-1.2.6-r1.ebuild
index 3a2db81cf37a..bc637548228c 100644
--- a/dev-java/jibx/jibx-1.2.6-r1.ebuild
+++ b/dev-java/jibx/jibx-1.2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="1.2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 CDEPEND="
 	dev-java/bcel:0
diff --git a/dev-java/jline/Manifest b/dev-java/jline/Manifest
index 79980393c76e..87d12cd115cd 100644
--- a/dev-java/jline/Manifest
+++ b/dev-java/jline/Manifest
@@ -2,6 +2,6 @@ AUX maven-build.properties 501 BLAKE2B aaaaeb13e4e23588d6fe8c5e990b1e95edade85a7
 AUX maven-build.xml 8634 BLAKE2B 4d1078e1201baf11da35772d0e48304522cad6b606a6d601c449bf1d97b2a43725ddcf703dea154ac923955aac5489d164686fb042fcb7c1753d0e9ef619a283 SHA512 45648b88f3df01e0623483c6c409ce1fb57b6b73e62775064b4bc7762d1dc3a3ead3a4925efe987986081ed34c26195827f3f34a1b631fdf4e7ce227376c2936
 DIST jline-1.0.zip 463082 BLAKE2B 4f4eec5a2674bf97ed9fe83c60d339fce54dcd556aca6e95db74438e87253fd4e36e4eef26b3ac14ed84fff3d2fe1b58ba3a6fe13f33d96fe50a34f7bb34f541 SHA512 2957e19a3536d89aeaf8f27afb1f8eb4eb8bcc99560244c7f1ba14693a84a2f5e677a6c21d5f85ec519674cc4cd6cb3c9e4725cb4797144168d2f6df3954aba9
 DIST jline-2.12.1.tar.gz 97289 BLAKE2B 375711ad78cba26c0b4702dd739a18dd4db2fd1e8b16ce817dd1f567c405b7b0f96c72a6c6b7fabff1520617cf9149a29040e132d0b61e2d57149bb83b404c8d SHA512 368492fa0b28e6aa3827db05d266b332935d9a03c2f6645d039941c61a698e85fd57accfac444503de4cb2f2dae5787496924b8d258faad1c18b6cafe787f99d
-EBUILD jline-1.0-r1.ebuild 1659 BLAKE2B 65eb4c6d80491a6344634beafe1ea296734a716f19e930f76ff5550a8e5295347ed5b87dabcf535c4ae95631a6efe205ab336967237bd402e7b6822cc3f2bb15 SHA512 31653297f1d0bfc2d169cafdf09e84f17e9b0aec2995bd08fdfc123c8d634f3e5e2436927ebaec4772779e3bfd8e999bdf7145853407a112d0e4c382d75f9f37
+EBUILD jline-1.0-r1.ebuild 1648 BLAKE2B 19912fc975f67b97d779cb4b45ecc166abb6a888199b8fc22e2ef756a0fca488bb5392f0d4a49cc600950f7c84e654342c780170151567c1f3bc18ed9ececf14 SHA512 0720db354b7051ee9f322fb186dc5cb2a9f75919ee2daa92710f1d2fbd001519f61ecfe994a11de67eb7c5f5a8f20191235f3ff1ede74cd75eff733d2a436eff
 EBUILD jline-2.12.1-r1.ebuild 1286 BLAKE2B 617c3fa79f322537294de7546548a0ffe9d0ecf5ea7fff4bdd2becf22c20c0d648b4c0835c6d94756cf8f55b9bd5f8c95609ee0a52aed1808f7829a68de02820 SHA512 efe14afc050da11b56004f1abc43dd4d4346a8c50a839e8292e054958e372e8d2d56cf62631a702fe06cff7efc78a99cda92f859dbf30941f94e4ab3380c2ebd
 MISC metadata.xml 375 BLAKE2B 6ac502feb83c678011ccf4b923c31184399f1feafdf3dbd8703d0c3c69900c1460da474eeb304d48590cb19ab7d128c8d8c0db48982e1283b527a0dfaf1668c2 SHA512 17a44da075005f0417e99ae638ba547800d799b98375f73c4bf7fc418b12e33e916952812850b63c623234bce98ebfd6eb525f7015e67cdaee16c38ad5f4b684
diff --git a/dev-java/jline/jline-1.0-r1.ebuild b/dev-java/jline/jline-1.0-r1.ebuild
index 86146fac2fd3..eb4e3f9754da 100644
--- a/dev-java/jline/jline-1.0-r1.ebuild
+++ b/dev-java/jline/jline-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="http://jline.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="
 	>=virtual/jdk-1.6
diff --git a/dev-java/jmock/Manifest b/dev-java/jmock/Manifest
index 6d40a8ec52f1..d03e1566b721 100644
--- a/dev-java/jmock/Manifest
+++ b/dev-java/jmock/Manifest
@@ -1,6 +1,6 @@
 AUX jmock-1.2.0-AbstractMo.patch 1189 BLAKE2B d10edde92384c86c2cbf9605cffcf25aa0acbd073e8803b88cccca2b4b94839e28458cb02f647cb492615836e7df02562329fb6135876c2a39fe5bb8fa7766bd SHA512 b4d59d16c2c513031b3b36fc2bdf4526cee8bfa405cac4c2c76d850289a835ba6e57d4e042ed4afe2814a217dcc1493afe80af9fd17fa066d1ada96af6dfa663
 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-1.2.0-r1.ebuild 971 BLAKE2B ebd8861dc5e02c85c98289f2820a7be9f006f97ee62fce32c7c45880bfaaa03745f78677408a1c6aac383bfa7e85e2ea26f0166c59bcdf8e541171b63575d6c7 SHA512 1450db05391b0241bf95f78824092d5bf4657632155f28a70d47cfd79510526399c7b1351a58318b9723b22f17f34e44d8a4bad6f2f17c4135a12d29e7fd92d0
 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-1.2.0-r1.ebuild b/dev-java/jmock/jmock-1.2.0-r1.ebuild
index 06a2670cff1b..62eb3c443dfb 100644
--- a/dev-java/jmock/jmock-1.2.0-r1.ebuild
+++ b/dev-java/jmock/jmock-1.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.jmock.org/"
 
 LICENSE="BSD"
 SLOT="1.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 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"
 IUSE=""
 
 CDEPEND="dev-java/junit:0"
diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest
index d365093b4760..33ea1e18a893 100644
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@@ -1,4 +1,4 @@
 AUX joda-time-2.7-build.xml 11231 BLAKE2B 9b7350270773c59f3497be28581408f9984f1151b812f3ddc4bbf8fbfe50505e36cb5fdbfc330f7f07416275adc92a8176b25d7c4cb4cecbdc9d239f711bc9e7 SHA512 c614cc2425b0cefdc5f9def196cd5014d6d65552038dd22f876bbb64ee25131ead57aa94ef967491e292cf1ddefef933d9827dd588056d58c9a311640a5af63f
 DIST joda-time-2.7-dist.tar.gz 4007765 BLAKE2B ed34c988dae1f1fb3359e06cccc148f680a04244987464770024635e72d5693036ec4d1648245f44db2fd57c47d9842a964d39e04e9ba510ecda7ec25c853ee7 SHA512 2a9bf91024bf20c4f1a28c87e5c6e560994ba6f7e131757c83a5ab6984ea79549e1d00452dcf767fc5cab374e531649759703acbaed724a1e49436cae0799209
-EBUILD joda-time-2.7-r1.ebuild 1918 BLAKE2B 397a64f536c6b1667f19af5b85f456cc375b38d166db658c395983c83c3485fb79bf07ad0e418c6fb3190e4704c98680ee914c45b563df436c9d93de6e151dcd SHA512 70755306d7c11c7a842188a5b42e12bf36f91ace4222fb925388c719cf8552caa4d363a33cb804c6146f7d1851db5868e4998a28c2084766b3ec37fe36cb5f3d
+EBUILD joda-time-2.7-r1.ebuild 1907 BLAKE2B 3a7d17a4e108eee44161a1cfe148e799e3307fa18e86322626d8a825a7eea1f59c3c5cbaa9183e431a7619c487538507a68f98c22c67f4ea8ad6c178c5b5a58b SHA512 edbaa5dfbcafd27a1899d1759f4488dacb7b007e7f3061eb0ab4ff5eca0be8ba36df0b758d7fead35497e3cabaec91ba483ee656a6a59b4c92ba5cf5a50ac977
 MISC metadata.xml 384 BLAKE2B 298d00eca8bdd34de1a3c30a423051cd62923963b1d239640690cf12c3ddbbe661bfaa689f1b225a968747bcc7d3b28aa53ccd90fa406322aeaa3e1f3703f4a6 SHA512 441aa3d5876d8ff91b9f9d368e817bf6869266c27f7f8686e9eb47812f899f37c5fa2e65337e979dd3247932b61d84e4b4f0d7325ea2659d54221ab428c9c089
diff --git a/dev-java/joda-time/joda-time-2.7-r1.ebuild b/dev-java/joda-time/joda-time-2.7-r1.ebuild
index bbf0efca3a84..f492d319c95b 100644
--- a/dev-java/joda-time/joda-time-2.7-r1.ebuild
+++ b/dev-java/joda-time/joda-time-2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/JodaOrg/${PN}/releases/download/v${PV}/${P}-dist.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 RESTRICT="test"
 
diff --git a/dev-java/jrexx/Manifest b/dev-java/jrexx/Manifest
index eb305da15087..95c0d97be04b 100644
--- a/dev-java/jrexx/Manifest
+++ b/dev-java/jrexx/Manifest
@@ -1,3 +1,3 @@
 DIST jrexx-1.1.1.zip 62878 BLAKE2B bb72a406bace2accb5fa1c31609222e0390debfaf598b5f5afa260a1620d74c259a03ab9000f7a8c62634e73979eb1058b1c3627bc9292ae0008e90fb30299aa SHA512 dc3e84e9c6313d8fc4c8fb57bc2713976d07284eae5d36ca4411d0e28eaae36351bbf7a6a16d9db365105e592d2e0cbccf7c3662f8d24114662422f02f0707d1
-EBUILD jrexx-1.1.1-r2.ebuild 600 BLAKE2B ce8ea06f136b3a2ef202b1713edb69080b49ab6ac13d15f98101e2fe6620dd99e211bcce2f38c36a03c676a3b4d6f5cb1b6a13b7ce979199883c22ec155869d5 SHA512 15528b20f1b6c277c58b2ee1c5c6d4e2355848db2944c5a1c0f36f33cb17cd1c4ac1f1483b253891cbba566fd9dd2234defd21af9b85b23161912476ac6f8c2e
+EBUILD jrexx-1.1.1-r2.ebuild 586 BLAKE2B f5ffb33a1f4fa37d03903c2f05018373bced390a8227c610622cf0454f87b2e38a3f28cc699a025c6c8f68ece61b3e540cdeacf5db1e6c442a6d9e4582f11388 SHA512 4c1fe46db32324fa26e9f4db4727b269362f51b29259fb7c3caedcbaa1ddab6b3a743228d1a1c58c051ef8949ca12891f87560d4cd1db305ea226f876a93f86b
 MISC metadata.xml 311 BLAKE2B 19fe5e29d58ba19931ae5ec5d90028f4b2a3dbdbc326bc98267791df5537fd265fb5e25aa46fd5bd32d224628a4e36aebcb59665c502438490dd1936c1346fe0 SHA512 5758f1cc5327cddfa8f035d816fbb86dbc77f0032c8e23e216b203696c5c94f3c9dc7e46e3c1a003f5027a9f3af4eef8862710b55499b56cc4041e28265867c0
diff --git a/dev-java/jrexx/jrexx-1.1.1-r2.ebuild b/dev-java/jrexx/jrexx-1.1.1-r2.ebuild
index ebff30ecbbe7..7d88aed26871 100644
--- a/dev-java/jrexx/jrexx-1.1.1-r2.ebuild
+++ b/dev-java/jrexx/jrexx-1.1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.karneim.com/jrexx/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip -> ${P}.zip"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	>=virtual/jre-1.6"
diff --git a/dev-java/jsch/Manifest b/dev-java/jsch/Manifest
index de8e492a4d43..52469107288a 100644
--- a/dev-java/jsch/Manifest
+++ b/dev-java/jsch/Manifest
@@ -1,3 +1,3 @@
 DIST jsch-0.1.54.zip 365455 BLAKE2B 5cd6fa012e5a511bad8f23a233559e6ad6d600f39ea7b519e66e118b1fdb997491b7ac8cff5bc1491c28f7ee99f0f4a3b4727f5d8ec02030576f34949d74e203 SHA512 2ed29f07495fbc28d6eb7b4fe414e8a9a96b911b2feea5b1513cc48a9439adba12341bceb23a3ea9ab307e32d48bfd4356c7bc877c56e77f6f55d69214db3a9e
-EBUILD jsch-0.1.54.ebuild 1179 BLAKE2B 8ce76309a0e10768c90ae325a4257ba7a44dad9bc16691e32df02521bfa1854b52ff425a5d995c21fd592aacc663d81d6765fd3b3a1bad32ee290d2db56ef221 SHA512 94d2df1d179d05790093a2172d4635cdcbd6ba5b7bb1f9396fbcbdb45bd6dd9dbc163b2701b6a30246f8ef26e92bf011e8e03c63f6c7ac967c2619355b593cba
+EBUILD jsch-0.1.54.ebuild 1168 BLAKE2B 5692f38e7b87cb4ce1450e3bfaa51a0c81583639581bfa677cc31f871c654df756839ea5cfdb45a1e3d3aef8a6a14002d3ab4d4e253cdaf987a29c775c570c0b SHA512 f1619aeb0437166592651069637dd1adad001215e83b406b6afbe2e1486fe3862c8c14cd0882eeae35404ce388a2e7ef7246e606cef10553a2daf12edc0f5b80
 MISC metadata.xml 310 BLAKE2B 6b76bef1eadb48caec1f3314829856f655be55da55fddeec91c3d3fd14f3eecf65dd2508de12a01fc75e2089e8ce1107481bbdb6f3c92eeac74fe85e5ba02aee SHA512 5051c200e3f618fda4991704418d902b513cf94b96917a1c23c1e552e1443cf9ccbf8a0a2ceddc8db46d7104284b43689be62dee0353d50b207c7c6ad3336262
diff --git a/dev-java/jsch/jsch-0.1.54.ebuild b/dev-java/jsch/jsch-0.1.54.ebuild
index 96b5ef303633..d87b476d9f7c 100644
--- a/dev-java/jsch/jsch-0.1.54.ebuild
+++ b/dev-java/jsch/jsch-0.1.54.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.jcraft.com/jsch/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="zlib"
 
 CDEPEND="
diff --git a/dev-java/jsr173/Manifest b/dev-java/jsr173/Manifest
index e4561fc04bfa..1dafd16900a1 100644
--- a/dev-java/jsr173/Manifest
+++ b/dev-java/jsr173/Manifest
@@ -1,3 +1,3 @@
 DIST jsr173-1.0.jar 639734 BLAKE2B f34caff27d216303d14050c78c3a4413685e843b9a5aacb228c38c57c50a009b691bff889ebc970097f998ba93b3a0737256c3b8a19f9df3529d238b43f71538 SHA512 8b299532716682772e5eeafb63a5dd125dec8954a9a284f6766bac05409fff611724ae1a9b6f4f6f303b64c12b19e394371a6b0a87132b36e88f94e20b69efe4
-EBUILD jsr173-1.0-r4.ebuild 873 BLAKE2B 0544abc489d1227e34df8b4a9edab8e6b479b3d2491d76ffadce7c86b34a8de6544e9bf2b59303b36238d9048cb9b669e2923fc5d01dac1bb4bf12270a381a72 SHA512 e6ee0b61bc4eb36beffb1d3dfaa8fe4d76e558dadbde990e47d8182f20ea4d5bfbc5f89e2fe08cf0f561c91ebb7f43bb2c0863b756526ced997d4d9306c02ae7
+EBUILD jsr173-1.0-r4.ebuild 862 BLAKE2B 36fb0e516201b51d1af9a0604133387f0cd381a668cf440342a6a0c766a78d3bc5e729f713b7a0f72397003c85308eac9e308bb35db0cc849fd43509e6042c26 SHA512 6c46b0df03a04dd37c3b28cd9c98357446f198f80c9e12a4af89b7f097187d11b61f17fcf8d9aa00e1dd6a23f46f65dc73b8ca3af238d7f7563f2069738eed85
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jsr173/jsr173-1.0-r4.ebuild b/dev-java/jsr173/jsr173-1.0-r4.ebuild
index 8ae113028d42..d9fb07247d0c 100644
--- a/dev-java/jsr173/jsr173-1.0-r4.ebuild
+++ b/dev-java/jsr173/jsr173-1.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.jar"
 
 LICENSE="bea.ri.jsr173"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	${CDEPEND}
diff --git a/dev-java/jta/Manifest b/dev-java/jta/Manifest
index a8b7c8371b91..54742100044b 100644
--- a/dev-java/jta/Manifest
+++ b/dev-java/jta/Manifest
@@ -1,3 +1,3 @@
 DIST jta-1_1-classes.zip 13236 BLAKE2B f2e1ffd531fce804d562c4cdcbe9b260d08eb2bcd79a879f94fbd3e23801849cbf311d8f7410a9776f9a8866027dcedcac479a64444321e8c6b2b23bd9a69054 SHA512 fb8b76223ccdec0ef97b00d7248d74b6316dd67c570667f3a644d03b05cd28af061a191cf71b6624fd4a4195f7bc107281eb847fc4c0ee4606c85c414da79a14
-EBUILD jta-1.1.ebuild 1047 BLAKE2B 84b36aa0dbe338a10e8b4126417be28c2921239c8c4053f5ed80d003faf772fa7653f9a0ade5650ca5f6d38b484375c00822ea76d3fa078efaff69114771b985 SHA512 b7ac0af2a03d4256d3d284c711027f83b7e244974bade6914fe128df8e19b2f8b9ec21314af9411b710419cfe5cbba0b51b4eaf614820a6d0c0f4b054619ef72
+EBUILD jta-1.1.ebuild 1036 BLAKE2B c6e27226b7f362dfb2bdd7e7d89284c178b8c43952e1d195395d8df2f6fc1de38de54ee72490606d6eca4d7146eae61747ef459b7bea564280cd1df78e8cd006 SHA512 efb82ee10a79e4d93b44c8138fd2e913f8baf1af1796e4d31b4a15e9f862564feb2d088c9eb5afc5c0ef045c982a8b4f82523eba49dcbb0f28c3679e34bf1fc1
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jta/jta-1.1.ebuild b/dev-java/jta/jta-1.1.ebuild
index 401962b1e482..6826cc091f2f 100644
--- a/dev-java/jta/jta-1.1.ebuild
+++ b/dev-java/jta/jta-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.oracle.com/technetwork/java/javaee/jta/index.html"
 SRC_URI="${JTA_ZIP}"
 LICENSE="sun-bcla-jta"
 SLOT=0
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND=" >=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/junit-addons/Manifest b/dev-java/junit-addons/Manifest
index 8ddf0dba6f83..67afea4d5b56 100644
--- a/dev-java/junit-addons/Manifest
+++ b/dev-java/junit-addons/Manifest
@@ -1,5 +1,5 @@
 AUX 1.4-build.xml 8725 BLAKE2B bdc668244b90693cd60f294d188b200b51929093c988ce96bda06231ae0df781515de678115cb6f8810aeda1f6c380f0405350bd9dc6e8804fb1240042d5c311 SHA512 3f3eae33867f9e311e8e2e58a87dbc67dc4beb6eb89793b2b477953a1fc5cba45aad2a8241e07717de472969ec448c6205617da2427243cfdb21f0cf4ba91b12
 AUX 1.4-common.properties 540 BLAKE2B 48c40f53f6f5557f5b97753209782ef3c57c53817ad2e7e04de7cc234ce84cf1abc9b7bdeefad992d3ea0586fb8aa72fe37942d63833cc3ceba01b400f23b432 SHA512 9362f56305b2d6cd97a10ed6cd661de6ae86e700d250cf69c55f922fca2c6f57e8ce1c306ad4378196c18cc8b839bcd5440816f6ef60f908a28da7b4ef78bbc6
 DIST junit-addons-1.4.zip 293750 BLAKE2B f305ae548ee9577ff9c5be01846768fe111a2cc7c523a080f5bfe823f6e2def5880fce091cd3e460eeae831e639616ec7cbf203dcee1dce66a7075a6343df1df SHA512 0ddc9a95d80190417c92e86697669020a2947e2211d2394334b80d76bca5397f132d90e00d0c679bf48607fbadf8d1d6e97d3770d06c35cab78c6cada198434a
-EBUILD junit-addons-1.4-r1.ebuild 1451 BLAKE2B 2798fc492b730bf4f778a395ac3edfc22fd8e9eae89b777c38e0a26a2a1bd19318f92a0a44e572cc110c53e8c191442bcfe35c7ca8ac3b3693a60ba61cf180c5 SHA512 4f59d65540a32b3ddf395f17b22a1e726435ff1d16d43805f7cd9c8f1b514d9082f5a3e945e909bbbcaf7c4c7bae122066dd635adde60d955df21c5585cb5ff0
+EBUILD junit-addons-1.4-r1.ebuild 1437 BLAKE2B 434e9b2a883d331018fab1cd4611bb4ee1733139592ec14caecf84a57d90925f9d467930e729b987d31383f4a22a573a16bb41bbc3bcdb5b50d154398c9a069a SHA512 010bf3f55fa7e2b3f094dea7d58649dcf6ea5882d1b89c2ce6fc510d463b130c6dd6f9b9687efc73fd0bf8ff0fce8af56bd7739b5ffacd2a33e63fca8144faa0
 MISC metadata.xml 490 BLAKE2B 01319745e5907693e1cc616f05f66b4e049258cfe26a585af35a4ba5e56c7d78a338b374ff42558ce05c7523da5d330084b274aa91967f8a6ad4a06adab4e564 SHA512 bfa7b8058d0f28bd1455f2ab6841b562f369a62d90bd6a1a875c67c991dc75ade65c6e854351a4dee83d2ae059185e82a84f3159095a174aa48fdbfa8070b3fa
diff --git a/dev-java/junit-addons/junit-addons-1.4-r1.ebuild b/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
index 5676030d18b9..06a2a1928cc5 100644
--- a/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
+++ b/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
 
 COMMON_DEP="
 	dev-java/junit:0
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 22e6d465db05..154bb45d3c5c 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,5 +1,5 @@
 DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
 DIST junit4-r4.12.tar.gz 443804 BLAKE2B b36248266eb83d8f2dfb1c525f635a4fce5a46c6042652ef27a5d405b83c471848edf83e799a4d1e950d83e127caa288f453edf19959a9a8aa5a9e26eeb4e771 SHA512 ba612598fa6c328e8f4bbea3afda08b459a110837ca3805a62e811535f7bca8d04509f8fe51a413c7bc855fccee35d6946c9eece4dd01726d12454c002a4de32
-EBUILD junit-3.8.2-r2.ebuild 824 BLAKE2B eaf4fa5b7bb42f945f1ed3fe444234d91efc02d6fc93e8238c7f4a8015b6a63c53376f775b2972cb10215c9afbfc13a499ae6b48f89d53921c0f2f8b9626ef4b SHA512 94fd353a30abb032d9847e2f22ee22b2b05de25310ac2671247a66efdb2b33eb43dfa2a10f0e3db02604f42ada9b0b6740f84bdb61972b2b72efd711470e3a9a
-EBUILD junit-4.12-r1.ebuild 1460 BLAKE2B e1f1c8af5405514e0cb2dd165c62d84eb0d8a50ffdd44a1afbf817d4fc977da72d08c07a3e842b272fb1d01610adb3707e4c8c44855248d4bb048dc99e6e7d4d SHA512 1ad3ac18cca913636d1bf51ad3721b5df4a1b3702e700944c5f637a32a436a7320e9f0a9b2c473857b20b3f895aeef80891831598044850886ff960eb60ac9ce
+EBUILD junit-3.8.2-r2.ebuild 813 BLAKE2B ac6f190e677782fa64b444fd8bed9075de0931cc6486b9d348df6d3b4a542502a841176d316257d638c1ecf3bf61a182c150ca2800bbaf012ee63301647138a3 SHA512 f3af904c6e1273ef937a892380187e90ae49a35c2f15754d720fe02000f479a009120e29733ea33ae42d35ee29bdc93fdc7aff7d45a925a305c9179242f7cfa0
+EBUILD junit-4.12-r1.ebuild 1449 BLAKE2B 0b2be1b853ec60b066bf90501e9d15457f007b9508ca5063c57eec54b0f338453f4d2b0e2ecf8096971d27c881da2e4ce016c405cb4b39b13a275ae34f2da727 SHA512 d9a6566c011cb81a82918fc6053265b486a0a362a148a1c555b18f48c4aa680addb7a7387a533d37e4340e7f0f27ae65037997bbc9678bb8e72394eebdea8bf1
 MISC metadata.xml 367 BLAKE2B 7cd798ae028c83275e61522be10a35abba419a823042be242ee7fdf7e0ccfc978e817affaaf154b8d0723f502499f17bb81b0622fa493dc812b82ad23dfa647b SHA512 44e492dfaaa9faf54f4aaf420d5816da8d117951d6a52e37c76a9e533fcefbeaa3c44bafa4d525f878deb3af2b7f426e72a62b16464e85ce9690c61b1f0da71f
diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild
index 043428932153..4079e6685fb3 100644
--- a/dev-java/junit/junit-3.8.2-r2.ebuild
+++ b/dev-java/junit/junit-3.8.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 HOMEPAGE="http://www.junit.org/"
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/junit/junit-4.12-r1.ebuild b/dev-java/junit/junit-4.12-r1.ebuild
index d0a50caac8b4..bdb81d48ce75 100644
--- a/dev-java/junit/junit-4.12-r1.ebuild
+++ b/dev-java/junit/junit-4.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}
 HOMEPAGE="http://junit.org/"
 LICENSE="EPL-1.0"
 SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 CDEPEND="dev-java/hamcrest-core:1.3"
diff --git a/dev-java/junitperf/Manifest b/dev-java/junitperf/Manifest
index 06372a6c70cc..a372b7acd351 100644
--- a/dev-java/junitperf/Manifest
+++ b/dev-java/junitperf/Manifest
@@ -1,3 +1,3 @@
 DIST junitperf-1.9.1.zip 110600 BLAKE2B f3f1467382da532d104fb1236607c72f2984f00e98eb9ae931df6cfdd8235f075e485f2cdb21a9837a866ea00fd4d07a55ed80c29c9a74871890441519a551a9 SHA512 35fd3cddf5643ede31a89f39e0149ceb5a07c97521bcb4e661fce32b08a5299064f6b52828889d4918485f3ca000f6020dd6cec802d8b1579f46bd861ad74b1b
-EBUILD junitperf-1.9.1-r2.ebuild 1029 BLAKE2B b35a8b6b6551c71fb65ad7d8243b5747f5de71489cc91df07106649384b8122f8975c91c06b723643359e152fc376fee4b75812bc299a4c2437c1498af291671 SHA512 59a1bf0355241154f1ae6cc00fd61ab81d6193add96baba9b1c7dfe704852a4f2aa8acc0b49c6f13daaea48a5bfc5dec3e35a5deb9376460210109fd81863507
+EBUILD junitperf-1.9.1-r2.ebuild 1018 BLAKE2B 953336a1ccd9b935bcdec91cd44f439472a97b0a66869a5aac7fa6570e5798792d93be74bfb3159fe89f2ed391b7d95e465797cf29e9f3f7ac6158177d27fc17 SHA512 5869737034f34893b10608f2b9f4e64ba33bfbb6241491e3f0bcf2f66806a9d44961a34418650bc1a7d8198d5ead8db896fd05dff9a949a392e5668a8d6ef813
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/junitperf/junitperf-1.9.1-r2.ebuild b/dev-java/junitperf/junitperf-1.9.1-r2.ebuild
index 14f04e6e3b16..ec0cf9ffc4bb 100644
--- a/dev-java/junitperf/junitperf-1.9.1-r2.ebuild
+++ b/dev-java/junitperf/junitperf-1.9.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://www.clarkware.com/software/${P}.zip"
 HOMEPAGE="http://www.clarkware.com/software/JUnitPerf.html"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 2b3ee0b42edf..8bfeab276099 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -6,5 +6,5 @@ AUX jython-2.7_beta1-ant.patch 996 BLAKE2B ea81e5c330e1e2b45378d91baed45b7d60cdd
 AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 BLAKE2B 72fe6e0afe6346ed4af714485aa70cccc202aa9b8f4587df380697b54d55ce278a89685144620c4695acf212e3e4654b476865d54643b88dbfc2468b2c33fb98 SHA512 75b25d98d8df13d0b9947cbc70a7da59097b89731210504cc26ab18680b93d9ce2cd177480870f985a87d3634d9034b8d9f1bac2c431f4cfe09ab0b54db78b18
 AUX jython-2.7_beta2-maxrepeat-import.patch 457 BLAKE2B a55f47a16264544608ba9916d3f2ced081a4f47d260bab2eeeb5959ad1aaf1074a69bea4d8083383d039f541f6b379a141c81c4376a7f7cf324ce06ddeb84ab1 SHA512 e06ddb36805e2545f351d9d5df651fa90b0b39d340e4772cbb24910f1e1c999463a21fbe4a62c9cc73f9ccdc0047f8900e6300602cb8d5b70cef7cacf1bd46d0
 DIST jython-2.7.0-sources.jar 15371691 BLAKE2B 7e1c29f2a2c03b034e89bb9c3a8fdddbaef6a0191a7320c82b76e31b41336f3d99c1995b2e9864c033ec53629d45669ad460fb4a1433ea7bc6b0390919500a24 SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6
-EBUILD jython-2.7.0-r2.ebuild 4297 BLAKE2B f1b3e0d8dea006946a45095afceca21d73db1926c31b176c416bc198387483e5afe112986ab1b780f396473381e8e3aa1a61384021e4d76b8db3a0723c08e692 SHA512 a99dd0d0ea96b046b431b98484680cf0b6f7fdcdf7e4690646ce13094a50958faeac9d05265b6aba31ce1c8fdbaf393fc7e755abeec8f8c194e0a6183c1d830b
+EBUILD jython-2.7.0-r2.ebuild 4286 BLAKE2B b7ed97fdea6ae0aae0368c6f8b4799fbc176c31069ad0cef99ceb93f8c617dbf5211d33c1062d5094f028ed3914c919a2351b7571d6b6a7954c44abb602e6347 SHA512 878c49a18b063d9e15881fb79ad5d37fc9c9e20533dee47bdbaaa40fb1900fb8a1537649e73706da76adbc8c319e12eb67eee198017a4535c8d3dcdf03b75462
 MISC metadata.xml 322 BLAKE2B 38d6e9bfdfaa08a94d90560b457b54d7e2732ddc7632b6c7c8a9fc9152ff563c36eeb31605e6bc5a96e9d4c537eb6e018dd57364456ac312cc64a3e7637cbadf SHA512 e8a44ffb98b2da1c2d60f478d89e45879c3f4516042afed922ee522ded157243381e51b198fd638845e45ceb2255535e25df8a7ce61f267b6222dd94525b2342
diff --git a/dev-java/jython/jython-2.7.0-r2.ebuild b/dev-java/jython/jython-2.7.0-r2.ebuild
index 6a11902e67b6..82ca29839984 100644
--- a/dev-java/jython/jython-2.7.0-r2.ebuild
+++ b/dev-java/jython/jython-2.7.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_P
 
 LICENSE="PSF-2"
 SLOT="2.7"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 
 CP_DEPEND="dev-java/antlr:3
diff --git a/dev-java/jzlib/Manifest b/dev-java/jzlib/Manifest
index b6b343b935bc..6c61bef1ef4a 100644
--- a/dev-java/jzlib/Manifest
+++ b/dev-java/jzlib/Manifest
@@ -1,5 +1,5 @@
 DIST jzlib-1.0.7.tar.gz 50303 BLAKE2B d38a1560fcbfbda479b797727d8e0ff0e6197ad13f78018d451346ae2f7a201bbffbf87a6ed727776dac2e9eb890aa0ea81486e0c78e11ddcb893c8654711618 SHA512 8cbc492857d432f79da08a9f6dcebc401e25bd888adada8d94caee15d67d0b89b4f66876a5b2275170157977527e1505386dd5a1575dbe658de233d4389941ea
 DIST jzlib-1.1.3.tar.gz 139424 BLAKE2B cae5f0f6ac8efd99cc916e8cc087280be84e1a2a8b43b8932dc68e2393ac5f1848e4dac1759aa75a54123adba63956463719aaa469ed88cf0c609eaa63647e16 SHA512 d78ed3feaded0bde62b3e2c6fb17b5051a6637bcf12e7fe0f5b1855922358b54b440b05bdba7328c5d2cb9f972bc68195f8f0570ce5d49de9251d7060018d88d
-EBUILD jzlib-1.0.7-r2.ebuild 755 BLAKE2B 4743a43849553e4a2f3766f653388d090fbc4cadcc3191d8d7855d9e319d49d9db1c6c9640246ebb19efb7bd52c649b2d85de1e62d8a77077d625e13a9805c87 SHA512 fc169c1fba14d791429a282805cff3b0c230a1acdeabc29ecdb05ea385f5653fa64f4d26b0c4026fd27455eca2a904b68e4fa7fb88b3136fcd7788141d456ca7
-EBUILD jzlib-1.1.3-r1.ebuild 1323 BLAKE2B 76016461e618b9404bdb579cb261a62c5a31decaea7343fb4cad8d49ad9c8fc43b12cca29b961ea7949505c36b7bc85dbfc329f0ea4258d11381a63b76176720 SHA512 3d323508aca27cb8bf9ee3a664352216fdf5c36da8f7d963730a8a90677f50cd9ccbb3c6819ec01343abe9931b48d3e342d1bbb9b23a6bb956fe550e6bd8bf69
+EBUILD jzlib-1.0.7-r2.ebuild 744 BLAKE2B b902748fdadbf73d5d6161cbccbbae7bda8b3d8decad11702b7a96da92554fc10fa0e8ddbcb8a99e6aac7d20e6eb0c2340d5117a51d91568a8c8a887816d4865 SHA512 c6951bb1a71a5b1ad6b25a1b94764502e8381408654f6093bb4c7d079195e599e28a23453876d14e7d3b708fff28a93bee13be62a9eccfb92e57448ede9ac6e4
+EBUILD jzlib-1.1.3-r1.ebuild 1312 BLAKE2B 367eaf5cc1e3daf94117a8e20b106cc9e6c21041930ca92d7658de6f4c7456587ebbfca572e8ab564ffd55483ea016b4d155891577d9229005b41c72a57102c0 SHA512 533bc6796918f37ac7c5aeb2d6f7f0a76994dbf1cc2d6ae6ff1f0a159c3ad2dc74fc26b11e2820c3cba56525e115dfbb8d2b97aa791af85ed0dce89d55999d4c
 MISC metadata.xml 321 BLAKE2B 446bb7ac28e63630afcf6bc8583857b6ec3206b0db5fce1ba0c5564fbe6e662f1df4a711e794960dfa00c31b7d1a28779c0bbc48072e2133326cd1d1fbfce1b2 SHA512 0602c7d4ec61795409acf409461bb44105b58d340a3740ace885d3dba9bee4ff146ee1a1ad6a8dd995d51ea406962fe6e5654b1a55a94c05c14cea3482a6ab8e
diff --git a/dev-java/jzlib/jzlib-1.0.7-r2.ebuild b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
index 4f55768422a5..cb18a81912d8 100644
--- a/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
+++ b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://www.jcraft.com/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jzlib/jzlib-1.1.3-r1.ebuild b/dev-java/jzlib/jzlib-1.1.3-r1.ebuild
index c90e35e36ccd..b58fc292b34a 100644
--- a/dev-java/jzlib/jzlib-1.1.3-r1.ebuild
+++ b/dev-java/jzlib/jzlib-1.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ymnk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.1.3"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=virtual/jre-1.5"
diff --git a/dev-java/msv/Manifest b/dev-java/msv/Manifest
index b9644aabbc26..fdf92ca2f88a 100644
--- a/dev-java/msv/Manifest
+++ b/dev-java/msv/Manifest
@@ -1,3 +1,3 @@
 DIST msv-core-2013.6.1-sources.jar 1011944 BLAKE2B 474d8a45bc5f16ec76dbe853a835b66cd1d733973ffad0dd5e0a653d349f075e22a72d29d91da312a9a133218f4187ece15fd66b19dc34bc00cdea72b95a5929 SHA512 3985451ff52e50957fdc22ef598edcd7b02495b834a53a048018064d1a6063d4554a7cb5d7752c2d265b852d17c7a55787d9b1ec2b580988ad005fcbc9c6eb8a
-EBUILD msv-20130601.ebuild 1194 BLAKE2B 271f5fc1729666b46b4d63381060bfa8181673ee3735a6962be6f7eaa3fac4c1e401601da0253396b0bfd3a56b460dc1e953cede5bb5c08627cc8f1e6d421c83 SHA512 138b4479514aec6c7b29e970bf90a50a7c063a60e43613dcb62cc0139495a597a326f0f46252f92390c476bcd00f55d3e9522a0f0e6c43c40652b57be70317c7
+EBUILD msv-20130601.ebuild 1180 BLAKE2B 08777a62410fc570a1a566e6735d306c70ee6003317567d41a92004142ebb5ac9f2ab4d35a6e1b530666f3a9e2fb90cde4516077f39dc11e3b1b55ca8b12ccef SHA512 6dd92ad41a6243bb3b32f86e88d18f2a9e6b93ea1a712bd3c3cd891121164cc06ee5ae6b92c91298df27db8fa5def08e29d9b4723f294d61ac1ee773267b693f
 MISC metadata.xml 401 BLAKE2B fbb5715feb77351d3edfb71b51f026f5c858300cb966a8d5cdfa4f3534c03e0de977703263015e5e60bc2928a2060e3da8684f5442f22c4e119e4d1616c82ac1 SHA512 cb176f670e860f0fb7612d313b9fe2fe1c00d5f08de531d7ef93f42204bb0dd537e6b51728b8e068cf571e24aaa7488441e0743724c8d54357f1aeee5ca10560
diff --git a/dev-java/msv/msv-20130601.ebuild b/dev-java/msv/msv-20130601.ebuild
index a1bf53084537..6eb799182641 100644
--- a/dev-java/msv/msv-20130601.ebuild
+++ b/dev-java/msv/msv-20130601.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ HOMEPAGE="https://msv.java.net/"
 SRC_URI="http://search.maven.org/remotecontent?filepath=net/java/dev/${PN}/${PN}-core/${MY_PV}/${PN}-core-${MY_PV}-sources.jar"
 LICENSE="BSD Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND="dev-java/iso-relax:0
 	dev-java/relaxng-datatype:0
diff --git a/dev-java/nanoxml/Manifest b/dev-java/nanoxml/Manifest
index ac86469d24cf..50a79e4dc633 100644
--- a/dev-java/nanoxml/Manifest
+++ b/dev-java/nanoxml/Manifest
@@ -1,5 +1,5 @@
 AUX nanoxml-2.2.3-enum.patch 9487 BLAKE2B 33d1433983f461f50f17a63151b292798036eda70d340ca8d7f139615fc16dda87c6e4d4314952ed8b270a7972ecd06fc1ddda8faa24e505af816c1bf7f0f614 SHA512 cdb5bc356f35e0b1906d2acc6b937ab8102ae34fd688f77e214976417174a3f15c884b1d22715782a19b4c374f9def94d35971ca88b9400c9c28350d3f795769
 AUX nanoxml-2.2.3-lite-enum.patch 2515 BLAKE2B 41f698b9fd685739b181951d1ac022226e5be8e4c4c72078ec4339102f46fb24acd9ba3aa2765f6f9787a9c818bf6c50bc3818835635f48279dc2214a84d284c SHA512 8bb31f737211168bb4a24f2abbd8f4fb78df35bc471116b427b5c2faeb2b1b1710ce5eda793d364a95bd7d7162075f1322dfed4c5a2527c3ae113a8c9a5cb97e
 DIST nanoxml-2.2.3.tar.gz 426111 BLAKE2B ac9980502c8c6ec50c6aebd19c0d08319701a508eea2a58847b804dcb3a3a93ca8d41ee1f08f4ec48527e669fc1695ec945933688516775373458ac7b6564895 SHA512 6800b86039cb555efc05644db65c516fb242d4d081ea612969d6cc52a12ffd7571e012a7afe7962cd61c28b0ebb3b9d94af76f20013f3b4dd7d2aacdc552c6fc
-EBUILD nanoxml-2.2.3-r4.ebuild 875 BLAKE2B 03bff6a5a87cb09ad518fb7d17b95299152af143203c51bf03953261c0a1182168b6900ad94720bc7d6db54e8175cc5aa264f52cbc8e9e41a40ce3ce2392e388 SHA512 2eba557cff7beb1ef4d5d73d75facac6ea5a5980f7432dc60f75bab7b7ac3fe03f2ebc51d5118cdc21dc46732607894a5bd9c6bb167e1dc2c71ea1c29ede82f4
+EBUILD nanoxml-2.2.3-r4.ebuild 861 BLAKE2B 8f3321804dd82db2afb880f5a63caf0fa4fefde59635ca5fbe62b6ec7bee932ad8f216cffd93ce44b3d954148762509ab6eb03145641bf2b2cab880a25b32a7b SHA512 9e57cfd0caec311a01ef261c54b4fcc3cc701240178ac328ef8ab2a23179a9196840a33d8badf45ff1f0fba7059e2cd9e028297d2856deebf74d355e45d7bc94
 MISC metadata.xml 313 BLAKE2B f5fa3b22b2233fbfe20819af9612b185c1279d5d6ce3688942d9fd1b651bbf07b92efacd77ad2ca77418dc3c3d384bfe903cc66f65693e79560f3d35e2340da8 SHA512 e9b3806d0286175ade9158968346fd9dc2251dd4f4f7363bfdb147bf08b60f3088d07483971c55b2e1ccf656362d83443cea57a2a6b876a0f1c6107987ee7974
diff --git a/dev-java/nanoxml/nanoxml-2.2.3-r4.ebuild b/dev-java/nanoxml/nanoxml-2.2.3-r4.ebuild
index 023a196112c0..fb78db838106 100644
--- a/dev-java/nanoxml/nanoxml-2.2.3-r4.ebuild
+++ b/dev-java/nanoxml/nanoxml-2.2.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/nanoxml/${MY_P}.tar.gz/357c7136
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 CDEPEND="dev-java/sax:0"
 
diff --git a/dev-java/oracle-javamail/Manifest b/dev-java/oracle-javamail/Manifest
index a5de7c0c24c2..c31040e73601 100644
--- a/dev-java/oracle-javamail/Manifest
+++ b/dev-java/oracle-javamail/Manifest
@@ -1,4 +1,4 @@
 DIST oracle-javamail-1.5.6.zip 1812631 BLAKE2B 9fd43058b10726db9359c4b59fd42226da329268ec4974a510940a4e7d6bd16afc3a3a73b6ee17914cd5d3577c42ddf22f29bc93e2ca185660ea03196ed2bd28 SHA512 3fde7901f5975f4a58d675d94e397bf1a169db227b138bfd684c0e2d0f6522ea1c8e2a5425b23fc08775a6824a9e9e68b2d6e6312f20c53af127f00a897363e2
-EBUILD oracle-javamail-1.5.6-r1.ebuild 1327 BLAKE2B 6c9f2a14dff965fb7c797f0cf531088c0a4e216d01af0857d9747a352670f684276c674967f969754ddb03fb016f2075f026ad993fec559d40c79fdd1d924628 SHA512 5f7ca1e1d8265a60d424b9e96800e23098362bf71182d079359171dc6c6ad421b80677742ef1f288f9952528bc626e0bc0487d675c04fe7495708c8e76da32b2
-EBUILD oracle-javamail-1.5.6.ebuild 1278 BLAKE2B bfa5841cc6141d5ca53a6a61d5398c3fd4af8826d5ec923d5539194de901b624c286f50620d3e232dd46c2ae7c1d3ef6f7034bc0eeb273ac3c2b12bc66d4d1f7 SHA512 eb734778ddf1d7476dd379cf2853158f4384149d207dcb56e682e8fdad6fa2ffe43867887abbe668b9e404767888fb5524b52681e82cd4a639f9a9304097fa31
+EBUILD oracle-javamail-1.5.6-r1.ebuild 1316 BLAKE2B a7165622d773eac307a5ca900b53c68473c6ffee19c3bfd13b6de77fa79986ac87fd162dcb802b624eb571c8f1ebdc338086db53901b6dc9062fa5ded2f20748 SHA512 673ea0ccecdbae8e2bb424f0b59f7d64af22f6cb5f624d2cd78e10f1c732e3971e0621cc9189ff98a565f9634a292ed612186c35bfcb05d14daf49a15ba3ef3c
+EBUILD oracle-javamail-1.5.6.ebuild 1267 BLAKE2B e38cd94322db3a9956b1bafc14050a2b8eb518e70797e2d6e8c0469458dc6c39306045159dfe9be9cbbbb5cd5274fb185ae0268e0efc88cfa162fe8e4d2903bf SHA512 9fa439502505d45c147e388cbc34f6867fc4f39c19b62fd0a94e78b00baed4089e27e90ef2bb04be1d1d9c5d5fe232b1824a719eab9bc947ed48e5056dabe5c6
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
index 1bd60ad7f79b..8e469d1a6cc7 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-$
 # either of these
 LICENSE="CDDL GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
index cc7c61cbb4a9..50ea5b36cd6b 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-$
 # either of these
 LICENSE="CDDL GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index d0d680e89ace..089aef68636a 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -2,9 +2,9 @@ DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f3
 DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
 DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
 DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5 SHA512 9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11
-EBUILD protobuf-java-3.12.2.ebuild 1407 BLAKE2B 8cb3425f46c6abe6e0c45b8ca5c0b6e460f99b6bfaaa5e505364ed75e7da2411729c84ebd0e9a4cb082672c04f0cff74a025a43a3f9ca6f3746e75765b393e5f SHA512 965bdbc69bda2810a809672bfb1c35bd58bb89d9bc9abf3e959d42385d82745abe5a15eaac50c7ee7e3ea0306e29e70fc36d9a2d8713d07b95049d43297264e0
-EBUILD protobuf-java-3.12.4.ebuild 1489 BLAKE2B d614cccadfeb776ad3a0ce67472a15034c89f07102ae766190710b89013ecae6bc7eeb691f37fd08080bbe2a4faeb70b669f822ee06078a680cb0e182a785d47 SHA512 a647dab84ade743212c3a726391023b9e2807017f75727df7225c7249af0a4b8960e9f6af6b3fe74bb4359501e0ed33c253a751dcfb17e6a657ddf0f428221cf
-EBUILD protobuf-java-3.13.0.ebuild 1488 BLAKE2B aaf459f56556a36f440b8d413100220035022d58f4354e1e301012d389a23f10e96cae3b1a48d028e7bd8392bae5057db94509b70c5b14aab191d0420235ae76 SHA512 cf0c8d423649de8dadc62867a40b83bf4b98fb66b65c9c82f956dc9c101d5eced3e2d9dd6020eefffb887d04bf9fd690106ce899e14d5bd96f4159f801d76c7e
-EBUILD protobuf-java-3.14.0.ebuild 1491 BLAKE2B 4215a44b5668a2ae9b96370a6b5ee5b4faa9435f6e64cb166b275813aaf5328b07cf29603832c024e985cf5f0330fca6f796b2f3eee4ff002e2cc0b1cd721d4d SHA512 93e50be3da3a650a971dfbf40da425b3a83aaa8d5307324c08d0af8cc41e0b28fefe3c7305f7cf377bd618d8aea5e77b65f22cb16f9dede641d9aab82e18141e
+EBUILD protobuf-java-3.12.2.ebuild 1396 BLAKE2B 77fe72f17c38e32636c675c393768be36c5ba6ad9594db38a6abfce618117ea6ed84f350d68e702cddaa8bf5ced10514d5852ad3935375c35d9ad4d430af5f47 SHA512 b4a79a688be8818c0f7ca3ceee0fabc7eb8ee4b3480194c7113babb8fc5c7f4270e029df57eb8d96fd077c4e131b2e2de5ebd11eeb7b355ad72ee16fe6317751
+EBUILD protobuf-java-3.12.4.ebuild 1478 BLAKE2B 8cdc4e335d0cb6b9e5002fc6ac099c03efda106e0f5af768a9a9745e7c45d17554bc0482b363696bfd4569a3956a86ed1fd8a74d5f9f0ceedc0ecf3850c9b83d SHA512 1ac0ce79cfe4615719a86d1ac7e09827777e8ce4a60999ad480d71d9c8d90acb02b3cfc57bf7d5b4139364fefb897e93fad214e675b94d99a9e6e93f6ce8a106
+EBUILD protobuf-java-3.13.0.ebuild 1477 BLAKE2B 669066ea60706166627b293179241302d89a4b7241e438a7f98c49992b5283eb201df25b0ee93273276324c3974e64062c80b108168e64606258e2d59f6e30f4 SHA512 a4883fd56780e65ea4cdb48a8e830a996c1bab4b92ab7a5faec99bc0e6711ddd03b094e5607a23bdd8d946161282ea12f19920f14943542c085256e6d2f8131c
+EBUILD protobuf-java-3.14.0.ebuild 1480 BLAKE2B d1052d92692f2530b184c584c498b63edc2ae4a6be063e8312d985ff2a012abc2fb5f7bdd00d031f530ae7513d4da3a31512101b206a30a6afeb7662837319da SHA512 30adfd4334cad13014f8681eb7690a5f892bb14cbc8198787a74a5b26f919bc9b61f1e11cae7516db48ea6a8309cd126ea1f5ceea7ced8617c2e59c2488995c5
 EBUILD protobuf-java-9999.ebuild 1415 BLAKE2B e5d0f477b6bf5ba696b07c2ea7e85c56d47027f42041230496c76705e5df4a986278fe08ea5d802e25595bfdd052a9a09435d196bc8eee67b5993bf3f6a8a452 SHA512 bdfe81f22c4a512704e5b41abbb84bb9196552a38f4df0a305a6a63a80383a9bf33f62dc48230ca39befa734150443d5e7415bf328e3c6d7ec4b1eee9c09f293
 MISC metadata.xml 535 BLAKE2B 9a137dca0f060e7fbede894aefb4dc4d05d0264cabc4dbcf65c240c6b9f130ce0a4287eedd0306aeea8d76009611d61ea4ab472a3163f93fddbeec8830e7bfae SHA512 22c4efebb2ac24924eff53af66c8a77439a8743cdd22636d1fa78b35482d0821c1fcf79268e75736a742da52b8c5d4a402ca8befef269436013bcdb8591fbed8
diff --git a/dev-java/protobuf-java/protobuf-java-3.12.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.12.2.ebuild
index 09a8150fe7e7..86a815cade2c 100644
--- a/dev-java/protobuf-java/protobuf-java-3.12.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2020 Gentoo Authors
+# Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/23"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/protobuf-java/protobuf-java-3.12.4.ebuild b/dev-java/protobuf-java/protobuf-java-3.12.4.ebuild
index 469fb243d1a3..f0450a860f47 100644
--- a/dev-java/protobuf-java/protobuf-java-3.12.4.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.12.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2020 Gentoo Authors
+# Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/23"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
index 8cca8e54e398..73f37de7f484 100644
--- a/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2020 Gentoo Authors
+# Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/24"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
index 3f0a2dec4807..cb4d56bc508e 100644
--- a/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2020 Gentoo Authors
+# Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/25"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index 87ebab437007..4b4a5928329f 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1,6 +1,6 @@
 AUX jflex-1.6.1.patch 680 BLAKE2B 2dba9bdba8ce77ebe28a608b505891ff49d51e9d7549bb17f21935ad9511fcdf4428a79b5243e5eb8cfb5747eaaaafb97eb6edca980ce337d37ed48772ff5ea5 SHA512 73e8067a31392a1975877470a2a239c9ca0913f807faa3e5c660bc2487dca9a46c1753ab86526e66581111fcded89229a4e9e3a16fa787ce3669ef6c07a28081
 DIST qdox-1.12.1.tar.gz 519833 BLAKE2B 83a732f1582b714cf943ede61bacc5216804c00cfbb642a479afb74739564f4fdbcd923dd7cb84a9626a97c5ad0a0f04895e0ae68252891cb25299e1fe1c9c72 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5
 DIST qdox-1.6.3.jar 63731 BLAKE2B 77d117f0f76f531f9320b5eb3650db315aab838d5d79a9df8997649b498b375db3fb0c694ea8b5911512097dd2325554d7599bed51a978e38af6fa55600d7c24 SHA512 0b05620809e3830c7e12c289cd4765f96d845adabc1f09497993bd9f39852784f454eb4aff1deecb325608a5773e86fbb1f5863e0f25387805472b59b46cf965
-EBUILD qdox-1.12.1-r2.ebuild 2198 BLAKE2B 7c6e6d3aebf33d47e431201b4dc2291d684038b14fe4bd78dc9db1ec454a54f78f6dc19fe67896af8a9ad7273169816c6a9926b88a37980251db7f3c9b92b982 SHA512 0ee7dd134a057c71403e2b04d7c03c81773390710e75082ba7199c359d01522988ec31001f6541be2bbd75b392d28004ec7517fa181a3166a95782750ea91842
-EBUILD qdox-1.6.3-r2.ebuild 698 BLAKE2B 7e412768a012d82d2450676355741a545d0a593a62e9da192dfa3494a0f016d3855c89748eecfcf8fb75a37fe9cd9f1c68fee85a4f95d409535b20c9ef88f6b9 SHA512 2fa55ff9ee7df3058c7e00cbb144387f15ef21a523a6f7757ba0b416afa14b5a63b74886b60a2fb7309c3b05c3c91cf7ed2fbe6817855a618145ad7b9bbb539f
+EBUILD qdox-1.12.1-r2.ebuild 2187 BLAKE2B 919894dbd7ff1d8f7fed1b3de66a2c2dcb5d3f53d9c1d28cc2480c8e083de977d35f9adb5ac669f06eb6f4dc38abd5fbd3d8cb52f70f18603979fc010b3cf0f5 SHA512 6e005a309d52fd3153989bdbadf57d17556d02fba59e8bbb5e67941905b30938951dcd3d39824b27ab5560f33a47322e46b415d536a437d3662a6270440f707d
+EBUILD qdox-1.6.3-r2.ebuild 687 BLAKE2B e4cb8a16f5f5c116b7d4a6247b5c9a8aae67ea29725a25c8d6a6ee5e3bbdd19140d1ed4b33c32d6c5c0c81deb4b7d391e04af784eb3f0ca26d6458b061a9a72c SHA512 e154d9ae1c0528d248e24ffb3063dee953be8f3b69e93ff1331f2d111f61c7337210a2421192027066307caa6341f307e50b0bee4f41d29047736ee6d05c2913
 MISC metadata.xml 489 BLAKE2B 88377b6fe8ec7278767a18b227778e6f5ec320221fc7293090c67ea268b695de6b131a08172031cc08d3baf8bfd347da0d18bc2ae5c632026eccf20b9d958267 SHA512 709f38b7f8bb7fabd77d9c17a15e537b7c5b46d6c3e203f24847377980ad6afe55adede125b703215b3ab00ad6cb02b8994b75a3db2a4b1b556775bb9f00ee8d
diff --git a/dev-java/qdox/qdox-1.12.1-r2.ebuild b/dev-java/qdox/qdox-1.12.1-r2.ebuild
index 559d80d7961e..e0bbd55bedd5 100644
--- a/dev-java/qdox/qdox-1.12.1-r2.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.12"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}-${PN}-${PV}"
 
diff --git a/dev-java/qdox/qdox-1.6.3-r2.ebuild b/dev-java/qdox/qdox-1.6.3-r2.ebuild
index 8159998cc6ce..824060300ab3 100644
--- a/dev-java/qdox/qdox-1.6.3-r2.ebuild
+++ b/dev-java/qdox/qdox-1.6.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ DESCRIPTION="Parser for extracting class/interface/method definitions"
 HOMEPAGE="https://github.com/codehaus/qdox"
 SRC_URI="mirror://gentoo/${P}.jar"
 
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 SLOT="1.6"
 LICENSE="Apache-2.0"
 
diff --git a/dev-java/relaxng-datatype/Manifest b/dev-java/relaxng-datatype/Manifest
index 1f9639e09f00..08956d1e2518 100644
--- a/dev-java/relaxng-datatype/Manifest
+++ b/dev-java/relaxng-datatype/Manifest
@@ -1,3 +1,3 @@
 DIST relaxng-datatype-1.0.zip 74033 BLAKE2B 15b488e914cab28fb9ade71b491d961ffa4f683f66759e96cd53dcf69edd39d423b5562831698bb3e03191396c86a2a93369f14d278f3c55a90728031d1921d3 SHA512 712b99209e927e8929c46797cf3733993cc2740bfbafb458c518e5e130a7860a19dee45acd360a9d7179137f9340c3edeb514cacf501233cca515b38e60d6b79
-EBUILD relaxng-datatype-1.0-r2.ebuild 780 BLAKE2B 86632ad635a8595655fd5b58070e057c5fd5ad58d9a30b03f1a5cefcde39b132286414179e96e887cc776db8d9eb7d980dc99141fb50c7bcd80b22dd70ab3301 SHA512 1dedc42b1723f75ea2e1815a0aecbbb47f1b0de12a4f6a7aa73fe90138211807220f10e8bf849ed65e4c00c8c82f3f97dd72ec2f7154e89592c82b7e54a7ec08
+EBUILD relaxng-datatype-1.0-r2.ebuild 769 BLAKE2B c61b24730f52dd084a71f4b73e8a98799485d999ec475dde01d1e574934b71cfbd806af385c36dceb597ff8db83ad3431af28a3cc78571c858197753ac8b92c4 SHA512 eb96c8295349207944862348b12222ce8d14c15b05e0c109422b65410756f71cea24f8401a3847c5979879cacb14df529aaf6b426c0694ebb14c5e2f3d824eac
 MISC metadata.xml 313 BLAKE2B 151379a0c11efd556a9c630fdbc52358ba2ca7baa4a4701526d65d394c1fcc0ccce38f4b874e47b669c3cade9c6faaf0b5bb42ff1a652809c60cc039eac9a582 SHA512 97bbf1c308f5f2436f0c24dac17f5219cc71a8e9882037f9bf59689f75524521ea42c63989491779ca59fd2878e2c478779ed6945fcf2eab661f28be3d9e2a4b
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild
index 8843497dd97f..c7357a9ad076 100644
--- a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild
+++ b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ DESCRIPTION="Interface between RELAX NG validators and datatype libraries"
 HOMEPAGE="https://relaxng.org/"
 SRC_URI="mirror://sourceforge/relaxng/${MY_P}.zip -> ${P}.zip"
 
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/dev-java/sax/Manifest b/dev-java/sax/Manifest
index 34219d7aef4a..92e747d2396b 100644
--- a/dev-java/sax/Manifest
+++ b/dev-java/sax/Manifest
@@ -1,4 +1,4 @@
 DIST sax-2.2.1.zip 372488 BLAKE2B 27813712e81c8a42f746ac5d84f381f7d5d30b6e11988624a01616632b742ac90f834574c7c1288385b3d6720cd2f3ee0eb9df1644e7cca5eae813ef8a2f9f45 SHA512 af05c14994894f0b6cd860c1d632a1148f43cef824081357c9e4b256e66e0f36ac3cba1838f03322182339f2642b4bf68f707407fba8ee6c2f95d5b8d1267648
-EBUILD sax-2.2.1-r3.ebuild 644 BLAKE2B a319b42284cddd4093a586e863c5ef05bc8b89cf9628e6679afd292b27cc6265604a5d8b62dbb9fc7bfff534f7d8ab273409f7d11b95ce67cf4f29ba3a2c4605 SHA512 f918377b9711a65b4fc89ca26d7c3910e2e1afc273d884b42ec1ec56da9acf5696a05e1920fd5a50ea8c3a74703c3d900fe3d5876bfd9d493da508ca69027a50
-EBUILD sax-2.2.1-r4.ebuild 687 BLAKE2B bbeaaebeb5e58de9ff876edb2d492c9cc90c16713b684735c5693f6719d58a36eccd4dda48cbd1751c5386f366c070e2b009bad43b7d67bac7526d0d398d977c SHA512 606d0e86d54844c9204e53a9b24e17901801db84924a18f23b053a5747ad8fd612f3b567c6cb9eadade3de0f0119bd64915d308e95e196d05123c495b9ef4e61
+EBUILD sax-2.2.1-r3.ebuild 630 BLAKE2B f194d0451fc5ea9c3357ac464ae1f05657f6838b8024a46ef747ff815a01cb60ad236ffc54af9644647783be49ca01c3c4b215b2fd750fb412af4f3e9dbe5501 SHA512 df55f243bb083c62d112e135d976820ad1558c633df24d4aba3faf4fc2650289285a90da3bd7e4ef157d6a909499d3d05ec81b62789576fb0ec948f00101f751
+EBUILD sax-2.2.1-r4.ebuild 673 BLAKE2B b98cb59dd48e2b701df68e16c576e24979ee788a3371716de72808b9547996d26be33eb499c815f1483af6cefadb0e00a037b01eac90087c9bf0a2d7770aee60 SHA512 3b0d46df350295d584f6cff679afcd3ba50c1b9ebf5233d140ca1ebb3a427a5dc69aa10492e6b9bc9f747bb76939fa470c7b224586930d8b4e659a77ec24364d
 MISC metadata.xml 309 BLAKE2B 9e480b093da836218b9c3c52bf91b2ac8a1c89bb750a485d662b018f18481984b850f8ed139c9f8b34677fa67e890f35af4e3009b93e92fc87e27c56fed9fca2 SHA512 f1412e1a93a748dd318a3238af4f0438d9b84762586bde5c3071e73fa0fd247e45f2e398e07f290059b487ea20866247f1df42a897b99e0001d52015d355db76
diff --git a/dev-java/sax/sax-2.2.1-r3.ebuild b/dev-java/sax/sax-2.2.1-r3.ebuild
index e375b5c14a0c..7e77a681194a 100644
--- a/dev-java/sax/sax-2.2.1-r3.ebuild
+++ b/dev-java/sax/sax-2.2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip -> ${P}.zip"
 LICENSE="public-domain"
 
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/sax/sax-2.2.1-r4.ebuild b/dev-java/sax/sax-2.2.1-r4.ebuild
index 52e3fe5c5d4c..dd2aff2873e2 100644
--- a/dev-java/sax/sax-2.2.1-r4.ebuild
+++ b/dev-java/sax/sax-2.2.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip -> ${P}.zip"
 LICENSE="public-domain"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	>=virtual/jre-1.6"
diff --git a/dev-java/saxpath/Manifest b/dev-java/saxpath/Manifest
index 09a9279cc730..102ccc57c384 100644
--- a/dev-java/saxpath/Manifest
+++ b/dev-java/saxpath/Manifest
@@ -1,3 +1,3 @@
 DIST saxpath-1.0.jar 36257 BLAKE2B 0b6b2c943b3b472a01109c6f6b25d8e54b5afff7c44f980f4741ccb3bb689520e5e6e49fb17e918f35212fceb69e5aa551469fb923675b9287733799134bb967 SHA512 53e7781ea3efc1e16a839c9137fe7ab683e7a9e40283f0f5aa7afc1de75c4dc366a91a93ae5f256fc24e78fd3a4dcdcde6631bfa0d926b7dd0ddacd5c240ca96
-EBUILD saxpath-1.0-r3.ebuild 546 BLAKE2B da8def73140f1874856d1d95230813242d5a9caa0302b36e2800f4c140b21121f62bb65dc2d7a4affd84083e8ca070bfc127162eaaae7aef7f5d12af099613c1 SHA512 4561ede9c05653579428d64e2ca48ed7eef54c0a599c5dc37885b34d36a4c351becf9ad2ebfb411213356deeba17a94d4eac303f571b34acd5b13fda1bfc3564
+EBUILD saxpath-1.0-r3.ebuild 532 BLAKE2B ca6df0f7e3f30a5e9b3e10f80be8928553d8a0d59227a8dab9ae5c30009f6f2be3b59edc8601332de4daaa69d75f7ce2d37b860031ee7332888ef5bdc66bb141 SHA512 a31242f0c2714fbde04bfdcb80f44d5722c28a8b196d1bcd1fac8df1af76805ce486d206cdb9dc4040a248ef4013f41f540d46c2adc28261271bcbefa7e16b84
 MISC metadata.xml 313 BLAKE2B f4d1330a2165d9293cfec36e9cd98feba4526f4b0c47694a4966aeff6cdc4d9b5021279081ed88e8b1039f04678497a7fa78aef18a86e341917a3366ecd22367 SHA512 bab31add81d5d0086ccb56af2b48076f31966c1cf671e0ab42eb055c6a28d20840f5693c2370fc03fa5768dbe95903ec18e9b0c07df357fa51a3e54da52bc835
diff --git a/dev-java/saxpath/saxpath-1.0-r3.ebuild b/dev-java/saxpath/saxpath-1.0-r3.ebuild
index 283ee8807ff4..6ce0da55b9e7 100644
--- a/dev-java/saxpath/saxpath-1.0-r3.ebuild
+++ b/dev-java/saxpath/saxpath-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}-FCS/${P}-FCS-sources.j
 
 LICENSE="JDOM"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/simplyhtml/Manifest b/dev-java/simplyhtml/Manifest
index 6de3b8d0341e..3192bbdfc5a0 100644
--- a/dev-java/simplyhtml/Manifest
+++ b/dev-java/simplyhtml/Manifest
@@ -1,3 +1,3 @@
 DIST SimplyHTML_src_0_13_1.tar.gz 473258 BLAKE2B b3d517d3f9388e9674ace860038e7ac001aabe3b8b1d1af4b8a0a0e883216bc5de3d1269f13f275dc4b4cb65b0742fc6ae2284f3ceaafd9067c2cb0582e5e959 SHA512 e37140ef7461f2c741f43ce14518e224cb41ddb42c4d396f8f934476a5fbbe4d121950dc3186ba1ae603068e81832a92240e99cd25d3778574c0d3f370d501ac
-EBUILD simplyhtml-0.13.1-r1.ebuild 1251 BLAKE2B 728fba61555329056e30f0c7a9a77d72cb51ea4be449f0cb5eb87121ebc1866eaf4059251ecba0e76856624550888b6bbef1e281b01453f5195e41afb54ef710 SHA512 c812b88a0ec17a6773090f39db390423ed0c61d13cb49a7073338065d445b7f83add4629612561be0a67b28cb5726a84d651bdda9733947c2024fbde64d521a8
+EBUILD simplyhtml-0.13.1-r1.ebuild 1237 BLAKE2B 8ef519f1d914368c76746c4094fe51dbefde4bf0b0192af44b9847d933f8cf195a1cade03dc1e91997c12fa3ab281928506f6e1c8b267c5347f801170e94a98a SHA512 0eca1c8c15456821b6e9dbe0161ae7fa905b85f93ed31fbf511c83487c6dbd5d4ac6818384668cb34769d49c06dba229291fc4ce581a3cefe3f07a550a59df33
 MISC metadata.xml 316 BLAKE2B bd020f0d1d0b4122a0ea3e9465864a08b52fb17234dccbfaff8fc647ab552bd5206a4a6df41bf83ba18577b83ab139ab6139327feb266e88c5dca1a578c6af11 SHA512 00e41e5c4ed97928aa67e96c81ef04305929bad8454b0d5608a73da37c6c90e1421c20627c95d8f280e4bcde27e640ed454521a0fa5376035cf7021d09e4a4ea
diff --git a/dev-java/simplyhtml/simplyhtml-0.13.1-r1.ebuild b/dev-java/simplyhtml/simplyhtml-0.13.1-r1.ebuild
index fc91a2631935..23e4f7f92a6d 100644
--- a/dev-java/simplyhtml/simplyhtml-0.13.1-r1.ebuild
+++ b/dev-java/simplyhtml/simplyhtml-0.13.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ HOMEPAGE="http://simplyhtml.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${MY_PN}_src_${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/sun-jaf/Manifest b/dev-java/sun-jaf/Manifest
index 039ba5345551..7070b8f2d109 100644
--- a/dev-java/sun-jaf/Manifest
+++ b/dev-java/sun-jaf/Manifest
@@ -1,3 +1,3 @@
 DIST sun-jaf-1.1.1.tar.bz2 125305 BLAKE2B bf7676f3b47e9cf4c169a7625160604c7973d2bb8f6a087f7a7759c924efc0c24fbc6d59f03fb89dc874b2ad03e311b5029fc066fe5083c1accdc73fa9666ea6 SHA512 c7287056514324aa5feeed3d4afaf861869974dd565f7810e0161fe590f070ec894e7005ffac4dd42cf075313237027d7d7c88cbf583e28e05df361536d73001
-EBUILD sun-jaf-1.1.1-r1.ebuild 603 BLAKE2B 15be8c5346fc16252a2e939c4ea732e2d9524b65ab3fde7f7aa8f66ecad32db09da37407e4dcce322eee19be9c28964ead1619c501bb5291fbcbaa54c02d7c0e SHA512 45f7f0445c3d2e886fdd02646f2d54c9f730b84400165135d000e7bdfb409fba869fad7c1c9d58f560b528d2c4e4025eb1759ecfeaf4d30be894eea7f98c7afd
+EBUILD sun-jaf-1.1.1-r1.ebuild 589 BLAKE2B ff47d298b6775b126d0b0c8dc712b7f780a6085c64dfaf06d3b98e98006d66096dcbf5b0d7519af20ce59d9045891dcec07a2f0c349bf0bdd2beb8b08b287339 SHA512 e978ea0fb2bbca282e4e7d511de8b7962bf5812ee5703168a3e8383a91e0b7a33a15a0f75172cc9567ba3d129ff9d8f695169d2363ee42faed104bbd81d5bfb7
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild b/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
index c7d4d045ff91..d979f1b67800 100644
--- a/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
+++ b/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Sun's JavaBeans Activation Framework (JAF)"
 HOMEPAGE="http://java.sun.com/products/javabeans/glasgow/jaf.html"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="CDDL"
 SLOT="0"
 
diff --git a/dev-java/sun-jms/Manifest b/dev-java/sun-jms/Manifest
index f2b8d577f6f5..bfc2bb275f58 100644
--- a/dev-java/sun-jms/Manifest
+++ b/dev-java/sun-jms/Manifest
@@ -1,3 +1,3 @@
 DIST jms-1_1-fr-apidocs.zip 361922 BLAKE2B 75342eaeb56ba329948a226f48304e0a520e83f7284d5d8b46b981531b7f8c78283e38b2a488177349aaabb70276fd4ca09bc86993800906aea1469a6549f318 SHA512 ac2c7925b7f5bd3918f0c69a7b18dfa2a15f58243aef7cb429c0571ea218860fc146fd355c905e17310072263f64385b9010eafb1050158f42f498d7f21dfe1d
-EBUILD sun-jms-1.1-r2.ebuild 1341 BLAKE2B c0cdbc4246630d5023af3e90509b27da205013fbb3fb8c81de696d3467dc5d554ef96347e7915632f64b953f0e04c4fdd1d4d630f8c7ce2da71caa8b25afb597 SHA512 6990f55025910b65215a2bd31f5e8bac42c0aeb9c3363d97b03646cb9f97fb8f0413ca8cbe750e2ac66624294e7c2fcfd27c6d15fd6b931428efcf28a0b1f199
+EBUILD sun-jms-1.1-r2.ebuild 1330 BLAKE2B d39c97ba5613b160a380eeee4104027897bea4990788a6a064d2f4ac561b306051aa1cc1f4f50fc79ecc39b5de9f7386b3ca06f643969aeb9e8829f66efefe4c SHA512 9e3865734c6eb046f36532be3c273f9e7d64c0e6f6f931255a0a0af13af38fa9b0dfa81f2ef2049bdbfbec89c1d3631fc554ffe4f9ea619f9e7bac29be7ec1f8
 MISC metadata.xml 420 BLAKE2B d00cdddbce707b1fbe67e796c7f62bc4f942c6f4e3c5af1aa3a643846dabded18b41b1e35d4e93cca068d2d0656fd5a88d65abfdc303cf5b6293d8fcd39be61d SHA512 60f2556340ffa7951c69e1bef1a5eda1905a02f3a1e72199c7af02225844c805fa2154ce6629b6d8bafcece22fc3d1c75349021af6932dff3ffaf952fdcb818c
diff --git a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
index 8c1ffebbb3c8..fc11510e058b 100644
--- a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
+++ b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="${At}"
 
 LICENSE="sun-bcla-jms"
 SLOT=0
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND=">=virtual/jre-1.3"
diff --git a/dev-java/sun-jmx/Manifest b/dev-java/sun-jmx/Manifest
index df7db77ba31a..dbb0f6468a4a 100644
--- a/dev-java/sun-jmx/Manifest
+++ b/dev-java/sun-jmx/Manifest
@@ -1,3 +1,3 @@
 DIST jmx-1_2_1-ri.zip 1624569 BLAKE2B 7262ee10ab49d7371da988f6f636c22e7ad8cc06bd61db5490659899424465f2ed85000d176e6dc5cb7631942079fde19cde35837cda677fa463cdf53c94780c SHA512 39c933ec39f3fcc631d6d8f3aa88724bb0aa11ff62dfbac61762d07c718dff4ba1e16b1b565c7aa1ede7d616516e68d0dbe8c227db34a6d30bd8f29880c7a5d1
-EBUILD sun-jmx-1.2.1-r3.ebuild 1295 BLAKE2B 51de4c252171ba8ad48504b4cfee139e53d7c75317adbec77cf4cf16e2266d2fc0e0ce9d701a3ecfd837e160c42fc652165d540da1f8557f30aeb82bc9e28609 SHA512 1aa7c206a76ff0e98f81320c302ebd44c8afbbddb7d90c6b9bf9db026c66ecc157f772477cb9a628cb83ce902314baa1abe011d186acb64485b606ace8422d3a
+EBUILD sun-jmx-1.2.1-r3.ebuild 1284 BLAKE2B 146bb33f0efc01b4acaab426ada1d455599c3e2c22c97934bf586f8f8f1c77deda287c503cba3c62d67f49d0027ebd8b948210cad346f453493882ab88ee8be3 SHA512 90931350bf84e669520a3bf76cd26824d491a3b14a33d18fefbb183564e5f8e97ffdfd1921ff0502ce83e0540205e8af06fb051b70f8fd55c7c62a93c5c31869
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
index 4bc3e8a1ac7c..7564581f335d 100644
--- a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
+++ b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="${MY_P}-ri.zip"
 
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="app-arch/unzip"
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/tagsoup/Manifest b/dev-java/tagsoup/Manifest
index 16d1c65ed77c..ef4908cbef6e 100644
--- a/dev-java/tagsoup/Manifest
+++ b/dev-java/tagsoup/Manifest
@@ -1,3 +1,3 @@
 DIST tagsoup-1.2.1-src.zip 222757 BLAKE2B 79a43edfa9aed7f08bfaedbe758b2a08d5ff596e268cc415707aee9076bcdbf8de0b4c2a855b9558ff2cf598ed4811a7a690aef6c5004e34484ffe3087bef8e9 SHA512 3bb1608746270663f6ed45318457e3ee27419929411689d962cffc0ab0c32ec4b858020043be46e929014b696c753a01b49d6eea9a98f18d81fb9205e99ac0a1
-EBUILD tagsoup-1.2.1.ebuild 1082 BLAKE2B 600a6159b72a8b236f6d77fea2fdab8d482779671e049ac772b3fc03bae324cb49bb3c20983dff70dff00714caef3612c2d7e2a60cd370db776fee50a92dc780 SHA512 9112bd30013d5c6e3feb81914aaba6fdc6848d89e7c04787a015df97321b1a0df913822fc226f3b4a2c4ea2b02721f0fd71d122a6552e5e24eb7b06243cd579a
+EBUILD tagsoup-1.2.1.ebuild 1071 BLAKE2B 3205b951406d934b0f00686454e44474bc71df8d027150a24f1a042aa5d698f4de9dd23aba37a47727904449e0a6b785ba4e8f3d278c26c8ea66dc2ff71e2339 SHA512 a01329a96bae4547379027d079fadbc1b9276c543bc98aabbbd0ad0d18e6a6145906b9df77c053da1f3e61fbd42f609bf8ca9950edc89f51b95c7a572fd20966
 MISC metadata.xml 501 BLAKE2B e343c2ff8cc35280a493830bff0fbd4486a37fcc22d79eb8b74e6712250e9c879b50f8beede300189d233cdfa9579f02b921573f6e3af1bb399d34099764caf6 SHA512 e8abb4f880b76ee62dd56e0caa65868efa920f080cae9c137a9ff2646e77c2e22e5bb687e584f1b9621bb10140d6725626b01adad7df85f19ce55d80b4706ba1
diff --git a/dev-java/tagsoup/tagsoup-1.2.1.ebuild b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
index fe10a18fcad1..501db89baf9e 100644
--- a/dev-java/tagsoup/tagsoup-1.2.1.ebuild
+++ b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://mercury.ccil.org/~cowan/XML/tagsoup/${P}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="app-arch/unzip"
 RDEPEND="
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 3046c872e493..d2fab909ec2e 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,5 +1,5 @@
-DIST tomcat-native-1.2.24-src.tar.gz 419572 BLAKE2B 572f6d64b8f4c22ed1ab68efcec5cd1c57fe01e7b0830dea979039cb702a2930458e7bb31abdeddcacc6d673513c896ca46d28ece681c6c42938498351962b36 SHA512 5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f
 DIST tomcat-native-1.2.25-src.tar.gz 421399 BLAKE2B 5033b389cfb8b2899fe57c75f5d6d6bf77f4646f3c17aed51109c30760fa5642a8bfa5137ff5f97c571a853b0ae5b1b16244bf286655b6b252ca7ad4c2e3892a SHA512 e121c0a18c51b5f952833df44c3a0add1f9a6e1b61e300abbafa0bc7e8f32296e64c9f81e9ad7389c1bd24abc40739e4726a56158d08e33b7ef00e5fa8a1d33d
-EBUILD tomcat-native-1.2.24.ebuild 1178 BLAKE2B a99246469d416372df02e87f7a401e3caf013a260c8d75ba519c26ad0fe0b0b7d56462b738690b6635b265e6d343942320a437699e3837f802929b30829bdb40 SHA512 eb969c2d30befcda019b155e8845a922471d16be31aefa8b2d15ee21c14153a491b812d838b31261867e669d35759e2975674d719e6bb80990a2fa0ccac8e215
-EBUILD tomcat-native-1.2.25.ebuild 1179 BLAKE2B 6f6768247218c3f40ea7b89d03468e1bded2962b354f9d14cb4956a3d0656ad84017a2d9b717d12b0bb4c65c7e5587f21ed014974ca86e7c84911261ae81a0b1 SHA512 25aff507afd4a8b1e4f0a485b643caa31b234079ba368a6a8d524f2cc70d9c32de19a967f176c8a59dd276eb3504a01bb684ae6b438fbcd102f1e416b1e863ad
+DIST tomcat-native-1.2.26-src.tar.gz 423135 BLAKE2B 84be9b04e73b9e9e2f8c751a2fbcd6469d4ecb265639973801502d7b7cc9f0202e1761a0bdae6526da182afb8135b6d5693475e6ba7a2d187f602247c0b26dc4 SHA512 cad9d9efdb6c980afcf304bd78e5ea572271075e153e2015d393dd5e6f4612992c7d0ac499c9aeafe0c3874832356e197564717df15b36a48aba775960659ac2
+EBUILD tomcat-native-1.2.25.ebuild 1178 BLAKE2B ed2752ed6f5563bb2cb5c7554cfda37c98a16dff1581559011350f55520662b33431bf347476c80ea2d7e9ab45e4232359229ae573dcce748e2d65793d2e8bd2 SHA512 0ff1066ee666702b936d467a44d077f6b258e1cd9750f07f2b528e9988cedb14b03c677d4dbbe22e145f3f137337b7da546887a8c1f9aea3a8fa1b041d475d89
+EBUILD tomcat-native-1.2.26.ebuild 1179 BLAKE2B 9d6859c696ce1433b8f56f46447da58d4636f87c6fe400528e60ea3070697475228b23e1576ebf596fc5e31faa7f9a6ebbc24f46a47222323bdddcccc48656d2 SHA512 43869f27432f27ca61727cd6b157cf1427809aa174968cf802e7a9b86cbaf42fcbca0e10d0f9880b83c7ade10c0647998a352ae3df491821cfff42612fb5f9dd
 MISC metadata.xml 806 BLAKE2B 7f193bb62b100b0c141677fcfe9671122b70bf5091663757fca98941ca2a7c195c0b7f4f1fd95c96706a8a8c8508a7a6b63858d2eb7a3afb75b4ec21f5eae021 SHA512 7bedd98efaa696458ae80b5bd844a569b2bda8903a7d4e7c9ee9ea197b80abacf7f257ff91aa14d4cf6df830425df58f08cac7c3e9ded79823424b352fd9e978
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.25.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.25.ebuild
index 2dd1db52c691..9aa95d1557dc 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.25.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="Allows Tomcat to use certain native resources for better performanc
 HOMEPAGE="https://tomcat.apache.org/"
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="static-libs test"
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.24.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.26.ebuild
index 0b63dda09194..955e4d74c04c 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.24.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="Allows Tomcat to use certain native resources for better performanc
 HOMEPAGE="https://tomcat.apache.org/"
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="static-libs test"
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index f1d286788f56..adc9e0c693e4 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -8,17 +8,15 @@ AUX tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer
 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.106-src.tar.gz 5302091 BLAKE2B f60975ef5570501b03e71645969170c44450f2b56f37688001ad1b4dce3a394f6800e9b28a8fabf59241116345fb7e2a287441f3eace020bc5c0203d57630c91 SHA512 5ce5a5af93c58e69c4758c2c0dedeadeceb6be920421b9d3b3d071d32fc8eb59ba8312c98d037b8434fe43d57a9f720ad8790de29a26ed2959f6c761fe1fd573
 DIST apache-tomcat-7.0.107-src.tar.gz 5312698 BLAKE2B 1f2712ddce6aa604692aaf6a6c706469d3dbcb2266a99e62346c15b8347fff573608440473be8e20b8632a431f8838dd29f24f6bf630a13d262c444be68e0d2c SHA512 820923697c487367786c595d3aeaa58981d25b56529c6739b9388ad771f3264e6995f7659805cc5b2ef9456dbd42bad92ad2cfa3c7f741920a5b7bff2cc1bb1b
 DIST apache-tomcat-8.5.60-src.tar.gz 5837412 BLAKE2B 0c2200412900f7f6d318051333b15b8c6236e00f6194c21fc45bb95b565c4146e2682b879f3a293de3ab65524013f786a7f69dd7e91f1c4cc903179075253cc4 SHA512 43222e5d04b3de400429d6f1792d418172b6ff15dcc17e392cd66a5444d740a323b9c426a9f39678b3460452545fda4d784f56961d5ea56b9c0e1ca466d49040
 DIST apache-tomcat-8.5.61-src.tar.gz 5840559 BLAKE2B 18e1505b6b7d8e1a024d9f834d33ef105a16e6fc1f9e80abd3e6e88b2326597b9973e13c2ebc030a1db4a2d4dc5572d195b9f61db6cb7bf51e97cbfaa121678a SHA512 fd6bb5926b5e7cf44f359c93dadc4edd87fa5f2e26fb0fb3a9bc0a5c89ae4d844d66872055e1b441392cf03d7690aca3429b66afd8334319784f089f821d8c22
 DIST apache-tomcat-9.0.40-src.tar.gz 6017562 BLAKE2B 1c90511911363bb3b154124382f6401851c3a0e7925e06cc8f2b4f02a7b4c1c59bc75007a8b387f06742cbeca7f840b6860d84dc7c6fdb1e7774b22dbca6082f SHA512 61b8e191315cee2bc0437013dbe7d1fb3451182e0b316fb377581c7d47a59cefb7f2ff30d96a2d6326a99c86f4151b26d1ef76bda5029b30d81c8297a0b362fb
 DIST apache-tomcat-9.0.41-src.tar.gz 6022059 BLAKE2B 6e97390aec956c16f271e57a2fa8805b6f49f593434f0dff8d82e14bc9abc199b00a7523dbb8da335a7ffa9dfee6790430c30f8b0ee90bcd133694c8da42197f SHA512 094e7cbd2519a4b812a2ca865f92802ece3385a20826c5e29b5f7cda8b9265d01ede6f598999f8aa2f1b04bcaca2e67e3f0132781b3f22007356df49ab6b1838
 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-5.5.36.ebuild 1426 BLAKE2B 02098b91f21bde7a24d0cf38bb224cfeca5218d53c943c24db8a342cb54a7658016e127a0719b0206b9cdc14c73b8066f335400202710d5a82ea3db91cd4b2f6 SHA512 d70314124ddd901892fb92163ba78d719d875582704868870c74b94163da96e56f17eadd1a833a64058467f0de9c39ccb3f8892970221fb946d8a645db174218
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cacbb95bfc439c63ba7cc3ee594209cb22927374e184edb90804ad1f55aa6721f98aa927f3bd8ca713463085233db1b233837acb07 SHA512 7a45a663f00ae5a71bea3002a72bd11a640583af44c0ab6a3dfbd6551bbf3a6de5f35e880643294c56027ecb3b7757425a2c26f34a96fbf8cd26df4a545086c0
-EBUILD tomcat-servlet-api-7.0.106.ebuild 905 BLAKE2B 9957aa960b21b87cefbe5cc3fb979e9c9489e35caaf47b53e66a6cc37b71f5412fe43a84d6530f4841446c2a7a1b6387af610ef3b00ee54284c696c91b123b11 SHA512 2f0fb2ec3f2026c33efeedda13aed94283a8ad1d958c44af873b2b41c43521fc59e4696a049e25465df9233a4458d84ce6f73d7dc70935fe5347ad3bcdac4370
-EBUILD tomcat-servlet-api-7.0.107.ebuild 2995 BLAKE2B 12e3762f74cc16679c6506ff371e8e9ca16d28a49aa42d1ed63ddb68765e3bab85194972c112624eabf27ff53f0dd45e466ada7ace094ebb8bea36b4f4289a7e SHA512 2bf8d0f4baf7b97e899c97930eeb349fec0547f09137ce3984e6e0d57f5a0da8bed51a6cb68acd361b626784b49563d2141230bc6283b7d95363ae52006b115c
+EBUILD tomcat-servlet-api-7.0.107.ebuild 2994 BLAKE2B 4e8f86d3f068f2e1dd1029ba8fa6d7df7b628a26ed5366d940b20d5375070d09caf2efd3429e8784fd1777d771a107a9184d7a46113966a994e4c496106bf37e SHA512 dde6491804e3f3ecae22d42fc35f40e64d867af0962fa0f9f4e91eedeb4df973175b3eccd45e59ed00eb3e7ec676326861540da6a8176e8275bbd6abfd8da6eb
 EBUILD tomcat-servlet-api-8.5.60.ebuild 3006 BLAKE2B 7608f3ce7ecb52570528e05e040ec079b76970fd4dc408e481842d005bbcd292b5db0a45985b3833d3f2129ec8e69792d225b6bbac2f474e9221ffb38af4667b SHA512 e21868d016e2ce116be08ed06827f59da07dc3bf4ca0f0ffd29369c3b8865ee3c73ff0aeced838cab3cbc7defabdb637ae13ff77f083de8bb1f46f7da4e16539
 EBUILD tomcat-servlet-api-8.5.61.ebuild 3009 BLAKE2B 73382c67d346ac48e0a3cc8fc35fd48be7c2a9bfe8fc9b18da0dec532f0d131875dd169916eea4f32aa82005e025c5b1073d6cdb3da25b9886b9687287cb7284 SHA512 e085c0821b6635da8c3201c472d883d40900828780f0ab8143c17c87c86d837a9602da05e0574a2af3fca268a3bf73de71be2ed5f6798c59aea3b97497220c60
 EBUILD tomcat-servlet-api-9.0.40.ebuild 3172 BLAKE2B 6c853abc08b2448a4f6cb507968a4d06c8c952f631b142ac50f72443c55a3a27fd44c347b987a6beee703fd13e1922de9d4da20920c4d4a34f06598d8daa6bb2 SHA512 e3ecd5cffcaef886fee3bfcc7f11d54258c3e2642d8e2b4328ce9b60089dd4992c4bc4ff137eec99f3d2f8a74e72115e50541486268f4cedfa8962eaf491250e
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 c2ae1a37f16b..b0bb3dc1838e 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-2020 Gentoo Authors
+# Copyright 1999-2021 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 ~ppc64 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"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.8
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.106.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.106.ebuild
deleted file mode 100644
index f370da59b91b..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.106.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml ||die
-	java-pkg_clean
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.107.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.107.ebuild
index 3ec03e06118c..ea5e1f0781ef 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.107.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.107.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/trove/Manifest b/dev-java/trove/Manifest
index 5e0fee619326..b7764411e386 100644
--- a/dev-java/trove/Manifest
+++ b/dev-java/trove/Manifest
@@ -1,5 +1,5 @@
 DIST trove-3.0.2.tar.gz 5880161 BLAKE2B a3dbb6a967ad9a519bd04abbbbf9e6af483360991956ff79532462a9ad471d409744017a3b24e4a09d2377243406e5d7cd542b452da8f59a1a97b454a2f60a8c SHA512 27460a66bad6f206eaeae02453c94333456db5a9c566246d495fb4184d42de6033b66d1bf74060f799cf4298d531afeb9597b92da4e2963b43dd4ef072ee750b
 DIST trove-3.0.3.jar 1793123 BLAKE2B efc6ff678d2f5cef8c68403faafce3dfb66ba7b3c1ffa42ad6727cd71c6dbd77fa06b4a6eb23c44a794982a8f2933afa10d4a5555a8749f49cf5e0ae227afb5a SHA512 03e0a376258730cb79fd0dd0a68bfacba6ca4baf3a352cce621d64e091ccd3f24c143b592f3bbd5bbac26529bc425b814dff45680ac46fd323eca95b36d2b640
-EBUILD trove-3.0.2-r3.ebuild 804 BLAKE2B a45abfcf97789427544d1b181d6f1b1d1ae5b282ff6e4037ae7ccd4698d99e4d1d39a32521fbe7fea573b816428246c107e4684161eac702d7a947dae4702274 SHA512 fa0cea4d9739bbc1f3624de5b9032822b14c787321b6317b0ee1d078eb533fdedf053722b9800b532bdb93ec5647e28cc2d4f543d79bc228e34549516c3f9f48
-EBUILD trove-3.0.3.ebuild 664 BLAKE2B 6807abf758cd4a595ecfb521ecaf34f884e310e4a048b80b60de2fbe0a08a011520a948c34ede6ca0feca24d8d7a9689d5d7dd24a7635f3f9d55b0da1779455a SHA512 489bcab10a500cb16efe782610e7bd5c2bb69969e7691db843b8801952bd94ee8b01fc1876bdfcea5c8ca4a3842b4ee0461449009867a76fb506006a93405d75
+EBUILD trove-3.0.2-r3.ebuild 790 BLAKE2B c15a938a6e36c420a8e1815b14548994c90d13457884361c7099e2b2bd115da2732edc5833cfbb936ec00ba9a50066c505a8c9e9aa7f41eaeb44d170d83d1bd1 SHA512 68f241c22a60f164596e557fb78844f982412758ff374fb3d2123e78b77f7664b1110eddcbef6f5bba3332ffcbfd6d44227462c8e6fc54f8c2bf1330e351b124
+EBUILD trove-3.0.3.ebuild 650 BLAKE2B a760537aa55fd7e218080fa3cea32e0d8f655f3a2a8e3d1592109b79e4aa0f1e84d39a014bbe3b097d28aa2de3449f1ab5d004a29625142c8facb2689d680257 SHA512 9ece8db39ef58f37b5465700cae031b3d3c0c8eca6a3af8416233093bc4d24781a48f4cb924f15f0453b258a35dda78db4e46637a4ae45c48b77d45a60a52169
 MISC metadata.xml 313 BLAKE2B 033a387e2850f70d371e4362736a66f796d8aa33ab9c46dc4d49a919533c0d9f6cf55588a58ae3d9a413cec5c98daaa65530e095dad86154d467a1749cd02b59 SHA512 8d83dca7ca9717cd91fab6805a9ec4fdab65161643d583cfe2134fbcbaea07ceb236773e88365b137a6e2fb5215c821f54955dd641d0037025b826d29ec0d2de
diff --git a/dev-java/trove/trove-3.0.2-r3.ebuild b/dev-java/trove/trove-3.0.2-r3.ebuild
index 2fb1f501a0cd..ba6c309b4abe 100644
--- a/dev-java/trove/trove-3.0.2-r3.ebuild
+++ b/dev-java/trove/trove-3.0.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="GNU Trove: High performance collections for Java"
 SRC_URI="mirror://sourceforge/trove4j/${P}.tar.gz"
 HOMEPAGE="http://trove4j.sourceforge.net"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
diff --git a/dev-java/trove/trove-3.0.3.ebuild b/dev-java/trove/trove-3.0.3.ebuild
index b8993f5ddf18..731fa2823334 100644
--- a/dev-java/trove/trove-3.0.3.ebuild
+++ b/dev-java/trove/trove-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="GNU Trove: High performance collections for Java"
 SRC_URI="https://repo1.maven.org/maven2/net/sf/${MY_PN}/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
 HOMEPAGE="http://trove4j.sourceforge.net"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
diff --git a/dev-java/xalan-serializer/Manifest b/dev-java/xalan-serializer/Manifest
index 8a5f778e2b37..bd63bf09f41e 100644
--- a/dev-java/xalan-serializer/Manifest
+++ b/dev-java/xalan-serializer/Manifest
@@ -1,3 +1,3 @@
 DIST xalan-j_2_7_2-src.tar.gz 8416261 BLAKE2B be67c9f2f7ec1140965dc148aea94347e60a2969deb1fac5834c1458d10b3dca91b448a44ed6ebbbb227e4f04780ce0142e812cd99d8862a4cbbf5e8e2af4cb3 SHA512 2f1fa105b3cb8082594e3121a245464e1b7c15464b1ead2d10e306e51ef61ded5d7fcd70c034fa46f41c4a8c14316e376cc14d8045c8aadfce80f2e4bd1b61d8
-EBUILD xalan-serializer-2.7.2.ebuild 1183 BLAKE2B 77b50ee853632bff8686e66fcb84008c9ae9130d5759e3afbb1d2f7a7b7466d338bb4fe03bff4eb442b402981f946de37963799daab00d1cb6349e3a9c875c67 SHA512 a379a2d3d6d22adbe5dd4206bb0e91185c2094b6968fec8c9a56efd012107f727b98a290169df721767ae82997026a81f5c3a71f4c80cffa3b9c0188beb54e9c
+EBUILD xalan-serializer-2.7.2.ebuild 1172 BLAKE2B 0363376283dc843270c2aa5727a416bdf630fe32a1479d1f95da735a869ea3630cca1d09e03f7cebf905fa0fbcd692e51e57713e85214943a3450b0581f383bc SHA512 f2a5960b5d0d9e8f59286f96d167d40ba932a6aaccb88b48bd2eee14f0223c3b59dc7deada3b8b23b2a5ee3975c6130810d72d24c590de82f47e884ab8cd8d84
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild
index bfbc91e6756b..5ae253dbf05c 100644
--- a/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild
+++ b/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ HOMEPAGE="http://xalan.apache.org/"
 SRC_URI="mirror://apache/xalan/${MY_PN}/source/${MY_P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=virtual/jre-1.3"
 DEPEND=">=virtual/jdk-1.3"
diff --git a/dev-java/xalan/Manifest b/dev-java/xalan/Manifest
index cae15fc68880..f196f181580d 100644
--- a/dev-java/xalan/Manifest
+++ b/dev-java/xalan/Manifest
@@ -1,4 +1,4 @@
 DIST xalan-j_2_7_2-bin.zip 17740075 BLAKE2B 244fd71011fa957ff1988dbbb58e40af4ad218aafbd92f2a6ec305d59ec0fb221a283442b24e4290f6d2e853cfad39d689c1397b4d18f34f4c94403610079328 SHA512 ae2be0bfc5e794b159c2d16718275a6ce6e8f63d681e2d13875f233d334a37aba872206c6c1f70565698ceaf4c66261c7df6db6c524e6e8da5dafe2f17cefddf
 DIST xalan-j_2_7_2-src.tar.gz 8416261 BLAKE2B be67c9f2f7ec1140965dc148aea94347e60a2969deb1fac5834c1458d10b3dca91b448a44ed6ebbbb227e4f04780ce0142e812cd99d8862a4cbbf5e8e2af4cb3 SHA512 2f1fa105b3cb8082594e3121a245464e1b7c15464b1ead2d10e306e51ef61ded5d7fcd70c034fa46f41c4a8c14316e376cc14d8045c8aadfce80f2e4bd1b61d8
-EBUILD xalan-2.7.2.ebuild 1829 BLAKE2B b51b6326d93c8dd08cb98ca966238dfe33dcb0f30ef3bc2b1c0d377c8274a7631289e9d03f268a8858ee5bc58982a5e2ebca94fc5439985ff9b083c69f713051 SHA512 402abaf66b08fdaf91f71662153aa066e997b1b29853f869a4e5059ed127b6dc784513c2834ce520d2aebc25ca4a8a5ca091a67ad2360d4bdb8555508c571e27
+EBUILD xalan-2.7.2.ebuild 1818 BLAKE2B d7f8b82abe9c9f295851a866879df0341560b88cd3244937d83707cc3d92137e4a528f8260225e5bd8056f5ea014d36c57c30d814cb2e94f599c7bc91b215725 SHA512 f8d7d85cb4d2b5836b2294c58d01347fc9cce7cd355a099acdecd7208a00e2eb932e1b234afa13dd24b7aecb7428130f7a26b1b6b96f978f8543fa5cb4dc1959
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xalan/xalan-2.7.2.ebuild b/dev-java/xalan/xalan-2.7.2.ebuild
index 2db4963bdd6a..c5f4ec852ee9 100644
--- a/dev-java/xalan/xalan-2.7.2.ebuild
+++ b/dev-java/xalan/xalan-2.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,7 @@ SRC_URI="mirror://apache/${PN}/${MY_PN}/source/${SRC_DIST}
 	doc? ( mirror://apache/${PN}/${MY_PN}/binaries/${BIN_DIST} )"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND="dev-java/javacup:0
 	dev-java/bcel:0"
diff --git a/dev-java/xjavac/Manifest b/dev-java/xjavac/Manifest
index b2dae4d0b15f..944b3ef2eef0 100644
--- a/dev-java/xjavac/Manifest
+++ b/dev-java/xjavac/Manifest
@@ -1,3 +1,3 @@
 DIST xjavac-2.4.0.tar.gz 2472 BLAKE2B 4693c2fa74a2951909ff6dc55638e7f3de19fecf82bcfeba0abfeaff82f941ea9d02dde3de969e850da9c5bfc98684b0a34be391d6db6c3fe12de0a734137afd SHA512 6a12c605f6f455f20981214d1ce8ed752070ae2b268e9279692a3b05921c84857636055d9c4d7b1de92bafbaa4b528f36983dc2eca0ca883a7fa340320e503a0
-EBUILD xjavac-2.4.0.ebuild 656 BLAKE2B edb07ec2b43dafc213c87d2ddc18afbd2ca0d3695a84e2ecfdcd0461e131b3ed1bdd6673b965f8c91a9de865febfc9ec6a9b4de17d97c3cc353869c540e901ec SHA512 a65c94cc57d442058d1cc14b131fc5ddf53649b7b5cbbbe3f3b686467dd90722ede62b038969e07480f047738fe9e8b54b5b08e539e53e64917f574e7ee8f83f
+EBUILD xjavac-2.4.0.ebuild 645 BLAKE2B f78be55559af898741e28726abfa119e249ab2657dac51f542b8168998defc6b8cf646d8110c3557ca907495dd07c49f85b01d7b2a8caa1cb988e45359ff9ca0 SHA512 56cd2cb327833f68284b3e1921daa78bdae26402bcfb9cceccee85571e05ea482ccb37244bca39f5cb06b97da55a73d25fafea9cc5df394e28e7718ce72cec8a
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xjavac/xjavac-2.4.0.ebuild b/dev-java/xjavac/xjavac-2.4.0.ebuild
index 7369c3afd50f..552ee4b12b4d 100644
--- a/dev-java/xjavac/xjavac-2.4.0.ebuild
+++ b/dev-java/xjavac/xjavac-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="1"
 
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND="dev-java/ant-core:0"
 
diff --git a/dev-java/xml-commons-external/Manifest b/dev-java/xml-commons-external/Manifest
index 5a48f9996d81..5e8b7b867286 100644
--- a/dev-java/xml-commons-external/Manifest
+++ b/dev-java/xml-commons-external/Manifest
@@ -1,5 +1,5 @@
 DIST xml-commons-external-1.3.04.tar.bz2 659665 BLAKE2B b7f51fab7162b905142c5256f1d03d519b4ab387edf8b4c3d738ac138cf6ad71f29fd568c99423f840be6eb02bb50e89cfab3c729d2d5071d8a66e30836d8f5e SHA512 8bc71a0850e751ae4a5057833d57b2235734facbae43c733b0a9d86e5be99af016b737f12f5566c736f71374a709dee9954089db8fbeff4fb4cbb236a9fd6abb
 DIST xml-commons-external-1.4.01.jar 656529 BLAKE2B c51ca760c23759d4f4ad11fcb44caa1cb0bcb2785d9095ed56dba9b0d5fe57370a9d9aaeed5a8e0c1fa67918237ce693590bac791200add2e85155ab87ffe40b SHA512 f00773eec613453d0e1b7b0857b01c51d1926079f38e172953c4ef0350f063439acc8b5967f947c8d15a73e5d53e8887c3bf30122d5f7c553bcef349e5a8cb9a
-EBUILD xml-commons-external-1.3.04-r1.ebuild 1147 BLAKE2B 62835033096f4ba8c7c55c765250b01e4e6317e7dbf0bf196b20dc20b4538721a55087d74dbe1e2765bd936e0186c98cf4036f0cc6bc3eb677e91b2addc59560 SHA512 9ba06d0f0def19abf6091a15f9ef9498c83c18f5846d4f8d54159bdc5bdb29cb8f0ac1d9d8c2c506a9c676df1cf55f05796a408efc2bf77674e7dc4191614e96
-EBUILD xml-commons-external-1.4.01-r1.ebuild 752 BLAKE2B a3b10393962277bfda7911d43652f94f35f13861f5be8b02382714feec7ab6a36d222b486215bf6af7ba683c2741326d74ca3530f179d73d8f40053cb8f9014c SHA512 1ffe54c68897caae51452826c78c6cba64d1c2f44cfc1c6171f93766164e45a3c61d9aa71614f4d728cab89757abf27ecc83cfc454c83dc5151b756628c62ef5
+EBUILD xml-commons-external-1.3.04-r1.ebuild 1136 BLAKE2B 11a888f3719764a06ea3c6ad0d7ac5732410e8b67c3e4a431386e9e969d30104a5f02131fe2005f091b26df2f3a996366be5c82519b867ee66143ce118f3a015 SHA512 32e690d333a743c4ba1ea36763edb0510f8d8e9a43ba0272164e42df3a35d11e495d357ff7955bcc0dbe670957aa9224f21fda4fe6f084a2d37f082f9ea7d73a
+EBUILD xml-commons-external-1.4.01-r1.ebuild 741 BLAKE2B eaa58ef734007ff018e74195868fc75f95b96d0c9b8760cb8af5b04136758f2f45cd56e86401bcc0cba844e00f96bfe0f1c26251b1b931d6729fce4736707ca0 SHA512 fd6c527195c0e2406ed69c983f999f2814609985badbec8b2bd474005bce7e65a4afc654276df9cbb0e007a8c073d585a8cd7093e4a8053b8d65d5e9a342a415
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.3.04-r1.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.3.04-r1.ebuild
index fef9e0f08c09..e4bb6a5f39e4 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.3.04-r1.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.3.04-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1.3"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 DEPEND="
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r1.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r1.ebuild
index cc9142bc5fd3..6be447012ce9 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r1.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="https://xerces.apache.org/xml-commons/components/external/"
 SRC_URI="https://repo1.maven.org/maven2/${MY_PN}/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
 
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="1.4"
 IUSE=""
 
diff --git a/dev-java/xml-commons-resolver/Manifest b/dev-java/xml-commons-resolver/Manifest
index 11623b96f308..340ddce5f400 100644
--- a/dev-java/xml-commons-resolver/Manifest
+++ b/dev-java/xml-commons-resolver/Manifest
@@ -1,3 +1,3 @@
 DIST xml-commons-resolver-1.2.tar.gz 262701 BLAKE2B 54258372fb2d08dd08777bb8355b13c26f426d843e47c6790a6174f82998b9a20bc1bfb8073c5bab8c4d521db54600c8eb3ffdb6c03ce6091073ada655e7c6b2 SHA512 0c91057da3198fc488c7b2c20afb029aa4441ad979159c378d532b02caa294d27e730ae2f9857062af5e3815a603a6110c5441dd3fe6b36c342a78beac3c8a6f
-EBUILD xml-commons-resolver-1.2-r1.ebuild 806 BLAKE2B 2b7287de6650b0b00f7d2a5a394a4564860f710dca673db3e7e817db0b2022b6c1e1c5e4f55cb600e17016fc82304ecc3b446317d63fd55fda4a532c86864e8f SHA512 cfe84762cd7216b95d2f7e878cefe518a5a290a2d5ab9339aee819db9baac06e9f67b9f6869f55386e3a3e755a8a5157b28bca14afe7d7f9177d40ef1306a27b
+EBUILD xml-commons-resolver-1.2-r1.ebuild 795 BLAKE2B 4bd09d1520a8d273503a8148d0def46bf79892d0c1eddc32700f3bfaed98a5a0e36a3495bea241c912771d28ac76fb2f0c18ccda369e976153b0d8b36ae47213 SHA512 f40842bc9e78c20cf0aa0a25d304e2dbe99995c605b37a5add1f516b653c3622e52c35bd864bfc5a1c507cc4992174efd75d1fd53af274a7a1fd58955c3c02d7
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r1.ebuild b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r1.ebuild
index 710323bf2fdb..4ffb71840a9b 100644
--- a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r1.ebuild
+++ b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="An XML Entity and URI Resolver"
 HOMEPAGE="http://xml.apache.org/commons/"
 SRC_URI="mirror://apache/xml/commons/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-java/xmldb/Manifest b/dev-java/xmldb/Manifest
index c1933f10f66b..18d3786ea1a8 100644
--- a/dev-java/xmldb/Manifest
+++ b/dev-java/xmldb/Manifest
@@ -1,5 +1,5 @@
 AUX xmldb-20011111-enum.patch 618 BLAKE2B 2e75eee88aaf768cd8394e82313448c6f0d5840fe5139dc9301cbd679b8ee05521f0e85b5e47e26224a06a2a5b1f88102592558d8677a560aa74edb66a1f61ad SHA512 5c9649f72dfdcdc054f11fdfd055b46e1b0d84949cedb1c29a8beafd05056c3a0206a38e3f022dfa83262f9a4a85b0cded7e3c899e207f51b31dc47cd2f0246f
 AUX xmldb-20011111-unreachable.patch 301 BLAKE2B c5cfa08eada500432b1c0d35ba74686727b6fcd8c8675cff9b2b2833e26055bb39e2586807e8f3099d49b83de074eb15387978f247bc5d01197d7c2956564104 SHA512 5cb8ee4323596b427fd15a1c0764ebdf377c7acc5a2111c17dc24b826965d61f4e576885dcceca600eb5dd850cee9a98c48f4b3fe5272f7f9d4558834e451786
 DIST xmldb-api-11112001.tar.gz 36553 BLAKE2B 458c0d043e47580776dc9348fc650c135d14c316ca4f5722d30c753e222e5b29cc524d962daa4729bc9cfbbe0adbd5519735e6333811bf202575d375cd3971ec SHA512 20123801a57b5350ade4dc82aba5ba2492cfbbe2e0389aaba4b73cdd3a8d07981a895ec2318885358102e48644cdaa30a18996ab9315891e506506fbc25658a2
-EBUILD xmldb-20011111-r2.ebuild 958 BLAKE2B 2c13db66ddec83db16da9ea343a5f42143d69720afb2b0963debb603be579c9eca314964403fa9e3f883e9ec0a6897ebc020d5d8444ac15400f4a427df7d7280 SHA512 f13d0421d61030a1d2b7de2e76ac7f6883adbc3bff0aabc4f0bc9efddc879c2391bac811fd13483b102a820cc0f2e2f2e3f32b3407291592ff16014a2d7cdf08
+EBUILD xmldb-20011111-r2.ebuild 944 BLAKE2B 36a3f1a08fa88c31be98a7329d4520125e3f9a3d714407c3b437daeacf058112aeb94894957ed99ec069958bbb88e0377934e1dce236abacc969a4f30360f22a SHA512 78217fcf2713a304be4c1a5af5b87d41cfa9352346fe6941765485e0e950b0614768bac5b9d7b2383e6d05742fd0ac80dca4c109ab97e3484d8cc42034ce3888
 MISC metadata.xml 594 BLAKE2B f5ba9a86091967e5f55fa090e3b6816919bd98a6ce0fd4f0bcc3cb8a5e474867b52cda19bd30bed1f3f215235134c9e842d2bdead35dcd770becf17dde2836f9 SHA512 7ef7cbbdfb0678d0cb201cf9d941ef1c539b7141b7378e9e3dbb80caddbfe27b04ec63c0e1b775760f1a46a6c66c606183d0c83eb9d6d5f086017c9ff9cd7bab
diff --git a/dev-java/xmldb/xmldb-20011111-r2.ebuild b/dev-java/xmldb/xmldb-20011111-r2.ebuild
index 4d1a0eb41ce1..f7d209a970b1 100644
--- a/dev-java/xmldb/xmldb-20011111-r2.ebuild
+++ b/dev-java/xmldb/xmldb-20011111-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/xmldb-org/${MY_P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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"
 
 CDEPEND="
 	dev-java/xalan:0
diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest
index 717c47254417..79ed4cf15093 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -3,6 +3,6 @@ AUX xom-strip-fallback-parser.patch 690 BLAKE2B c8135a026905fc16560be949598a48e0
 DIST jaxen-1.1.6-src.tar.gz 204211 BLAKE2B 02e3ca40f3d6a41d417ae7f40b70ca74b4dff0bb254d5d7a80aeb725595564805bda795ee9d1b1c92ec3b1d59aad3a9cb82d8f2bac5ef0e66a3feca04bb63345 SHA512 84a3beb521c8729d7ad9bcb76a252e12d624614277eee9d5e844f79fcdfc58f5f49eac902256b17c0af6563d4c255249d9124a47c3b02827189a7489f3172309
 DIST xom-1.2.10.tar.gz 11717279 BLAKE2B dd66d423563abd717c0a663db3300b5baccf549f9dd71e42cc86b9c222f60faed1fc8525dbab04c27f271a3f048dcc01fbcb20da6ec6efd093e192c7a4b90685 SHA512 edaa4abbb929f4eba1ee092be7a196ba1c7a359b233a38abbf100dc519a9a6ca2b9a4947497e412f96ceaf509bbd03c0ce25b17e401b6cd0a95fc355bbdc7680
 DIST xom-1.3.2.jar 317416 BLAKE2B cd891743b6c83eaf39be0e7c973b0221330532464dc433f64b769d07e7dd4f43341e01cb6bc4c237b7cab2a939280acde2dfc7f1da4467f87af6458409e7b37c SHA512 958c25262d297280ab87b000a8a9a0fa0842c062a52229f818568f937d5adc69f7b2214b9463a9a75b5d1714487ecc2b434a47c4627d9350e497367787e98aa4
-EBUILD xom-1.2.10.ebuild 2180 BLAKE2B 6d72a78523641f9bf871d64d846e7641719e31a344c63f532107b356a297c6f88d444026d237c8835a51fd48dd6ac129b201e42494ed88343a0e9c55ece7bdab SHA512 4acb2e5879b5eba4e358b39aa80980f62b663ab37bac936e91d8d338e56bd8d9364646ef845d684593550fe6c5d75d57d17274b5aaa87d84a9c0ada59dbce002
-EBUILD xom-1.3.2.ebuild 830 BLAKE2B aa85934dec069b68ac942019c417a8e94ffad244be4372e00602fe9ad096362da01ba152887f1186d802d8c45e49c9e23245d7f88e75e483525d05453f595d12 SHA512 b3692ea8c5fda1a38f014a100c4930718584149e18b169836628db59647cae41370a4dd4ec0bab96e9f62dfa329050213a26224c735b8b1eb62afc787ea9eeb3
+EBUILD xom-1.2.10.ebuild 2166 BLAKE2B 65380004dc447dd45c034599259b11e28ebc3988be9528782de0568b73b6e31632101d024b941b2acec78a8736dff7ad2b4a01d1303b9ba96c7c1b5c6c0e02ac SHA512 0858697d6ff1fc61930e42162d4e67b67e662b29e166d2e15da0fa51cf8563e06599359e6b04bd470902363988d6d61730a78a94244ff7b0ffca778afdeebeab
+EBUILD xom-1.3.2.ebuild 819 BLAKE2B 95c1a0236273676e598936b570f6304ed86b51b03b7368c6e1d112c6234bb92f3c0d1e5d36bb271e264fcf869d8d990124ffedaee7dcf0067a959a66d6374326 SHA512 92cfc4188b4b1d59d169481ec95c63bf6534f42df3f98c680beb8a69b3ecb7dd26b9ffaf0386e8536191008dd8789bc4312a750decbc867eab5c3e0639c959a3
 MISC metadata.xml 407 BLAKE2B 2486554418b17502be636181d1dc619a50143016a72e05d5bef8a42c631b9f09913040bc868cefae0759075f26853c605e6a11179b20f3ca3081dd091536b56e SHA512 4ec08597d54cbea6121f240565ff7b7ee614c370357b551bebd18d31749c1863e30bc8b7935caa00051f9946cc927cd34c1bad02be07eca40c89d2c6e0e7b2f6
diff --git a/dev-java/xom/xom-1.2.10.ebuild b/dev-java/xom/xom-1.2.10.ebuild
index 94ce28945741..434b57752e5d 100644
--- a/dev-java/xom/xom-1.2.10.ebuild
+++ b/dev-java/xom/xom-1.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -18,7 +18,7 @@ SRC_URI="http://cafeconleche.org/XOM/${P}.tar.gz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="dev-java/xerces:2
 		dev-java/xml-commons-external:1.3
diff --git a/dev-java/xom/xom-1.3.2.ebuild b/dev-java/xom/xom-1.3.2.ebuild
index 926f815bc3b5..b7321e970a26 100644
--- a/dev-java/xom/xom-1.3.2.ebuild
+++ b/dev-java/xom/xom-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 CDEPEND="
 	dev-java/xerces:2
diff --git a/dev-java/xpp2/Manifest b/dev-java/xpp2/Manifest
index 228af5a7cc3d..df2393a6e352 100644
--- a/dev-java/xpp2/Manifest
+++ b/dev-java/xpp2/Manifest
@@ -1,3 +1,3 @@
 DIST PullParser2.1.10.tgz 2310288 BLAKE2B 0c1f3aedf88aae18e7cab40b04055fa7a20f6bfe05973e6cbe3b459b408dfa193834d22a6d77b3d1ba3802e115d89f73e3f423efc7571efc8f09bb73625950d6 SHA512 87a091e415a31cde27ca1193735743b60f516feb336a9a3577792636e54ab8d671a22e74eb8aa41268f6251c688c68fe92a28f735ec78b96b919909f80c59590
-EBUILD xpp2-2.1.10-r2.ebuild 1714 BLAKE2B be7808ceaae770f7878853fd0b90304677c9afab02a6b84e5981f3ee27583f92d2ca36c9b3f770b84a9405f83fef62c6335dd6ab8e6668e1b6c159285d336a8c SHA512 54152f83cef7165e6ab1a7de349a68f37e515c3915e8f87a59b07194515242e3132861aea15c95b6f822d8fc76b836b4c0077afae85d373e9271658192283f8c
+EBUILD xpp2-2.1.10-r2.ebuild 1703 BLAKE2B e06143290e012eeda79ad750174ecf4003dd9c516ebc8c026a804d95c9d3dbc941a77283663397c1dabf7e41950896571b3439de09729b0f0e77861b6c3943ff SHA512 f0da8a4f57ff45c47185bfa7bf8dc825bf5ad73117c6658993efe747b3396d656536337ef228f8d847143c2d050209af0c7cf02104e0f297ef7bea3bc45eaa0b
 MISC metadata.xml 458 BLAKE2B 5a23e3b43da0a680538428c1cbd29dc6555459408a7d9520410a5da0f904cd9bfc1864e27b7f3aae2a94afca4c0f276c5cdaf09612a77759a64b7fb0c2f345ed SHA512 9004485c7ad032ec1f11aa89e7bc286f52d45f3886cca36912d12891f409d6d70cff063cf3790b7e05f4e280e1a953987dab155feecea461d5a3ff5cea0a430a
diff --git a/dev-java/xpp2/xpp2-2.1.10-r2.ebuild b/dev-java/xpp2/xpp2-2.1.10-r2.ebuild
index b0e089cff3ec..bb124374b5c7 100644
--- a/dev-java/xpp2/xpp2-2.1.10-r2.ebuild
+++ b/dev-java/xpp2/xpp2-2.1.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/${MY_PN}2/${MY_P
 
 LICENSE="Apache-1.1 IBM"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 # Some failures, partly because we haven't patched Xerces but probably
diff --git a/dev-java/xpp3/Manifest b/dev-java/xpp3/Manifest
index deb940e27086..1d3744b4c49b 100644
--- a/dev-java/xpp3/Manifest
+++ b/dev-java/xpp3/Manifest
@@ -1,4 +1,4 @@
 DIST xpp3-1.1.4c.jar 128334 BLAKE2B a0c1d871216e44f7196ae8edd4c0ca2503a16821b6f592e4af0fcc1da346135fd5023fa5210abe1ce772d0001274c0f6a3d2383b7ebad1a65ffa967ac31c1d5e SHA512 743d2a0b20d16e97b640d9ad3e20e56a7446cdaf4ca0ebba072bdbe3eed0ef90289c2829376b4a209b35e0960adee5e01f11e8f361798333d8b4eaf4f1038445
-EBUILD xpp3-1.1.4c-r3.ebuild 680 BLAKE2B 4fdc0c6ec0bfbf04c6f67d2df5a2497bff293d7eb1643ad1806d58bb1bd2c96b04a2666fad2e33291f70de00c77f2d14227732d262ce63d7a9eaf035684505be SHA512 b0d9e9746ecaad9b78b0ea10745781c9c5e9f653fb7f4132a63abc1cffcc58bbd719d6e1b956374ef3bfc6d2f5ccf7db4d7e85a928fc585d4bebf5cbbb3a96e0
-EBUILD xpp3-1.1.4c-r4.ebuild 634 BLAKE2B c8272523958b3d7d7ee5aa3f269f29b981b4c063c68f7e959a2ccfde142dc28f86c875124b477a535f021c639c27f8a76597f6f80ba8c59f4ff0261f33ceb4a3 SHA512 f97711bb2fcd90e3bb3b50ee0ba455db43240527d3402bceb29177f0c1738a1ae2fefae69ea23978e833b3f0114f565ef91dca7dfa7a7b2ca07ae1f9ca798dd4
+EBUILD xpp3-1.1.4c-r3.ebuild 666 BLAKE2B 6bebe7aff5a9ea049b6ed491c006f0b4bc8116c18d28f1367e701eb0884fbe12c5d112872edae84b458da8f56783fbaea403c84b5b100382a5bfa32cd7640a5a SHA512 7333d61225cc34e21563b4911c8f91bfb0f4edb7f4fd6091810310f7ee7560a41a3028846ce8aee0cbb5ff3679eebbe2759ace52807d21eb245939650717311a
+EBUILD xpp3-1.1.4c-r4.ebuild 623 BLAKE2B 24cade8f2df563e7c2fafd17dad47f18b8c101394525f9f73ff2e33ef1f4c9fb8b299cdeee73347edef359015142634e814e8385ac36f79335e545d3d879f184 SHA512 189ddf39d5562ebc8016e5840668894fa04caf644ed196c8b5e66ecd6688cf28ecb17b5c9bc1803aa9375ba3a8d2001efbf9e934a8047a9ab7118d6fcd700b47
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
index 22e70b689bd2..d392231d1098 100644
--- a/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/xpp3-1.1.4c-sources.ja
 
 LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r4.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r4.ebuild
index 5471aaa80309..297c14b7000e 100644
--- a/dev-java/xpp3/xpp3-1.1.4c-r4.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
 LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/xsdlib/Manifest b/dev-java/xsdlib/Manifest
index c409e31573df..6a29150ee537 100644
--- a/dev-java/xsdlib/Manifest
+++ b/dev-java/xsdlib/Manifest
@@ -1,3 +1,3 @@
 DIST xsdlib.20090415.zip 914126 BLAKE2B 7f8dc45c590606ece1775d08634f87bb7cd392c69c66204073d4867f925cf7159fe14b43cde6d59a72da90ab284d9a3adc0c4d6aa117ea5143eff8efc5bf6534 SHA512 479b20bb24c32f7a8bf548689cb6d7efc99e36d7f887d9e33b34b2e4707d74149ae1e312f7166a90acbd44422248729d6158a55d710616b656eb628cafc1e3f2
-EBUILD xsdlib-20090415.ebuild 1157 BLAKE2B c1573697f8119eb0b1b4162d39781eb1493e26ae1c4a69a83fc8f02a9a6d465bc2c862bf48dd1bb9069e20122e9f022c33eabca1c0ecac335ea8f06167767d44 SHA512 5d9cd42055027a5ea47cb394600edfaeb06bfe0b689d854d0beaf1aa6971fbd43e071ee09556b767f1b923fcc88e50355430396a64c575a4a4d6ffbe22a6cd7a
+EBUILD xsdlib-20090415.ebuild 1146 BLAKE2B 085af826f89fe7401fa25671563a5c160f39d27ce116f2cd022452e91bea1dc75d77183cb05c01eb7041e6c3168aff3ba1dbacd2677bd383bf8733235e60fd10 SHA512 3e0c9a971e0063b3098b946cb147d65d9489e74151639187961b6f9cb5b192f4eb10a7b1c69f183e7c1a2e94ffa70fb059b9e0b2e97c9c88543e6736b7a18679
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xsdlib/xsdlib-20090415.ebuild b/dev-java/xsdlib/xsdlib-20090415.ebuild
index 9be3fe0b7cb5..8628881c0abd 100644
--- a/dev-java/xsdlib/xsdlib-20090415.ebuild
+++ b/dev-java/xsdlib/xsdlib-20090415.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://java.net/downloads/msv/releases/${PN}.${PV}.zip"
 
 LICENSE="BSD Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 COMMON_DEP="
 	dev-java/xerces:2
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
commit	24fd814c326e282c4321965c31f341dad77e270d (patch)
tree	033d63b33c21a3209964ab56005bb9bdd523630d /dev-java
parent	129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)