gentoo resync : 19.03.2019

103 files changed, 720 insertions, 726 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index f2b53fdc6461..23233a8b50a4 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 e603e342a1f2..5d0b7c8a9bc3 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 510 BLAKE2B ed4df364a51fa4f6a9a43560b69f81e09a757b8ff3f3bb42f65f44effabeb699ddbf269bdfec015c5d903d54ab65fefb5e1413f36c196b71e9c1267704d1e976 SHA512 2c3cc071e5f318211f7f675176624682d0f405bacf24480812397028017a65615bb8dc54c4b6bdba01f980d4d6833f940dda1abdcd9450591417c71544dfce79
-EBUILD ant-antlr-1.9.13.ebuild 510 BLAKE2B ed4df364a51fa4f6a9a43560b69f81e09a757b8ff3f3bb42f65f44effabeb699ddbf269bdfec015c5d903d54ab65fefb5e1413f36c196b71e9c1267704d1e976 SHA512 2c3cc071e5f318211f7f675176624682d0f405bacf24480812397028017a65615bb8dc54c4b6bdba01f980d4d6833f940dda1abdcd9450591417c71544dfce79
+EBUILD ant-antlr-1.10.5.ebuild 509 BLAKE2B dae291dc2d44bef9a26c393534fe613f296d3365f29ff8af17a5feadb4dd5c6899dcb871b47fc5994c19d121fe53384a1b5031ebb8bc0406ecce403d587a358c SHA512 fbaf43264178726791d2f47553948e7056e643b162405be5d8324dd4be56bae5657afcdb0df14d1966c7bda4bcc8df48382c4530a0c3ccfde80d3fc56992e884
+EBUILD ant-antlr-1.9.13.ebuild 509 BLAKE2B dae291dc2d44bef9a26c393534fe613f296d3365f29ff8af17a5feadb4dd5c6899dcb871b47fc5994c19d121fe53384a1b5031ebb8bc0406ecce403d587a358c SHA512 fbaf43264178726791d2f47553948e7056e643b162405be5d8324dd4be56bae5657afcdb0df14d1966c7bda4bcc8df48382c4530a0c3ccfde80d3fc56992e884
 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 18b0dcb1d4f6..e50708dd9bab 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 18b0dcb1d4f6..e50708dd9bab 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 b0a7cbb52560..f18a86becd28 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 395 BLAKE2B 7ae7d955673c3f5ff68cd2962bb4281c0e777c1bdb32fdadfcc32de50491b659916de2014da58596057eb3f964f588f82688a62f252a2c68eb949176443425cd SHA512 f9744c01061937a6019294d7191cc2a223301c544f71991b0a1815fab0520ac0ead8b3ec884f945f11b5a87837879b6587b2cbcd437e9561e06e6caf2f168182
-EBUILD ant-apache-bcel-1.9.13.ebuild 395 BLAKE2B 7ae7d955673c3f5ff68cd2962bb4281c0e777c1bdb32fdadfcc32de50491b659916de2014da58596057eb3f964f588f82688a62f252a2c68eb949176443425cd SHA512 f9744c01061937a6019294d7191cc2a223301c544f71991b0a1815fab0520ac0ead8b3ec884f945f11b5a87837879b6587b2cbcd437e9561e06e6caf2f168182
+EBUILD ant-apache-bcel-1.10.5.ebuild 394 BLAKE2B 4590d1f5e73c91725455cbb43ff2f607d905f6d4138909e4d115d6a44617251ccb40ee3576185ced8394e74ec4469e0dd28fa808c1851a6b5ca7a6165afb3830 SHA512 17a1defbbdcdd410cab9d743557ba02c7eb7f815b74efd6a7609b53e04ef661192f1c369195852b6ecfa8336f4a2573e5a22de0df641cd723fccac96d6e203e6
+EBUILD ant-apache-bcel-1.9.13.ebuild 394 BLAKE2B 4590d1f5e73c91725455cbb43ff2f607d905f6d4138909e4d115d6a44617251ccb40ee3576185ced8394e74ec4469e0dd28fa808c1851a6b5ca7a6165afb3830 SHA512 17a1defbbdcdd410cab9d743557ba02c7eb7f815b74efd6a7609b53e04ef661192f1c369195852b6ecfa8336f4a2573e5a22de0df641cd723fccac96d6e203e6
 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 74f778d7ba8c..7feb081ccd8f 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 74f778d7ba8c..7feb081ccd8f 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 239e5451ddad..097b4e2ae2f0 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 674 BLAKE2B f4dc9363275e6b150da63f0062acd18532150a8492ed08c03422ecaab084f7f6dea9a68570a806e2b70374e5fdfb0dd19a97decd6daae21f249d322d440ab8c2 SHA512 f3bea7cba377c5f5b912da9d4d5c5185c9df3949f7ad265b0f6be4bab89c0542a5e96ccd12fce9cfbddd2583ddce6babf01ac98468637fc1db8e1d15d9a09925
-EBUILD ant-apache-bsf-1.9.13.ebuild 674 BLAKE2B f4dc9363275e6b150da63f0062acd18532150a8492ed08c03422ecaab084f7f6dea9a68570a806e2b70374e5fdfb0dd19a97decd6daae21f249d322d440ab8c2 SHA512 f3bea7cba377c5f5b912da9d4d5c5185c9df3949f7ad265b0f6be4bab89c0542a5e96ccd12fce9cfbddd2583ddce6babf01ac98468637fc1db8e1d15d9a09925
+EBUILD ant-apache-bsf-1.10.5.ebuild 673 BLAKE2B 45099d210b9c1429428e37b359b123a364fcaf3803e202ba4f4a6874eb3cbec21ccd49086a12de32ffefa7cb7f7c6e33fd08e776124124c119d61c06350c445c SHA512 a31d2738317a8d3d98eeb214f2a71a33f75a73b37676c4131682488313cd311943052898765812888bdc42503152951e61406d09aed28fdf24f29ca0251cffdf
+EBUILD ant-apache-bsf-1.9.13.ebuild 673 BLAKE2B 45099d210b9c1429428e37b359b123a364fcaf3803e202ba4f4a6874eb3cbec21ccd49086a12de32ffefa7cb7f7c6e33fd08e776124124c119d61c06350c445c SHA512 a31d2738317a8d3d98eeb214f2a71a33f75a73b37676c4131682488313cd311943052898765812888bdc42503152951e61406d09aed28fdf24f29ca0251cffdf
 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 177d29b9d27e..4afc6a0bcacc 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 177d29b9d27e..4afc6a0bcacc 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 d6fc5def03b5..66feadd6d3a1 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 400 BLAKE2B 84d0fbc9b907a37cdff40f1bc7bd9212ce092cc964b50dea6e238f573315d1cb697bd40deddf30cd61fe550368c66f80f2a6bebbd402ff044d1271b495ad03ee SHA512 0235b9da1e1b78ae2bcee88db039c7f586d223c87ef3bd82289ce450c0024d5d7605bf9383e0bc5c7ef4edcde4a3d07694c3491c621856784bd07059454fbb25
-EBUILD ant-apache-log4j-1.9.13.ebuild 400 BLAKE2B 84d0fbc9b907a37cdff40f1bc7bd9212ce092cc964b50dea6e238f573315d1cb697bd40deddf30cd61fe550368c66f80f2a6bebbd402ff044d1271b495ad03ee SHA512 0235b9da1e1b78ae2bcee88db039c7f586d223c87ef3bd82289ce450c0024d5d7605bf9383e0bc5c7ef4edcde4a3d07694c3491c621856784bd07059454fbb25
+EBUILD ant-apache-log4j-1.10.5.ebuild 399 BLAKE2B 804a596e878706223b14dac13b9fca4ce6187bc7280ac80352f1388f49b6e2bccfaabda35024a81b9e560bce543da6346956d6526c06cbbd394c0c4e0a8a5ecd SHA512 9e62ba88ad062cb12d37ba5e6ac8bfdb71656e63351d512ac1a6fb3e6f6c590c217decec72fdea71990cdd48a2064ba26e5329fb033c3439b70a58d4b453575d
+EBUILD ant-apache-log4j-1.9.13.ebuild 399 BLAKE2B 804a596e878706223b14dac13b9fca4ce6187bc7280ac80352f1388f49b6e2bccfaabda35024a81b9e560bce543da6346956d6526c06cbbd394c0c4e0a8a5ecd SHA512 9e62ba88ad062cb12d37ba5e6ac8bfdb71656e63351d512ac1a6fb3e6f6c590c217decec72fdea71990cdd48a2064ba26e5329fb033c3439b70a58d4b453575d
 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 6978e1a4cd83..0d18b22953c5 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 6978e1a4cd83..0d18b22953c5 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 ea011a484173..c2a2085f46f1 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 417 BLAKE2B 3c2c9d63bed47599de2227da191f0999323364b8fbd9781ffafdfeb36e18db18c80ca18a59b92ab878dee1db615d1ac1129e89637c4185b376a570014425899c SHA512 c01a447e7e23a78612d464dd4a43f395076921048d4cd083c9410cb2e835fff1e48510559f84ca0714bf98729cea0050e20ac854f7f3c9c438be5a50dcda9aef
-EBUILD ant-apache-oro-1.9.13.ebuild 417 BLAKE2B 3c2c9d63bed47599de2227da191f0999323364b8fbd9781ffafdfeb36e18db18c80ca18a59b92ab878dee1db615d1ac1129e89637c4185b376a570014425899c SHA512 c01a447e7e23a78612d464dd4a43f395076921048d4cd083c9410cb2e835fff1e48510559f84ca0714bf98729cea0050e20ac854f7f3c9c438be5a50dcda9aef
+EBUILD ant-apache-oro-1.10.5.ebuild 416 BLAKE2B 222e0f6eaaf6353e58ee4509badd35a3ec18f0a2f6031e7cb32300e183236242dff128654751b56791d5605da040a1d1bf1e1a47674525bb7296fc140fe860e7 SHA512 33a18e5e4e8a7898a0e16e790a8c311b4b1434e4073a29ff5385435298d6db13405cda990abdf20aaf1cc9d4c8d2352f67c432093eece91bf9f41c4a617d1867
+EBUILD ant-apache-oro-1.9.13.ebuild 416 BLAKE2B 222e0f6eaaf6353e58ee4509badd35a3ec18f0a2f6031e7cb32300e183236242dff128654751b56791d5605da040a1d1bf1e1a47674525bb7296fc140fe860e7 SHA512 33a18e5e4e8a7898a0e16e790a8c311b4b1434e4073a29ff5385435298d6db13405cda990abdf20aaf1cc9d4c8d2352f67c432093eece91bf9f41c4a617d1867
 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 ec42ffeba0c7..8d8e14886bb2 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 ec42ffeba0c7..8d8e14886bb2 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 57d414754d8d..64f0f6493753 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 421 BLAKE2B 9dcbc66ddcba16b223e80f1cb8c0fb8c4a98c83dfc6d2cc27f609d352c565bd07bcdc23ca786ac1aa9eae131a8b9b33cbb3c338fadbc526ca9b521ebbbaaa158 SHA512 79e55c383ca5fd62a791b56918e0e35fe7ef9e6ede5506099364ed52e2eb7bbe9aea316d279eba28b961a3c769c97e40d5eb3ccd30468ba235f7e0785de9196f
-EBUILD ant-apache-regexp-1.9.13.ebuild 421 BLAKE2B 9dcbc66ddcba16b223e80f1cb8c0fb8c4a98c83dfc6d2cc27f609d352c565bd07bcdc23ca786ac1aa9eae131a8b9b33cbb3c338fadbc526ca9b521ebbbaaa158 SHA512 79e55c383ca5fd62a791b56918e0e35fe7ef9e6ede5506099364ed52e2eb7bbe9aea316d279eba28b961a3c769c97e40d5eb3ccd30468ba235f7e0785de9196f
+EBUILD ant-apache-regexp-1.10.5.ebuild 420 BLAKE2B 2c4db795faab73dd8fb4783723ecc1bfa3017a79ad333999448e14360b9fc8f71a000dc14cc144f010dfe6eebd5be1f28dd8ecc67b9a89de4ac6e4a1cf6fc1cd SHA512 fa84c5788c9e4298a2fa5233fba5d8845e0ff280b5c75fa5a399ab402237c0637d35f2991129bde7ebc78374a3cd57f930b52b6b06d2f73849f3d7fab2f22172
+EBUILD ant-apache-regexp-1.9.13.ebuild 420 BLAKE2B 2c4db795faab73dd8fb4783723ecc1bfa3017a79ad333999448e14360b9fc8f71a000dc14cc144f010dfe6eebd5be1f28dd8ecc67b9a89de4ac6e4a1cf6fc1cd SHA512 fa84c5788c9e4298a2fa5233fba5d8845e0ff280b5c75fa5a399ab402237c0637d35f2991129bde7ebc78374a3cd57f930b52b6b06d2f73849f3d7fab2f22172
 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 b9abbff99cc1..ae618d471a14 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 b9abbff99cc1..ae618d471a14 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 d95f07375ad4..48d49bb18caf 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 424 BLAKE2B 5aa99de084bf87650b41df44f29823fb5b4becd3f3388f9f89650a871d191d7e787b8e1e13c7bdd021c9d4fc72d2eff3293749338f71f6f44cf73db86eabe2cf SHA512 b6752c0d99dfe244380610f520eedd1b0dff507fda0912d387a48438d6c90263e467c29ac7f7c1cdcfe2ddeb033edac102757ead2eae77f764ae65f5f7087eaf
-EBUILD ant-apache-resolver-1.9.13.ebuild 424 BLAKE2B 5aa99de084bf87650b41df44f29823fb5b4becd3f3388f9f89650a871d191d7e787b8e1e13c7bdd021c9d4fc72d2eff3293749338f71f6f44cf73db86eabe2cf SHA512 b6752c0d99dfe244380610f520eedd1b0dff507fda0912d387a48438d6c90263e467c29ac7f7c1cdcfe2ddeb033edac102757ead2eae77f764ae65f5f7087eaf
+EBUILD ant-apache-resolver-1.10.5.ebuild 423 BLAKE2B d30a3d13e9a241d245a26a49903dd90ce1d5c7f83be9f0c0c3afdc8788f0480f21fc21018fc8e49d492c11700eccc76b4b2184af0053c384abfedd22a6f56462 SHA512 02a92299e74fcf3466f80517ea9dbb874a79314b8153a54098d75dd2016ec70a3fb9b458a398701fd1b55efe42d28cc910a9c4802d704f54eb5c156a8da00216
+EBUILD ant-apache-resolver-1.9.13.ebuild 423 BLAKE2B d30a3d13e9a241d245a26a49903dd90ce1d5c7f83be9f0c0c3afdc8788f0480f21fc21018fc8e49d492c11700eccc76b4b2184af0053c384abfedd22a6f56462 SHA512 02a92299e74fcf3466f80517ea9dbb874a79314b8153a54098d75dd2016ec70a3fb9b458a398701fd1b55efe42d28cc910a9c4802d704f54eb5c156a8da00216
 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 9a4dbb007a05..2bc244ab0761 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 9a4dbb007a05..2bc244ab0761 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 9bb4bda1c617..fe3cfb56047d 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 498 BLAKE2B aa4a8e6a89ed96f6a5ebee9d086d62d9c89e858715522d049e4c1563fbc3f60e77cab62255f4229217182a303c8f7f2ccabd90631711408e683656ab41060cff SHA512 c5a634140e207611d49aa2ebd182d295e462c47b417ddd26d03d8f0da8d271f68746081d76c39570d0264889e701eefb1375c49b750315d51c9c689760730100
-EBUILD ant-apache-xalan2-1.9.13.ebuild 498 BLAKE2B aa4a8e6a89ed96f6a5ebee9d086d62d9c89e858715522d049e4c1563fbc3f60e77cab62255f4229217182a303c8f7f2ccabd90631711408e683656ab41060cff SHA512 c5a634140e207611d49aa2ebd182d295e462c47b417ddd26d03d8f0da8d271f68746081d76c39570d0264889e701eefb1375c49b750315d51c9c689760730100
+EBUILD ant-apache-xalan2-1.10.5.ebuild 497 BLAKE2B 2d6e7c26d33c4c30126b5190784bc02ea09bb968019e0d342add99a4c3f1d3b519dbc5adbf69b915550a009e4f35e68515eea566334555c8257610efe6ffb4a9 SHA512 bc821689f61d675321f29139bfec2767552854e363c0f26331d2d81c0007159351258ba9d5560a65b397c66fed72bc8d002ad7854f406cca831d194235b7df3a
+EBUILD ant-apache-xalan2-1.9.13.ebuild 497 BLAKE2B 2d6e7c26d33c4c30126b5190784bc02ea09bb968019e0d342add99a4c3f1d3b519dbc5adbf69b915550a009e4f35e68515eea566334555c8257610efe6ffb4a9 SHA512 bc821689f61d675321f29139bfec2767552854e363c0f26331d2d81c0007159351258ba9d5560a65b397c66fed72bc8d002ad7854f406cca831d194235b7df3a
 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 4eadc35c8c69..6f19db4c5ffa 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 4eadc35c8c69..6f19db4c5ffa 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 a3e4c9c4effa..936670709ce1 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 384 BLAKE2B 6a34a464c32ebf58b363b81364a7b4bf3599ef42eb515df55312cea190b5e9979c363f9b159c352ce72de988eac660da4f242995897f17b7d6f9d7c0708e51a1 SHA512 c0e5a9d6a12071c4134b482ef5def11f9ceed2847cc0e484736c943d1ed7c4c42cdbc2f2a3b322c083bd612f9840a4db57c2c4a2300d2669c0a1ceae232ec868
