gentoo resync : 25.01.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-01-25 08:09:37 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-01-25 08:09:37 +0000
commit: 693cc9b6e847a01c1bb692153021aaf9fb0fab25 (patch)
tree: bb2f7c299a4149f841c37a1208c7ac861aa95640 /dev-java
parent: 09351e78166b5e864197c4456ebae3f89dd0bed9 (diff)
69 files changed, 1117 insertions, 53 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 0ff32118fc97..172ee0e8b514 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 6fd31f41a87a..7140829d9455 100644
--- a/dev-java/ant-antlr/Manifest
+++ b/dev-java/ant-antlr/Manifest
@@ -1,7 +1,10 @@
+DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-antlr-1.10.5.ebuild 512 BLAKE2B 41bb443f0d1223603d32db787a63b4b490fd0bc64db17391e8ef55fcfb2dfbbc6bc77c374af0dea8380a91b2e91fa194f15e5817ff68f4ec5b61b09540f8027d SHA512 be4e7235b90f1a8d94fb29d3d2419e638551067338f7fc77c8ccc048910562201493c6f4e845575452b6d50cbddb3e8ff82aa4918ceb4507b1327d7b7c151793
 EBUILD ant-antlr-1.9.13.ebuild 512 BLAKE2B 41bb443f0d1223603d32db787a63b4b490fd0bc64db17391e8ef55fcfb2dfbbc6bc77c374af0dea8380a91b2e91fa194f15e5817ff68f4ec5b61b09540f8027d SHA512 be4e7235b90f1a8d94fb29d3d2419e638551067338f7fc77c8ccc048910562201493c6f4e845575452b6d50cbddb3e8ff82aa4918ceb4507b1327d7b7c151793
 EBUILD ant-antlr-1.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
new file mode 100644
index 000000000000..eac2b3357fa9
--- /dev/null
+++ b/dev-java/ant-antlr/ant-antlr-1.10.5.ebuild
@@ -0,0 +1,20 @@
+# 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=""
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional tasks for Antlr"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=dev-java/antlr-2.7.7-r7:0"
+
+src_install() {
+	ant-tasks_src_install
+	java-pkg_register-dependency antlr
+}
diff --git a/dev-java/ant-apache-bcel/Manifest b/dev-java/ant-apache-bcel/Manifest
index f8911e7192d2..aeb5bd894d90 100644
--- a/dev-java/ant-apache-bcel/Manifest
+++ b/dev-java/ant-apache-bcel/Manifest
@@ -1,7 +1,10 @@
+DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-apache-bcel-1.10.5.ebuild 397 BLAKE2B a7b92b4955f8a03045afd2716e8e3c8085e00d2b5bfbaa8aee4f8b8c1d074f7192453ca5ad627420cfbfcb80ce4872a751b5bb8dd579df7baf5c42a53338ac54 SHA512 f284a0c121c8e41d7967711847630c10b1d09c22c91b87d9225d9a0571da9d9d4188fafbe1e8e755dcef98eac6f80619cc80b101381bf91b424b5473e3bb45b5
 EBUILD ant-apache-bcel-1.9.13.ebuild 397 BLAKE2B a7b92b4955f8a03045afd2716e8e3c8085e00d2b5bfbaa8aee4f8b8c1d074f7192453ca5ad627420cfbfcb80ce4872a751b5bb8dd579df7baf5c42a53338ac54 SHA512 f284a0c121c8e41d7967711847630c10b1d09c22c91b87d9225d9a0571da9d9d4188fafbe1e8e755dcef98eac6f80619cc80b101381bf91b424b5473e3bb45b5
 EBUILD ant-apache-bcel-1.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
new file mode 100644
index 000000000000..cc27312305eb
--- /dev/null
+++ b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.5.ebuild
@@ -0,0 +1,15 @@
+# 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="bcel"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/bcel-5.1-r3:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-bsf/Manifest b/dev-java/ant-apache-bsf/Manifest
index 3f33170bb3e7..86389ca034ba 100644
--- a/dev-java/ant-apache-bsf/Manifest
+++ b/dev-java/ant-apache-bsf/Manifest
@@ -1,7 +1,10 @@
+DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-apache-bsf-1.10.5.ebuild 676 BLAKE2B 704842b34d07abf1625754ee6b4fd9fd61ce8c9d16b6ae804d32614a9ae3d41f536a536915eed19b070623f3b17053d55792314cba31d4b855b060dd6b7143f6 SHA512 952db5b221485ca7feaee87c432717bb4c2ebc6efe3d29730d5bb56a4f6c0d64fae27b429e2ebee32ce3d2d90fcfe67fbc3e1cf5862e07d43f606ed6d0b78e8b
 EBUILD ant-apache-bsf-1.9.13.ebuild 676 BLAKE2B 704842b34d07abf1625754ee6b4fd9fd61ce8c9d16b6ae804d32614a9ae3d41f536a536915eed19b070623f3b17053d55792314cba31d4b855b060dd6b7143f6 SHA512 952db5b221485ca7feaee87c432717bb4c2ebc6efe3d29730d5bb56a4f6c0d64fae27b429e2ebee32ce3d2d90fcfe67fbc3e1cf5862e07d43f606ed6d0b78e8b
 EBUILD ant-apache-bsf-1.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
new file mode 100644
index 000000000000..ab90ef07be0c
--- /dev/null
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.5.ebuild
@@ -0,0 +1,23 @@
+# 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="bsf-2.3"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="python javascript tcl"
+
+DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Also, >=dev-java/bsf-2.4.0-r1 adds optional support for groovy,"
+		elog "ruby and beanshell. See its postinst elog messages for instructions."
+	fi
+}
diff --git a/dev-java/ant-apache-log4j/Manifest b/dev-java/ant-apache-log4j/Manifest
index 1f89212a4b60..f5497303de5c 100644
--- a/dev-java/ant-apache-log4j/Manifest
+++ b/dev-java/ant-apache-log4j/Manifest
@@ -1,7 +1,10 @@
+DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-apache-log4j-1.10.5.ebuild 402 BLAKE2B ed648820171b4caab34190d3f5dd36f70cf02085fb88e921d70a3f7dcf1b26b4b139159e68a79e97a012d4f90d5f9cc86be463ac02e95346fa73db6a5e11b997 SHA512 1d8440d1b7355e09514e1e0ae6b37ba2f61cb849089a367f638308da8c1fa425b9fddec1d77ee69480ed16f77bbd59279457ffe7cb420d130c18e266fa26b612
 EBUILD ant-apache-log4j-1.9.13.ebuild 402 BLAKE2B ed648820171b4caab34190d3f5dd36f70cf02085fb88e921d70a3f7dcf1b26b4b139159e68a79e97a012d4f90d5f9cc86be463ac02e95346fa73db6a5e11b997 SHA512 1d8440d1b7355e09514e1e0ae6b37ba2f61cb849089a367f638308da8c1fa425b9fddec1d77ee69480ed16f77bbd59279457ffe7cb420d130c18e266fa26b612
 EBUILD ant-apache-log4j-1.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
new file mode 100644
index 000000000000..e2def8547bae
--- /dev/null
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.5.ebuild
@@ -0,0 +1,15 @@
+# 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="log4j"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/log4j-1.2.13-r2:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/Manifest b/dev-java/ant-apache-oro/Manifest
index ae160003357c..27cb042cc736 100644
--- a/dev-java/ant-apache-oro/Manifest
+++ b/dev-java/ant-apache-oro/Manifest
@@ -1,7 +1,10 @@
+DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-apache-oro-1.10.5.ebuild 419 BLAKE2B a902f3b7454d6e3c907109efaaa6bf8720a45b3e94d75422bbabc79a244ef61c7712fa544a444a45298b397a56059b6361f0457c329279a74c3666dd4b2837a5 SHA512 be13218686f32d7af1fa1f406e0c7222fadc87185d5280b81aff4199df7f31d2004196089efba5908e4ae6827d57fe8f3337f9325196044c132ede144a628f29
 EBUILD ant-apache-oro-1.9.13.ebuild 419 BLAKE2B a902f3b7454d6e3c907109efaaa6bf8720a45b3e94d75422bbabc79a244ef61c7712fa544a444a45298b397a56059b6361f0457c329279a74c3666dd4b2837a5 SHA512 be13218686f32d7af1fa1f406e0c7222fadc87185d5280b81aff4199df7f31d2004196089efba5908e4ae6827d57fe8f3337f9325196044c132ede144a628f29
 EBUILD ant-apache-oro-1.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
new file mode 100644
index 000000000000..3b4731d5813f
--- /dev/null
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.10.5.ebuild
@@ -0,0 +1,15 @@
+# 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="jakarta-oro-2.0"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/Manifest b/dev-java/ant-apache-regexp/Manifest
index 6029030a91a5..e6f2a26947df 100644
--- a/dev-java/ant-apache-regexp/Manifest
+++ b/dev-java/ant-apache-regexp/Manifest
@@ -1,7 +1,10 @@
+DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-apache-regexp-1.10.5.ebuild 423 BLAKE2B 693d3c9182648b14267bbc1c1cad2ebcc20d13e67c82574d78f24721d2f6657561d2da60b008755d911c0a45aa53d12fd993a86fc8005877ba42b658f2eb849c SHA512 31710a47cd87c8c78b90d556ae489957775a50090be519f8b9967200d8227a7f5005728d3d5d85d6ada4e2c2401f75a4908311348b73ad50aff4328a9da5ed8f
 EBUILD ant-apache-regexp-1.9.13.ebuild 423 BLAKE2B 693d3c9182648b14267bbc1c1cad2ebcc20d13e67c82574d78f24721d2f6657561d2da60b008755d911c0a45aa53d12fd993a86fc8005877ba42b658f2eb849c SHA512 31710a47cd87c8c78b90d556ae489957775a50090be519f8b9967200d8227a7f5005728d3d5d85d6ada4e2c2401f75a4908311348b73ad50aff4328a9da5ed8f
 EBUILD ant-apache-regexp-1.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
new file mode 100644
index 000000000000..d919b2bba89a
--- /dev/null
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.5.ebuild
@@ -0,0 +1,15 @@
+# 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="jakarta-regexp-1.4"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-resolver/Manifest b/dev-java/ant-apache-resolver/Manifest
index 0c846e13a5e2..066e822b91c5 100644
--- a/dev-java/ant-apache-resolver/Manifest
+++ b/dev-java/ant-apache-resolver/Manifest
@@ -1,7 +1,10 @@
+DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-apache-resolver-1.10.5.ebuild 426 BLAKE2B 5c22ba980060cafe7e0e306dfd8aeec9cc5ec9dd3ffe7e0f07678b054300831f15f7387b0cb914fcb9db0260b65243142dc158758e8884c7143f19644c0aa7f7 SHA512 e11941eb5ff56364b936656c2a70f78955097763646384a85ef9269ec09e5268750cb0d9485476b0cbaabd180fa4597cc9c1998692d5d7994d9a7a46657c4840
 EBUILD ant-apache-resolver-1.9.13.ebuild 426 BLAKE2B 5c22ba980060cafe7e0e306dfd8aeec9cc5ec9dd3ffe7e0f07678b054300831f15f7387b0cb914fcb9db0260b65243142dc158758e8884c7143f19644c0aa7f7 SHA512 e11941eb5ff56364b936656c2a70f78955097763646384a85ef9269ec09e5268750cb0d9485476b0cbaabd180fa4597cc9c1998692d5d7994d9a7a46657c4840
 EBUILD ant-apache-resolver-1.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
