14 files changed, 40 insertions, 368 deletions
diff --git a/app-misc/anki/anki-25.09.2.ebuild b/app-misc/anki/anki-25.09.2.ebuild
index 0e4e5c8a9960..4e1ba82e458c 100644
--- a/app-misc/anki/anki-25.09.2.ebuild
+++ b/app-misc/anki/anki-25.09.2.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL=1
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_COMPAT=( python3_{12..14} )
 
 declare -A GIT_CRATES=(
 	[linkcheck]='https://github.com/ankitects/linkcheck;184b2ca50ed39ca43da13f0b830a463861adb9ca;linkcheck-%commit%'
diff --git a/app-misc/jaq/Manifest b/app-misc/jaq/Manifest
index 186d2bfafed1..6a827e915b52 100644
--- a/app-misc/jaq/Manifest
+++ b/app-misc/jaq/Manifest
@@ -62,7 +62,7 @@ DIST is-terminal-0.4.16.crate 7811 BLAKE2B 430b817c0d022b669624c77e84304b40ea8ea
 DIST itoa-1.0.15.crate 11231 BLAKE2B 17c261baf95bff2f6cf0dbc33ab78ebbab0cf5dc56aeb7f8977377af868deb5957918f1763c2fe8c080e931489ea89ebcc16b3ebd976eeeb7663ff74989a1071 SHA512 158ca5dd4b04cb12d9292a4df63c72443adaf5aab1bd9aacdb964dc58878d847a64251f84897cb25c34648d4c973b44fef5b4c175d7c04cabc2c13b4631c2e42
 DIST jaq-2.2.0.gh.tar.gz 116189 BLAKE2B ac8f3d72049aa5b5e47f657c61b5fdbe63bc78cab97a8626bf85c91ddd151022b903ab931a0f378d7c769d0d5de42f918fce73c6d5d4bfc7a6d6da54bf08c03d SHA512 89577b1cb5c0a1c259e19ca56bc58f226f8da3e51568299fc013b01421686ee865eff3d33a4961ab239935f86afcc750a12a49eec6c92ad63e31c647fa859fed
 DIST jaq-2.3.0.gh.tar.gz 121047 BLAKE2B d144d9392d9f8901a3b605fb3a0284b5e9626873afef13e0d7b8370d4fd3850dd3fa7aaaf8600870d9a947bb81d902fada373711b755f1d911f3041d487b34ca SHA512 73c38f0938d8cb667911a634d5b9b49af973637420f449a63baf2db526d6816a5ff42e1f9db1a24114175df8073c797e8e2ac9793bdcd8006731832e9779b0a1
-DIST jaq-3.0.0_alpha.gh.tar.gz 202482 BLAKE2B 5f64605502726395b49caf7443ee99d014d904357b617e64606627146292e9974666d7260aa4bc707ddf242dc267a0af0483e286e6035d6b3f2e731c2890163f SHA512 c200c95faa9b50f157f0f5168d7b8e02676af7a84f6238f48bb08c2421aa60ae3ed8dd60f75fd440f19a0e335ca4aa7949267c62b890663d19efbdd8e911f8be
+DIST jaq-3.0.0_beta.gh.tar.gz 211482 BLAKE2B f287e2270158d9898eb1be018ceaed12ce889993893a94e10822f6cbc38362216ac9d18f6b121e2cf9010e146fc9d8f4012b69d3b4d0d9fc0a613e13e685325b SHA512 f7942f179577a96e47e4ffd87803161634fa9a3d326d4af46c98365fcce35a564c234b46730c5cbc4b0403bdb40ef89b9d1c6517aa9971629daaa4c748e3faa6
 DIST jiff-0.2.15.crate 712996 BLAKE2B c90d59db2762c59fd85fa8f45c189e2cdb476afd140899e5cde1b657b2630cee75a10ea3d3f20a7ce2853fef972bbbfb21b701375e5e9d20b6287cbe433e9a10 SHA512 577b5b326c66bf8b81174c48e913ee381cb17030b7cfb3d211ea3376a4805edf08eebff7ba1aa67cf20144ebf3aca02d6f96f771cd44e5bf6aa0a23e96f6fd27
 DIST jiff-static-0.2.15.crate 76146 BLAKE2B 5409fded10b61363d8a6c907716b5e374eb1de51cd062706eb3a81f53064584722984e9bcfae5fb0f90d1c3c841a12a2c569419ab459319697c98e6d70c630dc SHA512 282b8bbfcba6b86f84a5f93f3efcc20a61b727abad664836e8f81d00b397a34b1e94276af05dca25c7abd44292abcfe7af3c3b710087d4af8b5bbf348999089a
 DIST jiff-tzdb-0.1.4.crate 62435 BLAKE2B 2fc19077320ad711cafde399df5f62af12f47303acd4e806a3e29739a219a6e49b5207a3824d3325779569ae21087907c020266ca7e6d9cd80221530c40adf8f SHA512 bdb4b37a12e65d260bbf5d7c096e7f404e2f4c09cd625ed664b23c5bd2551323113c7e27a0e37fc009e1d8edc6643c00ea9d1f3dffcf40cf3349dbec49b7cecb
diff --git a/app-misc/jaq/jaq-3.0.0_alpha.ebuild b/app-misc/jaq/jaq-3.0.0_beta.ebuild
index 7f15eba19ac0..d8cbbb7631ea 100644
--- a/app-misc/jaq/jaq-3.0.0_alpha.ebuild
+++ b/app-misc/jaq/jaq-3.0.0_beta.ebuild
@@ -118,7 +118,6 @@ CRATES="
 	winnow@0.7.13
 	wit-bindgen-rt@0.39.0
 	xmlparser@0.13.6
-	yansi@1.0.1
 "
 
 #RUST_MIN_VER="1.70.0"
@@ -134,10 +133,7 @@ S="${WORKDIR}/${PN}-${PV/_/-}"
 
 LICENSE="MIT"
 # Dependent crate licenses
-LICENSE+="
-	MIT Unicode-3.0 ZLIB
-	|| ( Apache-2.0 Boost-1.0 )
-"
+LICENSE+=" Apache-2.0 Boost-1.0 MIT MPL-2.0 Unicode-3.0 ZLIB"
 SLOT="0"
 KEYWORDS="~amd64"
 
diff --git a/app-misc/koleo-cli/Manifest b/app-misc/koleo-cli/Manifest
index 032595bd1d02..3098c4cb55bb 100644
--- a/app-misc/koleo-cli/Manifest
+++ b/app-misc/koleo-cli/Manifest
@@ -1,2 +1,2 @@
-DIST koleo_cli-0.2.137.24.2.tar.gz 39362 BLAKE2B 7b7e4f89d8e153d228e4e8fbd456399a4b74f72fa2a017793dd77c84b4c28ede4903cf801577ba3471d38fb43389e3b138c4a315a2b24f1212d0aa78c855a3e5 SHA512 66785ed8e449c07885f49eb1267c776e9ba629d0a7c3d19fb17cc53e16687eb112f3facd8d930aa30efa38dd268fb2b8bcaaed320d7049e4e1abb0a747979bf1
 DIST koleo_cli-0.2.137.25.tar.gz 39978 BLAKE2B 86e0df615f7be1dd584aeebce279cdb1850660bf4b53f4a63c89d700d85fdab46515a51e32e4b47fd547818a4196959df0ff32804e23c4c006354a13f809a3b8 SHA512 01dbe8df36a0bd45b1a42f67000f5d04f45fb3cdbde8d0519b8bde5f907ef4f98273ffa08728cb985caf36929726cbbbf2708e46d45a687ae647ce5d02253654
+DIST koleo_cli-0.2.137.26.tar.gz 40058 BLAKE2B 51565822c073280a856a16b1e360531191700f4f8bbbb7f257c802a818a82a2d360440aae799e12e3821a69fbce69d48d79f0091ee378367d2c50a23ae9e75ec SHA512 6593bb454c2a6353012f630428fc5841c1b2ac725cc7126e08266d2125c3673920d62608d287e4232f582b0e7b60450469a86bfaf22d6ca938a1b5610a343f63
diff --git a/app-misc/koleo-cli/koleo-cli-0.2.137.24.2.ebuild b/app-misc/koleo-cli/koleo-cli-0.2.137.26.ebuild
index 549354bf7486..549354bf7486 100644
--- a/app-misc/koleo-cli/koleo-cli-0.2.137.24.2.ebuild
+++ b/app-misc/koleo-cli/koleo-cli-0.2.137.26.ebuild
diff --git a/app-misc/localsearch/Manifest b/app-misc/localsearch/Manifest
index 16c13985e2e7..7585d8109ffa 100644
--- a/app-misc/localsearch/Manifest
+++ b/app-misc/localsearch/Manifest
@@ -1,3 +1,3 @@
+DIST localsearch-3.10.2.tar.xz 4494144 BLAKE2B 9f4923778dfd3020403b037a299c6d12841a0fe58c30772d0534cc6023c529c8e5b03f494cd032c1bfa785c41f5ef7fe82f67d6a5fad05924627e76651ca38e6 SHA512 741fa7af68d3e697114fbc9a672bfbfb6e97f737d098e53742fe8ee5e1d055b3e33d168d3f5d1b5fa8734b1ccdbf406eccc36cdaa6c450f2cfc8f274b3bcb6c7
 DIST localsearch-3.8.2.tar.xz 4547012 BLAKE2B 5d5636aaf7213d1d9e73e00c259b5f59e8efb4065d9acb4730d78c1dd5bf4cd460d36a8be09d01c294618eea0b8537f892c46c14699e8fc3c759c9c208500317 SHA512 d037b81467987e31294dfc2ea540db5581e5bbcd1688578d8a338352c3f0841270d78eb54fd8ec1aaa4807e7d15cc787c6ed414b295c9e0c93d286be1a87c661
 DIST localsearch-3.9.0.tar.xz 4527924 BLAKE2B 8c895fa3b59c6a368a2437833d4a463092629bbf43d18b44d109bbce89fcb7d64409d709cc9c64d5b202ece27d876cb711df3058fc77a3c37ee695554d19bdc3 SHA512 693be7a6070ef30e5382e85af346356ee7f07f97d284a6b3cb59c6c4b86d6d2caf5e979f2c9c2a71a332c475d65615d4917b6f148b693c11d26c03f5d81ae3df
-DIST tracker-miners-3.6.2.tar.xz 7506528 BLAKE2B d0da1caaa72467ec03c7e3c35cbee48aca08dca59d45d11e5f5f887d75954dbac0671d5698226c9cb89e97b3a76b318013ca17f8508ec3f867758662f53b25b7 SHA512 032c96d41e02ed15b56937ea543428aef7b45ce4c206b749e6a99506dd48dd760e45b12563846a3208f0da42387d0547de9eef1fcb54d93cdbca4aad52050af4
diff --git a/app-misc/localsearch/files/tracker-miners-3.6.2-epoll_wait.patch b/app-misc/localsearch/files/tracker-miners-3.6.2-epoll_wait.patch
deleted file mode 100644
index 051fab644d26..000000000000
--- a/app-misc/localsearch/files/tracker-miners-3.6.2-epoll_wait.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 35ec653226dade6ec18bebdc450aca3b6c25b391 Mon Sep 17 00:00:00 2001
-From: Sam Thursfield <sam.thursfield@codethink.co.uk>
-Date: Wed, 21 Feb 2024 17:18:45 +0100
-Subject: [PATCH] libtracker-miners-common: Allow epoll_wait syscall in SECCOMP
- sandbox
-
-This is used in libmount from util-linux.
-
-Fixes https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/307
----
- src/libtracker-miners-common/tracker-seccomp.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/libtracker-miners-common/tracker-seccomp.c b/src/libtracker-miners-common/tracker-seccomp.c
-index ad41c94b01..dfc5cfae73 100644
---- a/src/libtracker-miners-common/tracker-seccomp.c
-+++ b/src/libtracker-miners-common/tracker-seccomp.c
-@@ -223,6 +223,7 @@ tracker_seccomp_init (void)
- 	ALLOW_RULE (epoll_create);
- 	ALLOW_RULE (epoll_create1);
- 	ALLOW_RULE (epoll_ctl);
-+	ALLOW_RULE (epoll_wait);
- 	/* System */
- 	ALLOW_RULE (uname);
- 	ALLOW_RULE (sysinfo);
--- 
-GitLab
-
diff --git a/app-misc/localsearch/localsearch-3.6.2-r2.ebuild b/app-misc/localsearch/localsearch-3.10.2.ebuild
index 5856312f1ff7..a47ed2fc85a6 100644
--- a/app-misc/localsearch/localsearch-3.6.2-r2.ebuild
+++ b/app-misc/localsearch/localsearch-3.10.2.ebuild
@@ -4,8 +4,6 @@
 EAPI=8
 PYTHON_COMPAT=( python3_{11..14} )
 
-GNOME_ORG_MODULE=tracker-miners
-
 inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 systemd xdg
 
 DESCRIPTION="Indexer and search engine that powers desktop search for core GNOME components"
@@ -13,22 +11,22 @@ HOMEPAGE="https://gnome.pages.gitlab.gnome.org/localsearch"
 
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cue exif gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw seccomp test +tiff upower webp +xml xmp xps"
 
 REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~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/tinysparql-3.6_rc:3
-
+	>=app-misc/tinysparql-3.8:3
 	>=sys-apps/dbus-1.3.1
 	xmp? ( >=media-libs/exempi-2.1.0:= )
-	raw? ( media-libs/gexiv2 )
+	raw? ( media-libs/gexiv2:= )
+	>=dev-libs/glib-2.76:2
+	dev-libs/libgudev
+	>=dev-libs/gobject-introspection-1.82.0-r2
 	cue? ( media-libs/libcue:= )
 	exif? ( >=media-libs/libexif-0.6 )
 	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
@@ -42,13 +40,10 @@ RDEPEND="
 	xml? ( >=dev-libs/libxml2-2.6:= )
 	pdf? ( >=app-text/poppler-0.16.0:=[cairo] )
 	playlist? ( >=dev-libs/totem-pl-parser-3:= )
-	sys-apps/util-linux
+	webp? ( media-libs/libwebp )
 
 	gif? ( media-libs/giflib:= )
 
-	networkmanager? ( net-misc/networkmanager )
-
-	rss? ( >=net-libs/libgrss-0.7:0 )
 	app-arch/gzip
 
 	upower? ( >=sys-power/upower-0.9.0:= )
@@ -59,8 +54,7 @@ RDEPEND="
 		>=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= ) )
