Removed JAR duplications; fixed dependencies; closes #20066.

4 files changed, 59 insertions, 3 deletions

diff --git a/dev-java/jdom/ChangeLog b/dev-java/jdom/ChangeLog
index c7ea979f176f..87de8d9cdce2 100644
--- a/dev-java/jdom/ChangeLog
+++ b/dev-java/jdom/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/jdom
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.6 2003/05/26 09:09:53 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.7 2003/05/26 11:20:19 absinthe Exp $
+
+*jdom-1.0_beta8-r4 (26 May 2003)
+
+  26 May 2003; Dylan Carlson <absinthe@gentoo.org> jdom-1.0_beta8-r4.ebuild:
+  In this version, ant.jar will not be installed. Also JDOM will DEPEND on xalan
+  and xerces separately, and those JARs will not be installed either. So be sure
+  to add those packages to your CLASSPATH via java-config if you want JDOM to
+  function. Closes #20066.
 
 *jdom-1.0_beta8-r3 (26 May 2003)
 
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 8326402c6299..7c17a9ff72a2 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,8 +1,8 @@
 MD5 b67bf3a5daf34dee811d992612979e53 jdom-1.0_beta8-r1.ebuild 841
 MD5 e553a800c8c97afae688f0d396fe9cdb jdom-1.0_beta8-r3.ebuild 1112
 MD5 423d2d8add30ed188d812bd610560add jdom-1.0_beta8-r2.ebuild 991
-MD5 9ef53795e7e3a201c8a0d596f1ea08d4 ChangeLog 1589
-MD5 60353c8bfa63b59e8c15cef923f6ff3b jdom-1.0_beta8-r4.ebuild 1167
+MD5 ec39cbfc4b50127085bbea33abecbbd1 ChangeLog 1589
+MD5 b3ed043158af06cbefa823f2c7dae910 jdom-1.0_beta8-r4.ebuild 1167
 MD5 33c4f711c3cd26755c0226a88fddd422 files/jdom-1.0_beta8-nojdk1.1.patch 646
 MD5 03290a96b3c0f71a58db6620dd1b547f files/digest-jdom-1.0_beta8-r1 60
 MD5 03290a96b3c0f71a58db6620dd1b547f files/digest-jdom-1.0_beta8-r2 60
diff --git a/dev-java/jdom/files/digest-jdom-1.0_beta8-r4 b/dev-java/jdom/files/digest-jdom-1.0_beta8-r4
new file mode 100644
index 000000000000..ec6a24dede89
--- /dev/null
+++ b/dev-java/jdom/files/digest-jdom-1.0_beta8-r4
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000000..3f5bce070460
--- /dev/null
+++ b/dev-java/jdom/jdom-1.0_beta8-r4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2003 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.1 2003/05/26 11:20:19 absinthe 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 ~alpha"
+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/*
+}