Version bump. Fix long descriptions, bug #271100. Clean up old revisions.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

8 files changed, 145 insertions, 407 deletions

diff --git a/gnome-extra/nautilus-sendto/ChangeLog b/gnome-extra/nautilus-sendto/ChangeLog
index ccb16ccd99ea..2a0b736a9e2d 100644
--- a/gnome-extra/nautilus-sendto/ChangeLog
+++ b/gnome-extra/nautilus-sendto/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for gnome-extra/nautilus-sendto
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.27 2009/05/11 11:12:48 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.28 2009/08/02 22:30:59 eva Exp $
+
+*nautilus-sendto-1.1.5-r1 (02 Aug 2009)
+
+  02 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/nautilus-sendto-0.8-thunderbird-binaries.patch,
+  -nautilus-sendto-0.12-r1.ebuild,
+  -files/nautilus-sendto-0.12-configure-options.patch,
+  -files/nautilus-sendto-0.12-debug-statements.patch,
+  -nautilus-sendto-1.1.2.ebuild,
+  -files/nautilus-sendto-1.1.2-pidgin-plugin-versioning.patch,
+  +nautilus-sendto-1.1.5-r1.ebuild,
+  +files/nautilus-sendto-1.1.5-long-description.patch:
+  Version bump. Fix long descriptions, bug #271100. Clean up old revisions.
 
 *nautilus-sendto-1.1.5 (11 May 2009)
 
diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.12-configure-options.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.12-configure-options.patch
deleted file mode 100644
index e74d1efb8ab5..000000000000
--- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.12-configure-options.patch
+++ /dev/null
@@ -1,218 +0,0 @@
---- configure.in	2007-08-13 08:30:27.000000000 -0700
-+++ configure.in.orig	2007-08-28 20:22:36.000000000 -0700
-@@ -63,79 +63,76 @@
- dnl Libebook support
- dnl ---------------------------------
- 
--PKG_CHECK_MODULES(NST_EBOOK, libebook-1.2 >= $EBOOK_REQUIRED,
--	[
--	AC_SUBST(NST_EBOOK_CFLAGS)
--	AC_SUBST(NST_EBOOK_LIBS)
--	echo "Using libebook-1.2 !"
--	enable_evolution=yes
--	],
--	[
--        echo "Building without evolution"
--	enable_evolution=no
--	]
--)
-+AC_ARG_ENABLE([evolution],
-+              AC_HELP_STRING([--enable-evolution], [enable support for evolution]),,
-+              [enable_evolution=no])
-+
-+if test x$enable_evolution = xyes ; then
-+   PKG_CHECK_MODULES(NST_EBOOK, [libebook-1.2 >= $EBOOK_REQUIRED])
-+
-+   AC_SUBST([NST_EBOOK_CFLAGS])
-+   AC_SUBST([NST_EBOOK_LIBS])
-+fi
- 
- AM_CONDITIONAL(HAVE_EVOLUTION, test "x$enable_evolution" = "xyes")
- 
--dnl Gaim support if it's installed
-+dnl Gaim support
- dnl ---------------------------------
- 
-+AC_ARG_ENABLE([gaim],
-+              AC_HELP_STRING([--enable-gaim], [enable support for gaim]),,
-+              [enable_gaim=no])
-+
-+if test x$enable_gaim = xyes ; then
-+   PKG_CHECK_MODULES(GAIM, [gaim >= $GAIM_REQUIRED])
- 
--PKG_CHECK_MODULES(GAIM, gaim >= $GAIM_REQUIRED,
--	[
--	AC_SUBST(GAIM_CFLAGS)
--	AC_SUBST(GAIM_LIBS)
--	GAIM_LIBDIR=`pkg-config --variable=libdir gaim`
--	GAIM_DATADIR=`pkg-config --variable=datadir gaim`
--	AC_SUBST(GAIM_LIBDIR)
--	AC_SUBST(GAIM_DATADIR)
--	enable_gaim=yes
--	],
--	[
--	echo "Building without gaim"
--	enable_gaim=no
--	]
--)
-+   AC_SUBST([GAIM_CFLAGS])
-+   AC_SUBST([GAIM_LIBS])
-+
-+   GAIM_LIBDIR=`pkg-config --variable=libdir gaim`
-+   GAIM_DATADIR=`pkg-config --variable=datadir gaim`
-+
-+   AC_SUBST([GAIM_LIBDIR])
-+   AC_SUBST([GAIM_DATADIR])
-+fi
- 
- AM_CONDITIONAL(HAVE_GAIM, test "x$enable_gaim" = "xyes")
- 
--dnl Pidgin support if it's installed
-+dnl Pidgin support
- dnl ---------------------------------
- 
-+AC_ARG_ENABLE([pidgin],
-+              AC_HELP_STRING([--enable-pidgin], [enable support for pidgin]),,
-+              [enable_pidgin=no])
-+
-+if test x$enable_pidgin = xyes ; then
-+   PKG_CHECK_MODULES(PIDGIN, [pidgin >= $PIDGIN_REQUIRED purple >= $PIDGIN_REQUIRED])
- 
--PKG_CHECK_MODULES(PIDGIN, pidgin >= $PIDGIN_REQUIRED purple >= $PIDGIN_REQUIRED,
--	[
--	AC_SUBST(PIDGIN_CFLAGS)
--	AC_SUBST(PIDGIN_LIBS)
--	PIDGIN_LIBDIR=`pkg-config --variable=libdir purple`
--	PIDGIN_DATADIR=`pkg-config --variable=datadir purple`
--	AC_SUBST(PIDGIN_LIBDIR)
--	AC_SUBST(PIDGIN_DATADIR)
--	enable_pidgin=yes
--	],
--	[
--	echo "Building without pidgin"
--	enable_pidgin=no
--	]
--)
-+   AC_SUBST([PIDGIN_CFLAGS])
-+   AC_SUBST([PIDGIN_LIBS])
-+
-+   PIDGIN_LIBDIR=`pkg-config --variable=libdir purple`
-+   PIDGIN_DATADIR=`pkg-config --variable=datadir purple`
-+
-+   AC_SUBST([PIDGIN_LIBDIR])
-+   AC_SUBST([PIDGIN_DATADIR])
-+fi
- 
- AM_CONDITIONAL(HAVE_PIDGIN, test "x$enable_pidgin" = "xyes")
- 
--dnl Bluetooth support if it's installed
-+dnl Bluetooth support
- dnl -----------------------------------
- 
--PKG_CHECK_MODULES(BLUETOOTH, dbus-glib-1 >= $DBUS_REQUIRED,
--	[
--	AC_SUBST(BLUETOOTH_CFLAGS)
--	AC_SUBST(BLUETOOTH_LIBS)
--	enable_bluetooth=yes
--	],
--	[
--	echo "Building without Bluetooth"
--	enable_bluetooth=no
--	]
--)
-+AC_ARG_ENABLE([bluetooth],
-+              AC_HELP_STRING([--enable-bluetooth], [enable support for bluetooth]),,
-+              [enable_bluetooth=no])
-+
-+if test x$enable_bluetooth = xyes ; then
-+   PKG_CHECK_MODULES(BLUETOOTH, [dbus-glib-1 >= $DBUS_REQUIRED])
-+
-+   AC_SUBST([BLUETOOTH_CFLAGS])
-+   AC_SUBST([BLUETOOTH_LIBS])
-+fi
- 
- AM_CONDITIONAL(HAVE_BLUETOOTH, test "x$enable_bluetooth" = "xyes")
- 
-@@ -147,7 +144,9 @@
- dnl Balsa support
- dnl -------------------------------------------------
- 
--enable_balsa=no
-+AC_ARG_ENABLE([balsa],
-+              AC_HELP_STRING([--enable-balsa], [enable support for balsa]),,
-+              [enable_balsa=no])
- AM_CONDITIONAL(HAVE_BALSA, test "x$enable_balsa" = "xyes")
- dnl -------------------------------------------------
- 
-@@ -155,7 +154,9 @@
- dnl Sylpheed support
- dnl -------------------------------------------------
- 
--enable_sylpheed=yes
-+AC_ARG_ENABLE([sylpheed],
-+              AC_HELP_STRING([--enable-sylpheed], [enable support for sylpheed]),,
-+              [enable_sylpheed=no])
- AM_CONDITIONAL(HAVE_SYLPHEED, test "x$enable_sylpheed" = "xyes")
- dnl -------------------------------------------------
- 
-@@ -163,37 +164,35 @@
- dnl Thunderbird support
- dnl -------------------------------------------------
- 
--enable_thunderbird=no
-+AC_ARG_ENABLE([thunderbird],
-+              AC_HELP_STRING([--enable-thunderbird], [enable support for thunderbird]),,
-+              [enable_thunderbird=no])
- AM_CONDITIONAL(HAVE_THUNDERBIRD, test "x$enable_thunderbird" = "xyes")
- dnl -------------------------------------------------
- 
- dnl Gajim support
- dnl -------------------------------------------------
- 
--AC_ARG_WITH(gajim,
--        [AS_HELP_STRING(--with-gajim,[Path to Gajim install prefix])],
--        [GAJIM_PATH="$withval"],[GAJIM_PATH="$prefix"])
--
--GAJIM_SHARE_DIR="$GAJIM_PATH"/share/gajim
--
--PKG_CHECK_MODULES(DBUS, dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED,
--        [
--        AC_SUBST(DBUS_CFLAGS)
--        AC_SUBST(DBUS_LIBS)
--	if test -f "$GAJIM_SHARE_DIR"/data/pixmaps/gajim.png ;
--	then
--		enable_gajim=yes
--		AC_DEFINE_UNQUOTED(GAJIM_SHARE_DIR, "$GAJIM_SHARE_DIR", [path to gajim share dir])
--	else
--		echo "Building without Gajim support"
--		enable_gajim=no
--	fi
--        ],
--        [
--        echo "Building without Gajim support"
--        enable_gajim=no
--        ]
--)
-+AC_ARG_ENABLE([gajim],
-+              AC_HELP_STRING([--enable-gajim], [enable support for gajim]),,
-+              [enable_gajim=no])
-+
-+if test x$enable_gajim = xyes ; then
-+   AC_ARG_WITH(gajim,
-+               AC_HELP_STRING([--with-gajim], [Path to Gajim install prefix]),
-+               [GAJIM_PATH="$withval"], [GAJIM_PATH="$prefix"])
-+
-+   GAJIM_SHARE_DIR="$GAJIM_PATH"/share/gajim
-+
-+   if test -f "$GAJIM_SHARE_DIR"/data/pixmaps/gajim.png ; then
-+      enable_gajim=yes
-+      AC_DEFINE_UNQUOTED(GAJIM_SHARE_DIR, "$GAJIM_SHARE_DIR", [path to gajim share dir])
-+
-+      PKG_CHECK_MODULES(DBUS, [dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED])
-+   else
-+      enable_gajim=no
-+   fi
-+fi
- 
- AM_CONDITIONAL(HAVE_GAJIM, test "x$enable_gajim" = "xyes")
- 
diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.12-debug-statements.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.12-debug-statements.patch
deleted file mode 100644
index 0f8c25643117..000000000000
--- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.12-debug-statements.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- pidgin_plugin/nautilus-sendto-plugin.c.orig	2007-08-29 22:10:10.000000000 -0700
-+++ pidgin_plugin/nautilus-sendto-plugin.c	2007-08-29 22:10:26.000000000 -0700
-@@ -123,10 +123,10 @@
- 	    fclose (fd);
- 	    g_string_free (buddies_str, TRUE);
- 	    buddies_str = str;
--	    gaim_debug_info ("nautilus", "save blist online\n");
-+	    purple_debug_info ("nautilus", "save blist online\n");
- 	}else{
- 	    g_string_free (str, TRUE);
--	    gaim_debug_info ("nautilus", "don't save blist online. No change\n");
-+	    purple_debug_info ("nautilus", "don't save blist online. No change\n");
- 	}
- 	g_free (fd_name);
-     }else{
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
deleted file mode 100644
index a2e2c926f2f9..000000000000
--- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.8-thunderbird-binaries.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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/files/nautilus-sendto-1.1.2-pidgin-plugin-versioning.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-1.1.2-pidgin-plugin-versioning.patch
deleted file mode 100644
index 373a08b0bc00..000000000000
--- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-1.1.2-pidgin-plugin-versioning.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur nautilus-sendto-1.1.1.orig/pidgin_plugin/Makefile.am nautilus-sendto-1.1.1/pidgin_plugin/Makefile.am
---- nautilus-sendto-1.1.1.orig/pidgin_plugin/Makefile.am	2007-08-13 19:43:56.000000000 +0530
-+++ nautilus-sendto-1.1.1/pidgin_plugin/Makefile.am	2009-01-27 21:57:33.305925162 +0530
-@@ -6,7 +6,8 @@
- nautilus_la_LDFLAGS = -module -avoid-version
- 
- AM_CPPFLAGS = 					\
-+	-DVERSION=\"$(VERSION)\"		\
- 	-DLIBDIR=\"$(PIDGIN_LIBDIR)/pidgin/\" 	\
--	-DDATADIR=\"$(PIDGIN_DATADIR)\" 		\
-+	-DDATADIR=\"$(PIDGIN_DATADIR)\" 	\
- 	$(NAUTILUS_SENDTO_CFLAGS)		\
- 	$(PIDGIN_CFLAGS)
-diff -Naur nautilus-sendto-1.1.1.orig/pidgin_plugin/nautilus-sendto-plugin.c nautilus-sendto-1.1.1/pidgin_plugin/nautilus-sendto-plugin.c
---- nautilus-sendto-1.1.1.orig/pidgin_plugin/nautilus-sendto-plugin.c	2008-05-28 23:26:56.000000000 +0530
-+++ nautilus-sendto-1.1.1/pidgin_plugin/nautilus-sendto-plugin.c	2009-01-27 21:56:40.273925445 +0530
-@@ -329,7 +329,7 @@
- 
-     "gtk-nautilus",			/* id */
-     N_("Nautilus Integration"),		/* name */
--    "0.8",				/* version */
-+    VERSION,				/* version */
-     N_("Provides integration with Nautilus"),		/* summary */ 
-     N_("Provides integration with Nautilus"),		/* description */
- 
diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-1.1.5-long-description.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-1.1.5-long-description.patch
new file mode 100644
index 000000000000..70f8eca38c1e
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/files/nautilus-sendto-1.1.5-long-description.patch
@@ -0,0 +1,99 @@
+From 9499b437dc43de780001d759db46a22503fa5020 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 19 May 2009 11:51:48 +0000
+Subject: Bug 582924 – Fix UI with long plugin descriptions
+
+- Ellipsise the plugin descriptions to avoid them resizing the
+  combo box bizarrely
+- Make the dialogue resizeable
+- Fix plugin loading for the uninstalled case
+- Use a GtkListStore instead of a GtkTreeStore
+---
+diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c
+index 2b396ce..8171509 100644
+--- a/src/nautilus-sendto-command.c
++++ b/src/nautilus-sendto-command.c
+@@ -36,9 +36,15 @@
+ #define NAUTILUS_SENDTO_LAST_COMPRESS	NAUTILUS_SENDTO_GCONF"/last_compress"
+ #define NAUTILUS_SENDTO_STATUS_LABEL_TIMEOUT_SECONDS 10
+ 
+-#define UNINSTALLED_PLUGINDIR "plugins/sylpheed-claws"
++#define UNINSTALLED_PLUGINDIR "plugins/removable-devices"
+ #define UNINSTALLED_SOURCE "nautilus-sendto-command.c"
+ 
++enum {
++	COLUMN_ICON,
++	COLUMN_DESCRIPTION,
++	NUM_COLUMNS,
++};
++
+ /* Options */
+ static char **filenames = NULL;
+ 
+@@ -418,7 +424,7 @@ set_model_for_options_combobox (NS_ui *ui)
+ {
+ 	GdkPixbuf *pixbuf;
+         GtkTreeIter iter;
+-        GtkTreeStore *model;
++        GtkListStore *model;
+ 	GtkIconTheme *it;
+ 	GtkCellRenderer *renderer;
+ 	GList *aux;
+@@ -429,7 +435,7 @@ set_model_for_options_combobox (NS_ui *ui)
+ 
+ 	it = gtk_icon_theme_get_default ();
+ 
+-	model = gtk_tree_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING);
++	model = gtk_list_store_new (NUM_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING);
+ 
+ 	last_used = gconf_client_get_string (gconf_client,
+ 			NAUTILUS_SENDTO_LAST_MEDIUM, NULL);
+@@ -438,10 +444,10 @@ set_model_for_options_combobox (NS_ui *ui)
+ 		p = (NstPlugin *) aux->data;
+ 		pixbuf = gtk_icon_theme_load_icon (it, p->info->icon, 16, 
+ 						   GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
+-		gtk_tree_store_append (model, &iter, NULL);
+-		gtk_tree_store_set (model, &iter,
+-					0, pixbuf,
+-					1, _(p->info->description),
++		gtk_list_store_append (model, &iter);
++		gtk_list_store_set (model, &iter,
++					COLUMN_ICON, pixbuf,
++					COLUMN_DESCRIPTION, _(p->info->description),
+ 					-1);
+ 		if (last_used != NULL && !strcmp(last_used, p->info->id)) {
+ 			option = i;
+@@ -459,15 +465,16 @@ set_model_for_options_combobox (NS_ui *ui)
+                                     FALSE);
+         gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (ui->options_combobox), 
+ 					renderer,
+-                                        "pixbuf", 0,
++                                        "pixbuf", COLUMN_ICON,
+                                         NULL);		
+         renderer = gtk_cell_renderer_text_new ();
++        g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+         gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (ui->options_combobox),
+                                     renderer,
+                                     TRUE);
+         gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (ui->options_combobox), 
+ 					renderer,
+-                                        "text", 1,
++                                        "text", COLUMN_DESCRIPTION,
+                                         NULL);
+ 
+ 	g_signal_connect (G_OBJECT (ui->options_combobox), "changed",
+diff --git a/src/nautilus-sendto.glade b/src/nautilus-sendto.glade
+index ee29663..6f26a6a 100644
+--- a/src/nautilus-sendto.glade
++++ b/src/nautilus-sendto.glade
+@@ -11,7 +11,7 @@
+   <property name="type">GTK_WINDOW_TOPLEVEL</property>
+   <property name="window_position">GTK_WIN_POS_CENTER</property>
+   <property name="modal">False</property>
+-  <property name="resizable">False</property>
++  <property name="resizable">True</property>
+   <property name="destroy_with_parent">False</property>
+   <property name="decorated">True</property>
+   <property name="skip_taskbar_hint">False</property>
+--
+cgit v0.8.2
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-0.12-r1.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-0.12-r1.ebuild
deleted file mode 100644
index f83b70016013..000000000000
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-0.12-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2008 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.12-r1.ebuild,v 1.5 2008/01/09 14:21:32 eva Exp $
-
-inherit gnome2 eutils autotools
-
-DESCRIPTION="A nautilus extension for sending files to locations"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="bluetooth eds gajim pidgin sylpheed thunderbird"
-
-RDEPEND=">=x11-libs/gtk+-2.4
-	>=dev-libs/glib-2.6
-	>=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
-	bluetooth? ( >=net-wireless/gnome-bluetooth-0.6 )
-	eds? ( >=gnome-extra/evolution-data-server-1.5.3 )
-	gajim? ( net-im/gajim )
-	pidgin? ( >=net-im/pidgin-2.0.0 )
-	sylpheed? ( || (
-		mail-client/sylpheed
-		mail-client/claws-mail
-	) )
-	thunderbird? ( mail-client/mozilla-thunderbird )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=gnome-base/gnome-common-0.12
-	>=dev-util/pkgconfig-0.19
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-gaim
-		$(use_enable bluetooth)
-		$(use_enable eds evolution)
-		$(use_enable pidgin)
-		$(use_enable gajim)
-		$(use_enable sylpheed)
-		$(use_enable thunderbird)"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Convert autodetection into hard options
-	epatch "${FILESDIR}"/${PN}-0.12-configure-options.patch
-
-	# Fix thunderbird support
-	epatch "${FILESDIR}"/${PN}-0.8-thunderbird-binaries.patch
-
-	# Fix debug statements for pidgin plugin
-	epatch "${FILESDIR}"/${PN}-0.12-debug-statements.patch
-
-	# Fix plugin versioning for pidgin plugin
-	epatch "${FILESDIR}"/${PN}-0.12-pidgin-plugin-versioning.patch
-
-	# Fix tests
-	echo "pidgin_plugin/nautilus-sendto-plugin.c" >> po/POTFILES.in
-	echo "src/plugins/pidgin.c" >> po/POTFILES.in
-
-	# Oh the joys of autotools
-	eautoreconf
-	intltoolize --force || die "intltoolize force"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use pidgin; then
-		elog "To enable SendTo support in pidgin, you must enable the plugin in pidgin"
-		elog "Check Tools -> Preferences -> Plugins in the pidgin menu."
-	fi
-}
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.2.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.5-r1.ebuild
index 70f42391e28b..7fba3109b646 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.2.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.5-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.2.ebuild,v 1.4 2009/05/11 11:12:48 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.5-r1.ebuild,v 1.1 2009/08/02 22:30:59 eva Exp $
+
+EAPI="2"
 
 inherit gnome2 eutils autotools
 
