Prepare for upcoming generic src_test and use system copy of xml-commons-external.

(Portage version: 2.1.4.4)

2 files changed, 86 insertions, 1 deletions

diff --git a/dev-java/dom4j/ChangeLog b/dev-java/dom4j/ChangeLog
index 0a5391d8c5d4..f8d327f3ae60 100644
--- a/dev-java/dom4j/ChangeLog
+++ b/dev-java/dom4j/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/dom4j
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.43 2008/01/19 07:43:53 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.44 2008/03/11 02:17:19 betelgeuse Exp $
+
+*dom4j-1.6.1-r3 (11 Mar 2008)
+
+  11 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> +dom4j-1.6.1-r3.ebuild:
+  Prepare for upcoming generic src_test and use system copy of
+  xml-commons-external.
 
   19 Jan 2008; Alistair Bush <ali_bush@gentoo.org> dom4j-1.6.1-r2.ebuild:
   Move IUSE to JAVA_PKG_IUSE to allow java eclasses to handle missing
diff --git a/dev-java/dom4j/dom4j-1.6.1-r3.ebuild b/dev-java/dom4j/dom4j-1.6.1-r3.ebuild
new file mode 100644
index 000000000000..077f13b99ee8
--- /dev/null
+++ b/dev-java/dom4j/dom4j-1.6.1-r3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.6.1-r3.ebuild,v 1.1 2008/03/11 02:17:19 betelgeuse Exp $
+
+EAPI=1
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java library for working with XML"
+HOMEPAGE="http://dom4j.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dom4j/${P}.tar.gz
+	mirror://gentoo/${P}-java5.patch.bz2"
+LICENSE="dom4j"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+RDEPEND=">=virtual/jre-1.4
+	dev-java/jaxme:0
+	dev-java/jsr173:0
+	>=dev-java/msv-20050627-r2:0
+	dev-java/xpp2:0
+	dev-java/xpp3:0
+	dev-java/relaxng-datatype:0
+	dev-java/xerces:2
+	>=dev-java/xsdlib-20050627-r2:0
+	dev-java/xml-commons-external:1.3"
+# Should look into why the tests fail with other versions
+DEPEND="
+	!test? ( >=virtual/jdk-1.4 )
+	test? (
+		=virtual/jdk-1.5*
+		dev-java/ant-junit:0
+		dev-java/xalan:0
+		dev-java/junitperf:0
+	)
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Add missing methods to compile on Java 5
+	# see bug #137970
+	epatch "${WORKDIR}/${P}-java5.patch"
+
+	# Needs X11
+	rm -v ./src/test/org/dom4j/bean/BeansTest.java || die
+	rm -v *.jar || die
+	cd "${S}/lib"
+	#circular deps with jaxen
+	rm -f $(echo *.jar | sed 's/jaxen[^ ]\+//')
+	java-pkg_jar-from jaxme
+	java-pkg_jar-from jsr173
+	java-pkg_jar-from msv
+	java-pkg_jar-from xpp2
+	java-pkg_jar-from xpp3
+	java-pkg_jar-from relaxng-datatype
+	java-pkg_jar-from xsdlib
+	java-pkg_jar-from xml-commons-external-1.3
+
+	cd "${S}/lib/endorsed"
+	rm -v *.jar || die
+	java-pkg_jar-from xerces-2 || die
+
+	rm -vr "${S}"/lib/test/* || die
+	if use test; then
+		java-pkg_jar-from --build-only xalan,junitperf,junit
+	fi
+	rm -vr "${S}"/lib/tools/* || die
+}
+
+EANT_BUILD_TARGET="clean package"
+EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+	use doc && java-pkg_dojavadoc build/doc/api
+	use source && java-pkg_dosrc src/java/*
+}