10 files changed, 105 insertions, 18 deletions
diff --git a/dev-java/jdom/ChangeLog b/dev-java/jdom/ChangeLog
index fe4c2d6f444d..2a36cd4c9397 100644
--- a/dev-java/jdom/ChangeLog
+++ b/dev-java/jdom/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/jdom
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.17 2004/10/17 07:29:20 absinthe Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.18 2005/02/03 17:14:26 luckyduck Exp $
+
+*jdom-1.0_beta9-r1 (03 Feb 2005)
+
+  03 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> +jdom-1.0.ebuild,
+  -jdom-1.0_beta10-r1.ebuild, +jdom-1.0_beta10-r3.ebuild,
+  -jdom-1.0_beta10.ebuild, +jdom-1.0_beta6.ebuild, +jdom-1.0_beta9-r1.ebuild,
+  -jdom-1.0_beta9.ebuild:
+  slotted jdom correctly, added 1.0 final and _beta6. fixes several bugs related
+  to missing jdom slotting.
 
   17 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
   jdom-1.0_beta10-r1.ebuild, jdom-1.0_beta10.ebuild, jdom-1.0_beta9.ebuild:
diff --git a/dev-java/jdom/files/digest-jdom-1.0 b/dev-java/jdom/files/digest-jdom-1.0
new file mode 100644
index 000000000000..2d7643309b87
--- /dev/null
+++ b/dev-java/jdom/files/digest-jdom-1.0
@@ -0,0 +1 @@
+MD5 ce29ecc05d63fdb419737fd00c04c281 jdom-1.0.tar.gz 3571788
diff --git a/dev-java/jdom/files/digest-jdom-1.0_beta10-r1 b/dev-java/jdom/files/digest-jdom-1.0_beta10-r1
deleted file mode 100644
index bf99f8de4578..000000000000
--- a/dev-java/jdom/files/digest-jdom-1.0_beta10-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 39323441e0e69fbf2458981b73477098 jdom-b10.tar.gz 3565663
diff --git a/dev-java/jdom/files/digest-jdom-1.0_beta10 b/dev-java/jdom/files/digest-jdom-1.0_beta10-r3
index bf99f8de4578..bf99f8de4578 100644
--- a/dev-java/jdom/files/digest-jdom-1.0_beta10
+++ b/dev-java/jdom/files/digest-jdom-1.0_beta10-r3
diff --git a/dev-java/jdom/files/digest-jdom-1.0_beta6 b/dev-java/jdom/files/digest-jdom-1.0_beta6
new file mode 100644
index 000000000000..185505916c98
--- /dev/null
+++ b/dev-java/jdom/files/digest-jdom-1.0_beta6
@@ -0,0 +1 @@
+MD5 eaffabd4ce596421a5c0696224ee4347 jdom-b6.tar.gz 1045817
diff --git a/dev-java/jdom/files/digest-jdom-1.0_beta9 b/dev-java/jdom/files/digest-jdom-1.0_beta9-r1
index 008f21f62620..008f21f62620 100644
--- a/dev-java/jdom/files/digest-jdom-1.0_beta9
+++ b/dev-java/jdom/files/digest-jdom-1.0_beta9-r1
diff --git a/dev-java/jdom/jdom-1.0_beta10.ebuild b/dev-java/jdom/jdom-1.0.ebuild
index 4d2aa14b3d5f..68a8cc0fd7b5 100644
--- a/dev-java/jdom/jdom-1.0_beta10.ebuild
+++ b/dev-java/jdom/jdom-1.0.ebuild
@@ -1,31 +1,44 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.ebuild,v 1.4 2004/10/17 07:29:20 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0.ebuild,v 1.1 2005/02/03 17:14:26 luckyduck Exp $
 
 inherit java-pkg
 
 IUSE="jikes doc"
 
 MY_PN="jdom"
-MY_PV="b10"
+MY_PV="1.0"
 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 ~amd64"
+SLOT="${PV}"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
 RDEPEND=">=virtual/jdk-1.3"
 DEPEND=">=dev-java/ant-1.4.1
