Remove old versions.

Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0x9C6D7DE4
author: James Le Cuirot <chewi@gentoo.org> 2015-07-09 21:13:43 +0000
committer: James Le Cuirot <chewi@gentoo.org> 2015-07-09 21:13:43 +0000
commit: a6eb30eba1a22193745c72cafb6ea5e09cce6a15 (patch)
tree: 482012e750194f09635ed9d264094466a01a3cb9 /dev-java
parent: Remove KDE Plasma 5.3.1 (diff)
download: historical-a6eb30eba1a22193745c72cafb6ea5e09cce6a15.tar.gz
historical-a6eb30eba1a22193745c72cafb6ea5e09cce6a15.tar.bz2
historical-a6eb30eba1a22193745c72cafb6ea5e09cce6a15.zip
121 files changed, 546 insertions, 2833 deletions
diff --git a/dev-java/ant-antlr/ChangeLog b/dev-java/ant-antlr/ChangeLog
index 19590388db63..1152318553f1 100644
--- a/dev-java/ant-antlr/ChangeLog
+++ b/dev-java/ant-antlr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-antlr
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-antlr/ChangeLog,v 1.52 2014/08/03 19:08:53 sera Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-antlr/ChangeLog,v 1.53 2015/07/09 21:09:01 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org> -ant-antlr-1.8.2.ebuild,
+  -ant-antlr-1.8.4.ebuild, -ant-antlr-1.9.1.ebuild:
+  Remove old versions.
 
   03 Aug 2014; Ralph Sennhauser <sera@gentoo.org> -ant-antlr-1.7.1-r1.ebuild,
   -ant-antlr-1.8.0.ebuild, -ant-antlr-1.8.1.ebuild:
diff --git a/dev-java/ant-antlr/Manifest b/dev-java/ant-antlr/Manifest
index 2d43dda13dd4..5b90264d3035 100644
--- a/dev-java/ant-antlr/Manifest
+++ b/dev-java/ant-antlr/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-antlr-1.8.2.ebuild 676 SHA256 9e613912f7b4f6503896c4990af3f251832649943c7eebdc9b422618175f9c78 SHA512 0f1b190bb1adbbffef839e5d7889c83370e95daefee11f34a3e49d3f74a2c950116f0c3eb5ad20b127a813b2e8b71a811e20bf0e86e241cda6f9b517bbe2d5fe WHIRLPOOL eb23c3f549aedd05f85260e7716898f6b11da7d60df3024fa828209589abf7e665132233910d05aed780014f2c38fd5a62aae983e0c2b1a4996675a1b4dc05dc
-EBUILD ant-antlr-1.8.4.ebuild 675 SHA256 b56e2f079d76db5f319745a37c8fa52a913b0a742bf3bb9fb589acde9956728a SHA512 efac0c38b2891fbbc4bd5a93d9b89a0171cf86c38808bb2878e7d6b783f26c069953224446908ae4fcfdedc42f6973254a2eef864e80577b767ec35361ea0617 WHIRLPOOL 9b36558b8990795649e0ac430e9379a6d2664dbe040b57da79b243d15d0dbfc818be93598a5234813aeb460550173b53a2151a2855eacb60310459822914d291
-EBUILD ant-antlr-1.9.1.ebuild 646 SHA256 814e052f2042f2db4240ab1bbba2306a6a1ffd08cae18251638ec6f97811d4c7 SHA512 3d30949b44b782d6f1dab27f44f3027351b64a91b6807c4442a4a3c27c98950852290159a39e81ba58c52a903f3490cc8c8ec4463bb4a6aaadfac6aa67a02a56 WHIRLPOOL ee13356b9f61ae78366774a5cb87e33d4a5291d9455d4974351376df85793eb78e54978ac13d3ef2bbf931dfe4ee513491fef34e7d303cae029bed1cac1e4e36
 EBUILD ant-antlr-1.9.2.ebuild 633 SHA256 d36a98b0880f71e89fc9cd762437cee69421098802acd770652eb57803ef64be SHA512 b01f20749389045742e2c47cb632b0f2c95b6f37010af24208de0b34fa678719dba734a7a3268e0e654992ec52934b0d2eeea85fd671669bf5422a7e467cdc0d WHIRLPOOL 2d850178e88952a65f779f66ad264c0bb1468310b83283310b405ca381cef20115d1c1b7ca197f2366aac234dc3bc9dc95199c2c0986bd3de0846d30ea8a3674
-MISC ChangeLog 6388 SHA256 828dec6a1d662cf1b44cd4e60a306fe3797316771809af46b06148600839f904 SHA512 c4f006e0aff9b16328557ff40a9221fdd04164ac68b5c87a78947e8226829e3a1c8dc88dd2444d416cc12f2054d6ddcf6c62b276e0189014d615f6d3cafe1cb7 WHIRLPOOL d0428c61b1e45a68c6e0787fd1f4013870ad306b3b910222d80fb219fc96ed2c52afda8ea49c0c6d60ab3aea22ed786f0dc877391c318c2852c969e5ca9b9c5f
+MISC ChangeLog 6540 SHA256 ffc6a9dec04d9a0bbd511c34dfa2138807c48bc2b6e8235f6bf789ff182c9a38 SHA512 1ba1190b9de58e9dfc978efbdd0aab4d82457c470fe68097067a9ff1cd96bfdb1b18f438f54f66e0507293fbbcabeea068c9edb060b4cfbb2e43f933b82c1158 WHIRLPOOL db2973692f5b09b7c0ee7d978cef562b862fd7c777126154212731812b5a0ec5a87d4d8404a1bdf92e31552b70cd4300fb0b4e2ba324713e0022200b1f6f0156
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJT3ojPAAoJELjwI6Q8XPdamGIH+gJciyCVnvNBi66d5zWkYbLM
-1FboX6Ppu8KPZLbJ8N8+OPk4eBqD+Pbli2bPcePLJhvgvEqpOP3LwCluh3j+9fK4
-hr5+GqXeJD+NlmYfxY0SXO0dvh1TGYWosnJH7VNx9tHpeRjJNTeVBQMMsw/AUf5Y
-k0u1rwe7Xv+38W+45f8MhQvdMTDxOTbNfQOwyamv6N7wUKXCm0tosKo1H52OPrRa
-a4A6q9z/JZU6tA2sd7lBg3z7LT9eurX3KKGHIrjQ1OLfjWtzsvmY/AzIdrP2hqjr
-JCUxja9/9Ls64/Hsx52Nmfhb0/HIOVTTKEfbF/zpi7ZBtj7GJOJrTziKuUHfENg=
-=erqk
+iQJ8BAEBCABmBQJVnuLuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3k1w4QAJ0ngS94eVL3u+X0MMZtGujl
+W8MEhQaA50v+/6ycL1WW70GFlO44YqRKLhpAJkKFgmBNBWSzaTDxJ7eRBvvpMfjw
+kfMu4hNEFSreUWJwK+FL6WjHG3ruvbio6wdP4OHytNW21hEEX3OQkbc3kyrjU1Ve
+f6tT14XYwGMAiY6PBDdPnZzS0MLP/odrG8g0z+gbIx4yN574yD6XLJD4+Imkc+Zz
+WGlMO6Wo+1/emvbEi0/6BFKx63h+nH+8zDXmvDbcbT0miYBp38PlpRK1/3zxA+p8
+OxDhmmARGG8+Y/IxtzgehUPtXT/2ILrIZGOLxN7ZDn1rNwMA7PzqAJIxpC8FTcbP
+DRW+ZfY26VWlyd8LMH3tehBfjCZx3ga6o7Lmk+DdBDOVkQc2AfgOt5p1qZNw18nH
+xg86cT7uuUkEj1j6st7q8VudRasKl1qPr/HrSvgDGac9gly/CSO2SvguQ3ZMOOi3
+Nmx2tRzGPnaZ2Tv059bZiR4/EikVSnLYrhYByyoBRPxaonCmZT2eYqmP0ViKpiZz
+PAEhF4jK82DIrfRCZ5GrAXkWNVDgQz7Ci/jEG4HF64+JEabUx60AYuPoZUrUXnsC
+PnJVlsB45mmbDJvBUtm5ypqGIMNXO9bgSQw4vkGOPu/tYDdi25U19u1+/SSVTm9e
+AUeHZEbOWYbJpG4mJ7mh
+=wd+Z
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-antlr/ant-antlr-1.8.2.ebuild b/dev-java/ant-antlr/ant-antlr-1.8.2.ebuild
deleted file mode 100644
index a40351b3e868..000000000000
--- a/dev-java/ant-antlr/ant-antlr-1.8.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-antlr/ant-antlr-1.8.2.ebuild,v 1.3 2012/05/25 11:23:41 ago Exp $
-
-EAPI="4"
-
-# just a runtime dependency
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for Antlr"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-java/antlr-2.7.5-r3:0[java]"
-
-src_install() {
-	ant-tasks_src_install
-	java-pkg_register-dependency antlr
-}
diff --git a/dev-java/ant-antlr/ant-antlr-1.8.4.ebuild b/dev-java/ant-antlr/ant-antlr-1.8.4.ebuild
deleted file mode 100644
index 5082df3bcf61..000000000000
--- a/dev-java/ant-antlr/ant-antlr-1.8.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-antlr/ant-antlr-1.8.4.ebuild,v 1.6 2013/02/05 06:59:06 zerochaos Exp $
-
-EAPI="4"
-
-# just a runtime dependency
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for Antlr"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-java/antlr-2.7.5-r3:0[java]"
-
-src_install() {
-	ant-tasks_src_install
-	java-pkg_register-dependency antlr
-}
diff --git a/dev-java/ant-antlr/ant-antlr-1.9.1.ebuild b/dev-java/ant-antlr/ant-antlr-1.9.1.ebuild
deleted file mode 100644
index 6df9419f7a36..000000000000
--- a/dev-java/ant-antlr/ant-antlr-1.9.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-antlr/ant-antlr-1.9.1.ebuild,v 1.1 2013/07/05 11:05:19 tomwij Exp $
-
-EAPI="5"
-
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for Antlr"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd \
-	~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris \
-	~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=dev-java/antlr-2.7.5-r3:0[java]"
-
-src_install() {
-	ant-tasks_src_install
-	java-pkg_register-dependency antlr
-}
diff --git a/dev-java/ant-apache-bcel/ChangeLog b/dev-java/ant-apache-bcel/ChangeLog
index 86979dde9ae6..37cd9cfcdee4 100644
--- a/dev-java/ant-apache-bcel/ChangeLog
+++ b/dev-java/ant-apache-bcel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-apache-bcel
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bcel/ChangeLog,v 1.41 2014/03/08 16:23:40 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bcel/ChangeLog,v 1.42 2015/07/09 21:09:12 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org> -ant-apache-bcel-1.8.2.ebuild,
+  -ant-apache-bcel-1.8.4.ebuild, -ant-apache-bcel-1.9.1.ebuild:
+  Remove old versions.
 
   08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -ant-apache-bcel-1.7.1.ebuild,
   -ant-apache-bcel-1.8.0.ebuild, -ant-apache-bcel-1.8.1.ebuild:
diff --git a/dev-java/ant-apache-bcel/Manifest b/dev-java/ant-apache-bcel/Manifest
index a64672fd5c35..5b378ffdcaba 100644
--- a/dev-java/ant-apache-bcel/Manifest
+++ b/dev-java/ant-apache-bcel/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-apache-bcel-1.8.2.ebuild 534 SHA256 20b556013a3f903c049cd78c923cffe5830751d0f4d941590399fa2589a30867 SHA512 6d779c5baac0061196b3fb43d88666c533fe62abf3aeba988c7759518abc17cb8eae85c84ed18760281867ae689fc29bc0f77f3e4138245a63b27204a98a8368 WHIRLPOOL 5fb0e8761ee90e27597655776a70cb949fc057e6d36e0c1a266cdcc25f0cfe82cdb3496ae9435b2f5f604daf76f8ea888eb3aa89125ca04237df6fc29e722ab7
-EBUILD ant-apache-bcel-1.8.4.ebuild 532 SHA256 83736c1004d687e4e079fcf92af654714ecaaa26ee28e8a619847413e9c7cbce SHA512 964356940614ba4c19f65a2cbffdcd7835c6c94ffe05aff0541776d27f1efae861ea7eeac5297a160e6043db66cfebe4ade4f90a9b65671e752b47c5558501d0 WHIRLPOOL 12ef27157e6594a2f8fbee503ed0965dc086b476f87cfb85586fd94101e8e612724d4cebf7d7b5cdba4818054194096e229b4e8ebc5af16bcbb335e04accdc26
-EBUILD ant-apache-bcel-1.9.1.ebuild 537 SHA256 9a12f1de567c051faa8693f3fbec6cda3dcdd05ce20f1051dc2f6ef8f876b37d SHA512 cdf23664e07aef39fcc197ba9e24f0d83f6040c0eda829793e74764dc3319f7d07c28c16e7655bac9d7e0ba05ebd0fc57e01529eb0a08307801d1396b59d7cd1 WHIRLPOOL b9987eade986aec6f67e52973b9b7fc1c8a2e9c80d15358f5b9e6720aad937b212efb60354d83a1c03ffba058f2412686036a7e5571ac58a76d10e16ecb5ad8b
 EBUILD ant-apache-bcel-1.9.2.ebuild 524 SHA256 1218f4723f054beb65c8f84e7598c7dd7bbad7075a327430e533d898a73cd494 SHA512 e1cfa9da0661d5611a762ebfa918ab3db64b46bba85006fa5aeb281a35860652f92a56c3eb281080f0c64ea1bd40dc73757ba0e474f85b3699f5f89753ab4f1f WHIRLPOOL 9d92422f175ef2306ac2b7bf1d2bdbbfb769cf4bb320adb02cc221fbdd58cfe6bfaa3290b75846b7a0c7bdc5d78c74db9b827c2cb4a1afe18cb414a748eebedc
-MISC ChangeLog 5301 SHA256 f2d6e47ff7b930c96c5430bf4b2b807e0ea4e1fdcfe3dff7cb22457dad725822 SHA512 eb33cfee11ab92eb18088db27ae8066648be74492e0709fa3e252e76b2ec6297591215e02af78eef93860b60d82f00a3d5927a6e704ccfc55295d407596b5ec4 WHIRLPOOL 3db43da6dfa316f6637f4f61c3380b62fa5776dac0dac0d87a3e88229a6c095685daa8b7dbf2dfcf3332a08707ce2b11e14556493fc33c19b8d00691326113ad
+MISC ChangeLog 5469 SHA256 936b5b7444ce96dfaf47837138ec88f459bb0ec68398d3b2510ff4ad3e93ffb5 SHA512 f2604a9446cd5eed57549af0b338f1435d99c4496542e8c32e651682d835d0652800658256e514f70ff09a050cedfc3b20f11324bcbb580bf58f1d3687785dcc WHIRLPOOL 21e61ca4b830751ab6dce430930263c4024fbe6cb0d08ed16c27a91f1cb2e640ba96778eefdcf45cc741fc8a9a3d9406942ae84d5e888951f6e8b04a69ec8db0
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJTG0PrAAoJEJWyH81tNOV9YcUH/iEalVW7EmgfkwH4eK3WrGZV
-LQW9JYdGIFrKZ2VYVjpr4KM2or1njDJtU+Sr7Cai3PhHtzSJ9hh3Dkbmu2Ar857u
-058Kmcmaj1LHjuOwGlCv5toRB697Mpfz7V+AXSNWS7kKpyzgLBUIDxi4ItrNT+Ok
-RHJnHtFRCjsxXVOuserYLhx6u7AhrsirtW7keteGAgtWoT02LtaKPTyX03CHsLUa
-qO5qN6005mrVBXltA3Vs+PXVwJSB//2Dyirg3wTp9h04CCkACoBIV8V+Re1MNo7V
-wkx2twieQTUo8JkI0EbwiI5qsBJx82BPFRCHEkecfptCBDCdioQiB9lf6emsZkY=
-=NmOx
+iQJ8BAEBCABmBQJVnuL5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3k23UQAKKx/JqRBEzAU+fBNzlNyP7U
+ZinUZaFDoAZYVUrsaLIOFHL3Vxr5k7OiKQWyauXFi2gxDB22ouN8jE9RtR796WnN
+Out3AdR5Lmfruu2qW0E+nRD0vExon+4IAldDR3qLwP8QYacIPuzElwJkiQgzUwv7
+P2coljr92IMo8V3R7uEoM4VUKJY4aPqfvkl6+2KAFxKhzZtXC7JpqiAlD5FfiaFW
+xI/MW/7pONZHFVEvyIc+IwMv5ng6hVn10LwxVYXOvcgR76/dNsAZYkYK7nsdkaXI
+h4KyJk5s5tSmvAK74SZGOamd+qad6y/3D2Gz7trgCUt3LszV0yHige7X5AWKLjRQ
+LIlw9t01qxL9okMnJVzzy9kNLfSZ5Ve49GSbRnEiBzYWH9KOLW773kHPYUi9mvg/
+i93rufB/ZnorfX3xYkmyPD7gTxGVL/RhEDxoMJrwxJWluc5p+KGI42ETxzQ4avjW
+InTwLaT4ahOWH7Ffhmt2Tv64RahmWKTctAS0LQgqkgH+o5nnFiS2EDe5QTevdbZu
+ywltnQ+bVqCNMnszFuirDFzoAUVIuI/EWT9WCwXE7A5FpDsry1W85bELFc+qN0Gv
+5Ker7Ndd0V9WQONjBCaOua5/2ykGJFayqwA4bslFYSR1/HRIDRjzKzawQy06hQRu
+2iq3imogliBLyXaGxsGZ
+=dbsH
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.2.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.2.ebuild
deleted file mode 100644
index 5462310e445a..000000000000
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.2.ebuild,v 1.3 2012/05/25 11:24:10 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME="bcel"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/bcel-5.1-r3:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.4.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.4.ebuild
deleted file mode 100644
index 9c1bb1db359c..000000000000
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bcel/ant-apache-bcel-1.8.4.ebuild,v 1.5 2012/12/05 17:27:26 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME="bcel"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/bcel-5.1-r3:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.1.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.1.ebuild
deleted file mode 100644
index cdb2322bfc2e..000000000000
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.1.ebuild,v 1.1 2013/07/05 11:08:01 tomwij Exp $
-
-EAPI="5"
-
-ANT_TASK_DEPNAME="bcel"
-
-inherit ant-tasks
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd \
-	~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/ChangeLog b/dev-java/ant-apache-bsf/ChangeLog
index fa63b6dde034..53680d4fe50d 100644
--- a/dev-java/ant-apache-bsf/ChangeLog
+++ b/dev-java/ant-apache-bsf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-apache-bsf
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bsf/ChangeLog,v 1.51 2014/08/03 19:05:16 sera Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bsf/ChangeLog,v 1.52 2015/07/09 21:09:23 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org> -ant-apache-bsf-1.8.2.ebuild,
+  -ant-apache-bsf-1.8.4.ebuild, -ant-apache-bsf-1.9.1.ebuild:
+  Remove old versions.
 
   03 Aug 2014; Ralph Sennhauser <sera@gentoo.org>
   -ant-apache-bsf-1.7.1-r1.ebuild, -ant-apache-bsf-1.8.0.ebuild,
diff --git a/dev-java/ant-apache-bsf/Manifest b/dev-java/ant-apache-bsf/Manifest
index 28c18ee6a3f5..67feafbc42fd 100644
--- a/dev-java/ant-apache-bsf/Manifest
+++ b/dev-java/ant-apache-bsf/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-apache-bsf-1.8.2.ebuild 846 SHA256 ce7170fcdf89be958c5f6ea6f04407d2fbf7c30b7354ec2968c0492c312fd763 SHA512 edec744fd7f874441e1b34b9c877b35cad14a23f2302c5064fa0b396b9d5368d3047e8ab61c4e8a00bfd48470580f858fc327fcbf8d39bc2cb4549b22fc00176 WHIRLPOOL 2e3089c415bea48392f1e277796fc17a108ea1a4a09bfeca8b5128c8d531dc4d48b60eb330490184d74f3bdeee55034b70acceeda4f81cb9547049104e8b69da
-EBUILD ant-apache-bsf-1.8.4.ebuild 835 SHA256 104e8b87269bcf9f6d7912f00e4557d86af9c4e37fdd6387d923665417c2504a SHA512 0742e91a79fa7c2b890add0bff92ad4a979662ef5c5db2ddd470ab8ae46b269a023e355a1e130a4b221e97edecd81155c9ed6dbb000946b14bbc0da101173cc7 WHIRLPOOL 7d0a30c6ab2a63ace77d836f56150685d646162d4c471c6a82f95eab93ccfd56ef03c72e1695c7a3655345d99d7ffa212056f28d5e1abfc12f6ed8d3f97c7b9d
-EBUILD ant-apache-bsf-1.9.1.ebuild 814 SHA256 586040f8f480e79d370492e8171c5199ea9da59f2f0d472549369b2040680bb1 SHA512 2276567f0f4204b75c45b8613bacb580988b8a627ec024f763cb9e19a0475554050c702848353b13bd4934123db18787e938b486bb5f139f9e227180b1cb5c29 WHIRLPOOL 649fb4c61f402ed1badcf5374d0a11fcce905d2bbd06f3de0c892afcde07c2aceb4440416f7efad160f507e549557a1a6cefa2617d18968381fcccddfcb8e572
 EBUILD ant-apache-bsf-1.9.2.ebuild 801 SHA256 a73933d44d02c44411cf73c23f9c3d3daa8235b14a91a932956ffd470078df23 SHA512 fa54470d6fb56edbee969d22447191dee200fbc616a58074b751a445827cbb6958bf25893927b99603ea22c0ac21c9d913fc693005dc5c2d6cbb3ff36e565e3f WHIRLPOOL c7a7c276cef263dca7851dfd23cffb85e250c539c9e732b727775eea2ec3bade89b9737dfd38cc9cec0ebf7a9777cbdf5bf43546726a317a16b696b8cef706fc
-MISC ChangeLog 6933 SHA256 aede36284e7d9e3b924af072f78c4e5810b5aca0a58c76ed13d94b22282d5960 SHA512 89340b36e011625bfdc035099a8e54267db6515940122b1ed30509236bf2bbbd2769fa8b7fe3cf159c81cf76885a61daf4061b8a4fb765b33a88939a2fb42c1a WHIRLPOOL a10b04c44c7ac36fef563a37e794845cf3d6f32b0379c4ecd035d00631b042aca15b33ce774188c3cbae2029e3db205b46965196fffa195b6b9a4f7a984f468a
+MISC ChangeLog 7100 SHA256 6785f116b45ef4562b06cd56401ffd89ea9cd5860c0a9d566dbc218302814e8b SHA512 22144f36ac89b17a53f18ac4a3c44b7bef837521275431b968c09b558790b7cfcc5f1874fa19d71f10b1f9bc1dbfb9bb7a9454fae7fd797b220ae7381ca5a645 WHIRLPOOL 495c4ba062ebaaf1af161adaf54bf07cef064fba403677c3d51c6db303f55c016036df86b3308e5917fc20e756f2c51fa72cfcda3e66e321d75223e3b48e599b
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJT3of1AAoJELjwI6Q8XPdaMFUH/0/66Tb6av/AjP1lbRP3M3qg
-O57L2tvhCtUOmWeDOHaRMPyB7yaPP7YOM/v2mPvkyFRcp/vS1vSwJtQZKg1/4qSJ
-EhMcxBclrn/Csr5VubjjoIrU6tAjKkLERi643tQj3QWdpjdsCX4EW3TkUn34KBiT
-Wl12Vt/3vOYPUibFyHx66Db3H4mfUpxalm9+5kaZ1M5s0D9R471iRpTQz/G9v1W6
-92k8sKur9zEebUYg9J9B2vMD+YXbDdTfsh0tnEdpto5PNJSzFTXF80vCnzB9enyl
-8+OoVO77ldoKfyXbhPYXGV6M0zj/arkXR9WmYf4yUJd/IBOlHxHvcAbnf/AkHIo=
-=w9ap
+iQJ8BAEBCABmBQJVnuMEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3k55wQAKKgGK1GnE0Tcb7qOdFIkVDB
+rVrM9m0HxL5vCJHWdGMwSSz9frKX/bMl0hgYibjpMREE1MWTKZCGUt8sCRXae4PM
+28qVsa9c2bBKThi7o3FHU8teFxto5RazqQuKeRr546+ZcYsx9VTeDdIgc23G09yF
+SNegiNu6+/1clNlMS/PZNL+dDY5p+yhZuuR2GGxwCjtgBJib5nl2x47dv47dJxZO
+g3n1d6f7EHTiIYeQkhdEStaMhmdQI6tOwtACT88YMOVlRCpFfHRA1gGZcmXqE6ti
+DasGKcZPa7GZN+pKHFKfWUhqJr7T1Ek6oOBnK0hjgeEl+bX+dXxBX2I93v45rqKP
+b7A47Ng+HMptC3hIeu/6dxD8o/GtWXlrhaGMchN+ezpeRVFkzxogqD2iGK2HLUNr
+s8OHVn8wmfa+vysZ3J5haehHe8RWxF1lHQhtYAaK8ZBScNhvkZySlhxljMkgw+3l
+UOymJdA+LywyH2kOys4qauqqcxdAjDRcjVYmbHfRai6ZXa43o3PmtGG+HduCTUma
+VbFDSdPnrAVDMMkATp7RVQ0zOnAXjmhrhEYnkR2qsKRc97uoRI+rdjADGeibsqoD
+XpP55UOYxdSFluBV1wn60IsROKG8/iGHjwvUgiuM+p3ilA0OrlQWf5RuaFI0qq2d
+f5Uj/55Ve0ume5zzGBYi
+=jcxE
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.8.2.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.8.2.ebuild
deleted file mode 100644
index 151242a32f62..000000000000
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.8.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bsf/ant-apache-bsf-1.8.2.ebuild,v 1.3 2012/05/25 11:24:37 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME="bsf-2.3"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
-RDEPEND="${DEPEND}"
-
-IUSE="python javascript tcl"
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-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-bsf/ant-apache-bsf-1.8.4.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.8.4.ebuild
deleted file mode 100644
index 1828f06272e9..000000000000
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.8.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bsf/ant-apache-bsf-1.8.4.ebuild,v 1.5 2012/12/05 17:27:45 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME="bsf-2.3"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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}"
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-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-bsf/ant-apache-bsf-1.9.1.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.1.ebuild
deleted file mode 100644
index 074f3d4cc15c..000000000000
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.1.ebuild,v 1.1 2013/07/05 11:10:12 tomwij Exp $
-
-EAPI="5"
-
-ANT_TASK_DEPNAME="bsf-2.3"
-
-inherit ant-tasks
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd \
-	~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/ChangeLog b/dev-java/ant-apache-log4j/ChangeLog
index 86a315a54d33..a9346deb7d0b 100644
--- a/dev-java/ant-apache-log4j/ChangeLog
+++ b/dev-java/ant-apache-log4j/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-apache-log4j
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ChangeLog,v 1.41 2014/03/08 16:24:43 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ChangeLog,v 1.42 2015/07/09 21:09:34 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org>
+  -ant-apache-log4j-1.8.2.ebuild, -ant-apache-log4j-1.8.4.ebuild,
+  -ant-apache-log4j-1.9.1.ebuild:
+  Remove old versions.
 
   08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -ant-apache-log4j-1.7.1.ebuild,
   -ant-apache-log4j-1.8.0.ebuild, -ant-apache-log4j-1.8.1.ebuild:
