Clean up leftovers.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

9 files changed, 29 insertions, 420 deletions

diff --git a/gnome-extra/nautilus-sendto/ChangeLog b/gnome-extra/nautilus-sendto/ChangeLog
index 2c238d426984..33dc007091f3 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.32 2010/01/11 22:35:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.33 2010/01/11 22:46:20 eva Exp $
+
+  11 Jan 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/nautilus-sendto-0.12-pidgin-plugin-versioning.patch,
+  -files/nautilus-sendto-0.14-configure-options.patch,
+  -files/nautilus-sendto-1.1.5-long-description.patch,
+  -files/nautilus-sendto-1.1.5-pidgin-plugin-versioning.patch,
+  nautilus-sendto-2.28.0.ebuild, nautilus-sendto-2.28.2.ebuild,
+  metadata.xml:
+  Clean up leftovers.
 
 *nautilus-sendto-2.28.2 (11 Jan 2010)
 
diff --git a/gnome-extra/nautilus-sendto/Manifest b/gnome-extra/nautilus-sendto/Manifest
index 933bb23e9537..486c3b47d4a9 100644
--- a/gnome-extra/nautilus-sendto/Manifest
+++ b/gnome-extra/nautilus-sendto/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX nautilus-sendto-0.12-pidgin-plugin-versioning.patch 833 RMD160 0d4df889e48a0c42da3b25994a1e6e7d687cf285 SHA1 ded905aad8a6425748428236ec69c4c5cdd0de08 SHA256 579919a85f514749ef679ab1102bc45944389becbc77cd386d8ade339be39c14
-AUX nautilus-sendto-0.14-configure-options.patch 7201 RMD160 9f0f2957b9478525df7327b0eeae8ea17e685f9d SHA1 43eb6a818453bd0c8bb6a83e532c5c235322dc33 SHA256 5004e981d2916ed89698b8faec319b98b0b4292ef94f2e3a342fc7081bd1d192
-AUX nautilus-sendto-1.1.5-long-description.patch 3834 RMD160 0ea619b7907fc808a291cd1e6662ba14fb3d42e3 SHA1 e82cb4ded69edf7aaa1434d95519e5ea383ae3fd SHA256 f2f0f2757de3d9565cb9de55f580b0e45e3c0c2f2d1e44633f289de0c4c80a07
-AUX nautilus-sendto-1.1.5-pidgin-plugin-versioning.patch 1147 RMD160 91326f8a21590f62d23d3f4561685e360ec4ccfc SHA1 33970503e31864a80b99da74694a2ef67db3e7fa SHA256 89016515e82a8b846333348c0fe0c7c8308ed5ab24e8a9eaa6e35de1f6a6ada4
 DIST nautilus-sendto-2.28.0.tar.bz2 401389 RMD160 f26925454bf53f5638395f8db6568c6ec6b90ac9 SHA1 9c102c3d8d9b6f9ee76cebf49d479937e6efbc78 SHA256 3f15fbe5c1cfc5bcadc39d47048ddae0dd0581a7494f365c5e531a2f3e77193c
 DIST nautilus-sendto-2.28.2.tar.bz2 423429 RMD160 1b78f89d85f30bc3542aa960abd732f57150c6c0 SHA1 9ca70f8e8bcfcff68e40fceae3e3a2c3aab71369 SHA256 0fa992b9a4489b712465e82eb182db3eaea9280397871f9d95849c25d1c33893
