Nuke test source files in src_unpack so we don't have to depend on junit and xalan.

Package-Manager: portage-2.2_rc4/cvs/Linux 2.6.26-gentoo i686

3 files changed, 81 insertions, 5 deletions

diff --git a/dev-java/xom/ChangeLog b/dev-java/xom/ChangeLog
index cd6a2d01ebf8..356153d77859 100644
--- a/dev-java/xom/ChangeLog
+++ b/dev-java/xom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/xom
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.49 2008/04/13 22:10:46 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.50 2008/07/30 19:34:07 betelgeuse Exp $
+
+*xom-1.0-r7 (30 Jul 2008)
+
+  30 Jul 2008; Petteri Räty <betelgeuse@gentoo.org> +xom-1.0-r7.ebuild:
+  Nuke test source files in src_unpack so we don't have to depend on junit
+  and xalan.
 
   13 Apr 2008; Petteri Räty <betelgeuse@gentoo.org> -xom-1.0-r4.ebuild:
   Remove old revision.
diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest
index 79911f02c5fe..226bc60d26ee 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -3,12 +3,13 @@ Hash: SHA1
 
 DIST xom-1.0.tar.gz 3396586 RMD160 9e524b87d0cce968aaabe9aff3010de210e23745 SHA1 bf6de9cd45263e6670a95ac7b2a34b97ee4d3db3 SHA256 d37fbb5a2e6f1dd716c1f55f2e2ce6d96f9227788c2cd73e436c1cd087925a16
 EBUILD xom-1.0-r6.ebuild 1771 RMD160 dab961166af377a7fdb191279c0617c301179729 SHA1 dd046ddea3c1331f57a90359157b5044275ba7e3 SHA256 26e15d7fda95dfac49482044effa871f809505654b1c2d0db9906a9de9adbaae
-MISC ChangeLog 6248 RMD160 37913c903b0f1d1084c1dd8de58bf24c60ae071f SHA1 9c0be5c59b6735205d43b8e1fcd362625e5aea2f SHA256 d80ee5ce4ccab0c80e032340b1abf635ab344cabeca6798ed89a9d58d61f1e6f
+EBUILD xom-1.0-r7.ebuild 1881 RMD160 06c68e033921027431d1c01f059142ccd1caf52a SHA1 937a1318c4a3785c298a4b6db4629afc910e8782 SHA256 9e95745d2d9a145a682a37e179fca35aa616bd270b6fea0ae77bcf10eb84284a
+MISC ChangeLog 6437 RMD160 2714ecb5136c7602c923ff2b2c86f9410c94e474 SHA1 2cdb308e58a6198dce44e7706c411e65e9e3c67e SHA256 1d6959f2a3b7ffe75610463d88a8d1f007f031c976ab963b988f3c1776fb8bc9
 MISC metadata.xml 329 RMD160 6eae130480bb2aaffeb7d11f07ced2bad8eab1e3 SHA1 09cb7ea27575a9d281a52b46b19fe63f6ea54adc SHA256 3f4ca05bff0b5512bd08e7e4471ff434786c27b458e840dda8e64c02e1901d1d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgChOgACgkQcxLzpIGCsLTiXQCglY3HpfLLTnJTFt1+vKvGXK7h
-pbEAmwcgg+JhEPwmpGITxUNBRJG2UULJ
-=X7Zo
+iEYEARECAAYFAkiQwjoACgkQcxLzpIGCsLR4hACgg/ksMR/FMYwnx1L26rdFMKoq
+18AAnRLEC2YsQO1weZa6mZ3jPHVYhEwm
+=D361
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xom/xom-1.0-r7.ebuild b/dev-java/xom/xom-1.0-r7.ebuild
new file mode 100644
index 000000000000..309aa04ba21c
--- /dev/null
+++ b/dev-java/xom/xom-1.0-r7.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0-r7.ebuild,v 1.1 2008/07/30 19:34:07 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc examples source"
+EAPI=1
+
+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
+		dev-java/icu4j:0
+		examples? ( dev-java/servletapi:2.4 )"
+RDEPEND=">=virtual/jre-1.4
+		${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+		${COMMON_DEPEND}"
+#test? ( dev-java/ant-junit:0 )
+
+S=${WORKDIR}/XOM
+
+# Test require network access to pass
+# They need a redirected http document on public web
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	java-ant_ignore-system-classes
+	rm -v *.jar || die
+	# nuke test files as we aren't installing them
+	rm -vr src/nu/xom/tests || die
+	cd "${S}/lib"
+	rm -v *.jar || die
+	#java-pkg_jar-from --build-only junit
+	#java-pkg_jar-from --build-only xalan
+	java-pkg_jar-from xerces-2
+	java-pkg_jar-from icu4j icu4j.jar normalizer.jar
+	# tagsoup is only needed to run betterdoc but we use the pregenerated ones
+}
+
+src_compile() {
+	local ant_flags="-Ddebug=off"
+	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)
+}
+
+EANT_TEST_ANT_TASKS="ant-trax"
+
+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
+}