Version bump :D

6 files changed, 58 insertions, 30 deletions

diff --git a/dev-java/jdom/ChangeLog b/dev-java/jdom/ChangeLog
index 34b26aa8aeba..83de601f378b 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.10 2004/03/19 01:17:14 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.11 2004/03/30 21:58:21 zx Exp $
+
+  30 Mar 2004; Chris Aniszczyk <zx@gentoo.org> jdom-1.0_beta9.ebuild,
+  files/jdom-1.0_beta8-nojdk1.1.patch:
+  Version bump
 
   18 Mar 2004; Chris Aniszczyk <zx@gentoo.org> jdom-1.0_beta8-r4.ebuild,
   jdom-1.0_beta9.ebuild:
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 963db559a3a3..c80f3e3f3d32 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,5 +1,7 @@
-MD5 e9bc4322ce39a3740e41f3d2f85d399d jdom-1.0_beta9.ebuild 1182
+MD5 5c2a081fc04b18b02285f87a95d2ae03 jdom-1.0_beta9.ebuild 1060
 MD5 b1b6e7537d47a8bf3ba428f72c675149 ChangeLog 1981
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 b8f094d6a5e8cd3e850985ed8718629b jdom-1.0_beta10.ebuild 1061
 MD5 5387342ae9576c96d6fab009ed1c306f files/digest-jdom-1.0_beta9 60
 MD5 33c4f711c3cd26755c0226a88fddd422 files/jdom-1.0_beta8-nojdk1.1.patch 646
+MD5 cad484f43c69253a8823f7d668b6c0ab files/digest-jdom-1.0_beta10 61
diff --git a/dev-java/jdom/files/digest-jdom-1.0_beta10 b/dev-java/jdom/files/digest-jdom-1.0_beta10
new file mode 100644
index 000000000000..bf99f8de4578
--- /dev/null
+++ b/dev-java/jdom/files/digest-jdom-1.0_beta10
@@ -0,0 +1 @@
+MD5 39323441e0e69fbf2458981b73477098 jdom-b10.tar.gz 3565663
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
deleted file mode 100644
index 97784beff557..000000000000
--- a/dev-java/jdom/files/jdom-1.0_beta8-nojdk1.1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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_beta10.ebuild b/dev-java/jdom/jdom-1.0_beta10.ebuild
new file mode 100644
index 000000000000..7b9e5248ca64
--- /dev/null
+++ b/dev-java/jdom/jdom-1.0_beta10.ebuild
@@ -0,0 +1,46 @@
+# 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_beta10.ebuild,v 1.1 2004/03/30 21:58:21 zx Exp $
+
+inherit java-pkg
+
+IUSE="jikes doc"
+
+MY_PN="jdom"
+MY_PV="b10"
+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=">=dev-java/ant-1.4.1
+		dev-java/xalan
+		dev-java/xerces
+		jikes? ( >=dev-java/jikes-1.15 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	local antflags=""
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "compile problem"
+}
+
+src_install() {
+	java-pkg_dojar \
+		build/*.jar
+
+	dodoc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
+	use doc && dohtml -r build/apidocs/*
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Online Documentation:"
+	einfo "     http://www.jdom.org/downloads/docs.html"
+	einfo
+}
diff --git a/dev-java/jdom/jdom-1.0_beta9.ebuild b/dev-java/jdom/jdom-1.0_beta9.ebuild
index 96485dca9fc8..f1bf5cd4aa5e 100644
--- a/dev-java/jdom/jdom-1.0_beta9.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta9.ebuild
@@ -1,6 +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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta9.ebuild,v 1.3 2004/03/30 21:58:21 zx Exp $
 
 inherit java-pkg
 
@@ -25,29 +25,22 @@ DEPEND=">=dev-java/ant-1.4.1
 S="${WORKDIR}/${MY_P}"
 
 src_compile() {
-	local antflags
-
-	antflags=""
+	local 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
+		build/*.jar
 
 	dodoc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
 	use doc && dohtml -r build/apidocs/*
 }
 
 pkg_postinst() {
-
 	einfo
 	einfo "Online Documentation:"
 	einfo "     http://www.jdom.org/downloads/docs.html"
 	einfo
-
 }