gentoo resync : 29.12.2022

7 files changed, 18 insertions, 161 deletions

diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 7833af4638c1..9ffe7de92059 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,11 +1,8 @@
 AUX 2.3.6-sqlite-3.34-compat.patch 2204 BLAKE2B 1b7602fee14de9c4ec2ca9dc55bf9b92a6f5f08fab5984184ac158fbde4537cb55f396e2b017b86f32e36a01c04c82f0c58946ffa0d2ce1025ae823f5788607a SHA512 3112fa20d4a8aacd008b0b5430b33329fcfbd2e3de886537cbde91c4f55fbaa5d254fefbd8f26a4e19824262d87e86b73c2192b1f5bde764ae8f182ac5ee9675
-AUX tracker-3.1.1-Fix-asciidoc-manpage.xsl-location.patch 835 BLAKE2B 70e949f1e385b237a154cbd7c3f3130acdb53761f6f6eb265ec591d43aa951db538765fb8b6d16f73a8ba99a53691610434a54e491cb85c8fb9350d5a00e8456 SHA512 adaa1d7f468186de0ec3d5ddecbf84518f08b3802c2d62d2f6511c68ae2b455c154e7fce14b57cb091f4a221a7fe32042ceeffa5095c22f8ec70ffbfe49f7de9
-AUX tracker-3.2.1-Add-config-options-for-libsoup.patch 1693 BLAKE2B 0ea29fff9bfd365973c293ad4f6cc6c59605dfe97ea6b1074f70c11b3ef2de7ec8fbbf31d076110a84b8d5829232eb372faec3331685ed8bdb6724d1be02f446 SHA512 0b602ada1d12f01b9f46e53a84eca228a997da782ae1fdd97a35743069fee35eec930eacd6481571af12bdf4b6dbfe5db802834fcc2832358be6280b6a1a09f8
-AUX tracker-3.2.1-build-Add-an-option-to-control-building-tests.patch 2585 BLAKE2B 72cdee92e578e64a4016e27dbd42a7a5fd9e7e1370abe52aa3b4d41aafcc708d805446d99f5ede70e1b17429aaecfd5e2dc14d570436c1be5465dc639dae42c8 SHA512 6fb94961339ac8ec45f4244ce23f7421515cd99066faa8a7d052706959708f0f1b07158bc091fb35e2ec6bb7529ebfbf989f64ddb512d24d2de763900be45b39
 DIST tracker-2.3.6.tar.xz 1606716 BLAKE2B ea39df4438e4502bc0229a5cc3b42a2fe6e13a643ac8e4034004b1291da49ff3ad1a177227035a4a02fd8f3723a735d37371c898bb03a6fc10573606a1c29d70 SHA512 1b8ae06b6c64a0cbe7d4c987bafe392fb38014215fc698f919273ba1f422dd0bc24344d3fd73164b00bfea315e527e2886ba90f1f1b86d5fceff24455b36d67e
-DIST tracker-3.2.1.tar.xz 1947304 BLAKE2B 9095a457157cd2bedfd34b01afc9fd832af0a5c57c6ba5b9c00175f382b70135e20437d6fd2ca9cc06df28634627e487536b15548f2c5d54c68297f26f06447b SHA512 3e8f33de0f77d45af2ed82e8fd216d6fb4c3aa080648cf490bdaef233fac1c635e10660ac0bfcdf0a43af48d454e0d4d7c04cb650f5f89660e8e4efc10104f56
 DIST tracker-3.3.0.tar.xz 1969132 BLAKE2B a43183599ee3d3947450e4d58fd02094a41d5978d0c3be120b995844eca5ddc0f7e37bd98e886bec99d5c9342f5ba6f92eec2cd729a1793ce2141bfa5ff99908 SHA512 0a55a80b44c2267f149c4c83ecbe42ca27a0645bd4fc206984999520f6bed3b7c63c71f81450f40ce2896223ce17326add20e7f39a71c821d754f30b8ce157bc
