minor fixes to gimp

Package-Manager: portage-2.1.4.4

4 files changed, 61 insertions, 5 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 7f32c3d7611f..f37c6cb108b2 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
 # 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.251 2008/03/09 23:30:20 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.252 2008/03/26 01:23:33 hanno Exp $
+
+  26 Mar 2008; Hanno Boeck <hanno@gentoo.org> +files/gimp-web-browser.patch,
+  gimp-2.4.5.ebuild:
+  Add xdg-open support for webbrowser, fix disabling gnome support.
 
   09 Mar 2008; <ricmm@gentoo.org> gimp-2.3.19.ebuild:
   Drop to ~mips due to unstable deps
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index d8b73021ea53..efab1a729d12 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
 DIST gimp-2.4.2.tar.bz2 17777846 RMD160 f9da1008c29746379eb728f27e9b0d452ba2318f SHA1 4913a411abde3fccae5350e00a9bd20742715367 SHA256 00393b2d2aa163a7791dc4456306bf903d920d345aeee162d0e2ce85cfae5fb1
 DIST gimp-2.4.4.tar.bz2 17775071 RMD160 b497e8bdf986bf94673ac702ecf0289350fc14e0 SHA1 47c80470e15e3fa29e46652130e870e0c952789f SHA256 d059c7159bca6e90f2a8201f1efdbd1c5af52a876e7c6462a7829d4b1618d4d6
@@ -6,7 +10,14 @@ DIST gimp-2.4.5.tar.bz2 17819962 RMD160 963a139e417354d898abd2499a5f31ecfc0da75b
 EBUILD gimp-2.3.19.ebuild 3448 RMD160 c7defd898465d682167ab9566b2b6f1dcefb41e0 SHA1 18183c72f90d0862c34989f01f155de8639187b6 SHA256 fedd01d9b2873bfa9837d4c1417d86904ee52c4dcc88b4eb1442146613c3476a
 EBUILD gimp-2.4.2.ebuild 3706 RMD160 cf265b6a9274af37bff76aa7048e20a1bbcbc946 SHA1 41ffb1ab555669664ba5cca84b4ae53d35ed1ce0 SHA256 cdbaa54bf2571d3ab60001866a4270a58c0fac37846135f3256bdc0f85a93a1b
 EBUILD gimp-2.4.4.ebuild 4041 RMD160 d2691fb9a252414cbcb937098daa16b3c47dd37e SHA1 3638237b4c22aec7ccaa08fe4d7606eff4d4fbe8 SHA256 215556bc979c3e9b152bb0553c6e31d8ebf72cbdef1eb40ac9d5eb23dfed4abc
-EBUILD gimp-2.4.5.ebuild 4041 RMD160 81a642de28cba073289839421a485e2e76c4c7ee SHA1 7ffe258f176a44a9d4e549b10dc3301f8c2c45dd SHA256 dc645745dfff1ec7a7bb6d10fda79f44534a7d8a0107a0e8a45883afba662adf
+EBUILD gimp-2.4.5.ebuild 4115 RMD160 2f1821c42c0678ad8116ee3fa7c4de2ce424c027 SHA1 9a8a70d4f4e34adf46f04b65b850742a0be24c26 SHA256 60c0a338dee9dc14a01971cace5fea7075a1822c9778084f4b338799df280ce7
 EBUILD gimp-9999.ebuild 3786 RMD160 ede6db9fbc04791c7dd3ac7f38bdd86d9e296fc6 SHA1 488c776ec66885737fc8da4fcd34c7689badc968 SHA256 f859ede7919d34622459e7ac823bc4a515d137692dc07de3f37f04c0556f06ea
