gentoo resync : 03.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-03 13:42:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-03 13:42:34 +0000
commit: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch)
tree: 3cb05783d73b2c33589ba305144a31c718e123cd /dev-java
parent: 16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff)
81 files changed, 263 insertions, 527 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 717f736e0c03..f2b53fdc6461 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 7140829d9455..e603e342a1f2 100644
--- a/dev-java/ant-antlr/Manifest
+++ b/dev-java/ant-antlr/Manifest
@@ -4,7 +4,7 @@ DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd91583
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-antlr-1.10.5.ebuild 512 BLAKE2B 41bb443f0d1223603d32db787a63b4b490fd0bc64db17391e8ef55fcfb2dfbbc6bc77c374af0dea8380a91b2e91fa194f15e5817ff68f4ec5b61b09540f8027d SHA512 be4e7235b90f1a8d94fb29d3d2419e638551067338f7fc77c8ccc048910562201493c6f4e845575452b6d50cbddb3e8ff82aa4918ceb4507b1327d7b7c151793
-EBUILD ant-antlr-1.9.13.ebuild 512 BLAKE2B 41bb443f0d1223603d32db787a63b4b490fd0bc64db17391e8ef55fcfb2dfbbc6bc77c374af0dea8380a91b2e91fa194f15e5817ff68f4ec5b61b09540f8027d SHA512 be4e7235b90f1a8d94fb29d3d2419e638551067338f7fc77c8ccc048910562201493c6f4e845575452b6d50cbddb3e8ff82aa4918ceb4507b1327d7b7c151793
+EBUILD ant-antlr-1.10.5.ebuild 510 BLAKE2B ed4df364a51fa4f6a9a43560b69f81e09a757b8ff3f3bb42f65f44effabeb699ddbf269bdfec015c5d903d54ab65fefb5e1413f36c196b71e9c1267704d1e976 SHA512 2c3cc071e5f318211f7f675176624682d0f405bacf24480812397028017a65615bb8dc54c4b6bdba01f980d4d6833f940dda1abdcd9450591417c71544dfce79
+EBUILD ant-antlr-1.9.13.ebuild 510 BLAKE2B ed4df364a51fa4f6a9a43560b69f81e09a757b8ff3f3bb42f65f44effabeb699ddbf269bdfec015c5d903d54ab65fefb5e1413f36c196b71e9c1267704d1e976 SHA512 2c3cc071e5f318211f7f675176624682d0f405bacf24480812397028017a65615bb8dc54c4b6bdba01f980d4d6833f940dda1abdcd9450591417c71544dfce79
 EBUILD ant-antlr-1.9.2-r1.ebuild 474 BLAKE2B c97085ba99084edc5df177278c5d1e54c0e1cdbeb6aa28c1bf77c7996aa9e1c3178cc0d5a861e1bd8443f2bbeed27252ea2453f6e4a49d94f5ef4fccdacf9a28 SHA512 3701e4e4504ebe741c095dd7e66d4d4a81a5e7e38b09f42e8b3f4c369b85a676572c6ec93c497b5fea101fc47afe188c913592280b7d06891d12a737c9f67c6a
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-antlr/ant-antlr-1.10.5.ebuild b/dev-java/ant-antlr/ant-antlr-1.10.5.ebuild
index eac2b3357fa9..18b0dcb1d4f6 100644
--- a/dev-java/ant-antlr/ant-antlr-1.10.5.ebuild
+++ b/dev-java/ant-antlr/ant-antlr-1.10.5.ebuild
@@ -10,7 +10,7 @@ ANT_TASK_DEPNAME=""
 inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for Antlr"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-java/antlr-2.7.7-r7:0"
 
diff --git a/dev-java/ant-antlr/ant-antlr-1.9.13.ebuild b/dev-java/ant-antlr/ant-antlr-1.9.13.ebuild
index eac2b3357fa9..18b0dcb1d4f6 100644
--- a/dev-java/ant-antlr/ant-antlr-1.9.13.ebuild
+++ b/dev-java/ant-antlr/ant-antlr-1.9.13.ebuild
@@ -10,7 +10,7 @@ ANT_TASK_DEPNAME=""
 inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for Antlr"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-java/antlr-2.7.7-r7:0"
 
diff --git a/dev-java/ant-apache-bcel/Manifest b/dev-java/ant-apache-bcel/Manifest
index aeb5bd894d90..b0a7cbb52560 100644
--- a/dev-java/ant-apache-bcel/Manifest
+++ b/dev-java/ant-apache-bcel/Manifest
@@ -4,7 +4,7 @@ DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd91583
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-apache-bcel-1.10.5.ebuild 397 BLAKE2B a7b92b4955f8a03045afd2716e8e3c8085e00d2b5bfbaa8aee4f8b8c1d074f7192453ca5ad627420cfbfcb80ce4872a751b5bb8dd579df7baf5c42a53338ac54 SHA512 f284a0c121c8e41d7967711847630c10b1d09c22c91b87d9225d9a0571da9d9d4188fafbe1e8e755dcef98eac6f80619cc80b101381bf91b424b5473e3bb45b5
-EBUILD ant-apache-bcel-1.9.13.ebuild 397 BLAKE2B a7b92b4955f8a03045afd2716e8e3c8085e00d2b5bfbaa8aee4f8b8c1d074f7192453ca5ad627420cfbfcb80ce4872a751b5bb8dd579df7baf5c42a53338ac54 SHA512 f284a0c121c8e41d7967711847630c10b1d09c22c91b87d9225d9a0571da9d9d4188fafbe1e8e755dcef98eac6f80619cc80b101381bf91b424b5473e3bb45b5
+EBUILD ant-apache-bcel-1.10.5.ebuild 395 BLAKE2B 7ae7d955673c3f5ff68cd2962bb4281c0e777c1bdb32fdadfcc32de50491b659916de2014da58596057eb3f964f588f82688a62f252a2c68eb949176443425cd SHA512 f9744c01061937a6019294d7191cc2a223301c544f71991b0a1815fab0520ac0ead8b3ec884f945f11b5a87837879b6587b2cbcd437e9561e06e6caf2f168182
+EBUILD ant-apache-bcel-1.9.13.ebuild 395 BLAKE2B 7ae7d955673c3f5ff68cd2962bb4281c0e777c1bdb32fdadfcc32de50491b659916de2014da58596057eb3f964f588f82688a62f252a2c68eb949176443425cd SHA512 f9744c01061937a6019294d7191cc2a223301c544f71991b0a1815fab0520ac0ead8b3ec884f945f11b5a87837879b6587b2cbcd437e9561e06e6caf2f168182
 EBUILD ant-apache-bcel-1.9.2.ebuild 359 BLAKE2B 6e3412a4764180bfbb9cbd3aef6134e228ce1b4bff207512b32a23a6b85214d671f89806aa02d5464819af8b1958d051df64c9c0f226ae0f8c734a01bb17a621 SHA512 d2a898cf6d8edea0f5b6f4e3c70c1547737337a2a5b0ff14619eb0173fab3b62386e00ef7316a50541ad49c34b6514d0985d174bd0fb7bf89d5fadf8f324cc21
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.5.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.5.ebuild
index cc27312305eb..74f778d7ba8c 100644
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.5.ebuild
+++ b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.5.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="bcel"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/bcel-5.1-r3:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.13.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.13.ebuild
index cc27312305eb..74f778d7ba8c 100644
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.13.ebuild
+++ b/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.13.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="bcel"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/bcel-5.1-r3:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-bsf/Manifest b/dev-java/ant-apache-bsf/Manifest
index 86389ca034ba..239e5451ddad 100644
--- a/dev-java/ant-apache-bsf/Manifest
+++ b/dev-java/ant-apache-bsf/Manifest
@@ -4,7 +4,7 @@ DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd91583
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-apache-bsf-1.10.5.ebuild 676 BLAKE2B 704842b34d07abf1625754ee6b4fd9fd61ce8c9d16b6ae804d32614a9ae3d41f536a536915eed19b070623f3b17053d55792314cba31d4b855b060dd6b7143f6 SHA512 952db5b221485ca7feaee87c432717bb4c2ebc6efe3d29730d5bb56a4f6c0d64fae27b429e2ebee32ce3d2d90fcfe67fbc3e1cf5862e07d43f606ed6d0b78e8b
-EBUILD ant-apache-bsf-1.9.13.ebuild 676 BLAKE2B 704842b34d07abf1625754ee6b4fd9fd61ce8c9d16b6ae804d32614a9ae3d41f536a536915eed19b070623f3b17053d55792314cba31d4b855b060dd6b7143f6 SHA512 952db5b221485ca7feaee87c432717bb4c2ebc6efe3d29730d5bb56a4f6c0d64fae27b429e2ebee32ce3d2d90fcfe67fbc3e1cf5862e07d43f606ed6d0b78e8b
+EBUILD ant-apache-bsf-1.10.5.ebuild 674 BLAKE2B f4dc9363275e6b150da63f0062acd18532150a8492ed08c03422ecaab084f7f6dea9a68570a806e2b70374e5fdfb0dd19a97decd6daae21f249d322d440ab8c2 SHA512 f3bea7cba377c5f5b912da9d4d5c5185c9df3949f7ad265b0f6be4bab89c0542a5e96ccd12fce9cfbddd2583ddce6babf01ac98468637fc1db8e1d15d9a09925
+EBUILD ant-apache-bsf-1.9.13.ebuild 674 BLAKE2B f4dc9363275e6b150da63f0062acd18532150a8492ed08c03422ecaab084f7f6dea9a68570a806e2b70374e5fdfb0dd19a97decd6daae21f249d322d440ab8c2 SHA512 f3bea7cba377c5f5b912da9d4d5c5185c9df3949f7ad265b0f6be4bab89c0542a5e96ccd12fce9cfbddd2583ddce6babf01ac98468637fc1db8e1d15d9a09925
 EBUILD ant-apache-bsf-1.9.2.ebuild 638 BLAKE2B c9eab574053f8817ee6fa07012a6012524fbb295f45d53bb47835cf7a454152516fae1b1daed4108b6a563557adbc964d7184942a3d735801d01b9457d7ce0a5 SHA512 31d6748a916d8852015bd5d64f54745571050093b390c067f37cdfa57014c0798936478ce0823c54733b3563ba4b9a696aefb3992f51909aeafdb2e49d66517f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.5.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.5.ebuild
index ab90ef07be0c..177d29b9d27e 100644
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.5.ebuild
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.5.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="bsf-2.3"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="python javascript tcl"
 
 DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.13.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.13.ebuild
index ab90ef07be0c..177d29b9d27e 100644
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.13.ebuild
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.13.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="bsf-2.3"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="python javascript tcl"
 
 DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
