Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.
author: V3n3RiX <venerix@redcorelinux.org> 2019-03-24 17:44:59 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-24 17:44:59 +0000
commit: 0706fc6986773f4e4d391deff4ad5143c464ea4e (patch)
tree: 9fd110f9fc996e8a4213eeda994a8c112491b86d /dev-java
parent: aa3411e241a201d53a2689766fe419f2756819f3 (diff)
53 files changed, 660 insertions, 40 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index b1b56e29ba1c..23233a8b50a4 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-antlr/Manifest b/dev-java/ant-antlr/Manifest
index f992a37b689c..5d0b7c8a9bc3 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 509 BLAKE2B dae291dc2d44bef9a26c393534fe613f296d3365f29ff8af17a5feadb4dd5c6899dcb871b47fc5994c19d121fe53384a1b5031ebb8bc0406ecce403d587a358c SHA512 fbaf43264178726791d2f47553948e7056e643b162405be5d8324dd4be56bae5657afcdb0df14d1966c7bda4bcc8df48382c4530a0c3ccfde80d3fc56992e884
 EBUILD ant-antlr-1.9.13.ebuild 509 BLAKE2B dae291dc2d44bef9a26c393534fe613f296d3365f29ff8af17a5feadb4dd5c6899dcb871b47fc5994c19d121fe53384a1b5031ebb8bc0406ecce403d587a358c SHA512 fbaf43264178726791d2f47553948e7056e643b162405be5d8324dd4be56bae5657afcdb0df14d1966c7bda4bcc8df48382c4530a0c3ccfde80d3fc56992e884
+EBUILD ant-antlr-1.9.2-r1.ebuild 474 BLAKE2B c97085ba99084edc5df177278c5d1e54c0e1cdbeb6aa28c1bf77c7996aa9e1c3178cc0d5a861e1bd8443f2bbeed27252ea2453f6e4a49d94f5ef4fccdacf9a28 SHA512 3701e4e4504ebe741c095dd7e66d4d4a81a5e7e38b09f42e8b3f4c369b85a676572c6ec93c497b5fea101fc47afe188c913592280b7d06891d12a737c9f67c6a
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild b/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..61c7c31879f1
--- /dev/null
+++ b/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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 28cf22fdfc7b..f18a86becd28 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 394 BLAKE2B 4590d1f5e73c91725455cbb43ff2f607d905f6d4138909e4d115d6a44617251ccb40ee3576185ced8394e74ec4469e0dd28fa808c1851a6b5ca7a6165afb3830 SHA512 17a1defbbdcdd410cab9d743557ba02c7eb7f815b74efd6a7609b53e04ef661192f1c369195852b6ecfa8336f4a2573e5a22de0df641cd723fccac96d6e203e6
 EBUILD ant-apache-bcel-1.9.13.ebuild 394 BLAKE2B 4590d1f5e73c91725455cbb43ff2f607d905f6d4138909e4d115d6a44617251ccb40ee3576185ced8394e74ec4469e0dd28fa808c1851a6b5ca7a6165afb3830 SHA512 17a1defbbdcdd410cab9d743557ba02c7eb7f815b74efd6a7609b53e04ef661192f1c369195852b6ecfa8336f4a2573e5a22de0df641cd723fccac96d6e203e6
+EBUILD ant-apache-bcel-1.9.2.ebuild 359 BLAKE2B 6e3412a4764180bfbb9cbd3aef6134e228ce1b4bff207512b32a23a6b85214d671f89806aa02d5464819af8b1958d051df64c9c0f226ae0f8c734a01bb17a621 SHA512 d2a898cf6d8edea0f5b6f4e3c70c1547737337a2a5b0ff14619eb0173fab3b62386e00ef7316a50541ad49c34b6514d0985d174bd0fb7bf89d5fadf8f324cc21
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.ebuild
new file mode 100644
index 000000000000..4c880a1ade48
--- /dev/null
+++ b/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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 65c9ff0142e3..097b4e2ae2f0 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 673 BLAKE2B 45099d210b9c1429428e37b359b123a364fcaf3803e202ba4f4a6874eb3cbec21ccd49086a12de32ffefa7cb7f7c6e33fd08e776124124c119d61c06350c445c SHA512 a31d2738317a8d3d98eeb214f2a71a33f75a73b37676c4131682488313cd311943052898765812888bdc42503152951e61406d09aed28fdf24f29ca0251cffdf
 EBUILD ant-apache-bsf-1.9.13.ebuild 673 BLAKE2B 45099d210b9c1429428e37b359b123a364fcaf3803e202ba4f4a6874eb3cbec21ccd49086a12de32ffefa7cb7f7c6e33fd08e776124124c119d61c06350c445c SHA512 a31d2738317a8d3d98eeb214f2a71a33f75a73b37676c4131682488313cd311943052898765812888bdc42503152951e61406d09aed28fdf24f29ca0251cffdf
+EBUILD ant-apache-bsf-1.9.2.ebuild 638 BLAKE2B c9eab574053f8817ee6fa07012a6012524fbb295f45d53bb47835cf7a454152516fae1b1daed4108b6a563557adbc964d7184942a3d735801d01b9457d7ce0a5 SHA512 31d6748a916d8852015bd5d64f54745571050093b390c067f37cdfa57014c0798936478ce0823c54733b3563ba4b9a696aefb3992f51909aeafdb2e49d66517f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.ebuild
new file mode 100644
index 000000000000..45ae131b3f60
--- /dev/null
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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 4f68a947acfb..66feadd6d3a1 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 399 BLAKE2B 804a596e878706223b14dac13b9fca4ce6187bc7280ac80352f1388f49b6e2bccfaabda35024a81b9e560bce543da6346956d6526c06cbbd394c0c4e0a8a5ecd SHA512 9e62ba88ad062cb12d37ba5e6ac8bfdb71656e63351d512ac1a6fb3e6f6c590c217decec72fdea71990cdd48a2064ba26e5329fb033c3439b70a58d4b453575d
 EBUILD ant-apache-log4j-1.9.13.ebuild 399 BLAKE2B 804a596e878706223b14dac13b9fca4ce6187bc7280ac80352f1388f49b6e2bccfaabda35024a81b9e560bce543da6346956d6526c06cbbd394c0c4e0a8a5ecd SHA512 9e62ba88ad062cb12d37ba5e6ac8bfdb71656e63351d512ac1a6fb3e6f6c590c217decec72fdea71990cdd48a2064ba26e5329fb033c3439b70a58d4b453575d
+EBUILD ant-apache-log4j-1.9.2.ebuild 364 BLAKE2B 17c62ecc9ca6650e3fcadda3b6c6d83afd0fe5e77ffb33ec8ac1a5fa926acf85107b87d91def668d76a405dc35de68aa49654e2e5be0a553f8125ac1ec730f8a SHA512 648e4a5370d9f5ee6d9ab9af80df505bb9eae238caf65b4b4ab7dc898ce61c8e552cddb2e1d303ec64e17eb5e5e7aebb9601a6719413a0759b4f63ec6a439de9
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.ebuild
new file mode 100644
index 000000000000..da86da4ae08a
--- /dev/null
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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 87b4ddc290ed..c2a2085f46f1 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 416 BLAKE2B 222e0f6eaaf6353e58ee4509badd35a3ec18f0a2f6031e7cb32300e183236242dff128654751b56791d5605da040a1d1bf1e1a47674525bb7296fc140fe860e7 SHA512 33a18e5e4e8a7898a0e16e790a8c311b4b1434e4073a29ff5385435298d6db13405cda990abdf20aaf1cc9d4c8d2352f67c432093eece91bf9f41c4a617d1867
 EBUILD ant-apache-oro-1.9.13.ebuild 416 BLAKE2B 222e0f6eaaf6353e58ee4509badd35a3ec18f0a2f6031e7cb32300e183236242dff128654751b56791d5605da040a1d1bf1e1a47674525bb7296fc140fe860e7 SHA512 33a18e5e4e8a7898a0e16e790a8c311b4b1434e4073a29ff5385435298d6db13405cda990abdf20aaf1cc9d4c8d2352f67c432093eece91bf9f41c4a617d1867
