gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /gnome-base
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
44 files changed, 69 insertions, 1544 deletions
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 43beb6ded144..538f2e04cf10 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 2747bda12acb..d7842bf5c437 100644
--- a/gnome-base/dconf-editor/Manifest
+++ b/gnome-base/dconf-editor/Manifest
@@ -1,4 +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 865 BLAKE2B 63c98e66d2547661d2b7eae22976f522269467024c5a7368f481aeefe9917c654c933067fedf2e5f79c24c5a8863deee52969b27a4d368aad0d7a89e70bd300c SHA512 13e1f32a055be2974d700f30620d8d52a573ce25e67428624e937676504f7f929a4affa3bf22ead4f506894a07183b86d1e3588f0ad96ae8f1085e387458d04d
+EBUILD dconf-editor-3.38.3.ebuild 864 BLAKE2B cfd492ce813a681acb09cb42330ebcf85a02cc964d2d083bcc07b7ae40c33e62ea011244b8f2c0ebaafa30ed3af0f95f965034c75d419812e43a8afc7b16aa39 SHA512 3728d5aba19a33b3fcd59bbf3fb59531bedb5ba1b318a0ab6568d8a95dbe7cefcb5f98307031ea1553f234db6a7f451ed83b1cf4c0e378e943a27d97c4b766f7
 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 dabf7da33d8f..29b544beb935 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/dconf-editor"
 LICENSE="GPL-3+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
 
 RDEPEND="
 	>=gnome-base/dconf-0.26.1
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 4b877e1282ab..aeba6142fe28 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -3,10 +3,7 @@ AUX gdm-3.30.3-logo.patch 846 BLAKE2B e99b6621191c509545bc36fe838bc467c3762f2726
 AUX gdm-3.8.4-fingerprint-auth.patch 923 BLAKE2B e681da8518ed1d002c1205658bb35e472e9d130df5d70dfd9eef55f5361cffeee716ebe0eea23f4c19f9f6ec2f4118729616f7f4e2c758990cf7cde3271cc8b2 SHA512 3cf5f9c0eabdae3f767d9b9db6052d760e879c14b9304753cdda56a4f643a9ed97f3ea83f642bfe96d220c8e9e4f99fbbd47c6e99ddfebeb6322a3a033c296d5
 AUX gdm-40.0-meson-allow-building-with-elogind.patch 8801 BLAKE2B 358abc6b4a81523f53f6551af3c976916492c6c80fcacf8ec7c6fd90683558f1e7d898b749bdb458b2379e8a96f08293bbbebee3b8fc9126ebf249a95c514b41 SHA512 6116047fe51f0daf99de7e369028629fff88890c9627407648f2bec312df9b8b94f1ccb9b7015347258444f8193da16c6209a41de9441c848097670a13b4a7ef
 AUX pam-elogind.patch 835 BLAKE2B 1db26b690d631c152ae7fd84149c7ff3222e8bd258bff78e09cd6f00fe34a8bfdb2499b252a1f15e17d9e4ed315e02260357b57cd31cf8ada5a2705ba1ef4ee0 SHA512 4d2d65741a5bfd1dc686dc986708526161d15ace2d5396bef281a2192d95458a072764483e1422ed1f6eb594fc0caa6baa381371618f907a97f75566209fab7b
-DIST gdm-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 gdm-41.3.tar.xz 807452 BLAKE2B ff6a264220c2ddc60c21fb767154bfdc2844a177e4043749cc393387b116865f5b9dc56c4ce996e83c0a258370f59b7fd1865f455aa67258671ae0bae8671997 SHA512 71a93eef02fccee22ca4f90e3217431923da2b1ac4f5995ff7b64c9b4cac839f4695f4122d255407b570635d34e86e233fa7e4d5d22a8d8185ccfa8ad20f83aa
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gdm-40.1.ebuild 5845 BLAKE2B ba21b057cc56faa241968f6413dfbac93f5645c5e51fcc337a93c341c2e225b0e1af74129c38091b5abd13434fddf75d40fbce44649d3e938d94b8a0fcfcdd5e SHA512 7b2b52af1cc4e08a13c4611596324f9c4c873b51e04d27a26623147173b28cf9bebc7293f3d82fdaaf636cdc5845ce573eac9a6cdb20fecfe85b51cf890edbf2
-EBUILD gdm-41.0.ebuild 5934 BLAKE2B 48ca9e06ec9f5050561b494bb7baad03fad4714b4eb85cc2d30f7a1851f8669449cfda9eb0ee7d0ffdc6663046c259c2b61b914c58a5ae2eaebfd5b9024a7d40 SHA512 d6d348448103dadc866ce344ef5ed4f56c3286189abfcc929b67415360688c3f9329d42d845f6b60d9ba50bdeafb26d84e50ae97dd6ff4232f76ac48c5476d70
+EBUILD gdm-41.3.ebuild 5845 BLAKE2B c60a6ef2ff2234706ff0c716f94ff383cda89605c1b09c02fcb8ee0f0f9185adf1eeea161b1eb68f3b3af6b0cf83f48a38fd6c492f59db952bfffe08ca937ec1 SHA512 d746306cb63b23c94d96f46a9e79edbcb7058ac4f45d9e01ad1b81cdf2da36bdffc59ade9ff409ce658cc4f9bd33647770dcb0682164d2f727af4d3fae8153ab
 MISC metadata.xml 760 BLAKE2B ed67837e4caac485dd97f9b2b392c4aa26cb0515a5147a258e197531123f1c92b96900d073e85dca0ffc661aad3efb0d2328434e4554bf3b681ecf3a61eb797a SHA512 40979ee3950ee2cb3c3d67eff9c100f6fb1bc19215daaf4d8e65b8f300f05b71c74e542312780979d7ee31d0234be351496dd2dd7a7ebf3519da2fbb3acbc8dd
