6 files changed, 9 insertions, 143 deletions
diff --git a/dev-java/jdom/ChangeLog b/dev-java/jdom/ChangeLog
index 3439a29f9a95..878a162cabe0 100644
--- a/dev-java/jdom/ChangeLog
+++ b/dev-java/jdom/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jdom
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.57 2007/09/18 06:14:56 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.58 2007/09/21 06:09:23 ali_bush Exp $
+
+  21 Sep 2007; <alistair@gentoo.org> -jdom-1.0_beta10-r5.ebuild,
+  -jdom-1.0-r3.ebuild:
+  Remove old, broken ebuild revisions.
 
 *jdom-1.0-r4 (18 Sep 2007)
 *jdom-1.0_beta10-r6 (18 Sep 2007)
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 49dc44244b71..d678cca7ba2b 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -5,10 +5,6 @@ EBUILD jdom-1.0-r2.ebuild 1753 RMD160 76fd63c6f45fbd4326f281d4c98bad961f135c5d S
 MD5 5c9494eb0abe1315405b16598044c42a jdom-1.0-r2.ebuild 1753
 RMD160 76fd63c6f45fbd4326f281d4c98bad961f135c5d jdom-1.0-r2.ebuild 1753
 SHA256 4e947f27b98b290e38875e04036e6d82909eab11fd9c9a757f1686f1772a0d39 jdom-1.0-r2.ebuild 1753
-EBUILD jdom-1.0-r3.ebuild 1434 RMD160 0103fe5d81f7a60f55849f85459b893e233b0d28 SHA1 384a0be5ae596bd92d3c256a48336e463ba46d09 SHA256 eeeafb823236514e71557fcf876715638067749a7b6eddc827c8f24c74ee504c
-MD5 ceef1fab5b5f4a64990148619ff794c2 jdom-1.0-r3.ebuild 1434
-RMD160 0103fe5d81f7a60f55849f85459b893e233b0d28 jdom-1.0-r3.ebuild 1434
-SHA256 eeeafb823236514e71557fcf876715638067749a7b6eddc827c8f24c74ee504c jdom-1.0-r3.ebuild 1434
 EBUILD jdom-1.0-r4.ebuild 1357 RMD160 7c878e67c888fe7bbe116a632bb85ae83ca65cf4 SHA1 c900ac6283f76a6028cf1bbaca4792fb52f5962c SHA256 3c4142aa536da9b64bf7474ff2cf64e0cc01e70b5b788e79527dc011caaf4c0c
 MD5 c122c925e6fc0005ae6adf8aaa327105 jdom-1.0-r4.ebuild 1357
 RMD160 7c878e67c888fe7bbe116a632bb85ae83ca65cf4 jdom-1.0-r4.ebuild 1357
@@ -17,10 +13,6 @@ EBUILD jdom-1.0_beta10-r4.ebuild 1829 RMD160 aad2b9bb54715a113f73b0d5b0589a37666
 MD5 3dc79cc20f566638ef03aea2c9b5a41b jdom-1.0_beta10-r4.ebuild 1829
 RMD160 aad2b9bb54715a113f73b0d5b0589a37666e711e jdom-1.0_beta10-r4.ebuild 1829
 SHA256 9c1920a45a8fd250ecb421c64aaea21c3aa4df36ba5579ad7b2fdd15509b6bdf jdom-1.0_beta10-r4.ebuild 1829
-EBUILD jdom-1.0_beta10-r5.ebuild 1441 RMD160 a87a159638f2eb9d018466d4e20d72229f302efd SHA1 73c945f42cfd443d9705d98c3d07624dd7b34e38 SHA256 97925671d3f888d034494253a82b738596df15bda5606bb6df4a013c9c6fa2d6
-MD5 5f3e8b53ceda22a20a75a58352fb375d jdom-1.0_beta10-r5.ebuild 1441
-RMD160 a87a159638f2eb9d018466d4e20d72229f302efd jdom-1.0_beta10-r5.ebuild 1441
-SHA256 97925671d3f888d034494253a82b738596df15bda5606bb6df4a013c9c6fa2d6 jdom-1.0_beta10-r5.ebuild 1441
 EBUILD jdom-1.0_beta10-r6.ebuild 1768 RMD160 b209a00492e666f76681d7a658eaaf025c4802c8 SHA1 161fd151863fbfb59b689da6ecda5d31baa137e6 SHA256 760a37d252d5b5157c2f4480257aff8f69a4a63adc81ed5cd68b305c839074e6
 MD5 d8211ae14da66329aeb48defb0772ac9 jdom-1.0_beta10-r6.ebuild 1768
 RMD160 b209a00492e666f76681d7a658eaaf025c4802c8 jdom-1.0_beta10-r6.ebuild 1768
