gentoo resync : 02.02.2022

45 files changed, 247 insertions, 1108 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index ffcf464afc91..43beb6ded144 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/dconf-editor/Manifest b/gnome-base/dconf-editor/Manifest
index 77c7fc350fa4..2747bda12acb 100644
--- a/gnome-base/dconf-editor/Manifest
+++ b/gnome-base/dconf-editor/Manifest
@@ -1,3 +1,4 @@
+AUX meson-0.61.patch 921 BLAKE2B d05988ee5c86a22c64c296f76f16a8f1fd69484652bcd1f8e5fc0bcb0b7b091edc1d4322c5925b3beb7f66a599e0446e486debcee206dd5e40da1a478b28be2f SHA512 f92b5b32b36285c61503fc184976921e72b1255bf96b17a53c87e77164a81f71012feb38c0e5bfb4934fb557f0e4d557b5d4dd6c686e4da74e595046f380fddd
 DIST dconf-editor-3.38.3.tar.xz 594544 BLAKE2B 0455fc01be96bccec9a9799c5bf23e9fe58cb34d32899a119753f58f5bc2f03acb96ff0eeba131cd8c0ea130e3afad16e4fadb23601510b618bf7a3d5a1664a3 SHA512 cf00705c1e11eab980777b9696fbaaa0f5f8a8118276f2add4f4fcefe5aab46844a539539418ce61f285e65623179a9d63cc18a91339b70b5e7c9408c697e9d1