+EBUILD ant-apache-oro-1.9.2.ebuild 381 BLAKE2B 7c53667cf3fa487b6a951bfd5ebb3e14fe40b0501eac2592c62c38b4eb9c6b0fcc65da7050724f518958232af5373f85716cc4a8a89e2cacedb597bf9eb8b856 SHA512 a996273c2bc9d48bfe09d0f0bd952fb52fbcd5fa21950865943ae09a4ca430f6c3aacf6b649d6f166c58815838c19bef5d6c7ccce22025cca635f02ede31c45c
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild
new file mode 100644
index 000000000000..834e899d1b83
--- /dev/null
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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 251dcdb67131..64f0f6493753 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 420 BLAKE2B 2c4db795faab73dd8fb4783723ecc1bfa3017a79ad333999448e14360b9fc8f71a000dc14cc144f010dfe6eebd5be1f28dd8ecc67b9a89de4ac6e4a1cf6fc1cd SHA512 fa84c5788c9e4298a2fa5233fba5d8845e0ff280b5c75fa5a399ab402237c0637d35f2991129bde7ebc78374a3cd57f930b52b6b06d2f73849f3d7fab2f22172
 EBUILD ant-apache-regexp-1.9.13.ebuild 420 BLAKE2B 2c4db795faab73dd8fb4783723ecc1bfa3017a79ad333999448e14360b9fc8f71a000dc14cc144f010dfe6eebd5be1f28dd8ecc67b9a89de4ac6e4a1cf6fc1cd SHA512 fa84c5788c9e4298a2fa5233fba5d8845e0ff280b5c75fa5a399ab402237c0637d35f2991129bde7ebc78374a3cd57f930b52b6b06d2f73849f3d7fab2f22172
+EBUILD ant-apache-regexp-1.9.2.ebuild 385 BLAKE2B c861e14076d4c261a93229a25b490b19f797850abba6f01a34c0ab7fc0cceaa5ce83a3f0177351bb1f7a053ac279c4c2530c064450e03dd25ba29fea1072aac2 SHA512 9d110c02c11a0ce43995b52d17f46d4542712625eec0a90ecd2b4653e954117306f5e59f52611a80d2b0b750e1b1f34ffd4df6de91c991e01082426c1ca39222
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild
new file mode 100644
index 000000000000..3e5ad52958e3
--- /dev/null
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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 11fd15f8c5fe..48d49bb18caf 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 423 BLAKE2B d30a3d13e9a241d245a26a49903dd90ce1d5c7f83be9f0c0c3afdc8788f0480f21fc21018fc8e49d492c11700eccc76b4b2184af0053c384abfedd22a6f56462 SHA512 02a92299e74fcf3466f80517ea9dbb874a79314b8153a54098d75dd2016ec70a3fb9b458a398701fd1b55efe42d28cc910a9c4802d704f54eb5c156a8da00216
 EBUILD ant-apache-resolver-1.9.13.ebuild 423 BLAKE2B d30a3d13e9a241d245a26a49903dd90ce1d5c7f83be9f0c0c3afdc8788f0480f21fc21018fc8e49d492c11700eccc76b4b2184af0053c384abfedd22a6f56462 SHA512 02a92299e74fcf3466f80517ea9dbb874a79314b8153a54098d75dd2016ec70a3fb9b458a398701fd1b55efe42d28cc910a9c4802d704f54eb5c156a8da00216
+EBUILD ant-apache-resolver-1.9.2.ebuild 388 BLAKE2B a5313956f0cf362f9df0d0943e53a383c00aebd76cc4d1b1dfd61378095af53f59700463d5d9538092340e75ecf6dae6d30e92f15edd9d307bf0e1cfa8987229 SHA512 38aa44f7bb8aa22f078a85e71f5429a5c9905891cb967458f890d0bb5fbc3c5c1cc52c98590a0907bd517eff310f0c881dea2dfa5e38b9c2060d37f83c1cdd0e
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild
new file mode 100644
index 000000000000..cba18e193cf5
--- /dev/null
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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 349916280a0b..fe3cfb56047d 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 497 BLAKE2B 2d6e7c26d33c4c30126b5190784bc02ea09bb968019e0d342add99a4c3f1d3b519dbc5adbf69b915550a009e4f35e68515eea566334555c8257610efe6ffb4a9 SHA512 bc821689f61d675321f29139bfec2767552854e363c0f26331d2d81c0007159351258ba9d5560a65b397c66fed72bc8d002ad7854f406cca831d194235b7df3a
 EBUILD ant-apache-xalan2-1.9.13.ebuild 497 BLAKE2B 2d6e7c26d33c4c30126b5190784bc02ea09bb968019e0d342add99a4c3f1d3b519dbc5adbf69b915550a009e4f35e68515eea566334555c8257610efe6ffb4a9 SHA512 bc821689f61d675321f29139bfec2767552854e363c0f26331d2d81c0007159351258ba9d5560a65b397c66fed72bc8d002ad7854f406cca831d194235b7df3a
+EBUILD ant-apache-xalan2-1.9.2-r1.ebuild 462 BLAKE2B 7043bd1b05eeda1bbc2c313853b4a15c8d94c3442fbd53e81eab9972d039230893219a375a92435addcfcfff7a5ab96d3d8520a3b00503b339a03cfee16b9dac SHA512 08d378e572d27dcb93db643d246a219c89a4e3ed27f55749162a2d932ac89c1acd91fb23b80c556613350581e56be9df7221f35827b98a0d96cb11e4db199fd8
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..3f3b7c497853
--- /dev/null
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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 44a07a51d01c..936670709ce1 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 383 BLAKE2B 752fd23c92c8dc8c5c7f1853e8bcdeb98219f0eb4752fdada322b205b7f5fdc698228c5c63b2d44777df1591f7259a1b36dc35b0634fd1b29e86a14d408cc648 SHA512 045522b2e046bce070fb42bfe605d4346d2a1fc567ba686da83e64e07bcbe7b41a53f990b94400166aac81185c74d471bca95436b4220ba1cf94a59ed07d92c0
 EBUILD ant-commons-logging-1.9.13.ebuild 383 BLAKE2B 752fd23c92c8dc8c5c7f1853e8bcdeb98219f0eb4752fdada322b205b7f5fdc698228c5c63b2d44777df1591f7259a1b36dc35b0634fd1b29e86a14d408cc648 SHA512 045522b2e046bce070fb42bfe605d4346d2a1fc567ba686da83e64e07bcbe7b41a53f990b94400166aac81185c74d471bca95436b4220ba1cf94a59ed07d92c0