diff --git a/gnome-base/gdm/gdm-41.0.ebuild b/gnome-base/gdm/gdm-41.0.ebuild
deleted file mode 100644
index 26502e302869..000000000000
--- a/gnome-base/gdm/gdm-41.0.ebuild
+++ /dev/null
@@ -1,216 +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}
-	https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="
-	GPL-2+
-	branding? ( CC-BY-SA-4.0 )
-"
-
-SLOT="0"
-
-IUSE="accessibility audit bluetooth-sound branding elogind fprint ipv6 plymouth selinux systemd tcpd test wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="^^ ( elogind systemd )"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-# dconf, dbus and g-s-d are needed at install time for dconf update
-# keyutils is automagic dep that makes autologin unlock login keyring when all the passwords match (disk encryption, user pw and login keyring)
-# dbus-run-session used at runtime
-COMMON_DEPEND="
-	virtual/udev
-	>=dev-libs/glib-2.56:2
-	>=x11-libs/gtk+-2.91.1:3
-	>=media-libs/libcanberra-0.4[gtk3]
-	>=sys-apps/accountsservice-0.6.35
-	x11-libs/libxcb
-	sys-apps/keyutils:=
-	selinux? ( sys-libs/libselinux )
-
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-base/xorg-server[-minimal]
-	x11-libs/libXdmcp
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-
-	systemd? ( >=sys-apps/systemd-186:0=[pam] )
-	elogind? ( >=sys-auth/elogind-239.3[pam] )
-
-	plymouth? ( sys-boot/plymouth )
-	audit? ( sys-process/audit )
-
-	sys-libs/pam
-	sys-auth/pambase[elogind?,systemd?]
-
-	>=gnome-base/dconf-0.20
-	>=gnome-base/gnome-settings-daemon-3.1.4
-	gnome-base/gsettings-desktop-schemas
-	sys-apps/dbus
-
-	>=x11-misc/xdg-utils-1.0.2-r3
-
-	>=dev-libs/gobject-introspection-0.9.12:=
-"
-# XXX: These deps are from session and desktop files in data/ directory
-# fprintd is used via dbus by gdm-fingerprint-extension
-RDEPEND="${COMMON_DEPEND}
-	acct-group/gdm
-	acct-user/gdm
-	>=gnome-base/gnome-session-3.6
-	>=gnome-base/gnome-shell-3.1.90
-	x11-apps/xhost
-
-	accessibility? (
-		>=app-accessibility/orca-3.10
-		gnome-extra/mousetweaks
-	)
-	fprint? ( sys-auth/fprintd[pam] )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=gnome-base/dconf-0.20
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( >=dev-libs/check-0.9.4 )
-	app-text/yelp-tools
-"
-
-DOC_CONTENTS="
-	To make GDM start at boot with systemd, run:\n
-	# systemctl enable gdm.service\n
-	\n
-	To make GDM start at boot with OpenRC, edit /etc/conf.d to have
-	DISPLAYMANAGER=\"gdm\" and enable the xdm service:\n
-	# rc-update add xdm
-	\n
-	For passwordless login to unlock your keyring, you need to install
-	sys-auth/pambase with USE=gnome-keyring and set an empty password
-	on your keyring. Use app-crypt/seahorse for that.\n
-	\n
-	You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
-	for smartcard support
-"
-
-PATCHES=(
-	"${WORKDIR}"/patches/
-
-	# Gentoo does not have a fingerprint-auth pam stack
-	"${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
-
-	# Add elogind support
-	"${FILESDIR}/${PN}-40.0-meson-allow-building-with-elogind.patch"
-
-	# Support pam_elogind.so in gdm-launch-environment.pam
-	"${FILESDIR}/pam-elogind.patch"
-)
-
-src_prepare() {
-	default
-
-	# Show logo when branding is enabled
-	use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch"
-}
-
-src_configure() {
-	# --with-initial-vt=7 conflicts with plymouth, bug #453392
-	# gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which
-	# saves on memory. However this means if we don't start on VT1, gdm doesn't start up
-	# before user manually goes to VT7. Thus as-is we can not keep gdm away from VT1,
-	# so lets try always having it in VT1 and see if that is an issue for people before
-	# hacking up workarounds for the initial start case.
-	local emesonargs=(
-		--localstatedir /var
-
-		-Ddefault-pam-config=exherbo
-		-Dgdm-xsession=true
-		-Dgroup=gdm
-		$(meson_use ipv6)
-		$(meson_feature audit libaudit)
-		-Dlogind-provider=$(usex systemd systemd elogind)
-		-Dpam-mod-dir=$(getpam_mod_dir)
-		$(meson_feature plymouth)
-		-Drun-dir=/run/gdm
-		$(meson_feature selinux)
-		$(meson_use systemd systemd-journal)
-		$(meson_use tcpd tcp-wrappers)
-		-Dudev-dir=$(get_udevdir)/rules.d
-		-Duser=gdm
-		-Duser-display-server=true
-		$(meson_use wayland wayland-support)
-		-Dxdmcp=enabled
-	)
-
-	if use elogind; then
-		emesonargs+=(
-			-Dinitial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility
-			-Dsystemdsystemunitdir=no
-			-Dsystemduserunitdir=no
-		)
-	else
-		emesonargs+=(
-			-Dinitial-vt=1
-			-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
-			-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use accessibility ; then
-		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
-	fi
-
-	if ! use bluetooth-sound ; then
-		# Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10
-		# bug #679526
-		insinto /var/lib/gdm/.config/pulse
-		doins "${FILESDIR}"/default.pa
-	fi
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm
-
-	use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	local d ret
-
-	# bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm
-	ret=0
-	ebegin "Fixing "${EROOT}"/var/lib/gdm ownership"
-	chown --no-dereference gdm:gdm "${EROOT}/var/lib/gdm" || ret=1
-	for d in "${EROOT}/var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do
-		[[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1
-	done
-	eend ${ret}
-
-	systemd_reenable gdm.service
-	readme.gentoo_print_elog
-}
diff --git a/gnome-base/gdm/gdm-40.1.ebuild b/gnome-base/gdm/gdm-41.3.ebuild
index 5112360b459b..8bef669a63d7 100644
--- a/gnome-base/gdm/gdm-40.1.ebuild
+++ b/gnome-base/gdm/gdm-41.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
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 159cea031628..13a51ce27441 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,11 +1,4 @@
-DIST gnome-control-center-40.0-patchset-2.tar.xz 7396 BLAKE2B 9d3c0461c065cbf0f2051847e516066a38ebffc0972f12060fc41a7d283dd0eecd1a3e581518e13c1dcd545d600e7a2bece5d33d10e8c50adcb2b05f9558e8d0 SHA512 3a93c0c2f0f2bc422e6992c259334d9a90678151882e2df3035e4c233fa8e6c557073cc6679044b27bbfaafaa06d59b76724154dcd63612724e1e89817c99a36
-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 6272 BLAKE2B 1976bf80a9615ffa4647cf07027384c07cbf5a95ce12651325cf96065191774b44e1f5b9c2295e427864a4b987721340bbeeab7e2c3f771fab9201251211c67b SHA512 baaca029d73c5cb8372641871b6a5e8f03b81b94be878bbe0016d5934c1c858ec71df1b9cb03cfb16ce8af8a16552422ba81b3c93f65f1bb80e9de0abcbc4ead
-MISC metadata.xml 589 BLAKE2B cc1f65e04e51a669bd160ddd7530d9365ae3086cc16d8c3120c5dc35b6079d2cab4a090dec76f5bb884e5d0e843887c16e447d95269f7e734693cdbef53507a6 SHA512 e7c7d1e5084cdc3373723c610a239759695fd1f6e346d1e32476679d4fe60be87df1ba5af7efb2bd1751b54af8e11be8b851b092caa6c8c672c163b19be2977a
+DIST gnome-control-center-41.4.tar.xz 6616908 BLAKE2B 7c1a2692667c0447590d81c17ae990bff4b3bb7b85007ec70f8623d284cc0743ca79380dc60f1a9f97c01f897260c74acae0d730b197e8d4314e8002c7eec826 SHA512 63fa20041a06f5075d172b543176b4f037fcd623d9fa5ca5f785e047a9b95ccd002c423d29de673dcb28b7d99a83157b39d7bd65ef77fe70065e9a03b5ae38a4
+EBUILD gnome-control-center-41.4.ebuild 6116 BLAKE2B 48f777af0401e6a64b8b86ac4a8c565a2fe81efc99c04b240284053a668ad0512e4786677797349c341c090e1a11fd7708085ec1cf457b853df481aa4dc9643f SHA512 2755e695e61b24f029d437f9afb3f8c82b727bf336ae88ab343a6e6c3dd939ca950e5fc6a1eb7f57533e0db649dc58d72628385f265775f9a72eedc665c810eb
+MISC metadata.xml 497 BLAKE2B 27aa6d9d725a3ce90d351442da83bdb5680f9931d78e5d6a653a1d2d392df118406e3eab36c77bbaeefc581be3a62c5df13fdfb611b2db27fc9c7440ba4ceae3 SHA512 c44903fa5a9462871c065bc776450c25bcca1dfe2f52d6bf676568f587bc308a0465bd5cb6e095fb0ecaefd0b8471df90df3b96164c7e7de76a86fbbe416a82b
diff --git a/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild
deleted file mode 100644
index 61e996591618..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild
+++ /dev/null
@@ -1,179 +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 gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-40.0-patchset-2.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +cups debug elogind flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test v4l wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	flickr? ( gnome-online-accounts )
-	^^ ( elogind systemd )
-" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86"
-
-# meson.build depends on python unconditionally
-BDEPEND="${PYTHON_DEPS}"
-
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# display panel requires colord and gnome-settings-daemon[colord]
-# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
-# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
-# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
-DEPEND="
-	>=gui-libs/libhandy-1:1=
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= )
-	>=media-sound/pulseaudio-2.0[glib]
-	>=sys-apps/accountsservice-0.6.39
-	>=x11-misc/colord-0.1.34:0=
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=dev-libs/glib-2.56.0:2
-	>=gnome-base/gnome-desktop-3.33.4:3=
-	>=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?]
-	>=gnome-base/gsettings-desktop-schemas-3.37.0
-	dev-libs/libxml2:2
-	>=sys-auth/polkit-0.114
-	>=sys-power/upower-0.99.8:=
-	>=dev-libs/libgudev-232
-	x11-libs/libX11
-	>=x11-libs/libXi-1.2
-	media-libs/libepoxy
-	flickr? ( >=media-libs/grilo-0.3.0:0.3= )
-	>=x11-libs/gtk+-3.22.0:3[X,wayland=]
-	cups? (
-		>=net-print/cups-1.7[dbus]
-		>=net-fs/samba-4.0.0[client]
-	)
-	v4l? (
-		>=media-video/cheese-3.28.0 )
-	ibus? ( >=app-i18n/ibus-1.5.2 )
-	networkmanager? (
-		>=net-libs/libnma-1.8.0
-		>=net-misc/networkmanager-1.24.0:=[modemmanager]
-		>=net-misc/modemmanager-0.7.990 )
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
-	input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
-	kerberos? ( app-crypt/mit-krb5 )
-
-	x11-libs/cairo[glib]
-	>=x11-libs/colord-gtk-0.1.24
-	net-libs/libsoup:2.4
-	media-libs/fontconfig
-	gnome-base/libgtop:2=
-	>=sys-fs/udisks-2.1.8:2
-	app-crypt/libsecret
-	media-libs/gsound
-	>=dev-libs/libpwquality-1.2.2
-"
-# systemd/elogind USE flagged because package manager will potentially try to satisfy a
-# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
-# libgnomekbd needed only for gkbd-keyboard-display tool
-# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${DEPEND}
-	systemd? ( >=sys-apps/systemd-31 )
-	elogind? ( app-admin/openrc-settingsd
-		sys-auth/elogind )
-	x11-themes/adwaita-icon-theme
-	>=gnome-extra/gnome-color-manager-3.1.2
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	>=gnome-base/libgnomekbd-3
-	wayland? ( dev-libs/libinput )
-	!wayland? (
-		>=x11-drivers/xf86-input-libinput-0.19.0
-		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
-	flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] )
-"
-# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
-# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
-	networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
-
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.2
-	x11-base/xorg-proto
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep '
-		dev-python/python-dbusmock[${PYTHON_USEDEP}]
-	') )
-"
-
-PATCHES=(
-	# Patches from gnome-40 branch on top of 40.0
-	# Makes some panels and dependencies optional
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	# Fix some absolute paths to be appropriate for Gentoo
-	"${WORKDIR}"/patches/
-)
-
-python_check_deps() {
-	use test || return 0
-	has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	# Mark python tests with shebang executable, so that meson will launch them directly, instead
-	# of via its own python-single-r1 version, which might not match what we get from python_check_deps
-	chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth)
-		$(meson_use v4l cheese)
-		-Dcups=$(usex cups enabled disabled)
-		-Ddocumentation=true # manpage
-		-Dgoa=$(usex gnome-online-accounts enabled disabled)
-		-Dgrilo=$(usex flickr enabled disabled)
-		$(meson_use ibus)
-		-Dkerberos=$(usex kerberos enabled disabled)
-		-Dmalcontent=false # unpackaged
-		$(meson_use networkmanager network_manager)
-		-Dprivileged_group=wheel
-		-Dsnap=false
-		$(meson_use test tests)
-		$(meson_use debug tracing)
-		$(meson_use input_devices_wacom wacom)
-		#$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
-		# bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-40.7.ebuild b/gnome-base/gnome-control-center/gnome-control-center-40.7.ebuild
deleted file mode 100644
index 35eb6612f6b3..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-40.7.ebuild
+++ /dev/null
@@ -1,179 +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 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/~leio/distfiles/${PF}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +cups debug elogind flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test v4l wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	flickr? ( gnome-online-accounts )
-	^^ ( elogind systemd )
-" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
-
-# meson.build depends on python unconditionally
-BDEPEND="${PYTHON_DEPS}"
-
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# display panel requires colord and gnome-settings-daemon[colord]
-# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
-# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
-# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
-DEPEND="
-	>=gui-libs/libhandy-1:1=
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= )
-	>=media-sound/pulseaudio-2.0[glib]
-	>=sys-apps/accountsservice-0.6.39
-	>=x11-misc/colord-0.1.34:0=
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=dev-libs/glib-2.56.0:2
-	>=gnome-base/gnome-desktop-3.33.4:3=
-	>=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?]
-	>=gnome-base/gsettings-desktop-schemas-40_alpha
-	dev-libs/libxml2:2
-	>=sys-auth/polkit-0.114
-	>=sys-power/upower-0.99.8:=
-	>=dev-libs/libgudev-232
-	x11-libs/libX11
-	>=x11-libs/libXi-1.2
-	media-libs/libepoxy
-	flickr? ( >=media-libs/grilo-0.3.0:0.3= )
-	>=x11-libs/gtk+-3.22.0:3[X,wayland=]
-	cups? (
-		>=net-print/cups-1.7[dbus]
-		>=net-fs/samba-4.0.0[client]
-	)
-	v4l? (
-		>=media-video/cheese-3.28.0 )
-	ibus? ( >=app-i18n/ibus-1.5.2 )
-	networkmanager? (
-		>=net-libs/libnma-1.8.0
-		>=net-misc/networkmanager-1.24.0:=[modemmanager]
-		>=net-misc/modemmanager-0.7.990 )
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
-	input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
-	kerberos? ( app-crypt/mit-krb5 )
-
-	x11-libs/cairo[glib]
-	>=x11-libs/colord-gtk-0.1.24
-	net-libs/libsoup:2.4
-	media-libs/fontconfig
-	gnome-base/libgtop:2=
-	>=sys-fs/udisks-2.1.8:2
-	app-crypt/libsecret
-	media-libs/gsound
-	>=dev-libs/libpwquality-1.2.2
-"
-# systemd/elogind USE flagged because package manager will potentially try to satisfy a
-# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
-# libgnomekbd needed only for gkbd-keyboard-display tool
-# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${DEPEND}
-	systemd? ( >=sys-apps/systemd-31 )
-	elogind? ( app-admin/openrc-settingsd
-		sys-auth/elogind )
-	x11-themes/adwaita-icon-theme
-	>=gnome-extra/gnome-color-manager-3.1.2
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	>=gnome-base/libgnomekbd-3
-	wayland? ( dev-libs/libinput )
-	!wayland? (
-		>=x11-drivers/xf86-input-libinput-0.19.0
-		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
-	flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] )
-"
-# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
-# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
-	networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
-
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.2
-	x11-base/xorg-proto
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep '
-		dev-python/python-dbusmock[${PYTHON_USEDEP}]
-	') )
-"
-
-PATCHES=(
-	# Patches from gnome-40 branch on top of 40.0
-	# Makes some panels and dependencies optional
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	# Fix some absolute paths to be appropriate for Gentoo
-	"${WORKDIR}"/patches/
-)
-
-python_check_deps() {
-	use test || return 0
-	has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	# Mark python tests with shebang executable, so that meson will launch them directly, instead
-	# of via its own python-single-r1 version, which might not match what we get from python_check_deps
-	chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth)
-		$(meson_use v4l cheese)
-		-Dcups=$(usex cups enabled disabled)
-		-Ddocumentation=true # manpage
-		-Dgoa=$(usex gnome-online-accounts enabled disabled)
-		-Dgrilo=$(usex flickr enabled disabled)
-		$(meson_use ibus)
-		-Dkerberos=$(usex kerberos enabled disabled)
-		$(meson_use networkmanager network_manager)
-		-Dprivileged_group=wheel
-		-Dsnap=false
-		$(meson_use test tests)
-		$(meson_use debug tracing)
-		$(meson_use input_devices_wacom wacom)
-		#$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
-		# bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
-		-Dmalcontent=false # unpackaged
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-41.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-41.4.ebuild
index 6843ae5bfd33..5f10276513a1 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-41.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-41.4.ebuild
@@ -8,8 +8,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"
+SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-41.2-patchset.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="2"
@@ -18,7 +17,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	^^ ( elogind systemd )
 " # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86"
 
 # meson.build depends on python unconditionally
 BDEPEND="${PYTHON_DEPS}"
