Marked stable on ppc,sparc, added new version to testing.

6 files changed, 36 insertions, 19 deletions

diff --git a/dev-java/jdom/ChangeLog b/dev-java/jdom/ChangeLog
index 87de8d9cdce2..787b51fe2cf3 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.7 2003/05/26 11:20:19 absinthe Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.8 2004/01/25 07:23:46 strider Exp $
+
+*jdom-1.0_beta9 (25 Jan 2004)
+
+  25 Jan 2004; Adrian Almenar <strider@gentoo.org> jdom-1.0_beta8-r4.ebuild,
+  jdom-1.0_beta9.ebuild:
+  Marked stable on ppc,sparc, added new version to testing.
 
 *jdom-1.0_beta8-r4 (26 May 2003)
 
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index e9ab1c2d01db..c82d31068b3b 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,7 +1,7 @@
-MD5 ec39cbfc4b50127085bbea33abecbbd1 ChangeLog 1589
-MD5 e553a800c8c97afae688f0d396fe9cdb jdom-1.0_beta8-r3.ebuild 1112
-MD5 4c48f5368c0019f2a51d916bdbe12e85 jdom-1.0_beta8-r4.ebuild 1165
+MD5 7be9d0a3fe499addb1cfa830603721a7 jdom-1.0_beta9.ebuild 1086
+MD5 59186e4841bb88f2b5a1d014a208aa33 ChangeLog 1782
+MD5 bf7eabde70856c94e2b1e8b7a566516e jdom-1.0_beta8-r4.ebuild 1155
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 03290a96b3c0f71a58db6620dd1b547f files/digest-jdom-1.0_beta8-r3 60
+MD5 5387342ae9576c96d6fab009ed1c306f files/digest-jdom-1.0_beta9 60
 MD5 33c4f711c3cd26755c0226a88fddd422 files/jdom-1.0_beta8-nojdk1.1.patch 646
 MD5 03290a96b3c0f71a58db6620dd1b547f files/digest-jdom-1.0_beta8-r4 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
deleted file mode 100644
index ec6a24dede89..000000000000
--- a/dev-java/jdom/files/digest-jdom-1.0_beta8-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8abd67fa4a227cb2abf2d2465de80248 jdom-b8.tar.gz 2534221
diff --git a/dev-java/jdom/files/digest-jdom-1.0_beta9 b/dev-java/jdom/files/digest-jdom-1.0_beta9
new file mode 100644
index 000000000000..008f21f62620
--- /dev/null
+++ b/dev-java/jdom/files/digest-jdom-1.0_beta9
@@ -0,0 +1 @@
+MD5 593c7bbbd939eb0513444d2c61e5aca0 jdom-b9.tar.gz 3417274
diff --git a/dev-java/jdom/jdom-1.0_beta8-r4.ebuild b/dev-java/jdom/jdom-1.0_beta8-r4.ebuild
index 6058a32799bc..57824f3e3797 100644
--- a/dev-java/jdom/jdom-1.0_beta8-r4.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta8-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.3 2003/09/06 22:26:46 msterret Exp $
+# $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
 
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="x86 sparc ppc"
 RDEPEND=">=virtual/jdk-1.3"
 DEPEND="${RDEPEND}
 	>=dev-java/ant-1.4.1
diff --git a/dev-java/jdom/jdom-1.0_beta8-r3.ebuild b/dev-java/jdom/jdom-1.0_beta9.ebuild
index 9c7234923b1c..d38942cf05bf 100644
--- a/dev-java/jdom/jdom-1.0_beta8-r3.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta9.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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-r3.ebuild,v 1.1 2003/05/26 09:09:53 absinthe Exp $
 
-inherit base
+inherit java-pkg
 
-IUSE="jikes"
+IUSE="jikes doc"
 
 MY_PN="jdom"
-MY_PV="b8"
+MY_PV="b9"
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="Java API to manipulate XML data"
@@ -15,12 +14,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 alpha"
+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() {
@@ -35,8 +35,19 @@ src_compile() {
 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`
+	java-pkg_dojar \
+		build/jdom.jar
 
 	dodoc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
-	dohtml -r build/apidocs/*
+	use doc && dohtml -r build/apidocs/*
 }
+
+pkg_postinst() {
+
+	einfo
+	einfo "Online Documentation:"
+	einfo "     http://www.jdom.org/downloads/docs.html"
+	einfo
+
+}
+