[gentoo-commits] repo/gentoo:master commit in: media-gfx/gnome-photos/

[Mart Raudsepp]

commit:     3008dca6f0148d4e16cc8dfab9cb9d7e388a6885
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 15 13:03:02 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Feb 15 13:38:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3008dca6

media-gfx/gnome-photos: support tracker-2

Bug: https://bugs.gentoo.org/672308
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild b/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild
index e2c8b5c0544..f34fc89fd7a 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild
@@ -15,9 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="flickr test upnp-av"
 
-# tracker-2 is supported, but we need to pull in tracker-miners for that, which we didn't have in main tree yet
 COMMON_DEPEND="
-	app-misc/tracker:0/100[miner-fs]
+	app-misc/tracker:=
 	>=dev-libs/glib-2.44:2
 	gnome-base/gsettings-desktop-schemas
 	>=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts]
@@ -50,6 +49,12 @@ DEPEND="${COMMON_DEPEND}
 	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
 "
 # app-text/yelp-tools needed for eautoreconf; otherwise probably just itstool
+RDEPEND="${RDEPEND}
+	|| (
+		>=app-misc/tracker-1[miner-fs(-)]
+		>=app-misc/tracker-miners-2
+	)
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-support-tracker1.patch # requires eautoreconf