diff --git a/dev-java/ant-apache-log4j/Manifest b/dev-java/ant-apache-log4j/Manifest
index f5497303de5c..d6fc5def03b5 100644
--- a/dev-java/ant-apache-log4j/Manifest
+++ b/dev-java/ant-apache-log4j/Manifest
@@ -4,7 +4,7 @@ DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd91583
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-apache-log4j-1.10.5.ebuild 402 BLAKE2B ed648820171b4caab34190d3f5dd36f70cf02085fb88e921d70a3f7dcf1b26b4b139159e68a79e97a012d4f90d5f9cc86be463ac02e95346fa73db6a5e11b997 SHA512 1d8440d1b7355e09514e1e0ae6b37ba2f61cb849089a367f638308da8c1fa425b9fddec1d77ee69480ed16f77bbd59279457ffe7cb420d130c18e266fa26b612
-EBUILD ant-apache-log4j-1.9.13.ebuild 402 BLAKE2B ed648820171b4caab34190d3f5dd36f70cf02085fb88e921d70a3f7dcf1b26b4b139159e68a79e97a012d4f90d5f9cc86be463ac02e95346fa73db6a5e11b997 SHA512 1d8440d1b7355e09514e1e0ae6b37ba2f61cb849089a367f638308da8c1fa425b9fddec1d77ee69480ed16f77bbd59279457ffe7cb420d130c18e266fa26b612
+EBUILD ant-apache-log4j-1.10.5.ebuild 400 BLAKE2B 84d0fbc9b907a37cdff40f1bc7bd9212ce092cc964b50dea6e238f573315d1cb697bd40deddf30cd61fe550368c66f80f2a6bebbd402ff044d1271b495ad03ee SHA512 0235b9da1e1b78ae2bcee88db039c7f586d223c87ef3bd82289ce450c0024d5d7605bf9383e0bc5c7ef4edcde4a3d07694c3491c621856784bd07059454fbb25
+EBUILD ant-apache-log4j-1.9.13.ebuild 400 BLAKE2B 84d0fbc9b907a37cdff40f1bc7bd9212ce092cc964b50dea6e238f573315d1cb697bd40deddf30cd61fe550368c66f80f2a6bebbd402ff044d1271b495ad03ee SHA512 0235b9da1e1b78ae2bcee88db039c7f586d223c87ef3bd82289ce450c0024d5d7605bf9383e0bc5c7ef4edcde4a3d07694c3491c621856784bd07059454fbb25
 EBUILD ant-apache-log4j-1.9.2.ebuild 364 BLAKE2B 17c62ecc9ca6650e3fcadda3b6c6d83afd0fe5e77ffb33ec8ac1a5fa926acf85107b87d91def668d76a405dc35de68aa49654e2e5be0a553f8125ac1ec730f8a SHA512 648e4a5370d9f5ee6d9ab9af80df505bb9eae238caf65b4b4ab7dc898ce61c8e552cddb2e1d303ec64e17eb5e5e7aebb9601a6719413a0759b4f63ec6a439de9
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.5.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.5.ebuild
index e2def8547bae..6978e1a4cd83 100644
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.5.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.5.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="log4j"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/log4j-1.2.13-r2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.13.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.13.ebuild
index e2def8547bae..6978e1a4cd83 100644
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.13.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.13.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="log4j"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/log4j-1.2.13-r2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/Manifest b/dev-java/ant-apache-oro/Manifest
index 27cb042cc736..ea011a484173 100644
--- a/dev-java/ant-apache-oro/Manifest
+++ b/dev-java/ant-apache-oro/Manifest
@@ -4,7 +4,7 @@ DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd91583
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-apache-oro-1.10.5.ebuild 419 BLAKE2B a902f3b7454d6e3c907109efaaa6bf8720a45b3e94d75422bbabc79a244ef61c7712fa544a444a45298b397a56059b6361f0457c329279a74c3666dd4b2837a5 SHA512 be13218686f32d7af1fa1f406e0c7222fadc87185d5280b81aff4199df7f31d2004196089efba5908e4ae6827d57fe8f3337f9325196044c132ede144a628f29
-EBUILD ant-apache-oro-1.9.13.ebuild 419 BLAKE2B a902f3b7454d6e3c907109efaaa6bf8720a45b3e94d75422bbabc79a244ef61c7712fa544a444a45298b397a56059b6361f0457c329279a74c3666dd4b2837a5 SHA512 be13218686f32d7af1fa1f406e0c7222fadc87185d5280b81aff4199df7f31d2004196089efba5908e4ae6827d57fe8f3337f9325196044c132ede144a628f29
+EBUILD ant-apache-oro-1.10.5.ebuild 417 BLAKE2B 3c2c9d63bed47599de2227da191f0999323364b8fbd9781ffafdfeb36e18db18c80ca18a59b92ab878dee1db615d1ac1129e89637c4185b376a570014425899c SHA512 c01a447e7e23a78612d464dd4a43f395076921048d4cd083c9410cb2e835fff1e48510559f84ca0714bf98729cea0050e20ac854f7f3c9c438be5a50dcda9aef
+EBUILD ant-apache-oro-1.9.13.ebuild 417 BLAKE2B 3c2c9d63bed47599de2227da191f0999323364b8fbd9781ffafdfeb36e18db18c80ca18a59b92ab878dee1db615d1ac1129e89637c4185b376a570014425899c SHA512 c01a447e7e23a78612d464dd4a43f395076921048d4cd083c9410cb2e835fff1e48510559f84ca0714bf98729cea0050e20ac854f7f3c9c438be5a50dcda9aef
 EBUILD ant-apache-oro-1.9.2.ebuild 381 BLAKE2B 7c53667cf3fa487b6a951bfd5ebb3e14fe40b0501eac2592c62c38b4eb9c6b0fcc65da7050724f518958232af5373f85716cc4a8a89e2cacedb597bf9eb8b856 SHA512 a996273c2bc9d48bfe09d0f0bd952fb52fbcd5fa21950865943ae09a4ca430f6c3aacf6b649d6f166c58815838c19bef5d6c7ccce22025cca635f02ede31c45c
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.10.5.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.10.5.ebuild
index 3b4731d5813f..ec42ffeba0c7 100644
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.10.5.ebuild
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.10.5.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="jakarta-oro-2.0"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.9.13.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.9.13.ebuild
index 3b4731d5813f..ec42ffeba0c7 100644
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.9.13.ebuild
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.9.13.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="jakarta-oro-2.0"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/Manifest b/dev-java/ant-apache-regexp/Manifest
index e6f2a26947df..57d414754d8d 100644
--- a/dev-java/ant-apache-regexp/Manifest
+++ b/dev-java/ant-apache-regexp/Manifest
@@ -4,7 +4,7 @@ DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd91583
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-apache-regexp-1.10.5.ebuild 423 BLAKE2B 693d3c9182648b14267bbc1c1cad2ebcc20d13e67c82574d78f24721d2f6657561d2da60b008755d911c0a45aa53d12fd993a86fc8005877ba42b658f2eb849c SHA512 31710a47cd87c8c78b90d556ae489957775a50090be519f8b9967200d8227a7f5005728d3d5d85d6ada4e2c2401f75a4908311348b73ad50aff4328a9da5ed8f
-EBUILD ant-apache-regexp-1.9.13.ebuild 423 BLAKE2B 693d3c9182648b14267bbc1c1cad2ebcc20d13e67c82574d78f24721d2f6657561d2da60b008755d911c0a45aa53d12fd993a86fc8005877ba42b658f2eb849c SHA512 31710a47cd87c8c78b90d556ae489957775a50090be519f8b9967200d8227a7f5005728d3d5d85d6ada4e2c2401f75a4908311348b73ad50aff4328a9da5ed8f
+EBUILD ant-apache-regexp-1.10.5.ebuild 421 BLAKE2B 9dcbc66ddcba16b223e80f1cb8c0fb8c4a98c83dfc6d2cc27f609d352c565bd07bcdc23ca786ac1aa9eae131a8b9b33cbb3c338fadbc526ca9b521ebbbaaa158 SHA512 79e55c383ca5fd62a791b56918e0e35fe7ef9e6ede5506099364ed52e2eb7bbe9aea316d279eba28b961a3c769c97e40d5eb3ccd30468ba235f7e0785de9196f
+EBUILD ant-apache-regexp-1.9.13.ebuild 421 BLAKE2B 9dcbc66ddcba16b223e80f1cb8c0fb8c4a98c83dfc6d2cc27f609d352c565bd07bcdc23ca786ac1aa9eae131a8b9b33cbb3c338fadbc526ca9b521ebbbaaa158 SHA512 79e55c383ca5fd62a791b56918e0e35fe7ef9e6ede5506099364ed52e2eb7bbe9aea316d279eba28b961a3c769c97e40d5eb3ccd30468ba235f7e0785de9196f
 EBUILD ant-apache-regexp-1.9.2.ebuild 385 BLAKE2B c861e14076d4c261a93229a25b490b19f797850abba6f01a34c0ab7fc0cceaa5ce83a3f0177351bb1f7a053ac279c4c2530c064450e03dd25ba29fea1072aac2 SHA512 9d110c02c11a0ce43995b52d17f46d4542712625eec0a90ecd2b4653e954117306f5e59f52611a80d2b0b750e1b1f34ffd4df6de91c991e01082426c1ca39222
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.5.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.5.ebuild
index d919b2bba89a..b9abbff99cc1 100644
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.5.ebuild
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.5.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="jakarta-regexp-1.4"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.13.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.13.ebuild
index d919b2bba89a..b9abbff99cc1 100644
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.13.ebuild
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.13.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="jakarta-regexp-1.4"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-resolver/Manifest b/dev-java/ant-apache-resolver/Manifest
index 066e822b91c5..d95f07375ad4 100644
--- a/dev-java/ant-apache-resolver/Manifest
+++ b/dev-java/ant-apache-resolver/Manifest
@@ -4,7 +4,7 @@ DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd91583
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-apache-resolver-1.10.5.ebuild 426 BLAKE2B 5c22ba980060cafe7e0e306dfd8aeec9cc5ec9dd3ffe7e0f07678b054300831f15f7387b0cb914fcb9db0260b65243142dc158758e8884c7143f19644c0aa7f7 SHA512 e11941eb5ff56364b936656c2a70f78955097763646384a85ef9269ec09e5268750cb0d9485476b0cbaabd180fa4597cc9c1998692d5d7994d9a7a46657c4840
-EBUILD ant-apache-resolver-1.9.13.ebuild 426 BLAKE2B 5c22ba980060cafe7e0e306dfd8aeec9cc5ec9dd3ffe7e0f07678b054300831f15f7387b0cb914fcb9db0260b65243142dc158758e8884c7143f19644c0aa7f7 SHA512 e11941eb5ff56364b936656c2a70f78955097763646384a85ef9269ec09e5268750cb0d9485476b0cbaabd180fa4597cc9c1998692d5d7994d9a7a46657c4840
+EBUILD ant-apache-resolver-1.10.5.ebuild 424 BLAKE2B 5aa99de084bf87650b41df44f29823fb5b4becd3f3388f9f89650a871d191d7e787b8e1e13c7bdd021c9d4fc72d2eff3293749338f71f6f44cf73db86eabe2cf SHA512 b6752c0d99dfe244380610f520eedd1b0dff507fda0912d387a48438d6c90263e467c29ac7f7c1cdcfe2ddeb033edac102757ead2eae77f764ae65f5f7087eaf
+EBUILD ant-apache-resolver-1.9.13.ebuild 424 BLAKE2B 5aa99de084bf87650b41df44f29823fb5b4becd3f3388f9f89650a871d191d7e787b8e1e13c7bdd021c9d4fc72d2eff3293749338f71f6f44cf73db86eabe2cf SHA512 b6752c0d99dfe244380610f520eedd1b0dff507fda0912d387a48438d6c90263e467c29ac7f7c1cdcfe2ddeb033edac102757ead2eae77f764ae65f5f7087eaf
 EBUILD ant-apache-resolver-1.9.2.ebuild 388 BLAKE2B a5313956f0cf362f9df0d0943e53a383c00aebd76cc4d1b1dfd61378095af53f59700463d5d9538092340e75ecf6dae6d30e92f15edd9d307bf0e1cfa8987229 SHA512 38aa44f7bb8aa22f078a85e71f5429a5c9905891cb967458f890d0bb5fbc3c5c1cc52c98590a0907bd517eff310f0c881dea2dfa5e38b9c2060d37f83c1cdd0e
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.5.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.5.ebuild
index 36d43d7abf1d..9a4dbb007a05 100644
--- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.5.ebuild
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.5.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="xml-commons-resolver"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/xml-commons-resolver-1.2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.13.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.13.ebuild
index 36d43d7abf1d..9a4dbb007a05 100644
--- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.13.ebuild
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.13.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="xml-commons-resolver"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/xml-commons-resolver-1.2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-xalan2/Manifest b/dev-java/ant-apache-xalan2/Manifest
index 33798d6e900f..9bb4bda1c617 100644
--- a/dev-java/ant-apache-xalan2/Manifest
+++ b/dev-java/ant-apache-xalan2/Manifest
@@ -4,7 +4,7 @@ DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd91583
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-apache-xalan2-1.10.5.ebuild 500 BLAKE2B 45f01fd70e19a8f51e011dbb52d24848829b8a8b77657ed05c9487bcc9af1b4ae1bae139d758651895ee7595b46ec61cb73f1d53b8a0a36a1523d518766998e3 SHA512 db45e6a9f1067e08214e07206505caf5b93fe4b666753d3447c8387406e1892d240fb2f45d91dfb8bd5eddbf10d4fcd86623c516709da6d5bc46b476ea6ccbe8
-EBUILD ant-apache-xalan2-1.9.13.ebuild 500 BLAKE2B 45f01fd70e19a8f51e011dbb52d24848829b8a8b77657ed05c9487bcc9af1b4ae1bae139d758651895ee7595b46ec61cb73f1d53b8a0a36a1523d518766998e3 SHA512 db45e6a9f1067e08214e07206505caf5b93fe4b666753d3447c8387406e1892d240fb2f45d91dfb8bd5eddbf10d4fcd86623c516709da6d5bc46b476ea6ccbe8
+EBUILD ant-apache-xalan2-1.10.5.ebuild 498 BLAKE2B aa4a8e6a89ed96f6a5ebee9d086d62d9c89e858715522d049e4c1563fbc3f60e77cab62255f4229217182a303c8f7f2ccabd90631711408e683656ab41060cff SHA512 c5a634140e207611d49aa2ebd182d295e462c47b417ddd26d03d8f0da8d271f68746081d76c39570d0264889e701eefb1375c49b750315d51c9c689760730100
+EBUILD ant-apache-xalan2-1.9.13.ebuild 498 BLAKE2B aa4a8e6a89ed96f6a5ebee9d086d62d9c89e858715522d049e4c1563fbc3f60e77cab62255f4229217182a303c8f7f2ccabd90631711408e683656ab41060cff SHA512 c5a634140e207611d49aa2ebd182d295e462c47b417ddd26d03d8f0da8d271f68746081d76c39570d0264889e701eefb1375c49b750315d51c9c689760730100
 EBUILD ant-apache-xalan2-1.9.2-r1.ebuild 462 BLAKE2B 7043bd1b05eeda1bbc2c313853b4a15c8d94c3442fbd53e81eab9972d039230893219a375a92435addcfcfff7a5ab96d3d8520a3b00503b339a03cfee16b9dac SHA512 08d378e572d27dcb93db643d246a219c89a4e3ed27f55749162a2d932ac89c1acd91fb23b80c556613350581e56be9df7221f35827b98a0d96cb11e4db199fd8
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.5.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.5.ebuild
index b8b82ce67833..4eadc35c8c69 100644
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.5.ebuild
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.5.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="xalan"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-java/xalan:0
 	dev-java/xalan-serializer:0"
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.13.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.13.ebuild
index b8b82ce67833..4eadc35c8c69 100644
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.13.ebuild
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.13.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="xalan"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-java/xalan:0
 	dev-java/xalan-serializer:0"