@@ -33,10 +25,10 @@ EBUILD jdom-1.0_beta9-r4.ebuild 1440 RMD160 e84efde6f6ccc103545131bd53c5f586c2ec
 MD5 b9e6a2696124a9cb34ceaa09d552d1ee jdom-1.0_beta9-r4.ebuild 1440
 RMD160 e84efde6f6ccc103545131bd53c5f586c2ec2a17 jdom-1.0_beta9-r4.ebuild 1440
 SHA256 8d08b348a698df28b451bfc915e7cc249f23c8897795b1ef21f39388fc4f197b jdom-1.0_beta9-r4.ebuild 1440
-MISC ChangeLog 9350 RMD160 d5c2fb03a391a27458c222b4548e0d0f3fde18d2 SHA1 d45d28ebea8a11269930b7a87eb6b7a0ec0c78d7 SHA256 bd06906c9a690389c3f7c404a81a7d37e32f291dfefbf1f28ef078e937e9c20b
-MD5 38e9da3575ff016b18ed6bdcd8e0608a ChangeLog 9350
-RMD160 d5c2fb03a391a27458c222b4548e0d0f3fde18d2 ChangeLog 9350
-SHA256 bd06906c9a690389c3f7c404a81a7d37e32f291dfefbf1f28ef078e937e9c20b ChangeLog 9350
+MISC ChangeLog 9478 RMD160 2e2f3eee4c4b71e86b5f60f4f8c32ba5a467c1f0 SHA1 a37c759f61d87b72f874fc44f93d293e24f88c74 SHA256 2962b33dcfc4ad475ccde1bcdd9b071be0cae78d7e6d813050c85643c1890ca6
+MD5 833fde784ae0704f4ba9564512b290d4 ChangeLog 9478
+RMD160 2e2f3eee4c4b71e86b5f60f4f8c32ba5a467c1f0 ChangeLog 9478
+SHA256 2962b33dcfc4ad475ccde1bcdd9b071be0cae78d7e6d813050c85643c1890ca6 ChangeLog 9478
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -44,18 +36,12 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 055e8cb83059e1745ce5dd6d083cb770 files/digest-jdom-1.0-r2 229
 RMD160 5ddc1e61cf63fb2df9d5c973c873319a4c0228d1 files/digest-jdom-1.0-r2 229
 SHA256 16591b7f7f171da64528033e0f88e9aa9483d5eebc97ca6cff48d7b7a1352dc2 files/digest-jdom-1.0-r2 229
-MD5 d26a104d6e08295aa1296456a0a9334d files/digest-jdom-1.0-r3 226
-RMD160 d30ad45a2ed73ca3377629ecb2e6f8268a60d33b files/digest-jdom-1.0-r3 226
-SHA256 8cd045277ddcccb04c717363116c1db5e6b336863faa5941dd9ee6a33bfc9570 files/digest-jdom-1.0-r3 226
 MD5 055e8cb83059e1745ce5dd6d083cb770 files/digest-jdom-1.0-r4 229
 RMD160 5ddc1e61cf63fb2df9d5c973c873319a4c0228d1 files/digest-jdom-1.0-r4 229
 SHA256 16591b7f7f171da64528033e0f88e9aa9483d5eebc97ca6cff48d7b7a1352dc2 files/digest-jdom-1.0-r4 229
 MD5 3c1b11f76a6a09c09d4db4d8c159b3c6 files/digest-jdom-1.0_beta10-r4 229
 RMD160 c8724504851a86a78f995a533998d10dbc98b556 files/digest-jdom-1.0_beta10-r4 229
 SHA256 c0b022f9b9811324082b9bc429ad2ebb6849d2d9f6d2d14e7b6759c55118897d files/digest-jdom-1.0_beta10-r4 229
-MD5 d26a104d6e08295aa1296456a0a9334d files/digest-jdom-1.0_beta10-r5 226
-RMD160 d30ad45a2ed73ca3377629ecb2e6f8268a60d33b files/digest-jdom-1.0_beta10-r5 226
-SHA256 8cd045277ddcccb04c717363116c1db5e6b336863faa5941dd9ee6a33bfc9570 files/digest-jdom-1.0_beta10-r5 226
 MD5 3c1b11f76a6a09c09d4db4d8c159b3c6 files/digest-jdom-1.0_beta10-r6 229
 RMD160 c8724504851a86a78f995a533998d10dbc98b556 files/digest-jdom-1.0_beta10-r6 229
 SHA256 c0b022f9b9811324082b9bc429ad2ebb6849d2d9f6d2d14e7b6759c55118897d files/digest-jdom-1.0_beta10-r6 229