@@ -125,9 +124,6 @@ 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-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml
index d6a9c29d21a7..1e05158abc3a 100644
--- a/gnome-base/gnome-control-center/metadata.xml
+++ b/gnome-base/gnome-control-center/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
-		<flag name="flickr">Add support for using photos from flickr as desktop background</flag>
 		<flag name="gnome-online-accounts">Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
 		<flag name="ibus">Enable support for enhanced input methods through <pkg>app-i18n/ibus</pkg></flag>
 	</use>
diff --git a/gnome-base/gnome-core-apps/Manifest b/gnome-base/gnome-core-apps/Manifest
index 7f34a4f04058..75396534fce7 100644
--- a/gnome-base/gnome-core-apps/Manifest
+++ b/gnome-base/gnome-core-apps/Manifest
@@ -1,3 +1,2 @@
-EBUILD gnome-core-apps-40.0.ebuild 1565 BLAKE2B d7008348c571ba12f2ecafc3be39b24fbe52f816a92dd2b94c8d89871f81100cc358871f67d9808764dba7b6c612f00c2c3b62b2e06b2921fe191cc349e8c33c SHA512 f76c746c06678a1f6beb7bfcaa007f15a8f0c41ad206c9b332235284ca063ef99edbc179cc067ee81e8ed70991193018496a1dc3b3e30359d4ea1e0dbd82e116
-EBUILD gnome-core-apps-40.6.ebuild 1572 BLAKE2B 5ebfde13a5b16282cc957b7f73a736748ccb6bb149573fd00f57f94f67285f419b7e608efde41ae1b698a10575bb80418e6c86536d67906e11851e0266ffeac1 SHA512 fbc31b969ecedc72490dca6c8e53ec4e5b3285473a5a3ac96c9c0734a2c859b1ec1bc9f0912181fe3f2e27331c60934cc104d4e03b918b5f28904f012b53dac6
+EBUILD gnome-core-apps-41.3.ebuild 1503 BLAKE2B 5fa17f59b45aa08b1ae60dddf0369e4bde3b4820235a768b98d039d62aa7a2e4eec23e857438890df9d53524ca86a89f5dc993d4b2959e6d72fd6590b88af185 SHA512 84eb986a66ca3d48a420f5325dbd869649bd7ac79db173574807496a2663f9e1f9544ed7d7a3fa55b38d8451ffe492b35bbb4c7c0dd8fbdfa08002dd8a8ddbe0
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-40.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-40.0.ebuild
deleted file mode 100644
index fb29d67f4a86..000000000000
--- a/gnome-base/gnome-core-apps/gnome-core-apps-40.0.ebuild
+++ /dev/null
@@ -1,54 +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 applications integrated with GNOME"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="+bluetooth cups"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-# gnome-color-manager min version enforced here due to control-center pulling it in
-# tepl min version for gedit deptree
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-
-	>=gnome-base/gnome-session-40.0
-	>=gnome-base/gnome-settings-daemon-40.0[cups?]
-	>=gnome-base/gnome-control-center-40.0[cups?]
-	>=gnome-extra/gnome-color-manager-3.36.0
-
-	>=app-crypt/gcr-3.38.1
-	>=gnome-base/nautilus-40.0
-	>=gnome-base/gnome-keyring-40.0
-	>=gnome-extra/evolution-data-server-3.${PV}
-
-	>=app-crypt/seahorse-40.0
-	>=gui-libs/tepl-6.0.0
-	>=app-editors/gedit-40.0
-	>=app-text/evince-40.0
-	>=gnome-extra/gnome-contacts-40.0
-	>=media-gfx/eog-40.0
-	>=media-video/totem-3.38.0
-	>=x11-terms/gnome-terminal-3.40.0
-
-	>=gnome-extra/gnome-user-docs-40.0
-	>=gnome-extra/yelp-40.0
-
-	>=x11-themes/adwaita-icon-theme-40.0
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.34.5 )
-"
-DEPEND=""
-BDEPEND=""
-
-# cdr? ( >=app-cdr/brasero-3.12.2 ) # not part of gnome releng release anymore
-# >=gnome-base/gnome-menus-3.13.3:3  # not used by core gnome anymore, just gnome-classic extensions
-# >=net-im/empathy-3.12.12 # not part of gnome releng core or apps suite anymore
-
-S="${WORKDIR}"
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-40.6.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-41.3.ebuild
index ce8bc0569102..1043b4a32689 100644
--- a/gnome-base/gnome-core-apps/gnome-core-apps-40.6.ebuild
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-41.3.ebuild
@@ -11,36 +11,34 @@ IUSE="+bluetooth cups"
 
 # 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"
 
 # gnome-color-manager min version enforced here due to control-center pulling it in
-# tepl min version for gedit deptree
 RDEPEND="
 	>=gnome-base/gnome-core-libs-${PV}[cups?]
 
 	>=gnome-base/gnome-session-40.1.1
-	>=gnome-base/gnome-settings-daemon-40.0.1[cups?]
-	>=gnome-base/gnome-control-center-40.7[cups?]
+	>=gnome-base/gnome-settings-daemon-41.0[cups?]
+	>=gnome-base/gnome-control-center-41.2[cups?]
 	>=gnome-extra/gnome-color-manager-3.36.0
 
 	>=app-crypt/gcr-3.40.0
