gentoo resync : 29.12.2022

91 files changed, 409 insertions, 3039 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index c45f62e01604..138df132b467 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index f7dfd7f43913..e2170bec6d25 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -1,5 +1,5 @@
 AUX 0.32.0-drop-vapigen-dep.patch 1123 BLAKE2B 921e0bfebf9dfa67e55cda7c410c790e07d5d55d9c24d897fd43bacf524bde2de4fce07905a8c2298130af5c94a309a8bd82d0d549f2e344d653f9c9e1335965 SHA512 c26e44fd38e46f1df60d2a13cc40415af9298629ad3c0d12a203bf483a0577c24af2bedfb8c1e8e35855eefa317a0afced78b74f217a13a2429bb8ae73d8413f
 AUX 0.40.0-bash-completion-dir.patch 3029 BLAKE2B 6695d75088c96060b0b0a34f928d8db9b06528d97ff3fe44b5911ef1c04b1a68aa807eea507213e316283db8b1d73218255e12c378aafb3fc920ab39d3f092b4 SHA512 4fead302c92327787f26b0001ced07dcd176abbc5142119a19be0b48893d777f1cfc4559f37a37a5c589221cb2c81f1627626371d8a3ad58bb8c542806ac7b87
 DIST dconf-0.40.0.tar.xz 117764 BLAKE2B bdbc48b71e46fdc4353358cd08fb96933d07af587300a6f91bc45826aeafb3f34f482fe6e09041dd839e507b863a8e33d09bad88a91c1c868983f8afb52c5c85 SHA512 71396d71f24f47653181482b052fdfc63795c50c373de34e2fb93e16101745daa7e81192b79a102d5389911cea34138eedf3ac32bc80562018e8a7f31963559a
-EBUILD dconf-0.40.0.ebuild 2163 BLAKE2B 7f95013433f387b6774e6a0b520317e2b60cbc45e3fd44c50dbba55fdfd7cc199c8984c071e079109f181e46cbaaf8250d1f23707d13e561b853ccbc3f7be79e SHA512 d19ccc44411a2c75ecaec1673103e77d441ab12dd32f08766511c477568ddbf8b130cb344b3b3a0d97fbcb9bfc57741a165f93f8b53edeb60958497bcfbd11d8
+EBUILD dconf-0.40.0.ebuild 2170 BLAKE2B a9ebb1553e2e5d86929cf1795042a5f0a0d2054e2a4db609d1c14c783c86fede797a61e3e7bf996a85b6c92a1cbe31e16ed47d68d6fafb9c05e5a0c6cd86cbf5 SHA512 cd12f9a3c679edb56d648f0fa2e3fca5f4777ef52f9fff92b653c766a932998142168854bf4a7702033e5c882b758eafcaf8c279da7ab232a0cf332b26ead2ca
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/dconf/dconf-0.40.0.ebuild b/gnome-base/dconf/dconf-0.40.0.ebuild
index ceacf61216f5..cdef334d4521 100644
--- a/gnome-base/dconf/dconf-0.40.0.ebuild
+++ b/gnome-base/dconf/dconf-0.40.0.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
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="gtk-doc"
 RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
 
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 946371fcc1d5..15aad28df0c9 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,11 +1,7 @@
 AUX default.pa 328 BLAKE2B 558dbedcb5a0f31e0bdc01ce21deaeacb4740dee998f8b2f947361745ea6680acf8662e426adf1d3f777af714c2fb7cf5ec74b2807187c37e2d8d896e863fa0d SHA512 4f0e9c38ae0c17b8f4ee6e37b87259676c4ff4e62fd315989c9e20012a8070c5b5571f835379639f76f157530495928cdc79265473478b1d9fe6d8ad0d64785d
 AUX gdm-3.30.3-logo.patch 846 BLAKE2B e99b6621191c509545bc36fe838bc467c3762f2726e247aea1b3cad2a86c0b0e95c5f9953b680a072d244140615c38becbc605998a2be0ed3332d7b5ef802f55 SHA512 63428d4605d9f4f35445f364657c1d92818125a737add7bc5e5acab424beaf8ae5895368111cd2d1c03c75f5fd8b9538d8750ea732a0990b5b82507735850e4c
-AUX gdm-3.8.4-fingerprint-auth.patch 923 BLAKE2B e681da8518ed1d002c1205658bb35e472e9d130df5d70dfd9eef55f5361cffeee716ebe0eea23f4c19f9f6ec2f4118729616f7f4e2c758990cf7cde3271cc8b2 SHA512 3cf5f9c0eabdae3f767d9b9db6052d760e879c14b9304753cdda56a4f643a9ed97f3ea83f642bfe96d220c8e9e4f99fbbd47c6e99ddfebeb6322a3a033c296d5
 AUX gdm-40.0-meson-allow-building-with-elogind.patch 8801 BLAKE2B 358abc6b4a81523f53f6551af3c976916492c6c80fcacf8ec7c6fd90683558f1e7d898b749bdb458b2379e8a96f08293bbbebee3b8fc9126ebf249a95c514b41 SHA512 6116047fe51f0daf99de7e369028629fff88890c9627407648f2bec312df9b8b94f1ccb9b7015347258444f8193da16c6209a41de9441c848097670a13b4a7ef
-AUX pam-elogind.patch 835 BLAKE2B 1db26b690d631c152ae7fd84149c7ff3222e8bd258bff78e09cd6f00fe34a8bfdb2499b252a1f15e17d9e4ed315e02260357b57cd31cf8ada5a2705ba1ef4ee0 SHA512 4d2d65741a5bfd1dc686dc986708526161d15ace2d5396bef281a2192d95458a072764483e1422ed1f6eb594fc0caa6baa381371618f907a97f75566209fab7b
-DIST gdm-41.3.tar.xz 807452 BLAKE2B ff6a264220c2ddc60c21fb767154bfdc2844a177e4043749cc393387b116865f5b9dc56c4ce996e83c0a258370f59b7fd1865f455aa67258671ae0bae8671997 SHA512 71a93eef02fccee22ca4f90e3217431923da2b1ac4f5995ff7b64c9b4cac839f4695f4122d255407b570635d34e86e233fa7e4d5d22a8d8185ccfa8ad20f83aa
 DIST gdm-42.0.tar.xz 811200 BLAKE2B 98f39fc4e80bb7160b7da57d5c606ce1fa2f66ea1ab817c82c6db7328df60b91a1e9a829f67a716c67a5e5ada9f9356e4c82e40065b2692f32aa80c545adc616 SHA512 e07a4e9233573069dd5628e7b7e6dbe462e90bd8f30267d3faf1cbe3dcb8b990afe3ad6af1edf5f0ec689c6eb245aaacd4e8565a7e4feea34cc754d43904daaa
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gdm-41.3.ebuild 5845 BLAKE2B c60a6ef2ff2234706ff0c716f94ff383cda89605c1b09c02fcb8ee0f0f9185adf1eeea161b1eb68f3b3af6b0cf83f48a38fd6c492f59db952bfffe08ca937ec1 SHA512 d746306cb63b23c94d96f46a9e79edbcb7058ac4f45d9e01ad1b81cdf2da36bdffc59ade9ff409ce658cc4f9bd33647770dcb0682164d2f727af4d3fae8153ab
-EBUILD gdm-42.0.ebuild 5654 BLAKE2B 42c405ad145740d5590f36c2d9bd119c9871256ac992ca2821530e7bf2a1f1d74931e116bd540556c06d3ca95f2662316e62dfec635755801b72aacdea8f03f1 SHA512 41355763fb752e787a958499b084d677c2575329db3a42861c77b4d5bb43805d38554f68fca3f761fcd422bb13cc91d754cbf03bb9e292620d055b5554823509
+EBUILD gdm-42.0.ebuild 5649 BLAKE2B 6ffef32fd6113a851536fa3e8be7e8f47b246a08225ffc509f018a39686d6c26b25f5f0b8201c62a6a9d225fb3842424a358be6214337603990570325b12f655 SHA512 5b2394eddd5cfdd3841222808f6da7b9322cd4da070423022221751cd52a3402c4b7fe521ffc44b477f4bf8e71e6b1a83c85a657288d2c09f3177b4fedd32e75
 MISC metadata.xml 760 BLAKE2B ed67837e4caac485dd97f9b2b392c4aa26cb0515a5147a258e197531123f1c92b96900d073e85dca0ffc661aad3efb0d2328434e4554bf3b681ecf3a61eb797a SHA512 40979ee3950ee2cb3c3d67eff9c100f6fb1bc19215daaf4d8e65b8f300f05b71c74e542312780979d7ee31d0234be351496dd2dd7a7ebf3519da2fbb3acbc8dd
diff --git a/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch b/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch
deleted file mode 100644
index cd19077a5f1d..000000000000
--- a/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 75fe02c2b383b27b202940bdedd7d8d2c64169fb Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 30 Jul 2013 22:56:30 -0400
-Subject: [PATCH 3/4] Gentoo does not have a fingerprint-auth pam stack
-
----
- data/pam-exherbo/gdm-fingerprint.pam | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/data/pam-exherbo/gdm-fingerprint.pam b/data/pam-exherbo/gdm-fingerprint.pam
-index 41639ec..d9633fb 100644
---- a/data/pam-exherbo/gdm-fingerprint.pam
-+++ b/data/pam-exherbo/gdm-fingerprint.pam
-@@ -1,6 +1,11 @@
- account  include  system-login
- 
--auth     substack fingerprint-auth
-+auth     optional pam_env.so
-+auth     required pam_tally2.so onerr=succeed
-+auth     required pam_shells.so
-+auth     required pam_nologin.so
-+auth     required pam_fprintd.so
-+auth     required pam_permit.so
- auth     optional pam_gnome_keyring.so
- 
- password required pam_deny.so
--- 
-1.8.5.1
-
diff --git a/gnome-base/gdm/files/pam-elogind.patch b/gnome-base/gdm/files/pam-elogind.patch
deleted file mode 100644
index e17bed395b54..000000000000
--- a/gnome-base/gdm/files/pam-elogind.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 96e605d6bd832a89f022872492a9c9cb1eb62f66 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Tue, 19 Mar 2019 23:13:29 +0200
-Subject: [PATCH 2/2] pam-exherbo: Support elogind
-
----
- data/pam-exherbo/gdm-launch-environment.pam | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/data/pam-exherbo/gdm-launch-environment.pam b/data/pam-exherbo/gdm-launch-environment.pam
-index 51a8e003..c697a528 100644
---- a/data/pam-exherbo/gdm-launch-environment.pam
-+++ b/data/pam-exherbo/gdm-launch-environment.pam
-@@ -8,6 +8,7 @@ auth        required    pam_permit.so
- 
- password    required    pam_deny.so
- 
-+-session    optional    pam_elogind.so
- -session    optional    pam_systemd.so
- session     optional    pam_keyinit.so force revoke
- session     required    pam_succeed_if.so audit quiet_success user = gdm
--- 
-2.17.0
-
diff --git a/gnome-base/gdm/gdm-41.3.ebuild b/gnome-base/gdm/gdm-41.3.ebuild
deleted file mode 100644
index 8bef669a63d7..000000000000
--- a/gnome-base/gdm/gdm-41.3.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop gnome2 meson pam readme.gentoo-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
-HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
-
-SRC_URI="${SRC_URI}
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="
-	GPL-2+
-	branding? ( CC-BY-SA-4.0 )
-"
-
-SLOT="0"
-
-IUSE="accessibility audit bluetooth-sound branding elogind fprint ipv6 plymouth selinux systemd tcpd test wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="^^ ( elogind systemd )"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-# dconf, dbus and g-s-d are needed at install time for dconf update
-# keyutils is automagic dep that makes autologin unlock login keyring when all the passwords match (disk encryption, user pw and login keyring)
-# dbus-run-session used at runtime
-COMMON_DEPEND="
-	virtual/udev
-	>=dev-libs/glib-2.56:2
-	>=x11-libs/gtk+-2.91.1:3
-	>=media-libs/libcanberra-0.4[gtk3]
-	>=sys-apps/accountsservice-0.6.35
-	x11-libs/libxcb
-	sys-apps/keyutils:=
-	selinux? ( sys-libs/libselinux )
-
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-base/xorg-server[-minimal]
-	x11-libs/libXdmcp
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-
-	systemd? ( >=sys-apps/systemd-186:0=[pam] )
-	elogind? ( >=sys-auth/elogind-239.3[pam] )
-
-	plymouth? ( sys-boot/plymouth )
-	audit? ( sys-process/audit )
-
-	sys-libs/pam
-	sys-auth/pambase[elogind?,systemd?]
-
-	>=gnome-base/dconf-0.20
-	>=gnome-base/gnome-settings-daemon-3.1.4
-	gnome-base/gsettings-desktop-schemas
-	sys-apps/dbus
-
-	>=x11-misc/xdg-utils-1.0.2-r3
-
-	>=dev-libs/gobject-introspection-0.9.12:=
-"
-# XXX: These deps are from session and desktop files in data/ directory
-# fprintd is used via dbus by gdm-fingerprint-extension
-RDEPEND="${COMMON_DEPEND}
-	acct-group/gdm
-	acct-user/gdm
-	>=gnome-base/gnome-session-3.6
-	>=gnome-base/gnome-shell-3.1.90
-	x11-apps/xhost
-
-	accessibility? (
-		>=app-accessibility/orca-3.10
-		gnome-extra/mousetweaks
-	)
-	fprint? ( sys-auth/fprintd[pam] )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=gnome-base/dconf-0.20
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( >=dev-libs/check-0.9.4 )
-	app-text/yelp-tools
-"
-
-DOC_CONTENTS="
-	To make GDM start at boot with systemd, run:\n
-	# systemctl enable gdm.service\n
-	\n
-	To make GDM start at boot with OpenRC, edit /etc/conf.d to have
-	DISPLAYMANAGER=\"gdm\" and enable the xdm service:\n
-	# rc-update add xdm
-	\n
-	For passwordless login to unlock your keyring, you need to install
-	sys-auth/pambase with USE=gnome-keyring and set an empty password
-	on your keyring. Use app-crypt/seahorse for that.\n
-	\n
-	You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
-	for smartcard support
-"
-
-PATCHES=(
-	# Gentoo does not have a fingerprint-auth pam stack
-	"${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
-
-	# Add elogind support
-	"${FILESDIR}/${PN}-40.0-meson-allow-building-with-elogind.patch"
-
-	# Support pam_elogind.so in gdm-launch-environment.pam
-	"${FILESDIR}/pam-elogind.patch"
-)
-
-src_prepare() {
-	default
-
-	# Show logo when branding is enabled
-	use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch"
-}
-
-src_configure() {
-	# --with-initial-vt=7 conflicts with plymouth, bug #453392
-	# gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which
-	# saves on memory. However this means if we don't start on VT1, gdm doesn't start up
-	# before user manually goes to VT7. Thus as-is we can not keep gdm away from VT1,
-	# so lets try always having it in VT1 and see if that is an issue for people before
-	# hacking up workarounds for the initial start case.
-	local emesonargs=(
-		--localstatedir /var
-
-		-Ddefault-pam-config=exherbo
-		-Dgdm-xsession=true
-		-Dgroup=gdm
-		$(meson_use ipv6)
-		$(meson_feature audit libaudit)
-		-Dlogind-provider=$(usex systemd systemd elogind)
-		-Dpam-mod-dir=$(getpam_mod_dir)
-		$(meson_feature plymouth)
-		-Drun-dir=/run/gdm
-		$(meson_feature selinux)
-		$(meson_use systemd systemd-journal)
-		$(meson_use tcpd tcp-wrappers)
-		-Dudev-dir=$(get_udevdir)/rules.d
-		-Duser=gdm
-		-Duser-display-server=true
-		$(meson_use wayland wayland-support)
-		-Dxdmcp=enabled
-	)
-
-	if use elogind; then
-		emesonargs+=(
-			-Dinitial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility
-			-Dsystemdsystemunitdir=no
-			-Dsystemduserunitdir=no
-		)
-	else
-		emesonargs+=(
-			-Dinitial-vt=1
-			-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
-			-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use accessibility ; then
-		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
-	fi
-
-	if ! use bluetooth-sound ; then
-		# Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10
-		# bug #679526
-		insinto /var/lib/gdm/.config/pulse
-		doins "${FILESDIR}"/default.pa
-	fi
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm
-
-	use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	local d ret
-
-	# bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm
-	ret=0
-	ebegin "Fixing "${EROOT}"/var/lib/gdm ownership"
-	chown --no-dereference gdm:gdm "${EROOT}/var/lib/gdm" || ret=1
-	for d in "${EROOT}/var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do
-		[[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1
-	done
-	eend ${ret}
-
-	systemd_reenable gdm.service
-	readme.gentoo_print_elog
-}
diff --git a/gnome-base/gdm/gdm-42.0.ebuild b/gnome-base/gdm/gdm-42.0.ebuild
index a3c6187c29fa..d6c9b14f6f70 100644
--- a/gnome-base/gdm/gdm-42.0.ebuild
+++ b/gnome-base/gdm/gdm-42.0.ebuild
@@ -23,7 +23,7 @@ IUSE="accessibility audit bluetooth-sound branding elogind fprint plymouth selin
 RESTRICT="!test? ( test )"
 REQUIRED_USE="^^ ( elogind systemd )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 # dconf, dbus and g-s-d are needed at install time for dconf update
 # keyutils is automagic dep that makes autologin unlock login keyring when all the passwords match (disk encryption, user pw and login keyring)
@@ -196,7 +196,7 @@ pkg_postinst() {
 
 	# bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm
 	ret=0
-	ebegin "Fixing "${EROOT}"/var/lib/gdm ownership"
+	ebegin "Fixing ${EROOT}/var/lib/gdm ownership"
 	chown --no-dereference gdm:gdm "${EROOT}/var/lib/gdm" || ret=1
 	for d in "${EROOT}/var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do
 		[[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index 364b8423a98f..de71d449d7ac 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-applets-3.42.0.tar.xz 9391580 BLAKE2B 43d3c86d4c401ef6e509a7ff653c613d7f49624354ea74635f9aa634e33c92bb54cc2461ab8e9fb3fcf7efe3f97fc9a65c9b8f7a0b8fc3e126a531492274518b SHA512 9be26e7779123dc5dc56aabe274d3ee34b3ffea830e2691051bf2a8011a1896c5e56fb9cc6d89b7f5ff14b1aeea969b81134bb7d0e4b1615343bf23daa1137a5
 DIST gnome-applets-3.44.0.tar.xz 9396928 BLAKE2B 03fb970e4ebe7747aed9241e7512c6fe945650ac789cac5c5bc1e49958b1636f43b59c56caaf24a01785c84617cef4c9b3fa76931ed46d6f3ea8c4b74335ca1b SHA512 8a9a75590e96d0ef6af4775d261337b41b23779b86d38080014f49666fdaee68bc9ef58eeae94e87c43bd07b0b0720b867f03f2c2d0f2d8b7daea3c66251fc7e
-EBUILD gnome-applets-3.42.0.ebuild 1269 BLAKE2B e7409e0e2c3ebcfc85623d3fc529759a42a831a2cff7e5f387e71fcef152cb77a1721292422e28abff8bbdb2c3105dbb5aeb2a919c2b34c4cfb2b44794650c35 SHA512 ad1a74f4116d781113bf379b47873902cac05a931cb1b4321323452362f75376cabcfe509765e91185dabea7b15cf633ffbe027f2f652d63af045001416a67fe
 EBUILD gnome-applets-3.44.0.ebuild 1296 BLAKE2B a3eba37b1433a45a024c0e89fdc90d29f43904734f30ed3e0ec7494b637887788f24728f30b01ad6373d723cdc8d21977a3ddb02d625e6e8d017985d4684f8d3 SHA512 4702c362fe38a19f066f61a75890c9439390bf4f8c7921f91a57a3c8bafb5db52a5586f5f513dbca6b4c28aae39cbcadf4f835516e6c6a6be471d5b5577599d5
 MISC metadata.xml 328 BLAKE2B 23e54626993373e58fbb0718c51e2b9c4eafcd7a0f2cd3968d05b72bc6a3cebeec386d96ab317cc92a17f08d17f8cb9091d6c47d4e6af49993451dd98b8aa04c SHA512 b4936e6332bbd5de094ec96060c84aa6eecc737260a093dc01da4687f68994a5a622eec0b3fce353abfb851b90c31ce7b0ee93e330d6ae2f4b288ab104655463
diff --git a/gnome-base/gnome-applets/gnome-applets-3.42.0.ebuild b/gnome-base/gnome-applets/gnome-applets-3.42.0.ebuild
deleted file mode 100644
index 0863ef27e917..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-3.42.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2
-
-DESCRIPTION="Applets for the GNOME Flashback Panel"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-applets/"
-
-LICENSE="GPL-2+ FDL-1.1"
-SLOT="0"
-IUSE="tracker"
-KEYWORDS="~amd64 ~riscv"
-
-# FIXME: automagic wireless-tools
-# TODO: gucharmap could be optional, but no knob
-# TODO: libgweather could be optional, but no knob
-RDEPEND="
-	>=x11-libs/gtk+-3.20.0:3[X]
-	>=dev-libs/glib-2.44.0:2
-	>=gnome-base/gnome-panel-3.41.1
-	>=gnome-base/libgtop-2.11.92:=
-	>=x11-libs/libwnck-3.14.1:3
-	>=x11-libs/libnotify-0.7
-	>=sys-power/upower-0.99.8:=
-	>=x11-themes/adwaita-icon-theme-3.14.0
-	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/libgweather-40.0:2=
-	>=gnome-extra/gucharmap-2.33.0:2.90
-	>=sys-auth/polkit-0.97
-	x11-libs/libX11
-	tracker? ( app-misc/tracker:3 )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-" # yelp-tools and autoconf-archive for eautoreconf
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-cpufreq \
-		$(use_enable tracker tracker-search-bar)
-}
diff --git a/gnome-base/gnome-common/Manifest b/gnome-base/gnome-common/Manifest
index 3597736f329f..411ff669e154 100644
--- a/gnome-base/gnome-common/Manifest
+++ b/gnome-base/gnome-common/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-common-3.18.0.tar.xz 155804 BLAKE2B 5e5dbccf1851f45e2890e2fcced1be5630dd378bb22448e38ff7988a18145bfa90dee03a64a4ba4ff9d22ea6fd812e9f02a1ee1f9656b4d47201afc174d69229 SHA512 b931c9a6668d996560549738bb2d95f86f56fa68ce930c077275bdc8fddbc2d28d215c1190099db1df851417902fca87ec81f1c0e644c5b9630a175e1cde0719
-EBUILD gnome-common-3.18.0-r1.ebuild 598 BLAKE2B 665b54f72b6df4a888b8758c74de05ac7d7d65a4d4623365450f66add984432388102a5e5cb5e99fc1d9e814bae7f8b8ade7cf4de265687cc6874a1060e421f7 SHA512 dbd4dfb63e88f9f91b00a5255478260ae81d1773c37542e917081bfc205496e11e8e0a973ad375ec1b1444d8ca9ae41b098e623824f198d143a90d7a6a06825d
+EBUILD gnome-common-3.18.0-r2.ebuild 577 BLAKE2B e25834de5c76a6c749e8e1d24064aa262514e64952464a7e632152632a0af2c3b4660d2a497367503917b6eab2e17198f6e8e45f36ff523797700a94c1d6b36e SHA512 d51379dcc131fd3a1de1a3af270e6c09c98f890aa9ea79c2c03517b8355397cc7db34f0c8372cda67da4cc49e4836ed95fde5e32a9657e6c76b800c19efbc368
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild b/gnome-base/gnome-common/gnome-common-3.18.0-r2.ebuild
index 3b97fbda242f..a207b0583037 100644
--- a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
+++ b/gnome-base/gnome-common/gnome-common-3.18.0-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit gnome2
 
 DESCRIPTION="Common files for development of Gnome packages"
@@ -11,9 +12,6 @@ LICENSE="GPL-3"
 SLOT="3"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
-RDEPEND=""
-DEPEND=""
-
 src_configure() {
 	# Force people to rely on sys-devel/autoconf-archive, bug #594084
 	gnome2_src_configure --with-autoconf-archive
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index ea5c341071cb..92a2708219f9 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,10 +1,6 @@
-AUX 42.0-online-accounts-Fix-goa-helper-on-X11.patch 1283 BLAKE2B 86d8ebd6cafceb4d075395900ecc2845394a06edb2e539ef1d81315ef4e2e26364269b6083f1901fc6e4bf49626ee65b532e14cd6a5c38322bef9c729e7f5986 SHA512 e301d0a97970a2d9df92d3639777dc989895a4993ce0f81cee8df362a908fc81fa0259c6d0f1c4128460493773f969deec837be5266d7be97308111b3b4fc664
-DIST gnome-control-center-41.2-patchset.tar.xz 6380 BLAKE2B de9eacf549686e43870df486994c5cd319f996edb2b09a7d3b5e9021c50b74c067e8c3cbabbc0ca68741fb3b4c5a2d65cc1ea72e20057ec59dab952fa886d527 SHA512 292737b34316ceff5eb43c598b0a8d2a7895e2891215137ba59defb935c6184e78f19e2485963a8642621a409ee87e0e2a1582403fd90ee3c83b2bc1f3334e27
-DIST gnome-control-center-41.4.tar.xz 6616908 BLAKE2B 7c1a2692667c0447590d81c17ae990bff4b3bb7b85007ec70f8623d284cc0743ca79380dc60f1a9f97c01f897260c74acae0d730b197e8d4314e8002c7eec826 SHA512 63fa20041a06f5075d172b543176b4f037fcd623d9fa5ca5f785e047a9b95ccd002c423d29de673dcb28b7d99a83157b39d7bd65ef77fe70065e9a03b5ae38a4
 DIST gnome-control-center-42.0-patchset.tar.xz 5932 BLAKE2B 1c9311481be6a07dc2ff61fc9e65f190bc1668026fba2a1e4a8edf9a033e6b2b9019542d89aac4480323ee4802e00b765654008f5252e87040f013a990cb8048 SHA512 b76c1facd3566edcadfe33f81027966da35bb03909bfbae6faad72005b92447e291fa424611196bfae6e1dc5bf5982917f3ae14c36d87206f6bfb4af502bf1a4
-DIST gnome-control-center-42.0.tar.xz 6238096 BLAKE2B 63540c94d64d312ff9ce523cc3ef0023b35b93bbd0593cc6a3f5d671cc70980969617b2436b0c9994b8d225fac972d639b935affac36bc32bf621c4593d490bd SHA512 d8097240444ab45174e89db0f543d6523051829b124933cdbb84b1bc5d2d6809ee810f6d2c09702da51c991fe11496635b3164b490ed1e2ac523481d5466cf3e
 DIST gnome-control-center-42.1.tar.xz 6239960 BLAKE2B ba539267a00bca7218a8088fba1c2790d26239ea57ef45cdbbe6b54b687b30ab15ec4ced0078d9fab48a7d6d8fd9e966ffa3dd92bcae164d99a5e64c458e5852 SHA512 a29df2604d90e42a602060a7042d70238eed9e59c46b500610c6b5842e015ba0d9567528a3dfd6bf365973f274de47ccd4b8f2f50cfa35c8f88bb05cb31e774d
-EBUILD gnome-control-center-41.4-r1.ebuild 6117 BLAKE2B 91a6d1c145971c45330865eb6017546cc4df1d99b87c441ba21edaef1ca3fa2eef9a8ce4396ad741a27557a3fa8e87e11ee54b35fb4d42321e129b5fe55bb742 SHA512 f7db79a7888306f9291c3e90eae254ffb85c7db5deb747b6af9d103a9cc9ea430e4a01642ec1017899fd452f24545031cde765c87c86168744f0973f0b58c588
-EBUILD gnome-control-center-42.0-r1.ebuild 6113 BLAKE2B bf91416360ffea17c708cf9501272d1637ce4275e8ce99548ab70b6ddba4bf0371bd754203658958e42708aeef64c1a93c5c32cb5ca6b3faa7a513fa36048cbc SHA512 86deb32ce02025476ae33f7b73cd0d36e956fdce919f2254f85aa10e772a562566c131ddea677d490356415023200a55e74856f5c06aae1f3757da33af7758e0
-EBUILD gnome-control-center-42.1.ebuild 6058 BLAKE2B 071bc0ef3ca97838a7ae829ee495a3d13c2642f24b9aaed6c354ce1d85dd93b9f18ab929f5d37ad12186f09b12630f3678df704aee916613481268cd448ccf54 SHA512 2d680e74f387f339499dedccdf06a6dd50de680ffc1cf197a12f1b3aac8aaa636c05dfe53a14466ffea49877be9768cb3cf5582a08dce0a9a7b6be54b3cc1397
+DIST gnome-control-center-42.2.tar.xz 6240632 BLAKE2B 976a07c1351e629ede3c8dc4f02ce98d93398450ff64af15775800d819c7dcddca43837a4eac6bfb8263a6cd8b2dbe7523a90576dece9959e32a7307f6884e1c SHA512 f8fda1a501939788de62a33d1570e45b95392165d23f90cb4c1ae94c92f61d5f5d72d1e25df1a9fb355ea88abecf7bf38bc67c69fb2b3495d027365deb44f21c
+EBUILD gnome-control-center-42.1.ebuild 6055 BLAKE2B 370738c28df978c2a34082910b872fcae15084439963fd82e1b37ccf24f9bd6511f819af5c315fb66bdee0e905e2862d623261bcc31d9274799b7a69d139a851 SHA512 b10d5dfff1efdb878a6850eaae0ea7f63e46307bf7bbf3b167311bcbf642307c62bfb55468b59fa349182cbf51e717295d08d9e2bcdc2bb345e2f522161e65a2
+EBUILD gnome-control-center-42.2.ebuild 6043 BLAKE2B f89d7bcff626eea61ce8cf6b84652bbdc88a8a33a4cdc6856dc627b4521d2d9270d1aaf42950cd9680cfd3307b4b1aa2829e7a02191c00557c8d71bae9f3f8ed SHA512 856da1d531f239de09531873b6e7c3a02e2efcea2171e931739e905f5cf806b6504bdf7a6351ae9fdeb25e32549c4a3ed36934c4e17ab58a2379e209d64da334
 MISC metadata.xml 497 BLAKE2B 27aa6d9d725a3ce90d351442da83bdb5680f9931d78e5d6a653a1d2d392df118406e3eab36c77bbaeefc581be3a62c5df13fdfb611b2db27fc9c7440ba4ceae3 SHA512 c44903fa5a9462871c065bc776450c25bcca1dfe2f52d6bf676568f587bc308a0465bd5cb6e095fb0ecaefd0b8471df90df3b96164c7e7de76a86fbbe416a82b
diff --git a/gnome-base/gnome-control-center/files/42.0-online-accounts-Fix-goa-helper-on-X11.patch b/gnome-base/gnome-control-center/files/42.0-online-accounts-Fix-goa-helper-on-X11.patch
deleted file mode 100644
index dfa56eab9e61..000000000000
--- a/gnome-base/gnome-control-center/files/42.0-online-accounts-Fix-goa-helper-on-X11.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7fe322b9cedae313cd9af6f403eab9bfc6027674 Mon Sep 17 00:00:00 2001
-From: Jan Tojnar <jtojnar@gmail.com>
-Date: Mon, 28 Mar 2022 21:02:23 +0200
-Subject: [PATCH] online-accounts: Fix goa-helper on X11
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The handle_str contains the “x11:” prefix so strtol would return 0.
-We need to pass it the numeric substring.
-
-Fixes: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1651
----
- panels/online-accounts/gnome-control-center-goa-helper.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/panels/online-accounts/gnome-control-center-goa-helper.c b/panels/online-accounts/gnome-control-center-goa-helper.c
-index 56513147e..533609cbc 100644
---- a/panels/online-accounts/gnome-control-center-goa-helper.c
-+++ b/panels/online-accounts/gnome-control-center-goa-helper.c
-@@ -129,7 +129,7 @@ set_external_parent_from_handle (GtkApplication *application,
-           int xid;
- 
-           errno = 0;
--          xid = strtol (handle_str, NULL, 16);
-+          xid = strtol (handle_str + strlen (x11_prefix), NULL, 16);
-           if (errno != 0)
-             {
-               g_warning ("Failed to reference external X11 window, invalid XID %s", handle_str);
--- 
-2.35.1
-
diff --git a/gnome-base/gnome-control-center/gnome-control-center-41.4-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-41.4-r1.ebuild
deleted file mode 100644
index 4d9543777d07..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-41.4-r1.ebuild
+++ /dev/null
@@ -1,175 +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 gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-41.2-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test v4l wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	^^ ( elogind systemd )
-" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86"
-
-# meson.build depends on python unconditionally
-BDEPEND="${PYTHON_DEPS}"
-
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# display panel requires colord and gnome-settings-daemon[colord]
-# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
-# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
-# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
-DEPEND="
-	>=gui-libs/libhandy-1:1=
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= )
-	>=media-sound/pulseaudio-2.0[glib]
-	>=sys-apps/accountsservice-0.6.39
-	>=x11-misc/colord-0.1.34:0=
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=dev-libs/glib-2.56.0:2
-	>=gnome-base/gnome-desktop-3.33.4:3=
-	>=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?]
-	>=gnome-base/gsettings-desktop-schemas-40_alpha
-	dev-libs/libxml2:2
-	>=sys-auth/polkit-0.114
-	>=sys-power/upower-0.99.8:=
-	>=dev-libs/libgudev-232
-	x11-libs/libX11
-	>=x11-libs/libXi-1.2
-	media-libs/libepoxy
-	>=x11-libs/gtk+-3.22.0:3[X,wayland=]
-	cups? (
-		>=net-print/cups-1.7[dbus]
-		>=net-fs/samba-4.0.0[client]
-	)
-	v4l? (
-		>=media-video/cheese-3.28.0 )
-	ibus? ( >=app-i18n/ibus-1.5.2 )
-	networkmanager? (
-		>=net-libs/libnma-1.8.0
-		>=net-misc/networkmanager-1.24.0:=[modemmanager]
-		>=net-misc/modemmanager-0.7.990 )
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:2= )
-	input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
-	kerberos? ( app-crypt/mit-krb5 )
-
-	x11-libs/cairo[glib]
-	>=x11-libs/colord-gtk-0.1.24
-	net-libs/libsoup:2.4
-	media-libs/fontconfig
-	gnome-base/libgtop:2=
-	>=sys-fs/udisks-2.1.8:2
-	app-crypt/libsecret
-	media-libs/gsound
-	>=dev-libs/libpwquality-1.2.2
-"
-# systemd/elogind USE flagged because package manager will potentially try to satisfy a
-# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
-# libgnomekbd needed only for gkbd-keyboard-display tool
-# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${DEPEND}
-	systemd? ( >=sys-apps/systemd-31 )
-	elogind? ( app-admin/openrc-settingsd
-		sys-auth/elogind )
-	x11-themes/adwaita-icon-theme
-	>=gnome-extra/gnome-color-manager-3.1.2
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	>=gnome-base/libgnomekbd-3
-	wayland? ( dev-libs/libinput )
-	!wayland? (
-		>=x11-drivers/xf86-input-libinput-0.19.0
-		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
-"
-# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
-# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
-	networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
-
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.2
-	x11-base/xorg-proto
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep '
-		dev-python/python-dbusmock[${PYTHON_USEDEP}]
-	') )
-"
-
-PATCHES=(
-	# Patches from gnome-40 branch on top of 40.0
-	# Makes some panels and dependencies optional
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	# Fix some absolute paths to be appropriate for Gentoo
-	"${WORKDIR}"/patches/
-)
-
-python_check_deps() {
-	use test || return 0
-	has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	# Mark python tests with shebang executable, so that meson will launch them directly, instead
-	# of via its own python-single-r1 version, which might not match what we get from python_check_deps
-	chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth)
-		$(meson_use v4l cheese)
-		-Dcups=$(usex cups enabled disabled)
-		-Ddocumentation=true # manpage
-		-Dgoa=$(usex gnome-online-accounts enabled disabled)
-		$(meson_use ibus)
-		-Dkerberos=$(usex kerberos enabled disabled)
-		$(meson_use networkmanager network_manager)
-		-Dprivileged_group=wheel
-		-Dsnap=false
-		$(meson_use test tests)
-		$(meson_use debug tracing)
-		$(meson_use input_devices_wacom wacom)
-		#$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
-		# bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
-		-Dmalcontent=false # unpackaged
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-42.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-42.1.ebuild
index 17e5b231ef47..0108ced00471 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-42.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-42.1.ebuild
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	^^ ( elogind systemd )
 " # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86"
 
 # meson.build depends on python unconditionally
 BDEPEND="${PYTHON_DEPS}"
diff --git a/gnome-base/gnome-control-center/gnome-control-center-42.0-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-42.2.ebuild
index 97ebfb3fe3b6..8a2f037685e1 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-42.0-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-42.2.ebuild
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	^^ ( elogind systemd )
 " # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
 
 # meson.build depends on python unconditionally
 BDEPEND="${PYTHON_DEPS}"
@@ -118,9 +118,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PV}-online-accounts-Fix-goa-helper-on-X11.patch
-
-	# Patches from gnome-40 branch on top of 40.0
+	# Patches from gnome-42 branch
 	# Makes some panels and dependencies optional
 	# https://bugzilla.gnome.org/686840, 697478, 700145
 	# Fix some absolute paths to be appropriate for Gentoo
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 37502d08b2bb..a43fab730be1 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,12 +1,8 @@
-AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c0265f34d5d0fd555ae60a519273512021cf4f065db1e22ab72ce9004a914a47d077551b5a12ffbd5e81a9b8cf098a4762a0e461d SHA512 ea76e41aff067281497b98c86b66d8c382124ceead5b18e729342615a50b6aa3401f4d7c5553023b5d78ca0ea02823c7d6026ba9acca862804351269e4107d18
 AUX 42.0-meson-Add-optionality-for-introspection.patch 3275 BLAKE2B f3629eab79b830397646ea855991daf5d61a9bb992262deb452e32a19e1564be20f98dfa49f8b08f6ca6a36b69fe44e46bee16b23533a27d089b77e2ae524a07 SHA512 9982e691e080dfa03c5ee6038b9a3a0e47521272240082d0da1ebf00c75f958d60c5d764ebae580415489e39b18ee77bb0c99587d32b4575ae0495fc88793c83
-AUX 42.0-meson-Fix-build_gtk4-option.patch 4432 BLAKE2B 38d648ca67079db2f552b3af0e76ea928c15e1fc44e5b569992ffd3b469047659e9c681a3933f91d4bf7065c4465a95db8fac2c2891f8bbc8b09d9c239d6057d SHA512 d7f6d3cad1986bcc3d9c5013c870fa2e6d42d3b27648b4375e23dc2cb0a6d53c1a6b085fe2d009566938f4bff68773b1d61784abdf47667f85b01fc485a08e19
-DIST gnome-desktop-41.3.tar.xz 732804 BLAKE2B 40a88ba4454455f85a46676d4b2f37159617f7eae9d0f5e1a27c3f0ed1e44953ae9475e81558b7cce1b6fd8cd8804cd3f452d060d843d4f58a7af8748b4c35fa SHA512 b02d9fe3bfad56993f9ed7225b38b4b0b685c7ad1480a9d9db5f9a6a8e13c16918d87e6a51160ee3101ab8ce24f4c0632ae351e7bb11cc473523e216ee9cf6bf
-DIST gnome-desktop-42.0.tar.xz 743484 BLAKE2B 7c7d5e74fe01e082c8ec1994bb7666f191e0eed4212c8ef6257ebb4c3e3a5fb95c8a0c47f1c8f0864a36faa239251569e67eafa734cba4a181b6774233352357 SHA512 b9d37765d3cc43bb709e1e9b97deb6ef16d2a8e6ef7cc3c577ba465d4856bbfe8774fb7fc6eaae4d88064081aeeea0c0c77fe2b4ef79b4d9af1232c918526b44
 DIST gnome-desktop-42.1.tar.xz 743032 BLAKE2B 1eda3138e50b0ded50ede12179311ab8888ab0837c650f3e6bad600a4327cdba02b3fbf7cf7ff845669075cbb56b69ca600b8b63b4f05dce93b0a71e76cedbd7 SHA512 a084f705aedf2d159da91dc54f38261760a50e51041321e6a69ee0dff499e11f0a440f5a9582a31977b0270c87e3ba7de0f5c9cc182c0631858afa1d9508ecf4
-EBUILD gnome-desktop-41.3.ebuild 1922 BLAKE2B d2d6613309b0adba0b3afba8d8966e368a8ea7fd5c1676ee2f3aaa37a3518af6f861a5aa98ba0611c3ee023901ba5c7838f59eddd1ef43cdee27054dfc94bb7f SHA512 722b7d3f3c6e43c84c7bf37f202263a21021ed0fc3b8275ea1cd207b0d19cb3e7807bbc8eb539a54210a4296468994d677ebdbd1b82023e11514f00ca82c73e4
-EBUILD gnome-desktop-42.0-r300.ebuild 2094 BLAKE2B 15bde2ec3d978dfe8aea8519f7a988480e14e0a4c72e62555be0ed51dc63a5cc659c6b25afdfca0809d59c7b2c0732809ba8c7522143e66b29d0ce8de46f13da SHA512 95b49469f13d3793b745945e7c1a9ffea4b0b5a8cfde63fbb230edaa1d4a0b4de76753c050ea41612bfb58fa5514ca150ac948126ded0cfd343c7bea204d95ab
-EBUILD gnome-desktop-42.0-r400.ebuild 2033 BLAKE2B 61481f5683713a072c0ce771b13bc4975cc538908e57483e4bad79e72f3b12a3c2f23b213602ec2b8d98ee61017b7b7810d01127e4b046bfb0379a4047244ced SHA512 dc2a5ca55a1e0bd61729deb90007aa6f6fa785e792125d8f6f03113a6f874c60cab4e07dff23ee96fc12b877f27bd62fd770edb153eba1f6830315c6e84dd0b9
-EBUILD gnome-desktop-42.1-r300.ebuild 1933 BLAKE2B bd31d5ce6639e07a12a477cda29b4187e0b47e6ee75b4a6154c555373dd7d7f551914fc2f2864e4a4c7527be84f2abba57158385941e49b3c97cc6d062971c79 SHA512 1432bd1e60983bad1c7596090d26cbe7271e4737f6057b69270b8c1d8894f15fec399683786a542bf1ab0de79688a6ed0192f9144be133534b68b610a5f4fc34
-EBUILD gnome-desktop-42.1-r400.ebuild 1883 BLAKE2B c74b72dec53b61ee1116eb807fc54af24f90bc7e7a54bd416d744318c9caeeee8b2e28c970d165bec0dd44c6442d47a42cd300e461bf6cbbf2cb6947a757cb3f SHA512 e3fe0c1eb6ec267b388ce00dad35c6b5e8cc722808fa6a92b0eec11d6c3b8cfb0dc5f7dd365531e8677d2a545413a5bcf4511cd34af2a56b37c3ef9b504c17db
+DIST gnome-desktop-42.2.tar.xz 743268 BLAKE2B 8f8ee5ada3bf8b11f9bd6ddfa9925d50ccc22bb3b02f4cd8caefefe76b162347dbddb5de0d6200768e0bcaf6b60c6c774155dfc3767a827c575c48ddc40380a3 SHA512 6c7d90b539b80e45f729a14dd8bf553abb09f20d16e1a2cda751b81f1e2a52e2dcb98551faab3cd4ad17206300f45c9bc968d160fddab0b71a4933f0adc22e0e
+EBUILD gnome-desktop-42.1-r300.ebuild 1934 BLAKE2B 6920f1ce50aa1edd89676b5be034d01c8d71df6e687dddea1db296064ab63549448ebde729705710ea0a17756855261efbd5c0ee07e733e2c2181d3ba4693b7e SHA512 d16202197817d69c3280f703f287218c8af3e16ecb05a2e165a5018258009a61dfb723c6994272ee2ac67c7220f7584ec176be33d1938a589de062d283eef2d1
+EBUILD gnome-desktop-42.1-r400.ebuild 1894 BLAKE2B 3f52d48e3318f77055131351ad2d32de9c601ee9ef8227663dcc0c2f43e5aa8d3dee3ae911c3cf0efe1bd92c5044cf8de7af0a0ee036053e8de8931e479fc761 SHA512 c321c9fb0da94b23077be2362cca5d219512cf6f590cdc2f80088cc1f20163c3f81d531aff2f159e72fd7f5acb67473a9d76288a7a4a1a1b7c205fe3160300d4
+EBUILD gnome-desktop-42.2-r300.ebuild 1933 BLAKE2B bd31d5ce6639e07a12a477cda29b4187e0b47e6ee75b4a6154c555373dd7d7f551914fc2f2864e4a4c7527be84f2abba57158385941e49b3c97cc6d062971c79 SHA512 1432bd1e60983bad1c7596090d26cbe7271e4737f6057b69270b8c1d8894f15fec399683786a542bf1ab0de79688a6ed0192f9144be133534b68b610a5f4fc34
+EBUILD gnome-desktop-42.2-r400.ebuild 1897 BLAKE2B 61485a67a7b2c9b05bec3f65fe485225e27caa9405e996bd619db93fdb7b222a66f099058dba928bc2166527a0fce29eaed659e081c5ecdeb302371490e83ab6 SHA512 5e9d4528aa996af4d678dca04b0233d285cbe148926362d835b49270d9762638ed51f258728b43db491508cefee3d186f8efc3e2c2dfd9dd97cd9df0646c9648
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch b/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch
deleted file mode 100644
index 7471a3e6a2dc..000000000000
--- a/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 1b8fb6b0fd155975f64b5e2ef03bece96a5e3340 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Wed, 18 Sep 2019 22:28:21 +0300
-Subject: [PATCH] build: Add optionality for introspection
-
----
- libgnome-desktop/meson.build | 2 ++
- meson_options.txt            | 4 ++++
- 2 files changed, 6 insertions(+)
-
-diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
-index c365b448..a7355f31 100644
---- a/libgnome-desktop/meson.build
-+++ b/libgnome-desktop/meson.build
-@@ -96,6 +96,7 @@ libgnome_desktop_dep = declare_dependency(
-   link_with: libgnome_desktop
- )
- 
-+if get_option('introspection')
- gnome.generate_gir(libgnome_desktop,
-   sources: introspection_sources + libgnome_desktop_headers,
-   export_packages: 'gnome-desktop-3.0',
-@@ -107,6 +108,7 @@ gnome.generate_gir(libgnome_desktop,
-   symbol_prefix: 'gnome',
-   install: true
- )
-+endif
- 
- desktop_pc = pkg.generate(
-   libraries: libgnome_desktop,
-diff --git a/meson_options.txt b/meson_options.txt
-index e3402a11..7efe43ce 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -17,6 +17,10 @@ option('debug_tools',
-   type: 'boolean', value: true, description: 'Build debug tools'
- )
- 
-+option('introspection',
-+  type: 'boolean', value: true, description: 'Whether to build introspection files'
-+)
-+
- option('udev',
-   type: 'feature', description: 'Udev support'
- )
--- 
-2.20.1
-
diff --git a/gnome-base/gnome-desktop/files/42.0-meson-Fix-build_gtk4-option.patch b/gnome-base/gnome-desktop/files/42.0-meson-Fix-build_gtk4-option.patch
deleted file mode 100644
index 9b166e23bab8..000000000000
--- a/gnome-base/gnome-desktop/files/42.0-meson-Fix-build_gtk4-option.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-desktop/-/merge_requests/138
-
-From a9ad6e704f9fead5748c2a9697990b01e91b9de0 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sun, 20 Mar 2022 18:07:17 -0700
-Subject: [PATCH 1/2] meson: Fix build_gtk4 option
-
----
- libgnome-desktop/meson.build | 134 +++++++++++++++++------------------
- 1 file changed, 67 insertions(+), 67 deletions(-)
-
-diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
-index e81530ed..a0fb11f8 100644
---- a/libgnome-desktop/meson.build
-+++ b/libgnome-desktop/meson.build
-@@ -86,79 +86,79 @@ libgnome_desktop_base_headers = [
-   'gnome-xkb-info.h',
- ]
- 
--install_headers(libgnome_desktop_base_headers,
--  subdir: 'gnome-desktop-4.0/libgnome-desktop'
--)
-+if get_option('build_gtk4')
-+  install_headers(libgnome_desktop_base_headers,
-+    subdir: 'gnome-desktop-4.0/libgnome-desktop'
-+  )
- 
--base_deps = [
--  gdk_pixbuf_dep,
--  glib_dep,
--  gio_dep,
--  gio_unix_dep,
--  libsystemd_dep,
--  schemas_dep,
--  xkb_config_dep,
--  xkbregistry_dep,
--  iso_codes_dep,
--  udev_dep,
--  seccomp_dep,
--  m_dep,
--  rt_dep,
--]
-+  base_deps = [
-+    gdk_pixbuf_dep,
-+    glib_dep,
-+    gio_dep,
-+    gio_unix_dep,
-+    libsystemd_dep,
-+    schemas_dep,
-+    xkb_config_dep,
-+    xkbregistry_dep,
-+    iso_codes_dep,
-+    udev_dep,
-+    seccomp_dep,
-+    m_dep,
-+    rt_dep,
-+  ]
- 
--libgnome_desktop_base = library('gnome-desktop-4',
--  sources: [
--    libgnome_desktop_base_sources,
--    libgnome_desktop_base_private_sources,
--    dbus_idle_built_sources,
--  ],
--  dependencies: base_deps,
--  soversion: soversion,
--  version: libversion,
--  c_args: libargs,
--  link_args: base_ldflags,
--  install: true,
--  include_directories: [
--    include_directories('.'),
--    include_directories('..'),
--  ],
--)
-+  libgnome_desktop_base = library('gnome-desktop-4',
-+    sources: [
-+      libgnome_desktop_base_sources,
-+      libgnome_desktop_base_private_sources,
-+      dbus_idle_built_sources,
-+    ],
-+    dependencies: base_deps,
-+    soversion: soversion,
-+    version: libversion,
-+    c_args: libargs,
-+    link_args: base_ldflags,
-+    install: true,
-+    include_directories: [
-+      include_directories('.'),
-+      include_directories('..'),
-+    ],
-+  )
- 
--libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
--  sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
--  export_packages: 'gnome-desktop-4',
--  namespace: 'GnomeDesktop',
--  nsversion: '4.0',
--  includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
--  extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
--  identifier_prefix: 'Gnome',
--  symbol_prefix: 'gnome',
--  install: true,
--)
-+  libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
-+    sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
-+    export_packages: 'gnome-desktop-4',
-+    namespace: 'GnomeDesktop',
-+    nsversion: '4.0',
-+    includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
-+    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
-+    identifier_prefix: 'Gnome',
-+    symbol_prefix: 'gnome',
-+    install: true,
-+  )
- 
--pkg.generate(
--  libgnome_desktop_base,
--  requires: ['gsettings-desktop-schemas'],
--  version: meson.project_version(),
--  name: 'gnome-desktop-4',
--  filebase: 'gnome-desktop-4',
--  description: 'Utility library for GNOME desktop components',
--  subdirs: 'gnome-desktop-4.0',
--)
-+  pkg.generate(
-+    libgnome_desktop_base,
-+    requires: ['gsettings-desktop-schemas'],
-+    version: meson.project_version(),
-+    name: 'gnome-desktop-4',
-+    filebase: 'gnome-desktop-4',
-+    description: 'Utility library for GNOME desktop components',
-+    subdirs: 'gnome-desktop-4.0',
-+  )
- 
--libgnome_desktop_base_dep = declare_dependency(
--  sources: [
--    libgnome_desktop_base_gir,
--  ],
--  dependencies: base_deps,
--  link_with: libgnome_desktop_base,
--  include_directories: [
--    include_directories('.'),
--    include_directories('..'),
--  ],
--)
-+  libgnome_desktop_base_dep = declare_dependency(
-+    sources: [
-+      libgnome_desktop_base_gir,
-+    ],
-+    dependencies: base_deps,
-+    link_with: libgnome_desktop_base,
-+    include_directories: [
-+      include_directories('.'),
-+      include_directories('..'),
-+    ],
-+  )
- 
--if gtk4_dep.found()
-   subdir('gnome-bg')
-   subdir('gnome-rr')
- endif
--- 
-2.34.1
-
diff --git a/gnome-base/gnome-desktop/gnome-desktop-41.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-41.3.ebuild
deleted file mode 100644
index 7aeb9c59632c..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-41.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org meson xdg
-
-DESCRIPTION="Library with common API for various GNOME modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
-SLOT="3/19" # subslot = libgnome-desktop-3 soname version
-IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
-	>=dev-libs/glib-2.53.0:2
-	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
-	x11-misc/xkeyboard-config
-	x11-libs/libxkbcommon
-	app-text/iso-codes
-	systemd? ( sys-apps/systemd:= )
-	udev? ( virtual/libudev:= )
-	seccomp? ( sys-libs/libseccomp )
-
-	x11-libs/cairo:=
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${COMMON_DEPEND}
-	media-libs/fontconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	seccomp? ( sys-apps/bubblewrap )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
-
-PATCHES=(
-	"${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
-)
-
-src_prepare() {
-	# Don't build manual test programs that will never get run
-	sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgnome_distributor=Gentoo
-		-Ddate_in_gnome_version=true
-		-Ddesktop_docs=true
-		$(meson_use debug debug_tools)
-		$(meson_use introspection)
-		$(meson_feature udev)
-		$(meson_feature systemd)
-		$(meson_use gtk-doc gtk_doc)
-		-Dinstalled_tests=false
-	)
-	meson_src_configure
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild
index 1c3c7ed2fd59..213db2dcf6c5 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="3/19" # subslot = libgnome-desktop-3 soname version
 IUSE="debug +introspection seccomp systemd udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
@@ -74,7 +74,7 @@ src_install() {
 	meson_src_install
 
 	rm -r \
-		${ED}/usr/share/gnome/gnome-version.xml \
-		${ED}/usr/share/locale \
+		"${ED}"/usr/share/gnome/gnome-version.xml \
+		"${ED}"/usr/share/locale \
 		|| die
 }
diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.1-r400.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.1-r400.ebuild
index 8367ef9c9ff2..ce09a049440c 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-42.1-r400.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-42.1-r400.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="4/1" # subslot = libgnome-desktop-4 soname version
 IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.0-r300.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.2-r300.ebuild
index 16f7cb36d9a1..1c3c7ed2fd59 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-42.0-r300.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-42.2-r300.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-
 
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
+	>=x11-libs/gtk+-3.3.6:3[introspection?]
 	>=dev-libs/glib-2.53.0:2
 	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
 	x11-misc/xkeyboard-config
@@ -38,14 +38,11 @@ BDEPEND="
 	dev-util/gdbus-codegen
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
-	x11-base/xorg-proto
 	virtual/pkgconfig
 "
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
 
 PATCHES=(
-	"${FILESDIR}"/${PV}-meson-Fix-build_gtk4-option.patch
-	"${FILESDIR}"/${PV}-meson-Add-optionality-for-introspection.patch
+	"${FILESDIR}"/42.0-meson-Add-optionality-for-introspection.patch
 )
 
 src_prepare() {
diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.0-r400.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.2-r400.ebuild
index f6e75723a277..96fb0604f50c 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-42.0-r400.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-42.2-r400.ebuild
@@ -10,11 +10,11 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="4/1" # subslot = libgnome-desktop-4 soname version
 IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
-	>=gui-libs/gtk-4.4.0:4[X,introspection?]
+	>=gui-libs/gtk-4.4.0:4[introspection?]
 	>=dev-libs/glib-2.53.0:2
 	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
 	x11-misc/xkeyboard-config
@@ -40,14 +40,11 @@ BDEPEND="
 	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
-	x11-base/xorg-proto
 	virtual/pkgconfig
 "
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
 
 PATCHES=(
-	"${FILESDIR}"/${PV}-meson-Fix-build_gtk4-option.patch
-	"${FILESDIR}"/${PV}-meson-Add-optionality-for-introspection.patch
+	"${FILESDIR}"/42.0-meson-Add-optionality-for-introspection.patch
 )
 
 src_prepare() {
diff --git a/gnome-base/gnome-flashback/Manifest b/gnome-base/gnome-flashback/Manifest
index f6b5db14ea65..fb821dfc5272 100644
--- a/gnome-base/gnome-flashback/Manifest
+++ b/gnome-base/gnome-flashback/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-flashback-3.42.1.tar.xz 867508 BLAKE2B ddd98e14dede69a43db24acdb8358ad51de90d311a8738a14ad403262f3b0790c4689b2c49d51706d8645c76a70e5d60dbbd6a82acea55d0898761ac0a479d25 SHA512 bbbc9ad419c4bedd772a41d88216d41502a657e1a02dbc32a80c7dd8984e583bd731e7e90932c0537b0e96d511244fec400e76308e9d8b57eb24491fa3334d4b
 DIST gnome-flashback-3.44.0.tar.xz 884008 BLAKE2B d9815634216537f59aa3fb7c50c4ddfcb295a85c2548bd3f5669a1924cf9a3f46fba05a4d7a1cf265f514d5f0f1611992f8b120e76771140bc4fc35908e5c688 SHA512 7a39baa5e37cd01dc6d3b5fff3ef4c99240106f9e13c68c2ce1db19c3f9a672d4c22602e3ca3c4cff28226c3bd26525500bf002fb598c1af362ce15d7a92b55e
-EBUILD gnome-flashback-3.42.1.ebuild 2586 BLAKE2B ecd77b8d792d3ad3f32f30650a92592b86971b957c26f4e725532efaf52a896e0ec3dfeedc696c692e7d5dcdb02730be493559077e5e93c897a464ea94aadb96 SHA512 56d9ba1f84cd7e2d67f0ea95b92302d23f3149b94eca89272df806149b98fb79fc3cd927a97c44f63a5779dd44cbed6cfe047d04e9c911a12f3de1fe8cf5906d
 EBUILD gnome-flashback-3.44.0-r1.ebuild 2589 BLAKE2B b2e195c27f49b70bfe541b9e14b868e6aca6608bf6b7e0be5d5826f678feff24b096b2ec6864367656785b412a04a303d75af5ecf7f8e5abd2af923f514c7180 SHA512 a40c80376f19452dba585c7789d7accc70027686262df0a1e3891edcc6c9a8fccabccce360105772f27ef636127ffcd5f0c4f5d05b6932adf287297733dfa096
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.42.1.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.42.1.ebuild
deleted file mode 100644
index 704dcdeb4fe7..000000000000
--- a/gnome-base/gnome-flashback/gnome-flashback-3.42.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2 toolchain-funcs
-
-DESCRIPTION="GNOME Flashback session"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-flashback/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="elogind systemd"
-REQUIRED_USE="^^ ( elogind systemd )"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	>=x11-libs/gdk-pixbuf-2.32.2:2
-	>=x11-libs/gtk+-3.22.0:3[X]
-	>=gnome-base/gnome-desktop-3.12.0:3=
-	>=gnome-base/gnome-panel-3.35.2
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=dev-libs/glib-2.67.3:2
-	>=gnome-base/gsettings-desktop-schemas-3.31.0
-	>=sys-auth/polkit-0.97
-	>=app-i18n/ibus-1.5.2
-	>=sys-power/upower-0.99.0:=
-	>=x11-libs/libXrandr-1.5.0
-	>=x11-libs/libXxf86vm-1.1.4
-	x11-libs/libxcb
-	x11-libs/libX11
-	gnome-base/gdm
-	elogind? ( >=sys-auth/elogind-230 )
-	systemd? ( >=sys-apps/systemd-230:= )
-	net-wireless/gnome-bluetooth
-	x11-libs/libXext
-	>=x11-libs/libXi-1.6.0
-	x11-libs/pango
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	x11-libs/libXfixes
-	media-sound/pulseaudio[glib]
-	sys-libs/pam
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-" # autoconf-archive for eautoreconf
-RDEPEND="${RDEPEND}
-	x11-wm/metacity
-	gnome-base/gnome-panel
-	gnome-base/gnome-settings-daemon
-"
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		--without-compiz-session
-		$(use_enable systemd systemd-session)
-	)
-
-	# Below elogind DESKTOP_* and SCREENSAVER_* pkg-config calls need to match up with
-	# what upstream has each version (libsystemd replaced with libelogind). Explicit
-	# per-version die to force a manual recheck. Only update the explicit version if the
-	# "PKG_CHECK_MODULES([MENU/SCREENSAVER], ...)" blocks did not change; otherwise adjust
-	# elogind conditional block below accordingly first.
-	if ver_test ${PV} -ne 3.42.1; then
-		die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
-	fi
-
-	if use elogind; then
-		local pkgconfig="$(tc-getPKG_CONFIG)"
-		myconf+=(
-			DESKTOP_CFLAGS="$(${pkgconfig} --cflags glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11)"
-			DESKTOP_LIBS="$(${pkgconfig} --libs glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11)"
-			SCREENSAVER_CFLAGS="$(${pkgconfig} --cflags gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm)"
-			SCREENSAVER_LIBS="$(${pkgconfig} --libs gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm)"
-		)
-	fi
-
-	gnome2_src_configure "${myconf[@]}"
-}
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 1290b98b79b4..417f36cc7844 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-keyring-40.0.tar.xz 1333440 BLAKE2B 4ef74d982d85766e8d7f28b97ddf295ca546f48b980518be7e586bda607344bdb72c124f92b5c34310aeb2f3903cb39092ae7ca6e1b3baf34ab6a9c58d26aeef SHA512 c9cb0dca8c46ee712200c96c20663a8d5cd39f07801a04e1afca26550a04af6cb369b53a1f29638bf4c8a29f418a69f565befcf4d08df5b0d30fb31894ecf95e
-EBUILD gnome-keyring-40.0-r1.ebuild 2156 BLAKE2B 0c9f8d110970eb7163c4823871c19ad2cf05417d7791e8b167b5ff92b9a2c88ecf443216c91e52c9c59c08e18bd095a8ff372d74b598455721eedc860a4e7289 SHA512 a152063a49ddea54301a0dd5218f6461dbc11e8cd3eb398686d1d8aefb0fb879172f8f388d3a85b4f6de04c79c989af3202f7b8903830c68463eff8af4b3a1b7
+DIST gnome-keyring-42.1.tar.xz 1346284 BLAKE2B ff6093cc16c649cda1e6cc2848c2198a502d8aa20a56f0a4dca00550e99f18820028427a7ec3979b6871648a7931da19fced3210558d5ca3de47983b7c94452d SHA512 560dc409c21768dcbdf42151986a5bbbfb9a092d2c36295cf76bd603cdf9650fa80670631c7fb8b3e1822bed6a1f55c34b2170a1419ce45fbe8ca08c7eaf3a57
+EBUILD gnome-keyring-40.0-r1.ebuild 2163 BLAKE2B 485eba5ca1fb6af6c8df505277098f8c1b8ba385424f45a1810a2207697ec3ccba6d911a26a24dda5282807b4e5a35d3165aac310d5782755b373f62ec79753c SHA512 533a1d220e18f940c9558ac88cff1377826ecdb197b3104d60a5df2ae546c4d36ac40861f8615bb52f98171773ae8a11c918e5987ba6f0a0b750591c112ebc69
+EBUILD gnome-keyring-42.1.ebuild 2202 BLAKE2B 24264ad60d65562c4fa32111745d5837a27822fe706260a3aa77394bbfdd7c76bf5ef29e8a7ccde94fd59aba92c5b46c19e94ca579a57134a9de0516715b4a59 SHA512 7f06a9940e73557cddb6ef7eb5028131fc9e28f3c452bede5ed612057fcb356f47f15f5a7049ad8126e1a25d2f5b106127b975eed3510d8ff8bffa6e81b7c4dc
 MISC metadata.xml 884 BLAKE2B 7453133f82b652fce07202db1a10c488a32355dd9398847e3d2f7d1cc62ad466c25febb6713318ba6d77d006e3f87b15c593c5020d1f187e2d7704a4c676dade SHA512 d5419c6a5b09fc57cb877210e59f82717374ea5ca7914fe305b2f3625e190c4438f76b24503698dffd00633ba17bcd70a0068765284ccfab730c5b7e8c1b768d
diff --git a/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild
index 5cb99f246cd5..a039095d65fe 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="pam selinux +ssh-agent test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 # Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
 RDEPEND="
diff --git a/gnome-base/gnome-keyring/gnome-keyring-42.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-42.1.ebuild
new file mode 100644
index 000000000000..033f5f3ef7e5
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-42.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome2 pam python-any-r1 virtualx
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="pam selinux +ssh-agent systemd test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
+RDEPEND="
+	>=app-crypt/gcr-3.27.90:=[gtk]
+	>=app-crypt/gnupg-2.0.28:=
+	>=app-eselect/eselect-pinentry-0.5
+	app-misc/ca-certificates
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/libgcrypt-1.2.2:0=
+	pam? ( sys-libs/pam )
+	selinux? ( sec-policy/selinux-gnome )
+	ssh-agent? ( net-misc/openssh )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=app-eselect/eselect-pinentry-0.5
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Disable stupid CFLAGS with debug enabled
+	sed -e 's/CFLAGS="$CFLAGS -g"//' \
+		-e 's/CFLAGS="$CFLAGS -O0"//' \
+		-i configure.ac configure || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--without-libcap-ng \
+		$(use_enable pam) \
+		$(use_with pam pam-dir $(getpam_mod_dir)) \
+		$(use_enable selinux) \
+		$(use_enable ssh-agent) \
+		$(use_with systemd) \
+		--enable-doc
+}
+
+src_test() {
+	# Needs dbus-run-session to not get:
+	# ERROR: test-dbus-search process failed: -6
+	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
+	GSETTINGS_SCHEMA_DIR="${S}/schema" virtx dbus-run-session emake check
+}
+
+pkg_postinst() {
+	# cap_ipc_lock only needed if building --with-libcap-ng, but that breaks with glib-2.70
+	# Never install as suid root, this breaks dbus activation, see bug #513870
+	gnome2_pkg_postinst
+
+	if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then
+		ewarn "Please select pinentry-gnome3 as default pinentry provider:"
+		ewarn " # eselect pinentry set pinentry-gnome3"
+	fi
+}
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index 02460d707495..f31c74f4b8f4 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-menus-3.36.0.tar.xz 502324 BLAKE2B 8bf1b0d4ac30a1e7f4c4e1b14ad3e2f718e974ec58fe8e8ab3c0d030c1cd1841a9cceb86d8909c0d0dcf128f19aecdd64350840f0cb25ed7cacdc2c95786f118 SHA512 e830e66639c2b6aebecf572188208d33b1515270e69af3f2c6f7a640d305a7b9c2bce10e5f520b3da1dea681b194fd14c551468ea5747aa333e649b5c46774e4
-EBUILD gnome-menus-3.36.0.ebuild 904 BLAKE2B 785bda1af4a9d4792f681b24aff4db204bb1fb2a495fa682baaca7d96d4a41e7294de5e5e9ef6ae732a4c86202683eaa2bfb8d62d05b544cfa0a1297b4180237 SHA512 d357ca7c149ff095d0cc586093edc9e693d70d74511bc248bd45b556a9754576a13ef72a2399057e5f602eb6b3f5703bdfdf9cc813de3528a9898305559705bb
+EBUILD gnome-menus-3.36.0-r1.ebuild 890 BLAKE2B b71ca66bc3863a963008d42cefc6b0d7f8061d5a3b43293a9740ee75309854b5a11ad251d32cdfdd187c993f86ad70519803ec1a7f11ce1d15abfcce0d4ac008 SHA512 7219284c8c9faedbf688b8e8c41bd4b899c85165abcc3d2e602fcef7c1613df7c02ec65ddc10efe32eac444b0d136fcd5db3895afe39bf338edd355efecf2816
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild b/gnome-base/gnome-menus/gnome-menus-3.36.0-r1.ebuild
index f22e4d48d07f..9794b165e3c2 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.36.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit gnome2
 
@@ -11,7 +11,6 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-menus"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="3"
 KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
 IUSE="+introspection test"
 RESTRICT="!test? ( test )"
 
@@ -20,17 +19,17 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 "
 DEPEND="${RDEPEND}
+	test? ( dev-libs/gjs )
+"
+BDEPEND="
 	>=sys-devel/gettext-0.19.4
 	virtual/pkgconfig
-	test? ( dev-libs/gjs )
 "
 
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
 
 src_configure() {
 	# Do NOT compile with --disable-debug/--enable-debug=no
 	# It disables api usage checks
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--disable-static
+	gnome2_src_configure $(use_enable introspection)
 }
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index e0faf64a589a..0d548c35fb1a 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-panel-3.42.0.tar.xz 2927280 BLAKE2B ec0490115d3d1e728f7b6dc85b915a8390148e55c0b9342ee1125c1bceb34cc4721d350e0bac01a5c55d5eede885938711a2b234eb3e28ba59b87feceee3b41c SHA512 834b5ed58f3444bddbf59caeb42740ee1fbd2bcea9914b69f9c14baa39cd8105d4e822f7e408a605ced3d6c4a69eb76a97c4e069b6466c88b2db7d7afed7540c
 DIST gnome-panel-3.44.0.tar.xz 2852688 BLAKE2B 2d31d9456cb94f5f7d4a7f02b1be7da901f79b32a098877d7b778570b67c7f9be42105f5dbcf0ee6eacdf5359349c31140677b87eedbe9c1516f63104be668d1 SHA512 b3300f6943c970b9a2ea27b9459ab82e634226372006b7748551e6c8c24897c9df4ab2bc5528eae6758d9cd431cb2428465ef30fdcc012ddac7c69cd4f43f966
-EBUILD gnome-panel-3.42.0.ebuild 2058 BLAKE2B 04bc13777efb3452fd7844dde84b4de9c1bd79808f4aabaff7fafb5f998ad634491294a8dd9fb0d751dddd3aabc965950e720084a278e8f366244eda93341bc0 SHA512 959dd978579e20469bf5ddbbece6b56c7216c97b355e3f94efaab24123ec3972f8105a9f5de385012cf3e4f0716ea389a95c31c405e5cb08d9f956d1a19ae475
 EBUILD gnome-panel-3.44.0.ebuild 2060 BLAKE2B 9291225cbe64b01795e8e539e4ee5822c401c84a1cb7477fdce0c21c077160166c12770723b7bce17e8c13bc0fc62a039b3f518bd78bba61622590e868aeda43 SHA512 bdae8fe08469f9ec082f45d0cf6a9de5526eb606347352b776ad6ff76bd1b40ac6184a646339a508bf4f5605f46e5a2ac9431aba88e0602dabd326702a4f0cd2
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gnome-panel/gnome-panel-3.42.0.ebuild b/gnome-base/gnome-panel/gnome-panel-3.42.0.ebuild
deleted file mode 100644
index 5ae488ada9d7..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-3.42.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2 toolchain-funcs
-
-DESCRIPTION="The GNOME Flashback Panel"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-panel/"
-
-LICENSE="GPL-2+ FDL-1.1 LGPL-2.1+"
-SLOT="0"
-IUSE="eds elogind systemd"
-REQUIRED_USE="^^ ( elogind systemd )"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	>=gnome-base/gnome-desktop-2.91.0:3=
-	>=x11-libs/gdk-pixbuf-2.26.0:2
-	>=x11-libs/pango-1.15.4
-	>=dev-libs/glib-2.67.1:2
-	>=x11-libs/gtk+-3.22.0:3[X]
-	>=x11-libs/libwnck-40.0:3
-	>=gnome-base/gnome-menus-3.7.90:3
-	eds? ( >=gnome-extra/evolution-data-server-3.33.2:= )
-	elogind? ( >=sys-auth/elogind-230 )
-	systemd? ( >=sys-apps/systemd-230:= )
-	>=x11-libs/cairo-1.0.0[X,glib]
-	>=dev-libs/libgweather-40.0:2=
-	>=gnome-base/dconf-0.13.4
-	>=x11-libs/libXrandr-1.3.0
-	gnome-base/gdm
-	x11-libs/libX11
-	x11-libs/libXi
-	sys-auth/polkit
-	x11-libs/libXi
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-" # yelp-tools and autoconf-archive for eautoreconf
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		$(use_enable eds)
-	)
-
-	# Below elogind MENU_* pkg-config calls need to match up with what upstream has
-	# each version (libsystemd replaced with libelogind). Explicit per-version die
-	# to force a manual recheck. Only update the explicit version if the
-	# "PKG_CHECK_MODULES([MENU], ...)" block did not change; otherwise adjust
-	# elogind conditional block below accordingly first.
-	if ver_test ${PV} -ne 3.42.0; then
-		die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
-	fi
-
-	if use elogind; then
-		local pkgconfig="$(tc-getPKG_CONFIG)"
-		myconf+=(
-			MENU_CFLAGS="$(${pkgconfig} --cflags gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
-			MENU_LIBS="$(${pkgconfig} --libs gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
-		)
-	fi
-
-	gnome2_src_configure "${myconf[@]}"
-}
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 5d1ffb3fa49a..3c063d5c989a 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -4,8 +4,6 @@ AUX 90-xcursor-theme-gnome 384 BLAKE2B 985ea5b7de4d51b46625c21b803c5d225ac598b81
 AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc52fe128b35eb3f9e8f0bf3884f0c444ab2da88eb6ba12d9a852e8a058f4abdcf050dc68c SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6
 AUX defaults.list-r5 19379 BLAKE2B 9299c535bcb3ce6f291ba66dfe655f7e793d554f5fd7a5df5e8db665e43372f8c08a5ea8480e63e318befc5b2e56e4b027ca873947972aa2b19d14ba85f0ec3e SHA512 edee1126e11c3b49ebcea1e1a6929d55a28d09b6c382666d6d6a32271a4cf22af23927f7a5e15ecbd4a4cdaa41ac2f1ffc09350f4e48257e2e5e29ade08635ac
 AUX gnome-session-3.38.0-meson-Support-elogind.patch 2808 BLAKE2B da7ad139fe118edc4c53570acc5e56d59e3073caae7941c54b11c59208675eaa148eb03d437d0edfa0f0d024880b77bc60ba65140422f25319ac132299dfe972 SHA512 2a57894b95662ca4488f95110943076a82ecbe7f3bb8ed4d95e2c8082276839f4b1a7ecc20915557378e73e1947df856e4ff57d9d5b9ae32a9673f2cc3b2fbc2
-DIST gnome-session-41.3.tar.xz 483396 BLAKE2B b5672868459b362452f62e6b543243df536a2edeaaa75dae09c5dedc9574fa58f6024aea5e0853361ae46cff6dcbfd257e6bc0da7ddfb028c3b0ae58d8ead63d SHA512 a75c038639301ccd1f0abf83f944890f74986e94dc32f45c97c1872ddc09bcebbb94116f7f865b1d9fa40a81133ec14fbfb75d585061750d9809af4abba3aa9a
 DIST gnome-session-42.0.tar.xz 485616 BLAKE2B 0e77ad7fa2403c6cf22d087508d98281900d2f0e83ddbc8e25e6c0905398e04a893049ce90c79aebeddfeaafdcc16d7913c546294d92e488725fe4ec4e751928 SHA512 3d340700958b5800039e3009618709add2cdbaecb58344d9d2f93e4e761a737ef003091c380c68f95386dbb078b3d12f70732f0022611ab4a10e1c1eb988b4fa
-EBUILD gnome-session-41.3.ebuild 3462 BLAKE2B 2202d8a6e5dee7aa3559625101a7a03f0902b688e1ccdd496a267121af8b9ad4fd13c1b189d5458950cf37cbd4c436f5bfc732ca4444fd7a310a9994084dbc6d SHA512 06997a93a0859ab1d4b39a8ffc4ba8c065f4c9da41736efc7640d8f922bf93ab4375fa97cf2051c15455be2333e8ff8832500d548386e38b502ea7b2a5440c06
-EBUILD gnome-session-42.0.ebuild 3481 BLAKE2B db0d6d738d9fe6ef88d7362ff41bb9c5313d5805efab8902ba366ea1ef7047573ef1c2702556bc6adcd5425b3c8fc9c299b125cffccf18ba78b918d695925257 SHA512 3af3a0d0fddbe48b12d1ab564d4e655c27887b06d80f74b252124b5f0960a04fbf7088a143525fe3942f52b9279910aecfda4d901856b9bfab9e3673489c6cc1
+EBUILD gnome-session-42.0.ebuild 3478 BLAKE2B 9b075e93943ac6fa706ffbae578c1b7b18c256f5fe6f94f85cd38ffc888dffd13e8fcfa2ec0d67d8b581b0abe415a389bd388f590b73636d43f1075e4818676c SHA512 eafc83a739ee5331fd3916d40f2036cac287b48ce3c95eed2c919b0b61bec80c38e9c2e916cc87f0dd53c31aed4771da22273ce22f5fc562691750503783425c
 MISC metadata.xml 349 BLAKE2B 675e33de85c98218f36cb44ac7e756e310530782ea6ef1f9e40a08e0ffaea810aaac0a72176a299c13192f92f03938fea5132b9726bce0fc6f50e1b1e42aba07 SHA512 c174185512a6df3648511062dfbeca054184f2357df8fd468553cb87421b72b876fe933161df738a8fa21f0637ad65963747ab761f2ada398061616ffb6f0f8a
diff --git a/gnome-base/gnome-session/gnome-session-41.3.ebuild b/gnome-base/gnome-session/gnome-session-41.3.ebuild
deleted file mode 100644
index e4ba03bb2260..000000000000
--- a/gnome-base/gnome-session/gnome-session-41.3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc elogind systemd"
-# There is a null backend available, thus ?? not ^^
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	>=dev-libs/glib-2.46.0:2
-	>=x11-libs/gtk+-3.22.0:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=gnome-base/gnome-desktop-3.34.2:3=
-	>=dev-libs/json-glib-0.10
-	media-libs/mesa[egl(+),gles2,X(+)]
-	media-libs/libepoxy
-	x11-libs/libXcomposite
-
-	systemd? ( >=sys-apps/systemd-242:0= )
-	elogind? ( >=sys-auth/elogind-239.4 )
-"
-
-# Pure-runtime deps from the session files should *NOT* be added here.
-# >=gnome-settings-daemon-3.35.91 for UsbProtection required component.
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# sys-apps/dbus[X] is needed for session management.
-# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
-RDEPEND="${DEPEND}
-	>=gnome-base/gnome-settings-daemon-3.35.91
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	sys-apps/dbus[X]
-
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-"
-BDEPEND="
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	x11-libs/xtrans
-	virtual/pkgconfig
-	doc? ( app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.38.0-meson-Support-elogind.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	# Install USE=doc in ${PF} if enabled
-	sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddeprecation_flags=false
-		$(meson_use elogind)
-		-Dsession_selector=true # gnome-custom-session
-		$(meson_use systemd)
-		-Dsystemd_session=$(usex systemd default disable)
-		$(meson_use systemd systemd_journal)
-		$(meson_use doc docbook)
-		-Dconsolekit=false
-		-Dman=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome"
-
-	newmenu "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
-	# This should be done here as discussed in bug #270852
-	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-
-	# Set XCURSOR_THEME from current dconf setting instead of installing
-	# default cursor symlink globally and affecting other DEs (bug #543488)
-	# https://bugzilla.gnome.org/show_bug.cgi?id=711703
-	newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
-		ewarn "If you use a custom .xinitrc for your X session,"
-		ewarn "make sure that the commands in the xinitrc.d scripts are run."
-	fi
-
-	if ! use systemd && ! use elogind; then
-		ewarn "You are building without systemd or elogind support."
-		ewarn "gnome-session won't be able to correctly track and manage your session."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-session/gnome-session-42.0.ebuild b/gnome-base/gnome-session/gnome-session-42.0.ebuild
index 7452977b4652..3e7aedbe1b17 100644
--- a/gnome-base/gnome-session/gnome-session-42.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-42.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc elogind systemd"
 # There is a null backend available, thus ?? not ^^
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index fc02dd9aed01..034f22360c48 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,11 +1,9 @@
 AUX 42.1-build-Make-wacom-optional-and-controllable-via-meson.patch 1759 BLAKE2B e734dfb341143f3f246d268ff479a528fa09d6c5e496611e06e4ffea914098349eab2b2c5a4a55e8b47e5032b68bf6b929b76a1aa899402953cdcc1d3cf0589e SHA512 faffde0cd940ac6a8dabdab09ea38bd126e11822e75df5adf1a0bb3b055135a8c52abbb6ecb4d71476899ec0c5d8a78ba0075cb84cfebafe6c3aa5310dfca308
 AUX gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch 4505 BLAKE2B a61199b8da339dbe9bbe7e8941a56958f5a69fafeb95c6f7027c483e35b193854560ad12f2df45dd8374db1abcefd9bfb8dae5b5381be3215755f907a73726ec SHA512 468a73b69f441886d1ce5e0e5f263ea695170a3610f6124100e3eaed1d8dd62c3439193461620d6f8b18c81d2066163ff2c1839194ebcfeec424868163f46997
 AUX gnome-settings-daemon-3.38.1-build-Allow-NM-optional-on-Linux.patch 694 BLAKE2B e4f32a376c2b1c55a396504e98c8a69d512bb9161a854482aa877023a2761e59d3fc682d724398ffb53bc138b010c33276071359d42ac19bcac2d9af87d42eef SHA512 618ad312b54709d0f95e5d881c2896c156246ae41eee1925f76b0a398b7ce6815a7466f8587f2291b07f7a34d1a3e1afb7df33823d9b52ebe8ad46a3f5f1e84d
-AUX gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch 3096 BLAKE2B 44587b5a73c5c1a622a8e5a422f03da414856e79edce30056f56fe93a7dcea0ca5a84be737de7fe723f023bb65714d589f60819667432109a212fc03ec4c7b68 SHA512 5ebfd528f7c446c02bf2c4160b91600e7dc27a3f6c17fec071ab9a72c6e4fffc3ba81427bdf7ba10d19cb5059238ec798ab136711018bd3269bbd658ed1c0632
-AUX gnome-settings-daemon-41.0-meson-0.61-build.patch 843 BLAKE2B 0f922f7f35e6801795508d5cabfb388e091c436f97d4745eb93fa5f0ea71d53f73c341315f65d4af1855bbef08555201fd38cc01e6e2fcf32d997fd0f1e2dae8 SHA512 2eda9c6e9a2c5cd82dc16a95b8f8043db47f996b27f3c2d3d30b56476d5f5cd8fb125e31ea622d0efabdeb76d769050e33bbd41d97376fc024ab36919d5ac9c2
 AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb15e998de9f5fddc956dab862552ecc3734083391f124ef577dd2efb70e29efd230511cca83536dcd8c32118ecebcfe52b2927d6f0094540ec73a6ae23 SHA512 9c4b1e1b63b1a6d97eed962969704accca2fc53763a4b7806e2a3e4ff49ecc7d4a0d7f8253ff2e33d83e766908d852721ffa33f363aed7d04c20002bfdee173b
-DIST gnome-settings-daemon-41.0.tar.xz 1477876 BLAKE2B f17005b03cbee142434f0805e8f590d6d9edad0f09b3226bb40ab7e312ee13bcd46c211efb140303d4a351d8818238a28bd9aa3fe760fb617fb006e97eebde61 SHA512 2c6848a749f84fd0c3a9ade6f4a83ae3ff7464da429b2d73030c9dcbd278b070c40475c678c819e31464941f2bd38d81f11b96f24d0d1fb05271267c3a1ecc2a
 DIST gnome-settings-daemon-42.1.tar.xz 1481432 BLAKE2B d045b2e2a17c6c54f0014db03e1b2d645086d907383b849de82f972af39463acf06ab1207817f171fd3b7a33b60303d058f04495158bb49aab7899da740f732c SHA512 20e87fc2318d77af016ec071cc6070f43ac42eaaf60a1f9bdb4278f59e038268e0a37759f0ab31068d8701b9dc64d142c0a875f0eeaa700ad47e0dbca3b9d141
-EBUILD gnome-settings-daemon-41.0.ebuild 3954 BLAKE2B a1e545560d68d18ed28bf025197b2998756ef08219727acd547e652dfed4573961307741eac8cb3a7021c9edd7adcf18bd281737e8330195457705f4d051fd02 SHA512 b8ef84e4dc1294b9dd4c9e1a0dc24b6406292e78b3e7276c9d407933aeb6d844ed8e67a3ff734e2df1118f75954aa34c3a324e9462e685b60ee44cd0f6571103
-EBUILD gnome-settings-daemon-42.1.ebuild 3910 BLAKE2B 777dcb7e34c39976e3cddfe9ca4e4f5faf22d638c668f7a5af3ebe9c2c44c894524fb61efc0b629163c96adb64189f6314eb31b759b03f62d89e215321958014 SHA512 3c09129d05c6437decf691b07252af19231b3bd9a503b24629e4085b4a398a0a9a2b01822925a80234bb91b0d1cd9593fbec67c68faa457760be70d9a044f74f
+DIST gnome-settings-daemon-42.2.tar.xz 1483864 BLAKE2B c2051f129e66df8ca55eb72b0c3a037275c89d3c519fe01822aa4ad2309af9a27e840f4f797a8ecac8e0767d8e7894ffe9c5942840b0ca57536325e3cbe12617 SHA512 66f1e766a7d1c36d4609c9505ba5d99516505ecfc5123483a3cbc6189d21cce23abf26da067bf9c05c3c25bc96d4568a8b07477f0722b0cb9442085f6d886e5c
+EBUILD gnome-settings-daemon-42.1.ebuild 3907 BLAKE2B 17b1f98a007a8f0fc2963525bc7c9c13732c00b6ce698d17bde31a8791b45ff2a2ae4fb381d3f91f8ef3736878d4427e3e5659a2eb7b045703fdaec7842a92c2 SHA512 ebf63538d7317c8bb81a0191df08d3902033402154b49fc54c4633be3e6e931a08191b09a83c2aae77e9e6c479cd9717fcd41e4c3a974a46e844199ca32040d1
+EBUILD gnome-settings-daemon-42.2.ebuild 3923 BLAKE2B a6518745a4f0b9d29909cf22f1f7b3f539fe0e1fd83038322ff9000ee3db5012c772dbbfce745a800095228a785868c907312b35bc53760b57b413130a04b674 SHA512 ea4043e1ca81e92076d7a54465f9286ae26fddf458d98bab5eaffbe63f5ba52249af7babd44e3c7d9180e2ddba4685bb4065d423710103ee7f4fc012202da3ab
 MISC metadata.xml 547 BLAKE2B ef7c1ef4b899bd7ba6f1d05b725a5c2205e949d03d41ae4922559e740fd94ecf767c25da34a9a45a4da796e336133ed250f675a525fec9db5fb53c4c7df35dd4 SHA512 ddc99a174f19c7c949cee4d130082572bcf71dc9c50d637cd94ea0f3609b9d032ff603552c2b077245cadc6cf03f8726cf81efe89fbf2e8b3e5293dcc572005c
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch
deleted file mode 100644
index b48007d29848..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 0cc1c2f5f5d12169acbb965a21b5d9f6fb4a0767 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Thu, 14 Mar 2019 09:43:00 +0200
-Subject: [PATCH 1/3] build: Make colord and wacom optional and controllable
- via meson_options
-
----
- meson.build         | 10 ++++++++--
- meson_options.txt   |  2 ++
- plugins/meson.build |  4 ++++
- 3 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 7dbee64b..dce9bfa1 100644
---- a/meson.build
-+++ b/meson.build
-@@ -142,6 +142,12 @@ if host_is_linux
-   assert(enable_gudev, 'GUdev is not optional on Linux platforms')
- endif
- 
-+# Check for colord
-+enable_colord = get_option('colord')
-+if enable_colord
-+  colord_dep = dependency('colord', version: '>= 1.3.5')
-+endif
-+
- has_timerfd_create = cc.has_function('timerfd_create')
- config_h.set10('HAVE_TIMERFD', has_timerfd_create)
- 
-@@ -154,8 +160,8 @@ if enable_wayland
- endif
- config_h.set10('HAVE_WAYLAND', enable_wayland)
- 
--# wacom (disabled for s390/s390x and non Linux platforms)
--enable_wacom = host_is_linux_not_s390
-+# wacom
-+enable_wacom = get_option('wacom')
- if enable_wacom
-   assert(enable_gudev, 'GUDev support is required for wacom support.')
-   libwacom_dep = dependency('libwacom', version: '>= 0.7')
-diff --git a/meson_options.txt b/meson_options.txt
-index 3e04cf64..6f6eb2fc 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -4,11 +4,13 @@ option('systemd', type: 'boolean', value: true, description: 'Enable systemd int
- 
- option('alsa', type: 'boolean', value: true, description: 'build with ALSA support (not optional on Linux platforms)')
- option('gudev', type: 'boolean', value: true, description: 'build with gudev device support (not optional on Linux platforms)')
-+option('colord', type: 'boolean', value: true, description: 'build with colord support')
- option('cups', type: 'boolean', value: true, description: 'build with CUPS support')
- option('network_manager', type: 'boolean', value: true, description: 'build with NetworkManager support (not optional on Linux platforms)')
- option('rfkill', type: 'boolean', value: true, description: 'build with rfkill support (not optional on Linux platforms)')
- option('smartcard', type: 'boolean', value: true, description: 'build with smartcard support')
- option('usb-protection', type: 'boolean', value: true, description: 'build with usb-protection support')
-+option('wacom', type: 'boolean', value: true, description: 'build with Wacom devices support')
- option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
- option('wwan', type: 'boolean', value: true, description: 'build with WWAN support')
- option('colord', type: 'boolean', value: true, description: 'build with colord support')
-diff --git a/plugins/meson.build b/plugins/meson.build
-index 83e01885..20ccb26d 100644
---- a/plugins/meson.build
-+++ b/plugins/meson.build
-@@ -20,6 +20,10 @@ all_plugins = [
- 
- disabled_plugins = []
- 
-+if not enable_colord
-+    disabled_plugins += ['color']
-+endif
-+
- if not enable_smartcard
-     disabled_plugins += ['smartcard']
- endif
--- 
-2.26.2
-
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch
deleted file mode 100644
index 59aa0f433ae8..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/281.patch
-https://bugs.gentoo.org/831431
-
-From d88484002b5a0c8d2adccb2a5886a7da0a247d27 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Fri, 14 Jan 2022 23:55:06 +0100
-Subject: [PATCH] build: remove positional i18n.merge_file arguments
-
-otherwise building with meson 0.61+ fails:
-
-    ERROR: Function does not take positional arguments.
---- a/plugins/power/meson.build
-+++ b/plugins/power/meson.build
-@@ -76,7 +76,6 @@ if host_is_linux
-   )
- 
-   i18n.merge_file(
--    policy,
-     input: policy_in,
-     output: policy,
-     po_dir: po_dir,
---- a/plugins/wacom/meson.build
-+++ b/plugins/wacom/meson.build
-@@ -7,7 +7,6 @@ policy_in = configure_file(
- )
- 
- i18n.merge_file(
--  policy,
-   input: policy_in,
-   output: policy,
-   po_dir: po_dir,
-GitLab
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild
index 43fc4b23d465..51c1ef9c0852 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	input_devices_wacom? ( udev )
 	wayland? ( udev )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 DEPEND="
 	>=sci-geosciences/geocode-glib-3.10
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.2.ebuild
index b719895dc966..0f6d9e6e2e82 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.2.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_{7..9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg
 
@@ -18,15 +18,15 @@ REQUIRED_USE="
 	input_devices_wacom? ( udev )
 	wayland? ( udev )
 "
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 DEPEND="
 	>=sci-geosciences/geocode-glib-3.10
 	>=dev-libs/glib-2.58:2
 	>=gnome-base/gnome-desktop-3.37.1:3=
-	>=gnome-base/gsettings-desktop-schemas-40
+	>=gnome-base/gsettings-desktop-schemas-42
 	>=x11-libs/gtk+-3.15.3:3[X,wayland?]
-	>=dev-libs/libgweather-40:2=
+	>=dev-libs/libgweather-4.0.0:4=
 	colord? (
 		>=x11-misc/colord-1.4.5:=
 		>=media-libs/lcms-2.2:2
@@ -90,10 +90,9 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch
+	"${FILESDIR}"/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch
 	"${FILESDIR}"/${PN}-3.38.1-build-Allow-NM-optional-on-Linux.patch
 	"${FILESDIR}"/${PN}-3.38.1-Allow-udev-optional-on-Linux.patch
-	"${FILESDIR}"/${P}-meson-0.61-build.patch
 )
 
 python_check_deps() {
@@ -138,6 +137,7 @@ src_test() {
 }
 
 pkg_postinst() {
+	udev_reload
 	xdg_pkg_postinst
 	gnome2_schemas_update
 }
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index e49f32e6afa3..f63314976277 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,16 +1,9 @@
 AUX 40.0-defaults.patch 1412 BLAKE2B e36f7215cf756586479b8bdc71339beb3bbde53ca9745ddc4ef1c3feb59c720e4920e8aa4aadd7912874c386e7495a4b5d554e0d0616db17a81c4ec52a2baa6b SHA512 d82cf1e329d5974755738e29e6366bb10452620021a5db6c2ec63c4ee38e87a65dada34d57026e9510dbffa78c7060ae6f2ccec1739e3026bb0c67dab95f94a9
-AUX 40.0-optional-bluetooth.patch 2034 BLAKE2B 9df252dbef229d372bae87ab017d49086090a4194644fc0f7f3dc78226f78fa58cb99d67d4aac2b156894721658c6094aa6609c0da8c707cf0a8dac5a9a404ee SHA512 ec82f1ef7a9123134af2617526c22fa4258413edb6d68acdcd074911b98ed27d2e761904ccd88a364d9064d79bdefd402988bc53e1139f0e54f993c84242f19f
-AUX 41.3-fix-build-with-meson-0.61.1.patch 3166 BLAKE2B 85378cb7a5ccf02833c409c9c0735d6004d59aa7cb915902b1b518d41235f89b649b353ecefce6228ff42724d6a299c18b3397f7bd584509a06356784871ce48 SHA512 70af8bc42e7a15d68834eed58dd3cac0074e2aa0ccc55c028112b9e06aaf79ffd41a135e1366a1d8131f5acd3857d282cf2471845df7cb301b1de10503e47e1f
-AUX 41.5-environment-Require-GnomeBluetooth-1.0.patch 1286 BLAKE2B 926168a408e7adfa4f42ad470d0bb657248d90f857fe2650f0349b1355d09b5c962ec31288ad1128c8cc03a05d043208101543fc82c71fd4ddc803360101062f SHA512 cd7a4b39c8478e047841fcb44f4b0efca0187ed1b5a3de336c66c6c3e7c90d33ccdda1fc765f78d6c14f326f03b4abafe59ffa5228feac9e0823b9d6684bd197
-AUX 41.5-environment-Require-gnome-desktop-3.0.patch 1021 BLAKE2B fee68ab772f0dbcba318864c440a7b2c160ce3dc60244848d4307dfdb707d535cf57814cf8baaa4886139e91c87c14741f4de4f03f5eac17e1bf1d2f434cb2ad SHA512 9cd44be2a55b22392f49d0f0d32f930245c6882ccab169806cd3583d77aa5c34357a19fa6587c9ba1b584afd5e752cfe7c647319de8c29b07ac71e07bea0c1b7
-AUX 41.5-environment-Require-libgweather-3.0.patch 1045 BLAKE2B d66eed70ba417590eebe1921e00fba045fa80295f17b432deaee5b823bc5248b4bd35ef6423b5947b2c77a2409675f3ab4ea31cb13f728cd42615e602ac69e4d SHA512 bd86e120203801f9a1a091d7be7adefa94f86fea5af400cd9469a1077ee422470f1e486693518d39e7210f3226b9fdfd6ee34a0e5cdbdee63ceea9d054795c40
 AUX 42.0-optional-bluetooth.patch 2032 BLAKE2B 635ba18f5bb5ca0c9f44fe11c2b52652355e1de4647c277524e3f19ef6d57870e75f32b8a2be10eb4e3be4ecf885765b8f0899ab71906f71324795763effa23a SHA512 5fb17c6ffd0486e43b5451747b346e5e9feb3f918f4ef23adc517c43bf61eb5b8850b03022e84848e446de1f0b2145a9dd2b954dde9994e9da176559cd6e48a8
-DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48 SHA512 6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7
-DIST gnome-shell-41.5.tar.xz 1899888 BLAKE2B 73491f382413c313956fc6ab878a54d8a881190ee93cac5d334d169636d8dd21557c78719142f717c94463e02c7ca4eaf12a6e4ca6167e48a002ece9379b6d03 SHA512 b638103528413dcfa12d65d0c7add45716d21334294babbadd0a05e3410ca068ae336b28c30eb8811222b9f90e5efdf0d1a6e0a2e3f104b49061bb28333f066e
-DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d SHA512 39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935
+AUX 42.1-polkit-g_autoptr.patch 1760 BLAKE2B d1d873af81e9b7641f0f2627c4c38cfa281f8ebb50b96af0c8bd6b71ee675d69865565d365e18b8cc09e1345239165cf1eed6bf9c130a68267c133e334a87381 SHA512 0b1bb7e984f9e714d6225c6016299abfe6d9b5b7ff1fb06bfa2f0a88d5191eb2fd3690f0ed1e8b1381440daf2896d17a9ee44c4e42bab68a2cfd004539ac2bfd
 DIST gnome-shell-42.1.tar.xz 1928924 BLAKE2B c8a1aed79a93d713a52ef0161ff9f06c39f7fb9a762086c78505d220e1e8ec43d7a0e376421f912dc91b33da8fd9394c6a233bb2d9d8b361d63ea2ad0406cee6 SHA512 3d27fdbcf5359f631a71b0fa6495fa50e2b43bb2b3c5c0efd740d9a6a88128ae54fe0ba11ea88990ba10ee2fc9f55211d0a21e60beca250bd197535d944d07ed
-EBUILD gnome-shell-41.4-r1.ebuild 7395 BLAKE2B 3769ab65768b699cf7394ea80a22274279c3d410da4b3d05ceb7f1ce33d9aa41524a0bb4de2a5b11acf9b540cf11c5c9a23c236e4a2df6e41544a74577a37ab7 SHA512 4af8c66e12a16e05e82389a7a28a7e49ae34ed72e68b6ce373a8c223be207f2fdbc007ec9d8fe57b4a53e5612c41f062225fe47d6851cd5481e3d34051cec2da
-EBUILD gnome-shell-41.5.ebuild 7610 BLAKE2B 52e2009ac7e4ad24ca062608bd131436d7533f7a228258d6a525521fbe23060fecddcc3823fe696f1f5252abfaad765113bc677894647da92dbfbbae273200bb SHA512 27a9f2200200fba82eb6ff9aabddce02533077aa1d5cb64e3977e49b5d07fa085a00810de0f68db59554589502f8537ff9d34ceab354215aacdd26e9f7442217
-EBUILD gnome-shell-42.0-r1.ebuild 7336 BLAKE2B f83be460fcfbd49398804bd30618aab5ac678e676a3e1f46daa7785780d7883af1c4d07614365633d7f48609a0721e0212b09850786cd82a56319fdd7507f434 SHA512 37976b8a9762d017688ab48459ecd091e7c5ef722f392a547e23b422b9cb8aa031db278612cf60ff003e61d9007935e7e83ca95b20826f08e6908b6bc04fed6a
-EBUILD gnome-shell-42.1.ebuild 7356 BLAKE2B 11be2d6171e95520dfebadefa926ef69f9c7a0d450fc4402a6c1e8dde93e08d1d7735d1c51c9387091ff84dabd692b7849a87daa3fa917fef65babf35448d208 SHA512 1820a7d815f860eb085cce14f312246b18548e0be767dbdf2d612f86e0a41a40a9a30f77e519f6cb039d06e12812df8ec22a3f735d5bce4eefb61a89e8f47de3
+DIST gnome-shell-42.2.tar.xz 1928948 BLAKE2B e263acfc9e6929accfb46b65b91b1173cfa4c778405c0852e93b83d78e1bf3a85e3b5c49b73445f604c0fdecb48f294931ab2403806661013bcef3a71b99f911 SHA512 dd77195772e23d8260e55a2db1103fa6dee8945ad168478c293e43e9971698aa191e17f7f5ef46cf46eeaae5051c34f0eb5df134690f7dc5ca98d6ca747e4eb0
+EBUILD gnome-shell-42.1-r3.ebuild 7490 BLAKE2B 5ac71aef32204d503da5369c6b2094e5f03591d514a5fe8087a338f537b244096c945fcc81c6ea76cd0bf510167e18e496c5840e8417b682651602f056505193 SHA512 447ea4e9af49dfa9e625caa81f80d6f2184d28ea7aeccb765d3b4b37e02d66c636793ec6793f7858361c85d0b2384c108cf9d105b0e747b9556e80245ac9f008
+EBUILD gnome-shell-42.1.ebuild 7353 BLAKE2B 6f9a84055d0e94cd98ee0bee5598f3f827d23969249b8d29ff4f29392699289c0bf23872a6dd74844627df66031b10bdc0157873aa12366fa52a44f437c7a25d SHA512 b274bc62c5869fb8c5dddd42aa93a783fa98f59523d7e5c9342799b14fbcd405650bf5b3b0eee590d8b9ca23869978fe12d1fac63dc4b84be11de4b3912af735
+EBUILD gnome-shell-42.2.ebuild 7415 BLAKE2B c24ed61ad5badba44fde2c241c8051e44a1778bd6db81912c64c2f13c136955fb2a1045140ddede366e28592884f1bb757b6bf2628c553eac0b311dc3abe22a2 SHA512 eaa4d064bdd2f4e9ead120919e51ad7794f60a1cfba23a1c538e89a96098524a363784b96c6ebf0241c9dc322c57299bf0d654a826e813ebd71fdf539d9f05b7
 MISC metadata.xml 1051 BLAKE2B 86f9156deb6546719e6bcd09ad609b2837901743dd390f430521226df6b9e8f54387d2c93411d63d0099261ee0463428fb8854ce2c47463b999827b377807d84 SHA512 f6a3efe242c1726508a56506a7817c3beea3cb17fbe37d2d38403bc6f4f1d11fd366b68b5c9c6ce44f200a21d48da6ccfcf07c9758369481376b5882ea872129
diff --git a/gnome-base/gnome-shell/files/40.0-optional-bluetooth.patch b/gnome-base/gnome-shell/files/40.0-optional-bluetooth.patch
deleted file mode 100644
index dba20fe8c093..000000000000
--- a/gnome-base/gnome-shell/files/40.0-optional-bluetooth.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 1ef0033f8148466256b403c9d8c79b9fed1dd343 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Thu, 28 Feb 2019 00:50:19 +0200
-Subject: [PATCH 2/2] build: Make bluetooth support optional
-
----
- js/misc/meson.build | 2 +-
- meson.build         | 7 ++++++-
- meson_options.txt   | 6 ++++++
- 3 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/js/misc/meson.build b/js/misc/meson.build
-index 2702c3dbc..7a6c831b9 100644
---- a/js/misc/meson.build
-+++ b/js/misc/meson.build
-@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
- jsconf.set('PACKAGE_VERSION', meson.project_version())
- jsconf.set('GETTEXT_PACKAGE', meson.project_name())
- jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
--jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
-+jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
- jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
- jsconf.set('datadir', datadir)
- jsconf.set('libexecdir', libexecdir)
-diff --git a/meson.build b/meson.build
-index 14b75c1c9..8b1c7a380 100644
---- a/meson.build
-+++ b/meson.build
-@@ -94,7 +94,12 @@ x11_dep = dependency('x11')
- schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
- gnome_desktop_dep = dependency('gnome-desktop-3.0', version: gnome_desktop_req)
- 
--bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: false)
-+if get_option('bluetooth')
-+  bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req)
-+  have_bluetooth = true
-+else
-+  have_bluetooth = false
-+endif
- gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
- gst_base_dep = dependency('gstreamer-base-1.0', required: false)
- pipewire_dep = dependency('libpipewire-0.3', required: false)
-diff --git a/meson_options.txt b/meson_options.txt
-index ef76b73c3..41cc0ff9d 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,3 +1,9 @@
-+option('bluetooth',
-+  type: 'boolean',
-+  value: true,
-+  description: 'Enable bluetooth support'
-+)
-+
- option('extensions_tool',
-   type: 'boolean',
-   value: true,
--- 
-2.26.2
-
diff --git a/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch b/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
deleted file mode 100644
index ecf212b9794c..000000000000
--- a/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/65450a836ee9e0722a2d4c3327f52345eae293c6
-https://bugs.gentoo.org/831921
-
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Thu, 23 Dec 2021 17:18:16 +0100
-Subject: [PATCH] build: Drop incorrect positional arg
-
-Unlike other targets that take a name, i18n.merge_file() does not.
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078>
----
- data/meson.build                                      | 2 +-
- src/calendar-server/meson.build                       | 2 +-
- subprojects/extensions-app/data/meson.build           | 2 +-
- subprojects/extensions-app/data/metainfo/meson.build  | 2 +-
- subprojects/extensions-tool/src/templates/meson.build | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index f924fdf806..76ae45c93a 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir)
- desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
- 
- foreach desktop_file : desktop_files
--  i18n.merge_file('desktop',
-+  i18n.merge_file(
-     input: configure_file(
-       input: desktop_file + '.in.in',
-       output: desktop_file + '.in',
-diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
-index 7363282a59..8b4ef411c8 100644
---- a/src/calendar-server/meson.build
-+++ b/src/calendar-server/meson.build
-@@ -27,7 +27,7 @@ configure_file(
-   install_dir: servicedir
- )
- 
--i18n.merge_file('evolution-calendar.desktop',
-+i18n.merge_file(
-   input: 'evolution-calendar.desktop.in',
-   output: 'evolution-calendar.desktop',
-   po_dir: po_dir,
-diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build
-index d7e7d4001c..4b601e8bd1 100644
---- a/subprojects/extensions-app/data/meson.build
-+++ b/subprojects/extensions-app/data/meson.build
-@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir)
- desktopconf.set('app_id', app_id)
- desktopconf.set('prgname', prgname)
- 
--i18n.merge_file('desktop',
-+i18n.merge_file(
-   input: configure_file(
-     input: base_id + '.desktop.in.in',
-     output: desktop_file + '.in',
-diff --git a/subprojects/extensions-app/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build
-index c4962c0576..a19bfa80a4 100644
---- a/subprojects/extensions-app/data/metainfo/meson.build
-+++ b/subprojects/extensions-app/data/metainfo/meson.build
-@@ -1,5 +1,5 @@
- metainfo = app_id + '.metainfo.xml'
--i18n.merge_file(metainfo,
-+i18n.merge_file(
-   input: base_id + '.metainfo.xml.in',
-   output: metainfo,
-   po_dir: po_dir,
-diff --git a/subprojects/extensions-tool/src/templates/meson.build b/subprojects/extensions-tool/src/templates/meson.build
-index 670e2bf448..d693bfaddb 100644
---- a/subprojects/extensions-tool/src/templates/meson.build
-+++ b/subprojects/extensions-tool/src/templates/meson.build
-@@ -4,7 +4,7 @@ template_metas = [
- ]
- template_deps = []
- foreach template : template_metas
--  template_deps += i18n.merge_file(template,
-+  template_deps += i18n.merge_file(
-     input: template + '.in',
-     output: template,
-     po_dir: po_dir,
--- 
-GitLab
-
diff --git a/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
deleted file mode 100644
index 8729a6c3e671..000000000000
--- a/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9ce6756235ba272b8602d50d1f005dc2ef265889 Mon Sep 17 00:00:00 2001
-From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
-Date: Sun, 31 Oct 2021 17:24:58 -0300
-Subject: [PATCH 1/2] environment: Require GnomeBluetooth 1.0
-
-libgnome-bluetooth will start to offer a 2.0 library version
-depending on GTK4. Given that GNOME Shell already depends on
-GTK3, it cannot use this next version of gnome-bluetooth. And
-since GJS will automatically try and use the latest version
-available of any library, Shell must specify it wants 1.0
-explicitly.
-
-Add a required GnomeBluetooth version number when importing it
-for the status indicator.
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2015>
----
- js/ui/environment.js | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/js/ui/environment.js b/js/ui/environment.js
-index ef53e6022..e906fa6c6 100644
---- a/js/ui/environment.js
-+++ b/js/ui/environment.js
-@@ -6,6 +6,7 @@ const Config = imports.misc.config;
- imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
- imports.gi.versions.Gio = '2.0';
- imports.gi.versions.GdkPixbuf = '2.0';
-+imports.gi.versions.GnomeBluetooth = '1.0';
- imports.gi.versions.Gtk = '3.0';
- imports.gi.versions.Soup = '3.0';
- imports.gi.versions.TelepathyGLib = '0.12';
--- 
-2.34.1
-
diff --git a/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
deleted file mode 100644
index 3dbb50bb989b..000000000000
--- a/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 795312b8d5634d3005679b3c1313114e41e538fd Mon Sep 17 00:00:00 2001
-From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
-Date: Thu, 11 Nov 2021 16:20:39 -0300
-Subject: [PATCH 2/2] environment: Require gnome-desktop 3.0
-
-Pretty much the exact same case of 9ce6756235.
-
-libgnome-desktop saw a major version bump, and we have to
-stick with 3.0 for a while.
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2030>
----
- js/ui/environment.js | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/js/ui/environment.js b/js/ui/environment.js
-index e906fa6c6..cb254e319 100644
---- a/js/ui/environment.js
-+++ b/js/ui/environment.js
-@@ -7,6 +7,7 @@ imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
- imports.gi.versions.Gio = '2.0';
- imports.gi.versions.GdkPixbuf = '2.0';
- imports.gi.versions.GnomeBluetooth = '1.0';
-+imports.gi.versions.GnomeDesktop = '3.0';
- imports.gi.versions.Gtk = '3.0';
- imports.gi.versions.Soup = '3.0';
- imports.gi.versions.TelepathyGLib = '0.12';
--- 
-2.34.1
-
diff --git a/gnome-base/gnome-shell/files/41.5-environment-Require-libgweather-3.0.patch b/gnome-base/gnome-shell/files/41.5-environment-Require-libgweather-3.0.patch
deleted file mode 100644
index dedd485a2627..000000000000
--- a/gnome-base/gnome-shell/files/41.5-environment-Require-libgweather-3.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f07a40d5eeb1daf6e2d118c548c8314c721d558c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Wed, 5 Jan 2022 02:42:49 +0100
-Subject: [PATCH] environment: Require libgweather 3.0
-
-GWeather did a major version bump on its main branch, so it is
-now possible that multiple versions are installed in parallel,
-and we should explicitly pick the one we are using.
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2083>
----
- js/ui/environment.js | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/js/ui/environment.js b/js/ui/environment.js
-index cb254e319..ad2b8e4f2 100644
---- a/js/ui/environment.js
-+++ b/js/ui/environment.js
-@@ -9,6 +9,7 @@ imports.gi.versions.GdkPixbuf = '2.0';
- imports.gi.versions.GnomeBluetooth = '1.0';
- imports.gi.versions.GnomeDesktop = '3.0';
- imports.gi.versions.Gtk = '3.0';
-+imports.gi.versions.GWeather = '3.0';
- imports.gi.versions.Soup = '3.0';
- imports.gi.versions.TelepathyGLib = '0.12';
- imports.gi.versions.TelepathyLogger = '0.2';
--- 
-2.34.1
-
diff --git a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
new file mode 100644
index 000000000000..78d3de086260
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
+https://bugs.gentoo.org/844919
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Tue, 17 May 2022 15:36:43 +0200
+Subject: [PATCH] build: Do not redefine polkit autocleanup
+
+PolkitAgent recently added autocleanup functions itself, so check
+for their existence at configure time and only define our own when
+they don't exist upstream.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2296>
+--- a/config.h.meson
++++ b/config.h.meson
+@@ -33,3 +33,6 @@
+ 
+ /* Define if fdwalk is available in libc */
+ #mesondefine HAVE_FDWALK
++
++/* Define if polkit defines autocleanup functions */
++#mesondefine HAVE_POLKIT_AUTOCLEANUP
+--- a/meson.build
++++ b/meson.build
+@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
+           cc.has_function('fdwalk')
+ )
+ 
++polkit_has_autocleanup = cc.compiles(
++  '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
++  #include <polkitagent/polkitagent.h>
++  void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
++  dependencies: polkit_dep)
++cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
++
+ buildtype = get_option('buildtype')
+ if buildtype != 'plain'
+   all_warnings = [
+--- a/src/shell-polkit-authentication-agent.h
++++ b/src/shell-polkit-authentication-agent.h
+@@ -14,8 +14,10 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef HAVE_POLKIT_AUTOCLEANUP
+ /* Polkit doesn't have g_autoptr support, thus we have to manually set the autoptr function here */
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
++#endif
+ 
+ #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT (shell_polkit_authentication_agent_get_type())
+ 
+GitLab
diff --git a/gnome-base/gnome-shell/gnome-shell-41.5.ebuild b/gnome-base/gnome-shell/gnome-shell-41.5.ebuild
deleted file mode 100644
index 06c3d23b7f72..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-41.5.ebuild
+++ /dev/null
@@ -1,208 +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 gnome.org gnome2-utils meson python-single-r1 virtualx xdg
-
-DESCRIPTION="Provides core UI functions for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( elogind systemd )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
-# FIXME:
-#  * gstreamer/pipewire support is currently automagic
-DEPEND="
-	>=gnome-extra/evolution-data-server-3.33.1:=
-	>=app-crypt/gcr-3.7.5[introspection]
-	>=dev-libs/glib-2.68:2
-	>=dev-libs/gobject-introspection-1.49.1:=
-	>=dev-libs/gjs-1.69.2
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=x11-wm/mutter-41.0:0/9[introspection,test?]
-	>=sys-auth/polkit-0.100[introspection]
-	>=gnome-base/gsettings-desktop-schemas-41_alpha[introspection]
-	>=x11-libs/startup-notification-0.11
-	>=app-i18n/ibus-1.5.19
-	>=gnome-base/gnome-desktop-3.35.90:3=[introspection]
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9:2=[introspection] )
-	>=media-libs/gstreamer-0.11.92:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-video/pipewire-0.3.0:=
-	networkmanager? (
-		>=net-misc/networkmanager-1.10.4:=[introspection]
-		net-libs/libnma[introspection]
-		>=app-crypt/libsecret-0.18
-		dev-libs/dbus-glib )
-	systemd? ( >=sys-apps/systemd-242
-		>=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
-	elogind? ( >=sys-auth/elogind-237 )
-
-	app-arch/gnome-autoar
-	dev-libs/json-glib
-
-	>=app-accessibility/at-spi2-atk-2.5.3
-	x11-libs/gdk-pixbuf:2[introspection]
-	dev-libs/libxml2:2
-	x11-libs/libX11
-
-	>=media-sound/pulseaudio-2[glib]
-	>=dev-libs/atk-2[introspection]
-	dev-libs/libical:=
-	>=x11-libs/libXfixes-5.0
-
-	gui-libs/gtk:4[introspection]
-
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	media-libs/mesa[X(+)]
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated from inspection of the output of:
-#  for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u
-# or
-#  rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g'
-# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired.
-# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements
-# Each block:
-# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already)
-# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
-# 3. Control shell settings
-# 4. xdg-utils needed for xdg-open, used by extension tool
-# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
-# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
-# 7. IBus is needed for nls integration
-# 8. Optional telepathy chat integration
-# 9. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
-# 10. xdg-desktop-portal-gtk for various integration, e.g. #764632
-# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
-RDEPEND="${DEPEND}
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	app-accessibility/at-spi2-core:2[introspection]
-	app-misc/geoclue[introspection]
-	media-libs/graphene[introspection]
-	>=dev-libs/libgweather-3.26:2[introspection]
-	x11-libs/pango[introspection]
-	net-libs/libsoup:2.4[introspection]
-	>=sys-power/upower-0.99:=[introspection]
-	gnome-base/librsvg:2[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	x11-misc/xdg-utils
-
-	>=x11-themes/adwaita-icon-theme-3.26
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
-	telepathy? (
-		>=net-im/telepathy-logger-0.2.4[introspection]
-		>=net-libs/telepathy-glib-0.19[introspection] )
-	media-fonts/cantarell
-
-	sys-apps/xdg-desktop-portal-gtk
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection(+)]
-	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
-	browser-extension? ( gnome-extra/chrome-gnome-shell )
-"
-BDEPEND="
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.45.3
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.17
-		app-text/docbook-xml-dtd:4.5 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset:
-# dev-lang/sassc
-# app-text/asciidoc
-
-PATCHES=(
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	"${FILESDIR}"/40.0-optional-bluetooth.patch
-	# Change favorites defaults, bug #479918
-	"${FILESDIR}"/40.0-defaults.patch
-	"${FILESDIR}"/41.3-fix-build-with-meson-0.61.1.patch
-
-	# From upstream
-	"${FILESDIR}"/${PV}-environment-Require-GnomeBluetooth-1.0.patch
-	"${FILESDIR}"/${PV}-environment-Require-gnome-desktop-3.0.patch
-	"${FILESDIR}"/${PV}-environment-Require-libgweather-3.0.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	# Hack in correct python shebang
-	sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth)
-		-Dextensions_tool=true
-		-Dextensions_app=true
-		$(meson_use gtk-doc gtk_doc)
-		-Dman=true
-		$(meson_use test tests)
-		$(meson_use networkmanager)
-		$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
-		# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
-		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
-		-Dsoup2=true # libslot SLOT needs to match with what libgweather is using
-	)
-	meson_src_configure
-}
-
-src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa if you do not have hardware 3D setup."
-	fi
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=563084
-	# TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
-	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
-		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
-		ewarn "otherwise Gnome will fail to start"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-41.4-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
index a0a38c2b4fa2..5cee4f6b828c 100644
--- a/gnome-base/gnome-shell/gnome-shell-41.4-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
@@ -26,15 +26,15 @@ DEPEND="
 	>=app-crypt/gcr-3.7.5[introspection]
 	>=dev-libs/glib-2.68:2
 	>=dev-libs/gobject-introspection-1.49.1:=
-	>=dev-libs/gjs-1.69.2
+	>=dev-libs/gjs-1.71.1
 	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=x11-wm/mutter-41.0:0/9[introspection,test?]
-	>=sys-auth/polkit-0.100[introspection]
-	>=gnome-base/gsettings-desktop-schemas-41_alpha[introspection]
+	>=x11-wm/mutter-42.0:0/10[introspection,test?]
+	>=sys-auth/polkit-0.120_p20220509[introspection]
+	>=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
 	>=x11-libs/startup-notification-0.11
 	>=app-i18n/ibus-1.5.19
 	>=gnome-base/gnome-desktop-3.35.90:3=[introspection]
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9:2=[introspection] )
+	bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] )
 	>=media-libs/gstreamer-0.11.92:1.0
 	media-libs/gst-plugins-base:1.0
 	>=media-video/pipewire-0.3.0:=
@@ -92,7 +92,7 @@ RDEPEND="${DEPEND}
 	app-accessibility/at-spi2-core:2[introspection]
 	app-misc/geoclue[introspection]
 	media-libs/graphene[introspection]
-	>=dev-libs/libgweather-3.26:2[introspection]
+	>=dev-libs/libgweather-4.0.0:4[introspection]
 	x11-libs/pango[introspection]
 	net-libs/libsoup:2.4[introspection]
 	>=sys-power/upower-0.99:=[introspection]
@@ -108,13 +108,13 @@ RDEPEND="${DEPEND}
 	networkmanager? (
 		net-misc/mobile-broadband-provider-info
 		sys-libs/timezone-data )
-	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
+	ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] )
 	telepathy? (
 		>=net-im/telepathy-logger-0.2.4[introspection]
 		>=net-libs/telepathy-glib-0.19[introspection] )
 	media-fonts/cantarell
 
-	sys-apps/xdg-desktop-portal-gtk
+	|| ( sys-apps/xdg-desktop-portal-gnome <sys-apps/xdg-desktop-portal-gtk-1.14.0 )
 "
 # avoid circular dependency, see bug #546134
 PDEPEND="
@@ -137,16 +137,19 @@ BDEPEND="
 
 PATCHES=(
 	# Fix automagic gnome-bluetooth dep, bug #398145
-	"${FILESDIR}"/40.0-optional-bluetooth.patch
+	"${FILESDIR}"/42.0-optional-bluetooth.patch
 	# Change favorites defaults, bug #479918
 	"${FILESDIR}"/40.0-defaults.patch
-	"${FILESDIR}"/41.3-fix-build-with-meson-0.61.1.patch
+
+	# Upstream backport, bug #844919
+	"${FILESDIR}"/42.1-polkit-g_autoptr.patch
 )
 
 src_prepare() {
-	xdg_src_prepare
+	default
+	xdg_environment_reset
 	# Hack in correct python shebang
-	sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
+	sed -e "s:python\.full_path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
 }
 
 src_configure() {
diff --git a/gnome-base/gnome-shell/gnome-shell-42.1.ebuild b/gnome-base/gnome-shell/gnome-shell-42.1.ebuild
index 00a7785b1bb4..b17edeaa6984 100644
--- a/gnome-base/gnome-shell/gnome-shell-42.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-42.1.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	?? ( elogind systemd )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 # libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
 # FIXME:
diff --git a/gnome-base/gnome-shell/gnome-shell-42.0-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-42.2.ebuild
index f7c9320819dd..fb0f8f85b1d5 100644
--- a/gnome-base/gnome-shell/gnome-shell-42.0-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-42.2.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 gnome.org gnome2-utils meson python-single-r1 virtualx xdg
 
@@ -29,7 +29,7 @@ DEPEND="
 	>=dev-libs/gjs-1.71.1
 	>=x11-libs/gtk+-3.15.0:3[introspection]
 	>=x11-wm/mutter-42.0:0/10[introspection,test?]
-	>=sys-auth/polkit-0.100[introspection]
+	>=sys-auth/polkit-0.120_p20220509[introspection]
 	>=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
 	>=x11-libs/startup-notification-0.11
 	>=app-i18n/ibus-1.5.19
@@ -114,7 +114,7 @@ RDEPEND="${DEPEND}
 		>=net-libs/telepathy-glib-0.19[introspection] )
 	media-fonts/cantarell
 
-	sys-apps/xdg-desktop-portal-gtk
+	|| ( sys-apps/xdg-desktop-portal-gnome <sys-apps/xdg-desktop-portal-gtk-1.14.0 )
 "
 # avoid circular dependency, see bug #546134
 PDEPEND="
@@ -143,9 +143,10 @@ PATCHES=(
 )
 
 src_prepare() {
-	xdg_src_prepare
+	default
+	xdg_environment_reset
 	# Hack in correct python shebang
-	sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
+	sed -e "s:python\.full_path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
 }
 
 src_configure() {
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
deleted file mode 100644
index d99764e46c4c..000000000000
--- a/gnome-base/gnome-vfs/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-AUX gnome-vfs-2.12.0-afs.patch 663 BLAKE2B 790fc4d85bebee9d3be52a0d6704030c71458477142169879e37c999f31c22866194080956f9fcca33165671df9a5277ccea2209eb9044e6f3bad96e6fcff1ec SHA512 38b1268e774ba2e7726295ee019f939b9dfc5d1a67f8e45d9bc30a2ae20f647acd9570740ad06cb17d83d9299f863aa14dd77a2ca2f9f4910b9c328111ae5ca1
-AUX gnome-vfs-2.15.2-headers-define.patch 501 BLAKE2B fed25b67bd1aee253994ec3e16a8dd0f8d5424b7200e73dd3fcc9d2911a57d9e8547bb967557cc3d5b295349bf164767e99cbcdbc041872ff2075650e515569e SHA512 34a66f9467a1ecf77cbf725fc732d9b62baddf68b017a65a2e4ee06f1fca92cbde4c94249fb44eb66c23e338f56fc2b5f314cc75d6e91349a3207c3bd5d74f26
-AUX gnome-vfs-2.16.0-no-dbus-crash.patch 710 BLAKE2B f73c2ffc1480ad1e0b94bc476965a1da989635bdcc34aeb65670e6548403bd32abc644b8eed1da0e8d5498484c855b10efe721b04f08b188198002fc49997434 SHA512 527c24b8902c9a1049b08f6479d32674c8f382a9ae4d7c6f3de772c09347555fda680a3dbfe70fcc312db8aa939ccbc4a42d1a84fd6a9f4a51180943766f5261
-AUX gnome-vfs-2.20.0-automagic-deps.patch 1976 BLAKE2B cbe4cf70fc52feedacdb2f422c1048b4eb196861040de066d8b16274c826bf369d63068020389f460e1d5631169ac0e2a83e736ea547339feecf5f53c6551786 SHA512 7ef30df523aabe316be0064a82857bd2dafb783857137912ee8d3153dac540cc314920e3f2c7fe49f32c485685cb62a3876ee386b30409600a318ea91c8d24eb
-AUX gnome-vfs-2.20.1-automagic-deps.patch 574 BLAKE2B eeb9a69590a59259a780af60a6b3000be33240a37ea20955ab50c36cf31e02214193da056b1e601f9dc546298a9a13bc17ad0b2dd9b3cb19a266ae65eca1c98b SHA512 d1adfd585d3564c61ac19b98ac57bf387ad938c4197d65971bbe6528fe3246e3260b424e9fa6760eed933a58e9cf2e5df9b8458835d420660735ac43dd54b4d5
-AUX gnome-vfs-2.24.0-uuid-mount.patch 2452 BLAKE2B 9607e8f7641799dbb46e29bfd7623815fa4066685b10d2cb232e556998f76970097d1bda65554c8c85961e729c269b8a7a6210f2532605cbf7cd16c501444574 SHA512 f66dbba17937b2b1b00aed3804d0b927cd65a2f462853069e62d7973d3f3d88c2a0a2d153e1c95c27ecdf363ff0530f0e8d9849e7b168815ca3f1ad0baf98b96
-AUX gnome-vfs-2.24.4-automake-1.13.patch 840 BLAKE2B fcdd3d1728f95b5b30246fa7471819d00ac2f689d957b665dbd16f2c84ec2e4afb4e2bfac9ca3d3eda4cd42be84c58402aacab1a7e2a503cf9802b5fce5001d7 SHA512 88e9ef1ff7cb513d576fa8d6441ff10c5072f277aef65f107c4f742690db9a4ebee0c986c3773d2055538c771672de84c3d08435cb1f8329dae633db395ae639
-AUX gnome-vfs-2.24.4-build-tests-asneeded.patch 632 BLAKE2B 21ff1b1b0d077f43e15989944c337f94b0ddaf5d69cc966d248404fd19afe2dd3a24eb589fff040a4993ed9f4da3692fda81851c0da4342ba89cee0bded387a3 SHA512 e9afd45ccbe6552daedc20403a0ea892a3dbf039439acc1bcabbecdcac57e808828a83076a6a29492ac74fa81b3f47a02b9d9d2a2387e445b03c8bf4f96e3bab
-AUX gnome-vfs-2.24.4-disable-test-async-cancel.patch 689 BLAKE2B e09b96510144b96385e55ef2d47dfbbcaacd662d327a57f2c04636cfa13971c12cc20c00a681a206515c098464c5956cd736331f0ae10cb0677b06b69ad341ae SHA512 434a3491b55cfdd581bf3f542d464844941af72daa6933d957a85120d17ee72fff59e9d98e303bd17a3fd9f1694506186a52309d2ec3077680f7d45759e4ae77
-AUX gnome-vfs-2.24.4-gnutls27.patch 3235 BLAKE2B f6874c9edf48200bcfb7028ef64235fd902a94490995638add7118c1e34b88e197daeca96083cbb21725bb265f62612622b1f24039028baf61ab2dc0158d3ec4 SHA512 a17ea282f22e22c2390c3a53efab2c99a3fbb2ee370c0c1a19a477ff76bdeae483bf1886f09680681b824254c14a8a411470c95319c4f3d5a7775f4369935b25
-AUX gnome-vfs-2.24.4-gnutls34.patch 1624 BLAKE2B 9b29ee3e95ad79f31a9d4adc494aa6b0587a85c308769238607be5a7284a2dfdf13cf33ae14a35624596414af1383a5fa9c647076c016fc6e86942ed8352bc8e SHA512 adbbe966be3f7193c838794fc8a8949433377c6730c55ed152c345858b4da3f97f5c372d6b4555814ea10f5c65b52cb8a625563a0329604a9d61ce57b08de620
-AUX gnome-vfs-2.24.4-home_dir_fakeroot.patch 4996 BLAKE2B 9883ef67221c053df5ad2d3f70e3f7c3f1916660cb35dd82a0dc52008ffd1a780f685a7af82a2dda1ec25aae5d1f024322b3a8c20bd8d48227405d0c1c357b48 SHA512 dcad32f15afaa7677c6d10672c06c6d635a17d2bb686883c94f42bfc4f9fc6c525c4f097c3af718020fd224e06bba0d0a4ec68cde431545e9fe4a2c65320a48f
-AUX gnome-vfs-2.24.4-openssl-1.1.patch 802 BLAKE2B 0bc20796d79df2b720a7ef06139178cbafdd4dc765ed8721d1c0a7ff930b1cd3ecba3bee4b0b074b35b2812ccda0c895824d01296f7aa6212e606bf3af519d13 SHA512 7ec9cdf91d1f9bf51dcf97c47efade87829acd59642bb61c6defc6c7377dfef9e3b0bc8c07a6257e0b55e0184e28e429ff931fcccb48cf6486774916cc8152de
-DIST gnome-vfs-2.24.4.tar.bz2 1890370 BLAKE2B 696c8ce479de5a15660c9cc79eeb1abb6d69716f68558c7f791a3a44a7f1e9d09d9bc9adcca11dabd745f36a70222817b68888f3c56839add737b802aba0e7ac SHA512 db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581
-EBUILD gnome-vfs-2.24.4-r5.ebuild 3888 BLAKE2B 77d7fb7aa51f81c2eb8f1b1943dd4f9cf77afdd0aae61d6e75d326ad9488e78ad3481c6fbc7da7fc77041c0ce6316a6480e0cf6452121c21151c61f84c1ad076 SHA512 5c03d486027e1a54149a50d7693a1244ec5c9309f42b93d73f3895ea17628d8a1e87407c28b4afab003f38248f9e6d97c686aeab0cf26c0672488c6121a84c0f
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch
deleted file mode 100644
index cdc88c24b6a3..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gnome-vfs-2.12.0/libgnomevfs/gnome-vfs-filesystem-type.c gnome-vfs-2.12.0-patched/libgnomevfs/gnome-vfs-filesystem-type.c
---- gnome-vfs-2.12.0/libgnomevfs/gnome-vfs-filesystem-type.c	2005-08-23 01:34:36.000000000 +0800
-+++ gnome-vfs-2.12.0-patched/libgnomevfs/gnome-vfs-filesystem-type.c	2005-09-18 20:30:47.000000000 +0800
-@@ -35,7 +35,7 @@
- 
- static struct FSInfo fs_data[] = {
- 	{ "affs"     , N_("AFFS Volume"), 0},
--	{ "afs"      , N_("AFS Network Volume"), 0 },
-+	{ "afs"      , N_("AFS Network Volume"), 1 },
- 	{ "auto"     , N_("Auto-detected Volume"), 0 },
- 	{ "cd9660"   , N_("CD-ROM Drive"), 0 },
- 	{ "cdda"     , N_("CD Digital Audio"), 0 },
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
deleted file mode 100644
index 9d6e9978242f..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -191,6 +191,16 @@
- 
- AC_CHECK_HEADERS(sys/param.h sys/resource.h sys/vfs.h sys/mount.h sys/statfs.h sys/statvfs.h sys/param.h wctype.h sys/poll.h poll.h)
- 
-+AC_CHECK_HEADERS([pwd.h])
-+if test "$ac_cv_header_pwd_h" = "yes"; then
-+	AC_DEFINE(HAVE_PWD_H, [1], [pwd.h present])
-+fi
-+
-+AC_CHECK_HEADERS([grp.h])
-+if test "$ac_cv_header_grp_h" = "yes"; then
-+	AC_DEFINE(HAVE_GRP_H, [1], [grp.h present])
-+fi
-+
- dnl
- dnl file system type member in statfs struct
- dnl
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch
deleted file mode 100644
index 6905060a4f71..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.16.0.orig/libgnomevfs/gnome-vfs-volume-monitor-client.c gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c
---- gnome-vfs-2.16.0.orig/libgnomevfs/gnome-vfs-volume-monitor-client.c	2006-07-07 04:46:39.000000000 -0400
-+++ gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c	2006-09-21 11:22:49.000000000 -0400
-@@ -236,6 +236,8 @@
- gnome_vfs_volume_monitor_client_init (GnomeVFSVolumeMonitorClient *volume_monitor_client)
- {
- 	setup_dbus_connection (volume_monitor_client);
-+	if (!volume_monitor_client->dbus_conn)
-+		return;
- 	read_drives_from_daemon (volume_monitor_client);
- 	read_volumes_from_daemon (volume_monitor_client);
- }
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
deleted file mode 100644
index 18d900ac12cd..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Index: configure.in
-===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -448,9 +448,13 @@
- dnl GSSAPI
- dnl Check for Kerberos installation
- have_gssapi=no
-+
-+AC_ARG_ENABLE(krb5,
-+	      AS_HELP_STRING([--enable-krb5],[Enable Kerberos 5 support]),
-+	      [],[enable_krb5=yes])
- AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
--					   
--if test "x$KRB5_CONFIG" != "xnone"; then
-+
-+if test "x$KRB5_CONFIG" != "xnone" -a "x$enable_krb5" = "xyes"; then
-    GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
-    GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
-    
-@@ -481,8 +485,12 @@
-      break
-    ])
-    LIBS="$saved_LIBS" 
--   CPPFLAGS="$saved_CPPFLAGS" 
--fi   
-+   CPPFLAGS="$saved_CPPFLAGS"
-+fi
-+
-+if test "x$KRB5_CONFIG" = "xnone" -a "x$enable_krb5" = "xyes"; then
-+	AC_MSG_ERROR([*** kerberos 5 support enabled but krb5-config not found ***])
-+fi
- AC_SUBST(GSSAPI_LIBS)
- AC_SUBST(GSSAPI_CFLAGS)
- 	   
-@@ -1077,9 +1085,13 @@
- dnl =====================
- dnl ACL checks
- dnl =====================
--acl_backends=""
-+acl_backends="none"
- ACL_LIBS=""
- 
-+AC_ARG_ENABLE(acl,
-+	    AS_HELP_STRING([--disable-acl],[Don't use libacl support]),
-+	    [],[enable_acl=yes])
-+
- AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"])
- AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
- AC_CHECK_LIB(sec,acl,[ACL_LIBS="$ACL_LIBS -lsec"])
-@@ -1102,7 +1114,7 @@
- gvfs_cv_HAVE_POSIX_ACLS=yes, gvfs_cv_HAVE_POSIX_ACLS=no)
- 		LIBS=$acl_LIBS])
- 
--if test x"$gvfs_cv_HAVE_SOLARIS_ACLS" = x"yes" ; then
-+if test x"$gvfs_cv_HAVE_SOLARIS_ACLS" = x"yes" -a x"$enable_acl" = x"yes"; then
-     have_solaris_acl_support=yes
-     acl_backends="solaris"
- 
-@@ -1110,7 +1122,7 @@
-     AC_CHECK_HEADERS([pwd.h grp.h])
- fi
- 
--if test x"$gvfs_cv_HAVE_POSIX_ACLS" = x"yes" ; then
-+if test x"$gvfs_cv_HAVE_POSIX_ACLS" = x"yes" -a x"$enable_acl" = x"yes"; then
-     have_posix_acl_support=yes
-     acl_backends="posix"
- 
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
deleted file mode 100644
index 63be9f95b9dc..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -1102,6 +1102,7 @@
- 	    AS_HELP_STRING([--disable-acl],[Don't use libacl support]),
- 	    [],[enable_acl=yes])
- 
-+if test "x$enable_acl" = "xyes"; then
- AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"])
- AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
- AC_CHECK_LIB(sec,acl,[ACL_LIBS="$ACL_LIBS -lsec"])
-@@ -1189,6 +1190,8 @@
- fi
- 
-+fi
- AC_SUBST(ACL_LIBS)
-+
- AM_CONDITIONAL(HAVE_POSIX_ACL, test x"$have_posix_acl_support" = x"yes")
- AM_CONDITIONAL(HAVE_SOLARIS_ACL, test x"$have_solaris_acl_support" = x"yes")
- 
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch
deleted file mode 100644
index e76a9837136a..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 8427c2daf543353f42b932b5137b6ec590f6589b Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 2 Oct 2010 00:42:31 +0200
-Subject: [PATCH 7/9] Prevent duplicated volumes, bug #193083
-
----
- libgnomevfs/gnome-vfs-unix-mounts.c |   39 +++++++++++++++++++++++++++++++++-
- 1 files changed, 37 insertions(+), 2 deletions(-)
-
-diff --git a/libgnomevfs/gnome-vfs-unix-mounts.c b/libgnomevfs/gnome-vfs-unix-mounts.c
-index 51a009b..3eee305 100644
---- a/libgnomevfs/gnome-vfs-unix-mounts.c
-+++ b/libgnomevfs/gnome-vfs-unix-mounts.c
-@@ -40,6 +40,10 @@
- #ifdef HAVE_POLL_H
- #include <poll.h>
- #endif
-+
-+#include <limits.h>
-+#include <stdlib.h>
-+
- #include <stdio.h>
- #include <unistd.h>
- #include <sys/time.h>
-@@ -290,6 +294,15 @@ _gnome_vfs_get_current_unix_mounts (GList **return_list)
- 
- 		mount_entry->mount_path = g_strdup (mntent->mnt_dir);
- 		mount_entry->device_path = g_strdup (mntent->mnt_fsname);
-+
-+		if (g_file_test (mntent->mnt_fsname, G_FILE_TEST_IS_SYMLINK)) {
-+			char rpath[PATH_MAX];
-+			if (realpath (mntent->mnt_fsname, rpath)) {
-+				g_free (mount_entry->device_path);
-+				mount_entry->device_path = g_strdup (rpath);
-+			}
-+		}
-+
- 		mount_entry->filesystem_type = g_strdup (mntent->mnt_type);
- 		
- 		g_hash_table_insert (mounts_hash,
-@@ -571,9 +584,31 @@ _gnome_vfs_get_unix_mount_table (GList **return_list)
- 		}
- 		
- 		mount_entry = g_new0 (GnomeVFSUnixMountPoint, 1);
--
-+		
-+		if(strlen(mntent->mnt_fsname) >= 5 && !strncmp (mntent->mnt_fsname, "UUID=", 5)) {
-+			mount_entry->device_path = g_strdup_printf ("/dev/disk/by-uuid/%s", mntent->mnt_fsname+5);
-+		}
-+		else if(strlen(mntent->mnt_fsname) >= 6 && !strncmp (mntent->mnt_fsname, "LABEL=", 6)) {
-+			mount_entry->device_path = g_strdup_printf ("/dev/disk/by-label/%s", mntent->mnt_fsname+6);
-+		}
-+		else {
-+			mount_entry->device_path = g_strdup (mntent->mnt_fsname);
-+		}
-+		
-+		if (g_file_test (mount_entry->device_path, G_FILE_TEST_IS_SYMLINK)) {
-+			char rpath[PATH_MAX];
-+			if (realpath (mount_entry->device_path, rpath)) {
-+				g_free (mount_entry->device_path);
-+				mount_entry->device_path = g_strdup (rpath);
-+			}
-+			else {
-+				g_free (mount_entry->device_path);
-+				g_free (mount_entry);
-+				continue;
-+			}
-+		}
-+		
- 		mount_entry->mount_path = g_strdup (mntent->mnt_dir);
--		mount_entry->device_path = g_strdup (mntent->mnt_fsname);
- 		mount_entry->filesystem_type = g_strdup (mntent->mnt_type);
- 
- #ifdef HAVE_HASMNTOPT
--- 
-1.7.3
-
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch
deleted file mode 100644
index 69f470a396a9..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- configure.in     | 2 +-
- test/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 7335451..7817998 100644
---- a/configure.in
-+++ b/configure.in
-@@ -33,7 +33,7 @@ AC_SUBST(LIBGNOMEVFS_REVISION)
- AC_SUBST(LIBGNOMEVFS_AGE)
- AC_SUBST(LIBGNOMEVFS_VERSION)
- 	
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_INIT_AUTOMAKE(gnome-vfs, $LIBGNOMEVFS_VERSION)
- 
- dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 5b0992e..626bdec 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -65,7 +65,7 @@ TESTS = test-acl	  \
- 	test-async-cancel \
- 	test-escape       \
- 	test-uri       	  \
--	$(srcdir)/auto-test	
-+	auto-test
- 
- libraries =						\
- 	$(top_builddir)/libgnomevfs/libgnomevfs-2.la	\
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-build-tests-asneeded.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-build-tests-asneeded.patch
deleted file mode 100644
index 45ca015573f0..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-build-tests-asneeded.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b7dabab33e00bdbd8b566ca058a1bce7dec2b77d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 2 Oct 2010 01:45:21 +0200
-Subject: [PATCH 8/9] Do not build tests unless required
-
----
- test/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 5b0992e..a1aefa0 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -14,7 +14,7 @@ else
- platform_only_programs = test-dns-sd test-symlinks test-parse-ls-lga
- endif
- 
--noinst_PROGRAMS =				\
-+check_PROGRAMS =				\
- 	test-acl				\
- 	test-address				\
- 	test-async				\
--- 
-1.7.3
-
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-disable-test-async-cancel.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-disable-test-async-cancel.patch
deleted file mode 100644
index 2684c92ec098..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-disable-test-async-cancel.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 390c1f6c06917f54cfacd5f85834d02c231cc2ea Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 2 Oct 2010 01:46:31 +0200
-Subject: [PATCH 9/9] Disable broken test, bug #285706, upstream #618089
-
----
- test/Makefile.am |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/test/Makefile.am b/test/Makefile.am
-index a1aefa0..c18f2e4 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -62,7 +62,6 @@ TESTS_ENVIRONMENT = GNOME_VFS_MODULE_PATH=$(top_builddir)/modules/.libs \
- 		SRCDIR=$(srcdir)
- TESTS = test-acl	  \
- 	test-address      \
--	test-async-cancel \
- 	test-escape       \
- 	test-uri       	  \
- 	$(srcdir)/auto-test	
--- 
-1.7.3
-
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch
deleted file mode 100644
index 93ebd17c7eff..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Debian #529827
-GNOME #574589
-Gentoo #253729
-Patch by Gilles Dartiguelongue, fixed for correctly setting have_ssl
-
-Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0
-Use pkg-config in place of gnutls own macro since it's not present anymore.
-
-As gnome-vfs-ssl.c also directly uses libgcrypt, we need to make sure that
-configure checks for it. Use AM_PATH_LIBGCRYPT macro for that.
-
-
-Index: gnome-vfs-2.24.4/configure.in
-===================================================================
---- gnome-vfs-2.24.4.orig/configure.in	2011-03-16 14:07:18.901009688 +0100
-+++ gnome-vfs-2.24.4/configure.in	2011-03-16 14:16:19.317009687 +0100
-@@ -667,15 +667,14 @@
-   if test "x${OPENSSL_LIBS}" != "x"; then
-     AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***])
-   else
--    AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***]))
--    AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
--			      have_ssl=true])
--
-+    AM_PATH_LIBGCRYPT
-+    if test "x${LIBGCRYPT_LIBS}" = "x"; then
-+      AC_MSG_ERROR([Unable to find LIBGRYPT])
-+    fi
-+    PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
-+    				 	   	  have_ssl=true])
-     if test "x${LIBGNUTLS_LIBS}" = "x"; then
--      AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
--                                 AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
--				 have_ssl=true],
--                                 AC_MSG_ERROR([Unable to find GNUTLS]))
-+      AC_MSG_ERROR([Unable to find GNUTLS])
-     fi
-   fi
- fi
-@@ -1045,8 +1044,8 @@
- dnl ==============================================================================
- 
- PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement)
--LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS"
--LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS"
-+LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $LIBGCRYPT_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS"
-+LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $LIBGCRYPT_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS"
- AC_SUBST(LIBGNOMEVFS_CFLAGS)
- AC_SUBST(LIBGNOMEVFS_LIBS)
- 
-Index: gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c
-===================================================================
---- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c	2011-03-16 14:07:18.861009688 +0100
-+++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c	2011-03-16 14:09:17.517009687 +0100
-@@ -61,13 +61,6 @@
- #endif
- #endif
- 
--#if defined GNUTLS_COMPAT
--#define gnutls_certificate_credentials GNUTLS_CERTIFICATE_CREDENTIALS
--#define gnutls_session GNUTLS_STATE
--#define gnutls_certificate_free_credentials gnutls_certificate_free_sc
--#define gnutls_certificate_allocate_credentials gnutls_certificate_allocate_sc
--#endif
--
- typedef struct {
- #ifdef HAVE_OPENSSL
- 	int sockfd;
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch
deleted file mode 100644
index 78942f06ea11..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -uprw gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c
---- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c	2010-02-09 14:16:14.000000000 +0200
-+++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c	2015-04-14 00:01:51.272451668 +0300
-@@ -314,21 +314,6 @@ gnome_vfs_ssl_create (GnomeVFSSSL **hand
- #endif
- }
- 
--#ifdef HAVE_GNUTLS
--static const int protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0};
--static const int cipher_priority[] = 
--	{GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_CIPHER_3DES_CBC,
--	 GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
--static const int comp_priority[] =
--	{GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0};
--static const int kx_priority[] =
--	{GNUTLS_KX_DHE_RSA, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, 0};
--static const int mac_priority[] =
--	{GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0};
--
--#endif
--
--
- /**
-  * gnome_vfs_ssl_create_from_fd:
-  * @handle_return: pointer to a #GnomeVFSSSL struct, which will
-@@ -437,11 +422,7 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
- 	gnutls_transport_set_ptr (ssl->private->tlsstate, 
- 				  GINT_TO_POINTER (fd));
- 
--	gnutls_protocol_set_priority (ssl->private->tlsstate, protocol_priority);
--	gnutls_cipher_set_priority (ssl->private->tlsstate, cipher_priority);
--	gnutls_compression_set_priority (ssl->private->tlsstate, comp_priority);
--	gnutls_kx_set_priority (ssl->private->tlsstate, kx_priority);
--	gnutls_mac_set_priority (ssl->private->tlsstate, mac_priority);
-+	gnutls_set_default_priority (ssl->private->tlsstate);
- 
- 	gnutls_cred_set (ssl->private->tlsstate, GNUTLS_CRD_CERTIFICATE,
- 			 ssl->private->xcred);
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-home_dir_fakeroot.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-home_dir_fakeroot.patch
deleted file mode 100644
index 991286aa4de6..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-home_dir_fakeroot.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 01dba45f0d15b7e23f21d19776d64f69879cd27a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 2 Oct 2010 00:41:01 +0200
-Subject: [PATCH 5/9] Fix to identify ${HOME} (#200897)
-
-Thanks to debian folks.
----
- libgnomevfs/gnome-vfs-application-registry.c |    2 +-
- libgnomevfs/gnome-vfs-init.c                 |    3 +-
- libgnomevfs/gnome-vfs-private-utils.c        |   52 ++++++++++++++++++++++++++
- libgnomevfs/gnome-vfs-private-utils.h        |    2 +
- modules/file-method.c                        |    6 +-
- 5 files changed, 60 insertions(+), 5 deletions(-)
-
-diff --git a/libgnomevfs/gnome-vfs-application-registry.c b/libgnomevfs/gnome-vfs-application-registry.c
-index 0b11cc5..051ea44 100644
---- a/libgnomevfs/gnome-vfs-application-registry.c
-+++ b/libgnomevfs/gnome-vfs-application-registry.c
-@@ -965,7 +965,7 @@ gnome_vfs_application_registry_init (void)
- 						       NULL);
- 	gnome_registry_dir.system_dir = TRUE;
- 	
--	user_registry_dir.dirname = g_build_filename (g_get_home_dir(),
-+	user_registry_dir.dirname = g_build_filename (gnome_vfs_get_home_dir(),
- 						      ".gnome",
- 						      "application-info",
- 						      NULL);
-diff --git a/libgnomevfs/gnome-vfs-init.c b/libgnomevfs/gnome-vfs-init.c
-index e3fd5d9..c07cf06 100644
---- a/libgnomevfs/gnome-vfs-init.c
-+++ b/libgnomevfs/gnome-vfs-init.c
-@@ -118,7 +118,8 @@ gnome_vfs_init (void)
- 	char *bogus_argv[2] = { "dummy", NULL };
- 	*/
- 	
--	if (!ensure_dot_gnome_exists ()) {
-+	/* The first call also checks that ~/.gnome2 is writable. */
-+	if (!gnome_vfs_get_home_dir ()) {
- 		return FALSE;
- 	}
- 
-diff --git a/libgnomevfs/gnome-vfs-private-utils.c b/libgnomevfs/gnome-vfs-private-utils.c
-index 7fafde3..7ad8fbc 100644
---- a/libgnomevfs/gnome-vfs-private-utils.c
-+++ b/libgnomevfs/gnome-vfs-private-utils.c
-@@ -34,6 +34,7 @@
- #include "gnome-vfs-uri.h"
- #include <errno.h>
- #include <glib.h>
-+#include <glib/gstdio.h>
- #include <gconf/gconf-client.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -1085,3 +1086,54 @@ _gnome_vfs_winsock_strerror (int error)
- }
- #endif
- 
-+static gboolean
-+ensure_dot_gnome_exists (gchar *home_dir)
-+{
-+	gboolean retval = TRUE;
-+	gchar *dirname;
-+
-+	dirname = g_build_filename (home_dir, ".gnome2", NULL);
-+
-+	if (!g_file_test (dirname, G_FILE_TEST_EXISTS)) {
-+		if (g_mkdir (dirname, S_IRWXU) != 0) {
-+			g_warning ("Unable to create ~/.gnome2 directory: %s",
-+				   g_strerror (errno));
-+			retval = FALSE;
-+		}
-+	} else if (!g_file_test (dirname, G_FILE_TEST_IS_DIR)) {
-+		g_warning ("Error: ~/.gnome2 must be a directory.");
-+		retval = FALSE;
-+	}
-+
-+	g_free (dirname);
-+	return retval;
-+}
-+
-+/**
-+ * gnome_vfs_get_home_dir:
-+ *
-+ * If ~/.gnome2 is writable, return the home directory
-+ * Otherwise, return the contents of the HOME environment variable
-+ *
-+ * Return value: home directory if successful, NULL otherwise.
-+ * Do not free the value returned.
-+ */
-+const gchar *
-+gnome_vfs_get_home_dir (void)
-+{
-+	static gchar *home = NULL;
-+
-+	if (home == NULL) {
-+		gchar *tmp = g_get_home_dir ();
-+		if (ensure_dot_gnome_exists (tmp)) {
-+			home = g_strdup (tmp);
-+		} else {
-+			gchar *tmp2 = g_getenv ("HOME");
-+			if (!g_str_equal (tmp, tmp2) && ensure_dot_gnome_exists (tmp2)) {
-+				home = g_strdup (tmp2);
-+			}
-+		}
-+	}
-+
-+	return home;
-+}
-diff --git a/libgnomevfs/gnome-vfs-private-utils.h b/libgnomevfs/gnome-vfs-private-utils.h
-index 981c6d9..fe282a2 100644
---- a/libgnomevfs/gnome-vfs-private-utils.h
-+++ b/libgnomevfs/gnome-vfs-private-utils.h
-@@ -124,6 +124,8 @@ const char    *_gnome_vfs_winsock_strerror		  (int		 error);
- 
- #endif
- 
-+const gchar   *gnome_vfs_get_home_dir                     (void);
-+
- G_END_DECLS
- 
- #endif /* _GNOME_VFS_PRIVATE_UTILS_H */
-diff --git a/modules/file-method.c b/modules/file-method.c
-index 37e4853..7265e58 100644
---- a/modules/file-method.c
-+++ b/modules/file-method.c
-@@ -1531,7 +1531,7 @@ save_trash_entry_cache (void)
- 	GList *p;
- 	char *buffer, *escaped_path, *escaped_mount_point;
- 
--	cache_file_parent = append_to_path (g_get_home_dir (), TRASH_ENTRY_CACHE_PARENT);
-+	cache_file_parent = append_to_path (gnome_vfs_get_home_dir (), TRASH_ENTRY_CACHE_PARENT);
- 	cache_file_path = append_to_path (cache_file_parent, TRASH_ENTRY_CACHE_NAME);
- 
- 	if (mkdir_recursive (cache_file_parent, 0777) != 0) {
-@@ -1670,7 +1670,7 @@ read_saved_cached_trash_entries (void)
- 	cached_trash_directories = NULL;
- 
- 	/* read in the entries from disk */
--	cache_file_path = g_build_filename (g_get_home_dir (),
-+	cache_file_path = g_build_filename (gnome_vfs_get_home_dir (),
- 					    TRASH_ENTRY_CACHE_PARENT,
- 					    TRASH_ENTRY_CACHE_NAME,
- 					    NULL);
-@@ -1942,7 +1942,7 @@ do_find_directory (GnomeVFSMethod *method,
- 		return GNOME_VFS_ERROR_INVALID_URI;
- 
- 	/* We will need the URI and the stat structure for the home directory. */
--	home_directory = g_get_home_dir ();
-+	home_directory = gnome_vfs_get_home_dir ();
- 
- 	if (gnome_vfs_context_check_cancellation (context)) {
- 		g_free (full_name_near);
--- 
-1.7.3
-
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
deleted file mode 100644
index cb1886ef4a29..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-libgnomevfs_gnome-vfs-ssl.c,v 1.1 2018/02/16 13:18:26 wiz Exp $
-
-struct SSL is opaque in openssl-1.1; and the SSL_free() man page
-says that one should not free members of it manually (in both
-the openssl-1.0 and openssl-1.1 man pages).
-
---- a/libgnomevfs/gnome-vfs-ssl.c
-+++ b/libgnomevfs/gnome-vfs-ssl.c
-@@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
- 			}
- 		}
- 
--                if (ssl->private->ssl->ctx)
--                        SSL_CTX_free (ssl->private->ssl->ctx);
--
-                 SSL_free (ssl->private->ssl);
- 		g_free (ssl->private);
- 		g_free (ssl);
-@@ -705,7 +702,6 @@ gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl,
- 		}
- 	}
- 	
--	SSL_CTX_free (ssl->private->ssl->ctx);
- 	SSL_free (ssl->private->ssl);
- 	close (ssl->private->sockfd);
- 	if (ssl->private->timeout)
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
deleted file mode 100644
index 091d812608a2..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_EAUTORECONF="yes"
-inherit gnome2 multilib-minimal virtualx
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="acl gnutls ipv6 kerberos samba ssl zeroconf"
-
-RDEPEND="
-	>=gnome-base/gconf-2.32.4-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
-	gnome-base/gnome-mime-data
-	>=x11-misc/shared-mime-info-0.14
-	>=dev-libs/dbus-glib-0.100.2[${MULTILIB_USEDEP}]
-	acl? (
-		>=sys-apps/acl-2.2.52-r1[${MULTILIB_USEDEP}]
-		>=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-	ssl? (
-		gnutls?	(
-			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
-			!gnome-extra/gnome-vfs-sftp )
-		!gnutls? (
-			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-			!gnome-extra/gnome-vfs-sftp ) )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	sys-devel/gettext
-	gnome-base/gnome-common
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.13
-"
-
-DOCS=( "${S}"/{AUTHORS,ChangeLog,HACKING,NEWS,README,TODO} )
-
-PATCHES=(
-	# Allow the Trash on afs filesystems (#106118)
-	"${FILESDIR}"/${PN}-2.12.0-afs.patch
-
-	# Fix compiling with headers missing
-	"${FILESDIR}"/${PN}-2.15.2-headers-define.patch
-
-	# Fix for crashes running programs via sudo
-	"${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
-
-	# Fix automagic dependencies, upstream bug #493475
-	"${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
-	"${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch
-
-	# Fix to identify ${HOME} (#200897)
-	# thanks to debian folks
-	"${FILESDIR}"/${PN}-2.24.4-home_dir_fakeroot.patch
-
-	# Configure with gnutls-2.7, bug #253729
-	# Fix building with gnutls-2.12, bug #388895
-	"${FILESDIR}"/${PN}-2.24.4-gnutls27.patch
-
-	# Prevent duplicated volumes, bug #193083
-	"${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch
-
-	# Do not build tests with FEATURES="-test", bug #226221
-	"${FILESDIR}"/${PN}-2.24.4-build-tests-asneeded.patch
-
-	# Disable broken test, bug #285706
-	"${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch
-
-	# Fix for automake-1.13 compatibility, #466944
-	"${FILESDIR}"/${P}-automake-1.13.patch
-
-	# Fix gnutls-3.4+ compatibility, #560084
-	# always use system defaults (patch from Arch Linux)
-	"${FILESDIR}"/${P}-gnutls34.patch
-
-	# Fix build with openssl-1.1 #592540
-	"${FILESDIR}"/${PN}-2.24.4-openssl-1.1.patch
-)
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-schemas-install
-		--disable-static
-		--disable-cdda
-		--disable-fam
-		--disable-hal
-		--disable-howl
-		$(use_enable acl)
-		$(use_enable gnutls)
-		$(use_enable ipv6)
-		$(use_enable kerberos krb5)
-		$(use_enable samba)
-		$(use_enable ssl openssl)
-		$(use_enable zeroconf avahi)
-		# Useless ? --enable-http-neon
-
-		# fix path to krb5-config
-		KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
-	)
-
-	# this works because of the order of configure parsing
-	# so should always be behind the use_enable options
-	# foser <foser@gentoo.org 19 Apr 2004
-	use gnutls && use ssl && myconf+=( --disable-openssl )
-
-	#bug #519060
-	#configure script is so messed up on res_init on Darwin
-	[[ ${CHOST} == *-darwin* ]] && export LIBS="${LIBS} -lresolv"
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure "${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_test() {
-	unset DISPLAY
-	# Fix bug #285706
-	unset XAUTHORITY
-	virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/gnome-base/gnome-vfs/metadata.xml b/gnome-base/gnome-vfs/metadata.xml
deleted file mode 100644
index 7b343b06be8a..000000000000
--- a/gnome-base/gnome-vfs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index cf90d2436096..4182328a1e66 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,6 +1,4 @@
 AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec9844843793dc568e3012d3cd80c7a5f7a921e8dcc42406c6e15010fa472edf9cb10b7c86d1f8f69da2f6a3a034b7 SHA512 190129064554a36b56ba308f8dd75a9b8ee5ccfadffc0b5d528b5ba70324bcb3436acab116ad7768f59d316c3c2bd85dad9e8147050cb475b21fce439cb92705
-DIST gsettings-desktop-schemas-41.0.tar.xz 705240 BLAKE2B 2f2eb797fbdb7317666839a4ddffd65405ddcca80724a480bd1decfc164acc4c0db193ca6a3e3bcd71fbeb479fe51c5262c0bcf40fe85cfb2d6bda5b47d5b6e5 SHA512 58f9f60d818f0ddce20ad70e6ca64d3e1fb5a5dfd45b737cc055901f7dd5f1625902451e765a26969bdd72e3b37300dacbd3555a4bc3f33c6667dbf9b1869739
 DIST gsettings-desktop-schemas-42.0.tar.xz 709372 BLAKE2B abe682b32dc3c419a65b3752b9fa6821ed0058f06a4b123728a8d095ff3b6f65b569d9b80d43aac28fa5d79439c316cb628f0c63cd500c7ebc40cc4eff704bdb SHA512 db73988a6b38857d1aa6588ccac42099c57dcc187ef01776567cc7c28aff67dc06d6a8a067e0c69167d03cd865f0c1d58e75469a40f969084bb2537b088f8664
-EBUILD gsettings-desktop-schemas-41.0.ebuild 1123 BLAKE2B e84b22f96f0e9f4c2ad9a89e0fc1a6e6c6d8801e599938740e4a72a892f2acd288ee5904f95627a53b1017a0f079a306bef079aee9da9690fbc1c986196c39bf SHA512 89715cbac35329caeee9486cacfbe3481e1cd0cc104bd6cc530a87d66f80c18a8c76ff005c07fd99ab9cbe71ea9d3cfebd7a752459665b3f8390bc692a67dfb6
-EBUILD gsettings-desktop-schemas-42.0.ebuild 1131 BLAKE2B 06bda37dd9ef06b89fbfe3d8b795c638be5cf9ac066c995489875f4e04d02ecb9c12f3ee6ce15b42b995c7ad7c68accf3983079dac16b1d4605a4baa20d0bccf SHA512 48349d9f5b74a149d6993dd49b8949317e564b946d03a6c6e48badc8be51d4fcbdaec72dc0521682bdec7b7d67a3fbab85d0ae138d5d7c726abf4b3422a7be9d
+EBUILD gsettings-desktop-schemas-42.0.ebuild 1130 BLAKE2B 0f0d8ddc1f7a5de95d5c650b2c548b297f80a7487cb1fb1685f8565a3ec056890e70a08b8523188bfccbdaa6a01afce7e5056734a798387feb55a8d20d0c1e3e SHA512 47ab05a968c72c5036335b04dc6d200ff10ddffb9cca60df0292c7b92ace9b10aff5c0d4680909e0a91c01a200b286784f0b3cfee69a0ecf44e54c6a523f241b
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-41.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-41.0.ebuild
deleted file mode 100644
index 9e31a5c70b79..000000000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-41.0.ebuild
+++ /dev/null
@@ -1,48 +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 gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+introspection"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
-
-BDEPEND="
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-
-PATCHES=(
-	# Revert change to 'Source Code Pro 10' and 'Cantarell 11' fonts back to generic sans and monospace aliases
-	"${FILESDIR}"/3.32.0-default-fonts.patch
-)
-
-src_prepare() {
-	default
-
-	python_fix_shebang build-aux/meson/post-install.py
-}
-
-src_configure() {
-	meson_src_configure $(meson_use introspection)
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-42.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-42.0.ebuild
index 9af8626a7cbc..e0551890bd14 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-42.0.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-42.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
 BDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 9f08fb61a2bb..c444ef2cabd3 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -2,7 +2,9 @@ AUX meson-0.61.patch 985 BLAKE2B 39f9a905a69f1cc724a04ce5c994f00ccf4272ac4038d95
 DIST gvfs-1.48.1.tar.xz 1225916 BLAKE2B f2c46d94ba68065fcaef93cfaf25d5d6cc2fbbf4c1842452d30a9fec2ac5259b440fe569411cf3a874d3464f8d001ef2d04a705230a21b381ff1c3abe9c0f16e SHA512 19a642bcfce37eaa0d2d9f509fed6c67abfea0f79f5be9a17074d20e9ba71252a13583a2e08de88718cb141c5e79e34c84c765c87160351fe21291a8f88abe8c
 DIST gvfs-1.50.0.tar.xz 1213456 BLAKE2B a560794677693f449fd71f314d18a8ad8bb38ce6ac6eb312d020fd4ed2b55c9e1939cecc993869b3f489c0ebddfa057bf76af04e6c6f700323dc7b99fa052af1 SHA512 6eea3c59b239fe9674a83db4e182c0ea2ab7d56e29f5d5c4a7af9cb3cb0fd9222721796754f2f502291049c158e8bd3771cbc5262d10bfa684c207cb3281dcce
 DIST gvfs-1.50.1.tar.xz 1214536 BLAKE2B 678c89d08255e577afb3a4999cef341fc5449c5ab615c5e089b14cbd2d0a882830dff71af6ab7a978d8b23a3aaeea197badd21d8c4e702588e626f3b4d917c55 SHA512 7a1ea47658dbd74673e1aea7c344d3f9e8a26fab844a26220cedcb19da6b4a0cac6b369d2b5107f649d6e7b2331894c89df04c6dce3630be4b289e23f56127a5
+DIST gvfs-1.50.2.tar.xz 1214464 BLAKE2B 3fbd461cd640fcb956158e6fce97cb6cb7c30e444c5955ee197f827273271b876de62469daee994586b2bfe6ab7ab41d8a9eb2f346a0b9ed45289d9d516f5bf5 SHA512 980ff8a857ad4dc820685a9331d875274f893aebf8aca406c8ee06e2a25026fc51572515f3ccaa06062314f7f5f8d1982c5813d235bd7d81b975874e1796ca04
 EBUILD gvfs-1.48.1-r1.ebuild 3917 BLAKE2B 06f752d9d82ec7144e6957ee018fc86228952c8c50428e13d9df121455ff1b1d7d7afd3f8bdda4393d30bcdb2e3b6c26f028901269262930d1f59e80aebfbed7 SHA512 0a542600b93a05ccc4ad3f10d20bcdf05d15c0757a19008e524ce5ba0d64a1ce79b33733987794799180f1a957e7d812e092de17ea9056f826a0baae614fc553
 EBUILD gvfs-1.50.0.ebuild 3905 BLAKE2B 4f4815a8cc27343fbfb67b7b04d60a52d121587653d56905f076956a1cf97fdb87bec0825bf9851f89cc74f7140089c6d50aceb4b243833c748119aa13ce10b1 SHA512 d12ec5475e7909f3397e852c20e06e01c2189fdc12625a8fa81ff79b2205323b2e22bd85d799304cca39360ca9097cf6cbbf45d7708f5ebc82d9c8fd9d34cb19
-EBUILD gvfs-1.50.1.ebuild 3905 BLAKE2B 4f4815a8cc27343fbfb67b7b04d60a52d121587653d56905f076956a1cf97fdb87bec0825bf9851f89cc74f7140089c6d50aceb4b243833c748119aa13ce10b1 SHA512 d12ec5475e7909f3397e852c20e06e01c2189fdc12625a8fa81ff79b2205323b2e22bd85d799304cca39360ca9097cf6cbbf45d7708f5ebc82d9c8fd9d34cb19
+EBUILD gvfs-1.50.1-r1.ebuild 3907 BLAKE2B 2c5989a41a1453c73c4526f9529dacb871e72e0ed63aa4abff722c4c9aa86f8e50ece57d88019c18606bccb9c124d201c978e19d16be694e4192fee12b6f8497 SHA512 5ef9b6478d8455062a4e157dae80369a15ba76e91b240eb60a3283908d68f195150ac9c4e0821fbcec74c290a8c55d59cba607629d1421f97019df85666ffa83
+EBUILD gvfs-1.50.2.ebuild 3914 BLAKE2B 34fa55a841d9f5e6525a2d3fbfc9a7a7e90a6c3e348832198df8bbad3b2c2cbb15a8bf0655bd5028762d24277a90d731b8481656205d200e0f84bc3f67901c29 SHA512 0498fa1a457eaffd43f5701a9b957d6f43e98738ed5ec178e77122b8e5cfcc1db4c9a74c827e384b52199ed6c0146436319e015019d674ab86a1be6b5c56eda7
 MISC metadata.xml 1700 BLAKE2B af3b3595b38c93739128edb4678d17d1166b91abf851098b892c7240bff0f98886bd39a1bd85a218a8378dc9f7df9759e4ced4ce8183b652f6e1d27900e22220 SHA512 7b4f4d8abda474c6670d3ef278801d61d285ba48b07f7023ddee5eaba01ed695edd16ed946afa5c90baf394e87b3bfff6135380e4f3698e188a209f954b6cabb
diff --git a/gnome-base/gvfs/gvfs-1.50.1.ebuild b/gnome-base/gvfs/gvfs-1.50.1-r1.ebuild
index 61a64ed1d03f..0d640c04c48c 100644
--- a/gnome-base/gvfs/gvfs-1.50.1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.50.1-r1.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	mtp? ( udev )
 	udisks? ( udev )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.70.0:2
@@ -67,7 +67,7 @@ RDEPEND="
 	)
 	google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] )
 	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