diff --git a/dev-java/jdom/files/digest-jdom-1.0-r3 b/dev-java/jdom/files/digest-jdom-1.0-r3
deleted file mode 100644
index 08fc74befc3c..000000000000
--- a/dev-java/jdom/files/digest-jdom-1.0-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 593c7bbbd939eb0513444d2c61e5aca0 jdom-b9.tar.gz 3417274
-RMD160 af44cb104946cc05e1a55a23951c364d08c4cc89 jdom-b9.tar.gz 3417274
-SHA256 00c4ddf640b17768582bba0e8b8a2584fe42b2540a98d1bfa276fa43bef1a676 jdom-b9.tar.gz 3417274
diff --git a/dev-java/jdom/files/digest-jdom-1.0_beta10-r5 b/dev-java/jdom/files/digest-jdom-1.0_beta10-r5
deleted file mode 100644
index 08fc74befc3c..000000000000
--- a/dev-java/jdom/files/digest-jdom-1.0_beta10-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 593c7bbbd939eb0513444d2c61e5aca0 jdom-b9.tar.gz 3417274
-RMD160 af44cb104946cc05e1a55a23951c364d08c4cc89 jdom-b9.tar.gz 3417274
-SHA256 00c4ddf640b17768582bba0e8b8a2584fe42b2540a98d1bfa276fa43bef1a676 jdom-b9.tar.gz 3417274
diff --git a/dev-java/jdom/jdom-1.0-r3.ebuild b/dev-java/jdom/jdom-1.0-r3.ebuild
deleted file mode 100644
index ae6756972f6e..000000000000
--- a/dev-java/jdom/jdom-1.0-r3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0-r3.ebuild,v 1.1 2007/09/16 08:27:50 ali_bush Exp $
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="jdom"
-MY_PV="b9"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="http://www.jdom.org/dist/source/archive/${MY_P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-LICENSE="JDOM"
-SLOT="${PV}"
-KEYWORDS="~amd64"
-
-COMMON_DEP="dev-java/saxpath
-		>=dev-java/xerces-2.7"
-RDEPEND=">=virtual/jre-1.4
-		${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-		${COMMON_DEP}"
-PDEPEND="~dev-java/jdom-jaxen-${PV}"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	rm -v build/*.jar lib/*.jar || die
-	rm -v src/java/org/jdom/xpath/JaxenXPath.java \
-		|| die "Unable to remove Jaxen Binding class."
-	rm -rf build/apidocs || die
-
-	cd ${S}/lib
-	java-pkg_jar-from saxpath,xerces-2
-}
-
-src_compile() {
-	# to prevent a newer jdom from going into cp
-	# (EANT_ANT_TASKS doesn't work with none)
-	ANT_TASKS="none" eant package $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar build/*.jar
-
-	java-pkg_register-dependency "jdom-jaxen-${SLOT}"
-
-	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
-	use doc && java-pkg_dojavadoc build/apidocs
-	use examples && java-pkg_doexamples samples
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/jdom/jdom-1.0_beta10-r5.ebuild b/dev-java/jdom/jdom-1.0_beta10-r5.ebuild
deleted file mode 100644
index 728980a29944..000000000000
--- a/dev-java/jdom/jdom-1.0_beta10-r5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta10-r5.ebuild,v 1.1 2007/09/16 08:27:50 ali_bush Exp $
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="jdom"
-MY_PV="b9"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="http://www.jdom.org/dist/source/archive/${MY_P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-LICENSE="JDOM"
-SLOT="${PV}"
-KEYWORDS="~amd64"
-
-COMMON_DEP="dev-java/saxpath
-		>=dev-java/xerces-2.7"
-RDEPEND=">=virtual/jre-1.4
-		${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-		${COMMON_DEP}"
-PDEPEND="~dev-java/jdom-jaxen-${PV}"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	rm -v build/*.jar lib/*.jar || die
-	rm -v src/java/org/jdom/xpath/JaxenXPath.java \
-		|| die "Unable to remove Jaxen Binding class."
-	rm -rf build/apidocs || die
-
-	cd ${S}/lib
-	java-pkg_jar-from saxpath,xerces-2
-}
-
-src_compile() {
-	# to prevent a newer jdom from going into cp
-	# (EANT_ANT_TASKS doesn't work with none)
-	ANT_TASKS="none" eant package $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar build/*.jar
-
-	java-pkg_register-dependency "jdom-jaxen-${SLOT}"
-
-	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
-	use doc && java-pkg_dojavadoc build/apidocs
-	use examples && java-pkg_doexamples samples
-	use source && java-pkg_dosrc src/java/org
-}