dev-java/servletapi is only needed to build the examples to add examples use flag. Also now it does not get picked automatically from ant classpath. Reported in bug #142538.

Package-Manager: portage-2.1.3.19

4 files changed, 92 insertions, 5 deletions

diff --git a/dev-java/xom/ChangeLog b/dev-java/xom/ChangeLog
index 9e034859d707..86ddfc521d27 100644
--- a/dev-java/xom/ChangeLog
+++ b/dev-java/xom/ChangeLog
@@ -1,6 +1,13 @@
 # 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.30 2007/05/09 14:46:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.31 2007/11/13 23:29:00 betelgeuse Exp $
+
+*xom-1.0-r3 (13 Nov 2007)
+
+  13 Nov 2007; Petteri Räty <betelgeuse@gentoo.org> +xom-1.0-r3.ebuild:
+  dev-java/servletapi is only needed to build the examples to add examples use
+  flag. Also now it does not get picked automatically from ant classpath.
+  Reported in bug #142538.
 
   09 May 2007; Raúl Porcel <armin76@gentoo.org> xom-1.0-r2.ebuild:
   Add ~ia64 wrt #160813
diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest
index a79969d025ac..2d167205c1c1 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -1,12 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST xom-1.0.tar.gz 3396586 RMD160 9e524b87d0cce968aaabe9aff3010de210e23745 SHA1 bf6de9cd45263e6670a95ac7b2a34b97ee4d3db3 SHA256 d37fbb5a2e6f1dd716c1f55f2e2ce6d96f9227788c2cd73e436c1cd087925a16
 EBUILD xom-1.0-r2.ebuild 1419 RMD160 f94fa3de1fb7c52d2cc6127594d99473d838adc3 SHA1 3c00e2e8554fb35be20c0e0e62ce23207e716099 SHA256 48e3d87470e81e410fac4b65341c87f52c44e241eb554b6e48c49b1d6ef77cb0
 MD5 607a7a80cb899fedee24d87c04beaa1d xom-1.0-r2.ebuild 1419
 RMD160 f94fa3de1fb7c52d2cc6127594d99473d838adc3 xom-1.0-r2.ebuild 1419
 SHA256 48e3d87470e81e410fac4b65341c87f52c44e241eb554b6e48c49b1d6ef77cb0 xom-1.0-r2.ebuild 1419
-MISC ChangeLog 3746 RMD160 50774cbbf3da07eab72f7717417bcad76249f8ce SHA1 90bebea349a96e90755aee912d85b563e27868ba SHA256 ecddd19b7afbef8235c7b6943263e21c2a6edf03564ad964f6e6fc10a949358c
-MD5 041792977450e144297f541e66c1b879 ChangeLog 3746
-RMD160 50774cbbf3da07eab72f7717417bcad76249f8ce ChangeLog 3746
-SHA256 ecddd19b7afbef8235c7b6943263e21c2a6edf03564ad964f6e6fc10a949358c ChangeLog 3746
+EBUILD xom-1.0-r3.ebuild 1658 RMD160 f354cacdfd9986e96f48e8d166aeedb036c08141 SHA1 981b919ba834b6921271b48e5291e3723ae3e0fd SHA256 ad43d0e6c557c7da2c34d57fbb93926f92082148fc345db3944f816dacc78a29
+MD5 efbabcae02b0b53c9e09fb04118da607 xom-1.0-r3.ebuild 1658
+RMD160 f354cacdfd9986e96f48e8d166aeedb036c08141 xom-1.0-r3.ebuild 1658
+SHA256 ad43d0e6c557c7da2c34d57fbb93926f92082148fc345db3944f816dacc78a29 xom-1.0-r3.ebuild 1658
+MISC ChangeLog 4030 RMD160 6843c5a82cc85e4519fe3a0cec48e1168ce0a7d1 SHA1 a001f3b54a00584b8c46a121dd2aebc338d5eed1 SHA256 46d68079ec134da1348058afd032e72a583cf5db66b377aaba4615b27dd172eb
+MD5 a5f9e62ed29b5605d60d24736195089c ChangeLog 4030
+RMD160 6843c5a82cc85e4519fe3a0cec48e1168ce0a7d1 ChangeLog 4030
+SHA256 46d68079ec134da1348058afd032e72a583cf5db66b377aaba4615b27dd172eb ChangeLog 4030
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -14,3 +21,13 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 83f964d202477e2a439016433b2e4b8f files/digest-xom-1.0-r2 226
 RMD160 cdd6d43994408957232f5c7774163d78bb612c6d files/digest-xom-1.0-r2 226
 SHA256 6f97856b30a3b3f4617263197f7887d4867f241b97e9ad765dc3e893ea217703 files/digest-xom-1.0-r2 226
+MD5 83f964d202477e2a439016433b2e4b8f files/digest-xom-1.0-r3 226
+RMD160 cdd6d43994408957232f5c7774163d78bb612c6d files/digest-xom-1.0-r3 226
+SHA256 6f97856b30a3b3f4617263197f7887d4867f241b97e9ad765dc3e893ea217703 files/digest-xom-1.0-r3 226
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHOjM4cxLzpIGCsLQRArumAJ4tsUuSyn20y1n1/sNN9+bzCQN0XgCcDx2Z
+gN7L4A4YWcFKcLxABCGnHwk=
+=obrL
+-----END PGP SIGNATURE-----
diff --git a/dev-java/xom/files/digest-xom-1.0-r3 b/dev-java/xom/files/digest-xom-1.0-r3
new file mode 100644
index 000000000000..27aa669027b5
--- /dev/null
+++ b/dev-java/xom/files/digest-xom-1.0-r3
@@ -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-r3.ebuild b/dev-java/xom/xom-1.0-r3.ebuild
new file mode 100644
index 000000000000..273a61982ddc
--- /dev/null
+++ b/dev-java/xom/xom-1.0-r3.ebuild
@@ -0,0 +1,60 @@
+# 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-r3.ebuild,v 1.1 2007/11/13 23:29:00 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+XOMVER="xom-${PV/_beta/b}"
+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}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4
+	>=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"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+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() {
+	eant jar -Ddebug=off -Dtagsoup.jar=lib/tagsoup.jar \
+		-Dservlet.jar="$(java-pkg_getjar servletapi-2.4 servlet-api.jar)" \
+		$(use examples && echo samples) \
+		|| die "Failed Compiling"
+}
+
+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
+}