fixes for a couple of bugs

Package-Manager: portage-2.1.2_rc4-r7

6 files changed, 233 insertions, 6 deletions

diff --git a/gnome-extra/nautilus-sendto/ChangeLog b/gnome-extra/nautilus-sendto/ChangeLog
index e1d75922b1d7..f516bd985c3c 100644
--- a/gnome-extra/nautilus-sendto/ChangeLog
+++ b/gnome-extra/nautilus-sendto/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-extra/nautilus-sendto
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.6 2006/12/07 04:24:49 compnerd Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.7 2007/01/10 23:37:18 compnerd Exp $
+
+*nautilus-sendto-0.8-r1 (10 Jan 2007)
+
+  10 Jan 2007; <compnerd@gentoo.org>
+  +files/nautilus-sendto-0.8-claws-mail-plugin.patch,
+  +files/nautilus-sendto-0.8-thunderbird-binaries.patch,
+  +nautilus-sendto-0.8-r1.ebuild:
+  Revision bump to fix thunderbird issue (bug #153146) and claws mail (bug
+  #158361) (patches by myself for thunderbird and Colin Leroy for claws-mail).
 
   07 Dec 2006; Saleem Abdulrasool <compnerd@gentoo.org>
   nautilus-sendto-0.8.ebuild:
diff --git a/gnome-extra/nautilus-sendto/Manifest b/gnome-extra/nautilus-sendto/Manifest
index 43ec23400370..30483ba31e1a 100644
--- a/gnome-extra/nautilus-sendto/Manifest
+++ b/gnome-extra/nautilus-sendto/Manifest
@@ -10,10 +10,18 @@ AUX nautilus-sendto-0.7-gaim-2.0-plugin.patch 931 RMD160 541f678638cd35dfe7a1750
 MD5 353bac34b9035433a925be58bf2273cc files/nautilus-sendto-0.7-gaim-2.0-plugin.patch 931
 RMD160 541f678638cd35dfe7a1750f700a1c4203f6b4e0 files/nautilus-sendto-0.7-gaim-2.0-plugin.patch 931
 SHA256 4e5387e205c6c4de262b2fad6140ff416f508d343c8c8b1d61af8b205827f78f files/nautilus-sendto-0.7-gaim-2.0-plugin.patch 931
+AUX nautilus-sendto-0.8-claws-mail-plugin.patch 1657 RMD160 d0ebb64d53e073118a626f34edb88d9e73db9524 SHA1 2fd3ff370cbc97157d8ada9397c0ed31a65e583e SHA256 167f30f4e2cef174ea21e73258e8efc6921c6972165d40ccd78e0b08c82b28ce
+MD5 43147c86a5571e43703bcb1976f8b663 files/nautilus-sendto-0.8-claws-mail-plugin.patch 1657
+RMD160 d0ebb64d53e073118a626f34edb88d9e73db9524 files/nautilus-sendto-0.8-claws-mail-plugin.patch 1657
+SHA256 167f30f4e2cef174ea21e73258e8efc6921c6972165d40ccd78e0b08c82b28ce files/nautilus-sendto-0.8-claws-mail-plugin.patch 1657
 AUX nautilus-sendto-0.8-gaim-2.0-plugin.patch 308 RMD160 6784c71fb8366474253eece67b4aa3ccd061a776 SHA1 b1d7dbeec631c676d67f83c690473f3dad7b9ca5 SHA256 5760b328f8e827e24f9e828e1fa0dcbd7d56c91e7ef994c1c1dba2368b318284
 MD5 4d3d436ee211fd8fde29407f81a79ebd files/nautilus-sendto-0.8-gaim-2.0-plugin.patch 308
 RMD160 6784c71fb8366474253eece67b4aa3ccd061a776 files/nautilus-sendto-0.8-gaim-2.0-plugin.patch 308
 SHA256 5760b328f8e827e24f9e828e1fa0dcbd7d56c91e7ef994c1c1dba2368b318284 files/nautilus-sendto-0.8-gaim-2.0-plugin.patch 308
+AUX nautilus-sendto-0.8-thunderbird-binaries.patch 850 RMD160 665c7cfa28828a923726ea403c39af908706e149 SHA1 9bcf70571c0f1a0957f8c0e5bf8eef691c2039fe SHA256 67afc9936ceec64f024ac3f735f089246c2905b0a77f17a2969c9645af7adb85
+MD5 d83394bc0535cf1e307c2e8ae31ac68d files/nautilus-sendto-0.8-thunderbird-binaries.patch 850
+RMD160 665c7cfa28828a923726ea403c39af908706e149 files/nautilus-sendto-0.8-thunderbird-binaries.patch 850
+SHA256 67afc9936ceec64f024ac3f735f089246c2905b0a77f17a2969c9645af7adb85 files/nautilus-sendto-0.8-thunderbird-binaries.patch 850
 DIST nautilus-sendto-0.5.tar.bz2 268518 RMD160 588d889fde1dcdac436694f0730e1720d7e10e84 SHA1 d6917e0ff920b6307e023738aa0814c6906134a6 SHA256 63709f0b8dc4c8006c9aa792b2898c3e956cb457b1c49e9e552d2fd1c4df7d38
 DIST nautilus-sendto-0.7.tar.bz2 300584 RMD160 5cc01b9ecb2d4ff38aee1fdeeb589695b1398128 SHA1 a75834d6fd8a134eb430905285c66ea3a737e0b2 SHA256 b182003855b2cf4e1f07b6291bfa1aec0639b3808dec32ae27a1301be0d80a1c
 DIST nautilus-sendto-0.8.tar.bz2 310098 RMD160 46c76f455e42f449c3a3d379d64face106beb557 SHA1 70fcc84a727b95257f3f47e7b3d73c81f8b6e513 SHA256 b046c9993029a0e5cc3976252420e5ba1413fa7174541a10815222a41c522c73
@@ -25,14 +33,18 @@ EBUILD nautilus-sendto-0.7.ebuild 1813 RMD160 e5764a0c7f09eac69614385efe1474d49d
 MD5 204a545f2e98c12e78148fb240f8f955 nautilus-sendto-0.7.ebuild 1813
 RMD160 e5764a0c7f09eac69614385efe1474d49dd6f6ae nautilus-sendto-0.7.ebuild 1813
 SHA256 1f27f207ef856f93e78c524c17a13cc5b0d098129cb339e28adcf5d78697f6d3 nautilus-sendto-0.7.ebuild 1813
+EBUILD nautilus-sendto-0.8-r1.ebuild 2263 RMD160 a32c4be40034cb6c25161278a28e3ec1a5b16600 SHA1 3b3ab098e47e33008e3615d32f3fb1d05d9000bd SHA256 ceaa532ebbcc8a622850c3c4ee7e283717aa905f3f225cef829a76bcffc63917
+MD5 023f1fc1de92df72022224854a12b2c5 nautilus-sendto-0.8-r1.ebuild 2263
+RMD160 a32c4be40034cb6c25161278a28e3ec1a5b16600 nautilus-sendto-0.8-r1.ebuild 2263
+SHA256 ceaa532ebbcc8a622850c3c4ee7e283717aa905f3f225cef829a76bcffc63917 nautilus-sendto-0.8-r1.ebuild 2263
 EBUILD nautilus-sendto-0.8.ebuild 1954 RMD160 11584faaab96bbb2e4abc2ac17a01c94a7120dda SHA1 f93885c05831ca5ea4707492ddfa571e0d5ec07f SHA256 a45438a6954ee3d006ac1fedf58f5cbaeef5904177ac00dfceb2d4834ffc9c61
 MD5 934bd08752359291493da5ce7ddc1ad8 nautilus-sendto-0.8.ebuild 1954
 RMD160 11584faaab96bbb2e4abc2ac17a01c94a7120dda nautilus-sendto-0.8.ebuild 1954
 SHA256 a45438a6954ee3d006ac1fedf58f5cbaeef5904177ac00dfceb2d4834ffc9c61 nautilus-sendto-0.8.ebuild 1954
-MISC ChangeLog 1227 RMD160 eca383730604f6b27a9e7b5dd744ed7f73142285 SHA1 1c745093d2f4b07975805f3f83ce32044f6a4aa8 SHA256 e59171521850793728380092ba07979dbbecf9958bac6f171ef044a521e6d9a1
-MD5 ee0cb85b3c9e96bf5276c650988057d7 ChangeLog 1227
-RMD160 eca383730604f6b27a9e7b5dd744ed7f73142285 ChangeLog 1227
-SHA256 e59171521850793728380092ba07979dbbecf9958bac6f171ef044a521e6d9a1 ChangeLog 1227
+MISC ChangeLog 1603 RMD160 9073af8d3e07de6561599c4781138df860e19fdb SHA1 dcd3ceef45d8b1f8c044e5523544366985ba38ae SHA256 fe62661fa3267ea06538d63b3d9c26813fb20527ebb42ac39023bbe9057613ed
+MD5 7205f59f84a44ac8318d88ea2b84a62e ChangeLog 1603
+RMD160 9073af8d3e07de6561599c4781138df860e19fdb ChangeLog 1603
+SHA256 fe62661fa3267ea06538d63b3d9c26813fb20527ebb42ac39023bbe9057613ed ChangeLog 1603
 MISC metadata.xml 311 RMD160 868d0eab62db916aa47b7f440a3f4efecc6163b1 SHA1 0e56da7be32af7c553c07179c574cd7837298702 SHA256 774cc71e08a317563fb2700d5aac76af10e3e31ae7c1c58325730bfa0fbb110a
 MD5 def57195a8a8fbc9ff84bded4f4c6772 metadata.xml 311
 RMD160 868d0eab62db916aa47b7f440a3f4efecc6163b1 metadata.xml 311
@@ -46,3 +58,6 @@ SHA256 2c18247c115e26cde29e455b526cd494c7ea2170c5367f9e01c64aa9460e6311 files/di
 MD5 3eb361530f754a6c25cf4ffb97023216 files/digest-nautilus-sendto-0.8 262
 RMD160 c63c72445346d41a9b1fc11c6e9d87006ddfa67c files/digest-nautilus-sendto-0.8 262
 SHA256 140d0f2c21e7dcb6a00ddbbacfc0ce5799cafe69d0f18e4b7a1273f63f36c2b7 files/digest-nautilus-sendto-0.8 262
+MD5 3eb361530f754a6c25cf4ffb97023216 files/digest-nautilus-sendto-0.8-r1 262
+RMD160 c63c72445346d41a9b1fc11c6e9d87006ddfa67c files/digest-nautilus-sendto-0.8-r1 262
+SHA256 140d0f2c21e7dcb6a00ddbbacfc0ce5799cafe69d0f18e4b7a1273f63f36c2b7 files/digest-nautilus-sendto-0.8-r1 262
diff --git a/gnome-extra/nautilus-sendto/files/digest-nautilus-sendto-0.8-r1 b/gnome-extra/nautilus-sendto/files/digest-nautilus-sendto-0.8-r1
new file mode 100644
index 000000000000..2b9e6b6cd1f3
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/files/digest-nautilus-sendto-0.8-r1
@@ -0,0 +1,3 @@
+MD5 19165c7404c4956efd4366a8ebe3ddfa nautilus-sendto-0.8.tar.bz2 310098
+RMD160 46c76f455e42f449c3a3d379d64face106beb557 nautilus-sendto-0.8.tar.bz2 310098
+SHA256 b046c9993029a0e5cc3976252420e5ba1413fa7174541a10815222a41c522c73 nautilus-sendto-0.8.tar.bz2 310098
diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.8-claws-mail-plugin.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.8-claws-mail-plugin.patch
new file mode 100644
index 000000000000..a9a20a9d4aae
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.8-claws-mail-plugin.patch
@@ -0,0 +1,73 @@
+Index: src/plugins/sylpheed-claws.c
+===================================================================
+--- src/plugins/sylpheed-claws.c	(revision 182)
++++ src/plugins/sylpheed-claws.c	(working copy)
+@@ -27,6 +27,25 @@
+ 
+ static GHashTable *hash = NULL;
+ 
++static const gchar *possible_binaries[] = 
++{	"claws-mail",
++	"sylpheed-claws-gtk2",
++	"sylpheed-claws",
++	"sylpheed"
++};
++
++static gchar *get_claws_command(void)
++{
++	gchar *cmd = NULL;
++	gint i;
++
++	for (i = 0; cmd == NULL && i < G_N_ELEMENTS(possible_binaries); i++) {
++		cmd = g_find_program_in_path (possible_binaries[i]);
++	}
++
++	return cmd;
++}
++
+ static 
+ gboolean init (NstPlugin *plugin)
+ {
+@@ -35,16 +54,13 @@
+ 	printf ("Init sylpheed-claws plugin\n");
+ 	hash = g_hash_table_new (g_str_hash, g_str_equal);
+ 
+-	sc_cmd = g_find_program_in_path ("sylpheed-claws-gtk2");
+-	if (sc_cmd == NULL){
+-		sc_cmd = g_find_program_in_path ("sylpheed-claws");
+-		if (sc_cmd == NULL)
+-			sc_cmd = g_find_program_in_path ("sylpheed");
+-	}
++	sc_cmd = get_claws_command();
+ 	
+ 	if(sc_cmd == NULL)
+ 		return FALSE;
+ 
++	g_free(sc_cmd);
++
+ 	return TRUE;
+ }
+ 
+@@ -80,12 +96,7 @@
+ 		g_string_append_printf (mailto, "%s", send_to);		
+ 	}
+ 	
+-	sc_cmd = g_find_program_in_path ("sylpheed-claws-gtk2");
+-	if (sc_cmd == NULL){
+-		sc_cmd = g_find_program_in_path ("sylpheed-claws");
+-		if (sc_cmd == NULL)
+-			sc_cmd = g_find_program_in_path ("sylpheed");
+-	}
++	sc_cmd = get_claws_command();
+ 	
+ 	if(sc_cmd == NULL)
+ 		return FALSE;
+@@ -116,7 +127,7 @@
+ NstPluginInfo plugin_info = {
+ 	"stock_mail",
+ 	"sylpheed-claws",
+-	N_("Email (Sylpheed-Claws)"),
++	N_("Email (Claws Mail)"),
+ 	FALSE,
+ 	init,
+ 	get_contacts_widget,
diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.8-thunderbird-binaries.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.8-thunderbird-binaries.patch
new file mode 100644
index 000000000000..a2e2c926f2f9
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.8-thunderbird-binaries.patch
@@ -0,0 +1,39 @@
+--- src/plugins/thunderbird.c	2007-01-10 17:04:06.000000000 -0600
++++ src/plugins/thunderbird.c	2007-01-10 17:09:02.000000000 -0600
+@@ -27,6 +27,23 @@
+ 
+ static GHashTable *hash = NULL;
+ 
++static const gchar const *possible_binaries[] =
++{
++   "thunderbird",
++   "mozilla-thunderbird",
++};
++
++static gchar *get_thunderbird_command(void)
++{
++   gchar *cmd = NULL;
++   gint i;
++
++   for (i = 0; cmd == NULL && i < G_N_ELEMENTS(possible_binaries); i++)
++      cmd = g_find_program_in_path(possible_binaries[i]);
++
++   return cmd;
++}
++
+ static 
+ gboolean init (NstPlugin *plugin)
+ {
+@@ -35,9 +52,11 @@
+ 	printf ("Init thunderbird plugin\n");
+ 	hash = g_hash_table_new (g_str_hash, g_str_equal);
+ 
+-	t_cmd = g_find_program_in_path ("mozilla-thunderbird");
++	t_cmd = get_thunderbird_command();
++
+ 	if (t_cmd == NULL)
+ 		return FALSE;
++
+ 	return TRUE;
+ }
+ 
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-0.8-r1.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-0.8-r1.ebuild
new file mode 100644
index 000000000000..da9bf41d6b06
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-0.8-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-0.8-r1.ebuild,v 1.1 2007/01/10 23:37:18 compnerd Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit gnome2 eutils autotools
+
+DESCRIPTION="A nautilus extension for sending files to locations"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~sparc ~x86"
+IUSE="bluetooth eds gaim gajim sylpheed thunderbird"
+
+RDEPEND=">=x11-libs/gtk+-2.4
+		 >=dev-libs/glib-2.4
+		 >=gnome-base/libglade-2.5.1
+		 >=gnome-base/libbonobo-2.13.0
+		 >=gnome-base/libbonoboui-2.13.0
+		 >=gnome-base/libgnome-2.13.0
+		 >=gnome-base/libgnomeui-2.13.0
+		 >=gnome-base/nautilus-2.13.3
+		 >=gnome-base/gconf-2.13.0
+		 ||	(
+				>=dev-libs/dbus-glib-0.71
+				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.60 )
+			)
+		 bluetooth? ( >=net-wireless/gnome-bluetooth-0.6 )
+		 eds? ( >=gnome-extra/evolution-data-server-1.5.3 )
+		 gaim? ( net-im/gaim )
+		 gajim? ( net-im/gajim )
+		 sylpheed?	( ||	(
+								mail-client/sylpheed
+								mail-client/claws-mail
+								mail-client/sylpheed-claws
+							)
+					)
+		 thunderbird? ( mail-client/mozilla-thunderbird )"
+DEPEND="${RDEPEND}
+		  sys-devel/gettext
+		>=dev-util/pkgconfig-0.19
+		>=dev-util/intltool-0.35"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF} \
+			$(use_enable bluetooth) \
+			$(use_enable eds evolution) \
+			$(use_enable gaim) \
+			$(use_enable gajim) \
+			$(use_enable sylpheed) \
+			$(use_enable thunderbird)"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Convert autodetection into hard options
+	epatch ${FILESDIR}/${PN}-0.7-configure-options.patch
+
+	# Add support for gaim 2.0
+	if has_version '=net-im/gaim-2*' ; then
+		epatch ${FILESDIR}/${PN}-0.8-gaim-2.0-plugin.patch
+	fi
+
+	# Fix claws-mail support
+	epatch ${FILESDIR}/${PN}-0.8-claws-mail-plugin.patch
+
+	# Fix thunderbird support
+	epatch ${FILESDIR}/${PN}-0.8-thunderbird-binaries.patch
+
+	# Oh the joys of autotools
+	eautoreconf
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if use gaim ; then
+		einfo "To enable SendTo support in GAIM, you must enable the plugin in GAIM"
+		einfo "Check Tools -> Preferences -> Plugins in the GAIM menu."
+	fi
+}