diff --git a/dev-java/ant-commons-logging/Manifest b/dev-java/ant-commons-logging/Manifest
index 45b13651403f..a3e4c9c4effa 100644
--- a/dev-java/ant-commons-logging/Manifest
+++ b/dev-java/ant-commons-logging/Manifest
@@ -4,7 +4,7 @@ DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd91583
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-commons-logging-1.10.5.ebuild 386 BLAKE2B 0efc40e96cc9acb1c9c1ed1172416efd0526b16783914d26ddda282485e25e0af14ac0fca26912950e96f9c0e6599dfdf381e51c39873595ab8cc8f9c63e75da SHA512 6360b7a1b48fdd6fc4b38cd5a99e39a8870d863ae62e21bcd53a9ff9bfbd081d62837ccef4f9ad861ea7ac199b19882da29c27b699dfc063e1d569a354e15839
-EBUILD ant-commons-logging-1.9.13.ebuild 386 BLAKE2B 0efc40e96cc9acb1c9c1ed1172416efd0526b16783914d26ddda282485e25e0af14ac0fca26912950e96f9c0e6599dfdf381e51c39873595ab8cc8f9c63e75da SHA512 6360b7a1b48fdd6fc4b38cd5a99e39a8870d863ae62e21bcd53a9ff9bfbd081d62837ccef4f9ad861ea7ac199b19882da29c27b699dfc063e1d569a354e15839
+EBUILD ant-commons-logging-1.10.5.ebuild 384 BLAKE2B 6a34a464c32ebf58b363b81364a7b4bf3599ef42eb515df55312cea190b5e9979c363f9b159c352ce72de988eac660da4f242995897f17b7d6f9d7c0708e51a1 SHA512 c0e5a9d6a12071c4134b482ef5def11f9ceed2847cc0e484736c943d1ed7c4c42cdbc2f2a3b322c083bd612f9840a4db57c2c4a2300d2669c0a1ceae232ec868
+EBUILD ant-commons-logging-1.9.13.ebuild 384 BLAKE2B 6a34a464c32ebf58b363b81364a7b4bf3599ef42eb515df55312cea190b5e9979c363f9b159c352ce72de988eac660da4f242995897f17b7d6f9d7c0708e51a1 SHA512 c0e5a9d6a12071c4134b482ef5def11f9ceed2847cc0e484736c943d1ed7c4c42cdbc2f2a3b322c083bd612f9840a4db57c2c4a2300d2669c0a1ceae232ec868
 EBUILD ant-commons-logging-1.9.2.ebuild 347 BLAKE2B 5006e6af3bce302bdbd1faf26a94386a79a0638b89e8028debd2d62a80b7fb9bae84ba666bcd1bb6645fb20eef74de283c4f538196fd5043e4359cde8aac7542 SHA512 4fa770c28772e034807242fc5051d19227c7efd233bc362fd650ae7dfcd3032c2b759ff04c73e5689bcaa97080fd388e7d012574b35f19fa4bd0cfffa63863bd
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.10.5.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.10.5.ebuild
index cde3be7d5afe..c1a4bb62f144 100644
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.10.5.ebuild
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.10.5.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.9.13.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.9.13.ebuild
index cde3be7d5afe..c1a4bb62f144 100644
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.9.13.ebuild
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.9.13.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-net/Manifest b/dev-java/ant-commons-net/Manifest
index c00fa4366853..9e068cd495ae 100644
--- a/dev-java/ant-commons-net/Manifest
+++ b/dev-java/ant-commons-net/Manifest
@@ -4,7 +4,7 @@ DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd91583
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-commons-net-1.10.5.ebuild 382 BLAKE2B abf76e86b3af5ad8a9ed1ad3b70db2d90757727e21eaf1b8bc71f416acdfb4c4ca0df8e453f8efb26c9d237bf4867436f7cb4b1ece55bd4c13901dad07f17deb SHA512 94f1620956bf5397711c1f4deebbd035fc5df2d0f2b2aa3cbc5128c1c02dcbe2a01cdb1c1e31ab02a41ee3c3d5ff035e9870c46fdee915102bca90916c7c1754
-EBUILD ant-commons-net-1.9.13.ebuild 382 BLAKE2B abf76e86b3af5ad8a9ed1ad3b70db2d90757727e21eaf1b8bc71f416acdfb4c4ca0df8e453f8efb26c9d237bf4867436f7cb4b1ece55bd4c13901dad07f17deb SHA512 94f1620956bf5397711c1f4deebbd035fc5df2d0f2b2aa3cbc5128c1c02dcbe2a01cdb1c1e31ab02a41ee3c3d5ff035e9870c46fdee915102bca90916c7c1754
+EBUILD ant-commons-net-1.10.5.ebuild 380 BLAKE2B dda069ed16b93126cc4575b4cde8955dcb5283fa5650c3ec680260d630f17255d4f0462fdd7043cd83696aa328711877470126090002dfec13ec23068b5103ec SHA512 b3f24556fa904bb0c3eb659cc730793a2526d5d921b07bcc4eb12edff3e43c0f57cec3439c29369dfb05685215448bba4cf9698a33232bf89b48d28066a88e33
+EBUILD ant-commons-net-1.9.13.ebuild 380 BLAKE2B dda069ed16b93126cc4575b4cde8955dcb5283fa5650c3ec680260d630f17255d4f0462fdd7043cd83696aa328711877470126090002dfec13ec23068b5103ec SHA512 b3f24556fa904bb0c3eb659cc730793a2526d5d921b07bcc4eb12edff3e43c0f57cec3439c29369dfb05685215448bba4cf9698a33232bf89b48d28066a88e33
 EBUILD ant-commons-net-1.9.2.ebuild 343 BLAKE2B d6a203ecbb2c405b725819c206c4a6af97b11d1632bbff59b8f9baeddd1cb24ae302792ef5e6fb79997a7c8726c992f6cba9cf0f087276bddcbf5aa4e5c6da75 SHA512 7681da0c70374d90f106e93dbb7f153db36fef7dfda3f31a780419f65ae071788ed7a1f12e5ec63a6408bb8ea9afdc4e532c2915b5059ae956391009f3cc5350
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.10.5.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.10.5.ebuild
index ad26bd8fe211..5727ceda93af 100644
--- a/dev-java/ant-commons-net/ant-commons-net-1.10.5.ebuild
+++ b/dev-java/ant-commons-net/ant-commons-net-1.10.5.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/commons-net-1.4.1-r1:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.9.13.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.9.13.ebuild
index ad26bd8fe211..5727ceda93af 100644
--- a/dev-java/ant-commons-net/ant-commons-net-1.9.13.ebuild
+++ b/dev-java/ant-commons-net/ant-commons-net-1.9.13.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/commons-net-1.4.1-r1:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 18b6cbddf2b5..69c89c1c52f7 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -4,7 +4,7 @@ DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd91583
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-core-1.10.5-r1.ebuild 3196 BLAKE2B 6f0eccb5f88b1357cc143622553dbf85dc7ddf3f79bc6a3355472fd2ca759e9d437d7535a6aef06ee5d8b0fd0a5d87702f96a5a2e9addb9730fcc50fad821520 SHA512 b01ec8ed706bd96884e0c19063b43b054489ec49d4ebb091886ff99ef0fb9c68b53bae0ad06d0fa6cc75f76f4b44fdaee1a7469187e3fa13427caeb2d0a8e15b
-EBUILD ant-core-1.9.13-r1.ebuild 3196 BLAKE2B 6f0eccb5f88b1357cc143622553dbf85dc7ddf3f79bc6a3355472fd2ca759e9d437d7535a6aef06ee5d8b0fd0a5d87702f96a5a2e9addb9730fcc50fad821520 SHA512 b01ec8ed706bd96884e0c19063b43b054489ec49d4ebb091886ff99ef0fb9c68b53bae0ad06d0fa6cc75f76f4b44fdaee1a7469187e3fa13427caeb2d0a8e15b
+EBUILD ant-core-1.10.5-r1.ebuild 3194 BLAKE2B 7a3ecee7a9c57fdeb8ebd1e2dba61de625a0020cf535f8e64ebc78414796775113f394be3d5cbdb3d2d04db23568a61bece4f102fb64fe9210a7f7e32f5c075f SHA512 227a969d2086769b8c1e6b51178b8a4b842a6f5a9d9cbbde1ba7654d206e7d565fa9094a157ddc66109b90116131df6ee49e309ced1e85bb43a84c836904ce1f
+EBUILD ant-core-1.9.13-r1.ebuild 3194 BLAKE2B 7a3ecee7a9c57fdeb8ebd1e2dba61de625a0020cf535f8e64ebc78414796775113f394be3d5cbdb3d2d04db23568a61bece4f102fb64fe9210a7f7e32f5c075f SHA512 227a969d2086769b8c1e6b51178b8a4b842a6f5a9d9cbbde1ba7654d206e7d565fa9094a157ddc66109b90116131df6ee49e309ced1e85bb43a84c836904ce1f
 EBUILD ant-core-1.9.2.ebuild 3216 BLAKE2B fdd1e40be093d25a40afd4e6009539ee1be4877a5e281596fb246d64c913da5c0877b05b7b8f024132ecdff31dc48bf9df691b1a6d07cc6580d1176b16027600 SHA512 fa3f6f9120f3ba469aad57c73317ea37adde68d39451d773172fd2c0c6c5e2b537f2c3ab1334733481740ec74021bc73756e8c502de861aae0057a87c36237a1
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-core/ant-core-1.10.5-r1.ebuild b/dev-java/ant-core/ant-core-1.10.5-r1.ebuild
index 7ddd5d55ba2b..5f5cb9ca722e 100644
--- a/dev-java/ant-core/ant-core-1.10.5-r1.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.5-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*
 	!dev-java/ant-tasks
diff --git a/dev-java/ant-core/ant-core-1.9.13-r1.ebuild b/dev-java/ant-core/ant-core-1.9.13-r1.ebuild
index 7ddd5d55ba2b..5f5cb9ca722e 100644
--- a/dev-java/ant-core/ant-core-1.9.13-r1.ebuild
+++ b/dev-java/ant-core/ant-core-1.9.13-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*
 	!dev-java/ant-tasks
diff --git a/dev-java/ant-jai/Manifest b/dev-java/ant-jai/Manifest
index 13f694428d97..b2797fea78de 100644
--- a/dev-java/ant-jai/Manifest
+++ b/dev-java/ant-jai/Manifest
@@ -4,7 +4,7 @@ DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd91583
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-jai-1.10.5.ebuild 368 BLAKE2B 3ae1c6ee077ac695ad3d3c971d7a11df822db7519908bc902e1233ae63f0482c72b9b6209ea269e0172569c5297217200d3ebc5617af0d0bb396c90fbaadc2e9 SHA512 671d6e5a24cd8b7a766b46f48ee6b1cbbd611d89122f6b5c17244b01e420da30ef588a57f976e332e17542ca8bd6795bcc68a359f68c9d120203241a9047449c
-EBUILD ant-jai-1.9.13.ebuild 368 BLAKE2B 3ae1c6ee077ac695ad3d3c971d7a11df822db7519908bc902e1233ae63f0482c72b9b6209ea269e0172569c5297217200d3ebc5617af0d0bb396c90fbaadc2e9 SHA512 671d6e5a24cd8b7a766b46f48ee6b1cbbd611d89122f6b5c17244b01e420da30ef588a57f976e332e17542ca8bd6795bcc68a359f68c9d120203241a9047449c
+EBUILD ant-jai-1.10.5.ebuild 366 BLAKE2B ef8881d25745d05df21bbad4dee9eafbcf98277186bb4ddf4e51178e4c7371f7da3cd6e21147d3fdff8a9113f7a344bfb585ee2b0fcb2ebb2dc368481683059c SHA512 5b3a37b227e2be1c7387913a266fbaf136c73234ade06cd4a504c7e8881d03514bf9892c5bad7ea6a7b702ca60d385f15079bc0b2cb34ff1add3d37799d7c575
+EBUILD ant-jai-1.9.13.ebuild 366 BLAKE2B ef8881d25745d05df21bbad4dee9eafbcf98277186bb4ddf4e51178e4c7371f7da3cd6e21147d3fdff8a9113f7a344bfb585ee2b0fcb2ebb2dc368481683059c SHA512 5b3a37b227e2be1c7387913a266fbaf136c73234ade06cd4a504c7e8881d03514bf9892c5bad7ea6a7b702ca60d385f15079bc0b2cb34ff1add3d37799d7c575
 EBUILD ant-jai-1.9.2.ebuild 330 BLAKE2B bd2f662e949c6ea8155595ecf7778a6cd7453e19c7dc4e61e3ee4880755005ea628a34091209e1d53c856accd3b3694e83857657579b27411147d498003dba99 SHA512 797fe5463151d9a66ccc7f4fdc666dee23935b36d45c1543ee6221d7a0d74c400921b9456677e3555f9f8bdb3242a658f3e361b54b1c968b4d19f999ad27b7a4
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jai/ant-jai-1.10.5.ebuild b/dev-java/ant-jai/ant-jai-1.10.5.ebuild
index c6181a3f28df..c0b4b8471220 100644
--- a/dev-java/ant-jai/ant-jai-1.10.5.ebuild
+++ b/dev-java/ant-jai/ant-jai-1.10.5.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="sun-jai-bin"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 # Unmigrated, has textrels and there's also some source one now too.
 DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1"
diff --git a/dev-java/ant-jai/ant-jai-1.9.13.ebuild b/dev-java/ant-jai/ant-jai-1.9.13.ebuild
index c6181a3f28df..c0b4b8471220 100644
--- a/dev-java/ant-jai/ant-jai-1.9.13.ebuild
+++ b/dev-java/ant-jai/ant-jai-1.9.13.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="sun-jai-bin"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 # Unmigrated, has textrels and there's also some source one now too.
 DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1"
diff --git a/dev-java/ant-javamail/Manifest b/dev-java/ant-javamail/Manifest
index 064d5077e379..2d7ed19dbdf8 100644
--- a/dev-java/ant-javamail/Manifest
+++ b/dev-java/ant-javamail/Manifest
@@ -4,7 +4,7 @@ DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd91583
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-javamail-1.10.5.ebuild 496 BLAKE2B c4c11fd3ddb9cd6537af603f067cd846e3960fae10e8e46642243a6081b4f145222d3beeca98dc70d44ef5531e8400a60bd0cad100f04e0f56812e6087bd4b18 SHA512 a2ac7b9aac0dcef86c9f8040b0d3f05516bf01c5fb8095484829fef77ae8695b54cb0852e31e2afdc30c733cb896f833d48cb88d886289a8ad2a5ab4c5434bb7
-EBUILD ant-javamail-1.9.13.ebuild 496 BLAKE2B c4c11fd3ddb9cd6537af603f067cd846e3960fae10e8e46642243a6081b4f145222d3beeca98dc70d44ef5531e8400a60bd0cad100f04e0f56812e6087bd4b18 SHA512 a2ac7b9aac0dcef86c9f8040b0d3f05516bf01c5fb8095484829fef77ae8695b54cb0852e31e2afdc30c733cb896f833d48cb88d886289a8ad2a5ab4c5434bb7
+EBUILD ant-javamail-1.10.5.ebuild 494 BLAKE2B 00620a18d36b491a4fb9d7b1a80d8125adcfdda93366cb4f1d6f5d5529b1891452c37c32916c3ad5b0b7f9009969ed27dde3cf8ca377e2acbbc38671abb06cd4 SHA512 ec5ba9d81368c98844af54013784606c9a1d8ef22e74282a81d10f6806cfb16c36d9a1f25251c72de72653d34007404fd7b9d2446ce0e6b574766a5451e96708
+EBUILD ant-javamail-1.9.13.ebuild 494 BLAKE2B 00620a18d36b491a4fb9d7b1a80d8125adcfdda93366cb4f1d6f5d5529b1891452c37c32916c3ad5b0b7f9009969ed27dde3cf8ca377e2acbbc38671abb06cd4 SHA512 ec5ba9d81368c98844af54013784606c9a1d8ef22e74282a81d10f6806cfb16c36d9a1f25251c72de72653d34007404fd7b9d2446ce0e6b574766a5451e96708
 EBUILD ant-javamail-1.9.2-r2.ebuild 372 BLAKE2B 729648d88eb3d1af5da67c490d0d4437d7dbd19344a81c1c3dc67ede261acf87e170b1e3c87df226fec860440b1184bbdd1fbaa2fc86a85496a51f7b57382a45 SHA512 956c6a3bb062f99efc8d45538d9703e9a90665559079d34e3edaedf0cd029969b84a88877cf8d5a47c6da1a95d5e1acc915d161a884e11ff774a589863907ea2
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-javamail/ant-javamail-1.10.5.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.5.ebuild
index fcc1e8b8df78..6293b89aafd5 100644
--- a/dev-java/ant-javamail/ant-javamail-1.10.5.ebuild
+++ b/dev-java/ant-javamail/ant-javamail-1.10.5.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="oracle-javamail"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # needs some classes from javax.activation.* which are not in jdk 11
 DEPEND="virtual/jdk:1.8