-	>=gnome-base/nautilus-40.2
+	>=gnome-base/nautilus-41.1
 	>=gnome-base/gnome-keyring-40.0
-	>=gnome-extra/evolution-data-server-3.40.4
-
-	>=app-crypt/seahorse-40.0
-	>=gui-libs/tepl-6.0.0
-	>=app-editors/gedit-40.1
-	>=app-text/evince-40.4
-	>=gnome-extra/gnome-contacts-40.0
-	>=media-gfx/eog-40.3
+	>=gnome-extra/evolution-data-server-3.42.3
+
+	>=app-crypt/seahorse-41.0
+	>=app-editors/gedit-41
+	>=app-text/evince-41.3
+	>=gnome-extra/gnome-contacts-41.0
+	>=media-gfx/eog-41.1
 	>=media-video/totem-3.38.2
-	>=x11-terms/gnome-terminal-3.40.3
+	>=x11-terms/gnome-terminal-3.42.2
 
-	>=gnome-extra/gnome-user-docs-40.5
-	>=gnome-extra/yelp-40.3
+	>=gnome-extra/gnome-user-docs-41.1
+	>=gnome-extra/yelp-41.2
 
-	>=x11-themes/adwaita-icon-theme-40.1.1
+	>=x11-themes/adwaita-icon-theme-41.0
 
 	bluetooth? ( >=net-wireless/gnome-bluetooth-3.34.5 )
 "
diff --git a/gnome-base/gnome-core-libs/Manifest b/gnome-base/gnome-core-libs/Manifest
index a34dae6d0e9e..bf441cd0e2b1 100644
--- a/gnome-base/gnome-core-libs/Manifest
+++ b/gnome-base/gnome-core-libs/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnome-core-libs-40.6.ebuild 945 BLAKE2B 9f36a47e6b707b2093e42c3cd41d581b832b02c6ebba79fd991ccf86219812bdb2e486093decda8f5658dc3e3e087fb565bce813ace7c2dd6752b4b761c723f4 SHA512 06cc06ab2ca8b5452f8ff1a21f6624dfde5addd7bba5f6e28a4369d0e260630a1a7ff88a7b8efeac5c493ecce19d76395fcd6a78e8f82651788b499f314e7c3f
+EBUILD gnome-core-libs-41.3.ebuild 944 BLAKE2B b1868234b7fdf788f419c2da8497f7b96c4fd347da5f2494df05d09068b018dff2f20593ab613199e367a0865e7b504e84f304084cd065e4a692e42fd74394e7 SHA512 1e30642fc61f1736610fba04b29090b98420163ef551cf73883fe32d015bb3b4c9724faeb31f2de58d5c1d69c9f6356a0e6d188811d5c44ef1ada09f2a29e1db
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-40.6.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-41.3.ebuild
index b896d6814625..fe4453e73290 100644
--- a/gnome-base/gnome-core-libs/gnome-core-libs-40.6.ebuild
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-41.3.ebuild
@@ -11,17 +11,17 @@ 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
 RDEPEND="
-	>=dev-libs/glib-2.68.4:2
+	>=dev-libs/glib-2.70.2:2
 	>=x11-libs/gdk-pixbuf-2.42.6:2
 	>=x11-libs/pango-1.48.10
-	>=x11-libs/gtk+-3.24.30:3[cups?]
+	>=x11-libs/gtk+-3.24.31:3[cups?]
 	>=dev-libs/atk-2.36.0
-	>=gnome-base/librsvg-2.50.7
+	>=gnome-base/librsvg-2.52.5
 	>=gnome-base/gnome-desktop-${PV}:3
 
 	>=gnome-base/gvfs-1.48.1
@@ -31,7 +31,7 @@ RDEPEND="
 	>=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.1:3 )
+	python? ( >=dev-python/pygobject-3.42.0:3 )
 "
 DEPEND=""
 BDEPEND=""
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index aa20fbc8f4e0..5430c9a15292 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,6 +1,4 @@
 AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c0265f34d5d0fd555ae60a519273512021cf4f065db1e22ab72ce9004a914a47d077551b5a12ffbd5e81a9b8cf098a4762a0e461d SHA512 ea76e41aff067281497b98c86b66d8c382124ceead5b18e729342615a50b6aa3401f4d7c5553023b5d78ca0ea02823c7d6026ba9acca862804351269e4107d18
-DIST gnome-desktop-40.7.tar.xz 721452 BLAKE2B d9979be0131bbaafdc4ae808a5367ce1ac39ade3595f96999cfc7e2876c9cf380a6a6039c74db34a40f1747fec05081384ea1dbf487e849f32a1da67fe22e8a0 SHA512 b687c8b7de968544b14bc8801ba3762e0cc2f4d08a41b718813302fdbdcedc3b67ead19bea14050db6312bd807f28bf5e56eeec53c3e2d9005466c9e73e62d14
 DIST gnome-desktop-41.3.tar.xz 732804 BLAKE2B 40a88ba4454455f85a46676d4b2f37159617f7eae9d0f5e1a27c3f0ed1e44953ae9475e81558b7cce1b6fd8cd8804cd3f452d060d843d4f58a7af8748b4c35fa SHA512 b02d9fe3bfad56993f9ed7225b38b4b0b685c7ad1480a9d9db5f9a6a8e13c16918d87e6a51160ee3101ab8ce24f4c0632ae351e7bb11cc473523e216ee9cf6bf
-EBUILD gnome-desktop-40.7.ebuild 1935 BLAKE2B 2996ef29e201abe721ea0b5611e52eb121e9da28fa858f2a3deb11ea084951f7ddc0ce6aa655177e6a5b3e0edd8e5079f226fd6c79c5154f50b69faf156621f6 SHA512 34435b92fcdae005a9855cf3f10c99e5e9dde499116737bdabb6d3a6765765fe3a474925da67e98b909b9350af581bf06623d19e4730878696f1b85a1fee642a
-EBUILD gnome-desktop-41.3.ebuild 1925 BLAKE2B 68d86b4ef86b039777fb210cc7dc68213b48a86f1667dc95eb9943fd70ba72dee8602032f1235849c875740b37cc3c49ca5e537dc00f62bb49340959252585c3 SHA512 922a601ad2e11ed2665fbcc97c16a0b063f328534c743a9777109fc7f8b9d7ab47c5b3282570ed4a6ed56ccfb804bbdaf47d07c40c398fddc7f9a86e1a6d34fc
+EBUILD gnome-desktop-41.3.ebuild 1922 BLAKE2B d2d6613309b0adba0b3afba8d8966e368a8ea7fd5c1676ee2f3aaa37a3518af6f861a5aa98ba0611c3ee023901ba5c7838f59eddd1ef43cdee27054dfc94bb7f SHA512 722b7d3f3c6e43c84c7bf37f202263a21021ed0fc3b8275ea1cd207b0d19cb3e7807bbc8eb539a54210a4296468994d677ebdbd1b82023e11514f00ca82c73e4
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-base/gnome-desktop/gnome-desktop-40.7.ebuild b/gnome-base/gnome-desktop/gnome-desktop-40.7.ebuild
deleted file mode 100644
index 6acc99df16e8..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-40.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org 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-41.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-41.3.ebuild
index 17f8768e560d..7aeb9c59632c 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-41.3.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-41.3.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-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest
index e157882f1ec6..4b6954414615 100644
--- a/gnome-base/gnome-extra-apps/Manifest
+++ b/gnome-base/gnome-extra-apps/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnome-extra-apps-40.0.ebuild 2513 BLAKE2B 2a67aad4aa05a1953b70a7261e8ae9a16a7542ba3f5dcc066892f9efbc39189aa6c3c7645281895b226c1e1ce13d15527794b81d5213c15293f51da538976917 SHA512 9ea8ce7dc22a7beeadf8b2bf3ff63425840fe5fc623e5010c61107ffcf969fb6eca3f754e15798fc260207f7f2403e2d992d5e3a498b5ffc191c1f056bd63efb
+EBUILD gnome-extra-apps-40.0.ebuild 2512 BLAKE2B 90b4eaa54c624a83a7cbec974404575fe17a5f874cdcb0004c87974e89b78450ab83f7e324bc53645fd557dd832f4ac24f5f4645fc12a36a9941a7302862b68f SHA512 450def13c7185c511d055e9ba1ec9cb3ba39ab1b9fbd2bbadd393372e1d16b36686630558aefebdb6960f49ad88decb66e3d103438afa2837baf1cba05f379be
 MISC metadata.xml 618 BLAKE2B b0e3eb484cf4fd6251b59d9be7cd5d150cff79379cdc61bac77eb17e4cdcdfb7f93be57976d6a47e331a44829d30e6f9075e490b2ac9eb557728135bbbd89071 SHA512 0688fb4552c6c1de4b493cb8f7194dd08665441c9c7f06c873bffe0ab1f58d2441c14d13d28073c89577eafc522bf535a72a72a66b9f4bb3f3fbf403a0acbf2f
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild
index 7483cf0b5514..a4a9a775ec58 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ LICENSE="metapackage"
 SLOT="3.0"
 IUSE="+games share +shotwell +tracker"
 
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 # Note to developers:
 # This is a wrapper for the extra apps integrated with GNOME
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index 4947a29d0994..02460d707495 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-menus-3.36.0.tar.xz 502324 BLAKE2B 8bf1b0d4ac30a1e7f4c4e1b14ad3e2f718e974ec58fe8e8ab3c0d030c1cd1841a9cceb86d8909c0d0dcf128f19aecdd64350840f0cb25ed7cacdc2c95786f118 SHA512 e830e66639c2b6aebecf572188208d33b1515270e69af3f2c6f7a640d305a7b9c2bce10e5f520b3da1dea681b194fd14c551468ea5747aa333e649b5c46774e4
-EBUILD gnome-menus-3.36.0.ebuild 905 BLAKE2B dfe71cb193f4292561f3f956d3253b07e1900cebc0c70f871e9eb88135a4a1a6a2eba75027f1c063b8833ea2c2eb364d08db9b26e4450bc352eae125c1ebc905 SHA512 ae63c378e30b3793f8d4598493924444c2ccfa35dd416c4681bb13817481fc877d761017a8045cf55c62a9eeb953ba86903a0f451327e2fb6b88d06c86e33cb7
+EBUILD gnome-menus-3.36.0.ebuild 904 BLAKE2B 785bda1af4a9d4792f681b24aff4db204bb1fb2a495fa682baaca7d96d4a41e7294de5e5e9ef6ae732a4c86202683eaa2bfb8d62d05b544cfa0a1297b4180237 SHA512 d357ca7c149ff095d0cc586093edc9e693d70d74511bc248bd45b556a9754576a13ef72a2399057e5f602eb6b3f5703bdfdf9cc813de3528a9898305559705bb
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild b/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild
index 0f664abf97e9..f22e4d48d07f 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-menus"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="+introspection test"
 RESTRICT="!test? ( test )"
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 764c652c8ee3..fc11eb0f513c 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -4,10 +4,6 @@ AUX 90-xcursor-theme-gnome 384 BLAKE2B 985ea5b7de4d51b46625c21b803c5d225ac598b81
 AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc52fe128b35eb3f9e8f0bf3884f0c444ab2da88eb6ba12d9a852e8a058f4abdcf050dc68c SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6
 AUX defaults.list-r5 19379 BLAKE2B 9299c535bcb3ce6f291ba66dfe655f7e793d554f5fd7a5df5e8db665e43372f8c08a5ea8480e63e318befc5b2e56e4b027ca873947972aa2b19d14ba85f0ec3e SHA512 edee1126e11c3b49ebcea1e1a6929d55a28d09b6c382666d6d6a32271a4cf22af23927f7a5e15ecbd4a4cdaa41ac2f1ffc09350f4e48257e2e5e29ade08635ac
 AUX gnome-session-3.38.0-meson-Support-elogind.patch 2808 BLAKE2B da7ad139fe118edc4c53570acc5e56d59e3073caae7941c54b11c59208675eaa148eb03d437d0edfa0f0d024880b77bc60ba65140422f25319ac132299dfe972 SHA512 2a57894b95662ca4488f95110943076a82ecbe7f3bb8ed4d95e2c8082276839f4b1a7ecc20915557378e73e1947df856e4ff57d9d5b9ae32a9673f2cc3b2fbc2