+		dev-java/saxpath
 		dev-java/xalan
-		dev-java/xerces
+		=dev-java/jaxen-1.1*
+		>=dev-java/xerces-2.6.2-r1
 		jikes? ( >=dev-java/jikes-1.15 )"
 
 S="${WORKDIR}/${MY_P}"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	rm -f build/*.jar lib/*.jar
+
+	cd ${S}/lib
+	java-pkg_jar-from jaxen-1.1
+	java-pkg_jar-from saxpath
+	java-pkg_jar-from xerces-2
+}
+
 src_compile() {
-	local antflags=""
+	local antflags="package"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	ant ${antflags} || die "compile problem"
 }
diff --git a/dev-java/jdom/jdom-1.0_beta10-r1.ebuild b/dev-java/jdom/jdom-1.0_beta10-r3.ebuild
index 34878f96d019..4159870d0734 100644
--- a/dev-java/jdom/jdom-1.0_beta10-r1.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta10-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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-r1.ebuild,v 1.3 2004/10/17 07:29:20 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta10-r3.ebuild,v 1.1 2005/02/03 17:14:26 luckyduck Exp $
 
 inherit java-pkg
 
@@ -14,8 +14,8 @@ 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 ~amd64"
+SLOT="${PV}"
+KEYWORDS="x86 ~sparc ~ppc ~amd64"
 RDEPEND=">=virtual/jdk-1.3"
 DEPEND=">=dev-java/ant-1.4.1
 		dev-java/jaxen
diff --git a/dev-java/jdom/jdom-1.0_beta6.ebuild b/dev-java/jdom/jdom-1.0_beta6.ebuild
new file mode 100644
index 000000000000..365b8c69b601
--- /dev/null
+++ b/dev-java/jdom/jdom-1.0_beta6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta6.ebuild,v 1.1 2005/02/03 17:14:26 luckyduck Exp $
+
+inherit java-pkg
+
+IUSE="jikes doc"
+
+MY_PN="jdom"
+MY_PV="b6"
+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="~x86 ~amd64"
+DEPEND=">=dev-java/ant-1.4.1
+		${RDEPEND}
+		>=virtual/jdk-1.3
+		jikes? ( >=dev-java/jikes-1.15 )"
+RDEPEND=">=virtual/jre-1.3
+		=dev-java/xerces-2.6.2*
+		dev-java/saxpath
+		=dev-java/jaxen-1.1*
+		dev-java/xalan"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	rm -f build/*.jar lib/*.jar
+
+	cd ${S}/lib
+	java-pkg_jar-from jaxen-1.1
+	java-pkg_jar-from saxpath
+	java-pkg_jar-from xerces-2
+}
+
+src_compile() {
+	local antflags="package"
+	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 && java-pkg_dohtml -r build/apidocs/*
+}
diff --git a/dev-java/jdom/jdom-1.0_beta9.ebuild b/dev-java/jdom/jdom-1.0_beta9-r1.ebuild
index 0dea0ea9e5da..ddb20f600dea 100644
--- a/dev-java/jdom/jdom-1.0_beta9.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # 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.6 2004/10/17 07:29:20 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta9-r1.ebuild,v 1.1 2005/02/03 17:14:26 luckyduck Exp $
 
 inherit java-pkg
 
@@ -14,16 +14,27 @@ 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"
+SLOT="${PV}"
 KEYWORDS="x86 ~sparc ~ppc ~amd64"
 RDEPEND=">=virtual/jdk-1.3"
 DEPEND=">=dev-java/ant-1.4.1
 		dev-java/xalan
-		dev-java/xerces
+		=dev-java/xerces-2.6.2*
+		=dev-java/jaxen-1.1*
 		jikes? ( >=dev-java/jikes-1.15 )"
 
 S="${WORKDIR}/${MY_P}"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}/lib
+
+	rm -f *
+	java-pkg_jar-from xerces-2
+	java-pkg_jar-from xalan
+	java-pkg_jar-from jaxen-1.1
+}
+
 src_compile() {
 	local antflags=""
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"