monsieurp 15/07/05 21:51:08 Modified: fop-2.0.ebuild metadata.xml ChangeLog Log: Add patch to remove unneeded (and broken) Ant task. Fix bug 553982. Signed-off-by: Patrice Clement <[email protected]> (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Revision Changes Path 1.10 dev-java/fop/fop-2.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?rev=1.10&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?rev=1.10&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?r1=1.9&r2=1.10 Index: fop-2.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fop-2.0.ebuild 29 Jun 2015 12:33:34 -0000 1.9 +++ fop-2.0.ebuild 5 Jul 2015 21:51:08 -0000 1.10 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.9 2015/06/29 12:33:34 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.10 2015/07/05 21:51:08 monsieurp Exp $ # TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot # be built as it needs forrest which we do not have @@ -17,17 +17,16 @@ SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip" KEYWORDS="amd64 x86 ppc ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="hyphenation jai" LICENSE="Apache-2.0" SLOT="2" +IUSE="" MY_P="${PN}-${SLOT}" # Tests are broken even in 2.0 RESTRICT="test" -CDEPEND=" - dev-java/batik:1.8 +CDEPEND="dev-java/batik:1.8 dev-java/ant-core:0 dev-java/fontbox:1.7 dev-java/commons-io:1 @@ -36,31 +35,25 @@ dev-java/avalon-framework:4.2 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 - dev-java/qdox:1.12 - jai? ( dev-java/sun-jai-bin:0 )" + dev-java/qdox:1.12" RDEPEND=">=virtual/jre-1.6 ${CDEPEND}" DEPEND=">=virtual/jdk-1.6 - hyphenation? ( dev-java/offo-hyphenation:0 ) app-arch/unzip - ${CDEPEND} - test? ( - dev-java/ant-junit:0 - dev-java/junit:4 - dev-java/xmlunit:1 - dev-java/mockito:0 - )" + ${CDEPEND}" -java_prepare() { - find "${S}" -name '*.jar' -print -delete || die -} +# test? ( +# dev-java/ant-junit:0 +# dev-java/junit:4 +# dev-java/xmlunit:1 +# dev-java/mockito:0 +# )" JAVA_ANT_ENCODING="ISO-8859-1" JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_DOC_TARGET="javadocs" -EANT_BUILD_TARGET="package" + EANT_GENTOO_CLASSPATH=" ant-core batik-1.8 @@ -73,46 +66,39 @@ xml-commons-external-1.3 " -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH} - mockito - junit-4 - xmlunit-1 -" +TARGETS=( + jar-hyphenation + jar-sandbox + jar-main +) + +java_prepare() { + epatch "${FILESDIR}"/${P}-build.xml.patch -EANT_EXTRA_ARGS="-Djce.present=true" -EANT_DOC_TARGET="javadocs" -EANT_TEST_TARGET="junit" -#EANT_TEST_EXTRA_ARGS="-Djunit.present=true -Dxmlunit.present=true" + find "${S}"/lib -type f -name \*.jar | xargs rm -v +} src_compile() { - EANT_GENTOO_CLASSPATH_EXTRA+="$(java-pkg_getjars --build-only qdox-1.12)" + EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only qdox-1.12)" - if use jai; then - EANT_EXTRA_ARGS+=" -Djai.present=true" - EANT_GENTOO_CLASSPATH+=" sun-jai-bin" - fi + for target in ${TARGETS[@]}; do + EANT_BUILD_TARGET="${target}" \ + java-pkg-2_src_compile + done - if use hyphenation; then - EANT_EXTRA_ARGS+=" -Dhyphenation.present=true -Duser.hyph.dir=${EPREFIX}/usr/share/offo-hyphenation/hyph/" + if use doc; then + sed -i -e 's/failonerror=\"true\"/failonerror=\"false\"/;' ./build.xml + EANT_BUILD_TARGET="javadocs" \ + java-pkg-2_src_compile fi - java-pkg-2_src_compile -} - -# Tests are broken even in 2.0 -src_test() { - EANT_ANT_TASKS="ant-junit" \ - java-pkg-2_src_test } src_install() { - java-pkg_dojar build/${PN} build/${PN}-sandbox.jar - - if use hyphenation; then - java-pkg_dojar build/${PN}-hyph.jar - insinto /usr/share/${MY_P}/ - doins -r hyph - fi + java-pkg_dojar \ + build/${PN}.jar \ + build/${PN}-sandbox.jar \ + build/${PN}-hyph.jar # Doesn't support everything upstream launcher does... java-pkg_dolauncher ${MY_P} --main org.apache.fop.cli.Main 1.5 dev-java/fop/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/metadata.xml?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/metadata.xml?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/metadata.xml?r1=1.4&r2=1.5 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/metadata.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- metadata.xml 27 Jun 2015 18:30:43 -0000 1.4 +++ metadata.xml 5 Jul 2015 21:51:08 -0000 1.5 @@ -2,8 +2,4 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <herd>java</herd> - <use> - <flag name="hyphenation">Precompile hyphenation patterns from the <pkg>dev-java/offo-hyphenation</pkg> package and install them as fop-hyph.jar</flag> - <flag name="jai">Enable jai support</flag> - </use> </pkgmetadata> 1.83 dev-java/fop/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/ChangeLog?rev=1.83&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/ChangeLog?rev=1.83&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/ChangeLog?r1=1.82&r2=1.83 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- ChangeLog 29 Jun 2015 12:33:34 -0000 1.82 +++ ChangeLog 5 Jul 2015 21:51:08 -0000 1.83 @@ -1,6 +1,10 @@ # ChangeLog for dev-java/fop # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.82 2015/06/29 12:33:34 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.83 2015/07/05 21:51:08 monsieurp Exp $ + + 05 Jul 2015; Patrice Clement <[email protected]> + +files/fop-2.0-build.xml.patch, fop-2.0.ebuild, metadata.xml: + Add patch to remove unneeded (and broken) Ant task. Fix bug 553982. 29 Jun 2015; Patrice Clement <[email protected]> fop-2.0.ebuild: Set JAVA_ANT_ENCODING to ISO-8859-1. Fix bug 553494.
