Revbump to fix optional dependency incorrect usage in ebuild

(Portage version: 2.1.3.19)

3 files changed, 71 insertions, 1 deletions

diff --git a/dev-java/xom/ChangeLog b/dev-java/xom/ChangeLog
index a3ac18a4cb59..e3935b50533f 100644
--- a/dev-java/xom/ChangeLog
+++ b/dev-java/xom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/xom
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.34 2007/11/15 18:48:02 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.35 2007/11/19 07:21:32 ali_bush Exp $
+
+*xom-1.0-r4 (19 Nov 2007)
+
+  19 Nov 2007; <alistair@gentoo.org> +xom-1.0-r4.ebuild:
+  Revbump to fix usage of optional dependency.
 
   15 Nov 2007; Krzysiek Pawlik <nelchael@gentoo.org> xom-1.0-r3.ebuild:
   Stable on ppc, bug #142538.
diff --git a/dev-java/xom/files/digest-xom-1.0-r4 b/dev-java/xom/files/digest-xom-1.0-r4
new file mode 100644
index 000000000000..27aa669027b5
--- /dev/null
+++ b/dev-java/xom/files/digest-xom-1.0-r4
@@ -0,0 +1,3 @@
+MD5 af472e90685eef0ac1e731eb84a49763 xom-1.0.tar.gz 3396586
+RMD160 9e524b87d0cce968aaabe9aff3010de210e23745 xom-1.0.tar.gz 3396586
+SHA256 d37fbb5a2e6f1dd716c1f55f2e2ce6d96f9227788c2cd73e436c1cd087925a16 xom-1.0.tar.gz 3396586
diff --git a/dev-java/xom/xom-1.0-r4.ebuild b/dev-java/xom/xom-1.0-r4.ebuild
new file mode 100644
index 000000000000..84939f14326c
--- /dev/null
+++ b/dev-java/xom/xom-1.0-r4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0-r4.ebuild,v 1.1 2007/11/19 07:21:32 ali_bush Exp $
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+XOMVER="xom-${PV/_beta/b}"
+DESCRIPTION="A new XML object model."
+HOMEPAGE="http://cafeconleche.org/XOM/index.html"
+SRC_URI="http://cafeconleche.org/XOM/${XOMVER}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEPEND=">=dev-java/xerces-2.7
+		dev-java/xalan
+		dev-java/junit
+		=dev-java/icu4j-3.0*
+		examples? ( =dev-java/servletapi-2.4* )
+		dev-java/tagsoup"
+RDEPEND=">=virtual/jre-1.4
+		${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+		${COMMON_DEPEND}"
+
+S=${WORKDIR}/XOM
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	java-ant_ignore-system-classes
+	rm -v *.jar || die
+	cd "${S}/lib"
+	rm -v *.jar || die
+	java-pkg_jar-from junit
+	java-pkg_jar-from xalan
+	java-pkg_jar-from xerces-2
+	java-pkg_jar-from icu4j icu4j.jar normalizer.jar
+	java-pkg_jar-from tagsoup
+}
+
+src_compile() {
+	ant_flags="-Ddebug=off -Dtagsoup.jar=lib/tagsoup.jar"
+	use examples && ant_flags="${ant_flags} -Dservlet.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)"
+
+	eant jar ${ant_flags}\
+		$(use examples && echo samples)
+}
+
+src_install() {
+	java-pkg_newjar build/${XOMVER}.jar ${PN}.jar
+	use examples && java-pkg_dojar build/xom-samples.jar
+	dodoc Todo.txt || die
+
+	use doc && java-pkg_dojavadoc apidocs/
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples --subdir nu/xom/samples src/nu/xom/samples
+}