+	media-video/ffmpeg:0=
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -85,11 +79,6 @@ BDEPEND="
 	)
 "
 
-PATCHES=(
-	# https://gitlab.gnome.org/GNOME/localsearch/-/merge_requests/511
-	"${FILESDIR}/tracker-miners-3.6.2-epoll_wait.patch"
-)
-
 python_check_deps() {
 	python_has_version -b \
 		"dev-python/pygobject[${PYTHON_USEDEP}]" \
@@ -119,22 +108,12 @@ 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
@@ -142,8 +121,11 @@ src_configure() {
 		-Dps=true
 		-Dtext=true
 		-Dunzip_ps_gz_files=true # spawns gunzip
-
-		$(meson_feature networkmanager network_manager)
+		# Broken with our library layout for libstdc++ (bug #957705)
+		# Once https://gitlab.gnome.org/GNOME/localsearch/-/issues/368 is fixed,
+		# we should add a USE flag for it but likely give it the same treatment
+		# as seccomp (i.e. package.use.force).
+		-Dlandlock=disabled
 		$(meson_feature cue)
 		$(meson_feature exif)
 		$(meson_feature gif)
@@ -153,6 +135,8 @@ src_configure() {
 		$(meson_feature jpeg)
 		$(meson_feature pdf)
 		$(meson_feature playlist)
+		$(meson_feature webp)
+		-Dbash_completion=true
 		-Dpng=enabled
 		$(meson_feature raw)
 		$(meson_feature tiff)
@@ -163,7 +147,6 @@ src_configure() {
 		-Dbattery_detection=$(usex upower upower none)
 		# enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
 		-Dcharset_detection=icu
-		-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)"
 	)
@@ -172,7 +155,8 @@ src_configure() {
 
 src_test() {
 	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
-	export PYTHONPATH="${ESYSROOT}"/usr/$(get_libdir)/tracker-3.0
+	export PYTHONPATH="${ESYSROOT}"/usr/$(get_libdir)/tinysparql-3.0
+	# Many (extractor) tests fail since version 3.9.0 https://gitlab.gnome.org/GNOME/localsearch/-/issues/405
 	dbus-run-session meson test -C "${BUILD_DIR}" --no-suite examples || die 'tests failed'
 }
 
diff --git a/app-misc/localsearch/localsearch-3.6.2.ebuild b/app-misc/localsearch/localsearch-3.6.2.ebuild
deleted file mode 100644
index a0cc69493ac3..000000000000
--- a/app-misc/localsearch/localsearch-3.6.2.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{11..14} )
-
-GNOME_ORG_MODULE=tracker-miners
-
-inherit flag-o-matic gnome.org gnome2 meson python-any-r1 systemd xdg
-
-DESCRIPTION="Indexer and search engine that powers desktop search for core GNOME components"
-HOMEPAGE="https://gnome.pages.gitlab.gnome.org/localsearch"
-
-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 ~loong ~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/tinysparql-3.6_rc:3
-
-	>=sys-apps/dbus-1.3.1
-	xmp? ( >=media-libs/exempi-2.1.0:= )
-	raw? ( media-libs/gexiv2 )
-	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? ( media-libs/libjpeg-turbo:0= )
-	iso? ( >=sys-libs/libosinfo-1.10.0-r1 )
-	>=media-libs/libpng-1.2:0=
-	seccomp? ( >=sys-libs/libseccomp-2.0 )
-	tiff? ( media-libs/tiff:= )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	pdf? ( >=app-text/poppler-0.16.0:=[cairo] )
-	playlist? ( >=dev-libs/totem-pl-parser-3:= )
-	sys-apps/util-linux
-
-	gif? ( media-libs/giflib:= )
-
-	networkmanager? ( net-misc/networkmanager )
-
-	rss? ( >=net-libs/libgrss-0.7:0 )
-	app-arch/gzip
-
-	upower? ( >=sys-power/upower-0.9.0:= )
-
-	>=dev-libs/icu-4.8.1.1:=
-
-	gstreamer? (
-		>=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= ) )
-"
-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/pygobject[${PYTHON_USEDEP}]')
-		$(python_gen_any_dep 'dev-python/tap-py[${PYTHON_USEDEP}]')
-		gstreamer? (
-			media-libs/gstreamer:1.0[introspection]
-			|| (
-				media-plugins/gst-plugins-libav:1.0
-				media-plugins/gst-plugins-openh264:1.0
-			)
-		)
-	)
-"
-
-python_check_deps() {
-	python_has_version -b \
-		"dev-python/pygobject[${PYTHON_USEDEP}]" \
-		"dev-python/tap-py[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	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
-		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
-	gnome2_environment_reset # sets gstreamer safety variables
-}
-
-src_configure() {
-	# bug #944218
-	append-cflags -std=gnu17
-
-	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)
-		# enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
-		-Dcharset_detection=icu
-		-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")
-	export PYTHONPATH="${ESYSROOT}"/usr/$(get_libdir)/tracker-3.0
-	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/tinysparql/Manifest b/app-misc/tinysparql/Manifest
index df6010836cf3..9bbc620a2961 100644
--- a/app-misc/tinysparql/Manifest
+++ b/app-misc/tinysparql/Manifest
@@ -1,3 +1,3 @@
+DIST tinysparql-3.10.1.tar.xz 2396040 BLAKE2B e69d1c8645b55028190f3e72320662c3b370e5ef210aa4b03546812c802533adcb0b07e3fdb9507f7307d425fc63abc3cf2ab3cf217ff4453d9fc98dac07b5c1 SHA512 26861532f8f3f5dd152cd28e0f24d58a652fdee7e9dbdadf1d1760cecd05dc62ecbfc0d4566291c52d02a80abcc7e1b04790277fb8f24ce72c15e008ea9d6d57
 DIST tinysparql-3.8.2.tar.xz 2114784 BLAKE2B 0fe3e6f566c560353b45d5774b741f08dcafb10f5c1b379ec06453cac5fa7512db861ae1dca50533ac2055d10888f732780b7c3352b72026ffa39ddbd1157af8 SHA512 45ad15026dc648dae9d09c64df9e0f0f30c061d26f00ff99da08ca16dc302cca113fbd5964af4e1b0e50c1a920b5f9c0eaa1136305f0b5a8d167b163a843d3df
 DIST tinysparql-3.9.2.tar.xz 2111352 BLAKE2B de128835e736b940f09793dcc7bd4a71680410fea8c00ab6a36d85b2d62639b3f08ddded74f4d1851c6060e5f5f82841a5ef714191a29869546549dd21d1722b SHA512 8d70571ada4097c56fb45844489405cc4b468f33ef5bb4db7020ad77882701097499111628ffbdac7e5dafb1f85b5801a3c2166ccf070a745a2f63b52ba3e314