diff --git a/dev-java/ant-javamail/ant-javamail-1.9.13.ebuild b/dev-java/ant-javamail/ant-javamail-1.9.13.ebuild
index fcc1e8b8df78..6293b89aafd5 100644
--- a/dev-java/ant-javamail/ant-javamail-1.9.13.ebuild
+++ b/dev-java/ant-javamail/ant-javamail-1.9.13.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="oracle-javamail"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # needs some classes from javax.activation.* which are not in jdk 11
 DEPEND="virtual/jdk:1.8
diff --git a/dev-java/ant-jdepend/Manifest b/dev-java/ant-jdepend/Manifest
index bf6d46288c70..02ac4c7bdf5f 100644
--- a/dev-java/ant-jdepend/Manifest
+++ b/dev-java/ant-jdepend/Manifest
@@ -4,7 +4,7 @@ DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd91583
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-jdepend-1.10.5.ebuild 376 BLAKE2B a696b3dd147add7d02a33255d7a11ee8c509cb57050ece62fff1c527559f8c394b40b0efc0002183a608670985d88f4f44f455b15c0bc96235a10fd514e4392f SHA512 4c5e1cf750649eddc4460c58f5676081ef6f2748f71ff5936de0ba3606253ac5f8e6300fe445ca757618b849599cf90935bb5e34656cb8ebaf64947bdacddaeb
-EBUILD ant-jdepend-1.9.13.ebuild 376 BLAKE2B a696b3dd147add7d02a33255d7a11ee8c509cb57050ece62fff1c527559f8c394b40b0efc0002183a608670985d88f4f44f455b15c0bc96235a10fd514e4392f SHA512 4c5e1cf750649eddc4460c58f5676081ef6f2748f71ff5936de0ba3606253ac5f8e6300fe445ca757618b849599cf90935bb5e34656cb8ebaf64947bdacddaeb
+EBUILD ant-jdepend-1.10.5.ebuild 374 BLAKE2B 430814f91faa364a7d299cbb0888e223e50744dddc964de40f2d098d2fa104760c3924d3a0ba4360abe11629354f6c66833e21ef0799565812f0e0caa1b76a10 SHA512 070944d2ad747c5cbd20cb0e42276c6a66d2a90246dd2a278a6effe7ca27fded4ca1d5fdad60f3a15bb73416b739aa78d6ecad8c336b1a7dde40bfb3801bea55
+EBUILD ant-jdepend-1.9.13.ebuild 374 BLAKE2B 430814f91faa364a7d299cbb0888e223e50744dddc964de40f2d098d2fa104760c3924d3a0ba4360abe11629354f6c66833e21ef0799565812f0e0caa1b76a10 SHA512 070944d2ad747c5cbd20cb0e42276c6a66d2a90246dd2a278a6effe7ca27fded4ca1d5fdad60f3a15bb73416b739aa78d6ecad8c336b1a7dde40bfb3801bea55
 EBUILD ant-jdepend-1.9.2.ebuild 337 BLAKE2B e761853e3f289559d234740faeff0155ed6dba6d22983edeea141785498f83f1854442cb0f55704d602ef844131b0678a4e42d1998317706a0237067c76cc9a7 SHA512 b8c848cc52646142102056f523f2fef73ac28bf6f1899522e74a7b32caf7adc8003f8e923cd46ad3e245a771b2a9b7fc5df46a81303795209648b9542f2af4e9
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.10.5.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.10.5.ebuild
index 791be2c169b6..e0b4528b54d5 100644
--- a/dev-java/ant-jdepend/ant-jdepend-1.10.5.ebuild
+++ b/dev-java/ant-jdepend/ant-jdepend-1.10.5.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/jdepend-2.9-r2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.9.13.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.9.13.ebuild
index 791be2c169b6..e0b4528b54d5 100644
--- a/dev-java/ant-jdepend/ant-jdepend-1.9.13.ebuild
+++ b/dev-java/ant-jdepend/ant-jdepend-1.9.13.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/jdepend-2.9-r2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jmf/Manifest b/dev-java/ant-jmf/Manifest
index 58c5e17f1e05..35cb74280c4b 100644
--- a/dev-java/ant-jmf/Manifest
+++ b/dev-java/ant-jmf/Manifest
@@ -4,7 +4,7 @@ DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd91583
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-jmf-1.10.5.ebuild 480 BLAKE2B 286c1b4804f8df6fa004dde3bafa13a548d38013cf9c8247dd7c9d252d2153a07fb9b857a725d270941e1e116ec2d5ca9a269ea14046ac236dda9370e8746286 SHA512 68ffff24854f1de809b7858e9a294481ed95779f5f35559eecff04c051b312492e488bef98a4afaafb65c4a016aa38d9f1ff9115cdccc3be1b86f9b6e6f347f7
-EBUILD ant-jmf-1.9.13.ebuild 480 BLAKE2B 286c1b4804f8df6fa004dde3bafa13a548d38013cf9c8247dd7c9d252d2153a07fb9b857a725d270941e1e116ec2d5ca9a269ea14046ac236dda9370e8746286 SHA512 68ffff24854f1de809b7858e9a294481ed95779f5f35559eecff04c051b312492e488bef98a4afaafb65c4a016aa38d9f1ff9115cdccc3be1b86f9b6e6f347f7
+EBUILD ant-jmf-1.10.5.ebuild 478 BLAKE2B 44ee2a9e4818b7624c74b6e4bc58b7621016419c0cc696da9c7382c378f991c5daea9c3951578437a9de9b2be0edba7ab8a3e8b12f712b47800e198f0e53c004 SHA512 cb2342fa8b12b9ccf74a4ec262dfc7e066c67f978bf48d458c2a29d22e0c1189e9db9eac9d93426f53cc16ed065c765de46aae2990e712943251a32f451f8486
+EBUILD ant-jmf-1.9.13.ebuild 478 BLAKE2B 44ee2a9e4818b7624c74b6e4bc58b7621016419c0cc696da9c7382c378f991c5daea9c3951578437a9de9b2be0edba7ab8a3e8b12f712b47800e198f0e53c004 SHA512 cb2342fa8b12b9ccf74a4ec262dfc7e066c67f978bf48d458c2a29d22e0c1189e9db9eac9d93426f53cc16ed065c765de46aae2990e712943251a32f451f8486
 EBUILD ant-jmf-1.9.2.ebuild 442 BLAKE2B 72c38a29c480b64d268a4fcb35343360fec007cdd9bc5001fc85117f881b9380384574767b57d337dbce4e751dcd1b9d9f9153070eb70625035226e7dd543acb SHA512 25ff6db6ea214003d27446f52a20fee2c34a78b4ee0f4bb96995d4059b1b3d2f04abd116a9c3bf086b9c507293063dcba7a1d96e667cdaac76679d1d77be6700
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jmf/ant-jmf-1.10.5.ebuild b/dev-java/ant-jmf/ant-jmf-1.10.5.ebuild
index 6320a347137e..e1dcf6b28bd3 100644
--- a/dev-java/ant-jmf/ant-jmf-1.10.5.ebuild
+++ b/dev-java/ant-jmf/ant-jmf-1.10.5.ebuild
@@ -13,4 +13,4 @@ inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)"
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-java/ant-jmf/ant-jmf-1.9.13.ebuild b/dev-java/ant-jmf/ant-jmf-1.9.13.ebuild
index 6320a347137e..e1dcf6b28bd3 100644
--- a/dev-java/ant-jmf/ant-jmf-1.9.13.ebuild
+++ b/dev-java/ant-jmf/ant-jmf-1.9.13.ebuild
@@ -13,4 +13,4 @@ inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)"
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-java/ant-jsch/Manifest b/dev-java/ant-jsch/Manifest
index 351fc8910a3e..a71ab2f3b22c 100644
--- a/dev-java/ant-jsch/Manifest
+++ b/dev-java/ant-jsch/Manifest
@@ -4,7 +4,7 @@ DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd91583
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-jsch-1.10.5.ebuild 373 BLAKE2B a57a1f35f191cdee1c13858e85b4e7d03419a17bc69c50f910cbc2c96280c352f2cb645d0ea128c9ae03b5ab4b179d430a01743b5d89da1ff15a3e6ea405a3c1 SHA512 1719deaa3496ddf36d6a18b30c092eba4c57f894d9f948e6e7e8f06325aa13e265fd1a6403c8f6ae0096c0d3325e434131b9d1379bab11dd087d8e61d7f66277
-EBUILD ant-jsch-1.9.13.ebuild 373 BLAKE2B a57a1f35f191cdee1c13858e85b4e7d03419a17bc69c50f910cbc2c96280c352f2cb645d0ea128c9ae03b5ab4b179d430a01743b5d89da1ff15a3e6ea405a3c1 SHA512 1719deaa3496ddf36d6a18b30c092eba4c57f894d9f948e6e7e8f06325aa13e265fd1a6403c8f6ae0096c0d3325e434131b9d1379bab11dd087d8e61d7f66277
+EBUILD ant-jsch-1.10.5.ebuild 371 BLAKE2B 2a78c5e8c61b4bc53e88e35d7eb3432ca850a5134a4db6c4569c13a539082c49ba2844233233effe875ba507289d044708c8ea3acd117abab2d1435cb02ce20d SHA512 0ff579c2bbb8851d9f94e87ddbb7fcd7d6ba2a5b63b99d9c3955064d88d13dbce3cc246176d142889666ce1dedb94ba4eb8c6be0e9e0c1e333d54dae44f3b41a
+EBUILD ant-jsch-1.9.13.ebuild 371 BLAKE2B 2a78c5e8c61b4bc53e88e35d7eb3432ca850a5134a4db6c4569c13a539082c49ba2844233233effe875ba507289d044708c8ea3acd117abab2d1435cb02ce20d SHA512 0ff579c2bbb8851d9f94e87ddbb7fcd7d6ba2a5b63b99d9c3955064d88d13dbce3cc246176d142889666ce1dedb94ba4eb8c6be0e9e0c1e333d54dae44f3b41a
 EBUILD ant-jsch-1.9.2.ebuild 334 BLAKE2B ca0fb3b2033c1405cfc6ed4d53ff1a00313d584c8bd70ffde3856f64cd2f5792ff82b91d5cf2fd6743e772e528188b244c45b6f52d7ed943621a20d1b4748bdd SHA512 eab9878016474d7c2dd04994b97f37fab9e7556dabb6fc4e556fd877ca274bcda0d04c349c9e59a0e3b20e46c75c3baaa4df40f7fa339b4669b340f81bd15c04
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jsch/ant-jsch-1.10.5.ebuild b/dev-java/ant-jsch/ant-jsch-1.10.5.ebuild
index 9d5d044a3a9d..5ae4086a5b98 100644
--- a/dev-java/ant-jsch/ant-jsch-1.10.5.ebuild
+++ b/dev-java/ant-jsch/ant-jsch-1.10.5.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/jsch-0.1.37:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jsch/ant-jsch-1.9.13.ebuild b/dev-java/ant-jsch/ant-jsch-1.9.13.ebuild
index 9d5d044a3a9d..5ae4086a5b98 100644
--- a/dev-java/ant-jsch/ant-jsch-1.9.13.ebuild
+++ b/dev-java/ant-jsch/ant-jsch-1.9.13.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/jsch-0.1.37:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-junit/Manifest b/dev-java/ant-junit/Manifest
index f70fee27812a..1edf9a4d9277 100644
--- a/dev-java/ant-junit/Manifest
+++ b/dev-java/ant-junit/Manifest
@@ -4,8 +4,8 @@ DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd91583
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-junit-1.10.5-r1.ebuild 500 BLAKE2B 28534ca06f9a866d43eb65f5e43fa39f98c82546ee3e2327d4d74786163a735b816adce43510f070132bf390b17f59cf4725636dc57a2a986c875f869df3e895 SHA512 8eb8751c5ae023c18249f7a9ee19055094388003d6e0df7b65fe986f2c5e8bed17188a8e34181d4c6b4ff81c40bac19f03e034842920f976f04c381afd412c91
-EBUILD ant-junit-1.9.13-r1.ebuild 500 BLAKE2B 28534ca06f9a866d43eb65f5e43fa39f98c82546ee3e2327d4d74786163a735b816adce43510f070132bf390b17f59cf4725636dc57a2a986c875f869df3e895 SHA512 8eb8751c5ae023c18249f7a9ee19055094388003d6e0df7b65fe986f2c5e8bed17188a8e34181d4c6b4ff81c40bac19f03e034842920f976f04c381afd412c91
+EBUILD ant-junit-1.10.5-r1.ebuild 498 BLAKE2B 7a381893d77e34cd5460f4b492cd6e8d9f308540d74540fe12d76027e61dc3ca6576aa7a2e282bf46985ca4c7f003e7787f6869a74af152d332777a5f0db9d50 SHA512 a850d37755e09f77afe6b56250a53768d163b5308c0d4d63a153c97dac1649f55bea586f0ce99d6088e1b4672b4c02b7e99f418d381ddf65d148a2da1a4fb658
+EBUILD ant-junit-1.9.13-r1.ebuild 498 BLAKE2B 7a381893d77e34cd5460f4b492cd6e8d9f308540d74540fe12d76027e61dc3ca6576aa7a2e282bf46985ca4c7f003e7787f6869a74af152d332777a5f0db9d50 SHA512 a850d37755e09f77afe6b56250a53768d163b5308c0d4d63a153c97dac1649f55bea586f0ce99d6088e1b4672b4c02b7e99f418d381ddf65d148a2da1a4fb658
 EBUILD ant-junit-1.9.2-r1.ebuild 502 BLAKE2B ac447b23465fea8e1fb8fec8127ba6014dca48787655a407a51e29206b339448b4c85402bd1245fa37053f9de4bcdbadbf7022ec40145ef795e40646a890643c SHA512 5f5e7927fc805b27e191a4c0c7c9b7ff7444ed0b00924af9916c3c69d2937893930fd4cb36526d93863b39c8f209e61aa1b1220d24e108b3f5eba0e2e26d27ef
 EBUILD ant-junit-1.9.2.ebuild 478 BLAKE2B dfce4cc4ff7be128a3d793a9557be2009ce946f552a1eafc10901dd6d73ff5a30174d333d084343b75e63b63836900134d6185037ef95b7a5a1e939b483127f1 SHA512 52ccfc4d9eeda879aff9734b70de3cbece99f1c0c2605abebf0416480c9c1d86afd8729ddbac79480ae4d68d8d467a2fa7b5294c711e6abc021962213d3bfb6e
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild b/dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild
index 71acf63814d5..dcfddcf716a3 100644
--- a/dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild
+++ b/dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-java/junit:0
diff --git a/dev-java/ant-junit/ant-junit-1.9.13-r1.ebuild b/dev-java/ant-junit/ant-junit-1.9.13-r1.ebuild
index 71acf63814d5..dcfddcf716a3 100644
--- a/dev-java/ant-junit/ant-junit-1.9.13-r1.ebuild
+++ b/dev-java/ant-junit/ant-junit-1.9.13-r1.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-java/junit:0
diff --git a/dev-java/ant-junit4/Manifest b/dev-java/ant-junit4/Manifest
index 9055994cbb5a..afcbf9d2559d 100644
--- a/dev-java/ant-junit4/Manifest
+++ b/dev-java/ant-junit4/Manifest
@@ -4,7 +4,7 @@ DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd91583
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-junit4-1.10.5.ebuild 943 BLAKE2B c172559480a7a5ddfd4d18fe5488cae4b21a90a1f82e826500f0623f323e38c2321cf0ce85d25d9a0a63b8750f54c50d3fe7452876e839cffc322597ed8dcf28 SHA512 23cae253175022a51ed3862989034b49c209c2362852e9ac0bedbf6789eb4ab5931d90379291638026d314eeb068badda7fc29072650997c1ffd3d73f4a5eaf1
-EBUILD ant-junit4-1.9.13.ebuild 943 BLAKE2B c172559480a7a5ddfd4d18fe5488cae4b21a90a1f82e826500f0623f323e38c2321cf0ce85d25d9a0a63b8750f54c50d3fe7452876e839cffc322597ed8dcf28 SHA512 23cae253175022a51ed3862989034b49c209c2362852e9ac0bedbf6789eb4ab5931d90379291638026d314eeb068badda7fc29072650997c1ffd3d73f4a5eaf1
+EBUILD ant-junit4-1.10.5.ebuild 941 BLAKE2B 877d23a0a92aa57d334b4be1fc18094091e423c6fda7baf3c3526e9b8a9657c0b24179391574a7117e120b27c4bacef653e5a0672dc72850f9b266d08f15e8f0 SHA512 f76a9ca3b4dfda96e64a84727b4bb62873a5e002f46923689fe1eb056b99df10c5fd662a96c2cfe807d428bfff5b56b084980ba968594928c51720ce2550e046
+EBUILD ant-junit4-1.9.13.ebuild 941 BLAKE2B 877d23a0a92aa57d334b4be1fc18094091e423c6fda7baf3c3526e9b8a9657c0b24179391574a7117e120b27c4bacef653e5a0672dc72850f9b266d08f15e8f0 SHA512 f76a9ca3b4dfda96e64a84727b4bb62873a5e002f46923689fe1eb056b99df10c5fd662a96c2cfe807d428bfff5b56b084980ba968594928c51720ce2550e046
 EBUILD ant-junit4-1.9.2.ebuild 892 BLAKE2B a86fbea1362673fa5a870d99aeda048af324cdd17378d544c26407d156ba4a95153711e6a640c484aca4920e12237e3a3ce79e5ee0ab01e331fd036ef2ba9149 SHA512 fb4d96d2c9f25d3be82aac963a73198f84fe98f0a517e131c604b3ad3b97f62ef517a3421fd947daa1dcab68e27c6d33a4647d51b875f3b1d90b1bdc93f62358
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junit4/ant-junit4-1.10.5.ebuild b/dev-java/ant-junit4/ant-junit4-1.10.5.ebuild
index fb52e9f07b75..cae67cdcb96b 100644
--- a/dev-java/ant-junit4/ant-junit4-1.10.5.ebuild
+++ b/dev-java/ant-junit4/ant-junit4-1.10.5.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="junit-4"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 DEPEND="dev-java/junit:4
 	~dev-java/ant-junit-${PV}"
