gentoo resync : 28.04.2021

4 files changed, 58 insertions, 26 deletions

diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 816ec310ea08..949c3af75cb3 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,5 +1,6 @@
-DIST tracker-2.3.4.tar.xz 1607928 BLAKE2B f0285480091fdac3aab1d258496643b7644f2d58383eb0d7cdd10f273a79e75a36507285db4737bb270dda8cb195482d6f8e2770b24fce13c72dd32325c3976e SHA512 8b8ffc33962a5dffbae83dfb8ea73b0d2ff6ee002fbd9e4b574ef5f8e562338e359caab290ab804f2801a14e04d2c76eb0a52cf06be4d236ea043de4fc39dadf
+AUX tracker-3.1.1-Fix-asciidoc-manpage.xsl-location.patch 835 BLAKE2B 70e949f1e385b237a154cbd7c3f3130acdb53761f6f6eb265ec591d43aa951db538765fb8b6d16f73a8ba99a53691610434a54e491cb85c8fb9350d5a00e8456 SHA512 adaa1d7f468186de0ec3d5ddecbf84518f08b3802c2d62d2f6511c68ae2b455c154e7fce14b57cb091f4a221a7fe32042ceeffa5095c22f8ec70ffbfe49f7de9
 DIST tracker-2.3.5.tar.xz 1604004 BLAKE2B ad79682cb703056fd927649021a5f37fddb2e978ecc710d020c23ef5dd076f88c7e0c2cd9d4385343e9d6c2c2ac7473af7508d86793c505e2361a8021bf27d50 SHA512 74cd3b2671b811f3267a516e6f6047594fffa7c8a4a23fa5be4f7d71f581c417a88f12f614757418a848077a9231c0c876617d4486f3bb5b103382b871913d34
-EBUILD tracker-2.3.4.ebuild 2618 BLAKE2B 4bb5b38390812608d2f1331db79cdecc273e632986aadb29ee009ae90104eca8aa3a10c242c779eea8a9d69d69a10e5450664d8823cf8b4bfca4feeff59f6c0b SHA512 3eb5fca780e09629d86c8c0ac00040ec3d50cf37d35839be5cdfd654c01bcbdc72dc0f76633c45fa20f38389141bcf86e4f9514a9186a95b7222e93e21db8ce4
-EBUILD tracker-2.3.5.ebuild 2590 BLAKE2B f5fe092b79880b45882747be8225efbbb7dbf7e12c7c3889277c1985997a4c3616c1fe311b21109ee3ec614d92f814b7e4f44b256cef1d3d6ef8bea5511b243e SHA512 b98e80469d53a0b984a587a7097a588391d02265342eb8577bec6312fb1e895c6de3b36c2075399f87e79c1c1a31ed6fedb31fd6b0317c2a7d0dffc47cc0d477
+DIST tracker-3.1.1.tar.xz 1434784 BLAKE2B fa73420736e82bc7a43ef9dd9dce9096e50a22aca3f83737a0c77802460fc307630403bb836a799ff2d03a838cd1e71fbb4a17a54fa0a7c823e122800530e050 SHA512 87e6cc6dbfb34cc17bef42defefc51fc9d9586bffebf7a282a89ec3b294e911c504ea862bb05e5a269e438a83fbeb8938670eb32fa11d0d09ba805e0b02e6dcd
+EBUILD tracker-2.3.5.ebuild 2591 BLAKE2B aa8a651907b383dd6b52ce9097ed0fdab39434245538141b76a8e6fe6bc1bcbc79cfffd607acfa67883cea86b6e55433e4cf5ed552aa97d53ab10d534b07205f SHA512 5578c76065635b94c67319261f7b66d4f222bf12c922b157c880bfc3a15a7ac47d1c389888550981f083417cfea3768aa609f914889eedd2004e973afaac12e8
+EBUILD tracker-3.1.1.ebuild 2509 BLAKE2B a18706f1f022fb677dc39ef357d4353e37364328ca9d83e69ca8051c0b7d81050181df7fbf284e554db8a196e700993c65e7963a8fc7b1384663e7e1fb700970 SHA512 3f8a8c1e670ffedd73adde7d6975b8f5af122ebb8db88fd7e2b3c09f398a0b130c1ff821fbcf5c33798c3e36c25765aa97396398e9a1771a9a9d2b7716026204
 MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/files/tracker-3.1.1-Fix-asciidoc-manpage.xsl-location.patch b/app-misc/tracker/files/tracker-3.1.1-Fix-asciidoc-manpage.xsl-location.patch
new file mode 100644
index 000000000000..3383e2be28e5
--- /dev/null
+++ b/app-misc/tracker/files/tracker-3.1.1-Fix-asciidoc-manpage.xsl-location.patch
@@ -0,0 +1,25 @@
+From c14fa25f2b616b170b453861de87ef21c05dc6c4 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sat, 13 Mar 2021 14:29:58 -0500
+Subject: [PATCH] Fix asciidoc manpage.xsl location
+
+---
+ docs/manpages/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build
+index f90c757cf..101cbca16 100644
+--- a/docs/manpages/meson.build
++++ b/docs/manpages/meson.build
+@@ -32,7 +32,7 @@ foreach m : manpages
+     command: [xsltproc,
+               '--output', '@OUTPUT@',
+               '--stringparam', 'man.authors.section.enabled', '0',
+-              '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
++              '/usr/share/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
+     input: xml,
+     output: manpage,
+     install: true,
+-- 
+2.26.3
+
diff --git a/app-misc/tracker/tracker-2.3.5.ebuild b/app-misc/tracker/tracker-2.3.5.ebuild
index 4a430b59490c..0c98fe546103 100644
--- a/app-misc/tracker/tracker-2.3.5.ebuild
+++ b/app-misc/tracker/tracker-2.3.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 VALA_MIN_API_VERSION="0.40"
 
 inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
diff --git a/app-misc/tracker/tracker-2.3.4.ebuild b/app-misc/tracker/tracker-3.1.1.ebuild
index d11fc2711392..0593bbbcb0c6 100644
--- a/app-misc/tracker/tracker-2.3.4.ebuild
+++ b/app-misc/tracker/tracker-3.1.1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 VALA_MIN_API_VERSION="0.40"
-VALA_MAX_API_VERSION="0.48"
 
 inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
 
@@ -12,42 +11,48 @@ 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 +miners networkmanager stemmer"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-#RESTRICT="!test? ( test )"
+SLOT="3/0" # libtracker-sparql-3.0 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk-doc +miners stemmer test"
+RESTRICT="!test? ( test )"
 
 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
-# But build still needs it - https://gitlab.gnome.org/GNOME/tracker/issues/131
 RDEPEND="
-	>=dev-libs/glib-2.46:2
+	>=dev-libs/glib-2.52:2
 	>=sys-apps/dbus-1.3.2
 	>=dev-libs/gobject-introspection-1.54:=
 	>=dev-libs/icu-4.8.1.2:=
 	>=dev-libs/json-glib-1.0
 	>=net-libs/libsoup-2.40.1:2.4
 	>=dev-libs/libxml2-2.7
-	>=dev-db/sqlite-3.20.0
-	networkmanager? ( >=net-misc/networkmanager-0.8 )
+	>=dev-db/sqlite-3.29.0
 	stemmer? ( dev-libs/snowball-stemmer )
-	sys-apps/util-linux
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/glib-utils
+	app-text/asciidoc
+	dev-libs/libxslt
 	$(vala_depend)
-	gtk-doc? ( >=dev-util/gtk-doc-1.8
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.8
 		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.5 )
+		app-text/docbook-xml-dtd:4.5
+	)
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
+	test? (
+		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
+	)
 	${PYTHON_DEPS}
 "
 PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-Fix-asciidoc-manpage.xsl-location.patch
+)
+
 function inotify_enabled() {
 	if linux_config_exists; then
 		if ! linux_chkconfig_present INOTIFY_USER; then
@@ -61,6 +66,11 @@ function inotify_enabled() {
 	fi
 }
 
+python_check_deps() {
+	use test || return 0
+	has_version -b "dev-python/tappy[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	linux-info_pkg_setup
 	inotify_enabled
@@ -76,15 +86,11 @@ src_prepare() {
 src_configure() {
 	local emesonargs=(
 		$(meson_use gtk-doc docs)
-		-Dfts=true
-		-Dfunctional_tests=false # many fail in 2.2; retry with 2.3
-		#$(meson_use test functional_tests)
 		-Dman=true
-		$(meson_feature networkmanager network_manager)
 		$(meson_feature stemmer)
 		-Dunicode_support=icu
-		-Dbash_completion="$(get_bashcompdir)"
-		-Dsystemd_user_services="$(systemd_get_userunitdir)"
+		-Dbash_completion_dir="$(get_bashcompdir)"
+		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
 	)
 	meson_src_configure
 }