Clean up old revisions.

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

13 files changed, 25 insertions, 748 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 955e81bf492e..1dab9b66d06a 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.360 2010/10/17 15:15:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.361 2010/10/21 21:48:55 eva Exp $
+
+  21 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/nautilus-2.24.2-filechooser-icon.patch,
+  -files/nautilus-2.24.2-playlist-preview.patch,
+  -files/nautilus-2.24.2-scrollbars.patch,
+  -files/nautilus-2.24.2-thumbnail-scaling.patch,
+  -files/nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch,
+  -files/nautilus-2.26.3-thumbnail-zoom-level.patch,
+  -nautilus-2.26.4-r1.ebuild,
+  -files/nautilus-2.26.4-file-roller-drag-n-drop.patch,
+  -nautilus-2.28.4-r1.ebuild, -nautilus-2.28.4-r2.ebuild, metadata.xml:
+  Clean up old revisions.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org> nautilus-2.30.1-r1.ebuild:
   alpha/ia64/sh/sparc stable wrt #324077
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 1ae0768d7fde..8ec5b9ff25d7 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,22 +1,20 @@
-AUX nautilus-2.24.2-filechooser-icon.patch 1630 RMD160 8f7fc892670a5b85f0a176bff89199c5a09e1a69 SHA1 defb885cbe8ba014d8787a08b3c703ed54ee829b SHA256 e86ac2512ae66ba3b4ec285f0a88b58387e64d3490c4172f03fd846881ebcb2f
-AUX nautilus-2.24.2-playlist-preview.patch 1036 RMD160 16e9a0239f1f162cb9683cf08f0d9e1b2c46230f SHA1 31ddf4cb3a1eb940aebedbbed9b4822759d361f5 SHA256 cddf52194fc6ae542dbb58b047fd5b65f20eb874f0468ec448b35ec0a6bd498a
-AUX nautilus-2.24.2-scrollbars.patch 732 RMD160 6856d895ec70d6e24f3bd3f112141dceb25eb896 SHA1 62570bad726066dd0238aee0a203fa3895f3a556 SHA256 93f5dacec1a88fbbdb32fe75fde52301053f5c29aadb483ad1d59fb7c107b344
-AUX nautilus-2.24.2-thumbnail-scaling.patch 2597 RMD160 b82748147f709118b060224a0458f16f74d7ddd9 SHA1 eb22ebc617d615832c943f2b24811ae08cb88304 SHA256 7948ae9ef56bf8c6e9d296ba741472fe8ad6faae8adb8f98e96b4002c3302f42
-AUX nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch 1421 RMD160 e4d745be6f938f5390fba74db0645534f60d9207 SHA1 21906f957df5b2f93ab6b34223405dd5f594b12e SHA256 687040243006b5698ec062305cb26bf5cd80c9ce1b8bc67f3025af134d3a242a
-AUX nautilus-2.26.3-thumbnail-zoom-level.patch 3411 RMD160 296a997116f96100d067c6dfd7a6e936c2946d90 SHA1 e2477c779e182f6609e08167ceafab54d081fd79 SHA256 400d809f16d0dd470ea287cd288ed378c2afcbf45ead48639d7b5b1b0a71828c
-AUX nautilus-2.26.4-file-roller-drag-n-drop.patch 2746 RMD160 0c2d7bc4627c840a167db6b3f852c7d19996647d SHA1 9bcb0b677714c924b3c31b6d22c7581dd7fac4a5 SHA256 b107464ef573c7d1036eb10562b5d62faf015d8ced9fb335d4639fdcb8c93b33
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nautilus-2.27.4-change-reg-desktop-file-with-no-desktop.patch 1396 RMD160 7efbc47c5f4ac647a15a56a26f80898e8ec896d0 SHA1 24f5281406066fc7fd5ffda23a061144c3667fe1 SHA256 ae9f91dddbbe2d562f5f21786daec6468b8788ece48419cce438d13201eef251
 AUX nautilus-2.30.1-remove-eel-gdk-window-focus.patch 2138 RMD160 7e10b009e6b137e99fac1566d5b51bc26ab8b88d SHA1 4fc6911c5060fd38d0b8958e734a1d511fc66439 SHA256 3ee7e7152e9a6fda1604c1eccaf8f5c5a1bd638e0f109f669c7d476d7f1c825c
 AUX nautilus-2.30.1-unmount-entries.patch 3048 RMD160 06ff25300206c097e7589221b0875847a63ac454 SHA1 b4090aecb652825b36a860fcd70583225489b934 SHA256 95a60074602cfb5c3855474c4f7c35e3814fe1c536a2d8a404ef1211fa0e85c3
-DIST nautilus-2.26.4.tar.bz2 5815912 RMD160 4af723021ece1fb9a37bd3bcc2de903b6c7dca61 SHA1 7eab587e0b88e3eab8196f64596207a1dc1c4b33 SHA256 63dc4f76925f73bf17aafcffbac87f272ac2a13fb098c8ddf5bd70cd80a6ab58
-DIST nautilus-2.28.4.tar.bz2 6045403 RMD160 8960342fa3a6f976e283f338c060896d67a4c028 SHA1 f6db915e725e6f45cd2d3f933eb251499dccf038 SHA256 3aceda1c36acda20a0f9ce75165a31b1285a7aca2097d0583e340ccb2b01ea87
 DIST nautilus-2.30.1.tar.bz2 6156330 RMD160 285e0b9d000725b11013ed6f8e98db59573b83dc SHA1 232afa5d7d977714667645adff1f952989edc185 SHA256 83df19591c4d0d359fe67d16b3f73f71e6a2aa5ba7d477739276c7562f221144
 DIST nautilus-2.32.0.tar.bz2 6173234 RMD160 b10610c464de97fd3104064cf826a204cbe109ee SHA1 0de7d4fc69754a734cb1bd71cf2343bd476faea8 SHA256 079cb4bc8c5afc012acc54b17f91b7673dcd3e3916224129b15a81eab553f192
-EBUILD nautilus-2.26.4-r1.ebuild 2831 RMD160 a80a223d7cd31e3793a9d5e3964be86d6d688211 SHA1 4a3a13bd69a57340b985fe5e59d925c494033277 SHA256 a96b85bfde3fb3baf72cc4e180d93b523d773acc7984fa4ed05f97dcfa87577c
-EBUILD nautilus-2.28.4-r1.ebuild 2718 RMD160 737f27cea2f968dbff43c41c68f71dd39285c59e SHA1 c894791185f958272c5878e524bd9c5e2c9c2f44 SHA256 6054f88481878b70ab5af9f6d80cc2fc6d14c02d469638ac479339bfbeec51a5
-EBUILD nautilus-2.28.4-r2.ebuild 2771 RMD160 608c3666d66fc6d13cf0515d013f1f306d99f121 SHA1 6cad9d3b579b73442badf56d2772d430fdf442c6 SHA256 b118ba1358d77712b7176f831b8512deb39b746cc4604a62575e5126f7d04b48
 EBUILD nautilus-2.30.1-r1.ebuild 2226 RMD160 b753896594c20014f1446d57c9e31ecc71e0ab39 SHA1 f9315e746de7aa062cd86844faf37f563e7f44d9 SHA256 c27b5a1f16dd97202ad3ce240a8ce92340903ef72e571b0415d90a8924031115
 EBUILD nautilus-2.30.1-r2.ebuild 2342 RMD160 6f0f3fc776e210a41abcfa0e597728b93c83c1d1 SHA1 b7ad8bd886849c0b1cae1cea0a4d6aea25751f59 SHA256 e199e71ae5dc43560f4c0542d8e5097d78ed437bed98889bd80d5b91ca34212f
 EBUILD nautilus-2.32.0.ebuild 2304 RMD160 a770e0d18c62db9c1fb4c5b3cbfd308c6d40e32e SHA1 e563400aa0a4f8d643dc83971c2ffb214bf9a55d SHA256 8a97b0d6f72b4753aeb04fa7bd4351e76eec6dc4c2e4f6cdccf3c189c6e0f5e9
-MISC ChangeLog 52689 RMD160 6ffc52f08d2cc609490c5dd417f34aa0b826d1f5 SHA1 ad7631468057c0d5d2771c07f3552060a6cc5b64 SHA256 5942fac096723ad5b481f8c3b40600958f4242d6dc99efe04af833ee8f783702
-MISC metadata.xml 521 RMD160 d96f86d4617ef74d222441c6fdb9d27725d7b145 SHA1 3bf54c1a12d7c9b8ad17e730dcb9b7e9f641074f SHA256 052015cd4affc19f6aa3340fb12ff176eb922f6236d4e764b7750a3034cf5acc
+MISC ChangeLog 53240 RMD160 f92f2e38f36ef3f07c200441e30b73246c6bb4e8 SHA1 c9638b127504b29842b6380382a8be499fa7efcc SHA256 72f7961106c1150fd1cd129fed0ad68fb41b88564df4814d3b4f56af5acb95c7
+MISC metadata.xml 274 RMD160 4a3e5603446a099b3e704fccbc8ccbd78a2660a1 SHA1 4215e0c0bb615596928a5a5fd7ec06b588d2b4b3 SHA256 d0e640b1d069f6546748707f63dc6c709546026b09ab863b26c77c041185002e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzAtU0ACgkQ1fmVwcYIWAaLmQCfe23bsRH/J+6XjMODX28YkhDV
+HZYAoKg/6/mR4zqG7pRmk213YrMHrTm+
+=xXt5
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/nautilus-2.24.2-filechooser-icon.patch b/gnome-base/nautilus/files/nautilus-2.24.2-filechooser-icon.patch
deleted file mode 100644
index a2fcb5aa42c0..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.24.2-filechooser-icon.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-# https://bugzilla.gnome.org/show_bug.cgi?id=575344
-# https://bugs.gentoo.org/show_bug.cgi?id=263165
---- a/src/file-manager/fm-properties-window.c	2009/03/08 00:33:28	15067
-+++ b/src/file-manager/fm-properties-window.c	2009/03/20 14:35:04	15145
-@@ -5677,6 +5677,31 @@
- }
- 
- static void
-+custom_icon_file_chooser_response_cb (GtkDialog *dialog,
-+				      gint response,
-+				      FMPropertiesWindow *window)
-+{
-+	char *uri;
-+
-+	switch (response) {
-+	case GTK_RESPONSE_NO:
-+		reset_icon (window);
-+		break;
-+
-+	case GTK_RESPONSE_OK:
-+		uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
-+		set_icon (uri, window);
-+		g_free (uri);
-+		break;
-+
-+	default:
-+		break;
-+	}
-+
-+	gtk_widget_hide (GTK_WIDGET (dialog));
-+}
-+
-+static void
- select_image_button_callback (GtkWidget *widget,
- 			      FMPropertiesWindow *window)
- {
-@@ -5684,8 +5709,8 @@
- 	GtkFileFilter *filter;
- 	GList *l;
- 	NautilusFile *file;
--	char *image_path;
- 	char *uri;
-+	char *image_path;
- 	gboolean revert_is_sensitive;
- 
- 	g_assert (FM_IS_PROPERTIES_WINDOW (window));
-@@ -5751,22 +5776,9 @@
- 	}
- 	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_NO, revert_is_sensitive);
- 
--	switch (gtk_dialog_run (GTK_DIALOG (dialog))) {
--	case GTK_RESPONSE_NO:
--		reset_icon (window);
--		break;
--
--	case GTK_RESPONSE_OK:
--		uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
--		set_icon (uri, window);
--		g_free (uri);
--		break;
--
--	default:
--		break;
--	}
--
--	gtk_widget_hide (dialog);
-+	g_signal_connect (dialog, "response",
-+			  G_CALLBACK (custom_icon_file_chooser_response_cb), window);
-+	gtk_widget_show (dialog);
- }
- 
- static void
diff --git a/gnome-base/nautilus/files/nautilus-2.24.2-playlist-preview.patch b/gnome-base/nautilus/files/nautilus-2.24.2-playlist-preview.patch
deleted file mode 100644
index 489604966c84..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.24.2-playlist-preview.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-# https://bugzilla.gnome.org/show_bug.cgi?id=575345
-# https://bugs.gentoo.org/show_bug.cgi?id=263162
---- a/src/file-manager/nautilus-audio-mime-types.h	(revision 15140)
-+++ b/src/file-manager/nautilus-audio-mime-types.h	(working copy)
-@@ -1,6 +1,6 @@
- /* 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[] = {
-+static const char *audio_mime_types[] = {
- "audio/3gpp",
- "audio/ac3",
- "audio/AMR",
-@@ -9,18 +9,18 @@
- "audio/midi",
- "audio/mp4",
- "audio/mpeg",
--"audio/mpegurl",
- "audio/ogg",
-+"audio/prs.sid",
- "audio/vnd.rn-realaudio",
- "audio/x-ape",
- "audio/x-flac",
-+"audio/x-gsm",
- "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",
-@@ -33,7 +33,6 @@
- "audio/x-realaudio",
- "audio/x-real-audio",
- "audio/x-sbc",
--"audio/x-scpls",
- "audio/x-speex",
- "audio/x-tta",
- "audio/x-wav",
diff --git a/gnome-base/nautilus/files/nautilus-2.24.2-scrollbars.patch b/gnome-base/nautilus/files/nautilus-2.24.2-scrollbars.patch
deleted file mode 100644
index 4d854bd0d038..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.24.2-scrollbars.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Solve issue with scrollbars not being updated in tabbed browsing.
-
-https://bugs.gentoo.org/show_bug.cgi?id=260965
-https://bugzilla.gnome.org/show_bug.cgi?id=542396
-
-Index: src/nautilus-navigation-window.c
-===================================================================
---- src/nautilus-navigation-window.c	(revision 14834)
-+++ src/nautilus-navigation-window.c	(working copy)
-@@ -200,6 +200,12 @@
- 	g_assert (slot != NULL);
- 
- 	nautilus_window_set_active_slot (nautilus_window, slot);
-+	
-+	if (slot->content_view != NULL)
-+	{
-+		gtk_scrolled_window_set_hadjustment (GTK_SCROLLED_WINDOW (slot->content_view), NULL);
-+		gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (slot->content_view), NULL);
-+	}
- 
- 	return FALSE;
- }
diff --git a/gnome-base/nautilus/files/nautilus-2.24.2-thumbnail-scaling.patch b/gnome-base/nautilus/files/nautilus-2.24.2-thumbnail-scaling.patch
deleted file mode 100644
index cbec1a547e40..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.24.2-thumbnail-scaling.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-# https://bugs.gentoo.org/show_bug.cgi?id=261219
-# https://bugzilla.gnome.org/show_bug.cgi?id=574708
-#
-#        Bug 523883 – Thumbnails for 200% zoom are regenerated each time a folder is opened.
-#
-#        * libnautilus-private/nautilus-file.c:
-#        (nautilus_file_get_icon):
-#        allow scaling up thumbnails, use the scaled up thumnail
-#        for up to 25% size increase.
-#
-#        * src/file-manager/fm-icon-container.c:
-#        (fm_icon_container_get_icon_images):
-#        Force thumbnail size for compact view to avoid loading at wrong size
-#        and then rescaling
-#
---- a/libnautilus-private/nautilus-file.c	2009/03/16 12:13:10	15121
-+++ b/libnautilus-private/nautilus-file.c	2009/03/16 14:18:13	15122
-@@ -3579,27 +3579,17 @@
- 			scale = (double)modified_size / s;
- 
- 
--			if (scale > 0.99) {
--				/* never scale any thumbnails up */
--				scaled_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
--								gdk_pixbuf_get_has_alpha (raw_pixbuf),
--								gdk_pixbuf_get_bits_per_sample (raw_pixbuf),
--								w * scale, h * scale);
--				gdk_pixbuf_fill (scaled_pixbuf, 0xffffff00);
--				gdk_pixbuf_copy_area (raw_pixbuf,
--						      0, 0, w, h,
--						      scaled_pixbuf,
--						      (gdk_pixbuf_get_width (scaled_pixbuf) - w) / 2,
--						      (gdk_pixbuf_get_height (scaled_pixbuf) - h) / 2);
--			} else {
--				scaled_pixbuf = gdk_pixbuf_scale_simple (raw_pixbuf,
--									 w * scale, h * scale,
--									 GDK_INTERP_BILINEAR);
--			}
-+			scaled_pixbuf = gdk_pixbuf_scale_simple (raw_pixbuf,
-+								 w * scale, h * scale,
-+								 GDK_INTERP_BILINEAR);
- 			nautilus_thumbnail_frame_image (&scaled_pixbuf);
- 			g_object_unref (raw_pixbuf);
- 
--			if (modified_size > 128 &&
-+			/* Don't scale up if more than 25%, then read the original
-+			   image instead. We don't want to compare to exactly 100%,
-+			   since the zoom level 150% gives thumbnails at 144, which is
-+			   ok to scale up from 128. */
-+			if (modified_size > 128*1.25 &&
- 			    !file->details->thumbnail_wants_original) {
- 				/* Invalidate if we resize upward */
- 				file->details->thumbnail_wants_original = TRUE;
---- a/src/file-manager/fm-icon-container.c	2009/03/16 12:13:10	15121
-+++ b/src/file-manager/fm-icon-container.c	2009/03/16 14:18:13	15122
-@@ -99,6 +99,9 @@
- 	if (!fm_icon_view_is_compact (icon_view) ||
- 	    nautilus_icon_container_get_zoom_level (container) > NAUTILUS_ZOOM_LEVEL_STANDARD) {
- 		flags |= NAUTILUS_FILE_ICON_FLAGS_USE_THUMBNAILS;
-+		if (fm_icon_view_is_compact (icon_view)) {
-+			flags |= NAUTILUS_FILE_ICON_FLAGS_FORCE_THUMBNAIL_SIZE;
-+		}
- 	}
- 
- 	if (use_embedding) {
diff --git a/gnome-base/nautilus/files/nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch b/gnome-base/nautilus/files/nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch
deleted file mode 100644
index d6ca6eb97227..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Gentoo bug 266398
-GNOME #580793 and #571417
-
-Index: nautilus-2.26.2/src/nautilus-main.c
-===================================================================
---- nautilus-2.26.2.orig/src/nautilus-main.c	2009-04-29 17:02:32.709364982 +0200
-+++ nautilus-2.26.2/src/nautilus-main.c	2009-04-29 17:39:36.529860872 +0200
-@@ -391,9 +391,6 @@ main (int argc, char *argv[])
- 	browser_window = FALSE;
- 
- 	g_set_prgname ("nautilus");
--	if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) {
--		egg_set_desktop_file (DATADIR "/applications/nautilus.desktop");
--	}
- 
- 	context = g_option_context_new (_("\n\nBrowse the file system with the file manager"));
- 	g_option_context_add_main_entries (context, options, NULL);
-@@ -464,6 +461,15 @@ main (int argc, char *argv[])
- 			(NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR, TRUE);
- 	}
- 
-+	/* Which .desktop file contains the relevant session management
-+	   information? */
-+	if ((no_desktop || !eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_DESKTOP))
-+	    && g_file_test (DATADIR "/applications/nautilus-home.desktop", G_FILE_TEST_EXISTS)) {
-+		egg_set_desktop_file (DATADIR "/applications/nautilus-home.desktop");
-+	} else if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) {
-+		egg_set_desktop_file (DATADIR "/applications/nautilus.desktop");
-+	}
-+
- 	application = NULL;
- 
- 	/* Do either the self-check or the real work. */
diff --git a/gnome-base/nautilus/files/nautilus-2.26.3-thumbnail-zoom-level.patch b/gnome-base/nautilus/files/nautilus-2.26.3-thumbnail-zoom-level.patch
deleted file mode 100644
index 9950d614e522..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.26.3-thumbnail-zoom-level.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From a8097e57788ad735227489e6c51d06bedc796889 Mon Sep 17 00:00:00 2001
-From: Alexander Larsson <alexl@redhat.com>
-Date: Fri, 18 Sep 2009 09:05:44 +0000
-Subject: [PATCH] Do not load files for thumbnailing that we can not thumbnail anyway
-
-When zooming out we read the real image and use that as the thumbnail. However, we should only do this for files gdk-pixbuf can read as other things can't be read anyway and may potentially be very large (such as videos) since the thumbnail size limit only applies for images. 
-
----
- libnautilus-private/nautilus-file.c       |    3 +-
- libnautilus-private/nautilus-thumbnails.c |   30 +++++++++++++++++++++++-----
- libnautilus-private/nautilus-thumbnails.h |    1 +
- 3 files changed, 27 insertions(+), 7 deletions(-)
-
-diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
-index fb6d92b..a2a84f0 100644
---- a/libnautilus-private/nautilus-file.c
-+++ b/libnautilus-private/nautilus-file.c
-@@ -3588,7 +3588,8 @@ nautilus_file_get_icon (NautilusFile *file,
- 			   since the zoom level 150% gives thumbnails at 144, which is
- 			   ok to scale up from 128. */
- 			if (modified_size > 128*1.25 &&
--			    !file->details->thumbnail_wants_original) {
-+			    !file->details->thumbnail_wants_original &&
-+			    nautilus_can_thumbnail_internally (file)) {
- 				/* Invalidate if we resize upward */
- 				file->details->thumbnail_wants_original = TRUE;
- 				nautilus_file_invalidate_attributes (file, NAUTILUS_FILE_ATTRIBUTE_THUMBNAIL);
-diff --git a/libnautilus-private/nautilus-thumbnails.c b/libnautilus-private/nautilus-thumbnails.c
-index f064135..2a3fede 100644
---- a/libnautilus-private/nautilus-thumbnails.c
-+++ b/libnautilus-private/nautilus-thumbnails.c
-@@ -765,17 +765,35 @@ get_types_table (void)
- 	return image_mime_types;
- }
- 
--gboolean
--nautilus_thumbnail_is_mimetype_limited_by_size (const char *mime_type)
-+static gboolean
-+pixbuf_can_load_type (const char *mime_type)
- {
- 	GHashTable *image_mime_types;
--	
-+
- 	image_mime_types = get_types_table ();
--        if (g_hash_table_lookup (image_mime_types, mime_type)) {
--                return TRUE;
-+	if (g_hash_table_lookup (image_mime_types, mime_type)) {
-+		return TRUE;
- 	}
- 
--        return FALSE;
-+	return FALSE;
-+}
-+
-+gboolean
-+nautilus_can_thumbnail_internally (NautilusFile *file)
-+{
-+	char *mime_type;
-+	gboolean res;
-+
-+	mime_type = nautilus_file_get_mime_type (file);
-+	res = pixbuf_can_load_type (mime_type);
-+	g_free (mime_type);
-+	return res;
-+}
-+
-+gboolean
-+nautilus_thumbnail_is_mimetype_limited_by_size (const char *mime_type)
-+{
-+	return pixbuf_can_load_type (mime_type);
- }
- 
- gboolean
-diff --git a/libnautilus-private/nautilus-thumbnails.h b/libnautilus-private/nautilus-thumbnails.h
-index 82007ba..715133b 100644
---- a/libnautilus-private/nautilus-thumbnails.h
-+++ b/libnautilus-private/nautilus-thumbnails.h
-@@ -46,6 +46,7 @@ typedef void (* NautilusThumbnailAsyncLoadFunc) (NautilusThumbnailAsyncLoadHandl
- /* Returns NULL if there's no thumbnail yet. */
- void       nautilus_create_thumbnail                (NautilusFile *file);
- gboolean   nautilus_can_thumbnail                   (NautilusFile *file);
-+gboolean   nautilus_can_thumbnail_internally        (NautilusFile *file);
- gboolean   nautilus_has_valid_failed_thumbnail      (NautilusFile *file);
- gboolean   nautilus_thumbnail_is_mimetype_limited_by_size
- 						    (const char *mime_type);
--- 
-1.6.5.rc1
-
diff --git a/gnome-base/nautilus/files/nautilus-2.26.4-file-roller-drag-n-drop.patch b/gnome-base/nautilus/files/nautilus-2.26.4-file-roller-drag-n-drop.patch
deleted file mode 100644
index 28d637ca5181..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.26.4-file-roller-drag-n-drop.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Fixes nautilus window closing when doing DnD from file-roller.
-Patch is taken from upstream git
-
-http://bugs.gentoo.org/show_bug.cgi?id=290001
-
----
-From 23278532505862816bd5c8c0ab7d17f7a07b4790 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimoc@gnome.org>
-Date: Fri, 09 Oct 2009 17:19:42 +0000
-Subject: Always check if the drag dest supports the source.
-
-In the "drag-motion" callback, make sure we check for target != GDK_NONE
-before getting non-existent data for it.
----
-diff --git a/libnautilus-private/nautilus-dnd.c b/libnautilus-private/nautilus-dnd.c
-index b7e1df2..15b6395 100644
---- a/libnautilus-private/nautilus-dnd.c
-+++ b/libnautilus-private/nautilus-dnd.c
-@@ -1010,7 +1010,7 @@ nautilus_drag_selection_includes_special_link (GList *selection_list)
- 	return FALSE;
- }
- 
--static void
-+static gboolean
- slot_proxy_drag_motion (GtkWidget          *widget,
- 			GdkDragContext     *context,
- 			int                 x,
-@@ -1038,6 +1038,11 @@ slot_proxy_drag_motion (GtkWidget          *widget,
- 
- 	if (!drag_info->have_data) {
- 		target = gtk_drag_dest_find_target (widget, context, NULL);
-+
-+		if (target == GDK_NONE) {
-+			goto out;
-+		}
-+
- 		gtk_drag_get_data (widget, context, target, time);
- 	}
- 
-@@ -1079,6 +1084,8 @@ out:
- 	}
- 
- 	gdk_drag_status (context, action, time);
-+
-+	return TRUE;
- }
- 
- static void
-diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
-index 1d07bba..9a87322 100644
---- a/src/nautilus-places-sidebar.c
-+++ b/src/nautilus-places-sidebar.c
-@@ -850,7 +850,7 @@ compute_drop_position (GtkTreeView *tree_view,
- }
- 
- 
--static void
-+static gboolean
- get_drag_data (GtkTreeView *tree_view,
- 	       GdkDragContext *context, 
- 	       unsigned int time)
-@@ -861,8 +861,14 @@ get_drag_data (GtkTreeView *tree_view,
- 					    context, 
- 					    NULL);
- 
-+	if (target == GDK_NONE) {
-+		return FALSE;
-+	}
-+
- 	gtk_drag_get_data (GTK_WIDGET (tree_view),
- 			   context, target, time);
-+
-+	return TRUE;
- }
- 
- static void
-@@ -928,7 +934,9 @@ drag_motion_callback (GtkTreeView *tree_view,
- 	char *uri;
- 
- 	if (!sidebar->drag_data_received) {
--		get_drag_data (tree_view, context, time);
-+		if (!get_drag_data (tree_view, context, time)) {
-+			return FALSE;
-+		}
- 	}
- 
- 	compute_drop_position (tree_view, x, y, &path, &pos, sidebar);
-@@ -1269,10 +1277,11 @@ drag_drop_callback (GtkTreeView *tree_view,
- 		    unsigned int time,
- 		    NautilusPlacesSidebar *sidebar)
- {
-+	gboolean retval = FALSE;
- 	sidebar->drop_occured = TRUE;
--	get_drag_data (tree_view, context, time);
-+	retval = get_drag_data (tree_view, context, time);
- 	g_signal_stop_emission_by_name (tree_view, "drag-drop");
--	return TRUE;
-+	return retval;
- }
- 
- /* Callback used when the file list's popup menu is detached */
---
-cgit v0.8.2
diff --git a/gnome-base/nautilus/metadata.xml b/gnome-base/nautilus/metadata.xml
index 7f7e136c1c68..492a4f76bce6 100644
--- a/gnome-base/nautilus/metadata.xml
+++ b/gnome-base/nautilus/metadata.xml
@@ -3,12 +3,8 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name='beagle'>Enables support for searching using the Beagle
-		(<pkg>app-misc/beagle</pkg>) desktop search tool</flag>
 	<flag name="introspection">Use
 		<pkg>dev-libs/gobject-introspection</pkg> for
 		introspection</flag>
-	<flag name='tracker'>Enables support for searching using the Tracker
-		(<pkg>app-misc/tracker</pkg>) search tool</flag>
 </use>
 </pkgmetadata>
diff --git a/gnome-base/nautilus/nautilus-2.26.4-r1.ebuild b/gnome-base/nautilus/nautilus-2.26.4-r1.ebuild
deleted file mode 100644
index cbc56347b6cc..000000000000
--- a/gnome-base/nautilus/nautilus-2.26.4-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.26.4-r1.ebuild,v 1.7 2010/07/20 01:27:27 jer 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 ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="beagle doc gnome tracker xmp"
-
-# 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.16.0
-	>=dev-libs/libxml2-2.4.7
-	>=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* ) )
-	tracker? ( >=app-misc/tracker-0.6.4 )
-	xmp? ( >=media-libs/exempi-2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=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 )"
-
-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() {
-	gnome2_src_prepare
-
-	# 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
-
-	# 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"
-
-	# Fix nautilus flipping-out with --no-desktop -- bug 266398
-	epatch "${FILESDIR}/${PN}-2.26.2-change-reg-desktop-file-with-no-desktop.patch"
-
-	# Fix massive memory consumption by Nautilus for larger zoom levels.
-	# Import from upstream, see distributor mailing lists.
-	epatch "${FILESDIR}/${PN}-2.26.3-thumbnail-zoom-level.patch"
-
-	# Fix nautilus window closing when doing DnD from file-roller, bug 290001
-	epatch "${FILESDIR}/${P}-file-roller-drag-n-drop.patch"
-}
-
-src_test() {
-	addwrite "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	unset ORBIT_SOCKETDIR
-	unset DBUS_SESSION_BUS_ADDRESS
-	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.28.4-r1.ebuild b/gnome-base/nautilus/nautilus-2.28.4-r1.ebuild
deleted file mode 100644
index 1f10ac37f497..000000000000
--- a/gnome-base/nautilus/nautilus-2.28.4-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.28.4-r1.ebuild,v 1.8 2010/08/18 21:53:52 maekke Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit 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 ia64 ~ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="beagle doc gnome xmp"
-
-# not adding gnome-base/gail because it is in >=gtk+-2.13
-RDEPEND=">=dev-libs/glib-2.21.3
-	>=gnome-base/gnome-desktop-2.25.5
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.16.0
-	>=dev-libs/libxml2-2.4.7
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2.0
-	dev-libs/libunique
-	dev-libs/dbus-glib
-	x11-libs/libXft
-	x11-libs/libXrender
-	beagle? ( || (
-		dev-libs/libbeagle
-		=app-misc/beagle-0.2* ) )
-	xmp? ( >=media-libs/exempi-2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40.1
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )
-	>=gnome-base/gvfs-0.1.2"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--disable-packagekit
-		--disable-tracker
-		$(use_enable beagle)
-		$(use_enable xmp)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# 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 intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed 3 failed"
-
-	# Remove crazy CFLAGS
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
-		|| die "sed 4 failed"
-
-	# Fix nautilus flipping-out with --no-desktop -- bug 266398
-	epatch "${FILESDIR}/${PN}-2.27.4-change-reg-desktop-file-with-no-desktop.patch"
-}
-
-src_test() {
-	addwrite "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	unset ORBIT_SOCKETDIR
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "Test phase failed"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${D}" -name "*.la" -delete || die "remove of la files 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.28.4-r2.ebuild b/gnome-base/nautilus/nautilus-2.28.4-r2.ebuild
deleted file mode 100644
index a0d33e5c1686..000000000000
--- a/gnome-base/nautilus/nautilus-2.28.4-r2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.28.4-r2.ebuild,v 1.4 2010/07/20 01:27:27 jer Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit 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 ~ia64 ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="beagle doc gnome tracker xmp"
-
-# not adding gnome-base/gail because it is in >=gtk+-2.13
-RDEPEND=">=dev-libs/glib-2.21.3
-	>=gnome-base/gnome-desktop-2.25.5
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.16.0
-	>=dev-libs/libxml2-2.4.7
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2.0
-	dev-libs/libunique
-	dev-libs/dbus-glib
-	x11-libs/libXft
-	x11-libs/libXrender
-	beagle? ( || (
-		dev-libs/libbeagle
-		=app-misc/beagle-0.2* ) )
-	tracker? ( >=app-misc/tracker-0.7 )
-	xmp? ( >=media-libs/exempi-2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40.1
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )
-	>=gnome-base/gvfs-0.1.2"
-
-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() {
-	gnome2_src_prepare
-
-	# 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 intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed 3 failed"
-
-	# Remove crazy CFLAGS
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
-		|| die "sed 4 failed"
-
-	# Fix nautilus flipping-out with --no-desktop -- bug 266398
-	epatch "${FILESDIR}/${PN}-2.27.4-change-reg-desktop-file-with-no-desktop.patch"
-}
-
-src_test() {
-	addwrite "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	unset ORBIT_SOCKETDIR
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "Test phase failed"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${D}" -name "*.la" -delete || die "remove of la files 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"
-}