media-gfx/LightZone: 3.9.1_p20130106-r2

2 files changed, 67 insertions, 9 deletions

diff --git a/media-gfx/LightZone/LightZone-3.9.1_p20130106-r1.ebuild b/media-gfx/LightZone/LightZone-3.9.1_p20130106-r2.ebuild
index bc84023..171270a 100644
--- a/media-gfx/LightZone/LightZone-3.9.1_p20130106-r1.ebuild
+++ b/media-gfx/LightZone/LightZone-3.9.1_p20130106-r2.ebuild
@@ -19,8 +19,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-COMMON_DEPEND="dev-java/javahelp
-	dev-java/sun-jai-bin"
+COMMON_DEPEND="dev-java/javahelp:0
+	dev-java/sun-jai-bin:0
+	dev-java/substance:3.3"
 
 DEPEND="${COMMON_DEPEND}
 	dev-java/sun-jdk:1.6
@@ -53,21 +54,17 @@ src_prepare() {
 
 	einfo ''
 	einfo "Deleting shipped .so files:"
-	einfo "$(find . -name '*.so' -print -delete)"
+	einfo "$(find . -name '*.so' -print -delete | sort)"
 	einfo ''
 	einfo "Deleting bundled .jar files:"
-	einfo "$(find . -name '*.jar' -print | fgrep -v lightcrafts/lib/substance-lite.jar | xargs rm -v)"
-
-	ewarn ''
-	ewarn "These .jar files still need to be unbundled:"
-	ewarn "$(find . -name '*.jar' -print)"
-	ewarn ''
+	einfo "$(find . -name '*.jar' -print -delete | sort)"
 
 	# Replace bundled files
 	ln -s /usr/$(get_libdir)/sun-jai-bin/libmlib_jai.so linux/lib/libmlib_jai.so || die
 	java-pkg_jar-from javahelp jh.jar linux/lib/jh.jar || die
 	java-pkg_jar-from sun-jai-bin mlibwrapper_jai.jar linux/lib/mlibwrapper_jai.jar || die
 	_make_empty_jar lightcrafts/lib/script-api.jar  # Included in Sun Java 6 already
+	java-pkg_jar-from substance-3.3 substance-lite.jar lightcrafts/lib/substance-lite.jar || die
 
 	java-pkg-2_src_prepare
 }
diff --git a/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-indent-number.patch b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-indent-number.patch
new file mode 100644
index 0000000..e747684
--- /dev/null
+++ b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-indent-number.patch
@@ -0,0 +1,61 @@
+From 0355c092ce86a25110a8b91df0a45b92e5730fe7 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 17 Feb 2013 05:08:17 +0100
+Subject: [PATCH] Handle "Not supported: indent-number" exception
+
+---
+ lightcrafts/src/com/lightcrafts/utils/xml/XMLUtil.java     | 6 +++++-
+ lightcrafts/src/com/lightcrafts/utils/xml/XmlDocument.java | 6 +++++-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/lightcrafts/src/com/lightcrafts/utils/xml/XMLUtil.java b/lightcrafts/src/com/lightcrafts/utils/xml/XMLUtil.java
+index a7ed7fe..ac5c406 100644
+--- a/lightcrafts/src/com/lightcrafts/utils/xml/XMLUtil.java
++++ b/lightcrafts/src/com/lightcrafts/utils/xml/XMLUtil.java
+@@ -3,6 +3,7 @@
+ package com.lightcrafts.utils.xml;
+ 
+ import java.io.*;
++import java.lang.IllegalArgumentException;
+ import java.util.ArrayList;
+ 
+ import javax.xml.parsers.DocumentBuilder;
+@@ -435,7 +436,10 @@ public final class XMLUtil {
+         catch ( Exception e ) {
+             throw new IllegalStateException( e );
+         }
+-        m_xformFactory.setAttribute( "indent-number", "2" );
++        try {
++            m_xformFactory.setAttribute( "indent-number", "2" );
++        } catch ( IllegalArgumentException e ) {
++        }
+     }
+ }
+ /* vim:set et sw=4 ts=4: */
+diff --git a/lightcrafts/src/com/lightcrafts/utils/xml/XmlDocument.java b/lightcrafts/src/com/lightcrafts/utils/xml/XmlDocument.java
+index e7f69a7..407ca17 100644
+--- a/lightcrafts/src/com/lightcrafts/utils/xml/XmlDocument.java
++++ b/lightcrafts/src/com/lightcrafts/utils/xml/XmlDocument.java
+@@ -14,6 +14,7 @@ import javax.xml.transform.dom.DOMSource;
+ import javax.xml.transform.stream.StreamResult;
+ import javax.xml.transform.stream.StreamSource;
+ import java.io.*;
++import java.lang.IllegalArgumentException;
+ import java.util.Arrays;
+ 
+ /**
+@@ -50,7 +51,10 @@ public class XmlDocument {
+             Transformers = TransformerFactory.newInstance();
+             // Here's how one controls XML output indentation in Java 1.5:
+             if (System.getProperty("java.version").startsWith("1.5")) {
+-                Transformers.setAttribute("indent-number", "2");
++                try {
++                    Transformers.setAttribute("indent-number", "2");
++                } catch (IllegalArgumentException e) {
++                }
+             }
+         }
+         catch (TransformerFactoryConfigurationError e) {
+-- 
+1.8.1.2
+