diff options
Diffstat (limited to 'dev-java/fop')
| -rw-r--r-- | dev-java/fop/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/fop/files/fop-2.0-build.xml.patch | 21 | ||||
| -rw-r--r-- | dev-java/fop/fop-2.0.ebuild | 84 | ||||
| -rw-r--r-- | dev-java/fop/metadata.xml | 4 |
4 files changed, 61 insertions, 54 deletions
diff --git a/dev-java/fop/ChangeLog b/dev-java/fop/ChangeLog index 07c468fcece3..59244a458621 100644 --- a/dev-java/fop/ChangeLog +++ b/dev-java/fop/ChangeLog @@ -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 <monsieurp@gentoo.org> + +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 <monsieurp@gentoo.org> fop-2.0.ebuild: Set JAVA_ANT_ENCODING to ISO-8859-1. Fix bug 553494. diff --git a/dev-java/fop/files/fop-2.0-build.xml.patch b/dev-java/fop/files/fop-2.0-build.xml.patch new file mode 100644 index 000000000000..7638516f1d83 --- /dev/null +++ b/dev-java/fop/files/fop-2.0-build.xml.patch @@ -0,0 +1,21 @@ +--- build.xml.orig 2015-07-05 20:34:00.099000000 +0000 ++++ build.xml 2015-07-05 20:34:38.194000000 +0000 +@@ -355,18 +355,6 @@ + <include name="**/*.xsl"/> + </fileset> + </copy> +- <taskdef name="eventResourceGenerator" classname="org.apache.fop.tools.EventProducerCollectorTask"> +- <classpath> +- <path refid="libs-tools-build-classpath"/> +- <pathelement location="${build.classes.dir}"/> +- <pathelement location="${build.codegen-classes.dir}"/> +- </classpath> +- </taskdef> +- <eventResourceGenerator destdir="${build.gensrc.dir}"> +- <fileset dir="${src.java.dir}"> +- <include name="**/*.java"/> +- </fileset> +- </eventResourceGenerator> + </target> + <target name="compile-copy-resources" depends="resourcegen"> + <copy todir="${build.classes.dir}"> diff --git a/dev-java/fop/fop-2.0.ebuild b/dev-java/fop/fop-2.0.ebuild index 065841f7d800..0094f5e7ef81 100644 --- a/dev-java/fop/fop-2.0.ebuild +++ b/dev-java/fop/fop-2.0.ebuild @@ -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 @@ HOMEPAGE="http://xmlgraphics.apache.org/fop/" 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 @@ CDEPEND=" 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 @@ EANT_GENTOO_CLASSPATH=" 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 diff --git a/dev-java/fop/metadata.xml b/dev-java/fop/metadata.xml index 610a741524d6..250f2d1940ea 100644 --- a/dev-java/fop/metadata.xml +++ b/dev-java/fop/metadata.xml @@ -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> |