Added launchers for ttf2svg, slideshow, svgpp and rasterizer tools.

Package-Manager: portage-2.1.2_rc1-r3

4 files changed, 111 insertions, 8 deletions

diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog
index acbef11633d7..850d676e80bc 100644
--- a/dev-java/batik/ChangeLog
+++ b/dev-java/batik/ChangeLog
@@ -1,6 +1,11 @@
 # 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.36 2006/11/05 22:01:52 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.37 2006/11/05 22:38:32 betelgeuse Exp $
+
+*batik-1.6-r2 (05 Nov 2006)
+
+  05 Nov 2006; Petteri Räty <betelgeuse@gentoo.org> +batik-1.6-r2.ebuild:
+  Added launchers for ttf2svg, slideshow, svgpp and rasterizer tools.
 
   05 Nov 2006; Petteri Räty <betelgeuse@gentoo.org> batik-1.6-r1.ebuild:
   Added missing dependency on dev-java/jython.
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 6f0e70f24b2b..0cd71ebf0a52 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -28,14 +28,18 @@ EBUILD batik-1.6-r1.ebuild 1756 RMD160 64f0c1b69ffb2224296e59f2023f2ec1d5fe7ad3
 MD5 b9718632eee7c8a12749a8d37ea3bb7d batik-1.6-r1.ebuild 1756
 RMD160 64f0c1b69ffb2224296e59f2023f2ec1d5fe7ad3 batik-1.6-r1.ebuild 1756
 SHA256 a6f2137f55865728958cb2bee0dd7084b0d9ed228fa014bbc47528cd5ad6066a batik-1.6-r1.ebuild 1756
+EBUILD batik-1.6-r2.ebuild 2117 RMD160 e87bee84134271f7f0862d990f9b6370a910eba2 SHA1 d57e8fd9a97afa4bf95530a9bbd7d2035f955636 SHA256 661c6d663278a2c80e77f90e797b3167c01cf9754f9a70a5e33e0de47d1d45cf
+MD5 9c07b4ad619d8d4c7b0eca6252a47b11 batik-1.6-r2.ebuild 2117
+RMD160 e87bee84134271f7f0862d990f9b6370a910eba2 batik-1.6-r2.ebuild 2117
+SHA256 661c6d663278a2c80e77f90e797b3167c01cf9754f9a70a5e33e0de47d1d45cf batik-1.6-r2.ebuild 2117
 EBUILD batik-1.6.ebuild 1902 RMD160 8180fc34c69deecd054aaecef9861207016e9339 SHA1 93b9a03a570c236b50184f1a786f44cb1e990e03 SHA256 dcccea44ba6daf34bfe8ff1571c42cbc54a1e18755609fd42d1e3f8784264128
 MD5 cd4b24ea97b4274f83a8eeb198a99fba batik-1.6.ebuild 1902
 RMD160 8180fc34c69deecd054aaecef9861207016e9339 batik-1.6.ebuild 1902
 SHA256 dcccea44ba6daf34bfe8ff1571c42cbc54a1e18755609fd42d1e3f8784264128 batik-1.6.ebuild 1902
-MISC ChangeLog 4737 RMD160 6d6825a013bb63d20ab5d4af25ba0315a91ed4cc SHA1 b914d3d5e5eacf8e874c2196d26e9224aac5a668 SHA256 13292df568033b1cd4fc1a03b9742560bb4b0b5f92591f43ab56c3691237220a
-MD5 9829ac7a4839019f6cbce8a97602f079 ChangeLog 4737
-RMD160 6d6825a013bb63d20ab5d4af25ba0315a91ed4cc ChangeLog 4737
-SHA256 13292df568033b1cd4fc1a03b9742560bb4b0b5f92591f43ab56c3691237220a ChangeLog 4737
+MISC ChangeLog 4912 RMD160 d8494f13114fc744ddb3ab51e2735209eab4581b SHA1 7523532612a638dedb97ec73f50b65c158e13c36 SHA256 ebcd69b5b751963866ef58bfc380a7e48b4e1e3918a00e768ac2603e1d4ff0b5
+MD5 ee6f094b1a12e1ba4dfc5484c7eef58a ChangeLog 4912
+RMD160 d8494f13114fc744ddb3ab51e2735209eab4581b ChangeLog 4912
+SHA256 ebcd69b5b751963866ef58bfc380a7e48b4e1e3918a00e768ac2603e1d4ff0b5 ChangeLog 4912
 MISC metadata.xml 374 RMD160 6d3a700a3b332f27c8e9057336d0cf3a28f59cf1 SHA1 5626acb9b3091acbf59b8d69c0ba46f525ee0ce5 SHA256 f71a7581f22225196ad493f9f6c85e5379e3a62f482059827ae35ab66b834437
 MD5 370ede5daee1ae9d1bb9251a8f581a13 metadata.xml 374
 RMD160 6d3a700a3b332f27c8e9057336d0cf3a28f59cf1 metadata.xml 374
@@ -58,10 +62,13 @@ SHA256 0155a5119496483490605907b767ee25bda39b1208db1fad5735aee4ef12b970 files/di
 MD5 a45d68c5a0fb6b3d0d8fe09004e11f54 files/digest-batik-1.6-r1 238
 RMD160 a8b135fbba15d2a4e26ab586e896f20323a16255 files/digest-batik-1.6-r1 238
 SHA256 0155a5119496483490605907b767ee25bda39b1208db1fad5735aee4ef12b970 files/digest-batik-1.6-r1 238
+MD5 a45d68c5a0fb6b3d0d8fe09004e11f54 files/digest-batik-1.6-r2 238
+RMD160 a8b135fbba15d2a4e26ab586e896f20323a16255 files/digest-batik-1.6-r2 238
+SHA256 0155a5119496483490605907b767ee25bda39b1208db1fad5735aee4ef12b970 files/digest-batik-1.6-r2 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFTl9acxLzpIGCsLQRAg9VAKCHtWZhtqo/vbkQHZJfsONwADyouQCbBccx
-keE89ejqqyIBYt6xvLcDYXA=
-=Nux1
+iD8DBQFFTmf0cxLzpIGCsLQRAo1SAKCE77W/z4A1juHVyLunxqhqr7E6bgCdFPdp
+x9juUUlMiJEbICjlxR/RQPI=
+=wqHM
 -----END PGP SIGNATURE-----
diff --git a/dev-java/batik/batik-1.6-r2.ebuild b/dev-java/batik/batik-1.6-r2.ebuild
new file mode 100644
index 000000000000..570f4d221a42
--- /dev/null
+++ b/dev-java/batik/batik-1.6-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.6-r2.ebuild,v 1.1 2006/11/05 22:38:32 betelgeuse 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
+
+	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
+	rm {js,x*}.jar
+
+	# 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}
+		rm -f ${jar}
+		dosym ../${jar} /usr/share/${PN}-${SLOT}/lib/lib/${jar}
+	done
+
+	cd "${S}"
+	dodoc README LICENSE || die "dodoc failed"
+	use doc && java-pkg_dohtml -r ${P}/docs/api xdocs/*
+
+	# 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/digest-batik-1.6-r2 b/dev-java/batik/files/digest-batik-1.6-r2
new file mode 100644
index 000000000000..16f71a451358
--- /dev/null
+++ b/dev-java/batik/files/digest-batik-1.6-r2
@@ -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