Mend compiling process by dropping previous patch and adding back eventResourceGenerator task definition so that event-model.xml files are correctly generated. Add required jars into lib directory using java-pkg_jar-from. Fix bug 554386.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

3 files changed, 22 insertions, 28 deletions

diff --git a/dev-java/fop/ChangeLog b/dev-java/fop/ChangeLog
index 59244a458621..60685f520958 100644
--- a/dev-java/fop/ChangeLog
+++ b/dev-java/fop/ChangeLog
@@ -1,6 +1,13 @@
 # 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.83 2015/07/05 21:51:08 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.84 2015/07/11 17:58:30 monsieurp Exp $
+
+  11 Jul 2015; Patrice Clement <monsieurp@gentoo.org>
+  -files/fop-2.0-build.xml.patch, fop-2.0.ebuild:
+  Mend compiling process by dropping previous patch and adding back
+  eventResourceGenerator task definition so that event-model.xml files are
+  correctly generated. Add required jars into lib directory using java-pkg_jar-
+  from. Fix bug 554386.
 
   05 Jul 2015; Patrice Clement <monsieurp@gentoo.org>
   +files/fop-2.0-build.xml.patch, fop-2.0.ebuild, metadata.xml:
diff --git a/dev-java/fop/files/fop-2.0-build.xml.patch b/dev-java/fop/files/fop-2.0-build.xml.patch
deleted file mode 100644
index 7638516f1d83..000000000000
--- a/dev-java/fop/files/fop-2.0-build.xml.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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 0094f5e7ef81..73c6483a1a97 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.10 2015/07/05 21:51:08 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.11 2015/07/11 17:58:30 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
@@ -67,19 +67,28 @@ EANT_GENTOO_CLASSPATH="
 "
 
 TARGETS=(
+	resourcegen
 	jar-hyphenation
 	jar-sandbox
 	jar-main
 )
 
 java_prepare() {
-	epatch "${FILESDIR}"/${P}-build.xml.patch
-
-	find "${S}"/lib -type f -name \*.jar | xargs rm -v
+	find "${S}"/lib -type f | xargs rm -v
 }
 
 src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only qdox-1.12)"
+	# https://bugs.gentoo.org/show_bug.cgi?id=554386
+	# http://wiki.apache.org/xmlgraphics-fop/HowTo/BuildFOPAlternatively
+	java-pkg_jar-from --into lib qdox-1.12 qdox.jar
+	java-pkg_jar-from --into lib xmlgraphics-commons-2 xmlgraphics-commons.jar
+	java-pkg_jar-from --into lib commons-logging commons-logging.jar
+	java-pkg_jar-from --into lib commons-io-1 commons-io.jar
+	java-pkg_jar-from --into lib fontbox-1.7 fontbox.jar
+	java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis-ext.jar
+	java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis.jar
+	java-pkg_jar-from --into lib avalon-framework-4.2 avalon-framework.jar
+	java-pkg_jar-from --virtual --into lib servlet-api-3.0 servlet-api.jar
 
 	for target in ${TARGETS[@]}; do
 		EANT_BUILD_TARGET="${target}" \
@@ -91,7 +100,6 @@ src_compile() {
 		EANT_BUILD_TARGET="javadocs" \
 			java-pkg-2_src_compile
 	fi
-
 }
 
 src_install() {