patch to work without fetch-restricted sun-jimi

(Portage version: 2.1_pre3-r1)

5 files changed, 148 insertions, 11 deletions

diff --git a/dev-java/skinlf/ChangeLog b/dev-java/skinlf/ChangeLog
index 89a4a38d9b5f..1b5315169a9a 100644
--- a/dev-java/skinlf/ChangeLog
+++ b/dev-java/skinlf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/skinlf
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/skinlf/ChangeLog,v 1.1 2006/01/22 12:31:49 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/skinlf/ChangeLog,v 1.2 2006/01/24 21:05:10 zzam Exp $
+
+*skinlf-1.2.12-r1 (24 Jan 2006)
+
+  24 Jan 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/skinlf-1.2.12-image-utils-without-jimi.patch,
+  +skinlf-1.2.12-r1.ebuild:
+  patch to work without fetch-restricted sun-jimi
 
 *skinlf-1.2.12 (22 Jan 2006)
 
diff --git a/dev-java/skinlf/Manifest b/dev-java/skinlf/Manifest
index 5ce1fad669a7..39fda1433d56 100644
--- a/dev-java/skinlf/Manifest
+++ b/dev-java/skinlf/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ff591a1b1d50681f94e98a4d870adb82 ChangeLog 521
 MD5 712c7b8f9a62b32643ac3bbe18b56e36 files/digest-skinlf-1.2.12 71
+MD5 712c7b8f9a62b32643ac3bbe18b56e36 files/digest-skinlf-1.2.12-r1 71
 MD5 3fb7968ec94470fdcdce84fa8cbe2bab files/skinlf-1.2.12-build.xml 11622
 MD5 ac87465a658ce799c09247109b646312 files/skinlf-1.2.12-common-devjavanet.xml 1370
 MD5 5c756abb1a1f464545c91c576b919dfc files/skinlf-1.2.12-common.xml 5452
+MD5 a25557204224b7e4a380d42b2df424ee files/skinlf-1.2.12-image-utils-without-jimi.patch 2968
 MD5 105061490c4431c113a77768131aa5fe files/skinlf-1.2.12-image-utils.patch 1497
 MD5 2edcd635da8bde46bdfbb82e5929a5da metadata.xml 296
+MD5 6bf9c37b8d8c41d656e44a50087cc02b skinlf-1.2.12-r1.ebuild 1340
 MD5 209a8550773afe9b590f9c2edb9196c9 skinlf-1.2.12.ebuild 1406
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD03tpZfSl1Kp5KmoRAmADAJwP80iQrmfgE5fvNyd8xnTVYinE9QCg4Exu
-t25I57f0A46QabIcB67b2HA=
-=trHC
------END PGP SIGNATURE-----
diff --git a/dev-java/skinlf/files/digest-skinlf-1.2.12-r1 b/dev-java/skinlf/files/digest-skinlf-1.2.12-r1
new file mode 100644
index 000000000000..ae3f50d0cc61
--- /dev/null
+++ b/dev-java/skinlf/files/digest-skinlf-1.2.12-r1
@@ -0,0 +1 @@
+MD5 e29a1316c58ede48c3ecdafb281a1e4c skinlf-1.2.12-20051009.zip 836773
diff --git a/dev-java/skinlf/files/skinlf-1.2.12-image-utils-without-jimi.patch b/dev-java/skinlf/files/skinlf-1.2.12-image-utils-without-jimi.patch
new file mode 100644
index 000000000000..02670136667d
--- /dev/null
+++ b/dev-java/skinlf/files/skinlf-1.2.12-image-utils-without-jimi.patch
@@ -0,0 +1,77 @@
+diff -ru skinlf-1.2.12-orig/src/com/l2fprod/tools/ImageUtils.java skinlf-1.2.12/src/com/l2fprod/tools/ImageUtils.java
+--- skinlf-1.2.12-orig/src/com/l2fprod/tools/ImageUtils.java	2006-01-24 20:09:36.000000000 +0100
++++ skinlf-1.2.12/src/com/l2fprod/tools/ImageUtils.java	2006-01-24 20:19:19.000000000 +0100
+@@ -6,15 +6,12 @@
+ 

+ import javax.swing.ImageIcon;

+ 

+-import com.ibm.imageconversion.*;

+-import com.sun.jimi.core.*;

++import javax.imageio.*;

+ 