diff --git a/dev-java/ant-junit4/ant-junit4-1.9.13.ebuild b/dev-java/ant-junit4/ant-junit4-1.9.13.ebuild
index fb52e9f07b75..cae67cdcb96b 100644
--- a/dev-java/ant-junit4/ant-junit4-1.9.13.ebuild
+++ b/dev-java/ant-junit4/ant-junit4-1.9.13.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="junit-4"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 DEPEND="dev-java/junit:4
 	~dev-java/ant-junit-${PV}"
diff --git a/dev-java/ant-junitlauncher/Manifest b/dev-java/ant-junitlauncher/Manifest
index e38ab3260f4d..cde676ce1701 100644
--- a/dev-java/ant-junitlauncher/Manifest
+++ b/dev-java/ant-junitlauncher/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
-EBUILD ant-junitlauncher-1.10.5.ebuild 350 BLAKE2B 16e87c18c3a79b188c95c804bada00168d22650ad79dc4d548bc2cf1a3188b50601fefc67a940ca198bdef4cb2d549ee179da6876ac652401831a5ce7ddbe45f SHA512 feb74430da2490e62b692a1a679f762ca97a99b2a8bdbbf7c879db31f61d8a2418d7260457be79095e7abc58d6423f096716e259092ca935d91f42ea2e45ad80
+EBUILD ant-junitlauncher-1.10.5.ebuild 348 BLAKE2B 2526a2fe9453bf79ff6f7180b3bca462ca07d402ba7471ccfb954474a306d8f8b149918dbe32e90f53942c6af0845766ffe5711e9d4ec7da96b32018c682f5da SHA512 2dd734c34de961019173140259a93f4ef943624b47a1f44ada01f2382d45b946d222611b5d1ab7a7058486845d90a702d41bfa4ac79f81a96d928b8f80ffbc6e
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.5.ebuild b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.5.ebuild
index 5ab771362188..50105248a95d 100644
--- a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.5.ebuild
+++ b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.5.ebuild
@@ -9,4 +9,4 @@ ANT_TASK_DEPNAME=""
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-swing/Manifest b/dev-java/ant-swing/Manifest
index cb7c157df648..d43425085c6c 100644
--- a/dev-java/ant-swing/Manifest
+++ b/dev-java/ant-swing/Manifest
@@ -4,7 +4,7 @@ DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd91583
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-swing-1.10.5.ebuild 416 BLAKE2B 2cc4fbf80449b44c8bd7b5c96cd81f2eb27e57243b0b2266aa444572e80d9cc71d648a531c9a863a960473728bcbcb380844b462ffce7a6115e2de03977e095f SHA512 535d2734973dbe13615d2aa732564fee11f10b07b2a82064f60d413e67b88c28a860b0398d3664f69b7188b54ca389867b2ab8476b3a5f9b4a22496fe5d542c1
-EBUILD ant-swing-1.9.13.ebuild 416 BLAKE2B 2cc4fbf80449b44c8bd7b5c96cd81f2eb27e57243b0b2266aa444572e80d9cc71d648a531c9a863a960473728bcbcb380844b462ffce7a6115e2de03977e095f SHA512 535d2734973dbe13615d2aa732564fee11f10b07b2a82064f60d413e67b88c28a860b0398d3664f69b7188b54ca389867b2ab8476b3a5f9b4a22496fe5d542c1
+EBUILD ant-swing-1.10.5.ebuild 414 BLAKE2B 05479d9168fd6506319c9f2d09f7c4032a370c89d1d8c0ae48d4a98d31ec7c55aa7ad917f3790a2fc9f968445307b59f526aa5e27fd9cba5247e026adf4776db SHA512 3cc01191071678d90f999ec97ba24bb0cdd48afeb6f6b6a5fddc35b6ed66a39aef392f8e785d970efaf94521a1bc67d53910adce30398a722cac1296163366f3
+EBUILD ant-swing-1.9.13.ebuild 414 BLAKE2B 05479d9168fd6506319c9f2d09f7c4032a370c89d1d8c0ae48d4a98d31ec7c55aa7ad917f3790a2fc9f968445307b59f526aa5e27fd9cba5247e026adf4776db SHA512 3cc01191071678d90f999ec97ba24bb0cdd48afeb6f6b6a5fddc35b6ed66a39aef392f8e785d970efaf94521a1bc67d53910adce30398a722cac1296163366f3
 EBUILD ant-swing-1.9.2.ebuild 378 BLAKE2B 929e21c190b22bf1a2208d257a1d869fea004c18c1744c20868ea5b217a8ccdae554d4d191825b43574c2ca51ca97aedc0d9cff5b10ddf26e8cde9650c09f8ea SHA512 1ffdf04554b7dfcaf301e28f8c39ad73701ec7c8348a4dae57c0f39183a8a044a51a363d9645ab0815ed4b0c0a9a7e294ae4c16acca25597f43d4ffc6de8f177
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-swing/ant-swing-1.10.5.ebuild b/dev-java/ant-swing/ant-swing-1.10.5.ebuild
index 9de5fd723213..2190d771f78d 100644
--- a/dev-java/ant-swing/ant-swing-1.10.5.ebuild
+++ b/dev-java/ant-swing/ant-swing-1.10.5.ebuild
@@ -12,4 +12,4 @@ inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for Swing"
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-swing/ant-swing-1.9.13.ebuild b/dev-java/ant-swing/ant-swing-1.9.13.ebuild
index 9de5fd723213..2190d771f78d 100644
--- a/dev-java/ant-swing/ant-swing-1.9.13.ebuild
+++ b/dev-java/ant-swing/ant-swing-1.9.13.ebuild
@@ -12,4 +12,4 @@ inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for Swing"
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-testutil/Manifest b/dev-java/ant-testutil/Manifest
index b268703e29e6..c9c3bbfca530 100644
--- a/dev-java/ant-testutil/Manifest
+++ b/dev-java/ant-testutil/Manifest
@@ -4,7 +4,7 @@ DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd91583
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-testutil-1.10.5.ebuild 918 BLAKE2B c42070be0d757c00aeb89c9e6acabfd3204d5d7278c555f14dcb7e4978e0997e0708993baeb8815d7b21b78b27c769503e1351fa7127fa39b81b16c6132488f2 SHA512 d2f4f979ef213a674d399ce6b33d14e5456addb44aaa18548673a7ef618eadbb8781525b96100332eadeefb5b47975463e88b8eb1c5ab290cd5a18360cb7d59e
-EBUILD ant-testutil-1.9.13.ebuild 918 BLAKE2B c42070be0d757c00aeb89c9e6acabfd3204d5d7278c555f14dcb7e4978e0997e0708993baeb8815d7b21b78b27c769503e1351fa7127fa39b81b16c6132488f2 SHA512 d2f4f979ef213a674d399ce6b33d14e5456addb44aaa18548673a7ef618eadbb8781525b96100332eadeefb5b47975463e88b8eb1c5ab290cd5a18360cb7d59e
+EBUILD ant-testutil-1.10.5.ebuild 916 BLAKE2B a9394391ccebde8ebc0ceec78682e5ca7359c1775a44e6d24247ca6ab96fe5e04f5aaf476876991d775967e5ce50983cea1fc8be76dc734695a36376e3065f99 SHA512 6302409876c168b14ab71c766edcbcb78401b4b9bc0e46dc9c99655f38c1884dbd4b7419792daf15a9c1e6c4aa39f312b8da81399b6a930aad5be8233bce9c0d
+EBUILD ant-testutil-1.9.13.ebuild 916 BLAKE2B a9394391ccebde8ebc0ceec78682e5ca7359c1775a44e6d24247ca6ab96fe5e04f5aaf476876991d775967e5ce50983cea1fc8be76dc734695a36376e3065f99 SHA512 6302409876c168b14ab71c766edcbcb78401b4b9bc0e46dc9c99655f38c1884dbd4b7419792daf15a9c1e6c4aa39f312b8da81399b6a930aad5be8233bce9c0d
 EBUILD ant-testutil-1.9.2.ebuild 879 BLAKE2B b5d43761171505f960122afe17265f0d76e2c336a00510daa726adb31efba3586389a924acd37cdaa26cdfe6ef788b67c35de0ce972fded71e9fc3e56bdab346 SHA512 35fbd1785a5d1ed76bf8cb78b90d67fdb1eca04fab19f45fa04e2d2e80993ed2432d8ef1198f1bb0464691169bf76748cdd7c2ae862e48e80d3173617e9b9739
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-testutil/ant-testutil-1.10.5.ebuild b/dev-java/ant-testutil/ant-testutil-1.10.5.ebuild
index c29ef4f5b6f0..d440e0a4eaa3 100644
--- a/dev-java/ant-testutil/ant-testutil-1.10.5.ebuild
+++ b/dev-java/ant-testutil/ant-testutil-1.10.5.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_JREVER=1.8
 inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND="dev-java/ant-core:0"
 