-EBUILD nautilus-sendto-2.28.0.ebuild 2222 RMD160 a597b4c90c131d648f88f17e70c9ebe077f96b81 SHA1 028087b522c0f4ea00b3ce4a7c20558e5d5a0125 SHA256 24950be2a7da149faa46cb8c331092d2dc109bed434d051341f7c9bc06cfec66
-EBUILD nautilus-sendto-2.28.2.ebuild 2162 RMD160 16c7e1e09f97cf3eb3ab51873134974ff141503a SHA1 c405791e5f78ca3b3bfd88f0c749f0841e32f989 SHA256 6132de7105d85ea314d2bc1a7011ec2643f60239f7307d7553c3094902b7bea0
-MISC ChangeLog 6642 RMD160 ffeef22fafde648bcdfc05bc272fc607a2883101 SHA1 bc527b4b84e829ead90fcb77690194b4f0fd046e SHA256 05aebb9c005653f0e3d0277f34e5fbee40127c2bebb59c3daa1a6bfc9cc3826c
-MISC metadata.xml 917 RMD160 076f338e5d1e1764840d4f988d16a7f6e316b07b SHA1 487af15e4bed942f4016af97334a66d39696eee7 SHA256 39f6c165fc219182be266c74dbd86c29dea8c803bb3bd9534014067732c10425
+EBUILD nautilus-sendto-2.28.0.ebuild 2012 RMD160 876978e4716b1c97a06f09be374db3c43b4deb8b SHA1 932adb942f7a13f7962dc100420424079111417e SHA256 846934a227529f63c76cf92d891c2bf492273d06576e9a34478b48dc5e33ad50
+EBUILD nautilus-sendto-2.28.2.ebuild 2142 RMD160 5a360e24e0dbb5488fc583c0cbbaaf9ad4f46627 SHA1 1ea6e9498a920a9f64994d81f45e0e0647cff09c SHA256 5b6215354ef0b88494e0824500024b926482a26e2b345e2027ff62a854459d32
+MISC ChangeLog 7034 RMD160 dc560ddc9e588899753a58c023527f48c8dff59c SHA1 240bba02d64cc021b4656fc5bacb8b15a19dc94a SHA256 cb95b54d4f39b557342b0ffb72d4773583e0885b9757ee04d21c846b8b7d3e8f
+MISC metadata.xml 623 RMD160 68f251a19cbfedaa84ded6e00498d9c70049fa61 SHA1 cfb3a804632ffdf770691b69245950113bc9ca8d SHA256 4a3547ae3728c595087c2a7f18adb6324bb08a9390d315470608df6cf9ba3e76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAktLp7kACgkQ1fmVwcYIWAbXogCg3u2vA0JctqEc0wetwMjbkisV
-FH0AoKx5GGSMZkrYbPmD+yq+z1LhPtfI
-=bVDQ
+iEYEARECAAYFAktLqkIACgkQ1fmVwcYIWAaHfgCgxQZWfpfm7qiek7aP4OXvJSqn
+drIAoLRIK2mgA9sAyiQAdL+l+UtebxkR
+=LZsc
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.12-pidgin-plugin-versioning.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.12-pidgin-plugin-versioning.patch
deleted file mode 100644
index db2fe4dbfeb1..000000000000
--- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.12-pidgin-plugin-versioning.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- pidgin_plugin/Makefile.am.orig	2007-08-29 22:15:29.000000000 -0700
-+++ pidgin_plugin/Makefile.am	2007-08-29 22:15:52.000000000 -0700
-@@ -6,6 +6,7 @@
- nautilus_la_LDFLAGS = -module -avoid-version
- 
- AM_CPPFLAGS = 					\
-+	-DVERSION=\"$(VERSION)\"	\
- 	-DLIBDIR=\"$(PIDGIN_LIBDIR)/pidgin/\" 	\
- 	-DDATADIR=\"$(PIDGIN_DATADIR)\" 		\
- 	$(NAUTILUS_SENDTO_CFLAGS)		\
---- pidgin_plugin/nautilus-sendto-plugin.c.orig	2007-08-29 22:13:55.000000000 -0700
-+++ pidgin_plugin/nautilus-sendto-plugin.c	2007-08-29 22:16:23.000000000 -0700
-@@ -306,7 +306,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-0.14-configure-options.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.14-configure-options.patch
deleted file mode 100644
index 21f37bf475f4..000000000000
--- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.14-configure-options.patch
+++ /dev/null
@@ -1,243 +0,0 @@
---- configure.in.orig	2008-03-29 13:06:51.000000000 -0700
-+++ configure.in	2008-03-29 13:26:47.000000000 -0700
-@@ -65,18 +65,16 @@
- 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],
-+              AS_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")
- 
-@@ -85,87 +83,88 @@
- AC_CHECK_TYPES([EContactPhotoType], , , [#include <libebook/e-contact.h>])
- CPPFLAGS="$saved_CPPFLAGS"
- 
--dnl Gaim support if it's installed
-+dnl Gaim support
- dnl ---------------------------------
- 
-+AC_ARG_ENABLE([gaim],
-+              AS_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])
-+
-+   AC_SUBST([GAIM_CFLAGS])
-+   AC_SUBST([GAIM_LIBS])
- 
--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
--	]
--)
-+   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],
-+              AS_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])
-+
-+   AC_SUBST([PIDGIN_CFLAGS])
-+   AC_SUBST([PIDGIN_LIBS])
- 
--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
--	]
--)
-+   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_GLIB_REQUIRED,
--	[
--	AC_SUBST(BLUETOOTH_CFLAGS)
--	AC_SUBST(BLUETOOTH_LIBS)
--	enable_bluetooth=yes
--	],
--	[
--	echo "Building without Bluetooth"
--	enable_bluetooth=no
--	]
--)
-+AC_ARG_ENABLE([bluetooth],
-+              AS_HELP_STRING([--enable-bluetooth], [enable support for bluetooth]),,
-+              [enable_bluetooth=yes])
-+
-+if test x$enable_bluetooth = xyes ; then
-+   PKG_CHECK_MODULES(BLUETOOTH, [dbus-glib-1 >= $DBUS_GLIB_REQUIRED])
-+
-+   AC_SUBST([BLUETOOTH_CLFAGS])
-+   AC_SUBST([BLUETOOTH_LIBS])
-+fi
- 
- AM_CONDITIONAL(HAVE_BLUETOOTH, test "x$enable_bluetooth" = "xyes")
- 
-+dnl --------------------------------------------------
-+
- GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
- AC_SUBST(GLIB_GENMARSHAL)
- 
--dnl --------------------------------------------------
--
- dnl Balsa support
- dnl -------------------------------------------------
- 
--enable_balsa=no
--AM_CONDITIONAL(HAVE_BALSA, test "x$enable_balsa" = "xyes")
--dnl -------------------------------------------------
-+AC_ARG_ENABLE([balsa],
-+              AS_HELP_STRING([--enable-balsa], [enable support for balsa]),,
-+              [enable_balsa=no])
- 
-+AM_CONDITIONAL(HAVE_BALSA, test "x$enable_balsa" = "xyes")
- 
- dnl Sylpheed support
- dnl -------------------------------------------------
- 
--enable_sylpheed=yes
--AM_CONDITIONAL(HAVE_SYLPHEED, test "x$enable_sylpheed" = "xyes")
--dnl -------------------------------------------------
-+AC_ARG_ENABLE([sylpheed],
-+              AS_HELP_STRING([--enable-sylpheed], [enable support for sylpheed]),,
-+              [enable_sylpheed=yes])
- 
-+AM_CONDITIONAL(HAVE_SYLPHEED, test "x$enable_sylpheed" = "xyes")
- 
- dnl Thunderbird support
- dnl -------------------------------------------------
-@@ -182,49 +181,45 @@
- 
- AC_DEFINE_UNQUOTED(THUNDERBIRD_NAME, "$THUNDERBIRD_NAME", [name of the Thunderbird binary])
- 
--enable_thunderbird=yes
--AM_CONDITIONAL(HAVE_THUNDERBIRD, test "x$enable_thunderbird" = "xyes")
-+AC_ARG_ENABLE([thunderbird],
-+              AS_HELP_STRING([--enable-thunderbird], [enable support for thunderbird]),,
-+              [enable_thunderbird=yes])
- 
--dnl -------------------------------------------------
-+AM_CONDITIONAL(HAVE_THUNDERBIRD, test "x$enable_thunderbird" = "xyes")
- 
- dnl Gajim support
- dnl -------------------------------------------------
- 
-+AC_ARG_ENABLE([gajim],
-+              AS_HELP_STRING([--enable-gajim], [enable support for gajim]),,
-+              [enable_gajim=no])
-+
-+if test x$enable_gajim = xyes ; then
-+   PKG_CHECK_MODULES(DBUS, [dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED])
-+
-+   AC_SUBST(DBUS_CFLAGS)
-+   AC_SUBST(DBUS_LIBS)
-+fi
-+
- AC_ARG_WITH(gajim,
--        [AS_HELP_STRING(--with-gajim,[Path to Gajim install prefix])],
--        [GAJIM_PATH="$withval"],[GAJIM_PATH="$prefix"])
-+            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_GLIB_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
--        ]
--)
-+if test -f "$GAJIM_SHARE_DIR"/data/pixmaps/gajim.png ; then
-+   AC_DEFINE_UNQUOTED(GAJIM_SHARE_DIR, "$GAJIM_SHARE_DIR", [path to gajim share dir])
-+fi
- 
- AM_CONDITIONAL(HAVE_GAJIM, test "x$enable_gajim" = "xyes")
- 
- dnl -------------------------------------------------
--
- IT_PROG_INTLTOOL([0.35.0])
- 
- GETTEXT_PACKAGE=nautilus-sendto
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [GetText Package])
--                                                                               
-+
- AM_GLIB_GNU_GETTEXT
- 
- AC_PATH_PROG(GCONFTOOL, gconftool-2)
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
deleted file mode 100644
index 70f8eca38c1e..000000000000
--- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-1.1.5-long-description.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-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/files/nautilus-sendto-1.1.5-pidgin-plugin-versioning.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-1.1.5-pidgin-plugin-versioning.patch
deleted file mode 100644
index 0b35e1aa0431..000000000000
--- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-1.1.5-pidgin-plugin-versioning.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur nautilus-sendto-1.1.4/pidgin_plugin/Makefile.am nautilus-sendto-1.1.4.new/pidgin_plugin/Makefile.am
---- nautilus-sendto-1.1.4/pidgin_plugin/Makefile.am	2009-04-17 19:42:47.000000000 +0530
-+++ nautilus-sendto-1.1.4.new/pidgin_plugin/Makefile.am	2009-04-18 20:08:18.504012965 +0530
-@@ -6,6 +6,7 @@
- nautilus_la_LDFLAGS = -module -avoid-version -no-undefined
- 
- AM_CPPFLAGS = 					\
-+	-DVERSION=\"$(VERSION)\"		\
- 	-DLIBDIR=\"$(PIDGIN_LIBDIR)/pidgin/\" 	\
- 	-DDATADIR=\"$(PIDGIN_DATADIR)\" 	\
- 	$(NAUTILUS_SENDTO_CFLAGS)		\
-diff -Naur nautilus-sendto-1.1.4/pidgin_plugin/nautilus-sendto-plugin.c nautilus-sendto-1.1.4.new/pidgin_plugin/nautilus-sendto-plugin.c
---- nautilus-sendto-1.1.4/pidgin_plugin/nautilus-sendto-plugin.c	2009-04-17 19:42:47.000000000 +0530
-+++ nautilus-sendto-1.1.4.new/pidgin_plugin/nautilus-sendto-plugin.c	2009-04-18 20:08:33.827013571 +0530
-@@ -338,7 +338,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/metadata.xml b/gnome-extra/nautilus-sendto/metadata.xml
index 29f7cde36ee0..45f0857e1424 100644
--- a/gnome-extra/nautilus-sendto/metadata.xml
+++ b/gnome-extra/nautilus-sendto/metadata.xml
@@ -3,17 +3,11 @@
 <pkgmetadata>
 	<herd>gnome</herd>
 	<use>
