gentoo resync : 28.04.2021

4 files changed, 74 insertions, 28 deletions

diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index e38dd9576e00..e3cc3abe7833 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,8 +1,8 @@
 AUX 2.3.5-fix-autostart-build.patch 3518 BLAKE2B e41b39cb8576a533bb4e1bae9b96daf3d2614109a94f4cf6edb8968a7a17b3788d824f3b3b156a17eeea7232ad720306f5c081c3beb4c891ddfbb911af5ed3c1 SHA512 4b325b89675c3e2f470c6be48da4f2598bdfc8be5b44ea55e09e161428b041ee8b7f3ecc3b6c3a9dcac612b46f3f05511fabbaf8ed2b17ed589349f103c0fae6
-DIST tracker-miners-2.3.3.tar.xz 3144712 BLAKE2B a5789cce89dedd7cf35548b730acc80eb9b8bcbc8338c4ee55b07c97af4b9fbadc46bf0fdc552a3384e995d71aca0defe2d57dc21d99f775dee6f33f69e0aa9b SHA512 1e845aaa5412125df84298a05f29888b3872c0f4d9251f026dd51846831fcd4aa0c6965c85752d7b6ed6548268d21f0fd2a8427c922a5dc0afcd294286c607e2
-DIST tracker-miners-2.3.4.tar.xz 3128484 BLAKE2B f52c46123c95252f8f16df824ff7498a8f44698cea13fa78653d7733590bef0a502139fea686b4fd9012f7569a6f946e1dbf8e053a16c474230c733d37103a3f SHA512 ceddddfa6c3151b5caeb197a4ae4dbe24fa2674e807bf66a9cc72227b60ee295171b52c2edb35236a3fbf9d8803678f55f8b990864a7a3a32bf362b0739d03ba
+AUX tracker-miners-3.1.1-Fix-asciidoc-manpage.xsl-location.patch 857 BLAKE2B 25e6a69bf2d868b5ab9045e4f890079a1edf81fb737e74beef7ac3037366bdc0986991aeb94053f0f027287e824abd2a4e0cc6a9ac94be680f1494bc0c4abc20 SHA512 112772fcf646a4b4c81473ac28a74f31706f41340c3867cd8272ecfb5b512158fdf4ed4756fb2d661883faa8478f51ebed897744582b42891e78039eb170139d
 DIST tracker-miners-2.3.5.tar.xz 3128428 BLAKE2B a45c642fb03433a6cf12d0904a82498aa6645f97ac70b1cfe04cc3b739b33b5d3fe307cd96f45a5a4af8927f029b4eade60195d2f72c1a684aa26ee723025d8a SHA512 13da1106bc1bc8a550093c4d1bf4336a205f636e0487dc9d42cee9ce2666eca73ead479fd04f03ccf15acb4e3b27a1c898860f63bdfa69ca74b02aa041731fa9
