gimp 2.6.0 bump

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.27-rc9-00169-gb34c873 x86_64

4 files changed, 172 insertions, 2 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 23c32471be05..bec7761c3298 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.263 2008/10/07 22:33:00 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.264 2008/10/07 22:50:15 hanno Exp $
+
+*gimp-2.6.0 (07 Oct 2008)
+
+  07 Oct 2008; Hanno Boeck <hanno@gentoo.org>
+  +files/gimp-2.6-file-uri.patch, +gimp-2.6.0.ebuild:
+  Version bump, cleanup, many minor changes.
 
   07 Oct 2008; Friedrich Oslage <bluebird@gentoo.org> gimp-2.4.6.ebuild:
   Stable on sparc, bug #239923
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 84efca35e89e..9baa926674c7 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gimp-2.6-file-uri.patch 1626 RMD160 02ac1485a6d5014a4cba1bce374233a90933b73a SHA1 fc6b42f2f8ba6bfc951c5ecd9988f2f6ac9a32b6 SHA256 0958c507c54cac22e0b990e2b5ccf40af50be273428d3cc0df2889563ed4577b
 AUX gimp-svg.diff 1080 RMD160 ef80ab1b82622dc28d38a3a606dec40b36685a04 SHA1 636d112dcf71e1b2fc31d3c941e0b49c8bdf422a SHA256 f8dc78958f3e7e0a921bbcb9c0deabed9f0354b3d17257f1740e355b9f456c44
 AUX gimp-web-browser.patch 1579 RMD160 33fd018a83b8ade7ced9bbd4c80b9c29468781fd SHA1 af9742a1aa6d07547d5753dcd34661be6f5e36a4 SHA256 f6329bb38be785a7c8c49cc8de61e41ce3a12a118849a713a54212e91de2a747
 DIST gimp-2.3.19.tar.bz2 16803491 RMD160 3ea293372ef0656543912c0a63ab287fd9ae72ca SHA1 f04efda774e8ed57ded5058d37091f7a8d7b17b2 SHA256 f4e388b7b52db1e91e052dcd0aeab0844fcf83a14ccd24228bf033e7937007f0
@@ -5,11 +9,20 @@ DIST gimp-2.4.2.tar.bz2 17777846 RMD160 f9da1008c29746379eb728f27e9b0d452ba2318f
 DIST gimp-2.4.5.tar.bz2 17819962 RMD160 963a139e417354d898abd2499a5f31ecfc0da75b SHA1 70cf6af5700cf6db73fca898510873394eb95581 SHA256 dadf13c2e605245572f1bdb948969c3f3ef3d2b18a9ca1f64d6f9383ac48d5ae
 DIST gimp-2.4.6.tar.bz2 18365363 RMD160 17d61da426950f8a7286f7e82259d23b46adb1fd SHA1 6cbfda0da19bf5a2221013afe32643e3c09aeeda SHA256 99aef9e70edf80e4f3605727ba2979286c568a02cadf6e8c5d37a5ce6cce0bea
 DIST gimp-2.4.7.tar.bz2 18977384 RMD160 79062e60db1fe172e2a91ff0601462462d3a61cb SHA1 fd6dac4fd107f3b741168ffcaf4425a9dd179327 SHA256 d398eef058faf81053c624690ba3192a8d517b1370c6f35d10e0eae2190109c9
+DIST gimp-2.6.0.tar.bz2 15897821 RMD160 66dae43b362298314befc39916bb3e01b9098b50 SHA1 187effb5722a1d5943c48ec74a3be96c836215f6 SHA256 f4055ea8f1815d7dcca6bf0159af70489243d63a14dcfaf2a994af062d829ca8
 EBUILD gimp-2.3.19.ebuild 3420 RMD160 6b764050ce4a20bc249fdf34246b9036c9498f4b SHA1 0f394608c2b25669ad886ee13b61407c474bc02c SHA256 0550dc8499e285dcaff590f31f014d5e5303ee6e03978f80eb49a810d3dbec7b
 EBUILD gimp-2.4.2.ebuild 3687 RMD160 3663e7a85f32416c99a4c7a83b6f81962f4e7f7f SHA1 7c499615c56d63ea10208e2d692789f6440471d9 SHA256 2f60b463680e951cb810436f5da1c99f9793b8a8365658cffad3dae70843ffd8
 EBUILD gimp-2.4.5.ebuild 4092 RMD160 fe15f6da7cbb8f6f32eb85d9c9e1987f2efd8abc SHA1 2434b9f1c07aea1da493e8868686a358f3efb46e SHA256 5439c52f7ee4eb7bd39cae7db5b143910df450b8da4261c997cc5016ea1ec5f6
 EBUILD gimp-2.4.6.ebuild 3849 RMD160 1cda080fbe59ee64f73254ef9d1fc6d3bad71544 SHA1 08819c537de21dec2534f51338baaaedb2b3464d SHA256 1f212e375c01e75445f4f911e11d334d2a47f4668dcb748ba04d9111bd2cabc1
 EBUILD gimp-2.4.7.ebuild 3851 RMD160 1c4e786a176b229acd6f4ec4d1d89201ea04deab SHA1 e583b34bafb4b52cf71ceff4a3303ebad55fb472 SHA256 0d4234105fa5df9f3feba2442f46ec24150ab15b4b82c94d041684339335994c