+EBUILD ant-commons-logging-1.9.2.ebuild 347 BLAKE2B 5006e6af3bce302bdbd1faf26a94386a79a0638b89e8028debd2d62a80b7fb9bae84ba666bcd1bb6645fb20eef74de283c4f538196fd5043e4359cde8aac7542 SHA512 4fa770c28772e034807242fc5051d19227c7efd233bc362fd650ae7dfcd3032c2b759ff04c73e5689bcaa97080fd388e7d012574b35f19fa4bd0cfffa63863bd
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.9.2.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.9.2.ebuild
new file mode 100644
index 000000000000..c4e08645d064
--- /dev/null
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.9.2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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 b308b27fe84a..b54989fbcd58 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 379 BLAKE2B a29535bfa7a740ab54bfa546fc1bdfe48e4ac0c69af90bf66f9b6c82a572bed5930d53ab412e6447677ea50e8cc63e1bf6f8c15f033ce6d7fb057fa59a7a4638 SHA512 873e21e3c5db5f58ca3d90324adcb9d79f836e5ea9e8109140fce06c4e06b17fe911cf314a5e012320c85cd12449bdc4d290be5a357c419594e31dd6c15658c8
 EBUILD ant-commons-net-1.9.13.ebuild 379 BLAKE2B a29535bfa7a740ab54bfa546fc1bdfe48e4ac0c69af90bf66f9b6c82a572bed5930d53ab412e6447677ea50e8cc63e1bf6f8c15f033ce6d7fb057fa59a7a4638 SHA512 873e21e3c5db5f58ca3d90324adcb9d79f836e5ea9e8109140fce06c4e06b17fe911cf314a5e012320c85cd12449bdc4d290be5a357c419594e31dd6c15658c8
+EBUILD ant-commons-net-1.9.2.ebuild 343 BLAKE2B d6a203ecbb2c405b725819c206c4a6af97b11d1632bbff59b8f9baeddd1cb24ae302792ef5e6fb79997a7c8726c992f6cba9cf0f087276bddcbf5aa4e5c6da75 SHA512 7681da0c70374d90f106e93dbb7f153db36fef7dfda3f31a780419f65ae071788ed7a1f12e5ec63a6408bb8ea9afdc4e532c2915b5059ae956391009f3cc5350
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.9.2.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.9.2.ebuild
new file mode 100644
index 000000000000..fcf4a4acdfe6
--- /dev/null
+++ b/dev-java/ant-commons-net/ant-commons-net-1.9.2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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 ee5b34a16df8..33a3cbf3a9ff 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,7 +1,10 @@
 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.10.5-r1.ebuild 3193 BLAKE2B 99479481bd22c6c1b74491949e629703ea09169def00e305449f263ea65f47df066b9f390cdd6d3f5aeacbf6915f7144b17753db7a063e964a08b2026c66914f SHA512 1fc307ec691ea85b49d27f9c2aafd7658988fd269df4eddd934c6e6739e133eaadfc833ea33c3d3e4c5ecc633ceb754cbd13ad162697c2ac8da5cc1ba169a482
 EBUILD ant-core-1.9.13-r1.ebuild 3193 BLAKE2B 99479481bd22c6c1b74491949e629703ea09169def00e305449f263ea65f47df066b9f390cdd6d3f5aeacbf6915f7144b17753db7a063e964a08b2026c66914f SHA512 1fc307ec691ea85b49d27f9c2aafd7658988fd269df4eddd934c6e6739e133eaadfc833ea33c3d3e4c5ecc633ceb754cbd13ad162697c2ac8da5cc1ba169a482
