From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5525B138AA2 for ; Sun, 17 Feb 2013 04:43:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7126BE0495; Sun, 17 Feb 2013 04:43:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9E6ECE04AB for ; Sun, 17 Feb 2013 04:43:25 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8584D33D86C for ; Sun, 17 Feb 2013 04:43:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C9D50E4090 for ; Sun, 17 Feb 2013 04:43:22 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1361075331.dae495d6fceb7ae0dacb78a324d0d83056516f3a.sping@gentoo> Subject: [gentoo-commits] proj/betagarden:master commit in: media-gfx/LightZone/files/, media-gfx/LightZone/ X-VCS-Repository: proj/betagarden X-VCS-Files: media-gfx/LightZone/LightZone-3.9.1_p20130106-r1.ebuild media-gfx/LightZone/LightZone-3.9.1_p20130106-r2.ebuild media-gfx/LightZone/files/LightZone-3.9.1_p20130106-indent-number.patch X-VCS-Directories: media-gfx/LightZone/files/ media-gfx/LightZone/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: dae495d6fceb7ae0dacb78a324d0d83056516f3a X-VCS-Branch: master Date: Sun, 17 Feb 2013 04:43:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8f28a2ed-b39e-4e59-a5dc-7a52f93f5e04 X-Archives-Hash: 906d55f894e395b0e59c9906fb401425 commit: dae495d6fceb7ae0dacb78a324d0d83056516f3a Author: Sebastian Pipping pipping org> AuthorDate: Sun Feb 17 03:53:55 2013 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Sun Feb 17 04:28:51 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=dae495d6 media-gfx/LightZone: 3.9.1_p20130106-r2 --- ....ebuild => LightZone-3.9.1_p20130106-r2.ebuild} | 15 ++--- .../LightZone-3.9.1_p20130106-indent-number.patch | 61 ++++++++++++++++++++ 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 similarity index 88% rename from media-gfx/LightZone/LightZone-3.9.1_p20130106-r1.ebuild rename to 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 +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 +