+EBUILD gimp-2.6.0.ebuild 3162 RMD160 b764b160803e7c893241b9d33f2f4ab3f5d5fd28 SHA1 bbbee631bb3495179e20b5ab42d94c4e44a0b283 SHA256 b008fa50dd4ba1afd8e8905227968d0ab2c5b85a70cf9eda2087c60be8bb3547
 EBUILD gimp-9999.ebuild 3765 RMD160 4eb85d08786ba8d73536e5bb60118fe2f9b42382 SHA1 c8a20283d95e2e8d274bde17cb97bb2a255a56b4 SHA256 b24670ec12036af85fab20131f8a0c0e377dd889a4d7bc8168ad124af187f464
-MISC ChangeLog 35529 RMD160 112238f6d8a436ed0ade82c5025e3405c604dfc9 SHA1 ee83507e48ffc923373315f39be3d62da0ceb7ba SHA256 76ea2302817e7b3bf98369f324e2c0048d41597ff5d1a1a39699ab94c8c9ad65
+MISC ChangeLog 35699 RMD160 523dbae88d796385bac1c7851b25f1d4d798394c SHA1 e5cb69ab2518bcbb6613ff42b12b3e07800d387b SHA256 d0ac7ba1cda4d3f13c86d6cc707d127ccae372f88344192eefe87fb0848996e2
 MISC metadata.xml 298 RMD160 8dbb11d3e75bbb3c3603cd9d252b563eea9a21fe SHA1 6b1b12a2b300521cb88cb2c6d51ad97868a9ef7b SHA256 24f1784d08a90f76fa9570566b4a5078f0f9eeaac3c6e089323d5f2ae273e4d7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjr56kACgkQr2QksT29OyChPACgl8hamA1Ow0Aycwd2f4VLGqvZ