-EBUILD tracker-2.3.6-r1.ebuild 2694 BLAKE2B 7ed178e71d1eca8bea4acee5c5f73c047793592a3b1696b95c858aa1f459aa3ac21a546c42fd97f30fc40727512f053c76a960e00712e68e54a3d8facf1baaf3 SHA512 2a190bcb1104afc7ad5809c19aa882b4ecad92ffc9a9e01a80d5ffc159a90ca8c665bd81cea5d59109581690b37c710d432fc001735d68f1bc28d5373ab93880
-EBUILD tracker-3.2.1.ebuild 2895 BLAKE2B eb7ca2ef765ba72afb857f28589b74acb33f6a3787a497b5b360c63d71eb00765ea7c8554e1d8d50812a277abf15cd83bd9f7fe2d06992cca45159dc8ed5c999 SHA512 624f62c6f6a8a2a214ed18b1e04b7c311492374c13a28b9f5861faf37d23e214231dc7a289f9e114ac706be0ee792f172f83207379132ea6cb0dccbcc3aade4b
-EBUILD tracker-3.3.0.ebuild 2641 BLAKE2B 3238db2d7322bbbdbb1fbe45b8bad368f9955b69a18cb85e47878a581c6586a89b821fd86fc86f2fca2f1755f08edb7351bce77dee9c7cc1e0ca64ff9c8d67d9 SHA512 b73acdd7f65aa30468a662d52d4e9b5773e25e3505065cd93607b2f1489f8565d69f17eb368e08905287cbca0cabab5c6c284d8b68b3e98e362c39b8a7aa6f57
+DIST tracker-3.3.1.tar.xz 1976268 BLAKE2B 34492aac5c7a5cae20cc3b246de7a7f9948be05356508cffeec56cd6aa83b89a875c01d58c299299723e1aed8bba55d641dc817f77cecbe1379b49ea853aa8b3 SHA512 34a86ac58bf8b31f3beb106d3f8db38b764624b800f4cb1c015102f02616e4c2d356f58f0e6a13f66cca79a4173828748ad5e4217b21e83b2fe1606ddcd7ce88
+EBUILD tracker-2.3.6-r1.ebuild 2695 BLAKE2B 9efdfa78e327053de5b3b60f929de47a9fe3dabd10f527d655e385f8b68e03191e076e651cd935b3c1a963e540663bf31665da7c519a5cc391f70da3fec749f5 SHA512 d52f8aa7859f722947bda55ef56bf21d54b3aeb54f11d84e2a151578a52198b48a847de7442b59fd2c46474f446c7260b866edf70f95b330da32d550de20151a
+EBUILD tracker-3.3.0.ebuild 2638 BLAKE2B 09c29b24078b848cbbadc632489ddfd4a1ca9ea533570f790c006458fba7c65a80d15447dde9edfc8f5b4b357fd86848edeed36825c0f179d71fde1c87a21b87 SHA512 b2630ed5256722e9b73e30671a9944336be354151dd3bd41a3d58a75f29db614ac2b49a156e0ff085cdfa45defb7db2325de6fc168f12a57e1c76965515c02e5
+EBUILD tracker-3.3.1.ebuild 2702 BLAKE2B e9fb0b44461e3476c539b24428c9e216f4657c9df95c64d277e489ffba78e0833c5e37fc4577f7947ffeb89dc216c11870dfb32d6b72f9497e491a860fbaa76c SHA512 b8f932930b58c6efd9b6dde1ca1662ff3ff347b9599771c83b55fb15a439a16a85f562608ae87706468622eccf1f82b940f808b5d0875161de5f95bd3f997753
 MISC metadata.xml 498 BLAKE2B 53cd3148f5755776613afbd38fa6b0eac4d10bb60765e7af7922ff70c5875f78ba25a78ef81af69f7767bc9da9fc854d9c833f4aa8bf18e52811fc4292dc47f7 SHA512 b81b2eb4705e5280286c6b6d9cc37945c671cd9ab635d31d7cef7d7ed2a3cf7a2ba5107e37363a78d8c707a2095a3d002e4ca6c233555a075ae21a9f8885d6db
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
deleted file mode 100644
index 3383e2be28e5..000000000000
--- a/app-misc/tracker/files/tracker-3.1.1-Fix-asciidoc-manpage.xsl-location.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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/files/tracker-3.2.1-Add-config-options-for-libsoup.patch b/app-misc/tracker/files/tracker-3.2.1-Add-config-options-for-libsoup.patch
deleted file mode 100644
index c6895f36512f..000000000000
--- a/app-misc/tracker/files/tracker-3.2.1-Add-config-options-for-libsoup.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6ebc7d09f005898236ee27a780f6fc0426cdd271 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Wed, 26 Jan 2022 18:08:24 -0800
-Subject: [PATCH] Add config options for libsoup
-
----
- meson.build       | 4 ++--
- meson_options.txt | 5 +++++
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 4109293a9..39947437a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -53,8 +53,8 @@ json_glib = dependency('json-glib-1.0', version: '>= 1.4', required: true)
- libxml2 = dependency('libxml-2.0', version: '> 2.6')
- sqlite = dependency('sqlite3', version: '>' + sqlite_required)
- dbus = dependency('dbus-1')
--libsoup2 = dependency('libsoup-2.4', version: '> 2.40', required: false)
--libsoup3 = dependency('libsoup-3.0', version: '>= 2.99.2', required: false)
-+libsoup2 = dependency('libsoup-2.4', version: '> 2.40', required: get_option('libsoup2'))
-+libsoup3 = dependency('libsoup-3.0', version: '>= 2.99.2', required: get_option('libsoup3'))
- 
- libmath = cc.find_library('m', required: false)
- libdl = cc.find_library('dl')
-diff --git a/meson_options.txt b/meson_options.txt
-index a7e647d02..d431caa03 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -28,3 +28,8 @@ option('tests_tap_protocol', type: 'boolean', value: false,
-        description: 'Whether to enable TAP protocol on tests')
- option('introspection', type: 'feature', value: 'enabled',
-        description: 'Whether to enable introspection')
-+
-+option('libsoup2', type: 'feature', value: 'enabled',
-+       description: 'Whether to enable libsoup2')
-+option('libsoup3', type: 'feature', value: 'enabled',
-+       description: 'Whether to enable libsoup3')
--- 
-2.34.1
-
diff --git a/app-misc/tracker/files/tracker-3.2.1-build-Add-an-option-to-control-building-tests.patch b/app-misc/tracker/files/tracker-3.2.1-build-Add-an-option-to-control-building-tests.patch
deleted file mode 100644
index 9480a6269c75..000000000000
--- a/app-misc/tracker/files/tracker-3.2.1-build-Add-an-option-to-control-building-tests.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From db36d010737d5eeceff300e3dd5e315c5d0382a2 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Wed, 16 Feb 2022 10:59:33 -0800
-Subject: [PATCH] build: Add an option to control building tests
-
-Commit 8569c99d2926 ("Look for a Python installation with the tap
-module") correctly added a dependency on the gi Python module for tests.
-Commit 51ca035697a4 ("Make tracker:endpoint test work on macOS")
-restructured Python probing by moving it to the top-level meson.build.
-
-These two commits have the side-effect of exposing the fact that the
-gi Python module is really only a test dependency, and should not be
-required if building without tests.
-
-As such, add a -Dtests=bool option to disable building tests. This
-reduces the number of ninja targets from 232 to 188 on my non-test
-build.
----
- meson.build       | 13 +++++++++----
- meson_options.txt |  2 ++
- 2 files changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 4e59b8240..f4dd58fd4 100644
---- a/meson.build
-+++ b/meson.build
-@@ -75,9 +75,12 @@ if get_option('man')
-   a2x = find_program('a2x')
- endif
- 
--py_modules = ['gi']
--if get_option('tests_tap_protocol')
--  py_modules += 'tap'
-+py_modules = []
-+if get_option('tests')
-+  py_modules += 'gi'
-+  if get_option('tests_tap_protocol')
-+    py_modules += 'tap'
-+  endif
- endif
- python = import('python').find_installation('python3', modules: py_modules)
- 
-@@ -358,7 +361,9 @@ tracker_uninstalled_nepomuk_ontologies_dir = join_paths(meson.current_source_dir
- tracker_uninstalled_stop_words_dir = join_paths(meson.current_source_dir(), 'src', 'libtracker-common', 'stop-words')
- tracker_uninstalled_testutils_dir = join_paths(meson.current_source_dir(), 'utils')
- 
--subdir('tests')
-+if get_option('tests')
-+  subdir('tests')
-+endif
- subdir('examples')
- 
- subdir('po')
-diff --git a/meson_options.txt b/meson_options.txt
-index a7e647d02..ec8ea8bc2 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -20,6 +20,8 @@ option('systemd_user_services', type: 'boolean', value: true, yield: true,
-        description: 'Whether to install systemd user .service files')
- option('systemd_user_services_dir', type: 'string', value: '', yield: true,
-        description: 'Directory to install systemd user unit files (or empty to use default)')
-+option('tests', type: 'boolean', value: true,
-+       description: 'Whether to build tests')
- option('test_utils', type: 'boolean', value: true,
-        description: 'Whether to install the trackertestutils Python package')
- option('test_utils_dir', type: 'string', value: '',
--- 
-2.34.1
-
diff --git a/app-misc/tracker/tracker-2.3.6-r1.ebuild b/app-misc/tracker/tracker-2.3.6-r1.ebuild
index cfaa81da0bab..00c45d75bcc8 100644
--- a/app-misc/tracker/tracker-2.3.6-r1.ebuild
+++ b/app-misc/tracker/tracker-2.3.6-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} )
 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-3.3.0.ebuild b/app-misc/tracker/tracker-3.3.0.ebuild
index 8875b2911b7e..ca215455981b 100644
--- a/app-misc/tracker/tracker-3.3.0.ebuild
+++ b/app-misc/tracker/tracker-3.3.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3/0" # libtracker-sparql-3.0 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc +miners stemmer test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/tracker/tracker-3.2.1.ebuild b/app-misc/tracker/tracker-3.3.1.ebuild
index 3106a0b44c3a..9142c98fcfcd 100644
--- a/app-misc/tracker/tracker-3.2.1.ebuild
+++ b/app-misc/tracker/tracker-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} )
 VALA_MIN_API_VERSION="0.40"
 
 inherit bash-completion-r1 flag-o-matic gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3/0" # libtracker-sparql-3.0 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="gtk-doc +miners stemmer test"
 RESTRICT="!test? ( test )"
 
