Version bump, bug #194687. No more ecj forcing, javac seems fine even on amd64. Javadoc generation still masked on amd64 though. Also dropped od 0.20.5 version.

(Portage version: 2.1.3.19)

8 files changed, 134 insertions, 232 deletions

diff --git a/dev-java/fop/ChangeLog b/dev-java/fop/ChangeLog
index 88bb54ce2f63..0927a63a911f 100644
--- a/dev-java/fop/ChangeLog
+++ b/dev-java/fop/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/fop
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.54 2007/09/18 22:18:32 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.55 2007/11/10 00:39:01 caster Exp $
+
+*fop-0.94 (10 Nov 2007)
+
+  10 Nov 2007; Vlastimil Babka <caster@gentoo.org>
+  -files/0.20.5-buildxml.patch, -files/0.20.5-startscript.patch,
+  -files/0.20.5-no-autodetection.patch, -fop-0.20.5-r7.ebuild,
+  +fop-0.94.ebuild:
+  Version bump, bug #194687. No more ecj forcing, javac seems fine even on
+  amd64. Javadoc generation still masked on amd64 though. Also dropped od
+  0.20.5 version.
 
   18 Sep 2007; Petteri Räty <betelgeuse@gentoo.org> fop-0.93-r1.ebuild:
   Add a built_with_use check for dev-java/xmlgraphics-commons and the jpeg use
diff --git a/dev-java/fop/files/0.20.5-buildxml.patch b/dev-java/fop/files/0.20.5-buildxml.patch
deleted file mode 100644
index 3c526ba56400..000000000000
--- a/dev-java/fop/files/0.20.5-buildxml.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- build.xml.orig	2005-02-28 16:33:15.757740112 +0100
-+++ build.xml	2005-02-28 19:21:12.306871800 +0100
-@@ -173,14 +173,7 @@
- 
-   <path id="libs-build-classpath">
-     <fileset dir="lib">
--      <include name="xalan*.jar"/>
--      <include name="xerces*.jar"/>
--      <include name="xml-apis.jar"/>
--      <include name="avalon-framework*.jar"/>
--      <include name="batik*.jar"/>
--      <include name="jimi*.jar"/>
--      <include name="jai*.jar"/>
--      <include name="jce*.jar"/>
-+	    <include name="*.jar"/>
-     </fileset>
-   </path>
-   
diff --git a/dev-java/fop/files/0.20.5-no-autodetection.patch b/dev-java/fop/files/0.20.5-no-autodetection.patch
deleted file mode 100644
index bb52378281ed..000000000000
--- a/dev-java/fop/files/0.20.5-no-autodetection.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- build.xml	2003-07-15 04:03:22.000000000 +0200
-+++ build.xml	2006-08-30 11:30:22.000000000 +0200
-@@ -172,16 +172,7 @@
-   </fileset>
- 
-   <path id="libs-build-classpath">
--    <fileset dir="lib">
--      <include name="xalan*.jar"/>
--      <include name="xerces*.jar"/>
--      <include name="xml-apis.jar"/>
--      <include name="avalon-framework*.jar"/>
--      <include name="batik*.jar"/>
--      <include name="jimi*.jar"/>
--      <include name="jai*.jar"/>
--      <include name="jce*.jar"/>
--    </fileset>
-+    <fileset dir="lib" includes="**/*.jar"/>
-   </path>
-   
-   <!-- =================================================================== -->
-@@ -293,11 +284,9 @@
-   </target>
- 
-   <target name="init-avail">
--    <available property="jimi.present" classname="com.sun.jimi.core.Jimi" classpathref="libs-build-classpath"/>
--    <available property="jai.present" classname="javax.media.jai.JAI" classpathref="libs-build-classpath"/>
--    <available property="trax.present" classname="javax.xml.transform.Transformer" classpathref="libs-build-classpath"/>
--    <available property="jdk14.present" classname="java.lang.CharSequence"/>
--    <available property="jce.present" classname="javax.crypto.Cipher" classpathref="libs-build-classpath"/>
-+    <property name="trax.present" value="true"/>
-+    <property name="jdk14.present" value="true"/>
-+    <property name="jce.present" value="true"/>
-   </target>
- 
-   <target name="init-filters-jdk13" depends="init-avail" unless="jdk14.present">
-@@ -588,7 +577,6 @@
-          includes="org/**,conf/**,hyph/**">
-     <manifest>
-         <attribute name="Main-Class" value="${main.class}"/>
--        <attribute name="Class-Path" value="${runtime.classpath}"/>
-         <attribute name="Implementation-Title" value="${Name}"/>
-         <attribute name="Implementation-Version" value="${version}"/>
-         <attribute name="Implementation-Vendor" value="Apache Software Foundation (http://xml.apache.org/fop/)"/>
diff --git a/dev-java/fop/files/0.20.5-startscript.patch b/dev-java/fop/files/0.20.5-startscript.patch
deleted file mode 100644
index 2fb9b2425d4f..000000000000
--- a/dev-java/fop/files/0.20.5-startscript.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- fop.sh.orig	2005-03-02 17:50:48.356252608 +0100
-+++ fop.sh	2005-03-02 17:59:21.169293176 +0100
-@@ -1,4 +1,5 @@
- #! /bin/sh
-+test "$FOP_HOME" || FOP_HOME=/usr/share/fop/
- #
- # Shell script to run FOP, adapted from the Jakarta-Ant project.
- 
-@@ -6,14 +7,6 @@
-   . $HOME/.foprc
- fi
- 
--# OS specific support.  $var _must_ be set to either true or false.
--cygwin=false;
--darwin=false;
--case "`uname`" in
--  CYGWIN*) cygwin=true ;;
--  Darwin*) darwin=true ;;
--esac
--
- if [ -z "$FOP_HOME" ] ; then
-   # try to find FOP
-   if [ -d /opt/fop ] ; then 
-@@ -42,63 +35,7 @@
- 
- fi
- 
--# For Cygwin, ensure paths are in UNIX format before anything is touched
--if $cygwin ; then
--  [ -n "$FOP_HOME" ] &&
--    FOP_HOME=`cygpath --unix "$FOP_HOME"`
--  [ -n "$JAVA_HOME" ] &&
--    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
--  [ -n "$CLASSPATH" ] &&
--    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
--fi
--
--if [ -z "$JAVACMD" ] ; then 
--  if [ -n "$JAVA_HOME"  ] ; then
--    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 
--      # IBM's JDK on AIX uses strange locations for the executables
--      JAVACMD=$JAVA_HOME/jre/sh/java
--    else
--      JAVACMD=$JAVA_HOME/bin/java
--    fi
--  else
--    JAVACMD=java
--  fi
--fi
-- 
--if [ ! -x "$JAVACMD" ] ; then
--  echo "Error: JAVA_HOME is not defined correctly."
--  echo "  We cannot execute $JAVACMD"
--  exit
--fi
--
--if [ -n "$CLASSPATH" ] ; then
--  LOCALCLASSPATH=$CLASSPATH
--fi
--
- # add fop.jar, which resides in $FOP_HOME/build
--LOCALCLASSPATH=${FOP_HOME}/build/fop.jar:$LOCALCLASSPATH
--
--# add in the dependency .jar files, which reside in $FOP_HOME/lib
--DIRLIBS=${FOP_HOME}/lib/*.jar
--for i in ${DIRLIBS}
--do
--    # if the directory is empty, then it will return the input string
--    # this is stupid, so case for it
--    if [ "$i" != "${DIRLIBS}" ] ; then
--      if [ -z "$LOCALCLASSPATH" ] ; then
--        LOCALCLASSPATH=$i
--      else
--        LOCALCLASSPATH="$i":$LOCALCLASSPATH
--      fi
--    fi
--done
--
--# For Cygwin, switch paths to Windows format before running java
--if $cygwin; then
--  FOP_HOME=`cygpath --path --windows "$FOP_HOME"`
--  JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
--  LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
--fi
--
--$JAVACMD -classpath "$LOCALCLASSPATH" $FOP_OPTS org.apache.fop.apps.Fop "$@"
-+cp=${CLASSPATH}:`java-config -p avalon-framework-4.1,batik-1.5,fop,xalan,xerces-2`
- 
-+`java-config -J` -classpath ${cp} ${FOP_OPTS} org.apache.fop.apps.Fop "${@}"
diff --git a/dev-java/fop/files/digest-fop-0.20.5-r7 b/dev-java/fop/files/digest-fop-0.20.5-r7
deleted file mode 100644
index f4b8ca285900..000000000000
--- a/dev-java/fop/files/digest-fop-0.20.5-r7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1a31eb1357e5d4b8d32d4cb3edae2da2 fop-0.20.5-src.tar.gz 7885256
-RMD160 c4b776b2b406710548bb343ca2f3dcf03af1a68b fop-0.20.5-src.tar.gz 7885256
-SHA256 0c3db9596520ae91747f55984f13d5474e195182c2c274a7556e509864a9ac88 fop-0.20.5-src.tar.gz 7885256
diff --git a/dev-java/fop/files/digest-fop-0.94 b/dev-java/fop/files/digest-fop-0.94
new file mode 100644
index 000000000000..265292188311
--- /dev/null
+++ b/dev-java/fop/files/digest-fop-0.94
@@ -0,0 +1,3 @@
+MD5 f9544efe8130f8b3b65940e88ae0fe27 fop-0.94-src.tar.gz 11853559
+RMD160 36f0b928f3511a8da7746b767c31112f3f0f45a2 fop-0.94-src.tar.gz 11853559
+SHA256 b1db5b7a46c529a4b5034a3986b013320452dd2af0984f294b1ddc8a852fa099 fop-0.94-src.tar.gz 11853559
diff --git a/dev-java/fop/fop-0.20.5-r7.ebuild b/dev-java/fop/fop-0.20.5-r7.ebuild
deleted file mode 100644
index d28bfd4ec27b..000000000000
--- a/dev-java/fop/fop-0.20.5-r7.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-0.20.5-r7.ebuild,v 1.9 2007/08/29 13:54:37 betelgeuse Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_V=${PV/_/}
-DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
-SRC_URI="mirror://apache/xml/fop/fop-${MY_V}-src.tar.gz"
-HOMEPAGE="http://xml.apache.org/fop/"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc64 x86"
-IUSE="doc examples jai jimi"
-
-# Doesn't like Java 1.5
-COMMON_DEP="
-	jai? ( dev-java/sun-jai-bin )
-	jimi? ( dev-java/sun-jimi )
-	=dev-java/avalon-framework-4.1*
-	~dev-java/batik-1.5
-	dev-java/xalan
-	>=dev-java/xerces-2.7
-	!dev-java/fop-bin
-	>=dev-java/ant-core-1.5.4"
-RDEPEND="=virtual/jre-1.4*
-	${COMMON_DEP}"
-DEPEND="=virtual/jdk-1.4*
-	${COMMON_DEP}
-	dev-java/ant-trax"
-
-S=${WORKDIR}/${P/_/}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch ${FILESDIR}/${PV}-no-autodetection.patch
-
-	cd "${S}/lib"
-	rm -v *.jar || die
-	java-pkg_jar-from ant-core ant.jar
-	java-pkg_jar-from avalon-framework-4.1
-	java-pkg_jar-from batik-1.5 batik-all.jar batik.jar
-	java-pkg_jar-from xalan
-	java-pkg_jar-from xerces-2
-	use jai && java-pkg_jar-from sun-jai-bin
-	use jimi && java-pkg_jar-from sun-jimi
-}
-
-src_compile() {
-	java-pkg_filter-compiler jikes
-
-	local jaip jimip
-
-	use jai && jaip="-Djai.present=true"
-	use jimi && jimip="-Djimi.present=true"
-
-	ANT_TASKS="ant-trax" eant ${jaip} ${jimip} package $(use_doc javadocs)
-}
-
-src_install() {
-	java-pkg_dojar build/fop.jar
-
-	dodir /etc/env.d/java/
-	echo 'FOP_HOME=/usr/share/fop/' > ${D}/etc/env.d/java/22fop
-	java-pkg_dolauncher ${PN} --main org.apache.fop.apps.Fop
-
-	dodoc CHANGES STATUS README || die
-	if use doc; then
-		java-pkg_dohtml -r ReleaseNotes.html build/javadocs/*
-	fi
-
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		cp -pPR examples ${D}/usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-java/fop/fop-0.94.ebuild b/dev-java/fop/fop-0.94.ebuild
new file mode 100644
index 000000000000..d03549e8ecd5
--- /dev/null
+++ b/dev-java/fop/fop-0.94.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-0.94.ebuild,v 1.1 2007/11/10 00:39:01 caster 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
+# TODO: package and use optional dependency jeuclid
+
+JAVA_PKG_IUSE="doc examples source"
+WANT_ANT_TASKS="ant-trax"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
+HOMEPAGE="http://xmlgraphics.apache.org/fop/"
+SRC_URI="mirror://apache/xmlgraphics/${PN}/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+# doesn't work with java.awt.headless
+RESTRICT="test"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="hyphenation jai jimi"
+
+COMMON_DEPEND="
+	>=dev-java/avalon-framework-4.2
+	>=dev-java/batik-1.6
+	dev-java/commons-io
+	dev-java/commons-logging
+	=dev-java/servletapi-2.2*
+	>=dev-java/xmlgraphics-commons-1.1
+	dev-java/xalan
+	jai? ( dev-java/sun-jai-bin )
+	jimi? ( dev-java/sun-jimi )"
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/ant-core
+	${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.4
+	hyphenation? ( dev-java/offo-hyphenation )
+	${COMMON_DEPEND}"
+#	test? (
+#		=dev-java/junit-3.8*
+#		dev-java/xmlunit
+#	)"
+
+pkg_setup() {
+	if ! built_with_use dev-java/xmlgraphics-commons jpeg; then
+		msg="${CATEGORY}/${P} needs dev-java/xmlgraphics-commons built with"
+		msg="${msg} the jpeg use flag"
+		eerror ${msg}
+		die "Recompile dev-java/xmlgraphics-commons with the jpeg use flag"
+	fi
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# automagic is bad
+	java-ant_ignore-system-classes || die
+
+	cd "${S}/lib"
+	rm -v *.jar || die
+
+	java-pkg_jarfrom ant-core ant.jar
+	java-pkg_jarfrom avalon-framework-4.2 avalon-framework.jar \
+		avalon-framework-4.2.0.jar
+	java-pkg_jarfrom batik-1.6 batik-all.jar batik-all-1.6.jar
+	java-pkg_jarfrom commons-io-1 commons-io.jar commons-io-1.3.1.jar
+	java-pkg_jarfrom commons-logging commons-logging.jar \
+		commons-logging-1.0.4.jar
+	java-pkg_jarfrom servletapi-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jarfrom xmlgraphics-commons-1 xmlgraphics-commons.jar \
+		xmlgraphics-commons-1.2.jar
+	java-pkg_jarfrom xalan xalan.jar xalan-2.7.0.jar
+
+	use jai && java-pkg_jar-from sun-jai-bin
+	use jimi && java-pkg_jar-from sun-jimi
+}
+
+src_compile() {
+	# because I killed the automagic tests; all our JDK's have JCE
+	local af="-Djdk14.present=true -Djce.present=true"
+	use hyphenation && af="${af} -Duser.hyph.dir=/usr/share/offo-hyphenation/hyph/"
+	use jai && af="${af} -Djai.present=true"
+	use jimi && af="${af} -Djimi.present=true"
+
+	export ANT_OPTS="-Xmx256m"
+	eant ${af} -Djavahome.jdk14="${JAVA_HOME}" package $(use_doc javadocs)
+}
+
+src_test() {
+	if use test ; then
+		cd "${S}/lib"
+		java-pkg_jar-from xmlunit-1
+		java-pkg_jar-from junit
+		cd "${S}"
+	fi
+
+	ANT_OPTS="-Xmx1g -Djava.awt.headless=true" eant -Djunit.fork=off junit
+}
+
+src_install() {
+	java-pkg_dojar build/fop.jar build/fop-sandbox.jar
+	if use hyphenation; then
+		java-pkg_dojar build/fop-hyph.jar
+		insinto /usr/share/${PN}/
+		doins -r hyph || die
+	fi
+
+	# doesn't support everything upstream launcher does...
+	java-pkg_dolauncher ${PN} --main org.apache.fop.cli.Main
+
+	dodoc NOTICE README
+
+	use doc && java-pkg_dojavadoc build/javadocs
+	use examples && java-pkg_doexamples examples/* conf
+	use source && java-pkg_dosrc src/java/org src/java-1.4/* src/sandbox/org
+}