new file mode 100644
index 000000000000..36d43d7abf1d
--- /dev/null
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.5.ebuild
@@ -0,0 +1,15 @@
+# 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="xml-commons-resolver"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/xml-commons-resolver-1.2:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-xalan2/Manifest b/dev-java/ant-apache-xalan2/Manifest
index a6ddc88f4306..33798d6e900f 100644
--- a/dev-java/ant-apache-xalan2/Manifest
+++ b/dev-java/ant-apache-xalan2/Manifest
@@ -1,7 +1,10 @@
+DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-apache-xalan2-1.10.5.ebuild 500 BLAKE2B 45f01fd70e19a8f51e011dbb52d24848829b8a8b77657ed05c9487bcc9af1b4ae1bae139d758651895ee7595b46ec61cb73f1d53b8a0a36a1523d518766998e3 SHA512 db45e6a9f1067e08214e07206505caf5b93fe4b666753d3447c8387406e1892d240fb2f45d91dfb8bd5eddbf10d4fcd86623c516709da6d5bc46b476ea6ccbe8
 EBUILD ant-apache-xalan2-1.9.13.ebuild 500 BLAKE2B 45f01fd70e19a8f51e011dbb52d24848829b8a8b77657ed05c9487bcc9af1b4ae1bae139d758651895ee7595b46ec61cb73f1d53b8a0a36a1523d518766998e3 SHA512 db45e6a9f1067e08214e07206505caf5b93fe4b666753d3447c8387406e1892d240fb2f45d91dfb8bd5eddbf10d4fcd86623c516709da6d5bc46b476ea6ccbe8
 EBUILD ant-apache-xalan2-1.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
new file mode 100644
index 000000000000..b8b82ce67833
--- /dev/null
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.5.ebuild
@@ -0,0 +1,22 @@
+# 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="xalan"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="dev-java/xalan:0
+	dev-java/xalan-serializer:0"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	ant-tasks_src_unpack all
+	java-pkg_jar-from xalan-serializer
+}
diff --git a/dev-java/ant-commons-logging/Manifest b/dev-java/ant-commons-logging/Manifest
index 22253554139a..45b13651403f 100644
--- a/dev-java/ant-commons-logging/Manifest
+++ b/dev-java/ant-commons-logging/Manifest
@@ -1,7 +1,10 @@
+DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-commons-logging-1.10.5.ebuild 386 BLAKE2B 0efc40e96cc9acb1c9c1ed1172416efd0526b16783914d26ddda282485e25e0af14ac0fca26912950e96f9c0e6599dfdf381e51c39873595ab8cc8f9c63e75da SHA512 6360b7a1b48fdd6fc4b38cd5a99e39a8870d863ae62e21bcd53a9ff9bfbd081d62837ccef4f9ad861ea7ac199b19882da29c27b699dfc063e1d569a354e15839
 EBUILD ant-commons-logging-1.9.13.ebuild 386 BLAKE2B 0efc40e96cc9acb1c9c1ed1172416efd0526b16783914d26ddda282485e25e0af14ac0fca26912950e96f9c0e6599dfdf381e51c39873595ab8cc8f9c63e75da SHA512 6360b7a1b48fdd6fc4b38cd5a99e39a8870d863ae62e21bcd53a9ff9bfbd081d62837ccef4f9ad861ea7ac199b19882da29c27b699dfc063e1d569a354e15839
 EBUILD ant-commons-logging-1.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
new file mode 100644
index 000000000000..cde3be7d5afe
--- /dev/null
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.10.5.ebuild
@@ -0,0 +1,14 @@
+# 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
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-net/Manifest b/dev-java/ant-commons-net/Manifest
index dd8b5fafbf47..c00fa4366853 100644
--- a/dev-java/ant-commons-net/Manifest
+++ b/dev-java/ant-commons-net/Manifest
@@ -1,7 +1,10 @@
+DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-commons-net-1.10.5.ebuild 382 BLAKE2B abf76e86b3af5ad8a9ed1ad3b70db2d90757727e21eaf1b8bc71f416acdfb4c4ca0df8e453f8efb26c9d237bf4867436f7cb4b1ece55bd4c13901dad07f17deb SHA512 94f1620956bf5397711c1f4deebbd035fc5df2d0f2b2aa3cbc5128c1c02dcbe2a01cdb1c1e31ab02a41ee3c3d5ff035e9870c46fdee915102bca90916c7c1754
 EBUILD ant-commons-net-1.9.13.ebuild 382 BLAKE2B abf76e86b3af5ad8a9ed1ad3b70db2d90757727e21eaf1b8bc71f416acdfb4c4ca0df8e453f8efb26c9d237bf4867436f7cb4b1ece55bd4c13901dad07f17deb SHA512 94f1620956bf5397711c1f4deebbd035fc5df2d0f2b2aa3cbc5128c1c02dcbe2a01cdb1c1e31ab02a41ee3c3d5ff035e9870c46fdee915102bca90916c7c1754
 EBUILD ant-commons-net-1.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
new file mode 100644
index 000000000000..ad26bd8fe211
--- /dev/null
+++ b/dev-java/ant-commons-net/ant-commons-net-1.10.5.ebuild
@@ -0,0 +1,14 @@
+# 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
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/commons-net-1.4.1-r1:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 880c78a9c68d..18b6cbddf2b5 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,7 +1,10 @@
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
+DIST ant-1.10.5-r1-gentoo.tar.bz2 6400 BLAKE2B 349a45ee678217ee31ae2f6e982ceec2d31138dcb58e614f496125d7d9bc01a0fa3630be069fbf0d131f4006cb7912597c31392bc82ab7f9b0a1189bbe9a763e SHA512 adf544c151f46df8a7fb7f7d33450f9a2390f568dd4c7b1c0e8850b1a155ea0ddc1f834d869d657806570d59af2d194cb443ddfc653627967246f3b38e264b12
+DIST ant-1.9.13-r1-gentoo.tar.bz2 7208 BLAKE2B 6f041a69f5f8e38e95b26030cf4d730ed22b071ad1d6e87ab1fb2707e2b40c7e23e1c8f7759d6904ad2b25793a7d9b2ead1c2649b6b029296cd9d05bec4ea296 SHA512 5b105ea00fbc7d6f63c0016b288f5e46a81b89cc46015e2ffcb2a4d41f915331ac8f8183752fea547396f204748132f6ce7aa7b3e6f6181c4983b4eb7ee84d54
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+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.9.13.ebuild 3109 BLAKE2B f565550c0b2d382537f4c9e3e8ea14b11ae7054fa78e8b860350fdcc11a37dc17aaaf9c7ae9f0c868027b3bd0940f12bcaeefbc044c697cb8e411c110bcb4041 SHA512 7b74c949c90fff0bd91322b37af15dab28bcbfcd7a5f29527f0157297c83af985dcc15c442884da81a004082cd0bd1cf571cb6e0d57131dd3e0ddb8dcdbfb593
+EBUILD ant-core-1.10.5-r1.ebuild 3196 BLAKE2B 6f0eccb5f88b1357cc143622553dbf85dc7ddf3f79bc6a3355472fd2ca759e9d437d7535a6aef06ee5d8b0fd0a5d87702f96a5a2e9addb9730fcc50fad821520 SHA512 b01ec8ed706bd96884e0c19063b43b054489ec49d4ebb091886ff99ef0fb9c68b53bae0ad06d0fa6cc75f76f4b44fdaee1a7469187e3fa13427caeb2d0a8e15b
+EBUILD ant-core-1.9.13-r1.ebuild 3196 BLAKE2B 6f0eccb5f88b1357cc143622553dbf85dc7ddf3f79bc6a3355472fd2ca759e9d437d7535a6aef06ee5d8b0fd0a5d87702f96a5a2e9addb9730fcc50fad821520 SHA512 b01ec8ed706bd96884e0c19063b43b054489ec49d4ebb091886ff99ef0fb9c68b53bae0ad06d0fa6cc75f76f4b44fdaee1a7469187e3fa13427caeb2d0a8e15b
 EBUILD ant-core-1.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.9.13.ebuild b/dev-java/ant-core/ant-core-1.10.5-r1.ebuild
index 55b6cd4246fc..7ddd5d55ba2b 100644
--- a/dev-java/ant-core/ant-core-1.9.13.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.5-r1.ebuild
@@ -17,7 +17,7 @@ MY_P="apache-ant-${PV}"
 DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
 HOMEPAGE="https://ant.apache.org/"
 SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-gentoo.tar.bz2"