-DIST tracker-3.6.0.tar.xz 2560980 BLAKE2B f10720b624b2b00eb510961f7346bb6c1fdc278237126d1b5f4b9af2d0f67cc74896b65bce89de14a085e55441fe64985cb13da06242838fe43dd0739e8d5bce SHA512 d3b7d4c1fd1cdcccc0d78c05f43b85f5cdab584e378cb56a2b568293ff95c887650d41c3c7f65de8864a0b6f80ae26410f4a443f045a80e30bacdf7ef9499697
diff --git a/app-misc/tinysparql/files/3.6.0-configure-c99.patch b/app-misc/tinysparql/files/3.6.0-configure-c99.patch
deleted file mode 100644
index f5de3e2746ce..000000000000
--- a/app-misc/tinysparql/files/3.6.0-configure-c99.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://bugs.gentoo.org/919095
-https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/638
-https://gitlab.gnome.org/GNOME/tracker/-/commit/f7393d61803815b19a1f210b197cce423ae3cc01
-
-From f7393d61803815b19a1f210b197cce423ae3cc01 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyich@gmail.com>
-Date: Sun, 3 Dec 2023 12:10:27 +0000
-Subject: [PATCH] build: Fix "4-digit year modifier" test
-
-Upcoming `gcc-14` enabled a few warnings into errors, like
-`-Wincompatible-pointer-types`. This caused `tracker` configure to
-fail as:
-
-    $ ../meson
-    ...
-    Checking if "strftime 4-digit year modifier" runs: DID NOT COMPILE
-
-    ../meson.build:235:2: ERROR: Problem encountered: Libc implementation has broken 4-digit years implementation.
-
-This happens because char buffer had an unusual type:
-
-    testfile.c: In function 'main':
-    testfile.c:16:17: error: passing argument 1 of 'strftime' from incompatible pointer type
-    [-Wincompatible-pointer-types]
-       16 |       strftime (&buf, sizeof buf, modifiers[i], &tm);
-          |                 ^~~~
-          |                 |
-          |                 char * (*)[100]
---- a/meson.build
-+++ b/meson.build
-@@ -215,15 +215,15 @@ result = cc.run('''
-   int main (int argc, char *argv[]) {
-     char *modifiers[] = { "%Y", "%C%y", "%4Y", "%2C%y", NULL };
-     time_t timestamp = -58979923200; /* 0101-01-01T01:01:01Z */
--    char *buf[100];
-+    char buf[100];
-     struct tm tm;
-     int i;
-     gmtime_r (&timestamp, &tm);
-     for (i = 0; modifiers[i]; i++) {
--      strftime (&buf, sizeof buf, modifiers[i], &tm);
--      if (strcmp (&buf, "0101") == 0) {
-+      strftime (buf, sizeof buf, modifiers[i], &tm);
-+      if (strcmp (buf, "0101") == 0) {
-         printf ("%s", modifiers[i]);
--	return 0;
-+        return 0;
-       }
-     }
-     return -1;
--- 
-GitLab
diff --git a/app-misc/tinysparql/files/3.6.0-sqlite-3.45.3-compat.patch b/app-misc/tinysparql/files/3.6.0-sqlite-3.45.3-compat.patch
deleted file mode 100644
index 72e37c83068c..000000000000
--- a/app-misc/tinysparql/files/3.6.0-sqlite-3.45.3-compat.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0c576af6df5af2f1b8df9841fbb566fa52a4e382 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 18 Apr 2024 14:18:08 +0200
-Subject: [PATCH] core: Fix incompatibility introduced by SQLite 3.45.3
-
-For the umpteenth time, SQLite introduced behavioral changes that
-we need to adapt to. This time, version 3.45.3 "fixed" at
-https://github.com/sqlite/sqlite/commit/74851f66811854c772a9b2d0a13f1e9e82b69c25
-their SQLITE_ALLOW_ROWID_IN_VIEW build-time option which controls the
-behavior of views having an implicit ROWID column vs not.
-
-This broke our view used to proxy data to the content-less FTS5
-table, since the SELECT query it translates to used a naked reference to
-ROWID that is now deemed "ambiguous" by SQLite engine, this results
-in the following errors:
-
-Tracker:ERROR:../tests/core/tracker-ontology-test.c:231:test_query: assertion failed (error == NULL): ambiguous column name: ROWID (tracker-db-interface-error-quark, 0)
-
-We are actually referencing data inside the SELECT query, so fix this
-ambiguity by stating clearly the table/column that we are referring to
-within the SELECT query clause. This is backwards compatible with older
-versions of SQLite.
-
-Closes: https://gitlab.gnome.org/GNOME/tracker/-/issues/435
----
- src/libtracker-sparql/core/tracker-fts.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libtracker-sparql/core/tracker-fts.c b/src/libtracker-sparql/core/tracker-fts.c
-index 1171dc11a8..99600820bd 100644
---- a/src/libtracker-sparql/core/tracker-fts.c
-+++ b/src/libtracker-sparql/core/tracker-fts.c
-@@ -112,7 +112,7 @@ tracker_fts_create_table (sqlite3            *db,
- 
- 	g_string_append_printf (from, "WHERE COALESCE (%s NULL) IS NOT NULL ",
- 	                        column_names->str);
--	g_string_append (from, "GROUP BY ROWID");
-+	g_string_append (from, "GROUP BY \"rdfs:Resource\".ID");
- 	g_string_append (str, from->str);
- 	g_string_free (from, TRUE);
- 
--- 
-GitLab
-
diff --git a/app-misc/tinysparql/metadata.xml b/app-misc/tinysparql/metadata.xml
index 66034832cd52..714135232850 100644
--- a/app-misc/tinysparql/metadata.xml
+++ b/app-misc/tinysparql/metadata.xml
@@ -7,7 +7,6 @@
   </maintainer>
   <use>
     <flag name="localsearch">Install the <pkg>app-misc/localsearch</pkg> package for actual data mining support for tinysparql</flag>
-    <flag name="miners">Install the <pkg>app-misc/localsearch</pkg> package for actual data mining support for tracker</flag>
     <flag name="stemmer">Add word stemming via <pkg>dev-libs/snowball-stemmer</pkg>.</flag>
   </use>
   <upstream>
diff --git a/app-misc/tinysparql/tinysparql-3.6.0-r2.ebuild b/app-misc/tinysparql/tinysparql-3.10.1.ebuild
index 304180ad6765..e6e21c34fc42 100644
--- a/app-misc/tinysparql/tinysparql-3.6.0-r2.ebuild
+++ b/app-misc/tinysparql/tinysparql-3.10.1.ebuild
@@ -4,8 +4,6 @@
 EAPI=8
 PYTHON_COMPAT=( python3_{11..14} )
 
-GNOME_ORG_MODULE=tracker
-
 inherit bash-completion-r1 flag-o-matic gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
 
 DESCRIPTION="Low-footprint RDF triple store with SPARQL 1.1 interface"
@@ -13,44 +11,45 @@ HOMEPAGE="https://gnome.pages.gitlab.gnome.org/tinysparql"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3/0" # libtracker-sparql-3.0 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="gtk-doc +miners stemmer test vala"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="dbus gtk-doc +localsearch stemmer systemd test vala zeroconf"
 RESTRICT="!test? ( test )"
 
 PV_SERIES=$(ver_cut 1-2)
 
 RDEPEND="
 	>=dev-libs/glib-2.52:2
-	>=sys-apps/dbus-1.3.2
 	>=dev-libs/gobject-introspection-1.82.0-r2:=
 	>=dev-libs/icu-4.8.1.2:=
 	>=dev-libs/json-glib-1.4
 	>=net-libs/libsoup-2.99.2:3.0
 	>=dev-libs/libxml2-2.7:=
 	>=dev-db/sqlite-3.29.0:3
-	stemmer? ( dev-libs/snowball-stemmer:= )
+	dev-libs/snowball-stemmer:=
+	dbus? ( >=sys-apps/dbus-1.3.2 )
+	zeroconf? ( net-dns/avahi )
+	systemd? ( >=sys-apps/systemd-2.42 )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/glib-utils
 	app-text/asciidoc
 	dev-libs/libxslt
-	$(vala_depend)
+	vala? ( $(vala_depend) )
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
-	gtk-doc? ( dev-util/gi-docgen )
+	gtk-doc? (
+		dev-util/gi-docgen
+		media-gfx/graphviz
+		app-text/xmlto
+	)
 	test? (
 		$(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
 		$(python_gen_any_dep 'dev-python/tap-py[${PYTHON_USEDEP}]')
 	)
 	${PYTHON_DEPS}
 "
-PDEPEND="miners? ( >=app-misc/localsearch-3.6_rc )"
-
-PATCHES=(
-	"${FILESDIR}"/3.6.0-configure-c99.patch
-	"${FILESDIR}"/${PV}-sqlite-3.45.3-compat.patch
-)
+PDEPEND="localsearch? ( >=app-misc/localsearch-3.6_rc )"
 
 python_check_deps() {
 	python_has_version -b \
@@ -67,7 +66,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	vala_setup
+	use vala && vala_setup
 	xdg_environment_reset
 }
 
@@ -79,12 +78,12 @@ src_configure() {
 		-Dman=true
 		$(meson_feature stemmer)
 		-Dunicode_support=icu
+		$(meson_feature zeroconf avahi)
 		-Dbash_completion_dir="$(get_bashcompdir)"
 		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
 		$(meson_use test tests)
 		-Dintrospection=enabled
 		$(meson_feature vala vapi)
-		-Dsoup=soup3
 	)
 	meson_src_configure
 }
@@ -98,7 +97,7 @@ src_install() {
 
 	if use gtk-doc; then
 		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/Tracker-3.0 "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/Tsparql-3.0 "${ED}"/usr/share/gtk-doc/html/ || die
 	fi
 }