version bump, and doesn't use packed jars anymore

6 files changed, 67 insertions, 43 deletions

diff --git a/dev-java/xom/ChangeLog b/dev-java/xom/ChangeLog
index 9b33f15bd563..d2c19888b23f 100644
--- a/dev-java/xom/ChangeLog
+++ b/dev-java/xom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/xom
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.5 2004/06/24 22:46:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.6 2004/09/19 15:12:39 axxo Exp $
+
+*xom-1.0_beta5 (19 Sep 2004)
+
+  19 Sep 2004; Thomas Matthijs <axxo@gentoo.org> -xom-1.0.14.ebuild,
+  +xom-1.0_beta5.ebuild:
+  version bump, and doesn't use packed jars anymore
 
   02 Jun 2004; Aron Griffis <agriffis@gentoo.org> xom-1.0.14.ebuild:
   Fix use invocation
diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest
index 3841c12b7e45..e74a09be70d1 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -1,4 +1,4 @@
-MD5 cc23deaedb1005e9bb4bf1e1173837bf xom-1.0.14.ebuild 1051
+MD5 a997874d3f4780623267e78c7915da8e xom-1.0_beta5.ebuild 1390
 MD5 aeb37cf7a348316d07b4cb9072d4b879 ChangeLog 578
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 209356975b01190324cd237655c057cc files/digest-xom-1.0.14 60
+MD5 a5d63e4795719a77ec4ed37989972163 files/digest-xom-1.0_beta5 59
diff --git a/dev-java/xom/files/digest-xom-1.0.14 b/dev-java/xom/files/digest-xom-1.0.14
deleted file mode 100644
index 8703f3a9c7ff..000000000000
--- a/dev-java/xom/files/digest-xom-1.0.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b2bb8af907f26d3c1f38ead57c097936 xom-1.0d14.zip 2302469
diff --git a/dev-java/xom/files/digest-xom-1.0_beta5 b/dev-java/xom/files/digest-xom-1.0_beta5
new file mode 100644
index 000000000000..ce938236b4e9
--- /dev/null
+++ b/dev-java/xom/files/digest-xom-1.0_beta5
@@ -0,0 +1 @@
+MD5 c7eebde7a1279f51407d589d286f6b0c xom-1.0b5.zip 4029687
diff --git a/dev-java/xom/xom-1.0.14.ebuild b/dev-java/xom/xom-1.0.14.ebuild
deleted file mode 100644
index 1019635c0f4c..000000000000
--- a/dev-java/xom/xom-1.0.14.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0.14.ebuild,v 1.6 2004/06/24 22:46:15 agriffis Exp $
-
-inherit java-pkg
-
-#This is ugly but portage barfs with the name set to xom-10.d14
-S=${WORKDIR}/XOM
-XOMVER="xom-1.0d14"
-DESCRIPTION="XOM is a new XML object model. It is a tree-based API for processing XML with Java that strives for correctness and simplicity."
-HOMEPAGE="http://cafeconleche.org/XOM/index.html"
-SRC_URI="http://cafeconleche.org/XOM/${XOMVER}.zip"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE="doc"
-
-DEPEND=">=dev-java/ant-1.4"
-RDEPEND=">=virtual/jdk-1.2"
-
-src_compile() {
-	local myc
-	cd ${WORKDIR}/XOM
-	myc="${myc} -Ddebug=off"
-	ANT_OPTS=${myc} ant jar || die "Failed Compiling"
-}
-
-src_install() {
-	mv ${WORKDIR}/XOM/build/${XOMVER}.jar xom.jar
-	java-pkg_dojar xom.jar || die "Failed Installing"
-	dodoc Todo.txt
-
-	if use doc ; then
-		dodir /usr/share/doc/${P}
-		cd ${WORKDIR}/XOM/
-		dohtml -r apidocs/
-	fi
-}
diff --git a/dev-java/xom/xom-1.0_beta5.ebuild b/dev-java/xom/xom-1.0_beta5.ebuild
new file mode 100644
index 000000000000..5ec9a23bceff
--- /dev/null
+++ b/dev-java/xom/xom-1.0_beta5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0_beta5.ebuild,v 1.1 2004/09/19 15:12:39 axxo Exp $
+
+inherit java-pkg
+
+XOMVER="xom-1.0b5"
+DESCRIPTION="XOM is a new XML object model. It is a tree-based API for processing XML with Java that strives for correctness and simplicity."
+HOMEPAGE="http://cafeconleche.org/XOM/index.html"
+SRC_URI="http://cafeconleche.org/XOM/${XOMVER}.zip"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc"
+
+DEPEND=">=dev-java/ant-1.4
+		>=dev-java/xerces-2.6.2-r1
+		dev-java/xalan
+		dev-java/junit
+		dev-java/icu4j
+		dev-java/tagsoup
+		=dev-java/servletapi-2.3*"
+RDEPEND=">=virtual/jdk-1.2"
+
+S=${WORKDIR}/XOM
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	rm -f *.jar
+	cd ${S}/lib
+	rm -f *.jar
+	java-pkg_jar-from junit
+	java-pkg_jar-from xalan
+	java-pkg_jar-from xerces-2
+	java-pkg_jar-from servletapi-2.3 servletapi-2.3.jar servlet.jar
+	java-pkg_jar-from icu4j icu4j.jar normalizer.jar
+	java-pkg_jar-from tagsoup tagsoup.jar tagsoup-0.9.7.jar
+}
+
+src_compile() {
+	local antflags="jar -Ddebug=off"
+	ant ${antflags} || die "Failed Compiling"
+}
+
+src_install() {
+	mv ${WORKDIR}/XOM/build/${XOMVER}.jar xom.jar
+	java-pkg_dojar xom.jar
+	dodoc Todo.txt
+
+	if use doc ; then
+		dodir /usr/share/doc/${P}
+		cd ${WORKDIR}/XOM/
+		dohtml -r apidocs/
+	fi
+}