-EBUILD ant-commons-logging-1.9.13.ebuild 384 BLAKE2B 6a34a464c32ebf58b363b81364a7b4bf3599ef42eb515df55312cea190b5e9979c363f9b159c352ce72de988eac660da4f242995897f17b7d6f9d7c0708e51a1 SHA512 c0e5a9d6a12071c4134b482ef5def11f9ceed2847cc0e484736c943d1ed7c4c42cdbc2f2a3b322c083bd612f9840a4db57c2c4a2300d2669c0a1ceae232ec868
+EBUILD ant-commons-logging-1.10.5.ebuild 383 BLAKE2B 752fd23c92c8dc8c5c7f1853e8bcdeb98219f0eb4752fdada322b205b7f5fdc698228c5c63b2d44777df1591f7259a1b36dc35b0634fd1b29e86a14d408cc648 SHA512 045522b2e046bce070fb42bfe605d4346d2a1fc567ba686da83e64e07bcbe7b41a53f990b94400166aac81185c74d471bca95436b4220ba1cf94a59ed07d92c0
+EBUILD ant-commons-logging-1.9.13.ebuild 383 BLAKE2B 752fd23c92c8dc8c5c7f1853e8bcdeb98219f0eb4752fdada322b205b7f5fdc698228c5c63b2d44777df1591f7259a1b36dc35b0634fd1b29e86a14d408cc648 SHA512 045522b2e046bce070fb42bfe605d4346d2a1fc567ba686da83e64e07bcbe7b41a53f990b94400166aac81185c74d471bca95436b4220ba1cf94a59ed07d92c0
 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 c1a4bb62f144..08a8e5d3a50b 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 c1a4bb62f144..08a8e5d3a50b 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 9e068cd495ae..b54989fbcd58 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 380 BLAKE2B dda069ed16b93126cc4575b4cde8955dcb5283fa5650c3ec680260d630f17255d4f0462fdd7043cd83696aa328711877470126090002dfec13ec23068b5103ec SHA512 b3f24556fa904bb0c3eb659cc730793a2526d5d921b07bcc4eb12edff3e43c0f57cec3439c29369dfb05685215448bba4cf9698a33232bf89b48d28066a88e33
-EBUILD ant-commons-net-1.9.13.ebuild 380 BLAKE2B dda069ed16b93126cc4575b4cde8955dcb5283fa5650c3ec680260d630f17255d4f0462fdd7043cd83696aa328711877470126090002dfec13ec23068b5103ec SHA512 b3f24556fa904bb0c3eb659cc730793a2526d5d921b07bcc4eb12edff3e43c0f57cec3439c29369dfb05685215448bba4cf9698a33232bf89b48d28066a88e33
+EBUILD ant-commons-net-1.10.5.ebuild 379 BLAKE2B a29535bfa7a740ab54bfa546fc1bdfe48e4ac0c69af90bf66f9b6c82a572bed5930d53ab412e6447677ea50e8cc63e1bf6f8c15f033ce6d7fb057fa59a7a4638 SHA512 873e21e3c5db5f58ca3d90324adcb9d79f836e5ea9e8109140fce06c4e06b17fe911cf314a5e012320c85cd12449bdc4d290be5a357c419594e31dd6c15658c8
+EBUILD ant-commons-net-1.9.13.ebuild 379 BLAKE2B a29535bfa7a740ab54bfa546fc1bdfe48e4ac0c69af90bf66f9b6c82a572bed5930d53ab412e6447677ea50e8cc63e1bf6f8c15f033ce6d7fb057fa59a7a4638 SHA512 873e21e3c5db5f58ca3d90324adcb9d79f836e5ea9e8109140fce06c4e06b17fe911cf314a5e012320c85cd12449bdc4d290be5a357c419594e31dd6c15658c8
 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 5727ceda93af..65bcbe7e7e44 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 5727ceda93af..65bcbe7e7e44 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 69c89c1c52f7..33a3cbf3a9ff 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 3194 BLAKE2B 7a3ecee7a9c57fdeb8ebd1e2dba61de625a0020cf535f8e64ebc78414796775113f394be3d5cbdb3d2d04db23568a61bece4f102fb64fe9210a7f7e32f5c075f SHA512 227a969d2086769b8c1e6b51178b8a4b842a6f5a9d9cbbde1ba7654d206e7d565fa9094a157ddc66109b90116131df6ee49e309ced1e85bb43a84c836904ce1f
-EBUILD ant-core-1.9.13-r1.ebuild 3194 BLAKE2B 7a3ecee7a9c57fdeb8ebd1e2dba61de625a0020cf535f8e64ebc78414796775113f394be3d5cbdb3d2d04db23568a61bece4f102fb64fe9210a7f7e32f5c075f SHA512 227a969d2086769b8c1e6b51178b8a4b842a6f5a9d9cbbde1ba7654d206e7d565fa9094a157ddc66109b90116131df6ee49e309ced1e85bb43a84c836904ce1f
+EBUILD ant-core-1.10.5-r1.ebuild 3193 BLAKE2B 99479481bd22c6c1b74491949e629703ea09169def00e305449f263ea65f47df066b9f390cdd6d3f5aeacbf6915f7144b17753db7a063e964a08b2026c66914f SHA512 1fc307ec691ea85b49d27f9c2aafd7658988fd269df4eddd934c6e6739e133eaadfc833ea33c3d3e4c5ecc633ceb754cbd13ad162697c2ac8da5cc1ba169a482
+EBUILD ant-core-1.9.13-r1.ebuild 3193 BLAKE2B 99479481bd22c6c1b74491949e629703ea09169def00e305449f263ea65f47df066b9f390cdd6d3f5aeacbf6915f7144b17753db7a063e964a08b2026c66914f SHA512 1fc307ec691ea85b49d27f9c2aafd7658988fd269df4eddd934c6e6739e133eaadfc833ea33c3d3e4c5ecc633ceb754cbd13ad162697c2ac8da5cc1ba169a482
 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 5f5cb9ca722e..a5340c00be7d 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 5f5cb9ca722e..a5340c00be7d 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 b2797fea78de..9f03ea56b5b7 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 366 BLAKE2B ef8881d25745d05df21bbad4dee9eafbcf98277186bb4ddf4e51178e4c7371f7da3cd6e21147d3fdff8a9113f7a344bfb585ee2b0fcb2ebb2dc368481683059c SHA512 5b3a37b227e2be1c7387913a266fbaf136c73234ade06cd4a504c7e8881d03514bf9892c5bad7ea6a7b702ca60d385f15079bc0b2cb34ff1add3d37799d7c575
-EBUILD ant-jai-1.9.13.ebuild 366 BLAKE2B ef8881d25745d05df21bbad4dee9eafbcf98277186bb4ddf4e51178e4c7371f7da3cd6e21147d3fdff8a9113f7a344bfb585ee2b0fcb2ebb2dc368481683059c SHA512 5b3a37b227e2be1c7387913a266fbaf136c73234ade06cd4a504c7e8881d03514bf9892c5bad7ea6a7b702ca60d385f15079bc0b2cb34ff1add3d37799d7c575
+EBUILD ant-jai-1.10.5.ebuild 365 BLAKE2B 01d123b2736ee2c62e76877373354e36bab5d8a2a0921049b2686f9a3ebced433f35ead29d1649ac2ad970bd022f3271382b5878b58fac089295f65b0ecc7352 SHA512 4d9f2edb95473b8d4f93680c409b6568a68e634345bc6613921adda3862b3ae6a747b58fa04aeedaf614aaa7f89066e512023a519c4ee12b50cee10ff541b027
+EBUILD ant-jai-1.9.13.ebuild 365 BLAKE2B 01d123b2736ee2c62e76877373354e36bab5d8a2a0921049b2686f9a3ebced433f35ead29d1649ac2ad970bd022f3271382b5878b58fac089295f65b0ecc7352 SHA512 4d9f2edb95473b8d4f93680c409b6568a68e634345bc6613921adda3862b3ae6a747b58fa04aeedaf614aaa7f89066e512023a519c4ee12b50cee10ff541b027
 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 c0b4b8471220..e7040b30e24d 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 c0b4b8471220..e7040b30e24d 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 2d7ed19dbdf8..78502517ff84 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 494 BLAKE2B 00620a18d36b491a4fb9d7b1a80d8125adcfdda93366cb4f1d6f5d5529b1891452c37c32916c3ad5b0b7f9009969ed27dde3cf8ca377e2acbbc38671abb06cd4 SHA512 ec5ba9d81368c98844af54013784606c9a1d8ef22e74282a81d10f6806cfb16c36d9a1f25251c72de72653d34007404fd7b9d2446ce0e6b574766a5451e96708
-EBUILD ant-javamail-1.9.13.ebuild 494 BLAKE2B 00620a18d36b491a4fb9d7b1a80d8125adcfdda93366cb4f1d6f5d5529b1891452c37c32916c3ad5b0b7f9009969ed27dde3cf8ca377e2acbbc38671abb06cd4 SHA512 ec5ba9d81368c98844af54013784606c9a1d8ef22e74282a81d10f6806cfb16c36d9a1f25251c72de72653d34007404fd7b9d2446ce0e6b574766a5451e96708
+EBUILD ant-javamail-1.10.5.ebuild 493 BLAKE2B 008298b99eee90d81e543139dd5f0322ca8e82d27a21dadfafde61937a5432a5a302fd678fd7a1387ad7e6c36992d02c740eb3c2af7cdba7d1414f5e9b06a1c7 SHA512 977dc8db6860e6c0bb4a36408e4703ddab1cc4d577726d7c625d73165f33d478cf29010a9699b693eb9c601602533eb6902e61d78f15698650b12b09f0b08bd0
+EBUILD ant-javamail-1.9.13.ebuild 493 BLAKE2B 008298b99eee90d81e543139dd5f0322ca8e82d27a21dadfafde61937a5432a5a302fd678fd7a1387ad7e6c36992d02c740eb3c2af7cdba7d1414f5e9b06a1c7 SHA512 977dc8db6860e6c0bb4a36408e4703ddab1cc4d577726d7c625d73165f33d478cf29010a9699b693eb9c601602533eb6902e61d78f15698650b12b09f0b08bd0
 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 6293b89aafd5..9abaf06c071e 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 6293b89aafd5..9abaf06c071e 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 02ac4c7bdf5f..026601f1c69c 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 374 BLAKE2B 430814f91faa364a7d299cbb0888e223e50744dddc964de40f2d098d2fa104760c3924d3a0ba4360abe11629354f6c66833e21ef0799565812f0e0caa1b76a10 SHA512 070944d2ad747c5cbd20cb0e42276c6a66d2a90246dd2a278a6effe7ca27fded4ca1d5fdad60f3a15bb73416b739aa78d6ecad8c336b1a7dde40bfb3801bea55
-EBUILD ant-jdepend-1.9.13.ebuild 374 BLAKE2B 430814f91faa364a7d299cbb0888e223e50744dddc964de40f2d098d2fa104760c3924d3a0ba4360abe11629354f6c66833e21ef0799565812f0e0caa1b76a10 SHA512 070944d2ad747c5cbd20cb0e42276c6a66d2a90246dd2a278a6effe7ca27fded4ca1d5fdad60f3a15bb73416b739aa78d6ecad8c336b1a7dde40bfb3801bea55
+EBUILD ant-jdepend-1.10.5.ebuild 373 BLAKE2B d14452867622a51876db8bc6d4f0e9a9aa04ad3a98292cf4d03eba0603ae890198e29b083195e0aeba823854804585f2d2ea5f01310f354a442f7013180bbd12 SHA512 6ef49c2fc02f4b2038cc893f026e679a69d7551e71ab3c91db61ebb2eb18ac3b2b6cb9722deaaf7fef93ce6656e5fbcb203a86af332e83e5ae2df4697a4948a0
+EBUILD ant-jdepend-1.9.13.ebuild 373 BLAKE2B d14452867622a51876db8bc6d4f0e9a9aa04ad3a98292cf4d03eba0603ae890198e29b083195e0aeba823854804585f2d2ea5f01310f354a442f7013180bbd12 SHA512 6ef49c2fc02f4b2038cc893f026e679a69d7551e71ab3c91db61ebb2eb18ac3b2b6cb9722deaaf7fef93ce6656e5fbcb203a86af332e83e5ae2df4697a4948a0
 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 e0b4528b54d5..8d01abfd0ad8 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 e0b4528b54d5..8d01abfd0ad8 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 35cb74280c4b..453e3de24587 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 478 BLAKE2B 44ee2a9e4818b7624c74b6e4bc58b7621016419c0cc696da9c7382c378f991c5daea9c3951578437a9de9b2be0edba7ab8a3e8b12f712b47800e198f0e53c004 SHA512 cb2342fa8b12b9ccf74a4ec262dfc7e066c67f978bf48d458c2a29d22e0c1189e9db9eac9d93426f53cc16ed065c765de46aae2990e712943251a32f451f8486
-EBUILD ant-jmf-1.9.13.ebuild 478 BLAKE2B 44ee2a9e4818b7624c74b6e4bc58b7621016419c0cc696da9c7382c378f991c5daea9c3951578437a9de9b2be0edba7ab8a3e8b12f712b47800e198f0e53c004 SHA512 cb2342fa8b12b9ccf74a4ec262dfc7e066c67f978bf48d458c2a29d22e0c1189e9db9eac9d93426f53cc16ed065c765de46aae2990e712943251a32f451f8486
+EBUILD ant-jmf-1.10.5.ebuild 477 BLAKE2B e0e27fd10e9c67ea3f59aac03c124f49f0417f0013b3fba11bda5de5a7608dd092d680d9228667dde113ba5b1b3afe143c026da14318814022af0b9085f057c0 SHA512 273ab0b8899c84bed50556cc7ff6567f91d4913d1fcf3d6d624b4d5893bedc3b3770fc7896bafa4ebd46a898534bfccf65b29dcc74e1230987ff496caf18c876
+EBUILD ant-jmf-1.9.13.ebuild 477 BLAKE2B e0e27fd10e9c67ea3f59aac03c124f49f0417f0013b3fba11bda5de5a7608dd092d680d9228667dde113ba5b1b3afe143c026da14318814022af0b9085f057c0 SHA512 273ab0b8899c84bed50556cc7ff6567f91d4913d1fcf3d6d624b4d5893bedc3b3770fc7896bafa4ebd46a898534bfccf65b29dcc74e1230987ff496caf18c876
 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 e1dcf6b28bd3..a85c9005c40f 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 e1dcf6b28bd3..a85c9005c40f 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 a71ab2f3b22c..ed7650134ca5 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 371 BLAKE2B 2a78c5e8c61b4bc53e88e35d7eb3432ca850a5134a4db6c4569c13a539082c49ba2844233233effe875ba507289d044708c8ea3acd117abab2d1435cb02ce20d SHA512 0ff579c2bbb8851d9f94e87ddbb7fcd7d6ba2a5b63b99d9c3955064d88d13dbce3cc246176d142889666ce1dedb94ba4eb8c6be0e9e0c1e333d54dae44f3b41a
-EBUILD ant-jsch-1.9.13.ebuild 371 BLAKE2B 2a78c5e8c61b4bc53e88e35d7eb3432ca850a5134a4db6c4569c13a539082c49ba2844233233effe875ba507289d044708c8ea3acd117abab2d1435cb02ce20d SHA512 0ff579c2bbb8851d9f94e87ddbb7fcd7d6ba2a5b63b99d9c3955064d88d13dbce3cc246176d142889666ce1dedb94ba4eb8c6be0e9e0c1e333d54dae44f3b41a
+EBUILD ant-jsch-1.10.5.ebuild 370 BLAKE2B ab08572c64c2bfe212d303f6216598f96e32584cfdbf791a2b37c929334851a88156e8f8e688866ad1e670f6cdc32848f491061c1d8af3018f4f89cee9e79a37 SHA512 2e57a4c727c97c62a35ff61916cc3c618a78416d0d298941f3188dc6efb01e9bd8b26eab02d340a2c888762e4775e4a6d486477452f1c1a589e2a225bda5f625
+EBUILD ant-jsch-1.9.13.ebuild 370 BLAKE2B ab08572c64c2bfe212d303f6216598f96e32584cfdbf791a2b37c929334851a88156e8f8e688866ad1e670f6cdc32848f491061c1d8af3018f4f89cee9e79a37 SHA512 2e57a4c727c97c62a35ff61916cc3c618a78416d0d298941f3188dc6efb01e9bd8b26eab02d340a2c888762e4775e4a6d486477452f1c1a589e2a225bda5f625
 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 5ae4086a5b98..ff9b37b1c72f 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 5ae4086a5b98..ff9b37b1c72f 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 1edf9a4d9277..42815efbd336 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 498 BLAKE2B 7a381893d77e34cd5460f4b492cd6e8d9f308540d74540fe12d76027e61dc3ca6576aa7a2e282bf46985ca4c7f003e7787f6869a74af152d332777a5f0db9d50 SHA512 a850d37755e09f77afe6b56250a53768d163b5308c0d4d63a153c97dac1649f55bea586f0ce99d6088e1b4672b4c02b7e99f418d381ddf65d148a2da1a4fb658
