gnome-base/nautilus: 3.5.90 → 3.5.91

4 files changed, 19 insertions, 20 deletions

diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index c4e731ae..9eb42613 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,4 +1,4 @@
-AUX nautilus-3.2.1-delete.patch 1869 SHA256 51ebfb58d3b1217796dfa79386bdeade2255f879108963962c63124cbedb4fa0 SHA512 1230abdb73d3334dffffa0861b3bbaefdcf00773e66eb33877607bf38d73c314f56fd8a077d5918e640dff031f8ebc878b8c896535f6d806b44cb488586ee22f WHIRLPOOL 5430db3032027b4fcc8fb2765c935f18a354073e3028985069d0983ef2d011025dd5403edf695bb8c59899d0ee5cb5e46346f667816309dda8eb9d764b23fc7f
-DIST nautilus-3.5.90.tar.xz 4963280 SHA256 6c6a5e875883237dec6c38bca453f0b24ceb056de185fb507df2885979e0529e SHA512 b81bd93a5d9fffcc479142208c145c7d8644b388293869ea45de78fa3009bb132f26ed3c34ba6a29ebf9838d6d7aa780e22c105553bd3d0d5f2d05913f968b1d WHIRLPOOL 7a8b63c6c54ce9970b6e5d2ab8d0698b31cc3efcad437b8e0bdbc11599cbb52c16c3643a2b1f8d6607d1470e206edc852973f9e9c0ce32a58dd53109c5130c24
-EBUILD nautilus-3.5.90.ebuild 2983 SHA256 1882c2f52a1abbb31414ba5ba465318f5e575d2cbfcee4f63b470c143d5953f4 SHA512 d031808b99254ed582376c6e854285ccf7102cb01c4e07b9e3a2406762323961afe76499520bea547ad85269b23906d1736ee818edeff70fd18603baa40f8682 WHIRLPOOL fa49b9b6cc871801c402d63f7cd197e14d0127bf95af3382bd7fd8c6b75d697c9eba57926a16f3f746b32ad92a136526afb1a60639a91dd96ed92e612dfa4d82
-EBUILD nautilus-9999.ebuild 2983 SHA256 1882c2f52a1abbb31414ba5ba465318f5e575d2cbfcee4f63b470c143d5953f4 SHA512 d031808b99254ed582376c6e854285ccf7102cb01c4e07b9e3a2406762323961afe76499520bea547ad85269b23906d1736ee818edeff70fd18603baa40f8682 WHIRLPOOL fa49b9b6cc871801c402d63f7cd197e14d0127bf95af3382bd7fd8c6b75d697c9eba57926a16f3f746b32ad92a136526afb1a60639a91dd96ed92e612dfa4d82
+AUX nautilus-3.5.91-delete.patch 1695 SHA256 7b4bdadcac9890be5bee4023acac419f57f9b4c87bc0868457e3009513b2f497 SHA512 f815d7451adbd2dc15c8af48b02d92e42a920bc5d0316ecc54923bb8f557faa50d9299dbc8c1e80509aa649a4e4c3de7f1a641aff308b7a923357e41ed18182b WHIRLPOOL fbc56485cbb489aa0f0432eb5fa3da0f152782a538d4e4f5b320af5d6230d478fae97467902faa4874c531cb7e186829a4d167e1cc2de23126ceababa5c38155
+DIST nautilus-3.5.91.tar.xz 4979108 SHA256 0fe4b31a27ee1b172d6c948fedcfc2f8b3dd09da035e317b53c6fa2a96c7abc0 SHA512 122bf3541490e27ca571afd538522b093b0e28e2bcaf93350ed2c85da9319e249aac59eb0e23c9bca564dac28594e787210314b0999b9af98fa38f81d42f14cf WHIRLPOOL 0b5bf920344ba081bc3bae1e23369eef29d49c2235c34170c8ae5cde4999e55ccab3ea5c268eb715780591270f0a22bd7002712237b2b186def6faac08a8524d
+EBUILD nautilus-3.5.91.ebuild 3008 SHA256 bcee666298a12c143adfa0d18b8a8f82e4f96853b6f8a724c2e2bb5d11d872a6 SHA512 c40f8111397887de731b5b95b76e674f3502968cc37415677a2f7bb443c3fb972b540a729808c031a95dc6f6ef9ec5670f7ee8eb193e906c4735f03fafa84c18 WHIRLPOOL 700e8684c3b0fed165c3d5c4ffb4db6f6e9c232330b13fadc5d5eb4f55224c01d90a7e25712f975d756ee3b36516541774ca172846df24194e3873fd43f7f727
+EBUILD nautilus-9999.ebuild 3008 SHA256 bcee666298a12c143adfa0d18b8a8f82e4f96853b6f8a724c2e2bb5d11d872a6 SHA512 c40f8111397887de731b5b95b76e674f3502968cc37415677a2f7bb443c3fb972b540a729808c031a95dc6f6ef9ec5670f7ee8eb193e906c4735f03fafa84c18 WHIRLPOOL 700e8684c3b0fed165c3d5c4ffb4db6f6e9c232330b13fadc5d5eb4f55224c01d90a7e25712f975d756ee3b36516541774ca172846df24194e3873fd43f7f727
diff --git a/gnome-base/nautilus/files/nautilus-3.2.1-delete.patch b/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch
index 7720a6b7..6971c399 100644
--- a/gnome-base/nautilus/files/nautilus-3.2.1-delete.patch
+++ b/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch
@@ -1,14 +1,11 @@
-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
+
+Original Author: Alexandre Rostovtsev <tetromino@gentoo.org>
 ---
  src/nautilus-view.c |    6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)
@@ -17,15 +14,15 @@ 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[] = {
+@@ -7238,7 +7238,7 @@
    /* tooltip */                  NULL,
  				 G_CALLBACK (action_rename_select_all_callback) },
-   /* name, stock id */         { "Trash", NULL,
+   /* 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 */         { "Delete", NULL,
+   /* name, stock id */         { NAUTILUS_ACTION_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,
diff --git a/gnome-base/nautilus/nautilus-3.5.90.ebuild b/gnome-base/nautilus/nautilus-3.5.91.ebuild
index e39db043..0815b132 100644
--- a/gnome-base/nautilus/nautilus-3.5.90.ebuild
+++ b/gnome-base/nautilus/nautilus-3.5.91.ebuild
@@ -26,9 +26,9 @@ 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
+COMMON_DEPEND=">=dev-libs/glib-2.33.11:2
 	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.5.5:3[introspection?]
+	>=x11-libs/gtk+-3.5.12:3[introspection?]
 	>=dev-libs/libxml2-2.7.8:2
 	>=gnome-base/gnome-desktop-3.0.0:3
 
@@ -41,7 +41,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.9:2
 
 	exif? ( >=media-libs/libexif-0.6.20 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	tracker? ( >=app-misc/tracker-0.12 )
+	tracker? ( >=app-misc/tracker-0.14 )
 	xmp? ( >=media-libs/exempi-2.1.0 )"
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
@@ -67,6 +67,7 @@ PDEPEND="gnome? (
 
 pkg_setup() {
 	G2CONF="${G2CONF}
+		--disable-profiling
 		--disable-update-mimedb
 		$(use_enable exif libexif)
 		$(use_enable introspection)
@@ -82,7 +83,7 @@ src_prepare() {
 
 	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
 	# bug #393663
-	epatch "${FILESDIR}/${PN}-3.2.1-delete.patch"
+	epatch "${FILESDIR}/${PN}-3.5.91-delete.patch"
 
 	# Remove crazy CFLAGS
 	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-9999.ebuild
index e39db043..0815b132 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-9999.ebuild
@@ -26,9 +26,9 @@ 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
+COMMON_DEPEND=">=dev-libs/glib-2.33.11:2
 	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.5.5:3[introspection?]
+	>=x11-libs/gtk+-3.5.12:3[introspection?]
 	>=dev-libs/libxml2-2.7.8:2
 	>=gnome-base/gnome-desktop-3.0.0:3
 
@@ -41,7 +41,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.9:2
 
 	exif? ( >=media-libs/libexif-0.6.20 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	tracker? ( >=app-misc/tracker-0.12 )
+	tracker? ( >=app-misc/tracker-0.14 )
 	xmp? ( >=media-libs/exempi-2.1.0 )"
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
@@ -67,6 +67,7 @@ PDEPEND="gnome? (
 
 pkg_setup() {
 	G2CONF="${G2CONF}
+		--disable-profiling
 		--disable-update-mimedb
 		$(use_enable exif libexif)
 		$(use_enable introspection)
@@ -82,7 +83,7 @@ src_prepare() {
 
 	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
 	# bug #393663
-	epatch "${FILESDIR}/${PN}-3.2.1-delete.patch"
+	epatch "${FILESDIR}/${PN}-3.5.91-delete.patch"
 
 	# Remove crazy CFLAGS
 	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \