[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/

[Ole Reifschneider]

commit:     f996b4645d051c362a20815f223f625be97c86ff
Author:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 14:01:43 2015 +0000
Commit:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 14:01:43 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=f996b464

Bump nautilus to 3.16.1

Package-Manager: portage-2.2.14
Manifest-Sign-Key: 7E8B4D42

 .../nautilus/files/nautilus-3.5.91-delete.patch    | 44 ----------------------
 ...nautilus-9999.ebuild => nautilus-3.16.1.ebuild} | 32 ++++------------
 gnome-base/nautilus/nautilus-9999.ebuild           | 13 ++-----
 3 files changed, 11 insertions(+), 78 deletions(-)

diff --git a/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch b/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch
deleted file mode 100644
index 072b34e..0000000
--- a/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 92af7beb790ad9181e5a6a89ac52f177354536f2 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@g.o>
-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 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/nautilus-view.c b/src/nautilus-view.c
-index f51d916..0a50994 100644
---- a/src/nautilus-view.c
-+++ b/src/nautilus-view.c
-@@ -7237,7 +7237,7 @@ static const GtkActionEntry directory_view_entries[] = {
-   /* tooltip */                  NULL,
- 				 G_CALLBACK (action_rename_select_all_callback) },
-   /* name, stock id */         { NAUTILUS_ACTION_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 */         { NAUTILUS_ACTION_DELETE, NULL,
-@@ -9895,8 +9895,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.12
-

diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-3.16.1.ebuild
similarity index 79%
copy from gnome-base/nautilus/nautilus-9999.ebuild
copy to gnome-base/nautilus/nautilus-3.16.1.ebuild
index 55bd512..26ceb6d 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-3.16.1.ebuild
@@ -1,15 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.14.2-r1.ebuild,v 1.3 2015/03/15 13:23:47 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
 
 inherit eutils gnome2 readme.gentoo virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="A file manager for the GNOME desktop"
 HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
@@ -18,13 +15,8 @@ LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
 
 # profiling?
-IUSE="debug exif gnome +introspection packagekit +previewer sendto tracker xmp"
-if [[ ${PV} = 9999 ]]; then
-	IUSE="${IUSE} doc"
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
-fi
+IUSE="exif gnome +introspection packagekit +previewer sendto tracker xmp"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
 
 # FIXME: tests fails under Xvfb, but pass when building manually
 # "FAIL: check failed in nautilus-file.c, line 8307"
@@ -34,15 +26,14 @@ RESTRICT="test"
 # 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.35.3:2
+	>=dev-libs/glib-2.43.4:2[dbus]
 	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.13.2:3[introspection?]
+	>=x11-libs/gtk+-3.15.2:3[introspection?]
 	>=dev-libs/libxml2-2.7.8:2
 	>=gnome-base/gnome-desktop-3:3=
 
 	gnome-base/dconf
 	>=gnome-base/gsettings-desktop-schemas-3.8.0
-	>=x11-libs/libnotify-0.7:=
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender
@@ -81,11 +72,6 @@ PDEPEND="
 "
 # Need gvfs[gtk] for recent:/// support
 
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		doc? ( >=dev-util/gtk-doc-1.4 )"
-fi
-
 src_prepare() {
 	if use previewer; then
 		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
@@ -93,13 +79,10 @@ src_prepare() {
 			close the previewer, press space again."
 	fi
 
-	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
-	# bug #393663
-	epatch "${FILESDIR}/${PN}-3.5.91-delete.patch"
-
 	# Remove -D*DEPRECATED flags. Don't leave this for eclass! (bug #448822)
 	sed -e 's/DISABLE_DEPRECATED_CFLAGS=.*/DISABLE_DEPRECATED_CFLAGS=/' \
 		-i configure || die "sed failed"
+
 	gnome2_src_prepare
 }
 
@@ -108,7 +91,6 @@ src_configure() {
 	gnome2_src_configure \
 		--disable-profiling \
 		--disable-update-mimedb \
-		$(use_enable debug) \
 		$(use_enable exif libexif) \
 		$(use_enable introspection) \
 		$(use_enable packagekit) \

diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-9999.ebuild
index 55bd512..0031aa2 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -34,15 +34,14 @@ RESTRICT="test"
 # 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.35.3:2
+	>=dev-libs/glib-2.43.4:2[dbus]
 	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.13.2:3[introspection?]
+	>=x11-libs/gtk+-3.15.2:3[introspection?]
 	>=dev-libs/libxml2-2.7.8:2
 	>=gnome-base/gnome-desktop-3:3=
 
 	gnome-base/dconf
 	>=gnome-base/gsettings-desktop-schemas-3.8.0
-	>=x11-libs/libnotify-0.7:=
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender
@@ -93,13 +92,10 @@ src_prepare() {
 			close the previewer, press space again."
 	fi
 
-	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
-	# bug #393663
-	epatch "${FILESDIR}/${PN}-3.5.91-delete.patch"
-
 	# Remove -D*DEPRECATED flags. Don't leave this for eclass! (bug #448822)
 	sed -e 's/DISABLE_DEPRECATED_CFLAGS=.*/DISABLE_DEPRECATED_CFLAGS=/' \
 		-i configure || die "sed failed"
+
 	gnome2_src_prepare
 }
 
@@ -108,7 +104,6 @@ src_configure() {
 	gnome2_src_configure \
 		--disable-profiling \
 		--disable-update-mimedb \
-		$(use_enable debug) \
 		$(use_enable exif libexif) \
 		$(use_enable introspection) \
 		$(use_enable packagekit) \