Clean up old revision.

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key C6085806)

4 files changed, 6 insertions, 185 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 6e9f43ef455e..cc119f1f0787 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.406 2013/03/28 22:51:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.407 2013/03/29 19:58:12 eva Exp $
+
+  29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/nautilus-3.2.1-delete.patch,
+  -files/nautilus-3.2.1-key-press-forwarding.patch, -nautilus-3.4.2.ebuild:
+  Clean up old revision.
 
 *nautilus-3.8.0 (28 Mar 2013)
 
diff --git a/gnome-base/nautilus/files/nautilus-3.2.1-delete.patch b/gnome-base/nautilus/files/nautilus-3.2.1-delete.patch
deleted file mode 100644
index 7720a6b74ccf..000000000000
--- a/gnome-base/nautilus/files/nautilus-3.2.1-delete.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0c86d481ac075d733ddffae7a67aa23b0b4d54c5 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 8 Dec 2011 18:39:28 -0500
-Subject: [PATCH] Delete key should delete files
-
-Make the Delete key delete files like in nautilus-2.x and every other
-file manager on the planet. Note: the nautilus-3 Ctrl+Delete shortcut
-will also continue to work.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=647048
-https://bugs.gentoo.org/show_bug.cgi?id=393663
----
- src/nautilus-view.c |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/src/nautilus-view.c b/src/nautilus-view.c
-index dca1413..f3928db 100644
---- a/src/nautilus-view.c
-+++ b/src/nautilus-view.c
-@@ -7014,7 +7014,7 @@ static const GtkActionEntry directory_view_entries[] = {
-   /* tooltip */                  NULL,
- 				 G_CALLBACK (action_rename_select_all_callback) },
-   /* name, stock id */         { "Trash", NULL,
--  /* label, accelerator */       N_("Mo_ve to Trash"), "<control>Delete",
-+  /* label, accelerator */       N_("Mo_ve to Trash"), "Delete",
-   /* tooltip */                  N_("Move each selected item to the Trash"),
- 				 G_CALLBACK (action_trash_callback) },
-   /* name, stock id */         { "Delete", NULL,
-@@ -9687,8 +9687,12 @@ nautilus_view_class_init (NautilusViewClass *klass)
- 	binding_set = gtk_binding_set_by_class (klass);
- 	gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_CONTROL_MASK,
- 				      "trash", 0);
-+	gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, 0,
-+				      "trash", 0);
- 	gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_CONTROL_MASK,
- 				      "trash", 0);
-+	gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, 0,
-+				      "trash", 0);
- 	gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_SHIFT_MASK,
- 				      "delete", 0);
- }
--- 
-1.7.8
-
diff --git a/gnome-base/nautilus/files/nautilus-3.2.1-key-press-forwarding.patch b/gnome-base/nautilus/files/nautilus-3.2.1-key-press-forwarding.patch
deleted file mode 100644
index 4ad417edd6c2..000000000000
--- a/gnome-base/nautilus/files/nautilus-3.2.1-key-press-forwarding.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d4e2a297589e35a9545d996a4f0a61d22152e4c7 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 14 Dec 2011 20:43:08 -0500
-Subject: [PATCH] Do not handle keyboard shortcuts in NautilusWindow if an
- editable widget is focused
-
-If an editable widget (e.g. GtkEntry in the location bar or search bar) is
-focused, NautilusWindow should forward all key press events to it since the
-window's accelerator bindings may conflict with the widget's.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=664573
----
- src/nautilus-window.c |   11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/src/nautilus-window.c b/src/nautilus-window.c
-index c3a3c2c..e8646d8 100644
---- a/src/nautilus-window.c
-+++ b/src/nautilus-window.c
-@@ -1117,11 +1117,12 @@ nautilus_window_key_press_event (GtkWidget *widget,
- 	active_slot = nautilus_window_get_active_slot (window);
- 	view = active_slot->content_view;
- 
--	if (view != NULL && nautilus_view_get_is_renaming (view)) {
--		/* if we're renaming, just forward the event to the
--		 * focused widget and return. We don't want to process the window
--		 * accelerator bindings, as they might conflict with the 
--		 * editable widget bindings.
-+	if ((view != NULL && (nautilus_view_get_is_renaming (view))) || GTK_IS_EDITABLE (gtk_window_get_focus (window))) {
-+		/* If we're renaming, or editing a GtkEntry (e.g. location or
-+		 * search bar), just forward the event to the focused widget
-+		 * and return.
-+		 * We don't want to process the window accelerator bindings,
-+		 * as they might conflict with the editable widget bindings.
- 		 */
- 		if (gtk_window_propagate_key_event (GTK_WINDOW (window), event)) {
- 			return TRUE;
--- 
-1.7.8
-
diff --git a/gnome-base/nautilus/nautilus-3.4.2.ebuild b/gnome-base/nautilus/nautilus-3.4.2.ebuild
deleted file mode 100644
index 97ea8f5dd5c0..000000000000
--- a/gnome-base/nautilus/nautilus-3.4.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.4.2.ebuild,v 1.2 2012/12/20 16:27:56 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/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 exif gnome +introspection packagekit +previewer sendto tracker xmp"
-
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND=">=dev-libs/glib-2.31.9:2
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.3.17:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-	>=gnome-base/gnome-desktop-3.0.0:3
-
-	gnome-base/dconf
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	exif? ( >=media-libs/libexif-0.6.20 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	tracker? ( >=app-misc/tracker-0.12 )
-	xmp? ( >=media-libs/exempi-2.1.0 )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.31.0
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xproto"
-RDEPEND="${COMMON_DEPEND}
-	packagekit? ( app-admin/packagekit-base )
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )"
-# For eautoreconf
-#	gnome-base/gnome-common
-PDEPEND="gnome? (
-		>=x11-themes/gnome-icon-theme-1.1.91
-		x11-themes/gnome-icon-theme-symbolic )
-	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-0.1.2"
-
-src_prepare() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		$(use_enable exif libexif)
-		$(use_enable introspection)
-		$(use_enable packagekit)
-		$(use_enable sendto nst-extension)
-		$(use_enable tracker)
-		$(use_enable xmp)"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
-	# bug #393663
-	epatch "${FILESDIR}/${PN}-3.2.1-delete.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=664573
-	epatch "${FILESDIR}/${PN}-3.2.1-key-press-forwarding.patch"
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	addpredict "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	unset ORBIT_SOCKETDIR
-	unset DBUS_SESSION_BUS_ADDRESS
-	export GSETTINGS_BACKEND="memory"
-	Xemake check
-	unset GSETTINGS_BACKEND
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use previewer; then
-		elog "nautilus uses gnome-extra/sushi to preview media files."
-		elog "To activate the previewer, select a file and press space; to"
-		elog "close the previewer, press space again."
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}