diff --git a/dev-java/ant-apache-log4j/Manifest b/dev-java/ant-apache-log4j/Manifest
index 04041a383f81..dda4407b1711 100644
--- a/dev-java/ant-apache-log4j/Manifest
+++ b/dev-java/ant-apache-log4j/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-apache-log4j-1.8.2.ebuild 541 SHA256 129ec04167422260aa89d608158260d735b94f5a51d2179f78726c02032b1924 SHA512 9fc58c91ab159a4c2b7978e16690db6c228f80759f0579d8eec380f8217b59072eeaa6ca93dd22638c6379534c1f4a38fab1a38ef685b29670b68f8837b6d717 WHIRLPOOL 89085b4763f43296fca67720f4bddc223b9cd1aeaa3869ce81b630d6a43471ad2a8e53c1e8be212ca717988e879a60194d245ac6e1506d5818d71f07fb010861
-EBUILD ant-apache-log4j-1.8.4.ebuild 539 SHA256 e4acc3a6bfa255ab5629f963cafa6905e79223fc963811d38fda0275f6d91e70 SHA512 e758afc6b1150d1016987215375b85799de64755fdb3b438d977fc9633189c2b15fab2233aca84fe0fd976e3b90b0bb787f87960cd58bd0458ff7a744cfc69ed WHIRLPOOL c1d291aca5f9fa01a284b53e3057f5bf993f44ce27a3249a62a880111d294e9633f39f8e75fce275ff662a25d501fe6117c37f830d9913e4b96a4c9185bc7a1f
-EBUILD ant-apache-log4j-1.9.1.ebuild 544 SHA256 a4f1cd4054d99b37b068823f48be96420c1bd69e0b4da1d2bba6d9a0328f8028 SHA512 d0d601a7265119bd23d4480c8a6528d6ea6bcb597040becac59a689ba34785c7fae78888999fc01e6b2b00f0873429577f639881206410464f5d4a8d083b6303 WHIRLPOOL 76baa6cc03dbbb0bbd5a06a75c16b21175b4b3c4a9dba0f1e15c3d84a13d995a77ffce8f403ba4ed22f6053651b6e145fadc149c4fb070fb7d335321500d896c
 EBUILD ant-apache-log4j-1.9.2.ebuild 531 SHA256 045d4febc8577b8241d51a385e4d9a9c9e0027bf6e3b2713b44d4542254785a2 SHA512 07ba7724486132701e1d5ee175b651d19ec786bfe8e430b3c3fd266fe8b680453b4b37e6f41efdf81f602a360014273f241051f36bf1d5936a8ddb9627858939 WHIRLPOOL 4b2aed8c5d136846492373e7c412fc2151f1cfb3cfe950797136c1b5e6ba2ff369deede4b3facf0c08d3475c5dea19e1d8035483c4185dec6ef44836fb52a91c
-MISC ChangeLog 5359 SHA256 093040c34c25e14338154e33fc4c7d02ff77d401de639f13b8b1a8e92c00a581 SHA512 c8497c3d436aaad619036686f17ef8ce62101812aecadbfad5b0587b70ce5650a80a44019e952bebec332e20d6e4326933697df84f7def4c77741d5777b659cc WHIRLPOOL a4002f9ebd952fc7a2df7794dcff90bad806630f5ac600ee83eec4cd86632e41385423b2a5c3ef950fdbb5d2f42d0f058c63285f5c30bf339e2cf0c429bdc1a0
+MISC ChangeLog 5532 SHA256 7ce30ee4c7a8d9296c09a9ad82afeb5d86052373326340c3130326642e2e636f SHA512 9274f7df5522dda55e316f6f98d42f8367be9b3f82d7cfdd2d2691333989660e7e845804b918ef2f3c0ba64513aff7bfb5cd31c97f688c779f39ade2b0531553 WHIRLPOOL b7c95237c327ad3cdf9a317c55e6d222784baacbe5fee9ead0babe953aacc9a8775071b3855cd71e54d1bcf639034541280d474baf8b31a2986cd0503fee0e1c
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJTG0QrAAoJEJWyH81tNOV9+YIH/iCZdAdGArfemdneI8kXALR5
-vvx1jtYgGJgAkXdDsqAo1jLOq3ihJ8QjdA7EvMYdr+Q0HutIYyliNweGXYxVqiuQ
-1bH1XmVhO23FNZq71JbZjOZNGunBdZGVjIbSetQQeLhJH1KVzfMrWx+nCKW9DhyA
-aFwNX9KA8GiQjwCBzZT6oR/RMHJOpzDWkvxwJqA5W6NGKExn5PfBydVai/p9UU//
-D0ZVOMWs+WjFMt0XCnu1Ill0+fQep11wDLhvpYjlkqlUI/jMEBg7uVl0gE7lXAzP
-KbNnUiMdUxLi47CqF8oRkxgB1oFarl5ABSyRmVPhI+1gAbkemWw+z9xn4Q5lSzE=
-=5JZF
+iQJ8BAEBCABmBQJVnuMPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kzWkP/0RQgvSabPT6DUs7Pca988pv
+XllSUNVbpDedpG7BArTJb0+AFvg1wY8CeuSoYx9tCAbpiZlG6F9DGYO/L7+IFE0y
+b+IPJqiyDTDKUKysQs2mjTY5sfoS0d/9+5T3yuOZLQHAGBeoK71DwQ7dAWA91tDC
+F+N3LeSvrQp93zw8ilkPK+vF3VXaH5fn1qOc3wCQDlRHs1mVnJflTe2nmly7IOEp
+S30zYOf6gWhLRDoIZRMhwncamHl5xmUQSwCPDdmceQSMQ7V3BJ6LDjEZ25EGWOnl
+wgRkVDhuQfeBhxeNgycoAUyR/GMIth3DqW/4SErG+1YtL1XUVVp4N6mQF2n0lS2A
+wgRFzqOsQXSeKPhvfkhgVtQYc6S/YcIizYRIkgjjf0ZaOKL/d+eHt5621WzwVaAm
+KTVwZWoq6WPZmwGQt/9/l3RLCkZUyl4t46JOvZKn0Osp6mAHbzWGOAh6StPzgY5b
+FjFNnwPhNPRlizDUysbIkWtlN+eORxcdBp737i+abtxFhib/FFZRSraIDdShszjT
+cZaPH+0NQa825r/2oik/5YLTb8Cf03OzO1Rbo6Oc91VzdZ/LNDwSqiZQXjbsxLeH
+IqIgBqfwNTZo0kZSe6MzvmyclnY5y8JxaviSNWLv6TdDyMurJ7dPhSMVguaEMsX7
+cPcXjQWoaCfHqPZJX1L6
+=wR3I
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.2.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.2.ebuild
deleted file mode 100644
index 9fc8bb642f75..000000000000
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.2.ebuild,v 1.3 2012/05/25 11:25:05 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME="log4j"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/log4j-1.2.13-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.4.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.4.ebuild
deleted file mode 100644
index 19399249fc70..000000000000
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ant-apache-log4j-1.8.4.ebuild,v 1.5 2012/12/05 17:28:05 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME="log4j"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/log4j-1.2.13-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.1.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.1.ebuild
deleted file mode 100644
index 972ccf482a0d..000000000000
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.1.ebuild,v 1.1 2013/07/05 11:12:19 tomwij Exp $
-
-EAPI="5"
-
-ANT_TASK_DEPNAME="log4j"
-
-inherit ant-tasks
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd \
-	~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/ChangeLog b/dev-java/ant-apache-oro/ChangeLog
index 7fdd2c094ba6..46ddfc2f7392 100644
--- a/dev-java/ant-apache-oro/ChangeLog
+++ b/dev-java/ant-apache-oro/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-apache-oro
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-oro/ChangeLog,v 1.41 2014/03/08 15:52:59 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-oro/ChangeLog,v 1.42 2015/07/09 21:09:46 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org> -ant-apache-oro-1.8.2.ebuild,
+  -ant-apache-oro-1.8.4.ebuild, -ant-apache-oro-1.9.1.ebuild:
+  Remove old versions.
 
   08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -ant-apache-oro-1.7.1.ebuild,
   -ant-apache-oro-1.8.0.ebuild, -ant-apache-oro-1.8.1.ebuild:
diff --git a/dev-java/ant-apache-oro/Manifest b/dev-java/ant-apache-oro/Manifest
index 5390de4b6808..b8fcaa0fdd5e 100644
--- a/dev-java/ant-apache-oro/Manifest
+++ b/dev-java/ant-apache-oro/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-apache-oro-1.8.2.ebuild 554 SHA256 221ddff0141b5f774bee6ab59314615d14d3483ed5591e62b12aae88ca4e2e45 SHA512 49d36e3fbf1dd190dc89b57c29982db2ad61f3e0cf944435796d73756be96c1bd991bfb37b1b4dd64257a35a37c4b96ffc5d5ca61019b742080a1200d984a129 WHIRLPOOL c3c760e4151c9e8e79f198585dba18ed24b9c3de1d692c5a935e7744b2a832ad1c4f64328295cea9a309a94c5c61847eb12c1a2f0a7969bc927c683803f5b523
-EBUILD ant-apache-oro-1.8.4.ebuild 552 SHA256 7f624fcc636443ef8265a05301629edfcb90ddc8357adf31cb0971c68daa8a76 SHA512 6689c8b3fd6f06062dbc3cdff45490738c8ebf3c7692fda69be15b18fd5c52728e1f92848e86211cef20e34757b9de6dd8770cfe746fd61d7373e54209f1ca31 WHIRLPOOL 28d593056becc604737790ce4804c670b9cbc483c223c054bd66b9c71533f17a9b931d55408dd22bd3c40be7b639d2d207e5ee67811cc0edb288a82e60d6ba4b
-EBUILD ant-apache-oro-1.9.1.ebuild 557 SHA256 76263410b8c4d6b01885ec60c0d8115a116ef821f9806252cab8fb98c296e9b5 SHA512 df0b2fa6d09326303cf86c4549376c9ab6c28cd2973d88be108aae0faa9dbd8eca8e2aa4b4963918eed42c45293cf081c38e5d62db177ac19698da349e51a3c5 WHIRLPOOL 4faa6fda6d33899e201ee6a28b81fe82c4d83ccda933632b2cb7dbe23fdb79dbe4c7a6663fefe6e6043a42e09a01d34ad69749b19e90008f048d4239dd21c4ed
 EBUILD ant-apache-oro-1.9.2.ebuild 544 SHA256 552d5297dc3d09bac8541341df3bd4812d53eec53164284adf90a04843b04c0d SHA512 7ca8adf6c39566757fbf48069d724a15c18c9ddd8c43f9200fcd6455d9727e21b06a66c0133854d8fba57d7da95e67f2b022623147dce9610f0ab5c95a1831a0 WHIRLPOOL 6c9ad284bf486a29ab09408b12417654f7b8c05e534b5a1664bdc86bd39cff4fd4a854f87366e108c6e737be1f1766e9be65e5eacd134e94c12df5958b57c2b0
-MISC ChangeLog 5233 SHA256 27f26d1e5360efc82a5b74d4e15a8ced1ca56ab10028e82e3199e6795bbee68a SHA512 83d5f79931f5d34a7640e601819700ffe7f1ff399dc79293ce230a8efc1726dff03539010c1f2ad508efb9f8825ebcf9ad473b14704d68a7a65c23350ece7784 WHIRLPOOL 6c7f187af28fbb02fca6083a9ad24207a18da376c30d68112b9aa02fff8a0004eb3662adca9e3f202f681b7a3bb637d811fe5c3738c90ff4cf9c566185ee5d1f
+MISC ChangeLog 5398 SHA256 c32e79439bc7bea413d0b5e44a7d0a416b25a2bb310cd134daa86ea7240a481e SHA512 9e2ddca7407c3bd06d164906fabd03cab08a939f0603be45206b4d238444476fce49cc50cb09168425cd205806545c3d88502c5ef02f71555f4a49b90ded8138 WHIRLPOOL 78d36656114506c666fed1726e5606954a3520f45b01394832f632d5ef075e40dc587c476f2ff995a0b9d9b7105aa98b3373cdc966a8496ab03e4e6e68ca8f23
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJTGzy7AAoJEJWyH81tNOV9pcQIAI2g3CZjOyULJmc+8amDBl5b
-RWdK0wzz8GPQxUnaarpcXUfY6NdQqFmPLjqQd9H7Df1Hmg3Nyf5kSlfM/bAm3DdU
-4Q9w+SFm6iW8bry7sizrK873v9h6n6fXsA7GKyGnyUreXXQ2adztgA1trCTsnQAA
-pjMlIg2PsLxJpTqxZ9d+2bJq04AOlCXoEHbcmDsNUHd8IkGFOPph1RBIu4ZPJn+v
-AjD5SUupaRsrs3yBVePC8PvSaIXtbPFSMpimHl0l9nQcQoLSttxsrAbprqXI5AtK
-SitX6lYP7/fYHR91DrJ6fBy2tA6RXoCTcNTA1lFGR3olNAE/jJKuUeTNvQRiLWQ=
-=7XfB
+iQJ8BAEBCABmBQJVnuMbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kipcP/A3fvc30NIp24XG4VtEQInH9
+tIFre4GkOKD7IjECyhX4TRwGv2xkVu4N8/pvTUx7cnA+uL1jib0uZRil8W5EL0/U
+MIYgZdcSicL2FyzBtbOBBDp1DsyQd315wenqlck26IT4hYsgOW6sLDBfelzzl7q+
+lCcBxYMZa19VdnXov9dp92HoJJoan73eDtXtA7oS01nRZr8L6L4lPjyQ4gpiCY36
+srvKE7thV3hLctjG8EmaKidt8k1T2SUE/2rahbM4eexEEzVsK9RvY0Li8svRjuyq
+tRbKxU79duxZ8W+F8gdg9KCMDBOSemnKPrvo0xtMsqxp6+FHb+k/J6mYMfl0QnpF
+FZlagkBe68umxkzkn/9W5j50nh2WNTfrAwwokZYzaGSDNcacu9PvWlxUxzYG6BsG
+hkUwmOdRiejHclQqDADHm166FojvKlkDNW+iFFWg3kDhHnQtFq6OZ4SRQ6lF31wT
+ezpJnOhwMCKikiJERFqcggP6bZ9oKBJA9kqtRPpldqW5wR7MUfylFCZCo3+K0EvS
+QdZs3R8va1MMq6R8/U3sil0/Uu8Avj8pxV1jLBHqrY/GHBGOED99r9UF5Y4upqBK
+8U/WMHr0wIDrkFyMwR5OX+nQ2wo92fpFUUXcmxW2a2c6RdlFy17kimYJ8QCZvS/f
+j7bvEAb8E85L7CFsnBgM
+=mMZ6
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.8.2.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.8.2.ebuild
deleted file mode 100644
index e0ddef39d568..000000000000
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.8.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-oro/ant-apache-oro-1.8.2.ebuild,v 1.3 2012/05/25 11:25:32 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME="jakarta-oro-2.0"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.8.4.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.8.4.ebuild
deleted file mode 100644
index 5e877e84adb0..000000000000
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.8.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-oro/ant-apache-oro-1.8.4.ebuild,v 1.5 2012/12/05 17:28:24 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME="jakarta-oro-2.0"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.9.1.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.9.1.ebuild
deleted file mode 100644
index 1de2e9f8cfad..000000000000
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.9.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-oro/ant-apache-oro-1.9.1.ebuild,v 1.1 2013/07/05 11:14:13 tomwij Exp $
-
-EAPI="5"
-
-ANT_TASK_DEPNAME="jakarta-oro-2.0"
-
-inherit ant-tasks
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd \
-	~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/ChangeLog b/dev-java/ant-apache-regexp/ChangeLog
index e6baecec977f..6943431de115 100644
--- a/dev-java/ant-apache-regexp/ChangeLog
+++ b/dev-java/ant-apache-regexp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-apache-regexp
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-regexp/ChangeLog,v 1.41 2014/03/08 17:33:32 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-regexp/ChangeLog,v 1.42 2015/07/09 21:09:57 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org>
+  -ant-apache-regexp-1.8.2.ebuild, -ant-apache-regexp-1.8.4.ebuild,
+  -ant-apache-regexp-1.9.1.ebuild:
+  Remove old versions.
 
   08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -ant-apache-regexp-1.7.1.ebuild,
   -ant-apache-regexp-1.8.0.ebuild, -ant-apache-regexp-1.8.1.ebuild:
diff --git a/dev-java/ant-apache-regexp/Manifest b/dev-java/ant-apache-regexp/Manifest
index 470cb664fffb..f4813cc9d098 100644
--- a/dev-java/ant-apache-regexp/Manifest
+++ b/dev-java/ant-apache-regexp/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-apache-regexp-1.8.2.ebuild 564 SHA256 018ffcf98d14582fef249ad225b740099d0ab71a76f5bb4ac503198d5b74c52d SHA512 b24f00d386dd65f66119a45c8845ac2ee72d3c796f077af143f48a5b721a27e2f54f3ed47d01044b99f6b2e2e08adda8ab9e2fe283b9b713ed7224456ac3132a WHIRLPOOL 6d53b4ba58c778d826d0f8958740704d219d4b149768ad9a792ff9f19326377b5cb03ada3c01ef905084251989fcae44f58c9ca116afd37533f612c7690858ad
-EBUILD ant-apache-regexp-1.8.4.ebuild 562 SHA256 da5c9488f8b3fe8355dcb454281145d14e259b9f8c9f1b8b047286d0c6a4a481 SHA512 5fe397b3d4aae93bb843caca7d2111965f648375d2fe25f69aeceb3b6f0c8d9ac82a8d654cc180332403974b973d12a9229faf0619a7cd05d9fedd086f6c3cbb WHIRLPOOL af28aac8784de63da6df9d0a33e0e0dce3253e0c991f86f0546f23288d7cf86c3c5f26a52e136ffdb8ea6353466b20737a145fd45889bf70389074cb4348e451
-EBUILD ant-apache-regexp-1.9.1.ebuild 567 SHA256 07c90c1d8b9e83db4c0a3ce720270cb0af73ec394fe5a7c812cfb52009f19dc8 SHA512 7b1cf68c99fa8661a28ac233dfa9fa2885b26c4c018525216bae8b7ed147aea5d1cb914613115ddf3ef48450af7670af8eb872f7ee7b75899afc223f1a3d2d9d WHIRLPOOL b43defe03098808e1adf69ca2dfa43e9c23dd8147dae084f006b23eb2be897b403128d47fcf9a227d23f6a288b512f3a18654c4989e175f259ecbc227ca30336
 EBUILD ant-apache-regexp-1.9.2.ebuild 554 SHA256 3521357dff21ad3a42decdaec7f9283355ec4875c074957e5cf983e19ad61a28 SHA512 24ef132316e99ffc0e5648a3def63ba96aee9a1374724764be35a9fb5779d70bc495e5ff5143fe6aff4719650281bb540039287d9a9f3121b35862bc0a9a3f56 WHIRLPOOL a56dd9985348d7bfc08f2babdf4e56846bf2698b3bf1a1b7133a4b1e2fffa63f58c848740667155030dccb8f78cef0f31427d96991919c9d1a86df989fe10e3d
-MISC ChangeLog 5423 SHA256 af5c73a5991ad95cf64fcac54439cb8b21df022451c57b0d1c93e50880bb0679 SHA512 2192b0624e9b733605f01f61e7f5636cc6ec7dd6101376ba72152ac6b6a06c6cc4cffe12749e9608c537448c8805456421e569e6058be4fa2cefa55627a8e785 WHIRLPOOL 0be0a49266687e89719b8c9f7715a6f3e4d3302af3ba90f6e3371c00687bce0aff474e94f3e8f2bb0ee34a2ce2328c99a336efbec1d7e260ff79d1992d4de8f4
+MISC ChangeLog 5599 SHA256 a4f16c0d8949c1acdb30b3bafe944de26672bddc98053650831e4486f2ddfbb3 SHA512 422b66d2ee4299666adf1a4190c69a93de3d225a9567327869b98abb3fadd6728a3e406e6bd3051dd428d85d4f70862dd1972294c2d9033898c00f1bf4d9b07e WHIRLPOOL 88affe2d56ef024f11511924c56e8ebcbeb65de835a6e1e23b5b56f710ba09abbd3db8277cff2e30620eee5bdadf39ac8b5c93c12638247504d325ac81dbaf42
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJTG1RLAAoJEJWyH81tNOV9kUAH/jicwHi57Qv50edjingmuhlY
-9RcrWt2U6QkOaAQDxMZ18stR1GEyFAYfnQFudqkx22N/RmDm4E10mWFQo8bfMED2
-u/0Z1hncPrdVpPYm9DebI/qUe7FWuHgFOWXBHYdb/S4pThpI/R6Tm8p5ABptd6OA
-YTBptd44a+XLIPqdgux+0Ni1j4BWw+2DEzVZ+JJwe8EHM4XQ81EfVkmnw9g3EKg4
-j6gTJUxqvRj2H2TOOZ6EnVVlTmYs8IEpGFJIN/19ebVam/KzbBSpeOaPERDi4Z4N
-uOhjVC0v6C6JOVTlIVtB2NZnwW191FkJPWkJCx+Da0EdG8a7VnvWbfqAEM/J15Y=
-=Zhx6
+iQJ8BAEBCABmBQJVnuMmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kQN8P/1K1QCE+u7J6WWZ+ps4bn7+r
+412W8OzIxRLM8K50tHd4IgXHbU+TDZd7WsBeTRcLGj7qlwxJxQBsEdGwJkvaKbgW
+WGQab4M+mJ3ygbeyiKsXOMbTzfUthxcVtsEEJDWmd0kCNxOdbsSzHnUglPA1Aowr
+8bQdT7BUZQ18SyTsdQXJpWc7yGA/kJI7N4jrmH+/OWxA5M6oxPKk2GcRoquuVAJ9
+cYrQdsWqYYJw/3DhbazfAsS92Q5YJT0W/WGTlOfZMynkZ52cqnAzNmrtSq3l0sP6
+JYG0R2LWzestigReVocKRijujSWWFYe8+0EdkqMI5vZaz7AU06HJB/44llFT8zLT
+NJagucjr4mEFvrC0qKgp5oE5gXkR+RBznU9TLlnfNUEfN+2m49e149/kreB+2COa
+Lt/YdbCTKfvaISJV/V+J/zkOnI5viii2HnRuAU7s+wX4n6ZgZC/32KbfKtznmRKt
+EbzXI+KuqxN0kF5+BFNro4CdRzTgZBu71Jns0Ty5O5dZoy/wMN1gS4yg1C7UZw0x
+W7j1ngOhbDuaFUYvCcQpQUFpSv4WCzggZ2nSOUC1idm9M84MwCzlqlDYyQbczwmF
+TuMqp/R1NeYlJWoR5oYJlUrD8Jzb5sYApFPrzP9rF10ajIRK+5DXVa+Xc3lPikS1
+oGcH5LHDZLfQ+UZe+gFe
+=PNzK
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.2.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.2.ebuild
deleted file mode 100644
index e19c9d970f6d..000000000000
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.2.ebuild,v 1.3 2012/05/25 11:25:58 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME="jakarta-regexp-1.4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.4.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.4.ebuild
deleted file mode 100644
index 3501cbaa36fb..000000000000
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-regexp/ant-apache-regexp-1.8.4.ebuild,v 1.5 2012/12/05 17:28:43 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME="jakarta-regexp-1.4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.1.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.1.ebuild
deleted file mode 100644
index b63c8c543dd2..000000000000
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.1.ebuild,v 1.1 2013/07/05 11:15:54 tomwij Exp $
-
-EAPI="5"
-
-ANT_TASK_DEPNAME="jakarta-regexp-1.4"
-
-inherit ant-tasks
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd \
-	~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/ChangeLog b/dev-java/ant-apache-resolver/ChangeLog
index 27860f36fc47..f9381cbf2a2e 100644
--- a/dev-java/ant-apache-resolver/ChangeLog
+++ b/dev-java/ant-apache-resolver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-apache-resolver
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-resolver/ChangeLog,v 1.41 2014/03/08 16:46:43 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-resolver/ChangeLog,v 1.42 2015/07/09 21:10:08 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org>
+  -ant-apache-resolver-1.8.2.ebuild, -ant-apache-resolver-1.8.4.ebuild,
+  -ant-apache-resolver-1.9.1.ebuild:
+  Remove old versions.
 
   08 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
   -ant-apache-resolver-1.7.1.ebuild, -ant-apache-resolver-1.8.0.ebuild,
diff --git a/dev-java/ant-apache-resolver/Manifest b/dev-java/ant-apache-resolver/Manifest
index 739922e52af3..d32d4bf3e94a 100644
--- a/dev-java/ant-apache-resolver/Manifest
+++ b/dev-java/ant-apache-resolver/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-apache-resolver-1.8.2.ebuild 571 SHA256 d2c5c952b51fa1f0e21030556c7ed0c2b1c92ce7f0740384cb25e46614c9176c SHA512 39765e0f98abb8656e65bdc5a2716993a566e09f0e568a9b414a3ce82abda2efc3081bdf4160f9b5f74a21371558bf54c03aa0b855e51b48b0aecbf801ef44bb WHIRLPOOL ca92e387bc3a6843a7c79aac450d79b7d034900ee687505a99e521f227d5f3a37df61cd2132d8b689d01af7f97f9a10c413547c09f9b6c3f06c70444416b7d05
-EBUILD ant-apache-resolver-1.8.4.ebuild 569 SHA256 5766248bb37ccfe4cf94ed94b1a0703078ad788cfb983e1567e814fbb9ab1494 SHA512 6a829f29eb11e1a5a339e3c92fd7b194b0846a8164cd42b8e83e79dbf7b27e5c1115f4ae93d8d5bbc75346e63a36ae6e227c4232883d7e0c46b9f4d795865630 WHIRLPOOL 5cd656f52b8dfb44d529de4a166f54865a196f9db42385de126c3a66d9b480901e5466c3cb011de339efee4cd50cecf5eeefb41af7c460363f03cd92c1ed6051
-EBUILD ant-apache-resolver-1.9.1.ebuild 574 SHA256 1018b5a1732c480f047a77e0f97c284135676d6eb5d8f34e507835b1f3d2c3bb SHA512 27546f9850b70f73ba108fea849519858a6bdf5d4b28eff53a480f35d66dd0d8f4f1ffaeaefaec98dbc192809e95a5d897b8953c28f200438a20dd15c91da4bd WHIRLPOOL c35949c868d216ea3a1bc0d9f0f9b8ec21fab45dd5dcf61eb1f494120ff791f796b8c8d1d1dc76ff040a6d8ed39e81b43a8c7082b5f826950a21380135d531cd
 EBUILD ant-apache-resolver-1.9.2.ebuild 561 SHA256 161b623448a4c63c410b700a3c39c18f47eba35672ccec09b653bce2bfb7211d SHA512 2a415c45b51e5e87ec4e23c57b2806ee16c1b1366e762075526460966dbe2c32b5fd6f0a4831852abd8be13ce46f3504737fc9c0ff7fd494fe4ee496292974a3 WHIRLPOOL ca678e879c53fff642b1650661abdc49bc1aa29efdffff1ae684451e23db95a0d7aa67af3d362ad3285e89b8e7042c42b22448aef37ee48168e3a4031b5e6070
