[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/files/, dev-java/batik/

[Patrice Clement]

commit:     bace0280856b81f8196ef01a831d074a72c392ac
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 28 17:51:29 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 17:57:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bace0280

dev-java/batik: patch file against missing import.

Patch JaclInterpreterFactory.java against a missing import. We will
remove it once Batik devs decide to cut a new release.

Courtesy of Martin von Gagern <Martin.vGagern <AT> gmx.net>.

See: https://issues.apache.org/jira/browse/BATIK-1123
See: http://svn.apache.org/viewvc?view=revision&revision=1808872
Closes: https://bugs.gentoo.org/628812
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-java/batik/batik-1.9.ebuild                 |  3 +++
 dev-java/batik/files/batik-1.9-ImportInfo.patch | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/dev-java/batik/batik-1.9.ebuild b/dev-java/batik/batik-1.9.ebuild
index 364f452f0a0..a223d4116d9 100644
--- a/dev-java/batik/batik-1.9.ebuild
+++ b/dev-java/batik/batik-1.9.ebuild
@@ -48,6 +48,9 @@ java_prepare() {
 		java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v no -a maxmemory -v 512m
 	done
 
+	# See bug 628812.
+	use tcl && epatch "${FILESDIR}/${P}-ImportInfo.patch"
+
 	cd lib || die
 	rm -v *.jar build/*.jar || die
 	use python && java-pkg_jar-from jython-2.7

diff --git a/dev-java/batik/files/batik-1.9-ImportInfo.patch b/dev-java/batik/files/batik-1.9-ImportInfo.patch
new file mode 100644
index 00000000000..103b99e1b96
--- /dev/null
+++ b/dev-java/batik/files/batik-1.9-ImportInfo.patch
@@ -0,0 +1,10 @@
+--- a/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreterFactory.java	2017-10-28 17:24:11.401276868 +0000
++++ b/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreterFactory.java	2017-10-28 17:27:13.314255999 +0000
+@@ -20,6 +20,7 @@
+ 
+ import java.net.URL;
+ 
++import org.apache.batik.script.ImportInfo;
+ import org.apache.batik.script.Interpreter;
+ import org.apache.batik.script.InterpreterFactory;
+