Rev and EAPI bump. Make better use of eclasses. Cleanup.

Drop deps on xalan, xerces, msv and xml-commons-external. Also solves slot
conflict with xml-commons-external. #419603
Replace jsr173 with virtual stax-api.
Don't let jre rdep leak into DEPEND, confuses vm switching code.
Disable one additionl test failing with jdk 7.

Package-Manager: portage-2.1.10.62/cvs/Linux x86_64

3 files changed, 92 insertions, 16 deletions

diff --git a/dev-java/dom4j/ChangeLog b/dev-java/dom4j/ChangeLog
index aaffa37b4051..c9f47e17df9a 100644
--- a/dev-java/dom4j/ChangeLog
+++ b/dev-java/dom4j/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/dom4j
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.56 2012/04/15 18:47:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.57 2012/06/05 13:44:14 sera Exp $
+
+*dom4j-1.6.1-r4 (05 Jun 2012)
+
+  05 Jun 2012; Ralph Sennhauser <sera@gentoo.org> +dom4j-1.6.1-r4.ebuild:
+  Rev and EAPI bump. Make better use of eclasses. Cleanup.
+  Drop deps on xalan, xerces, msv and xml-commons-external. Also solves slot 
+  conflict with xml-commons-external. #419603
+  Replace jsr173 with virtual stax-api.
+  Don't let jre rdep leak into DEPEND, confuses vm switching code.
+  Disable one additionl test failing with jdk 7.
 
   15 Apr 2012; Mike Frysinger <vapier@gentoo.org> dom4j-1.6.1-r3.ebuild:
   Add back ia64 love #349020 by Dennis Schridde.
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index 0a19f56980fe..9d02babe3044 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -5,22 +5,17 @@ DIST dom4j-1.6.1-java5.patch.bz2 2900 RMD160 cb153194e3b5d13626486d8f376b76f0925
 DIST dom4j-1.6.1.tar.gz 9687211 RMD160 d990d712a6b58c799366c526b32eb6c84a81e29c SHA1 8a2ab8af1dd039c449032ad50f3dd050647d7ce8 SHA256 01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f
 EBUILD dom4j-1.6.1-r2.ebuild 2109 RMD160 4bab5bae7a2977ec88f24d5ba97fb8f5c6f54ec5 SHA1 22e9dde31646a06fa2a6d619808ab3384f9b9638 SHA256 a95944f821ca0f22e119656f3989c2c9859f0865a1aeaa5a38fd308de21b2a4b
 EBUILD dom4j-1.6.1-r3.ebuild 2131 RMD160 944d539572c1dcc6355358f8ef529bc0443f4620 SHA1 892e1935ca9cd64a1996e048beb98b0247fa585e SHA256 cb324c8cd6f5ced597ad00702e963610e6cc5815d6bb7e94faed8c9fce878c9b
-MISC ChangeLog 6633 RMD160 345e8876ec66457af657aa7db3f358ed13734745 SHA1 5dfcce1f1e912ad5b108202d145bfc0698173682 SHA256 1f8948a30a4a77347b2e1fa3880c2f1c22c9ee98a47571282c245f7d8a27cc4f
+EBUILD dom4j-1.6.1-r4.ebuild 1921 RMD160 fc62db9387e63b33ba7e047c856e808d217229c2 SHA1 1cfb8b99f0260d8ffeda932d2499ebc1859ebc01 SHA256 7b8c94a66eb42a6bb08d28062e71c814542c7697b38ebe6a9c766a858c407894
+MISC ChangeLog 7076 RMD160 256be748c3c225c0c9058467f2f88b5ca001d942 SHA1 04d689dc70b2091b36297426dc207f6f35e6c410 SHA256 33cf944593e9fe41297f0f86231bbf1eba008ef4478f020717d8b88b32149650
 MISC metadata.xml 376 RMD160 ab4f5ef01e92c40a24cc41a50e56948c5454ed3e SHA1 96b1c474f7dc9fe9915f6d58dd4ec1be2badb82f SHA256 1b7f4f99476e5a8b0f24104d0bd3d6c717ee3a32011851d32a8d3f5674e5d2c4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPixf6AAoJELEHsLL7fEFWyTMQAKZZ3++pPcXiOk41pxcI9Kex
