patrick 15/06/17 02:36:39 Modified: ChangeLog Added: dom4j-1.6.1-r5.ebuild Removed: dom4j-1.6.1-r3.ebuild Log: Move things from src_unpack to src_prepare for EAPI5 happy (Portage version: 2.2.20/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.71 dev-java/dom4j/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/dom4j/ChangeLog?rev=1.71&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/dom4j/ChangeLog?rev=1.71&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/dom4j/ChangeLog?r1=1.70&r2=1.71 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- ChangeLog 15 Jun 2015 16:53:53 -0000 1.70 +++ ChangeLog 17 Jun 2015 02:36:39 -0000 1.71 @@ -1,6 +1,12 @@ # ChangeLog for dev-java/dom4j # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.70 2015/06/15 16:53:53 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.71 2015/06/17 02:36:39 patrick Exp $ + +*dom4j-1.6.1-r5 (17 Jun 2015) + + 17 Jun 2015; Patrick Lauer <[email protected]> +dom4j-1.6.1-r5.ebuild, + -dom4j-1.6.1-r3.ebuild: + Move things from src_unpack to src_prepare for EAPI5 happy *dom4j-1.6.1-r3 (15 Jun 2015) 1.1 dev-java/dom4j/dom4j-1.6.1-r5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/dom4j/dom4j-1.6.1-r5.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/dom4j/dom4j-1.6.1-r5.ebuild?rev=1.1&content-type=text/plain Index: dom4j-1.6.1-r5.ebuild =================================================================== # Copyright 1999-2015 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-r5.ebuild,v 1.1 2015/06/17 02:36:39 patrick Exp $ 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="~ia64" 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" DEPEND=" >=virtual/jdk-1.4 test? ( dev-java/ant-junit:0 dev-java/xalan:0 dev-java/junitperf:0 ) ${RDEPEND}" src_test() { java-pkg-2_src_test } src_prepare() { # 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 # fails with a 1.6 JDK for some reason rm -v src/test/org/dom4j/io/StaxTest.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 java-pkg-2_src_prepare } 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/* }