-DIST gnome-session-40.1.1.tar.xz 482304 BLAKE2B 9a96f230dc793cc0b810bdaad6ce0103f923fbd2b22ee567316508c79bd6e7afe3961b593d094d0a4766a76f45ba6710f96e03a299f43d08a04aca776a172955 SHA512 91609915366839806729e066e5ca0d42daff0591732cda08c3da7d4951f7e27964d72988c4e61a64045443969b9fb0a9697c7ace82bdd8843310cb4d7e9dfd8c
-DIST gnome-session-40.8.tar.xz 483272 BLAKE2B 47cbc09885163bbae2cd6578cc506ce32c1514a3024e410d9bf0dd7bb4a8e5dd38f8957f17685c9847098579c3b5e46d5675a53b99ce6673c9f4905c9f55d3dd SHA512 1f0cc24ae140adfada4a343ad4542883779ac0e6343df2a5720458d62fa1c88e6703d6612c05c2af32b5cabc351daa432ef0b6981f852550ebb99eeed4a77b36
 DIST gnome-session-41.3.tar.xz 483396 BLAKE2B b5672868459b362452f62e6b543243df536a2edeaaa75dae09c5dedc9574fa58f6024aea5e0853361ae46cff6dcbfd257e6bc0da7ddfb028c3b0ae58d8ead63d SHA512 a75c038639301ccd1f0abf83f944890f74986e94dc32f45c97c1872ddc09bcebbb94116f7f865b1d9fa40a81133ec14fbfb75d585061750d9809af4abba3aa9a
-EBUILD gnome-session-40.1.1-r1.ebuild 3462 BLAKE2B 11d024d25aaf753b92233546fb0f4af827d6f9b202f90418fc0250d4962a07f36180942a452f90d097640cd3703e2a0e51d45057f749a55161969fca55b015d3 SHA512 86a431a2cc9b57281f4ce4d8d87460f72cb5daa79bf16de881bff91b1ce048d286eb1fc33002b57c08d2cf606bb2cdb271d7b4fa6462af2c40b8610543e3b98c
-EBUILD gnome-session-40.8.ebuild 3465 BLAKE2B 92e34084c9afb29775e8be3dbddeacdfb8d824ae287371316c21f56b32bc7f2a2587b5959feda959f445a97f5c6ebb46206bab3d1951f6c0f786ae92065dea8a SHA512 d6c799875bb877249559d4e0afa71d1cfd63ccb8d779b919666d1f85edc2843892e06316eefe832783bc8c785b1a9782d1377166b8de85ae0ae4031f495d9f4a
-EBUILD gnome-session-41.3.ebuild 3465 BLAKE2B 92e34084c9afb29775e8be3dbddeacdfb8d824ae287371316c21f56b32bc7f2a2587b5959feda959f445a97f5c6ebb46206bab3d1951f6c0f786ae92065dea8a SHA512 d6c799875bb877249559d4e0afa71d1cfd63ccb8d779b919666d1f85edc2843892e06316eefe832783bc8c785b1a9782d1377166b8de85ae0ae4031f495d9f4a
+EBUILD gnome-session-41.3.ebuild 3462 BLAKE2B 2202d8a6e5dee7aa3559625101a7a03f0902b688e1ccdd496a267121af8b9ad4fd13c1b189d5458950cf37cbd4c436f5bfc732ca4444fd7a310a9994084dbc6d SHA512 06997a93a0859ab1d4b39a8ffc4ba8c065f4c9da41736efc7640d8f922bf93ab4375fa97cf2051c15455be2333e8ff8832500d548386e38b502ea7b2a5440c06
 MISC metadata.xml 349 BLAKE2B 675e33de85c98218f36cb44ac7e756e310530782ea6ef1f9e40a08e0ffaea810aaac0a72176a299c13192f92f03938fea5132b9726bce0fc6f50e1b1e42aba07 SHA512 c174185512a6df3648511062dfbeca054184f2357df8fd468553cb87421b72b876fe933161df738a8fa21f0637ad65963747ab761f2ada398061616ffb6f0f8a
diff --git a/gnome-base/gnome-session/gnome-session-40.1.1-r1.ebuild b/gnome-base/gnome-session/gnome-session-40.1.1-r1.ebuild
deleted file mode 100644
index a1cf79b72858..000000000000
--- a/gnome-base/gnome-session/gnome-session-40.1.1-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc elogind systemd"
-# There is a null backend available, thus ?? not ^^
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	>=dev-libs/glib-2.46.0:2
-	>=x11-libs/gtk+-3.22.0:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=gnome-base/gnome-desktop-3.34.2:3=
-	>=dev-libs/json-glib-0.10
-	media-libs/mesa[egl(+),gles2,X(+)]
-	media-libs/libepoxy
-	x11-libs/libXcomposite
-
-	systemd? ( >=sys-apps/systemd-242:0= )
-	elogind? ( >=sys-auth/elogind-239.4 )
-"
-
-# Pure-runtime deps from the session files should *NOT* be added here.
-# >=gnome-settings-daemon-3.35.91 for UsbProtection required component.
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# sys-apps/dbus[X] is needed for session management.
-# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
-RDEPEND="${DEPEND}
-	>=gnome-base/gnome-settings-daemon-3.35.91
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	sys-apps/dbus[X]
-
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-"
-BDEPEND="
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	x11-libs/xtrans
-	virtual/pkgconfig
-	doc? ( app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.38.0-meson-Support-elogind.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	# Install USE=doc in ${PF} if enabled
-	sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddeprecation_flags=false
-		$(meson_use elogind)
-		-Dsession_selector=true # gnome-custom-session
-		$(meson_use systemd)
-		-Dsystemd_session=$(usex systemd default disable)
-		$(meson_use systemd systemd_journal)
-		$(meson_use doc docbook)
-		-Dconsolekit=false
-		-Dman=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome"
-
-	newmenu "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
-	# This should be done here as discussed in bug #270852
-	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-
-	# Set XCURSOR_THEME from current dconf setting instead of installing
-	# default cursor symlink globally and affecting other DEs (bug #543488)
-	# https://bugzilla.gnome.org/show_bug.cgi?id=711703
-	newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
-		ewarn "If you use a custom .xinitrc for your X session,"
-		ewarn "make sure that the commands in the xinitrc.d scripts are run."
-	fi
-
-	if ! use systemd && ! use elogind; then
-		ewarn "You are building without systemd or elogind support."
-		ewarn "gnome-session won't be able to correctly track and manage your session."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-session/gnome-session-40.8.ebuild b/gnome-base/gnome-session/gnome-session-40.8.ebuild
deleted file mode 100644
index d79d3e2348d7..000000000000
--- a/gnome-base/gnome-session/gnome-session-40.8.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc elogind systemd"
-# There is a null backend available, thus ?? not ^^
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	>=dev-libs/glib-2.46.0:2
-	>=x11-libs/gtk+-3.22.0:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=gnome-base/gnome-desktop-3.34.2:3=
-	>=dev-libs/json-glib-0.10
-	media-libs/mesa[egl(+),gles2,X(+)]
-	media-libs/libepoxy
-	x11-libs/libXcomposite
-
-	systemd? ( >=sys-apps/systemd-242:0= )
-	elogind? ( >=sys-auth/elogind-239.4 )
-"
-
-# Pure-runtime deps from the session files should *NOT* be added here.
-# >=gnome-settings-daemon-3.35.91 for UsbProtection required component.
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# sys-apps/dbus[X] is needed for session management.
-# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
-RDEPEND="${DEPEND}
-	>=gnome-base/gnome-settings-daemon-3.35.91
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	sys-apps/dbus[X]
-
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-"
-BDEPEND="
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	x11-libs/xtrans
-	virtual/pkgconfig
-	doc? ( app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.38.0-meson-Support-elogind.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	# Install USE=doc in ${PF} if enabled
-	sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddeprecation_flags=false
-		$(meson_use elogind)
-		-Dsession_selector=true # gnome-custom-session
-		$(meson_use systemd)
-		-Dsystemd_session=$(usex systemd default disable)
-		$(meson_use systemd systemd_journal)
-		$(meson_use doc docbook)
-		-Dconsolekit=false
-		-Dman=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome"
-
-	newmenu "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
-	# This should be done here as discussed in bug #270852
-	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-
-	# Set XCURSOR_THEME from current dconf setting instead of installing
-	# default cursor symlink globally and affecting other DEs (bug #543488)
-	# https://bugzilla.gnome.org/show_bug.cgi?id=711703
-	newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
-		ewarn "If you use a custom .xinitrc for your X session,"
-		ewarn "make sure that the commands in the xinitrc.d scripts are run."
-	fi
-
-	if ! use systemd && ! use elogind; then
-		ewarn "You are building without systemd or elogind support."
-		ewarn "gnome-session won't be able to correctly track and manage your session."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-session/gnome-session-41.3.ebuild b/gnome-base/gnome-session/gnome-session-41.3.ebuild
index d79d3e2348d7..e4ba03bb2260 100644
--- a/gnome-base/gnome-session/gnome-session-41.3.ebuild
+++ b/gnome-base/gnome-session/gnome-session-41.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc elogind systemd"
 # There is a null backend available, thus ?? not ^^
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 4054113a4e7b..89fc5f76deb3 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -4,8 +4,6 @@ AUX gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-contro
 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 4027 BLAKE2B 1fe7f17a64b22ed30d609727bbb45f4cc7fc55a28c310bb18293fa8bd90a4d0aa0085e5ca3070cb33fc41adec156f86501c3bc4b23f72109ec1e6f808a151363 SHA512 67e718c9a534ac94c2ba372918ff089671a8449e190f7448b67695f3f1c035459c485f8f89b0136e8dd4070a710989801161e3ca4372518023d421d6504af251
-EBUILD gnome-settings-daemon-41.0.ebuild 3957 BLAKE2B c84baf97c719b6abcd99c4757b62e161646db17496c3b746ab108cc46bb2d6f25ec297f919af0399f4363e59e4e56aaa08d2991bc7ab95801a90213c11075e2f SHA512 9d096e3e92120d337036f84843b64ad8b2fd04d056dec5727777ef493b2cfc1e7430f579bdf44b4574bc38fa05ed2eeaba3e36b6ac47bf00c1ef4d46bce638ee
+EBUILD gnome-settings-daemon-41.0.ebuild 3954 BLAKE2B a1e545560d68d18ed28bf025197b2998756ef08219727acd547e652dfed4573961307741eac8cb3a7021c9edd7adcf18bd281737e8330195457705f4d051fd02 SHA512 b8ef84e4dc1294b9dd4c9e1a0dc24b6406292e78b3e7276c9d407933aeb6d844ed8e67a3ff734e2df1118f75954aa34c3a324e9462e685b60ee44cd0f6571103
 MISC metadata.xml 547 BLAKE2B ef7c1ef4b899bd7ba6f1d05b725a5c2205e949d03d41ae4922559e740fd94ecf767c25da34a9a45a4da796e336133ed250f675a525fec9db5fb53c4c7df35dd4 SHA512 ddc99a174f19c7c949cee4d130082572bcf71dc9c50d637cd94ea0f3609b9d032ff603552c2b077245cadc6cf03f8726cf81efe89fbf2e8b3e5293dcc572005c
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
deleted file mode 100644
index b355aaa5d382..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test +udev wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	^^ ( elogind systemd )
-	input_devices_wacom? ( udev )
-	wayland? ( udev )
-"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-DEPEND="
-	>=sci-geosciences/geocode-glib-3.10
-	>=dev-libs/glib-2.56:2
-	>=gnome-base/gnome-desktop-3.37.1:3=
-	>=gnome-base/gsettings-desktop-schemas-40
-	>=x11-libs/gtk+-3.15.3:3[X,wayland?]
-	>=dev-libs/libgweather-40:2=
-	colord? (
-		>=x11-misc/colord-1.4.5:=
-		>=media-libs/lcms-2.2:2
-	)
-	media-libs/libcanberra[gtk3]
-	>=app-misc/geoclue-2.3.1:2.0
-	>=x11-libs/libnotify-0.7.3
-	>=media-sound/pulseaudio-12.99.3[glib]
-	>=sys-auth/polkit-0.114
-	>=sys-power/upower-0.99.8:=
-	x11-libs/libX11
-	udev? ( dev-libs/libgudev:= )
-	wayland? ( dev-libs/wayland )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=x11-libs/pango-1.20.0
-		x11-libs/gdk-pixbuf:2
-	)
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	modemmanager? (
-		>=app-crypt/gcr-3.7.5:=
-		>=net-misc/modemmanager-1.0:=
-	)
-	networkmanager? ( >=net-misc/networkmanager-1.0 )
-	media-libs/alsa-lib
-	x11-libs/libXi
-	x11-libs/libXext
-	media-libs/fontconfig
-	systemd? (
-		>=sys-apps/systemd-243
-	)
-"
-# logind needed for power and session management, bug #464944
-# gnome-session-3.33.90/gdm-3.33.90/gnome-shell-extensions-3.34.1/gnome-flashback-3.33.1 adapt to Clipboard and Mouse component removals (moved to mutter)
-RDEPEND="${DEPEND}
-	gnome-base/dconf
-	elogind? ( sys-auth/elogind )
-	!<gnome-base/gnome-session-3.33.90
-	!<gnome-base/gdm-3.33.90
-	!<gnome-extra/gnome-shell-extensions-3.34.1
-	!<gnome-base/gnome-flashback-3.33.1
-"
-# rfkill requires linux/rfkill.h (and USE=udev), thus linux-headers dep, not os-headers. If this package wants to work on other kernels, we need to make rfkill conditional instead
-BDEPEND="
-	sys-kernel/linux-headers
-	dev-util/glib-utils
-	dev-util/gdbus-codegen
-	x11-base/xorg-proto
-	${PYTHON_DEPS}
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			dev-python/python-dbusmock[${PYTHON_USEDEP}]
-		')
-		gnome-base/gnome-session
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-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}"/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() {
-	if use test; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		#-Dnssdb_dir # TODO: Is the default /etc/pki/nssdb path correct for our nss?
-		-Dudev_dir="$(get_udevdir)"
-		$(meson_use systemd)
-		-Dalsa=true
-		$(meson_use udev gudev)
-		$(meson_use colord)
-		$(meson_use cups)
-		$(meson_use networkmanager network_manager)
-		$(meson_use udev rfkill)
-		$(meson_use smartcard)
-		$(meson_use input_devices_wacom wacom)
-		$(meson_use wayland)
-		$(meson_use modemmanager wwan)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	# Don't auto-suspend by default on AC power
-	insinto /usr/share/glib-2.0/schemas
-	doins "${FILESDIR}"/org.gnome.settings-daemon.plugins.power.gschema.override
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
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 f5bbb821b4c3..b719895dc966 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
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	input_devices_wacom? ( udev )
 	wayland? ( udev )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 DEPEND="
 	>=sci-geosciences/geocode-glib-3.10
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index e78ab204003e..3e4aff219284 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,8 +1,6 @@
 AUX 40.0-defaults.patch 1412 BLAKE2B e36f7215cf756586479b8bdc71339beb3bbde53ca9745ddc4ef1c3feb59c720e4920e8aa4aadd7912874c386e7495a4b5d554e0d0616db17a81c4ec52a2baa6b SHA512 d82cf1e329d5974755738e29e6366bb10452620021a5db6c2ec63c4ee38e87a65dada34d57026e9510dbffa78c7060ae6f2ccec1739e3026bb0c67dab95f94a9
 AUX 40.0-optional-bluetooth.patch 2034 BLAKE2B 9df252dbef229d372bae87ab017d49086090a4194644fc0f7f3dc78226f78fa58cb99d67d4aac2b156894721658c6094aa6609c0da8c707cf0a8dac5a9a404ee SHA512 ec82f1ef7a9123134af2617526c22fa4258413edb6d68acdcd074911b98ed27d2e761904ccd88a364d9064d79bdefd402988bc53e1139f0e54f993c84242f19f
 AUX 41.3-fix-build-with-meson-0.61.1.patch 3166 BLAKE2B 85378cb7a5ccf02833c409c9c0735d6004d59aa7cb915902b1b518d41235f89b649b353ecefce6228ff42724d6a299c18b3397f7bd584509a06356784871ce48 SHA512 70af8bc42e7a15d68834eed58dd3cac0074e2aa0ccc55c028112b9e06aaf79ffd41a135e1366a1d8131f5acd3857d282cf2471845df7cb301b1de10503e47e1f