-EBUILD ant-junit-1.9.13-r1.ebuild 498 BLAKE2B 7a381893d77e34cd5460f4b492cd6e8d9f308540d74540fe12d76027e61dc3ca6576aa7a2e282bf46985ca4c7f003e7787f6869a74af152d332777a5f0db9d50 SHA512 a850d37755e09f77afe6b56250a53768d163b5308c0d4d63a153c97dac1649f55bea586f0ce99d6088e1b4672b4c02b7e99f418d381ddf65d148a2da1a4fb658
+EBUILD ant-junit-1.10.5-r1.ebuild 497 BLAKE2B 0207bc0b6a519399adcb49c2ddcbc1a73ecb39bf54a87e726fd33346ffc6b3f4163b2fcb70796540ec55a143fe38694d580eab5beb5fd34ba10dbf821db27028 SHA512 36ef29c67d3c0051837a474ea185023cc1664f67d7fc4cf7252ac65f8d0e2519e779bf2aecbe77487cea9f9172da0b3f5d3bf56b36e481853438053c65f669ca
+EBUILD ant-junit-1.9.13-r1.ebuild 497 BLAKE2B 0207bc0b6a519399adcb49c2ddcbc1a73ecb39bf54a87e726fd33346ffc6b3f4163b2fcb70796540ec55a143fe38694d580eab5beb5fd34ba10dbf821db27028 SHA512 36ef29c67d3c0051837a474ea185023cc1664f67d7fc4cf7252ac65f8d0e2519e779bf2aecbe77487cea9f9172da0b3f5d3bf56b36e481853438053c65f669ca
 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 dcfddcf716a3..db0df142a354 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 dcfddcf716a3..db0df142a354 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 afcbf9d2559d..a2ba39def6f7 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 941 BLAKE2B 877d23a0a92aa57d334b4be1fc18094091e423c6fda7baf3c3526e9b8a9657c0b24179391574a7117e120b27c4bacef653e5a0672dc72850f9b266d08f15e8f0 SHA512 f76a9ca3b4dfda96e64a84727b4bb62873a5e002f46923689fe1eb056b99df10c5fd662a96c2cfe807d428bfff5b56b084980ba968594928c51720ce2550e046
-EBUILD ant-junit4-1.9.13.ebuild 941 BLAKE2B 877d23a0a92aa57d334b4be1fc18094091e423c6fda7baf3c3526e9b8a9657c0b24179391574a7117e120b27c4bacef653e5a0672dc72850f9b266d08f15e8f0 SHA512 f76a9ca3b4dfda96e64a84727b4bb62873a5e002f46923689fe1eb056b99df10c5fd662a96c2cfe807d428bfff5b56b084980ba968594928c51720ce2550e046
+EBUILD ant-junit4-1.10.5.ebuild 940 BLAKE2B f4eff21908f9362bf6d00892cfbf4db10f898c45e3e207a939c6cc2c4db2591d53d3ffd4570b3537d944138a85185a5a381cf357acf33785e0ae7e3dc1423e1c SHA512 25c9a902be0d5f28cd2fc364a50542d33ecc2f42e8180af31caee13811fd078cef6c724b798d21948a36d7df0adc814cba05a419e7ea66628a16783ea4629cfd
+EBUILD ant-junit4-1.9.13.ebuild 940 BLAKE2B f4eff21908f9362bf6d00892cfbf4db10f898c45e3e207a939c6cc2c4db2591d53d3ffd4570b3537d944138a85185a5a381cf357acf33785e0ae7e3dc1423e1c SHA512 25c9a902be0d5f28cd2fc364a50542d33ecc2f42e8180af31caee13811fd078cef6c724b798d21948a36d7df0adc814cba05a419e7ea66628a16783ea4629cfd
 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 cae67cdcb96b..676db3e8bdee 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 cae67cdcb96b..676db3e8bdee 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 cde676ce1701..ea28c5dac417 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 348 BLAKE2B 2526a2fe9453bf79ff6f7180b3bca462ca07d402ba7471ccfb954474a306d8f8b149918dbe32e90f53942c6af0845766ffe5711e9d4ec7da96b32018c682f5da SHA512 2dd734c34de961019173140259a93f4ef943624b47a1f44ada01f2382d45b946d222611b5d1ab7a7058486845d90a702d41bfa4ac79f81a96d928b8f80ffbc6e
+EBUILD ant-junitlauncher-1.10.5.ebuild 347 BLAKE2B 2ab9a7ecb10b7634d4cc6d0b4f177fae88cb821384952014db6831a2c6b7b40d9d6d5fe064dba413b716eb47c54d11e227ae9d53b35109a2618e3cb262821514 SHA512 6dff0abaa30952daa2302e3fa870dba41b6fe6807da6dcf2aec71b9eb10aafb2582dbad81d3bc3924a564232b675479c9ba942f1126c6208051d1a0b0f719794
 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 50105248a95d..a06684f6c892 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 d43425085c6c..87268ce43242 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 414 BLAKE2B 05479d9168fd6506319c9f2d09f7c4032a370c89d1d8c0ae48d4a98d31ec7c55aa7ad917f3790a2fc9f968445307b59f526aa5e27fd9cba5247e026adf4776db SHA512 3cc01191071678d90f999ec97ba24bb0cdd48afeb6f6b6a5fddc35b6ed66a39aef392f8e785d970efaf94521a1bc67d53910adce30398a722cac1296163366f3
-EBUILD ant-swing-1.9.13.ebuild 414 BLAKE2B 05479d9168fd6506319c9f2d09f7c4032a370c89d1d8c0ae48d4a98d31ec7c55aa7ad917f3790a2fc9f968445307b59f526aa5e27fd9cba5247e026adf4776db SHA512 3cc01191071678d90f999ec97ba24bb0cdd48afeb6f6b6a5fddc35b6ed66a39aef392f8e785d970efaf94521a1bc67d53910adce30398a722cac1296163366f3
+EBUILD ant-swing-1.10.5.ebuild 413 BLAKE2B cd63db00ea34820084071e7e1e7b83aacbf2ea6bfd9855cfb91bc3daed6a4ab11af81d2c585797df36a2ad2ea2cc2049e37a4efd3cff0c7c0ecbd1d83f065f3a SHA512 c4a483ae8e34ba1f42db8298dd5713a70e1384f740b3eb99cc2f207f7041941c0160f36f434a0af1b8f824fff6e25ebc860b6228d1357d6be43a62ef1db59413
+EBUILD ant-swing-1.9.13.ebuild 413 BLAKE2B cd63db00ea34820084071e7e1e7b83aacbf2ea6bfd9855cfb91bc3daed6a4ab11af81d2c585797df36a2ad2ea2cc2049e37a4efd3cff0c7c0ecbd1d83f065f3a SHA512 c4a483ae8e34ba1f42db8298dd5713a70e1384f740b3eb99cc2f207f7041941c0160f36f434a0af1b8f824fff6e25ebc860b6228d1357d6be43a62ef1db59413
 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 2190d771f78d..bd64e5ee54dd 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 2190d771f78d..bd64e5ee54dd 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 c9c3bbfca530..d7fe929d28a9 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 916 BLAKE2B a9394391ccebde8ebc0ceec78682e5ca7359c1775a44e6d24247ca6ab96fe5e04f5aaf476876991d775967e5ce50983cea1fc8be76dc734695a36376e3065f99 SHA512 6302409876c168b14ab71c766edcbcb78401b4b9bc0e46dc9c99655f38c1884dbd4b7419792daf15a9c1e6c4aa39f312b8da81399b6a930aad5be8233bce9c0d
-EBUILD ant-testutil-1.9.13.ebuild 916 BLAKE2B a9394391ccebde8ebc0ceec78682e5ca7359c1775a44e6d24247ca6ab96fe5e04f5aaf476876991d775967e5ce50983cea1fc8be76dc734695a36376e3065f99 SHA512 6302409876c168b14ab71c766edcbcb78401b4b9bc0e46dc9c99655f38c1884dbd4b7419792daf15a9c1e6c4aa39f312b8da81399b6a930aad5be8233bce9c0d
+EBUILD ant-testutil-1.10.5.ebuild 915 BLAKE2B ac51e0d21775cc262872696d04d8131527976a06640267b7d68d52909d5fbdc5cb7e9ec8d94dc173b45abf74b263e2c65b5e1cdd62d3f31f084e356d8455be3e SHA512 e01d34bd411749cb0e8fcf4cf0fda67c40f23e1c3a85c72a300a0608e9d03423a85ea7aa0571f2b4339b94f86887847a1902e8dfa89a25c575f457c8eb04584b
+EBUILD ant-testutil-1.9.13.ebuild 915 BLAKE2B ac51e0d21775cc262872696d04d8131527976a06640267b7d68d52909d5fbdc5cb7e9ec8d94dc173b45abf74b263e2c65b5e1cdd62d3f31f084e356d8455be3e SHA512 e01d34bd411749cb0e8fcf4cf0fda67c40f23e1c3a85c72a300a0608e9d03423a85ea7aa0571f2b4339b94f86887847a1902e8dfa89a25c575f457c8eb04584b
 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 d440e0a4eaa3..075585d0e327 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 d440e0a4eaa3..075585d0e327 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/ant-xz/Manifest b/dev-java/ant-xz/Manifest
new file mode 100644
index 000000000000..3b855623e31b
--- /dev/null
+++ b/dev-java/ant-xz/Manifest
@@ -0,0 +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-xz-1.10.5.ebuild 466 BLAKE2B 96f152e7a3d8d90722a8e27cae9a10c301e030167dd9908be98f71dddfdac8df25c229dbdb6b72f794a4f4eb0f6ece32903687025358b9aeb792269a5ed068c0 SHA512 a42b03dc835bafc6602aa2760760ea2ba3dff09811354ab268764a4c7e0931c2927bdf63d31b79d707f5d4e8dc85d50c528ef6bd7f1eec205a999c12f84da795
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-xz/ant-xz-1.10.5.ebuild b/dev-java/ant-xz/ant-xz-1.10.5.ebuild
new file mode 100644
index 000000000000..fa1d30ba21b9
--- /dev/null
+++ b/dev-java/ant-xz/ant-xz-1.10.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME="xz-java"
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional tasks for XZ compression"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="dev-java/xz-java"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-xz/metadata.xml b/dev-java/ant-xz/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-xz/metadata.xml
@@ -0,0 +1,8 @@
+<?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>
+</pkgmetadata>
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 466830834073..b6bc5bc20c86 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,4 +1,5 @@
-EBUILD ant-1.10.5.ebuild 1655 BLAKE2B 2b4f96b3c50cc360b9b39f279013762322745950b607e2aef955c9a5d3bc8071dfca736ee3191943c03a28481a955558c579123e3ab4d8b897073494079df27f SHA512 782c834c175bf2c4487100525a1aa429b158354ad4678bf5227a0d484e6399a55e5957d1cf2e65c16c3597458df5e88c8593e3728cf7606ac5ad804a94897227
-EBUILD ant-1.9.13.ebuild 1586 BLAKE2B 23309c6a2b32d748303d8bed2eb3c9a3e87f411dfb0e33d8f465129b88899550c563c5f7920faeb31f2cac2f11c4e708caafc7b035747f99c7ef28c4bd078fd5 SHA512 c53db3f0d75b1cd4084c6cc68177459fa026067c76274b9ed53167fa7c72e2366e0abd9ad07001b9caf9b18e8dfccf217be3d37e27a2992021eb3b9cde1a80a5
+EBUILD ant-1.10.5-r1.ebuild 1690 BLAKE2B a5a34ec4e6f4587f2e966ebb2b513fedef27a261837f3e3f2b9fb03a8408201e941d59364b9ff6fc4fd2f44408bc0f85773905441394ec6dff476c1dade0b839 SHA512 1c07c6f9dbcaa729f18361b4b61a191c5cd98a280db1f28ffab9119a261d0f8f75f6878d217f784066b5f68ded7ec6676d17416892e436c6506c595dc17ab59f
+EBUILD ant-1.10.5.ebuild 1652 BLAKE2B bd8eeb5e5b0faddb84086fc0a3084ec43bb32766f855dd6433922499cf7ee5bdc25a8d3eb75f5804556bce316e6453372573053d7098002c1031bef2387bd294 SHA512 31a9c15de893e36c8cc223803ef606779b5512aa2407b411ef0d30cb1e64266c8af3d512041a7d795a438125a60b4860ad2c58642b9ae822c58c2b7f04ee0e07
+EBUILD ant-1.9.13.ebuild 1583 BLAKE2B d8cb9a5ce2a9a3d0c5d79d732b75ec8b9dbcc2f6b1ddf95632dfe796602385d0225c206caba3c202253c300b35fea6049dcea91e02bfdce097380b201314f83c SHA512 e94bf1c4b76bf3c220df56c1192d994ec8663fbaf21b5fa4e171e233448c148cb2a99d2687c51dd3eda77df618546f85cecaa7e1dfddf65daa39d9efd2cf0dea
 EBUILD ant-1.9.2-r1.ebuild 2027 BLAKE2B eee331a9cffd99f179cd2df829299f95e100d132cf7055dffa63463d42655febd55a3e7643af993f236a6ba5bc12efe5c332fcd73e7cebb4540bf45d4a7a7018 SHA512 092edc2dc1c0b2e2b607db39dab7632814bb124ef3c20c1787fc84760b4192e8690cdc575f21efc2b4146b1efea97e2317829f5c99b4f3b96cbb1c002951d605
-MISC metadata.xml 1493 BLAKE2B 8a89866225217f0451ddc3e7901a645d36ab69cbbe4c504c653d7c95c5f3fe6811c163860e9cdbd80e3ab25cdaba88916c58ab390b7d47e6e07acbaac94e18fc SHA512 e4b010f45ec5895291a25432ea50d3a3ae07303c550f711b884d067367424422d336ca83478db71ad3d41766faf177420d039030a58c1787f8ebed42c585bc09
+MISC metadata.xml 1540 BLAKE2B 5536e37e8d4b18a8b744b88968c8f5f87973dedd25dfc5a0c96202bed4991034e93b57ad9a8737b5dfab6526adfa1e563768f08c6b85442f87f0b4ebc87345a4 SHA512 651f97c959e8322e51a7d937dd5886604e3118249907cbd7c0695e65b91b39c22539aeac2870c4f8ffe49e6f4edb8736459eb68266cfc4cb0baac9e439d0a4e5
diff --git a/dev-java/ant/ant-1.10.5-r1.ebuild b/dev-java/ant/ant-1.10.5-r1.ebuild
new file mode 100644
index 000000000000..5fa60ad60e8e
--- /dev/null
+++ b/dev-java/ant/ant-1.10.5-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
+HOMEPAGE="https://ant.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
+	+jsch +junit +junit4 +junitlauncher +log4j +oro +regexp +resolver swing testutil xz"
+
+DEPEND="~dev-java/ant-core-${PV}"
+
+RDEPEND="${DEPEND}
+	~dev-java/ant-core-${PV}
+	~dev-java/ant-junit-${PV}
+	!dev-java/ant-optional
+	!dev-java/ant-tasks
+	~dev-java/ant-apache-xalan2-${PV}
+	antlr? ( ~dev-java/ant-antlr-${PV} )
+	bcel? ( ~dev-java/ant-apache-bcel-${PV} )
+	bsf? ( ~dev-java/ant-apache-bsf-${PV} )
+	commonslogging? ( ~dev-java/ant-commons-logging-${PV} )
+	commonsnet? ( ~dev-java/ant-commons-net-${PV} )
+	jai? ( ~dev-java/ant-jai-${PV} )
+	javamail? ( ~dev-java/ant-javamail-${PV} )
+	jdepend? ( ~dev-java/ant-jdepend-${PV} )
+	jmf? ( ~dev-java/ant-jmf-${PV} )
+	jsch? ( ~dev-java/ant-jsch-${PV} )
+	junit? ( ~dev-java/ant-junit-${PV} )
+	junit4? ( ~dev-java/ant-junit4-${PV} )
+	junitlauncher? ( ~dev-java/ant-junitlauncher-${PV} )
+	log4j? ( ~dev-java/ant-apache-log4j-${PV} )
+	oro? ( ~dev-java/ant-apache-oro-${PV} )
+	regexp? ( ~dev-java/ant-apache-regexp-${PV} )
+	resolver? ( ~dev-java/ant-apache-resolver-${PV} )
+	swing? ( ~dev-java/ant-swing-${PV} )
+	testutil? ( ~dev-java/ant-testutil-${PV} )
+	X? ( ~dev-java/ant-swing-${PV} )
+	xz? ( ~dev-java/ant-xz-${PV} )
+"
+
+S="${WORKDIR}"
+
+src_compile() { :; }
diff --git a/dev-java/ant/ant-1.10.5.ebuild b/dev-java/ant/ant-1.10.5.ebuild
index 82e8fc32c9b9..7ae9053339ac 100644
--- a/dev-java/ant/ant-1.10.5.ebuild
+++ b/dev-java/ant/ant-1.10.5.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://ant.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
 	+jsch +junit +junit4 +junitlauncher +log4j +oro +regexp +resolver swing testutil"