-MISC ChangeLog 5553 SHA256 6df3604765294efb184f46e2ae082527736d867d2cccaa9b3ead97fd2cffa199 SHA512 038699e013add8e41fa0316b2a230dee77c44dca4ddccd98dc5f9651b1ba36c1e921a47f7e190fa639423fb0f2ebb747c8e5c79d0f7684e7db432397da080d8f WHIRLPOOL 5585de613f258ad3a4a99277111fdd267eae4585bffb1e4cefaa3e51e2077205e819a16f61a328255a59c88f704043e57ec89b9c98b9b8742d428740267c8285
+MISC ChangeLog 5735 SHA256 f447a70b9a44dee1efb7e8163e9bc9e65c5761187b8a940aea3b844e5d28eafe SHA512 33d4858dba3c519b02803f560ee6f6f2d2b96d6bf04580c41d7ef6ca9fc8a44f1d26fb0a027917ce0accf7b0d7742857516a25adf466a6029d375ea77610e1f6 WHIRLPOOL f38af7653d8204b9d601eee1d62090996494c0f2088d2b19bf93e0a3b6a28c6dcfb6b61bf25aa670e37ec4a57ff43657b66029f20e5513fb83a1392256d909b4
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJTG0lTAAoJEJWyH81tNOV9vGgIAIWg/xxMN43mKQbOozlLl5wj
-twuBaVC5KqdF2NqR3Y1mmIwwCYyzK6objNuF5uW0UXh21NLKtLuOCF8bEGLMpFof
-hgfUXy219tiIXbFEX7IaHzYFseP0m1vl0J4pBO1BRMhRXeG9TH1kbCpfe0UsF8Km
-c7VQKsbxB4LcH/TNMpV2o8sB1pFBq8YsgT7MALOqQYu/JhQtJAGKh7BSEuilE0Qn
-XhPGurfjkkcJZAY1gijM6lRe43rMq8w3Rb0PWjQ7yVt5FsLZVSI/qo42dqbt/Lqo
-nO6oZ5weQ5XQNYwaaeQ5JM9/VvNt2d5kFaLiLX4SvzpoBeJpyxQ3x4suvEy8sK8=
-=TCzu
+iQJ8BAEBCABmBQJVnuMxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kDKkP/2rmS4MEb7VZkveSVdn4amiO
+A2nVV5OT3aLOOHCrzbOdihEstoQ3UVRRvTJ/EXYQtmL0CrPFAFpEmZCPu6Qqfa4y
+EVukD4KB4I9xdVTqxrqyZoBamSCJiNbvZVVbpwMCpx2eV8+nw14rf50pyyMlMdle
+b2/moBGuBOqBOSgcjbuSmyAtQHR0M3xKVfPCJi6lTOXTe0I/PaBh7xkBwr94fdkx
+AqtdHpduiuH1Cbk22nXUA1E0uZQf8+4HmaiCz8vKge5NApsHVDqzn/iv7sM+QmBe
+VFX65+Ong1+f6R7PxJVS9h7NH76gHLj1NxQz9yyd4mRI7n9apIR6J3fmgHGGNCBc
+Uv0xDma+bfQ6OdevC72xKFZ5ssmi7CpJcGdvEVDbn8CR4uz5n+avtxl3RIZCRZJW
++sHRi2kSoaSyop+S9Yr2I0D2jQOFMi0z1Zue/kI1C1elJ0cUeEMObsRQCPAmIBT6
+OWQ7ai2D6f01xzToS1XOl+KOK8LC1oQI4p7KiIQoMVfth6o9EccrwdyI9ytAZgHA
+7KXqzcnpeSGDqLMPxEPlNM5S9la2Y93t/WzGgiJ36WyJ566ndxFsOgx+2xt6rNr0
+8M7ABJ6hxrudyemVqiCdRwTkCGvFy6FsqvgbEMmnciO3MEBEeFil6lwd8WqBW1wQ
+JuEKPdBiqT5k53L0gTdZ
+=LDTf
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.8.2.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.8.2.ebuild
deleted file mode 100644
index cd36869ab3c3..000000000000
--- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.8.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-resolver/ant-apache-resolver-1.8.2.ebuild,v 1.3 2012/05/25 11:26:25 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME="xml-commons-resolver"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/xml-commons-resolver-1.2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.8.4.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.8.4.ebuild
deleted file mode 100644
index 1295563470f7..000000000000
--- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.8.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-resolver/ant-apache-resolver-1.8.4.ebuild,v 1.5 2012/12/05 17:29:02 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME="xml-commons-resolver"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/xml-commons-resolver-1.2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.1.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.1.ebuild
deleted file mode 100644
index cb8fc79bd714..000000000000
--- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.1.ebuild,v 1.1 2013/07/05 11:17:38 tomwij Exp $
-
-EAPI="5"
-
-ANT_TASK_DEPNAME="xml-commons-resolver"
-
-inherit ant-tasks
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd \
-	~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/ChangeLog b/dev-java/ant-apache-xalan2/ChangeLog
index a16378ef0126..7d1a1b0b26d1 100644
--- a/dev-java/ant-apache-xalan2/ChangeLog
+++ b/dev-java/ant-apache-xalan2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-apache-xalan2
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-xalan2/ChangeLog,v 1.26 2014/03/08 17:24:18 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-xalan2/ChangeLog,v 1.27 2015/07/09 21:10:21 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org>
+  -ant-apache-xalan2-1.8.2.ebuild, -ant-apache-xalan2-1.8.4.ebuild,
+  -ant-apache-xalan2-1.9.1.ebuild:
+  Remove old versions.
 
   08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -ant-apache-xalan2-1.8.0.ebuild,
   -ant-apache-xalan2-1.8.1.ebuild:
diff --git a/dev-java/ant-apache-xalan2/Manifest b/dev-java/ant-apache-xalan2/Manifest
index 3d22342d12be..8aa0f11133fb 100644
--- a/dev-java/ant-apache-xalan2/Manifest
+++ b/dev-java/ant-apache-xalan2/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-apache-xalan2-1.8.2.ebuild 579 SHA256 2c6d4e0dd5458ace957938ad5ed67d4df76362ce5fbc70ed3f95c4c30096c9c5 SHA512 38accf4eeedeb90da57bea5144559e84b4dacf7fc5bac6f7e6ea9408bfa78724f5d443d39c3078db323a2997540e214a00fa9059dea42e227416c4bfd7008d24 WHIRLPOOL 4eb1fb1515076c7c939fae1d9b9bb0f37cbc20bbce9d85bafc36bd3044b169a09d0838155e4b2e93004248880b4ddbe7d01ff44eba0680b38b9594ec6540270c
-EBUILD ant-apache-xalan2-1.8.4.ebuild 577 SHA256 0dae9ea40dd4fcead6339fcef40fe96719622b5536394e28d750249e6800dba1 SHA512 e5007587f67739b7d70743c076930b4e0a008c4d65789eeda77d9e3709ec1732c3cc4f8e6a09a8345d3c78b58cebbb4d2f7b4d55fa6f6fd4eb8ec3ad0c574c78 WHIRLPOOL 2766b8d599c58e9c6e07b8b06c68d58edc928ee8cf421483eac44ca0d3bb5566136e03ebb0b72c79ae237d154dfb6d3d88f0329a9e1e3fd8937122006d8e99e4
-EBUILD ant-apache-xalan2-1.9.1.ebuild 582 SHA256 7a9355c5ce2a0bb7fc0108c1ede0e3452907c3564726996f18c579559d869f11 SHA512 82cc4959f6f0502f7a5c27daa4c9eb2a764254a188022f8de0b28addd20d8263e9cfb0784d6e0a0c3d27623c6b594f9d293f0d5462e3ae928467c14cf24f0f52 WHIRLPOOL 13a238e365931bc7c52610bfaef0ac4e7a228c8e481223a65d196111a9400e8917ac15fa2cddccb544eef63915f567102bfc2971c9d31f263c6ff276306dfd11
 EBUILD ant-apache-xalan2-1.9.2.ebuild 569 SHA256 36a7c0c7398df4a7f8178d9959b00a2b4060022aaa94c536823d7803c661e4db SHA512 11dd1f75984878b31cab24fa8ed57abb821f4fab4c2709f9081e05f7c88ee5d32c6eec0f322b3363f533b1d733964a1186e967947abab3b488a57a4429e570ef WHIRLPOOL 10920900c13b7fbae89c2d998c9ba401ac5e3f71fd380c1273c54b5a5b15c13620b1eda01d82768b6ccbbe2fb22f73a20ad4c0fb9bb0998de829ff1e7a8ce2f8
-MISC ChangeLog 3569 SHA256 a98abe1f702c701886fbe12c036218661952bd587782e572b131de97308c7b61 SHA512 4552330228c40a4e490ae5814e97f5b2263cce0d30943034523eca4520f1094b2db661d402715488257bb704804884ac8d9843fddd144237a322396aaedf205a WHIRLPOOL cc02e0188f7f360840490cb3cb1fd911b0ca27c4b974e93dbb69b5dd4d765a014982cd1d4c6f410ea60345219c51527025fc30bce6ef51925af1cc10a050dc0c
+MISC ChangeLog 3745 SHA256 75f03cf57321c7884515645dcec5e02c0ab6e93ba41085bb146e1b9a909ed7bc SHA512 323f18db25c204c675c09d093d3bae0d2f262294e8c59c8a50e90be11891c99aa0e4c8fb267b08f701e3d96c9052cb4b2816f12a62fa590f27197e0578f70ae8 WHIRLPOOL 06454591c80f3e3ff4ce046133d26d0cd92519b16bc8ed42d0b7d248ddb0da996099bb9048c710fc591793bcae0885d3b533e45ac8d2077cd148a11a9bf59021
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJTG1IiAAoJEJWyH81tNOV9aE8H/1SFlBBG3QZZT498EnJez05Q
-w1xZaeKR9tYoZuDvDIx+JqjOROWk3KrvjupAo9ssKDXHn49Bz0L9MzcN9jfWPqfZ
-p8rfKc4uhTFhwH20bgNTK69d0L5bSk5K2Fu/Po8tRL8BUBk35o9hKILN8hLN0ffG
-Nu8gjZgw9IxWSvv6XRyx1crOd+x/69xVDyTPtMlSNXwd3Obs9OY5efhxhbkVlFv3
-zBDJ+dmM8Scoy9Etyr7VLXgEa+xhAyBrLW8QR0m+viMV+BzSxkG4d4WT5X4fhtTp
-24rv5PgD0GZNsJiuhHsqh7/R4YyaP/yJY/HZIJYPF90A25CqwO2hVORAwWqIJ8E=
-=VF0H
+iQJ8BAEBCABmBQJVnuM+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3k95sP/i6CZZ1r/+y+A8KcgAPyQc5b
+C+WoLBxsO0tWMNYXm55N5rZ4w0inTyUtvGFQIlKWycgCuDNx51tCE5pd4Pj9z1do
+zEfqdnQhEgeeQdc6uWJk/9CwCHHRFDnr+41SeKEz1iKGCOTw+qOBhicojYI2v5aq
+VS5GMRh4dWQJDCHY3OYxQ9PtEeM1JKCxKBgjAXwhnZNMa5Bna58NYe+X64k0E73h
+GUm4bz5ziJA9NkA0W6RVgTF/nmhZe4uc8f73Z86MejVhjUxHlAIJca1oEF+dtCTC
++vCKSInWXnLxf1dYMzrkr1q8jzFN5NyT+XB4KQbOW7rIUaiMnHNFCl8QraNKhO6b
+8NoeKwv4udiC0JA3mDveG+snW6nP6zqppz0Kh/rMBL1pTsDnZsBe/zpVfyXGPFC1
+UOl8+Hg4J8G7c5DdOLZ5KemDBIMuBLdv1sXO5cSlcvT7Bs1X3DKd/PsgzOSd5YI4
+H3Ol6lnhheInQNdGoFWpROPXkIodDIhcbRVoO8KWvl3sPxXs2kPNujyYY0iIYbT5
+pbXlcN/oxjfYfXaJM17Fei+SsAHa3NaMb8qkB/Zz1auh8hAHrkXxD57ClDR4bLI0
+jtuODX6H5/ssS5W46r4pT5WDv0Sc5k30JlC3+6pJ6qhQ+z/xp6jodSGioYUOY2Dy
+J+i8AmyBHWCFUhTujrrI
+=2muU
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.2.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.2.ebuild
deleted file mode 100644
index cad25c0a0b3e..000000000000
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.2.ebuild,v 1.4 2012/05/25 11:23:13 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME="xalan"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-java/xalan"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	ant-tasks_src_unpack all
-}
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.4.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.4.ebuild
deleted file mode 100644
index 01ab8424128b..000000000000
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.8.4.ebuild,v 1.5 2012/12/05 17:29:24 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME="xalan"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-java/xalan"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	ant-tasks_src_unpack all
-}
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.1.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.1.ebuild
deleted file mode 100644
index c6fce9ded4db..000000000000
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.1.ebuild,v 1.1 2013/07/05 11:19:57 tomwij Exp $
-
-EAPI="5"
-
-ANT_TASK_DEPNAME="xalan"
-
-inherit ant-tasks
-
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd \
-	~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris \
-	~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="dev-java/xalan"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	ant-tasks_src_unpack all
-}
diff --git a/dev-java/ant-commons-logging/ChangeLog b/dev-java/ant-commons-logging/ChangeLog
index 00c88597df96..de85bb55bfd9 100644
--- a/dev-java/ant-commons-logging/ChangeLog
+++ b/dev-java/ant-commons-logging/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-commons-logging
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-logging/ChangeLog,v 1.41 2014/03/08 17:26:42 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-logging/ChangeLog,v 1.42 2015/07/09 21:10:32 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org>
+  -ant-commons-logging-1.8.2.ebuild, -ant-commons-logging-1.8.4.ebuild,
+  -ant-commons-logging-1.9.1.ebuild:
+  Remove old versions.
 
   08 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
   -ant-commons-logging-1.7.1.ebuild, -ant-commons-logging-1.8.0.ebuild,
diff --git a/dev-java/ant-commons-logging/Manifest b/dev-java/ant-commons-logging/Manifest
index fb60fb66c45a..132fd712e35a 100644
--- a/dev-java/ant-commons-logging/Manifest
+++ b/dev-java/ant-commons-logging/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-commons-logging-1.8.2.ebuild 530 SHA256 6ab02f14fb5a31e87fed5466eb60affe9d32bc3ac5f2fbc02743487344f9548b SHA512 31876f42cfe31ac3a2b6a09742dfa6034f47735f4de0e7fbb4126efc531d0a32ac776d91f94de2d5b5d1259f4c2425b14ec21e214078d3f4a6d41b6fadb1f2b4 WHIRLPOOL f0d64daf79695c3d801d3805d0ea1a5f28a40d31ba1462d671ab08de2d02cea18c35efc64cf3f25d4685579d6025997ea0ffd9b80838ff23b65ef873f9176d86
-EBUILD ant-commons-logging-1.8.4.ebuild 528 SHA256 9adca4253e9280a246a336e9e4db548a69398aeee1056b22d8562c3a393c7db9 SHA512 35dc6a4190d9ab723b8a4eb479cd00041a5f01310e2079c0d0e8751a0e684ce24fa196f40d897c215cbacab3c4e7ec8c852e6a5f2b2776c32f01a404d462ee89 WHIRLPOOL ee5fd4d7c85bb9aef0db795423d0144f7286b21a16589ab58578f1ad7b9bce4950764f1387a17bbbcb9600b8685389a2cc9ac9b975880d2fb9189fb7ccd2d83e
-EBUILD ant-commons-logging-1.9.1.ebuild 533 SHA256 9008e2fab464fb8182c4ea451a4d2b02d3d18d64c908af01531b2a59747505ea SHA512 433938d64c5df258e7e225c828258e8e48ba4d3f4716aa4219ae4d20b9526b24f094544fae10a4a23dfd9bf42146cade379c5c27a43efc8fafe23cfe913b09c6 WHIRLPOOL 69e5118ff6c5327b518bbe2af1649d17c2d1b18d3b78e568b0ab9ff68932013a4b36bb571ad7799d93a0c318a1402c1e120fc7e3400f80598bfc33c294db3560
 EBUILD ant-commons-logging-1.9.2.ebuild 520 SHA256 60a03227f9391608555a6a7792d3115d12ed1a41d181d6d05d8becbb31a6efd5 SHA512 3e33ad52d97fb76b281654607c01c41200517a0906b6e5fb8a50955929864b32cc6d0f38a9694c7f12ccac775d9ce8f0e30ceb0473dcb8cb975d9a690382a2e2 WHIRLPOOL 2e0c260068bbfb18a866b4e50d06f3874053c579fddd23f3b56670ff27efd70e1089495476af92a8e1c62b6bb2615e17e1ae89be3d8e648a03b00f9b6e7698c4
-MISC ChangeLog 5553 SHA256 e546e97e0e0d8f09a8bd39befa6fa136f74cb517c4e62c726ba744cb4e4202ba SHA512 8935463d93fb7ea6050d10c8d4a5f2a10d218bb8e2a7c0ccaad382b432b2f5b13b060cfc2f08613f2662f11733252da165c26f1dbb73767729e930c75d5ab666 WHIRLPOOL 04848e4af287a883243516fa1669cde9cc497a72c63b283a9342b283aa5e54cf97137bcf6882f0514ef725870f9454a9650762412c8f6362cb7baf108ede61c5
+MISC ChangeLog 5735 SHA256 3452303966c5a95a8e6b97c8b16a83a0d229fedabf2cfcfa6a2e79b3fa7204d1 SHA512 80afd108c27ea29d0a0350d614c62c1b863061eae937b486d4d2bcdd3d03ef4a0ea0e51f4c97c70c3e34612322ea110d49ea484f3d7eeea8eb1782cece5ab106 WHIRLPOOL 327ce58c373f9e16ed43329ead3716e2d3a3c244b4acc6b0830617ca914ab3cbe12af291ac95c24661d49cd0702e15bf3b65df7a103401f40f610f8977ad1d84
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJTG1KyAAoJEJWyH81tNOV93JAH/2v8HPeCUwCSEyel5ipLx8Kz
-Y6XeYZd/qP7XP+5eVb79M24QksoMmYmvtbjEtXMzGYs2IXORgkEmtQDZPhfRoGve
-lCsDWP/gAvg6vdz9Zrutjbr/hBQYixRoZsIkp3Oz5GHAMytLJmC8i8ehr2k6dDfU
-QttBfBMhbV4CDhQzOqKgX3QleYT/aDdvFcvk0k2syK98GZqp83pEzDtrwA0+xsPs
-uq6TdrV6O+czCMBCU3PqBzq1dII3YHhU+Gin49YYv8eCfKuOjALxjoo58oeJuvGc
-Rg0UV9v9E1JjQ/naQDoLOvZILDVM+7RjSNxVyKRRX+ZmZHWnziYXQdlqPkS3M7M=
-=1gY0
+iQJ8BAEBCABmBQJVnuNJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3ktsoQAKDfOuw1VD+42STV93yNsNlu
+jSFtbRqJmi0l2sg7pf1rAKBYrE+9gGSGhVaetXV5p64zUtHc/Ftr4JkYkOUAUntH
+4Lg6oIq3hNGuVEF0CjH4PR6l1mFQENov8vyaM1FYaLdU5zYMYgJRQCzPCdN9/0lV
+rHEZPZJqJgUF12Hl2wfcgUFPdQq0bXNQ6W7ylFd8BTH8ptx4hiDUHDhSz49B+nvM
+eCqThBtOuwxT9luiJz2vpASLRKXTrLA/tY/c1DspMZrblqDsPYds6WfLzligMahT
+Lj+2NZcyHepKxTryS9ODVWSG3+bKwXqMGZ0L1oYxWQabMJg+xIATHHIGIbRNmx7/
+F/qnKGDkVZPlIdJJAVRZUKZotcFwUUE3FAKG31u/Nlv0UP0aMVNIJdF/0yw0osrV
+lR2E8quGACCjFi3E5c8hAy5tXAnv666pDECh2tQc/1ay0N8kRLZMKbykLP7+L9FX
+biZLiFtUm2ShfozyatZB0UBdbWIOY8MUFViZHg3PlvQzYoXTez5QpwXtP4ag+Vj0
+OLyn9YEurQx+IBtJS3gzXUW8WUfpMAlczLyeYfcR0fpek55HFf0Ans+Ex6k9iIQI
+Y/DsFNLXejNASt/BMdRtgbdbl9f10NN/yA1QOuCF+twQ9bVo3dbjZnu2eVbYCCAW
+nV4BIluvWxq3H8h1WeUc
+=oyos
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.8.2.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.8.2.ebuild
deleted file mode 100644
index 27a20d231fa6..000000000000
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.8.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-logging/ant-commons-logging-1.8.2.ebuild,v 1.3 2012/05/25 11:26:52 ago Exp $
-
-EAPI="4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.8.4.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.8.4.ebuild
deleted file mode 100644
index 2662a7b367d0..000000000000
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.8.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-logging/ant-commons-logging-1.8.4.ebuild,v 1.5 2012/12/05 17:29:43 ago Exp $
-
-EAPI="4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.9.1.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.9.1.ebuild
deleted file mode 100644
index 919b36f11a6a..000000000000
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.9.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-logging/ant-commons-logging-1.9.1.ebuild,v 1.1 2013/07/05 12:10:49 tomwij Exp $
-
-EAPI="5"
-
-inherit ant-tasks
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd \
-	~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/ChangeLog b/dev-java/ant-commons-net/ChangeLog
index d4e5480c2128..97e057af1939 100644
--- a/dev-java/ant-commons-net/ChangeLog
+++ b/dev-java/ant-commons-net/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-commons-net
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-net/ChangeLog,v 1.41 2014/03/08 17:11:17 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-net/ChangeLog,v 1.42 2015/07/09 21:10:43 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org> -ant-commons-net-1.8.2.ebuild,
+  -ant-commons-net-1.8.4.ebuild, -ant-commons-net-1.9.1.ebuild:
+  Remove old versions.
 
   08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -ant-commons-net-1.7.1.ebuild,
   -ant-commons-net-1.8.0.ebuild, -ant-commons-net-1.8.1.ebuild:
diff --git a/dev-java/ant-commons-net/Manifest b/dev-java/ant-commons-net/Manifest
index 9a1d6b173d69..20ddc46dce42 100644
--- a/dev-java/ant-commons-net/Manifest
+++ b/dev-java/ant-commons-net/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-commons-net-1.8.2.ebuild 518 SHA256 4dac1c8ed113b18b3d8f3509c54a07b6f66e5b15e1cb0074eb9705ec2554bcd1 SHA512 f35bf7b7027ebf179a41d1033212b1019e54681fe51a11b6eaa32e3b199b94d43aa05aa41d86d792214e5494007f139451e4aab9d62b61f07f3484b1f4b54912 WHIRLPOOL 9a76015c326fc250b16e3aca769da4590e6aeb9250d912832de1e4bea9410509d123984e75015605d66617fa268a103b63e4b85dd9a21d603da48348260c3058
-EBUILD ant-commons-net-1.8.4.ebuild 516 SHA256 f14bef197695d213c94a6c8481a4e73b54068b58589b2ddf4945964f268fb706 SHA512 da5d4eb12b6e817ea41c23496eeaee4b4266dacff941d4a21ea1ae15ff9cd1196d71c2e0ddc1b1281abe9bbaa11076cb75c7c6c8bfc6cab9b4eb3ccc472e65e5 WHIRLPOOL 802984d8f998f3f3934faf526de5058a61d0a4595d63ee58011de616c752ecba8f5762315fd36b9b497416cfd467b6e85eb623bba9d0718ed930a846ef51e242
-EBUILD ant-commons-net-1.9.1.ebuild 521 SHA256 9debb32ac61c7a3dd8abfa65c403fc0d979726404449ac85cab676975b0800c9 SHA512 920e2be11829876950f027a51779dda6c0ec9e27250a278c6d447707f0a5795182630e8fd9f98c375390ad5e3832685afb2e03d7a7f4192db40702f2cea529ef WHIRLPOOL 94747290bda04a1b11a64534a6c56c6a912117006e3f94423a0ae186de51b3a4d6dffb60da37ba865da91e02cf7ceb77fbd2edce155a66c6439e6bc413a4cd01
 EBUILD ant-commons-net-1.9.2.ebuild 508 SHA256 e01d6ebc44c7c640d1bd35894e504add621d234a368c5f7e8e3fb8fea2bba51d SHA512 9c8a07004d843cc5c62a320d15d5c385a2723370cce6df2aca0dbf180e314c39d80352171ecdcf3c501495a89a8ba6ab7ca213ff0899343ff44073e30affdc20 WHIRLPOOL 95a62c48e33fefe77f181071776f4bccf29515a73ad136cf39b2091d56a06fa0f464fbe143acc58563868b675aae8524ec0ba19c5153c7cf69ce4f8e1436bf7d
-MISC ChangeLog 5239 SHA256 9e6b295aa2b24589230f429261c73734b6b72419aae377c742500e74cbe8a951 SHA512 f781fcf8804c35b89cf52795b42e0af065561901f03d0d8c394b289fb7e56829b915e1d23da3dc13de98e31c25aae436994485ea772f741d9ac28c1a0ce08e64 WHIRLPOOL d60f0558428dfa4a27669e88648b1e1478953d52009551deaf5ea366711479c5f8eecb440fa41b31b69d8f2791ec76edcd08b242dd8c1125748694a221c01583
+MISC ChangeLog 5407 SHA256 2357dd4ffc85dc08739742440d8dd9e035f1ec1faabbb6f572336a5ef34bb06f SHA512 674036e032f43f8cd35a7287a46c4df363c667214819bb19925ba3fd6a4a49584eccc95dc01ced0612c57f5e8cc97eba1d5d57309a917e634a129789c4698f42 WHIRLPOOL 257370b39b6ee5211a150aae88dddd3a355de7000a5d44d248aa56db840dffa490966cb09daf590da088244c770b7fba17a02013f66f0f00ac3610c8cfa14f3a
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJTG08UAAoJEJWyH81tNOV9Bt8IAMaMhHsfCzYUMyTaHM4kKen9
-5JFfYAIuR8e9NWApcG5wLViZQcSGGcg/Dywdzj+Z7Nt7odjBzKcokuNt0aUVWA/b
-8rPteG71D9ZWE0DZJCLN7NQOW39Vs5w1z32dhbU6xWjg4szPaIJzNrysNLbmNyNM
-FGR0MEC7kYkMubhj6A41Lot9WufYQriuw/+8k0dI8bRKj2BkocaIensff6j2WIr1
-/tYmTibY95lphq2d/Isueg76u9S7AwNp8fS+Bmha+XhbqgTAnlmDQUmyla7VVsdd
-hzAAJ9To8wUKD7WCbLs30sStgCVasnRu2hISzCNyMiITcKbUlrJ+T6dHGftw/uA=
-=Lk3U
+iQJ8BAEBCABmBQJVnuNUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3khvMP/iULgRZKDkL/JjrVwulohTMo
+RXk3lRgPy2W2+s116z4W6CL5EwaK161iptYFK+IApSlEY7igFP+98IqqHoD5Ol89
+Pc3dAb5xzN6PUivVwB4OURmlWER0HnuazdZ1r98zwRKNwh7T5GGM8FSMorFWh3dw
+vdHYjpsnX/2vc2wX2tysjpxBz5kf7qoAiOEvnDjh0GN3lYAV3Wnzz+2CKznDPv4h
+UaDaalA5uhmGlYHaO3YK90++3THvNevngzYv/wV2YaytBuUzu+ZL/+eW3JVdq8Bs
+jqbAh2vxsMQS3fd7SarpIEXZniP0f8k1kRFWoMS0Lk/6eMygx1myM0RQtnE7WXxW
+pUK65XR8KkUYyjUcSvZoECI9nInGOazPUss99sExPERi68fKlJgpk3DynRx+ev4S
+GptBeDiP0qF5mV14+KRslQjfD7bKBwbI4g2PqBln6rU93Ie41JY/8sV5oeHqtln8
+zk2zL6AsF/PlnqcpacajFcbSUe2OA30W4F6L+BhwIdYaqPjYqLvN5PUmbI07Hl6s
+hoIRHb0/k8OjobXCtE95aZxf/AUZfEAq0sq0xjMXipo5p/8hED2wCmXny6avchSD
+box18lRdfF8+EKCa9XaSaEcWKabmhq6N8si6glCbIqjOQW38GTrlrL5u1iLW8Y4+
+2y1ZZPo8/Kx3PUsVfeih
+=qzfF
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.8.2.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.8.2.ebuild
deleted file mode 100644
index 2182d96444ce..000000000000
--- a/dev-java/ant-commons-net/ant-commons-net-1.8.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-net/ant-commons-net-1.8.2.ebuild,v 1.3 2012/05/25 11:27:19 ago Exp $
-
-EAPI="4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/commons-net-1.4.1-r1:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.8.4.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.8.4.ebuild
deleted file mode 100644
index a10c9ff34a64..000000000000
--- a/dev-java/ant-commons-net/ant-commons-net-1.8.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-net/ant-commons-net-1.8.4.ebuild,v 1.5 2012/12/05 17:30:02 ago Exp $
-
-EAPI="4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/commons-net-1.4.1-r1:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.9.1.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.9.1.ebuild
deleted file mode 100644
index a63ecb87b65a..000000000000
--- a/dev-java/ant-commons-net/ant-commons-net-1.9.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-commons-net/ant-commons-net-1.9.1.ebuild,v 1.1 2013/07/05 12:12:50 tomwij Exp $
-
-EAPI="5"
-
-inherit ant-tasks
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd \
-	~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/ChangeLog b/dev-java/ant-core/ChangeLog
index 4bc18a1ad1e2..7dbd9e1129af 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-core
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.135 2015/05/23 22:48:44 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.136 2015/07/09 21:10:56 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org> -ant-core-1.7.1-r4.ebuild,
+  -ant-core-1.7.1-r5.ebuild, -ant-core-1.8.0-r1.ebuild,
+  -ant-core-1.8.0-r2.ebuild, -ant-core-1.8.1.ebuild, -ant-core-1.8.2.ebuild,
+  -ant-core-1.8.4-r1.ebuild, -ant-core-1.8.4.ebuild, -ant-core-1.9.1.ebuild:
+  Remove old versions.
 
   23 May 2015; James Le Cuirot <chewi@gentoo.org> ant-core-1.9.2.ebuild:
   Allow building with gcj-jdk for bootstrapping icedtea. This used to be implied
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index d33d8bbe91b4..dbe6f58cfab9 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,51 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ant-1.7.1-gentoo-r1.tar.bz2 17259 SHA256 f0a395c56445a794e1715ea91429596b785310f0ad8c055d21438c78338fd13c SHA512 d7ee77ec5f1a0f6ca0a6dffebb5a556a8731f025cbb1d81ce11da5d99ec513bb8f2570cef78f07fbfcfaaa73172e5a5c379d6db07f85f5c12e7472a665919d12 WHIRLPOOL a3b9d8008fe1d7781bfd057601c46fcfcc99001abb284312c21f2ef4deb0bfeb722e900090544ad9a91c30bf747090d08de17c80a4c4a233e71cddec751fb858
-DIST ant-1.7.1-gentoo-r2.tar.bz2 19360 SHA256 21f5b949ca2f177f8dbbe72419a70ddc017c4abbfea67af4a829e37c0e93f03c SHA512 3e9e42b6ee4155f46ca865a772b3f4de30882b2a8966a1e54f5d5be1beff517a9ec95d08da9454d232968261095288ef93e3ee55a8bc1421b920e0cfca2aa5ae WHIRLPOOL e3e0df0369c4aa94726ab1a32147f3abc2cc64250bf543c3f70231457a2b20e4475fda446906ac54d7dea239063ba5b48da515a47e6c0f6cfde20e422091a7ea
-DIST ant-1.8.0-gentoo-r1.tar.bz2 15287 SHA256 772136465912518e417e237bea62c331ad71c6b92a9f95000fbc77a1a623ffb9 SHA512 f674efc7d5b98330a27885d1951c5dc3ecdaeec891f515d9dc7a757fc260adbd46d0da9aeb0b4ad248059a5dc9dab95e209129b25e9e37a798caccc9947c4ebd WHIRLPOOL 1ac28eb1a85c3a73d101a5c60ac341b6ac7defc744af760de398e52597842b779b4febd72498eb594d1f3b8d599da44ac99e32fa641cc9df61bba58eb9d6b551
-DIST ant-1.8.0-gentoo-r2.tar.bz2 15144 SHA256 4e20d8a99060fc094c47fed13ddf3cb7d6e8c118d2acd3a7c9a7d7e2456336ac SHA512 0831b42661eb0047cae161518d76b3e045189a42d999554bb5ba4db0c2139f5587571869974d85c5c4a34737389d102631ffc42a7c43303d5085a3575ebda0b4 WHIRLPOOL 9c4c2327d39e942bd7f623c76a9555e63708ef70d65ebf5b3874084964547228f0eb1248c0233d22ae42dc2c9ef6405059bf76f55af82b42be83e826f712f39c
-DIST ant-1.8.1-gentoo.tar.bz2 14979 SHA256 1a2230ba44b1eadc4ca3367b56bb287271d76ade9c828a4ac64556f0f4d2e340 SHA512 35943d111f32f0c88146892da390112a1d6133ad5044b89b8302a543721753b584f5069f7f082f011dc4a3d1feb8d400a955b83a2dae9c9d4012de91584c4f0b WHIRLPOOL 6752b3647dfa30133d6c7de871082f9f8232b2ca90a702093c7b42bd7b49117d5fe26ffdab9ae6c14d166eb9c0fa26a15c821f947de2c3218b17759fd9ea5668
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.8.4-r1-gentoo.tar.bz2 14921 SHA256 a0a20763da2ebae5619c57c2e87a7d904b431c64a1e6d37ec0a59efe2ab042c7 SHA512 878564c7193767a84519a2a60d9f690157deedcc0a47d83e8640dc805aa0b45bf0bbdf34d9bbc74b06c6f39ba382a2fa62bd5f483c6235dce21dc447aaed6176 WHIRLPOOL d0d80d40542ae3d7e43d5e006205f055acfc973ee155726b29a4df27fee8badc7c8f9d9c151058ba045e3b74f2b8a70ce487d8ea50756bd2dcb3d8425bb13aac
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.7.1-src.tar.bz2 6979386 SHA256 4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6 SHA512 bb627d0c5d491d5505a71c5ef1cc6b748c6eab6b94b44fd582557585bd0472d0b110d3709a8a355c2480b0c000e57327925a467afbe50cd786f1898ad4b67cfc WHIRLPOOL e463dfe8e9893a487e29f58f366f2a531dd3b8c1bde1416566235b59845539e4023be21a55e7043770ce789c12e4a37d57f1cc4d119059515ea69fceae04a962
-DIST apache-ant-1.8.0-src.tar.bz2 7122981 SHA256 b1da647175784c9e0113b8e76643c89123396b5f1d0ad54417390a92e02e6786 SHA512 063cc180f02042670dec344376164620f9cf3b47411dd7f710ddf0df8c6c00901bef0a6a30dda6a6931d1e650a6dd1faf810efae6029b46dfb9fa7af13f7b6bf WHIRLPOOL 741a22d5294d3780b9c06d2760fe8dde7e011d38b0051abf9903f35339a79cfb337174bb1b921188445f6bce75e280f5448a8150831fb3ba103b5763284bddb4
-DIST apache-ant-1.8.1-src.tar.bz2 5861907 SHA256 02b24c7354f19879e136c8258d75672ec9a7379622aeaea9f7a485210b193700 SHA512 4afd0d24929fc840659b2f7860dbb61976dd5d6b9c4627e68aa34182012366ab2726d20d77b0f0b793cb1b7cbfb6fc8b3511cd412ab7cf5d2c2c69839b44ac93 WHIRLPOOL a7f1836000e1892793a4fbf2fc7dc8ed89ea6790ccfe39cfabb00d727470d8f5a89a84590466d22f6e327f10d7b25cceae0880c5fc8e04b5ecc21cc4813b343f
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-core-1.7.1-r4.ebuild 2909 SHA256 f7b3669a647d1c5a97a3bff0d3d3c79b3cb6d4b06cbba5f2ddee16b19cc7a1b8 SHA512 fff0743ed52ece42bc3bb720e0d552a2d9f37cc7848ba030de7fdaacfcf87c2f6a130ea37623fb29992ea5cfadd5cf13e532daa9e858ccac991e2431ee49e7dd WHIRLPOOL 4cb370deeedf6fd29f3bd52048dd0da65153d0d0fdfc94b9e584567c7b6874db2a7227a826b0b800eae80e2093b555034da8418aa06f68ba0ccd9a661bd65101
-EBUILD ant-core-1.7.1-r5.ebuild 3050 SHA256 d419536dde4d6718f93e08d2fce886ac9fc356bc6d74df085a1f70d4eff95d2b SHA512 7273c14b60d2b03abdc0fca8d0ca7d3e74f9ef311ef21c296f64dc00d918efca8def602881c18a2078a6f0a23b4d2072ae23194ac2520166ded157bb2787beb8 WHIRLPOOL 4d606f6dd4fa97daa52f433e312e9e2e605e2b463859c82df5501fed9c18783f4db596810986d2db390f668574e7dc5a1470f5481a17f095552da0cc832668d9
-EBUILD ant-core-1.8.0-r1.ebuild 3052 SHA256 350e2db9d24166b464b29d672214916f8c4a2e8fc3fb6f58c12eab7e38a46d0a SHA512 66fa562cfc0063868a1054a1d2276b5a9e369e9b4407cda1b65a084995ad489d3301b2a22bd518503718fd03eea16d4c5cf760c00605d20405b594224581aef8 WHIRLPOOL 10d261e570346b3cc120327ea843b1fe2ec5abb84050f124ed6b1d707ac8ef5fe580c4c91d93f9e9c46e02e589621fccb2dd5c508481b96fa28c5e54934086f8
-EBUILD ant-core-1.8.0-r2.ebuild 3052 SHA256 74cd1a790e27c18429c360d8b51225e010f04bf2b17d58e4e3f6be3d06436fe9 SHA512 8d3845b9b2d7413949a42df690eb2f2e581942ca1c16f64a449b75d23eee6d0cdf9cd026ca2d81c70b8666620d0d922fef5cd4a598eec9befe85085176df3b4f WHIRLPOOL 4ba65a5aee6d7adc1765eba7d36efb17f8c1b4e4103d4d9c2a9a384bc6f213672ac5707789c6a94d81683206362cb89aba17080066406defafaa89bdc11427ed
-EBUILD ant-core-1.8.1.ebuild 3016 SHA256 324bd68d03793d27046135389f4705fd448ad8031d2de8f6682949cee270ff39 SHA512 f98671272a62718e55f0e22e5246f36eb42ce2cb01c22b3282206c8443cbe48fb70605732b2ef9eb5f1d8b814736523f505954f3ea8a5d7e96356dda73f39349 WHIRLPOOL dea633a3264797c0b87260b9cf7c6ed7fe9861d81681cddfd8d9f65994e0f1a8e0729061aa9cd53e2c32bab9edf569e67d6d7f42e5608d3b889f1c8db441b581
-EBUILD ant-core-1.8.2.ebuild 3254 SHA256 dd2da4b3294ed4aeb086d8ea8b77443cb48477c742912948fc19afdd7f6cd82c SHA512 4766dd393f3512845762791efefb9e80ede238b9d118ca132e0d45442d4d368596c6a153a337cb5a68411ac95c165623c9af43870c231f4fda865e93f81ba9b6 WHIRLPOOL e403bfa71d12bee40fcc80d8d1298a17875a06aba8c787cdbe489e65051af10945c5be2bc5250eb930799dd0e50dc3420ebb6c90c71f6a662e6a0c225a62fd0f
-EBUILD ant-core-1.8.4-r1.ebuild 3265 SHA256 03edf34aba2cb69fce7fd090c31e6a9747a5069b5c3102edcd62402a8f2d16cc SHA512 d96b32406b4d3c971e7954431aa75215cf019474557f13b4d11f7208ceb6b7272acb9841b3141efce40c3237a6ed5091e7c147b05f50f694215feef95ce66f54 WHIRLPOOL af7f3f536d96d2932b116dbbd8c508c4271a138b65981d653c8bc2f2c1346d7eddf864cb02682bea5753f4f15133dbd5af2b7ac54de4e81524e530c8c1250938
-EBUILD ant-core-1.8.4.ebuild 3257 SHA256 b0ccac691ebe163a4db19462df988b7823943752b29080a2e8660e29d14e0c75 SHA512 bb3d19f1ce966e96d70e224d908e268f1a2f61e9ac7ac4d07b5c6a114b284b551d9ae10b7287c0241fd2e32abb8954b8cbaefd375103ff1f4a6addecebb95e9e WHIRLPOOL b6f271eafb1954ea28d1c6308a4ed23e8b699f02c04592c5895dee4778e8b44240859a890dc909bd3b6d7d9151af596738e5aa82b5d78fc34f7ec7362397be5e
-EBUILD ant-core-1.9.1.ebuild 3231 SHA256 c48e8ae1c1c80509a058036418dd3092befae2319c74548b88807dd97b7f0595 SHA512 e6dfdbcc4187db886c444b44dbf312f14529437e47d2573d9dc58b851469bc4c1d46d5f91ff3a713fe70c8bdfdaa61e845629073816beb912b63073312d2b9b2 WHIRLPOOL 3e7828d3049791c5bafe10949d1b143b8cbab92aa3edb2e8bd778aa3a4aea661b4d1bd3718ff1e36891b8f3bfbbebb09e0c207cbc334f79e7428db36bbba0f6d
 EBUILD ant-core-1.9.2.ebuild 3253 SHA256 d58a85b77740d8248de827d386ab951dce2086221f8c08ec6ebbbb5b82845e9a SHA512 58ee5d37a0b05fd7bef0b4f17a86062e6c75a8b9f5ccc757b4427cf73aa719f9d51ef1ecd6e1e96c2551079343aeaca1996113671d836c3b21af37315d78d83d WHIRLPOOL 9fc3e5fd9fac5bfae1b1daf37fcfa6cb297853db3f9fd32730d636d51856b4c154f0bd0c33e34ee38336c893b393a28cb1edc8b4067f3605d256ff9a7a38cbf5
-MISC ChangeLog 33428 SHA256 c240513bbcc20c8f350f3e85e990479a0fa83755a29329bbe79e0b2634b7b43d SHA512 5884695ea58fb9b94cf11a6476cb4c5f473d0d3e81cf224a0ff68e4b4c3c6659c14b9ac9c26d4212322dc827112ae5a5657ad20e7c992b1a72ef8636e05f4f26 WHIRLPOOL 2bcb03f86e2b2fdee66806fec84fe6999015ba9aa069911f3e9743b5a9673a9981da8d41f74995895468fe8c1045b05228245220c913dac4bd01b2d5d33cfd3d
+MISC ChangeLog 33739 SHA256 5ce58d3ffe6d76b08b3dcd404debd9bc6f4475026c07ee1fbc2bd473ee30be8e SHA512 0c683681d95d89fa259817b1083eb8cb635003957154cdbf509b6c328c96682d9f8e2d6694be7869706d11a0b7a1a277ac2e9a9f56ed41ff74c2440482016ddb WHIRLPOOL f5c522e2ca7e4eb4f2f6bb2a60de2846a966e87833af2e4ace1bfcfc7d11fd484b28f5cc11983de185ba2b96fcca3d43b2a64b9ce82798e06faf4871bfadd4e0
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVYQPTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVnuNhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kTzQP/2I5m8EOSrumBN8QGHZujl7s
-pWGFa9mk+JiARsXWojptUNbiKiRG8uMGbsPEVrk4Q0ow9e6wIATzKsyhzk5yUzTR
-iLj3oDeZrGH7EQ6APvAwPF1e77AfQHIeXbVN6Ci1po95DM33dATg+4gi23FgDA5A
-SXAIkxNWnCS7Uu7lYytyL4x9lt3L5VPYbM9afrqGRV7yA+NYw6zIEx8R6h/uXY9H
-tUgvVSrD47W4/JMrlFZUKzZklgeYUWyM1Z5p7Bs2UuzfsK8VMDboxSDQPpKkX9p4
-7qvYa+ohzZsuopXPFu95w+BASBvwBGTKNeqmwynWpdQA9whxQ2+TLOXADxPILbj4
-FF2F2IXjXTfyJsKd6OK2K0fxmVxheS6LBD5Kh6g1ME8bSwGTxjVMeXOl0mIantKk
-UxIzW00K1fQ55OGORUC3nRMhY0DstwVec4I8jzpR9C6HdtGkpSBOFQqpzUSR7Nca
-7djGvE95o0XfWCM47wrT1gLlwzhalffL6q8eh/YS7m94Sld2ip1cmRCcVhq9vnD2
-Lb+BdcdlFYSQzd02CYuvDFpNmHCiCWVkZOtUOlWkLbYFr+RS3mML+TMdNDvc5Zhe
-I+Qoo085Vks9fyV9ElwA6ddTVnBgPKEub3MD9NBA2kB4sU3yenKU8pqzyy6XnwtG
-AiPsT1e2pF1mYAD5XDd9
-=Z3GD
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kr7MP+gMW0Snufirr1E+DiE4cDa5g
+Iz39sPgk/uckdZHm5IrVQZNS156pjVZ1lt6rj6fe4z6nXNMqgwdudF/g5CvPjzFb
+jxTWYwaFvZ/a8CSpbkaAQe9ZdPvJ6OuuUik/V96YcqGPRjPuZ3pyY4FjVAg5vmCf
+x2aR25oEzDaXK2kpDFvVqdPAd/7TlRCq7+8O14YaZdw+cU7ynLhRwQ0pi57qVoxJ
+mmfun8OTFv8aROzFpOzcIFVUATXaC3P8cAML7kr5qu+tO3sQBB0CtR8zQ6G4nZde
+OEAG1I06yS8TwzfSwh6hwSztjvkYMspoDYUsswx+tYuSIWtmB4G+5wNf9wELvl2T
+y26hx31vtmrSj2xKV+AQVu6MJ6+uDrdH5Pn59X/QbSQu9NuVpO/HOsvJseefoyw7
+2qaEfHQ9RFucUSB4yTGaJr726SotRUkUT1e25wYYmCUEw18Jqm5nEXGjmw7opOW6
+jtT4NHiD5P5cAfsyJR3w+/6Dw2ULvvtznuhDjVn0PZYjhHrjIUQ7gyJSj9Zb9q0X
+lVpFbHqFOaAFFCUJmsjn0VsseBdSBXi5L13QLmcTuq3lCOt2h2XrM14GIvrwNG56
+WRTMJeIh0ulvqSNYSinfe9z7Ej8/IxooEAtbdeR8MqTMZrcdGmsg8269O3XfSS54
+sQNCAr5p37lcClCgyxww
+=zTfV
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-core/ant-core-1.7.1-r4.ebuild b/dev-java/ant-core/ant-core-1.7.1-r4.ebuild
deleted file mode 100644
index 12d3d032407c..000000000000
--- a/dev-java/ant-core/ant-core-1.7.1-r4.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.7.1-r4.ebuild,v 1.8 2014/08/10 20:07:23 slyfox Exp $
-
-EAPI="2"
-
-# don't depend on itself
-JAVA_ANT_DISABLE_ANT_CORE_DEP=true
-# rewriting build.xml files for the testcases has no reason atm
-JAVA_PKG_BSFIX_ALL=no
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-
-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="mirror://apache/ant/source/${MY_P}-src.tar.bz2
-	mirror://gentoo/ant-${PV}-gentoo-r1.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-	!dev-java/ant-tasks
-	!dev-java/ant-optional"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# remove bundled xerces
-	rm -v lib/*.jar || die
-
-	epatch "${WORKDIR}/patches/1.7.1-pkg-info.patch"
-	epatch "${WORKDIR}/patches/1.7.1-jdk4-javadoc.patch"
-
-	# use our split-ant build.xml
-	mv -f "${WORKDIR}/build.xml" . || die
-
-	# bug #196080
-	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-core 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" || die "failed to install wrapper"
-	dodir /usr/share/${PN}/bin
-	for each in antRun 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=\"/usr/share/ant\"" > "${T}/20ant"
-	doenvd "${T}/20ant" || die "failed to install env.d file"
-
-	dodoc README WHATSNEW KEYS
-
-	if use doc; then
-		dohtml welcome.html
-		dohtml -r docs/*
-		java-pkg_dojavadoc --symlink manual/api build/javadocs
-	fi
-
-	use source && java-pkg_dosrc src/main/*
-}
-
-pkg_postinst() {
-	elog "The way of packaging ant in Gentoo has changed significantly since"
-	elog "the 1.7.0 version, For more information, please see:"
-	elog "http://www.gentoo.org/proj/en/java/ant-guide.xml"
-	elog
-	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."
-}
diff --git a/dev-java/ant-core/ant-core-1.7.1-r5.ebuild b/dev-java/ant-core/ant-core-1.7.1-r5.ebuild
deleted file mode 100644
index 57e9c1c822e9..000000000000
--- a/dev-java/ant-core/ant-core-1.7.1-r5.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.7.1-r5.ebuild,v 1.3 2014/08/10 20:07:23 slyfox Exp $
-
-EAPI="3"
-
-# don't depend on itself
-JAVA_ANT_DISABLE_ANT_CORE_DEP=true
-# rewriting build.xml files for the testcases has no reason atm
-JAVA_PKG_BSFIX_ALL=no
-JAVA_PKG_IUSE="doc source"
-inherit eutils java-pkg-2 java-ant-2 prefix
-
-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="mirror://apache/ant/source/${MY_P}-src.tar.bz2
-	mirror://gentoo/ant-${PV}-gentoo-r2.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-	!dev-java/ant-tasks
-	!dev-java/ant-optional"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# remove bundled xerces
-	rm -v lib/*.jar || die
-
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches/"
-	eprefixify "${WORKDIR}/ant"
-
-	# use our split-ant build.xml
-	mv -f "${WORKDIR}/build.xml" . || die
-
-	# bug #196080
-	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-core 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" || die "failed to install wrapper"
-	dodir /usr/share/${PN}/bin
-	for each in antRun 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" || die "failed to install env.d file"
-
-	dodoc README WHATSNEW KEYS
-
-	if use doc; then
-		dohtml welcome.html
-		dohtml -r docs/*
-		java-pkg_dojavadoc --symlink manual/api build/javadocs
-	fi
-
-	use source && java-pkg_dosrc src/main/*
-}
-
-pkg_postinst() {
-	elog "The way of packaging ant in Gentoo has changed significantly since"
-	elog "the 1.7.0 version, For more information, please see:"
-	elog "http://www.gentoo.org/proj/en/java/ant-guide.xml"
-	elog
-	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."
-}
diff --git a/dev-java/ant-core/ant-core-1.8.0-r1.ebuild b/dev-java/ant-core/ant-core-1.8.0-r1.ebuild
deleted file mode 100644
index 47e3fb1c9a43..000000000000
--- a/dev-java/ant-core/ant-core-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.8.0-r1.ebuild,v 1.3 2014/08/10 20:07:23 slyfox Exp $
-
-EAPI="3"
-
-# don't depend on itself
-JAVA_ANT_DISABLE_ANT_CORE_DEP=true
-# rewriting build.xml files for the testcases has no reason atm
-JAVA_PKG_BSFIX_ALL=no
-JAVA_PKG_IUSE="doc source"
-inherit eutils java-pkg-2 java-ant-2 prefix
-
-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="mirror://apache/ant/source/${MY_P}-src.tar.bz2
-	mirror://gentoo/ant-${PV}-gentoo-r1.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-	!dev-java/ant-tasks
-	!dev-java/ant-optional"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# remove bundled xerces
-	rm -v lib/*.jar || die
-
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches/"
-	eprefixify "${WORKDIR}/ant"
-
-	# use our split-ant build.xml
-	mv -f "${WORKDIR}/build.xml" . || die
-
-	# bug #196080
-	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-core 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" || die "failed to install wrapper"
-	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" || die "failed to install env.d file"
-
-	dodoc NOTICE README WHATSNEW KEYS || die
-
-	if use doc; then
-		dohtml -r docs/*
-		java-pkg_dojavadoc --symlink manual/api build/javadocs
-	fi
-
-	use source && java-pkg_dosrc src/main/*
-}
-
-pkg_postinst() {
-	elog "The way of packaging ant in Gentoo has changed significantly since"
-	elog "the 1.7.0 version, For more information, please see:"
-	elog "http://www.gentoo.org/proj/en/java/ant-guide.xml"
-	elog
-	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."
-}
diff --git a/dev-java/ant-core/ant-core-1.8.0-r2.ebuild b/dev-java/ant-core/ant-core-1.8.0-r2.ebuild
deleted file mode 100644
index 31916d4d1947..000000000000
--- a/dev-java/ant-core/ant-core-1.8.0-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.8.0-r2.ebuild,v 1.3 2014/08/10 20:07:23 slyfox Exp $
-
-EAPI="3"
-
-# don't depend on itself
-JAVA_ANT_DISABLE_ANT_CORE_DEP=true
-# rewriting build.xml files for the testcases has no reason atm
-JAVA_PKG_BSFIX_ALL=no
-JAVA_PKG_IUSE="doc source"
-inherit eutils java-pkg-2 java-ant-2 prefix
-
-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="mirror://apache/ant/source/${MY_P}-src.tar.bz2
-	mirror://gentoo/ant-${PV}-gentoo-r2.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-	!dev-java/ant-tasks
-	!dev-java/ant-optional"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# remove bundled xerces
-	rm -v lib/*.jar || die
-
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches/"
-	eprefixify "${WORKDIR}/ant"
-
-	# use our split-ant build.xml
-	mv -f "${WORKDIR}/build.xml" . || die
-
-	# bug #196080
-	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-core 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" || die "failed to install wrapper"
-	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" || die "failed to install env.d file"
-
-	dodoc NOTICE README WHATSNEW KEYS || die
-
-	if use doc; then
-		dohtml -r docs/*
-		java-pkg_dojavadoc --symlink manual/api build/javadocs
-	fi
-
-	use source && java-pkg_dosrc src/main/*
-}
-
-pkg_postinst() {
-	elog "The way of packaging ant in Gentoo has changed significantly since"
-	elog "the 1.7.0 version, For more information, please see:"
-	elog "http://www.gentoo.org/proj/en/java/ant-guide.xml"
-	elog
-	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."
-}
diff --git a/dev-java/ant-core/ant-core-1.8.1.ebuild b/dev-java/ant-core/ant-core-1.8.1.ebuild
deleted file mode 100644
index ae5fedabb751..000000000000
--- a/dev-java/ant-core/ant-core-1.8.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.8.1.ebuild,v 1.9 2014/08/10 20:07:23 slyfox Exp $
-
-EAPI="3"
-
-# don't depend on itself
-JAVA_ANT_DISABLE_ANT_CORE_DEP=true
-# rewriting build.xml files for the testcases has no reason atm
-JAVA_PKG_BSFIX_ALL=no
-JAVA_PKG_IUSE="doc source"
-inherit eutils java-pkg-2 java-ant-2 prefix
-
-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="mirror://apache/ant/source/${MY_P}-src.tar.bz2
-	mirror://gentoo/ant-${PV}-gentoo.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-	!dev-java/ant-tasks
-	!dev-java/ant-optional"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-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
-
-	# bug #196080
-	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-core 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" || die "failed to install wrapper"
-	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" || die "failed to install env.d file"
-
-	dodoc NOTICE README WHATSNEW KEYS || die
-
-	if use doc; then
-		dohtml -r docs/*
-		java-pkg_dojavadoc --symlink manual/api build/javadocs
-	fi
-
-	use source && java-pkg_dosrc src/main/*
-}
-
-pkg_postinst() {
-	elog "The way of packaging ant in Gentoo has changed significantly since"
-	elog "the 1.7.0 version, For more information, please see:"
-	elog "http://www.gentoo.org/proj/en/java/ant-guide.xml"
-	elog
-	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."
-}
diff --git a/dev-java/ant-core/ant-core-1.8.2.ebuild b/dev-java/ant-core/ant-core-1.8.2.ebuild
deleted file mode 100644
index 711655dd5826..000000000000
--- a/dev-java/ant-core/ant-core-1.8.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.8.2.ebuild,v 1.6 2014/08/10 20:07:23 slyfox Exp $
-
-EAPI="4"
-
-# don't depend on itself
-JAVA_ANT_DISABLE_ANT_CORE_DEP=true
-# rewriting build.xml files for the testcases has no reason atm
-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="mirror://apache/ant/source/${MY_P}-src.tar.bz2
-	http://dev.gentoo.org/~caster/distfiles/ant-${PV}-gentoo.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-	!dev-java/ant-tasks
-	!dev-java/ant-optional"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-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
-
-	# bug #196080
-	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-core 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" || die "failed to install wrapper"
-	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" || die "failed to install env.d file"
-
-	dodoc NOTICE README WHATSNEW KEYS || die
-
-	if use doc; then
-		dohtml -r docs/*
-		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 "http://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-core/ant-core-1.8.4-r1.ebuild b/dev-java/ant-core/ant-core-1.8.4-r1.ebuild
deleted file mode 100644
index 8f586aa89e65..000000000000
--- a/dev-java/ant-core/ant-core-1.8.4-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.8.4-r1.ebuild,v 1.5 2014/08/10 20:07:23 slyfox Exp $
-
-EAPI="4"
-
-# don't depend on itself
-JAVA_ANT_DISABLE_ANT_CORE_DEP=true
-# rewriting build.xml files for the testcases has no reason atm
-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="mirror://apache/ant/source/${MY_P}-src.tar.bz2
-	http://dev.gentoo.org/~sera/distfiles/ant-${PV}-r1-gentoo.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-	!dev-java/ant-tasks
-	!dev-java/ant-optional"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-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
-
-	# bug #196080
-	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-core 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" || die "failed to install wrapper"
-	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" || die "failed to install env.d file"
-
-	dodoc NOTICE README WHATSNEW KEYS || die
-
-	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 "http://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-core/ant-core-1.8.4.ebuild b/dev-java/ant-core/ant-core-1.8.4.ebuild
deleted file mode 100644
index dab6f17016f1..000000000000
--- a/dev-java/ant-core/ant-core-1.8.4.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.8.4.ebuild,v 1.8 2014/08/10 20:07:23 slyfox Exp $
-
-EAPI="4"
-
-# don't depend on itself
-JAVA_ANT_DISABLE_ANT_CORE_DEP=true
-# rewriting build.xml files for the testcases has no reason atm
-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="mirror://apache/ant/source/${MY_P}-src.tar.bz2
-	http://dev.gentoo.org/~sera/distfiles/ant-${PV}-gentoo.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-	!dev-java/ant-tasks
-	!dev-java/ant-optional"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-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
-
-	# bug #196080
-	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-core 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" || die "failed to install wrapper"
-	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" || die "failed to install env.d file"
-
-	dodoc NOTICE README WHATSNEW KEYS || die
-
-	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 "http://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-core/ant-core-1.9.1.ebuild b/dev-java/ant-core/ant-core-1.9.1.ebuild
deleted file mode 100644
index 7d7f51a5eddb..000000000000
--- a/dev-java/ant-core/ant-core-1.9.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.9.1.ebuild,v 1.2 2014/08/10 20:07:23 slyfox Exp $
-
-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="mirror://apache/ant/source/${MY_P}-src.tar.bz2
-	http://dev.gentoo.org/~tomwij/files/dist/ant-${PV}-gentoo.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd \
-	~x86-freebsd ~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/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
-
-	# 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 "http://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/ChangeLog b/dev-java/ant-jai/ChangeLog
index f1c78ead2317..2ec089adece4 100644
--- a/dev-java/ant-jai/ChangeLog
+++ b/dev-java/ant-jai/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-jai
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jai/ChangeLog,v 1.36 2014/08/03 19:12:33 sera Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jai/ChangeLog,v 1.37 2015/07/09 21:11:07 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org> -ant-jai-1.8.2.ebuild,
+  -ant-jai-1.8.4.ebuild, -ant-jai-1.9.1.ebuild:
+  Remove old versions.
 
   03 Aug 2014; Ralph Sennhauser <sera@gentoo.org> -ant-jai-1.7.1.ebuild,
   -ant-jai-1.8.0.ebuild, -ant-jai-1.8.1.ebuild:
diff --git a/dev-java/ant-jai/Manifest b/dev-java/ant-jai/Manifest
index 585a2d612777..f8145bcb08b2 100644
--- a/dev-java/ant-jai/Manifest
+++ b/dev-java/ant-jai/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-jai-1.8.2.ebuild 462 SHA256 e5aed3e5bd425470be16e2cf435ccef2b2718e4937de5c3d0f09459bdf882569 SHA512 96511e76707ed042311d8e3c707a562ce2f414f8a12ce013e312f12b46baa7088b02cc2b7b257a9687363e1b80ed90af8a4abe9bf7b7c9713ffba921c960df2e WHIRLPOOL aa113354a29d824901c3a57f38551b6b1fae308fdb637aa51e36faefe8313f098f10a3881baf2442cbc6287f6015f36e917fcbb50a952207993966564232d5b4
-EBUILD ant-jai-1.8.4.ebuild 460 SHA256 fafa0b4a56d5b399255316b26645cb88e22039f3f0aa42e073816d5cc9c918f4 SHA512 1e759f8fb3d159cecd1361a71c8853cd2a09ee35816a75f00104f95a043b4ac61b086305923fbf48e7ce6f653b8cc8f412f82e969d7ee44fd878d74ff71cc06d WHIRLPOOL 7e24891fd56c8e0cec63805580e4f78e5100b02e5d9f2ce12bfe8f6e89b6cd5ac5cfdb10e4b5b90dc2a42c14fe897a4b20c91fae2bd07e734ce414608b5f0805
-EBUILD ant-jai-1.9.1.ebuild 460 SHA256 690f058effc0def65cc09030c3111b87ca0f99632a69e7727d8f1ce985955687 SHA512 1317f1467a03d1cad5f007fce71911f86d41b4ee5bc0ee7d4332253eb4b7f52b5ce4da6252a7e1d54e29ee1471db6cb083763bc0af47f8e0ecd62977807334f7 WHIRLPOOL 2abe83c8b7ac3f89d628fa0c0908f98375b8c63323b349eac509ccae2eddd9df814134c89b247fc456532972f40b84148adb3e4b99488ea4aefebf801d91602d
 EBUILD ant-jai-1.9.2.ebuild 453 SHA256 675cf6ee2a6fb3e64cd226649f7311623eab63d6c0bab60677df59562bcd8079 SHA512 7df102ae83b0caf9b26ba6f23f615b0269fe2cf3d8ace071cf68edbe2e6135954542a033d07e678a7ea9a1a173534546cf289bfe212cc00040085009aa79715b WHIRLPOOL 59aeebc9fd9f0ec312e66d0544e2cca6dd362a76e5cadc9e9791df78309d8e5a306750e7dbf1d09b0149607e2f8b9cc87149496a2eee8c191ac530c411e51722
-MISC ChangeLog 4351 SHA256 1d87ea908f26052eef24c7be40bc0b54119772596ceb3382ca2eddd388ea0f2f SHA512 3f22b9a0de6bd75a89d70ea0288d8e80faf0aedb356f7929cf5e27b611f4eb98ebc48ca8cb13c487cfe57ddee73b82a629781a194e442d4b13467f715d4a5785 WHIRLPOOL 4cb47737e1d3c748f52272b703220db00ea0899104e62860313095b141c23ec9acf58cb2ffaa3eea50c9a7fe19c261272bbeabfddbdde4456fc6d1d72f366104
+MISC ChangeLog 4497 SHA256 d60c784a474205aa9840dbbefbaf5e193771e73150f82ef9ae4d9b03859a1550 SHA512 73d9a6322f75f4f539a0b138d1fd15b37142f13fe0b2ef62dfcba847d7734fd8646059a111fa06211ab100d92630b7e679fb6be2cad7bb09aef49dbf557b2c31 WHIRLPOOL daa3b4800353af54a3ac5094af5e558af56b71f6b4edc978f10709e4ba79c1ca7c953a73bba04f8e908256b191fe32cfa1fad31c4223ab4a5e2eda2bce2e7d87
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJT3omrAAoJELjwI6Q8XPdaOi0IALEoqzk4w5blzCi/xOjEDOwv
-i/o/q2js08jNRccn4eQB33yGx/x2eQLlXS0eu3OXbhpZpobbe1YJX4fvew/ExdOD
-X7fmMPCSlNDqvS3pHE7zvlZLUk3/ZH/JnRyrzKRiFd/hCt1Q7Z43jRKIQqOK27WV
-qpomn1coOaVwavOkY406H6NxovWtTuUs4vXZle4yViTgoqx5dIiZEwzpZW8qNaqn
-Gk0sZf4RLaGQ9F1dnZI+FLx3X2gkO88I7w+SLsJP+TLQIyojdoJU2fnh/UP8iAeZ
-WzU3LuvjcotbBAwlGxVjrD6Xu4giXSAgwvo+UiwWjaBx+oPAbvvwMps1wsK+YM0=
-=QCaF
+iQJ8BAEBCABmBQJVnuNsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kBQ4QAIN+3T3Ml7XPV/+AaUgRaJCn
+A8pSpLDDsGFZZ8yYWPOI1bx86fxudYLTXS6T/HxCFBd7fKw2NuhrlRL6ow6zX/Wl
+vqRYQ44/LwQb013HZzsmNkCgTuoIyty8Vp/lO9u437wC1qfys6+DT0Y7i/69DMwI
+4jwekVhab88lP8P3IZhneqSLiYPI2OjmIK1vB2CV+3/R6nHihw8AgNYywEp98jYY
+nJal2y/oa/SMuhAsZpeM6gj4ZfSmfgPfQlz3nTyDNhIa2+WmhgA8eXxuoKZmvvme
+umN6DD/nSCkH5DEmMyB16E8GgYfyQunUvxuXBZLO2rYRJ1JYjHrG5irYC8+2lkRj
+sEpX4ng2nhWH3E+PD4gAXRM570Ycz/qzn9N3HMdJcOUI27WtzFIQN3UZ8BBQwt8c
++rE6V04FxwuxBfprLNFD4XJ4/kvptVhAQeaW4fjWCFxCdbIjFo2O1ORC0N02ZHlJ
+APSsYLK2vJIqhaXcRmiIIwRspZjOYpGIcT7In4bMDe+lljV/MdoGLxOywhKUuWp0
+uetd8qVYSBtTopSAwn3k0ksHkAAr5AlRHxfcW8hPC7ha5BFZ0wvMOKzDwhOblJyy
+i5bLO3g85MpMdVJKNuNMomwqoW3q+3Jbl/ou/In7LibZ9dMwYrFrEvo+t5hWfYNZ
+LNlHxzo4VUqmmT+o/zeI
+=UnSw
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-jai/ant-jai-1.8.2.ebuild b/dev-java/ant-jai/ant-jai-1.8.2.ebuild
deleted file mode 100644
index 3b73a2c33ea0..000000000000
--- a/dev-java/ant-jai/ant-jai-1.8.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jai/ant-jai-1.8.2.ebuild,v 1.3 2012/05/25 11:27:45 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME="sun-jai-bin"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-# 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-jai/ant-jai-1.8.4.ebuild b/dev-java/ant-jai/ant-jai-1.8.4.ebuild
deleted file mode 100644
index f9cfb2f477dd..000000000000
--- a/dev-java/ant-jai/ant-jai-1.8.4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jai/ant-jai-1.8.4.ebuild,v 1.5 2012/12/05 17:30:44 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME="sun-jai-bin"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-# 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-jai/ant-jai-1.9.1.ebuild b/dev-java/ant-jai/ant-jai-1.9.1.ebuild
deleted file mode 100644
index 31528c9caaf7..000000000000
--- a/dev-java/ant-jai/ant-jai-1.9.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jai/ant-jai-1.9.1.ebuild,v 1.1 2013/07/05 14:11:30 tomwij Exp $
-
-EAPI="5"
-
-ANT_TASK_DEPNAME="sun-jai-bin"
-
-inherit ant-tasks
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-
-# 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/ChangeLog b/dev-java/ant-javamail/ChangeLog
index cf1f3b346e35..efb8827c39f4 100644
--- a/dev-java/ant-javamail/ChangeLog
+++ b/dev-java/ant-javamail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-javamail
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ChangeLog,v 1.43 2014/03/08 17:14:55 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ChangeLog,v 1.44 2015/07/09 21:11:19 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org> -ant-javamail-1.8.2.ebuild,
+  -ant-javamail-1.8.4.ebuild, -ant-javamail-1.9.1.ebuild:
+  Remove old versions.
 
   08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -ant-javamail-1.7.1.ebuild,
   -ant-javamail-1.8.0.ebuild, -ant-javamail-1.8.1.ebuild:
diff --git a/dev-java/ant-javamail/Manifest b/dev-java/ant-javamail/Manifest
index 9a78cfb17ebc..6773b50c5bee 100644
--- a/dev-java/ant-javamail/Manifest
+++ b/dev-java/ant-javamail/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-javamail-1.8.2.ebuild 636 SHA256 9f9d0a269ebf0948a3acd45c6208c21f7b9b9b57ac04d49054840204c8037e3b SHA512 eafb880ad5643e5e58a437b6399c4a34c21017efbef0640ed36091fea716d43cea789e282dd61b24b94942a6038fc45c8e4377a6b0b7bc7a41437c8f5628bd45 WHIRLPOOL 7f92c487eb8cc59457c8242aaf67bc48b5f8dd25e4e0f7b6da8eae9a213235ac82b8a5cc3226556024a0ae30738bd4eb0b0483aedac4a897a13e5259da211ea1
-EBUILD ant-javamail-1.8.4.ebuild 634 SHA256 90861467342d875743e62ab69ae0115a546fcc0ca7eed4fb83de159656e3c49c SHA512 107907cb8f8485299284554bbc5a3f3e78c54273a63d921ac27366dd6147fae373f9c59492a5475d053f1bf42f0d8317be200a00f9a23cd8cc3b3797164fe6d6 WHIRLPOOL b6394f9ec5eed6913f51cf880dbb2a5cd0a958c9c08f783e6bbe78d0a56dcb99100e3e7b7c78a8b17262f077c64d69bc37ffdb3738c81301f58a32a159ec8cac
-EBUILD ant-javamail-1.9.1.ebuild 639 SHA256 e703c80e1a5b07faabc3ae61ee0d5c78545ba2032b7d6d79db6ddb5ef6778f73 SHA512 a06ff454a12e58053658fa2c36e72963469a1f276a140a112599f4d6d0959b0c0ef90c7c478feb6174bc53f6a6c9c13302421fdf2dbbe26693b2b1bbd8651642 WHIRLPOOL b84f98f9d5e2a8b9e930eddf68cab6eee01cdccea1cf9a643d5ed95d304a9f7bd842e2fa62cc406b454a1d15bce77f47d4c4128dd30cf178c7d66407f0c57671
 EBUILD ant-javamail-1.9.2.ebuild 626 SHA256 4fc656c0aa97b0ae4d1e9cba2b6bdfabd05fdf8de6585eeb16fbfe9d3b48ee42 SHA512 65b2d24e015c7243017383b6f1a6b0232e8d8d75665aecea4a212d04ddf03c396b623712cbeb51e26b718dc0b4677ab0087f7b9a3c45a8327e4d11003844e969 WHIRLPOOL 9a9793bfd7a6755f12f03e94f2a3241fed09a21efca57db6760bc1a5505dc0b8472df700f5f50127a34a57d58cb9196a0016d37549a0e3eb1bb21086cbf294db
-MISC ChangeLog 5441 SHA256 dd3b59142ba9cd9ef067420fc9b128926f3f8b415857685c671a74fd0223ab9b SHA512 cb19fba9a50ae68cd51a570eb05da0d5e39d28df001367d0274734356421906ccb283a4bea50e51958b1e98f2b7df2ef31564cff5621a926d2c70a13409a363d WHIRLPOOL b1a3c4924aacf39dae28d3fcb2b3c7d333c062b22f4288fae658ca55b63e6e2a0179eb32d59fee2e389e2ee6860a02e3abad5cecf5079ce0adcd5b8922958b3f
+MISC ChangeLog 5600 SHA256 76b5e61982bf4aa32fd9d6c60c0cb0319463d7f8fa712e100fc905cbc2f02128 SHA512 38ad9f66fe736e24a48acefc34149965849b314e2d15a2dfe69ae60d6d247922c7eb14e0c0e03f01d58f1837e1bc2bccfcfbd15145652e9c93dc001614eab94a WHIRLPOOL 9309577f6b5711701b99b49db3a91d5d87e79be7221125685d496076b971d2cfe119fb1c4edfef203f4ba9803949464d1550d7253dea69962de88c9b130bf24f
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJTG0/uAAoJEJWyH81tNOV9dlsIALe01L/by6bXf1OTpuVVdx0Q
-50aYpMC9/YKEG21KD9d5DmQrv3w5iXtBFaPQYxAlJmWPHAYphZgp1XxftYRFqpfP
-rUC/awLYx2IOsJ1FEP/yRovR75X428iFJwxUZCj4w18g6FRVJ+yRS1F7lQgDQe+Y
-ixmMj7df6AUYJ/lyAeOeQXLha/CeU/Y0mDawju15NLokHQIUMLHrtfafvoANIiSO
-CvUkXoBZK/shuu+mQuTrI/xIzAi+8yXxwANuhjqLv//432/Dv4yheJofrVvhsfI/
-TrFks3tm3c90k1JySd4B6QnUdZbEaESIL3eAJXossOawDFZXGncq1BpVGn+G6Dw=
-=O9/m
+iQJ8BAEBCABmBQJVnuN4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kUzgQAIkXkbql7rnjJmmXnZWO41UO
+NdR80xJZXEUFQ7vdh3YAWtW+4Eq5XpcSCXW8Iq63uCYIBsc0gICuGxnbCKbdUoDe
+4voqwTqPBxChKfmdQj9NF8u90wk714MWiowt/FUyYREArShS/XQcMMTA6SSgy58u
+SYo8j34nYkesjAdA8I/BCA+8ApT3pcYM0CJEiNQoz52M1jFuxQ2HRtF1nZ3sNgoK
+1A4cS7mxyVkaDpgpHWYh5jw+SduyRP6Bd1GeJ1WjmMMgLk+ONZqHC+Gj++FfLj+G
+5ynhu1301a/Jl4uuQerfkWi0mCIMAfz7B3TK7WneIBoEem8ZeUxR43KfNOUL0Q8w
+FOPmJjc47HWgGEFHjMwpCYRELrpXhw4pAhd8RfzS6NmMeR2BA+XYBF805AqsLg08
+BIJanfvKye8MIi5TaEoADkTrD6UsmigV+gv/plgdMDMRG/fXGbMIDIs/ckWKUFfL
+bSUaALNDq39gnAxUPB6KwJQ9/kHuTNqIxPeqLvlNiyOxhB8NqRKpMEZBdOpS5Qsf
+wx/TPaFUglNeMfwEviRJ/Ke1sEqxRu+9cDIlvQX2NZywAhVSE6oBJbptXTryBjaD
+pz0lWKB2c6KPYg+NIWugvF1t8n4Cxc3tgBhToW+ceD9RNbPBgDTwP4Y+y7GOW/hc
+G9Pwg4X5RAMf7X0N2et9
+=ZoNc
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-javamail/ant-javamail-1.8.2.ebuild b/dev-java/ant-javamail/ant-javamail-1.8.2.ebuild
deleted file mode 100644
index fa10ec35239a..000000000000
--- a/dev-java/ant-javamail/ant-javamail-1.8.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ant-javamail-1.8.2.ebuild,v 1.3 2012/05/25 11:28:13 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME="--virtual javamail"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="java-virtuals/javamail
-	java-virtuals/jaf"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	ant-tasks_src_unpack all
-	java-pkg_jar-from --virtual jaf
-}
diff --git a/dev-java/ant-javamail/ant-javamail-1.8.4.ebuild b/dev-java/ant-javamail/ant-javamail-1.8.4.ebuild
deleted file mode 100644
index ab93bf3e7740..000000000000
--- a/dev-java/ant-javamail/ant-javamail-1.8.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ant-javamail-1.8.4.ebuild,v 1.5 2012/12/05 17:31:03 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME="--virtual javamail"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="java-virtuals/javamail
-	java-virtuals/jaf"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	ant-tasks_src_unpack all
-	java-pkg_jar-from --virtual jaf
-}
diff --git a/dev-java/ant-javamail/ant-javamail-1.9.1.ebuild b/dev-java/ant-javamail/ant-javamail-1.9.1.ebuild
deleted file mode 100644
index cb3fccd2107b..000000000000
--- a/dev-java/ant-javamail/ant-javamail-1.9.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ant-javamail-1.9.1.ebuild,v 1.1 2013/07/05 14:13:11 tomwij Exp $
-
-EAPI="5"
-
-ANT_TASK_DEPNAME="--virtual javamail"
-
-inherit ant-tasks
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd \
-	~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris \
-	~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="java-virtuals/javamail
-	java-virtuals/jaf"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	ant-tasks_src_unpack all
-	java-pkg_jar-from --virtual jaf
-}
diff --git a/dev-java/ant-jdepend/ChangeLog b/dev-java/ant-jdepend/ChangeLog
index 8c0ad2de4c96..ad6aab9b59dd 100644
--- a/dev-java/ant-jdepend/ChangeLog
+++ b/dev-java/ant-jdepend/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-jdepend
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jdepend/ChangeLog,v 1.41 2014/03/08 16:40:14 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jdepend/ChangeLog,v 1.42 2015/07/09 21:11:30 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org> -ant-jdepend-1.8.2.ebuild,
+  -ant-jdepend-1.8.4.ebuild, -ant-jdepend-1.9.1.ebuild:
+  Remove old versions.
 
   08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -ant-jdepend-1.7.1.ebuild,
   -ant-jdepend-1.8.0.ebuild, -ant-jdepend-1.8.1.ebuild:
diff --git a/dev-java/ant-jdepend/Manifest b/dev-java/ant-jdepend/Manifest
index df0885584cc1..cff34c4ab494 100644
--- a/dev-java/ant-jdepend/Manifest
+++ b/dev-java/ant-jdepend/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-jdepend-1.8.2.ebuild 504 SHA256 276a10cd3f326ca6131dfa046efa2c3a482a83ffdc5739055b51a146cba2a25f SHA512 eea2f36838c857a9bb813c4892f10c8bbb6dbccdc0cac11e7f588dca8371a556ae1884cb459c949b1e1b166eaf8e31bba04a1c741aad8edf21ac247c4db767aa WHIRLPOOL 0035826f79551b2e5bfeebc6fc4730f1998b50ccb2606f13221f1d164f22ea6fd3b7529cb6e1db2156ffefdfed1f21548448739044a735f3db1047e5952f3f19
-EBUILD ant-jdepend-1.8.4.ebuild 502 SHA256 2840c4ad8d9e104a7e8bf9b02e5660a878a10030489e9cbcb248fad7a6bbf865 SHA512 aa0d845ef06bc43d46fe923e247208bfc81f4bc11cee324da7ba11e34e76af8b7fd9155c06b199293002fdba4cebf3a2f8340b87bf6cfc6663055afcf4e36bd6 WHIRLPOOL 7a5ba77d1a5b07faf7768034cffb03ade798efed082edfa862857ca553420b48861a0ce4154eada5e96affa66c4f1a62a8627f02a282fd78cae409fe0bc5cd89
-EBUILD ant-jdepend-1.9.1.ebuild 507 SHA256 be8a780565399c0d82c7cecf3b4a16d5b8503f82c7e8377091d7e41aad1fd637 SHA512 ccb946776be25952729364844095d70d8e72463e9f916454160db5b1b1ffb82b1edf51623fb058bdf229b75ce23d720a30c24769b4c04f210c87fa2e913625cb WHIRLPOOL 403cfc032da26321edc4985964cbafbb7becbf37471d7d37c0f213583b668b229d739c6c308056a7cc24be2d82450a7aee8abd113079cf18cb55bf98e7dd6fb6
 EBUILD ant-jdepend-1.9.2.ebuild 494 SHA256 35fb85a1d2af92ed08aa5d50dc2a5e8eee4a6e472c783fd8da9f5119b4e2f2ee SHA512 56d1b014ca21047643f777ba0a2a3ee6d09cd4654451c4ff146faf1eeedb70912b258319bdd1a5ff8a445e9c3b849519a6dd04e7470b50055e7486c5a7487129 WHIRLPOOL aff46d0f5294efe4df205a7af5d7bccc58cb969bc7179da248466ee7e353b3a334ed16c5ba74bb7671b2763f9ee0d05c4e22e798ebd945bbeef5a0612a74abba
-MISC ChangeLog 5051 SHA256 bb7327c1d960f0a588c6f7609e4dacb5ecf85a894a6cb4d657eda95147f4a151 SHA512 eeb172bff881da8658a3eecafa7a6eb8ae4594db2d854ee792ba9bc9e9c075e6558c371e4b086b9316b311a8f27ba72f52ecdefd6a70b3a4ba12587b8597a93b WHIRLPOOL d13438d7b0e1bc15aee3e6b479288ec3bc089d55dcd0253a01feaf5a2d820dda6c4d61af9428a2bd9bb85a5db8015b0f6f55ce9c98f967472f8272b560f69a06
+MISC ChangeLog 5207 SHA256 2213e4ffcf6b5bab96c0809c28f3bbd6f63b4715f78fd35ace07ed9a84f12c20 SHA512 b1efb37b5ae034dd76c81f9d7782ccdb2970c12c2913935e846f246d93b6ff4bd6753e7b83507d18f79b904be5e8b35f1e44ab4355c9a8be717f780855cd99a6 WHIRLPOOL 4bc88c167706f7eaaca76a7cc032b533641d300a05d28a9275148eda0e277d90ca57a8f7dec9f17409ec7a37fc6d793e9229ebdaf4b82ebf11b2cbb9430ae394
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJTG0fNAAoJEJWyH81tNOV9kaAH/iJWpX6rx2FaEWBWnwEpbhKh
-ZOK0C+Noi8vJ/HeE6RDO7gstQFXrlgY6M+h7CwUUMvCvdgsdkbhAME9F42cpQosz
-DcaR+LV93huD/IH/gSsMcd3f4J9kaC6NajHPPchmDjYLrfYlKhBwOxbA39ZjM+W7
-VpqhLUwrKr5/0ln6w5IIHWZYEReIyiQ11veppiHmLkv+yazrvGTwQ5IxJiIV/YTq
-rUzFJoyt82tDpqR5bzXBxOzxNM2RErsimeyYypFfe9zvRRjppVgaQjukOKSlbD3J
-XDzFL3ipm1nCvaH8hgA1dtZxLS5bNoHNCNJDb8xGstTiNjU+xIlz/DF6KlXe3XA=
-=Xkhk
+iQJ8BAEBCABmBQJVnuODXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kK1UQAIWkwU0tMwvyjCBZ5cmd/Up1
+gQhE2yoJvbvwD420VenmJkTKid42/Q9fKJVNHcWNCoRwmNc98mg2NVvYfCrz0r/3
+Wna0GIzg7+tfFjtKlpSSdbExfkHvTQoWZSrGUJcU6p7EaiL040HPSIeCPHKqnUBv
+1cBCjlkkRWde5bxzJURlkYSU5IVtEMJNDHDMz1A3q5WF/EJeIZZUiJA4YXwVDl19
+SUmQJEkyih16OJK1uIRqQQfM5Dd81CmnjUxFXqLH+q3ZssDu5WwDyqY1NyTdZacV
+y0oi1DgnDSMmzy/A6sePfIDTfzv3QngmNoxIQZK8vYzrKNZX0I0AKWPgt+wQCm4Y
+oPlqHK3FpAHYdQYco3F0KcPQmvY5L+VyLT3gwzrKvk8WHP7gEEpCLB58ggXYlovX
+NTLY2AFVzfHjdb11Ia/LUXgjtYDg/9sL84jLNDezE5VsuXYup1lyYFW4K9bF58hq
+I3IzJggrF4/KI/YHq181gqKteC0hTC/J0oMqnczrOonWXkUQP5LzOD8GMorsRB6J
+yXjMe8+/rHBNonddtHTsTi6QaKmDtsXfU9xQ5a9v4nOctPZO1vw3xtEM+QIVc0yM
+oQHi7eV7HADNMYct6Ad1G5szcVRwrdc6vGoU1OOF4YVCEYvXDM6G0B0FANo+PQbF
+U2YvCeI6Fi47CgqaqYsd
+=E1u/
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.8.2.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.8.2.ebuild
deleted file mode 100644
index 17f88792c654..000000000000
--- a/dev-java/ant-jdepend/ant-jdepend-1.8.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jdepend/ant-jdepend-1.8.2.ebuild,v 1.3 2012/05/25 11:28:40 ago Exp $
-
-EAPI="4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/jdepend-2.9-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.8.4.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.8.4.ebuild
deleted file mode 100644
index 1177d04a6bf2..000000000000
--- a/dev-java/ant-jdepend/ant-jdepend-1.8.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jdepend/ant-jdepend-1.8.4.ebuild,v 1.5 2012/12/05 17:31:23 ago Exp $
-
-EAPI="4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/jdepend-2.9-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.9.1.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.9.1.ebuild
deleted file mode 100644
index c79df5c85064..000000000000
--- a/dev-java/ant-jdepend/ant-jdepend-1.9.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jdepend/ant-jdepend-1.9.1.ebuild,v 1.1 2013/07/05 14:15:03 tomwij Exp $
-
-EAPI="5"
-
-inherit ant-tasks
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd \
-	~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/ChangeLog b/dev-java/ant-jmf/ChangeLog
index 03dfdef05832..519b3d929364 100644
--- a/dev-java/ant-jmf/ChangeLog
+++ b/dev-java/ant-jmf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-jmf
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jmf/ChangeLog,v 1.42 2014/08/10 20:07:36 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jmf/ChangeLog,v 1.43 2015/07/09 21:11:41 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org> -ant-jmf-1.8.2.ebuild,
+  -ant-jmf-1.8.4.ebuild, -ant-jmf-1.9.1.ebuild:
+  Remove old versions.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> ant-jmf-1.8.2.ebuild,
   ant-jmf-1.8.4.ebuild, ant-jmf-1.9.1.ebuild, ant-jmf-1.9.2.ebuild:
diff --git a/dev-java/ant-jmf/Manifest b/dev-java/ant-jmf/Manifest
index 9f6b7531029e..114429476d16 100644
--- a/dev-java/ant-jmf/Manifest
+++ b/dev-java/ant-jmf/Manifest
@@ -1,14 +1,27 @@
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-jmf-1.8.2.ebuild 571 SHA256 225e1b8ef05a6e0754a89da56d261cc47c4f51ffba43de41acb95581eb0d7d88 SHA512 936d8e927db67255e8a67596d14588e435b1c5820f5b80440ca344d36f8a3ec621268f60485f7fa24a343a0a0b4969d10e96db033883a9a585baf5a7dbf9d121 WHIRLPOOL ab8bbb5b3f21d1d9e9aeb06f69e8c44c6cd449108e417e435addcda9055589d71132d875fc0e2cdf6b44cf2c6f363340c6feb1d147114b2dac852dc8d82edec2
-EBUILD ant-jmf-1.8.4.ebuild 569 SHA256 9c35efd337f45e866935471e8e986b47aaf3d57c99825ec99b08c05ac0026d37 SHA512 c93178479fa19d738a69d2d01b45ca2c08e53bdc02ec75199dc9cfe88a62e1c0c20291c108edd7b96599dea502fe891c0f86fb231bb39b9c8808e4e9085155e3 WHIRLPOOL 713da3b608f74d5c31aface095e86742da8ff282bc2d29b5cc14709fab70b07616f968fdef0f7af0b785936c6274304cd8df917cecd236335cc5d212a4d34548
-EBUILD ant-jmf-1.9.1.ebuild 591 SHA256 9c0b8ba7d1348ef65798cbd3b70738aedf219ded3ff4f5ca1aa4d7b8f9831130 SHA512 181aff32465f0149d34b0752acc61d6785a2ab7323f6d6e1a16d6d02538e0f683dd9f2d7e6a749b909eb4d7a4a04ca7eef4188b33ee5fb297d59a9eee5118480 WHIRLPOOL 238100fe17569cf1470a1c1d77f61088a3e7f30b77043d731c115c1c82771bfa1a0e1bd18f56e86c3b91d42776d8ef5e08d618bcbc312dfc7f9333f7dd08d0f7
 EBUILD ant-jmf-1.9.2.ebuild 581 SHA256 b73fb5f57805ca13ffa3139f2a400eb200785be54804cb9831c6c194a93a1ba6 SHA512 62623b57d2e2fea0d557a3826d6111c2c8bbe774d31de32f3a6f592e4b26af54bf8469f262a86ab81bc82152f8061069faa26b16ef0e8384aa15abe239022431 WHIRLPOOL 105f8aaea31184d7ebb9e6b224fc0730a9e53eaa91f80589ece0bb30841aeddb37a783713a20364037afc8e1a09cb9bdb1633488ddbc536bd82766d07ced7257
-MISC ChangeLog 5061 SHA256 049e1712e865947d7c362fc047f281d8eab39edb027384a754358f9f5cc2b755 SHA512 168f1c4ed8585c8023510428037cfafdc33519ee5f71e19ced5cd3f00d3e60bb4423ea7deabe7fd12b6bc790add27c28dcf7ae6d05e9d3f4932146dbf6cfef33 WHIRLPOOL 4eea71ea1ae7ec6f8e0b042ad04a4f36373c880d2b6aaeea0d7f00f473520f418acf28266150fa0e0a13590c1e78068a1359a0daebfcd3dd58602f0a6ed28122
+MISC ChangeLog 5205 SHA256 e6e55a9e8becb9079c60037581a32c7c560e6fc3f5968741fae9533830ca401c SHA512 bf13d08d6781ee9c3052f3bec3860101ada1d280cfa5d1ded924da28dc0e682fd57217ed432298355b0b50ba34bb18808967be886083c64948f4b5aedba91677 WHIRLPOOL 1ee0e5cf3e811f5479eb91c08bdc1915303a269e781c69404ab5b41c9af54ceb81b19da3d7b5a8930da19a3fb3d9eb6eeacd1176754b09f9914710789a2e92ba
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1
+
+iQJ8BAEBCABmBQJVnuOOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3klYIP/0SDqgyI96i9iJxvKXbPQRL2
+tjBIvlOO43q4indeM60TU5991tSQONhRIcn4qyOrm1M5xyJ3V18v0PBI5zqQDAHg
+bzIkhNYrOB7pI9YHEftbdTRCZZnol7zN3U7xF9Gr2zDWbbbEORPP3Dum+hzhheOD
+h6Yj33gU8YGEH4op5LgKRVRPpOh9qewUQeLSi1v2Io+RGlvaohhUonbQ2KbgQCZ4
+zM+OFyIUgCRKU4xu0F4vM3H6JYg5IXjD3Thq+R9Gfjq/tfEyT/r6LEM8kGsQOGN2
+du++6gTKvafEuyAKIptvLjzLsNPrnl8te9pVDY1Dsm+ZYYjmmh344fJzpc20oP/Y
+AjxGw2sfz9PlKzdUgnZ5ezkd5SMUPt4adR+mJRUr+CQW4B0dvrHkJ/ynb3gp22LI
+TeZQ4slqulChTkoSc7fKfw2lCAXHpS+bLux1tSHY3n7Twg413ouUZSuk9BtkQ0Ay
++JzcNrpwc+MeCrVgkm3wKxgBfpLEn6gy3o06nGufiWZVkcVNFl7A305Vd+kdntRx
+IS2t3r5tQ61nicoxD/wWR73CzKM6TLMXJ5VE8udF1jvq4hD3mTyJF9wn0WyYe1U7
+SigRf0v58cnDakg2+6ZFjfncM7V4neluizTELKGgagG7AWtKEF6kCH5bbCXW0zTD
+mg1yHeudQG01VBJZDAIb
+=5zol
+-----END PGP SIGNATURE-----
diff --git a/dev-java/ant-jmf/ant-jmf-1.8.2.ebuild b/dev-java/ant-jmf/ant-jmf-1.8.2.ebuild
deleted file mode 100644
index 6abbadf6b3a0..000000000000
--- a/dev-java/ant-jmf/ant-jmf-1.8.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jmf/ant-jmf-1.8.2.ebuild,v 1.4 2014/08/10 20:07:36 slyfox Exp $
-
-EAPI="4"
-
-# seems no need to dep on jmf-bin, the classes ant imports are in J2SE API since 1.3
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)"
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
diff --git a/dev-java/ant-jmf/ant-jmf-1.8.4.ebuild b/dev-java/ant-jmf/ant-jmf-1.8.4.ebuild
deleted file mode 100644
index d81b25768d8f..000000000000
--- a/dev-java/ant-jmf/ant-jmf-1.8.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jmf/ant-jmf-1.8.4.ebuild,v 1.6 2014/08/10 20:07:36 slyfox Exp $
-
-EAPI="4"
-
-# seems no need to dep on jmf-bin, the classes ant imports are in J2SE API since 1.3
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)"
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
diff --git a/dev-java/ant-jmf/ant-jmf-1.9.1.ebuild b/dev-java/ant-jmf/ant-jmf-1.9.1.ebuild
deleted file mode 100644
index cd58b53d0566..000000000000
--- a/dev-java/ant-jmf/ant-jmf-1.9.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jmf/ant-jmf-1.9.1.ebuild,v 1.3 2015/04/02 18:00:48 mr_bones_ Exp $
-
-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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux \
-	~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-java/ant-jsch/ChangeLog b/dev-java/ant-jsch/ChangeLog
index 3e0a2be1b8ed..7044b1400a78 100644
--- a/dev-java/ant-jsch/ChangeLog
+++ b/dev-java/ant-jsch/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-jsch
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ChangeLog,v 1.45 2014/03/08 17:28:03 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ChangeLog,v 1.46 2015/07/09 21:11:52 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org> -ant-jsch-1.8.2.ebuild,
+  -ant-jsch-1.8.4.ebuild, -ant-jsch-1.9.1.ebuild:
+  Remove old versions.
 
   08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -ant-jsch-1.7.1.ebuild,
   -ant-jsch-1.8.0.ebuild, -ant-jsch-1.8.1.ebuild:
diff --git a/dev-java/ant-jsch/Manifest b/dev-java/ant-jsch/Manifest
index 580ab3b91e0d..21c77f62be97 100644
--- a/dev-java/ant-jsch/Manifest
+++ b/dev-java/ant-jsch/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-jsch-1.8.2.ebuild 495 SHA256 ac1094390a3cbbca2fe9d7918293a46c5281e5a25dcabc10445ae555bbea8e4c SHA512 f59e98e78d32d0da865c8d2ef6f02083cc4034ef7dc97acfa263d224349d02f3d01ff3d578549be1a3bd3473f34ca1b230e68444c69c6c8b667747ba9c2fded9 WHIRLPOOL b8d32e43c3f8067045b26257f4129dd1d2f5b95640c70dcc7a0a9a0e2ba431bd7ed81510e96016d4133d11acd8bc450bfb4a776607aef788a6b34d6fd39f9d19
-EBUILD ant-jsch-1.8.4.ebuild 493 SHA256 e61a42461789b01edcb26138ff5230f7e3da26c7a4d8f96fba94e65d6db00d1b SHA512 c37e4d4af76c2d71ae0514dd19b3b932dc835a03eab5270260467ec03a99e848dea2cdd271d75bcf2cf40eca39960fc0e9980081e5020df059b90716e37816b9 WHIRLPOOL 521f45aed07651e9f287bd7e433f342a2e2f7b70a30e5fa1ff4024c5f1e80f881298e702150f13b57b223b97e9b90b15d1e255f10d537b7809292b1af50f618e
-EBUILD ant-jsch-1.9.1.ebuild 498 SHA256 52d72752369a6fac68b0a6333163138d3f12d5be8e85ba263a70c05d6d38ac6b SHA512 a65a8d9e75350da780cec78e86d3942aa0e2a3f3d3bfa648652849424792183aac5bc6788e72d65476718aa8924f2613ff589e0a21254bdfbfb6ed0905cbc161 WHIRLPOOL c7eb69b7652fba621a56447d1e1e8a8e1b227e184c6d38223ad557ddd2997fae7d323933980400028c4580c839ebb6712a7fab43050dcc1409067d8543e76a78
 EBUILD ant-jsch-1.9.2.ebuild 485 SHA256 d08f5e3090b0ef1504218a01ccb16d073543ad1f6b2bfb3f438b41cdde89a97e SHA512 5868ac5e4d5df4845d12ae064a4fd2002bff766d5410d8fe27d640d8079c2a0470831412831bca5e7387ad05fa33fa5053179fad60c08b4a261a012e4713ee7f WHIRLPOOL b5230fa241d7d7fc67e4f55e59fc0c54b438033f606e14e1abe32360c0de90feb133fed68c1b096e82d6879ad6864e588e79e8ea9b01c9ebd74cad43cea259bf
-MISC ChangeLog 5362 SHA256 9be2e27936fff3ef6e8d70a77b14e01d6d5fef1a25dcf681671eb569d2b1d5e8 SHA512 f33fb56793fd3ac56a18163063ac044d23879f3acb0b03ccc7cc8b4817bea80d23b0447795ee35b10b552d3faaf17171640efeddf2e05c8805a8cc50287d0032 WHIRLPOOL b8227fd06a318d1986360d4e04e33a33b8c6ab4b6af76185e9db0cc11d123586d6ba532992232d0d154028d58241c09424b71d89c164b50d1539221fbc2f3cf2
+MISC ChangeLog 5509 SHA256 d9b95ec59fae077097839c2668b36c3564fb9aca3df0b60400b96f1f48f456fc SHA512 fc83f83c4ff613f9e7fba015d257e217cf25b179966b6fe9ef01d71077deb1df59db0e15edf76c44d27a5f800ac8b2169aa951caa95fb32da6b42e22ff534926 WHIRLPOOL 4a8a4b490bea3642a30c903229ce46dbf0da8f9e4002369a29c53919183d7b24b8be17a354d38a554de48b45702f3784fa00e65e16c6de14c929aeefadb0c197
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJTG1MCAAoJEJWyH81tNOV9DFcIAMPsWV4YGQr0WppJe7tIpIHy
-6FhDjv/OzuTegoEnXTRlkRnUPYYO/JKjpSgNs1HMb0baZNIhdAAaf7wppMFOpjhd
-wEodHtkAF4XlYFRyt6E+Yh680hj6sYHRkvFzlimMae1HqTla0urV4h5pFJ97qfdE
-wc6BvE/RLdm5CcCPRqX9/EwPNQbgQ2GoNpYXjfbsxt0MkSl/KfpwsdpewaYDhxiu
-JiEUeEHsX3NwVd7GmqODQbwtcyl1LHTpFDWLuVIURGR97aPeNcoZ8R7O+ivk9mbT
-oaDbYlVSHnNMqwXWm4Gg/b9ygpjaJujm0Wmwv6hshPO/tBQV8Mo7SAr53qlzuSg=
-=0eCg
+iQJ8BAEBCABmBQJVnuOZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kB9UQAKAePl/cZ5ZxiWYiBQf2EPZx
+ymYA+6jtCq9GKy0MytWI2K9B0r7CoUuWYcjFI5gSVBkU1rlHHXgm8sfF8O7DnT37
++ujnzVdsL6oqFGqkl/VU0gO5xRoZSqFos/I8fv+QeasV/1PNfyvztdpSA2um2AZu
+CpvV1XUPX1ZYTesEskTO/69mM+kXq15rfXbRqpwe9/x+0zk0PN3EZ2eJNBAo/hh1
+hyWFaH+iR2YAuDbrCPooYeYG1gu+um8Soe7u39k9F8MdL+0A5vCOMj1PpMLF0LVJ
+qGlKL4cMxFsQEJJ4yHn5wI9nThbTQMsitT/FcjIIB48UXq8NWEMzloI97hxOS3jK
+VgStpJYaVl7aZrb+17zRKMy5O+5ypOORCulAvMQB4auXwPC4cO+dYo97xSkHtAXi
+8SrxqwMeOMoYeZSxb4j3ooOPtrf23V5k13dXimrMTq2mhCHSFUr7ssXOsoDsuP7x
+kfFX5eKa9XgjMbORktnGzSCymgFpiE2X7NrnHbG3P57SCeRlSlPkc6ya3E35LXMc
+h27AJ01WvEB+h7BW/WsuNzQusJOrG18SeDLOpv9pXN9AIb/j3ENbeNFOLHqmXlEb
+Cik56zoeYqAkWGyPPGqG34SW+TovnAO/nZsd8IyoMFnbPI9joVi9zTmkW64if1ZH
+0pymnhuWZmrYqlyz6Ayo
+=HzNX
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-jsch/ant-jsch-1.8.2.ebuild b/dev-java/ant-jsch/ant-jsch-1.8.2.ebuild
deleted file mode 100644
index bbd980083c7f..000000000000
--- a/dev-java/ant-jsch/ant-jsch-1.8.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ant-jsch-1.8.2.ebuild,v 1.3 2012/05/25 11:29:34 ago Exp $
-
-EAPI="4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/jsch-0.1.37:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jsch/ant-jsch-1.8.4.ebuild b/dev-java/ant-jsch/ant-jsch-1.8.4.ebuild
deleted file mode 100644
index 345df79dd5aa..000000000000
--- a/dev-java/ant-jsch/ant-jsch-1.8.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ant-jsch-1.8.4.ebuild,v 1.5 2012/12/05 17:32:01 ago Exp $
-
-EAPI="4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-java/jsch-0.1.37:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jsch/ant-jsch-1.9.1.ebuild b/dev-java/ant-jsch/ant-jsch-1.9.1.ebuild
deleted file mode 100644
index cab333e7fbbf..000000000000
--- a/dev-java/ant-jsch/ant-jsch-1.9.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jsch/ant-jsch-1.9.1.ebuild,v 1.1 2013/07/05 14:18:24 tomwij Exp $
-
-EAPI="5"
-
-inherit ant-tasks
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd \
-	~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/ChangeLog b/dev-java/ant-junit/ChangeLog
index bf2824486c77..f2ca4eb10437 100644
--- a/dev-java/ant-junit/ChangeLog
+++ b/dev-java/ant-junit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-junit
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit/ChangeLog,v 1.44 2014/03/08 17:16:56 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit/ChangeLog,v 1.45 2015/07/09 21:12:05 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org> -ant-junit-1.8.2.ebuild,
+  -ant-junit-1.8.4.ebuild, -ant-junit-1.9.1.ebuild:
+  Remove old versions.
 
   08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -ant-junit-1.7.1.ebuild,
   -ant-junit-1.8.0.ebuild, -ant-junit-1.8.1.ebuild:
diff --git a/dev-java/ant-junit/Manifest b/dev-java/ant-junit/Manifest
index 7d7075bd6d50..2042ee061390 100644
--- a/dev-java/ant-junit/Manifest
+++ b/dev-java/ant-junit/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-junit-1.8.2.ebuild 542 SHA256 4a061ab9dcff085a59bcde70f427193a4375dbcd0dcd73fb9459eff0c469d7d6 SHA512 7b09cd0b0300e2d97714910654c1b7c78174483bc22e3a7fad4a59ca0c4348ac5e8f925e25535fc9aaf3dc43fb8006e987a3cbd184e1397319c2950777b8ad2f WHIRLPOOL 4f6e22a9caf8cf5746814d6a99dea564ae3b4c7853a02b32780a4ca6d9c4d8d0dd852b05c417cff2fb7452100e106a7fe9e50017b78f6a91cd6eb26890af6348
-EBUILD ant-junit-1.8.4.ebuild 551 SHA256 af8b3596256f25cd523b2e6c8db3ba276c9e915fbd9bbb77a8a8b68c05e51411 SHA512 a019e370c08865baf8732ab296d4cc59eab13b4e682971eb2f35e56c776e361ffd5e754f0fd7d21c0a7b071c8133030fe068701a00d0c0ef660ed0a73145ae1a WHIRLPOOL 4058d41eea752de419a531461410d2ad225ab03f99e0d03381301d5d303a20ea2436f429d07f0d82ed49c528c3508c1c02a08777e4cd3099b679074189432ff5
-EBUILD ant-junit-1.9.1.ebuild 617 SHA256 b725b516fc0c20817c6996b6c7ca8f44872c900e9116386214f00fd918691419 SHA512 fb32ad3d8e8f55743acde6be55656ffcce2bab214d649a5e72b9c8c65b2af25968a9ffef3c0b11dd5c079cb09d4dcfe6f76f7b1bc8d128c47fd3d19ea33f78fb WHIRLPOOL c3475db4f01fcf8d4d3734499d89712decd39a2c9b846240ae7a6c8e9092b62fbf14cfe90afa8b0bfac783865d2e2f2b418c7f08e328debe24d73dffb8d1c624
 EBUILD ant-junit-1.9.2.ebuild 604 SHA256 d8d5f90c2f75f0ac5b5955256bf150f7fa13d8d061b64825fb1051372b3e1970 SHA512 c096ee553cf4fee16ae491be2c4f6c3fd5049fa36e613aaa04e8f4954a55e16af89b44938b5d8c08e5286d29bd9164d0cf6dc9832bc700265b2126f13438bdb3 WHIRLPOOL f5a62c8a19bd8f317e454961ad8af0acd3a32f5f8dafc589b6c58ba77e02845df543f8d0987daf616c87da85cc281d5f531c7e169068ca74a373918ba52d24bd
-MISC ChangeLog 5239 SHA256 99c4006fc673f1e196a7d3e952712ea4c15ed64fd4c7b0addbe988f7dbe19d33 SHA512 eafad33db7cdc0c41f710e4ced213a865a4ca1fc358ebc22efc480e10306127f94b2b2e9d761e0e2e33d5eac7e87ba57b200678eef4b7a020feb9af9af585f71 WHIRLPOOL 58d5fbfebe701a868f2bafc5293abfa441fcb81d68eb4b48ffa3fc5b07b0b216c627c4ec883f2bb32cc4bb9d3a4db308b2e268aa1a058a23a170d4c5b6a0190a
+MISC ChangeLog 5389 SHA256 103e37d4508f5af07a0e9c052fec11f39622cbd9c4780dfeeb0bea5ef798b32b SHA512 5c7e4e91668026f18517202f5911a425fb5318a52c5369c6ff839ddd35fd24d23e9e7c61b667ce7dc567d2e897ab35e9a325bd8e6e7035f2eeffbcf326003f23 WHIRLPOOL 670c456fc976e5e7524ceb8075d8a0d2688ea2a17fafe65aeffd9bd9dca1819eb14f6b1001829abc79f25ca029a276522eb98ab6311d032ce40675c765ecdd8b
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJTG1BnAAoJEJWyH81tNOV9p0wIAKWNTCpWLKumz3npy4+FmMIQ
-MIrNfFk+Azi2l8lc1rZtMKZPN0w/AboHQeDbPEpkxN3dlfsraBpEscifM9xOOudK
-30aPLRILMTDYGIwsOuIUM8JSTE+1LBOT6Yz4BP7eVBqhg3+bbEWq7Ixz01DTGxkv
-BPxgCFWS9AkRaWgQFMt/D/ncDMPCcS31JyKd+WEH3HQ92iSdI5jgSwa7k0MSz8kT
-CkmYjWRCpJqTrCeW0/F1tfIBavgAJyie/nUzboGkDw/Ozo9wKsm1cEkmCdnyIW2u
-HAFjolqNIki51Z2nAXCNnBpWqdiX8w2triJisKtyeg171mVWWK66+1TJi7+kehQ=
-=cVfv
+iQJ8BAEBCABmBQJVnuOmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kSlUQAIWrgVFy3zT4uCbDFrqpd0KI
+A+1PpPU2nfhML/D0ts+96n5d/L+Rddj9TxcleR841Y0xhRrTt3SzNgwYYuwBWih6
+Rq+7Y3IwMFPcQu/PM3fHgy4KSxmolT3noI2ztEtwgov1tUWfBp9wM5x00ZCH/lMo
+jLovHVVSbNJep5r9ZLQ/44UKBn/vu1CwRHQnsCnT/XAG7olIqTFljmKX/0nZa1D7
+BwJHsprGmz6RZ7WqMtEAZNo0ZrI/1ruB1I8nAHtPyYU1glWEVjNtpZOVIl2wZtpJ
+gjYZfHNA4SDQNup7HATfyPfQFf5pNdk3vNYiZ2COWnnPv9Jz8tTsHOVnlrPD3PDi
+VRh7kyhA828LsIUI+WRFoh+qiYis4kcFPKmpj2lcg1WVIsGPDmsqbaEBj+9zkdsp
+gYRtFqfN8nteGVjY2qfTon8yumkOOKc0EVa2CtCYLDQ3gAb+nFdyNmgNOsUG3JPz
+hBBS77RKfySj89e2OMJmyWYxGNqBZqxroLMB3uhwWi9uDiq4sTK25GtynVMZhp2h
+mfEeAsueSNUu7LdmWC1gCcf7hGhv0qyKGdwHcUtUXSuMJZl5OAiB6tMcwoeaWrrm
+gsLhzXXNiu6LntyK8DDarSpm/A0+/im9rnDd7AKzxegt1ZSAxCk2aUQPb0PE1oQi
+rV3D0rayRMeDkFNufwUs
+=An4i
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-junit/ant-junit-1.8.2.ebuild b/dev-java/ant-junit/ant-junit-1.8.2.ebuild
deleted file mode 100644
index 7035d56ca780..000000000000
--- a/dev-java/ant-junit/ant-junit-1.8.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit/ant-junit-1.8.2.ebuild,v 1.6 2012/05/25 11:21:46 ago Exp $
-
-EAPI="4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-java/junit:0"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	eant jar-junit
-}
diff --git a/dev-java/ant-junit/ant-junit-1.8.4.ebuild b/dev-java/ant-junit/ant-junit-1.8.4.ebuild
deleted file mode 100644
index b27d8eec4752..000000000000
--- a/dev-java/ant-junit/ant-junit-1.8.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit/ant-junit-1.8.4.ebuild,v 1.6 2013/02/05 05:50:44 zerochaos Exp $
-
-EAPI="4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-java/junit:0"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	eant jar-junit
-}
diff --git a/dev-java/ant-junit/ant-junit-1.9.1.ebuild b/dev-java/ant-junit/ant-junit-1.9.1.ebuild
deleted file mode 100644
index 200f43835a41..000000000000
--- a/dev-java/ant-junit/ant-junit-1.9.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit/ant-junit-1.9.1.ebuild,v 1.1 2013/07/05 12:17:48 tomwij Exp $
-
-EAPI="5"
-
-inherit ant-tasks
-
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd \
-	~x64-freebsd ~x86-freebsd ~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/ChangeLog b/dev-java/ant-junit4/ChangeLog
index 878cbc500696..9a8290d14fb0 100644
--- a/dev-java/ant-junit4/ChangeLog
+++ b/dev-java/ant-junit4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-junit4
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit4/ChangeLog,v 1.32 2014/03/08 17:41:34 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit4/ChangeLog,v 1.33 2015/07/09 21:12:17 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org> -ant-junit4-1.8.2.ebuild,
+  -ant-junit4-1.8.4.ebuild, -ant-junit4-1.9.1.ebuild:
+  Remove old versions.
 
   08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -ant-junit4-1.7.1.ebuild,
   -ant-junit4-1.8.0-r1.ebuild, -ant-junit4-1.8.1.ebuild:
diff --git a/dev-java/ant-junit4/Manifest b/dev-java/ant-junit4/Manifest
index f1fd3138b3b4..91c2d90ef136 100644
--- a/dev-java/ant-junit4/Manifest
+++ b/dev-java/ant-junit4/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-junit4-1.8.2.ebuild 944 SHA256 6d056de161c47b56172316661daf46113d5e911cf3bed7ec336b29d3b644367c SHA512 c37098cb11a9eed5875844942596106664c5b1ef1b95e4dd475e82cdc0d31d8784ffd7155631e7dd852453fee1b17f0bc7cb3b17fc245fa4b5b3b42c1034d8b6 WHIRLPOOL b8914c5c941374c1a7ec77f81c02a8bfdf38cede0b17fcf53de1e4451affb01b4d546585448fb75514b63cb0649ffdd164959872b9b5f07d49e37de25a28e613
-EBUILD ant-junit4-1.8.4.ebuild 942 SHA256 98df4f6f9f66205e5b2076a275bd97329b33260dbaa3fcda6cb4966d69ba81de SHA512 99800a224558bcef7c40cacd54c507aa6f39c700f2aefc8f2d638dd71071d0c67a4dcb0ee5939b5948b11671e3ee36af4b7e74e8c2ea9abcf491ffa569f03db4 WHIRLPOOL cc6c1eafed7cb76e7867445d49ac0607443ad4b25afa9cc95aa3a46d5dc3cfcd06a77198eae643997c72e174dfa9131ad16b670bc9ee0b5b652987c974c14b23
-EBUILD ant-junit4-1.9.1.ebuild 1021 SHA256 df4055e530bb09dfd4b1c3b4c0a0dd15000a117e5493bdd0e61e956a7a70c717 SHA512 c4ad86b9d52827a57ab329940d792369c87c9b1a35b109ace6243e7fd440f5776d9b8034ce178aadf664308efe791f84cb6819da2312c3cd4d4545be227dcbfd WHIRLPOOL c8eab5998f2381d92199b56a5265b93df3be1fa912110856261af419cda101a4cb2406cb8826c3181759190dc42c43eae6df1963fa435eb450f790ec0fd59af8
 EBUILD ant-junit4-1.9.2.ebuild 1014 SHA256 c36ae3b90b2dbe3487c4ce7f693d413b01b807eecc58415acb1bd646ee16c978 SHA512 d2258700e52c84edcfb8cf2df4031c9ea432e3bec316e6265e805cbca27cffd7c87b52c76793837bef297e4aeafca2c00251253f08d606fdf44077bad191ab7c WHIRLPOOL 415a7ae37dad6e7b69ad47e902ed189e2edba1573ae0fbf42c4a25d83abed737aec6799c6fe241341f7f509df1068913e25e652fa57fec669f4248929d2450b4
-MISC ChangeLog 4200 SHA256 f7ecb873ed5960b240f8e5ca604c486445b160c8f2a7f13531d587f2fa517b29 SHA512 e42ffce1799b5aac8cad8103416d1a4cf3ee6988440a1db952b652b3d2b33db78ee85bf82d9c0b37c3dcdab616576b8443e1cd7d0de74890b356d5ef8e728e39 WHIRLPOOL 88c3b556c279801350c88d7d8c280ea62bab5a88a1fe8ba6002c93d3836728474f0e0c1ed32139b87aa34d9985563f0957153dc79b7de6001a4fbf256dbfb8c6
+MISC ChangeLog 4353 SHA256 3e1eae91f65855a79dfeb054778f9ff54f4169b44dd3188672a8aac0bf5d591e SHA512 a246afa0ee61488a595337d2788583a7659da54438e43596d370c6623332bf1e522f5ea6f9f67fd316b7fbed20f6aafbc040ca34f001d3db37d3096e43769092 WHIRLPOOL 9126022c1ec8d844ff74445ecd027af83b12a5b455ab6a846294b1fab841ac2f9516aa7a7e7cb33a32bdbb4a6ee256c76f56cf1c526acb7bcfc48bdcc950b987
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJTG1YuAAoJEJWyH81tNOV9t+AIAJ7tvsd8eTDqGwPJvIU1JGdo
-Qh5KLwZy3mYpAFW7sll/ixC4w7+NHOn/52XWrqUsB4Gd4Qxx/9c0W5Zs+7OUIDo+
-MVLq42IkV1ZetNRL9x0xXdGihNB6U9t9PrOkYtQbQUHmQD6hcpVx7tQVOT3AlC6n
-FtzuJDq/w3pBwbRWVHUc8p2zCNo5XJzvGgSAq8GtzZjS6w20iWTy/zorDOt6tXDp
-NbiOJ7iM/JamJitqzsev+AX3DBVotdN8YWUb9DZkvoJT7BYnR1rDVNfDHBskSwYP
-JcVZsJ/oKV7aYJR94Lt3TTnLavUpN2jU9VUCQ9ugRzdiXR1NKwvTb63HI3nKjWE=
-=3WpA
+iQJ8BAEBCABmBQJVnuOyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kdigP/iaOqMmhQFtgXFKHYitQD9Fy
+bXfTH6+G9xzTtJJkScltIFrW/17Z63tDdkAY1BS9C1aTPIGPfqUEdCXp84CX7rj6
+sqNYcXGjinIDV/0H5I2j4fJwQG6RAa/EFCij6j59DgHgfbbg+2mUrv86Uu0HZJxN
+MwkEZ/K6litP8/nPDO1DM8eeWvy1BHiQBHxqeBiq4T7ZE0C3xfdQLAJJBkJ8CRXB
+9rbFgvGJJe4+QF0+RXYaqN2mt6OjI/C4GPMDj/YEr+PnyWXOXVOKLnXlX2J7l+NX
+Tep+9bMQQMFDY5ITAgCyKQzoxEFczEHOWaICqC7sysDKv+Qi650dSeCMJR1G2yxS
+RyCsZa12gKOsn6sZXtKHXqv0uKEWxogR+v8oW2BUIA5nDgEOjg23Mq9Em6pd7LBE
+8bp2rJr1XBJemB1wcpj3pMmXP+L0S2Q9QEnNrG/YnGOl54jo4W9LIidzT8Rw08HL
+1QPtDLPwj4lKEQXvEYlkSXkpbWz9ShfT7u4VwgWYfsVyg+MKKhBSwhpuMqgTL40d
+ecEKsAaEItzwMSVQSBueAnl5loM2zykAQDAkmGDHL3U8kp367kEOXCHF5wzoC1/o
+JTtB8XeIehyK/tNtJAUOlbawMELtZpYdO3sH/cFbOGsANgLTHoWv0ytzN31iXw0R
+qkdFzUNoQQfMBZKbfZ78
+=QNSm
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-junit4/ant-junit4-1.8.2.ebuild b/dev-java/ant-junit4/ant-junit4-1.8.2.ebuild
deleted file mode 100644
index 10e878b2d919..000000000000
--- a/dev-java/ant-junit4/ant-junit4-1.8.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit4/ant-junit4-1.8.2.ebuild,v 1.3 2012/05/25 11:22:16 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_JDKVER=1.5
-ANT_TASK_JREVER=1.5
-ANT_TASK_DEPNAME="junit-4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-java/junit:4
-	~dev-java/ant-junit-${PV}"
-RDEPEND="${DEPEND}"
-
-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-junit4/ant-junit4-1.8.4.ebuild b/dev-java/ant-junit4/ant-junit4-1.8.4.ebuild
deleted file mode 100644
index e96507377d79..000000000000
--- a/dev-java/ant-junit4/ant-junit4-1.8.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit4/ant-junit4-1.8.4.ebuild,v 1.5 2012/12/05 17:32:44 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_JDKVER=1.5
-ANT_TASK_JREVER=1.5
-ANT_TASK_DEPNAME="junit-4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-java/junit:4
-	~dev-java/ant-junit-${PV}"
-RDEPEND="${DEPEND}"
-
-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-junit4/ant-junit4-1.9.1.ebuild b/dev-java/ant-junit4/ant-junit4-1.9.1.ebuild
deleted file mode 100644
index 74902c4e73e3..000000000000
--- a/dev-java/ant-junit4/ant-junit4-1.9.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit4/ant-junit4-1.9.1.ebuild,v 1.1 2013/07/05 14:20:20 tomwij Exp $
-
-EAPI="5"
-
-ANT_TASK_JDKVER=1.5
-ANT_TASK_JREVER=1.5
-ANT_TASK_DEPNAME="junit-4"
-
-inherit ant-tasks
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-
-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-nodeps/ChangeLog b/dev-java/ant-nodeps/ChangeLog
index 79fe42b3a582..3c3e6e664767 100644
--- a/dev-java/ant-nodeps/ChangeLog
+++ b/dev-java/ant-nodeps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-nodeps
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ChangeLog,v 1.47 2014/08/03 19:17:58 sera Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ChangeLog,v 1.48 2015/07/09 21:12:30 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org> -ant-nodeps-1.8.2.ebuild,
+  -ant-nodeps-1.8.4.ebuild, -ant-nodeps-1.9.1.ebuild:
+  Remove old versions.
 
   03 Aug 2014; Ralph Sennhauser <sera@gentoo.org> -ant-nodeps-1.7.1.ebuild,
   -ant-nodeps-1.8.0.ebuild, -ant-nodeps-1.8.1.ebuild:
diff --git a/dev-java/ant-nodeps/Manifest b/dev-java/ant-nodeps/Manifest
index c815bbb55d21..3c0709b4ee9d 100644
--- a/dev-java/ant-nodeps/Manifest
+++ b/dev-java/ant-nodeps/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-nodeps-1.8.2.ebuild 1196 SHA256 387429234b457d804030e42711addb41982723f998c16a0decc78a8431313444 SHA512 35ea1453bcfdcfd09291a025463f4069e2b70bbcfd468fdd2dfb2e4e70b7508fc7d22ec3c0fb590a51fd68914da18e7b2ac94b159053e644e2b8fa1aba2dcd04 WHIRLPOOL df4ae9bdba599c7b2a092d26f85b56500ae69181aaafbf9847932a12c7abef558b723c38184cec6258dfabacebfcf51ebf49347e68d0fb032e6ea0b8d349862d
-EBUILD ant-nodeps-1.8.4.ebuild 1072 SHA256 a90a766910b9f65474b1c9e0e2ebaf54e495c2a9b97258f56bb82971b967ee6f SHA512 39ceec6373be007b00d3783fbe2d97c63ce5e97cf52fedaf993214eb8e7bce9adedf5a7896c660ff42f1bad4f7aa6cce0ca63ded313b1db060be1ad56ac40d4f WHIRLPOOL 08c77716d8b16b3bc4f01ff98ace300b316b352da126ba1fbc467e649ca76ec6919441753b55f8c436de6fa54cbd5c7f75741cdb9c5518420612f0a6c5814d19
-EBUILD ant-nodeps-1.9.1.ebuild 1090 SHA256 ca2eb8a90af4c9dda09cf717eec66953462f936dd992920264a2b085d2551d4d SHA512 c089f12da40995acb84328598d35eb9b5488215bc1c69dc7b44d2cc58265786da54db6b4b030a0b7361deb1f954498277887aeaa06cef590b817246c6a1a91ce WHIRLPOOL acba1c7ed42bc2c8b7a8f856564930ff0b905658f9ab51fcb8141fedc131600a71a84fd6e3462dd0a48cccae9f2e379e6f0921251c6589aa8c70735b82ab26b8
 EBUILD ant-nodeps-1.9.2.ebuild 1083 SHA256 2d025752d2a2ea949c136f9b34975d35681f40047d1aafdcdf80f3117213a513 SHA512 b7112e1d06b6175b9b10066dccd77649a4ec91b3f8ad11269b35ee14ac0d3a4f2c47fd1c8cfff7fc6e102f571345f406d8b6d1394a6551d9de6cc17320a3f347 WHIRLPOOL 363d53f7bbc3258cb4f79c763999b5d96a11d8a253bdcd57278fef86b0b32b66526a98e7faede0c9e34068742a3bb5cc801f81792c0b8f2cba07e11071a556e9
-MISC ChangeLog 5615 SHA256 b035f1db5568507157014c3ef2c5c5bb5b89493f2769152b71686bb21a4d10ec SHA512 7d9c6a750c85c1b031eff1b38036c538b809197789f21f76c5af9af26c7ced8c8e5a568983b993e9e279304e1b4187dfef4b29fb350159d9674963558e7834e9 WHIRLPOOL b0282acbf8cedc207ad0265e885819a2ea650e98cd37eca12f81b1a1fece6af3e74f59427be1cc2b5f78e85953a8c165b81164c857e9de81a56a7d4edbcf595d
+MISC ChangeLog 5770 SHA256 75f2ac38e6a2c8ef484ea0c7c986aa0c2a2f884ed00a01dd6b5660f087e8c508 SHA512 cc755378e54da5532ce0a268b4175c292764f1947c1f4766fbe998e0d86a1ea47739c4668cbe09e7d24492d96c41cffa5a41224913d59e764d911e5503ec8d35 WHIRLPOOL eed58ec3d5155ea7bc3ea07eb2ef9fe79cc23ef71bb0f85b3705e8cfae815880e88a59eff9f8470adb7f1b54c72e2b89ca40dd1abc2122304657bd3942d3f588
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJT3oruAAoJELjwI6Q8XPda2/QH/13A8MhUepcAkMVzpLNuY/6Y
-djFn1Q0S4vfAU/JPAJ+Tyq/sgtqhG7GNjrJUF2r3Cjpw5pmivrZXV+ZtTBOUcU8a
-JOJylq6vCc4d8heuq+1ku9wdFFiveHr4is/pRdDY00u+lCLOC8ogVqVtRKZMsVvJ
-BH1WA3hkP95Z8Ex/Kh5QLNE6LwPOktOyZzrdBcN1QzManSccvFGZJNhRIugr+vYM
-oBpGVoK9xN39a9D5eXDVHlLdC19y0rc1qUlS4a9FO0KcfFWUMC1X04Fi5VYxoQz7
-wkdtw09g4nHTn1sHOMPRZ+20RwSsY7gk4DDFX4UjLWpPZeRr1ru/3F11z0VY3+4=
-=ae1e
+iQJ8BAEBCABmBQJVnuO/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3krDcQAKDqpr8kXAnDsmymd/1t2M7R
+Xe8EoZsex1piTq2soma5zYnLFZuYBzWt3/uyVwlTTv9IoAF6/uLfCYzTnKoiqdDL
+PEb4fis+2PA39ReK9SAQmjksUh+5QLI4CPpj04BDcJ5tSG+e93FXK6htQS5ijCKb
+R52qNKCHWFinUVh7L5RC6kJjh7xPR7d7zin2c6yY0Xuj67FGVO7hXztxlmP7vSgY
+/wxGqrRC4Zc55ZBfcWZpQFitulAkxwXRchPTxD+Hfi78pGx7enOyzzMfZeqZ5qLO
+pwon80yz4ao01t3m0lhxek4Rty+s17IMAR/NJ1+3TLSCvCqKCEPRVJmZuHZ4p3tN
+ErRrIBJt9nBwymsZU5e2Rk2eBrO4KF3frqy1/44TfVEPkvscPs4EcDhV6qHao+rB
+312bnyRZf4fonQad9cbhEXscotxxeW3/gLXOCk/kzLCia+UKqc8fRvu9PcCT1olL
+Y5cHuCqAEfP0yDWejlGsr9LH6r1dGG7VlDOv2p1QYGB/gmPtpIJIQakz2P3U0Ju6
+W8RsUt7T2oHWJtYxeSnT07qep0Zdo/jIDM6JVIKc3A2gnoNf/keTQEuiiEvGXWVW
++ynSnfzW5+nvj8aOSx/Q1uoqDReJiTywYl6n4pNP5ZWH1uAK9ptjouzKgsy5XhgM
+AspWo/Mg76q/KKJUMnpg
+=IHWL
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild b/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild
deleted file mode 100644
index 0a02654d04f1..000000000000
--- a/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild,v 1.8 2012/05/27 21:26:45 sera Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME=""
-ANT_TASK_DISABLE_VM_DEPS="true"
-
-inherit ant-tasks
-
-# to disable vm switching
-JAVA_PKG_WANT_SOURCE="1.4"
-JAVA_PKG_WANT_TARGET="1.4"
-# disable QA notice
-JAVA_PKG_BSFIX="no"
-
-DESCRIPTION="Formerly Ant's optional tasks w/o external deps, now compat empty jar"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4" #jar
-RDEPEND=""
-
-src_compile() {
-	# the classes were moved to ant-core in 1.8.2, this is just for compatibility
-	mkdir -p build/lib/empty && cd build/lib/empty || die
-	jar -cf ../${PN}.jar . || die
-}
-
-src_postinst() {
-	elog "Upstream has removed ant-nodeps.jar as of 1.8.2 and moved the classes to ant.jar"
-	elog "This package thus installs an empty jar for compatibility"
-	elog "and will be removed once reverse dependencies are transitioned."
-}
diff --git a/dev-java/ant-nodeps/ant-nodeps-1.8.4.ebuild b/dev-java/ant-nodeps/ant-nodeps-1.8.4.ebuild
deleted file mode 100644
index fd088599daea..000000000000
--- a/dev-java/ant-nodeps/ant-nodeps-1.8.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ant-nodeps-1.8.4.ebuild,v 1.6 2013/02/05 05:30:36 zerochaos Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME=""
-ANT_TASK_DISABLE_VM_DEPS="true"
-
-inherit ant-tasks
-
-DESCRIPTION="Formerly Ant's optional tasks w/o external deps, now compat empty jar"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4" #jar
-
-src_compile() {
-	# the classes were moved to ant-core in 1.8.2, this is just for compatibility
-	mkdir -p build/lib/empty && cd build/lib/empty || die
-	jar -cf ../${PN}.jar . || die
-}
-
-pkg_postinst() {
-	elog "Upstream has removed ant-nodeps.jar as of 1.8.2 and moved the classes to ant.jar"
-	elog "This package thus installs an empty jar for compatibility"
-	elog "and will be removed once reverse dependencies are transitioned."
-}
diff --git a/dev-java/ant-nodeps/ant-nodeps-1.9.1.ebuild b/dev-java/ant-nodeps/ant-nodeps-1.9.1.ebuild
deleted file mode 100644
index 986857295cad..000000000000
--- a/dev-java/ant-nodeps/ant-nodeps-1.9.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ant-nodeps-1.9.1.ebuild,v 1.1 2013/07/05 14:22:09 tomwij Exp $
-
-EAPI="5"
-
-ANT_TASK_DEPNAME=""
-ANT_TASK_DISABLE_VM_DEPS="true"
-
-inherit ant-tasks
-
-DESCRIPTION="Formerly Ant's optional tasks w/o external deps, now compat empty jar"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Dependency needed for jar.
-DEPEND=">=virtual/jdk-1.4"
-
-src_compile() {
-	# The classes were moved to ant-core in 1.8.2, this is just for compatibility.
-	mkdir -p build/lib/empty && cd build/lib/empty || die
-	jar -cf ../${PN}.jar . || die
-}
-
-pkg_postinst() {
-	elog "Upstream has removed ant-nodeps.jar as of 1.8.2 and moved the classes to ant.jar"
-	elog "This package thus installs an empty jar for compatibility"
-	elog "and will be removed once reverse dependencies are transitioned."
-}
diff --git a/dev-java/ant-swing/ChangeLog b/dev-java/ant-swing/ChangeLog
index d405d0f9d3f7..14e5c7e65486 100644
--- a/dev-java/ant-swing/ChangeLog
+++ b/dev-java/ant-swing/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-swing
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-swing/ChangeLog,v 1.43 2014/08/10 20:07:46 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-swing/ChangeLog,v 1.44 2015/07/09 21:12:43 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org> -ant-swing-1.8.2.ebuild,
+  -ant-swing-1.8.4.ebuild, -ant-swing-1.9.1.ebuild:
+  Remove old versions.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> ant-swing-1.8.2.ebuild,
   ant-swing-1.8.4.ebuild, ant-swing-1.9.1.ebuild, ant-swing-1.9.2.ebuild:
diff --git a/dev-java/ant-swing/Manifest b/dev-java/ant-swing/Manifest
index b682fdf90f67..565d0f2f3963 100644
--- a/dev-java/ant-swing/Manifest
+++ b/dev-java/ant-swing/Manifest
@@ -1,14 +1,27 @@
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-swing-1.8.2.ebuild 510 SHA256 4ede9553247daac9e3c1119c2a38148b2e6a453b0ca25feb126105219283e695 SHA512 628477c4829f52512dd054c05665ba97e168c7f99b5bfa1bf2671468852200802e4ae187faa1afe4ce25e92ac537272db4ea3acd1583ba7b58fcd1107d7f4fa3 WHIRLPOOL cbe5805af40079aa5c0a9c1e96f1b154cca0dcf40bf1176d60acfea6c9d6397f8d8bbfc0a7005bd3255cd864fe6fab05485f9ca49d31679841afefda08c776ed
-EBUILD ant-swing-1.8.4.ebuild 508 SHA256 a94cabd41ba101db7f79ae9d1eec1821392d0c4afa877d37db54b049af986a05 SHA512 73f206a272cb8257d9eeea189e9828ec7be54e63f7fa74b0720e677451ef59f967af8755576208dc8a02a323d871ff16884df67a4928524f54748494738749eb WHIRLPOOL 98f5d41b89633c66a770452e81b5515215024d5fc592100dc2808f3565725585f3bb852a7cf82fadf9f070c3b0ee3040ce8d1de08d6fdea2fbc1305994aaeba9
-EBUILD ant-swing-1.9.1.ebuild 534 SHA256 9a1e9565d021ee0a2775074dc6b523b57e4849a3e7216e7fbf7fba6039b4ed50 SHA512 18cc31b89e1f476ca54768ae7d4d52d6b03bb61b861c26c7f8da2bb94b05519b8ce66773071e56d1031d6fcaca53ff0afb71970e0d332fa38565abada293746c WHIRLPOOL f80804fce1bc8cc9b44b4e3d39b640db699ba8cac5cb5caf86a16e387a62e2e860e4e21a77ed12725c02fdcd8820a618f686533bae5aebef957139eda9d913c6
 EBUILD ant-swing-1.9.2.ebuild 521 SHA256 5f04ff97a904e3b0ea72d05db475af64c7d77fa886c060e4c8f2d674e1037cd9 SHA512 45ef9239a7ba42e397eeaa6bf9a48739559b644ff30a3765df552dae66885ce8d9515f14ff199278d15aa64ab6a360ef75960f10ed28de10c55a971fa3f47dca WHIRLPOOL a0eccdd53c3e9ca06a6ea7769762336e78a35276b71b40c77db34cd0f4bd1c7cf11cf208b91900c491bd77385a65d5ceb38a37b73123a9144adb83e23976a32e
-MISC ChangeLog 5285 SHA256 aa37e7c0cfd962a96a82511ea4cb613dd9408bb0e1ec649f5e85c5615cd0a5d0 SHA512 847aaff1ed1233c6ca6841ee1cc5a85fe66a6c6ff919f575eaa5f1ca6b1126acc3c1d3dedc445e26677c64cc0e74713f6e9511ead14d1e55a60d75f923f18a77 WHIRLPOOL ff650054137a0ad844ac80b8f6d96a0bee8ffa7201ff8cd76205ef3d8bb8b1a1d6fabaa537d885c0e06f4f254160d000a1565a6b8f6ecc61d094747a7def42c7
+MISC ChangeLog 5435 SHA256 1360668b2e7b69b0281aafff9ff2e1f6276bb7f0138bb6c2fe114ef1a8d497c0 SHA512 308cf386021a3816143bb35f28b7c0a744d4edaeb40e4bf9ce54e9d85c67145b2f4607e55860f9b80a236ceb6e021d17c8a3f65eace4ae95938f802478ff8425 WHIRLPOOL 7d69c5f5b7efee8fa284d454d98b10b9dbaaa1035c2dcc4e75fc2964d7ad8a53ffbbc9faf4a256240032b8f8b847e46725d9a55241bf7c66b56e00433969c723
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1
+
+iQJ8BAEBCABmBQJVnuPMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3khE4P/1vtpKrmDTPNnenB9hkdLnqT
+51Nln/obUGijvMkAWNXjdx3uRsSC0GQ+JCQ7aVCUkIlquBcTGnuv+YmPKPHKmpS0
+9d3uttUQw4zZ6iWJNplEq5SAA0fQ9ZKMu6GbrSHsiVhyPmpbmIxqW5KpAyGNC/lv
+VI5PYJoQ9aluE2KElli5CWn2sGpQ1EZmZI6XEVJsQwykL6C3zDr4gr9P6Lb01FT3
+CSLMB2kzoA85zfP/ImnxldG+jveGaBWdKitH/XLizciB+qiERT+eTHIsQpJa1sEh
+f3DnmJQQsnekZ13jk8UluQ/hr32UZPtO1ygSaGlrGZE9BCbGgrBL5QWtA4OXZddN
+fy8d9N9wOIVLvFKtLfvxYAL1Jr2FRJfUQOHnTt8uA/tVcNRZV3jlGKw6XDHb3wUR
+ynsTRbFnoZ4zx8k8w/keo/vRjfby+CAw2IZ7sk7jY6DG/dqVtLaxO6da3ucAF46h
+F81TF30qtAupsKr7O9bEbkqvOYtTUhC+e83GuU6te+rx+5eqPpCltz2TAP9YPTif
+AwiiF7wrKr2YK+frG1IbHNwGp2tY59J1TeUMVZeWbp3oKmg3rYVwDIu7sK0dZVMW
+m5CPxDUnj2B61NUPGMnaFRAabH4YdBXd4bZE8ds5XyrGhNu/6NXudSLPG0Ao0E1R
+Hvav9z+zBawfNA7pCETS
+=WKUt
+-----END PGP SIGNATURE-----
diff --git a/dev-java/ant-swing/ant-swing-1.8.2.ebuild b/dev-java/ant-swing/ant-swing-1.8.2.ebuild
deleted file mode 100644
index 69b164ca1874..000000000000
--- a/dev-java/ant-swing/ant-swing-1.8.2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-swing/ant-swing-1.8.2.ebuild,v 1.4 2014/08/10 20:07:46 slyfox Exp $
-
-EAPI="4"
-# no extra deps
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for Swing"
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
diff --git a/dev-java/ant-swing/ant-swing-1.8.4.ebuild b/dev-java/ant-swing/ant-swing-1.8.4.ebuild
deleted file mode 100644
index 7902dd616164..000000000000
--- a/dev-java/ant-swing/ant-swing-1.8.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-swing/ant-swing-1.8.4.ebuild,v 1.6 2014/08/10 20:07:46 slyfox Exp $
-
-EAPI="4"
-# no extra deps
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for Swing"
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
diff --git a/dev-java/ant-swing/ant-swing-1.9.1.ebuild b/dev-java/ant-swing/ant-swing-1.9.1.ebuild
deleted file mode 100644
index f7337ee545af..000000000000
--- a/dev-java/ant-swing/ant-swing-1.9.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-swing/ant-swing-1.9.1.ebuild,v 1.3 2015/04/02 18:01:34 mr_bones_ Exp $
-
-EAPI="5"
-
-# No extra dependencies are needed.
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for Swing"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux \
-	~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris \
-	~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-testutil/ChangeLog b/dev-java/ant-testutil/ChangeLog
index 0feba0a3aeb8..09263302a4fd 100644
--- a/dev-java/ant-testutil/ChangeLog
+++ b/dev-java/ant-testutil/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-testutil
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-testutil/ChangeLog,v 1.25 2014/03/08 16:27:31 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-testutil/ChangeLog,v 1.26 2015/07/09 21:12:58 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org> -ant-testutil-1.8.2.ebuild,
+  -ant-testutil-1.8.4.ebuild, -ant-testutil-1.9.1.ebuild:
+  Remove old versions.
 
   08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -ant-testutil-1.8.0.ebuild,
   -ant-testutil-1.8.1.ebuild:
diff --git a/dev-java/ant-testutil/Manifest b/dev-java/ant-testutil/Manifest
index cbb2ef245f69..81f3abd84522 100644
--- a/dev-java/ant-testutil/Manifest
+++ b/dev-java/ant-testutil/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-testutil-1.8.2.ebuild 953 SHA256 f5c0309069c6142568aaabce60c2c7eb4e44627d64194eb67a083f6771f4736e SHA512 349e5bffa27a40dd6da59ad9737062859cd29babb71e3c7c219bd1a3fbc3c60bad1678e84311753549406a3c1e551c2e3779ae7825c1a0a95bf91b6c33017325 WHIRLPOOL adb6f1734afbf942e169f835f7eef8dac77fe0022fe26183139b6c2f57ee4fea9a991373e6570c33e48c98cd4d4bc10d4304beeb8b174cc20f6312f1ac10140f
-EBUILD ant-testutil-1.8.4.ebuild 951 SHA256 6ebd03ec7bea438865a3c82973ccaa841f9cd68498016186d62b6044726fedc9 SHA512 f66541f5be1457b94b05f4762cb6a9e5895b528d892a48586e38ead63c372aca9c442a98caa39f274bdea71270180782f642afe3d0b810f4af67262482b34576 WHIRLPOOL a4e5f93e2de989a900a9ede06ed5417263872600a3892d4a8277cdfcfccaeeb3624b1036c67d11d03aa61ef0e2fd76cb30eebf75be954a0017fd77cd15dbde71
-EBUILD ant-testutil-1.9.1.ebuild 1031 SHA256 d8e620cb09dcb73d365cf0143773bdb006b61186f5744e2f5a9c3f9baa59e0a2 SHA512 80d12819e3a45035bd0e8461fb95b5cd2f4cef7fc248024fac2d0ad9cbda88cf691235d7e28150b51e79c95a17eb080d56abdba81687b50b99f1c84e6cdc7157 WHIRLPOOL 6bfe110f486b4738fab4c0399b54bfd4579ee2c357eb827d8b6563a50b1bb530332bad9258c74d44469ec4ef385675a07eb98fd3ec084ca773c79c8428b0fa01
 EBUILD ant-testutil-1.9.2.ebuild 1025 SHA256 33f35dd0d87388cc061cdff47538b3fb38397c955acf73654595b01621956b85 SHA512 09b46a8005175edb44629aca91265a07333026ea5f567dc6ca85cd51f6bf071df3e4f38bd22a3f6b889b78a2863f02bdc8365ac1e614c2682a25c855146c936b WHIRLPOOL 869c8dcdf6871c498d2237d9c85669f907c522b160d8f302c180be2e5ea2c755a0322043e9ca41e692dcbfec5289a82111164f7fda8bed511164c5d6555071c6
-MISC ChangeLog 3409 SHA256 526ef351a55f06198a3ff40b761478960103222b54c34d2e68f49f1e45d30c7e SHA512 4cb27acc22ccd4c3e6a4f941c578d92762a8fea43f02a1801db4b558245db7a1116e74186c1e5d9c407e8afee592939e5a8a3f9e933fc040aab13d122cce6744 WHIRLPOOL 11e07bde4b06f4b8d4934d0123b233f5b976d645848cf5459bb4cd81eed5dfeedc427f5ab6ebab1160d2411ec570ad58e1aba924025fcf59e38591eee41b2b94
+MISC ChangeLog 3568 SHA256 2473739db3d8a1fc1ab6c286acda57dab12bc4dadb864d2046c4bfa9447e2497 SHA512 496165318229e3fb2f15d0da9bf130f621b296e4617e153213c4be2abb63995e7810a294867824c66039292057ce5d3b5f3615bb79491c6636dceba7c46f0dc6 WHIRLPOOL 8dcb78f309c9f4d273bdf33c318a17e4e5a7b4500517342e1b24f034b180ebc38fec724b3d4684015f1e371a40fbc49f5a1e926e7b761806844145fea16041c6
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJTG0TSAAoJEJWyH81tNOV9hmAH/0a5spDOk10Wgb/yYqgclNjB
-Du70VsDBD7UtDCymXa9Zw2OT0sESK4RINF7iopVhZPxXq/4mn8jYudTSDVdul8F7
-lAsVeIkKZPpoGiK1S6t7DvaHN12px0lGXqSJC5sMWmACvwJQ0f60BVVQ0KvsdWa3
-3HK5RT8wXwiHD455q5XfpghybbDZ0JTw7YQL9nMj9LF6dPoEj7PurJyQYx4DyUSf
-wuXDoPAvFl4uu1SZ++R2YkWFHrWYcWRZyOQSPaZlPymal8wvPhh6ezH5oSbptN2I
-AjBBAR5xF7uJ00s8/7QZy9BeOpdSusq/u9qD9N3sba1+JUzHfuzH7wNjar0HgcY=
-=6KgZ
+iQJ8BAEBCABmBQJVnuPbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3koYoP/2itN77BMyQbNbJikVtW9VGe
+WkvyP408x9+8xbYFD72AGR+WJ5UQTkxyNkus1HSzENPsZTyvOSlM3DJicr7efh00
+v+LOWSajpe8CeO/f6WIT1koVSgSoPOgvyK+pu78RIEFAsNnmqe0KuTAajQZvUlU+
+0zvJdOF1xqD9gLp6rz1CXoRT/Sn578N5HeWMGkF5vhU00aGFNx1KhXIz0EqZsqEl
+cpL8poh80L7jM29NenbFNheEil9lAAS7/YzovTEr5BUvrxLA/YGjImI3OmXQ8yx3
+DIFpbIvKBwAz/fS5T+GtRk18cewU37SbZ5Lw0J1VkL8BhhQNOvjMLrfdL351El5B
+nOXM4HwYhiad1vhTM5yimvt0vDUdE0f4OkcbnxFzNCd44pObPbijouAd90p6E18g
+QMtRlGdetd21gP8xuvuj681aCvzx0n9a6eldRYusN6xJw/brrCGt2/xtBQT5qpc5
+fzsL7pksMI4nytKWXTHfKi5JUXNaSafc/rKhn+RSJEm8ZLitvGJa0R1GpzDSDmZE
+pSOtcuv+q3NAXy1+q71NztdfssGM3Dua6TOuSW8h0rZJrbPc91NDIoztJy/314P0
+QnE9+dfZiHOqP5D5vKDj1ZWHHrn/A3B5uQ2yNyO8E95Urq+ZzBvADGWScZNPT73Y
+lrnh63c3IhYeBkAWlNm/
+=u9yS
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-testutil/ant-testutil-1.8.2.ebuild b/dev-java/ant-testutil/ant-testutil-1.8.2.ebuild
deleted file mode 100644
index 7ed200ba848b..000000000000
--- a/dev-java/ant-testutil/ant-testutil-1.8.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-testutil/ant-testutil-1.8.2.ebuild,v 1.3 2012/05/25 11:30:03 ago Exp $
-
-EAPI="4"
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="virtual/jdk:1.6
-	dev-java/junit:4
-	~dev-java/ant-swing-${PV}
-	~dev-java/ant-junit4-${PV}"
-RDEPEND=""
-
-IUSE=""
-
-# 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-testutil/ant-testutil-1.8.4.ebuild b/dev-java/ant-testutil/ant-testutil-1.8.4.ebuild
deleted file mode 100644
index a522c705867f..000000000000
--- a/dev-java/ant-testutil/ant-testutil-1.8.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-testutil/ant-testutil-1.8.4.ebuild,v 1.5 2012/12/05 17:33:44 ago Exp $
-
-EAPI="4"
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="virtual/jdk:1.6
-	dev-java/junit:4
-	~dev-java/ant-swing-${PV}
-	~dev-java/ant-junit4-${PV}"
-RDEPEND=""
-
-IUSE=""
-
-# 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-testutil/ant-testutil-1.9.1.ebuild b/dev-java/ant-testutil/ant-testutil-1.9.1.ebuild
deleted file mode 100644
index 295106017867..000000000000
--- a/dev-java/ant-testutil/ant-testutil-1.9.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-testutil/ant-testutil-1.9.1.ebuild,v 1.1 2013/07/05 14:28:11 tomwij Exp $
-
-EAPI="5"
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~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-trax/ChangeLog b/dev-java/ant-trax/ChangeLog
index 4e59810e9293..d3306b35255e 100644
--- a/dev-java/ant-trax/ChangeLog
+++ b/dev-java/ant-trax/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-trax
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-trax/ChangeLog,v 1.44 2014/03/08 16:44:23 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-trax/ChangeLog,v 1.45 2015/07/09 21:13:35 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org> -ant-trax-1.8.2.ebuild,
+  -ant-trax-1.8.4.ebuild, -ant-trax-1.9.1.ebuild:
+  Remove old versions.
 
   08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -ant-trax-1.7.1.ebuild,
   -ant-trax-1.8.0.ebuild, -ant-trax-1.8.1.ebuild:
diff --git a/dev-java/ant-trax/Manifest b/dev-java/ant-trax/Manifest
index 96a065b6d8cc..c3b3aba3f6c5 100644
--- a/dev-java/ant-trax/Manifest
+++ b/dev-java/ant-trax/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
-DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
-DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
-DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
-DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
-DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-trax-1.8.2.ebuild 1405 SHA256 e426769307eb0aa61c0bb4d51071e6088d5b2ea0e2dc1e11269b66e8d40a47d5 SHA512 ef6ae9daa28f549b3c01da4989180d11da2eab55d2a829de98310267b6390a7dc42618378926783d35254c6f987b93a47c7778d49e0d6ef61d9911b7568edd3c WHIRLPOOL 431ac8172baaceb8f3696eba067156ba578acffffbde0791de79a8035ca642475662ac36c46a6caa7f429d6c0b43ebec4f2ad673256d511b5a1c5667b0472860
-EBUILD ant-trax-1.8.4.ebuild 1056 SHA256 9dd6a2c0e16b36c4e8b880fbb99e7cdd22bf91e600652584c4739435627b914a SHA512 bfc9e80f7268f269c10fb00af2589bb15fdea5f57270dfbfe16d8174fc053c151214da6a649de0bebc098ac6c1c996732743449cc03234604306af9e19fb59f8 WHIRLPOOL 0ce0377ef3e5a4a191edc73d9ab7190bae91b79ed44516a3fdaf38fc6096d4fcb84c4ba9004055a4eea785026c77732b63efeb8df352f5db53fe10a7adcdc6db
-EBUILD ant-trax-1.9.1.ebuild 1080 SHA256 8e5dcacc65b92907214558f446bdd1ef9afbdeacad325e6ac2c6764abf9bdde8 SHA512 ce9ebb3abc1c7e5d8715de5c4e7c707d703e40e3639f4c76a9a0dd63bb2518655340fdfbe852f0f713ff78953fd2263d5e68afd225c689d16d83c12ce359da79 WHIRLPOOL f2af5cf799625cebcebeca06ca36d618a096eeb63fa26915e7828cc7b6a6c725513eba9f91e03a99f3a7d8c31bf7d4795c1685968beca51bcf05781d61734698
 EBUILD ant-trax-1.9.2.ebuild 1067 SHA256 32f5cccade351a787e9aaf382f35dabb5869e256f09d2b14cec2f72755c55c07 SHA512 be999d28a9086719f903d2b5bf0160137db98d83a138d8b038be876b087998df2d4cfe8a21f17ebe49e83416c91bbccd564e5f725af8b391342b318205b0ccbe WHIRLPOOL 44107a1022841d19ac02088f347218be02b180c42189a0b81ce23bc63affd817ca9f50484fc2a14fe9332af267b37fea20a08a0127d6443b8e1d138d9fd6513f
-MISC ChangeLog 5259 SHA256 d13dd06eccb02e2736e8588849b0889fbd9f8ef66efde4aca04be39990854477 SHA512 628ca1d735029c517ca55b8cff4eb685ced84e972a5f2ade03b67eb81d457b12b8e0cc472f2b0a98aec927b271683c0fe9d39ff94a615b99f07bc0b63338fef3 WHIRLPOOL f2b03bf8a3fa80ae8f48c2f83bce0636decbb3bb5510b7a8ee837383471997961c5ebb91c82f429baeb537258fbce17cbf5f81bcab3335e5ff9959f0e6787ca1
+MISC ChangeLog 5406 SHA256 a2e31172c231af968e56080155eb55daa1db8b5bac99133a7842a3c782fb2c16 SHA512 b78d51ef04cb6f1b209726f9cf83f26d1e19b6dec968b34d82dcc45ff1124ea3c79cc251cfd5770b262b268e9cc15b0846f7e412ddab5914f549eaad86dcbe37 WHIRLPOOL 8a3afbb501270c5be44eaa05bff7e7ede2c0e8fd018b5ea54d8989c9a391d51baf08448140878ff4d6bcde9e228cbad2df83cdbfe8a51dc7b5eb506c99af0615
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJTG0jHAAoJEJWyH81tNOV9SqkH/0LXzjqZX7ZdtZa5dZVVhP1v
-Lv2o+cgc/dwUl0qYo7TdP49Kh3FpD/6f2dVtaeTqQabYyZ03ONlKzqEmuWgz0CwW
-TEIcCU1O99fR7QtUxTXbSfi+89s0+wTE8BtvbEQCjmuvEeZNJAULw9ejnevgk4Qg
-Tu7mP1YYzxUZR/1JLQm1YxpxWgdbLrKisg/euE+fOmplfqW1neK65nTqsldCSs1O
-ah7ok8XOdubriSelg+DbCqmf7WLpmduxX9/tnLP+U97LISgtcKIbBrp6WnBUxCFL
-wo7TCAOwd6lqLuToUPsydIvXfrtHaB6BZQL1du3VDVbIm7MOl4Ryr/vgLVZSrSE=
-=sWTo
+iQJ8BAEBCABmBQJVnuQAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kqwsP/2Jbzh8n9jFSeRRzGfoyV8Jl
+tUsfih2BXjLUivMiOOxUronAvHvcN0g0J72wKsdkUIyhf+ZnWotah8jbD5P5OL2B
+/N90L1zy9ccFkZByxOmAW2+grP4G/YcFDbPMmo/tT7bcWJ5zRT/apzx5IEz9F/lQ
+sOJKIpg2Z4AprI65UGG/V3nHuyk4CSYMV0WHqqlx1v/OwcfhJhCvqn378qyHUP9p
+ozEeOZyRQdPxHFK9plSf4mHfcx6/eI1arP0bAA8JrfbxR7Ow+s7mOFLBgzmK+tGV
+6RsOVDdRfS0DPQqx0oj9yzu7V+f3NsssU2zg8pWHvJXorqKHJkBHkY+xmqhPb5hZ
+ngFw8yWYnJ+9hq70BQ4hn92q9ItvQ70iUZEj7wNji5MaDqc52+RNwMTiTZKNWr9Z
+OMAD9Ss1DXNy41aXq20ZoEHMzp5HGq7TUZEs3G+vEV34dizx/VhzyRBhZA+ei3ZN
+jYp39e2nvVJ92ZjvAI6Ntn5X8sYVsjfMoE5oUPO+pLBJ8OwG/DVkajgqTrLmBhkf
+KtHpz90aBXELGGIJTCedgl+Jfv4/KQT8pLo++7N08e7uYmyGUsP9LK43NamIRfDb
+fKP6v83U/cMWxVdfQoz/x+VLAAmdNolt/3eHt260QsBoMu0SsKud7U30LEXxZYJ+
+1bORSaR7DXndFz0hm89P
+=MkUN
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-trax/ant-trax-1.8.2.ebuild b/dev-java/ant-trax/ant-trax-1.8.2.ebuild
deleted file mode 100644
index 134fcd15dc7f..000000000000
--- a/dev-java/ant-trax/ant-trax-1.8.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-trax/ant-trax-1.8.2.ebuild,v 1.4 2012/05/25 11:22:46 ago Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant .jar with optional tasks depending on XML transformer (Deprecated!)"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-# it seems that xslt task will try to use Xalan2TraceSupport from ant-apache-xalan2
-# when xalan happens to be on ant's classpath, so it's safer to have ant-apache-xalan2 there
-# we need PDEPEND and register-optional-dependency to break circular dependency
-PDEPEND="~dev-java/ant-apache-xalan2-${PV}"
-
-src_compile() {
-	# the classes were moved to ant-core in 1.8.1, this is just for compatibility
-	mkdir -p build/lib/empty && cd build/lib/empty || die
-	jar -cf ../${PN}.jar .
-}
-
-src_install() {
-	ant-tasks_src_install
-	java-pkg_register-optional-dependency ant-apache-xalan2
-}
-
-src_postinst() {
-	elog "Upstream has removed ant-trax.jar as of 1.8.1 and moved the classes to ant.jar"
-	elog "This package thus installs an empty jar for compatibility"
-	elog "and will be removed once reverse dependencies are transitioned."
-}
diff --git a/dev-java/ant-trax/ant-trax-1.8.4.ebuild b/dev-java/ant-trax/ant-trax-1.8.4.ebuild
deleted file mode 100644
index 7761f6d4e6d4..000000000000
--- a/dev-java/ant-trax/ant-trax-1.8.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-trax/ant-trax-1.8.4.ebuild,v 1.6 2013/02/05 05:54:19 zerochaos Exp $
-
-EAPI="4"
-
-ANT_TASK_DEPNAME=""
-ANT_TASK_DISABLE_VM_DEPS="true"
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant .jar with optional tasks depending on XML transformer (Deprecated!)"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4" #jar
-
-src_compile() {
-	# the classes were moved to ant-core in 1.8.1, this is just for compatibility
-	mkdir -p build/lib/empty && cd build/lib/empty || die
-	jar -cf ../${PN}.jar .
-}
-
-pkg_postinst() {
-	elog "Upstream has removed ant-trax.jar as of 1.8.1 and moved the classes to ant.jar"
-	elog "This package thus installs an empty jar for compatibility"
-	elog "and will be removed once reverse dependencies are transitioned."
-}
diff --git a/dev-java/ant-trax/ant-trax-1.9.1.ebuild b/dev-java/ant-trax/ant-trax-1.9.1.ebuild
deleted file mode 100644
index 1afac2e55941..000000000000
--- a/dev-java/ant-trax/ant-trax-1.9.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-trax/ant-trax-1.9.1.ebuild,v 1.1 2013/07/05 14:32:34 tomwij Exp $
-
-EAPI="5"
-
-ANT_TASK_DEPNAME=""
-ANT_TASK_DISABLE_VM_DEPS="true"
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant .jar with optional tasks depending on XML transformer (Deprecated!)"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd \
-	~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos \
-	~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Dependency needed for jar.
-DEPEND=">=virtual/jdk-1.4"
-
-src_compile() {
-	# The classes were moved to ant-core in 1.8.1, this is just for compatibility.
-	mkdir -p build/lib/empty && cd build/lib/empty || die
-	jar -cf ../${PN}.jar .
-}
-
-pkg_postinst() {
-	elog "Upstream has removed ant-trax.jar as of 1.8.1 and moved the classes to ant.jar"
-	elog "This package thus installs an empty jar for compatibility"
-	elog "and will be removed once reverse dependencies are transitioned."
-}
diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 187a69be8094..0c956c9b0d57 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.147 2014/08/10 20:06:57 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.148 2015/07/09 21:08:30 chewi Exp $
+
+  09 Jul 2015; James Le Cuirot <chewi@gentoo.org> -ant-1.8.2.ebuild,
+  -ant-1.8.4.ebuild, -ant-1.9.1.ebuild:
+  Remove old versions.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> ant-1.8.2.ebuild,
   ant-1.8.4.ebuild, ant-1.9.1.ebuild, ant-1.9.2.ebuild:
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index a45855ae431f..a1bcd4728864 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,16 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD ant-1.8.2.ebuild 2256 SHA256 e469eae69229973c9d1c778ec6fd3cd3bc4a8ce1d001dc10107c9e1a94ecbdc5 SHA512 bdd58ac983c0e2ea7015fb7f0b8cf9f97263b0375e120a17becdf3b22ebe9f31c616550d2b9109df7e5d387aaa09f065da3775381aa0139266a1cad6f90a7c7d WHIRLPOOL a67c6fdfa3d054eeeeee6e3c3a98db709659fab79bcbe972a00d34596419e27849ca28a1888ca918038bb294b7e88fed93b4a659c12dee83abddb9a2af9a3b23
-EBUILD ant-1.8.4.ebuild 2254 SHA256 f53c8202fcee8696991e5db5730cf2a59f9ccb28db3fc329eb50def45f9456ef SHA512 5adebd39c7c00e380bc688fd69a4c4cccb9dedfba77c25db8d4d7b385df68642c73207cea4d73cd3f50052b506d35013f219bf64907a6b4989a2625160ad9fe8 WHIRLPOOL e70053cb63e0546057f39f17fe38e620b5e822cae7a5f91631d0ce39757a070331e733e35be5955ce8b291efe2ab44df51761e1b7bbe8c79f8632f393e8f6b2a
-EBUILD ant-1.9.1.ebuild 2249 SHA256 c3a2a5b863207b7648cb8ff1c4aaf3cbc738ca769342b533b7ccce29527f0060 SHA512 8b1cacc8ea03a6ae6ea12105ff493e260bc56c910d5d6f8ee9a308f7076164e74d07bf4283391a46216bf408e875eee81fc3b2b17a909cdda08ca7b146a02f29 WHIRLPOOL a3e77370883ff34d3d013f137de6a935440870399c1f38817a5e5db3565fb8a242fd779eeca1fb20a856a99edda6267cbd222b977647b502fb26da39cf2f6f66
 EBUILD ant-1.9.2.ebuild 2246 SHA256 e0a8343d22154f546d03884ced56804c34544bcbaf1edb11e58cd92b1c01a819 SHA512 5be60d6fbf6a79bc86f5b4207bb2ca04509c0f1f08b806f9fe92c7821a02ae9bc3a3274e9daebc565c85211ea683a5d9e2d975f4d3e654acecd3efd987997950 WHIRLPOOL f48678731110b7e2e70d66f5b903e16efce5ab82fd7486ffd822f303a2834e4419fb19f0d8b88493271d2ad6e15fe86e7e085340a26660bf7967047914a3b6f6
-MISC ChangeLog 7529 SHA256 2085ce7f289c346cef462ac78b21fcf340e26cd9e67c4b9dd10a8cc6a16755c5 SHA512 762bccc0a7261ee364217a6d78c8f153c8e42a0a7e8c2ffc419856dd16146974eebd9bf9397a28537b5bb9011a676fe7cd7684ca5c6fc415c85688a963694eec WHIRLPOOL 2ff738d48055f3bdac9c2ed485dad9237b58eae24bbe0f7ca03c44bcf27592ab2c6157f5192cb889a6977ccc94fa4424e954740e1c722d1d57b9ddf01bc0e02d
+MISC ChangeLog 7661 SHA256 3d1e56501f82bd2f2598fffbe92eebba952b5a07cd61883ad4abf26f50394c15 SHA512 96b1e7630c0e268fe0f71228e0c4aa08a9490cf2aa0fbc21670b1a50bbe97fc0bff8d513d9aa5edbbb7b5ec7abffc255088df4e98149074d5dc9a077640d719d WHIRLPOOL 442425c7c36f468fd100c95a535ac3d3e4f7d126a658725b15a21ff9130c6d475cd103753e2cd9cb03777843d1b00d0a4a6d52b69ef88f26598952aacede4573
 MISC metadata.xml 1076 SHA256 013d89ddc64f92df85732549c4d2e3333faf84b0951cb2db91ae2a7dce8db4a5 SHA512 ab6f4abbc32a37db4eb2dd8f98bbe7d7591d0fe70dac1c9eee045a1b90144f80836c960a84265fe78f72cec55914a58d39ba07c46c11f59493203e17a38113cc WHIRLPOOL 032735e6a6ca3e1671ddaed58ee1f756c9131a9f53aac51eaa432494d366fbd20a42f6e29dd6693a4cf0c0f77bb253e9570c44a90a1c246dfb0afda0f68cf565
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlPn0OIACgkQcaHudmEf86rsmwCggW6gvWl8R5027Bb+veNV1P5J
-MPoAnA44DBebZ5p7h5N0VCXFXtkgU5FV
-=mIEC
+iQJ8BAEBCABmBQJVnuLPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3k3GMP/3BunPvL9q5niau36VGEqs/C
+0vq1vblJU1I01Rd3its1LFkK48xEHIcfceg0qlLlTM5Tm6EnQRQ/JmKlTLpdbemL
+YIfnCi+IFUTsKhe7CszYariEzdQ28d/jteQtbuakOelt7/bQZt+g68TsI2+PzExv
+Gq+Qj2B6m1UnidQQYOcVYUBvU+Nn7g94gzi9/KrQDpHNAu4T44SZHWazQ2PAKloB
+8UEPBa3slP42hVLj5XP0s+IaojxwWSeW8v8mIF++5lCHSDS7SA8Ow5x301me5qUJ
+TCk5gmzpLKKj5as1rYuU3+EWGadRp0dXUiAPDYN53BwAKCrmFdIhwvrkHbz3iOA+
+eWz8m2A6ocHs1Q+7eAqtOgf8lismfutD1KnAA1/7CxN6ulFD+xbVgSYw0ML2pr34
+bAt3R6pj2qJQ/ZlOR0EhtImiVz7/eHPXioHqgP7T10OyVu6DMLxW9YAaKljwrxZg
+74S4VuatULycy3+AkDdGqmexjBs6xm1fXcME9nIyM6IKH9OUj0SV+xB+3Fd4p/hn
+ZjVs8ikpiXozCLAp/h5NOEAoQyWyfmT6Uivft/ADZ4IiQeMXrf5YPASH8vevr7Jc
+hDpQu/WVk1FEeiDUO1+3UxRuX08n4VYvFlK07Bb4huUzDsGZn/YeEW/96MD3oPSu
+mkWzgoyoOJJbJ1DVRWUS
+=sCRm
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant/ant-1.8.2.ebuild b/dev-java/ant/ant-1.8.2.ebuild
deleted file mode 100644
index d8346cf9b261..000000000000
--- a/dev-java/ant/ant-1.8.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.8.2.ebuild,v 1.4 2014/08/10 20:06:57 slyfox Exp $
-
-EAPI="4"
-
-inherit versionator
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
-HOMEPAGE="http://ant.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="~dev-java/ant-core-${PV}"
-RDEPEND="${DEPEND}"
-
-IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
-	+jsch +log4j +oro +regexp +resolver testutil"
-
-RDEPEND="~dev-java/ant-core-${PV}
-	~dev-java/ant-nodeps-${PV}
-	~dev-java/ant-junit-${PV}
-	!dev-java/ant-optional
-	!dev-java/ant-tasks
-	~dev-java/ant-trax-${PV}
-	~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} )"
-
-DEPEND=""
-
-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/ant/ant-1.8.4.ebuild b/dev-java/ant/ant-1.8.4.ebuild
deleted file mode 100644
index 87c21061e6ce..000000000000
--- a/dev-java/ant/ant-1.8.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.8.4.ebuild,v 1.6 2014/08/10 20:06:57 slyfox Exp $
-
-EAPI="4"
-
-inherit versionator
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
-HOMEPAGE="http://ant.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="~dev-java/ant-core-${PV}"
-RDEPEND="${DEPEND}"
-
-IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
-	+jsch +log4j +oro +regexp +resolver testutil"
-
-RDEPEND="~dev-java/ant-core-${PV}
-	~dev-java/ant-nodeps-${PV}
-	~dev-java/ant-junit-${PV}
-	!dev-java/ant-optional
-	!dev-java/ant-tasks
-	~dev-java/ant-trax-${PV}
-	~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} )"
-
-DEPEND=""
-
-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/ant/ant-1.9.1.ebuild b/dev-java/ant/ant-1.9.1.ebuild
deleted file mode 100644
index d1dfd48c122c..000000000000
--- a/dev-java/ant/ant-1.9.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.9.1.ebuild,v 1.2 2014/08/10 20:06:57 slyfox Exp $
-
-EAPI="5"
-
-inherit versionator
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
-HOMEPAGE="http://ant.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd \
-	~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris \
-	~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="~dev-java/ant-core-${PV}"
-RDEPEND="${DEPEND}"
-
-IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
-	+jsch +log4j +oro +regexp +resolver testutil"
-
-RDEPEND="~dev-java/ant-core-${PV}
-	~dev-java/ant-nodeps-${PV}
-	~dev-java/ant-junit-${PV}
-	!dev-java/ant-optional
-	!dev-java/ant-tasks
-	~dev-java/ant-trax-${PV}
-	~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} )"
-
-DEPEND=""
-
-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
-}
author	James Le Cuirot <chewi@gentoo.org>	2015-07-09 21:13:43 +0000
committer	James Le Cuirot <chewi@gentoo.org>	2015-07-09 21:13:43 +0000
commit	a6eb30eba1a22193745c72cafb6ea5e09cce6a15 (patch)
tree	482012e750194f09635ed9d264094466a01a3cb9 /dev-java
parent	Remove KDE Plasma 5.3.1 (diff)
download	historical-a6eb30eba1a22193745c72cafb6ea5e09cce6a15.tar.gz historical-a6eb30eba1a22193745c72cafb6ea5e09cce6a15.tar.bz2 historical-a6eb30eba1a22193745c72cafb6ea5e09cce6a15.zip