-EBUILD dconf-editor-3.38.3.ebuild 820 BLAKE2B f6f3cefda9ae34ee3c1096231adad15f3f334274b195d6279e9137d1a57898316aaa274dffd709e480a60c279425785953d4910d54199a387a8ee6f19636062d SHA512 3897fdacd92e5afd01fab0a2fd9b3f69fc357ed0724d800608b5a0c315e4609291df406e3bd9b5d02a72c935a1079224ad504384862ca6a7bd05ff5ad72fa1d8
+EBUILD dconf-editor-3.38.3.ebuild 865 BLAKE2B 63c98e66d2547661d2b7eae22976f522269467024c5a7368f481aeefe9917c654c933067fedf2e5f79c24c5a8863deee52969b27a4d368aad0d7a89e70bd300c SHA512 13e1f32a055be2974d700f30620d8d52a573ce25e67428624e937676504f7f929a4affa3bf22ead4f506894a07183b86d1e3588f0ad96ae8f1085e387458d04d
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild b/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild
index ad7847c009a7..dabf7da33d8f 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.38.3.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
@@ -27,6 +27,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/meson-0.61.patch"
+)
+
 src_prepare() {
 	vala_src_prepare
 	xdg_src_prepare
diff --git a/gnome-base/dconf-editor/files/meson-0.61.patch b/gnome-base/dconf-editor/files/meson-0.61.patch
new file mode 100644
index 000000000000..caa1806d5779
--- /dev/null
+++ b/gnome-base/dconf-editor/files/meson-0.61.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/831746
+https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/21
+
+From 56474378568e6ff4af8aa912810323e808c1d977 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 22:22:58 +0100
+Subject: [PATCH] editor/meson.build: fix meson 0.61 errors
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ editor/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/editor/meson.build b/editor/meson.build
+index 4c89ab99..0eb3bb1a 100644
+--- a/editor/meson.build
++++ b/editor/meson.build
+@@ -1,7 +1,6 @@
+ desktop = dconf_editor_namespace + '.desktop'
+ 
+ i18n.merge_file (
+-  desktop,
+   type: 'desktop',
+   input: desktop + '.in',
+   output: desktop,
+@@ -26,7 +25,6 @@ configure_file(
+ appdata = dconf_editor_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,
+-- 
+GitLab
+
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index ae8ab51fd2f8..4b877e1282ab 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,15 +1,12 @@
 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-Fix-libwrap-detection.patch 772 BLAKE2B 7910f76af46d7541da9547182fe14202f3bff0e771fcb248a7f16718b675532d2b24fa109aa8ad68936c008e680717efe9ed1b785e46a520132d745ce3c85fae SHA512 cb690b9c07d61b610705454d676d5b0f9c544d299d2b890c7ae7c4b9b7cb061c02be1805d61e845d2415677333040f2ffd10f48a60725fdb149dacf8ea36dc92
 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-40.0.tar.xz 800296 BLAKE2B 9c2038758cec09f13c18bd79d431e82a29fb1a2b8ab099498a0b8d920cb93896abceab9157edae8cc15312e03d21eb36b649c2cc8761f9af5fec387c5f28a261 SHA512 b20d02f8a80f6aff8909a69c6c621c20c5aa1b25cfedd68bf95faaaa56d5f7cd5d607d1a7388b97aa06510684f1e9e474248042a00203f496c39930e001bb64c
 DIST gdm-40.1.tar.xz 803488 BLAKE2B a0f5349c15c281b666e2e1eb35b81bd4fe3561d7dfa48e43fab7b6ac5c6f9f187f3907fc88eb169ef5e7951c815dec849f64ff2a2b630742b47521bc5c33f618 SHA512 34e3d905195c9d44f3681fcf8170b67e739cef60fe3987802b7006e5063b9cdf5ca047470d0aebd6e9b47dbbb660040648a647ed8d3186a3099b8c6532c5ded7
 DIST gdm-41.0-patchset.tar.xz 12076 BLAKE2B 900ad267bdbb0c189ba36c215aa4bd18f170efd4df02341b1b6f98bdb09b4bbcfcf795ec5a63b5364f47486767a347f60193168749f10823fa816f9500cd3073 SHA512 6c7940ec9c91d0e28f5e9d728abd49814d4d9c7b964e753436f0ceaa11f6c58a559ac3ef0d2e14bf5410a097abdf72cf16dad191017c9ee5c59e6f68de8f2ca8
 DIST gdm-41.0.tar.xz 806668 BLAKE2B 12bd10ff4c5799683665127e5ff543e07f13cffde1d668213b43d6471812c727cb18e93c3305923019c3f522aa0484779dd861afc7ac939115b5f169657722e8 SHA512 b1dd99beb8339c6cf93f10e0aec1c946c615b4efaf1724392585985fb32cee156a9e44fd3041ab87ab9ba6a6bd6c9a9d0ecf8b40dc9c098b3c7ee47f7a7e9a97
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gdm-40.0-r1.ebuild 5887 BLAKE2B 59186d40fa446dcf0d51d767c9820fe99393746b2445323977f98227e2e7ce6b07e969a2eef2beb788fb87ee219ce1493bce0968a29ff04f1242684b418ac4a4 SHA512 c2c913b76e7f4fed0a7cff852e2e139a2195fbabc0ed56c96477fdb25de4efa8062fe00f0be2bad88601dc47c2ff4570a1d50e58da94b4656d8dfffb50468684
 EBUILD gdm-40.1.ebuild 5845 BLAKE2B ba21b057cc56faa241968f6413dfbac93f5645c5e51fcc337a93c341c2e225b0e1af74129c38091b5abd13434fddf75d40fbce44649d3e938d94b8a0fcfcdd5e SHA512 7b2b52af1cc4e08a13c4611596324f9c4c873b51e04d27a26623147173b28cf9bebc7293f3d82fdaaf636cdc5845ce573eac9a6cdb20fecfe85b51cf890edbf2
 EBUILD gdm-41.0.ebuild 5934 BLAKE2B 48ca9e06ec9f5050561b494bb7baad03fad4714b4eb85cc2d30f7a1851f8669449cfda9eb0ee7d0ffdc6663046c259c2b61b914c58a5ae2eaebfd5b9024a7d40 SHA512 d6d348448103dadc866ce344ef5ed4f56c3286189abfcc929b67415360688c3f9329d42d845f6b60d9ba50bdeafb26d84e50ae97dd6ff4232f76ac48c5476d70
 MISC metadata.xml 760 BLAKE2B ed67837e4caac485dd97f9b2b392c4aa26cb0515a5147a258e197531123f1c92b96900d073e85dca0ffc661aad3efb0d2328434e4554bf3b681ecf3a61eb797a SHA512 40979ee3950ee2cb3c3d67eff9c100f6fb1bc19215daaf4d8e65b8f300f05b71c74e542312780979d7ee31d0234be351496dd2dd7a7ebf3519da2fbb3acbc8dd
diff --git a/gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch b/gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch
deleted file mode 100644
index 2742cf276413..000000000000
--- a/gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/142
-
-From c713ace4c71a6804734ba5b1bca4abde11ab90d1 Mon Sep 17 00:00:00 2001
-From: Bernd Feige <Bernd.Feige@gmx.net>
-Date: Wed, 19 May 2021 11:28:07 -0700
-Subject: [PATCH] meson: Fix libwrap detection
-
-Bug: https://bugs.gentoo.org/790671
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 0266a938..a490a725 100644
---- a/meson.build
-+++ b/meson.build
-@@ -90,7 +90,7 @@ else
- endif
- xdmcp_dep = cc.find_library('Xdmcp', required: get_option('xdmcp'))
- if xdmcp_dep.found() and get_option('tcp-wrappers')
--  libwrap_dep = cc.find_library('libwrap')
-+  libwrap_dep = cc.find_library('wrap')
- endif
- # systemd
- systemd_dep = dependency('systemd')
--- 
-2.26.3
-
diff --git a/gnome-base/gdm/gdm-40.0-r1.ebuild b/gnome-base/gdm/gdm-40.0-r1.ebuild
deleted file mode 100644
index 538537d7e0f5..000000000000
--- a/gnome-base/gdm/gdm-40.0-r1.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2021 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 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}/${P}-meson-allow-building-with-elogind.patch"
-
-	# Support pam_elogind.so in gdm-launch-environment.pam
-	"${FILESDIR}/pam-elogind.patch"
-
-	"${FILESDIR}"/${P}-meson-Fix-libwrap-detection.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/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index bad5605826c7..05e31c026f50 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,3 +1,3 @@
-DIST gnome-applets-3.40.0.tar.xz 9390340 BLAKE2B 0d8e76086e444789b7a327623db9b21ef0a51f071b67aa5d99dc3e7988be40ec353ced795aaa1acbbe8d1b303d3878e2a0589214dac10f35ab2e40381ee64978 SHA512 909a1e9ecbe6904537b7408239a17aad265890cf179c4b8929968fa4d8ba6f1ac1f6e98612eb9c54266d3abacaaa7ed0e218f41b081b7539532527a3234fc037
-EBUILD gnome-applets-3.40.0-r2.ebuild 1269 BLAKE2B 21cd74df0295644f1cce067c3b87c75e44f3744ceec1c5d4d89a93574c0282332b140da22e4de36f81c60ecbd86a3a07fac4517e7a80600066cb3357c4df9b72 SHA512 b731c33e1591eb21f8f89aeb8e44b071e1fcdd19faf80bd008b500b8b3207474a41cf854369c425901d87a7761efad661a1ec37f627ad738f88cd28d981749bf
+DIST gnome-applets-3.42.0.tar.xz 9391580 BLAKE2B 43d3c86d4c401ef6e509a7ff653c613d7f49624354ea74635f9aa634e33c92bb54cc2461ab8e9fb3fcf7efe3f97fc9a65c9b8f7a0b8fc3e126a531492274518b SHA512 9be26e7779123dc5dc56aabe274d3ee34b3ffea830e2691051bf2a8011a1896c5e56fb9cc6d89b7f5ff14b1aeea969b81134bb7d0e4b1615343bf23daa1137a5
+EBUILD gnome-applets-3.42.0.ebuild 1269 BLAKE2B e7409e0e2c3ebcfc85623d3fc529759a42a831a2cff7e5f387e71fcef152cb77a1721292422e28abff8bbdb2c3105dbb5aeb2a919c2b34c4cfb2b44794650c35 SHA512 ad1a74f4116d781113bf379b47873902cac05a931cb1b4321323452362f75376cabcfe509765e91185dabea7b15cf633ffbe027f2f652d63af045001416a67fe
 MISC metadata.xml 328 BLAKE2B 23e54626993373e58fbb0718c51e2b9c4eafcd7a0f2cd3968d05b72bc6a3cebeec386d96ab317cc92a17f08d17f8cb9091d6c47d4e6af49993451dd98b8aa04c SHA512 b4936e6332bbd5de094ec96060c84aa6eecc737260a093dc01da4687f68994a5a622eec0b3fce353abfb851b90c31ce7b0ee93e330d6ae2f4b288ab104655463
diff --git a/gnome-base/gnome-applets/gnome-applets-3.40.0-r2.ebuild b/gnome-base/gnome-applets/gnome-applets-3.42.0.ebuild
index 8a4ae41c0cd5..0863ef27e917 100644
--- a/gnome-base/gnome-applets/gnome-applets-3.40.0-r2.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-3.42.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
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~riscv"
 RDEPEND="
 	>=x11-libs/gtk+-3.20.0:3[X]
 	>=dev-libs/glib-2.44.0:2
-	>=gnome-base/gnome-panel-3.37.0
+	>=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
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 7572233fc542..159cea031628 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -2,9 +2,10 @@ DIST gnome-control-center-40.0-patchset-2.tar.xz 7396 BLAKE2B 9d3c0461c065cbf0f2
 DIST gnome-control-center-40.0.tar.xz 6463616 BLAKE2B 7c79b79a0cb9bb847cdeb31613e9520b446f7720031fc7cda927a82b6e0acc6af03a047fe296a45f6e171c4ab1659b4ed5c6d07f83c9ffa554b1bdcce6fa26fe SHA512 26980cd18c414b12d2bf7e61be200e02302e170d53aba4f064154eda4c006648160919b6d4c9d168d8c5a461c05dc6593a52066b144af577c6aac420b9723cb9
 DIST gnome-control-center-40.7-patchset.tar.xz 7232 BLAKE2B bdf97bd666dcdd8cf87e1a553b849b42e3e1713e508e22450073ea8c4849a7086fc8f5effde39c939e0b8c26decadf9056fb93cfcb530fe287b0039c322fd989 SHA512 cbd7e7ca734ad49fd343f0d5d21c5153ba48ebedcd58ed225c7f196b0c79167f769609803f5752585e43edd7649ac73fe3ed1d9264e3d103107a9f5b4b091058
 DIST gnome-control-center-40.7.tar.xz 6473212 BLAKE2B 94a97297857ebdf8dcc9c4a45f64cabbc7e2210cf0cce00174c016290c17393c9c6b73073873c8fb9917ca4ed9f18c20947730127e3ad7ed4658a2bf3d99ede5 SHA512 2a5235b8659fa72521b50fb05bb4c2daceac88ea127492ea7cb544da1831370faa3c70c98b1a25e314121d85f82aa8f606c8c6f3a082d577ba5cf85b14d1cc48
+DIST gnome-control-center-41.2-meson-0.61-build.patch.bz2 2356 BLAKE2B c739cb6e0ce181a4724aafc5996469f92ac85e89d6673fa6f3c051e0db0b8c2280c57c5a07fae35318a8d5e407b377a47d5a93e86071a79eb2ff44274919ebd3 SHA512 8f78444e275f5e89ee041ccb13887427cba7d19c456347dea9fb20f66b6a29f5d89b049487b402bb62886e29d43c22f2019dba770cbb4c7bd7fd568e9efb3f06
 DIST gnome-control-center-41.2-patchset.tar.xz 6380 BLAKE2B de9eacf549686e43870df486994c5cd319f996edb2b09a7d3b5e9021c50b74c067e8c3cbabbc0ca68741fb3b4c5a2d65cc1ea72e20057ec59dab952fa886d527 SHA512 292737b34316ceff5eb43c598b0a8d2a7895e2891215137ba59defb935c6184e78f19e2485963a8642621a409ee87e0e2a1582403fd90ee3c83b2bc1f3334e27
 DIST gnome-control-center-41.2.tar.xz 6619180 BLAKE2B 1ddc68b87482d66f093f72690d287691dce6e02b071878e1facb33a646e7b487a75ba04b8ec18bb6e717a8c6c27a393bf0dd30fcb371ae833edd18c6e645bad3 SHA512 9ea19e4bd1bd708f78a62c746102467dd2e801b84a64589a043a4f849d297353edc54291a5c59db1f8dd3c2c24088aec0f1d98a6270b0373384a2e19e7dde332
 EBUILD gnome-control-center-40.0.ebuild 6317 BLAKE2B 36e5c618b07bf8222c84cd5e1fb417566ce11b96ec55dff5704185546cca209039f3809b672d1484e0d9631f42be6185ec2bfad71c5a1df34c200e1d6967a50e SHA512 fee96d3c1d422725c6c10f97aad539bf007890fe0e0afcd13988040d6da5b69d0d2c3e056de139e4c8c9ff85d234abca0ac85d88c3d7f83ccb454b8672765717
 EBUILD gnome-control-center-40.7.ebuild 6311 BLAKE2B dd4bfb4da3f67fa0cbba9206e7040cd2471bfc94e11a4d6ba14e6a65a39582e2507eba07a4be1631f295d509dbb72a782a4257273725ed3c8539176a2039b5f1 SHA512 5c6ca1809a208efa728ea488cb05014104fd4ae5d7e16465e5f1e1810980408b4d5330b667f90d078010054011920ac7bea9800fc11a1f91d6a26d7177850b49
-EBUILD gnome-control-center-41.2.ebuild 6114 BLAKE2B 3db9817656398554cb589178173c495d02beab1af7622f265a2e3502e035daa0de2c015bf150d2efde694671d21353688d1713426a39bd213ec1769bbe124b16 SHA512 0684785aa26659dd415ac98fc025b815256384840f5235b4ad2aa505b0eaf5a60f02abcb386160a983c8d3ce90ef26bd8abb67f7850b9ab7f6798af6707dd706
+EBUILD gnome-control-center-41.2.ebuild 6272 BLAKE2B 1976bf80a9615ffa4647cf07027384c07cbf5a95ce12651325cf96065191774b44e1f5b9c2295e427864a4b987721340bbeeab7e2c3f771fab9201251211c67b SHA512 baaca029d73c5cb8372641871b6a5e8f03b81b94be878bbe0016d5934c1c858ec71df1b9cb03cfb16ce8af8a16552422ba81b3c93f65f1bb80e9de0abcbc4ead
 MISC metadata.xml 589 BLAKE2B cc1f65e04e51a669bd160ddd7530d9365ae3086cc16d8c3120c5dc35b6079d2cab4a090dec76f5bb884e5d0e843887c16e447d95269f7e734693cdbef53507a6 SHA512 e7c7d1e5084cdc3373723c610a239759695fd1f6e346d1e32476679d4fe60be87df1ba5af7efb2bd1751b54af8e11be8b851b092caa6c8c672c163b19be2977a
diff --git a/gnome-base/gnome-control-center/gnome-control-center-41.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-41.2.ebuild
index 94d95e29285e..6843ae5bfd33 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-41.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-41.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,6 +9,7 @@ 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/${PF}-patchset.tar.xz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-meson-0.61-build.patch.bz2"
 
 LICENSE="GPL-2+"
 SLOT="2"
@@ -124,6 +125,9 @@ PATCHES=(
 	# https://bugzilla.gnome.org/686840, 697478, 700145
 	# Fix some absolute paths to be appropriate for Gentoo
 	"${WORKDIR}"/patches/
+
+	# bug #831435
+	"${WORKDIR}"/${P}-meson-0.61-build.patch
 )
 
 python_check_deps() {
diff --git a/gnome-base/gnome-core-libs/Manifest b/gnome-base/gnome-core-libs/Manifest
index e6542b3d9a9f..a34dae6d0e9e 100644
--- a/gnome-base/gnome-core-libs/Manifest
+++ b/gnome-base/gnome-core-libs/Manifest
@@ -1,3 +1,2 @@
-EBUILD gnome-core-libs-40.0.ebuild 944 BLAKE2B b7f0934eee1166c407544dc71fe567083ca5b4f7f663ffb3664c41e5c484632e7f273a1305cf9f9801817f7fafaf5e833c209444781fb5300615196fd2f2eff1 SHA512 e6612699cc325f5a947b89fe01d30660e9b7fe762fd46f5efb62da7c3adf6d8967641b6e95f7401e43b92a9f7c5f07839d236f2a4d3d439c59e8e078163619be
-EBUILD gnome-core-libs-40.6.ebuild 947 BLAKE2B 23a4b491e4847d34f10bd331896177c74f344589f81423ef470570598d1f30aa3659d17f9dd1ae4c91267f06e04eba70be16444db21b453ea9cb4e4a255fc14c SHA512 ab8cab263c6b513751782f2025114337270c3c7e2225cbeb2e7c7143d64aa9d36ecb73261194b290dec5feeb75325c07eefa4729bb34b32b7935bd7f133d69b4
+EBUILD gnome-core-libs-40.6.ebuild 945 BLAKE2B 9f36a47e6b707b2093e42c3cd41d581b832b02c6ebba79fd991ccf86219812bdb2e486093decda8f5658dc3e3e087fb565bce813ace7c2dd6752b4b761c723f4 SHA512 06cc06ab2ca8b5452f8ff1a21f6624dfde5addd7bba5f6e28a4369d0e260630a1a7ff88a7b8efeac5c493ecce19d76395fcd6a78e8f82651788b499f314e7c3f
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-40.0.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-40.0.ebuild
deleted file mode 100644
index e4a65565e587..000000000000
--- a/gnome-base/gnome-core-libs/gnome-core-libs-40.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Sub-meta package for the core libraries of GNOME"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="cups python"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-# Note to developers:
-# This is a wrapper for the core libraries used by GNOME
-RDEPEND="
-	>=dev-libs/glib-2.68.0:2
-	>=x11-libs/gdk-pixbuf-2.42.4:2
-	>=x11-libs/pango-1.48.3
-	>=x11-libs/gtk+-3.24.27:3[cups?]
-	>=dev-libs/atk-2.36.0
-	>=gnome-base/librsvg-2.50.3
-	>=gnome-base/gnome-desktop-${PV}:3
-
-	>=gnome-base/gvfs-1.48.0
-	>=gnome-base/dconf-0.40.0
-
-	>=media-libs/gstreamer-1.16.2:1.0
-	>=media-libs/gst-plugins-base-1.16.2:1.0
-	>=media-libs/gst-plugins-good-1.16.2:1.0
-
-	python? ( >=dev-python/pygobject-3.40.0:3 )
-"
-DEPEND=""
-BDEPEND=""
-
-S="${WORKDIR}"
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-40.6.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-40.6.ebuild
index 220d4aae3ab1..b896d6814625 100644
--- a/gnome-base/gnome-core-libs/gnome-core-libs-40.6.ebuild
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-40.6.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 @@ IUSE="cups python"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 # Note to developers:
 # This is a wrapper for the core libraries used by GNOME
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index a786ad1bf466..aa20fbc8f4e0 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,10 +1,6 @@
 AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c0265f34d5d0fd555ae60a519273512021cf4f065db1e22ab72ce9004a914a47d077551b5a12ffbd5e81a9b8cf098a4762a0e461d SHA512 ea76e41aff067281497b98c86b66d8c382124ceead5b18e729342615a50b6aa3401f4d7c5553023b5d78ca0ea02823c7d6026ba9acca862804351269e4107d18
-DIST gnome-desktop-40.5.tar.xz 722316 BLAKE2B 1f2e214eaea74295c892a465f767d29175ac0719a66d8d5b60b924c448f7b8317d3f9e23361d65b4d171018edd206dce764c38545a716ad9c83f20214fe5c4e9 SHA512 a65bf42be69d04efd80da6a8c8b08c4adc09db1c6627b93d4eecc3396376bc4407bfad914fc131d16d78b3b3263e635c925ed3dcff92af069525f809bea21afc
 DIST gnome-desktop-40.7.tar.xz 721452 BLAKE2B d9979be0131bbaafdc4ae808a5367ce1ac39ade3595f96999cfc7e2876c9cf380a6a6039c74db34a40f1747fec05081384ea1dbf487e849f32a1da67fe22e8a0 SHA512 b687c8b7de968544b14bc8801ba3762e0cc2f4d08a41b718813302fdbdcedc3b67ead19bea14050db6312bd807f28bf5e56eeec53c3e2d9005466c9e73e62d14
-DIST gnome-desktop-41.2.tar.xz 732788 BLAKE2B 5ae560fb31166db0fff56c3c3afd13a5890a540a748ba0602cee7a2f129facd023104198600379415a8f00f6edf1eba670769810cc0542e4c75dc1deb4da0f57 SHA512 1a520c84f7a781c59bfd8499c87c7049044a59b87033fac078c4a255c8bcaf79f9b614ad20985ea19c245424bb1972af744ad66fdafa5501800ad342b60fb531
 DIST gnome-desktop-41.3.tar.xz 732804 BLAKE2B 40a88ba4454455f85a46676d4b2f37159617f7eae9d0f5e1a27c3f0ed1e44953ae9475e81558b7cce1b6fd8cd8804cd3f452d060d843d4f58a7af8748b4c35fa SHA512 b02d9fe3bfad56993f9ed7225b38b4b0b685c7ad1480a9d9db5f9a6a8e13c16918d87e6a51160ee3101ab8ce24f4c0632ae351e7bb11cc473523e216ee9cf6bf
-EBUILD gnome-desktop-40.5-r1.ebuild 1935 BLAKE2B 655bb10eb13bbb63ce08593677d7f4f9a253d3c75c42b2207c1c46c34947738a9441fb62ccd3d4481ac349c72d179795aaa01ec7197bcc5984064659ed51d3c7 SHA512 2d49209f19c7ec946b4388ae4b137fdc8c83efd0817e5f88b9c7026657ed6104829fb0a42cf3b8831269d9974a3f1cbb96371796c2ed4d6c4face250df4356fa
-EBUILD gnome-desktop-40.7.ebuild 1938 BLAKE2B 199d87544f15f68dce973af14eb9786f51f5af90c501084573f64b56fdf3dea43cedaa6f6f38caf3588b266cb410c70ee7a44de52ac3729c93c2bd7885678ffa SHA512 19c3f055cca4a247de1126e87f62f774961dcd829fdf2f7bea13f809a6d4bf3b831dc040f0f305fee85349e46b6aed6e59de3c657d45a9f772459a3e0bd81992
-EBUILD gnome-desktop-41.2.ebuild 1925 BLAKE2B b0c99ca78d26c9993bcf2069ff43e3379908d7094e1347e39731264a8e3473769df7dab835c70f359bca14b253ef6d367963f8c126435343d88e70a51a20ce1b SHA512 05a9b9d4250c5b97300269410d591576b9bd38dfb8d8abd0617facbee1ad7738f37ed02a84b39a3957b8deeffe1dc2b06fcf945bc77bef50c28b5005a1863cf6
+EBUILD gnome-desktop-40.7.ebuild 1935 BLAKE2B 2996ef29e201abe721ea0b5611e52eb121e9da28fa858f2a3deb11ea084951f7ddc0ce6aa655177e6a5b3e0edd8e5079f226fd6c79c5154f50b69faf156621f6 SHA512 34435b92fcdae005a9855cf3f10c99e5e9dde499116737bdabb6d3a6765765fe3a474925da67e98b909b9350af581bf06623d19e4730878696f1b85a1fee642a
 EBUILD gnome-desktop-41.3.ebuild 1925 BLAKE2B 68d86b4ef86b039777fb210cc7dc68213b48a86f1667dc95eb9943fd70ba72dee8602032f1235849c875740b37cc3c49ca5e537dc00f62bb49340959252585c3 SHA512 922a601ad2e11ed2665fbcc97c16a0b063f328534c743a9777109fc7f8b9d7ab47c5b3282570ed4a6ed56ccfb804bbdaf47d07c40c398fddc7f9a86e1a6d34fc
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-base/gnome-desktop/gnome-desktop-40.5-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-40.5-r1.ebuild
deleted file mode 100644
index 61eeba43c70a..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-40.5-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils 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-40.7.ebuild b/gnome-base/gnome-desktop/gnome-desktop-40.7.ebuild
index 5e2b771d5f36..6acc99df16e8 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-40.7.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-40.7.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 gtk-doc +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?]
diff --git a/gnome-base/gnome-desktop/gnome-desktop-41.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-41.2.ebuild
deleted file mode 100644
index 2c2f814e2db1..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-41.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 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-flashback/Manifest b/gnome-base/gnome-flashback/Manifest
index 178b28ad7aff..e966889b2682 100644
--- a/gnome-base/gnome-flashback/Manifest
+++ b/gnome-base/gnome-flashback/Manifest
@@ -1,3 +1,3 @@
-DIST gnome-flashback-3.40.0.tar.xz 857104 BLAKE2B 41711edc4687682dd48134e452297bef7d0c4db93532bfd4bd49f19f2f01eab7c887b584f412384057e8a2b65a937446a108df0c4cfd811085c161a212e19355 SHA512 b938d12c437926e64567388b1a97350b76883cf91c009c1f57d4963321497ebdf69b094c7d88a86e5bf805930b88ff2637e522ac4f9981a391206a03d23a521e
-EBUILD gnome-flashback-3.40.0.ebuild 2586 BLAKE2B 3c58311bc472a0be3135cddfb010adc9d7ecc125546447d2bbf2fba5b6a4c02db3fb5a7675f10164838cdf313f50bf8142b32098735966bf9415eff170d6f02f SHA512 6a953c6450fb3aaa8b94ac1ee6b324be70280998f3f12e599d16c9c3e12cfd963d38e4022b66fa4c88474a3a74643683ecaf29916cb2d55bc26c14f2bb5363d8
+DIST gnome-flashback-3.42.1.tar.xz 867508 BLAKE2B ddd98e14dede69a43db24acdb8358ad51de90d311a8738a14ad403262f3b0790c4689b2c49d51706d8645c76a70e5d60dbbd6a82acea55d0898761ac0a479d25 SHA512 bbbc9ad419c4bedd772a41d88216d41502a657e1a02dbc32a80c7dd8984e583bd731e7e90932c0537b0e96d511244fec400e76308e9d8b57eb24491fa3334d4b
+EBUILD gnome-flashback-3.42.1.ebuild 2586 BLAKE2B ecd77b8d792d3ad3f32f30650a92592b86971b957c26f4e725532efaf52a896e0ec3dfeedc696c692e7d5dcdb02730be493559077e5e93c897a464ea94aadb96 SHA512 56d9ba1f84cd7e2d67f0ea95b92302d23f3149b94eca89272df806149b98fb79fc3cd927a97c44f63a5779dd44cbed6cfe047d04e9c911a12f3de1fe8cf5906d
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.40.0.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.42.1.ebuild
index 976d195c4856..704dcdeb4fe7 100644
--- a/gnome-base/gnome-flashback/gnome-flashback-3.40.0.ebuild
+++ b/gnome-base/gnome-flashback/gnome-flashback-3.42.1.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
@@ -68,7 +68,7 @@ src_configure() {
 	# 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.40.0; then
+	if ver_test ${PV} -ne 3.42.1; then
 		die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
 	fi
 
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 92a4b8afe1a2..03fbbab718ff 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,4 +1,3 @@
 DIST gnome-keyring-40.0.tar.xz 1333440 BLAKE2B 4ef74d982d85766e8d7f28b97ddf295ca546f48b980518be7e586bda607344bdb72c124f92b5c34310aeb2f3903cb39092ae7ca6e1b3baf34ab6a9c58d26aeef SHA512 c9cb0dca8c46ee712200c96c20663a8d5cd39f07801a04e1afca26550a04af6cb369b53a1f29638bf4c8a29f418a69f565befcf4d08df5b0d30fb31894ecf95e
-EBUILD gnome-keyring-40.0-r1.ebuild 2162 BLAKE2B 422663d6cdcf7eab1bcea2318af0f4d854542494448b7ec855b4133853c574c5fe371e88da04e93d9ecc4d964efb6b409e2579a222e3c5b8b6aa18aa959ce9c5 SHA512 e83fd59c871e579358843ee9f1f320e5eae63ff0fd3057f46ab8173bc8b9856d6486a55a638606ba614667abaf085657671f017210eda5360481d9b1a239582d
-EBUILD gnome-keyring-40.0.ebuild 2240 BLAKE2B c79a2de4457666987941707a1fe784b504d2fe820661650039e22cf420597d239f8f6939233d7fb2198e5e537d7eb79cf298fb2448439acd6d4375271c9177e9 SHA512 3994d2754c8738f0630a88dad84a7ac62d0ded284c098173324361bb7224f387c1973e9f724b86875bb3cb6fcc1dab1379f228553d58f5256c6af0d3ef896d43
+EBUILD gnome-keyring-40.0-r1.ebuild 2155 BLAKE2B f4102f9c57695df35b0aa8231f3ea841a9ae5ecdf3b419b24b162543d75541ba919d6ffe915e342c7f16710c2c45a536ed23ccb88c6b679914cfa75733f33dfb SHA512 d7856e091ca949711909cae7e34357fc7cbadda2e100b44fde9f238fd415c20327b6d344f29910114f19795a6cb0e02286707c03a637c663a8cad84d6502014e
 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 a6174f16178a..90ec97155fa5 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-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
@@ -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 ~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-40.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild
deleted file mode 100644
index 3f1a2d876e2b..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit fcaps 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="+caps 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"
-
-# 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=
-	caps? ( sys-libs/libcap-ng )
-	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 \
-		$(use_with caps libcap-ng) \
-		$(use_enable pam) \
-		$(use_with pam pam-dir $(getpam_mod_dir)) \
-		$(use_enable selinux) \
-		$(use_enable ssh-agent) \
-		--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
-	# Never install as suid root, this breaks dbus activation, see bug #513870
-	use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon
-	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-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 958bb0433c30..3b3cb085b3fc 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,3 +1,3 @@
-DIST gnome-panel-3.40.0.tar.xz 2924776 BLAKE2B fb7d3b85c0eb7509810b1c3730f27479516b104ded31127c9fb2d2852277e62270b300d238b0e2de944d571c68db9ac2b35ed323ddd709e6a4b669089f09bae2 SHA512 49d8fde009ccf139dcc1412863432e642c11e3c149c6f39ab8f51d8027880654625a997f58efe03234ea2716ad0316f7d5f60fb493e7e6cea366611b975effe6
-EBUILD gnome-panel-3.40.0.ebuild 2059 BLAKE2B ded1570a123a33ae231e897cdc14e0b2dcb5c377faaf15cd818a90bb83b8401c81c3082b9e8003a3ed178dafaf3fbc1732b156e5bb1ed48dc28349cfc2c5da2c SHA512 b664b7bd2b47404e0fa48a37c8efdd811a806300bab54b2df571bc74d43dc9fd0b3525fb4dd730a2669fa9832380034f846b02a7889b3b14d261faab19414080
+DIST gnome-panel-3.42.0.tar.xz 2927280 BLAKE2B ec0490115d3d1e728f7b6dc85b915a8390148e55c0b9342ee1125c1bceb34cc4721d350e0bac01a5c55d5eede885938711a2b234eb3e28ba59b87feceee3b41c SHA512 834b5ed58f3444bddbf59caeb42740ee1fbd2bcea9914b69f9c14baa39cd8105d4e822f7e408a605ced3d6c4a69eb76a97c4e069b6466c88b2db7d7afed7540c
+EBUILD gnome-panel-3.42.0.ebuild 2058 BLAKE2B 04bc13777efb3452fd7844dde84b4de9c1bd79808f4aabaff7fafb5f998ad634491294a8dd9fb0d751dddd3aabc965950e720084a278e8f366244eda93341bc0 SHA512 959dd978579e20469bf5ddbbece6b56c7216c97b355e3f94efaab24123ec3972f8105a9f5de385012cf3e4f0716ea389a95c31c405e5cb08d9f956d1a19ae475
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gnome-panel/gnome-panel-3.40.0.ebuild b/gnome-base/gnome-panel/gnome-panel-3.42.0.ebuild
index 389cfea2a968..5ae488ada9d7 100644
--- a/gnome-base/gnome-panel/gnome-panel-3.40.0.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-3.42.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
@@ -19,7 +19,7 @@ RDEPEND="
 	>=x11-libs/pango-1.15.4
 	>=dev-libs/glib-2.67.1:2
 	>=x11-libs/gtk+-3.22.0:3[X]
-	>=x11-libs/libwnck-3.4.6:3
+	>=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 )
@@ -57,7 +57,7 @@ src_configure() {
 	# 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.40.0; then
+	if ver_test ${PV} -ne 3.42.0; then
 		die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
 	fi
 
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index a8f06c343161..4054113a4e7b 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -2,9 +2,10 @@ AUX gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch 4505 BLAKE2B
 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-40.0.1-build-fix-str-bool-comparison.patch 909 BLAKE2B ae6115763a16d2ec54ad96c970f5b5a4df310a6818059ab9bb9e9a6f874f209ac05f17cd248e8a335631d9822a3df3de975d63704c458af0ccab3fd8da91b815 SHA512 7635b8c7370410921ae39a9f1278e45147261ad9a2b30b95ed07f1d08c9e0de86acdaafca99c04e4a78d646490f8f5356472887accff2d8e6057887ba52d8438
+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-40.0.1.tar.xz 1443100 BLAKE2B 2615165e4b33b3ae4f9ceac73fdd298ad5288b5de03424ade70a0dfd64b7349ae759138c0c930ba4c78ff70ed52389b2f0a996333234755f793dc114870d2460 SHA512 d5b7235e097baded66cbbc2c4f05effcac722daa09413f495368555ad97830746415c4c8f1ecfe54dac262f3b75ab1a83863dc4b736b9854dcf86c94c14edd79
 DIST gnome-settings-daemon-41.0.tar.xz 1477876 BLAKE2B f17005b03cbee142434f0805e8f590d6d9edad0f09b3226bb40ab7e312ee13bcd46c211efb140303d4a351d8818238a28bd9aa3fe760fb617fb006e97eebde61 SHA512 2c6848a749f84fd0c3a9ade6f4a83ae3ff7464da429b2d73030c9dcbd278b070c40475c678c819e31464941f2bd38d81f11b96f24d0d1fb05271267c3a1ecc2a
-EBUILD gnome-settings-daemon-40.0.1-r1.ebuild 3962 BLAKE2B 63026baa76a890c73f70118ab5b512e80741ffd5176b5a35e4dc3dd89b5e4b3ace64aafd54224a6f067e72a820e757b9c2783727fe92f82015528c5d3f9592c7 SHA512 8ed8580fcc318c467be4e4636901ec506647b45ec77d47bf49ae12079a9fa2d53340bb6933cd9e5485dc7a0d184155acf3b57b222241a34aa907ad77168219fa
-EBUILD gnome-settings-daemon-41.0.ebuild 3914 BLAKE2B ced2ccbd573d5719ed05df639f916de572a0167946c44cd459419921eb588cb2ec1080f4838a5b4890655c62c55ef2850698a022fe4ab4b37a3304794d1858f0 SHA512 105c5d1219b34206021e8a49b393639f105ab7dc039181c2d263131d1f0870c885d32d2fe23f164faa0a9155c9bfe7c7c05d91d768df2748b07876a7a47edbca
+EBUILD gnome-settings-daemon-40.0.1-r1.ebuild 4027 BLAKE2B 1fe7f17a64b22ed30d609727bbb45f4cc7fc55a28c310bb18293fa8bd90a4d0aa0085e5ca3070cb33fc41adec156f86501c3bc4b23f72109ec1e6f808a151363 SHA512 67e718c9a534ac94c2ba372918ff089671a8449e190f7448b67695f3f1c035459c485f8f89b0136e8dd4070a710989801161e3ca4372518023d421d6504af251
+EBUILD gnome-settings-daemon-41.0.ebuild 3957 BLAKE2B c84baf97c719b6abcd99c4757b62e161646db17496c3b746ab108cc46bb2d6f25ec297f919af0399f4363e59e4e56aaa08d2991bc7ab95801a90213c11075e2f SHA512 9d096e3e92120d337036f84843b64ad8b2fd04d056dec5727777ef493b2cfc1e7430f579bdf44b4574bc38fa05ed2eeaba3e36b6ac47bf00c1ef4d46bce638ee
 MISC metadata.xml 547 BLAKE2B ef7c1ef4b899bd7ba6f1d05b725a5c2205e949d03d41ae4922559e740fd94ecf767c25da34a9a45a4da796e336133ed250f675a525fec9db5fb53c4c7df35dd4 SHA512 ddc99a174f19c7c949cee4d130082572bcf71dc9c50d637cd94ea0f3609b9d032ff603552c2b077245cadc6cf03f8726cf81efe89fbf2e8b3e5293dcc572005c
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
new file mode 100644
index 000000000000..59aa0f433ae8
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch
@@ -0,0 +1,32 @@
+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-40.0.1-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1-r1.ebuild
index 5ad49d3f30c6..b355aaa5d382 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1-r1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1-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
@@ -93,6 +93,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.38.1-build-Allow-NM-optional-on-Linux.patch
 	"${FILESDIR}"/${PN}-3.38.1-Allow-udev-optional-on-Linux.patch
 	"${FILESDIR}"/gnome-settings-daemon-40.0.1-build-fix-str-bool-comparison.patch
+	"${FILESDIR}"/gnome-settings-daemon-41.0-meson-0.61-build.patch
 )
 
 python_check_deps() {
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild
index b0e196bea8d6..f5bbb821b4c3 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild
@@ -93,6 +93,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.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() {
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index fc62e974fb39..e78ab204003e 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,11 +1,8 @@
 AUX 40.0-defaults.patch 1412 BLAKE2B e36f7215cf756586479b8bdc71339beb3bbde53ca9745ddc4ef1c3feb59c720e4920e8aa4aadd7912874c386e7495a4b5d554e0d0616db17a81c4ec52a2baa6b SHA512 d82cf1e329d5974755738e29e6366bb10452620021a5db6c2ec63c4ee38e87a65dada34d57026e9510dbffa78c7060ae6f2ccec1739e3026bb0c67dab95f94a9
 AUX 40.0-optional-bluetooth.patch 2034 BLAKE2B 9df252dbef229d372bae87ab017d49086090a4194644fc0f7f3dc78226f78fa58cb99d67d4aac2b156894721658c6094aa6609c0da8c707cf0a8dac5a9a404ee SHA512 ec82f1ef7a9123134af2617526c22fa4258413edb6d68acdcd074911b98ed27d2e761904ccd88a364d9064d79bdefd402988bc53e1139f0e54f993c84242f19f
-DIST gnome-shell-40.4.tar.xz 1870468 BLAKE2B 78b0a749850e5df18beabd25cc35214b2d1f9a254dd095b9e783b2acdc9bac30edd7ffae3e6b15dd14d5b0877e8453c17548298e29b57642353e80ed505e556d SHA512 305d12cc7273f23e4a0c294f532cbf951816fd2de81959bef769048f4d5717e9e1886b64fe17b2f5ef6ee216ea67a6b913293a8903ec5dc5214bd29fbb1d3b32
+AUX 41.3-fix-build-with-meson-0.61.1.patch 3166 BLAKE2B 85378cb7a5ccf02833c409c9c0735d6004d59aa7cb915902b1b518d41235f89b649b353ecefce6228ff42724d6a299c18b3397f7bd584509a06356784871ce48 SHA512 70af8bc42e7a15d68834eed58dd3cac0074e2aa0ccc55c028112b9e06aaf79ffd41a135e1366a1d8131f5acd3857d282cf2471845df7cb301b1de10503e47e1f
 DIST gnome-shell-40.5.tar.xz 1871284 BLAKE2B 39c7392541af8a043627fb7aa19b723ee3b36e3d8001a64f34b14a6f23d68d3b160a0abe0f90659c55b99bf898cfdf30d88f62b8e113fc47814a55ef37c58725 SHA512 98bb0321aa9bc9da10ff6262cac802f575e2958600f429d446f3f87ec1ea40c837dd6e2fecae9dab0c2e224d2bf8b434a188ade84d4f480260102dcc80fdc5c9
-DIST gnome-shell-41.2.tar.xz 1896672 BLAKE2B 634cc8e4b77a94899af123fa9ce2a11271b913467007084bde90cfe2f4dbddd65bb1ed115c42ba21a697cb591e48387a19c5b0c3764e13950b9034c9fbc493d9 SHA512 4ec29881030933f8c15ea1d11a431ca07ea84566cd7c1ab69afbf25c1b588b2d75ade17b623b5bf644b42bf5b82e375b67a833169b5b0b6c7c0dd8dbd3e56835
 DIST gnome-shell-41.3.tar.xz 1897228 BLAKE2B 41cfc32488f7fcc3b0b565f8b63586ff0b2e7573e47d5e858e864ed7744b8cd535872312f4ccbb86fe7dea306f2c1460ce3a9ed93521f5d93bd124ce92634420 SHA512 3ef18f992c55ecb76e55f64306d43a15dc104b372db2faaaae2435d10edbc44bc0b8f9e27d173c0cac11b812c27648517543f210470c07d5dbc1f04ce4d811cc
-EBUILD gnome-shell-40.4-r1.ebuild 7078 BLAKE2B 0e2c32170f0cd386b9ac6585545082360c5907a55eb547367a8cbe7a698d10a9ef290d8b1199b5d8c24eaa74f264100501ebfd2e34aa252762eed9460bd8a351 SHA512 9a88e9178458f7503bc28184161b87fe78a8cbc6c940eb718f2573ae5e846929b72f1a179107145bbce4ab7981d101f37e7c73579b892a90250194d17f9d9da9
-EBUILD gnome-shell-40.5-r1.ebuild 7081 BLAKE2B 0c727a7c25e2be75a02634078b7841a523540f37b3a56c2f5d40b311ac2b4b2320db600935eee9583d45e94b471069cfa170a734d5487259f90c4a48451dc0d8 SHA512 34ad2fa9f44135c6ef6e0c78667b930c33c2fd7dba77a26b7d71a53f8e02c66cf7629e7aa85d770d8e8111975eff4db3c59302c143512ccbe568601a68a8d8af
-EBUILD gnome-shell-41.2-r1.ebuild 7303 BLAKE2B b97b21fd5669ad6cb3da3d106f252010a1579a395d4e8284a4252bab333e28efbfab2f30240a0c76f11f7c31967cc59e10dcf75afb4fa97d5832c6ee01328f3f SHA512 1c0bfb9268ec20d59245a5e7ad6f796e548d54ba3d33f129c70659102618091e17680e0dd49bcc7558f946be90c7327076dacf1f1b6fa4d8cda97a5f1a4a654d
-EBUILD gnome-shell-41.3.ebuild 7303 BLAKE2B 7750748ee45869e4d23bec892633bcb475f5322e66123ac929c40bad05029334ecce7a77b209910727e3d807e0a0cfef7eac0ad4f27031cb469707b5566bc3b5 SHA512 d04ad3f4bc13f309ad4c9b7846ec78601001af30090d95f08f0b1945f4fed12f31ce98fd16f7b18071e0ac942bba5029c5f5caa07885dc895c1d65614b57f60d
+EBUILD gnome-shell-40.5-r1.ebuild 7078 BLAKE2B 9bfeb5b555aad893675bb684bca8f74dc8a11e5c33d36224d6a4d06114c50906a7f19b9a73c0a659226d531b37c48f6699e0b43ed56a230297c3341d6748e98f SHA512 ec11388291ff13ae28dd92cacb4637560aff548e5153e56734b6c9a13d69c8f81e7ad26cc797c116a46e161e2311c429bb3412e9150b56c968a3d4fde7a06fe9
+EBUILD gnome-shell-41.3.ebuild 7358 BLAKE2B 1842c777a8816e384abc086b337c4e958d906df49bb8370ae5ee6dfb42591f63b7712d2ee5c8493d28ad1bbfc82cccaf6e0e79499b558a0a68407015bf087a41 SHA512 21681efb7eb649bb7813fe82c388df28ad25c7ca7b3080af12448ad7d76c2aabc23c6a315dc40c3ae0599e0cb167763cece3daf72111b532942cb6fc34c2713d
 MISC metadata.xml 1051 BLAKE2B 86f9156deb6546719e6bcd09ad609b2837901743dd390f430521226df6b9e8f54387d2c93411d63d0099261ee0463428fb8854ce2c47463b999827b377807d84 SHA512 f6a3efe242c1726508a56506a7817c3beea3cb17fbe37d2d38403bc6f4f1d11fd366b68b5c9c6ce44f200a21d48da6ccfcf07c9758369481376b5882ea872129
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
new file mode 100644
index 000000000000..ecf212b9794c
--- /dev/null
+++ b/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,84 @@
+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/gnome-shell-40.4-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-40.4-r1.ebuild
deleted file mode 100644
index b1f920349a61..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-40.4-r1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2021 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"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( elogind systemd )"
-
-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.65.1
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=x11-wm/mutter-40.0:0/8[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=gnome-base/gsettings-desktop-schemas-3.33.1[introspection]
-	>=x11-libs/startup-notification-0.11
-	>=app-i18n/ibus-1.5.2
-	>=gnome-base/gnome-desktop-3.35.90:3=[introspection]
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[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 greey 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
-)
-
-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 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
-	)
-	meson_src_configure
-}
-
-src_test() {
-	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-40.5-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-40.5-r1.ebuild
index 308122265769..458374b65d6d 100644
--- a/gnome-base/gnome-shell/gnome-shell-40.5-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-40.5-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
@@ -15,7 +15,7 @@ IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager system
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	?? ( elogind systemd )"
 
-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-41.2-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-41.2-r1.ebuild
deleted file mode 100644
index 950ce4355d5c..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-41.2-r1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2021 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"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( elogind systemd )"
-
-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]
-	>=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[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
-)
-
-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.3.ebuild b/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
index a5b2b5a53e21..25496f9f35dc 100644
--- a/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
@@ -139,6 +139,7 @@ PATCHES=(
 	"${FILESDIR}"/40.0-optional-bluetooth.patch
 	# Change favorites defaults, bug #479918
 	"${FILESDIR}"/40.0-defaults.patch
+	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
 )
 
 src_prepare() {
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index d4660a6758b3..60a2938ce22b 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,8 +1,6 @@
 AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec9844843793dc568e3012d3cd80c7a5f7a921e8dcc42406c6e15010fa472edf9cb10b7c86d1f8f69da2f6a3a034b7 SHA512 190129064554a36b56ba308f8dd75a9b8ee5ccfadffc0b5d528b5ba70324bcb3436acab116ad7768f59d316c3c2bd85dad9e8147050cb475b21fce439cb92705
-DIST gsettings-desktop-schemas-3.38.0.tar.xz 685868 BLAKE2B a5fe8baf6d7178cfba74c82974dfb854fbc2accfb9c98db2edbf46271b54626150a570fb3b578cdd86acfd1b21b432da0947e273c3ab94ec3f416c4a51b44e4a SHA512 5af7da90b8e7eec1c98e9e44653955f2882961dd9b5e2bf00e4eeb9f4f1149ae5171c600d457c6ab9c7482471c1a0e98f92f645a7ee7298e1b843c608f660756
 DIST gsettings-desktop-schemas-40.0.tar.xz 700672 BLAKE2B 5cc19d23e31a8ca7bd2344fa9392f11588b84c2641a6c0c2f184e733248d22c5603978408ccb13e58efac241beac8780c4a4f8c527b59fa3646cc18a18b09b90 SHA512 6b7f9b3095706b287254bd21d54311d6048e87340462e75848f05f7d7ded09da766cec7159fb6d889405ecfb4fdfe2243197989afeb21678fe4048783ae16424
 DIST gsettings-desktop-schemas-41.0.tar.xz 705240 BLAKE2B 2f2eb797fbdb7317666839a4ddffd65405ddcca80724a480bd1decfc164acc4c0db193ca6a3e3bcd71fbeb479fe51c5262c0bcf40fe85cfb2d6bda5b47d5b6e5 SHA512 58f9f60d818f0ddce20ad70e6ca64d3e1fb5a5dfd45b737cc055901f7dd5f1625902451e765a26969bdd72e3b37300dacbd3555a4bc3f33c6667dbf9b1869739
-EBUILD gsettings-desktop-schemas-3.38.0.ebuild 971 BLAKE2B 6e54977b6256f9972a4cbe8e32bd2bf89e3a4b0e1efa8f9481fa8efc05d8a3acdc95118069b3bacb5c405e0c8caa3556c552e2eefad28bd491d3b6667f8d9e3a SHA512 3bb0df1caabe286e4d568288e72a0bfc3d73900ec4a1e50a815e8a174affa0c5fed003905bceabff6500ac5e844c878fe6fed34b5a34bcf0d21a632070e6f294
-EBUILD gsettings-desktop-schemas-40.0.ebuild 1121 BLAKE2B 24f96c7803adb937027c34502db58081fdd0edcca38f6a64efc64c77c7d3d43d106621ba7efaf7e86baf4b8608f28d9848b26c01da4ad6329c0b1e5601359da5 SHA512 d6a51c91e2bbc5a8504776bcc2cf4619cb8ece2fccf32c0b7efdc9fc0e2954f4c39aca41fb01eec50c308fde6bd29ed99cc20480df980157bf400d67357017a9
-EBUILD gsettings-desktop-schemas-41.0.ebuild 1129 BLAKE2B 326d7cf395956a5daa825b88111426432c997dbb6712792858dc0c2c34e818ae0e56711bab8b61187d46a4687dddbd4f0226d0b0e790978c651d62f50a06fd34 SHA512 26ac3fe77c0a259a2c70cf0092eb30fdd2bb7ff6207f98b750b18eb04b4f3fe6324a5238678c71d45346e68a2f5671662ab9ce869768487360ed491186b3f1a9
+EBUILD gsettings-desktop-schemas-40.0.ebuild 1123 BLAKE2B 4ee66d73a34d73dc6229781b29c685540f02d8edcdad4f6781f1915931e206fbc891c5e83b95c825e04f9d5b06a004cb6bcf303a0a0af526e42e95989a26b3a9 SHA512 6adf06840ac6a9ca60c5facf11f3a1f201492c027633ef5986562226d14acbe49b9c16b6be892e4ff792634435e41e8eec53560e4ebe7c0f9c96aee6bcd4b9ad
+EBUILD gsettings-desktop-schemas-41.0.ebuild 1131 BLAKE2B 06bda37dd9ef06b89fbfe3d8b795c638be5cf9ac066c995489875f4e04d02ecb9c12f3ee6ce15b42b995c7ad7c68accf3983079dac16b1d4605a4baa20d0bccf SHA512 48349d9f5b74a149d6993dd49b8949317e564b946d03a6c6e48badc8be51d4fcbdaec72dc0521682bdec7b7d67a3fbab85d0ae138d5d7c726abf4b3422a7be9d
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.38.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.38.0.ebuild
deleted file mode 100644
index a4ff85ce3d26..000000000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.38.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson 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 ~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
-"
-
-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_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-40.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-40.0.ebuild
index 052a81d34d50..7f5222779930 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-40.0.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-40.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{6..9})
+PYTHON_COMPAT=( python3_{8..9} )
 inherit gnome.org gnome2-utils meson python-any-r1 xdg
 
 DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
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
index 929c1310ba77..9af8626a7cbc 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-41.0.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-41.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{6..10})
+PYTHON_COMPAT=( python3_{8..10} )
 inherit gnome.org gnome2-utils meson python-any-r1 xdg
 
 DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 7b44ac6bd2d0..981b70e21f24 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,3 +1,4 @@
+AUX meson-0.61.patch 985 BLAKE2B 39f9a905a69f1cc724a04ce5c994f00ccf4272ac4038d95ea1afba42bb85d29624bcd7c1b573496c6eebf2541c224cd978eff6e6b7b9640a58b0d9361a7b919e SHA512 ceb03541b0c1991ec1f4d933e7b6c0741cb8d36b3083945763a8ea91bfe271c3395e715e52f9a6724a132baf7792fbfcd97a0e43050eaeaa72d50a6388d61e3a
 DIST gvfs-1.48.1.tar.xz 1225916 BLAKE2B f2c46d94ba68065fcaef93cfaf25d5d6cc2fbbf4c1842452d30a9fec2ac5259b440fe569411cf3a874d3464f8d001ef2d04a705230a21b381ff1c3abe9c0f16e SHA512 19a642bcfce37eaa0d2d9f509fed6c67abfea0f79f5be9a17074d20e9ba71252a13583a2e08de88718cb141c5e79e34c84c765c87160351fe21291a8f88abe8c
-EBUILD gvfs-1.48.1-r1.ebuild 3872 BLAKE2B 559fb64b7529be42ea820d6a474de79128d306701b72f49cc53c7c6bdcbb948fcc7df42f430f30f6692d722903b3ebe8a53c57e60a16e48c55d5222bac3827a1 SHA512 275dbab450eec5b352253cb3ecaa1ed22e91e0eb5bd4273ffe878174521bdf34ebec0fecc6aed3fd720b8e0c6a35b5895614f80d5ef40732254c3a20c85bcb08
+EBUILD gvfs-1.48.1-r1.ebuild 3917 BLAKE2B 06f752d9d82ec7144e6957ee018fc86228952c8c50428e13d9df121455ff1b1d7d7afd3f8bdda4393d30bcdb2e3b6c26f028901269262930d1f59e80aebfbed7 SHA512 0a542600b93a05ccc4ad3f10d20bcdf05d15c0757a19008e524ce5ba0d64a1ce79b33733987794799180f1a957e7d812e092de17ea9056f826a0baae614fc553
 MISC metadata.xml 1700 BLAKE2B af3b3595b38c93739128edb4678d17d1166b91abf851098b892c7240bff0f98886bd39a1bd85a218a8378dc9f7df9759e4ced4ce8183b652f6e1d27900e22220 SHA512 7b4f4d8abda474c6670d3ef278801d61d285ba48b07f7023ddee5eaba01ed695edd16ed946afa5c90baf394e87b3bfff6135380e4f3698e188a209f954b6cabb
diff --git a/gnome-base/gvfs/files/meson-0.61.patch b/gnome-base/gvfs/files/meson-0.61.patch
new file mode 100644
index 000000000000..20e03388d7c6
--- /dev/null
+++ b/gnome-base/gvfs/files/meson-0.61.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/831840
+https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/133
+
+From 1522bf6a9741cf6f1fe16eaf50fd20af46882873 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Fri, 21 Jan 2022 08:32:31 +0100
+Subject: [PATCH] build: Remove incorrect i18n.merge_file argument
+
+The positional argument was being silently ignored until meson 0.60.0 where
+it fails with "ERROR: Function does not take positional arguments".
+
+Related: https://github.com/mesonbuild/meson/issues/9441
+Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/599
+(cherry picked from commit 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0)
+---
+ daemon/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/daemon/meson.build b/daemon/meson.build
+index dffeef3e..bdc506fe 100644
+--- a/daemon/meson.build
++++ b/daemon/meson.build
+@@ -366,7 +366,6 @@ if enable_admin
+   )
+ 
+   i18n.merge_file(
+-    policy,
+     input: policy_in,
+     output: '@BASENAME@',
+     po_dir: po_dir,
+-- 
+2.34.1
+
diff --git a/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild b/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild
index f4b50cffc64b..38deee759bc2 100644
--- a/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.48.1-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
@@ -82,6 +82,10 @@ BDEPEND="
 	test? ( dev-libs/libgdata )
 "
 
+PATCHES=(
+	"${FILESDIR}/meson-0.61.patch"
+)
+
 src_configure() {
 	local enable_logind="false"
 	if use systemd || use elogind; then
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index f17d1f242cb9..baceaa089d5b 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -2,9 +2,7 @@ AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e89404
 AUX 3.32.3-optional-gstreamer.patch 1592 BLAKE2B 5c0326638ed4c2714fe72e460256bd01cfad547c6455e1ec3e0273550d5f16e7ddf2e32e4928b7d45e1ea877625fce5a8ea3171d67f5c87359a9ddc2944fe9cc SHA512 40bcbbad8ad7d831e7af0659a710af0f378e8aaafff89f764528f577dcb78d96d38af475112bcd4c615d5c78249955c31ce196bcbebd590bdeb6f52127ce3a3a
 AUX 41.1-optional-gstreamer.patch 1592 BLAKE2B 877421d758d9b0911bc94b3d5132867e3a78532ce90c3e10017b164dcf4ae8f2cd8a49a23878936ed7adfe1112e5fbaff06542a62d7c6a0f515a53cff1dbb03e SHA512 3f1e0cb25237b5c9c6f29a7ac7a50afcf7a1b9844a4a9c6e134cbabebecf374846295de7b5d4416e1def8a1a2fb111e557caf27096836d8d19c51f9325799807
 DIST nautilus-40.2.tar.xz 3250384 BLAKE2B 8f8bb0c1a060d57695b28df126d421f386d634cbeea007ca30e076eb1b432a4098b98e9a1f39f688f8a920d99ef42ae2d53fe14fb270ba1e7de16aadd037a8d7 SHA512 ff7beab2963231c6e5ccd88098260659dd7fedd38ef6c0b95d66ffa110bfe5adc86477e2c1657eb2fcfe6110384038f75a7e669158712dfc1e2bd3f9e273b268
-DIST nautilus-41.1.tar.xz 3246356 BLAKE2B 558cac6bacd4d4238e8ceb792baa4d85a6aa981e78ae380b6c1256d079cac8e78b3d9b850a01180e4952630eb7898b987f79c12844adca82ab3702b0213d3150 SHA512 1eb2f2a0187f8b6581fe64285f347e8522b971eeb4d1f575387f3767e177f0195e758da9187090155216807b8f49ebed0fbcc29dd3cce6f3e408d7a955ae5286
 DIST nautilus-41.2.tar.xz 3248212 BLAKE2B be4e4e8fc03751259a1a5d4d1eb726e3026d24376da3fa680c412598219bfb3ced52f9b809004913dffdb9bb1c176dede07288c440c100487b3a337d8eaab417 SHA512 adb14fa1cf37a4797f57ae5162bddcd5b012de270cf955051b69276bc266b1dbfd8027b835f627ae19a1252356b344b1c8a4b7ca79a22512f3138a2c13fd2f3e
 EBUILD nautilus-40.2.ebuild 3065 BLAKE2B 9e69ced68e66e213977e927dc86865eb71211388aed72f190377c0af5c45fc7e3993ae53e98f5123305b42bf6d3167749fb0593e9df7307832f2169be520994a SHA512 66a918c5ae9fbf231684fc76d19b817dbbfaf4e887f52eb7870cdf9a0ad1bd6ed075d31db5b7b678dcd5217986708542d7c84781506ed2b5b4a79375a7a0fe85
-EBUILD nautilus-41.1.ebuild 3066 BLAKE2B 7cbc982c235187cd1c5c094c101317106417e4fe0a3b0d7d1c43f99261004dba2f9a4838337c1225f75b6cbe99b1fd2b88ef45c6dae073bac4074685a25dd92f SHA512 ed493ad48cb5d5a5e425bdd71987b4b87328de68a016f3ec7ae110932f429f61e016620188fe08e85a50962e580d75c17133ca7f6af26c99547e1153b1bfeec8
-EBUILD nautilus-41.2.ebuild 3066 BLAKE2B 69c0480b16d093e290c90120dfc43a3f9001fb54e54e6ef9015457d4ccb0d78c6b7c97f95ba18f2ec0e1f4013d4576a65cd30d45fceed56dfc2730b5103641f7 SHA512 70221a714ce5e80f26d0a5fcaf9803cfaf27de2b1230fdc7cd7c472bad7a6c2ca0e11a1cba58e21eee7d6042b0a97625490074439f9d9a06ef078e403b4ad79a
+EBUILD nautilus-41.2.ebuild 3066 BLAKE2B f793ad9a3d4a8d18bf773830e93541d63f1111a1d1ecd1b788487a85e6db382c91bcca7402653ba42d113dd8b5b4e33624a1a24d47447c67ec0113b373ce9fce SHA512 ef4313b9808158a4e4139df67aa195cea6b84ca1927f62442a245b4d1921caf4619beffe78258f10cd2b4eee28aa7cfba45b36886cba57d58c2dcca5bb1b3b92
 MISC metadata.xml 554 BLAKE2B 80d4d6da040c47ddd01a278a0ca8af3d371f9e88b7c1583a606701bc85331d853d41bcc3a6be73772ce5574a1c50e601b31fa125a5f4c8a6dc39b1308d78af5b SHA512 ad97897d6f8c9be9271c0204fafd3540ac0d798fc8d4a1de1e66503dbb714dfacf0fd4ce23e059044ab7a3a3b687228811aa9adfba16391e6a5dfe2fda11801c
diff --git a/gnome-base/nautilus/nautilus-41.1.ebuild b/gnome-base/nautilus/nautilus-41.1.ebuild
deleted file mode 100644
index da337e10b426..000000000000
--- a/gnome-base/nautilus/nautilus-41.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 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.10.0
-	gstreamer? ( media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	>=app-arch/gnome-autoar-0.3.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
-	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-41.2.ebuild b/gnome-base/nautilus/nautilus-41.2.ebuild
index d5d9b1ae7f2e..b0749dad3692 100644
--- a/gnome-base/nautilus/nautilus-41.2.ebuild
+++ b/gnome-base/nautilus/nautilus-41.2.ebuild
@@ -19,7 +19,7 @@ DEPEND="
 	>=media-libs/gexiv2-0.10.0
 	gstreamer? ( media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0 )
-	>=app-arch/gnome-autoar-0.3.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