+	https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-r1-gentoo.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -51,6 +51,8 @@ src_prepare() {
 
 src_compile() {
 	export ANT_HOME=""
+	# Avoid error message that package ant-core was not found
+	export ANT_TASKS="none"
 
 	local bsyscp
 
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
new file mode 100644
index 000000000000..7ddd5d55ba2b
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.9.13-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Don't depend on itself.
+JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
+
+# Rewriting build.xml files for the testcases has no use at the moment.
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 prefix eapi7-ver
+
+MY_P="apache-ant-${PV}"
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
+HOMEPAGE="https://ant.apache.org/"
+SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-r1-gentoo.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.8:*
+	!dev-java/ant-tasks
+	!dev-java/ant-optional"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${WORKDIR}/${PV}-build.patch"
+	epatch "${WORKDIR}/${PV}-launch.patch"
+
+	eprefixify "${S}/src/script/ant"
+
+	# Fixes bug 556008.
+	java-ant_xml-rewrite -f build.xml \
+		-c -e javadoc \
+		-a failonerror \
+		-v "false"
+
+	# See bug #196080 for more details.
+	java-ant_bsfix_one build.xml
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	export ANT_HOME=""
+	# Avoid error message that package ant-core was not found
+	export ANT_TASKS="none"
+
+	local bsyscp
+
+	# This ensures that when building ant with bootstrapped ant,
+	# only the source is used for resolving references, and not
+	# the classes in bootstrapped ant but jikes in kaffe has issues with this...
+	if ! java-pkg_current-vm-matches kaffe; then
+		bsyscp="-Dbuild.sysclasspath=ignore"
+	fi
+
+	CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal \
+		$(use_doc javadocs) || die "build failed"
+}
+
+src_install() {
+	dodir /usr/share/ant/lib
+
+	for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
+		java-pkg_dojar build/lib/${jar}
+		dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar}
+	done
+
+	dobin src/script/ant
+
+	dodir /usr/share/${PN}/bin
+	for each in antRun antRun.pl runant.pl runant.py complete-ant-cmd.pl ; do
+		dobin "${S}/src/script/${each}"
+		dosym ../../../bin/${each} /usr/share/${PN}/bin/${each}
+	done
+	dosym ../${PN}/bin /usr/share/ant/bin
+
+	insinto /usr/share/${PN}
+	doins -r dist/etc
+	dosym ../${PN}/etc /usr/share/ant/etc
+
+	echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
+	doenvd "${T}/20ant"
+
+	dodoc NOTICE README WHATSNEW KEYS
+
+	if use doc; then
+		dohtml -r manual/*
+		java-pkg_dojavadoc --symlink manual/api build/javadocs
+	fi
+
+	use source && java-pkg_dosrc src/main/*
+}
+
+pkg_postinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if _ver_compare ${REPLACING_VERSIONS} 1.7.0 -eq 1; then
+			elog "The way of packaging ant in Gentoo has changed significantly since"
+			elog "the 1.7.0 version, For more information, please see:"
+			elog "https://www.gentoo.org/proj/en/java/ant-guide.xml"
+		fi
+
+		if _ver_compare ${REPLACING_VERSIONS} 1.7.1 -eq 1; then
+			elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
+			elog "flags have been moved to dev-java/ant."
+		fi
+	fi
+}
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 995ec6828b00..814d98231375 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,9 +1,12 @@
+AUX ecj-4.10 326 BLAKE2B 5f0c336b144c94bb8ce57464854eacdf240d4172eb33c8a271f73680599672b668b7da98974f061969bb7153525d7361fea53492d947edf1349bfab89e9dd67d SHA512 9019fa5d98bbd759960e2ee1525962aef5f8b9402e84e5f3409812d3bcf8719b9495a39603d7f611c31a3a4327508b29d0bbba0952afbb38de2a251d52b9b3ed
 AUX ecj-4.2 290 BLAKE2B 4c96c6ead1903a37769bb2453d6320f2cff933855e7086bd9e59b3577ce0a30ac0887aea26eac1599a89a28eb048fc19c05cb1eba21b4dad23caaacefa36cfc8 SHA512 9fee5e853c9ffde67103b35cb8b28d06dde9be305aba872703a14a95be3e51f5087a5c897e6685f0381794415a524513a4e988ca088b7d30a574518943f97713
 AUX ecj-4.4 314 BLAKE2B 9855d136e85d003ef85e2b0e854d0ea6d29ee37e4221ca612d1ed6c51f89e6f2268f9082dd946468119129240166394122f54618e1a6a799dded0eeb9f0046cc SHA512 a0023e61ed3b1174e7ab7ebc9eb2bc42e9df6a23e5010ede6c2456eca60c4f4a9e11633fcc6438824fe1db4c881499b5f384715c19381411460e78e78ddca678
 AUX ecj-4.5 322 BLAKE2B 2941d70de68459d2bea21ae10680dbbee7888e156753e2bb7bae89b4c2aa41e453106b6ab0ae3660790cf70799550e09fd612a8736b0ac07a3859cdc25446e86 SHA512 d46976eb709a65e1d01af6b48d095325daf10a1ee4ff5da22de12593a253ba21e9550538ff13d1b7844fdb2604462d28133011301ba6a69cab83b2de7c7324f2
+DIST ecjsrc-4.10.jar 2036945 BLAKE2B cf9e50e53dac970a0b6b1231024a4efdc9adc92e02585aa4767c6511b367b32eefaf6fb3461c3c5c8160cf7205c0f708af0c433f4636b5a49caf637ba60fa092 SHA512 e85cacf6d2e21d464ff0226eac12bab8388df7a1413cb16d2982e255eb7369341792562f5080354279be0643c08fd80564a8eb2d8f59b72c8443c02577e4e1ee
 DIST ecjsrc-4.2.1.jar 1417043 BLAKE2B dc6915ec85d96a6ecdafb04485549feeb6ef8329811e294647e9e179ff3b1ec3cea55c29ad23b306ff3489dbfe6f574dc691ee31080a592d71607d3a996e9bb4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf
 DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
+EBUILD ant-eclipse-ecj-4.10.ebuild 1247 BLAKE2B fec5a58b0569cd24b4f992cce0aa3b3957365ac8e33e9ecd44d1198ee4c368272d8b7c825181519c573a1878d131608acc2bd9b06cf07e4f6007a906d3fe5077 SHA512 04f59d6699ec060918496fdfecfd3214f45ef41e86f81bd80b7d5e29dde9c65bd46cc8346b3751bbb5bd00d2456583a967b31428feeb24f525d10b4ccec9a297
 EBUILD ant-eclipse-ecj-4.2.1.ebuild 1363 BLAKE2B 1fd46c888db8d7662c55ceda97bfcfb2074bde7d26a249f0837e9a4f53f130b7776b9e131f3714d0ce272dbe8a777879366160e7fcb03e809099d7d3e168de50 SHA512 edbcd030f67950128afb6aad948d2104ca9610152cded95750c10771513246463c3da9d9a7fd128a623c9669cb3d6559875c69f4045e2ff1ea6a0b6f6bae9461
 EBUILD ant-eclipse-ecj-4.4.2.ebuild 1248 BLAKE2B dd7249882bbb0c2511e424165dcc12ccdee58baf9985da2182d31d451fa1fb94f736407e303bc1a61d9d43355a7142fd7af1078ff7277122540e1bc0a47786f5 SHA512 310dd8cb237d922b55186fcfad23136e0861464dc6aaa252ea8615a9dcf61a3f6042c5edc463af1147fb1f9d4c76b61fca15a035b8b9718252cc8d9ef85c4277
 EBUILD ant-eclipse-ecj-4.5.1.ebuild 1249 BLAKE2B 4f0fd6db9c642716d87396a421521a5087d014c41235436596a1e3d81c32ffc71d6734d1dd858b1d3c4ec088b8adf1cf2920402575910f51f1bda35c6a6f964d SHA512 45c87738ac2c850d2fbbcf1fb2cdbb03b271900b63324f6d9418337431da7fb260371a39814354e6abae1115fa9e84ffd43d6036be7bca724ff0e32780bef69f
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10.ebuild
new file mode 100644
index 000000000000..2749b9e70173
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10.ebuild
@@ -0,0 +1,48 @@
+# 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 java-pkg-simple prefix
+
+DMF="R-${PV}-201812060815"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.10"
+IUSE=""
+
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+	>=dev-java/ant-core-1.7"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-11"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-11"
+
+JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
+
+java_prepare() {
+	# Remove everything but the Ant component.
+	find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
+
+	rm build.xml || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	insinto /usr/share/java-config-2/compiler
+	doins "${FILESDIR}/ecj-${SLOT}"
+	eprefixify "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.10 b/dev-java/ant-eclipse-ecj/files/ecj-4.10
new file mode 100644
index 000000000000..cdb259897705
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.10
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.10"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.10*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.10,ant-eclipse-ecj-4.10"
+GENERATION="2"
diff --git a/dev-java/ant-jai/Manifest b/dev-java/ant-jai/Manifest
index 3d83fe8edfa4..13f694428d97 100644
--- a/dev-java/ant-jai/Manifest
+++ b/dev-java/ant-jai/Manifest
@@ -1,7 +1,10 @@
+DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-jai-1.10.5.ebuild 368 BLAKE2B 3ae1c6ee077ac695ad3d3c971d7a11df822db7519908bc902e1233ae63f0482c72b9b6209ea269e0172569c5297217200d3ebc5617af0d0bb396c90fbaadc2e9 SHA512 671d6e5a24cd8b7a766b46f48ee6b1cbbd611d89122f6b5c17244b01e420da30ef588a57f976e332e17542ca8bd6795bcc68a359f68c9d120203241a9047449c
 EBUILD ant-jai-1.9.13.ebuild 368 BLAKE2B 3ae1c6ee077ac695ad3d3c971d7a11df822db7519908bc902e1233ae63f0482c72b9b6209ea269e0172569c5297217200d3ebc5617af0d0bb396c90fbaadc2e9 SHA512 671d6e5a24cd8b7a766b46f48ee6b1cbbd611d89122f6b5c17244b01e420da30ef588a57f976e332e17542ca8bd6795bcc68a359f68c9d120203241a9047449c
 EBUILD ant-jai-1.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
new file mode 100644
index 000000000000..c6181a3f28df
--- /dev/null
+++ b/dev-java/ant-jai/ant-jai-1.10.5.ebuild
@@ -0,0 +1,16 @@
+# 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="sun-jai-bin"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Unmigrated, has textrels and there's also some source one now too.
+DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-javamail/Manifest b/dev-java/ant-javamail/Manifest
index e19020f2601d..064d5077e379 100644
--- a/dev-java/ant-javamail/Manifest
+++ b/dev-java/ant-javamail/Manifest
@@ -1,7 +1,10 @@
+DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-javamail-1.10.5.ebuild 496 BLAKE2B c4c11fd3ddb9cd6537af603f067cd846e3960fae10e8e46642243a6081b4f145222d3beeca98dc70d44ef5531e8400a60bd0cad100f04e0f56812e6087bd4b18 SHA512 a2ac7b9aac0dcef86c9f8040b0d3f05516bf01c5fb8095484829fef77ae8695b54cb0852e31e2afdc30c733cb896f833d48cb88d886289a8ad2a5ab4c5434bb7
 EBUILD ant-javamail-1.9.13.ebuild 496 BLAKE2B c4c11fd3ddb9cd6537af603f067cd846e3960fae10e8e46642243a6081b4f145222d3beeca98dc70d44ef5531e8400a60bd0cad100f04e0f56812e6087bd4b18 SHA512 a2ac7b9aac0dcef86c9f8040b0d3f05516bf01c5fb8095484829fef77ae8695b54cb0852e31e2afdc30c733cb896f833d48cb88d886289a8ad2a5ab4c5434bb7
 EBUILD ant-javamail-1.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
new file mode 100644
index 000000000000..fcc1e8b8df78
--- /dev/null
+++ b/dev-java/ant-javamail/ant-javamail-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="oracle-javamail"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# needs some classes from javax.activation.* which are not in jdk 11
+DEPEND="virtual/jdk:1.8
+	dev-java/oracle-javamail:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jdepend/Manifest b/dev-java/ant-jdepend/Manifest
index 5f8ca3dd111f..bf6d46288c70 100644
--- a/dev-java/ant-jdepend/Manifest
+++ b/dev-java/ant-jdepend/Manifest
@@ -1,7 +1,10 @@
+DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-jdepend-1.10.5.ebuild 376 BLAKE2B a696b3dd147add7d02a33255d7a11ee8c509cb57050ece62fff1c527559f8c394b40b0efc0002183a608670985d88f4f44f455b15c0bc96235a10fd514e4392f SHA512 4c5e1cf750649eddc4460c58f5676081ef6f2748f71ff5936de0ba3606253ac5f8e6300fe445ca757618b849599cf90935bb5e34656cb8ebaf64947bdacddaeb
 EBUILD ant-jdepend-1.9.13.ebuild 376 BLAKE2B a696b3dd147add7d02a33255d7a11ee8c509cb57050ece62fff1c527559f8c394b40b0efc0002183a608670985d88f4f44f455b15c0bc96235a10fd514e4392f SHA512 4c5e1cf750649eddc4460c58f5676081ef6f2748f71ff5936de0ba3606253ac5f8e6300fe445ca757618b849599cf90935bb5e34656cb8ebaf64947bdacddaeb
 EBUILD ant-jdepend-1.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
new file mode 100644
index 000000000000..791be2c169b6
--- /dev/null
+++ b/dev-java/ant-jdepend/ant-jdepend-1.10.5.ebuild
@@ -0,0 +1,14 @@
+# 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
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/jdepend-2.9-r2:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jmf/Manifest b/dev-java/ant-jmf/Manifest
index b97de22f66f4..58c5e17f1e05 100644
--- a/dev-java/ant-jmf/Manifest
+++ b/dev-java/ant-jmf/Manifest
@@ -1,7 +1,10 @@
+DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-jmf-1.10.5.ebuild 480 BLAKE2B 286c1b4804f8df6fa004dde3bafa13a548d38013cf9c8247dd7c9d252d2153a07fb9b857a725d270941e1e116ec2d5ca9a269ea14046ac236dda9370e8746286 SHA512 68ffff24854f1de809b7858e9a294481ed95779f5f35559eecff04c051b312492e488bef98a4afaafb65c4a016aa38d9f1ff9115cdccc3be1b86f9b6e6f347f7
 EBUILD ant-jmf-1.9.13.ebuild 480 BLAKE2B 286c1b4804f8df6fa004dde3bafa13a548d38013cf9c8247dd7c9d252d2153a07fb9b857a725d270941e1e116ec2d5ca9a269ea14046ac236dda9370e8746286 SHA512 68ffff24854f1de809b7858e9a294481ed95779f5f35559eecff04c051b312492e488bef98a4afaafb65c4a016aa38d9f1ff9115cdccc3be1b86f9b6e6f347f7
 EBUILD ant-jmf-1.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
new file mode 100644
index 000000000000..6320a347137e
--- /dev/null
+++ b/dev-java/ant-jmf/ant-jmf-1.10.5.ebuild
@@ -0,0 +1,16 @@
+# 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
+# Seems we don't need to depend on jmf-bin, the classes ant imports are in J2SE
+# API since version 1.3.
+ANT_TASK_DEPNAME=""
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)"
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-java/ant-jsch/Manifest b/dev-java/ant-jsch/Manifest
index a83ed9c91f01..351fc8910a3e 100644
--- a/dev-java/ant-jsch/Manifest
+++ b/dev-java/ant-jsch/Manifest
@@ -1,7 +1,10 @@
+DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-jsch-1.10.5.ebuild 373 BLAKE2B a57a1f35f191cdee1c13858e85b4e7d03419a17bc69c50f910cbc2c96280c352f2cb645d0ea128c9ae03b5ab4b179d430a01743b5d89da1ff15a3e6ea405a3c1 SHA512 1719deaa3496ddf36d6a18b30c092eba4c57f894d9f948e6e7e8f06325aa13e265fd1a6403c8f6ae0096c0d3325e434131b9d1379bab11dd087d8e61d7f66277
 EBUILD ant-jsch-1.9.13.ebuild 373 BLAKE2B a57a1f35f191cdee1c13858e85b4e7d03419a17bc69c50f910cbc2c96280c352f2cb645d0ea128c9ae03b5ab4b179d430a01743b5d89da1ff15a3e6ea405a3c1 SHA512 1719deaa3496ddf36d6a18b30c092eba4c57f894d9f948e6e7e8f06325aa13e265fd1a6403c8f6ae0096c0d3325e434131b9d1379bab11dd087d8e61d7f66277
 EBUILD ant-jsch-1.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
new file mode 100644
index 000000000000..9d5d044a3a9d
--- /dev/null
+++ b/dev-java/ant-jsch/ant-jsch-1.10.5.ebuild
@@ -0,0 +1,14 @@
+# 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
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/jsch-0.1.37:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-junit/Manifest b/dev-java/ant-junit/Manifest
index a7d5d0416f5a..f70fee27812a 100644
--- a/dev-java/ant-junit/Manifest
+++ b/dev-java/ant-junit/Manifest
@@ -1,7 +1,11 @@
+DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+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.9.13.ebuild 479 BLAKE2B 7a44d5bad2af9a0d7a2853cadd23ce0c94346d5b004aab8c82941e947f555a2cce7850abed80e39ebcc47637e24cc7073f57535956affafe1c2322fec5c16413 SHA512 490385f5614eb61c96368d46fc53d146d192e70d945ff4c01da5c2c0883411541c5e986fd1a0dc645bb29e2f2c0b4ae76e4dcebbd7dc9e33f658bbe32e48da54
+EBUILD ant-junit-1.10.5-r1.ebuild 500 BLAKE2B 28534ca06f9a866d43eb65f5e43fa39f98c82546ee3e2327d4d74786163a735b816adce43510f070132bf390b17f59cf4725636dc57a2a986c875f869df3e895 SHA512 8eb8751c5ae023c18249f7a9ee19055094388003d6e0df7b65fe986f2c5e8bed17188a8e34181d4c6b4ff81c40bac19f03e034842920f976f04c381afd412c91
+EBUILD ant-junit-1.9.13-r1.ebuild 500 BLAKE2B 28534ca06f9a866d43eb65f5e43fa39f98c82546ee3e2327d4d74786163a735b816adce43510f070132bf390b17f59cf4725636dc57a2a986c875f869df3e895 SHA512 8eb8751c5ae023c18249f7a9ee19055094388003d6e0df7b65fe986f2c5e8bed17188a8e34181d4c6b4ff81c40bac19f03e034842920f976f04c381afd412c91
+EBUILD ant-junit-1.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.9.13.ebuild b/dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild
index f61f65337cf9..71acf63814d5 100644
--- a/dev-java/ant-junit/ant-junit-1.9.13.ebuild
+++ b/dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild
@@ -10,7 +10,10 @@ inherit ant-tasks
 
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-DEPEND="dev-java/junit:4"
+DEPEND="
+	dev-java/junit:0
+	dev-java/junit:4
+"
 RDEPEND="${DEPEND}"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
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
new file mode 100644
index 000000000000..71acf63814d5
--- /dev/null
+++ b/dev-java/ant-junit/ant-junit-1.9.13-r1.ebuild
@@ -0,0 +1,24 @@
+# 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
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+	dev-java/junit:0
+	dev-java/junit:4
+"
+RDEPEND="${DEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="junit-4"
+
+src_compile() {
+	eant jar-junit
+}
diff --git a/dev-java/ant-junit/ant-junit-1.9.2-r1.ebuild b/dev-java/ant-junit/ant-junit-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..c5742d40b81d
--- /dev/null
+++ b/dev-java/ant-junit/ant-junit-1.9.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+ANT_TASK_JDKVER=1.5
+ANT_TASK_JREVER=1.5
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+	dev-java/junit:0
+	dev-java/junit:4
+"
+RDEPEND="${DEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="junit-4"
+
+src_compile() {
+	eant jar-junit
+}
diff --git a/dev-java/ant-junit4/Manifest b/dev-java/ant-junit4/Manifest
index d3bbaaaeb5b2..9055994cbb5a 100644
--- a/dev-java/ant-junit4/Manifest
+++ b/dev-java/ant-junit4/Manifest
@@ -1,7 +1,10 @@
+DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-junit4-1.10.5.ebuild 943 BLAKE2B c172559480a7a5ddfd4d18fe5488cae4b21a90a1f82e826500f0623f323e38c2321cf0ce85d25d9a0a63b8750f54c50d3fe7452876e839cffc322597ed8dcf28 SHA512 23cae253175022a51ed3862989034b49c209c2362852e9ac0bedbf6789eb4ab5931d90379291638026d314eeb068badda7fc29072650997c1ffd3d73f4a5eaf1
 EBUILD ant-junit4-1.9.13.ebuild 943 BLAKE2B c172559480a7a5ddfd4d18fe5488cae4b21a90a1f82e826500f0623f323e38c2321cf0ce85d25d9a0a63b8750f54c50d3fe7452876e839cffc322597ed8dcf28 SHA512 23cae253175022a51ed3862989034b49c209c2362852e9ac0bedbf6789eb4ab5931d90379291638026d314eeb068badda7fc29072650997c1ffd3d73f4a5eaf1
 EBUILD ant-junit4-1.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
new file mode 100644
index 000000000000..fb52e9f07b75
--- /dev/null
+++ b/dev-java/ant-junit4/ant-junit4-1.10.5.ebuild
@@ -0,0 +1,37 @@
+# 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="junit-4"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND="dev-java/junit:4
+	~dev-java/ant-junit-${PV}"
+
+RDEPEND="${DEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="junit-4,ant-junit"
+
+src_prepare() {
+	default
+
+	java-pkg_jar-from --build-only --into "${S}/lib" ant-junit
+}
+
+src_install() {
+	# No registration as ant-task, would be loaded together with ant-junit.
+	java-pkg_dojar build/lib/ant-junit4.jar
+
+	# As we dont't want to depend on and-junit in package.env, because it depends
+	# on junit:0. Instead, we "steal" its jar and record it to our package.env as
+	# if it belongs to this package's classpath.
+	java-pkg_getjar --build-only ant-junit ant-junit.jar
+	java-pkg_regjar $(java-pkg_getjar --build-only ant-junit ant-junit.jar)
+}
diff --git a/dev-java/ant-junitlauncher/Manifest b/dev-java/ant-junitlauncher/Manifest
new file mode 100644
index 000000000000..e38ab3260f4d
--- /dev/null
+++ b/dev-java/ant-junitlauncher/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-junitlauncher-1.10.5.ebuild 350 BLAKE2B 16e87c18c3a79b188c95c804bada00168d22650ad79dc4d548bc2cf1a3188b50601fefc67a940ca198bdef4cb2d549ee179da6876ac652401831a5ce7ddbe45f SHA512 feb74430da2490e62b692a1a679f762ca97a99b2a8bdbbf7c879db31f61d8a2418d7260457be79095e7abc58d6423f096716e259092ca935d91f42ea2e45ad80
+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
new file mode 100644
index 000000000000..5ab771362188
--- /dev/null
+++ b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.5.ebuild
@@ -0,0 +1,12 @@
+# 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=""
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-junitlauncher/metadata.xml b/dev-java/ant-junitlauncher/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/ant-junitlauncher/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-swing/Manifest b/dev-java/ant-swing/Manifest
index c31671a10f20..cb7c157df648 100644
--- a/dev-java/ant-swing/Manifest
+++ b/dev-java/ant-swing/Manifest
@@ -1,7 +1,10 @@
+DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-swing-1.10.5.ebuild 416 BLAKE2B 2cc4fbf80449b44c8bd7b5c96cd81f2eb27e57243b0b2266aa444572e80d9cc71d648a531c9a863a960473728bcbcb380844b462ffce7a6115e2de03977e095f SHA512 535d2734973dbe13615d2aa732564fee11f10b07b2a82064f60d413e67b88c28a860b0398d3664f69b7188b54ca389867b2ab8476b3a5f9b4a22496fe5d542c1
 EBUILD ant-swing-1.9.13.ebuild 416 BLAKE2B 2cc4fbf80449b44c8bd7b5c96cd81f2eb27e57243b0b2266aa444572e80d9cc71d648a531c9a863a960473728bcbcb380844b462ffce7a6115e2de03977e095f SHA512 535d2734973dbe13615d2aa732564fee11f10b07b2a82064f60d413e67b88c28a860b0398d3664f69b7188b54ca389867b2ab8476b3a5f9b4a22496fe5d542c1
 EBUILD ant-swing-1.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
new file mode 100644
index 000000000000..9de5fd723213
--- /dev/null
+++ b/dev-java/ant-swing/ant-swing-1.10.5.ebuild
@@ -0,0 +1,15 @@
+# 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
+# No extra dependencies are needed.
+ANT_TASK_DEPNAME=""
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional tasks for Swing"
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-testutil/Manifest b/dev-java/ant-testutil/Manifest
index 933ea8028aa6..b268703e29e6 100644
--- a/dev-java/ant-testutil/Manifest
+++ b/dev-java/ant-testutil/Manifest
@@ -1,7 +1,10 @@
+DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
+EBUILD ant-testutil-1.10.5.ebuild 918 BLAKE2B c42070be0d757c00aeb89c9e6acabfd3204d5d7278c555f14dcb7e4978e0997e0708993baeb8815d7b21b78b27c769503e1351fa7127fa39b81b16c6132488f2 SHA512 d2f4f979ef213a674d399ce6b33d14e5456addb44aaa18548673a7ef618eadbb8781525b96100332eadeefb5b47975463e88b8eb1c5ab290cd5a18360cb7d59e
 EBUILD ant-testutil-1.9.13.ebuild 918 BLAKE2B c42070be0d757c00aeb89c9e6acabfd3204d5d7278c555f14dcb7e4978e0997e0708993baeb8815d7b21b78b27c769503e1351fa7127fa39b81b16c6132488f2 SHA512 d2f4f979ef213a674d399ce6b33d14e5456addb44aaa18548673a7ef618eadbb8781525b96100332eadeefb5b47975463e88b8eb1c5ab290cd5a18360cb7d59e
 EBUILD ant-testutil-1.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
new file mode 100644
index 000000000000..c29ef4f5b6f0
--- /dev/null
+++ b/dev-java/ant-testutil/ant-testutil-1.10.5.ebuild
@@ -0,0 +1,36 @@
+# 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
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional test utility classes"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+CDEPEND="dev-java/ant-core:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8
+	>=dev-java/junit-4.11:4
+	~dev-java/ant-swing-${PV}
+	~dev-java/ant-junit4-${PV}"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8"
+
+# The build system builds much more than it actually packages, so there are many
+# build-only deps, but since those are quite common, it wasn't worth to patch it.
+
+src_unpack() {
+	ant-tasks_src_unpack base
+	java-pkg_jar-from --build-only junit-4,ant-junit4,ant-swing
+	java-pkg_jar-from --build-only ant-core ant-launcher.jar
+}
+
+src_compile() {
+	eant test-jar
+}
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index fadee5cf3895..466830834073 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,3 +1,4 @@
+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.9.2-r1.ebuild 2027 BLAKE2B eee331a9cffd99f179cd2df829299f95e100d132cf7055dffa63463d42655febd55a3e7643af993f236a6ba5bc12efe5c332fcd73e7cebb4540bf45d4a7a7018 SHA512 092edc2dc1c0b2e2b607db39dab7632814bb124ef3c20c1787fc84760b4192e8690cdc575f21efc2b4146b1efea97e2317829f5c99b4f3b96cbb1c002951d605
-MISC metadata.xml 1431 BLAKE2B 823bc35e3afb270dc4096065c0a446be74eee32d4fff15851d3f260e6ff0c81af90439db67f214f683e9ddba3163682b337d9dadc132a5fc4c4b37d8cea4688e SHA512 7d9ac0e422e5502fb34ae451bee7aba6bad7fbc1e437ce2267dad7e00ac696cad3a776210bdac8e6c8f25ba43ebc2b377aaf8bb9f7ba3fd4eafccdd5dfab50e1
+MISC metadata.xml 1493 BLAKE2B 8a89866225217f0451ddc3e7901a645d36ab69cbbe4c504c653d7c95c5f3fe6811c163860e9cdbd80e3ab25cdaba88916c58ab390b7d47e6e07acbaac94e18fc SHA512 e4b010f45ec5895291a25432ea50d3a3ae07303c550f711b884d067367424422d336ca83478db71ad3d41766faf177420d039030a58c1787f8ebed42c585bc09
diff --git a/dev-java/ant/ant-1.10.5.ebuild b/dev-java/ant/ant-1.10.5.ebuild
new file mode 100644
index 000000000000..82e8fc32c9b9
--- /dev/null
+++ b/dev-java/ant/ant-1.10.5.ebuild
@@ -0,0 +1,48 @@
+# 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"
+
+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} )
+"
+
+S="${WORKDIR}"
+
+src_compile() { :; }
diff --git a/dev-java/ant/metadata.xml b/dev-java/ant/metadata.xml
index 9cf9c9ca48a5..8576aaf4b15a 100644
--- a/dev-java/ant/metadata.xml
+++ b/dev-java/ant/metadata.xml
@@ -19,6 +19,7 @@
     <flag name="jsch">Disable Jsch (ssh, scp and related) Ant tasks</flag>
     <flag name="junit">Enable JUnit Ant tasks</flag>
     <flag name="junit4">Enable JUnit4 Ant tasks</flag>
+    <flag name="junitlauncher">Enable JUnit5 Ant tasks</flag>
     <flag name="log4j">Enable Apache log4j Ant tasks</flag>
     <flag name="oro">Enable Apache Oro Ant tasks</flag>
     <flag name="regexp">Enable Apache Regexp Ant tasks</flag>
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 8c17430413f9..fc3ee8cf0670 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,6 +1,8 @@
+DIST ecjsrc-4.10.jar 2036945 BLAKE2B cf9e50e53dac970a0b6b1231024a4efdc9adc92e02585aa4767c6511b367b32eefaf6fb3461c3c5c8160cf7205c0f708af0c433f4636b5a49caf637ba60fa092 SHA512 e85cacf6d2e21d464ff0226eac12bab8388df7a1413cb16d2982e255eb7369341792562f5080354279be0643c08fd80564a8eb2d8f59b72c8443c02577e4e1ee
 DIST ecjsrc-4.2.1.jar 1417043 BLAKE2B dc6915ec85d96a6ecdafb04485549feeb6ef8329811e294647e9e179ff3b1ec3cea55c29ad23b306ff3489dbfe6f574dc691ee31080a592d71607d3a996e9bb4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf
 DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
+EBUILD eclipse-ecj-4.10.ebuild 1678 BLAKE2B 933c353919c86dd1d1a8adff7604bb42a35ed0de363134d8a3169dfefd91c90f6827a0bd661371515da6b9a63fd55745578dd70c50e808ccb29f1e5e1ffa4fb1 SHA512 2bd4398ccc15505ef35081e5afce5302001a0eec585c8c5463b233922e3faf234fc982293d873b4c181785f23b883993e157555202c0e2c1f823b68aa844f87f
 EBUILD eclipse-ecj-4.2.1.ebuild 2770 BLAKE2B 23996155f35ac40c9a44a92f49e794a0f02468c1fd94a4a151f2b5451ac02d22feaa5381d07f8fcf49592b407842aae438c6e0866f7c20ecd7514edf6127e0b1 SHA512 b1e4e064ce41776a958ee2c8290382baaf228d998ea8b1d7db5c036369cff259da43877b1f8e7712678985f2facd0adabc9922c3ecd7072f499f52adc929a9ce
 EBUILD eclipse-ecj-4.4.2-r1.ebuild 1361 BLAKE2B 3f2fea077ce628cb057ee841d6a19b06f9b56344c085a5fd7533fa084d3f7cf92a5ac6edc31632e31c470852f742b383cc913371e927d59aabfbb38e42496f6e SHA512 9a870d4ce61c4a5ed3f9c0e9b7b75f0006a1649269849a08a5b5b809f980abb3773be37338564578e4fc8ee8921e231c93b5cfc0f72e99f71190c7a91ff86eef
 EBUILD eclipse-ecj-4.5.1.ebuild 1628 BLAKE2B 19a0422c19a19998e199dae7170e3b89954d412e62523ec4742fbf514015afdfe01a9c932b044dfd4f6971a96ba1bf3bf98697732b677f567c3d2a83368d575e SHA512 ba5ded5ba46b10e1467c42ad8f63f67f065acd08f3e39541e3794e97a0f8974edc1d4e3eff474916922b83e8fd9656cba6f34b67c3febc4ea15bf08c933ca2ff
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.10.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.10.ebuild
new file mode 100644
index 000000000000..18842971b055
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.10.ebuild
@@ -0,0 +1,70 @@
+# 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 java-pkg-simple
+
+MY_PN="ecj"
+DMF="R-${PV}-201812060815"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.10"
+IUSE="+ant"
+
+COMMON_DEP="
+	app-eselect/eselect-java
+	dev-java/ant-core"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-11"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-11
+	app-arch/unzip"
+PDEPEND="
+	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+
+JAVA_JAR_FILENAME="${MY_PN}.jar"
+JAVA_GENTOO_CLASSPATH="ant-core"
+
+S="${WORKDIR}"
+
+# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
+java_prepare() {
+	# These have their own package.
+	rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -r org/eclipse/jdt/internal/antadapter || die
+
+	# JavaCore is not distributed in the jar
+	sed -i -e '/import org.eclipse.jdt.core.JavaCore;/d' \
+		-e 's|JavaCore.getOptions()||g' \
+		org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
+		org.eclipse.jdt.internal.compiler.batch.Main
+}
+
+pkg_postinst() {
+	einfo "To select between slots of ECJ..."
+	einfo " # eselect ecj"
+
+	eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+	eselect ecj update
+}
diff --git a/dev-java/glassfish-jms-api/Manifest b/dev-java/glassfish-jms-api/Manifest
index a1a0c74c4d8a..51285dfd6923 100644
--- a/dev-java/glassfish-jms-api/Manifest
+++ b/dev-java/glassfish-jms-api/Manifest
@@ -1,3 +1,3 @@
 DIST glassfish-v2ur2-b04-src.zip 39817113 BLAKE2B 4aeb0df44f838c91fa8dd52e2a4985e86457f75cec3cd5d527de54f672afcd2824cefaad9d9e67c5ce096515e389bb2fc0874d76ce2ec86a956233f2c3508439 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8
-EBUILD glassfish-jms-api-1.1.2.2.04.ebuild 1235 BLAKE2B 553972605cc58642f29f0445f2a2080416c1cc1c7eb89f8c51f90ce2249205b605cd9d9bfbb329d5fb873ce3629e2373269994f82156d5477d0a741deabcc4a6 SHA512 f3ab5eb4ac6455d0dd577b4b1e295d8fed169e9962472989d816c85d3c3d029cc44d65e28e5e3a7170fe0af88d48e94284bd7596d0bb4d7315f0b18ea5d09446
+EBUILD glassfish-jms-api-1.1.2.2.04.ebuild 1228 BLAKE2B ff2a89eb1a89247008ba656021b5eaead1b1572c65d5b8af0987ccedc8b184b828ab1bc9d6f7d43b06632f3ec5d5392cb43af6871ec22d8a0e9fcf7afd6df49a SHA512 7d3b30e514cd690bbe4b2dabe2ca57407e1d4ffe53bee6de2b8f853c978942ff3c0faa973a452839c50ce4d64f0a603e6874f3e3f971f262e3fe8fb2f2691cbb
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04.ebuild b/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04.ebuild
index a19cf3b26787..be0d113d2a59 100644
--- a/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04.ebuild
+++ b/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04.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="2"
@@ -36,7 +36,7 @@ src_unpack() {
 }
 
 EANT_BUILD_TARGET="all"
-EANT_EXTRA_ARGS="-Djavaee.jar=\"${S}/${PN}.jar\""
+EANT_EXTRA_ARGS="-Djavaee.jar=${S}/${PN}.jar"
 EANT_DOC_TARGET=""
 
 src_compile() {
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index e4c8361d90e1..17396dcb23a9 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,9 +1,7 @@
-DIST jdk-11.0.1_doc-all.zip 51573427 BLAKE2B 8b08e383922367f19a570e3c112c30ce0306292daf95678cd699d5a15fa4003e6b231ea2ecb278f039cdf9525a82b4e95e3c9b7866a09beb4240945ec293d2bd SHA512 9cb0e5e1b95874de46d63d747685eeeabfb6de5b80e3018025341f265fdf3d54e769479cf2c5f0d62af934a4c9c647fb8fd89920a9ae4ff1ef612eeccb4f0e99
-DIST jdk-11.0.2_doc-all.zip 51573358 BLAKE2B fa16dd49ea645e3ae21b6e57152f10872772dd149ba117f6eea820d48c3669ed3f0bd7144eccf122d6e8a8aa5f8b279857c63ef23babce35771126cf42a92e1b SHA512 fe35b59e5d04e0fbdc5bfab3398ddebfe9f0a10411da84a5e513450920267a5e163f71a69d21d62e442a4fdc4171e2e2bb006609bc969cc7fa035747663b9418
+DIST jdk-11.0.2_doc-all.zip 51570202 BLAKE2B 6e1ced82751eeb04740d146677da3a4f7644a51a227caf0b47cae28a218bd7851cb4e6f908793cf9358f64c5c2b6d52be4d5bf6a06d22815d3f0b866ba493ed7 SHA512 511ad7ebed88055c6f2800a16051c17e89a2fcb8de49979f32d920fa0e7c6328646f20f2809a133116e763ad464640826a50fd7fce3ed10b9b7cb0e46f2aa8d5
 DIST jdk-8u202-docs-all.zip 93792495 BLAKE2B c1e3f6f5a713d55a62dc6ef0fd2bba5d30b094030e8438b73bd6bf9f27a7ec3bdb924d8251f99182eb62b470f177fdf84db23f57550bc9467a4a7c305190ad50 SHA512 ad8b51bbc705d46d47164918ce2d620cbadaf92a3fe56d72528f9cbc05da900309ecfef7ebf711e9474f292f744e2e33877cb7377e2e21a5a58e1922198be907
 DIST jdk-9.0.4_doc-all.zip 70500089 BLAKE2B 549da2c6baf1b39082f05d42d0fd02f7682a765c1d43a605063b155b3b3e2e20053b4044a238afb41c758700efa5de9ec53c29e2e8be1d682c2e9e7b221c0875 SHA512 7d8b40499a0ea91ac922c6916b19a061b39e73e54e123a943fcaa75fcfe66672ad445dbd789c2c9448c8cee0e7f72974ca6ad53bcaa5667547feca5791dab92b
 EBUILD java-sdk-docs-1.8.0.202.ebuild 1463 BLAKE2B 90333af0e93385f7c17ebcdba8a08022d4e16db20cd13e1081a8e44f7c2fed01de147767f0a52debe08559937a54e40d3636c371bbd1369ccc8fd3ca1c1857d1 SHA512 690b5443f1dbf3cb51c9b6f5201375d225bda54bf4ab83e388546c12b5f3c60a5bbe44b1abb7ebf48d85caaf550339798f5b6d9141cfa8b7bc2867653a5baea6
-EBUILD java-sdk-docs-11.0.1.ebuild 1276 BLAKE2B 62d83b8826c0db27f7845e0c3da9b75b09d07b8fffdbf5297849a41d223cde5a6a1329a42b72a23965e09424592370e73a85adad272bcc9d41e0fd6bd9cbd1ca SHA512 3a387c687e75f0a45cbb39a4512935bb2b25bb0dedcd9d1c25923ea17aada3cc2d9035f821ba3560e4497ea3fbcaea1c1e0af50ff301f43dd4fe6c219fe2e5bb
 EBUILD java-sdk-docs-11.0.2.ebuild 1276 BLAKE2B c20cd90cfb65752da1d5f5f2e0ff62e5d0c316c94356d6093593b0d55bf11535edc9600d88cd6143f6e415870ad62d138658a791a9bdede5659a4d33281113b3 SHA512 2f2eaff0d799c8565bac3489f00034898c90d84dd4bae4daecf0dcd166f28dfdbf0f74b17ee2b8a2824718a4cd5cd3e4826482dfe0f3436d8412b6fec003f111
 EBUILD java-sdk-docs-9.0.4.ebuild 1277 BLAKE2B 0e2610b8541e0470b9ca4d093ffdf46dd244694b13f23aa5ad7e139a9b5085795efba9553bf1cbfe68b64ff1bed3b8eec51b27c1f106da69b964aaa17fb8d84e SHA512 7772dd3232e6ed790570c82cf23a67006944cdd7676d4e4d6ce69e19ee9f8f3c4cf4fc18cff85bb68c0f50173bc92bb5442ac0050b73aebe662b819e7866d532
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-11.0.1.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-11.0.1.ebuild
deleted file mode 100644
index 06d84404b0f4..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-11.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DOWNLOAD_URL="https://www.oracle.com/technetwork/java/javase/documentation/jdk11-doc-downloads-5097203.html"
-
-SLOT="${PV%%.*}"
-DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="https://docs.oracle.com/javase/${SLOT}"
-SRC_URI="jdk-${PV}_doc-all.zip"
-LICENSE="oracle-java-documentation-${SLOT}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-RESTRICT="fetch"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${SRC_URI} from"
-	einfo "${DOWNLOAD_URL}"
-	einfo "by agreeing to the license and place it in your distfiles directory."
-	einfo ""
-	einfo "If you find the file on the download page replaced with a higher"
-	einfo "version, please report it in bug #67266 (link below)."
-	einfo ""
-	einfo "If emerge fails because of a checksum error, it is possible that"
-	einfo "the upstream release changed without renaming. Try downloading the file"
-	einfo "again (or a newer revision if available). Otherwise report this to"
-	einfo "https://bugs.gentoo.org/67266 and we will make a new revision."
-}
-
-src_install() {
-	insinto /usr/share/doc/${PN}-${SLOT}/html
-	doins -r index.html */
-}
diff --git a/dev-java/leiningen-bin/Manifest b/dev-java/leiningen-bin/Manifest
index 49da95e7d697..b443e7d43dfc 100644
--- a/dev-java/leiningen-bin/Manifest
+++ b/dev-java/leiningen-bin/Manifest
@@ -3,6 +3,9 @@ DIST leiningen-2.8.0-standalone.jar 13541842 BLAKE2B 79697751b9da90a3f61bd4b8722
 DIST leiningen-2.8.0.sh 4335 BLAKE2B 951cc9b69e726bbb84c88b8b6407386c878cb1521c5cd79c7ce39ed48805cd24e9af0102f21cd7e852a024830b151751d42e7524f729bcca40f0e7de013ceb8b SHA512 08a5e2fc68ac3bd34dc32558088bd2ff79c9d72c54a610cfcd8c79fa5dcb98ad28d6950cb91b88081d024d5be881a168c2f9235c7888aa36c0f0e7e1f124169f
 DIST leiningen-2.8.1-standalone.jar 13541128 BLAKE2B f38c5d9e8e0088af352f915c2e3290bbbd97fd791607e1553109084a302c6c58d37f1d712b68b31d16d5de83239a9908bcf69aad0eaf1d2dc2e358090665fab8 SHA512 7c585d25f7089dbd718d84711b202b087ec4987f2e1a448fc00cb789a12da88967c048f2de1d087c9e81c6fcfd8b82825117220ba729096b4c946ae25504c716
 DIST leiningen-2.8.1.sh 4461 BLAKE2B ed3fe5421bfdf4fc3a0a8d09bba7c3ca4de4571bd2dcd26251af338dcff0baaa71208c83317b62067f2fcde4a70aef5593cc7c31742eed6ce5db8c3ce8a80b9b SHA512 77ef29885a87e7c23b972d519cdb052b94a74d63f8a455935c199f5f7c04ab30ed06503792ea5a21ac047c7abdcf7e4e72e54114b96f984e4bcb9790e97909de