-		<flag name='eds'>Enables support for evolution-sendto using
-			<pkg>gnome-extra/evolution-data-server</pkg></flag>
 		<flag name='empathy'>Enables support for <pkg>net-im/empathy</pkg></flag>
 		<flag name='gajim'>Enables support for <pkg>net-im/gajim</pkg></flag>
-		<flag name='mail'>Enables support for mailto using
-			<pkg>gnome-extra/evolution-data-server</pkg></flag>
+		<!-- <flag name='mail'>Enables support for mailto using
+			<pkg>gnome-extra/evolution-data-server</pkg></flag> -->
 		<flag name='pidgin'>Enables support for <pkg>net-im/pidgin</pkg></flag>
-		<flag name='sylpheed'>Enables support for
-			<pkg>mail-client/sylpheed</pkg></flag>
-		<flag name='thunderbird'>Enables support for
-			<pkg>mail-client/mozilla-thunderbird</pkg></flag>
 		<flag name='upnp'>Enables support for sending files over upnp using
 			<pkg>net-libs/gupnp-av</pkg></flag>
 	</use>
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-2.28.0.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-2.28.0.ebuild
index 13ef4f3fc056..84cb8a74865b 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-2.28.0.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-2.28.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-2.28.0.ebuild,v 1.2 2010/01/05 04:43:52 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-2.28.0.ebuild,v 1.3 2010/01/11 22:46:20 eva Exp $
 
 EAPI="2"
 