-MISC ChangeLog 34163 RMD160 fe660af429f95d1fc8d17c26905d5b7c9a0b4a8b SHA1 c57d5ad6ededca0f729c7d994e01dc8e8f83ef6d SHA256 18c863ddf689086c4a87dfb53c5848bafac24f7be9f7533b773c174c1cac067e
+MISC ChangeLog 34330 RMD160 3e52702f0fb98e8cec5c4934df07c1bb75a07538 SHA1 53bd03338da412c3359d22131833ed0eebc9c51f SHA256 06c07b27b0b6416f4825b3adc419aa340bc55ab735a4ad2be86f98deaf7d3f34
 MISC metadata.xml 220 RMD160 a49072631c03f8ac3685b12169abeef3b34ad3d6 SHA1 9614887db749b0a3c17016da5b3ec0e42b908ad3 SHA256 c893488c84e6da8039f2b473982f03e934ec12f8fe2c1ace770f9e34969db081
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH6aWgr2QksT29OyARAgiZAJ0bXCmH8Zcpy4vXYywxXILddcyi0gCgiNKS
+FxoN8Oa9XZE+O4el2Kg8N8g=
+=Og8f
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/files/gimp-web-browser.patch b/media-gfx/gimp/files/gimp-web-browser.patch
new file mode 100644
index 000000000000..51ef87d2750b
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-web-browser.patch
@@ -0,0 +1,39 @@
+diff -u -r gimp-2.4.5/app/config/gimpguiconfig.c gimp-2.4.5.new/app/config/gimpguiconfig.c
+--- gimp-2.4.5/app/config/gimpguiconfig.c	2007-11-20 10:31:08.000000000 +0100
++++ gimp-2.4.5.new/app/config/gimpguiconfig.c	2008-03-25 14:13:13.000000000 +0100
+@@ -40,7 +40,7 @@
+ #ifdef G_OS_WIN32
+ #  define DEFAULT_WEB_BROWSER      "not used on Windows"
+ #else
+-#  define DEFAULT_WEB_BROWSER      "firefox %s"
++#  define DEFAULT_WEB_BROWSER      "xdg-open %s"
+ #endif
+ 
+ 
+Sólo en gimp-2.4.5.new/app/config: gimpguiconfig.c~
+diff -u -r gimp-2.4.5/docs/gimprc.5.in gimp-2.4.5.new/docs/gimprc.5.in
+--- gimp-2.4.5/docs/gimprc.5.in	2008-01-30 11:45:12.000000000 +0100
++++ gimp-2.4.5.new/docs/gimprc.5.in	2008-03-25 14:13:51.000000000 +0100
+@@ -788,7 +788,7 @@
+ web-browser.
+ 
+ .TP
+-(web-browser "firefox %s")
++(web-browser "xdg-open %s")
+ 
+ Sets the external web browser to be used.  This can be an absolute path or the
+ name of an executable to search for in the user's PATH. If the command
+Sólo en gimp-2.4.5.new/docs: gimprc.5.in~
+diff -u -r gimp-2.4.5/etc/gimprc gimp-2.4.5.new/etc/gimprc
+--- gimp-2.4.5/etc/gimprc	2008-01-30 11:45:12.000000000 +0100
++++ gimp-2.4.5.new/etc/gimprc	2008-03-25 14:14:30.000000000 +0100
+@@ -625,7 +625,7 @@
+ # appended to the command with a space separating the two.  This is a single
+ # filename.
+ # 
+-# (web-browser "firefox %s")
++# (web-browser "xdg-open %s")
+ 
+ # The window type hint that is set on the toolbox. This may affect how your
+ # window manager decorates and handles the toolbox window.  Possible values
+Sólo en gimp-2.4.5.new/etc: gimprc~
diff --git a/media-gfx/gimp/gimp-2.4.5.ebuild b/media-gfx/gimp/gimp-2.4.5.ebuild
index 99a5a69e7ad8..37b57c619c0f 100644
--- a/media-gfx/gimp/gimp-2.4.5.ebuild
+++ b/media-gfx/gimp/gimp-2.4.5.ebuild
@@ -1,6 +1,6 @@
 # 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.4.5.ebuild,v 1.1 2008/03/03 15:00:26 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.5.ebuild,v 1.2 2008/03/26 01:23:33 hanno Exp $
 
 inherit fdo-mime flag-o-matic multilib python eutils autotools
 
@@ -24,6 +24,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
 	sys-libs/zlib
 	dev-libs/libxml2
 	dev-libs/libxslt
+	x11-misc/xdg-utils
 	x11-themes/hicolor-icon-theme
 	aalib? ( media-libs/aalib )
 	alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
@@ -66,6 +67,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}/gimp-web-browser.patch"
 
 	# Workaround for MIME-type, this is fixed in gimp trunk, so we can
 	# remove this with >= 2.5
@@ -96,7 +98,7 @@ src_compile() {
 		$(use_enable doc gtk-doc) \
 		$(use_with dbus) \
 		$(use_with hal) \
-		$(use_with gnome) \
+		$(use_with gnome gnomevfs) \
 		$(use_with gtkhtml gtkhtml2) \
 		--with-libjpeg \
 		$(use_with exif libexif) \