19 files changed, 430 insertions, 122 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 58c5c770adb6..b2fcf59e36b8 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ledit/Manifest b/app-misc/ledit/Manifest
index 3d1d840dda50..f0cdb8a527b2 100644
--- a/app-misc/ledit/Manifest
+++ b/app-misc/ledit/Manifest
@@ -1,3 +1,4 @@
+AUX ledit-2.04-ocaml4.09.patch 1220 BLAKE2B 73c38afb2e64772e1756de664b4eb9fdfdc90759d07d52d5bd7fec7c151f0a94d884aea6e1148849cad4b5fa445ba2d3ce1c55847af540ee70f34f6990c6f439 SHA512 c1f66e86ce7eae4a48f30e2b395649b5e1c06da7583ae0399934e01a7bf69de01fc1e113929ff81e788637d3f3208f762b41813f92ab7ea4aa3806c82d3e620f
 DIST ledit-2.04.tgz 24430 BLAKE2B 782f39606e6151307c30a665cfb6e641647fe861718ae304171db07ac82c27ee5ca9503229a27857723de98c15ac350f60be8df2e4b4fe7dc475ef2271dcf591 SHA512 56fed04fa6306b5550dc6ab4f000553d5b01eddbdeccaafad51160ba9e2c12de5faab08cb8463cad2952501c73dff0e2e214f52a30a74da20f18af153206b807