+DIST leiningen-2.8.3-standalone.jar 13598124 BLAKE2B 1810acb75adb25985b660d14d5be429a82b81480d38a6325ddb99a34ae6d44fed0b19243135c673001ff958935d1bb8e912940e22b25b3aed7982a80fbbd3fb3 SHA512 f9ed3604dbf0498524b3a137a872576de7cb5b8df6d4841cf6d552adc0b8cf2186244805cd53228d57c4285803069ed8a67a8dd33a326369cb468dcc773444f7
+DIST leiningen-2.8.3.sh 4509 BLAKE2B b5291c5596dea00c2043ae7c791f2a79077e545eec667a99e584400af5351258fb5041037fe060a12033115dd0fbc63a8e9ad83f1d6c926c231d49ad331adb51 SHA512 d62a5e9bbf10d940763ca988f900900413e80bf9d0e2d8c668f897f178dbc64daf7b828e8dcd1c72aa0794e266814491122b8d8acd47c5561feec177595cabdd
 EBUILD leiningen-bin-2.8.0.ebuild 1549 BLAKE2B 121745ac21ffc2a35bc7fcf9faf3cc60a94125445f426b6cbcc96dad0be74f0a94060ecf5f1490239c1cfc5e1eaff8e597a4f2823474c9c82ea201280f7e9912 SHA512 538011051c64acaf051b4b7b97e23e8a32655fe038520e4585d5d90d071ae6241c61e366b71e5b8d5178d2c1acd573d4b51796cfc2e1513cfb296232e9eee2af
 EBUILD leiningen-bin-2.8.1.ebuild 1546 BLAKE2B 06c5c1d35e08895de62663541d2f49e221b89c24946ae30eedc8ef4eb49a72d885efd621be562b8477cb5381fdd7d369b236ab27956d04669682dbdbcf541d8e SHA512 ff8b91c1e3482867e6a6fb4fa02f9445c8cb49ad8531e37dd1be4e2256522b299333328660feabfbd10098cd959b1a6123793fa11fa19dbb50608291f1e1efdf
