Remove dummy ebuild sylpheed-claws from deps, and clean up unused versions.

(Portage version: 2.1.3.17)

11 files changed, 36 insertions, 754 deletions

diff --git a/gnome-extra/nautilus-sendto/files/digest-nautilus-sendto-0.10 b/gnome-extra/nautilus-sendto/files/digest-nautilus-sendto-0.10
deleted file mode 100644
index 1609ea144dd1..000000000000
--- a/gnome-extra/nautilus-sendto/files/digest-nautilus-sendto-0.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cc47d4364d71d6f35776c5634e2f1ed1 nautilus-sendto-0.10.tar.bz2 322104
-RMD160 a3a75070b7d08e61a3e84920e288ee013de275a9 nautilus-sendto-0.10.tar.bz2 322104
-SHA256 f5d3a654070464929c751775c767cf39ce27f8f37a7d9ef5f336598631d3ea8d nautilus-sendto-0.10.tar.bz2 322104
diff --git a/gnome-extra/nautilus-sendto/files/digest-nautilus-sendto-0.12 b/gnome-extra/nautilus-sendto/files/digest-nautilus-sendto-0.12
deleted file mode 100644
index a663b2d7bbd9..000000000000
--- a/gnome-extra/nautilus-sendto/files/digest-nautilus-sendto-0.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9ec9a476be9a1c24ceddcfd76c6b3be2 nautilus-sendto-0.12.tar.bz2 336188
-RMD160 d90730aa1af385240d62d38bbda78ffdb699fe76 nautilus-sendto-0.12.tar.bz2 336188
-SHA256 e91af28d5473997836e85aa5eabb39e53f88fdc7cc535d2b0399afdaee1184ab nautilus-sendto-0.12.tar.bz2 336188
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
deleted file mode 100644
index 2b9e6b6cd1f3..000000000000
--- a/gnome-extra/nautilus-sendto/files/digest-nautilus-sendto-0.8-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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.10-configure-options.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.10-configure-options.patch
deleted file mode 100644
index 3fae1cdd3cf1..000000000000
--- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.10-configure-options.patch
+++ /dev/null
@@ -1,173 +0,0 @@
---- configure.in.orig	2007-03-22 14:50:03.000000000 -0500
-+++ configure.in	2007-03-22 15:15:03.000000000 -0500
-@@ -58,60 +58,57 @@
- AC_SUBST(NAUTILUS_EXT_SENDTO_CFLAGS)
- AC_SUBST(NAUTILUS_EXT_SENDTO_LIBS)
- 
--dnl Libebook support
-+dnl Evolution (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])
- 
--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
--	]
--)
-+if test x$enable_gaim = xyes ; then
-+   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)
-+fi
- 
- AM_CONDITIONAL(HAVE_GAIM, test "x$enable_gaim" = "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")
- 
-@@ -123,7 +120,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 -------------------------------------------------
- 
-@@ -131,7 +130,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 -------------------------------------------------
- 
-@@ -139,7 +140,9 @@
- 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 -------------------------------------------------
- 
-@@ -152,24 +155,20 @@
- 
- 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
-+   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.7-configure-options.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.7-configure-options.patch
deleted file mode 100644
index 405baaaf0e12..000000000000
--- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.7-configure-options.patch
+++ /dev/null
@@ -1,211 +0,0 @@
---- configure.in.orig	2006-07-04 14:08:48.000000000 -0500
-+++ configure.in	2006-07-04 14:46:41.000000000 -0500
-@@ -6,7 +6,7 @@
- AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
- 
- AM_MAINTAINER_MODE
--                                                                                
-+
- AM_DISABLE_STATIC
- AC_PROG_CC
- AM_PROG_LIBTOOL
-@@ -54,120 +54,116 @@
- AC_SUBST(NAUTILUS_SENDTO_CFLAGS)
- AC_SUBST(NAUTILUS_SENDTO_LIBS)
- 
--dnl Libebook support
-+dnl Evolution (libebook) support
- dnl ---------------------------------
-+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])
- 
--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_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])
-+
-+   AC_SUBST(GAIM_CFLAGS)
-+   AC_SUBST(GAIM_LIBS)
-+
-+   GAIM_LIBDIR=`pkg-config --variable=libdir gaim`
-+   GAIM_DATADIR=`pkg-config --variable=datadir gaim`
- 
--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_LIBDIR)
-+   AC_SUBST(GAIM_DATADIR)
-+fi
- 
- AM_CONDITIONAL(HAVE_GAIM, test "x$enable_gaim" = "xyes")
- 
--dnl Bluetooth support if it's installed
-+dnl Bluetooth support
- dnl -----------------------------------
- 
--PKG_CHECK_MODULES(BLUETOOTH, gnome-bluetooth >= $BLUETOOTH_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])
- 
--AM_CONDITIONAL(HAVE_BLUETOOTH, test "x$enable_bluetooth" = "xyes")
-+if test x$enable_bluetooth = xyes ; then
-+   PKG_CHECK_MODULES(BLUETOOTH, [gnome-bluetooth >= $BLUETOOTH_REQUIRED])
- 
--dnl --------------------------------------------------
-+   AC_SUBST(BLUETOOTH_CFLAGS)
-+   AC_SUBST(BLUETOOTH_LIBS)
-+fi
-+
-+AM_CONDITIONAL(HAVE_BLUETOOTH, test "x$enable_bluetooth" = "xyes")
- 
- dnl Balsa support
- dnl -------------------------------------------------
- 
--enable_balsa=no
--AM_CONDITIONAL(HAVE_BALSA, test "x$enable_balsa" = "xyes")
--dnl -------------------------------------------------
-+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 Sylpheed support
- dnl -------------------------------------------------
- 
--enable_sylpheed=yes
--AM_CONDITIONAL(HAVE_SYLPHEED, test "x$enable_sylpheed" = "xyes")
--dnl -------------------------------------------------
-+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 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"])
-+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
-+   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])
-+
-+      AC_SUBST(DBUS_CFLAGS)
-+      AC_SUBST(DBUS_LIBS)
-+   else
-+      enable_gajim=no
-+   fi
-+fi
- 
- AM_CONDITIONAL(HAVE_GAJIM, test "x$enable_gajim" = "xyes")
- 
--dnl -------------------------------------------------
--
- 
- GNOME_COMPILE_WARNINGS
- 
-@@ -178,7 +174,7 @@
- GETTEXT_PACKAGE=nautilus-sendto
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [GetText Package])
--                                                                               
-+
- AM_GLIB_GNU_GETTEXT
- AC_PROG_INTLTOOL
- 
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
deleted file mode 100644
index a9a20a9d4aae..000000000000
--- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.8-claws-mail-plugin.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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-gaim-2.0-plugin.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.8-gaim-2.0-plugin.patch
deleted file mode 100644
index fb549bde170e..000000000000
--- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.8-gaim-2.0-plugin.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gaim_plugin/nautilus-sendto-plugin.c.orig	2006-10-15 17:08:37.000000000 -0500
-+++ gaim_plugin/nautilus-sendto-plugin.c	2006-10-15 17:08:57.000000000 -0500
-@@ -38,6 +38,7 @@
- #include <unistd.h>
- #include <dirent.h>
- 
-+#include "plugin.h"
- #include "conversation.h"
- #include "core.h"
- #include "debug.h"
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-0.10.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-0.10.ebuild
deleted file mode 100644
index 4aff62f8f9d2..000000000000
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-0.10.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.10.ebuild,v 1.5 2007/08/02 05:46:10 mr_bones_ 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 gaim gajim 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 )
-		 gaim? ( >=net-im/gaim-1.5.0 )
-		 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
-		>=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} \
-			$(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.10-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 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
-		elog "To enable SendTo support in GAIM, you must enable the plugin in GAIM"
-		elog "Check Tools -> Preferences -> Plugins in the GAIM menu."
-	fi
-}
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-0.12-r1.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-0.12-r1.ebuild
index 968d916960a7..e99defae63bc 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-0.12-r1.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-0.12-r1.ebuild
@@ -1,11 +1,11 @@
 # 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.12-r1.ebuild,v 1.1 2007/08/30 05:25:46 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-0.12-r1.ebuild,v 1.2 2007/11/05 15:19:09 drac Exp $
 
 inherit gnome2 eutils autotools
 
 DESCRIPTION="A nautilus extension for sending files to locations"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="http://www.gnome.org"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -13,59 +13,57 @@ 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