+ public class ImageUtils {

+ 

+   public static Component bitmapCreator = new javax.swing.JLabel();

+   

+-  static BMPDecoder decoder = new BMPDecoder();

+-  static BMPEncoder encoder = new BMPEncoder();

+ 

+   public static Image loadPng(String pathToImage) throws Exception {

+     ImageIcon icon = new ImageIcon(new File(pathToImage).toURL());

+@@ -22,29 +19,33 @@
+   }

+ 

+   public static void savePng(Image image, String pathToImage) throws Exception {

+-    Jimi.putImage(image, pathToImage);

++    ImageIO.write((RenderedImage)image, "png", new File(pathToImage));

+   }

+ 

++  private static String getFileFmt(String pathToImage) throws Exception {

++    String fmt;

++    if (pathToImage.toLowerCase().endsWith(".png")) {

++      return "png";

++    }

++    if (pathToImage.toLowerCase().endsWith(".gif")) {

++      return "gif";

++    }

++    if (pathToImage.toLowerCase().endsWith(".bmp")) {

++      return "bmp";

++    }

++    return "";

++  }

++  

+   public static void createPicture(String pathToImage, int index, int maxParts,

+                                    String filename, boolean horizontal) {

+     try {

+       System.out.println("working with " + pathToImage);

+       Image image = null;

+-

+-      if (pathToImage.toLowerCase().endsWith(".png") ||

+-        	pathToImage.toLowerCase().endsWith(".gif")) {

+-        image = loadPng(pathToImage);

+-      } else if (pathToImage.toLowerCase().endsWith(".bmp")) {

+-        decoder.setInputFilename(pathToImage);

+-        decoder.triggerAction();

+-        image = decoder.getResult();

+-      } else {

+-        throw new Error("do not know how to load " + pathToImage);

+-      }

++      image = Toolkit.getDefaultToolkit().getImage(pathToImage);

+ 

+       // if only one image, dump it as it

+-	    if (index == 0 && maxParts == 1) {

+-        Jimi.putImage(image, filename);

++      if (index == 0 && maxParts == 1) {

++        ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));

+       } else {

+         if (horizontal) {

+           int partHeight = image.getHeight(bitmapCreator) / maxParts;

+@@ -55,7 +56,7 @@
+           image = grab(image, partWidth * index, 0,

+                        partWidth, image.getHeight(bitmapCreator));

+         }

+-        Jimi.putImage(image, filename);

++	ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage));

+       }

+     } catch (Exception e) {

+       System.out.println("error while working with " + pathToImage);

diff --git a/dev-java/skinlf/skinlf-1.2.12-r1.ebuild b/dev-java/skinlf/skinlf-1.2.12-r1.ebuild
new file mode 100644
index 000000000000..6727d0ec272f
--- /dev/null
+++ b/dev-java/skinlf/skinlf-1.2.12-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/skinlf/skinlf-1.2.12-r1.ebuild,v 1.1 2006/01/24 21:05:10 zzam Exp $
+
+inherit java-pkg eutils
+
+MY_P="${P}-20051009"
+
+DESCRIPTION="Skin Look and Feel - Skinning Engine for the Swing toolkit"
+HOMEPAGE="http://skinlf.l2fprod.com/"
+SRC_URI="https://skinlf.dev.java.net/files/documents/66/22128/${MY_P}.zip"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="source"
+
+RDEPEND=">=virtual/jre-1.3
+	dev-java/javacc
+	dev-java/xalan
+	dev-java/xerces"
+
+DEPEND=">=virtual/jdk-1.3
+	>=dev-java/ant-core-1.5.4
+	dev-java/ant-tasks
+	source? ( app-arch/zip )"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-image-utils-without-jimi.patch
+
+	cp ${FILESDIR}/${P}-build.xml ${S}/build.xml
+	cp ${FILESDIR}/${P}-common.xml ${S}/common.xml
+	cp ${FILESDIR}/${P}-common-devjavanet.xml ${S}/common-devjavanet.xml
+
+	cd ${S}/lib
+	rm *.jar
+
+	java-pkg_jar-from javacc
+	java-pkg_jar-from xalan
+	java-pkg_jar-from xerces-2
+}
+
+src_compile() {
+	local antflags="jar"
+	#use doc && antflags="${antflags} public-doc"
+	cd ${S}
+	ant ${antflags} || die "compilation failed !"
+}
+
+src_install() {
+	use source && java-pkg_dosrc src/*
+	java-pkg_dojar build/skinlf.jar
+
+	#java-pkg_dojar lib/skinlf.jar
+	dodoc LICENSE LICENSE_nanoxml
+}
+
+