-	nfs? ( >=net-fs/libnfs-1.9.8 )
+	nfs? ( >=net-fs/libnfs-1.9.8:= )
 	net-misc/openssh
 "
 DEPEND="${RDEPEND}"
diff --git a/gnome-base/gvfs/gvfs-1.50.2.ebuild b/gnome-base/gvfs/gvfs-1.50.2.ebuild
new file mode 100644
index 000000000000..3d0944f5334d
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.50.2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TMPFILES_OPTIONAL=1
+inherit gnome.org gnome2-utils meson systemd tmpfiles xdg
+
+DESCRIPTION="Virtual filesystem implementation for GIO"
+HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
+RESTRICT="!test? ( test )"
+# elogind/systemd only relevant to udisks (in v1.38.1)
+REQUIRED_USE="
+	?? ( elogind systemd )
+	cdda? ( udev )
+	google? ( gnome-online-accounts )
+	gphoto2? ( udev )
+	mtp? ( udev )
+	udisks? ( udev )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.70.0:2
+	>=gnome-base/gsettings-desktop-schemas-3.33.0
+	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	sys-apps/dbus
+	app-crypt/gcr:=
+	policykit? (
+		>=sys-auth/polkit-0.114
+		sys-libs/libcap
+	)
+	http? (
+		dev-libs/libxml2:2
+		>=net-libs/libsoup-3.0.0:3.0
+	)
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+	udev? ( >=dev-libs/libgudev-147:= )
+	fuse? (
+		>=sys-fs/fuse-3.0.0:3
+		virtual/tmpfiles
+	)
+	udisks? ( >=sys-fs/udisks-1.97:2 )
+	systemd? ( >=sys-apps/systemd-206:0= )
+	elogind? ( >=sys-auth/elogind-229:0= )
+	ios? (
+		>=app-pda/libimobiledevice-1.2:=
+		>=app-pda/libplist-1:=
+	)
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= )
+	gnome-keyring? ( app-crypt/libsecret )
+	bluray? ( media-libs/libbluray:= )
+	mtp? (
+		virtual/libusb:1
+		>=media-libs/libmtp-1.1.15
+	)
+	samba? ( >=net-fs/samba-4[client] )
+	archive? ( app-arch/libarchive:= )
+	cdda? (
+		dev-libs/libcdio:0=
+		>=dev-libs/libcdio-paranoia-0.78.2
+	)
+	google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] )
+	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
+	nfs? ( >=net-fs/libnfs-1.9.8:= )
+	net-misc/openssh
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	test? ( dev-libs/libgdata )
+"
+
+src_configure() {
+	local enable_logind="false"
+	if use systemd || use elogind; then
+		enable_logind="true"
+	fi
+
+	local enable_gcrypt="false"
+	if use afp; then # currently HAVE_GCRYPT and linkage only used with afp; check it on big bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes
+		enable_gcrypt="true"
+	fi
+
+	local enable_libusb="false"
+	if use mtp; then # currently HAVE_LIBUSB and linkage only used with mtp; check it on big bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes
+		enable_libusb="true"
+	fi
+
+	local emesonargs=(
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+		-Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
+		$(meson_use policykit admin)
+		$(meson_use ios afc)
+		$(meson_use afp)
+		$(meson_use archive)
+		$(meson_use cdda)
+		$(meson_use zeroconf dnssd)
+		$(meson_use gnome-online-accounts goa)
+		$(meson_use google)
+		$(meson_use gphoto2)
+		$(meson_use http)
+		$(meson_use mtp)
+		$(meson_use nfs)
+		-Dsftp=true
+		$(meson_use samba smb)
+		$(meson_use udisks udisks2)
+		$(meson_use bluray)
+		$(meson_use fuse)
+		-Dgcr=true
+		-Dgcrypt=${enable_gcrypt}
+		$(meson_use udev gudev)
+		$(meson_use gnome-keyring keyring)
+		-Dlogind=${enable_logind}
+		-Dlibusb=${enable_libusb}
+		-Ddevel_utils=false # wouldn't install any of it as of 1.38.1; some tests need it, but they aren't automated tests in v1.38.1
+		-Dinstalled_tests=false
+		-Dman=true
+		-Dprivileged_group=wheel
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	if use fuse; then
+		tmpfiles_process gvfsd-fuse-tmpfiles.conf
+	fi
+
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	gnome2_giomodule_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+	gnome2_giomodule_cache_update
+}
diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest
index cc214e279075..2c6ae19d7274 100644
--- a/gnome-base/libglade/Manifest
+++ b/gnome-base/libglade/Manifest
@@ -3,5 +3,5 @@ AUX libglade-2.6.3-fix_tests-page_size.patch 369 BLAKE2B 0994633712e71d4d1919dbf
 AUX libglade-2.6.4-enable-extensions.patch 225 BLAKE2B 668fb60395b401e3acc9f93ab049a13621e404b7e3e9a7ee265bac6850eae20db0957064726fe9b4a8f9403ec60398585dec2c7762c65daef824eb8f444b295a SHA512 e9cf514612790984110f9c5dc8fe12f5e2b4707ea469a803f0db24dc1ff7561411e6e47faafa71037e23daa1a21b1bc8ac7fc6e699508c76e9cb5b4cf8c10fde
 AUX libglade-2.6.4-gold-glib-2.32.patch 544 BLAKE2B 0a7b0c89eab5e17788528743aa894f485e19bcc84f2175e1a4c64363ef3c0924e9fd7fdd7b20ff01a899cfbdb549ac00fc375e4b47cef98bc118a288ca332621 SHA512 d2d77d6e4d2bfe426222231dbca29b6003d33e3964ea6ab25f2f2c11d3b52ed9d1379c5f5d727980ad16b6db8d7bab2dc540830e169b70ce24e9afd8c170a1d8
 DIST libglade-2.6.4.tar.bz2 356119 BLAKE2B 7132a12affc4b6954eb9565236ca64a0f13f369dba630c14fdbb66a35d2273e8dd371baaad80ce97fd4480a6795629dd7f3bbee90a34b09c85041907a054f5c3 SHA512 b725842febaf4c1f0d305a629ae1c61ea2de24dd6f41937e806c078fada2cea483195ef40f5238ce2045e47130c92559e984f677de667b840dd7fff0f8559735
-EBUILD libglade-2.6.4-r3.ebuild 2477 BLAKE2B 49426139774a264cf1fcf16b61449faffa4bd05966818bd7a84a645bc6b55b5b21e6425ee9b8e01a4381c7e755ae271e4b89fda710a7d630c10f56c4f7b18270 SHA512 8ce820ea78edda7630264a24ddb5e9b94071b54bdff5b439dd8396b7e819b2368da9a9aa97b034a49c061ec11cb5bb114f46bf6e5d752ca49ae728915a0a1236
+EBUILD libglade-2.6.4-r3.ebuild 2484 BLAKE2B db94550d36c6bbdcf68ea9025fc47dd1069380338e3fdedeaa36a2e69fa12d5f71dcffac1cd22cfc4d7bd2d51a286d749e6b3dd4f96fa65a5c274a0bec79d49a SHA512 c43b0e74e4f7e30ab6d7fe6a86cfdd3990fe5c2d151154740217087048e5640fce9046cdb98f7797f5aa4fab02b0df998938093d641289872b87f113facd6c7b
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-base/libglade/libglade-2.6.4-r3.ebuild b/gnome-base/libglade/libglade-2.6.4-r3.ebuild
index a287de2c2511..a8716da208ef 100644
--- a/gnome-base/libglade/libglade-2.6.4-r3.ebuild
+++ b/gnome-base/libglade/libglade-2.6.4-r3.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=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://library.gnome.org/devel/libglade/stable/"
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest
index 862257dd52f4..d750dbad4662 100644
--- a/gnome-base/libgtop/Manifest
+++ b/gnome-base/libgtop/Manifest
@@ -1,5 +1,5 @@
 AUX 2.40.0-sandbox-workaround.patch 890 BLAKE2B b231acfa4f15b04d5148864da0ef32f08c65fd4ddcda940cd39d832bc30d46edb8f48633e08974521abee126251e5e80693bb224f0630f17065e7c5580ba9439 SHA512 ec5b1f9e9b8174dee576370ccfeb2d758ad5369c1ffacc7d8840f9936046fbedfd0d3e1e2b024606d33a32da59c65cdf204ba98fb108a92dcff660b0769d71b6
 DIST libgtop-2.40.0-patchset.tar.xz 9700 BLAKE2B 0d7e42b12fe0989df8e5abd1d45578acb97981c05c43aeeea57ba38f526e61aaa9507cd9520a20634f4559b4dfe60efd368d343f2d1ac6803e33bc5dc4832522 SHA512 15b5a81f4ec7a3e921a2c114e8f57dcca194e38849e09080c55a3a16078a8ec706f8efef6d4b22931927e7ab7789596e85054ccd85f37d6dd3206c962734960b
 DIST libgtop-2.40.0.tar.xz 744316 BLAKE2B 3ffd11937e29aacc4b0d5569429ec92835a3743d7cb65336c5c36165b1bb0d817629e73db88c29eff4baf4965791497a8676a897d0de9b394f583fb2cab15b3a SHA512 a9b2135796d7e41c63a6621f672c385d1baeb74d4af3e55c9164aaaae18c66a8a76b09a6ae8b37f89f120092123c38830e0da840c6613a09035ea62339117861
-EBUILD libgtop-2.40.0-r1.ebuild 1230 BLAKE2B 979edc6d29be4cf1600ede999f2cf44b892238bb1d72fc5e346e620622e60972aa5f2f4a20a757a4771d14f16772fa301f76018f9182db8f85b7d40a21b4b335 SHA512 5284ead796d224541fe3cb601a77d394754a4829e444974d8608aac52a088b95cec13a9e824e55c5804de47a3690f5d7c56ab7d53a87e5dcc66a07bfcfde78c1
+EBUILD libgtop-2.40.0-r1.ebuild 1237 BLAKE2B fa027c28549b2458b8beb9db18ed4f2de24aff23d88e5ee11c99225bfe4dc4bcc9494d6cd304f98bb119401e06ce91ce1bbe81f8ebb3edb111939502dc35b4a0 SHA512 073209f56c4fa66b5f2f57ed0b913d686b4e5e6e9cb694ca22c169685f0c77436664defee690e2bbfc27b6f20a78ff80892c11df40205653fad143fa78314f65
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild b/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
index dc57dc6714f5..553d12ec96ad 100644
--- a/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
+++ b/gnome-base/libgtop/libgtop-2.40.0-r1.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
@@ -11,7 +11,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="2/11" # libgtop soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 3eab44ce71ef..5e4ff12f1e6c 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,13 +1,8 @@
 AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f05006094106a17fdb61b1bf2e6210f42fe91716e7fd21cf40ad5adecfee45b9e1d488249d1befdb48399c5952829c3d01e07 SHA512 bea056ac4d3d19719129dd7379d783a8eb34efbf57186f6ab7113ff97fdd809b0802d60add646ea50c776eb7bc07f5a0f4c0911569a2b1b24dbb1683f111d7c0
-AUX librsvg-2.54.1-build-Add-enable-gtk-doc-flag.patch 2171 BLAKE2B b9ef76f832fdb18daae53652908d1f59042448420b63239a7434a5f350bb4e1ce9c4b54eb85e1ab9c0ec593c4f9882b66fbb3b00d9f7dcaddd526e69b00705f7 SHA512 34d0fc111b2ef09076bf6d011a0ed14d56370ece58db31e460d84177154fa058b8c77b54987c23333a47dbba58380813b656cec6818added7f0e897d7154973f
 DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
-DIST librsvg-2.52.6.tar.xz 23662708 BLAKE2B 21108297aa4f87a852d0decb9cc7b8a5cdb546e00075d16f0f86502752adc176a67b56607eb90b034ca4e2dddbf8f82a3d81727496a5ae1a2b94715cdbbd87ac SHA512 be4830fb34c4859bdbe0c86da7b5de0807f28bb63fc124b4405ca8f9ef6ee45add77b4c43b9031d00157870eceb458df30cf5ee25e73d3894797d622b465f38d
-DIST librsvg-2.52.7.tar.xz 23709632 BLAKE2B 4eb83d71b77b851c408ddba711fe39ed23863aa6466634020a19ffc30e00c12f7dea81f11fdc09eb53c0c72efb35adc4528568b3c27e5dc0e886426d145d347f SHA512 15c075d696ebba35555f93456be088e6398da5b7992119edc78f1ee1d376a70425248e36b138dc86234aec13cb139fded11d6d74523c44f9a49eb19c2151fcb7
-DIST librsvg-2.54.0.tar.xz 23489972 BLAKE2B 04fcbb688b18e98dcbef81e84106a99280d45f242152a355ac6f202410c13b289b281bd10f9e77854997362b7d3e88832d3274d7d63ace8adc05613da99e2aab SHA512 3357ca8cf7537fe2792ee2d9a1719622656f3e1d7f30da062799a4b3ca8788cc07333a00e1c9da53a53da2b67a2aa5895a4c8fce35003da659fb7f98048b68eb
-DIST librsvg-2.54.1.tar.xz 28181768 BLAKE2B 86e1cf01febce55acadc9b05f5e08fda69423ab267ab8330bbf892d63f475d5ddd163099346f3cf1e63bf2807d847440cf48d8b24f3c32b3ab14a35c0c54d96e SHA512 d1ea8a49988fed1d7a2ba21540a6c10084cd78f8b6db3534882d086a09f3a0d96ec80c59b3744a6eeef8ae511f0b0152eaf18cc9a134f4b871a993418cae09a6
-EBUILD librsvg-2.40.21.ebuild 2600 BLAKE2B 21f2ee7a8c11fc1d1dea3ff8cc804951fbeb5b555841b79a9230a7c67ef9d2c6ae571a5b775835565f9995b134eede674a5f254b568dab34bd1cb30603461f76 SHA512 be3bfd885134bfbc97170d7349689e54d0be0eece6b4a85e4761ec697bb496aa2c2723c6e82b97df29dc6a7e4676a7bec3c83a00a3a33f6d0fca4187bef5d4a7
-EBUILD librsvg-2.52.6.ebuild 2533 BLAKE2B 6ca050d7e942cbad64bedbeefbe2f14fadb86b3f121e1fef6eb686f811e88815a59d6f5615a870c9c08bf678ae5c51ac0481d4d9b7193a48edc55b5d6fd09755 SHA512 d7b8b9b48bae3ef5cf8e8723fa23a94df8f6355c14b2bdccaedfb8649b9bac5c66a86a113e65594e7277139628dee2c2f311d82ec00d84b7a49d759e2f5f9788
-EBUILD librsvg-2.52.7.ebuild 2538 BLAKE2B 94f34eae9a6ec5584a591ccba117611df6e322db538e707e773970431aa9e4a6217c7901487a2ddceebdb7da2c110e3884a9bf7d10dafcd49d9cbe05218c0727 SHA512 9578a4ba5bfd9f3222f367fb4be6ab509b376fe7c3cf59860b9e447552947779921bdcd0de7ae35193eb46b9afc49767da6a900572a53036cd44e1f1b4d7d93f
-EBUILD librsvg-2.54.0.ebuild 3077 BLAKE2B 6eaeed128935c3930360e06e70ebd5efd8d832438486e7261c5d4c9d62f5cd5e0d97b0f5537e5f9c856e55d571d811743f9b2492c3d517a9233c80f4c4128931 SHA512 e97f2697e41de6d474ef7c587885d10f20ea2aa25655d468725edf6f6892b7c69c7b0ad34b9197cfed4a58751755a80083aa4bb5cd7ce1f7f3ce83b5f2dd90b5
-EBUILD librsvg-2.54.1.ebuild 2889 BLAKE2B 172441dab4b98ff288eb10c78ed44687e02a892119a0ee8c00e5603c23cf78984b87d3090aee5975d947d8d0bdca5b0a0a42b1aad4a33d3786ee6f9b0df08995 SHA512 cd6686b4266dab735d21d94e9489bdc076def911b7feed2ee043d1d4a031f36e8004585a2b15146221b553508d7c4c5e84c660233d3580646821c226a741fefb
+DIST librsvg-2.54.3.tar.xz 28215048 BLAKE2B 3685b9c0eb923874e6829c365f437095b595ccea997b7b1411ab82117d09b84261241594959a049bd712fc0791d359c6bf536acfe022c44bcbd7804a2a59ef28 SHA512 153bb9d5b2e04ac87127663ab2cae1ae9e3c23666e54234efb3e247a6c3fdd67701f8baa31e06bba673c0cfc71202001c46fb8e0398770dfbc59e10f6de78077
+DIST librsvg-2.54.4.tar.xz 28214908 BLAKE2B 9aab1175494e50c9b4a1b74c76c0db4f052e42d98e48842c87a5434382983fc63f41923c67dc86c31988c114c4a18056d52a99c8ac2d5c1dd90af3da4814e4ac SHA512 e3415044a4faa48ec83e25cbd86dfbe7bc997286269298fb913a61a13d55195f660bcef459950979c2b8d60b144b29e33b278b2c4da0c376de65c34f39687e9a
+EBUILD librsvg-2.40.21.ebuild 2607 BLAKE2B e1c974514e0deb7c81ff027747a00bb8bfb1902a140711a7207e4d126c59ef5ebc0252cb64c6ff379822db65bcf3b60992ec72accf3d1d3d6681ea65d1df6b49 SHA512 a2ba181144cb049e66af4743e1b84ff3865d7aed0b4c1f06c985616fb1fc72f39845926def6b81fafef041f59bbaa8b136782be1de99127af651d2b916724ed4
+EBUILD librsvg-2.54.3.ebuild 2809 BLAKE2B 732ecd76072d64e43e9f48e44bc2d7ef30196dd688d60aac56b141385aa2f163ae3af8a1e0f456fce8a747fd8cd592fd0ebc5557db810e84c2f326dbb34b3d83 SHA512 1fa43b593333ee9ad9187a791a59988240fca44d3db2880ee4324b3a917054bc8cd2b9bdcf51a22da1f7b69cc4504abe60b8f010598142a94aa11a6f0b21b5cf
+EBUILD librsvg-2.54.4.ebuild 2770 BLAKE2B d294412c056957f34e47f3951b6763e60cd053fe3fd1c2ab0f4fff061566bcb288da975f04d9821a5e9e173a3e32314e2a2ad63ac7750ed86c589b27fd37eecf SHA512 729205c198e91bcdac79ac9df3c48b2e184bdf3267afb03b2b568a6bfbb6384e7faead9031b0e1c8f894b4c4581d837f0f5d282bf860be456584da1c0a2d80c8
 MISC metadata.xml 312 BLAKE2B 9a8c74fbf88673a6fee588b6c7368d4d40287b3dbb46d591878f5744ce3eaf5fc6b4e711cd50d2ff830e9c0139cd99f629cb378039376dded59373216ec19038 SHA512 0715a267ceda6ecb4d9499951b0d3343b5ccedbfc85441f3001d9293dfdd2d31b214f907c5466676cce899c67f4249cf4b643a46b4d16e1ab6b89ccaac763e26
diff --git a/gnome-base/librsvg/files/librsvg-2.54.1-build-Add-enable-gtk-doc-flag.patch b/gnome-base/librsvg/files/librsvg-2.54.1-build-Add-enable-gtk-doc-flag.patch
deleted file mode 100644
index ee5c3bce0a5c..000000000000
--- a/gnome-base/librsvg/files/librsvg-2.54.1-build-Add-enable-gtk-doc-flag.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/692
-
-From 1c53068cbcfccb9c663dea2d1a61c8d7b24d317a Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 26 Apr 2022 15:01:55 -0700
-Subject: [PATCH] build: Add --enable-gtk-doc flag
-
-gtk-doc documentation relies on introspection, and introspection doesn't
-cross compile well, so it's nice to be able to disable documentation.
----
- Makefile.am  |  2 +-
- configure.ac | 19 ++++++++++++++-----
- 2 files changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 83e73c38..1e1ce856 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--if HAVE_GI_DOCGEN
-+if ENABLE_GTK_DOC
- RSVG_DOC = doc
- endif
- 
-diff --git a/configure.ac b/configure.ac
-index 9abc587e..6cced25c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -123,11 +123,19 @@ AM_CONDITIONAL(HAVE_RST2MAN, [test "x$RST2MAN" != "xno"])
- 
- dnl Gi-docgen
- 
--AC_CHECK_TOOL(GI_DOCGEN, [gi-docgen], [no])
--AS_IF(test x$GI_DOCGEN = xno,
--    AC_MSG_WARN([gi-docgen not found - not building docs])
--)
--AM_CONDITIONAL(HAVE_GI_DOCGEN, [test "x$GI_DOCGEN" != "xno"])
-+AC_ARG_ENABLE([gtk-doc],
-+              [AS_HELP_STRING([--disable-gtk-doc],[Disable building documentation (requires introspection)])],
-+              [enable_gtk_doc=$enableval],[enable_gtk_doc=auto])
-+
-+AS_IF([test "x$enable_gtk_doc" != xno],
-+      [AC_CHECK_TOOL(GI_DOCGEN, [gi-docgen], [no])
-+       AS_IF([test "x$GI_DOCGEN" = no],
-+             [AS_CASE(["$enable_gtk_doc"],
-+                      [yes], [AC_MSG_ERROR([gi-docgen not found - cannot build docs])],
-+                      [auto], [AC_MSG_WARN([gi-docgen not found - not building docs])])
-+              enable_gtk_doc=no]
-+             [enable_gtk_doc=yes])])
-+AM_CONDITIONAL(ENABLE_GTK_DOC, [test "x$enable_gtk_doc" = xyes])
- 
- dnl ===========================================================================
- 
-@@ -359,4 +367,5 @@ librsvg-$VERSION
- 	Build introspectable bindings:  ${found_introspection}
- 	Build Vala bindings:            ${enable_vala}
- 	Build GdkPixbuf loader:         ${enable_pixbuf_loader}
-+	Build developer documentation:  ${enable_gtk_doc}
- "
--- 
-2.35.1
-
diff --git a/gnome-base/librsvg/librsvg-2.40.21.ebuild b/gnome-base/librsvg/librsvg-2.40.21.ebuild
index bbd1656e7ba5..983b8aab8e94 100644
--- a/gnome-base/librsvg/librsvg-2.40.21.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.21.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
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha arm hppa ~ia64 ~mips ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha arm hppa ~ia64 ~loong ~mips ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection tools +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gnome-base/librsvg/librsvg-2.52.6.ebuild b/gnome-base/librsvg/librsvg-2.52.6.ebuild
deleted file mode 100644
index 28767f1a0cdb..000000000000
--- a/gnome-base/librsvg/librsvg-2.52.6.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION=0.46
-
-inherit gnome2 multilib-minimal rust-toolchain vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-
-IUSE="+introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[glib,svg,${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.46.0[${MULTILIB_USEDEP}]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
-"
-DEPEND="${RDEPEND}
-	>=virtual/rust-1.52[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
-
-QA_FLAGS_IGNORED="
-	usr/bin/rsvg-convert
-	usr/lib.*/librsvg.*
-"
-
-RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc.
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-static
-		--disable-debug
-		$(multilib_native_use_enable introspection)
-		$(multilib_native_use_enable vala)
-		--enable-pixbuf-loader
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# Set the rust target, which can differ from CHOST
-			RUST_TARGET="$(rust_abi)"
-			# RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as
-			# far as C parts and configure auto-detection are concerned as CHOST equals CBUILD
-			cross_compiling=yes
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure "${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_compile() {
-	# causes segfault if set, see bug #411765
-	unset __GL_NO_DSO_FINALIZER
-	gnome2_src_compile
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	multilib_foreach_abi gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	multilib_foreach_abi gnome2_pkg_postrm
-}
diff --git a/gnome-base/librsvg/librsvg-2.52.7.ebuild b/gnome-base/librsvg/librsvg-2.52.7.ebuild
deleted file mode 100644
index 083436b27fac..000000000000
--- a/gnome-base/librsvg/librsvg-2.52.7.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION=0.46
-
-inherit gnome2 multilib-minimal rust-toolchain vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-IUSE="+introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[glib,svg,${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.46.0[${MULTILIB_USEDEP}]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
-"
-DEPEND="${RDEPEND}
-	>=virtual/rust-1.52[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
-
-QA_FLAGS_IGNORED="
-	usr/bin/rsvg-convert
-	usr/lib.*/librsvg.*
-"
-
-RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc.
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-static
-		--disable-debug
-		$(multilib_native_use_enable introspection)
-		$(multilib_native_use_enable vala)
-		--enable-pixbuf-loader
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# Set the rust target, which can differ from CHOST
-			RUST_TARGET="$(rust_abi)"
-			# RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as
-			# far as C parts and configure auto-detection are concerned as CHOST equals CBUILD
-			cross_compiling=yes
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure "${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_compile() {
-	# causes segfault if set, see bug #411765
-	unset __GL_NO_DSO_FINALIZER
-	gnome2_src_compile
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	multilib_foreach_abi gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	multilib_foreach_abi gnome2_pkg_postrm
-}
diff --git a/gnome-base/librsvg/librsvg-2.54.1.ebuild b/gnome-base/librsvg/librsvg-2.54.3.ebuild
index 656e02c638ae..8ef771052666 100644
--- a/gnome-base/librsvg/librsvg-2.54.1.ebuild
+++ b/gnome-base/librsvg/librsvg-2.54.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 
 IUSE="gtk-doc +introspection +vala"
 REQUIRED_USE="
@@ -50,10 +50,6 @@ QA_FLAGS_IGNORED="
 	usr/lib.*/librsvg.*
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-build-Add-enable-gtk-doc-flag.patch
-)
-
 src_prepare() {
 	use vala && vala_src_prepare
 	gnome2_src_prepare
@@ -100,7 +96,7 @@ multilib_src_install_all() {
 
 	if use gtk-doc; then
 		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/${PF}/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die
 	fi
 }
 
diff --git a/gnome-base/librsvg/librsvg-2.54.0.ebuild b/gnome-base/librsvg/librsvg-2.54.4.ebuild
index efdb0bdf2148..5437b1fed3c2 100644
--- a/gnome-base/librsvg/librsvg-2.54.0.ebuild
+++ b/gnome-base/librsvg/librsvg-2.54.4.ebuild
@@ -2,21 +2,23 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION=0.46
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit gnome2 multilib-minimal python-any-r1 rust-toolchain vala
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
-IUSE="+introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
+IUSE="gtk-doc +introspection +vala"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc.
 
 RDEPEND="
 	>=x11-libs/cairo-1.16.0[glib,svg,${MULTILIB_USEDEP}]
@@ -33,25 +35,21 @@ DEPEND="${RDEPEND}
 	>=virtual/rust-1.56[${MULTILIB_USEDEP}]
 	${PYTHON_DEPS}
 	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
-	dev-util/gi-docgen
+	gtk-doc? ( dev-util/gi-docgen )
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
+
+	dev-libs/gobject-introspection-common
+	dev-libs/vala-common
 "
-# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
+# dev-libs/gobject-introspection-common, dev-libs/vala-common needed by eautoreconf
 
 QA_FLAGS_IGNORED="
 	usr/bin/rsvg-convert
 	usr/lib.*/librsvg.*
 "
 
-RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc.
-
 src_prepare() {
-	# Documentation is built unconditionally and depends on introspection,
-	# but introspection is only built for the primary ABI.
-	# Disable documentation and manually build the doc subdirectory separately.
-	sed -i -e '/SUBDIRS =/s/ doc//' Makefile.in Makefile.am || die
-
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 }
@@ -60,6 +58,7 @@ multilib_src_configure() {
 	local myconf=(
 		--disable-static
 		--disable-debug
+		$(multilib_native_use_enable gtk-doc)
 		$(multilib_native_use_enable introspection)
 		$(multilib_native_use_enable vala)
 		--enable-pixbuf-loader
@@ -85,26 +84,18 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	gnome2_src_compile
-
-	if multilib_is_native_abi && use introspection; then
-		emake -C doc
-	fi
 }
 
 multilib_src_install() {
 	gnome2_src_install
-
-	if multilib_is_native_abi && use introspection; then
-		emake DESTDIR="${D}" install -C doc
-	fi
 }
 
 multilib_src_install_all() {
 	find "${ED}" -name '*.la' -delete || die
 
-	if use introspection; then
+	if use gtk-doc; then
 		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/${PF}/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die
 	fi
 }
 
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index b14f6e8ecd44..f372950f2c79 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,10 +1,7 @@
 AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e894049df2dfdebf75f0f519eb715aba5bd590f4b57a718f78238ee50242215ef2b648fd3e3e8e8dddebc2ff1b45be2 SHA512 3a0925262643eb84d4c1731cad6b3c2c427def000503a3a680b06b68828f53492b4367d02ac6de36c35b6460e3d0967e3ce26203f8257271b222883990047459
-AUX 41.1-optional-gstreamer.patch 1592 BLAKE2B 877421d758d9b0911bc94b3d5132867e3a78532ce90c3e10017b164dcf4ae8f2cd8a49a23878936ed7adfe1112e5fbaff06542a62d7c6a0f515a53cff1dbb03e SHA512 3f1e0cb25237b5c9c6f29a7ac7a50afcf7a1b9844a4a9c6e134cbabebecf374846295de7b5d4416e1def8a1a2fb111e557caf27096836d8d19c51f9325799807
 AUX 42.0-optional-gstreamer.patch 1590 BLAKE2B eb251337ef8f2cba7b0fa9e1643c1155aa36bbc9234f4c5bf6baddd7f91d69e2713172685687a0bbf8fc646a97df857cfbce2a73768beb4eb5dae32ace893d07 SHA512 5f90d946c7bea63da2ca20397b0606747383b781dc972051082596d4fd0522a22c0d40440129e41ff4faeb5e9fcdfc5abb14318a9dade5b0343003bf86c7e339
-DIST nautilus-41.2.tar.xz 3248212 BLAKE2B be4e4e8fc03751259a1a5d4d1eb726e3026d24376da3fa680c412598219bfb3ced52f9b809004913dffdb9bb1c176dede07288c440c100487b3a337d8eaab417 SHA512 adb14fa1cf37a4797f57ae5162bddcd5b012de270cf955051b69276bc266b1dbfd8027b835f627ae19a1252356b344b1c8a4b7ca79a22512f3138a2c13fd2f3e
-DIST nautilus-42.0.tar.xz 3263108 BLAKE2B 0d06a72cc1ea1a227f6d92ee2841a2fdda9220ccb61bdb43cd5930a8f64393994a746e33a5451d460ca4c15810549c5d94f895ee861efa8ae46b98e25ed20f5f SHA512 c3b182f75f89a31ecb7b4f6b42dfb2f9792e195fdaf0e5f2b1a4dbe0f0d01071cf4ecb8408d6da476aa111ec891462e33c0d139d3423109bd5b4138ae822bd1e
 DIST nautilus-42.1.1.tar.xz 3259444 BLAKE2B 4737c44a6b30c61eeb850dce266f5ee1ed50dd5f2c7da868efb4b407e60a99b1ac0ea2c865a3e4710afabfa8c96c8d29f2dfaab3c56c5ef0236fa0c10a8c1864 SHA512 f8961c41fa2d5109e7011311f79caa1d3b9b71a3cf946a90d1a4dd03a4f0f7daac902e61bc01f6b86c2552255b9dbe0573474dcfe2ea08e0218a3c2bcbc58e48
-EBUILD nautilus-41.2.ebuild 3187 BLAKE2B 0ef6a93741ea846684150262e296a5775aef7af8395803ecf683ce093fff3d67df20c3786233afcc790d816996b54ac0d8b6c257f866c11edab76b6b980913ce SHA512 523a7f96bf4d2beed2f3906ee4ed8b73bad71de0b7ce6d1fa952778608b45e25cfebabc9674d1cfba875c18a4fcaa963e20da0a2ff238d9f37c85d5d7499e67e
-EBUILD nautilus-42.0.ebuild 3354 BLAKE2B 4b2e0323f3af8387b8f65917e75c30b01ed137423a60709fbd1768c4b67980a7a74b454ff32ecf24bda025b4283e8ed0a289d1dba2525df7156852e9b70e4f4a SHA512 63037e91cd78ed1dd4b73e30530e2014e29cfd3b1a914345ba968c76186d687c90f08e8c65a03bcfcf63c79b9244d41c3270f34c63409daea78162c3ea46d7db
-EBUILD nautilus-42.1.1.ebuild 3343 BLAKE2B 83bdfb0a1369f74746d28f6eae7ef0eb536180d3c029854026458211499a45921bd49b9d1603c0090c565c74167a8af573b336a25115aaa4ab8f973f34e0ed17 SHA512 bf5dd6f560f0f2825d088b69f3ac262143159b770a3fad87ebe8796dd708d3f50c02a01abb8f3509787fb04dbc5fca90aad09ccf9e7ea77cb12af15cd6f517a5
+DIST nautilus-42.2.tar.xz 3254912 BLAKE2B 303b52fe9bbdb8e437a447004dcd284ee0c66ecaa11db45c52cf8c831f52a764efa03476d69f74840289f200c49b917bc329487bd87d3e776ea5dc1a6ea9b413 SHA512 2b3ba2990b00bbc3abf771b83b9b0a7c1a8b107b1b4955a45879f7d28add713d326bbe84d70056058073edfc3c7b7891547af77b8a34f94fe1b9ca047c76e9c9
+EBUILD nautilus-42.1.1.ebuild 3340 BLAKE2B f2968baf0c7af84edc0d048a40e4edf84d83338d35d57a146bc6ad8dc10867ca3403c7248d0b1b8b530d451cae7299f35a201dca2b100115073acd79e208931d SHA512 465f03fa321f14ef1b8cef926e2c34b4eaa1f648a13f96e273521f193eca174b8b94539701e377f8de9119a1fa2fbbae8cf733511955db6d674007474872b5be
+EBUILD nautilus-42.2.ebuild 3343 BLAKE2B 83bdfb0a1369f74746d28f6eae7ef0eb536180d3c029854026458211499a45921bd49b9d1603c0090c565c74167a8af573b336a25115aaa4ab8f973f34e0ed17 SHA512 bf5dd6f560f0f2825d088b69f3ac262143159b770a3fad87ebe8796dd708d3f50c02a01abb8f3509787fb04dbc5fca90aad09ccf9e7ea77cb12af15cd6f517a5
 MISC metadata.xml 554 BLAKE2B 80d4d6da040c47ddd01a278a0ca8af3d371f9e88b7c1583a606701bc85331d853d41bcc3a6be73772ce5574a1c50e601b31fa125a5f4c8a6dc39b1308d78af5b SHA512 ad97897d6f8c9be9271c0204fafd3540ac0d798fc8d4a1de1e66503dbb714dfacf0fd4ce23e059044ab7a3a3b687228811aa9adfba16391e6a5dfe2fda11801c
diff --git a/gnome-base/nautilus/files/41.1-optional-gstreamer.patch b/gnome-base/nautilus/files/41.1-optional-gstreamer.patch
deleted file mode 100644
index cb4023cd0d2e..000000000000
--- a/gnome-base/nautilus/files/41.1-optional-gstreamer.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 1b908b6cf0422ecb496a5aaf7da25ede9ad12d60 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Thu, 19 Sep 2019 22:26:08 +0300
-Subject: [PATCH] build: Optional gstreamer
-
----
- extensions/meson.build | 4 +++-
- meson.build            | 2 ++
- meson_options.txt      | 6 ++++++
- 3 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/extensions/meson.build b/extensions/meson.build
-index 5c6f64cef..bd8c41d3e 100644
---- a/extensions/meson.build
-+++ b/extensions/meson.build
-@@ -1,3 +1,5 @@
- subdir('image-properties')
--subdir('audio-video-properties')
-+if get_option('gstreamer')
-+  subdir('audio-video-properties')
-+endif
- subdir('sendto')
-diff --git a/meson.build b/meson.build
-index 66e56bda6..d71d597a6 100644
---- a/meson.build
-+++ b/meson.build
-@@ -110,8 +110,10 @@ libm = cc.find_library('m')
- 
- if get_option('extensions')
-   gexiv = dependency('gexiv2', version: '>= 0.12.2')
-+ if get_option('gstreamer')
-   gst_tag_dep = dependency('gstreamer-tag-1.0')
-   gst_pbutils_dep = dependency('gstreamer-pbutils-1.0')
-+ endif
- endif
- gio = dependency('gio-2.0', version: glib_ver)
- gio_unix = dependency('gio-unix-2.0', version: glib_ver)
-diff --git a/meson_options.txt b/meson_options.txt
-index 6e781c4ef..9ad8d8196 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -13,6 +13,12 @@ option(
-   value: true,
-   description: 'Build stock extensions',
- )
-+option(
-+  'gstreamer',
-+  type: 'boolean',
-+  value: true,
-+  description: 'Build audio-video properties extension (requires "extensions")',
-+)
- option(
-   'introspection',
-   type: 'boolean',
--- 
-2.32.0
-
diff --git a/gnome-base/nautilus/nautilus-41.2.ebuild b/gnome-base/nautilus/nautilus-41.2.ebuild
deleted file mode 100644
index b89583f8e394..000000000000
--- a/gnome-base/nautilus/nautilus-41.2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="Default file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-libs/glib-2.67.1:2
-	>=media-libs/gexiv2-0.12.2
-	gstreamer? ( media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	>=app-arch/gnome-autoar-0.4.0
-	>=gnome-base/gnome-desktop-3.0.0:3=
-	>=x11-libs/gtk+-3.22.27:3[X,introspection?]
-	>=gui-libs/libhandy-1.1.90:1
-	>=x11-libs/pango-1.28.3
-	selinux? ( >=sys-libs/libselinux-2.0 )
-	>=app-misc/tracker-3.0:3=
-	x11-libs/libX11
-	>=dev-libs/libxml2-2.7.8:2
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
-	>=app-misc/tracker-miners-3.0:3=
-" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
-BDEPEND="
-	>=dev-util/gdbus-codegen-2.51.2
-	>=dev-util/meson-0.57.2
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.10
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-PDEPEND="
-	gnome? ( x11-themes/adwaita-icon-theme )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-1.14[gtk(+)]
-" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
-
-PATCHES=(
-	"${FILESDIR}"/3.30.5-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
-	"${FILESDIR}"/41.1-optional-gstreamer.patch # Allow controlling audio-video-properties build
-)
-
-src_prepare() {
-	if use previewer; then
-		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
-			To activate the previewer, select a file and press space; to
-			close the previewer, press space again."
-	fi
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		-Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
-		$(meson_use gstreamer) # gstreamer audio-video-properties extension
-		$(meson_use introspection)
-		-Dlibportal=false # As of 40.2, all libportal usages are flatpak-specific
-		-Dpackagekit=false
-		$(meson_use selinux)
-		-Dprofiling=false
-		-Dtests=$(usex test all none)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	use previewer && readme.gentoo_create_doc
-	meson_src_install
-}
-
-src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	# TODO: Tests require tracker testutils (e.g. tracker-sandbox), which may need some sorting out with tracker use flag deps
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use previewer; then
-		readme.gentoo_print_elog
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/nautilus/nautilus-42.1.1.ebuild b/gnome-base/nautilus/nautilus-42.1.1.ebuild
index c7dab39e1262..8cb207e691f8 100644
--- a/gnome-base/nautilus/nautilus-42.1.1.ebuild
+++ b/gnome-base/nautilus/nautilus-42.1.1.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.67.1:2
diff --git a/gnome-base/nautilus/nautilus-42.0.ebuild b/gnome-base/nautilus/nautilus-42.2.ebuild
index cc5893b59ef3..c7dab39e1262 100644
--- a/gnome-base/nautilus/nautilus-42.0.ebuild
+++ b/gnome-base/nautilus/nautilus-42.2.ebuild
@@ -21,6 +21,7 @@ DEPEND="
 		media-libs/gst-plugins-base:1.0 )
 	>=app-arch/gnome-autoar-0.4.0
 	>=gnome-base/gnome-desktop-3.0.0:3=
+	>=gnome-base/gsettings-desktop-schemas-42
 	>=x11-libs/gtk+-3.22.27:3[X,introspection?]
 	>=gui-libs/libhandy-1.5.0:1
 	>=x11-libs/pango-1.28.3
@@ -31,7 +32,6 @@ DEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
 RDEPEND="${DEPEND}
-	gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
 	>=app-misc/tracker-miners-3.0:3=
 " # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
 BDEPEND="