+EBUILD ant-core-1.9.2.ebuild 3216 BLAKE2B fdd1e40be093d25a40afd4e6009539ee1be4877a5e281596fb246d64c913da5c0877b05b7b8f024132ecdff31dc48bf9df691b1a6d07cc6580d1176b16027600 SHA512 fa3f6f9120f3ba469aad57c73317ea37adde68d39451d773172fd2c0c6c5e2b537f2c3ab1334733481740ec74021bc73756e8c502de861aae0057a87c36237a1
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-core/ant-core-1.9.2.ebuild b/dev-java/ant-core/ant-core-1.9.2.ebuild
new file mode 100644
index 000000000000..1f5fc1092c46
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.9.2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# 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 versionator
+
+MY_P="apache-ant-${PV}"
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
+HOMEPAGE="http://ant.apache.org/"
+SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~tomwij/files/dist/ant-${PV}-gentoo.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="|| ( >=virtual/jdk-1.5 dev-java/gcj-jdk )
+	!dev-java/ant-tasks
+	!dev-java/ant-optional"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+src_prepare() {
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches/"
+	eprefixify "${WORKDIR}/ant"
+
+	# use our split-ant build.xml.
+	mv -f "${WORKDIR}/build.xml" . || die
+
+	# 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=""
+
+	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 internal_dist \
+		$(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 /usr/share/${PN}/lib/${jar} /usr/share/ant/lib/${jar}
+	done
+
+	dobin "${WORKDIR}/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 /usr/bin/${each} /usr/share/${PN}/bin/${each}
+	done
+	dosym /usr/share/${PN}/bin /usr/share/ant/bin
+
+	insinto /usr/share/${PN}
+	doins -r dist/etc
+	dosym /usr/share/${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 ! version_is_at_least 1.7.0 ${REPLACING_VERSIONS}; 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 ! version_is_at_least 1.7.1 ${REPLACING_VERSIONS}; 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-jai/Manifest b/dev-java/ant-jai/Manifest
index 9b381eba378e..9f03ea56b5b7 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 365 BLAKE2B 01d123b2736ee2c62e76877373354e36bab5d8a2a0921049b2686f9a3ebced433f35ead29d1649ac2ad970bd022f3271382b5878b58fac089295f65b0ecc7352 SHA512 4d9f2edb95473b8d4f93680c409b6568a68e634345bc6613921adda3862b3ae6a747b58fa04aeedaf614aaa7f89066e512023a519c4ee12b50cee10ff541b027
 EBUILD ant-jai-1.9.13.ebuild 365 BLAKE2B 01d123b2736ee2c62e76877373354e36bab5d8a2a0921049b2686f9a3ebced433f35ead29d1649ac2ad970bd022f3271382b5878b58fac089295f65b0ecc7352 SHA512 4d9f2edb95473b8d4f93680c409b6568a68e634345bc6613921adda3862b3ae6a747b58fa04aeedaf614aaa7f89066e512023a519c4ee12b50cee10ff541b027
+EBUILD ant-jai-1.9.2.ebuild 330 BLAKE2B bd2f662e949c6ea8155595ecf7778a6cd7453e19c7dc4e61e3ee4880755005ea628a34091209e1d53c856accd3b3694e83857657579b27411147d498003dba99 SHA512 797fe5463151d9a66ccc7f4fdc666dee23935b36d45c1543ee6221d7a0d74c400921b9456677e3555f9f8bdb3242a658f3e361b54b1c968b4d19f999ad27b7a4
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jai/ant-jai-1.9.2.ebuild b/dev-java/ant-jai/ant-jai-1.9.2.ebuild
new file mode 100644
index 000000000000..4d424488a10a
--- /dev/null
+++ b/dev-java/ant-jai/ant-jai-1.9.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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 0ab25e29db1e..78502517ff84 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 493 BLAKE2B 008298b99eee90d81e543139dd5f0322ca8e82d27a21dadfafde61937a5432a5a302fd678fd7a1387ad7e6c36992d02c740eb3c2af7cdba7d1414f5e9b06a1c7 SHA512 977dc8db6860e6c0bb4a36408e4703ddab1cc4d577726d7c625d73165f33d478cf29010a9699b693eb9c601602533eb6902e61d78f15698650b12b09f0b08bd0
 EBUILD ant-javamail-1.9.13.ebuild 493 BLAKE2B 008298b99eee90d81e543139dd5f0322ca8e82d27a21dadfafde61937a5432a5a302fd678fd7a1387ad7e6c36992d02c740eb3c2af7cdba7d1414f5e9b06a1c7 SHA512 977dc8db6860e6c0bb4a36408e4703ddab1cc4d577726d7c625d73165f33d478cf29010a9699b693eb9c601602533eb6902e61d78f15698650b12b09f0b08bd0
+EBUILD ant-javamail-1.9.2-r2.ebuild 372 BLAKE2B 729648d88eb3d1af5da67c490d0d4437d7dbd19344a81c1c3dc67ede261acf87e170b1e3c87df226fec860440b1184bbdd1fbaa2fc86a85496a51f7b57382a45 SHA512 956c6a3bb062f99efc8d45538d9703e9a90665559079d34e3edaedf0cd029969b84a88877cf8d5a47c6da1a95d5e1acc915d161a884e11ff774a589863907ea2
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-javamail/ant-javamail-1.9.2-r2.ebuild b/dev-java/ant-javamail/ant-javamail-1.9.2-r2.ebuild
new file mode 100644
index 000000000000..f09165a59c20
--- /dev/null
+++ b/dev-java/ant-javamail/ant-javamail-1.9.2-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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"
+
+DEPEND="dev-java/oracle-javamail:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jdepend/Manifest b/dev-java/ant-jdepend/Manifest
index 6c1d89ee75ba..026601f1c69c 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 373 BLAKE2B d14452867622a51876db8bc6d4f0e9a9aa04ad3a98292cf4d03eba0603ae890198e29b083195e0aeba823854804585f2d2ea5f01310f354a442f7013180bbd12 SHA512 6ef49c2fc02f4b2038cc893f026e679a69d7551e71ab3c91db61ebb2eb18ac3b2b6cb9722deaaf7fef93ce6656e5fbcb203a86af332e83e5ae2df4697a4948a0
 EBUILD ant-jdepend-1.9.13.ebuild 373 BLAKE2B d14452867622a51876db8bc6d4f0e9a9aa04ad3a98292cf4d03eba0603ae890198e29b083195e0aeba823854804585f2d2ea5f01310f354a442f7013180bbd12 SHA512 6ef49c2fc02f4b2038cc893f026e679a69d7551e71ab3c91db61ebb2eb18ac3b2b6cb9722deaaf7fef93ce6656e5fbcb203a86af332e83e5ae2df4697a4948a0
+EBUILD ant-jdepend-1.9.2.ebuild 337 BLAKE2B e761853e3f289559d234740faeff0155ed6dba6d22983edeea141785498f83f1854442cb0f55704d602ef844131b0678a4e42d1998317706a0237067c76cc9a7 SHA512 b8c848cc52646142102056f523f2fef73ac28bf6f1899522e74a7b32caf7adc8003f8e923cd46ad3e245a771b2a9b7fc5df46a81303795209648b9542f2af4e9
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.9.2.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.9.2.ebuild
new file mode 100644
index 000000000000..fd84d5ea01db
--- /dev/null
+++ b/dev-java/ant-jdepend/ant-jdepend-1.9.2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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 52d610c2b7f1..453e3de24587 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 477 BLAKE2B e0e27fd10e9c67ea3f59aac03c124f49f0417f0013b3fba11bda5de5a7608dd092d680d9228667dde113ba5b1b3afe143c026da14318814022af0b9085f057c0 SHA512 273ab0b8899c84bed50556cc7ff6567f91d4913d1fcf3d6d624b4d5893bedc3b3770fc7896bafa4ebd46a898534bfccf65b29dcc74e1230987ff496caf18c876
 EBUILD ant-jmf-1.9.13.ebuild 477 BLAKE2B e0e27fd10e9c67ea3f59aac03c124f49f0417f0013b3fba11bda5de5a7608dd092d680d9228667dde113ba5b1b3afe143c026da14318814022af0b9085f057c0 SHA512 273ab0b8899c84bed50556cc7ff6567f91d4913d1fcf3d6d624b4d5893bedc3b3770fc7896bafa4ebd46a898534bfccf65b29dcc74e1230987ff496caf18c876
+EBUILD ant-jmf-1.9.2.ebuild 442 BLAKE2B 72c38a29c480b64d268a4fcb35343360fec007cdd9bc5001fc85117f881b9380384574767b57d337dbce4e751dcd1b9d9f9153070eb70625035226e7dd543acb SHA512 25ff6db6ea214003d27446f52a20fee2c34a78b4ee0f4bb96995d4059b1b3d2f04abd116a9c3bf086b9c507293063dcba7a1d96e667cdaac76679d1d77be6700
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jmf/ant-jmf-1.9.2.ebuild b/dev-java/ant-jmf/ant-jmf-1.9.2.ebuild
new file mode 100644
index 000000000000..bc8934bcd488
--- /dev/null
+++ b/dev-java/ant-jmf/ant-jmf-1.9.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# 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 da62937c6daa..ed7650134ca5 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 370 BLAKE2B ab08572c64c2bfe212d303f6216598f96e32584cfdbf791a2b37c929334851a88156e8f8e688866ad1e670f6cdc32848f491061c1d8af3018f4f89cee9e79a37 SHA512 2e57a4c727c97c62a35ff61916cc3c618a78416d0d298941f3188dc6efb01e9bd8b26eab02d340a2c888762e4775e4a6d486477452f1c1a589e2a225bda5f625
 EBUILD ant-jsch-1.9.13.ebuild 370 BLAKE2B ab08572c64c2bfe212d303f6216598f96e32584cfdbf791a2b37c929334851a88156e8f8e688866ad1e670f6cdc32848f491061c1d8af3018f4f89cee9e79a37 SHA512 2e57a4c727c97c62a35ff61916cc3c618a78416d0d298941f3188dc6efb01e9bd8b26eab02d340a2c888762e4775e4a6d486477452f1c1a589e2a225bda5f625
+EBUILD ant-jsch-1.9.2.ebuild 334 BLAKE2B ca0fb3b2033c1405cfc6ed4d53ff1a00313d584c8bd70ffde3856f64cd2f5792ff82b91d5cf2fd6743e772e528188b244c45b6f52d7ed943621a20d1b4748bdd SHA512 eab9878016474d7c2dd04994b97f37fab9e7556dabb6fc4e556fd877ca274bcda0d04c349c9e59a0e3b20e46c75c3baaa4df40f7fa339b4669b340f81bd15c04
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jsch/ant-jsch-1.9.2.ebuild b/dev-java/ant-jsch/ant-jsch-1.9.2.ebuild
new file mode 100644
index 000000000000..bf0f7290e70c
--- /dev/null
+++ b/dev-java/ant-jsch/ant-jsch-1.9.2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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 75f377580b55..42815efbd336 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.10.5-r1.ebuild 497 BLAKE2B 0207bc0b6a519399adcb49c2ddcbc1a73ecb39bf54a87e726fd33346ffc6b3f4163b2fcb70796540ec55a143fe38694d580eab5beb5fd34ba10dbf821db27028 SHA512 36ef29c67d3c0051837a474ea185023cc1664f67d7fc4cf7252ac65f8d0e2519e779bf2aecbe77487cea9f9172da0b3f5d3bf56b36e481853438053c65f669ca
 EBUILD ant-junit-1.9.13-r1.ebuild 497 BLAKE2B 0207bc0b6a519399adcb49c2ddcbc1a73ecb39bf54a87e726fd33346ffc6b3f4163b2fcb70796540ec55a143fe38694d580eab5beb5fd34ba10dbf821db27028 SHA512 36ef29c67d3c0051837a474ea185023cc1664f67d7fc4cf7252ac65f8d0e2519e779bf2aecbe77487cea9f9172da0b3f5d3bf56b36e481853438053c65f669ca
+EBUILD ant-junit-1.9.2-r1.ebuild 502 BLAKE2B ac447b23465fea8e1fb8fec8127ba6014dca48787655a407a51e29206b339448b4c85402bd1245fa37053f9de4bcdbadbf7022ec40145ef795e40646a890643c SHA512 5f5e7927fc805b27e191a4c0c7c9b7ff7444ed0b00924af9916c3c69d2937893930fd4cb36526d93863b39c8f209e61aa1b1220d24e108b3f5eba0e2e26d27ef
+EBUILD ant-junit-1.9.2.ebuild 478 BLAKE2B dfce4cc4ff7be128a3d793a9557be2009ce946f552a1eafc10901dd6d73ff5a30174d333d084343b75e63b63836900134d6185037ef95b7a5a1e939b483127f1 SHA512 52ccfc4d9eeda879aff9734b70de3cbece99f1c0c2605abebf0416480c9c1d86afd8729ddbac79480ae4d68d8d467a2fa7b5294c711e6abc021962213d3bfb6e
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junit/ant-junit-1.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-junit/ant-junit-1.9.2.ebuild b/dev-java/ant-junit/ant-junit-1.9.2.ebuild
new file mode 100644
index 000000000000..6c017ac5cd86
--- /dev/null
+++ b/dev-java/ant-junit/ant-junit-1.9.2.ebuild
@@ -0,0 +1,21 @@
+# 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: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 d883447457b6..a2ba39def6f7 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 940 BLAKE2B f4eff21908f9362bf6d00892cfbf4db10f898c45e3e207a939c6cc2c4db2591d53d3ffd4570b3537d944138a85185a5a381cf357acf33785e0ae7e3dc1423e1c SHA512 25c9a902be0d5f28cd2fc364a50542d33ecc2f42e8180af31caee13811fd078cef6c724b798d21948a36d7df0adc814cba05a419e7ea66628a16783ea4629cfd
 EBUILD ant-junit4-1.9.13.ebuild 940 BLAKE2B f4eff21908f9362bf6d00892cfbf4db10f898c45e3e207a939c6cc2c4db2591d53d3ffd4570b3537d944138a85185a5a381cf357acf33785e0ae7e3dc1423e1c SHA512 25c9a902be0d5f28cd2fc364a50542d33ecc2f42e8180af31caee13811fd078cef6c724b798d21948a36d7df0adc814cba05a419e7ea66628a16783ea4629cfd
+EBUILD ant-junit4-1.9.2.ebuild 892 BLAKE2B a86fbea1362673fa5a870d99aeda048af324cdd17378d544c26407d156ba4a95153711e6a640c484aca4920e12237e3a3ce79e5ee0ab01e331fd036ef2ba9149 SHA512 fb4d96d2c9f25d3be82aac963a73198f84fe98f0a517e131c604b3ad3b97f62ef517a3421fd947daa1dcab68e27c6d33a4647d51b875f3b1d90b1bdc93f62358
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junit4/ant-junit4-1.9.2.ebuild b/dev-java/ant-junit4/ant-junit4-1.9.2.ebuild
new file mode 100644
index 000000000000..7e52132ebaa4
--- /dev/null
+++ b/dev-java/ant-junit4/ant-junit4-1.9.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+ANT_TASK_JDKVER=1.5
+ANT_TASK_JREVER=1.5
+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_compile() {
+	eant jar-junit4
+}
+
+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-swing/Manifest b/dev-java/ant-swing/Manifest
index e16ea7c779b8..87268ce43242 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 413 BLAKE2B cd63db00ea34820084071e7e1e7b83aacbf2ea6bfd9855cfb91bc3daed6a4ab11af81d2c585797df36a2ad2ea2cc2049e37a4efd3cff0c7c0ecbd1d83f065f3a SHA512 c4a483ae8e34ba1f42db8298dd5713a70e1384f740b3eb99cc2f207f7041941c0160f36f434a0af1b8f824fff6e25ebc860b6228d1357d6be43a62ef1db59413
 EBUILD ant-swing-1.9.13.ebuild 413 BLAKE2B cd63db00ea34820084071e7e1e7b83aacbf2ea6bfd9855cfb91bc3daed6a4ab11af81d2c585797df36a2ad2ea2cc2049e37a4efd3cff0c7c0ecbd1d83f065f3a SHA512 c4a483ae8e34ba1f42db8298dd5713a70e1384f740b3eb99cc2f207f7041941c0160f36f434a0af1b8f824fff6e25ebc860b6228d1357d6be43a62ef1db59413
+EBUILD ant-swing-1.9.2.ebuild 378 BLAKE2B 929e21c190b22bf1a2208d257a1d869fea004c18c1744c20868ea5b217a8ccdae554d4d191825b43574c2ca51ca97aedc0d9cff5b10ddf26e8cde9650c09f8ea SHA512 1ffdf04554b7dfcaf301e28f8c39ad73701ec7c8348a4dae57c0f39183a8a044a51a363d9645ab0815ed4b0c0a9a7e294ae4c16acca25597f43d4ffc6de8f177
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-swing/ant-swing-1.9.2.ebuild b/dev-java/ant-swing/ant-swing-1.9.2.ebuild
new file mode 100644
index 000000000000..ce2b13e20711
--- /dev/null
+++ b/dev-java/ant-swing/ant-swing-1.9.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# 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 29429ec9e106..d7fe929d28a9 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 915 BLAKE2B ac51e0d21775cc262872696d04d8131527976a06640267b7d68d52909d5fbdc5cb7e9ec8d94dc173b45abf74b263e2c65b5e1cdd62d3f31f084e356d8455be3e SHA512 e01d34bd411749cb0e8fcf4cf0fda67c40f23e1c3a85c72a300a0608e9d03423a85ea7aa0571f2b4339b94f86887847a1902e8dfa89a25c575f457c8eb04584b
 EBUILD ant-testutil-1.9.13.ebuild 915 BLAKE2B ac51e0d21775cc262872696d04d8131527976a06640267b7d68d52909d5fbdc5cb7e9ec8d94dc173b45abf74b263e2c65b5e1cdd62d3f31f084e356d8455be3e SHA512 e01d34bd411749cb0e8fcf4cf0fda67c40f23e1c3a85c72a300a0608e9d03423a85ea7aa0571f2b4339b94f86887847a1902e8dfa89a25c575f457c8eb04584b
+EBUILD ant-testutil-1.9.2.ebuild 879 BLAKE2B b5d43761171505f960122afe17265f0d76e2c336a00510daa726adb31efba3586389a924acd37cdaa26cdfe6ef788b67c35de0ce972fded71e9fc3e56bdab346 SHA512 35fbd1785a5d1ed76bf8cb78b90d67fdb1eca04fab19f45fa04e2d2e80993ed2432d8ef1198f1bb0464691169bf76748cdd7c2ae862e48e80d3173617e9b9739
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-testutil/ant-testutil-1.9.2.ebuild b/dev-java/ant-testutil/ant-testutil-1.9.2.ebuild
new file mode 100644
index 000000000000..5b82bd8d0c38
--- /dev/null
+++ b/dev-java/ant-testutil/ant-testutil-1.9.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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.6
+	>=dev-java/junit-4.11:4
+	~dev-java/ant-swing-${PV}
+	~dev-java/ant-junit4-${PV}"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+# 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 e15c60b91abd..b6bc5bc20c86 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,4 +1,5 @@
 EBUILD ant-1.10.5-r1.ebuild 1690 BLAKE2B a5a34ec4e6f4587f2e966ebb2b513fedef27a261837f3e3f2b9fb03a8408201e941d59364b9ff6fc4fd2f44408bc0f85773905441394ec6dff476c1dade0b839 SHA512 1c07c6f9dbcaa729f18361b4b61a191c5cd98a280db1f28ffab9119a261d0f8f75f6878d217f784066b5f68ded7ec6676d17416892e436c6506c595dc17ab59f
 EBUILD ant-1.10.5.ebuild 1652 BLAKE2B bd8eeb5e5b0faddb84086fc0a3084ec43bb32766f855dd6433922499cf7ee5bdc25a8d3eb75f5804556bce316e6453372573053d7098002c1031bef2387bd294 SHA512 31a9c15de893e36c8cc223803ef606779b5512aa2407b411ef0d30cb1e64266c8af3d512041a7d795a438125a60b4860ad2c58642b9ae822c58c2b7f04ee0e07
 EBUILD ant-1.9.13.ebuild 1583 BLAKE2B d8cb9a5ce2a9a3d0c5d79d732b75ec8b9dbcc2f6b1ddf95632dfe796602385d0225c206caba3c202253c300b35fea6049dcea91e02bfdce097380b201314f83c SHA512 e94bf1c4b76bf3c220df56c1192d994ec8663fbaf21b5fa4e171e233448c148cb2a99d2687c51dd3eda77df618546f85cecaa7e1dfddf65daa39d9efd2cf0dea
+EBUILD ant-1.9.2-r1.ebuild 2027 BLAKE2B eee331a9cffd99f179cd2df829299f95e100d132cf7055dffa63463d42655febd55a3e7643af993f236a6ba5bc12efe5c332fcd73e7cebb4540bf45d4a7a7018 SHA512 092edc2dc1c0b2e2b607db39dab7632814bb124ef3c20c1787fc84760b4192e8690cdc575f21efc2b4146b1efea97e2317829f5c99b4f3b96cbb1c002951d605
 MISC metadata.xml 1540 BLAKE2B 5536e37e8d4b18a8b744b88968c8f5f87973dedd25dfc5a0c96202bed4991034e93b57ad9a8737b5dfab6526adfa1e563768f08c6b85442f87f0b4ebc87345a4 SHA512 651f97c959e8322e51a7d937dd5886604e3118249907cbd7c0695e65b91b39c22539aeac2870c4f8ffe49e6f4edb8736459eb68266cfc4cb0baac9e439d0a4e5
diff --git a/dev-java/ant/ant-1.9.2-r1.ebuild b/dev-java/ant/ant-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..b9f778d065f9
--- /dev/null
+++ b/dev-java/ant/ant-1.9.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit versionator
+
+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 +log4j +oro +regexp +resolver 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} )
+	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} )
+	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} )
+	testutil? ( ~dev-java/ant-testutil-${PV} )
+	X? ( ~dev-java/ant-swing-${PV} )
+"
+
+S="${WORKDIR}"
+
+src_compile() { :; }
+
+pkg_postinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		# if we update from a version below 1.7.1
+		if ! version_is_at_least 1.7.1 ${REPLACING_VERSIONS}; 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."
+			elog
+			elog "You may now freely set the USE flags of this package without breaking"
+			elog "building of Java packages, which depend on the exact ant tasks they need."
+			elog "The USE flags default to enabled (except X, jai and jmf) for convenience."
+		fi
+	fi
+}
diff --git a/dev-java/eclipsito/Manifest b/dev-java/eclipsito/Manifest
index 22884a42bb4f..af3189f7acee 100644
--- a/dev-java/eclipsito/Manifest
+++ b/dev-java/eclipsito/Manifest
@@ -1,6 +1,4 @@
 AUX eclipsito-0_pre20130713-build.xml 1101 BLAKE2B 32c21296648965d9c3abbf47d66ef5d8d70597016b7ba1aab806c548a5d66c12de519cc2f6e48b4401eb177593a9f12c2a424a66a62e85a6434d783ca07cd896 SHA512 015ec8415927e31d672a0daf8ca89ceb0c8202f2ac8556583fef44586eedf6de8abafd3e96b85ece41fd7de7b712c9a18c53fd6184c8cf753a63e9d1c02ad7cd
 DIST eclipsito-0_pre20130713.tar.xz 162972 BLAKE2B 193a3b2c4bee39bfb87c49eb8b077804d26ef1f84a1dc2c3546d235ab6fa8f86340c943b1a5ce1044dcd5681751d856a044d75866717a0c976e82c86ae8a1ab1 SHA512 b238692950bc93059fb16df8e6301669583185976ae4f12519d1917a13fea2b53c5b3462f2da61d63025019eee10037a3a96b2ac742545d61b80f2ab7964d41b