-EBUILD ledit-2.04.ebuild 864 BLAKE2B 8473b2ed7799fd415ad93f8e18e8c93750bf8f9c77ac246134071ce9f00ed1cf8beded5af4cb7f59da7a4cda378212002f085fbf98f7a34ffb80a0f3f2e89b13 SHA512 c6f7b725576038dbaf85c7a3ff1e335665e176f4ea340d14696c0b704b010bbc89a8f440e37bbd11c99ed2ddccd1e21d69332a95a74e9ae7acb1663c0af2b411
+EBUILD ledit-2.04.ebuild 912 BLAKE2B abe20ad17b01be4928602f75caf075a44727b99bd61e159cc036437c2ffa1ebefd7836506aa9d78f12ea8e84a92f73c74979d03b72245b4d16234621c5a64fab SHA512 b7812f62bc982212723f85fa629894ca3d676e467916aca28671482dacf581b9f0d06df3030215055951600ade26783bf704b8cdf027606e2ad7ed568d2729eb
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/app-misc/ledit/files/ledit-2.04-ocaml4.09.patch b/app-misc/ledit/files/ledit-2.04-ocaml4.09.patch
new file mode 100644
index 000000000000..2ececde9e922
--- /dev/null
+++ b/app-misc/ledit/files/ledit-2.04-ocaml4.09.patch
@@ -0,0 +1,34 @@
+diff --git a/ext/pa_def.ml b/ext/pa_def.ml
+index 812240d..871bfe2 100644
+--- a/ext/pa_def.ml
++++ b/ext/pa_def.ml
+@@ -33,7 +33,7 @@ value subst mloc env =
+   loop where rec loop =
+     fun
+     [ <:expr< let $opt:rf$ $list:pel$ in $e$ >> ->
+-        let pel = List.map (fun (p, e) -> (p, loop e)) pel in
++        let pel = List.map (fun (p, e, al) -> (p, loop e, al)) pel in
+         <:expr< let $opt:rf$ $list:pel$ in $loop e$ >>
+     | <:expr< if $e1$ then $e2$ else $e3$ >> ->
+         <:expr< if $loop e1$ then $loop e2$ else $loop e3$ >>
+diff --git a/ext/pa_local.ml b/ext/pa_local.ml
+index b65704d..3ef9cd1 100644
+--- a/ext/pa_local.ml
++++ b/ext/pa_local.ml
+@@ -23,13 +23,15 @@ value expr_of_patt p =
+   | _ -> Stdpp.raise_with_loc loc (Stream.Error "identifier expected") ]
+ ;
+ 
++value fst3 (a,b,c) = a ;
++
+ EXTEND
+   str_item:
+     [ [ "local"; rf = [ "rec" -> True | -> False ];
+         lb = LIST1 let_binding SEP "and"; "in"; "value";
+         rf1 = [ "rec" -> True | -> False ];
+         lb1 = LIST1 let_binding SEP "and" ->
+-          let pl = List.map fst lb1 in
++          let pl = List.map fst3 lb1 in
+           let el = List.map expr_of_patt pl in
+           <:str_item<
+            value ($list:pl$) =
diff --git a/app-misc/ledit/ledit-2.04.ebuild b/app-misc/ledit/ledit-2.04.ebuild
index 211bc15f3c27..617592ad1b50 100644
--- a/app-misc/ledit/ledit-2.04.ebuild
+++ b/app-misc/ledit/ledit-2.04.ebuild
@@ -22,6 +22,8 @@ RDEPEND="${DEPEND}"
 # https://github.com/gentoo/gentoo/pull/14865#issuecomment-605697524
 QA_FLAGS_IGNORED="/usr/bin/ledit"
 
+PATCHES=( "${FILESDIR}"/${P}-ocaml4.09.patch )
+
 src_compile() {
 	emake -j1 all
 	if use ocamlopt; then
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index 8545d09e1771..7a95affbc87f 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1,8 +1,10 @@
 DIST solaar-1.0.5.tar.gz 920452 BLAKE2B 44aa0f9abd63629a5a4e737c14e468922c4aa501341717d595f045c5f40369ade6ff296120931557f1e8f04b99aa4f690454aa8f6bceaa526f370f93b312f6d6 SHA512 28603c30f0e9f2f0fe2549722062548031c69a0d9c98f732fdd8fbb51ed1d55ef033262113b2f88044a68f8b26c8c51fb0b45d4f4689fb3619e143d159618c47
 DIST solaar-1.0.7.tar.gz 1265664 BLAKE2B 6bb221d603dc74bf21ac44ca6611d817889285c8711c565b7393b875a934bf9125fc366569c1f677d657463484f2ec5fa077703f311ef2aec74e9f6813a5f1d7 SHA512 24b6b861f90d5747f150afb38b32041885b61cbf7df7794d780b311aef50d334347d5c5c722a0a7d5de3f91b96228e90e2a61dc108054452f46750a04340df83
 DIST solaar-1.1.1.tar.gz 1418025 BLAKE2B c6fd053002727a372bf9672fc22c0acc123f814003c14172f7d13e59b82ab42ecee9b71a09289b2d234874850e0921debaa069506a07d8957f52a2e9953a47f4 SHA512 c4da0c5521724c00afbc54ee9d10a4709246bb6f57635637b77e5944293b285a055b7df623e7e2a810a0764021813929e0f4fa7f21d4afc39abd516416a2bf25
+DIST solaar-1.1.2rc2.tar.gz 1462081 BLAKE2B b5bcf37f75631d39ac726b564bfd7f329f80e9931461fceb5ce7442113df50db82679dabfd08150a87ebe9a9de68aeb111138a005e450c3e025c57e5f1219312 SHA512 65320d7193124d1444ecddf5a162e925f373c7c06d0e582af29b1c9d82ea16a32a69accd53f53568b228474691eacd5c0f16bce1bccef1e9a1846151e86dc203
 EBUILD solaar-1.0.5-r2.ebuild 1776 BLAKE2B 3413685b7eae0f5030f11f6944b36750f53eb2eaf4432c0e505390a3c695141006df4b4a8ddb66a8dae63940e42cf55f63cb0c5662ef4ea2dbdf9f556de2a5f9 SHA512 b153a3897b8e3bb0f442c7f08530c3e676631197c9367b0f6a8575287a83be285796e28854101ef9012910d8b27ab09809f3fae2d890a3f5302e9eaaf8ce4663
 EBUILD solaar-1.0.7.ebuild 1778 BLAKE2B 5b0e5eff7da81d9047095e9f349ceb44a268873f4d971accf763355bc45567aa96d479e867da73d9d2b31291b71d7c70f670d025b3d8007c7d9d293686d55dfa SHA512 59e307e1f0b714e1cdb98a0835fb13a500faceb34ef28bde9da88a15b3056c851a672cdcf19a093f8f17380f5b74bba71134fd215bc87fefb16881560552c6f3
-EBUILD solaar-1.1.1.ebuild 1778 BLAKE2B 5b0e5eff7da81d9047095e9f349ceb44a268873f4d971accf763355bc45567aa96d479e867da73d9d2b31291b71d7c70f670d025b3d8007c7d9d293686d55dfa SHA512 59e307e1f0b714e1cdb98a0835fb13a500faceb34ef28bde9da88a15b3056c851a672cdcf19a093f8f17380f5b74bba71134fd215bc87fefb16881560552c6f3
+EBUILD solaar-1.1.1.ebuild 1790 BLAKE2B da70652eab86d1c7d379fb4f465be4dbad75e09d80a82037a7352f21081fa4f77af74ce5ae0067f66cddc2373ffad35628c6a80c7b501918f050901e6bb0381e SHA512 8755bd1a0a06cf23d0d2d7ff2a8986c61521218cece1f839350819adda47567cd46d9a6f5ef480a1cd65eb7ae6669256f060b78c7d06dd55e6f923d9d9714356
+EBUILD solaar-1.1.2_rc2.ebuild 1791 BLAKE2B 3d38579d0cbf62620ef6b0fd0f4aa54c7bfc2e2ce44d956b0a9c9da13959a0993f6b4bd171be84ccfb4e4faeba33f296dc3037a39e70101de8ce417d9a208904 SHA512 033b09abbb31ba1885b08d2eb6c46d810b84f9cd06dffef2c9170382459871acdad20e8c83f3cf7f2d33d318ef2c0cf8c8b55dd2b75cdeeacbf949f4b3007811
 EBUILD solaar-9999.ebuild 1778 BLAKE2B 5b0e5eff7da81d9047095e9f349ceb44a268873f4d971accf763355bc45567aa96d479e867da73d9d2b31291b71d7c70f670d025b3d8007c7d9d293686d55dfa SHA512 59e307e1f0b714e1cdb98a0835fb13a500faceb34ef28bde9da88a15b3056c851a672cdcf19a093f8f17380f5b74bba71134fd215bc87fefb16881560552c6f3
 MISC metadata.xml 302 BLAKE2B 55938561021d105894875ec5158bd1a744c91039744ff789bffed4ab483eebe73450a9cd62cb4a97c984213fa2f1e8799f8b0d97bd6202e826e4609434086f5e SHA512 3bff70d27a9934d48f848cf0131e01415e13426ea705ef7721a9b59e29ff7bf32718d015de9e4a4f89f23405a8f372f038d2f0c3485cf9a7939a33ebda9d1681
diff --git a/app-misc/solaar/solaar-1.1.1.ebuild b/app-misc/solaar/solaar-1.1.1.ebuild
index cad0500253bc..cbc2547de833 100644
--- a/app-misc/solaar/solaar-1.1.1.ebuild
+++ b/app-misc/solaar/solaar-1.1.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} =~ 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/pwr-Solaar/Solaar"
 else
 	SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/rc}.tar.gz -> ${P/_rc/rc}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~x86"
 	S="${WORKDIR}"/Solaar-${PV/_rc/rc}
 fi
 
@@ -59,7 +59,7 @@ python_prepare_all() {
 python_install_all() {
 	distutils-r1_python_install_all
 
-	dodoc docs/devices.md
+	dodoc docs/devices.md ChangeLog.md
 	if use doc; then
 		dodoc -r docs/*
 	else
diff --git a/app-misc/solaar/solaar-1.1.2_rc2.ebuild b/app-misc/solaar/solaar-1.1.2_rc2.ebuild
new file mode 100644
index 000000000000..ed9a688180e5
--- /dev/null
+++ b/app-misc/solaar/solaar-1.1.2_rc2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit linux-info udev xdg distutils-r1
+
+DESCRIPTION="Linux Device Manager for Logitech Unifying Receivers and Paired Devices"
+HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
+if [[ ${PV} =~ 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pwr-Solaar/Solaar"
+else
+	SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/rc}.tar.gz -> ${P/_rc/rc}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}"/Solaar-${PV/_rc/rc}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc appindicator libnotify"
+
+RDEPEND="
+	acct-group/plugdev
+	$(python_gen_cond_dep '
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-xlib[${PYTHON_USEDEP}]
+		>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+
+	')
+	x11-libs/gtk+:3[introspection]
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	libnotify? ( x11-libs/libnotify[introspection] )"
+# libappindicator & libnotify are entirely optional and detected at runtime
+
+CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
+
+python_prepare_all() {
+	# don't autostart (bug #494608)
+	sed -i \
+		-e '/yield autostart_path/d' \
+		setup.py || die
+
+	sed -i -r \
+		-e '/yield.*udev.*rules.d/{s,/etc,/lib,g}' \
+		setup.py || die
+
+	# grant plugdev group rw access
+	sed -i 's/#MODE=/MODE=/' rules.d/42-logitech-unify-permissions.rules || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc docs/devices.md ChangeLog.md
+	if use doc; then
+		dodoc -r docs/*
+	else
+		newdoc docs/index.md README.md
+	fi
+	udev_dorules "${S}"/rules.d/42-logitech-unify-permissions.rules
+}
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 2468a447b67a..3c316787156a 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -2,6 +2,5 @@ AUX searchd.rc 656 BLAKE2B 5ba2679b18b0a26d7779a69896958b6ed0cca32e4fa22303d5f3b
 AUX sphinx-2.0.1_beta-darwin8.patch 538 BLAKE2B aaac41e383404736d2f18421af2cf2bd03404d99488b778bcab5bec85a36d75a32234d5e4184ae912027b189fd31d41d07caa3e10b35b28318dd0a4369982039 SHA512 342d4ecd3e75c208e358a39de6e5cd2a2bd9dc627f53893869c2280ba5b50546c7edf8476c07cf681c8d1921eeadbeaf48c75337efba0349b951c7a4569f0c14
 AUX sphinx-2.2.11-automake-1.16.patch 402 BLAKE2B 0e0ea346acb11b4f0a469b76e0491eb0942d0a29b9c566f2ae247401e357062c9366d070bdbb89983884d68576848c58e474c3015651fee92c4ed7e2b6694b2b SHA512 8babc7470036c762cb1d930ffa446aa0280637f6bbbe6854346bd94a46cfa36e466e38a402c3ef141c7a76d58188fb33000e66633a81680a7fab26ca5cee2b62
 DIST sphinx-2.2.11-release.tar.gz 3061998 BLAKE2B 63abdf3d08046ebafcdfd67d3445325b9b127e4dd66ba9d36b3b7053ba80f1f3308b74fd1e01caae6174850e1db22c743454894584bad4a4bec78d533a002668 SHA512 cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
-EBUILD sphinx-2.2.11-r4.ebuild 2711 BLAKE2B d898e5a1b9d284f5af614c7a2e91e36bad5ca3b07c80f20e0d90000bbbf6e9f7da6602d6d1713e08d8bb1346d1adc1d14fdbf95e5fe0a983a241e823a220f085 SHA512 297c490bf425cb7f8a150309d31e41a4320e51cef85ff64edc5fbda3ff96ed71f572fb501374d308281989e44e067c93a065bd4aeaf90d311fd237e00143c6ac
 EBUILD sphinx-2.2.11-r5.ebuild 2694 BLAKE2B de3b79ac6cf3f915d772eb5ff06b56433bbf1a1470a6b4f4e869ae1ab88e99ce8bdaa16310f14ae4b83bb6dd5581471b95573d1910a80be63d77879ba775c7ef SHA512 b09740fa0a5d40b7880724c9da5e9db8d0afcf3dcd80053c42d96206024863765da0d557543c9950f629a99f8e402edf1bb7968c88da5c0ebbda64f0112fd7d8
 MISC metadata.xml 496 BLAKE2B ca4cca497fecb4b199b001c5f45f82746213c8ca377c52fc48527162db43507989f3f2a72b4a1599574990a9d9eb7139d699838169f2b84d347810e2de020c04 SHA512 4bd6eb73e0ae85ce428703f98ebe8f1ab78bd36b29b062d6b42838a85c637a7d92c699d42222b9b6796a3a67d2bc38479aef2445f15cb87f8c8cca92a12ea028
diff --git a/app-misc/sphinx/sphinx-2.2.11-r4.ebuild b/app-misc/sphinx/sphinx-2.2.11-r4.ebuild
deleted file mode 100644
index 0c4666a146d4..000000000000
--- a/app-misc/sphinx/sphinx-2.2.11-r4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WANT_AUTOMAKE=1.15
-
-inherit epatch autotools toolchain-funcs
-
-#MY_P=${P/_/-}
-MY_P=${P}-release
-
-DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
-HOMEPAGE="http://www.sphinxsearch.com/"
-SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
-
-REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
-
-RDEPEND="
-	mysql? ( dev-db/mysql-connector-c:= )
-	mariadb? ( dev-db/mariadb-connector-c:= )
-	postgres? ( dev-db/postgresql:* )
-	odbc? ( dev-db/unixODBC )
-	re2? ( dev-libs/re2:= )
-	stemmer? ( dev-libs/snowball-stemmer:= )
-	xml? ( dev-libs/expat )
-	virtual/libiconv"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
-
-	# drop nasty hardcoded search path breaking Prefix
-	# We patch configure directly since otherwise we need to run
-	# eautoreconf twice and that causes problems, bug 425380
-	sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure || die
-
-	if use mariadb ; then
-		sed -i -e 's/mysql_config/mariadb_config/g' configure || die
-	fi
-
-	# Fix QA compilation warnings.
-	sed -i -e '19i#include <string.h>' api/libsphinxclient/test.c || die
-
-	eapply_user
-
-	pushd api/libsphinxclient || die
-	eautoreconf
-	popd || die
-
-	# Drop bundled code to ensure building against system versions. We
-	# cannot remove libstemmer_c since configure updates its Makefile.
-	rm -rf libexpat libre2 || die
-}
-
-src_configure() {
-	# fix libiconv detection
-	use !elibc_glibc && export ac_cv_search_iconv=-liconv
-
-	local mysql_with
-	if use mysql || use mariadb ; then
-		mysql_with="--with-mysql"
-	else
-		mysql_with="--without-mysql"
-	fi
-
-	econf \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
-		$(use_enable id64) \
-		$(use_with debug) \
-		${mysql_with} \
-		$(use_with odbc unixodbc) \
-		$(use_with postgres pgsql) \
-		$(use_with re2) \
-		--with-re2-libs="${EPREFIX}/usr/$(get_libdir)/libre2.so" \
-		$(use_with stemmer libstemmer) \
-		$(use_with syslog syslog) \
-		$(use_with xml libexpat )
-
-	cd api/libsphinxclient || die
-	econf STRIP=:
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-
-	emake -j 1 -C api/libsphinxclient
-}
-
-src_test() {
-	# Tests require a live database and only work from the source
-	# directory.
-	:
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" -C api/libsphinxclient install
-
-	dodoc doc/*
-
-	dodir /var/lib/sphinx
-	dodir /var/log/sphinx
-
-	newinitd "${FILESDIR}"/searchd.rc searchd
-}
diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
index 42d16d70923f..d259b34dc898 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -1,8 +1,10 @@
 DIST task-2.5.3.tar.gz 788760 BLAKE2B 3e8a4f2ebf6c39d3d51dc9b044cf1c8fbce23ab8178b6645405f26522bbb6f29e9f78247fe52601f6c8f87f966a3b7aad130417d0f416b9d969e9e396c10eafc SHA512 e906c8f42ad4b9a7e20a82defe31b89194d72957f18dd5129ecc41a2a60a9d8b0d01abb9b44ecce79b65cd9064af4a4a4c9dd695f98152e77908f130dc3f9677
 DIST task-2.6.1.tar.gz 836830 BLAKE2B 18531a462e9466d2bfc21af70c05ec75f504c82e67ff4160378dd1dc2438955284eb430ec92969ffd212e9e92b14d6bea6013beda8eb353bfb7b8aac03bbbb2d SHA512 996690831967b5b248d336f0848aa243d5929a34238d05a78d49930f477a7927966d097119cf2dd935aa1c159e930f74bac07b05327504b15d235348927b657b
+DIST task-2.6.2.tar.gz 838933 BLAKE2B 47761b1d172f823b35cb5d44edda2ac8d37daf9c54c6e3af267b880bf7f6246c6fbfa436ff63179b415f22c4e6d4253768bb7e9321893ebeaf46089761f309ad SHA512 3c592552c1baada09ef4e06cf2266c9897ffae42a75998b70767f2cfbabd2e1de7d1a900f16f3b8eb164ce19637dabd21e246f84732a20a646f39716895cdf98
 DIST tests-2.5.3.tar.gz 223579 BLAKE2B 89a7fda3726d9923388675f34fe40a6a597901b2ab6c90a345b89d4ba00660e6a7533c4752fc4fe6f77344594a322c17eb43866028c26d005ce44cf12c11c355 SHA512 f6a58407f172385e9955b21b7fffeb510f852bd055ada4869547e396856c7df01b8414a51de6bc8530b29d8ca0fa7e74a8e35aa7bc88fe1e15bda7035a5fadd1
 DIST tests-2.6.1.tar.gz 221364 BLAKE2B 6aac691ba1828abb3469dfa2a9c093b92431591ac21113f71550676f7f9c40394770ddd2c649bf6cda5655d5f1c25aa6c7ef174e9da7ea0c647109d25771dc2d SHA512 df252b252ac7e319d46ef7e72c587c52a97bf7b496ad401342611114db15b7fdab501b4fffc60ea6a8dca7820abc267120375a1aafd1da0a0c41b925e9fd62da
+DIST tests-2.6.2.tar.gz 222713 BLAKE2B e65e2da08264a0dcceeb839efdfad4733312d645fa0dad9eb9fd7e1f260ed21db3009f1c2b3c939dc1a1bf8cf4389f228a0ba05844483fcb5e44de82c2d33fb5 SHA512 98946332f898c4cf621e1dfb2b48761ca9496a43935aca45bf5965029d74f87ff37154693348f13aeed0b61836fab7d2a3cec8161ddd2f65ed9402162fe21239
 EBUILD task-2.5.3.ebuild 1369 BLAKE2B 9a9697292649fccd81b763cb645879c7cd8a46ec8b7cf222ad3be528e2f9244e529fbf14a7a3151b535cfb2674daaae42a851821250f132216d305300b2a09b5 SHA512 6306303a1e824e13d14588d56f79559da8ae54dd237b64fc249dde94da842daf7ece3ea8ed7a5127261ac8e4f245adfd9de514a2d41e73c6248933c73c20a31c
-EBUILD task-2.6.1-r2.ebuild 1452 BLAKE2B 10da76901d78dc09c9b0672413e51cb5c7c93b44be28a1d85302b5d3a26a4bbecb01a37f88e00e81fd59aa5374b7f6ddb9d633215127740be4d7bfe0c5f426f9 SHA512 e5052aeec3bac269c135822ca9bb5c079f4715547265937cfe7823fd9b84789a01cc53182e36f0c8c4e33df595a3af1e9d5c7efad39ea6aa24d640a0039c6ab6
-EBUILD task-2.6.1.ebuild 1363 BLAKE2B 194af9d8ec57b6ee79b11cbb1f9c8443a83b3fb27f777284515042bcdcec1a26ccbbaa258ae399dd12b53ed621ecde55e2ceb281b62519424092d323ae2f97b4 SHA512 db59c98871348a7d2baf95f36ec1cafd325287971a2bc677523c511433539e09a4d1d6a7778855e470067b252a6aed7939921219f04160e2c69d280830a87457
+EBUILD task-2.6.1-r2.ebuild 1450 BLAKE2B 71be676510265b2b326275c15445deb2147fef1e674e1250dd0eaf5f8484151651b23f057480b6492c38274387cac89bacff048d9a81e2d41e49e27b29d039e2 SHA512 f50076068d96231d6d25d19a6c980bf701b35a14400f17e0166b2802c54681df81735a689a386e021337cc6c050fd34d99a9e68d40a1778c5b20f416cbebbe97
+EBUILD task-2.6.2.ebuild 1452 BLAKE2B 10da76901d78dc09c9b0672413e51cb5c7c93b44be28a1d85302b5d3a26a4bbecb01a37f88e00e81fd59aa5374b7f6ddb9d633215127740be4d7bfe0c5f426f9 SHA512 e5052aeec3bac269c135822ca9bb5c079f4715547265937cfe7823fd9b84789a01cc53182e36f0c8c4e33df595a3af1e9d5c7efad39ea6aa24d640a0039c6ab6
 MISC metadata.xml 466 BLAKE2B f2da2e60c939ef2864d1463434c7581457f8d05435cd428038f18fd00ce7cc24a92dc57430e35ff82927188f4a82f9e20f9f0da5272b7c63d0cf00901740747f SHA512 2211e19b9bec481fb3723596e8aba2c560071910c96f9225b4eb33da132a0563e36b2c6edb574c54061bcf480033cc5eecb3095b6ca1bd56fc7e8c3d38a08225
diff --git a/app-misc/task/task-2.6.1-r2.ebuild b/app-misc/task/task-2.6.1-r2.ebuild
index db350fe67469..acaa34e50b1c 100644
--- a/app-misc/task/task-2.6.1-r2.ebuild
+++ b/app-misc/task/task-2.6.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm x86 ~x64-macos"
 IUSE="+sync"
 
 DEPEND="
diff --git a/app-misc/task/task-2.6.1.ebuild b/app-misc/task/task-2.6.2.ebuild
index f1d4aba890f6..db350fe67469 100644
--- a/app-misc/task/task-2.6.1.ebuild
+++ b/app-misc/task/task-2.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -61,6 +61,10 @@ src_install() {
 	insinto /usr/share/zsh/site-functions
 	doins scripts/zsh/*
 
+	# fish-completions
+	insinto /usr/share/fish/vendor_completions.d
+	doins scripts/fish/*
+
 	exeinto "/usr/share/${PN}/scripts"
 	doexe scripts/add-ons/*
 }
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index feb2c6373e63..876b8914069f 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,8 +1,9 @@
 AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4d31b4f7a3f9bcf8d3dfa38fc186a603a90fe734b25781b9d517115c2b089648c29e4605fa9610f6dc311a SHA512 505d5ec4fa1d7844870c67aedccac3a147db1971464fc21d19319bb343fb6fd73b696e85298f8592e46900774b35b250cc53841b05514333c44c3e973bcdb860
+AUX tmux-3.2a-Fix-crosscompiling-Marco-A-L-Barbosa.patch 662 BLAKE2B c9a0881b49e952ad70609a6748bb83f6dcc3c53476738276b283e4e33f73445ce991ea19a749d8310cf580cfe5b9ab58dc3b31718b28778e6e40c18245188ec4 SHA512 d7a351122f39c21aff6c7a21626231234919479ee1e45ffbfefa0471bb3326d0af8cd12a49897ac9c1b928ccc3336c81ad22415cbd9836a8d3b930c696a189d9
 DIST tmux-3.1c.tar.gz 561323 BLAKE2B c6f688a854e128acffa140321a5dd00e4ca090ff79c7cbff15febbca6da9f7626c675fe1820b344637ff0fbe94ae6d0da7f111880ce5d74f97c4b6a90ceef802 SHA512 aad2e6457dd350369f245f711f1936a575d0588b72e660d10e7abc7d373da0d322903b451ad00b96a3e0e6847ca855673da6a4c5447cea91fa756edd23659397
 DIST tmux-3.2a.tar.gz 648394 BLAKE2B 94527d4d1016caddab170b5bbfd181514768474898314241fb65a53a1f5ae94863bacedf90a7543690c115d15295960dfab4d5ba2ce31cd105585a73fb9b82d1 SHA512 6e52c7f5d03b2c8b8c4c8caac092a166956ba97334b426f2823d74dc5849a1d31a80145924f641f69dd2c244809e9350d9bd7070897fa2e3e1f9f086f9b2f365
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
 EBUILD tmux-3.1c.ebuild 1638 BLAKE2B 0ab8033ed5e3093c794c163f0434e02b15fb8a03e0eec333048bc1a1ea845065cb93de1edbc40f05b3d2c39e842ca5e0037d992846021a0d5e8f82f241dbb48c SHA512 c0bb3466cf8087fdd1bc2bafa298f21fdc44792a1d2c60ec0075fe51a86eaa15913b685d5be26aca949c993023a66d2d1fca9d06c25ee3a9fbab8e7612da464a
-EBUILD tmux-3.2a.ebuild 1643 BLAKE2B 06be28b2cef41c5e43b29b5dc50ec04d469a5666813155fca86c4aac7016c7a79e9528b8ce5811f6f9fea970e308d0c71b58fda0274e1f5a92ba1cd316560cc9 SHA512 3061c579b4cc9a4295b2e9cce4a9aac71ebdde27c73b3257f5091eb9c65540d9474e287467afbf9b416821bd7c42cf3f1dd1c98bcd3420b0a653f4feba2b26f7
+EBUILD tmux-3.2a.ebuild 1706 BLAKE2B 903cf84a06aa341fbe0a9fbb4e8a7ce5e09fe74d7a299eab7aaaa24a2adf593849cd4f55d11a6c7f806f403646652a6db951d87f7b244d1e04c368b90c58bb2b SHA512 fbf9224fd63c012f36c621926f874f13a8abf9ac682124bd80626217ac244154e8b498bd42b06118065bcdb681d08af6d6102217e263f8f538a2ca9b7bf33a28
 EBUILD tmux-9999.ebuild 1647 BLAKE2B 1e438f3e076ecc281fa1fd71185dda46a094152191c45ce7343d1a888ac5d8fab3d3e7e84b4916ce3153ef57d431ab2065247bc57d57765aaed4641d8006733e SHA512 c1bb99f996aeb30f1faa040ab5b006aedbf7c2dfba381c62d9c95385770b5740b42681436e4c467bc58ddf6f63895f2805f3503fdff8ee571de8ad1f8403c8ca
 MISC metadata.xml 817 BLAKE2B 82a6ef0299449e66a441f24d6ababd640926b51a2196573d1d21076e83709db1c4e3ca9a466d8220ac4bc5fb4ae8aee02b49c8573011524e2d9509802553c092 SHA512 5cdbfe700d3c1f37fb1d958ada1078ab22d1236248872f1aad6e311ec0aad1fb32b8988acf2e1ade98ba1a6644ffc39b9a29d553271fa12d73afc27b78c8b141
diff --git a/app-misc/tmux/files/tmux-3.2a-Fix-crosscompiling-Marco-A-L-Barbosa.patch b/app-misc/tmux/files/tmux-3.2a-Fix-crosscompiling-Marco-A-L-Barbosa.patch
new file mode 100644
index 000000000000..331ffd7b6eb9
--- /dev/null
+++ b/app-misc/tmux/files/tmux-3.2a-Fix-crosscompiling-Marco-A-L-Barbosa.patch
@@ -0,0 +1,24 @@
+From b1a8c0fe022e99cffb0fb4f321740464f35bc6b9 Mon Sep 17 00:00:00 2001
+From: Nicholas Marriott <nicholas.marriott@gmail.com>
+Date: Tue, 22 Jun 2021 12:16:48 +0100
+Subject: [PATCH] Fix crosscompiling, Marco A L Barbosa.
+
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index f6bdd3c7..30b4d370 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -160,6 +160,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM(
+          [return (strtonum("0", 0, 1, NULL) == 0 ? 0 : 1);]
+ 	 )],
+ 	 [AC_DEFINE(HAVE_STRTONUM) AC_MSG_RESULT(yes)],
++	 [AC_LIBOBJ(strtonum) AC_MSG_RESULT(no)],
+ 	 [AC_LIBOBJ(strtonum) AC_MSG_RESULT(no)]
+ )
+ 
+-- 
+2.34.1
+
diff --git a/app-misc/tmux/tmux-3.2a.ebuild b/app-misc/tmux/tmux-3.2a.ebuild
index 5e9de30cf012..dc9fe95fd7e4 100644
--- a/app-misc/tmux/tmux-3.2a.ebuild
+++ b/app-misc/tmux/tmux-3.2a.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.4-flags.patch"
 
 	# upstream fixes (can be removed with next version bump)
+	"${FILESDIR}"/${P}-Fix-crosscompiling-Marco-A-L-Barbosa.patch
 )
 
 src_prepare() {
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 216528ee6a14..9ddd3e134bc7 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -3,7 +3,9 @@ AUX tracker-miners-3.1.1-Fix-asciidoc-manpage.xsl-location.patch 857 BLAKE2B 25e
 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
 MISC metadata.xml 740 BLAKE2B 038c1a4f3d5a1dce875cdd315187b3299b9a5ac0831dbd6d7967b9d5ea99610e134d9ccbffe3717819b88843e4836fc74c125bdfaa827f7b8479565cebd521d3 SHA512 474d28d444a83797a8f8bf287fd67b8e432dc7e93dccb30774e5eed254547840ae72eff5ccffbff6a020385a4d55fa1d7b0e3fc36280d6a6968f8b53ceff50a7
diff --git a/app-misc/tracker-miners/tracker-miners-3.3.0.ebuild b/app-misc/tracker-miners/tracker-miners-3.3.0.ebuild
new file mode 100644
index 000000000000..292e8a512afc
--- /dev/null
+++ b/app-misc/tracker-miners/tracker-miners-3.3.0.ebuild
@@ -0,0 +1,165 @@
+# 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.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= ) )
+
+	>=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
+			)
+		)
+	)
+"
+
+python_check_deps() {
+	has_version -b "dev-python/tappy[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# 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/Manifest b/app-misc/tracker/Manifest
index c6fe50251459..7833af4638c1 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -4,6 +4,8 @@ AUX tracker-3.2.1-Add-config-options-for-libsoup.patch 1693 BLAKE2B 0ea29fff9bfd
 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
 MISC metadata.xml 498 BLAKE2B 53cd3148f5755776613afbd38fa6b0eac4d10bb60765e7af7922ff70c5875f78ba25a78ef81af69f7767bc9da9fc854d9c833f4aa8bf18e52811fc4292dc47f7 SHA512 b81b2eb4705e5280286c6b6d9cc37945c671cd9ab635d31d7cef7d7ed2a3cf7a2ba5107e37363a78d8c707a2095a3d002e4ca6c233555a075ae21a9f8885d6db
diff --git a/app-misc/tracker/tracker-3.3.0.ebuild b/app-misc/tracker/tracker-3.3.0.ebuild
new file mode 100644
index 000000000000..8875b2911b7e
--- /dev/null
+++ b/app-misc/tracker/tracker-3.3.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+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
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+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"
+IUSE="gtk-doc +miners stemmer test"
+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.54:=
+	>=dev-libs/icu-4.8.1.2:=
+	>=dev-libs/json-glib-1.4
+	>=net-libs/libsoup-2.40.1:2.4
+	>=dev-libs/libxml2-2.7
+	>=dev-db/sqlite-3.29.0
+	stemmer? ( dev-libs/snowball-stemmer:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	app-text/asciidoc
+	dev-libs/libxslt
+	$(vala_depend)
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.8
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.5
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		$(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
+		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
+	)
+	${PYTHON_DEPS}
+"
+PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
+
+function inotify_enabled() {
+	if linux_config_exists; then
+		if ! linux_chkconfig_present INOTIFY_USER; then
+			ewarn "You should enable the INOTIFY support in your kernel."
+			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
+			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
+			die 'missing CONFIG_INOTIFY'
+		fi
+	else
+		einfo "Could not check for INOTIFY support in your kernel."
+	fi
+}
+
+python_check_deps() {
+	use test || return 0
+	has_version -b "dev-python/tappy[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	inotify_enabled
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+	vala_setup
+}
+
+src_configure() {
+	append-cflags -DTRACKER_DEBUG -DG_DISABLE_CAST_CHECKS
+
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dman=true
+		$(meson_feature stemmer)
+		-Dunicode_support=icu
+		-Dbash_completion_dir="$(get_bashcompdir)"
+		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
+		$(meson_use test tests)
+		-Dintrospection=enabled
+		-Dsoup=soup2
+	)
+	meson_src_configure
+}
+
+src_test() {
+	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
+}