-EBUILD tracker-miners-2.3.3.ebuild 4635 BLAKE2B 11c4b5662fae132610db03cb86c9ca78e9630a5fab1ab6d1a2fde5ec3193afb5937416ec20ac2f95a13be25ff821ab67fce0667fa9ee97cd422e82eb44bbcf0a SHA512 9d8cb95df031b25f3e0eef61c6d40f68e8fa872c52235057ce834cf563a9a3fc35370fd4272a5775bf4cc65d4e22e61d9c7ebc2e66502f210589034b82639596
-EBUILD tracker-miners-2.3.4.ebuild 4638 BLAKE2B c017180ddc7aa6131d802f2acd8f38fe92d375d1c4dd1607808194fbf998626a96bd8ac18ce493d75765d32fbaf0944d9a6355a3b8c7ef574361eb5c05e91639 SHA512 7fb21ad11dae03de02fbc9770c98c809da9f98161ea9c437f22dacfef33958ae797495a4ca53be9885f7afc528be3a6c4d2b677b46e7d22654e88e4ab748ac92
+DIST tracker-miners-3.1.1.tar.xz 4066784 BLAKE2B 60ae0141b295f08f9fce92b2697adcabfa1c7dcadd32759a5283771e6c98aed03a2f9a2afc8c60138a3c3590d96b59fbeb844dfbd34acb89d83dd40d1476858c SHA512 d7935fd02e0971a377106c65005b6ed4fdcc2c147f698d3cb36fea8e78019050e8b8ae5a407dea9809196c0186b8969c923767445249a85ad8b81a10e07c242f
+EBUILD tracker-miners-2.3.5-r1.ebuild 4731 BLAKE2B 97db115174c1a24648c1902c504c1cb3ecfae2ddd311b78f648badfa129bba7ad614577deaaec1b5babea2bb0bd58e51889480453aab7fa372c339f137aaca4c SHA512 761ff76fdd2eb02e46de77c42dcca2205d99db82240cb310d303d9af908f0c466b3599758c40e7d16d5a5058e81ba0bb97a48f721622e8054b14f82da78d0089
 EBUILD tracker-miners-2.3.5.ebuild 5001 BLAKE2B b683e12c111b42c22a1703d14490809af17d54e1bc2943c2f208706eee6b715261a2e39a923d4d622a224f402c32bbae41e0eff45065dcd63848358976c1694d SHA512 ab5f4f7bcb7577ee88d96c19ebace33c85e4b71b54bcaf903a54e837d99e59575ae0c426bf61f9e93e2a85053c4e9609d80d514d2ce85ca1e343bf2ced27f8f5
+EBUILD tracker-miners-3.1.1.ebuild 4671 BLAKE2B 15ae1d63bef54b574a4510dc4ce7f80d10437bced6f708fb46cf5604d1a4db065ff5602b0fabd9c54da24830210bfd2895e8fe8e8b23cb67d4a2929e18b0ac56 SHA512 3d08035334401017d36d62ae386a20db75bbb899b9ce9df515001847ded8bf05ffbaceadf21c2b192663b4aad6f2187383fd4a275b8626d97619acae44ab6ba3
 MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01
diff --git a/app-misc/tracker-miners/files/tracker-miners-3.1.1-Fix-asciidoc-manpage.xsl-location.patch b/app-misc/tracker-miners/files/tracker-miners-3.1.1-Fix-asciidoc-manpage.xsl-location.patch
new file mode 100644
index 000000000000..26bea773b284
--- /dev/null
+++ b/app-misc/tracker-miners/files/tracker-miners-3.1.1-Fix-asciidoc-manpage.xsl-location.patch
@@ -0,0 +1,25 @@
+From 24a47894578f48c54cb303c8a11ad8df29fc93a4 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sat, 13 Mar 2021 17:35:17 -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 0b8a64863..831d08597 100644
+--- a/docs/manpages/meson.build
++++ b/docs/manpages/meson.build
+@@ -43,7 +43,7 @@ foreach m : daemon_manpages + cli_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.2
+
diff --git a/app-misc/tracker-miners/tracker-miners-2.3.4.ebuild b/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
index f8bfdeb8dd65..417aa39630d3 100644
--- a/app-misc/tracker-miners/tracker-miners-2.3.4.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
@@ -1,8 +1,8 @@
-# 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} )
 
 inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
 
@@ -21,7 +21,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 # tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
 RDEPEND="
 	>=dev-libs/glib-2.46:2
-	>=app-misc/tracker-2.2.0:=
+	>=app-misc/tracker-2.2.0:0=
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -68,7 +68,11 @@ BDEPEND="
 				media-plugins/gst-plugins-openh264:1.0 )
 	) )
 "
-# intltool-merge manually called in meson.build in 2.2.2; might be properly gone by 2.3
+# intltool-merge manually called in meson.build in 2.3.5
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-autostart-build.patch
+)
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
@@ -133,6 +137,7 @@ src_configure() {
 		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
 		-Dgeneric_media_extractor=${media_extractor}
 		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
+		-Dautostart=false # false to co-exist with tracker-miners-3
 		-Dsystemd_user_services="$(systemd_get_userunitdir)"
 	)
 	meson_src_configure
