[gentoo-commits] repo/gentoo:master commit in: app-misc/tracker/

[Mart Raudsepp]

commit:     a36430aa894f437924697e06674f37a47b43763c
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 15 12:37:11 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Feb 15 12:38:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a36430aa

app-misc/tracker: pull in tracker-miners by default

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>

 app-misc/tracker/metadata.xml         | 1 +
 app-misc/tracker/tracker-2.1.7.ebuild | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app-misc/tracker/metadata.xml b/app-misc/tracker/metadata.xml
index c5ff6169293..7516a51a113 100644
--- a/app-misc/tracker/metadata.xml
+++ b/app-misc/tracker/metadata.xml
@@ -16,6 +16,7 @@
   for ODT.</flag>
     <flag name="iptc">Enable extraction of IPTC data from pictures</flag>
     <flag name="iso">Enable extraction of metadata from ISO disk images</flag>
+    <flag name="miners">Install the <pkg>app-misc/tracker-miners</pkg> package for actual data mining support for tracker</flag>
     <flag name="miner-fs">Enable tracker-miner-fs (required for filesystem indexing)</flag>
     <flag name="playlist">Add support for playlists</flag>
     <flag name="stemmer">Add word stemming via <pkg>dev-libs/snowball-stemmer</pkg>.</flag>

diff --git a/app-misc/tracker/tracker-2.1.7.ebuild b/app-misc/tracker/tracker-2.1.7.ebuild
index d3a2a269ab4..24923cfd409 100644
--- a/app-misc/tracker/tracker-2.1.7.ebuild
+++ b/app-misc/tracker/tracker-2.1.7.ebuild
@@ -4,17 +4,19 @@
 EAPI=6
 PYTHON_COMPAT=( python3_{4,5,6,7} )
 
-inherit bash-completion-r1 gnome.org linux-info meson python-any-r1 systemd vala xdg
+inherit bash-completion-r1 eapi7-ver gnome.org linux-info meson python-any-r1 systemd vala xdg
 
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/2.0"
-IUSE="gtk-doc networkmanager stemmer"
+IUSE="gtk-doc +miners networkmanager stemmer"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
+PV_SERIES=$(ver_cut 1-2)
+
 # In 2.2.0 util-linux should only be necessary if glib is older than 2.52 at compile-time
 RDEPEND="
 	>=dev-libs/glib-2.46:2
@@ -40,6 +42,9 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 " # g-ir-merge needs py3; functional tests need py2, so disabled for now due to mixup
 # intltool-merge manually called in meson.build in 2.1.7; properly gone by 2.2.0
+RDEPEND="${RDEPEND}
+	miners? ( >=app-misc/tracker-miners-${PV_SERIES} )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-doc-options.patch # https://gitlab.gnome.org/GNOME/tracker/merge_requests/58