-DIST eclipsito-20180510.tar.gz 66661 BLAKE2B 0cd1879314eaf4acfcb26cd37f27c50208263cc584d15cb19cfee4d75b29e925d7840be6f39fdf2b6aa05d26f1497284d2d772f9a42ea81398aeec9b1ebad029 SHA512 420cc4ed44fc80065452b39350625f5621175e0bd2aae1ba38a409134bd92af23b492c01f826234431fec68e09eecdf47d61a06f02338e5998c2c5cad44fd142
 EBUILD eclipsito-0_pre20130713.ebuild 703 BLAKE2B e71d6f0458bb0565509908be3240791427b7b19051344b8a235b3238027003aa0f473dcc2b95b64cfa8b9beb902f62269cabbee9e768b3aa03c13f2a7a9eaf58 SHA512 50905b910ea794b51dcea6f3b9bd36bc65f8b1b9ce30752780b085c2677f596af7836f131b57c6420682fa4929e55485861a8d784bc0d3e7f3b4856bfbfe0cbf
-EBUILD eclipsito-20180510.ebuild 681 BLAKE2B 404b3a40ef34e50257862b090fcfc2e0594973a281093e5c8490d3863ef37d903c90a6173cfe8ff658c498e6584b7f25d0d958d541ac33e0a0e2efac3b039588 SHA512 31e5c2b5aa681cec97f58b15712af417b133897eb583580e751b802acb9f4c7b8f7b4abb11885ea267bc62401aa18cc98335b51e066ae3d2887f37a684dbe427
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/eclipsito/eclipsito-20180510.ebuild b/dev-java/eclipsito/eclipsito-20180510.ebuild
deleted file mode 100644
index 2c5cf97ca604..000000000000
--- a/dev-java/eclipsito/eclipsito-20180510.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-COMMIT="0eb2fbb739898f55265027c2796f77fbee9f4ab2"
-
-inherit java-pkg-2 java-pkg-simple vcs-snapshot
-
-DESCRIPTION="A small subset of Eclipse core libraries for modular applications"
-HOMEPAGE="https://github.com/bardsoftware/eclipsito"
-SRC_URI="https://github.com/bardsoftware/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8"
-
-S="${WORKDIR}/${P}/org.bardsoftware.${PN}"
-
-src_prepare() {
-	default
-	rm -r src/org/bardsoftware/test || die
-}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 125a35de2f6d..e3351294935d 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -12,12 +12,14 @@ DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713
 DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
 DIST apache-tomcat-7.0.92-src.tar.gz 4778943 BLAKE2B d11b01219a25c303ce791d965908c79cd48b5c97e1f0bed81ae60e0fcae3c4b23906f652eaf1d2922db7a57e68ee9f5a09ef017b7f1b89ed6c2ab81a477a810e SHA512 8cbcaf6d8dcda5ad8bd667582a39e91c1feaa4cc7216cafc23b9f5cf005cce9af24473c1c9d573f4da26c88ea68520a113dc0a7e2a50823f3ba3bb1510ec9e0a
 DIST apache-tomcat-7.0.93-src.tar.gz 4786577 BLAKE2B 8b72418c98369e0e104c5f51e9d822c287487b5d3b66a4a6d005535b33a35a6cbc50c49b48100555bfaba0c6c983ea11dcdf381d2fba80a77fc17ac0df20efaa SHA512 5f9b08827aeae58f371496c34ce1ae5692bd5403e1a9a7a91b283ece3289356dbd85d48fcb71958aaeeb42cd65bb70fcf34cbe2db3901475cfb812370766f3fc
