gentoo resync : 29.12.2022

6 files changed, 18 insertions, 221 deletions

diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 9ddd3e134bc7..1e1625b80316 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,11 +1,8 @@
 AUX 2.3.5-fix-autostart-build.patch 3518 BLAKE2B e41b39cb8576a533bb4e1bae9b96daf3d2614109a94f4cf6edb8968a7a17b3788d824f3b3b156a17eeea7232ad720306f5c081c3beb4c891ddfbb911af5ed3c1 SHA512 4b325b89675c3e2f470c6be48da4f2598bdfc8be5b44ea55e09e161428b041ee8b7f3ecc3b6c3a9dcac612b46f3f05511fabbaf8ed2b17ed589349f103c0fae6
-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
-DIST tracker-miners-3.2.1.tar.xz 4074476 BLAKE2B dfadb33f70462f8373d526ed7fce63553808b7b38ae444dcc67c2f9a0b5f4821526491ced9e43608793ef3190cb200a5fc1a7dee24ead02001b600cbb09931b9 SHA512 d3767f714cbda1688aecced96c6e9b6c51e69018db872e0427c98b09aacea3274b446dd85df1196dd4b24358dcabe6780abec9cc9f44af70261ef6bc74b78c2c
-DIST tracker-miners-3.2.2.tar.xz 4073752 BLAKE2B f2fe63cb6ea0704152305c8922d6a557cb24dd507d9ea00e8d800de50bd04ad1f373503ecd8b734c6dc74568a8ec370b2a8b29b6ca4d8512d420a938b1b179df SHA512 03508ef2bbfe3030c4afaaea740739b91e4b1c1dde364f801cf7deeb2358abde3561f7e1b43eeae97acbb010f7fcc063d7cd46578089cf1e1fc736d219c91b62
 DIST tracker-miners-3.3.0.tar.xz 7243888 BLAKE2B 3dcbb03808e823e46141ddc13c074a5e066d1b41b32291b8ad1d1ff7896ee6c7c1f09b1792555324ad54ea55481a5641c0426b09e7960506ff77717f756300ad SHA512 ef28abf48633125e2386cc6c9cc4afbc8c203cfd6fcd31eb6928eb6132e033be232e1141655b5d517e66170c5abb3799f9ea3c76f4b5db66e18524aea59f3969