-inherit gnome2 eutils autotools
+inherit gnome2
 
 DESCRIPTION="A nautilus extension for sending files to locations"
 HOMEPAGE="http://www.gnome.org"
@@ -63,12 +63,6 @@ src_prepare() {
 
 	# FIXME: skip evolution, it does not build properly
 	sed 's/evolution//g' -i Makefile.{am,in} || die "sed failed"
-
-	# Fix plugin versioning for pidgin plugin
-	epatch "${FILESDIR}/${PN}-1.1.5-pidgin-plugin-versioning.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
 }
 
 pkg_postinst() {
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-2.28.2.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-2.28.2.ebuild
index b51ef40eea62..4dd26fb9e15e 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-2.28.2.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-2.28.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-2.28.2.ebuild,v 1.1 2010/01/11 22:35:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-2.28.2.ebuild,v 1.2 2010/01/11 22:46:20 eva Exp $
 
 EAPI="2"
 
-inherit gnome2 eutils autotools
+inherit gnome2 multilib
 
 DESCRIPTION="A nautilus extension for sending files to locations"
 HOMEPAGE="http://www.gnome.org"
@@ -69,12 +69,14 @@ src_prepare() {
 
 	# FIXME: skip evolution, it does not build properly
 	sed 's/evolution//g' -i Makefile.{am,in} || die "sed failed"
+}
 
-	# Fix plugin versioning for pidgin plugin
-	epatch "${FILESDIR}/${PN}-1.1.5-pidgin-plugin-versioning.patch"
+src_install() {
+	gnome2_src_install
 
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
+	# Nautilus does not use *.la files
+	find "${D}/usr/$(get_libdir)/nautilus" -name "*.la" -delete \
+		|| die "failed to delete *.la files"
 }
 
 pkg_postinst() {