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

Package-Manager: portage-2.1.4.4

3 files changed, 98 insertions, 2 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/Manifest b/dev-java/dom4j/Manifest
index cb4efd338348..178985180c17 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST dom4j-1.6.1-java5.patch.bz2 2900 RMD160 cb153194e3b5d13626486d8f376b76f0925448c8 SHA1 468330fe079e8c1c13e935da18a49b10163dcb86 SHA256 5e7361eac5332c3380420bd88c2d3a2d4dde30984486c6d4f7e4621940abb42d
 DIST dom4j-1.6.1.tar.gz 9687211 RMD160 d990d712a6b58c799366c526b32eb6c84a81e29c SHA1 8a2ab8af1dd039c449032ad50f3dd050647d7ce8 SHA256 01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f
 EBUILD dom4j-1.6.1-r2.ebuild 2119 RMD160 4b34ec4e608a147e4b506ffb2523b2d660b733b5 SHA1 15c388350d63b3ac0ded920bb48c3473e742f6d9 SHA256 629422623b31b4e3b97c213c8be6367525643d716803838e1ab2864873647b35
-MISC ChangeLog 5052 RMD160 599db9d69beedd532d396f5162aea82066ae3ec8 SHA1 3b4d0abe66b1d7598d5ed65a30e21a33c91b9a7e SHA256 13070ad5e8740cc7443fc9c51c5f56b84d5d79de348b412eb481eb14a283965b
+EBUILD dom4j-1.6.1-r3.ebuild 1977 RMD160 a767645227e686778f740081ec854718bddf12de SHA1 ceb170df477e4acb68ed1c40bc55a441716abba8 SHA256 147d8a85e612f0c2e58267c92b80a63510febe37bd78634abffb31c11788e0ea
+MISC ChangeLog 5250 RMD160 232bbc88e693707cf8dddc444127181b82dfe97f SHA1 4940c0a3e885b310b3d9121e5abe0f262c2a7a4f SHA256 f1f016c99f4a066684f24af941307677f29acb6fa07dd8708cbfb8047d736f12
 MISC metadata.xml 376 RMD160 ab4f5ef01e92c40a24cc41a50e56948c5454ed3e SHA1 96b1c474f7dc9fe9915f6d58dd4ec1be2badb82f SHA256 1b7f4f99476e5a8b0f24104d0bd3d6c717ee3a32011851d32a8d3f5674e5d2c4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH1eu0cxLzpIGCsLQRAudyAJ93QdDkRclzKMAwgBgZuOSE3xy+JQCgmbJP
+cU/KknnILufbrJO4nRXKFJg=
+=Ihwp
+-----END PGP SIGNATURE-----
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/*
+}