+DIST apache-tomcat-8.0.52-src.tar.gz 5039683 BLAKE2B 36318d0ae50fbca3f2a97e0210d0a8da8314f1ef79d0b047971bca30a5b0cc937faf013b5090f6e6b8aec4127b6185dc54ae589f5b57143b62c71c09f8bd5e9d SHA512 6d846213db0b15f9add8d80f30f304afdaf879ab6d7f85d212183a93f4f360ebfeeb079813bdea83cbd13f507504473028bbf8279e89b800b6f150b83086fa56
 DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd SHA512 0b56bc723277b2888896ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
+DIST apache-tomcat-8.5.31-src.tar.gz 5154531 BLAKE2B cce0388e5c8c5fb5fcb3dba3b5961dc21d9f19d9a2f6177660a41410bddf241f73dda1e52c3875e28cfa13041c85a458a92c9a23c509b645f042cfa472081fde SHA512 659137ef4809af329ae4dd6f5825a603c1408ef3e48153abe7480a722e7f4bebef68a64af9cbef4a4ad9a7e8da76494f825035bbadbb983a097525f476f32f33
+DIST apache-tomcat-8.5.37-src.tar.gz 5233414 BLAKE2B 1848180c3e0a3f4559e5c232bea8bad6d05f09d9c4f2f9f903178012b7b8837d395a5ac73c8ac0504fbd3d1df3c2dc785022e1c97da4441cfdcf8b790170ff7c SHA512 29ddbf7bfef19441a8a043020b5f1149d12590dac8120012a2167b6892e3db7c644990e49ba14cc4b4c7339faed65f010a7b24d660db0fb8adde34f032099cec
 DIST apache-tomcat-8.5.38-src.tar.gz 5253678 BLAKE2B b2ecc732128934a3afa314ddc569b1b3d330ccb12b99b0ce4b12e1952347ac57cafb3a5637595997a0c9e77752ae41665e637c826c3b9ae9925799124e735480 SHA512 b84d96fa972a9d24957ef047cdce0fb49de3d365401b07990eaa5bad8f3c87a6b1ad1eac077c4be595ee291daef68720381fe63461815de47664275b486ceeee