+EBUILD leiningen-bin-2.8.3.ebuild 1546 BLAKE2B eea35f9cb33a79851688f15c92ab0e3ffeb167aefaa217cfcd53bd523675fac8a86fac89e8472b154a6831864f5146dcbb7eda6d251ee45316ba4fa75b60c88b SHA512 2d1e01491c03f3415e88bde8f9a0919f025abfccc41ae9f8675b4c276d2bd88349af5043de457afe0e048ab67f17d6b90c41abe6aafc7c1427f39ea1ee9afe8a
 MISC metadata.xml 408 BLAKE2B 5c7a156b3dce1942e988302fb75ffbb3fc3738bb4aeb21203804b61a46f313fcbe2b8314702b9361afe21d33db68d9643217eaa3db3f08b7f001f29100e06eca SHA512 be76fcdb5d5ab199c951e2b563976b5c2bfe4f95000822073dccd71305f2409e90488e4c0fa726e503cbb533b16ca6a85599d84cadcf15d46e8070c3e5d0a5d3
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.8.3.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.8.3.ebuild
new file mode 100644
index 000000000000..8025bfa59aba
--- /dev/null
+++ b/dev-java/leiningen-bin/leiningen-bin-2.8.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_PNV="${MY_PN}-${PV}"
+
+DESCRIPTION="Automate Clojure projects without setting your hair on fire"
+HOMEPAGE="https://leiningen.org/"
+SRC_URI="
+	https://github.com/technomancy/${MY_PN}/releases/download/${PV}/${MY_PNV}-standalone.zip -> ${MY_PNV}-standalone.jar
+	https://raw.githubusercontent.com/technomancy/${MY_PN}/${PV}/bin/lein-pkg -> ${MY_PNV}.sh
+"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+
+RDEPEND=">=virtual/jre-1.8"
+DEPEND=">=virtual/jdk-1.8"
+
+RESTRICT="test"
+
+src_unpack() {
+	mkdir -p "${S}" || die "Can't mkdir ${S}"
+	cd "${S}"	|| die "Can't enter ${S}"
+	for file in ${A}; do
+		einfo "Copying ${file}"
+		cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
+	done
+}
+
+src_prepare() {
+	einfo "Copying leinrc"
+	cp "${FILESDIR}/leinrc" "${S}/" || die "Can't copy leinrc"
+	einfo "Patching leinrc"
+	sed -i "s^@@PN@@^${PN}^" "${S}/leinrc" || die "Can't patch leinrc"
+
+	einfo "Renaming lein-pkg"
+	# Rename generically to help user patching
+	mv "${S}/${MY_PNV}.sh" "${S}/lein" || die "Can't rename to lein"
+
+	einfo "Patching lein"
+	java-pkg_init_paths_
+	sed -i "s|^LEIN_JAR=.*$|LEIN_JAR=${EPREFIX}/${JAVA_PKG_JARDEST#/}/${PN}.jar|" "${S}/lein" \
+		|| die "Can't patch LEIN_JAR in lein"
+
+	default
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin "${S}/lein"
+	java-pkg_newjar "${MY_PNV}-standalone.jar"
+	insinto /etc
+	doins "${S}/leinrc"
+	fperms 0644 "/etc/leinrc"
+}
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 3b2132b6f15b..6b3851be3877 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -31,6 +31,6 @@ DIST jdk-8u202-solaris-sparcv9.tar.gz 92381302 BLAKE2B 331eda8ffa0128853e872f7f2
 DIST jdk-8u202-solaris-x64-demos.tar.gz 8830525 BLAKE2B 6b6ced784d5b549d647c29b5859e376bbb44d3310d424bfdb087a3043d4849c43c24a370f166739850588f2b83ec7f24b3f3d9ae68a544f4f1cc152249137057 SHA512 eaa9adf1df2e554d2c76ea5f109e0ccf2f7c4a8221c78c402d1bfeb1da74cfe8bf2b8ecdac4cdfbef6b63b7439f94daadbcecd4dadfc73456400387c6d3a6353
 DIST jdk-8u202-solaris-x64.tar.gz 89523049 BLAKE2B 4b93344feaf6235d2e41cee688668c067ebb8107ba62b66d6cffec0b3b021a2f34537957743dfecfe7e97231ba709c948da0deac3bbbd7a9ca7de2086ee7f359 SHA512 4b4480bfc25be8d4bc8efe4aac3b5c28c240fd7f39875b5976bf735f58e11c39083d6c48387ecd81b507fd8284296df7844675450e6b5edc2c04627a73cc5923
 EBUILD oracle-jdk-bin-1.8.0.192.ebuild 8499 BLAKE2B b0d6aec6ef4111cfb45e26dd2c53d7f673a1253dc2ad61cfb6d11d5aca5fef7533d7ab2e704b2269f75398978da4551774bbec98fc93c4d86abe7c17a0cbd606 SHA512 311006a218f6b65627943a9eaa2db29f1feaf4d90747a7481e6c492f7ab19e651bf07595772ad97e696732d02ab6bdb9326c8d67ccc4a7ebeda0fc54baa41fb1