diff --git a/app-misc/tracker-miners/tracker-miners-2.3.3.ebuild b/app-misc/tracker-miners/tracker-miners-3.1.1.ebuild
index 9d0204ebade2..1142f92f8000 100644
--- a/app-misc/tracker-miners/tracker-miners-2.3.3.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-3.1.1.ebuild
@@ -1,8 +1,8 @@
-# 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} )
 
 inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
 
@@ -10,18 +10,18 @@ DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
 HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
 
 LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
+SLOT="3"
+IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
 
 REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
 RDEPEND="
-	>=dev-libs/glib-2.46:2
-	>=app-misc/tracker-2.2.0:=
+	>=dev-libs/glib-2.62:2
+	>=app-misc/tracker-3.0:3=
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -50,31 +50,49 @@ RDEPEND="
 	sys-libs/zlib:0
 	gif? ( media-libs/giflib:= )
 
+	networkmanager? ( net-misc/networkmanager:= )
+
 	rss? ( >=net-libs/libgrss-0.7:0 )
 	app-arch/gzip
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	app-text/asciidoc
+	dev-libs/libxslt
 	dev-util/glib-utils
 	dev-util/gdbus-codegen
 
-	>=dev-util/intltool-0.40.0
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS}
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
 		gstreamer? (
 			media-libs/gstreamer:1.0[introspection]
-			|| ( media-plugins/gst-plugins-libav:1.0
-				media-plugins/gst-plugins-openh264:1.0 )
-	) )
+			|| (
+				media-plugins/gst-plugins-libav:1.0
+				media-plugins/gst-plugins-openh264:1.0
+			)
+		)
+	)
 "
-# intltool-merge manually called in meson.build in 2.2.2; might be properly gone by 2.3
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Fix-asciidoc-manpage.xsl-location.patch
+)
+
+python_check_deps() {
+	has_version -b "dev-python/tappy[${PYTHON_USEDEP}]"
+}
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
 src_prepare() {
+	# https://gitlab.gnome.org/GNOME/tracker-miners/-/merge_requests/323
+	sed -i -e 's:environtment:env:' tests/libtracker-extract/meson.build || die
+
 	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
 	if use gstreamer; then
 		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
@@ -96,24 +114,23 @@ src_configure() {
 	local emesonargs=(
 		-Dtracker_core=system
 
-		-Ddocs=true
+		-Dman=true
 		-Dextract=true
-		-Dfunctional_tests=false # currently broken, may fare better in 2.2.3 or 2.3; if re-enabled re-add dconf test dep
-		#$(meson_use test functional_tests)
+		$(meson_use test functional_tests)
+		$(meson_use test tests_tap_protocol)
 		-Dminer_fs=true
 		$(meson_use rss miner_rss)
 		-Dwriteback=true
 		-Dabiword=true
-		-Ddvi=true
 		-Dicon=true
 		-Dmp3=true
 		-Dps=true
 		-Dtext=true
 		-Dunzip_ps_gz_files=true # spawns gunzip
 
+		$(meson_feature networkmanager network_manager)
 		$(meson_feature cue)
 		$(meson_feature exif)
-		-Dflac=disabled # never use external flac extractor - gst-plugins-flac is for that; ffmpeg one is maybe worse, but that's non-default
 		$(meson_feature gif)
 		$(meson_feature gsf)
 		$(meson_feature iptc)
@@ -124,7 +141,6 @@ src_configure() {
 		-Dpng=enabled
 		$(meson_feature raw)
 		$(meson_feature tiff)
-		-Dvorbis=disabled # never use external vorbis extractor - gst-plugins-base[vorbis] is for that; ffmpeg one is maybe worse, but that's non-default
 		$(meson_feature xml)
 		$(meson_feature xmp)
 		$(meson_feature xps)
@@ -133,7 +149,7 @@ src_configure() {
 		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
 		-Dgeneric_media_extractor=${media_extractor}
 		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
-		-Dsystemd_user_services="$(systemd_get_userunitdir)"
+		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
 	)
 	meson_src_configure
 }