-EBUILD tracker-miners-2.3.5-r1.ebuild 4728 BLAKE2B 5c6b74b18dbe2aebb821d1d2c193c67e3503ee9fc1f9681f1ebc2858b57499a05ffab60cc0f55570f6594ef0d1238628d3777a4d5941ca982013424674d16133 SHA512 d0091dac5a17251612eeaf422bd7f4a62c2dde7be38c936295a8ed3ab98dd0d69a1dd610b8a4b121e2419fd28ec23a4559da4c3895f0188e04095612e64d6b08
-EBUILD tracker-miners-3.2.1.ebuild 4754 BLAKE2B facec9761c21544f37842fead42b3ef18b0a86d3e0d011ec788bd7539c3cf9c9df9db693c55f2f0788498c6ed2c83a6beae78c083d0ba3ee40a87983020cfb09 SHA512 fc2f9a8de0e71c761e0848e0d837294093e7c2075248e80be4f410f82e83bc77170051ca2ae12e2536aaca162215a44ea4943286a1c1f9cdf144ef294a5c897d
-EBUILD tracker-miners-3.2.2.ebuild 4757 BLAKE2B 78076f587ae368ad6e0ff8d33bc5dbc78e62ca7389d4f54dbadca231e9c39e69ca02a17991642ad640d9c93f627976cde6d085d93aefc656217413388b7e6b8f SHA512 a0e88a8cdee82674816bbe95227bad90c855d12d51df51307898591b2d5e24138e2d927fea091e7bb3775b1eba9daf77a8da759f1b4ae91e97a47d61ccec78b8
-EBUILD tracker-miners-3.3.0.ebuild 4550 BLAKE2B 51016e95c4ae4aa13613f65e46d27327eb8582fe79e2ba7d53d78cdb807c3ae28a4b2d9a7f3a4440eee273a6bb0f65ae3dc8b6414198a0a3c3b8b4dfe405f2ee SHA512 c43179c7614d3be4eff2550919756ac8f910256f05f1fd8a9ec20730ae07f8f49c00e9332fb75d44e16bca689d1e4b9fcaad6a987b7597bbfc15d9bbc81a04e5
+DIST tracker-miners-3.3.1.tar.xz 7244032 BLAKE2B 0233ba74ed6c697055c12fb758fefc0f71dba7e17db0e92950491cf51e228896e46d27485e2cedd16a5a3a8e4d46eca66baf57824e6340bad9f177b206908e2e SHA512 bc0cb53a7296a2836f05d5d5413418af936ef7f0a4794705e5970699d69c27f513812d0daa182f5359d665a3b6111de06cd9fc671ad769472e0cde2550f66dcb
+EBUILD tracker-miners-2.3.5-r1.ebuild 4729 BLAKE2B a9b88ca7efee49e804ad2ba2a14f4b73924c4192c0054ef4dff784b72ab9f1e7ae23e88ddd9e31b7b6bab9cb21d6e57ac15be175e4a7c853b2d3eb9aa316e86a SHA512 4e384b35ddeb2b61fa9b5c9d65ee8a9856d8040bf19fea746c2940e1a14f19bae857bc20fade912ca825d6743576d0ed34b6f704fd1856ab194928a5df2533f9
+EBUILD tracker-miners-3.3.0.ebuild 4547 BLAKE2B afadcad92ee66614ee538d8365ae03edf2c2d530b9d79199f24c23acdb8032f3b6d79c1b98e0e30dc40106a678ea0dcb0d3bdb265151a20dd8028cfe854fc6b8 SHA512 2be5ccda4b6234766b8dea65083774e6a2dabbadbd2df5d2be52f72ec5e44b48a0cbd5ed6a67486644625024a2fab76113e6cc4ee477316e4c373fe24a7870ba
+EBUILD tracker-miners-3.3.1.ebuild 4677 BLAKE2B c94f6ec50607107fedb22138d3472646694f47d69056fc6db32ad8ed97b78b702a4cdc79c3c03240f7b6a2f0833c861252def27a6c3190a1ca9e3b09faf4e38f SHA512 99d7984dbee46dec5d508d492382d7593c61323ba5a057ab36f699c55dc32e343b2e4c3235ec71bed06eb9f846b082437f6804dbbfb419d87f96455a13d83630
 MISC metadata.xml 740 BLAKE2B 038c1a4f3d5a1dce875cdd315187b3299b9a5ac0831dbd6d7967b9d5ea99610e134d9ccbffe3717819b88843e4836fc74c125bdfaa827f7b8479565cebd521d3 SHA512 474d28d444a83797a8f8bf287fd67b8e432dc7e93dccb30774e5eed254547840ae72eff5ccffbff6a020385a4d55fa1d7b0e3fc36280d6a6968f8b53ceff50a7
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
deleted file mode 100644
index 26bea773b284..000000000000
--- a/app-misc/tracker-miners/files/tracker-miners-3.1.1-Fix-asciidoc-manpage.xsl-location.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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.5-r1.ebuild b/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
index 804672ef7215..ed625d539a31 100644
--- a/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
 