-DIST gnome-shell-40.5.tar.xz 1871284 BLAKE2B 39c7392541af8a043627fb7aa19b723ee3b36e3d8001a64f34b14a6f23d68d3b160a0abe0f90659c55b99bf898cfdf30d88f62b8e113fc47814a55ef37c58725 SHA512 98bb0321aa9bc9da10ff6262cac802f575e2958600f429d446f3f87ec1ea40c837dd6e2fecae9dab0c2e224d2bf8b434a188ade84d4f480260102dcc80fdc5c9
-DIST gnome-shell-41.3.tar.xz 1897228 BLAKE2B 41cfc32488f7fcc3b0b565f8b63586ff0b2e7573e47d5e858e864ed7744b8cd535872312f4ccbb86fe7dea306f2c1460ce3a9ed93521f5d93bd124ce92634420 SHA512 3ef18f992c55ecb76e55f64306d43a15dc104b372db2faaaae2435d10edbc44bc0b8f9e27d173c0cac11b812c27648517543f210470c07d5dbc1f04ce4d811cc
-EBUILD gnome-shell-40.5-r1.ebuild 7078 BLAKE2B 9bfeb5b555aad893675bb684bca8f74dc8a11e5c33d36224d6a4d06114c50906a7f19b9a73c0a659226d531b37c48f6699e0b43ed56a230297c3341d6748e98f SHA512 ec11388291ff13ae28dd92cacb4637560aff548e5153e56734b6c9a13d69c8f81e7ad26cc797c116a46e161e2311c429bb3412e9150b56c968a3d4fde7a06fe9
-EBUILD gnome-shell-41.3.ebuild 7358 BLAKE2B 1842c777a8816e384abc086b337c4e958d906df49bb8370ae5ee6dfb42591f63b7712d2ee5c8493d28ad1bbfc82cccaf6e0e79499b558a0a68407015bf087a41 SHA512 21681efb7eb649bb7813fe82c388df28ad25c7ca7b3080af12448ad7d76c2aabc23c6a315dc40c3ae0599e0cb167763cece3daf72111b532942cb6fc34c2713d
+DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48 SHA512 6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7
+EBUILD gnome-shell-41.4.ebuild 7392 BLAKE2B 508fe29d8ea87a2edca732cef755467d6311bc28f14ee15eb5148d871b72e4621c2561c57ce6c3c94e46a40183bed406dbed529ea3481231352d6973a6a4fa2c SHA512 1993d9bf8edeb8d45eb466f5175bf7567805ec62998f2ec0922a7341f83b30dde31f170c16b8ef1e04d43a79ca1d75219bac954ad99b326face76aea23011959
 MISC metadata.xml 1051 BLAKE2B 86f9156deb6546719e6bcd09ad609b2837901743dd390f430521226df6b9e8f54387d2c93411d63d0099261ee0463428fb8854ce2c47463b999827b377807d84 SHA512 f6a3efe242c1726508a56506a7817c3beea3cb17fbe37d2d38403bc6f4f1d11fd366b68b5c9c6ce44f200a21d48da6ccfcf07c9758369481376b5882ea872129
diff --git a/gnome-base/gnome-shell/gnome-shell-40.5-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-40.5-r1.ebuild
deleted file mode 100644
index 458374b65d6d..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-40.5-r1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
-
-DESCRIPTION="Provides core UI functions for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy"
-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-41.3.ebuild b/gnome-base/gnome-shell/gnome-shell-41.4.ebuild
index 25496f9f35dc..1d1c98f736d5 100644
--- a/gnome-base/gnome-shell/gnome-shell-41.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-41.4.ebuild
@@ -11,11 +11,12 @@ 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"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 # libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
 # FIXME:
@@ -27,7 +28,7 @@ DEPEND="
 	>=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]
+	>=x11-wm/mutter-41.0:0/9[introspection,test?]
 	>=sys-auth/polkit-0.100[introspection]
 	>=gnome-base/gsettings-desktop-schemas-41_alpha[introspection]
 	>=x11-libs/startup-notification-0.11
