Fix javadoc install location wrt bug #160835 by Alistair Bush <alistair.bush@gmail.com>. Don't install xdocs, we will need stylebook to transform them to html first. Prevents copying jython.jar into own lib dir.

(Portage version: 2.1.2_rc4-r7)

5 files changed, 120 insertions, 4 deletions

diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog
index 98179e2b7522..fe1f2abda864 100644
--- a/dev-java/batik/ChangeLog
+++ b/dev-java/batik/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/batik
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.42 2006/11/29 00:00:42 nichoj Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.43 2007/01/08 10:59:40 caster Exp $
+
+*batik-1.6-r3 (08 Jan 2007)
+
+  08 Jan 2007; Vlastimil Babka <caster@gentoo.org>
+  +files/batik-1.6-dont-copy-deps.patch, batik-1.5.1-r5.ebuild,
+  +batik-1.6-r3.ebuild:
+  Fix javadoc install location wrt bug #160835 by Alistair Bush
+  <alistair.bush@gmail.com>. Don't install xdocs, we will need stylebook to
+  transform them to html first. Prevents copying jython.jar into own lib dir.
 
   29 Nov 2006; Joshua Nichols <nichoj@gentoo.org> batik-1.5-r1.ebuild:
   Added ~ia64.
diff --git a/dev-java/batik/batik-1.5.1-r5.ebuild b/dev-java/batik/batik-1.5.1-r5.ebuild
index 04ff9d10f806..dac717136fdb 100644
--- a/dev-java/batik/batik-1.5.1-r5.ebuild
+++ b/dev-java/batik/batik-1.5.1-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.1-r5.ebuild,v 1.5 2006/11/23 18:49:51 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.1-r5.ebuild,v 1.6 2007/01/08 10:59:40 caster Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -36,6 +36,7 @@ src_unpack() {
 }
 
 src_compile() {
+	java-pkg_filter-compiler jikes
 	ANT_OPTS=-Xmx256m eant jars all-jar
 }
 
diff --git a/dev-java/batik/batik-1.6-r3.ebuild b/dev-java/batik/batik-1.6-r3.ebuild
new file mode 100644
index 000000000000..1b6ef6f911ec
--- /dev/null
+++ b/dev-java/batik/batik-1.6-r3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.6-r3.ebuild,v 1.1 2007/01/08 10:59:40 caster Exp $
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Java based SVG toolkit"
+HOMEPAGE="http://xml.apache.org/batik/"
+SRC_URI="mirror://apache/xml/batik/${PN}-src-${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="1.6"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+# According to
+# http://xmlgraphics.apache.org/batik/install.html#optionalComponents
+# jython is optional so should look into making a use flag
+CDEPEND="=dev-java/rhino-1.5*
+	>=dev-java/xerces-2.7.1
+	=dev-java/xml-commons-external-1.3*
+	dev-java/jython"
+DEPEND="=virtual/jdk-1.4*
+	dev-java/ant-core
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+
+S="${WORKDIR}/xml-${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch ${FILESDIR}/${P}-jikes.patch
+	epatch ${FILESDIR}/${P}-dont-copy-deps.patch
+
+	cd lib
+	rm -f *.jar build/*.jar
+
+	java-pkg_jar-from xml-commons-external-1.3
+	java-pkg_jar-from xerces-2
+	java-pkg_jar-from rhino-1.5
+	java-pkg_jar-from jython
+}
+
+src_compile() {
+	# Fails to build on amd64 without this
+	if use amd64 ; then
+		export ANT_OPTS="-Xmx1g"
+	else
+		export ANT_OPTS="-Xmx256m"
+	fi
+
+	eant jars all-jar $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar ${P}/batik*.jar
+
+	cd ${P}/lib
+
+	# needed because batik expects this layout:
+	# batik.jar lib/*.jar
+	# there are hardcoded classpaths in the manifest :(
+	dodir /usr/share/${PN}-${SLOT}/lib/lib/
+	for jar in *.jar
+	do
+		java-pkg_dojar ${jar}
+		dosym ../${jar} /usr/share/${PN}-${SLOT}/lib/lib/${jar}
+	done
+
+	cd "${S}"
+	dodoc README LICENSE || die "dodoc failed"
+	use doc && java-pkg_dojavadoc ${P}/docs/javadoc
+
+	# pwd fixes bug #116976
+	java-pkg_dolauncher batik-${SLOT} --pwd "/usr/share/${PN}-${SLOT}/" \
+		--main org.apache.batik.apps.svgbrowser.Main
+
+	# To find these lsjar batik-${SLOT} | grep Main.class
+	for launcher in ttf2svg slideshow svgpp rasterizer; do
+		java-pkg_dolauncher batik-${launcher}-${SLOT} \
+			--main org.apache.batik.apps.${launcher}.Main
+	done
+}
diff --git a/dev-java/batik/files/batik-1.6-dont-copy-deps.patch b/dev-java/batik/files/batik-1.6-dont-copy-deps.patch
new file mode 100644
index 000000000000..5397b6e294c4
--- /dev/null
+++ b/dev-java/batik/files/batik-1.6-dont-copy-deps.patch
@@ -0,0 +1,16 @@
+--- build.xml	2007-01-08 11:44:12.000000000 +0100
++++ build.xml	2007-01-08 11:46:19.000000000 +0100
+@@ -457,11 +457,13 @@
+                                rasterizer-jar,
+                                rasterizer-ext-jar,
+                                ttf2svg-jar">
++	<!--
+     <copy todir="${build}/lib">
+       <fileset dir="${lib}">
+         <include name="*.jar"/>
+       </fileset>
+     </copy>
++	-->
+   </target>
+ 
+ 
diff --git a/dev-java/batik/files/digest-batik-1.6-r3 b/dev-java/batik/files/digest-batik-1.6-r3
new file mode 100644
index 000000000000..16f71a451358
--- /dev/null
+++ b/dev-java/batik/files/digest-batik-1.6-r3
@@ -0,0 +1,3 @@
+MD5 b65e12f520f8342605f700204c96cd2b batik-src-1.6.zip 10199668
+RMD160 a6d32d881827fa47b294c57442b2e0efd87caf85 batik-src-1.6.zip 10199668
+SHA256 e1c69fb68e4b6710c246f44157bc4f3f021bdb2f2cedb8112bc025e3a4877a2c batik-src-1.6.zip 10199668