-								mail-client/sylpheed-claws
-							)
-					)
-		 thunderbird? ( mail-client/mozilla-thunderbird )"
+	>=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"
+	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)"
+		$(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}
+	cd "${S}"
 
 	# Convert autodetection into hard options
-	epatch ${FILESDIR}/${PN}-0.12-configure-options.patch
+	epatch "${FILESDIR}"/${PN}-0.12-configure-options.patch
 
 	# Fix thunderbird support
-	epatch ${FILESDIR}/${PN}-0.8-thunderbird-binaries.patch
+	epatch "${FILESDIR}"/${PN}-0.8-thunderbird-binaries.patch
 
 	# Fix debug statements for pidgin plugin
-	epatch ${FILESDIR}/${PN}-0.12-debug-statements.patch
+	epatch "${FILESDIR}"/${PN}-0.12-debug-statements.patch
 
 	# Fix plugin versioning for pidgin plugin
-	epatch ${FILESDIR}/${PN}-0.12-pidgin-plugin-versioning.patch
+	epatch "${FILESDIR}"/${PN}-0.12-pidgin-plugin-versioning.patch
 
 	# Oh the joys of autotools
 	eautoreconf
@@ -74,7 +72,7 @@ src_unpack() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 
-	if use pidgin ; then
+	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-0.12.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-0.12.ebuild
deleted file mode 100644
index a6b4f43f4faf..000000000000
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-0.12.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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.12.ebuild,v 1.1 2007/08/29 03:59:47 compnerd 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
-								mail-client/sylpheed-claws
-							)
-					)
-		 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
-
-	# Oh the joys of autotools
-	eautoreconf
-}
-
-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-0.8-r1.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-0.8-r1.ebuild
deleted file mode 100644
index 6938b48350d7..000000000000
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-0.8-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.5 2007/08/02 05:46:10 mr_bones_ 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="~amd64 ~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
-		 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
-		elog "To enable SendTo support in GAIM, you must enable the plugin in GAIM"
-		elog "Check Tools -> Preferences -> Plugins in the GAIM menu."
-	fi
-}