@@ -50,12 +50,6 @@ BDEPEND="
 "
 PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.1-Fix-asciidoc-manpage.xsl-location.patch
-	"${FILESDIR}"/${PN}-3.2.1-Add-config-options-for-libsoup.patch
-	"${FILESDIR}"/${PN}-3.2.1-build-Add-an-option-to-control-building-tests.patch
-)
-
 function inotify_enabled() {
 	if linux_config_exists; then
 		if ! linux_chkconfig_present INOTIFY_USER; then
@@ -70,20 +64,22 @@ function inotify_enabled() {
 }
 
 python_check_deps() {
-	use test || return 0
-	has_version -b "dev-python/tappy[${PYTHON_USEDEP}]"
+	python_has_version -b \
+		"dev-python/pygobject[${PYTHON_USEDEP}]" \
+		"dev-python/tappy[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
 	linux-info_pkg_setup
 	inotify_enabled
 
-	python-any-r1_pkg_setup
+	use test && python-any-r1_pkg_setup
 }
 
 src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
+	default
+	vala_setup
+	xdg_environment_reset
 }
 
 src_configure() {
@@ -98,8 +94,7 @@ src_configure() {
 		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
 		$(meson_use test tests)
 		-Dintrospection=enabled
-		-Dlibsoup2=enabled
-		-Dlibsoup3=disabled
+		-Dsoup=soup2
 	)
 	meson_src_configure
 }