Keep and package batik-all.jar so that other ebuilds can potentially make use of it. Fixes bug 556062.

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

3 files changed, 133 insertions, 18 deletions

diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog
index 9227631a6590..ef1a331f48ac 100644
--- a/dev-java/batik/ChangeLog
+++ b/dev-java/batik/ChangeLog
@@ -1,6 +1,12 @@
 # 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.87 2015/07/25 14:45:41 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.88 2015/07/30 08:01:15 monsieurp Exp $
+
+*batik-1.8-r2 (30 Jul 2015)
+
+  30 Jul 2015; Patrice Clement <monsieurp@gentoo.org> +batik-1.8-r2.ebuild:
+  Keep and package batik-all.jar so that other ebuilds can potentially make use
+  of it. Fixes bug 556062.
 
   25 Jul 2015; James Le Cuirot <chewi@gentoo.org> batik-1.8-r1.ebuild:
   Add some missing dies. Closes bug #555870.
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 5edd3c2f14fd..26e9970c65e5 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -3,24 +3,17 @@ Hash: SHA256
 
 DIST batik-src-1.8.tar.gz 14970684 SHA256 0f1175146d45445fc4940e214c3e1e5cfa0294ae6a9787859bda00964f97c2bd SHA512 352843fd0cec43c6d9d54426fe1c20a9bd2234798404b101f2e8d43f6089c0bf6bb5102cb5674de11d37a0d820a8bb79fe9dd854030b23fd8c68f3931eb12f1b WHIRLPOOL fa50d1f87257c6018f99076bf759066b2311f483d424ef743e45fe17c74c646a215c1211c5431b2a522913f23ff5f53934a1606d4d4a223e8298abd6ce94bb46
 EBUILD batik-1.8-r1.ebuild 3272 SHA256 a6e6413dbc291d0864aa1667869fc74a59fe38a1d2860f31cb09a8471f1c7379 SHA512 5eb0a214bea0cf66f4b8ad15c62fe684defd484112b760b29685768be3b33fcdbe24ae57ad6ef931b96a760ec4debd3a116056e70bb761edae01d8fcf1216f37 WHIRLPOOL f0038521676012d585111e2b12bbd604b0d009acd1eba986d52a5d7f68977ff6f589537fc57dc5e8c41fbb997484cded81c1fe775d9a389bcf5463cbfd86a411