diff --git a/dev-java/ant/ant-1.9.13.ebuild b/dev-java/ant/ant-1.9.13.ebuild
index 1b1407b22107..4bb3de7a1b1f 100644
--- a/dev-java/ant/ant-1.9.13.ebuild
+++ b/dev-java/ant/ant-1.9.13.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://ant.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
 	+jsch +junit +junit4 +log4j +oro +regexp +resolver swing testutil"
diff --git a/dev-java/ant/metadata.xml b/dev-java/ant/metadata.xml
index 8576aaf4b15a..0caea867de6f 100644
--- a/dev-java/ant/metadata.xml
+++ b/dev-java/ant/metadata.xml
@@ -26,5 +26,6 @@
     <flag name="resolver">Enable Apache Resolver Ant tasks</flag>
     <flag name="swing">Enable Swing Ant tasks</flag>
     <flag name="testutil">Enable optional test util classes</flag>
+    <flag name="xz">Enable XZ Ant tasks</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index dc80d802f4fd..d4ff5ca5f01d 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -11,7 +11,19 @@ DIST icedtea-3.10-nashorn-6cf21321f367.tar.xz 2320504 BLAKE2B d0427d201c1217f5fa
 DIST icedtea-3.10-openjdk-90de74e82bfb.tar.xz 338992 BLAKE2B 71f232161b48899b1b19f41d881302b2a939ccc466c5c460f4f24baa8f1d13068bb3d0133e12a361b5fb919ab237748b593b5365fccf2400f0ddbe5ae05645a8 SHA512 dcd7a9a73ee9fb13317fbf0778e002309194ab035289c4095b3d4940f76dbd21b7b7c7eda414b9208dc6a9eadc078eddbe51900b86b6b1eb66de3b9e15ec0868
 DIST icedtea-3.10-shenandoah-bc4deb768b1d.tar.xz 7022672 BLAKE2B 590171a545cdfe5c5724a836e0b011e99d5e679262719159173ba4a1e8830c70027affad2eda952911a2a67528c7c5247ebc339b29e80bbcb87e6c429349f16f SHA512 6c84c743da34e555da93d0b01ff03a3f570b32f8821331b68ebfb9427b247870456f907fc870b50c2e866bc5b6da065cd751ddbf6c43434a030a716f350b703f
 DIST icedtea-3.10.0.tar.xz 1538932 BLAKE2B c92131179a583829d35c0852b7cd46d1fc1a7ba975c0acfc677d51eeb3dbdbde3319af12d0e7b39d4b4d730a9ed11b2499206e02448388132a8b9d56465dc8bd SHA512 af244a8bdb083e6273de14a04c0f2c21513a9cbe3fd2437c1503f3df88ef7ec77449387e24e4d8cb0fe7dbe0b8b023ea6a3041f145a00560999781027322c697
+DIST icedtea-3.11-aarch32-5caf41da4f93.tar.xz 6792096 BLAKE2B 41ef1911520456cbb7e1dc62172ac87f48819b3a9926eea3b61e7c9da3699d6aec445bad879c5588bf84a0a07300ab6c90fa1f18609d0389681df2d0bf5b7342 SHA512 dc59c9a3dd39863b6c64b525902aaab575055b39fe8266e4b59f0cac461b5760418df217fce264962900d7547b16faf7cb01ba6f0486e1af25693a0b433ee310
+DIST icedtea-3.11-corba-cfc35c4598d9.tar.xz 946136 BLAKE2B 184677a88618d09fdfe629b2e6830b3d2530d2b643596c7e1ab397a7efdce9b74b21707e83482c5539c8fda14873f9c5b248c55229efce14b1602f829075f463 SHA512 9b8a44dda0bbfba8dc0d659e0fabf22e84b9931518e4b199a238faa103cbc4ed814c97f0f38f0aed263846b46fc7eab4500ba9759503373083e12cb8b5b364b5
+DIST icedtea-3.11-hotspot-a24b4e46303e.tar.xz 6887280 BLAKE2B fa404d71dd36d4ce297108fd7a9ddc054888f383d239daf018f4a5f8414fc71f1f6c21903a36db70f5ac02c020cde2daf7121ecb40b3f2306dd824c692aea868 SHA512 13fa35f4a4fe01b3da4efb8476c0cb3482a36596eb422f2ad958a4c51efc286962ac3123a75853e84c4db477ac064a0fd3ee5e03f1ea0ec4f7e2c8ac07aa2d0e
+DIST icedtea-3.11-jaxp-1c01fbb460ba.tar.xz 2291488 BLAKE2B 228bdc110a33b904e4d2052eaad5125cf1cfa6b8560890cd25a6f3a269b1d7a66debcdf6dcb3f83dfeb2c044a96b81d355a1721f94ba71d5eb962a5e37453dd7 SHA512 9eba0f6ada2ae8adc1791a91ceb4fba9bd06aee0626cd1b4310ff16c7c8006045fed5fb7f109e490395b70695be4e6bfd6f1f5cbcdb095fb17abf123012a03de
+DIST icedtea-3.11-jaxws-cf4d2b27895c.tar.xz 2274588 BLAKE2B 5aa62c387545e6679c2e7806262bf250e4b424aa240470c3ae7d2a4950be190adf34fb6c16751d0062ffa606c5a04bde64b8dcc2aff1a46043442e340c0d8763 SHA512 ce5f0c2aced1af59f002dc9dc6cba4b9332167e9e019a3040267901ef7f325e05b8c99ed1f276b88ddb4e43cdd1b0c456e0c4dc2222ae6b3800c0502ffa840de
+DIST icedtea-3.11-jdk-34ade0cd2dd5.tar.xz 39248532 BLAKE2B b47eba283afddb0cc22e8ba1904587542535620311e5f4e3c7770bad61a9f149b413ed30c62e43a6d4b395f6e1fa3ca647890097c5c5af4eff60dc63b7bd712f SHA512 411508ed91f14ae1c51ea54de72a943db222ff572f3991631fe1a1fa97f9bb42da1e01ca98893f7236b4b44bae2917fc3f8622d7f94a085be30d437451acd272
+DIST icedtea-3.11-langtools-78414f4f0172.tar.xz 2073920 BLAKE2B 299f8bb215710b692f9cb359951a19acb27d93e7ca048a7e83f1ed2d9bf7101fc48e5512056f70b3e780246410359739a6a23ee691c8ba7777e49630a692022e SHA512 363c376848870c6c28415967561c4b151f1256c38a315fabc69c90425f5255224182045349a00c9433db52c416b7ebffedaa4825c980460541a3f9338adbaa5e
+DIST icedtea-3.11-nashorn-3cb2fe2b1b7d.tar.xz 2317604 BLAKE2B 246d8f69c080b8b8bee1ecfd65d5f157ba8ad4b49474e324a8afe1953e2e3d7161c8456c974aa645357a40c2d1a532a04ea8052634fcde187db7aa58ae606dc6 SHA512 2b46a8599d530a351522420cae8ac780cd2e64a6d7adbff87397a178f12f0a992bccd0f56435582dbd10be2157d4a4540c41b3dca488566162eed680102e58a9
+DIST icedtea-3.11-openjdk-9edccdd36f81.tar.xz 358224 BLAKE2B fe9e2351829f03f4dc5b77b7df12d88e06c617a94e118a9c09dda2feffd6f6dcb419882b57ec7c76e32bc0ff47e797618ddc50d4f460d68d0d73343b2d52f7f7 SHA512 fc3faa7d7b9531f10c40241d89c36854043921f6f1a0851f284bcab36fc54fb0bb8cf8365dd4b2fb22b3ee8ddb8ed4a79e0807f79cb95b4b00f164993f1acc0b
+DIST icedtea-3.11-shenandoah-1e8639cc8075.tar.xz 7028904 BLAKE2B 73a2f02bc95037d62464c3699b34462db73cd5905e88c86124f5bbf016dbfce0b09b8f09b05d835d52c042d9d46097cf0f2ef2c5b165b4c5a45a75392eafb382 SHA512 c35fb93164110d92bba525911bd72760bd74590885884a636e6574da0a22515fa07b4e22d84f020128221c7bd1ec5bc8ddaa9061840a06d98a30ce817ee6b9ff
+DIST icedtea-3.11.0.tar.xz 1552144 BLAKE2B c7ed5a47b71ee5dbd36f05ee775c25041b1bd5286e413e23a2c58a5b10ef9442c465b01cc3b7e29f6f7e085358ab10553b76fb4f134f36784cbaec4a0eedd60a SHA512 a71c9318d49077f8ae27f5c3e0b61df0709eded241f557c886f6b93aa98c13ad78f713d1286da286989bf62866dfff7538ad783eb804a705a160cbc096dea851
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
 EBUILD icedtea-3.10.0.ebuild 12819 BLAKE2B 760968745fa9ee52eb0a701266a0706f57560a3fa16f2a03dd85fdb6f1fe85c9285245f83958ba6dacfbcbcdd01b5fd4500aca93572bdf561b1db9c741acf37c SHA512 73a1a50541898495cd9af6fe5205c94779eed69a54a52a2141b533b6a01aafd08a5ed4603bdfb1d1d2dffc3d4778800928e62567b6614b8ab6a06ce28c63e5d2
+EBUILD icedtea-3.11.0.ebuild 12631 BLAKE2B 1568d3d47b2b53c3247a260bd35cd27d56038c965291ad93eac7ebb8896ddf1160f6f9ae0fc4f3c2c3844123fe5f2c11bccdd835625212100647e1ce17e8a153 SHA512 27850e65cb95734a04fe59070ea5e7366fbe5b8cb0b5d38f29d326f5bc7f897f041c4949e9d2c6516d5c397ba3c7261009a7fececbeb87ba734ade0c06f2c1be
 MISC metadata.xml 2332 BLAKE2B d27aa216aaf2e93f1a939198433d9c3dfffb2426e7ae777cbbe13e353a2f0366d35fc7b3008d9e9c7f6eaa90c3d4a2dd76259e5b8856ca0a5417c1fb6eb2c59b SHA512 ccbd1a4530b69231625896171aceee756d4ecc262b095140ced6cee35f2e844e0dcbd6f6888c4f0356dca91f7eb257e911ae28adbcc33645ea76e7953a272035
