summaryrefslogtreecommitdiff
path: root/gnome-base/nautilus/nautilus-3.32.3.ebuild
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 21:54:24 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-13 21:54:24 +0100
commitda491770b9ba5f179e18db461c49cb6f1ccf0e1f (patch)
treed3e34a8bd906741ab18cf69d8d4f732853e26ade /gnome-base/nautilus/nautilus-3.32.3.ebuild
parentad6182343997a405079870a2fe91c4e0c6b94595 (diff)
parent5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff)
gentoo resync : 28.09.2019
Diffstat (limited to 'gnome-base/nautilus/nautilus-3.32.3.ebuild')
-rw-r--r--gnome-base/nautilus/nautilus-3.32.3.ebuild5
1 files changed, 5 insertions, 0 deletions
diff --git a/gnome-base/nautilus/nautilus-3.32.3.ebuild b/gnome-base/nautilus/nautilus-3.32.3.ebuild
index b73d0c915cca..3197ede8970f 100644
--- a/gnome-base/nautilus/nautilus-3.32.3.ebuild
+++ b/gnome-base/nautilus/nautilus-3.32.3.ebuild
@@ -35,7 +35,12 @@ RDEPEND="${COMMON_DEPEND}
seccomp? ( >=sys-apps/bubblewrap-0.3.1 )
sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
+<<<<<<< HEAD
"
+=======
+ >=app-misc/tracker-miners-2.0:=
+" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
+>>>>>>> next
DEPEND="${COMMON_DEPEND}
media-libs/fontconfig
"