removed packed jars issue, fixes #63262

(Portage version: 2.0.51.19)

6 files changed, 185 insertions, 4 deletions

diff --git a/dev-java/fop/ChangeLog b/dev-java/fop/ChangeLog
index 403ecbe39a73..a45989ffb631 100644
--- a/dev-java/fop/ChangeLog
+++ b/dev-java/fop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/fop
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.14 2005/01/01 18:24:49 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.15 2005/03/19 23:57:28 luckyduck Exp $
+
+*fop-0.20.5-r2 (20 Mar 2005)
+
+  20 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> +fop-0.20.5-r2.ebuild:
+  removed packed jars issue, fixes #63262
 
 *fop-0.20.5-r1 (23 Dec 2004)
 
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 2ca12ae2265b..01f8e772bb57 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,6 +1,9 @@
-MD5 7d400ec32a48f64a8369030df20c9514 ChangeLog 1434
 MD5 ada84b9585b72dda436e17b41c803900 fop-0.20.5.ebuild 1267
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 3eacf1894359f19aabcde55637d44818 fop-0.20.5-r1.ebuild 1285
-MD5 198aedddc6ad08dbc64dec1545524d8d files/digest-fop-0.20.5 67
+MD5 7d400ec32a48f64a8369030df20c9514 ChangeLog 1434
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 a157b59b8e46755ebf8c6519281be028 fop-0.20.5-r2.ebuild 1537
+MD5 d3df91ca13167997b7c793fd359d6a26 files/0.20.5-buildxml.patch 470
 MD5 198aedddc6ad08dbc64dec1545524d8d files/digest-fop-0.20.5-r1 67
+MD5 198aedddc6ad08dbc64dec1545524d8d files/digest-fop-0.20.5-r2 67
+MD5 198aedddc6ad08dbc64dec1545524d8d files/digest-fop-0.20.5 67
diff --git a/dev-java/fop/files/0.20.5-buildxml.patch b/dev-java/fop/files/0.20.5-buildxml.patch
new file mode 100644
index 000000000000..3c526ba56400
--- /dev/null
+++ b/dev-java/fop/files/0.20.5-buildxml.patch
@@ -0,0 +1,18 @@
+--- 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-startscript.patch b/dev-java/fop/files/0.20.5-startscript.patch
new file mode 100644
index 000000000000..f61dbce01292
--- /dev/null
+++ b/dev-java/fop/files/0.20.5-startscript.patch
@@ -0,0 +1,89 @@
+--- 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.2,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-r2 b/dev-java/fop/files/digest-fop-0.20.5-r2
new file mode 100644
index 000000000000..97307f640a5d
--- /dev/null
+++ b/dev-java/fop/files/digest-fop-0.20.5-r2
@@ -0,0 +1 @@
+MD5 1a31eb1357e5d4b8d32d4cb3edae2da2 fop-0.20.5-src.tar.gz 7885256
diff --git a/dev-java/fop/fop-0.20.5-r2.ebuild b/dev-java/fop/fop-0.20.5-r2.ebuild
new file mode 100644
index 000000000000..157eda47c966
--- /dev/null
+++ b/dev-java/fop/fop-0.20.5-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2005 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-r2.ebuild,v 1.1 2005/03/19 23:57:28 luckyduck Exp $
+
+inherit eutils java-pkg
+
+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 ~x86"
+IUSE="doc examples jai jimi" # jikes support currently not possible :/
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-1.5.4
+	!dev-java/fop-bin"
+RDEPEND=">=virtual/jre-1.4
+	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.6.2"
+
+S=${WORKDIR}/${P/_/}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-buildxml.patch
+	epatch ${FILESDIR}/${PV}-startscript.patch
+
+	cd ${S}/lib
+	rm -f *.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() {
+	local antflags="package"
+	use doc && antflags="${antflags} javadocs"
+	ant ${antflags} || die "compile failed"
+}
+
+src_install () {
+	java-pkg_dojar build/fop.jar
+
+	newbin fop.sh fop
+
+	if use doc; then
+		dodoc CHANGES STATUS README LICENSE
+		java-pkg_dohtml -r ReleaseNotes.html build/javadocs/*
+	fi
+
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		cp -ar examples ${D}/usr/share/doc/${PF}/examples
+	fi
+}