added prefix support (bug #438898)

Package-Manager: portage-2.2.0_alpha142/cvs/Linux i686
Manifest-Sign-Key: 0xC2000586

3 files changed, 118 insertions, 4 deletions

diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog
index 6a61e22c4a88..6f752f40af7a 100644
--- a/dev-java/batik/ChangeLog
+++ b/dev-java/batik/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/batik
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.66 2011/12/31 16:38:20 sera Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.67 2012/11/17 03:30:04 ottxor Exp $
+
+*batik-1.7-r3 (17 Nov 2012)
+
+  17 Nov 2012; Christoph Junghans <ottxor@gentoo.org> +batik-1.7-r3.ebuild:
+  added prefix support (bug #438898)
 
   31 Dec 2011; Ralph Sennhauser <sera@gentoo.org> batik-1.7-r2.ebuild:
   Drop ia64 support #345433
@@ -252,4 +257,3 @@
 
   27 Apr 2003; Todd Berman <tberman@gentoo.org> batik-1.1.1.ebuild:
   Initial import.
-
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 9b55a217a390..a6bdfd3c3881 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,4 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST batik-src-1.7.zip 15060504 SHA256 6bea593543a797561fa83651764e40b1b0ce01c1df21ab0359ade58e967379fd SHA512 7fee3e0d2c99e95517420c8170f68b4857fec87f69c7c55719b5e9914608900fca4c9d7d9b3e1166d678a6c844fe870a3c1051e2c1f35a2e6793a17b9087893e WHIRLPOOL 7e8f4e537d5c1d14778a8c151ff469edbc25e629c0cf99009c65a99c1dfac47d58c0bf0fa6b194bc51d8fe25ba7949f264b5d055cc22563ff50ecdd95d36daab
 EBUILD batik-1.7-r2.ebuild 2549 SHA256 d1707ace08196df526d2421f26dd671f41fb3023a67008d0fbbce740de38cd42 SHA512 19f37077cab54532f676c085b55c0e40054816ccbc092c32357c148ecb0a55ee0083e20dd7d7367f18531733c56c49ef8f2a8d0d3bf391a085faa2dc906febd4 WHIRLPOOL 8becaeb73f11290f90ffc3d317ff26620734f67207fa758339149480a51f6ec7bb32ab384cf541e44a1fb4ebf4741e35daea620ec3b4a50a9050b0309f8c253e
-MISC ChangeLog 8911 SHA256 9541ff03c1f6131228a41b2ae7c6c0faae8865b4d58a2781b3144686b182009c SHA512 0af140239474f70d944832f2fbf9087a0a61ef4603b3713b1c839f1f09b7acddb98a620d6294041604e4da5789e9325db70af3d48ee5651096bdbef573e2d3b1 WHIRLPOOL fd643e9aec6166f2841b8a1feb0578822df85c8e44ead4a24ae212e0d9b4d3005073f4fbcaeee6ea5e1ed04ae2ae28fd2e64adab57eb569dd507c5ad22e86a11
+EBUILD batik-1.7-r3.ebuild 2617 SHA256 4fd99639d0acc6b8d229a56213bb49c1d4dc81d68d8bf574e25073e9b98359de SHA512 a6423cd2a39ff1b6f307cdf9475e428789664212f6930e58c824868e4a3548157afda7b74fc4fe7b20078dd76c204de6ef1731559a56d22b3929fb2c7a4e07e0 WHIRLPOOL 9a6d97c495296db715db0b535c7f061537534bcac7b9da4f81d0316454201ab015d07e87bf27ecd6455933dce47803ba78c2ec0ac545a7e7cfe0dc1ced7b4981
+MISC ChangeLog 9055 SHA256 a9c99d7792a95a8dc8859d1143e999f81f2bef1d8f63799aa5f9398612224418 SHA512 7797a7d5b8c0f18a30d08a969c9bdc6e71fd2e104b251e302132490a799e054616ad2e8ddfa65b05f0860c5e86723b6618d16851c84e5926ff510f2eaf811403 WHIRLPOOL 1bf1773ba3f413e76504a0773affeb40ad81cee7c7382ac53fed2ffe5d73b08208a46a8aa7068646a6ff85af5b084444bb2edcd3d289157374a88c0c99cddc1a
 MISC metadata.xml 374 SHA256 f71a7581f22225196ad493f9f6c85e5379e3a62f482059827ae35ab66b834437 SHA512 57c2dbfe07d5395cadb81efbfcc2af61785d373e8b791f243895489af12945c3fb16e4f9fb229ebe2379868fec5d8224443e92b9389ddc9104224f6af8acd3b9 WHIRLPOOL a8475c29be2005c682b07ce66370d46bb562b49d38d62883005d7ed238f822043e95425c4644454dd0c1209c17c71362fe02bfadfea81fc6dae07de5dbd32cde
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQpwS9AAoJEOeBhlrCAAWGqH4H/iHNflBftFzOg31H3N+cuYrx
+Gm+SeCPt01K+jvYmQteDkNfkxFFft/fR7JKh3v/GZJn7yTbK5UEgmGZRMjB5BqJG
+nQK9f6Vyc2y7jAHCUfYzf/JtTUQdE/uizFkbFXu7a+LaHPR4Ei+k3KXmEtS3SsrL
+0+6lcdZS8WwqN0ElMb+akKFjVrtOnYzqdGdbU57q8oBuRBYcfsjDAvJDAlFDbf+h
+oAJFcTLoNf0VrZCKIQ/NBeX71qa+NXgW8DiuFMGR840VZ7E8AZSssvjw825qkMlE
+36gJsXcMf+x1OegpUNY1TWD/ML6vK3illC0Jl0PBBuxRr0NSI/jAvexCSwTrQJI=
+=TtPY
+-----END PGP SIGNATURE-----
diff --git a/dev-java/batik/batik-1.7-r3.ebuild b/dev-java/batik/batik-1.7-r3.ebuild
new file mode 100644
index 000000000000..6f49e1585949
--- /dev/null
+++ b/dev-java/batik/batik-1.7-r3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.7-r3.ebuild,v 1.1 2012/11/17 03:30:04 ottxor Exp $
+
+EAPI=4
+JAVA_PKG_IUSE="doc"
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Java based SVG toolkit"
+HOMEPAGE="http://xmlgraphics.apache.org/${PN}/"
+SRC_URI="mirror://apache/xmlgraphics/${PN}/${PN}-src-${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="1.7"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc python tcl"
+
+CDEPEND="dev-java/xalan:0
+	dev-java/rhino:1.6
+	dev-java/xml-commons-external:1.3
+	python? ( dev-java/jython:0 )
+	tcl? ( dev-java/jacl:0 )
+	dev-java/ant-core"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+
+java_prepare() {
+	java-ant_ignore-system-classes
+	java-ant_rewrite-classpath contrib/rasterizertask/build.xml
+	for file in build.xml contrib/rasterizertask/build.xml; do
+		# bug #318323
+		java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v yes -a maxmemory -v 512m
+	done
+
+	cd lib
+	rm -v *.jar build/*.jar || die
+
+	java-pkg_jar-from xml-commons-external-1.3
+	java-pkg_jar-from xalan
+	java-pkg_jar-from rhino-1.6
+
+	use python && java-pkg_jar-from jython
+	use tcl && java-pkg_jar-from jacl
+}
+
+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)
+	cd contrib/rasterizertask || die
+	eant -Dgentoo.classpath="$(java-pkg_getjar ant-core ant.jar):../../classes" jar $(use_doc)
+}
+
+src_install() {
+	#All-jar doesn't include ALL
+	java-pkg_dojar ${P}/${PN}-*.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 batik*.jar
+	do
+		java-pkg_dojar ${jar}
+		dosym ../${jar} /usr/share/${PN}-${SLOT}/lib/lib/${jar}
+	done
+
+	cd "${S}"
+	dodoc README CHANGES
+	use doc && java-pkg_dojavadoc ${P}/docs/javadoc
+
+	# pwd fixes bug #116976
+	java-pkg_dolauncher batik-${SLOT} --pwd "${EPREFIX}/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
+
+	# Install and register the ant task.
+	java-pkg_dojar contrib/rasterizertask/build/lib/RasterizerTask.jar
+	java-pkg_register-ant-task
+}