-MISC ChangeLog 11717 SHA256 23b3a168d8e893342547a1f4663ad79f827c4550985daf9e36b85a9032951a67 SHA512 a667b62c97f26ec09cf93481e5a7571830ac805c92df3d5a1bdb838c48ada4a53a9ad5c2629bf2144fd27ed62fd757c17c11dc11e2478376d64131776d266ed8 WHIRLPOOL 06f936ef3ed892eea4674581ae62a8158149e42474ff27ea2f23aa348b3f12738b5437513c64fa2eb0ac6e1625f662e26086095136f9a15f4fab58906383713b
+EBUILD batik-1.8-r2.ebuild 3321 SHA256 a5ff004ecf033f8cdcc18425d3fa86d53619ff4a18bfe282468f9eaac8b7002c SHA512 5eeaf71c88b6d528f9209e750415c0e72cbb74cfc1fe5f6ed9dbd65778c6d9ddd11a6f15a4e04ef1fb8bc193fbdaaac3ec88f07da3d565b2d03f851b6dd6cadc WHIRLPOOL a6bd37572aa24bd9770f55be3f7b8b7761d4029996b20389c1f3b94a1afcf1a5e1beefd6816d4a37444839b43f2438744b5476ba3d6b2981ca1df76a08ef5ecd
+MISC ChangeLog 11934 SHA256 b4e2e276895ae399799cbd0b38c7f0e6cdf25d36f2edb18a18f7204d116544d0 SHA512 6360dd5b278ba7904c01f65b5d9a9d972d319619eb4b072f8d240300465818ef7970781481689eea1b68f2a074022f615017db63ccf35fad4eeeee3fedbb7112 WHIRLPOOL 4415633e4890b6ae8586143d4b35fc264ce4f47d3ea7fcd8d36c7fb6e0027ce096ab17da6bdb3982cfdffc16aa898db2489f5270513d8f5d4880209d0ee12e93
 MISC metadata.xml 374 SHA256 f71a7581f22225196ad493f9f6c85e5379e3a62f482059827ae35ab66b834437 SHA512 57c2dbfe07d5395cadb81efbfcc2af61785d373e8b791f243895489af12945c3fb16e4f9fb229ebe2379868fec5d8224443e92b9389ddc9104224f6af8acd3b9 WHIRLPOOL a8475c29be2005c682b07ce66370d46bb562b49d38d62883005d7ed238f822043e95425c4644454dd0c1209c17c71362fe02bfadfea81fc6dae07de5dbd32cde
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVs6EWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kFXIP/2LbFVtZckFDfe4wKuEboDp/
-5SZuYK1RUfllM7WcGgCUHWr+4f31svIMwwRWXigjuwexOyMHIONiCq7H79wy3Xwx
-5DZHrm0p7BzgO19o/eLAQKYUhJQM+hluSXNL+XwHZfgQuBQUjAcTdaBjSXGWLGTE
-R9rpOaxea7UYdOJdupft8H/8HZWaglAbocD2vAzHX/hzhTysl66tPJQ+9mu5alXa
-BF7766p16A6pVL3PntuPrvgWYfmVvF8HrI8MIfdQFpRvK55gZvf9eVpWDAvLQuBe
-b3fmvCaGjzYOpJQe4JJNNn9Bga2eUvOSeFQBFFID2ir+umklazzM530/QzTpcTGE
-8Xl8g2UPSbUQ3TmOjPXRHooHxmX2QF5YOPJOkGGAqKC39KfmWZIfhHJoAjMJpHPo
-J7V5D7QASbL2nfsg3OsZNqxpByHl6GY4murNV97Hve86E5qKbh/CiAW5v21pECK7
-MVYsKqmYgX+Qr6sGCokzxvVc9hLXt1q4DmecLzpWKN9tq602/QvbsRoXPUgVMvbg
-Yjvi+ZxQ/FhJRuYcHfEB/nl0/+/fSEf8dclFu/EUOPSXWqUnqFgxj2BNpOpip+PM
-oSg7j9p4vEg32D8vb36LFA2JBU2Fbw9aGMKIk3gW0UY11HK6T//o+fleOOqOboBE
-M9972jwOulJHFCmEsOVG
-=IkY5
+iQEcBAEBCAAGBQJVuegJAAoJEJGRpfGTSRu4S/gH/3lI2XhYwBxaIeQ1QCe13h1P
+KSXyfELErdPPht5eFPUYNOrKlH+20N0MGnJklPvPEWl2mlZgHd73HYL//DGUtcnc
+D1r1ek304iPwNzUZPO8JFXetw2oMh+Q6WOxBgFB9mRice5pE/Jf3wLJsgk9GyFEV
+i8qccwhjE8Yxe8gSfGgTW056a+jyyEzcLgsJHvr4TPR1RbuGVIKdEmJltEljaG3p
+H0hXF4LVxRC5uerEAxvuoKrqnA6V5NJaX29VyB24sp2zAiymUeGKMBp61F+Ekiuk
+zacS7FDCiWr3Rq1YR2BnXsCeRbM9LjuxsOJ6iKQi7VStTcPvw6osxg6OPI0swT0=
+=jy01
 -----END PGP SIGNATURE-----
diff --git a/dev-java/batik/batik-1.8-r2.ebuild b/dev-java/batik/batik-1.8-r2.ebuild
new file mode 100644
index 000000000000..5efaaef833e3
--- /dev/null
+++ b/dev-java/batik/batik-1.8-r2.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-r2.ebuild,v 1.1 2015/07/30 08:01:15 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 ~x86 ~ppc ~ppc64 ~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} || die
+		eend $?
+	done
+
+	cd lib || die
+	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)
+
+	# batik-all-1.8.jar is a all-in-one jar that contains all other jars.
+	# We don't want to package it.
+	# No actually we do. See bug 556062.
+	# cd "${S}"/"${P}/lib" || die
+	# rm -v ${PN}-all-${PV}.jar || die
+}
+
+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
+}