@@ -10,33 +12,31 @@ HOMEPAGE="http://www.gnome.org"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="balsa bluetooth claws eds gajim pidgin sylpheed thunderbird upnp"
+IUSE="bluetooth +mail empathy gajim cdr pidgin upnp"
 
-RDEPEND=">=x11-libs/gtk+-2.4
+RDEPEND=">=x11-libs/gtk+-2.12
 	>=dev-libs/glib-2.6
 	>=gnome-base/libglade-2.5.1
 	>=gnome-base/nautilus-2.14
 	>=gnome-base/gconf-2.13.0
-	balsa? ( mail-client/balsa )
 	bluetooth? (
-		>=net-wireless/bluez-gnome-1.8
+		|| ( >=net-wireless/gnome-bluetooth-2.27
+			 >=net-wireless/bluez-gnome-1.8 )
 		>=dev-libs/dbus-glib-0.60 )
-	eds? ( >=gnome-extra/evolution-data-server-1.5.3 )
+	cdr? (
+		|| ( >=app-cdr/brasero-2.26.0[nautilus]
+			 >=gnome-extra/nautilus-cd-burner-2.24.0 ) )
+	mail? ( >=gnome-extra/evolution-data-server-1.5.3 )
+	empathy? ( >=net-im/empathy-2.25.5 )
 	gajim? ( net-im/gajim
 			 >=dev-libs/dbus-glib-0.60 )
 	pidgin? ( >=net-im/pidgin-2.0.0 )