@@ -139,7 +140,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
+	"${FILESDIR}"/41.3-fix-build-with-meson-0.61.1.patch
 )
 
 src_prepare() {
diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest
index 117eb9a12526..d150d4068633 100644
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnome-40.0.ebuild 1395 BLAKE2B 53487aea33d250bdf218d8a948a81e79faa38dd6969d550180efc26a893277ed11d0864d439c633c163ec29ff73f7119a87d10698b282b8d47f72b2d1cf6772a SHA512 32bd70fed8403daa2dedc96ed63091c62491220b1855734cfef7e014b4715a9975ee8dd14d763b20968509b800f8c2758867009140d4729d5ad921eaf1803acf
+EBUILD gnome-40.0.ebuild 1394 BLAKE2B 828626dd388595952b2a25ee5dab4b4bc50746a0583dde6390fee39f7eb5e9583c2cbb6043408dad1dae02586e5130d5883f92528a6f07b34407a5576070ec73 SHA512 0dd8d1a1d57a3ff7b8c7efdadc4b38f68e2029525ddea99129de9180a64d9a86e3ef9047b7a30b142f0e082535a189eb5ac4257a9a23a237eda9e3045a83df16
 MISC metadata.xml 453 BLAKE2B 554de0ba1b2fa3d180d2272c2b1fc2e554719010b9eee60ca30369a500055693cea204ca6369e7f483077c6f1dc1ccea6f0e667359cbe3e720d55a96e49a6d6f SHA512 363bf129187b4a2cd24be9ed576e566051fac6902c5db28de69aa9cc96f1f8c82fea056ae263d12a392839fbca82a06e556f1914100e6e3aab2884dd9de76278
diff --git a/gnome-base/gnome/gnome-40.0.ebuild b/gnome-base/gnome/gnome-40.0.ebuild
index 2505d64000dc..2099dd230df7 100644
--- a/gnome-base/gnome/gnome-40.0.ebuild
+++ b/gnome-base/gnome/gnome-40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SLOT="2.0" # Cannot be installed at the same time as gnome-2
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 IUSE="accessibility +bluetooth +classic cups +extras"
 
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 60a2938ce22b..9ea76638c48f 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,6 +1,4 @@
 AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec9844843793dc568e3012d3cd80c7a5f7a921e8dcc42406c6e15010fa472edf9cb10b7c86d1f8f69da2f6a3a034b7 SHA512 190129064554a36b56ba308f8dd75a9b8ee5ccfadffc0b5d528b5ba70324bcb3436acab116ad7768f59d316c3c2bd85dad9e8147050cb475b21fce439cb92705
-DIST gsettings-desktop-schemas-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-40.0.ebuild 1123 BLAKE2B 4ee66d73a34d73dc6229781b29c685540f02d8edcdad4f6781f1915931e206fbc891c5e83b95c825e04f9d5b06a004cb6bcf303a0a0af526e42e95989a26b3a9 SHA512 6adf06840ac6a9ca60c5facf11f3a1f201492c027633ef5986562226d14acbe49b9c16b6be892e4ff792634435e41e8eec53560e4ebe7c0f9c96aee6bcd4b9ad
-EBUILD gsettings-desktop-schemas-41.0.ebuild 1131 BLAKE2B 06bda37dd9ef06b89fbfe3d8b795c638be5cf9ac066c995489875f4e04d02ecb9c12f3ee6ce15b42b995c7ad7c68accf3983079dac16b1d4605a4baa20d0bccf SHA512 48349d9f5b74a149d6993dd49b8949317e564b946d03a6c6e48badc8be51d4fcbdaec72dc0521682bdec7b7d67a3fbab85d0ae138d5d7c726abf4b3422a7be9d
+EBUILD gsettings-desktop-schemas-41.0.ebuild 1124 BLAKE2B 3aba04271de57a81acb84c9acd623692b31debdbcec74680fc067458139e70301d1a53558122740cfa7ca417cd29cad10ebfa6c4c43986dfd33a40d1cb96a038 SHA512 ad6e8e6b60ed13b2cac922007566481377883537d344eef8a759b972378381851cc051eaa6b41a14ca0f4449f62d9625d0c52f372e2474030c3e5098027635b8
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
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
deleted file mode 100644
index 7f5222779930..000000000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-40.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+introspection"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
-
-BDEPEND="
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-
-PATCHES=(
-	# Revert change to 'Source Code Pro 10' and 'Cantarell 11' fonts back to generic sans and monospace aliases
-	"${FILESDIR}"/3.32.0-default-fonts.patch
-)
-
-src_prepare() {
-	default
-
-	python_fix_shebang build-aux/meson/post-install.py
-}
-
-src_configure() {
-	meson_src_configure $(meson_use introspection)
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-41.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-41.0.ebuild
index 9af8626a7cbc..134b3e3fb7c1 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
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
 BDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index c3317f408d70..0ca01b2b4952 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,8 +1,8 @@
 AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f05006094106a17fdb61b1bf2e6210f42fe91716e7fd21cf40ad5adecfee45b9e1d488249d1befdb48399c5952829c3d01e07 SHA512 bea056ac4d3d19719129dd7379d783a8eb34efbf57186f6ab7113ff97fdd809b0802d60add646ea50c776eb7bc07f5a0f4c0911569a2b1b24dbb1683f111d7c0
 DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
-DIST librsvg-2.50.7.tar.xz 22224148 BLAKE2B 323d8125d73c9e72fefe7a868783f16332fb9e047963ccc0c36af280dc5ca4e1f6df3eee8b28b2380140634f51c1acf5b71fc496dd584ed9abf6ca3ebbb9f4c7 SHA512 064df9440802088f4414ffb70e5115809028858065739443444e5eaf6f809da47c697d31f9423e3ce9efcdeea02ff41ec39f5acf5882f2d35f433b7565be3c16
-DIST librsvg-2.52.5.tar.xz 23273740 BLAKE2B f158fa0b16bed176ef5a687b448707906019ad62177029c1165abb0a7f1d1bbe8a8b2809ccab0a49c19e23dd6f949667db533e1010b21b4bed14506c72a1cca8 SHA512 00acfe6f3b4912b393fa3d73bcea5d2a6eb04a34cd297c66cc633b35f26bee622093620fcd038ce64ff1712ec86cd19c2cc5ec782d024b56d2605e37fdc3733d
+DIST librsvg-2.52.6.tar.xz 23662708 BLAKE2B 21108297aa4f87a852d0decb9cc7b8a5cdb546e00075d16f0f86502752adc176a67b56607eb90b034ca4e2dddbf8f82a3d81727496a5ae1a2b94715cdbbd87ac SHA512 be4830fb34c4859bdbe0c86da7b5de0807f28bb63fc124b4405ca8f9ef6ee45add77b4c43b9031d00157870eceb458df30cf5ee25e73d3894797d622b465f38d
+DIST librsvg-2.52.7.tar.xz 23709632 BLAKE2B 4eb83d71b77b851c408ddba711fe39ed23863aa6466634020a19ffc30e00c12f7dea81f11fdc09eb53c0c72efb35adc4528568b3c27e5dc0e886426d145d347f SHA512 15c075d696ebba35555f93456be088e6398da5b7992119edc78f1ee1d376a70425248e36b138dc86234aec13cb139fded11d6d74523c44f9a49eb19c2151fcb7
 EBUILD librsvg-2.40.21.ebuild 2600 BLAKE2B 21f2ee7a8c11fc1d1dea3ff8cc804951fbeb5b555841b79a9230a7c67ef9d2c6ae571a5b775835565f9995b134eede674a5f254b568dab34bd1cb30603461f76 SHA512 be3bfd885134bfbc97170d7349689e54d0be0eece6b4a85e4761ec697bb496aa2c2723c6e82b97df29dc6a7e4676a7bec3c83a00a3a33f6d0fca4187bef5d4a7
-EBUILD librsvg-2.50.7.ebuild 2654 BLAKE2B 9864c8e801c45281bc85d2250563ae80372db7dae300ab33e0fb75942036aa065c3ce92b0ca9be0864e9b89c4127ee2dffb673cde64cc64d66badcc2942be2b5 SHA512 db6ac0abaff81033f955aa58aef548fe5e2c385991d9b1fc6da25ee069cb345bbb197dc0fa2180b4fc564a30aa45202902fc85b6afb90c9f11624cd2dfbd23d9
-EBUILD librsvg-2.52.5.ebuild 2534 BLAKE2B 40116c517e1ccac21dc6fbc4ed23dc22df417f3c2b10b05b439bd9b001eef670ae9d06129b7086449fd5c0da360eda3bf36c12690cc595d8866e2b7f5f64294f SHA512 446a999062b3d562f3367e15cbfaa4f0b48e666f2ac2a0b7e989436c1216338e29dc6964ca4b68a1888ba3daa116e0481dc4e52d6e0e37698b82f7259b95d774
+EBUILD librsvg-2.52.6.ebuild 2533 BLAKE2B 6ca050d7e942cbad64bedbeefbe2f14fadb86b3f121e1fef6eb686f811e88815a59d6f5615a870c9c08bf678ae5c51ac0481d4d9b7193a48edc55b5d6fd09755 SHA512 d7b8b9b48bae3ef5cf8e8723fa23a94df8f6355c14b2bdccaedfb8649b9bac5c66a86a113e65594e7277139628dee2c2f311d82ec00d84b7a49d759e2f5f9788
+EBUILD librsvg-2.52.7.ebuild 2538 BLAKE2B 94f34eae9a6ec5584a591ccba117611df6e322db538e707e773970431aa9e4a6217c7901487a2ddceebdb7da2c110e3884a9bf7d10dafcd49d9cbe05218c0727 SHA512 9578a4ba5bfd9f3222f367fb4be6ab509b376fe7c3cf59860b9e447552947779921bdcd0de7ae35193eb46b9afc49767da6a900572a53036cd44e1f1b4d7d93f
 MISC metadata.xml 312 BLAKE2B 9a8c74fbf88673a6fee588b6c7368d4d40287b3dbb46d591878f5744ce3eaf5fc6b4e711cd50d2ff830e9c0139cd99f629cb378039376dded59373216ec19038 SHA512 0715a267ceda6ecb4d9499951b0d3343b5ccedbfc85441f3001d9293dfdd2d31b214f907c5466676cce899c67f4249cf4b643a46b4d16e1ab6b89ccaac763e26
diff --git a/gnome-base/librsvg/librsvg-2.50.7.ebuild b/gnome-base/librsvg/librsvg-2.52.6.ebuild
index c81f61052c15..28767f1a0cdb 100644
--- a/gnome-base/librsvg/librsvg-2.50.7.ebuild
+++ b/gnome-base/librsvg/librsvg-2.52.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=6
@@ -18,20 +18,18 @@ IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
-	>=x11-libs/cairo-1.16.0[glib,${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.16.0[glib,svg,${MULTILIB_USEDEP}]
 	>=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
 	>=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
 	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
 	>=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
 	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.44.0[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.46.0[${MULTILIB_USEDEP}]
 
 	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
 "
 DEPEND="${RDEPEND}
-	>=virtual/rust-1.40[${MULTILIB_USEDEP}]
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
+	>=virtual/rust-1.52[${MULTILIB_USEDEP}]
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 "
@@ -53,7 +51,6 @@ multilib_src_configure() {
 	local myconf=(
 		--disable-static
 		--disable-debug
-		--disable-tools # the tools/ subdirectory is useful only for librsvg devs
 		$(multilib_native_use_enable introspection)
 		$(multilib_native_use_enable vala)
 		--enable-pixbuf-loader
diff --git a/gnome-base/librsvg/librsvg-2.52.5.ebuild b/gnome-base/librsvg/librsvg-2.52.7.ebuild
index f933ab707b47..083436b27fac 100644
--- a/gnome-base/librsvg/librsvg-2.52.5.ebuild
+++ b/gnome-base/librsvg/librsvg-2.52.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
-	>=x11-libs/cairo-1.16.0[glib,${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.16.0[glib,svg,${MULTILIB_USEDEP}]
 	>=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
 	>=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
 	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index baceaa089d5b..6313d20173d1 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,8 +1,6 @@
 AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e894049df2dfdebf75f0f519eb715aba5bd590f4b57a718f78238ee50242215ef2b648fd3e3e8e8dddebc2ff1b45be2 SHA512 3a0925262643eb84d4c1731cad6b3c2c427def000503a3a680b06b68828f53492b4367d02ac6de36c35b6460e3d0967e3ce26203f8257271b222883990047459
 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.2.tar.xz 3248212 BLAKE2B be4e4e8fc03751259a1a5d4d1eb726e3026d24376da3fa680c412598219bfb3ced52f9b809004913dffdb9bb1c176dede07288c440c100487b3a337d8eaab417 SHA512 adb14fa1cf37a4797f57ae5162bddcd5b012de270cf955051b69276bc266b1dbfd8027b835f627ae19a1252356b344b1c8a4b7ca79a22512f3138a2c13fd2f3e
-EBUILD nautilus-40.2.ebuild 3065 BLAKE2B 9e69ced68e66e213977e927dc86865eb71211388aed72f190377c0af5c45fc7e3993ae53e98f5123305b42bf6d3167749fb0593e9df7307832f2169be520994a SHA512 66a918c5ae9fbf231684fc76d19b817dbbfaf4e887f52eb7870cdf9a0ad1bd6ed075d31db5b7b678dcd5217986708542d7c84781506ed2b5b4a79375a7a0fe85
-EBUILD nautilus-41.2.ebuild 3066 BLAKE2B f793ad9a3d4a8d18bf773830e93541d63f1111a1d1ecd1b788487a85e6db382c91bcca7402653ba42d113dd8b5b4e33624a1a24d47447c67ec0113b373ce9fce SHA512 ef4313b9808158a4e4139df67aa195cea6b84ca1927f62442a245b4d1921caf4619beffe78258f10cd2b4eee28aa7cfba45b36886cba57d58c2dcca5bb1b3b92
+EBUILD nautilus-41.2.ebuild 3187 BLAKE2B 0ef6a93741ea846684150262e296a5775aef7af8395803ecf683ce093fff3d67df20c3786233afcc790d816996b54ac0d8b6c257f866c11edab76b6b980913ce SHA512 523a7f96bf4d2beed2f3906ee4ed8b73bad71de0b7ce6d1fa952778608b45e25cfebabc9674d1cfba875c18a4fcaa963e20da0a2ff238d9f37c85d5d7499e67e
 MISC metadata.xml 554 BLAKE2B 80d4d6da040c47ddd01a278a0ca8af3d371f9e88b7c1583a606701bc85331d853d41bcc3a6be73772ce5574a1c50e601b31fa125a5f4c8a6dc39b1308d78af5b SHA512 ad97897d6f8c9be9271c0204fafd3540ac0d798fc8d4a1de1e66503dbb714dfacf0fd4ce23e059044ab7a3a3b687228811aa9adfba16391e6a5dfe2fda11801c
diff --git a/gnome-base/nautilus/nautilus-40.2.ebuild b/gnome-base/nautilus/nautilus-40.2.ebuild
deleted file mode 100644
index 0ed580949d00..000000000000
--- a/gnome-base/nautilus/nautilus-40.2.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}"/3.32.3-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 b0749dad3692..b89583f8e394 100644
--- a/gnome-base/nautilus/nautilus-41.2.ebuild
+++ b/gnome-base/nautilus/nautilus-41.2.ebuild
@@ -12,11 +12,11 @@ LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.67.1:2
-	>=media-libs/gexiv2-0.10.0
+	>=media-libs/gexiv2-0.12.2
 	gstreamer? ( media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0 )
 	>=app-arch/gnome-autoar-0.4.0
@@ -88,6 +88,7 @@ src_install() {
 
 src_test() {
 	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+	# TODO: Tests require tracker testutils (e.g. tracker-sandbox), which may need some sorting out with tracker use flag deps
 	virtx meson_src_test
 }
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /gnome-base
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)