-cy57WLC7JhOz0jAhHdJ9xd5jrkTiju3tsxX8MyCZAXBIirhhYztiy706AN1poGSX
-ZiCAh+8MyIpYWg0sDwZHrXA7cHin26Dt7larPcJDRafAN31CZmYz2AdgG5FzCLb3
-/g3Dak53bLHWzPHaqYa58PKxSmfYKmrELZIAP65PApn05tLoaWLSfw0Rf6bGI/cL
-G0Lxv6+/dcJPr8CxeHMXFeaXIYjsxmUQlYOrzV8mEEoKQteiFVgp3Q0W5wozLLpN
-fBinYn7fcvtnNZc+sv2u8TeljaQJGym6J/rmXfleEuBIGl7MVQmkLnURcYaSNo9q
-RJDrxskusp8Ah+XsYE/FMXX44psBR088iq4PoE0sPErprJmXDidCtq1XtpGV9YRm
-wRc30jVV7SNhbpTfmkh8SEPo23DUX92ptgZt2a48vPMkrSTza58guQl8Jmi4c66m
-ve0NNqHlAGg3Twi6JJZpZ1untqmaXm9c7Ebz2dkj4GJZpnD0SX+UmaTiph9sRkOw
-56c2lpkZPVnxTmyITc2CsOdViDflvpCx6CWWn6ekWvfkq2RK+CHZn61f2Fxf9DVs
-l0l0VI/nPC31f7Nak3L1XnfK57xeb4pbDKquwrqjlhFaS6LcI4pJ6qo0NckjGRRK
-gpxr6reiX0EDUjMjRbpX
-=lQrK
+iQEcBAEBAgAGBQJPzg09AAoJEIUJ+svaV163DToH/18hQwakcDSHgCnGjGl/o3YU
+g5g1UE5Qr5gYrKSkC8rptZRRGQC7PKsW3BU1SZqZbaRpwreZjft4DaiPQHO1eSEI
+BmjFP9VEKRwEnJyK+ohK8M/U8lor9Zy9FCykLkZq7e9eNlfvTcP3dfj8A8nyJKfx
+PzhXOaev5MLlKwlyhtoHQ8ChXzSbqSjbmrxI6xsFVe6YW1laZR1tWAUgu1kJYFFC
+STECsStIvS0oExWA2xqdxCq7FW8rsNl1uALo+scp91T89fsRZC4tH23R6tUcmub7
+dBfGPg+6iCFnKmL4e+swfYEfSyDKgLJCu7xsDGhCo7AbfRAux68jhV+rS874JHY=
+=r7MA
 -----END PGP SIGNATURE-----
diff --git a/dev-java/dom4j/dom4j-1.6.1-r4.ebuild b/dev-java/dom4j/dom4j-1.6.1-r4.ebuild
new file mode 100644
index 000000000000..a3f646ef5084
--- /dev/null
+++ b/dev-java/dom4j/dom4j-1.6.1-r4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 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-r4.ebuild,v 1.1 2012/06/05 13:44:14 sera Exp $
+
+EAPI=4
+
+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 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/jaxme:0
+	dev-java/relaxng-datatype:0
+	dev-java/xpp2:0
+	dev-java/xpp3:0
+	dev-java/xsdlib:0
+	java-virtuals/stax-api:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junitperf:0
+	)"
+
+java_prepare() {
+	# Circular deps with jaxen #212993
+	find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
+
+	# Add missing methods to compile on Java 5 #137970
+	epatch "${WORKDIR}/${P}-java5.patch"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_BUILD_TARGET="clean package"
+EANT_GENTOO_CLASSPATH="jaxme,relaxng-datatype,stax-api,xpp2,xpp3,xsdlib"
+EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen-1.1-beta-6.jar"
+EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf"
+
+src_test() {
+	# Needs X11
+	rm -v src/test/org/dom4j/bean/BeansTest.java || die
+	# Fails with a 1.6 JDK for some reason
+	rm -v src/test/org/dom4j/io/StaxTest.java || die
+	# Fails with a 1.7 JDK for some reason
+	rm -v src/test/org/dom4j/rule/RuleTest.java || die
+
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+	use doc && java-pkg_dojavadoc build/doc/api
+	use source && java-pkg_dosrc src/java/*
+}