diff --git a/dev-java/ant-testutil/ant-testutil-1.9.13.ebuild b/dev-java/ant-testutil/ant-testutil-1.9.13.ebuild
index c29ef4f5b6f0..d440e0a4eaa3 100644
--- a/dev-java/ant-testutil/ant-testutil-1.9.13.ebuild
+++ b/dev-java/ant-testutil/ant-testutil-1.9.13.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_JREVER=1.8
 inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND="dev-java/ant-core:0"
 
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 99b523216c45..c28361098206 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,5 +1,7 @@
 DIST gradle-3.3-all.zip 91388147 BLAKE2B 15539ec06cadcdaee9d54928381d5626bf06bae3251eb304fee095e6d0362f23759e99e3841dac2b9a1eed50b6057ecce78230dafb45711bfe764bf107b1f704 SHA512 4b852eaf4030c780516fe9214c289e49fc93fc62672da70b7fd6bbbcd128e6912dd196195ce32570984503ea53b48593a41fbf4ec69b0f18b5e32c2fe9e556b3
 DIST gradle-3.4.1-all.zip 91604607 BLAKE2B 1c4aaae4899f3faa94fc3ead84c4fd4bdb6212c0f579a255c7494896fd2a498890c58e853315892c3c9d78635b58da5423b1b2211b991639474d19eca1f2992f SHA512 bdaabf747e60ae1cf2c9fedb0730a2e3deb914609db05ffc7e4cbd5402bc44e84d2c98154f14fdd7f944c2f49eb5dead0f44c119ac5a16bd7491c3369d784f5c
+DIST gradle-bin-5.2.1.zip 132549774 BLAKE2B c6d6fa9975bc28030672a99f22f0e9c4c2cb3d667ae3658c1062428d0ab2fd8c3b4df0479f4fde7b2d75b8fcb64c7f5b208e53c5b30a9b3c7afb5ad7e1a4139d SHA512 e2a17072c10d27acbe4a0282dfdfed907ab5c57109668595feaec681ab1d4be017ac0f6090c2c2b64a057d71c1e244bb50f4047509d36c5930e894837a96171b
 EBUILD gradle-bin-3.3.ebuild 1012 BLAKE2B 88db4b90f690e935665f3bcf06a292765ffaa72781fb14be7ee3f64a3f1b8b9dcb6184c8138419d14bc5f9af2ebebf12707582bb8765c33c4e5f37de67e8638e SHA512 a0a9d78d5fa7104f7a720ff7f8125d3b7b81fcfbc481f65c0a6e31fb97e7fcb50ec3b14c40e0262179a9f8175ff2726c2b051284662a7f4251e6f3babb5400f8
 EBUILD gradle-bin-3.4.1.ebuild 1020 BLAKE2B f388743943ab861566d3880d95df439f469b68c975085b167edc5fb99b214a165ecb1399dc5d61fc36d74371471af905f3276f6f14efc60eb8bb35ee164fd23d SHA512 0df5a41dd5f941a4b8058125fbfaed550b900ded90767a5252a236af7477ff5939ce7cc77cd1e171c311305c88b7664a4fcd9d615e43376750d298292a138d9c
+EBUILD gradle-bin-5.2.1.ebuild 1052 BLAKE2B 6abb286cfd8165ada2c79e7be5527390ee4e0c7538230a738e406dc53eda5f45d8601681eeec2b9838837e527f581a0a3d0c02c8a73cdd1e6131d3b68e4eb90c SHA512 d6fbf5b75afbef0aa997217dcc9dc2f9862d35e50b7d83a103ed76d5cefd0f7570223ba03bc988481863c995acda04cb1aa499bdbfb90b32326dec58716c14cd
 MISC metadata.xml 435 BLAKE2B 22a7527b15ef2974a3e389977eb4056c03f7575ec9866848b90ef9e98bb7d2d645e83408f0ab4cbb139699757e7e3a1b5eb458a389563597ae3fa0ff5c310c0b SHA512 2a8b7c438d8aed952350c0a08660bde349363bb80794de9197c7ac107409021c1e38f0168e13213d730c6251ed9e39f644c42d6de050f0e58e862efaa46b2a43
diff --git a/dev-java/gradle-bin/gradle-bin-5.2.1.ebuild b/dev-java/gradle-bin/gradle-bin-5.2.1.ebuild
new file mode 100644
index 000000000000..0f029927d1f2
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-5.2.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+IUSE="source doc examples"
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
+HOMEPAGE="http://www.gradle.org/"
+
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/jdk-1.6"
+
+DEPEND="
+	app-arch/zip
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}"
+
+	dodoc docs/release-notes.html getting-started.html
+
+	insinto "${gradle_dir}"
+
+	# source
+	if use source ; then
+		java-pkg_dosrc src/*
+	fi
+
+	# docs
+	if use doc ; then
+		java-pkg_dojavadoc docs/javadoc
+	fi
+
+	# examples
+	if use examples ; then
+		java-pkg_doexamples samples
+	fi
+
+	insinto "${gradle_dir}"
+	doins -r bin/ lib/
+	fperms 755 "${gradle_dir}/bin/gradle"
+	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}"
+}
diff --git a/dev-java/jcs/Manifest b/dev-java/jcs/Manifest
deleted file mode 100644
index fe4f88c844ae..000000000000
--- a/dev-java/jcs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX jcs-2.0-build.xml 16360 BLAKE2B b7243d8bcc5aade6b9b609298d1f552f0fad8bf3f9dd0edf3cadea376dc9543579d45d3a813886c51872d6aac501b4cbeeea8c3d4700e2e1f0017449e595c6ba SHA512 8b11500fb24f7166475b3bb37b210884d8203bb73879649bcbeb4f892059c16bc20a9871b7d306c119efa7033e91a64ee77c5244a2adb460c4d63473de0f9b33
-DIST commons-jcs-dist-2.0-beta-1-src.tar.gz 825048 BLAKE2B e99ed509d790e600bed762358f1f52779daec1a1dc2b6245ed9a39660400be0cea8546f02e6478bfeefdd2476409efeeed012cba705eeb0f71a31668f242284a SHA512 56d68807de6d47debc893584a738bc797c2a150503ae460dc1444e9434b438926f6ad9fe8c1292250f6a0b2936210084cbd512083b5a8cc4f20e692b759a314f
-EBUILD jcs-2.0.ebuild 2482 BLAKE2B 44cec6d92defa8f83cfaecb2a2dc3b2217b011ec4f2e4e150c5345cf60ab4aabc13be345b2ef65c6127ae365b58af3ed48100b49a05202d869e1a510071b4423 SHA512 b6134c8f7af9b2ab8a5194028f92b46ffbe30c2baa472bfe2df558d87e79a8d23ba58277a8823e67805780dfa3ef6b67e8a3e51d1869d37548e1217683b26008
-MISC metadata.xml 315 BLAKE2B 1b2549bc29a6fc50390237d4f2bc151e8ad3a7096fd5697eb96b9902fa50bf3a2a9c619a8941dc2189292a0d690157fb1a106ebf8771d47a7b12e26fe121b30a SHA512 d9bd0e859afd4cf87e40f48facb8fc28df61d841277eec0df36d3173ec6b10af0017bd7eae5b0b31bb4ec16f051a24b64bc45b27cf22c720f2a6fcbb4add21de
diff --git a/dev-java/jcs/files/jcs-2.0-build.xml b/dev-java/jcs/files/jcs-2.0-build.xml
deleted file mode 100644
index 04c4dae81729..000000000000
--- a/dev-java/jcs/files/jcs-2.0-build.xml
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 6/14/15 12:02 AM                      -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="commons-jcs-core-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="commons-jcs-core-2.0-beta-1"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/test-conf"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar"/>
-    <pathelement location="${maven.repo.local}/commons-pool/commons-pool/1.6/commons-pool-1.6.jar"/>
-    <pathelement location="${maven.repo.local}/hsqldb/hsqldb/1.8.0.10/hsqldb-1.8.0.10.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar"/>
-    <pathelement location="${maven.repo.local}/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
-    <pathelement location="${maven.repo.local}/commons-digester/commons-digester/1.8/commons-digester-1.8.jar"/>
-    <pathelement location="${maven.repo.local}/commons-chain/commons-chain/1.1/commons-chain-1.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
-    <pathelement location="${maven.repo.local}/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar"/>
-    <pathelement location="${maven.repo.local}/dom4j/dom4j/1.1/dom4j-1.1.jar"/>
-    <pathelement location="${maven.repo.local}/oro/oro/2.0.8/oro-2.0.8.jar"/>
-    <pathelement location="${maven.repo.local}/sslext/sslext/1.2-0/sslext-1.2-0.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar"/>
-    <pathelement location="${maven.repo.local}/antlr/antlr/2.7.2/antlr-2.7.2.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/velocity/velocity/1.6.2/velocity-1.6.2.jar"/>
-    <pathelement location="${maven.repo.local}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"/>
-    <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar"/>
-    <pathelement location="${maven.repo.local}/commons-pool/commons-pool/1.6/commons-pool-1.6.jar"/>
-    <pathelement location="${maven.repo.local}/hsqldb/hsqldb/1.8.0.10/hsqldb-1.8.0.10.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/commons/commons-collections4/4.0/commons-collections4-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
-    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
-    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.jar"/>
-    <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar"/>
-    <pathelement location="${maven.repo.local}/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
-    <pathelement location="${maven.repo.local}/commons-digester/commons-digester/1.8/commons-digester-1.8.jar"/>
-    <pathelement location="${maven.repo.local}/commons-chain/commons-chain/1.1/commons-chain-1.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
-    <pathelement location="${maven.repo.local}/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar"/>
-    <pathelement location="${maven.repo.local}/dom4j/dom4j/1.1/dom4j-1.1.jar"/>
-    <pathelement location="${maven.repo.local}/oro/oro/2.0.8/oro-2.0.8.jar"/>
-    <pathelement location="${maven.repo.local}/sslext/sslext/1.2-0/sslext-1.2-0.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar"/>
-    <pathelement location="${maven.repo.local}/antlr/antlr/2.7.2/antlr-2.7.2.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/velocity/velocity/1.6.2/velocity-1.6.2.jar"/>
-    <pathelement location="${maven.repo.local}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"/>
-    <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <mkdir dir="${maven.build.outputDir}//var/tmp/portage/dev-java/jcs-2.0/work/commons-jcs-dist-2.0-beta-1-src/commons-jcs-core/target/classes"/>
-    <copy todir="${maven.build.outputDir}//var/tmp/portage/dev-java/jcs-2.0/work/commons-jcs-dist-2.0-beta-1-src/commons-jcs-core/target/classes">
-      <fileset dir="${maven.build.resourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}">
-        <include name="**/*.properties"/>
-        <include name="**/*.ccf"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/*UnitTest.java"/>
-          <exclude name="**/BlockDiskElementDescriptorUnitTest.java"/>
-          <exclude name="**/HSQLDiskCacheConcurrentUnitTest.java"/>
-          <exclude name="**/HSQLDiskCacheUnitTest.java"/>
-          <exclude name="**/IndexedDiskCacheOptimizationUnitTest.java"/>
-          <exclude name="**/TestTCPLateralUnitTest.java"/>
-          <exclude name="**/UDPDiscoveryUnitTest.java"/>
-          <exclude name="**/UDPDiscoverySenderUnitTest.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/BlockDiskElementDescriptorUnitTest.java"/>
-          <exclude name="**/HSQLDiskCacheConcurrentUnitTest.java"/>
-          <exclude name="**/HSQLDiskCacheUnitTest.java"/>
-          <exclude name="**/IndexedDiskCacheOptimizationUnitTest.java"/>
-          <exclude name="**/TestTCPLateralUnitTest.java"/>
-          <exclude name="**/UDPDiscoveryUnitTest.java"/>
-          <exclude name="**/UDPDiscoverySenderUnitTest.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             encoding="UTF-8" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             docencoding="UTF-8" 
-             source="1.6" 
-             linksource="true" 
-             breakiterator="false">
-      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
-      <link href="http://docs.oracle.com/javaee/6/api/"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-      <manifest>
-        <attribute name="Main-Class" value="Main"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-</project>
diff --git a/dev-java/jcs/jcs-2.0.ebuild b/dev-java/jcs/jcs-2.0.ebuild
deleted file mode 100644
index f79f0dded211..000000000000
--- a/dev-java/jcs/jcs-2.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="test doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="commons-${PN}-dist-${PV}-beta-1-src"
-JCS_CORE="commons-${PN}-core"
-
-DESCRIPTION="A distributed caching system for server-side Java applications"
-HOMEPAGE="http://commons.apache.org/jcs/"
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/commons/${PN}/source/commons-${PN}-dist-${PV}-beta-1-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.0"
-KEYWORDS="amd64 x86"
-IUSE="admin"
-
-CDEPEND="dev-java/jisp:2.5
-	dev-db/hsqldb:0
-	dev-java/log4j:0
-	dev-java/xmlrpc:3
-	dev-java/commons-lang:0
-	dev-java/commons-dbcp:0
-	dev-java/commons-pool:0
-	dev-java/commons-logging:0
-	dev-java/commons-httpclient:3
-	java-virtuals/servlet-api:3.0"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	test? ( dev-java/ant-junit:0 )
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
-	xmlrpc-3
-	hsqldb
-	jisp-2.5
-	log4j
-	commons-lang
-	commons-pool
-	commons-dbcp
-	commons-logging
-	commons-httpclient-3
-	servlet-api-3.0
-"
-
-EANT_BUILD_XML="${JCS_CORE}/build.xml"
-EANT_BUILD_TARGET="package"
-
-java_prepare() {
-	cp "${FILESDIR}/${P}-build.xml" ${JCS_CORE}/build.xml
-
-	# Disable the velocity-tools dep.
-	rm -v \
-		${JCS_CORE}/src/main/java/org/apache/commons/jcs/admin/servlet/JCSAdminServlet.java
-
-	if use test; then
-		# Make use of commons-collections4 not yet packaged in Gentoo
-		rm -v \
-			"${JCS_CORE}"/src/test/java/org/apache/commons/jcs/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java \
-			"${JCS_CORE}"/src/test/java/org/apache/commons/jcs/utils/struct/LRUMapPerformanceTest.java
-
-		# Fails for some reason.
-		rm -v \
-			"${JCS_CORE}"/src/test/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCacheUnitTest.java \
-			"${JCS_CORE}"/src/test/java/org/apache/commons/jcs/auxiliary/disk/LRUMapJCSUnitTest.java \
-			"${JCS_CORE}"/src/test/java/org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLoggerUnitTest.java \
-			"${JCS_CORE}"/src/test/java/org/apache/commons/jcs/utils/struct/DoubleLinkedListUnitTest.java
-	fi
-}
-
-EANT_TEST_TARGET="test"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local target="${JCS_CORE}"/target
-	java-pkg_newjar "${target}"/"${JCS_CORE}-${PV}"-beta-1.jar "${JCS_CORE}".jar
-
-	if use doc; then
-		java-pkg_dojavadoc "${target}"/site/apidocs
-	fi
-
-	if use source; then
-		java-pkg_dosrc "${JCS_CORE}"/src
-	fi
-}
diff --git a/dev-java/jcs/metadata.xml b/dev-java/jcs/metadata.xml
deleted file mode 100644
index 4946ed2f4b77..000000000000
--- a/dev-java/jcs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <use>
-    <flag name="admin">Enable JCS Admin servlets</flag>
-  </use>
-</pkgmetadata>
diff --git a/dev-java/jvyamlb/Manifest b/dev-java/jvyamlb/Manifest
index 96efefa3eedb..98df65ae22a0 100644
--- a/dev-java/jvyamlb/Manifest
+++ b/dev-java/jvyamlb/Manifest
@@ -1,3 +1,3 @@
-DIST jvyamlb-src-0.2.5.tar.gz 1767828 BLAKE2B d87a31ce4cbba1ad039afaa067b0430d488abe5ed82fa53a14b4971c236e6ed77bcc652bdca4e9ff2d465d9468927f1dd5113bb44c63abba80caf50b272c60d1 SHA512 1e853ff957b888d706a4d264aac4573cf4aced02604e2679d5871f3a92c016136a7fb73adf5d5c0be0cea9f28b4bc6faf11abc0334fe2f96a251a7d9cc228711
-EBUILD jvyamlb-0.2.5.ebuild 1010 BLAKE2B 1145d98a1e70ffb4aaea1112750834a711d9f0a3b8378fb4fa94d7e18e9adddb5219a9b9ba9faff9ec3ef20df46308d70e0a03f78be5f01cf7747d1227b47734 SHA512 d3dd95121a759a52c3759283147f5d9c7a4f87ee9f2a0d6599fdfc4a020450c8da87fc89ee4c1a0867cff2ecc93a16719e9d5332b22ddcadd1c9231484903a94
+DIST jvyamlb-0.2.5.tar.gz 526052 BLAKE2B 8b55748eb4e9b03b1e5ca78fd41145456d1329a3edb0a7d02c6b5e37a15c4a25e93cae9337ee9aeedb6611ee87ba09157e00ef4a55ed4a8202f8282e287b56dc SHA512 28d707255ca7447ad00f29bf1215e28fa485557e76795c47cbf309a5b1b97ba4c901ddc7b1507d06301b4f544bfc437c4926f457516832f953aff6b29b01b711
+EBUILD jvyamlb-0.2.5-r1.ebuild 999 BLAKE2B 58a96151c0bc23787b38f85c87b35d831966e8fe296a7af59508bb3db7bce0fd9e334f0904cbb0fb0c2f44058e6a91a3cb641802cc3df240cf8fc1e55402465c SHA512 09924482c7eee018c1da3001e163e3b37f1ffa246cfff209bff761fb1d735df18e607c9b665117c21364605e41f29444bb7688ed87650c91aa3ec77c9643298d
 MISC metadata.xml 348 BLAKE2B 82f0d57c39dbdc2501bffc728986883387457858b9f044ed924efbe526a7ea282d872001695a7050b99c44707ac956d66e086426b98a071501c2a286c1299df8 SHA512 50cc0581097381b62f98172a0c876c5835dbcad92e6c1f966bcb2bf48614d9768a4577a511e49f83c3f9ed1679adf708ef709c1aecba40b5abb69626cd906e22
