5 files changed, 21 insertions, 32 deletions
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index aa90b1c7bf13..e6270bb5d630 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,18 +1,12 @@
-MD5 ff8fc036111d64621462b00705937d31 ChangeLog 19608
-RMD160 e5d134143a0d29766ced34984bd5474594657d94 ChangeLog 19608
-SHA256 7fd996ecabbcfa92ca96d5aa2f186326c72661138ca2cb85508c92b3c105729b ChangeLog 19608
-MD5 ae30cd07e7ef7a314369a39335bea5ef ant-core-1.5.4-r2.ebuild 3023
-RMD160 79fa3893c54c81d8b95c409b7996661fa723fc19 ant-core-1.5.4-r2.ebuild 3023
-SHA256 3eb6d9fec6c6911695f96ecd8a1c30b38fa80f11e322477bdbcd3ea5505d5c83 ant-core-1.5.4-r2.ebuild 3023
+MD5 67cc24d0ee9a7fb34d1f3921a711112f ChangeLog 19737
+RMD160 80fc7162799f79126258be755dc25188a9610017 ChangeLog 19737
+SHA256 5befb2d2226eddbb78b5e0f6a93e5be33fe6ab3c1968d63d87dca4144f9d7c1e ChangeLog 19737
 MD5 45c826152c7de9789493fe41efd87b27 ant-core-1.6.2-r5.ebuild 2082
 RMD160 cd1d8c23383397d05206ed7256a281aeaa90deb4 ant-core-1.6.2-r5.ebuild 2082
 SHA256 e0a55354a9149fcdb77a157c65ff8cf7110fca89a19d2a7f84cffdfbe86d9d2c ant-core-1.6.2-r5.ebuild 2082
 MD5 28fb623be0093d929803aeaefc530b06 ant-core-1.6.5-r2.ebuild 1997
 RMD160 b119db5164d14a4e689386483450d41bcecca347 ant-core-1.6.5-r2.ebuild 1997
 SHA256 02b88a7eb30e246265b9282f20bb01972ff7f5b50157ad095bfeb205c9ced452 ant-core-1.6.5-r2.ebuild 1997
-MD5 d7186edf4c71dc0531330f90e2c08fe9 files/1.5.4-ant 2283
-RMD160 be9af8449dda65d400bbe171eb85ffc352ae3d2e files/1.5.4-ant 2283
-SHA256 047a187757706ffcaacd48bac55145b63fa782537e40fa95a8bd5abbed70ceaa files/1.5.4-ant 2283
 MD5 816ea8a6a51471da4c8df2f59434fc9d files/1.6.2-ant 5058
 RMD160 fb75e9bf3c4a095297be865e0cd87620feab8643 files/1.6.2-ant 5058
 SHA256 ea8b41190c6a5b89b7a111a9fc901ad6fa294d3696cfcb9ba58a0f969a305071 files/1.6.2-ant 5058
@@ -25,9 +19,6 @@ SHA256 d9a45d747aae54531f3cc4018e1d17d1dc6bacbc64051d50f1d217dce376b942 files/1.
 MD5 ea37e3a5b2edbe1b1fca02ba48c4ea47 files/build.sh-exit-fix.patch 345
 RMD160 4c4cfdfb1b13b9cc55f279a5765afda6da9f6f4d files/build.sh-exit-fix.patch 345
 SHA256 bafac89599d2d5bbb8f17060e39922a01891826251925e39be2df38170d88e2b files/build.sh-exit-fix.patch 345
-MD5 8d86f265f37d0d73cdd2e8a3fd2ff6eb files/digest-ant-core-1.5.4-r2 70
-RMD160 30c2ffb6c5b5db4c16003434222407a0930841d7 files/digest-ant-core-1.5.4-r2 70
-SHA256 61267c8a183abcfd2ab540391b003c37316bcefb01b41986d30f2a87e2936db3 files/digest-ant-core-1.5.4-r2 70
 MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-core-1.6.2-r5 74
 RMD160 66d373bf435d3a4609fb0a1da03ff25e3fc783cb files/digest-ant-core-1.6.2-r5 74
 SHA256 a9b153951e9ca3deb84b3506fe73a6f37ed2b21283ab5c584abdf6bbc0c8a4fd files/digest-ant-core-1.6.2-r5 74
diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 2aff7d5e0f02..c2e012f70dbd 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ant
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.91 2005/07/09 13:40:45 axxo Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.92 2006/03/12 04:20:46 nichoj Exp $
+
+  12 Mar 2006; <nichoj@gentoo.org> -ant-1.5.4-r2.ebuild:
+  Pruned old versions with same keywords.
 
   09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> ant-1.5.4-r2.ebuild,
   ant-1.6.2-r6.ebuild, ant-1.6.5.ebuild:
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 2e58b785d40b..4bd77c113dfd 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,8 +1,18 @@
-MD5 a6e5daabb876bd8ce0d45b7ef6a91bc9 ChangeLog 1518
-MD5 4f208fb54675e4e2f1b440f17cee7140 ant-1.5.4-r2.ebuild 463
+MD5 088077fe85e26d4fe327fa1237ddd76f ChangeLog 1620
+RMD160 82a1cc645966b5b118cf5b0f1e895ee3d10c1785 ChangeLog 1620
+SHA256 b1e850e2f0f8d670c1fbaf824d89ca12fceb866ff25619be15909f41c5811351 ChangeLog 1620
 MD5 2d8b443eca0c65119bfaad860773badd ant-1.6.2-r6.ebuild 497
+RMD160 fe08bfea84fd769522446d5dd3d5c7cc9494f06e ant-1.6.2-r6.ebuild 497
+SHA256 03171181efc7f9013d7887bb882dfcd3ada28206945016296896869cdabbf6e7 ant-1.6.2-r6.ebuild 497
 MD5 4d47c0e1192baed1e42418ed166af1eb ant-1.6.5.ebuild 499
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ant-1.5.4-r2 0
+RMD160 f6fec53ecad9d25d50da5e3d0f890a17567fa66a ant-1.6.5.ebuild 499
+SHA256 1829614b2aaa8b892a3f2ab81027b87eb5877221a4d15f5ca6decc6efbfe9718 ant-1.6.5.ebuild 499
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ant-1.6.2-r6 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-ant-1.6.2-r6 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-ant-1.6.2-r6 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ant-1.6.5 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-ant-1.6.5 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-ant-1.6.5 0
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
+RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
+SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
diff --git a/dev-java/ant/ant-1.5.4-r2.ebuild b/dev-java/ant/ant-1.5.4-r2.ebuild
deleted file mode 100644
index da24ea82a25f..000000000000
--- a/dev-java/ant/ant-1.5.4-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.4-r2.ebuild,v 1.7 2005/07/09 13:40:45 axxo Exp $
-
-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="x86 amd64 ppc sparc"
-IUSE=""
-
-DEPEND="=dev-java/ant-core-${PV}*"
-RDEPEND="${DEPEND}"
-
diff --git a/dev-java/ant/files/digest-ant-1.5.4-r2 b/dev-java/ant/files/digest-ant-1.5.4-r2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/ant/files/digest-ant-1.5.4-r2
+++ /dev/null