New version for GNOME 2.26. Drop libgnome/gnome-vfs, merge eel, support crossfades of desktop background, and more. Clean up old revisions.

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

18 files changed, 51 insertions, 1155 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index f801fdf76ffd..daec8f93e74a 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.305 2009/04/28 11:28:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.306 2009/05/10 20:49:48 eva Exp $
+
+*nautilus-2.26.2 (10 May 2009)
+
+  10 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -nautilus-2.20.0-r1.ebuild,
+  -files/nautilus-2.20.0-async-thumbnail-framing.patch,
+  -files/nautilus-2.20.0-exempi.patch,
+  -files/nautilus-2.20.0-fix_broken_configure.patch,
+  -files/nautilus-2.20.0-small-font-crasher.patch,
+  -files/nautilus-2.20.0-sound-preview-cleanup.patch,
+  -files/nautilus-2.20.0-statfs.patch,
+  -files/nautilus-2.20.0-thumbnail-flashing.patch,
+  -files/nautilus-2.22.3-open-folder.patch,
+  -files/nautilus-2.22.3-preserve-metadata.patch,
+  -files/nautilus-2.22.3-prevent-recursive-mvcp.patch,
+  -nautilus-2.22.5.1-r1.ebuild, -files/nautilus-2.22.5.1-exempi.patch,
+  -files/nautilus-2.22.5.1-fix-stat-include.patch,
+  -files/nautilus-2.22.5-ask-what-to-do.patch, -nautilus-2.24.2-r1.ebuild,
+  -nautilus-2.24.2-r2.ebuild, +nautilus-2.26.2.ebuild:
+  New version for GNOME 2.26. Drop libgnome/gnome-vfs, merge eel, support
+  crossfades of desktop background, and more. Clean up old revisions.
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org> nautilus-2.24.2.ebuild:
   sh stable
