From: Vlastimil Babka Date: Sat, 28 Apr 2007 22:14:23 +0000 (+0000) Subject: Version bump, migrated to generation-2 java eclasses. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b2ddbb2ad32704f19b7b7bc9832707480cebfc57;p=gentoo.git Version bump, migrated to generation-2 java eclasses. Package-Manager: portage-2.1.2.5 --- diff --git a/dev-java/prefuse/Manifest b/dev-java/prefuse/Manifest index 9539b98c28bc..2155c64d9462 100644 --- a/dev-java/prefuse/Manifest +++ b/dev-java/prefuse/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST prefuse-alpha-20050114.zip 1262679 RMD160 8bdb868a69427d93ec35b18381c1d60b55706ee1 SHA1 27a4f96cfc20281d406002491ab76b232c149280 SHA256 ebe47f5f90fbb6414eda3ef91221c1dfaace051f2b8f3e49c114d293aa5e25fb DIST prefuse-alpha-20050401.zip 3106518 RMD160 c9b1726c5964f84ad912f2d97774b009b3a1ee54 SHA1 432ce7d176aad3541c53137e6b164811d9075674 SHA256 7f7c9567ac35b5f0f20b0e55f72144e73514e94ccdadbd003ac572acc0ab59bd DIST prefuse-beta-20060715.zip 4327180 RMD160 fcf6507b5acc9c5935ee36d2974315ea006abfee SHA1 99f0ab050a31ee2f4376370b0fb09756ae87a720 SHA256 0a44ad918a1cf595fa55d12835467434ee6066d78329127453802ff886b409b8 @@ -9,14 +12,14 @@ EBUILD prefuse-20050401_alpha.ebuild 1090 RMD160 5191337d63f22862e18b9d42ad0d196 MD5 a67684ea13cd113ee96f93ea8844161d prefuse-20050401_alpha.ebuild 1090 RMD160 5191337d63f22862e18b9d42ad0d196deeaeefc7 prefuse-20050401_alpha.ebuild 1090 SHA256 bdfaeda10c51f901584301ded23da99b904c52d0afe32d989d527e5d9e191bee prefuse-20050401_alpha.ebuild 1090 -EBUILD prefuse-20060715_beta.ebuild 1324 RMD160 dcf5c73e576191efa5428a74075e312453ca2511 SHA1 29fbb917f2aba3a6f4fd25b2745650c7e19c8824 SHA256 3f9fb2fd60f568463552557ac105a2e89fb2458faabed2008531e9124acb637c -MD5 369f37590a87ecd2c5956f2e03380469 prefuse-20060715_beta.ebuild 1324 -RMD160 dcf5c73e576191efa5428a74075e312453ca2511 prefuse-20060715_beta.ebuild 1324 -SHA256 3f9fb2fd60f568463552557ac105a2e89fb2458faabed2008531e9124acb637c prefuse-20060715_beta.ebuild 1324 -MISC ChangeLog 1261 RMD160 c8db8ee29ca98d9ac1813a4734b6c12a0e37cfcd SHA1 58bb8a146a057d5a6df5f567d2158e6799d74aa0 SHA256 8fb52ca251e70b8759942327cd8ad48c2cf034cd8489174eea32c063473dcb2e -MD5 8e1c7dd4b27dd6d78449da6113b9acac ChangeLog 1261 -RMD160 c8db8ee29ca98d9ac1813a4734b6c12a0e37cfcd ChangeLog 1261 -SHA256 8fb52ca251e70b8759942327cd8ad48c2cf034cd8489174eea32c063473dcb2e ChangeLog 1261 +EBUILD prefuse-20060715_beta.ebuild 1327 RMD160 438c92567ec4f6530b4c0f4908ce2f53301aadd0 SHA1 815970d9a2507f980e46a19f1b668356e5a43290 SHA256 28c8abdefccebf844fc756e90c427ed6ef5a1c1541f5c5869fe3a2180129668a +MD5 df9ea176d061312e35cd8014eeff08f3 prefuse-20060715_beta.ebuild 1327 +RMD160 438c92567ec4f6530b4c0f4908ce2f53301aadd0 prefuse-20060715_beta.ebuild 1327 +SHA256 28c8abdefccebf844fc756e90c427ed6ef5a1c1541f5c5869fe3a2180129668a prefuse-20060715_beta.ebuild 1327 +MISC ChangeLog 1400 RMD160 da10e0830d8f0b38fba0d0abaad5456a70949bf7 SHA1 cb4b3bc660f03bd1d5e4c1622f6365032436d444 SHA256 d76038d3b1760134964c5850c5e5e2304d8ce483dc690f44c8cd83b30f078892 +MD5 6d25b9e5da9610c9ba4eef8109fa9314 ChangeLog 1400 +RMD160 da10e0830d8f0b38fba0d0abaad5456a70949bf7 ChangeLog 1400 +SHA256 d76038d3b1760134964c5850c5e5e2304d8ce483dc690f44c8cd83b30f078892 ChangeLog 1400 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -30,3 +33,10 @@ SHA256 4d85e101b9ba0ef17d7fda08be710a7406dde43f452794ab0c4f9737c168a882 files/di MD5 6006a0c79a4c648cae91855d8d73af2b files/digest-prefuse-20060715_beta 259 RMD160 cbe4d1256d53bc66994d7effb939680b26fdf0f3 files/digest-prefuse-20060715_beta 259 SHA256 b04ba5311083e7da17912dcbb2a225048d9223eb08c86316a3a15dca0c7f2668 files/digest-prefuse-20060715_beta 259 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGM8hbcxLzpIGCsLQRAvV/AJ9omHCbGfdSRzwYG6+IJgsfjsrmlACfUsbD +o0vY3N24TSvpnVSyZGZN4xo= +=yGmO +-----END PGP SIGNATURE----- diff --git a/dev-java/skinlf/ChangeLog b/dev-java/skinlf/ChangeLog index 9e483ab24ba1..058c28b49c21 100644 --- a/dev-java/skinlf/ChangeLog +++ b/dev-java/skinlf/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/skinlf # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/skinlf/ChangeLog,v 1.7 2007/04/01 14:49:00 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/skinlf/ChangeLog,v 1.8 2007/04/28 22:14:23 caster Exp $ + +*skinlf-6.7 (28 Apr 2007) + + 28 Apr 2007; Vlastimil Babka + +files/skinlf-6.7-build.xml, +files/skinlf-6.7-common.xml, + +files/skinlf-6.7-image-utils-without-jimi.patch, +skinlf-6.7.ebuild: + Version bump, migrated to generation-2 java eclasses. 01 Apr 2007; Petteri Räty -skinlf-1.2.12.ebuild: Remove gen 1 ebuild. diff --git a/dev-java/skinlf/Manifest b/dev-java/skinlf/Manifest index 2be3bc7a350c..eec0fdd38f6c 100644 --- a/dev-java/skinlf/Manifest +++ b/dev-java/skinlf/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX skinlf-1.2.12-build.xml 11622 RMD160 e5bd5810f4f6c52c5252d0ccf9fec9388fd32793 SHA1 c0dd71277140a398150ad183d75fc9602d8eb6dc SHA256 3404b1d02af29a500ae954aa35ca22f5e95378f7c5617095ab5d21fc3015c817 MD5 3fb7968ec94470fdcdce84fa8cbe2bab files/skinlf-1.2.12-build.xml 11622 RMD160 e5bd5810f4f6c52c5252d0ccf9fec9388fd32793 files/skinlf-1.2.12-build.xml 11622 @@ -21,15 +18,32 @@ AUX skinlf-1.2.12-image-utils.patch 1497 RMD160 2f407cee8a6fa88a8afca7fae2d90319 MD5 105061490c4431c113a77768131aa5fe files/skinlf-1.2.12-image-utils.patch 1497 RMD160 2f407cee8a6fa88a8afca7fae2d90319d86ef618 files/skinlf-1.2.12-image-utils.patch 1497 SHA256 3a8246c1c038684c6c933f6dce6177a2d4488ae7aaccac01bcd24587c530c284 files/skinlf-1.2.12-image-utils.patch 1497 +AUX skinlf-6.7-build.xml 10712 RMD160 cf5fd5f76e8fbd9cd59d59013f5c4b7ef4b13547 SHA1 f22a88ac556c69ff747a814b37996ecd7666a9e6 SHA256 85dd7092c1756b3e70e95c2c2fd36745b22634fa38410a0f9ee53fe3f7983e93 +MD5 c2618d08c1248865ad5f73e92684bd62 files/skinlf-6.7-build.xml 10712 +RMD160 cf5fd5f76e8fbd9cd59d59013f5c4b7ef4b13547 files/skinlf-6.7-build.xml 10712 +SHA256 85dd7092c1756b3e70e95c2c2fd36745b22634fa38410a0f9ee53fe3f7983e93 files/skinlf-6.7-build.xml 10712 +AUX skinlf-6.7-common.xml 5452 RMD160 83142be5733bff326546a59c06846f084674d16e SHA1 51921d041edb64baf4464044f5b24d6142c2d993 SHA256 a6ea18e7187684e86797ca51f45c0224f44433184f0473afbb32b08cadc95732 +MD5 5c756abb1a1f464545c91c576b919dfc files/skinlf-6.7-common.xml 5452 +RMD160 83142be5733bff326546a59c06846f084674d16e files/skinlf-6.7-common.xml 5452 +SHA256 a6ea18e7187684e86797ca51f45c0224f44433184f0473afbb32b08cadc95732 files/skinlf-6.7-common.xml 5452 +AUX skinlf-6.7-image-utils-without-jimi.patch 2935 RMD160 5c7f661596295ab300bb06cc77c45aeeb964ea05 SHA1 dac738bae475d76b2cb6c53dd530313337c8cbbd SHA256 9bf37bf2a74b04a1228cbae1741baf9ecd2df00530214e8848e73ce45c0567c0 +MD5 fb62690b77d55ef33faa591b404f59e6 files/skinlf-6.7-image-utils-without-jimi.patch 2935 +RMD160 5c7f661596295ab300bb06cc77c45aeeb964ea05 files/skinlf-6.7-image-utils-without-jimi.patch 2935 +SHA256 9bf37bf2a74b04a1228cbae1741baf9ecd2df00530214e8848e73ce45c0567c0 files/skinlf-6.7-image-utils-without-jimi.patch 2935 DIST skinlf-1.2.12-20051009.zip 836773 RMD160 7c1b0c2e2d07f7f73a4f43b4d7af344213892f50 SHA1 13eb578bb8474774c1794c945b1b7eaf1beca881 SHA256 629c89831f4dd06b3637a1b538c5b19f3c1efd093416eb9ad5d4acc25cc70346 +DIST skinlf-6.7-20060722.zip 827174 RMD160 c1bd5ec769c5eb36bfb9f931d504f98d85c2622c SHA1 9fa7a68e9d2480d120146dea60e2df74d6f1c170 SHA256 3d31ffbe1fa1325049cb94e675971a2b8d89ae24558cb173e7e4e1f926dd7daa EBUILD skinlf-1.2.12-r1.ebuild 1374 RMD160 78c96085525faaceb7fff776f08c84d6b0a986d2 SHA1 761dacedbf928da728a5fb607afa3bc2dfd7cd78 SHA256 5a851e9a2d1d9e95a48629862a247cd9fa1ce65fc95d636102ab9c51e485cf74 MD5 6175ab6fffbf69ec52414af176c22da0 skinlf-1.2.12-r1.ebuild 1374 RMD160 78c96085525faaceb7fff776f08c84d6b0a986d2 skinlf-1.2.12-r1.ebuild 1374 SHA256 5a851e9a2d1d9e95a48629862a247cd9fa1ce65fc95d636102ab9c51e485cf74 skinlf-1.2.12-r1.ebuild 1374 -MISC ChangeLog 1332 RMD160 efed11cbae569d6df0e8f4eca916afabb5f9a103 SHA1 c36916991996fbf0ee6a52ce7f913f0381ff9453 SHA256 8957736cf81ea4f8eea695673323d6e12d705bdf4f5667bd326868cb8b0c114b -MD5 fb07c9c1d831a07c8f6bc901ec28d014 ChangeLog 1332 -RMD160 efed11cbae569d6df0e8f4eca916afabb5f9a103 ChangeLog 1332 -SHA256 8957736cf81ea4f8eea695673323d6e12d705bdf4f5667bd326868cb8b0c114b ChangeLog 1332 +EBUILD skinlf-6.7.ebuild 1501 RMD160 9cad3402c882628fb912626830aa2c29b4f65a64 SHA1 7496372c23df56ca090488e01510d94143d72dd9 SHA256 2d82aec0db3a6d8c7e657170a5c312b23283d5d94b0c5732de7dee5b11a7c929 +MD5 97f63dbb0d11263a28da12ce7b8632ec skinlf-6.7.ebuild 1501 +RMD160 9cad3402c882628fb912626830aa2c29b4f65a64 skinlf-6.7.ebuild 1501 +SHA256 2d82aec0db3a6d8c7e657170a5c312b23283d5d94b0c5732de7dee5b11a7c929 skinlf-6.7.ebuild 1501 +MISC ChangeLog 1596 RMD160 a1d48f2e67b501f835edefd28fb4ab2619ca9b4a SHA1 e5334f142afd1e682ad57a6aae55fdbd776181e4 SHA256 30de9fe20822b7c7c1228c9cb43fa88cfb308c2eb7cec8ec5b85f1eac36cdcc4 +MD5 2cc0737bb6662743909568dcaa0ead19 ChangeLog 1596 +RMD160 a1d48f2e67b501f835edefd28fb4ab2619ca9b4a ChangeLog 1596 +SHA256 30de9fe20822b7c7c1228c9cb43fa88cfb308c2eb7cec8ec5b85f1eac36cdcc4 ChangeLog 1596 MISC metadata.xml 296 RMD160 90aca187f5983a11f749a6bcd1316f515eb1b350 SHA1 5a3419c2ca8173341534c0d0157bcb48defa521d SHA256 8e28ce8172f0873f2dbf2a82b1d0cf47873edab69aee8062eabe3818b91be0ce MD5 2edcd635da8bde46bdfbb82e5929a5da metadata.xml 296 RMD160 90aca187f5983a11f749a6bcd1316f515eb1b350 metadata.xml 296 @@ -37,10 +51,6 @@ SHA256 8e28ce8172f0873f2dbf2a82b1d0cf47873edab69aee8062eabe3818b91be0ce metadata MD5 45f1d134b1f967cc6d80ea0a1540c711 files/digest-skinlf-1.2.12-r1 259 RMD160 b270fb9647714703a262137d4a645cc40cfe68dc files/digest-skinlf-1.2.12-r1 259 SHA256 b8699ee563baf5a0e5c7d051a9140f87672610206723bb6233dbc084a416c46e files/digest-skinlf-1.2.12-r1 259 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) - -iD8DBQFGD8ZicxLzpIGCsLQRAtStAJwIo7HU6odr+KVUMAZixGwyOoLmpACfVoYg -jd9PxWujR5Z+YX5G+t1+EPs= -=Mf+E ------END PGP SIGNATURE----- +MD5 9e9fd04630bbda3d1f43078e233815c9 files/digest-skinlf-6.7 250 +RMD160 4731cb4afa4c851edd1ce0181fcb2b7e5ab5150b files/digest-skinlf-6.7 250 +SHA256 7bd9caf7d1ab86bc64f1afac73870d7d4c50e2bb093b852deb7ebf1c075f776a files/digest-skinlf-6.7 250 diff --git a/dev-java/skinlf/files/digest-skinlf-6.7 b/dev-java/skinlf/files/digest-skinlf-6.7 new file mode 100644 index 000000000000..5e28e9977b80 --- /dev/null +++ b/dev-java/skinlf/files/digest-skinlf-6.7 @@ -0,0 +1,3 @@ +MD5 09b41b511b51e465a052483b598d68f3 skinlf-6.7-20060722.zip 827174 +RMD160 c1bd5ec769c5eb36bfb9f931d504f98d85c2622c skinlf-6.7-20060722.zip 827174 +SHA256 3d31ffbe1fa1325049cb94e675971a2b8d89ae24558cb173e7e4e1f926dd7daa skinlf-6.7-20060722.zip 827174 diff --git a/dev-java/skinlf/files/skinlf-6.7-build.xml b/dev-java/skinlf/files/skinlf-6.7-build.xml new file mode 100644 index 000000000000..42b4c1145aa2 --- /dev/null +++ b/dev-java/skinlf/files/skinlf-6.7-build.xml @@ -0,0 +1,276 @@ + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + &build-COMMON; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/dev-java/skinlf/files/skinlf-6.7-common.xml b/dev-java/skinlf/files/skinlf-6.7-common.xml new file mode 100644 index 000000000000..c2803acc5bab --- /dev/null +++ b/dev-java/skinlf/files/skinlf-6.7-common.xml @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev-java/skinlf/files/skinlf-6.7-image-utils-without-jimi.patch b/dev-java/skinlf/files/skinlf-6.7-image-utils-without-jimi.patch new file mode 100644 index 000000000000..3e797bf08d86 --- /dev/null +++ b/dev-java/skinlf/files/skinlf-6.7-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 +--- src/com/l2fprod/tools/ImageUtils.java 2006-01-24 20:09:36.000000000 +0100 ++++ 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-6.7.ebuild b/dev-java/skinlf/skinlf-6.7.ebuild new file mode 100644 index 000000000000..aaba75d889ad --- /dev/null +++ b/dev-java/skinlf/skinlf-6.7.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/skinlf/skinlf-6.7.ebuild,v 1.1 2007/04/28 22:14:23 caster Exp $ + +JAVA_PKG_IUSE="examples source" +WANT_ANT_TASKS="ant-nodeps" +inherit eutils java-pkg-2 java-ant-2 + +MY_P="${P}-20060722" + +DESCRIPTION="Skin Look and Feel - Skinning Engine for the Swing toolkit" +HOMEPAGE="http://${PN}.l2fprod.com/" +SRC_URI="https://${PN}.dev.java.net/files/documents/66/37801/${MY_P}.zip" +LICENSE="as-is" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +CDEPEND="dev-java/laf-plugin + dev-java/xalan" +RDEPEND=">=virtual/jre-1.4 + ${CDEPEND}" +DEPEND=">=virtual/jdk-1.4 + app-arch/unzip + ${CDEPEND}" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}-image-utils-without-jimi.patch" + + cp "${FILESDIR}/${P}-build.xml" build.xml + cp "${FILESDIR}/${P}-common.xml" common.xml + + cd lib + # assert_built_jar_equals is your friend, upstream your enemy + unzip ${PN}.jar '*.gif' '*.template' -d ../src || die + rm -v *.jar + + java-pkg_jar-from xalan,laf-plugin +} + +src_install() { + java-pkg_dojar build/${PN}.jar + # laf-plugin.jar is referenced in manifest's Class-Path + # doesn't work without it due to class loader trickery + # upstream solved this by absorbing laf-plugin in own jar... + java-pkg_dojar lib/laf-plugin.jar + + use examples && java-pkg_doexamples src/examples + use source && java-pkg_dosrc src/com src/*.java + + dodoc CHANGES README LICENSE LICENSE_nanoxml || die +} + +