-DIST apache-tomcat-8.5.39-src.tar.gz 5264067 BLAKE2B 8cd672529660783d3310beae356c32a9392f550ae72f2cdbd60f23c3b532e3adb19a295737fb39e9a2990b14edeff51cedf1f936f32f844e496e751913f2a859 SHA512 ba591290be49a01cec38300c6321b634e3ca7417074b55103afc887b9af3eda942d302aee5f1648e7fa60b5231cd7d83428846e2b55a4964f5cc98c27a844f8d
+DIST apache-tomcat-9.0.14-src.tar.gz 5472704 BLAKE2B ee533afd733dacbe4a20baadb4c5dc9fa7620d695c1c57b1662894945731f978508b45ef0d8169068c13ba862804868f12d3e494873643589b9f57bc9ec0a342 SHA512 46119f6ae9003b7a178dd5158c1eae3b5116461e73c5d78cd763bff82b80f282ff08cee5175cf850d3f209af900677e93bab31c556035a6eaf6aae86a5d42fc6
 DIST apache-tomcat-9.0.16-src.tar.gz 5654943 BLAKE2B a412457c2d34367301b4335a3a4bf46a647f8e60440be751874e1eaad400a0832b64fcae4c9f81585a4afbddafd75f2929bc78c12eb05b20539b11de686dfecc SHA512 60fbdefbddaa6fac4bc9d0ca4c1d9a119dd53063fd4574c474daf5f346fddc9cb7fd174f1be189e965d5ae4670710347d84fcf443c7df01faac9a1b84ecb33ce
-DIST apache-tomcat-9.0.17-src.tar.gz 5670728 BLAKE2B 15f8518ec073a935dec6afdd3a8f9885e7867a0aa033024024bd72b7887011ca169c776f2a4d886d93a73a478f9dcad5f87c31b3a30a88ca913309c51e0f0ec7 SHA512 b5763dae05598c0a4d3638ba02c0627219de20406bddaab86ae3262299f2d9bbda1a5db612cad9fb8a54b2888e9ce1c4be67613d855cfd92b4cee5b85e226602
 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
 DIST apache-tomcat-9.0.8-src.tar.gz 5115250 BLAKE2B 8eaf0aa963711f90278d6d20986f4ba583c64e9e2b1f0b82ccc676a854a2078fe29c3b691d49af529074c9eea02ba78802cc9a4bb5cd7a3e561f6dfcb342c50b SHA512 22a3c9a2c9f2fa87b218ec5deb50248af201e83111bbeb7fcfbb7dde5aba3e2d61b53bc40500b3e364a9fb94b576ad8a4683979534274af0f3bcdfb86aa045e7
 DIST jakarta-servletapi-src.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
@@ -30,12 +32,14 @@ EBUILD tomcat-servlet-api-6.0.53.ebuild 943 BLAKE2B c7b1a81fcb5f243e1888df39fc62
 EBUILD tomcat-servlet-api-7.0.82.ebuild 906 BLAKE2B 2169547e97371a8532c797f02e31ad1e17b04d2f03f7ab3041dac4ac1f23e699cdea60fb5779436d259cb3fdba6c59cd083d9cf4f874e8dad3f3194919c38c6c SHA512 ea84aa02351af9a21ffdad739619e1b8bc22b0978a03f464fedd7400257ed253040c2bd89be2749f00889f009988dd4083a5ceb81a89d3d6d5e8a5b6bfc07dbb
 EBUILD tomcat-servlet-api-7.0.92.ebuild 904 BLAKE2B b380f8e0c06f18c2d2c4042fc9a746c2008a2a195f45d7d4a7c6636f4fc22a0b99590e94dfa41a47910ff13b3d45b04d18e055f933ef03ea1f722fba79a9b979 SHA512 eaab24b5d2ad2abde36fc52328a17893cd8f618bd3e8c9c06350f06549b7daa34667f2206e622ae2fbb1d9f06881e084b9b1b3482a434ed69e57b43e737d4670
 EBUILD tomcat-servlet-api-7.0.93.ebuild 905 BLAKE2B 30ef1491ebc2075c2ac674b51daa2ca189e07c96d15ab3ed001ae5fe65a06f9d65dc9ee89a6f2f183d6445ffb8ddf9be616327f5e5c64c493688edcfc4c39eaa SHA512 541679a0de3f1e192a738f956fea4fd1ca7f56476c5dad5c3f017be01f03a4506f2798a0985aa42cfb49dbf40db3015ea5da93d5ac362f2bacb824d442102bb2
