From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 702AB1388C0 for ; Sun, 21 Feb 2016 21:10:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0D3021C0CB; Sun, 21 Feb 2016 21:10:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 68C4F21C0CB for ; Sun, 21 Feb 2016 21:10:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2966A340BC1 for ; Sun, 21 Feb 2016 21:10:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A66EC8E9 for ; Sun, 21 Feb 2016 21:10:51 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1456089045.85a791e393424acc69584f6d36fd4751b0dfee0f.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/dom4j/dom4j-1.6.1-r6.ebuild X-VCS-Directories: dev-java/dom4j/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 85a791e393424acc69584f6d36fd4751b0dfee0f X-VCS-Branch: master Date: Sun, 21 Feb 2016 21:10:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e975848b-9647-4a28-b8f5-11f6883e13fa X-Archives-Hash: 86cc921a807688956f98076155f82215 commit: 85a791e393424acc69584f6d36fd4751b0dfee0f Author: James Le Cuirot gentoo org> AuthorDate: Sun Feb 21 21:10:05 2016 +0000 Commit: James Le Cuirot gentoo 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/* +}