diff --git a/gnome-base/nautilus/files/nautilus-2.20.0-async-thumbnail-framing.patch b/gnome-base/nautilus/files/nautilus-2.20.0-async-thumbnail-framing.patch
deleted file mode 100644
index 4e947bb51f6c..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.20.0-async-thumbnail-framing.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-* libnautilus-private/nautilus-icon-factory.c:
-	(async_thumbnail_load_func): Frame asynchronously loaded thumbnails.
-	Fixes #478363
---- libnautilus-private/nautilus-icon-factory.c	2007/09/27 17:15:05	13235
-+++ libnautilus-private/nautilus-icon-factory.c	2007/09/27 17:19:21	13236
-@@ -384,9 +384,21 @@
- 		goto out;
- 	}
- 
-+	if (!gdk_pixbuf_get_has_alpha (pixbuf)) {
-+		/* we don't own the pixbuf, but nautilus_thumbnail_frame_image() assumes so and unrefs it. */
-+		g_object_ref (pixbuf);
-+
-+		nautilus_thumbnail_frame_image (&pixbuf);
-+		/* at this point, we own a pixbuf, which is the framed version of the passed-in pixbuf. */
-+	}
-+
- 	cached_icon = cache_icon_new (pixbuf, NULL, scale_x, scale_y);
- 	cached_icon->mtime = statbuf.st_mtime;
- 
-+	if (!gdk_pixbuf_get_has_alpha (pixbuf)) {
-+		g_object_unref (pixbuf);
-+	}
-+
- 	if (cached_icon != NULL) {
- 		key = g_new (CacheKey, 1);
- 		key->name = g_strdup (path);
diff --git a/gnome-base/nautilus/files/nautilus-2.20.0-exempi.patch b/gnome-base/nautilus/files/nautilus-2.20.0-exempi.patch
deleted file mode 100644
index 33229a6ef112..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.20.0-exempi.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.in.old	2008-07-04 17:51:51.000000000 +0200
-+++ configure.in	2008-07-04 18:00:12.000000000 +0200
-@@ -255,13 +255,23 @@
- 
- dnl exempi checking
- 
--PKG_CHECK_MODULES(EXEMPI, exempi-2.0 >= exempi_minver, [
--		  AM_CONDITIONAL(HAVE_EXEMPI, true)
--		  AC_DEFINE(HAVE_EXEMPI, 1, [Define to enable XMP support])
--		  ], [AM_CONDITIONAL(HAVE_EXEMPI, false)])
-+AM_CONDITIONAL(HAVE_EXEMPI, false)
-+AC_ARG_ENABLE(xmp, 
-+	AC_HELP_STRING([--disable-xmp], 
-+			[build without xmp support]))
-+msg_xmp=no
-+if test "x$enable_xmp" != "xno"; then
-+	PKG_CHECK_MODULES(EXEMPI, exempi-2.0 >= exempi_minver, [
-+		  	  AM_CONDITIONAL(HAVE_EXEMPI, true)
-+			  AC_DEFINE(HAVE_EXEMPI, 1, [Define to enable xmp support])
-+			  ]
-+                          msg_xmp=yes,
-+	          	  [AM_CONDITIONAL(HAVE_EXEMPI, false)])
-+
-
--AC_SUBST(EXEMPI_CFLAGS)
--AC_SUBST(EXEMPI_LIBS)
-+	AC_SUBST(EXEMPI_CFLAGS)
-+	AC_SUBST(EXEMPI_LIBS)
-+fi
- 
- dnl ==========================================================================
- dnl search implementations
diff --git a/gnome-base/nautilus/files/nautilus-2.20.0-fix_broken_configure.patch b/gnome-base/nautilus/files/nautilus-2.20.0-fix_broken_configure.patch
deleted file mode 100644
index bdf4941fca88..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.20.0-fix_broken_configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nautilus-2.20.0/configure.in
-+++ nautilus-2.20.0/configure.in
-@@ -42,7 +42,7 @@
- AC_SUBST(BONOBO_REQUIRED, [bonobo_minver])
- AC_SUBST(EEL_REQUIRED, [eel_minver])
- AC_SUBST(ESOUND_REQUIRED, [esound_minver])
--AC_SUBST(GLIB_REQUIRED [glib_minver])
-+AC_SUBST(GLIB_REQUIRED, [glib_minver])
- AC_SUBST(GNOME_DESKTOP_REQUIRED, [gnome_desktop_minver])
- AC_SUBST(GNOME_REQUIRED, [gnome_minver])
- AC_SUBST(GNOME_UI_REQUIRED, [gnome_ui_minver])
diff --git a/gnome-base/nautilus/files/nautilus-2.20.0-small-font-crasher.patch b/gnome-base/nautilus/files/nautilus-2.20.0-small-font-crasher.patch
deleted file mode 100644
index eb7b165c0a77..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.20.0-small-font-crasher.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Fix crash with small fonts (#454884)
---- src/nautilus-sidebar-title.c	2007/10/03 06:38:48	13255
-+++ src/nautilus-sidebar-title.c	2007/10/03 06:39:37	13256
-@@ -364,7 +364,7 @@
- 	title_font = pango_font_description_copy (style->font_desc);
- 
- 	max_style_font_size = pango_font_description_get_size (title_font) * 1.8 / PANGO_SCALE;
--	if (max_style_font_size < MIN_TITLE_FONT_SIZE) {
-+	if (max_style_font_size < MIN_TITLE_FONT_SIZE + 1) {
- 		max_style_font_size = MIN_TITLE_FONT_SIZE + 1;
- 	}
- 
diff --git a/gnome-base/nautilus/files/nautilus-2.20.0-sound-preview-cleanup.patch b/gnome-base/nautilus/files/nautilus-2.20.0-sound-preview-cleanup.patch
deleted file mode 100644
index 8cb976393f46..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.20.0-sound-preview-cleanup.patch
+++ /dev/null
@@ -1,414 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN nautilus-2.20.0.orig/configure.in nautilus-2.20.0/configure.in
---- nautilus-2.20.0.orig/configure.in	2007-09-18 02:55:14.000000000 -0400
-+++ nautilus-2.20.0/configure.in	2007-10-29 10:50:48.000000000 -0400
-@@ -90,7 +90,6 @@ fi
- AC_SUBST(STARTUP_NOTIFICATION_PACKAGE)
- 
- PKG_CHECK_MODULES(ALL, [
--	esound			>= esound_minver
- 	bonobo-activation-2.0	>= bonobo_activation_minver
- 	eel-2.0			>= eel_minver
- 	glib-2.0		>= glib_minver
-@@ -312,6 +311,25 @@ fi
- 
- dnl ==========================================================================
- 
-+AM_CONDITIONAL(HAVE_ESOUND, false)
-+
-+dnl esound checking
-+			    			  
-+AC_ARG_ENABLE(esound, [  --disable-esound     build without esound support])
-+msg_esound=no
-+if test "x$enable_esound" != "xno"; then
-+	PKG_CHECK_MODULES(ESOUND, esound >= esound_minver, [
-+		  	  AM_CONDITIONAL(HAVE_ESOUND, true)
-+			  AC_DEFINE(HAVE_ESOUND, 1, [Define to enable esound support])
-+			  ]
-+                          msg_esound=yes,
-+	          	  [AM_CONDITIONAL(HAVE_ESOUND, false)])
-+        AC_SUBST(ESOUND_CFLAGS)
-+	AC_SUBST(ESOUND_LIBS)
-+fi
-+
-+dnl ==========================================================================
-+
- dnl ****************************
- dnl *** Check for libselinux ***
- dnl ****************************
-@@ -404,7 +422,7 @@ LIBNAUTILUS_EXTENSION_LIBS="`$PKG_CONFIG
- AC_SUBST(LIBNAUTILUS_EXTENSION_LIBS)
- 
- dnl core nautilus (must list bonobo-activation and libbonobo because idldir does not respect "requires")
--CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 esound gnome-desktop-2.0 gnome-vfs-module-2.0 $EXTRA_CORE_MODULES"
-+CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 gnome-desktop-2.0 gnome-vfs-module-2.0 $EXTRA_CORE_MODULES"
- CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags $WARNING_CFLAGS"
- AC_SUBST(CORE_CFLAGS)
- CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN nautilus-2.20.0.orig/libnautilus-private/Makefile.am nautilus-2.20.0/libnautilus-private/Makefile.am
---- nautilus-2.20.0.orig/libnautilus-private/Makefile.am	2007-08-21 05:37:54.000000000 -0400
-+++ nautilus-2.20.0/libnautilus-private/Makefile.am	2007-10-29 10:50:48.000000000 -0400
-@@ -10,6 +10,7 @@ INCLUDES = 						\
- 	$(DISABLE_DEPRECATED_CFLAGS)			\
- 	$(TRACKER_CFLAGS)				\
- 	$(BEAGLE_CFLAGS)				\
-+	$(ESOUND_CFLAGS)				\
- 	-DDATADIR=\""$(datadir)"\" 			\
- 	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
- 	-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" 	\
-@@ -31,6 +32,7 @@ libnautilus_private_la_LIBADD =		\
- 	$(SELINUX_LIBS)			\
- 	$(BEAGLE_LIBS)			\
- 	$(TRACKER_LIBS)			\
-+	$(ESOUND_LIBS)			\
- 	$(top_builddir)/libnautilus-extension/libnautilus-extension.la \
- 	$(CORE_LIBS)			\
- 	$(NULL)
-@@ -49,8 +51,6 @@ marshal_sources = \
- 
- libnautilus_private_la_SOURCES = \
- 	$(nautilus_metafile_server_idl_sources)	\
--	nautilus-audio-player.c \
--	nautilus-audio-player.h \
- 	nautilus-bookmark.c \
- 	nautilus-bookmark.h \
- 	nautilus-cell-renderer-pixbuf-emblem.c \
-@@ -228,6 +228,14 @@ if HAVE_TRACKER
- libnautilus_private_la_SOURCES += $(TRACKER_SOURCES)
- endif
- 
-+ESOUND_SOURCES = \
-+	nautilus-audio-player.c \
-+	nautilus-audio-player.h
-+
-+if HAVE_ESOUND
-+libnautilus_private_la_SOURCES += $(ESOUND_SOURCES)
-+endif
-+
- $(lib_LTLIBRARIES): $(dependency_static_libs)
- 
- $(nautilus_metafile_server_idl_sources): nautilus_metafile_server_idl_stamp
-@@ -264,6 +272,7 @@ EXTRA_DIST = 				\
- 	nautilus-marshal.list		\
- 	$(schema_in_files)              \
- 	$(BEAGLE_SOURCES)		\
-+	$(ESOUND_SOURCES)		\
- 	$(TRACKER_SOURCES)		\
- 	$(NULL)
- 
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN nautilus-2.20.0.orig/src/file-manager/fm-icon-view.c nautilus-2.20.0/src/file-manager/fm-icon-view.c
---- nautilus-2.20.0.orig/src/file-manager/fm-icon-view.c	2007-04-03 06:08:04.000000000 -0400
-+++ nautilus-2.20.0/src/file-manager/fm-icon-view.c	2007-10-29 12:02:21.000000000 -0400
-@@ -24,6 +24,7 @@
- 
- #include <config.h>
- #include "fm-icon-view.h"
-+#include "nautilus-audio-mime-types.h"
- 
- #include "fm-actions.h"
- #include "fm-icon-container.h"
-@@ -78,7 +79,9 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <unistd.h>
-+#ifdef HAVE_ESOUND
- #include <esd.h>
-+#endif
- 
- #define USE_OLD_AUDIO_PREVIEW 1
- #define READ_CHUNK_SIZE 16384
-@@ -165,9 +168,8 @@ static const SortCriterion sort_criteria
- 
- static gboolean default_sort_in_reverse_order = FALSE;
- static int preview_sound_auto_value;
--static gboolean gnome_esd_enabled_auto_value;
- 
--#if USE_OLD_AUDIO_PREVIEW
-+#ifndef HAVE_ESOUND
- static pid_t audio_preview_pid = 0;
- #endif
- 
-@@ -1747,60 +1749,59 @@ band_select_ended_callback (NautilusIcon
- 
- /* handle the preview signal by inspecting the mime type.  For now, we only preview local sound files. */
- 
-+#ifndef HAVE_ESOUND
-+static char *
-+get_preview_command (void)
-+{
-+	char *command;
-+
-+	command = g_find_program_in_path ("totem-audio-preview");
-+	if (command)
-+		return command;
-+	command = g_find_program_in_path ("gst-launch-0.10");
-+	if (command) {
-+		char *new_cmd;
-+
-+		new_cmd = g_strdup_printf ("%s playbin uri=fd://0", command);
-+		g_free (command);
-+		return new_cmd;
-+	}
-+
-+	return NULL;
-+}
-+#endif /* !HAVE_ESOUND */
-+
- /* here's the timer task that actually plays the file using mpg123, ogg123 or play. */
- /* FIXME bugzilla.gnome.org 41258: we should get the application from our mime-type stuff */
- static gboolean
- play_file (gpointer callback_data)
- {
--#if USE_OLD_AUDIO_PREVIEW	
-+#ifndef HAVE_ESOUND
- 	NautilusFile *file;
- 	FMIconView *icon_view;
- 	FILE *sound_process;
- 	char *file_uri;
--	char *suffix;
--	char *mime_type;
--	const char *command_str;
--	gboolean is_mp3;
--	gboolean is_ogg;
-+	char *command_str;
- 	pid_t mp3_pid;
- 	
- 	GnomeVFSResult result;
- 	GnomeVFSHandle *handle;
- 	char *buffer;
--	const char *audio_device = NULL;
- 	GnomeVFSFileSize bytes_read;
- 
--	audio_device = g_getenv ("AUDIODEV");
- 	icon_view = FM_ICON_VIEW (callback_data);
-+
-+	command_str = get_preview_command ();
-+	if (command_str == NULL)
-+		return FALSE;
- 	
- 	file = icon_view->details->audio_preview_file;
- 	file_uri = nautilus_file_get_uri (file);
--	mime_type = nautilus_file_get_mime_type (file);
--	is_mp3 = eel_strcasecmp (mime_type, "audio/mpeg") == 0;
--	is_ogg = eel_strcasecmp (mime_type, "application/ogg") == 0 ||
--                eel_strcasecmp (mime_type, "application/x-ogg") == 0;
- 	
- 	mp3_pid = fork ();
- 	if (mp3_pid == (pid_t) 0) {
- 		/* Set the group (session) id to this process for future killing. */
- 		setsid();
--		if (is_mp3) {
--			command_str = "mpg123 -y -q -";
--		} else if (is_ogg) {
--			command_str = "ogg123 -q -";
--		} else {
--			suffix = strrchr(file_uri, '.');
--			if (suffix == NULL) {
--				suffix = "wav";
--			} else {
--				suffix += 1; /* skip the period */
--			}
--			if (audio_device) {
--				command_str = g_strdup_printf("play -d %s -t %s -", audio_device, suffix);
--			} else {
--				command_str = g_strdup_printf("play -t %s -", suffix);
--			}
--		}
- 
- 		/* read the file with gnome-vfs, feeding it to the sound player's standard input */
- 		/* First, open the file. */
-@@ -1851,10 +1852,10 @@ play_file (gpointer callback_data)
- 	}
- 		
- 	g_free (file_uri);
--	g_free (mime_type);
-+	g_free (command_str);
- 
- 	icon_view->details->audio_preview_timeout = 0;
--#else
-+#else /* HAVE_ESOUND */
- 	char *file_path, *file_uri, *mime_type;
- 	gboolean is_mp3;
- 	FMIconView *icon_view;
-@@ -1893,13 +1894,13 @@ static void
- preview_audio (FMIconView *icon_view, NautilusFile *file, gboolean start_flag)
- {		
- 	/* Stop current audio playback */
--#if USE_OLD_AUDIO_PREVIEW
-+#ifndef HAVE_ESOUND
- 	if (audio_preview_pid > 0) {
- 		kill (-audio_preview_pid, SIGTERM);
- 		waitpid (audio_preview_pid, NULL, 0);
- 		audio_preview_pid = 0;
- 	}
--#else
-+#else /* HAVE_ESOUND */
- 	if (icon_view->details->audio_player_data != NULL) {
- 		nautilus_audio_player_stop (icon_view->details->audio_player_data);
- 		g_free (icon_view->details->audio_player_data);
-@@ -1913,9 +1914,9 @@ preview_audio (FMIconView *icon_view, Na
- 			
- 	if (start_flag) {
- 		icon_view->details->audio_preview_file = file;
--#if USE_OLD_AUDIO_PREVIEW			
-+#ifndef HAVE_ESOUND
- 		icon_view->details->audio_preview_timeout = g_timeout_add (1000, play_file, icon_view);
--#else
-+#else /* HAVE_ESOUND */
- 		/* FIXME: Need to kill the existing timeout if there is one? */
- 		icon_view->details->audio_preview_timeout = g_timeout_add (1000, play_file, icon_view);
- #endif
-@@ -1923,15 +1924,31 @@ preview_audio (FMIconView *icon_view, Na
- }
- 
- static gboolean
--should_preview_sound (NautilusFile *file)
-+sound_preview_type_supported (NautilusFile *file)
- {
--	char *uri;
-+	char *mime_type;
-+	guint i;
- 
--	/* Check gnome config sound preference */
--	if (!gnome_esd_enabled_auto_value) {
-+	mime_type = nautilus_file_get_mime_type (file);
-+	if (mime_type == NULL)
- 		return FALSE;
-+	for (i = 0; i < G_N_ELEMENTS (audio_mime_types); i++) {
-+		GnomeVFSMimeEquivalence equivalence = gnome_vfs_mime_type_get_equivalence (mime_type, audio_mime_types[i]);
-+		if (equivalence == GNOME_VFS_MIME_IDENTICAL || equivalence == GNOME_VFS_MIME_PARENT) {
-+			g_free (mime_type);
-+			return TRUE;
-+		}
- 	}
- 
-+	g_free (mime_type);
-+	return FALSE;
-+}
-+
-+static gboolean
-+should_preview_sound (NautilusFile *file)
-+{
-+	char *uri;
-+
- 	uri = nautilus_file_get_uri (file);
- 	if (uri && eel_istr_has_prefix (uri, "burn:")) {
- 		g_free (uri);
-@@ -1956,12 +1973,9 @@ can_play_sound (void)
- {
- 	int open_result;
- 
--#if USE_OLD_AUDIO_PREVIEW			
--	/* first see if there's already one in progress; if so, return true */
--	if (audio_preview_pid > 0) {
--		return TRUE;
--	}
--#endif
-+#ifndef HAVE_ESOUND
-+	return TRUE;
-+#else /* HAVE_ESOUND */
- 
- 	/* Now check and see if system has audio out capabilites */
-         open_result = esd_open_sound (NULL);
-@@ -1972,6 +1986,7 @@ can_play_sound (void)
- 	esd_close (open_result);
- 
- 	return TRUE;
-+#endif
- }
- 
- static int
-@@ -1981,25 +1996,17 @@ icon_container_preview_callback (Nautilu
- 				 FMIconView *icon_view)
- {
- 	int result;
--	char *mime_type, *file_name, *message;
-+	char *file_name, *message;
- 		
- 	result = 0;
- 	
- 	/* preview files based on the mime_type. */
- 	/* at first, we just handle sounds */
- 	if (should_preview_sound (file)) {
--		mime_type = nautilus_file_get_mime_type (file);
--
--		if ((eel_istr_has_prefix (mime_type, "audio/")
--		     || eel_istr_has_prefix (mime_type, "application/ogg")
--		     || eel_istr_has_prefix (mime_type, "application/x-ogg"))
--		    && eel_strcasecmp (mime_type, "audio/x-pn-realaudio") != 0
--		    && eel_strcasecmp (mime_type, "audio/x-mpegurl") != 0
--		    && can_play_sound ()) {
-+		if (sound_preview_type_supported (file) && can_play_sound ()) {
- 			result = 1;
- 			preview_audio (icon_view, file, start_flag);
- 		}	
--		g_free (mime_type);
- 	}
- 	
- 	/* Display file name in status area at low zoom levels, since
-@@ -2708,10 +2715,6 @@ fm_icon_view_init (FMIconView *icon_view
- 		eel_preferences_add_auto_enum (NAUTILUS_PREFERENCES_PREVIEW_SOUND,
- 					       &preview_sound_auto_value);
- 
--		eel_preferences_monitor_directory ("/desktop/gnome/sound");
--		eel_preferences_add_auto_boolean ("/desktop/gnome/sound/enable_esd",
--						  &gnome_esd_enabled_auto_value);
--		
- 		setup_sound_preview = TRUE;
- 	}
- 
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN nautilus-2.20.0.orig/src/file-manager/Makefile.am nautilus-2.20.0/src/file-manager/Makefile.am
---- nautilus-2.20.0.orig/src/file-manager/Makefile.am	2007-06-27 03:12:32.000000000 -0400
-+++ nautilus-2.20.0/src/file-manager/Makefile.am	2007-10-29 10:55:00.000000000 -0400
-@@ -38,6 +38,7 @@ libnautilus_file_manager_la_SOURCES=	\
- 	fm-tree-model.h			\
- 	fm-tree-view.c			\
- 	fm-tree-view.h			\
-+	nautilus-audio-mime-types.h	\
- 	$(NULL)
- 
- EMPTY_VIEW_SOURCES = \
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN nautilus-2.20.0.orig/src/file-manager/nautilus-audio-mime-types.h nautilus-2.20.0/src/file-manager/nautilus-audio-mime-types.h
---- nautilus-2.20.0.orig/src/file-manager/nautilus-audio-mime-types.h	1969-12-31 19:00:00.000000000 -0500
-+++ nautilus-2.20.0/src/file-manager/nautilus-audio-mime-types.h	2007-10-29 10:55:00.000000000 -0400
-@@ -0,0 +1,41 @@
-+/* generated with mime-types-include.sh in the totem module, don't edit or 
-+   commit in the nautilus module without filing a bug against totem */
-+static char *audio_mime_types[] = {
-+"audio/3gpp",
-+"audio/ac3",
-+"audio/AMR",
-+"audio/AMR-WB",
-+"audio/basic",
-+"audio/mp4",
-+"audio/mpeg",
-+"audio/mpegurl",
-+"audio/ogg",
-+"audio/vnd.rn-realaudio",
-+"audio/x-ape",
-+"audio/x-flac",
-+"audio/x-it",
-+"audio/x-m4a",
-+"audio/x-matroska",
-+"audio/x-mod",
-+"audio/x-mp3",
-+"audio/x-mpeg",
-+"audio/x-mpegurl",
-+"audio/x-ms-asf",
-+"audio/x-ms-asx",
-+"audio/x-ms-wax",
-+"audio/x-ms-wma",
-+"audio/x-musepack",
-+"audio/x-pn-aiff",
-+"audio/x-pn-au",
-+"audio/x-pn-wav",
-+"audio/x-pn-windows-acm",
-+"audio/x-realaudio",
-+"audio/x-real-audio",
-+"audio/x-sbc",
-+"audio/x-scpls",
-+"audio/x-tta",
-+"audio/x-wav",
-+"audio/x-wav",
-+"audio/x-wavpack",
-+"audio/x-vorbis",
-+};
diff --git a/gnome-base/nautilus/files/nautilus-2.20.0-statfs.patch b/gnome-base/nautilus/files/nautilus-2.20.0-statfs.patch
deleted file mode 100644
index 17a50a1fe692..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.20.0-statfs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-So we can check for statfs in FreeBSD
-
-diff -ur a/configure.in b/configure.in
---- a/configure.in	2007-10-19 10:41:53 +0100
-+++ b/configure.in	2007-10-19 10:42:53 +0100
-@@ -149,7 +149,7 @@
- 
- dnl ==========================================================================
- 
--AC_CHECK_HEADERS(sys/mount.h sys/vfs.h)
-+AC_CHECK_HEADERS(sys/param.h sys/mount.h sys/stat.h sys/vfs.h)
- 			      
- dnl ==========================================================================
- 
diff --git a/gnome-base/nautilus/files/nautilus-2.20.0-thumbnail-flashing.patch b/gnome-base/nautilus/files/nautilus-2.20.0-thumbnail-flashing.patch
deleted file mode 100644
index 2aabd5769798..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.20.0-thumbnail-flashing.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-2007-10-02  Frederic Crozat  <fcrozat@mandriva.com>
-
-	Backport from gio-branch, fixes #480608, from 
-	Alexander Larsson  <alexl@redhat.com>
-
-* libnautilus-private/nautilus-icon-factory.c:
-	Don't clear thumbnails and other absolute pathnames from icon
-	cache when mime data or icon theme changes. This is to avoid
-	flashing and async realoading of all thumbnails.
-
-* libnautilus-private/nautilus-directory-async.c:
-	(mime_db_changed_callback):
-	Use the right call to invalidate attributes, so that
-	they get re-read correctly.
---- libnautilus-private/nautilus-icon-factory.c	2007/10/02 13:28:27	13248
-+++ libnautilus-private/nautilus-icon-factory.c	2007/10/02 13:28:59	13249
-@@ -200,7 +200,7 @@
- 							  const char               *modifier,
- 							  guint                     nominal_size,
- 							  gboolean		    force_nominal);
--static void nautilus_icon_factory_clear                  (void);
-+static void nautilus_icon_factory_clear                  (gboolean                  clear_pathnames);
- 
- GNOME_CLASS_BOILERPLATE (NautilusIconFactory,
- 			 nautilus_icon_factory,
-@@ -270,7 +270,7 @@
- {
- 	NautilusIconFactory *factory;
- 
--	nautilus_icon_factory_clear ();
-+	nautilus_icon_factory_clear (FALSE);
- 
- 	factory = user_data;
- 
-@@ -726,9 +726,23 @@
-         return TRUE;
- }
- 
--/* Reset the cache to the default state. */
-+static gboolean
-+remove_non_pathnames (gpointer _key, gpointer value, gpointer user_data)
-+{
-+	CacheKey *key = _key;
-+	
-+	if (key->name && key->name[0] == '/') {
-+		return FALSE;
-+	}
-+	    
-+        return TRUE; /* Tell the caller to remove the hash table entry. */
-+}
-+
-+/* Reset the cache to the default state.
-+   Clear pathnames can be set to FALSE which means we only clear icon names, not
-+   absolute pathnames. This is useful to avoid throwing away all loaded thumbnails. */
- static void
--nautilus_icon_factory_clear (void)
-+nautilus_icon_factory_clear (gboolean clear_pathnames)
- {
- 	NautilusIconFactory *factory;
- 	CircularList *head;
-@@ -736,24 +750,25 @@
- 	factory = get_icon_factory ();
- 
-         g_hash_table_foreach_remove (factory->icon_cache,
--				     remove_all,
-+				     clear_pathnames ? remove_all : remove_non_pathnames,
-                                      NULL);
- 	
- 	/* Empty out the recently-used list. */
- 	head = &factory->recently_used_dummy_head;
- 
--	/* fallback_icon hangs around, but we don't know if it
--	 * was ever inserted in the list
--	 */
--	g_assert (factory->recently_used_count == 0 ||
--		  factory->recently_used_count == 1);
--
--	if (factory->recently_used_count == 1) {
--		/* make sure this one is the fallback_icon */
--		g_assert (head->next == head->prev);
--		g_assert (&factory->fallback_icon->recently_used_node == head->next);
-+	if (clear_pathnames) {
-+		/* fallback_icon hangs around, but we don't know if it
-+		 * was ever inserted in the list
-+		 */
-+		g_assert (factory->recently_used_count == 0 ||
-+			  factory->recently_used_count == 1);
-+		if (factory->recently_used_count == 1) {
-+			/* make sure this one is the fallback_icon */
-+			g_assert (head->next == head->prev);
-+			g_assert (&factory->fallback_icon->recently_used_node == head->next);
-+		}
- 	}
--
-+		
- }
- 
- static void
-@@ -806,7 +821,7 @@
- 	 * signal to mean only "thumbnails might have changed" if this ends up being slow
- 	 * for some reason.
- 	 */
--	nautilus_icon_factory_clear ();
-+	nautilus_icon_factory_clear (TRUE);
- 	g_signal_emit (global_icon_factory,
- 			 signals[ICONS_CHANGED], 0);
- }
-@@ -820,7 +835,7 @@
- 	 * signal to mean only "thumbnails might have changed" if this ends up being slow
- 	 * for some reason.
- 	 */
--	nautilus_icon_factory_clear ();
-+	nautilus_icon_factory_clear (TRUE);
- 	g_signal_emit (global_icon_factory,
- 			 signals[ICONS_CHANGED], 0);
- }
-@@ -830,7 +845,7 @@
- {
- 	show_image_thumbs = eel_preferences_get_enum (NAUTILUS_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS);
- 
--	nautilus_icon_factory_clear ();
-+	nautilus_icon_factory_clear (TRUE);
- 	/* If the user disabled thumbnailing, remove all outstanding thumbnails */ 
- 	if (show_image_thumbs == NAUTILUS_SPEED_TRADEOFF_NEVER) {
- 		nautilus_thumbnail_remove_all_from_queue ();
-@@ -848,7 +863,7 @@
- 	/* We don't know which data changed, so we have to assume that
- 	 * any or all icons might have changed.
- 	 */
--	nautilus_icon_factory_clear ();
-+	nautilus_icon_factory_clear (FALSE);
- 	g_signal_emit (get_icon_factory (), 
- 			 signals[ICONS_CHANGED], 0);
- }				 
---- libnautilus-private/nautilus-directory-async.c	2007/10/02 13:28:27	13248
-+++ libnautilus-private/nautilus-directory-async.c	2007/10/02 13:28:59	13249
-@@ -594,7 +594,7 @@
- 		NAUTILUS_FILE_ATTRIBUTE_FILE_TYPE |
- 		NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_MIME_TYPES;
- 
--	nautilus_directory_invalidate_file_attributes (dir, attrs);
-+	nautilus_directory_force_reload_internal (dir, attrs);
- }
- 
- void
diff --git a/gnome-base/nautilus/files/nautilus-2.22.3-open-folder.patch b/gnome-base/nautilus/files/nautilus-2.22.3-open-folder.patch
deleted file mode 100644
index 1622374851e9..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.22.3-open-folder.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -up nautilus-2.22.2/libnautilus-private/nautilus-autorun.c.fix-open-folder nautilus-2.22.2/libnautilus-private/nautilus-autorun.c
---- nautilus-2.22.2/libnautilus-private/nautilus-autorun.c.fix-open-folder	2008-04-17 22:30:04.000000000 -0400
-+++ nautilus-2.22.2/libnautilus-private/nautilus-autorun.c	2008-04-17 22:30:10.000000000 -0400
-@@ -1200,15 +1200,6 @@ typedef struct {
- 	gpointer user_data;
- } AutorunData;
- 
--
--static void
--autorun_open_folder_for_mount (AutorunData *data)
--{
--	if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_MEDIA_AUTOMOUNT_OPEN) && 
--	    data->open_window_func != NULL)
--		data->open_window_func (data->mount, data->user_data);
--}
--
- static void
- autorun_guessed_content_type_callback (GObject *source_object,
- 				       GAsyncResult *res,
-@@ -1237,13 +1228,14 @@ autorun_guessed_content_type_callback (G
- 			}
- 			g_strfreev (guessed_content_type);
- 		} else {
--			open_folder = TRUE;
-+			if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_MEDIA_AUTOMOUNT_OPEN))
-+				open_folder = TRUE;
- 		}
- 	}
- 
- 	/* only open the folder once.. */
--	if (open_folder) {
--		autorun_open_folder_for_mount (data);
-+	if (open_folder && data->open_window_func != NULL) {
-+		data->open_window_func (data->mount, data->user_data);
- 	}
- 
- 	g_object_unref (data->mount);
diff --git a/gnome-base/nautilus/files/nautilus-2.22.3-preserve-metadata.patch b/gnome-base/nautilus/files/nautilus-2.22.3-preserve-metadata.patch
deleted file mode 100644
index 6a00eeb83756..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.22.3-preserve-metadata.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru nautilus-2.22.1.orig/libnautilus-private/nautilus-file-operations.c nautilus-2.22.1/libnautilus-private/nautilus-file-operations.c
---- nautilus-2.22.1.orig/libnautilus-private/nautilus-file-operations.c	2008-03-28 08:13:32.000000000 -0400
-+++ nautilus-2.22.1/libnautilus-private/nautilus-file-operations.c	2008-04-05 16:24:39.674861333 -0400
-@@ -3245,7 +3245,7 @@
-  retry:
- 	
- 	error = NULL;
--	flags = G_FILE_COPY_NOFOLLOW_SYMLINKS;
-+	flags = G_FILE_COPY_NOFOLLOW_SYMLINKS | G_FILE_COPY_ALL_METADATA;
- 	if (overwrite) {
- 		flags |= G_FILE_COPY_OVERWRITE;
- 	}
diff --git a/gnome-base/nautilus/files/nautilus-2.22.3-prevent-recursive-mvcp.patch b/gnome-base/nautilus/files/nautilus-2.22.3-prevent-recursive-mvcp.patch
deleted file mode 100644
index 128475e08cf8..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.22.3-prevent-recursive-mvcp.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Index: libnautilus-private/nautilus-file-operations.c
-===================================================================
---- libnautilus-private/nautilus-file-operations.c	(revision 14108)
-+++ libnautilus-private/nautilus-file-operations.c	(working copy)
-@@ -3224,6 +3224,24 @@
- 	}
- }
- 
-+static gboolean
-+g_file_struct_contains (GFile *child, GFile *root)
-+{
-+    GFile *f;
-+    
-+    f = g_file_dup (child);
-+    while (f) {
-+	if (g_file_equal (f, root)) {
-+	    g_object_unref (f);
-+	    return TRUE;
-+	}
-+	f = g_file_get_parent (f);
-+    }
-+    
-+    if (f)  g_object_unref (f);
-+    return FALSE;
-+}
-+
- /* Debuting files is non-NULL only for toplevel items */
- static void
- copy_move_file (CopyMoveJob *copy_job,
-@@ -3264,6 +3282,41 @@
- 		dest = get_target_file (src, dest_dir, same_fs);
- 	}
- 
-+
-+	/* Don't allow recursive move/copy into itself.  
-+         * (We would get a file system error if we proceeded but it is nicer to 
-+         * detect and report it at this level) */
-+	if (g_file_struct_contains (dest_dir, src)) {
-+		if (job->skip_all_error) {
-+			g_error_free (error);
-+			goto out;
-+		}
-+		
-+		/*  the run_warning() frees all strings passed in automatically  */
-+		primary = copy_job->is_move ? g_strdup (_("You cannot move a folder into itself."))
-+					    : g_strdup (_("You cannot copy a folder into itself."));
-+		secondary = g_strdup (_("The destination folder is inside the source folder."));
-+		
-+		response = run_warning (job,
-+					primary,
-+					secondary,
-+					NULL,
-+					GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
-+					NULL);
-+
-+		if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
-+			abort_job (job);
-+		} else if (response == 1) { /* skip all */
-+			job->skip_all_error = TRUE;
-+		} else if (response == 2) { /* skip */
-+			/* do nothing */
-+		} else {
-+			g_assert_not_reached ();
-+		}
-+
-+		goto out;
-+	}
-+	
-  retry:
- 	
- 	error = NULL;
-@@ -3791,6 +3844,41 @@
- 	
- 	dest = get_target_file (src, dest_dir, same_fs);
- 
-+
-+	/* Don't allow recursive move/copy into itself.  
-+         * (We would get a file system error if we proceeded but it is nicer to 
-+         * detect and report it at this level) */
-+	if (g_file_struct_contains (dest_dir, src)) {
-+		if (job->skip_all_error) {
-+			g_error_free (error);
-+			goto out;
-+		}
-+		
-+		/*  the run_warning() frees all strings passed in automatically  */
-+		primary = move_job->is_move ? g_strdup (_("You cannot move a folder into itself."))
-+					    : g_strdup (_("You cannot copy a folder into itself."));
-+		secondary = g_strdup (_("The destination folder is inside the source folder."));
-+		
-+		response = run_warning (job,
-+					primary,
-+					secondary,
-+					NULL,
-+					GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
-+					NULL);
-+		
-+		if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
-+			abort_job (job);
-+		} else if (response == 1) { /* skip all */
-+			job->skip_all_error = TRUE;
-+		} else if (response == 2) { /* skip */
-+			/* do nothing */
-+		} else {
-+			g_assert_not_reached ();
-+		}
-+
-+		goto out;
-+	}
-+
-  retry:
- 	
- 	flags = G_FILE_COPY_NOFOLLOW_SYMLINKS | G_FILE_COPY_NO_FALLBACK_FOR_MOVE;
diff --git a/gnome-base/nautilus/files/nautilus-2.22.5-ask-what-to-do.patch b/gnome-base/nautilus/files/nautilus-2.22.5-ask-what-to-do.patch
deleted file mode 100644
index 16b74a78ac79..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.22.5-ask-what-to-do.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nautilus-2.22.2/libnautilus-private/apps_nautilus_preferences.schemas.in.orig	2008-05-02 14:05:28.000000000 -0400
-+++ nautilus-2.22.2/libnautilus-private/apps_nautilus_preferences.schemas.in	2008-05-02 14:08:30.000000000 -0400
-@@ -122,7 +122,7 @@
-       <owner>nautilus</owner>
-       <type>list</type>
-       <list_type>string</list_type>
--      <default>[]</default>
-+      <default>[x-content/audio-cdda,x-content/video-dvd,x-content/audio-player,x-content/image-dcf,x-content/video-vcd,x-content/video-svcd,x-content/image-picturecd,x-content/video-hddvd,x-content/audio-dvd,x-content/blank-bd,x-content/blank-cd,x-content/blank-dvd,x-content/blank-hddvd,x-content/video-bluray]</default>
-       <locale name="C">
-          <short>List of x-content/* types to ask the user what to do on insertion</short>
-          <long>
diff --git a/gnome-base/nautilus/files/nautilus-2.22.5.1-exempi.patch b/gnome-base/nautilus/files/nautilus-2.22.5.1-exempi.patch
deleted file mode 100644
index 2942fab3f42e..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.22.5.1-exempi.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- configure.in.old	2008-07-04 17:51:51.000000000 +0200
-+++ configure.in	2008-07-04 18:00:12.000000000 +0200
-@@ -255,16 +255,26 @@
- 
- dnl exempi checking
- 
--PKG_CHECK_MODULES(EXEMPI, exempi-2.0 >= exempi_minver, [
--		  AM_CONDITIONAL(HAVE_EXEMPI, true)
--		  AC_DEFINE(HAVE_EXEMPI, 1, [Define to enable XMP support])
--		  ], [AM_CONDITIONAL(HAVE_EXEMPI, false)])
-+AM_CONDITIONAL(HAVE_EXEMPI, false)
- 
--PKG_CHECK_MODULES(EXEMPI_NEW_API, exempi-2.0 >= exempi_minver_newapi,
-+AC_ARG_ENABLE(xmp, 
-+	AC_HELP_STRING([--disable-xmp], 
-+			[build without xmp support]))
-+msg_xmp=no
-+if test "x$enable_xmp" != "xno"; then
-+	PKG_CHECK_MODULES(EXEMPI, exempi-2.0 >= exempi_minver, [
-+		  	  AM_CONDITIONAL(HAVE_EXEMPI, true)
-+			  AC_DEFINE(HAVE_EXEMPI, 1, [Define to enable xmp support])
-+			  ]
-+                          msg_xmp=yes,
-+	          	  [AM_CONDITIONAL(HAVE_EXEMPI, false)])
-+
-+	PKG_CHECK_MODULES(EXEMPI_NEW_API, exempi-2.0 >= exempi_minver_newapi,
- 		  AC_DEFINE(HAVE_EXEMPI_NEW_API, 1, [Define if we have exempi with the new API]), true)
- 
--AC_SUBST(EXEMPI_CFLAGS)
--AC_SUBST(EXEMPI_LIBS)
-+	AC_SUBST(EXEMPI_CFLAGS)
-+	AC_SUBST(EXEMPI_LIBS)
-+fi
- 
- dnl ==========================================================================
- dnl search implementations
diff --git a/gnome-base/nautilus/files/nautilus-2.22.5.1-fix-stat-include.patch b/gnome-base/nautilus/files/nautilus-2.22.5.1-fix-stat-include.patch
deleted file mode 100644
index 362b15aea20c..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.22.5.1-fix-stat-include.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fixed on trunk with
-http://svn.gnome.org/viewvc/nautilus/trunk/libnautilus-private/nautilus-emblem-utils.c?r1=14319&r2=14357&view=patch
-and
-http://svn.gnome.org/viewvc/nautilus/trunk/libnautilus-private/nautilus-file.c?r1=14318&r2=14319
-so shouldn't be necessary for nautilus-2.24 onwards
-
---- libnautilus-private/nautilus-emblem-utils.c.orig	2008-09-28 11:40:05.284668861 +0300
-+++ libnautilus-private/nautilus-emblem-utils.c	2008-09-28 11:40:12.617466465 +0300
-@@ -30,6 +30,8 @@
- #include <string.h>
- #include <time.h>
- #include <unistd.h>
-+#include <sys/stat.h>
-+
- #include "nautilus-file.h"
- #include <eel/eel-glib-extensions.h>
- #include <eel/eel-gdk-pixbuf-extensions.h>
---- libnautilus-private/nautilus-file.c.orig	2008-09-28 11:49:33.990743377 +0300
-+++ libnautilus-private/nautilus-file.c	2008-09-28 11:50:20.917404516 +0300
-@@ -56,6 +56,7 @@
- #include <grp.h>
- #include <gtk/gtksignal.h>
- #include <glib/gi18n.h>
-+#include <glib/gstdio.h>
- #include <gio/gio.h>
- #include <glib/gurifuncs.h>
- #include <libgnome/gnome-macros.h>
diff --git a/gnome-base/nautilus/nautilus-2.20.0-r1.ebuild b/gnome-base/nautilus/nautilus-2.20.0-r1.ebuild
deleted file mode 100644
index 6bf65fc49f58..000000000000
--- a/gnome-base/nautilus/nautilus-2.20.0-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.20.0-r1.ebuild,v 1.12 2009/03/09 23:55:52 eva Exp $
-
-inherit virtualx eutils gnome2 autotools
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/projects/nautilus/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="arm sh"
-IUSE="beagle esd gnome tracker"
-# cups flac gstreamer mad ogg vorbis
-
-RDEPEND=">=media-libs/libart_lgpl-2.3.10
-	>=gnome-base/libbonobo-2.1
-	>=gnome-base/eel-2.15.92
-	esd? ( >=media-sound/esound-0.2.27 )
-	>=dev-libs/glib-2.13
-	>=gnome-base/gnome-desktop-2.9.91
-	>=gnome-base/libgnome-2.14.0
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/gnome-vfs-2.19.3
-	>=gnome-base/orbit-2.4
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.11.6
-	>=gnome-base/librsvg-2.0.1
-	>=dev-libs/libxml2-2.4.7
-	>=x11-libs/startup-notification-0.8
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2
-	media-libs/audiofile
-	beagle? ( =app-misc/beagle-0.2* )
-	x86? ( tracker? ( >=app-misc/tracker-0.0.1 ) )
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-proto/xproto
-	virtual/eject"
-#	!gstreamer? ( vorbis? ( media-sound/vorbis-tools ) )
-#	gstreamer? (
-#		>=media-libs/gstreamer-0.8
-#		>=media-libs/gst-plugins-0.8
-#		>=media-plugins/gst-plugins-gnomevfs-0.8
-#		mad? ( >=media-plugins/gst-plugins-mad-0.8 )
-#		ogg? ( >=media-plugins/gst-plugins-ogg-0.8 )
-#		vorbis? ( >=media-plugins/gst-plugins-vorbis-0.8 )
-#		flac? (	>=media-plugins/gst-plugins-flac-0.8 ) )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9"
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-pkg_setup() {
-	G2CONF="--disable-update-mimedb $(use_enable beagle) $(use_enable tracker) $(use_enable esd esound)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	epatch "${FILESDIR}/${P}-sound-preview-cleanup.patch"
-	epatch "${FILESDIR}/${P}-statfs.patch"
-
-	# Patches from unreleased 2.20.1
-	epatch "${FILESDIR}/${P}-async-thumbnail-framing.patch"
-	epatch "${FILESDIR}/${P}-thumbnail-flashing.patch"
-	epatch "${FILESDIR}/${P}-small-font-crasher.patch"
-
-	# Fix for autoconf 2.62, see Gnome Bug #527315
-	epatch "${FILESDIR}/${PN}-2.20.0-fix_broken_configure.patch"
-
-	eautoreconf
-}
-
-src_test() {
-	addwrite "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	Xmake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "nautilus now has three ways of previewing sound.  First, if the esd"
-	elog "USE flag is given, it will attempt to play directly via esd.  If"
-	elog "the esd USE flag is *not* given, it will attempt to use totem to"
-	elog "play the sound.  If totem is not installed, it will attempt to use"
-	elog "gstreamer 10.x to play the sound.  If gstreamer 10.x is not installed"
-	elog "it will fail to preview the sound."
-}
diff --git a/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild b/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild
deleted file mode 100644
index 248002b76625..000000000000
--- a/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild,v 1.9 2009/02/06 03:00:34 jer Exp $
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/projects/nautilus/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="beagle gnome tracker"
-
-RDEPEND=">=x11-libs/startup-notification-0.8
-		 >=gnome-base/libbonobo-2.1
-		 >=gnome-base/eel-2.21.90
-		 >=dev-libs/glib-2.15.6
-		 >=gnome-base/gnome-desktop-2.10
-		 >=gnome-base/orbit-2.4
-		 >=x11-libs/pango-1.1.2
-		 >=x11-libs/gtk+-2.11.6
-		 >=gnome-base/librsvg-2.0.1
-		 >=dev-libs/libxml2-2.4.7
-		 >=media-libs/libexif-0.5.12
-		 >=gnome-base/gconf-2.0
-		 >=gnome-base/gvfs-0.1.2
-		 beagle? ( || (
-			dev-libs/libbeagle
-			=app-misc/beagle-0.2*
-			) )
-		 tracker? ( >=app-misc/tracker-0.6.4 )
-		 >=gnome-base/libgnome-2.14
-		 >=gnome-base/libgnomeui-2.6"
-DEPEND="${RDEPEND}
-		  sys-devel/gettext
-		>=dev-util/pkgconfig-0.9
-		>=dev-util/intltool-0.35"
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-pkg_setup() {
-	G2CONF="--disable-update-mimedb --disable-xmp $(use_enable beagle) $(use_enable tracker)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# bug #229719, #229723
-	epatch "${FILESDIR}/${PN}-2.22.3-open-folder.patch"
-	epatch "${FILESDIR}/${PN}-2.22.3-prevent-recursive-mvcp.patch"
-
-	# "Ask what to do" by default, bug #229725
-	epatch "${FILESDIR}/${PN}-2.22.5-ask-what-to-do.patch"
-
-	# Build fix
-	epatch "${FILESDIR}/${P}-fix-stat-include.patch"
-
-	# Fix automagic exempi detection, bug #206041
-	epatch "${FILESDIR}/${P}-exempi.patch"
-
-	eautoreconf
-}
-
-src_test() {
-	addwrite "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "nautilus can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview"
-}
diff --git a/gnome-base/nautilus/nautilus-2.24.2-r1.ebuild b/gnome-base/nautilus/nautilus-2.24.2-r1.ebuild
deleted file mode 100644
index 4b2f6aa3a15a..000000000000
--- a/gnome-base/nautilus/nautilus-2.24.2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.24.2-r1.ebuild,v 1.1 2009/03/09 23:55:52 eva Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/projects/nautilus/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="beagle doc gnome tracker xmp"
-
-RDEPEND=">=gnome-base/libbonobo-2.1
-	>=gnome-base/eel-2.24.0
-	>=dev-libs/glib-2.17.5
-	>=gnome-base/gnome-desktop-2.10
-	>=gnome-base/libgnome-2.14
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/orbit-2.4
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.13.0
-	>=gnome-base/librsvg-2.0.1
-	>=dev-libs/libxml2-2.4.7
-	>=x11-libs/startup-notification-0.8
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2.0
-	>=gnome-base/gvfs-0.1.2
-	beagle? ( || (
-		dev-libs/libbeagle
-		=app-misc/beagle-0.2* ) )
-	tracker? ( >=app-misc/tracker-0.6.4 )
-	xmp? ( >=media-libs/exempi-2 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		$(use_enable beagle)
-		$(use_enable tracker)
-		$(use_enable xmp)"
-}
-
-src_prepare() {
-	# Fix update of scrollbars, bug #260965
-	epatch "${FILESDIR}/${P}-scrollbars.patch"
-}
-
-src_test() {
-	addwrite "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "nautilus can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview"
-}
diff --git a/gnome-base/nautilus/nautilus-2.24.2-r2.ebuild b/gnome-base/nautilus/nautilus-2.26.2.ebuild
index de25fd7cd47d..b72c02ef3c55 100644
--- a/gnome-base/nautilus/nautilus-2.24.2-r2.ebuild
+++ b/gnome-base/nautilus/nautilus-2.26.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.24.2-r2.ebuild,v 1.1 2009/03/21 12:59:21 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.26.2.ebuild,v 1.1 2009/05/10 20:49:48 eva Exp $
 
 EAPI="2"
 
@@ -11,24 +11,22 @@ HOMEPAGE="http://www.gnome.org/projects/nautilus/"
 
 LICENSE="GPL-2 LGPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="beagle doc gnome tracker xmp"
 
-RDEPEND=">=gnome-base/libbonobo-2.1
-	>=gnome-base/eel-2.24.0
-	>=dev-libs/glib-2.17.5
-	>=gnome-base/gnome-desktop-2.10
-	>=gnome-base/libgnome-2.14
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/orbit-2.4
+# not adding gnome-base/gail because it is in gtk+
+RDEPEND=">=dev-libs/glib-2.19.0
+	>=gnome-base/gnome-desktop-2.25.5
 	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.13.0
-	>=gnome-base/librsvg-2.0.1
+	>=x11-libs/gtk+-2.16.0
 	>=dev-libs/libxml2-2.4.7
-	>=x11-libs/startup-notification-0.8
 	>=media-libs/libexif-0.5.12
 	>=gnome-base/gconf-2.0
 	>=gnome-base/gvfs-0.1.2
+	dev-libs/libunique
+	dev-libs/dbus-glib
+	x11-libs/libXft
+	x11-libs/libXrender
 	beagle? ( || (
 		dev-libs/libbeagle
 		=app-misc/beagle-0.2* ) )
@@ -36,10 +34,13 @@ RDEPEND=">=gnome-base/libbonobo-2.1
 	xmp? ( >=media-libs/exempi-2 )"
 
 DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.4 )"
+	>=dev-util/intltool-0.40.1
+	doc? ( >=dev-util/gtk-doc-1.4 )
+	gnome-base/gnome-common
+	dev-util/gtk-doc-am"
 
 PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
 
@@ -48,20 +49,28 @@ DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
 pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-update-mimedb
+		--disable-packagekit
 		$(use_enable beagle)
 		$(use_enable tracker)
 		$(use_enable xmp)"
 }
 
 src_prepare() {
-	# Fix update of scrollbars, bug #260965
-	epatch "${FILESDIR}/${P}-scrollbars.patch"
+	gnome2_src_prepare
 
-	# Fix preview on playlists, bug #263162
-	epatch "${FILESDIR}/${P}-playlist-preview.patch"
+	# FIXME: tarball generated with broken gtk-doc, revisit me.
+	if use doc; then
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
+			-i gtk-doc.make || die "sed 1 failed"
+	else
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/bin/true" \
+			-i gtk-doc.make || die "sed 2 failed"
+	fi
 
-	# Fix non asyncness in custom icon filechooser, bug #263165
-	epatch "${FILESDIR}/${P}-filechooser-icon.patch"
+	# gtk-doc-am and gnome-common needed for this
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
 }
 
 src_test() {