+AlsAn2F2RiJQMlqb7O8xO76OQDU7YrsD
+=wYr9
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/files/gimp-2.6-file-uri.patch b/media-gfx/gimp/files/gimp-2.6-file-uri.patch
new file mode 100644
index 000000000000..251573b79063
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.6-file-uri.patch
@@ -0,0 +1,41 @@
+diff -Naur gimp-2.6.0.orig/plug-ins/file-uri/uri-backend-libcurl.c gimp-2.6.0/plug-ins/file-uri/uri-backend-libcurl.c
+--- gimp-2.6.0.orig/plug-ins/file-uri/uri-backend-libcurl.c     2008-10-02 10:34:43.000000000 +0300
++++ gimp-2.6.0/plug-ins/file-uri/uri-backend-libcurl.c          2008-10-02 10:34:57.000000000 +0300
+@@ -21,6 +21,8 @@
+ 
+ #include "config.h"
+ 
++#include <errno.h>
++
+ #include <curl/curl.h>
+ #include <curl/types.h>
+ #include <curl/easy.h>
+@@ -161,6 +161,6 @@
+     {
+       g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
+                    _("Could not open '%s' for writing: %s"),
+-                   gimp_filename_to_utf8 (filename),  g_strerror (errno));
++                   gimp_filename_to_utf8 (tmpname),  g_strerror (errno));
+       return FALSE;
+     }
+diff -Naur gimp-2.6.0.orig/plug-ins/file-uri/uri-backend-wget.c gimp-2.6.0/plug-ins/file-uri/uri-backend-wget.c
+--- gimp-2.6.0.orig/plug-ins/file-uri/uri-backend-wget.c	2008-10-03 15:06:32.000000000 +0300
++++ gimp-2.6.0/plug-ins/file-uri/uri-backend-wget.c	2008-10-03 15:06:42.000000000 +0300
+@@ -91,7 +91,7 @@
+ 
+   if (pipe (p) != 0)
+     {
+-      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,,
++      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                    "pipe() failed: %s", g_strerror (errno));
+       return FALSE;
+     }
+@@ -101,7 +101,7 @@
+ 
+   if ((pid = fork()) < 0)
+     {
+-      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,,
++      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                    "fork() failed: %s", g_strerror (errno));
+       return FALSE;
+     }
diff --git a/media-gfx/gimp/gimp-2.6.0.ebuild b/media-gfx/gimp/gimp-2.6.0.ebuild
new file mode 100644
index 000000000000..1d6229f50ebf
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.6.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.0.ebuild,v 1.1 2008/10/07 22:50:15 hanno Exp $
+
+inherit gnome2 fdo-mime flag-o-matic multilib python eutils
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="http://www.gimp.org/"
+SRC_URI="mirror://gimp/v2.4/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="alsa aalib altivec curl dbus debug doc exif gtkhtml gnome hal jpeg lcms mmx mng pdf png python smp sse svg tiff wmf"
+
+RDEPEND=">=dev-libs/glib-2.18.1
+	>=x11-libs/gtk+-2.10.13
+	>=x11-libs/pango-1.12.2
+	>=media-libs/freetype-2.1.7
+	>=media-libs/fontconfig-2.2.0
+	>=media-libs/libart_lgpl-2.3.8-r1
+	sys-libs/zlib
+	dev-libs/libxml2
+	dev-libs/libxslt
+	x11-misc/xdg-utils
+	x11-themes/hicolor-icon-theme
+	media-libs/gegl
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
+	curl? ( net-misc/curl )
+	dbus? ( dev-libs/dbus-glib )
+	hal? ( sys-apps/hal )
+	gnome? ( gnome-base/gvfs
+		>=gnome-base/libgnomeui-2.10.0
+		>=gnome-base/gnome-keyring-0.4.5 )
+	gtkhtml? ( =gnome-extra/gtkhtml-2* )
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	exif? ( >=media-libs/libexif-0.6.15 )
+	lcms? ( media-libs/lcms )
+	mng? ( media-libs/libmng )
+	pdf? ( >=app-text/poppler-bindings-0.3.1 )
+	png? ( >=media-libs/libpng-1.2.2 )
+	python?	( >=dev-lang/python-2.2.1
+		>=dev-python/pygtk-2.10.4 )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	svg? ( >=gnome-base/librsvg-2.8.0 )
+	wmf? ( >=media-libs/libwmf-0.2.8 )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+
+src_unpack() {
+	gnome2_src_unpack
+	cd "${S}"
+	epatch "${FILESDIR}/gimp-2.6-file-uri.patch" || die "epatch failed"
+}
+
+pkg_setup() {
+	if use pdf && ! built_with_use app-text/poppler-bindings gtk; then
+		eerror "This package requires app-text/poppler-bindings compiled with GTK+ support."
+		die "Please reemerge app-text/poppler-bindings with USE=\"gtk\"."
+	fi
+	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
+		eerror "This package requires media-libs/alsa-lib compiled with midi support."
+		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
+	fi
+
+	G2CONF="--enable-default-binary \
+		--with-x \
+		$(use_with aalib aa) \
+		$(use_with alsa) \
+		$(use_enable altivec) \
+		$(use_with curl libcurl) \
+		$(use_with dbus) \
+		$(use_with hal) \
+		$(use_with gnome gvfs) \
+		--without-gnomevfs \
+		$(use_with gtkhtml gtkhtml2) \
+		$(use_with jpeg libjpeg) \
+		$(use_with exif libexif) \
+		$(use_with lcms) \
+		$(use_enable mmx) \
+		$(use_with mng libmng) \
+		$(use_with pdf poppler) \
+		$(use_with png libpng) \
+		$(use_enable python) \
+		$(use_enable smp mp) \
+		$(use_enable sse) \
+		$(use_with svg librsvg) \
+		$(use_with tiff libtiff) \
+		$(use_with wmf)"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
+		/usr/$(get_libdir)/gimp/2.0/plug-ins
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
+		/usr/$(get_libdir)/gimp/2.0/plug-ins
+}