-	sylpheed?  ( mail-client/sylpheed )
-	claws? ( mail-client/claws-mail	)
-	thunderbird? (
-		|| ( mail-client/mozilla-thunderbird
-			 mail-client/mozilla-thunderbird-bin ) )
-	upnp? ( >=net-libs/gupnp-av-0.2.1 )
-"
+	upnp? ( >=net-libs/gupnp-av-0.2.1 )"
 DEPEND="${RDEPEND}
-		sys-devel/gettext
-		>=gnome-base/gnome-common-0.12
-		>=dev-util/pkgconfig-0.19
-		>=dev-util/intltool-0.35"
+	sys-devel/gettext
+	>=gnome-base/gnome-common-0.12
+	>=dev-util/pkgconfig-0.19
+	>=dev-util/intltool-0.35"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
@@ -47,29 +47,36 @@ _use_plugin() {
 }
 
 pkg_setup() {
-	G2CONF="${G2CONF} --with-plugins="
+	G2CONF="${G2CONF} --with-plugins=removable-devices,"
 	_use_plugin bluetooth
-	_use_plugin eds evolution
+	_use_plugin cdr nautilus-burn
+	_use_plugin mail evolution
+	_use_plugin empathy
 	_use_plugin pidgin
 	_use_plugin gajim
-	_use_plugin claws sylpheed-claws
-	_use_plugin sylpheed sylpheed-claws
-	_use_plugin thunderbird
 	_use_plugin upnp
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	gnome2_src_prepare
 
 	# Fix plugin versioning for pidgin plugin
 	epatch "${FILESDIR}"/${P}-pidgin-plugin-versioning.patch
+
+	# Fix long description for plugins, bug #271100
+	epatch "${FILESDIR}/${P}-long-description.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }
 
 pkg_postinst() {
 	gnome2_pkg_postinst
 
+	if ! use mail; then
+		ewarn "You have disabled mail support, this will remove support for all mail clients"
+	fi
+
 	if use pidgin; then
 		elog "To enable SendTo support in pidgin, you must enable the plugin in pidgin"
 		elog "Check Tools -> Preferences -> Plugins in the pidgin menu."