Stable on x86, clean up...

4 files changed, 12 insertions, 56 deletions

diff --git a/dev-java/jdom/ChangeLog b/dev-java/jdom/ChangeLog
index 4c9186cd88f4..34b26aa8aeba 100644
--- a/dev-java/jdom/ChangeLog
+++ b/dev-java/jdom/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jdom
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.9 2004/01/25 07:27:16 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.10 2004/03/19 01:17:14 zx Exp $
+
+  18 Mar 2004; Chris Aniszczyk <zx@gentoo.org> jdom-1.0_beta8-r4.ebuild,
+  jdom-1.0_beta9.ebuild:
+  Clean up, stable on x86.
 
 *jdom-1.0_beta9 (25 Jan 2004)
 
diff --git a/dev-java/jdom/files/digest-jdom-1.0_beta8-r4 b/dev-java/jdom/files/digest-jdom-1.0_beta8-r4
deleted file mode 100644
index ec6a24dede89..000000000000
--- a/dev-java/jdom/files/digest-jdom-1.0_beta8-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8abd67fa4a227cb2abf2d2465de80248 jdom-b8.tar.gz 2534221
diff --git a/dev-java/jdom/jdom-1.0_beta8-r4.ebuild b/dev-java/jdom/jdom-1.0_beta8-r4.ebuild
deleted file mode 100644
index 57824f3e3797..000000000000
--- a/dev-java/jdom/jdom-1.0_beta8-r4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta8-r4.ebuild,v 1.4 2004/01/25 07:23:46 strider Exp $
-
-inherit java-pkg
-
-IUSE="jikes doc"
-
-MY_PN="jdom"
-MY_PV="b8"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="http://www.jdom.org/dist/source/${MY_P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-LICENSE="JDOM"
-SLOT="0"
-KEYWORDS="x86 sparc ppc"
-RDEPEND=">=virtual/jdk-1.3"
-DEPEND="${RDEPEND}
-	>=dev-java/ant-1.4.1
-	dev-java/xalan
-	dev-java/xerces
-	jikes? ( >=dev-java/jikes-1.15 )"
-PATCHES="${FILESDIR}/${P}-nojdk1.1.patch"
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	local antflags
-
-	antflags=""
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-
-	ant ${antflags} || die "compile problem"
-}
-
-src_install() {
-	# install everything except for the jdom11.jar and collections
-	# (pre-Java 2 support which interferes)
-	java-pkg_dojar \
-		build/jdom.jar \
-		lib/crimson.jar \
-		lib/jaxp.jar
-
-	dodoc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
-	use doc && dohtml -r build/apidocs/*
-}
diff --git a/dev-java/jdom/jdom-1.0_beta9.ebuild b/dev-java/jdom/jdom-1.0_beta9.ebuild
index d38942cf05bf..96485dca9fc8 100644
--- a/dev-java/jdom/jdom-1.0_beta9.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta9.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta9.ebuild,v 1.2 2004/03/19 01:17:14 zx Exp $
 
 inherit java-pkg
 
@@ -14,13 +15,13 @@ SRC_URI="http://www.jdom.org/dist/source/${MY_P}.tar.gz"
 HOMEPAGE="http://www.jdom.org"
 LICENSE="JDOM"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="x86 ~sparc ~ppc"
 RDEPEND=">=virtual/jdk-1.3"
-DEPEND="${RDEPEND}
-	>=dev-java/ant-1.4.1
-	dev-java/xalan
-	dev-java/xerces
-	jikes? ( >=dev-java/jikes-1.15 )"
+DEPEND=">=dev-java/ant-1.4.1
+		dev-java/xalan
+		dev-java/xerces
+		jikes? ( >=dev-java/jikes-1.15 )"
+
 S="${WORKDIR}/${MY_P}"
 
 src_compile() {
@@ -50,4 +51,3 @@ pkg_postinst() {
 	einfo
 
 }
-