-EBUILD oracle-jdk-bin-1.8.0.202.ebuild 8501 BLAKE2B 393cced92b424d4b5ce1e2a00a8fb8cf745ecd733bacf3dc473bdfe2ce3674aca78f4ad60ae3db6ff2ea94551d73aadaf6e26f1ee6337cd2c3a1342dd9e9be90 SHA512 2c2d3ac75d93d4e0ba57faede1f148174e36d2d4875071251ead11a57e118a9b0130139034e75fdb601cdab45deae2bee468128f05269a58e1708d8a70273626
+EBUILD oracle-jdk-bin-1.8.0.202.ebuild 8500 BLAKE2B 279c3fbe5a0e22854e20fce7634ee2a818e784a88d4c4b12506236a7ebfb7040fdb890ea3c894da54f22454c35bd7f98b6862cce4d945d5e1f26144ec3a7d572 SHA512 fa4bf303f56eba121cf4d1b3684b21c6fb93f02f823ed58842b31e73b79df2d7aacbb7066ebfa046af4efdf7af5397205a044190e857da40b392fa9699db8dc1
 EBUILD oracle-jdk-bin-11.0.2.ebuild 6921 BLAKE2B ea5ed5d866f51767aad5781cd9b34dd5ed2490afe815e1139b80dc6b6940f27c799269aea4eecd69e5586750611de92a8114fd52982bdd839b1d1ad60cbb69ad SHA512 5132b1fd4a3b0de6c4caa1f3c2e1446c0db28c7177d3599a733214e3ff49da756208d1782ccec4e36013a6887f8a7a7409510273d3ceb17cbe52da3ce0b31a72
 MISC metadata.xml 1132 BLAKE2B 6029eb0374ee0cfeb6f83c56dc8fd5206e297cfad6a799626ccdd2df7cac20e9c97eb7008a3ca210da474a78a26c9052d97b85f04b38aad7367d83ce78bc1c24 SHA512 eeae92c31db1c935fc4b248342428f5a34138e3b6f558927aa75c7f2c9f42ab574083e00b234752a6dcc685e9bd5f1daa2a15571d73a1a7576a35860df90e903
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
index 3bcad1957c5e..f11f44490052 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit desktop gnome2-utils java-vm-2 prefix versionator
 
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="-* ~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
 
 if [[ "$(get_version_component_range 4)" == 0 ]] ; then
 	S_PV="$(get_version_component_range 1-3)"
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index dbb97502c5ed..8da67ef3da69 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -5,5 +5,5 @@ DIST jre-8u192-linux-x64.tar.gz 84597342 BLAKE2B 655db641df8349109e2944838f16f37
 DIST jre-8u202-linux-i586.tar.gz 90106000 BLAKE2B e756771caf8567c58870a267aafc9d48e98f06da1373a33bfdf40cc564c8df1645df38ad2f6951bc34d703bb0f4646b52ebf008dfc470231b4e93078c7730862 SHA512 573e32dc715d280084e71999e71a2875a488cbbba2b42c5107c55669c8842dd4ca6c6f42034b5e0b705c22a7a1d9799b456211034a6f351bc9d8e8fd803e0ad3
 DIST jre-8u202-linux-x64.tar.gz 86883826 BLAKE2B 8e69f4e8d6ce7d556ce7c8f30f5c71a50997103f729935269581f0af054fd1dc769b7099ad3a35d4baf41c8a6bdd76b049ae4908714701b196c4ce57ff61b39b SHA512 2460cde88162b00f5ca5600084f5f6b8720b8158869f5f5832fe886a5a6e839eb48398e9e3df47c45be257d9f6915e682d294d560b09e097ff610f09a76b1760
 EBUILD oracle-jre-bin-1.8.0.192.ebuild 6051 BLAKE2B beaac4bd855933446e09beb4536df6fc7dc90c04b47d754a278c13f681e6ef52e10cc05c29d4504c9c8e8e790f99018024ada60e7da445049549a2ae75d8c166 SHA512 93a9ca002faeb3225b195ebe95799b66ddf436e67309fdfe4290388748534513a84f6d99fedacea90aa5f3fe6cc2978ab7e7f8b80031c16545bd7bbe03a9131d
-EBUILD oracle-jre-bin-1.8.0.202.ebuild 6053 BLAKE2B a4e8a2c1de2a23d9a50276de97afcc84227aa11efee42118ce61b039c2a0744a4493a7a06b04717d0a9fe7a3e1f64db0f98b79bc989acc788bfcdc1845754433 SHA512 2c39c80576ebdf2cf3f4f6f4aadc1b9a53d7a468d6abbd9359e1b13ff85a34d9e306df8ee77b416249fa388f902e285ca42ce355041a061bdb34b8de421822d5
+EBUILD oracle-jre-bin-1.8.0.202.ebuild 6052 BLAKE2B d81f20107dcfd942a5f415549c7f127cbd171cfc3b9cfebfe271e2f99fa16412c900110a8d51cee7dfebbb01fcbe943d18a745300b4e8f2d10e62a8639d03417 SHA512 37ef970f996f61d273b416df6421c23677491fe5ddc0cb6236a480a889d409b3d9087e30ac98876e0c699b3eb5ee8e0e346612d865b26fe9c7fc9526048b9f1c
 MISC metadata.xml 743 BLAKE2B 8669a83860c5bde6fa4dc380173d97756cac52e46cfd60effebe73088e35b8e31876e0c2d267201cb2c739afaed94515ec90ec2b2b2e346664b02bd173540bda SHA512 31515728907e1fdc96fe6a27f62585c528370a544a306b4a3a26cf86d8a248211e3852e4a532d9a59be0e534393e6f11bd46df39b439084eb1234d7a6bea4d42
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild
index 0301c67934ad..4a38c8f94746 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit desktop gnome2-utils java-vm-2 prefix versionator
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 
 if [[ "$(get_version_component_range 4)" == 0 ]] ; then
 	S_PV="$(get_version_component_range 1-3)"
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 7553c8e7b68e..a3330720a3bf 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -6,6 +6,8 @@ AUX swt-3.7.2-gio_launch-URI.patch 4287 BLAKE2B 45c2655ca657b968b1fa6dc74fee4e30
 AUX swt-3.8-as-needed-and-flag-fixes.patch 8852 BLAKE2B 963f9cccc06c41b6bbd88d5430d66b500094c19708bb903cae7b125342556eb42d193c91fb6c3ca94c589a75060e3a16c3f8cec2ccd02c3f5a4176d5ec2c6a91 SHA512 523dfb0c0fa2bb2c8c0647ef214465c7ebbc93a7a179b204efc46065a925170dc2659238bbb0abefc73b145322b9668340d36ff8a95fc5083890223b48d6e644
 AUX swt-3.8-manifest 750 BLAKE2B 46ff2102bf58343aa6443accc445c1531920f5913876189f471eba38961c4850cc121f52410570f8cae374f2112ec9466cffaccb218daf9558d43c32f39cd24c SHA512 ce465f77e2fc3340ccaf3ecce67697666972331f849ef196eeebfed3dd1342691a5641ec20b91bc5b480ea0acc9edf194ec9f4bc597c2778d0bd0382923d1bc5
 AUX swt-3.8.2-gthread.patch 1225 BLAKE2B 44dd188433a0e3f70ae53c2df79ffe1fe9839e82847568f611e1c04d380b6cd5837c7f96055ea3132c401de3e73f4b41e6b9bf070f515778cf0b5ddbdaa8942f SHA512 035ea3dda893481f67ac0447e0c7382a9761eb3ee77b65ca77038bd17117b68a2d93058c8414d9b2656ceeecde3e6ebc06c0f27e044f217fe8f44945104dcbd4
+AUX swt-4.10-as-needed-and-flag-fixes.patch 2647 BLAKE2B 003a92de886b9c11dcba89f0fc6862ba4211359025f95c07d13e5a68bb151667bd0fa36137a28f144f6bb2b8c2905243a6402dd0136a9d9fe080c5e8d4dfedd5 SHA512 fd39fa82aa63de13904b9b2e535983de1be1129cb471e49fc2f76e0fdf2b3dc45a7bcddfce6c77447a8a5863ee590cffa3d29509fb12b30369dff1360f88493a
+AUX swt-4.10-manifest 739 BLAKE2B d70c6bbecc6741cff4889005f13adab95d59ef7ff4604bf0ca4482422cb6d4e6f0766e1a01bd9779c3acab3d5b1d382b193b93c44f00ad37317aa6b9308f1088 SHA512 dba2b208fb925cdc43dd64c0900b5c8e8d2ffdea06a9f4f49648d9aa6625481b8316c654d07a1b059385c9546f4929a747a69107415028b0fa0247a7619538ce
 AUX swt-4.2-as-needed-and-flag-fixes.patch 7840 BLAKE2B 96edb84193506ed8c4c293970def5c1c38fb0cd66561030e1e07f214a70f84c657260e1adbdf41f2eb404d4069794cca9b5422dea344ceaf028fbc75cf9aaa26 SHA512 00cc50a0432bb17272a40c3606c9a5729171708af5581c861a5bfae3d1b694289de92164961bfceb841813fb9161befdc2114616556296e81401f133f07c1db1
 AUX swt-4.2-manifest 739 BLAKE2B 031d2e59e4b20c8aacdb4c5b03ff3bdfd14f9373386766993efeb833995d4858b09ac157bdc847820271bd0a354f5c0280aa0746eb0038413782c5cf59f7ba4c SHA512 f17bdc21083c70896d82d12d6918bb121db838b895d1db95dbbf9bbc0368b1b26e6b6acf5a90b709ff961f3640911111932391fa45ae898d1de8a387d17594b1
 DIST swt-3.7.2-gtk-linux-ppc64.zip 5688113 BLAKE2B bb102da40a3f63d63ca6a56d4c57ade55d7fe8d6206acf9e60caa0a8600b5c2cec6c0304cd2ab532948f03ff0706e8b2928ae9e93ef0019051044dad3fe7b1c0 SHA512 750aaa43560bbf6f82f7f8cd9338abc88578f4f0b9aadaec9bc8a5c3d1ad593619cdf01d202cbf06766090ee977989ea7904643669c61971973951d8428b57d0
@@ -14,10 +16,13 @@ DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf
 DIST swt-3.8.2-gtk-linux-ppc64.zip 5933708 BLAKE2B d49633d9d5049d1a6f9bbdcf5a364b73802194fbaf02aa5064c7a1c917e0aad80c829b026a1a41b7903ed0d8066af89ff24683897ced8cbe8c41406a7696c408 SHA512 cb9f2c7aed0b18bae6546272076c23c91d9e1a38404f0a70ddc6408047d961befe2839db177066312b82d8365bee6bcffb6e92aaa7a869ad37d9f49ab780e337
 DIST swt-3.8.2-gtk-linux-x86.zip 5558694 BLAKE2B 8dd0ce9f2c6b8dc448c85a6c509f39ef2da000e0589da52330b83dec87601d100320af778983b2083ca8f9e2890a2d4c731cb2810d9054a9e50e7940ad14bea2 SHA512 afe1563e92fe9af0a58e7dbae731976991a6afacf6415ab88ebf557f99a5154169ad7103519524f71142c4160d55a9b0a9f7379b21486430318e4160e6f01c00
 DIST swt-3.8.2-gtk-linux-x86_64.zip 5865160 BLAKE2B 45d60d334eb99f407cf9101a06f65e48543538a386103767700fb0af5ea0cf3da73eefe57b8cc6b3d78cb8f29345869f5474513648560395a69cbd4c9b8ee8a4 SHA512 43a27cb6fc891d7da35f5fcfc6ccb689d2b2c58de70b628b1e7cf07131f0641598b627eeedafb6a8dca715a336a7fb4fb6a03bb29fea3e115a4af571b1574cf8
+DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a
+DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0
 DIST swt-4.2-gtk-linux-ppc64.zip 5935799 BLAKE2B 6b1ca0d25d81134239e56ead673303075b6d9c5f20e4ab07fb7b5b87d54582023d02c28a1d330fd40d647bdbc27823ca7b184837cb974706ee13809ebdfd2db4 SHA512 bedd64099380980a6dbe47b86f4719666366680f7580150f97282c6f6b6acc95822493469e950e8fcbc9c584f6fca9f35a59937551ae8b6e799b188dc3751e9d
 DIST swt-4.2-gtk-linux-x86.zip 5561088 BLAKE2B cf8bda6a48d5d8e389c387162bf2aafde5a95c43d76e444a4b79008e1154348d2c99850851b3d0e428890e6b2da1e4bec53a7f9050169ad4866a5a8352e9ed2b SHA512 e3d53bcd0521411c40f4c37719917f3570a17fb3ea5c617560986273fd155b99d9b0790ba27c57da26663d49ebec4c6a8387b41bd01b0ba934b21724ba98e133
 DIST swt-4.2-gtk-linux-x86_64.zip 5867140 BLAKE2B 994bf18799297529329637c1b9ebf15638187339b4f56bf8cc1dedfc97c25a1ea4a1664605cac1374fe3d79b321dc450c6129ebef00ddd6f9507f238b7836316 SHA512 56c5ec4ca2ddeed5256dd6ff350dc3911034ecbc414a06ba879f04ab53d6380ca9da9037097f76228ca8182f6076bcd9cc4cb9b01c10766c10048e6576fc5f50
 EBUILD swt-3.7.2-r2.ebuild 4606 BLAKE2B 9d782b21565f93a1d69e83f3f65ade694bbc1034f24ac2b1a59ceaa1c2da0defcd00e27d43c43907e04661b3a29094282dfca952caa99d4ece750b72491f28ec SHA512 6ca872bd210d5823d369abc031d3e412a3e3f869f541c37f4fcfc084bedefb1e3144f3aeb7d1bfc039b0337641c1582bcde76a279a5a0f6a2b5b0f5c4232495d
 EBUILD swt-3.8.2-r2.ebuild 4437 BLAKE2B 19f84cd5506ca1306754a26f601d9a1a18b6e3f3091e7f38fb768db833621c741502794417ab7099a1edec0546ba6c79785c918bb26aa0acfb3bdc5dc788b860 SHA512 c4e25e86c66d29d74d5bc100d97214b3742369ab7bbf96f38fd95ed28c7c03838f3260dcd45f755c90a07ba4f0f0a066702f7f8b2396e66569fe6f513770ab28
+EBUILD swt-4.10.ebuild 4442 BLAKE2B 1c5ee9e7fda684687e298d1dede32fb468d279a3b0340308b490c39472dc05df04141fa874788b6c9463456bda9eb4125cabc95462eee53ed44f02ce1bc04558 SHA512 e07398f920e59fac400b0aac2cae521ef1bad900cb18969b780ce8706a0cd23c303e16b56c7b82334118ba258dfb69c6f7f03b11623c2a7e5781e9cc10f79fa3
 EBUILD swt-4.2-r3.ebuild 4682 BLAKE2B 1e47fc517f3eba4ff626129f5b4810dba8930da995aa03788806d324192443e56570c280e3e732f4a58b6b3aad125574b22e8d024de11b56cced051675cb382c SHA512 15ffbb9e0cdaca5bc782327052d049efce05686d2a27ab84f44c9388e82a2f83ce42adab9e2c8110580b7572b18b111d5dcdf5ab601021cc2a321a84ffeca130
 MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
diff --git a/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch
new file mode 100644
index 000000000000..09bed21d58f8
--- /dev/null
+++ b/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch
@@ -0,0 +1,82 @@
+diff -Naur a/make_linux.mak b/make_linux.mak
+--- a/make_linux.mak	2019-01-07 14:08:00.269147198 +0100
++++ b/make_linux.mak	2019-01-07 14:10:28.645155241 +0100
+@@ -101,7 +101,7 @@
+ WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
+ GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
+ 
+-CFLAGS := $(CFLAGS) \
++CFLAGS += -fPIC \
+ 		-DSWT_VERSION=$(SWT_VERSION) \
+ 		$(NATIVE_STATS) \
+ 		$(SWT_DEBUG) \
+@@ -129,13 +129,13 @@
+ make_swt: $(SWT_LIB) $(SWTPI_LIB)
+ 
+ $(SWT_LIB): $(SWT_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
+ 
+ callback.o: callback.c callback.h
+ 	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
+ 
+ $(SWTPI_LIB): $(SWTPI_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
+ 
+ swt.o: swt.c swt.h
+ 	$(CC) $(CFLAGS) -c swt.c
+@@ -154,7 +154,7 @@
+ make_cairo: $(CAIRO_LIB)
+ 
+ $(CAIRO_LIB): $(CAIRO_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
+ 
+ cairo.o: cairo.c cairo.h swt.h
+ 	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
+@@ -169,7 +169,7 @@
+ make_awt:$(AWT_LIB)
+ 
+ $(AWT_LIB): $(AWT_OBJECTS)
+-	$(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
++	$(CC) -fPIC $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
+ 
+ #
+ # Atk lib
+@@ -177,7 +177,7 @@
+ make_atk: $(ATK_LIB)
+ 
+ $(ATK_LIB): $(ATK_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
+ 
+ atk.o: atk.c atk.h
+ 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
+@@ -198,7 +198,7 @@
+ endif
+ 
+ $(WEBKIT_LIB): $(WEBKIT_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS)
+ 
+ webkitgtk.o: webkitgtk.c webkitgtk_custom.h
+ 	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c
+@@ -217,7 +217,7 @@
+ make_webkit2extension: $(WEBKIT_EXTENSION_LIB)
+ 
+ $(WEBKIT_EXTENSION_LIB) : webkitgtk_extension.o
+-	$(CC) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS)
+ 
+ webkitgtk_extension.o : webkitgtk_extension.c
+ 	$(CC) $(CFLAGS) $(WEBKIT_EXTENSION_CFLAGS) ${SWT_PTR_CFLAGS} -fPIC -c $^
+@@ -228,7 +228,7 @@
+ make_glx: $(GLX_LIB)
+ 
+ $(GLX_LIB): $(GLX_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
+ 
+ glx.o: glx.c 
+ 	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
diff --git a/dev-java/swt/files/swt-4.10-manifest b/dev-java/swt/files/swt-4.10-manifest
new file mode 100644
index 000000000000..230d33f7bf1c
--- /dev/null
+++ b/dev-java/swt/files/swt-4.10-manifest
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Fragment-Host: org.eclipse.swt; bundle-version=4.5.1
+Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
+Bundle-Version: 4.5
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH))
+Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
+ org.eclipse.swt.internal.cairo; x-internal:=true,
+ org.eclipse.swt.internal.cde; x-internal:=true,
+ org.eclipse.swt.internal.gnome; x-internal:=true,
+ org.eclipse.swt.internal.gtk; x-internal:=true,
+ org.eclipse.swt.internal.opengl.glx; x-internal:=true
+ org.eclipse.swt.internal.webkit; x-internal:=true
diff --git a/dev-java/swt/swt-4.10.ebuild b/dev-java/swt/swt-4.10.ebuild
new file mode 100644
index 000000000000..f7fa9be7233a
--- /dev/null
+++ b/dev-java/swt/swt-4.10.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="http://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="
+	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )"
+
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+SLOT="4.10"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="cairo opengl webkit"
+
+COMMON_DEP="
+	>=dev-libs/atk-1.10.2
+	>=dev-libs/glib-2.32
+	>=x11-libs/gtk+-2.6.8:2
+	x11-libs/libXtst
+	cairo? ( >=x11-libs/cairo-1.4.14 )
+	opengl?	(
+		virtual/glu
+		virtual/opengl
+	)
+	webkit? (
+		net-libs/webkit-gtk:4
+	)"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.8
+	app-arch/unzip
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/libXtst-1.1.0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.8"
+
+S="${WORKDIR}"
+
+# JNI libraries don't need SONAME, bug #253756
+QA_SONAME='usr/lib[^/]*/libswt-[^/]+.so'
+
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch
+)
+
+src_unpack() {
+	local DISTFILE=${A}
+	unzip -jq "${DISTDIR}"/${DISTFILE} swt.jar src.zip || die "Unable to extract distfile"
+	unpack "./src.zip"
+
+	# Cleanup the redirtied directory structure
+	rm -rf about_files/ || die
+}
+
+src_prepare() {
+	# Replace the build.xml to allow compilation without Eclipse tasks
+	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
+	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
+
+	# Apply patches
+	default
+
+	# Define missing g_thread_supported() to be already started.
+	sed -i '1s/^/#define g_thread_supported() 1\n\n/' "${S}"/os_custom.h || die
+
+	# Webext is also in the library directory
+	sed -i 's|findResource([^,]\+|findResource("swt"|' \
+		"${S}"/src/org/eclipse/swt/browser/WebKit.java || die
+}
+
+src_compile() {
+	# Drop jikes support as it seems to be unfriendly with SWT
+	java-pkg_filter-compiler jikes
+
+	local AWT_ARCH
+	local JAWTSO="libjawt.so"
+	if [[ $(tc-arch) == 'ppc64' ]] ; then
+		AWT_ARCH="ppc64"
+	else
+		AWT_ARCH="amd64"
+	fi
+	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
+	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
+	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
+		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
+	else
+		eerror "${JAWTSO} not found in the JDK being used for compilation!"
+		die "cannot build AWT library"
+	fi
+
+	# Fix the pointer size for AMD64
+	export SWT_PTR_CFLAGS=-DJNI64
+
+	# Bug #461784, g_thread_init is deprecated since glib-2.32.
+	append-cflags -DNO__1g_1thread_1init
+
+	local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+
+	einfo "Building AWT library"
+	${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`"
+
+	einfo "Building SWT library"
+	${make} make_swt
+
+	einfo "Building JAVA-AT-SPI bridge"
+	${make} make_atk
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		${make} make_cairo
+	fi
+
+	if use opengl ; then
+		einfo "Building OpenGL component"
+		${make} make_glx
+	fi
+
+	if use webkit ; then
+		einfo "Building WebKit component"
+		${make} make_webkit make_webkit2extension
+	fi
+
+	einfo "Building JNI libraries"
+	eant compile
+
+	einfo "Copying missing files"
+	cp -i "${S}/version.txt" "${S}/build/version.txt" || die
+	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
+		"${S}/build/org/eclipse/swt/internal/" || die
+	unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d build || die
+
+	einfo "Packing JNI libraries"
+	eant jar
+}
+
+src_install() {
+	local swtArch=${ARCH}
+	use amd64 && swtArch=x86_64
+
+	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
+	remove_from_manifest() {
+		local subpkg=$1
+		sed -i -e "/ org.eclipse.swt.internal.$subpkg; x-internal:=true,/d" "MANIFEST_TMP.MF" || die
+	}
+	use cairo || remove_from_manifest cairo
+	use opengl || remove_from_manifest opengl.glx
+	use webkit || remove_from_manifest webkit
+	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
+
+	java-pkg_sointo "/usr/$(get_libdir)/swt"
+	java-pkg_doso *.so
+
+	dodoc about.html
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-01-25 08:09:37 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-01-25 08:09:37 +0000
commit	693cc9b6e847a01c1bb692153021aaf9fb0fab25 (patch)
tree	bb2f7c299a4149f841c37a1208c7ac861aa95640 /dev-java
parent	09351e78166b5e864197c4456ebae3f89dd0bed9 (diff)