xmlgraphics-common dependency bump from :1.5 to :2.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x93491BB8

3 files changed, 131 insertions, 9 deletions

diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog
index dee1f4365180..6f024188a20c 100644
--- a/dev-java/batik/ChangeLog
+++ b/dev-java/batik/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/batik
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.81 2015/06/22 14:03:37 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.82 2015/06/27 18:27:34 monsieurp Exp $
+
+*batik-1.8-r1 (27 Jun 2015)
+
+  27 Jun 2015; Patrice Clement <monsieurp@gentoo.org> +batik-1.8-r1.ebuild:
+  xmlgraphics-common dependency bump from :1.5 to :2.
 
   22 Jun 2015; Patrice Clement <monsieurp@gentoo.org> batik-1.7-r3.ebuild,
   batik-1.8.ebuild:
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 1f8c2f5ba2b7..ee7734189920 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -4,17 +4,18 @@ Hash: SHA256
 DIST batik-src-1.7.zip 15060504 SHA256 6bea593543a797561fa83651764e40b1b0ce01c1df21ab0359ade58e967379fd SHA512 7fee3e0d2c99e95517420c8170f68b4857fec87f69c7c55719b5e9914608900fca4c9d7d9b3e1166d678a6c844fe870a3c1051e2c1f35a2e6793a17b9087893e WHIRLPOOL 7e8f4e537d5c1d14778a8c151ff469edbc25e629c0cf99009c65a99c1dfac47d58c0bf0fa6b194bc51d8fe25ba7949f264b5d055cc22563ff50ecdd95d36daab
 DIST batik-src-1.8.tar.gz 14970684 SHA256 0f1175146d45445fc4940e214c3e1e5cfa0294ae6a9787859bda00964f97c2bd SHA512 352843fd0cec43c6d9d54426fe1c20a9bd2234798404b101f2e8d43f6089c0bf6bb5102cb5674de11d37a0d820a8bb79fe9dd854030b23fd8c68f3931eb12f1b WHIRLPOOL fa50d1f87257c6018f99076bf759066b2311f483d424ef743e45fe17c74c646a215c1211c5431b2a522913f23ff5f53934a1606d4d4a223e8298abd6ce94bb46
 EBUILD batik-1.7-r3.ebuild 2616 SHA256 f223725a1b3278cda51197177b13f94618109feb6beb3141f38c0c40059b4c81 SHA512 35ffb3ff9e2e2b50b065fd44e7760807cbf8bf74162f4b16bcf709e0c2f9b61e77dfcf25674eb20df2b8061a23b6eeee20168e52209296918831c190da2e5265 WHIRLPOOL f7dd5cd184babde5fdb43664838f72bfc4498ab9cd21773d0193cf695efe8893ff028190dc0471ec6588a657a49081af77f40ca924fd2ee5ffc8e2ad8af665f8
+EBUILD batik-1.8-r1.ebuild 3256 SHA256 df8e60e225f944aa3826d4a2836cc388f967b83cde25137ff5b37ac393396290 SHA512 b3dbaf7756d01cf5975c2862a448a6dc0dd0e144d61172f3d6c849551769d67e488c539086f8f38786e2f455a9dd0f7671fba8e67613ca36297bc1a2b37c08bf WHIRLPOOL 4e178825654acaeffdcd03af912acf7c6a448b1832f8ab957ea04ac398c86e2fbc4e09c393bed8454d60b624f6d666c930691958349b4df01e3eedb46c4ee80e
 EBUILD batik-1.8.ebuild 3251 SHA256 8f012e3446ee745c39e422c49b64497aaad75835ac415ce6df48fc44d3b0a8de SHA512 538575bf6251fad12e2a8f221706a0f85645e29f483be9159fb571eb511b4982f218dab2376c9daec8c64765622c86c82dfed8477c81c7a7ce777a611632b489 WHIRLPOOL b7450f3590742a60b315ef71c380d84cc4090628ede2b64d57f4b315d9d9ae1ba96c51eaabd73343621fa77af9469d49acec5dea46adcec00268b63d16520057
