[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/

[James Le Cuirot]

commit:     85a791e393424acc69584f6d36fd4751b0dfee0f
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 21:10:05 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 21:10:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85a791e3

dev-java/dom4j: Remove jaxme (R)DEPEND, add jaxen PDEPEND

jaxme has been effectively included in Java since 6 and should go.

dom4j has a cyclic dependency of jaxen so we already use the bundled
version to build against but a PDEPEND was never added, which leaves
it broken. Closes bug #212993.

Package-Manager: portage-2.2.27

 dev-java/dom4j/dom4j-1.6.1-r6.ebuild | 80 ++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/dev-java/dom4j/dom4j-1.6.1-r6.ebuild b/dev-java/dom4j/dom4j-1.6.1-r6.ebuild
new file mode 100644
index 0000000..cc6b666
--- /dev/null
+++ b/dev-java/dom4j/dom4j-1.6.1-r6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+CDEPEND="
+	dev-java/xpp2:0
+	dev-java/xpp3:0
+	dev-java/xsdlib:0
+	dev-java/relaxng-datatype:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junitperf:0
+	)
+	>=virtual/jdk-1.6"
+
+PDEPEND="dev-java/jaxen:1.1"
+
+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"
+}
+
+# 0 - Requires X11.
+# 1 - Fails with JDK 1.7.
+# 2 - Fails with JDK 1.6.
+JAVA_RM_FILES=(
+	src/test/org/dom4j/bean/BeansTest.java
+	src/test/org/dom4j/io/StaxTest.java
+	src/test/org/dom4j/rule/RuleTest.java
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+EANT_BUILD_TARGET="clean package"
+EANT_GENTOO_CLASSPATH="relaxng-datatype,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() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar "build/${PN}.jar"
+	java-pkg_register-dependency jaxen-1.1
+	use doc && java-pkg_dojavadoc build/doc/api
+	use source && java-pkg_dosrc src/java/*
+}