diff --git a/app-misc/tracker-miners/tracker-miners-3.2.1.ebuild b/app-misc/tracker-miners/tracker-miners-3.2.1.ebuild
deleted file mode 100644
index 5ff984092f4c..000000000000
--- a/app-misc/tracker-miners/tracker-miners-3.2.1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 systemd xdg
-
-DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-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 ~riscv ~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.70:2
-	>=app-misc/tracker-3.2.0:3=
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-plugins/gst-plugins-meta:1.0 )
-	!gstreamer? (
-		ffmpeg? ( media-video/ffmpeg:0= ) )
-
-	>=sys-apps/dbus-1.3.1
-	xmp? ( >=media-libs/exempi-2.1.0:= )
-	raw? ( media-libs/gexiv2 )
-	>=dev-libs/icu-4.8.1.2:=
-	cue? ( media-libs/libcue:= )
-	exif? ( >=media-libs/libexif-0.6 )
-	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
-	xps? ( app-text/libgxps )
-	iptc? ( media-libs/libiptcdata )
-	jpeg? ( virtual/jpeg:0 )
-	iso? ( >=sys-libs/libosinfo-0.2.10 )
-	>=media-libs/libpng-1.2:0=
-	seccomp? ( >=sys-libs/libseccomp-2.0 )
-	tiff? ( media-libs/tiff:0 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	pdf? ( >=app-text/poppler-0.16.0[cairo] )
-	playlist? ( >=dev-libs/totem-pl-parser-3:= )
-	upower? ( >=sys-power/upower-0.9.0 )
-	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
-
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	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
-			)
-		)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.1-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
-	else
-		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
-	fi
-	xdg_src_prepare
-	gnome2_environment_reset # sets gstreamer safety variables
-}
-
-src_configure() {
-	append-cflags -DTRACKER_DEBUG -DG_DISABLE_CAST_CHECKS
-
-	local media_extractor="none"
-	if use gstreamer ; then
-		media_extractor="gstreamer"
-	elif use ffmpeg ; then
-		media_extractor="libav"
-	fi
-
-	local emesonargs=(
-		-Dtracker_core=system
-
-		-Dman=true
-		-Dextract=true
-		$(meson_use test functional_tests)
-		$(meson_use test tests_tap_protocol)
-		-Dminer_fs=true
-		$(meson_use rss miner_rss)
-		-Dwriteback=true
-		-Dabiword=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)
-		$(meson_feature gif)
-		$(meson_feature gsf)
-		$(meson_feature iptc)
-		$(meson_feature iso)
-		$(meson_feature jpeg)
-		$(meson_feature pdf)
-		$(meson_feature playlist)
-		-Dpng=enabled
-		$(meson_feature raw)
-		$(meson_feature tiff)
-		$(meson_feature xml)
-		$(meson_feature xmp)
-		$(meson_feature xps)
-
-		-Dbattery_detection=$(usex upower upower none)
-		-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_dir="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-misc/tracker-miners/tracker-miners-3.3.0.ebuild b/app-misc/tracker-miners/tracker-miners-3.3.0.ebuild
index 292e8a512afc..bd5ac146967b 100644
--- a/app-misc/tracker-miners/tracker-miners-3.3.0.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-3.3.0.ebuild
@@ -16,7 +16,7 @@ IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +pl
 REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~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="
diff --git a/app-misc/tracker-miners/tracker-miners-3.2.2.ebuild b/app-misc/tracker-miners/tracker-miners-3.3.1.ebuild
index 03dcbfde8c38..8cb5c423e06e 100644
--- a/app-misc/tracker-miners/tracker-miners-3.2.2.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-3.3.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 systemd xdg
 
@@ -23,9 +23,9 @@ RDEPEND="
 	>=dev-libs/glib-2.70:2
 	>=app-misc/tracker-3.2.0:3=
 	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-plugins/gst-plugins-meta:1.0 )
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0
+		>=media-plugins/gst-plugins-meta-1.20:1.0 )
 	!gstreamer? (
 		ffmpeg? ( media-video/ffmpeg:0= ) )
 
@@ -38,7 +38,7 @@ RDEPEND="
 	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
 	xps? ( app-text/libgxps )
 	iptc? ( media-libs/libiptcdata )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
 	iso? ( >=sys-libs/libosinfo-0.2.10 )
 	>=media-libs/libpng-1.2:0=
 	seccomp? ( >=sys-libs/libseccomp-2.0 )
@@ -66,6 +66,7 @@ BDEPEND="
 	virtual/pkgconfig
 	test? (
 		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
 		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
 		gstreamer? (
 			media-libs/gstreamer:1.0[introspection]
@@ -77,12 +78,10 @@ BDEPEND="
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.1-Fix-asciidoc-manpage.xsl-location.patch
-)
-
 python_check_deps() {
-	has_version -b "dev-python/tappy[${PYTHON_USEDEP}]"
+	python_has_version -b \
+		"dev-python/pygobject[${PYTHON_USEDEP}]" \
+		"dev-python/tappy[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
@@ -90,8 +89,7 @@ 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
+	default
 
 	# 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
@@ -99,7 +97,6 @@ src_prepare() {
 	else
 		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
 	fi
-	xdg_src_prepare
 	gnome2_environment_reset # sets gstreamer safety variables
 }