diff --git a/dev-java/icedtea/icedtea-3.11.0.ebuild b/dev-java/icedtea/icedtea-3.11.0.ebuild
new file mode 100644
index 000000000000..c9d4250432bf
--- /dev/null
+++ b/dev-java/icedtea/icedtea-3.11.0.ebuild
@@ -0,0 +1,385 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
+# *********************************************************
+
+EAPI="6"
+SLOT="8"
+
+inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator
+
+ICEDTEA_VER=$(get_version_component_range 1-3)
+ICEDTEA_BRANCH=$(get_version_component_range 1-2)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+ICEDTEA_PRE=$(get_version_component_range _)
+
+CORBA_TARBALL="cfc35c4598d9.tar.xz"
+JAXP_TARBALL="1c01fbb460ba.tar.xz"
+JAXWS_TARBALL="cf4d2b27895c.tar.xz"
+JDK_TARBALL="34ade0cd2dd5.tar.xz"
+LANGTOOLS_TARBALL="78414f4f0172.tar.xz"
+OPENJDK_TARBALL="9edccdd36f81.tar.xz"
+NASHORN_TARBALL="3cb2fe2b1b7d.tar.xz"
+HOTSPOT_TARBALL="a24b4e46303e.tar.xz"
+SHENANDOAH_TARBALL="1e8639cc8075.tar.xz"
+AARCH32_TARBALL="5caf41da4f93.tar.xz"
+
+CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
+JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
+JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
+JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
+LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
+OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
+NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
+SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
+AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
+
+CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
+
+DROP_URL="http://icedtea.classpath.org/download/drops"
+ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+	http://icedtea.classpath.org/download/source/${SRC_PKG}
+	${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
+	${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
+	${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
+	shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
+	arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
+	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="+alsa cacao +cups doc examples +gtk headless-awt
+	jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
+	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test +webstart zero"
+
+REQUIRED_USE="gtk? ( !headless-awt )"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.2.12"
+X_COMMON_DEP="
+	>=media-libs/giflib-4.1.6:0=
+	>=media-libs/libpng-1.2:0=
+	>=x11-libs/libX11-1.1.3
+	>=x11-libs/libXext-1.1.1
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.0.3
+	x11-libs/libXcomposite"
+X_DEPEND="
+	x11-base/xorg-proto
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2"
+
+# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
+COMMON_DEP="
+	>=dev-libs/glib-2.26:2=
+	>=dev-util/systemtap-1
+	media-libs/fontconfig:1.0=
+	>=media-libs/freetype-2.5.3:2=
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg:0=
+	kerberos? ( virtual/krb5 )
+	sctp? ( net-misc/lksctp-tools )
+	smartcard? ( sys-apps/pcsc-lite )
+	system-lcms? ( >=media-libs/lcms-2.9:2= )"
+
+# Gtk+ will move to COMMON_DEP in time; PR1982
+# gsettings-desktop-schemas will be needed for native proxy support; PR1976
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea:0
+	!dev-java/icedtea-web:7
+	>=gnome-base/gsettings-desktop-schemas-3.12.2
+	virtual/ttf-fonts
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )
+	gtk? (
+		>=dev-libs/atk-1.30.0
+		>=x11-libs/cairo-1.8.8
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.8:2
+		>=x11-libs/pango-1.24.5
+	)
+	!headless-awt? ( ${X_COMMON_DEP} )
+	selinux? ( sec-policy/selinux-java )"
+
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# perl is needed for running the SystemTap tests and the bootstrap javac
+# lsb-release is used to obtain distro information for the version & crash dump output
+# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
+# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
+# Ant is no longer needed under the new build system
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
+	|| (
+		dev-java/icedtea-bin:8
+		dev-java/icedtea-bin:7
+		dev-java/icedtea:8
+		dev-java/icedtea:7
+		dev-java/openjdk:8
+		dev-java/openjdk-bin:8
+	)
+	app-arch/cpio
+	app-arch/unzip
+	app-arch/zip
+	app-misc/ca-certificates
+	dev-lang/perl
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl:0 )
+	sys-apps/attr
+	sys-apps/lsb-release
+	x11-libs/libXt
+	virtual/pkgconfig
+	pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+icedtea_check_requirements() {
+	local CHECKREQS_DISK_BUILD
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="9000M"
+	else
+		CHECKREQS_DISK_BUILD="8500M"
+	fi
+
+	check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	icedtea_check_requirements
+}
+
+pkg_setup() {
+	icedtea_check_requirements
+
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-8 icedtea-bin-8
+		icedtea-7 icedtea-bin-7
+		openjdk-8 openjdk-bin-8"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${SRC_PKG}
+}
+
+src_configure() {
+	# For bootstrap builds as the sandbox control file might not yet exist.
+	addpredict /proc/self/coredump_filter
+
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+
+	local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
+	local vm=$(java-pkg_get-current-vm)
+
+	# gcj-jdk ensures ecj is present.
+	if use jbootstrap || has "${vm}" gcj-jdk; then
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		config+=" --enable-bootstrap"
+	else
+		config+=" --disable-bootstrap"
+	fi
+
+	# Use Zero if requested
+	if use zero; then
+		use_zero="yes"
+	fi
+
+	# Use JamVM if requested
+	if use jamvm; then
+		use_jamvm="yes"
+	fi
+
+	# Use CACAO if requested
+	if use cacao; then
+		use_cacao="yes"
+	fi
+
+	# Are we on a architecture with a HotSpot port?
+	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
+	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
+		hotspot_port="yes"
+	fi
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use Zero for now until alternate VMs are working
+	if test "x${hotspot_port}" != "xyes"; then
+			use_zero="yes"
+	fi
+
+	if use shenandoah; then
+		if { use amd64 || use arm64; }; then
+			hs_config="--with-hotspot-build=shenandoah"
+			hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
+		else
+			eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
+		fi
+	else
+		if use arm ; then
+			hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
+		else
+			hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
+		fi
+	fi
+
+	# Turn on JamVM if needed (non-HS archs) or requested
+	if test "x${use_jamvm}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-jamvm"'
+		fi
+		ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
+		jamvm_config="--enable-jamvm"
+	fi
+
+	# Turn on CACAO if needed (non-HS archs) or requested
+	if test "x${use_cacao}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-cacao"'
+		fi
+		ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
+		cacao_config="--enable-cacao"
+	fi
+
+	# Turn on Zero if needed (non-HS/CACAO archs) or requested
+	if test "x${use_zero}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+		fi
+		zero_config="--enable-zero"
+	fi
+
+	# PaX breaks pch, bug #601016
+	if use pch && ! host-is-pax; then
+		config+=" --enable-precompiled-headers"
+	else
+		config+=" --disable-precompiled-headers"
+	fi
+
+	config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
+		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
+		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
+		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
+		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
+		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+		--with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--with-pkgversion="Gentoo ${PF}" \
+		--disable-ccache \
+		--disable-downloading --disable-Werror --disable-tests \
+		--disable-systemtap-tests --enable-improved-font-rendering \
+		--enable-system-jpeg --enable-system-zlib \
+		$(use_enable headless-awt headless) \
+		$(use_enable !headless-awt system-gif) \
+		$(use_enable !headless-awt system-png) \
+		$(use_enable doc docs) \
+		$(use_enable kerberos system-kerberos) \
+		$(use_enable system-lcms) \
+		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		$(use_enable sctp system-sctp) \
+		$(use_enable smartcard system-pcsc) \
+		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
+}
+
+src_compile() {
+	default
+}
+
+src_test() {
+	default
+}
+
+src_install() {
+	default
+
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}${dest#/}"
+
+	if ! use alsa; then
+		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if ! use examples; then
+		rm -r "${ddest}"/demo "${ddest}"/sample || die
+	fi
+
+	if ! use source; then
+		rm -v "${ddest}"/src.zip || die
+	fi
+
+	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# We need to generate keystore - bug #273306
+	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+	mkdir "${T}/certgen" && cd "${T}/certgen" || die
+	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+		openssl x509 -text -in "${c}" >> all.crt || die
+	done
+	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+	java-vm_install-env "${FILESDIR}/icedtea.env.sh"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postrm
+}
diff --git a/dev-java/jdbm/Manifest b/dev-java/jdbm/Manifest
index 259e015ff65e..30b91698f955 100644
--- a/dev-java/jdbm/Manifest
+++ b/dev-java/jdbm/Manifest
@@ -1,4 +1,4 @@
-AUX jdbm-0.12-buildfile.patch 2260 BLAKE2B 8eb654c83944cd2b1ba53d65cd0ba1d99a41e017e18c847b44d0c1775b04138e33de9681e3aa6e178ecb7080c3b857f880720930ee8e8c0ee2ef546814cc5b46 SHA512 22a86d1d647bac6d384fcf69cfb17013396235c113d40c5c38cfa05702ab38e2540d5bd38921d0975f4cac0f22d717b550417569a8dc9a4442abb392e9865565
+AUX jdbm-0.12-buildfile.patch 2267 BLAKE2B 156d36b09fe3aadb1128a7c157e5970d2fe8444978018de933006bd45bb49f941da4946a2b797e8bd20b4d1cb3eb61163936f6c05dbfe9d0a292f8522569bc22 SHA512 b54ff93a3af363efef7495fa32aa5fcc0ba1317d3a65059d9b64147393d2a51f5a344e267ec7b660843b66c0bd0c4cc1bcb5d4c5d3a9e32584e6118ab5470063
 DIST jdbm-0.12-src.zip 969490 BLAKE2B c40ec523c0dfbfe617ffb8b6bb91a1c43cc65d735c9e80970ebfc765c4ef304fa71497670b747c42db55b067a6b0600b184f2ca060089ccfd289849c4f515fc4 SHA512 cf65a89d1b3262aba40a2b10cdf3bbc1ed75fd60facfbd22baad2cfbcf81b5d67d3b7a372c7018907eedbcbb0114ddbb8d13b6cb7bc47896c47997996b0d57ec
-EBUILD jdbm-0.12-r2.ebuild 879 BLAKE2B ff0b3495b8dd43d2511553dbb144931c21595b08e810c0e4e1ede122dcef2dc2b2e9e98e59421e7422075aeb75ca5fbc6948a14c2790e7603486784b67eb0bbc SHA512 5c825d35e96b4a86322ea751c2300d22f43c5b532305ea410f438f474f43c8eb266aaeb170f5e3c39f7660bee0a3dd7074b4e44c393bd8fc39505773d67e9373
+EBUILD jdbm-0.12-r3.ebuild 846 BLAKE2B c62d5e095bee69120b2e1eac308b6e7d842f818df6e93338b5a0cc3927e4cd4493afc4d90fb8a84bc7d900c2d95519d1ee61c9c41115d9962fdb90ae2037a134 SHA512 33defd875d4e1deebb4c26a0454e6bad2050e38265ba87c14d58eb59edf72ef442d09c8f712c0a74b12a572463a37da5ca58f54f6533d02009efcdb50e267ece
 MISC metadata.xml 310 BLAKE2B 39f67322e71ef31c835b666cf49f3e80d6c16b122d878ac9f19217664f518f69f64cfcd395f5c61512be2e4362117902feb3c661a9596c15c97934e0aee31445 SHA512 2a8c6e7833374873e0087786096a22d53369de951067051786d9d11fb657c8285d1f3dfc1c5b77a12f3172096eef2cfe4129477990806c7f193dad47a068e724
diff --git a/dev-java/jdbm/files/jdbm-0.12-buildfile.patch b/dev-java/jdbm/files/jdbm-0.12-buildfile.patch
index 23957e131c50..0cc6d5e3cc05 100644
--- a/dev-java/jdbm/files/jdbm-0.12-buildfile.patch
+++ b/dev-java/jdbm/files/jdbm-0.12-buildfile.patch
@@ -1,5 +1,5 @@
---- build.xml.orig	2005-02-05 23:34:43.000000000 +0100
-+++ build.xml	2005-02-06 00:02:39.392389088 +0100
+--- a/src/build.xml	2005-02-05 23:34:43.000000000 +0100
++++ b/src/build.xml	2005-02-06 00:02:39.392389088 +0100
 @@ -1,9 +1,9 @@
 -<project name="JDBM" default="main" basedir=".">

 +<project name="JDBM" default="main" basedir="..">

diff --git a/dev-java/jdbm/jdbm-0.12-r2.ebuild b/dev-java/jdbm/jdbm-0.12-r3.ebuild
index 1b4cb774349c..4a625eb0a266 100644
--- a/dev-java/jdbm/jdbm-0.12-r2.ebuild
+++ b/dev-java/jdbm/jdbm-0.12-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 JAVA_PKG_IUSE="doc source"
 
@@ -14,26 +14,25 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 LICENSE="BSD"
 SLOT="1"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 # Needs to depend on 1.3 because this uses assert
 # so we need -source 1.3 here.
-RDEPEND=">=virtual/jre-1.3"
-DEPEND=">=virtual/jdk-1.3
-	app-arch/unzip"
+RDEPEND="
+	>=virtual/jre-1.3"
 
-src_unpack() {
-	unpack ${A}
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.3"
 
-	cd "${S}/src"
-	epatch "${FILESDIR}/${P}-buildfile.patch"
+PATCHES=( "${FILESDIR}/${P}-buildfile.patch" )
 
-	cd "${S}/lib"
-	rm -v *.jar || die
+src_prepare() {
+	default
+	java-pkg_clean
 }
 
 src_compile() {
-	cd "${S}/src"
+	cd "${S}/src" || die
 	java-pkg-2_src_compile
 }
 
diff --git a/dev-java/jline/Manifest b/dev-java/jline/Manifest
index beff0e251d2b..3713b2057255 100644
--- a/dev-java/jline/Manifest
+++ b/dev-java/jline/Manifest
@@ -2,6 +2,6 @@ AUX maven-build.properties 501 BLAKE2B aaaaeb13e4e23588d6fe8c5e990b1e95edade85a7
 AUX maven-build.xml 8634 BLAKE2B 4d1078e1201baf11da35772d0e48304522cad6b606a6d601c449bf1d97b2a43725ddcf703dea154ac923955aac5489d164686fb042fcb7c1753d0e9ef619a283 SHA512 45648b88f3df01e0623483c6c409ce1fb57b6b73e62775064b4bc7762d1dc3a3ead3a4925efe987986081ed34c26195827f3f34a1b631fdf4e7ce227376c2936
 DIST jline-1.0.zip 463082 BLAKE2B 4f4eec5a2674bf97ed9fe83c60d339fce54dcd556aca6e95db74438e87253fd4e36e4eef26b3ac14ed84fff3d2fe1b58ba3a6fe13f33d96fe50a34f7bb34f541 SHA512 2957e19a3536d89aeaf8f27afb1f8eb4eb8bcc99560244c7f1ba14693a84a2f5e677a6c21d5f85ec519674cc4cd6cb3c9e4725cb4797144168d2f6df3954aba9
 DIST jline-2.12.1.tar.gz 97289 BLAKE2B 375711ad78cba26c0b4702dd739a18dd4db2fd1e8b16ce817dd1f567c405b7b0f96c72a6c6b7fabff1520617cf9149a29040e132d0b61e2d57149bb83b404c8d SHA512 368492fa0b28e6aa3827db05d266b332935d9a03c2f6645d039941c61a698e85fd57accfac444503de4cb2f2dae5787496924b8d258faad1c18b6cafe787f99d
-EBUILD jline-1.0.ebuild 1644 BLAKE2B 4069f204bdcd09f156112ca33c12fbdc91da13f6a3ec124104ef54cbabb3b0acd9be65a81fa2e639d3f91f155b21eb8d0afb53abc9d74bcac22a1acedfac761b SHA512 195e08810e2e05ab6c3b2009ae407d3040505dfb12c303164e22110a9695e471d030e513c7cdfeb7bdcf0374e3f2fed3c1330138db0d119ac667e5a25e7ce26b
+EBUILD jline-1.0-r1.ebuild 1667 BLAKE2B 1f394d1712c8f41fd5aff73df0fab877923793c58ac77c2042dd173a58c5097b949bf765e047e9406571479d3659273431650d09a6606cb644034feda54f06e4 SHA512 312aa559051fcaf628a18e95ddc55944fc2fceffe8e5fb16ed92687171c43a62e06cc5cda00777e765364b848dafcacdc681eaa35cdc997af71030232638072b
 EBUILD jline-2.12.1-r1.ebuild 1262 BLAKE2B 21b4efdf0413e9af3693154de0e7259f098b31bda663edb5ca40ba3f7ce46c03f7f98924ef0b4cc40a0ecbcca8ecfe6a7a40065fe81bcb0f0558187d6a3d485a SHA512 47891ca0a85a3e3414bab175e9cfd95b037f855effb069f682335042de102a622e16dc7bb8236481347d5e7493c1186ee9dff690c3ac72cc447b8542288e3ced
 MISC metadata.xml 375 BLAKE2B 6ac502feb83c678011ccf4b923c31184399f1feafdf3dbd8703d0c3c69900c1460da474eeb304d48590cb19ab7d128c8d8c0db48982e1283b527a0dfaf1668c2 SHA512 17a44da075005f0417e99ae638ba547800d799b98375f73c4bf7fc418b12e33e916952812850b63c623234bce98ebfd6eb525f7015e67cdaee16c38ad5f4b684
diff --git a/dev-java/jline/jline-1.0.ebuild b/dev-java/jline/jline-1.0-r1.ebuild
index 5d846154e3f4..60944d342c3e 100644
--- a/dev-java/jline/jline-1.0.ebuild
+++ b/dev-java/jline/jline-1.0-r1.ebuild
@@ -1,40 +1,53 @@
-# 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="A Java library for handling console input"
+DESCRIPTION="Handle console input in Java"
 HOMEPAGE="http://jline.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
 
-DEPEND=">=virtual/jdk-1.4
+DEPEND="
+	>=virtual/jdk-1.6
 	app-arch/unzip
-	test? ( dev-java/ant-junit )"
-RDEPEND=">=virtual/jre-1.4"
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:0
+	)"
+
+RDEPEND="
+	>=virtual/jre-1.6"
 
 S="${WORKDIR}/${P}/src"
 
-java_prepare() {
-	rm -fv "${WORKDIR}"/${P}/*.jar || die
+src_prepare() {
+	default
+	java-pkg_clean
 
-	# we don't support maven for building yet. this build.xml was generated by:
+	# we don't support maven for building yet.
+	# this build.xml was generated by:
 	# - mvn ant:ant
 	# - tweak build.xml to not load properties from home dir
 	# - tweak the test target to match the test cases
 	# - change maven.repo.local from ~/.maven to "lib" in .properties
 	# - change classpath definitions to "*.jar"
+
 	cp "${FILESDIR}/maven-build.xml" build.xml || die
 	cp "${FILESDIR}/maven-build.properties" . || die
 	java-ant_ignore-system-classes
 
-	mkdir lib && cd lib || die
-	use test && java-pkg_jar-from --build-only junit
+	if use test; then
+	    mkdir lib || die
+	    cd lib || die
+		java-pkg_jar-from --build-only junit
+	fi
 }
 
 src_compile() {
@@ -51,7 +64,7 @@ src_test() {
 
 src_install() {
 	java-pkg_newjar target/${P}.jar
-	#no api docs in this release
-	#use doc && java-pkg_dojavadoc ../apidocs
+	# no api docs in this release
+	# use doc && java-pkg_dojavadoc ../apidocs
 	use source && java-pkg_dosrc src/main/java
 }
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index eec4fab4a92f..ccfe7ab3b7f4 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,7 +1,6 @@
 AUX junit-3.8.2-build.xml 3179 BLAKE2B df7dd61b577d415f807d234fe41255bda57235465ec6a96dc793f3c4852278978f4c2be6df89f4910b96b450a280bb0e9bcaf50463430f4769c116bca4ea868c SHA512 6d2c74c70569feed235db70fdb646c813ce9453b5e7fae6d5fe8c818d0ce820fc155eef8426d8f3263cff45cd4b78542d5524aa1d5efbb84e43698c1d4466f55
 DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
 DIST junit4-r4.12.tar.gz 443804 BLAKE2B b36248266eb83d8f2dfb1c525f635a4fce5a46c6042652ef27a5d405b83c471848edf83e799a4d1e950d83e127caa288f453edf19959a9a8aa5a9e26eeb4e771 SHA512 ba612598fa6c328e8f4bbea3afda08b459a110837ca3805a62e811535f7bca8d04509f8fe51a413c7bc855fccee35d6946c9eece4dd01726d12454c002a4de32
-EBUILD junit-3.8.2-r1.ebuild 1003 BLAKE2B 91753d0e74ce8efd135f394df69342ffdb113bbba628ebd8a5baf4af8e1a967c6e319a05192b3d35d4717e32b1324afcfd45a0115c284c8a59c8d83320a13598 SHA512 e6ed543345ffc53cc86e1a6582ece77660c9514e522d5f7b46038281ed13a67d70ee5263eb420f11a7b9a1155255161cb0beb40a639c3ddc112273eec3ae4050
-EBUILD junit-3.8.2-r2.ebuild 831 BLAKE2B e07f45d637d4aaee89c2ff51f168fd610cc6bb655b2da6efcaa3bdc8392b4a89c860c682a50fd1e4d3bcbea693d61142c7b8c95497f6f1cfe81d7cf2bf9f00d1 SHA512 2db4e78da194aaab043bca14d6679f5ad6b33b88fc01a55ad828bc9c43e47b3de1ba7a3c6e6bd8c867faceaf30cc45debdd9a9fab86c7a0d2b7153cb986b4c06
+EBUILD junit-3.8.2-r2.ebuild 825 BLAKE2B 34421948bc01948ec4558d90a5095580618dc7f39772035c838fffec10f9fcb367c600ec73a5f464a91688179062a4b187bc4cd3a888f5553677816002bcc52a SHA512 5af2dda815227e335267a0993fbd9064b03f411adf886f6dc38f06a44b169103f051f1e9914d0895bef40525765c04527bde431cbf125794e13430a60e30f990
 EBUILD junit-4.12-r1.ebuild 1464 BLAKE2B c5c998dca82ed919aef941435b371d5f5788afbbe952b22f976740d53a37d8daeb6851e5c74c2d2ac6d9c066cb75f777372f272c5af4095e59f0adb80b980316 SHA512 a2f0b67b093f7bc86ac7a671bd66b69e67d561140ceffbf21e5ac5a3ebe935cb2bc3907b5f3bfae2248f6f6b2561d02e4afd327877adc8f761b393687306ee29
 MISC metadata.xml 367 BLAKE2B 7cd798ae028c83275e61522be10a35abba419a823042be242ee7fdf7e0ccfc978e817affaaf154b8d0723f502499f17bb81b0622fa493dc812b82ad23dfa647b SHA512 44e492dfaaa9faf54f4aaf420d5816da8d117951d6a52e37c76a9e533fcefbeaa3c44bafa4d525f878deb3af2b7f426e72a62b16464e85ce9690c61b1f0da71f
diff --git a/dev-java/junit/junit-3.8.2-r1.ebuild b/dev-java/junit/junit-3.8.2-r1.ebuild
deleted file mode 100644
index 309adf1024bf..000000000000
--- a/dev-java/junit/junit-3.8.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P=${P/-/}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Simple framework to write repeatable tests"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-HOMEPAGE="http://www.junit.org/"
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	unzip src.jar || die
-	rm -v *.jar || die
-	rm -rf javadoc ${PN}${PV} || die
-	cp "${FILESDIR}/${P}-build.xml" build.xml || die
-}
-
-EANT_BUILD_TARGET="dist"
-
-src_install() {
-	use source && java-pkg_dosrc ${PN}
-	cd ${MY_P}
-	java-pkg_dojar ${PN}.jar
-	dohtml README.html cpl-v10.html || die
-	if use doc; then
-		dohtml -r doc || die
-		java-pkg_dojavadoc javadoc
-	fi
-}
diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild
index 362aa0129f62..95e8f4c93c8e 100644
--- a/dev-java/junit/junit-3.8.2-r2.ebuild
+++ b/dev-java/junit/junit-3.8.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 HOMEPAGE="http://www.junit.org/"
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/libreadline-java/Manifest b/dev-java/libreadline-java/Manifest
index a9642f07f8ed..ee184e3fffb4 100644
--- a/dev-java/libreadline-java/Manifest
+++ b/dev-java/libreadline-java/Manifest
@@ -1,6 +1,6 @@
-AUX libreadline-java-0.8.0-gmake.patch 532 BLAKE2B 2bdc0e198b5daf274ec2bce5cef04281793957ed5a9fd3cd182188ef18794a5c96081386ebc4e6031d0366b0d263062bc18e6e986a9455084ea8f5d1591ac3c3 SHA512 079f978e90968a6d04f717e25511320f69e4eea76b64b9ae928eea868433d4cfff2586c2598ff0b73eeb5f6146066d2926e5c6c7ec077a69e0f2abbcabb9c2c7
+AUX libreadline-java-0.8.0-gmake.patch 367 BLAKE2B 149491acf9d5383fe095a8533b6ffcfc966f3aeb2382d8ac1e4d03b1f8388c1d0d5a2475e83cc2c827fdc8e308b3536b98934c6adbe789100fefed4be3797d3e SHA512 2d91eb76dc14e37ea9b7b0a4e3aa87ae22b8fbf6ef4ad958318f6ecc0aaff331f6d5563c11c59fbafa0a1b36f30ed5c41850f4badaf7830ddd64d24d8569fa4c
 AUX libreadline-java-0.8.0-respect-flags.patch 651 BLAKE2B e8c4fe1901fb87b5f8b7fa9faa21e5446385e029aa034a482b883df174c0889c65ca09d7f34a7728d7dc2d8fc90ea3373f8dcb16f740befe5b9183481ed32844 SHA512 b3419484c6732d3396ae90fba0c77bec656bb705d63c8ec2bd999222c8e687d6fbecebfa10bcb91c8780e6ffa922e2d58318978073f382c4b7601cd569ec7abd
-AUX termcap-to-ncurses.patch 498 BLAKE2B 693eddef846b0b4e3f570d0cac46164b0990deeacdea55ad0ef547c3c7eabf7a682d2ac9c3360366d478a00c68703092f0641cdce1cc9ab6e6f464be4c2f8d02 SHA512 43b6494d94da3d8874da34caf3e191e489bdea3e680d76514f3acf7d1c55db784efd8220e9aa914831c8dc753c231a06d5c3980bdd28835a3369f4c1d862a932
-DIST libreadline-java-0.8.0-src.tar.gz 77122 BLAKE2B cd25c3aea6189d0d48a10c26ad2f359e7f22533fd4a22d22b8491fd19c2d12c0fda6c8f1b8908bd66be8094efb374a51c6877eb89835360c4a2be8d9107d1336 SHA512 16bbb01a4852244387d63d8d5a7203e2862f235d8a68b436f33b586c7a6ea5297d1fabfa910c54bc33cfdc43b5dfe80e9eb4828b80196a974410c90387c3d1f2
-EBUILD libreadline-java-0.8.0-r3.ebuild 1282 BLAKE2B ab39d4e9fa4d863a94355a886baca4a94804c52b95483dade22d644daf3fd0137ee5821d93d6089f55458ab40313fa7bb55a5c02aa7635f429616cd5341c828d SHA512 cc71cfc74461c13c190ef135d6a53a3f2704888b77ddb8a9401cdec69dc92fcac9fbe850c8eb079198edb9aec225f492118cc83bb3205be0105ecad313ed6221
+AUX termcap-to-ncurses.patch 502 BLAKE2B 4695fdfcb2329e8f2ba555fc06be7e9b3d1039509e046aa1059e8bd954840f641d1b0f8be7dff04850ef5dd54435a204cfe468e778f4767f1a8c6ddf1391cef1 SHA512 a7d157fe3455b10641ea15285ab610a1ef3d4c8b8906408e9caa483f8453c96143e02dcdd193bb11514a4e4c1e53c810de5346e88ea843ad39166a624c33f8f9
+DIST libreadline-java-0.8.0.tar.gz 77122 BLAKE2B cd25c3aea6189d0d48a10c26ad2f359e7f22533fd4a22d22b8491fd19c2d12c0fda6c8f1b8908bd66be8094efb374a51c6877eb89835360c4a2be8d9107d1336 SHA512 16bbb01a4852244387d63d8d5a7203e2862f235d8a68b436f33b586c7a6ea5297d1fabfa910c54bc33cfdc43b5dfe80e9eb4828b80196a974410c90387c3d1f2
+EBUILD libreadline-java-0.8.0-r4.ebuild 1401 BLAKE2B 181f24049a3a7ab1418d943763317de428dc297869983ab5f8d02ffae7e6fb53f48501ae5eb4029917e110eb53b61d2d683efb64bcfc1d63ba8970ab8f4b42db SHA512 c4ab6c49ee4a19f29365373793d46c4a55d7d3cd94eef1cb4090ec3e6e92cb6638be771257cde9fcf98d46d463ec2fcc817fa24beac95cfdf5370c2c63bf93a9
 MISC metadata.xml 319 BLAKE2B e82b45bce13253c5e40fffb3429166c0613d8841af08a626d6a9d70bfe5f69c036e8fdc4248cfe632ab8ccc54b6901df0ba02ce2faf0ad18b649ef87f92d9bed SHA512 e13714611711ecb54943d5d3ccc5a8ae8f9dcfb6e9a6e6c6e96d04d7d80dec6a07d76225850cb2cdbb6b2d6a99f0c5c5fd0c9c4a9a3c0724c6e8ed7b21a75e8f
diff --git a/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch b/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch
index 6de5cde18e89..34a01e48ae55 100644
--- a/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch
+++ b/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch
@@ -1,7 +1,5 @@
-Index: libreadline-java-0.8.0/src/native/Makefile
-===================================================================
---- libreadline-java-0.8.0.orig/src/native/Makefile
-+++ libreadline-java-0.8.0/src/native/Makefile
+--- a/src/native/Makefile
++++ b/src/native/Makefile
 @@ -69,13 +69,13 @@ all: $(T_LIBS) 
  lib: $(ROOTDIR)/$(LIB_PRE)$(TG).$(LIB_EXT)
  
diff --git a/dev-java/libreadline-java/files/termcap-to-ncurses.patch b/dev-java/libreadline-java/files/termcap-to-ncurses.patch
index 22921c80ba54..256cf6573da1 100644
--- a/dev-java/libreadline-java/files/termcap-to-ncurses.patch
+++ b/dev-java/libreadline-java/files/termcap-to-ncurses.patch
@@ -1,5 +1,5 @@
---- src/native/Makefile.org	2004-09-07 16:43:16.703100016 +0200
-+++ src/native/Makefile	2004-09-07 16:43:28.804919625 +0200
+--- a/src/native/Makefile.org	2004-09-07 16:43:16.703100016 +0200
++++ b/src/native/Makefile	2004-09-07 16:43:28.804919625 +0200
 @@ -45,8 +45,8 @@
  CFLAGS=-DWIN32=$(WIN32) -D__IBMC__
  else
diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild
deleted file mode 100644
index 3fd6a4df55eb..000000000000
--- a/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 eutils
-
-DESCRIPTION="A JNI-wrapper to GNU Readline"
-HOMEPAGE="http://java-readline.sourceforge.net/"
-SRC_URI="mirror://sourceforge/java-readline/${P}-src.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="elibc_FreeBSD"
-
-COMMON_DEP="sys-libs/ncurses"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-RESTRICT="test"
-
-java_prepare() {
-	epatch "${FILESDIR}/termcap-to-ncurses.patch"
-	# bug #157387, reported upstream
-	epatch "${FILESDIR}/${P}-gmake.patch"
-
-	# bug #157390
-	sed -i "s/^\(JC_FLAGS =\)/\1 $(java-pkg_javac-args)/" Makefile || die
-	if use elibc_FreeBSD; then
-		sed -i -e '/JAVANATINC/s:linux:freebsd:' Makefile || die "sed JAVANATINC failed"
-	fi
-
-	#Respect CC CFLAGS LDFLAGS #336302 #296741
-	epatch "${FILESDIR}"/${P}-respect-flags.patch
-}
-
-src_compile() {
-	emake -j1 || die "failed to compile"
-	if use doc; then
-		emake -j1 apidoc || die "failed to generate docs"
-	fi
-}
-
-src_install() {
-	java-pkg_doso *.so
-	java-pkg_dojar *.jar
-	use source && java-pkg_dosrc src/*
-	use doc && java-pkg_dojavadoc api
-	dodoc ChangeLog NEWS README README.1st TODO || die
-}
diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r4.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r4.ebuild
new file mode 100644
index 000000000000..ba0a6235e08f
--- /dev/null
+++ b/dev-java/libreadline-java/libreadline-java-0.8.0-r4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 eutils
+
+DESCRIPTION="A JNI-wrapper to GNU Readline"
+HOMEPAGE="http://java-readline.sourceforge.net/"
+SRC_URI="mirror://sourceforge/java-readline/${P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="elibc_FreeBSD"
+
+CDEPEND="sys-libs/ncurses:0="
+
+RDEPEND="
+	>=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	${CDEPEND}"
+
+RESTRICT="test"
+
+# 1: See bug #157387 reported upstream.
+# 2: Respect CC CFLAGS LDFLAGS, see bugs #336302 #296741.
+PATCHES=(
+	"${FILESDIR}/termcap-to-ncurses.patch"
+	"${FILESDIR}/${P}-gmake.patch"
+	"${FILESDIR}/${P}-respect-flags.patch"
+)
+
+DOCS=( ChangeLog NEWS README README.1st TODO )
+
+src_prepare() {
+	default
+
+	# See bug #157390.
+	sed -i "s/^\(JC_FLAGS =\)/\1 $(java-pkg_javac-args)/" Makefile || die
+	if use elibc_FreeBSD; then
+		sed -i -e '/JAVANATINC/s:linux:freebsd:' Makefile || die "sed JAVANATINC failed"
+	fi
+
+}
+
+src_compile() {
+	emake -j1
+	if use doc; then
+		# src/org/gnu/readline/Readline.java is completely bogus and generate a
+		# truckload of errors. Let's call make without catching anything. :(
+		make -j1 apidoc
+	fi
+}
+
+src_install() {
+	java-pkg_doso *.so
+	java-pkg_dojar *.jar
+	use source && java-pkg_dosrc src/*
+	use doc && java-pkg_dojavadoc api
+}
diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 14422d2629cd..e6caf535f430 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -71,6 +71,6 @@ DIST F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.
 DIST F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip 459564 BLAKE2B 8d847c768f545b668838b7adce3f0eba4b3b7b4f56469b59e658da0089313748843d08a4f0df180824a3a5e516fb9f103e259c37b315b0352daf58e8ff711470 SHA512 8add9ad7e3f2fb551c11841ad991f204dbeadf7d88cf2e10609644deaa1012095579fb32d568aa67715108062836b48d5c17fd69d5b61d33bca38ad85a617ab5
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-ide-8.2-r1.ebuild 29502 BLAKE2B a602e565fac2cfebfa905a264795bd638e26cff038d8dd40104b19c398d938c054cfcc5cdd8d90354d16fe16e384d6a28811c1685f955fba7628990cf99b66bb SHA512 b240c2d2e3a76ab7b8dc9f0fead272caa85ec2583c25d4e486ec0a9396f802fd5f2b6b9a261ddd45c3fb8ef6119fc92904abef83a496ed3b6677a174c16b8a34
-EBUILD netbeans-ide-8.2.ebuild 29489 BLAKE2B 12c8c79b8566387e30401dc33b411c5491702b1cdf2f72486afdb6be42a9659d5465bafdd386c7ecbeaed4181f0b9cfb8ad039b99b92c801fe441da9d23f31c5 SHA512 4be4bb7912bef84b19a4daeab23291a7480564906834d0190f5ff2440e52ce16228defebea3c1aab03152c2eb1022e43d5ffbe5428b3c95649d531e66d0da248
+EBUILD netbeans-ide-8.2-r1.ebuild 29488 BLAKE2B 247c7e3ee323e91beb359c972a9a2b465c7dd1c92d01254dc2823b3dad9a62b868e254f35c5d438fbaf5342f6e1b6d5b4b204868841582656a4d8edc10cc4c6c SHA512 2bbcd0e7a5710270ce5f2565a244533a39f5e4720828d4004ba771edffec52a32055e5f8a8ff6ab5bb0c3f28aa1578c035145ea8f9d8c2d94d9f74cec848b8c9
+EBUILD netbeans-ide-8.2.ebuild 29478 BLAKE2B 762be6b50605015c8a63dbd891a16f60aacc73f84223ffd29a56f5fc9d4e599677e9187c92d8fa3953518e9b37ced817f0a976b85bc825a2e0f0253e9e8746c5 SHA512 44b7d8cf9eb45923c72b129880b1a49378e9ca2ad89c4651c9b7be40cef499c9741e1683576a2328e47f6b753bb5c1e6c92e6eb23e732445a8efd9fd626ce389
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild
index 841b1b8c9e65..2b8cd1b3026f 100644
--- a/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild
+++ b/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -106,7 +106,7 @@ CDEPEND="virtual/jdk:1.8
 	dev-java/rhino:1.6
 	dev-java/saxon:9
 	dev-java/smack:2.2
-	>=dev-java/sun-jaf-1.1.1-r1:0
+	dev-java/sun-jaf:0
 	dev-java/tomcat-servlet-api:2.2
 	dev-java/ws-commons-util:0
 	dev-java/xerces:2"
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
index 1d445837b6c6..96b2ffbcf8a9 100644
--- a/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
+++ b/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -106,7 +106,7 @@ CDEPEND="virtual/jdk:1.8
 	dev-java/rhino:1.6
 	dev-java/saxon:9
 	dev-java/smack:2.2
-	<=dev-java/sun-jaf-1.1.1:0
+	dev-java/sun-jaf:0
 	dev-java/tomcat-servlet-api:2.2
 	dev-java/ws-commons-util:0
 	dev-java/xerces:2"
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 9916b145fdba..97f605c98216 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,15 +1,11 @@
 AUX openjdk-bin-11.env.sh 496 BLAKE2B 6a99de9730f8e84f6082a08fc925126a2fa1579f040b7f083af371218c4523956d5a86777e1bfbca7a63a717992d1a170d539d04f26f5317c3fbb9a14972c191 SHA512 94ec17c26c7305c57fb53356a4477711fd987c4d48af114f481579f316c20ed487ec40124361bd0cf2c947f59eaf93ca629975f9e999d47f5025269187db82ad
 AUX openjdk-bin-8.env.sh 705 BLAKE2B 0e155706fa9633a9a2e54ae2c9ecb95516c0b46ead84e24dc4c4d79a1b67644eedc6b97e6d4e17da4f6162e2ce7bfafe60dddc950e7f76a666af46920a8a5025 SHA512 ca6fc7b0889ae3d2be386696eadaf9f25fdedaf94cb24696a2de56214695cb0211226bc87671449bf366763f568229b22409201e532d14394c641164c48ffe2d
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.1_13.tar.gz 193388219 BLAKE2B 21ff9bcd5288a17ff7f660fb9b1bbb6c38589fea72850729227a985dce1966c6d0b0d6c64ad6885c17612d215e58a50cec5f70205877bb26c70924b15f92886b SHA512 200ebd5882e2ebd315a2d0fdd800d70b52d468022ae565756ccd56e1fdd2464b459753cfad6c5f46a61cdda8a003cdfe031c2a6a12e047bbe7ee2133dd048546
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.2_7.tar.gz 194181157 BLAKE2B 7883e6846670c87f4ed8338804671bff19ba2910e1e96eacd9729f2ba64e9c6b460d300080e3cd3a4f94722ff9942832681bf23f64e9401e07d824028614874f SHA512 d982d4ba8c1b99b8685b36b9c0b6bb6ff8f8ec04de74945876915e01827fb389ad72d868c387f0ef4d5dd1a21cb09170b0d14ca33a2c2ec0c1f95c09fc1a475a
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.1_13.tar.gz 179520284 BLAKE2B 32acf913aa1b176ca98af0c6111e7f14bba22b84547e24dac279205bb0c81fc3845239e9e34c897c18452ebbb4c71b8185fc4d7d3a2856f3cc767ed4c268d61c SHA512 3bf9fa8eb4cdad03dbbb648b6ab1d8ed5ed34584abe2bec254626952aeba2fc5d492075ba0308ab8e28824959df5f11bb46ec1638c2588b352dd58a5097c030a
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.2_7.tar.gz 180394013 BLAKE2B b5b82b6cd4121e2fbf66c948435bc84d549a11a793310bf0624898562005d5fc01a2f2de84a18517a75ccb2ed7d9f5173dc0a087500eb897e8d7461838991af1 SHA512 5f1a54e7d2456b42e23488b3699b09d82c57f3cb7056684a15f5aa19b992f4b1638acac716d6ed15c0a409ff1953022892ea55f7ed0542d210f5fd43f33fd8e0
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz 195710782 BLAKE2B a374afea8de4333488294dcb200e235f7cc42309a56e693a9b5434dc74d0189b57c26adc93ef22454a4ed05f44b90afa8fdfc016feb022c1eaeb706044581f24 SHA512 b5e55cd32daa3b30fb84b8f4fed0ef70e4f8e3e153974c0c9fa0fcdf22cade99613da93f2289798b625adde24d9a1c4c4808a139e9f2feb2543b05f273f3bdd8
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_7.tar.gz 195593592 BLAKE2B 038c88dd4475842ffd27afc9249925baea0230cd993a963e13c2e090a0f6332fbeaebefae5b5e98026a12a7d94696633507a9d08af469b0227372088b5cd4869 SHA512 f9f4d168105e499b0da4923c6fe18c31ea6f6a24a48fc9d47b643460316d75de273f8f6dcbd43c9df6efcfb77127182dab8125c55f63200c5ff53cc9eb0ddcdc
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u191b12.tar.gz 75382012 BLAKE2B 9521bb3d0dc08d5069108bb56594d401cbadf7a290652a39c7379e6ded530044e85f1ffae1cd3eb7e881d7c283c06463e6f8b76602d03a7bf5b188b1004f5daf SHA512 156f7a57f095095b72edb4bfc766d575795e496b006fb994566b0207d346e89863cf377ce97290bf1b47923c5d6aee5558eaa7a54f394f95a270b1cfec4308e2
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u202b08.tar.gz 101497437 BLAKE2B 4fdc659f9cc50fd968cd339cf24780cd0097286fe3004669972b925fa5c8bbd0e6024587f761ef05ec170c4caa6a915f9f748badd021fae6eb669aa613e1c90d SHA512 42991d2203d51492090e92ee4c7600e7b0ab613550d925f52dd7c7c3b796f9bd36e7284d55540b661a5175064d714267cddd786d81aeda358feda3927e3676e3
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz 104336613 BLAKE2B 3bf42af57707a057077969487f66c32289d0dc96639aee553b18812262d517b07a8e80e3351a4b22731569c7d7c1443d8018d05a41a26abf844a1a2950e7c368 SHA512 8e04d22fe03d2ab92e48fbbfe7d6015d9062d8e767d55ca9235e02b39841236d47b8977ae0252d5f4351a4c5fe082d377e2f8978156cf73c0208028a422e5e4c
-EBUILD openjdk-bin-11.0.1_p13.ebuild 2784 BLAKE2B 95876cd57127d335f3d994730512546d1e3ee5a46aeeaa0bf50ec10d9914bc176dae841b1865ddde5b5b0e3fb71b6f830465fbe13d1ef5f21cd084293f7b5d23 SHA512 ce814dc3dbf3b3a6e2272c496d4b29dcb614e7eaceaf7245050fdc1c797678b187b49b876bdcc313e83050d7c21bbf965f9e735e495064ea0b5bb9bb3039b188
 EBUILD openjdk-bin-11.0.2_p7.ebuild 2785 BLAKE2B 77c144ad87f6024f82b3ea81a0dfb9f79e6adaa2e172c061215e047f3e812ae025d0d73f05801cbd3775c36d70bf8045e8f3f9d3b2cd25d4e4fa5fab4559a186 SHA512 9b26a81ca3401bc24c54c5f1c26df6da1749adf905f1d8476ab2696bf6810deb587619ee4d57c8b05498d46f2fc1753484e2cd29929ee618ba989ab14970a34c
 EBUILD openjdk-bin-8.191_p12.ebuild 2590 BLAKE2B 29cc600adece87f8d040891e5ea84fdec01245e5823d7cfc9631010cdfd053545b9fa75aadb74b2b882127a87609404a7f7e4d061d7854110d5a08f4bb6359d5 SHA512 d16e2f164b8f521a3d36f24c56afef4f9b0b7f2bf01edd22d5267689f5186afc2c1079a547d73c6ad61306e3b41ab8b3dc6abbbded0f8e8444b431d4c86f6c58
 EBUILD openjdk-bin-8.202_p08.ebuild 2619 BLAKE2B d96761323c832f37e8fa7b9792ba36c07ed4e9313aa8acd9a072589039b738baf0b5402fc673426203e3276e7ee624fd091c7a08f6b25baf464b026716042218 SHA512 cb07634a89a7f10bdb099188980b26e4ad6ebb7f460c52b1d0adec3b390e58619bf1a15bc2723d239e6e926fb9e43a16ecd310a838fd6e1c211f2683f8de92ae
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.1_p13.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.1_p13.ebuild
deleted file mode 100644
index c633ab47d5ca..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.1_p13.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-	$(abi_uri aarch64 arm64)
-	$(abi_uri ppc64le ppc64)
-"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	doc? ( dev-java/java-sdk-docs:${SLOT} )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-S="${WORKDIR}/jdk-${MY_PV}"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index effa14aef06a..869e478fd39d 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,7 +1,6 @@
 AUX generate-cacerts.pl 11051 BLAKE2B e6d54319153735bd4b445581dfbd2b78e2e27a19f3b8a78d2fe6912efa207d133fa550652295648bc0bd1370956f71374d4b42de71776fa253f44d4e9dff2527 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97
 AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
 AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd65c64469b3a49a520686ff8d884c0b3d5dd9017ff4027d2fc1d78d57f062a4cf8910e0bab3ed444cc SHA512 2c65d1875406deabbfadb798501de15850775a4a049f073cdfda684ca1bff4b531b93596ee91a7caf77ff6c377457093f72c7bde4b995bce9ffbc4a8fcceb6dd
-DIST jdk-11.0.1+13.tar.bz2 90134818 BLAKE2B c79f32dc5b531a06317afb87ef15495267e914b9b292a1d434514a90298d8234e7e0ba92659416b15d9392c7513d976a0c81411953cb6706a27ee57c965e36fb SHA512 c534c2fa8dcd4fdebef6f00473d5ceaae4a33bd1e1a417846508e25f154b1ded649a73468c8c71ac0c1e27bab5f641a3b480a264b532a0c30be2869c3d11a15d
 DIST jdk-11.0.2+7.tar.bz2 90189455 BLAKE2B 37473a8db4c6ad6789ea67b44f4dda94b9f59143c681a206aa0931b3a2a376fbc480c0c5a6b617072cf9ce1faca34a6c5c5e56cfec9fbf5482b82520fb2463c4 SHA512 03214d9fc920c04f3057594efa78ff588a630e6c594e5bbcc24b4c327fa08273ce060063d98720cdc04bc6978a3d04e172f38ba7a3bcabf02dd5dad397fd9952
 DIST openjdk-8.202_p08.tar.bz2 449202 BLAKE2B 8f7442918c083e94cda0e029cf2348dd9242653027f84d66deebe162e0928b2c6a86d3f273ba235bad5e5656f2b109e6521aaccfa81332fea92873d008ac0c0d SHA512 586713b889dd60c7dc65fccd39ef3ddd985ebb95a7c6c1feaef3c8d76fd1d929bbf19a99f72274c1afb77bd7f80b581d44add4aa232358d8951f7cc5befb43d0
 DIST openjdk-corba-8.202_p08.tar.bz2 1033539 BLAKE2B 9cbe20fb771157142329db037866ec7d67ff7e70318bec8b74034ce59574cd730975f0e7a3d6b88fc946b1d340558a92ca867639765a205883481fd071d7059e SHA512 9b25132c76f559055698c52888f6cae287096e05b89541cb8e445b46a488126a38e58d4f28649e277862eac7aa20f75f64dbcdcf56c900dcb0530a9545c4f717
@@ -11,7 +10,6 @@ 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 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
+EBUILD openjdk-8.202_p08.ebuild 7135 BLAKE2B 367571346274382c2442fa350517a5a1271def6c376a141d2719100e5776f5822d96691dab389b37b20a1baf370e8228fa6c9bba47d07660b95aa8bf8c0e3225 SHA512 5aecfd0bb06fdd13994ead308d1641018f002ab4b037df535b6c17c5876953ef656f6baf7a32fd976edf2b661685b21906ad65cddd040cd2c10d366f6fed2188
 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
deleted file mode 100644
index b73dc4da11b7..000000000000
--- a/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-
-# Default variant must be first!
-# The rest do not matter.
-JVM_VARIANTS="
-	server
-	client
-	core
-	minimal
-	zero
-"
-
-IUSE=$(printf "jvm_variant_%s " ${JVM_VARIANTS})
-
-REQUIRED_USE="
-	|| ( ${IUSE} )
-	?? ( jvm_variant_core jvm_variant_zero )
-	jvm_variant_core? ( !jvm_variant_server !jvm_variant_client !jvm_variant_minimal )
-	jvm_variant_zero? ( !jvm_variant_server !jvm_variant_client !jvm_variant_minimal )
-"
-
-IUSE="+${IUSE} alsa debug doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source systemtap +webstart"
-
-CDEPEND="
-	media-libs/freetype:2=
-	net-print/cups
-	sys-libs/zlib
-	systemtap? ( dev-util/systemtap )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-"
-
-RDEPEND="
-	${CDEPEND}
-	alsa? ( media-libs/alsa-lib )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	!headless-awt? (
-		x11-base/xorg-proto
-	)
-	|| (
-		dev-java/openjdk-bin:${SLOT}
-		dev-java/openjdk:${SLOT}
-	)
-"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 24GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M variant count=0
-
-	for variant in ${JVM_VARIANTS}; do
-		use jvm_variant_${variant} &&
-			count=$(( $count + 1 ))
-	done
-
-	M=$(usex debug 2600 875)
-	M=$(( $(usex debug 2900 375) * $count + $M ))
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex doc 300 0) + $(usex source 120 0) + 820 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
-		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
-	else
-		JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
-		[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-		JDK_HOME=${JDK_HOME#*/}
-		JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
-		export JDK_HOME
-	fi
-}
-
-src_configure() {
-	# Work around stack alignment issue, bug #647954.
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	chmod +x configure || die
-
-	local variant build_variants
-	for variant in ${JVM_VARIANTS}; do
-		use jvm_variant_${variant} &&
-			build_variants+=${variant},
-	done
-
-	local myconf=()
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		myconf+=( --enable-precompiled-headers )
-	else
-		myconf+=( --disable-precompiled-headers )
-	fi
-
-	# Enabling full docs appears to break doc building. If not
-	# explicitly disabled, the flag will get auto-enabled if pandoc and
-	# graphviz are detected. pandoc has loads of dependencies anyway.
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf \
-			--with-boot-jdk="${JDK_HOME}" \
-			--with-extra-cflags="${CFLAGS}" \
-			--with-extra-cxxflags="${CXXFLAGS}" \
-			--with-extra-ldflags="${LDFLAGS}" \
-			--with-jvm-variants=${build_variants%,} \
-			--with-native-debug-symbols=$(usex debug internal none) \
-			--with-version-pre=gentoo \
-			--with-version-string=${MY_PV%+*} \
-			--with-version-build=${MY_PV#*+} \
-			--enable-dtrace=$(usex systemtap yes no) \
-			--enable-headless-only=$(usex headless-awt yes no) \
-			--enable-full-docs=no \
-			--disable-ccache \
-			"${myconf[@]}"
-	)
-}
-
-src_compile() {
-	emake -j1 \
-		$(usex jbootstrap bootcycle-images product-images) $(usex doc docs '') \
-		JOBS=$(makeopts_jobs) LOG=debug CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}${dest#/}"
-
-	cd "${S}"/build/*-release/images/jdk || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/html
-		doins -r "${S}"/build/*-release/images/docs/*
-		dosym ${PF} /usr/share/doc/${PN}-${SLOT}
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
-	fi
-}
diff --git a/dev-java/openjdk/openjdk-8.202_p08.ebuild b/dev-java/openjdk/openjdk-8.202_p08.ebuild
index 65196b1e29d7..9936ca2b9e1e 100644
--- a/dev-java/openjdk/openjdk-8.202_p08.ebuild
+++ b/dev-java/openjdk/openjdk-8.202_p08.ebuild
@@ -133,6 +133,9 @@ src_prepare() {
 	for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do
 		ln -s ../"${repo}-jdk${MY_PV}" "${repo}" || die
 	done
+
+	# linux 5 is ok https://bugs.gentoo.org/679506
+	sed -i '/^SUPPORTED_OS_VERSION/ s/ 4%/ 4% 5%/' hotspot/make/linux/Makefile || die
 }
 
 src_configure() {
diff --git a/dev-java/pdfbox/Manifest b/dev-java/pdfbox/Manifest
index bbb350d5bd6f..f21e1432b396 100644
--- a/dev-java/pdfbox/Manifest
+++ b/dev-java/pdfbox/Manifest
@@ -1,6 +1,4 @@
 DIST pcfi-2010.08.09.jar 6731455 BLAKE2B 438dda63e91494231fba890d995227e7c6428b25a698ad5905a7ca0f2a29f511ff4cc34136c96c878ca04ec7630a062bbff3bbf0400a332b4edb6a6972175920 SHA512 067394ddac4a48ba8ac94b03f907d0faf98a91be658689a34eb85fdce49515582426f6a1fa433bfa87ca417ce3a6fa3aa89d89126a36176d8e04f3359c36d10b
-DIST pdfbox-1.8.11-src.zip 11026359 BLAKE2B b3eb1add38e9bd0e5a1fcb116263fdbc372d6adb77132aeb0647a6c5d2c2b735345220f0a5c22caa97d04f78ad6517df388327aaa625677bd8c99d2051329a9c SHA512 05c8e5075379ed5ebb09555b39434dd936fce9dd24445871d24ea7f0f6afa49e74242bf0c9eba2d1a847b505143789b687dd039ca51ce76851132f2f18d434d1
 DIST pdfbox-1.8.15-src.zip 11078696 BLAKE2B e468a1c263007484d47861945b50a8b0c9afed2d792619a49f41e57b313d86f4e04d317d1b75406876592d755958771c0468446eb23fe3b26ff529e07d467ffb SHA512 ac3f4b131f5cd2153ec2a744c486db921bc2165d596b243ad673cfc94be1bc4ae27bdf2981b63419fead18db569a2008264d6fdc7c89cf47f69f81c4a7d3a2a6
-EBUILD pdfbox-1.8.11.ebuild 2079 BLAKE2B 36c1ee6f0f1d517c7f7d0ce084c427e52993c7dd02e9795862de3c3234554dd245871e072402427b04c27232518e7d79e35b4e28fa4cc1f03adbce7b9bad891c SHA512 249af8e8327b87210e5919f7504978a9a258214accf957644e1a7803a7132b75532882a0ab87e19d35a7d7523eb5ecede5396657f55444f7874bda7b6d322ba8
 EBUILD pdfbox-1.8.15.ebuild 2088 BLAKE2B 7fbf6f88923a9903d77e4d49ea15645196ff7494f91d01ca17fe83b26299ac8224ac181d354ccb3811ace954a505dd088e47972458f918bc44699f5be66979b1 SHA512 b6890014cb12c6663bfb4ad6eaafff616fc06f9e9073bc299e2aeb8f8d2af038f6019b8368240c5994ba46e3fa41b7936f577c3cdbd2cca3cb492b33e456eecc
 MISC metadata.xml 641 BLAKE2B 03d882aee9a768dead555ff0394a3700c55dc9fd72097a1014cd7a87fca6d6e900b675e4ec4707c6ca5baca40646650bca3bcfbd25cd215af679c3e574442b3b SHA512 df978af8abefb42c2eadf80184cfdc0889758d758656f7b7bef19b7d4f59da28e465683cec26d96d288dccce4d82a182d56abff28ee14eb718280d469bb4183f
diff --git a/dev-java/pdfbox/pdfbox-1.8.11.ebuild b/dev-java/pdfbox/pdfbox-1.8.11.ebuild
deleted file mode 100644
index 213188bdd96e..000000000000
--- a/dev-java/pdfbox/pdfbox-1.8.11.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-BC_SLOT="1.45"
-ADOBE_FILES="pcfi-2010.08.09.jar"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java library and utilities for working with PDF documents"
-HOMEPAGE="http://pdfbox.apache.org/"
-SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip
-	http://repo2.maven.org/maven2/com/adobe/pdf/pcfi/2010.08.09/${ADOBE_FILES}"
-LICENSE="Apache-2.0"
-SLOT="1.8"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="test" # Explosive even when manually using unmodified build.xml.
-
-CDEPEND="dev-java/fontbox:${SLOT}
-	dev-java/jempbox:${SLOT}
-	dev-java/bcmail:${BC_SLOT}
-	dev-java/bcprov:${BC_SLOT}
-	>=dev-java/commons-logging-1.1.1:0
-	dev-java/icu4j:55"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	app-arch/unzip
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${P}/${PN}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_ENCODING="ISO-8859-1"
-JAVA_GENTOO_CLASSPATH="fontbox-${SLOT},jempbox-${SLOT},bcmail-${BC_SLOT},bcprov-${BC_SLOT},commons-logging,icu4j-55"
-
-src_unpack() {
-	unpack ${P}-src.zip
-}
-
-java_prepare() {
-	local DIR=target/classes/org/apache/${PN}/resources
-	mkdir -p "${DIR}/afm" || die
-
-	unzip -j -d "${DIR}" "${DISTDIR}/${ADOBE_FILES}" com/adobe/pdf/pcfi/glyphlist.txt || die
-	unzip -j -d "${DIR}/afm" "${DISTDIR}/${ADOBE_FILES}" com/adobe/pdf/pcfi/afm/*.afm || die
-
-	echo "${PN}.version=${PV}" > ${DIR}/${PN}.version || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${PN} --main org.apache.${PN}.PDFBox
-}
-
-src_test() {
-	local DIR=src/test/java
-	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
-	local TESTS=$(find ${DIR} -name "*Test.java")
-	TESTS="${TESTS//src\/test\/java\/}"
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -encoding ${JAVA_ENCODING} -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/sun-jaf/Manifest b/dev-java/sun-jaf/Manifest
index 135aa35f5808..039ba5345551 100644
--- a/dev-java/sun-jaf/Manifest
+++ b/dev-java/sun-jaf/Manifest
@@ -1,4 +1,3 @@
 DIST sun-jaf-1.1.1.tar.bz2 125305 BLAKE2B bf7676f3b47e9cf4c169a7625160604c7973d2bb8f6a087f7a7759c924efc0c24fbc6d59f03fb89dc874b2ad03e311b5029fc066fe5083c1accdc73fa9666ea6 SHA512 c7287056514324aa5feeed3d4afaf861869974dd565f7810e0161fe590f070ec894e7005ffac4dd42cf075313237027d7d7c88cbf583e28e05df361536d73001
 EBUILD sun-jaf-1.1.1-r1.ebuild 603 BLAKE2B 15be8c5346fc16252a2e939c4ea732e2d9524b65ab3fde7f7aa8f66ecad32db09da37407e4dcce322eee19be9c28964ead1619c501bb5291fbcbaa54c02d7c0e SHA512 45f7f0445c3d2e886fdd02646f2d54c9f730b84400165135d000e7bdfb409fba869fad7c1c9d58f560b528d2c4e4025eb1759ecfeaf4d30be894eea7f98c7afd
-EBUILD sun-jaf-1.1.1.ebuild 1274 BLAKE2B c5906b41dec356a5a44a52141975ee58b8cd282ee80917a7b9c69a2849b39ee9998a12d40a7a7707d9663335e4ba1d7266e603ecb2f8f9db4fb7e83bdcbe5b3b SHA512 f8ea38b4d0b6c75f3dc0c0a811d68c3152e8b44191f71377b7e257780c59245b9543f368114bf2d39aac2991375e8f79d05ebd2cf30313c61eee95f6cb12f02f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sun-jaf/sun-jaf-1.1.1.ebuild b/dev-java/sun-jaf/sun-jaf-1.1.1.ebuild
deleted file mode 100644
index f54d71922707..000000000000
--- a/dev-java/sun-jaf/sun-jaf-1.1.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Sun's JavaBeans Activation Framework (JAF)"
-HOMEPAGE="http://java.sun.com/products/javabeans/glasgow/jaf.html"
-# CVS:
-# View: https://glassfish.dev.java.net/source/browse/glassfish/activation/?only_with_tag=JAF-1_1
-# How-To: https://glassfish.dev.java.net/servlets/ProjectSource
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-# Remember to pray that bootstrap HEAD works
-#cvs -d:pserver:guest@cvs.dev.java.net:/cvs export -r JAF-${PV/./_} glassfish/activation
-#cvs -d:pserver:guest@cvs.dev.java.net:/cvs export -r HEAD glassfish/bootstrap
-#find . -name \*.jar -delete
-#tar cvjf ${P}.tar.bz glassfish
-#upload
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source"
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
-S="${WORKDIR}/glassfish/activation"
-
-JAVA_PKG_BSFIX="off"
-
-EANT_DOC_TARGET="docs"
-
-src_install() {
-	java-pkg_dojar build/release/activation.jar
-	use doc && java-pkg_dojavadoc build/release/docs/javadocs
-	use source && java-pkg_dosrc src/java
-}
diff --git a/dev-java/tijmp/Manifest b/dev-java/tijmp/Manifest
index 90ef26b15e2b..7aba69ea965b 100644
--- a/dev-java/tijmp/Manifest
+++ b/dev-java/tijmp/Manifest
@@ -1,5 +1,5 @@
 AUX tijmp-0.8-respect-javacflags.patch 433 BLAKE2B 22999d08accccc8a00bb27e4db93b47faad83481083ecfef8b33c43e670093d15c6f483f5f15f1e02069e14d7dfa9df2d67846e2455ff73a01a5a209a8ac702e SHA512 01de85f6dd0609a85faecf398de83862dc99741d7447127ae8fbd57a16ead7b1493cee0479700e1027c45c4ee5a9561352868c2a45293f29a6e2fe8ee501f972
-AUX tijmp-jni.h.patch 1121 BLAKE2B 0eec0e65ceafe1f9a60b8f5482947f61a4434d9d6c4b2ec449741dc04e3ccbb5122f15dfdab5a30e8e1d3a4bb0c328781cf52f69f7d55655d060cee89670cbdb SHA512 3733c220c23a5c252ca088f9cc8c37780193bbbc1efe12c0f21ce5c5c9a875a43c3a4947c8bd52cb4c3ede4549ba9fdc4107d1a3207a0563813fc5b351c6e2a3
+AUX tijmp-jni.h.patch 1120 BLAKE2B e444841f9454f7fc8f8423986a5b82cceda43513a07c5ed3d4a143e813645a2f2323aa42e4fdc391e7ab38f3603acaf6efc18c8de0fc3c363273916b6db47477 SHA512 03c5b6425b4b92d929117366bbf1e3d3c5376f0882e7363e83f70324e5ba6533f212226cc811eb61b24772a45853f3b3243c24a444d181eedd1aa67017a15dc6
 DIST tijmp-0.8.tar.gz 347809 BLAKE2B d18fd0ba9145fb9277404a24fa26a65e4cbba34e62dfa0b080bc380d61a3dd11aab23e2c7fb982a97cb40fa216b1b3347c949cee52f7462f0113c3adef993c8d SHA512 911efd93c1548db45fcf8fd924675329aa82c6853ffe93074768646d08f80f4b076f336dba0da293d1acb084a12eb62c68803fa9408e2b64b2b82ab62db1de25
-EBUILD tijmp-0.8.ebuild 1129 BLAKE2B 0b58ddba5d1ad18f8b5da4094fe4ad03131c2d44dd2997425d75e73761fc683118c5d54c57542de65c34dc8c34b44c9e1679b71e15b71e74312ed34a56d106ea SHA512 ecfc77ee4f96f66b6dd32c7f613646d51e037cfc534d34a9de117a10fad57399d9a352618fcef66033f2e76c1898b6a58e088ef3a96b469786c1c648c2722727
+EBUILD tijmp-0.8-r1.ebuild 1075 BLAKE2B 9b0f320ac0454d8e6f3533ff1a33e75376086396e45074cbc9089cfcb7464d3b8f2cd022f0cb8a398f42b560ee50db3354062a657d5dab1790561091ab99171e SHA512 2bcfd356f43c9a4994045d0571f52f6bf767466a0ffce853f62a295a852506215d5ab8f830027c2cc38e409d42a5639b641328d2739ca9a205ebe2cf298f43ac
 MISC metadata.xml 481 BLAKE2B 6b151d4c0ca3047811c3902cbe5dafd42cdbc05cb6d44a35e116be42276fabc8dd9ef90a8e4b05c58f3ed228dfa0df37ac1c8b5eeb4859373abf9e7624a093dc SHA512 52940eb0d565ae1419ea5b10d90997551cf1a9accf3ae2369b37a7afbd7e5cf0a11e0fa0afa84baeeac34d516a734b779a40ffd74f06767549ae0ad82010661e
diff --git a/dev-java/tijmp/files/tijmp-jni.h.patch b/dev-java/tijmp/files/tijmp-jni.h.patch
index e9f18cc4ee68..02a9b43670b0 100644
--- a/dev-java/tijmp/files/tijmp-jni.h.patch
+++ b/dev-java/tijmp/files/tijmp-jni.h.patch
@@ -1,7 +1,7 @@
 # Patch by Vlastimil Babka <caster@gentoo.org>
 # Some JDK's such as ibm-jdk-bin don't have jni_md.h, so make the test more robust
---- configure.ac.orig	2009-01-10 00:29:01.000000000 +0100
-+++ configure.ac	2010-04-05 12:17:35.000000000 +0200
+--- a/configure.ac	2009-01-10 00:29:01.000000000 +0100
++++ b/configure.ac	2010-04-05 12:17:35.000000000 +0200
 @@ -24,22 +24,16 @@
    JAVA_HOME=/usr/local/jdk
  fi
diff --git a/dev-java/tijmp/tijmp-0.8.ebuild b/dev-java/tijmp/tijmp-0.8-r1.ebuild
index 9fea8db45ca0..a6e2774efc3a 100644
--- a/dev-java/tijmp/tijmp-0.8.ebuild
+++ b/dev-java/tijmp/tijmp-0.8-r1.ebuild
@@ -1,11 +1,11 @@
-# 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
 
 inherit autotools java-pkg-2
 
-DESCRIPTION="Java Memory Profiler for java 1.6+"
+DESCRIPTION="Java Memory Profiler"
 HOMEPAGE="http://www.khelekore.org/jmp/tijmp/"
 SRC_URI="http://www.khelekore.org/jmp/tijmp/${P}.tar.gz"
 
@@ -13,14 +13,19 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-IUSE=""
+RDEPEND="
+	>=virtual/jre-1.6"
 
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
+DEPEND="
+	>=virtual/jdk-1.6"
 
-java_prepare() {
-	epatch "${FILESDIR}/${PN}-jni.h.patch"
-	epatch "${FILESDIR}/${P}-respect-javacflags.patch"
+PATCHES=(
+	"${FILESDIR}/${PN}-jni.h.patch"
+	"${FILESDIR}/${P}-respect-javacflags.patch"
+)
+
+src_prepare() {
+	default
 	eautoreconf
 }
 
@@ -28,20 +33,16 @@ src_configure() {
 	econf --docdir="/usr/share/doc/${PF}"
 }
 
-src_compile() {
-	emake || die "make failed"
-}
-
 src_install() {
-	emake DESTDIR="${D}" jardir="/usr/share/${PN}/lib/" install || die
+	emake DESTDIR="${D}" jardir="/usr/share/${PN}/lib/" install
 	java-pkg_regjar "${D}/usr/share/${PN}/lib/${PN}.jar"
 	java-pkg_regso "${D}/usr/$(get_libdir)/lib${PN}.so"
 
-	cat > "${T}/tijmp" <<-"EOF"
-		#!/bin/sh
-		java -Dtijmp.jar="$(java-config -p tijmp)" -agentlib:tijmp "${@}"
+	cat > "${T}/${PN}" <<- "EOF" || die
+#!/usr/bin/env bash
+java -Dtijmp.jar="$(java-config -p tijmp)" -agentlib:tijmp "${@}"
 EOF
-	dobin "${T}/tijmp"
+	dobin "${T}/${PN}"
 }
 
 pkg_postinst() {
diff --git a/dev-java/xz-java/Manifest b/dev-java/xz-java/Manifest
index b00a9fbdefdd..eb07273ec6d8 100644
--- a/dev-java/xz-java/Manifest
+++ b/dev-java/xz-java/Manifest
@@ -7,5 +7,5 @@ EBUILD xz-java-1.5.ebuild 764 BLAKE2B 4748847ca4d7c6281423767b7b6e749c4d19b0157b
 EBUILD xz-java-1.6-r1.ebuild 651 BLAKE2B c810d938d1e27719d5098d6d256c5a5f5383e49ccdebb309c5c53ba1f302f67ab95c017dd35d92aae7dcebb85e4dca2f874cf13fb45347257c6221b42d73de09 SHA512 0266edcbf8678ca58bba9bf01d10dd7eaa3d96fd405803aa8c60ea25b903bc0e44f11f043a5c238d9405215bf252c24a0c7a7aa9acb508916d3af6141725aa43
 EBUILD xz-java-1.6.ebuild 808 BLAKE2B a3222e8abac79531bc0c3a87211054ca499f11639076772820de127cdb448e2d978b643e083b7449a3679d0dec24cef78670ee15bf44e47218162721ba669aa3 SHA512 cbcfaa0cc5bfef2ad065b4493cb58fae2e45bcd219745e68a5c775073747d7141f23583927ccbbac042997353b9bbeb3dc5aa0292f921a194b5d67c08af84307
 EBUILD xz-java-1.7.ebuild 651 BLAKE2B c810d938d1e27719d5098d6d256c5a5f5383e49ccdebb309c5c53ba1f302f67ab95c017dd35d92aae7dcebb85e4dca2f874cf13fb45347257c6221b42d73de09 SHA512 0266edcbf8678ca58bba9bf01d10dd7eaa3d96fd405803aa8c60ea25b903bc0e44f11f043a5c238d9405215bf252c24a0c7a7aa9acb508916d3af6141725aa43
-EBUILD xz-java-1.8.ebuild 655 BLAKE2B f702b117c65a6221328686e3ba2b90f58e1c120342b449b366de4692db864f8dde1f99bfb1f3de2f601af7bbd22c8de797a396d7135d2593dbfa008bf2184ada SHA512 f736bb0943f7099d40de634f83e2c8be492a8181e88fb950f5842d670f29454f398b31a31c4c3aedc0f13e01d33c455849488871560f7a88b551fe1a372a68c0
+EBUILD xz-java-1.8.ebuild 660 BLAKE2B 6dc92c4712cefb487a8b308e0aa9c10eb8de677b454b7aed11d8d5e8762206c29058660e7394ed303afa224efb9654b422c1ea0ab480b432a9c432bebf008e8d SHA512 164a6599a3beb22d04d8f2e535fb055a2013598b0df53de7611f70e928ff7ecec4ac6461879ba009175549f6826d664edab176b084e8f11780654e6c0b26a0da
 MISC metadata.xml 352 BLAKE2B 8390000455654697f473905c14903172230b9667fd16c4db74dd32643b096cb7c8efa21f8614b30d676fb32e052a76c613298e2a28c362d6135f61a4fe27c242 SHA512 a3c6ce3cd97b39644238700277dd416e1ee79df975184de3429810ca4d77f7160112adef6a9b56f77243a003187f6642798b278cf8501d55da766ccfbaa861cf
diff --git a/dev-java/xz-java/xz-java-1.8.ebuild b/dev-java/xz-java/xz-java-1.8.ebuild
index 78b83d3f6e8e..bfb68767547f 100644
--- a/dev-java/xz-java/xz-java-1.8.ebuild
+++ b/dev-java/xz-java/xz-java-1.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://tukaani.org/xz/${P}.zip"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"