+EBUILD tomcat-servlet-api-8.0.52.ebuild 961 BLAKE2B 4d207cbd6e39369ceace593d2f02d644bba3d81b2a88d34f9288cbd08cc58a40220e5a2f791074d3aafa7dbdbe3a9a1327436e4427aa5017ab3a11667b98c390 SHA512 6eb575f867923c318e684ae4fb182753fbb15e078d1da4fc8583461c2c7360bf9a2b82e3fb8839046895ae8f9a1d5c7634348edfb6ba0c12b6599805a5e50427
 EBUILD tomcat-servlet-api-8.0.53.ebuild 961 BLAKE2B 4d207cbd6e39369ceace593d2f02d644bba3d81b2a88d34f9288cbd08cc58a40220e5a2f791074d3aafa7dbdbe3a9a1327436e4427aa5017ab3a11667b98c390 SHA512 6eb575f867923c318e684ae4fb182753fbb15e078d1da4fc8583461c2c7360bf9a2b82e3fb8839046895ae8f9a1d5c7634348edfb6ba0c12b6599805a5e50427
 EBUILD tomcat-servlet-api-8.5.23.ebuild 1010 BLAKE2B fb16fa9955dd865619850de21cdae0e44130895b3f886ec96ad5cff37f45f8a13b5caaddc083f46d2eab6b00e174689e652a5a0ead58fb4626e40612c1fd5784 SHA512 1ceaa37c6434f32e10705b0663bc39e2ccc5507c621a2ede604feec69a49bcb46ddd49fff33a5ccce50d4daa228170a3db30e31624ae84dfc83b538de10f7824
-EBUILD tomcat-servlet-api-8.5.38.ebuild 1009 BLAKE2B 616e51d8822c6876501edd4bc2408cf0bf8874c7bb2be477492d83aab8a90ce472072b0f92f475362109acc1468f5e80c83bc31f201694ace3485cde174dbc8d SHA512 bf685eedd82d08d142aad7301694e54ea8677f4b730def058c09e6c0b92b9db69d2df37859f113a024283e8b05e5eaa38a5ac30784c4fc269d221387e50d6e4b
-EBUILD tomcat-servlet-api-8.5.39.ebuild 1010 BLAKE2B 04f7dd7c54b930a54631cd1e444052db3290f7e9f2e289040a58a0bdd2d2410996197a22c6a36df9462328153b8a28b58f1cfa4554283ecb10ce0806c25ff484 SHA512 e6c416bae0febef9521b8ae3385c2fe41b7926b4c734f6e09b1f77d92a74ac986579811ec93d9c1887d13133a9520b9327a82725e5c90a35b5ba2aa4f93fc53d
-EBUILD tomcat-servlet-api-9.0.16.ebuild 1004 BLAKE2B 7f18ece7027e7c7e4af92c417870389e5938963ed8d5c03c06a4c44140e0803712a356bad0853f64fc860e900905169811dd85fa733b82940da4d9b03f1bd61a SHA512 467a31bf3148372c850fa94a9c0467163038aabe29ab72be1a539e5f2642bb363c9a0bbc4416fec9e24e46aa0c76e2b51ec000512772e8964177841310468303
-EBUILD tomcat-servlet-api-9.0.17.ebuild 1005 BLAKE2B 13c34d148546c4adaad25d2fa7ff3d90bb2464865b5af19832cc611ee3fb6c0a10c26fac4ca76da16d42e7fa9301deeed7b2c94e73e08c7ad0287c59730c81f0 SHA512 f552bd4b8f38a5e3a569755a2105fedf4ddf03572cfc3c363455e0a4bfc17a0272a0bc264b1e3d84dfaa51089f0f54fc4123a5964dc116be9b9181862b127f4e
+EBUILD tomcat-servlet-api-8.5.31.ebuild 1009 BLAKE2B 616e51d8822c6876501edd4bc2408cf0bf8874c7bb2be477492d83aab8a90ce472072b0f92f475362109acc1468f5e80c83bc31f201694ace3485cde174dbc8d SHA512 bf685eedd82d08d142aad7301694e54ea8677f4b730def058c09e6c0b92b9db69d2df37859f113a024283e8b05e5eaa38a5ac30784c4fc269d221387e50d6e4b
+EBUILD tomcat-servlet-api-8.5.37.ebuild 1009 BLAKE2B 616e51d8822c6876501edd4bc2408cf0bf8874c7bb2be477492d83aab8a90ce472072b0f92f475362109acc1468f5e80c83bc31f201694ace3485cde174dbc8d SHA512 bf685eedd82d08d142aad7301694e54ea8677f4b730def058c09e6c0b92b9db69d2df37859f113a024283e8b05e5eaa38a5ac30784c4fc269d221387e50d6e4b
+EBUILD tomcat-servlet-api-8.5.38.ebuild 1010 BLAKE2B 04f7dd7c54b930a54631cd1e444052db3290f7e9f2e289040a58a0bdd2d2410996197a22c6a36df9462328153b8a28b58f1cfa4554283ecb10ce0806c25ff484 SHA512 e6c416bae0febef9521b8ae3385c2fe41b7926b4c734f6e09b1f77d92a74ac986579811ec93d9c1887d13133a9520b9327a82725e5c90a35b5ba2aa4f93fc53d
+EBUILD tomcat-servlet-api-9.0.14.ebuild 1004 BLAKE2B 7f18ece7027e7c7e4af92c417870389e5938963ed8d5c03c06a4c44140e0803712a356bad0853f64fc860e900905169811dd85fa733b82940da4d9b03f1bd61a SHA512 467a31bf3148372c850fa94a9c0467163038aabe29ab72be1a539e5f2642bb363c9a0bbc4416fec9e24e46aa0c76e2b51ec000512772e8964177841310468303
+EBUILD tomcat-servlet-api-9.0.16.ebuild 1005 BLAKE2B 13c34d148546c4adaad25d2fa7ff3d90bb2464865b5af19832cc611ee3fb6c0a10c26fac4ca76da16d42e7fa9301deeed7b2c94e73e08c7ad0287c59730c81f0 SHA512 f552bd4b8f38a5e3a569755a2105fedf4ddf03572cfc3c363455e0a4bfc17a0272a0bc264b1e3d84dfaa51089f0f54fc4123a5964dc116be9b9181862b127f4e
 EBUILD tomcat-servlet-api-9.0.7.ebuild 1007 BLAKE2B 93f6cdc024db1fd4959c86661de3d58e4a3457e54e94bc26d28cfa14f276b17ae61113252b9004de8492f815fd4b02744e055c8082d3fe50918376e61dcca071 SHA512 4cbd09d197fa558fb2172bfb637c06c6f028939038ad3071074019de4663c833d24f8f96a1c7ca628241ae65ef16fc88a06b226f210070170844ad95e2890c51
 EBUILD tomcat-servlet-api-9.0.8.ebuild 1004 BLAKE2B 7f18ece7027e7c7e4af92c417870389e5938963ed8d5c03c06a4c44140e0803712a356bad0853f64fc860e900905169811dd85fa733b82940da4d9b03f1bd61a SHA512 467a31bf3148372c850fa94a9c0467163038aabe29ab72be1a539e5f2642bb363c9a0bbc4416fec9e24e46aa0c76e2b51ec000512772e8964177841310468303
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.52.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.52.ebuild
new file mode 100644
index 000000000000..4186988a08af
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.52.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.39.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.31.ebuild
index a6df79ab2dec..640c06837c8c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.39.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.31.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.37.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.37.ebuild
new file mode 100644
index 000000000000..640c06837c8c
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.37.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.38.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.38.ebuild
index 640c06837c8c..a6df79ab2dec 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.38.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.38.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.17.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.14.ebuild
index e35055493b79..d66f7a815533 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.17.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.16.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.16.ebuild
index d66f7a815533..e35055493b79 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.16.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-24 17:44:59 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-24 17:44:59 +0000
commit	0706fc6986773f4e4d391deff4ad5143c464ea4e (patch)
tree	9fd110f9fc996e8a4213eeda994a8c112491b86d /dev-java
parent	aa3411e241a201d53a2689766fe419f2756819f3 (diff)