diff --git a/dev-java/jvyamlb/jvyamlb-0.2.5.ebuild b/dev-java/jvyamlb/jvyamlb-0.2.5-r1.ebuild
index 89d7ee44b2de..9a0b11e6951e 100644
--- a/dev-java/jvyamlb/jvyamlb-0.2.5.ebuild
+++ b/dev-java/jvyamlb/jvyamlb-0.2.5-r1.ebuild
@@ -1,43 +1,49 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 JAVA_PKG_IUSE="source test"
+
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="JvYAMLb, YAML processor extracted from JRuby"
 HOMEPAGE="https://github.com/olabini/jvyamlb"
-SRC_URI="https://jvyamlb.googlecode.com/files/jvyamlb-src-${PV}.tar.gz"
+SRC_URI="https://github.com/olabini/jvyamlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
 
-CDEPEND="dev-java/bytelist:0
+CDEPEND="
+	dev-java/bytelist:0
 	dev-java/jcodings:0
 	dev-java/joda-time:0"
 
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
 
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/ant-junit )
-	${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.4
+	test? ( dev-java/ant-junit )"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
 EANT_GENTOO_CLASSPATH="bytelist jcodings joda-time"
 
-java_prepare() {
-	rm -fv lib/*.jar || die
+DOCS=( CREDITS README )
+
+src_prepare() {
+	default
+
+	java-pkg_clean
 
-	# Don't do tests unnecessarily.
-	sed -i 's:depends="test":depends="compile":' build.xml
+	sed -i 's:depends="test":depends="compile":' build.xml || die
 }
 
 src_install() {
+	einstalldocs
 	java-pkg_newjar lib/${P}.jar
 	use source && java-pkg_dosrc src/*
-	dodoc CREDITS README || die
 }
 
 src_test() {
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 46e2bcccfc71..effa14aef06a 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -11,7 +11,7 @@ DIST openjdk-jaxws-8.202_p08.tar.bz2 2541554 BLAKE2B a92aae4290e1901b736a6a93aed
 DIST openjdk-jdk-8.202_p08.tar.bz2 46618401 BLAKE2B e73b1341b837a0983ded4b4969ce83f9b77283e1d4d51e8d31a1b7401961a0b78943a41d2fe0aa724d85ac93dc3082511bcea341e87daecd070278ae59c8f240 SHA512 20e6747b506091383166298aeed6ff4ffd9deb92f20765ef839bf46d3ecae6b1aa218eb6857e6541df0522b8d571379341e94eb5bef765a1164cf9f59b20dfac
 DIST openjdk-langtools-8.202_p08.tar.bz2 2392880 BLAKE2B 45ebebe4864e3274e14cf27986cd96facfe2f8e5c1292344e05743d1448f95367caf0f68886c506ce10435fbf53948c6b9f7087ad5d2cd090cf0f1becb962843 SHA512 a1e1c3dc06b3a58082e1d67d58ffeaf0bc3c5534fd1ba368e835a54d3c6ba9232e277ae685ed3ff5ccdf3cd7fe0612ad78a08ed55d1d2d06de54914a19377907
 DIST openjdk-nashorn-8.202_p08.tar.bz2 2854026 BLAKE2B 05ba828160270e52f27023db83b1ffc4e6611b7a74b300a93a6d476f319a265834b48c7de57b0d3bea502d88279e72fd9cfbc5f3eb0e719650e34e82ba4a3d09 SHA512 bea0eaa4b2247cf1e5ee33613754c8f2f6ffe074a7be562f26e63c6327f56d67f60d4877dd363ed8a812689db1d837f5c257637460e247a1592c3258f3add11b
-EBUILD openjdk-11.0.1_p13.ebuild 6474 BLAKE2B 64d2e9bc2ce703e71d3e29ddae4543130449bb39e4349def19536526c3cd80a013211d808faded8ca4a8f049c76b23ba57d6a9590a086f009da1af2ead95279a SHA512 4f5c2683e44e34e0128cafdeb449f518aa470259ef5884666c71f945ca9dd1c8523d4f1ebeb2e29e2976980c8178d3ce02548ab91bef8751e36360c28fe2cfa3
-EBUILD openjdk-11.0.2_p7.ebuild 5910 BLAKE2B 039016a44aa9a0c9305a0b7529e00c05f3d63c6bad34abfe1060884080719ff83d6f0e0dc3324bdc72a1afff142e0ff9b358c2a07385d1e7b69c7a049283ca7f SHA512 15abdae2f6e668b4a50807b86c3aecab4471439fb598e5c67fb06055ab961581a97d15993def0e9e6bf83765c08117f2db1caf7feedca360e77e96b8ff17daf7
-EBUILD openjdk-8.202_p08.ebuild 7011 BLAKE2B a989c6ba3c8c012d0bb4e999782a093f49bad699b4eae5fec96ec0dfd17b1d6e06b1f4f46692c7a36eb8b1f01a2ce4a8eb2d9f3c07de421352f93e26205cd752 SHA512 ed08f0f6fd1f08c0ee915b13f488de51d989f69109018b0b4dff817c02936c5c9c98d05d95ff7174140079aae5d25c6b0eb8b171980281352ec39e7ed5b55c4d
+EBUILD openjdk-11.0.1_p13.ebuild 6488 BLAKE2B 9f076a7fbd2e725df8e8b3199601c2b7cd838f393126da37516059bcd8d7e0143a52f55375ebca729167db8ac4ee0384c2ac4d9daa8b71da5607c273eb82327e SHA512 4ca87aac3e979d506d8d360e94d110e3af3cbb130af535d80f4fff56bf87a15e7e7e16bedd94022732c08d6911cf683be671c80e630a20e50330a15046d93fd2
+EBUILD openjdk-11.0.2_p7.ebuild 5902 BLAKE2B f1cc664b678083e0562941837947798c92a64c4e00d16c3f9463877b68b3f18516e747a2f176cb12275e6efee5bb751aaedaf32f24057d4ac972db442f68afda SHA512 d4b49df6be291a6876ea04115909806e16102de96bbbe9d3e614c1ba7ff136e3062c73a9f464d1ad35a34efab4a82f1ed11514767e56febcbc5f49f86d390d9d
+EBUILD openjdk-8.202_p08.ebuild 7003 BLAKE2B fccd42572ae7712c351644e6d775f085332aa98942e219f84c305b2e98a11e44ec2710480265197fa86967811c591beaead55dadb010a8ef3cb34a4ddedcfc92 SHA512 3a82fdb3d01c01f45e8b10648475a692fa463496a575e42c3b0a4e809f074e1d0ecde0bc6a06f78350e6ebefe8c1c9f89ab5a39ae7cea6b499ec697985febe35
 MISC metadata.xml 1053 BLAKE2B bc7d07c481cee341f2778eef806dae3484592c5c8ca8e015ab4cca6dc64b8d225e1eff1f03f9c7b4d06751282e566624644348eece51dbb03a603b960b6ed84d SHA512 4a749d32cf21c2a517558c2e06ed9e5cd2470db8ba758847f727a8da82252a209e00c3d23f8896d5fb99aeb4f07df8717764a2f52c81261050b88dc91b61dab7
diff --git a/dev-java/openjdk/openjdk-11.0.1_p13.ebuild b/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
index efa3a3ed2de5..b73dc4da11b7 100644
--- a/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
@@ -159,7 +159,7 @@ src_configure() {
 	# graphviz are detected. pandoc has loads of dependencies anyway.
 
 	(
-		unset JAVA JAVAC XARGS
+		unset _JAVA_OPTIONS JAVA JAVAC XARGS
 		CFLAGS= CXXFLAGS= LDFLAGS= \
 		CONFIG_SITE=/dev/null \
 		econf \
diff --git a/dev-java/openjdk/openjdk-11.0.2_p7.ebuild b/dev-java/openjdk/openjdk-11.0.2_p7.ebuild
index 1f86bff0e40a..b03e8a2da400 100644
--- a/dev-java/openjdk/openjdk-11.0.2_p7.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.2_p7.ebuild
@@ -108,7 +108,6 @@ pkg_setup() {
 		JDK_HOME=${JDK_HOME#*/}
 		JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
 		export JDK_HOME
-		unset _JAVA_OPTIONS
 	fi
 }
 
