Clean up old revision.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

5 files changed, 8 insertions, 274 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 29f5c3e0f1ea..c4c601a5a955 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.373 2011/03/22 19:20:31 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.374 2011/04/09 13:34:32 eva Exp $
+
+  09 Apr 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/nautilus-2.27.4-change-reg-desktop-file-with-no-desktop.patch,
+  -nautilus-2.30.1-r1.ebuild,
+  -files/nautilus-2.30.1-remove-eel-gdk-window-focus.patch,
+  -files/nautilus-2.30.1-unmount-entries.patch:
+  Clean up old revision.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> nautilus-2.32.2.1.ebuild:
   Marking nautilus-2.32.2.1 ppc stable for bug 353436
diff --git a/gnome-base/nautilus/files/nautilus-2.27.4-change-reg-desktop-file-with-no-desktop.patch b/gnome-base/nautilus/files/nautilus-2.27.4-change-reg-desktop-file-with-no-desktop.patch
deleted file mode 100644
index 6bd3dee4cfaa..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.27.4-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[])
- 
- 	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.30.1-remove-eel-gdk-window-focus.patch b/gnome-base/nautilus/files/nautilus-2.30.1-remove-eel-gdk-window-focus.patch
deleted file mode 100644
index 969d38b96f9b..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.30.1-remove-eel-gdk-window-focus.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Fix compile failure with gtk+-2.22 by removing eel_gdk_window_focus.
- * Patches **ported** from master repository, not needed 2.90 onwards
- * Might be needed in 2.32
-
---
-From 7e8d1dfa6a17fe9189bf2489b735cd6462f03571 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimoc@gnome.org>
-Date: Sat, 21 Aug 2010 16:57:15 +0000
-Subject: [eel] remove eel_gdk_window_focus
-
----
-From 6b06e0e27ca1cf29afd4fac716c58e15928a8ff8 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimoc@gnome.org>
-Date: Sat, 21 Aug 2010 16:56:57 +0000
-Subject: icon-container: use gdk_window_focus
-
----
---- eel/eel-gdk-extensions.c
-+++ eel/eel-gdk-extensions.c
-@@ -585,19 +585,7 @@
- 	 * the focus at this point. Do a little X trickery to
- 	 * ensure it is focused.
- 	 */
--	eel_gdk_window_focus (window, GDK_CURRENT_TIME);
--}
--
--void
--eel_gdk_window_focus (GdkWindow *window, guint32 timestamp)
--{
--	gdk_error_trap_push ();
--	XSetInputFocus (GDK_DISPLAY (),
--			GDK_WINDOW_XWINDOW (window),
--			RevertToParent,
--			timestamp);
--	gdk_flush();
--	gdk_error_trap_pop ();
-+	gdk_window_focus (window, GDK_CURRENT_TIME);
- }
- 
- void
---- eel/eel-gdk-extensions.h
-+++ eel/eel-gdk-extensions.h
-@@ -137,8 +137,6 @@
- /* Misc GdkWindow helper functions */
- void                eel_gdk_window_bring_to_front          (GdkWindow           *window);
- void                eel_gdk_window_set_invisible_cursor    (GdkWindow           *window);
--void                eel_gdk_window_focus                   (GdkWindow           *window,
--							    guint32              timestamp);
- void                eel_gdk_window_set_wm_protocols        (GdkWindow           *window,
- 							    GdkAtom             *protocols,
- 							    int                  nprotocols);
---- libnautilus-private/nautilus-icon-container.c
-+++ libnautilus-private/nautilus-icon-container.c
-@@ -4475,7 +4475,7 @@
- 	/* Ensure the window itself is focused.. */
- 	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (container));
- 	if (toplevel != NULL && gtk_widget_get_realized (toplevel)) {
--		eel_gdk_window_focus (toplevel->window, GDK_CURRENT_TIME);
-+		gdk_window_focus (toplevel->window, GDK_CURRENT_TIME);
- 	}
- 
- 	return TRUE;
diff --git a/gnome-base/nautilus/files/nautilus-2.30.1-unmount-entries.patch b/gnome-base/nautilus/files/nautilus-2.30.1-unmount-entries.patch
deleted file mode 100644
index bc953bbc4aa6..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.30.1-unmount-entries.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 9bdd0ef925a1e660031917746f8914a38e352576 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Tue, 30 Mar 2010 16:33:51 +0000
-Subject: Do not show Unmount when showing Eject/Safe removal
-
-Having three menu entries (unmount/eject/safe removal) in a volume/drive menu
-entry is too confusing. Unmount only really makes sense for internal drives,
-for external ones it is pretty much a "geek" option. Geeks can use palimpsest
-or "unmount /media/foo" from the CLI if they really want to, for everyone else
-it is just an unintuitive and hard to to explain menu entry.
-
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=598690
-Bug-Ubuntu: https://launchpad.net/bugs/453072
-(cherry picked from commit 0a5cc4c4e5b01eb8aa38dfae926502ce920efc94)
----
-diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
-index d8b9050..361b994 100644
---- a/src/file-manager/fm-directory-view.c
-+++ b/src/file-manager/fm-directory-view.c
-@@ -7782,10 +7782,6 @@ file_should_show_foreach (NautilusFile        *file,
- 		*show_eject = TRUE;
- 	}
- 
--	if (nautilus_file_can_unmount (file)) {
--		*show_unmount = TRUE;
--	}
--
- 	if (nautilus_file_can_mount (file)) {
- 		*show_mount = TRUE;
- 
-@@ -7805,6 +7801,12 @@ file_should_show_foreach (NautilusFile        *file,
- 		*show_stop = TRUE;
- 	}
- 
-+	/* Dot not show both Unmount and Eject/Safe Removal; too confusing to
-+	 * have too many menu entries */
-+	if (nautilus_file_can_unmount (file) && !*show_eject && !*show_stop) {
-+		*show_unmount = TRUE;
-+	}
-+
- 	if (nautilus_file_can_poll_for_media (file) && !nautilus_file_is_media_check_automatic (file)) {
- 		*show_poll = TRUE;
- 	}
-@@ -7852,10 +7854,6 @@ file_should_show_self (NautilusFile        *file,
- 		*show_eject = TRUE;
- 	}
- 
--	if (nautilus_file_can_unmount (file)) {
--		*show_unmount = TRUE;
--	}
--
- 	if (nautilus_file_can_mount (file)) {
- 		*show_mount = TRUE;
- 	}
-@@ -7874,6 +7872,12 @@ file_should_show_self (NautilusFile        *file,
- 		*show_stop = TRUE;
- 	}
- 
-+	/* Dot not show both Unmount and Eject/Safe Removal; too confusing to
-+	 * have too many menu entries */
-+	if (nautilus_file_can_unmount (file) && !*show_eject && !*show_stop) {
-+		*show_unmount = TRUE;
-+	}
-+
- 	if (nautilus_file_can_poll_for_media (file) && !nautilus_file_is_media_check_automatic (file)) {
- 		*show_poll = TRUE;
- 	}
-diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
-index 95c06eb..6dc2df7 100644
---- a/src/nautilus-places-sidebar.c
-+++ b/src/nautilus-places-sidebar.c
-@@ -1317,7 +1317,7 @@ check_unmount_and_eject (GMount *mount,
- 	}
- 	if (mount != NULL) {
- 		*show_eject |= g_mount_can_eject (mount);
--		*show_unmount = g_mount_can_unmount (mount);
-+		*show_unmount = g_mount_can_unmount (mount) && !*show_eject;
- 	}
- }
- 
-@@ -1349,6 +1349,9 @@ check_visibility (GMount           *mount,
- 
- 		*show_start = g_drive_can_start (drive) || g_drive_can_start_degraded (drive);
- 		*show_stop  = g_drive_can_stop (drive);
-+
-+		if (*show_stop)
-+			*show_unmount = FALSE;
- 	}
- 
- 	if (volume != NULL) {
---
-cgit v0.8.3.1
diff --git a/gnome-base/nautilus/nautilus-2.30.1-r1.ebuild b/gnome-base/nautilus/nautilus-2.30.1-r1.ebuild
deleted file mode 100644
index 65a8cb5b8739..000000000000
--- a/gnome-base/nautilus/nautilus-2.30.1-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.30.1-r1.ebuild,v 1.10 2011/03/16 17:08:06 nirbheek 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 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="doc gnome xmp"
-
-RDEPEND=">=dev-libs/glib-2.24.0:2
-	>=gnome-base/gnome-desktop-2.29.91:2
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.20.0:2
-	>=dev-libs/libxml2-2.4.7:2
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2.0:2
-	dev-libs/libunique:1
-	dev-libs/dbus-glib
-	x11-libs/libXft
-	x11-libs/libXrender
-	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 xmp)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# 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"
-
-	# Do not show Unmount when showing Eject/Safe removal
-	epatch "${FILESDIR}/${P}-unmount-entries.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"
-}