Fix to close #15731.

5 files changed, 70 insertions, 3 deletions

diff --git a/dev-java/jdom/ChangeLog b/dev-java/jdom/ChangeLog
index bed62acce0b9..c7ea979f176f 100644
--- a/dev-java/jdom/ChangeLog
+++ b/dev-java/jdom/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2003/02/12 05:53:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.6 2003/05/26 09:09:53 absinthe Exp $
+
+*jdom-1.0_beta8-r3 (26 May 2003)
+
+  26 May 2003; Dylan Carlson <absinthe@gentoo.org> jdom-1.0_beta8-r3.ebuild,
+  files/jdom-1.0_beta8-nojdk1.1.patch:
+  Version bump/fix to close bug #15731.  Thanks to Zhen Lin <lowzl@hotmail.com>.
 
 *jdom-1.0_beta8-r2 (12 Jan 2003)
 
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 6f261a9fddc5..bfb901b3cbd3 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,7 +1,7 @@
 MD5 b67bf3a5daf34dee811d992612979e53 jdom-1.0_beta8-r1.ebuild 841
-MD5 2027ff2bf908876f1c6d48d284d55736 jdom-1.0_beta8-r3.ebuild 1110
+MD5 e553a800c8c97afae688f0d396fe9cdb jdom-1.0_beta8-r3.ebuild 1112
 MD5 423d2d8add30ed188d812bd610560add jdom-1.0_beta8-r2.ebuild 991
-MD5 c756ae35b70d97f958cc7fa21d33ebde ChangeLog 1208
+MD5 84bc166a7e9a250676ab9f7514014e29 ChangeLog 1210
 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-r3 b/dev-java/jdom/files/digest-jdom-1.0_beta8-r3
new file mode 100644
index 000000000000..ec6a24dede89
--- /dev/null
+++ b/dev-java/jdom/files/digest-jdom-1.0_beta8-r3
@@ -0,0 +1 @@
+MD5 8abd67fa4a227cb2abf2d2465de80248 jdom-b8.tar.gz 2534221
diff --git a/dev-java/jdom/files/jdom-1.0_beta8-nojdk1.1.patch b/dev-java/jdom/files/jdom-1.0_beta8-nojdk1.1.patch
new file mode 100644
index 000000000000..97784beff557
--- /dev/null
+++ b/dev-java/jdom/files/jdom-1.0_beta8-nojdk1.1.patch
@@ -0,0 +1,18 @@
+--- build.xml.orig	2002-03-29 01:28:29.000000000 +0800
++++ build.xml	2003-02-15 17:22:02.000000000 +0800
+@@ -47,9 +47,14 @@
+     <filter token="verbose" value="true"/>
+ 
+     <!-- JDK1.1 collections -->
++    <!--
+     <property name="coll.import" value="com.sun.java.util.collections"/>
+     <available classname="${coll.import}.Collection" property="coll.present"/>
+-
++    -->
++    
++    <!-- JDK1.4 collections -->
++    <property name="coll.import" value="java.util"/>
++    <available classname="${coll.import}.Collection" property="coll.present"/>
+   </target>
+ 
+   <!-- =================================================================== -->
diff --git a/dev-java/jdom/jdom-1.0_beta8-r3.ebuild b/dev-java/jdom/jdom-1.0_beta8-r3.ebuild
new file mode 100644
index 000000000000..9c7234923b1c
--- /dev/null
+++ b/dev-java/jdom/jdom-1.0_beta8-r3.ebuild
@@ -0,0 +1,42 @@
+# 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-r3.ebuild,v 1.1 2003/05/26 09:09:53 absinthe Exp $
+
+inherit base
+
+IUSE="jikes"
+
+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
+	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)
+	dojar `ls build/jdom*.jar lib/*.jar |grep -v jdk11 |grep -v collections`
+
+	dodoc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
+	dohtml -r build/apidocs/*
+}