-MISC ChangeLog 10880 SHA256 6e4cd3c0f751a929eb6bdb933a21ed8109e6c20cb8b2aeba146dc547ab3916c1 SHA512 ee6aebb88bb905500db9dc83b3a0f00d818fb150d265b0128c4e186b2f105a3776e28768b7c5d96f5b0b999bf4eb3f20e856454c534573462ddc6d7cdfb29ba1 WHIRLPOOL 5af3b9fde3aaa894bc3482239dccc35003887bb789af6b951faba389516e9a02028333ac36d5e3427c25b3636eae20532e86b4acebd978d1ed11e20fb76c5860
+MISC ChangeLog 11040 SHA256 95a96406045efd039fe7a49d9189a64d3c350fc61d3cb9483519a257b6bf877f SHA512 b77eb7fccff2e08cf0b7ab45b576f702f00700671d9a96cb032d52aa872be926c2c757daa02f6472900592f42b6efa02f01d0ea073403ea10824f21fb4658c59 WHIRLPOOL 9a6d4ca937a5ae3c6660c2a680498ddef476db370aa8ab5d55eec4a36582f2a730eead73ab671d36273fca97118618f87049fb914d9ea1700c29b7d57cb3d36b
 MISC metadata.xml 374 SHA256 f71a7581f22225196ad493f9f6c85e5379e3a62f482059827ae35ab66b834437 SHA512 57c2dbfe07d5395cadb81efbfcc2af61785d373e8b791f243895489af12945c3fb16e4f9fb229ebe2379868fec5d8224443e92b9389ddc9104224f6af8acd3b9 WHIRLPOOL a8475c29be2005c682b07ce66370d46bb562b49d38d62883005d7ed238f822043e95425c4644454dd0c1209c17c71362fe02bfadfea81fc6dae07de5dbd32cde
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJViCQxAAoJEJGRpfGTSRu4TnYIAMJvjGH0yRnqEknXO5c3RLPI
-vNKYwmOYly394lA6BLpV/zV6dC2cbXj6//mMqhmQfk3dyetMhiVGAgOqyTGe0m2Y
-+GgreNjy0tDJjN3JxOgjg1YyISSw/fS49ZShOpoDIow/Lu5EuFkr1gH8J3KnKOT9
-e96bqZ8pUv/N3qQXz+KcaoUR9gnZuphZonDr32RNx/TwRgpM2jlsaGOrIr/ueJRG
-UbMRCq+5sSJGGdjujwNRnPMGq8GvnGH8Tl680ZPo/skMsXPdFVUUmI1K3HJM08Bd
-rZKB1Ribvg0RbK/+eItaENadjxDEfgw/KSWAREz0bqRcKlBI5kCp3uEfrH7RbDs=
-=qV3W
+iQEcBAEBCAAGBQJVjvmEAAoJEJGRpfGTSRu4oFAIAL1LVDZo9QT9Moxy/DETtxIb
+/iUHI5dd5ev1IZWv1WkC8DgLDY4bxS0Ufw2402spsrkOmcUq7WvhSE3X2Hp1hwAs
++zmKlz9ju+LHBGEv/9PRRbWs51Y1Q5lJm+iXXkWcqGGLLzcN+p9LPdv1ViZIAkUA
+TbyyEXC6KOycPhnFf1tZG7srgNKQHchiJrPGRbWbzqwZ/1owjTf0hx2e9Ko+hDPH
+5CuPf/+PJGe3ZpdxGmb3vA9lH3ZxwlpQEO85G0JX7MdD12ywYQ63pNmY5YL8lBg8
+ZXKcbi0zcl+o2ba+UALnes+G3XWVd5haC2Ko5OXvWdDkxdul7oJiC3Sc3Zc9i8Y=
+=i/pS
 -----END PGP SIGNATURE-----
diff --git a/dev-java/batik/batik-1.8-r1.ebuild b/dev-java/batik/batik-1.8-r1.ebuild
new file mode 100644
index 000000000000..a7c60f254382
--- /dev/null
+++ b/dev-java/batik/batik-1.8-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8-r1.ebuild,v 1.1 2015/06/27 18:27:34 monsieurp Exp $
+
+EAPI=5
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Java based SVG toolkit"
+HOMEPAGE="https://xmlgraphics.apache.org/batik/"
+SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/source/${PN}-src-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.8"
+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
+	dev-java/xmlgraphics-commons:2
+	python? ( dev-java/jython:0 )
+	tcl? ( dev-java/jacl:0 )
+	dev-java/ant-core:0"
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="
+	xml-commons-external-1.3
+	xmlgraphics-commons-2
+	xalan
+	rhino-1.6
+"
+
+java_prepare() {
+	# bug #318323
+	for file in build.xml contrib/rasterizertask/build.xml; do
+		java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v no -a maxmemory -v 512m
+	done
+
+	# Add some missing imports to avoid a compiling issue.
+	# https://bugs.gentoo.org/show_bug.cgi?id=551952
+	# https://issues.apache.org/jira/browse/BATIK-1123
+	local imports=()
+	imports+=(sources/org/apache/batik/script/jpython/JPythonInterpreterFactory.java)
+	imports+=(sources/org/apache/batik/script/jacl/JaclInterpreterFactory.java)
+	for import in ${imports[@]}; do
+		einfo "Fixing missing import in ${import}"
+		sed -i '23i import org.apache.batik.script.ImportInfo;' ${import}
+		eend $?
+	done
+
+	cd lib
+	rm -v *.jar build/*.jar || die
+	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)
+
+	cd "${S}"/"${P}/lib" || die
+
+	# batik-all-1.8.jar is a all-in-one jar that contains all other jars. 
+	# We don't want to package it.
+	rm -v ${PN}-all-${PV}.jar
+}
+
+src_install() {
+	batik_unversion_jars() {
+		for jar in batik-*.jar; do
+			newj="${jar%-*}.jar"
+			java-pkg_newjar ${jar} ${newj}
+		done
+	}
+
+	# First unversion jars in ${P}/lib
+	cd "${S}"/"${P}"/lib || die
+	batik_unversion_jars
+
+	# Then, only those in ${P}
+	cd "${S}"/"${P}" || die
+	batik_unversion_jars
+
+	# Proceed with documentation installation
+	cd "${S}" || die
+	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
+}