@@ -150,7 +149,7 @@ src_configure() {
 	fi
 
 	(
-		unset JAVA JAVAC XARGS
+		unset _JAVA_OPTIONS JAVA JAVAC XARGS
 		CFLAGS= CXXFLAGS= LDFLAGS= \
 		CONFIG_SITE=/dev/null \
 		econf "${myconf[@]}"
diff --git a/dev-java/openjdk/openjdk-8.202_p08.ebuild b/dev-java/openjdk/openjdk-8.202_p08.ebuild
index fd7a5d675a45..65196b1e29d7 100644
--- a/dev-java/openjdk/openjdk-8.202_p08.ebuild
+++ b/dev-java/openjdk/openjdk-8.202_p08.ebuild
@@ -123,7 +123,6 @@ pkg_setup() {
 		JDK_HOME=${JDK_HOME#*/}
 		JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
 		export JDK_HOME
-		unset _JAVA_OPTIONS
 	fi
 }
 
@@ -172,7 +171,7 @@ src_configure() {
 	fi
 
 	(
-		unset JAVA JAVAC XARGS
+		unset _JAVA_OPTIONS JAVA JAVAC XARGS
 		CFLAGS= CXXFLAGS= LDFLAGS= \
 		CONFIG_SITE=/dev/null \
 		econf "${myconf[@]}"
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 9a7a7d615174..fa9cb8f33369 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -10,6 +10,6 @@ EBUILD protobuf-java-3.5.2.ebuild 1814 BLAKE2B fd690cc2a8ecbf5d568ea3d20cd5c494d
 EBUILD protobuf-java-3.6.0.1.ebuild 1112 BLAKE2B ed95623a91d20e3c8e2ecbb69c8c52421441c0eed3a3f36bcf84486b98cc67cccab53da1f83f3299b071cd0332f59461af952d29be82dd9f65d58fb68ab47ef7 SHA512 2746cfa9ac7a844aac943cf6ea5e0b09b5544f0be8a2ef46bdd9d46a3e8261892d0cd153e668bffd5b7babe31601ec3338c81f79de3788353f48921ae2890f2b
 EBUILD protobuf-java-3.6.1.1.ebuild 1112 BLAKE2B c2196e26d93a7a1572195f6dec8e2a71fb5791aa1133a43385020a2d7276021479319ef8cd5ec195eb8ca054f797ee83284fbb7b94c702d30cafacf8f529569b SHA512 0c2943558095fb4b4dfb63612c6cdf7cd5b535a9590701cb83de83e971128dd772814adf51de9065dec5408fa60f9f8883d92cccade30c42abd6ac91afc5f680
 EBUILD protobuf-java-3.6.1.2.ebuild 1112 BLAKE2B c2196e26d93a7a1572195f6dec8e2a71fb5791aa1133a43385020a2d7276021479319ef8cd5ec195eb8ca054f797ee83284fbb7b94c702d30cafacf8f529569b SHA512 0c2943558095fb4b4dfb63612c6cdf7cd5b535a9590701cb83de83e971128dd772814adf51de9065dec5408fa60f9f8883d92cccade30c42abd6ac91afc5f680
-EBUILD protobuf-java-3.6.1.3.ebuild 1112 BLAKE2B c2196e26d93a7a1572195f6dec8e2a71fb5791aa1133a43385020a2d7276021479319ef8cd5ec195eb8ca054f797ee83284fbb7b94c702d30cafacf8f529569b SHA512 0c2943558095fb4b4dfb63612c6cdf7cd5b535a9590701cb83de83e971128dd772814adf51de9065dec5408fa60f9f8883d92cccade30c42abd6ac91afc5f680
+EBUILD protobuf-java-3.6.1.3.ebuild 1109 BLAKE2B d76e82ea1872d9c8d3a7cee220e243a424d5352dea09962435d487282c88157d937f89eb07e214f3a0bb62abdaab7afe88572cc4a00decc67e03ca13b6da4673 SHA512 8504a8fead79fe649cfd0d8bb63fe44c30e7f68c5fa8d0f3546a55460dc3e78fbd63f636b4f02269455159f471ead4a86d96431beb7d131c11c211b5b02d1e0a
 EBUILD protobuf-java-3.6.1.ebuild 1109 BLAKE2B bd8fb8e90a5f6386f16a9d98351b30e34b3307d323565fa016b22d69285cea18495f4fb29c6ec7bd4052bab2cd5d7af82219209e36a7303de55ca92cba1797cf SHA512 cc09ccf03e073edd2c7ec711f3e4c55afe7dae532ee94916f9f4319c3c9b019c49b42f8ae5c43c2de6ea11dfe3ea34fc5f7c96a2bc66f3d7b02ce1bc7749ec32
 MISC metadata.xml 805 BLAKE2B d90fd4afcd89ea87b592be42fa34d1279f2fc28b24c3891c2065b909b197927014c3e96d6cc88797b5cb9ccb087efdb2f3b31bb436bde3e7d6858cdacb714c3e SHA512 4bbb4b673edf832e0e5bd985d3d11e813d8512c31e79441c8b0321b4d40f89bf0a15b5bbcf12f3ef9294fa831c35b7dc518be1a86b2fb87eab173a6b2bccf476
diff --git a/dev-java/protobuf-java/protobuf-java-3.6.1.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.6.1.3.ebuild
index 21b22d791b71..c2172fa14a11 100644
--- a/dev-java/protobuf-java/protobuf-java-3.6.1.3.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.6.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2018 Gentoo Authors
+# Copyright 2008-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> pr
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/sbt-bin/Manifest b/dev-java/sbt-bin/Manifest
index 840fcd6edfaa..1a0c9c8e6ebc 100644
--- a/dev-java/sbt-bin/Manifest
+++ b/dev-java/sbt-bin/Manifest
@@ -1,5 +1,7 @@
 DIST sbt-1.1.4.tgz 45858350 BLAKE2B 792b05bf9bf16968c6580f070e042395b13580c6137a6592ca66bc3b02df3b27676b49364db8c6d2ec259b22b09a7e7a2d364e940890be38a96ba079066c4fa2 SHA512 7b278ecd22d4778482c61ec2e9650c8dd199c341aaaa624fee6b7f8989203de3d4dac24c4181ee08f0da50c69901321a1e11a535f0911241c9f6bfdfab5e94b8
 DIST sbt-1.1.5.tgz 49603901 BLAKE2B b458600bec2610fd76e5ca21633738b6815bf6c3e2918814147c904b97ab80b972a15b31f555777d0aa7f2e4613eef9b109745476d0cd7166506573aa2a72873 SHA512 bb538d88ec5ee7bb08b5eed6e7e250c45ee25419952473e4f093391316f936b26cc181f21c7b3501b9126a5c1f21b10514adffea4f9a09f7920203ba6330c2d4
+DIST sbt-1.2.8.tgz 47179935 BLAKE2B f31dcf25168471cb7315d8dc8f168321098fbfbf985bcc5aa294ea95c6b65d299ee0f9b457d6dc3569eff6117f0fbf5fd51b37ca9294f7bcca2256f52e07b73f SHA512 e12d50de4481dc599b8e129b5caf86b4a6a42426612308f9c8dd791525b5ae325e65f1c1db479bdc00fed2421c108a0dcdd00585f90334446e2cef914484719a
 EBUILD sbt-bin-1.1.4.ebuild 860 BLAKE2B b17b66c3d6a2f845a87bba126f99050e9e3cd19dce5650d8d91968730bb79a471f0c2224eb7aeaad8df7ad6447974bfe982ce39071c647f50f3f37c9ab33d2e6 SHA512 31a2bf25148fcbf9e387f51c535dd18cba311181ddd01cb6aa19637bb6269e83f596c70fb3d4bdeedb6e7d1136886722cdc54112747f9c07d41098a9f72d43df
 EBUILD sbt-bin-1.1.5.ebuild 860 BLAKE2B b17b66c3d6a2f845a87bba126f99050e9e3cd19dce5650d8d91968730bb79a471f0c2224eb7aeaad8df7ad6447974bfe982ce39071c647f50f3f37c9ab33d2e6 SHA512 31a2bf25148fcbf9e387f51c535dd18cba311181ddd01cb6aa19637bb6269e83f596c70fb3d4bdeedb6e7d1136886722cdc54112747f9c07d41098a9f72d43df
+EBUILD sbt-bin-1.2.8.ebuild 857 BLAKE2B f58cc58f25419b156ff7b454e793e560b86c98d727f126b77658d5af0c2264f8945d8c010b2c3b426d5a829c81f58154a2c5802b5649b8b4d20ddcabfb81116c SHA512 a8f14859b983a34efd4c64056e823fd6996dfc4c74d4fef1f57dc877cbe791c1021eab04451f4b03325937dad4411e7bea3c6a58019a41e3eac6708f152bf577
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sbt-bin/sbt-bin-1.2.8.ebuild b/dev-java/sbt-bin/sbt-bin-1.2.8.ebuild
new file mode 100644
index 000000000000..fc9acfcd4e6a
--- /dev/null
+++ b/dev-java/sbt-bin/sbt-bin-1.2.8.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+DESCRIPTION="sbt, a build tool for Scala"
+HOMEPAGE="https://scala-sbt.org"
+SRC_URI="https://github.com/sbt/sbt/releases/download/v${PV}/${PN/-bin}-${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=virtual/jre-1.7
+	!dev-java/sbt"
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/sbt" "${S}" || die
+}
+
+src_prepare() {
+	default
+	java-pkg_init_paths_
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	local dest="${JAVA_PKG_SHAREPATH}"
+
+	rm -v bin/sbt.bat || die
+	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
+		bin/sbt-launch-lib.bash || die
+
+	insinto "${dest}/lib"
+	doins bin/* || die
+
+	insinto "${dest}"
+	doins -r conf || die
+
+	fperms 0755 "${dest}/lib/sbt" || die
+	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
+}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 7fbf682e7a70..e3351294935d 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -11,6 +11,7 @@ DIST apache-tomcat-6.0.44-src.tar.gz 3447711 BLAKE2B 7baf1fc24a7c9aba7e2ddac63fe
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
 DIST apache-tomcat-7.0.92-src.tar.gz 4778943 BLAKE2B d11b01219a25c303ce791d965908c79cd48b5c97e1f0bed81ae60e0fcae3c4b23906f652eaf1d2922db7a57e68ee9f5a09ef017b7f1b89ed6c2ab81a477a810e SHA512 8cbcaf6d8dcda5ad8bd667582a39e91c1feaa4cc7216cafc23b9f5cf005cce9af24473c1c9d573f4da26c88ea68520a113dc0a7e2a50823f3ba3bb1510ec9e0a
+DIST apache-tomcat-7.0.93-src.tar.gz 4786577 BLAKE2B 8b72418c98369e0e104c5f51e9d822c287487b5d3b66a4a6d005535b33a35a6cbc50c49b48100555bfaba0c6c983ea11dcdf381d2fba80a77fc17ac0df20efaa SHA512 5f9b08827aeae58f371496c34ce1ae5692bd5403e1a9a7a91b283ece3289356dbd85d48fcb71958aaeeb42cd65bb70fcf34cbe2db3901475cfb812370766f3fc
 DIST apache-tomcat-8.0.52-src.tar.gz 5039683 BLAKE2B 36318d0ae50fbca3f2a97e0210d0a8da8314f1ef79d0b047971bca30a5b0cc937faf013b5090f6e6b8aec4127b6185dc54ae589f5b57143b62c71c09f8bd5e9d SHA512 6d846213db0b15f9add8d80f30f304afdaf879ab6d7f85d212183a93f4f360ebfeeb079813bdea83cbd13f507504473028bbf8279e89b800b6f150b83086fa56
 DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd SHA512 0b56bc723277b2888896ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
@@ -30,6 +31,7 @@ EBUILD tomcat-servlet-api-6.0.44-r1.ebuild 941 BLAKE2B c253c51b56d719fc6abe9cc71
 EBUILD tomcat-servlet-api-6.0.53.ebuild 943 BLAKE2B c7b1a81fcb5f243e1888df39fc624a11385809ae602b4af2547b8a8a04ba4b1f4baf66703e9cd16ccf380b0dabe90c93b95c282c6605db03186d180a491c94c4 SHA512 d6bcfceea13c347ef6b467c3e2b18313465717d3c855c5011f3d5a0b130bc7a6f19c1f02eb647bdc328d16ceb8582ed7f3b68ca13c60bd29861a68700bb52e02
 EBUILD tomcat-servlet-api-7.0.82.ebuild 906 BLAKE2B 2169547e97371a8532c797f02e31ad1e17b04d2f03f7ab3041dac4ac1f23e699cdea60fb5779436d259cb3fdba6c59cd083d9cf4f874e8dad3f3194919c38c6c SHA512 ea84aa02351af9a21ffdad739619e1b8bc22b0978a03f464fedd7400257ed253040c2bd89be2749f00889f009988dd4083a5ceb81a89d3d6d5e8a5b6bfc07dbb
 EBUILD tomcat-servlet-api-7.0.92.ebuild 904 BLAKE2B b380f8e0c06f18c2d2c4042fc9a746c2008a2a195f45d7d4a7c6636f4fc22a0b99590e94dfa41a47910ff13b3d45b04d18e055f933ef03ea1f722fba79a9b979 SHA512 eaab24b5d2ad2abde36fc52328a17893cd8f618bd3e8c9c06350f06549b7daa34667f2206e622ae2fbb1d9f06881e084b9b1b3482a434ed69e57b43e737d4670
+EBUILD tomcat-servlet-api-7.0.93.ebuild 905 BLAKE2B 30ef1491ebc2075c2ac674b51daa2ca189e07c96d15ab3ed001ae5fe65a06f9d65dc9ee89a6f2f183d6445ffb8ddf9be616327f5e5c64c493688edcfc4c39eaa SHA512 541679a0de3f1e192a738f956fea4fd1ca7f56476c5dad5c3f017be01f03a4506f2798a0985aa42cfb49dbf40db3015ea5da93d5ac362f2bacb824d442102bb2
 EBUILD tomcat-servlet-api-8.0.52.ebuild 961 BLAKE2B 4d207cbd6e39369ceace593d2f02d644bba3d81b2a88d34f9288cbd08cc58a40220e5a2f791074d3aafa7dbdbe3a9a1327436e4427aa5017ab3a11667b98c390 SHA512 6eb575f867923c318e684ae4fb182753fbb15e078d1da4fc8583461c2c7360bf9a2b82e3fb8839046895ae8f9a1d5c7634348edfb6ba0c12b6599805a5e50427
 EBUILD tomcat-servlet-api-8.0.53.ebuild 961 BLAKE2B 4d207cbd6e39369ceace593d2f02d644bba3d81b2a88d34f9288cbd08cc58a40220e5a2f791074d3aafa7dbdbe3a9a1327436e4427aa5017ab3a11667b98c390 SHA512 6eb575f867923c318e684ae4fb182753fbb15e078d1da4fc8583461c2c7360bf9a2b82e3fb8839046895ae8f9a1d5c7634348edfb6ba0c12b6599805a5e50427
 EBUILD tomcat-servlet-api-8.5.23.ebuild 1010 BLAKE2B fb16fa9955dd865619850de21cdae0e44130895b3f886ec96ad5cff37f45f8a13b5caaddc083f46d2eab6b00e174689e652a5a0ead58fb4626e40612c1fd5784 SHA512 1ceaa37c6434f32e10705b0663bc39e2ccc5507c621a2ede604feec69a49bcb46ddd49fff33a5ccce50d4daa228170a3db30e31624ae84dfc83b538de10f7824
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.93.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.93.ebuild
new file mode 100644
index 000000000000..15794b7e3626
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.93.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml ||die
+	java-pkg_clean
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-03 13:42:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-03 13:42:34 +0000
commit	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch)
tree	3cb05783d73b2c33589ba305144a31c718e123cd /dev-java
parent	16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff)