gnome-base/nautilus: 3.26.2 → 3.26.3.1

Cleanup unused dependencies.

Package-Manager: Portage-2.3.40, Repoman-2.3.9
Manifest-Sign-Key: 0x5A56C8CD0C13248A

3 files changed, 32 insertions, 42 deletions

diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 3f7ef34e..9b796fb2 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST nautilus-3.26.2.tar.xz 3277464 BLAKE2B ffc389faa8d2836c0241274cb0a76af7e5894ad705ae4dfafc9b6d1becd34500a1c3cd4d15b62f91a4169001108c47c2323057a77bc9ad3a09fe353b3b526854 SHA512 d6de37bd5ae0488f6df8b57611aea748275702dd1bf3f95545800b9f5d6b5b8661a7d7c44273f7211dc6c4a53b219cdeb24b2ac2716e687e677859961ea006f3
+DIST nautilus-3.26.3.1.tar.xz 3275616 BLAKE2B 48fa6561322575ceaae036c0132c46a34a62cc1057c4b672f1a131e28478892317e1905f9d18a93ee07dcba0468b60e9c176138e48a684e3b9f07bccb3e0820c SHA512 bd2f98d0cdad40ab23876ce8dabe5572aa3a9b433b3520054d674b6904859d9e536d34082e840ff8c1df88c04a60c4034669012e2773517058f99ca9e5ad4e72
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEX+aBqe7MmoWBwzA1lSmjXZiBxnkFAlsKpvFfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEX+aBqe7MmoWBwzA1lSmjXZiBxnkFAlsKqD9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDVG
 RTY4MUE5RUVDQzlBODU4MUMzMzAzNTk1MjlBMzVEOTg4MUM2NzkACgkQlSmjXZiB
-xnlpthAAuoyA0bwThrU3r+Gii5C0dRdFWlSe5uWUy39smEjyhnMQ8s9MryPvTSpJ
-RiVpGufOTq94MozvZokpF3Se4nUsEWkgZfWDw5ccrDKB8Q1eSM0u3sS7EjlmMGs8
-FCvybEfYhzntxkrP3SUTS/eG865sCMy1tnGmDzbygJTaHKN/hYFJJDmTfDl6gcm3
-oLz2XXf65iuVBCB5+TKJzl5Vik6XjRWclWyfzXCl5gplynHOzDJ3RkYnOkWpGe6i
-QMMkQCD0KI/1HmF+GUnxOj+9zppItnA5g9ViCawS2rre1RVo6thcOy39vntpouqw
-kbX/8DgptbLXbfBBGtNHikdNAaGNHTngwwKv+JUBLsau22+qzelN4DPY9UVeBcvi
-daNEClS7kRkm7bxZHrK8fizoIB182c8EItqzAQD8PTASOu+7605O5EX15IINSsAl
-7gxv5KP0CfL5xztnDa21+r2A/QUzgHs2vE/tSXRiGRtVMaHlFrHksm5ecox5cXti
-5a+IhlTKgqDr/8Jzu+bws6Q7aI7oE7HmZcAfgf4XHW7ZxDSJjYN4sd63he0TZ2kb
-XLpIDOkt6S3sND7Sv9uhvb81wifYQLLOK9MjkUKnokDaqMtadpgoRH/dggP64/y/
-njYsI89o69ipXK3Nm/vHCQP30EtTN0XPKDIvg/3VuHuGN9541dI=
-=8D0k
+xnnPxA/+JEiy92CGZLJvrPtpx7fuz2aao3DjaZs0ciTSKBjL8rMLfVP+PCfOxGZm
+ByNBLkFxXXiEqS6mFG8OSEzqy7o8o8CpLkEYh6msQckvXmX0U7SsIu1jA6bfXcGu
+rOMBHdBGp3gE+X7jnZn3bxME3eRMVaeRAhpFNgRYSanqpZ4/zettccguAlDyPAC6
+qCna7wTTr6CcXIIWZas1dDYMx+qNa8CWShPDqsc7O0x9h0xz5zohmNAIAVc7Gwvd
+UkXuIaBDqbeT4mYFTRKYrubE6zE2oYhQKtPsNhGRcRvJ8LGF0o+MBaG2t3GUEMtu
+rCMMyANlpoX8Ro7vXltlJMQGyRIbVD+V2Pv4TqSXn/KI4cD3HJE6fIIHMGgMQ4rk
+NGxqCx3EpFD2XRgtkzXCkxPKdQ6DHrz4Yb5JDNDHgyusLDHMREzyGGBCJZCfBhpP
+z5bkdbwkxpwrDYX7MI/pK7IM3t/AgdFHpvuaCQMfPhQGhME60VTMuvWKdZS2+bVf
+BN5bVgQ5GZ8heF6n0aBChNNDhSfOHT7IxcT3KF7AogAndkic/PyIDgbFcTdOOUDB
+MmXBSFqJXgkShlhBwQYXAFJzd9SK1uswOvzbU4q+EX2lhKWKQ2t6DFKWVcey0X3N
+bD5NC5y1RjIjtG23cOX/SXCC+5GEp0MB+YGvrymCQ8BfxkqHaDU=
+=TgHx
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch b/gnome-base/nautilus/files/3.26.3.1-tracker-support-optional.patch
index 4363cbbf..61eacc2a 100644
--- a/gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch
+++ b/gnome-base/nautilus/files/3.26.3.1-tracker-support-optional.patch
@@ -1,4 +1,4 @@
-From 3e3d7621c6f8ec72e626701e3f55afc900a04a68 Mon Sep 17 00:00:00 2001
+From 664c66bd231c5d0ac20f6f4f14be461bfb206a1e Mon Sep 17 00:00:00 2001
 From: Gilles Dartiguelongue <eva@gentoo.org>
 Date: Sun, 27 May 2018 13:54:38 +0200
 Subject: [PATCH] Make tracker support optional
@@ -7,12 +7,12 @@ Subject: [PATCH] Make tracker support optional
  config.h.meson                      |  1 +
  meson.build                         | 15 ++++++++++++---
  meson_options.txt                   |  5 +++++
- src/meson.build                     | 21 +++++++++++++--------
+ src/meson.build                     | 19 ++++++++++++-------
  src/nautilus-file-undo-operations.c |  4 ++++
  src/nautilus-file.c                 |  2 ++
  src/nautilus-files-view.c           |  4 ++++
  src/nautilus-search-engine.c        | 14 ++++++++++++++
- 8 files changed, 55 insertions(+), 11 deletions(-)
+ 8 files changed, 54 insertions(+), 10 deletions(-)
 
 diff --git a/config.h.meson b/config.h.meson
 index 4f5cb5848..58d71e96f 100644
@@ -27,7 +27,7 @@ index 4f5cb5848..58d71e96f 100644
  #mesondefine ENABLE_PACKAGEKIT
  #mesondefine LOCALEDIR
 diff --git a/meson.build b/meson.build
-index 7b8f15cf5..b2f2ef438 100644
+index 6256193cc..776111f81 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -81,9 +81,18 @@ if get_option ('enable-selinux')
@@ -36,7 +36,7 @@ index 7b8f15cf5..b2f2ef438 100644
  
 -tracker_sparql = dependency ('tracker-sparql-2.0', required: false)
 -if not tracker_sparql.found()
--  tracker_sparql = dependency ('tracker-sparql-1.0')
+-    tracker_sparql = dependency ('tracker-sparql-1.0')
 +tracker_api = get_option ('tracker')
 +if tracker_api == 'disabled'
 +    # pass
@@ -69,7 +69,7 @@ index c934dd8b1..d2ba885a2 100644
          type: 'boolean',
          value: false,
 diff --git a/src/meson.build b/src/meson.build
-index 9f01f5ba2..c55f39c7d 100644
+index cc08345d8..40f337cde 100644
 --- a/src/meson.build
 +++ b/src/meson.build
 @@ -254,12 +254,6 @@ libnautilus_sources = [
@@ -85,17 +85,15 @@ index 9f01f5ba2..c55f39c7d 100644
  ]
  
  nautilus_deps = [glib,
-@@ -273,8 +267,7 @@ nautilus_deps = [glib,
-                  eel_2,
+@@ -274,7 +268,6 @@ nautilus_deps = [glib,
                   nautilus_extension,
                   x11,
--                 gmodule_no_export,
--                 tracker_sparql]
-+                 gmodule_no_export]
+                  gmodule_no_export,
+-                 tracker_sparql,
+                  gio_unix]
  
  if get_option ('enable-exif')
-     nautilus_deps += exif
-@@ -288,6 +281,18 @@ if get_option ('enable-xmp')
+@@ -289,6 +282,18 @@ if get_option ('enable-xmp')
      nautilus_deps += exempi
  endif
  
@@ -146,7 +144,7 @@ index e833d0578..d6e407ca5 100644
  /* trash */
  G_DEFINE_TYPE (NautilusFileUndoInfoTrash, nautilus_file_undo_info_trash, NAUTILUS_TYPE_FILE_UNDO_INFO)
 diff --git a/src/nautilus-file.c b/src/nautilus-file.c
-index 536f83541..247334d5d 100644
+index d6ac35a44..752adc295 100644
 --- a/src/nautilus-file.c
 +++ b/src/nautilus-file.c
 @@ -2392,6 +2392,7 @@ real_batch_rename (GList                         *files,
@@ -166,7 +164,7 @@ index 536f83541..247334d5d 100644
      if (op->skipped_files == g_list_length (files))
      {
 diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
-index a79ecf20d..3b7bd4166 100644
+index 8784f63f8..af5605d68 100644
 --- a/src/nautilus-files-view.c
 +++ b/src/nautilus-files-view.c
 @@ -28,8 +28,10 @@
@@ -180,7 +178,7 @@ index a79ecf20d..3b7bd4166 100644
  #include "nautilus-error-reporting.h"
  #include "nautilus-file-undo-manager.h"
  #include "nautilus-floating-bar.h"
-@@ -6209,6 +6211,7 @@ real_action_rename (NautilusFilesView *view)
+@@ -6266,6 +6268,7 @@ real_action_rename (NautilusFilesView *view)
              {
                  invoke_external_bulk_rename_utility (view, selection);
              }
@@ -188,7 +186,7 @@ index a79ecf20d..3b7bd4166 100644
              else
              {
                  GdkCursor *cursor;
-@@ -6226,6 +6229,7 @@ real_action_rename (NautilusFilesView *view)
+@@ -6283,6 +6286,7 @@ real_action_rename (NautilusFilesView *view)
  
                  gtk_widget_show (GTK_WIDGET (dialog));
              }
diff --git a/gnome-base/nautilus/nautilus-3.26.2.ebuild b/gnome-base/nautilus/nautilus-3.26.3.1.ebuild
index ac07418d..076cdce4 100644
--- a/gnome-base/nautilus/nautilus-3.26.2.ebuild
+++ b/gnome-base/nautilus/nautilus-3.26.3.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
 IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
 
-KEYWORDS="~amd64"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~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"
@@ -30,11 +30,8 @@ COMMON_DEPEND="
 	>=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/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
 
 	exif? ( >=media-libs/libexif-0.6.20 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
@@ -43,21 +40,16 @@ COMMON_DEPEND="
 	xmp? ( >=media-libs/exempi-2.1.0:2 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
 	>=dev-util/gdbus-codegen-2.33
-	>=dev-util/gtk-doc-1.10
 	>=sys-devel/gettext-0.19.7
 	virtual/pkgconfig
 	x11-base/xorg-proto
 "
 RDEPEND="${COMMON_DEPEND}
+	gnome-base/dconf
 	packagekit? ( app-admin/packagekit-base )
 	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
 "
-
-# FIXME: does nautilus tracker tags work with tracker 2? there seems to be
-# some automagic involved
-
 PDEPEND="
 	gnome? ( x11-themes/adwaita-icon-theme )
 	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
@@ -87,7 +79,7 @@ src_configure() {
 		-Denable-desktop=true \
 		-Denable-gtk-doc=false \
 		-Denable-profiling=false \
-		-Dtracker=$(usex tracker 1.0 disabled) \
+		-Dtracker=$(usex tracker auto disabled) \
 		$(meson_use exif enable-exif) \
 		$(meson_use packagekit enable-packagekit) \
 		$(meson_use sendto nst-extension) \