gentoo resync : 22.12.2021

25 files changed, 837 insertions, 296 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 7f6df983f215..a7f2abee7b31 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index f6f6b1febcd5..7572233fc542 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,4 +1,10 @@
 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-patchset.tar.xz 6380 BLAKE2B de9eacf549686e43870df486994c5cd319f996edb2b09a7d3b5e9021c50b74c067e8c3cbabbc0ca68741fb3b4c5a2d65cc1ea72e20057ec59dab952fa886d527 SHA512 292737b34316ceff5eb43c598b0a8d2a7895e2891215137ba59defb935c6184e78f19e2485963a8642621a409ee87e0e2a1582403fd90ee3c83b2bc1f3334e27
+DIST gnome-control-center-41.2.tar.xz 6619180 BLAKE2B 1ddc68b87482d66f093f72690d287691dce6e02b071878e1facb33a646e7b487a75ba04b8ec18bb6e717a8c6c27a393bf0dd30fcb371ae833edd18c6e645bad3 SHA512 9ea19e4bd1bd708f78a62c746102467dd2e801b84a64589a043a4f849d297353edc54291a5c59db1f8dd3c2c24088aec0f1d98a6270b0373384a2e19e7dde332
 EBUILD gnome-control-center-40.0.ebuild 6317 BLAKE2B 36e5c618b07bf8222c84cd5e1fb417566ce11b96ec55dff5704185546cca209039f3809b672d1484e0d9631f42be6185ec2bfad71c5a1df34c200e1d6967a50e SHA512 fee96d3c1d422725c6c10f97aad539bf007890fe0e0afcd13988040d6da5b69d0d2c3e056de139e4c8c9ff85d234abca0ac85d88c3d7f83ccb454b8672765717
+EBUILD gnome-control-center-40.7.ebuild 6311 BLAKE2B dd4bfb4da3f67fa0cbba9206e7040cd2471bfc94e11a4d6ba14e6a65a39582e2507eba07a4be1631f295d509dbb72a782a4257273725ed3c8539176a2039b5f1 SHA512 5c6ca1809a208efa728ea488cb05014104fd4ae5d7e16465e5f1e1810980408b4d5330b667f90d078010054011920ac7bea9800fc11a1f91d6a26d7177850b49
+EBUILD gnome-control-center-41.2.ebuild 6114 BLAKE2B 3db9817656398554cb589178173c495d02beab1af7622f265a2e3502e035daa0de2c015bf150d2efde694671d21353688d1713426a39bd213ec1769bbe124b16 SHA512 0684785aa26659dd415ac98fc025b815256384840f5235b4ad2aa505b0eaf5a60f02abcb386160a983c8d3ce90ef26bd8abb67f7850b9ab7f6798af6707dd706
 MISC metadata.xml 589 BLAKE2B cc1f65e04e51a669bd160ddd7530d9365ae3086cc16d8c3120c5dc35b6079d2cab4a090dec76f5bb884e5d0e843887c16e447d95269f7e734693cdbef53507a6 SHA512 e7c7d1e5084cdc3373723c610a239759695fd1f6e346d1e32476679d4fe60be87df1ba5af7efb2bd1751b54af8e11be8b851b092caa6c8c672c163b19be2977a
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
new file mode 100644
index 000000000000..35eb6612f6b3
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-40.7.ebuild
@@ -0,0 +1,179 @@
+# 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.2.ebuild
new file mode 100644
index 000000000000..94d95e29285e
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-41.2.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-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"
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test v4l wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	^^ ( elogind systemd )
+" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+
+# meson.build depends on python unconditionally
+BDEPEND="${PYTHON_DEPS}"
+
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+# display panel requires colord and gnome-settings-daemon[colord]
+# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
+# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
+# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
+DEPEND="
+	>=gui-libs/libhandy-1:1=
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= )
+	>=media-sound/pulseaudio-2.0[glib]
+	>=sys-apps/accountsservice-0.6.39
+	>=x11-misc/colord-0.1.34:0=
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=dev-libs/glib-2.56.0:2
+	>=gnome-base/gnome-desktop-3.33.4:3=
+	>=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?]
+	>=gnome-base/gsettings-desktop-schemas-40_alpha
+	dev-libs/libxml2:2
+	>=sys-auth/polkit-0.114
+	>=sys-power/upower-0.99.8:=
+	>=dev-libs/libgudev-232
+	x11-libs/libX11
+	>=x11-libs/libXi-1.2
+	media-libs/libepoxy
+	>=x11-libs/gtk+-3.22.0:3[X,wayland=]
+	cups? (
+		>=net-print/cups-1.7[dbus]
+		>=net-fs/samba-4.0.0[client]
+	)
+	v4l? (
+		>=media-video/cheese-3.28.0 )
+	ibus? ( >=app-i18n/ibus-1.5.2 )
+	networkmanager? (
+		>=net-libs/libnma-1.8.0
+		>=net-misc/networkmanager-1.24.0:=[modemmanager]
+		>=net-misc/modemmanager-0.7.990 )
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
+	input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
+	kerberos? ( app-crypt/mit-krb5 )
+
+	x11-libs/cairo[glib]
+	>=x11-libs/colord-gtk-0.1.24
+	net-libs/libsoup:2.4
+	media-libs/fontconfig
+	gnome-base/libgtop:2=
+	>=sys-fs/udisks-2.1.8:2
+	app-crypt/libsecret
+	media-libs/gsound
+	>=dev-libs/libpwquality-1.2.2
+"
+# systemd/elogind USE flagged because package manager will potentially try to satisfy a
+# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
+# libgnomekbd needed only for gkbd-keyboard-display tool
+# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+#
+# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
+# Also we need newer driver versions to allow wacom and libinput drivers to
+# not collide
+#
+# system-config-printer provides org.fedoraproject.Config.Printing service and interface
+# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
+RDEPEND="${DEPEND}
+	systemd? ( >=sys-apps/systemd-31 )
+	elogind? ( app-admin/openrc-settingsd
+		sys-auth/elogind )
+	x11-themes/adwaita-icon-theme
+	>=gnome-extra/gnome-color-manager-3.1.2
+	cups? (
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	>=gnome-base/libgnomekbd-3
+	wayland? ( dev-libs/libinput )
+	!wayland? (
+		>=x11-drivers/xf86-input-libinput-0.19.0
+		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
+"
+# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
+# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
+	networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
+
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.2
+	x11-base/xorg-proto
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep '
+		dev-python/python-dbusmock[${PYTHON_USEDEP}]
+	') )
+"
+
+PATCHES=(
+	# Patches from gnome-40 branch on top of 40.0
+	# Makes some panels and dependencies optional
+	# https://bugzilla.gnome.org/686840, 697478, 700145
+	# Fix some absolute paths to be appropriate for Gentoo
+	"${WORKDIR}"/patches/
+)
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+	# Mark python tests with shebang executable, so that meson will launch them directly, instead
+	# of via its own python-single-r1 version, which might not match what we get from python_check_deps
+	chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth)
+		$(meson_use v4l cheese)
+		-Dcups=$(usex cups enabled disabled)
+		-Ddocumentation=true # manpage
+		-Dgoa=$(usex gnome-online-accounts enabled disabled)
+		$(meson_use ibus)
+		-Dkerberos=$(usex kerberos enabled disabled)
+		$(meson_use networkmanager network_manager)
+		-Dprivileged_group=wheel
+		-Dsnap=false
+		$(meson_use test tests)
+		$(meson_use debug tracing)
+		$(meson_use input_devices_wacom wacom)
+		#$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
+		# bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
+		-Dmalcontent=false # unpackaged
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-base/gnome-core-libs/Manifest b/gnome-base/gnome-core-libs/Manifest
index 5bd6fc06873c..e6542b3d9a9f 100644
--- a/gnome-base/gnome-core-libs/Manifest
+++ b/gnome-base/gnome-core-libs/Manifest
@@ -1,2 +1,3 @@
 EBUILD gnome-core-libs-40.0.ebuild 944 BLAKE2B b7f0934eee1166c407544dc71fe567083ca5b4f7f663ffb3664c41e5c484632e7f273a1305cf9f9801817f7fafaf5e833c209444781fb5300615196fd2f2eff1 SHA512 e6612699cc325f5a947b89fe01d30660e9b7fe762fd46f5efb62da7c3adf6d8967641b6e95f7401e43b92a9f7c5f07839d236f2a4d3d439c59e8e078163619be
+EBUILD gnome-core-libs-40.6.ebuild 947 BLAKE2B 23a4b491e4847d34f10bd331896177c74f344589f81423ef470570598d1f30aa3659d17f9dd1ae4c91267f06e04eba70be16444db21b453ea9cb4e4a255fc14c SHA512 ab8cab263c6b513751782f2025114337270c3c7e2225cbeb2e7c7143d64aa9d36ecb73261194b290dec5feeb75325c07eefa4729bb34b32b7935bd7f133d69b4
 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-40.6.ebuild
new file mode 100644
index 000000000000..220d4aae3ab1
--- /dev/null
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-40.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Sub-meta package for the core libraries of GNOME"
+HOMEPAGE="https://www.gnome.org/"
+LICENSE="metapackage"
+SLOT="3.0"
+IUSE="cups python"
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# Note to developers:
+# This is a wrapper for the core libraries used by GNOME
+RDEPEND="
+	>=dev-libs/glib-2.68.4:2
+	>=x11-libs/gdk-pixbuf-2.42.6:2
+	>=x11-libs/pango-1.48.10
+	>=x11-libs/gtk+-3.24.30:3[cups?]
+	>=dev-libs/atk-2.36.0
+	>=gnome-base/librsvg-2.50.7
+	>=gnome-base/gnome-desktop-${PV}:3
+
+	>=gnome-base/gvfs-1.48.1
+	>=gnome-base/dconf-0.40.0
+
+	>=media-libs/gstreamer-1.16.2:1.0
+	>=media-libs/gst-plugins-base-1.16.2:1.0
+	>=media-libs/gst-plugins-good-1.16.2:1.0
+
+	python? ( >=dev-python/pygobject-3.40.1:3 )
+"
+DEPEND=""
+BDEPEND=""
+
+S="${WORKDIR}"
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 2efb867a566f..623c77ac7f3b 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,10 +1,8 @@
 AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c0265f34d5d0fd555ae60a519273512021cf4f065db1e22ab72ce9004a914a47d077551b5a12ffbd5e81a9b8cf098a4762a0e461d SHA512 ea76e41aff067281497b98c86b66d8c382124ceead5b18e729342615a50b6aa3401f4d7c5553023b5d78ca0ea02823c7d6026ba9acca862804351269e4107d18
-DIST gnome-desktop-40.2.tar.xz 721852 BLAKE2B a7258d0465b17c5c9c78a066acd72571c002054f196d847e07b10055b1d72900d6efc80ac623f118ff11a87a4d5042ac9902f7f3f9d5a181ad3d80429cf9f904 SHA512 2fd3ba5eb0263aecc43978d84070619c16af4de998b344bc2aaac16aa0e734d93235aa218c2684ad993b471136434b97dffae52f183798daaa4ec47574cc51b3
-DIST gnome-desktop-40.3.tar.xz 721788 BLAKE2B bfdb77995d8cb392805a9d4a7a1276608aa53ea7c73604b12817c1660176c4e0274ba6954523cd0bec067230520c2736ed77885726696e463c97d09992186243 SHA512 96f2069ec3eb1bd1f6c2056c73d268eed5521398818cc05c22cdedfd1c09805fe5abc7f450abc7752690e809f3bdca502dfc107564236bbb03e262531418804f
-DIST gnome-desktop-40.4.tar.xz 721840 BLAKE2B f663460ce6a2b2d03543e92eab9e2f127da4a7c8e800149842f5f30e4f885c104786806be8e8f32e0783003b18015d39b4501f3ceccdee0ab94206031bf671b4 SHA512 4e91438c17faa2d12e7d6a9914fe4308543bbd5f8821e94dee9052f087110e2a3776109c203de6ef7bf66ae1825fc5e890d969ce2ebab2654cc157e9629fe6fc
 DIST gnome-desktop-40.5.tar.xz 722316 BLAKE2B 1f2e214eaea74295c892a465f767d29175ac0719a66d8d5b60b924c448f7b8317d3f9e23361d65b4d171018edd206dce764c38545a716ad9c83f20214fe5c4e9 SHA512 a65bf42be69d04efd80da6a8c8b08c4adc09db1c6627b93d4eecc3396376bc4407bfad914fc131d16d78b3b3263e635c925ed3dcff92af069525f809bea21afc
-EBUILD gnome-desktop-40.2.ebuild 1947 BLAKE2B 8b2233b157b3b50cb779149e18d46a14b5f2d4c6492f10d55767e4bc444bbc9bbf0b2eadbb10b8333b02675ffa2931ead810343f99b1ae5efa7adf71f45f89e6 SHA512 fe87b2876286c3d550bc9d353c5b347dc99d5a8f261e09514885798cb796ce2ec8917dd9652cd65631bd00e34d67da42a5bdd4c0c58ddfd2a0bdc6e1fc49b5b2
-EBUILD gnome-desktop-40.3.ebuild 1947 BLAKE2B 8b2233b157b3b50cb779149e18d46a14b5f2d4c6492f10d55767e4bc444bbc9bbf0b2eadbb10b8333b02675ffa2931ead810343f99b1ae5efa7adf71f45f89e6 SHA512 fe87b2876286c3d550bc9d353c5b347dc99d5a8f261e09514885798cb796ce2ec8917dd9652cd65631bd00e34d67da42a5bdd4c0c58ddfd2a0bdc6e1fc49b5b2
-EBUILD gnome-desktop-40.4.ebuild 1954 BLAKE2B 62c0f3a6ddf310f9080f80796e7286978d16e01b31647a0e0a9420e92ca6d95d100b03c88a6f68cd73a706e30d9d9b9105e9d90a73dfc41cb560d6117bb6545f SHA512 9cb70ccced6d748c6a293ef2568ea7a36ffd5fd553db859055ae06ea7bf2df092211fb678831d96a65e50ba0cb027b7e97058c8ae45cf14b9b1aa058385f35b6
-EBUILD gnome-desktop-40.5-r1.ebuild 1938 BLAKE2B 6d8c0468b7761d029ebb79d788a0a38daf1f547735871aa8593ef55b91de1021772c6e3889e769244e3deeece5e7a1af50f6392680169dd04a886469ed3bd560 SHA512 4c51e1809f827a833e9129a8f42aa6401a78a1b6d4b9aafe5e2318faa077fcaad6d4b68f47c695e5c84f81464263996e789304fc10dfcdde9506692ca7127b61
+DIST gnome-desktop-40.6.tar.xz 722388 BLAKE2B b13fbf4ba6c38a5b26f3275b973f834d41416f7163ccf192a20fc9092af8021d5a9ba34a7a44141b1f6f61a890fee1d3e4a89b047bd0b27c42d4296a98ca88a2 SHA512 0e1bd2c1add0485d6c6cdaf1ba816ad4cbe1dd338d494ff90b09f2ac8cef140433c136b4be4e6832478e4880fb8bfbf3cc931b3925cad29b64eca4573d6c4498
+DIST gnome-desktop-41.2.tar.xz 732788 BLAKE2B 5ae560fb31166db0fff56c3c3afd13a5890a540a748ba0602cee7a2f129facd023104198600379415a8f00f6edf1eba670769810cc0542e4c75dc1deb4da0f57 SHA512 1a520c84f7a781c59bfd8499c87c7049044a59b87033fac078c4a255c8bcaf79f9b614ad20985ea19c245424bb1972af744ad66fdafa5501800ad342b60fb531
+EBUILD gnome-desktop-40.5-r1.ebuild 1935 BLAKE2B 655bb10eb13bbb63ce08593677d7f4f9a253d3c75c42b2207c1c46c34947738a9441fb62ccd3d4481ac349c72d179795aaa01ec7197bcc5984064659ed51d3c7 SHA512 2d49209f19c7ec946b4388ae4b137fdc8c83efd0817e5f88b9c7026657ed6104829fb0a42cf3b8831269d9974a3f1cbb96371796c2ed4d6c4face250df4356fa
+EBUILD gnome-desktop-40.6.ebuild 1938 BLAKE2B 6d8c0468b7761d029ebb79d788a0a38daf1f547735871aa8593ef55b91de1021772c6e3889e769244e3deeece5e7a1af50f6392680169dd04a886469ed3bd560 SHA512 4c51e1809f827a833e9129a8f42aa6401a78a1b6d4b9aafe5e2318faa077fcaad6d4b68f47c695e5c84f81464263996e789304fc10dfcdde9506692ca7127b61
+EBUILD gnome-desktop-41.2.ebuild 1925 BLAKE2B b0c99ca78d26c9993bcf2069ff43e3379908d7094e1347e39731264a8e3473769df7dab835c70f359bca14b253ef6d367963f8c126435343d88e70a51a20ce1b SHA512 05a9b9d4250c5b97300269410d591576b9bd38dfb8d8abd0617facbee1ad7738f37ed02a84b39a3957b8deeffe1dc2b06fcf945bc77bef50c28b5005a1863cf6
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-base/gnome-desktop/gnome-desktop-40.4.ebuild b/gnome-base/gnome-desktop/gnome-desktop-40.4.ebuild
deleted file mode 100644
index 7881aafc22c4..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-40.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Library with common API for various GNOME modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
-SLOT="3/19" # subslot = libgnome-desktop-3 soname version
-IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
-	>=dev-libs/glib-2.53.0:2
-	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
-	x11-misc/xkeyboard-config
-	x11-libs/libxkbcommon
-	app-text/iso-codes
-	systemd? ( sys-apps/systemd:= )
-	udev? (
-		sys-apps/hwids
-		virtual/libudev:= )
-	seccomp? ( sys-libs/libseccomp )
-
-	x11-libs/cairo:=
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${COMMON_DEPEND}
-	media-libs/fontconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	seccomp? ( sys-apps/bubblewrap )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
-
-PATCHES=(
-	"${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
-)
-
-src_prepare() {
-	# Don't build manual test programs that will never get run
-	sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgnome_distributor=Gentoo
-		-Ddate_in_gnome_version=true
-		-Ddesktop_docs=true
-		$(meson_use debug debug_tools)
-		$(meson_use introspection)
-		$(meson_feature udev)
-		$(meson_feature systemd)
-		$(meson_use gtk-doc gtk_doc)
-		-Dinstalled_tests=false
-	)
-	meson_src_configure
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-40.5-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-40.5-r1.ebuild
index 4d52f427709e..61eeba43c70a 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-40.5-r1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-40.5-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="3/19" # subslot = libgnome-desktop-3 soname version
 IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
diff --git a/gnome-base/gnome-desktop/gnome-desktop-40.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-40.6.ebuild
index e42379bab2e0..4d52f427709e 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-40.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-40.6.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 ~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?]
@@ -21,9 +21,7 @@ COMMON_DEPEND="
 	x11-libs/libxkbcommon
 	app-text/iso-codes
 	systemd? ( sys-apps/systemd:= )
-	udev? (
-		sys-apps/hwids
-		virtual/libudev:= )
+	udev? ( virtual/libudev:= )
 	seccomp? ( sys-libs/libseccomp )
 
 	x11-libs/cairo:=
diff --git a/gnome-base/gnome-desktop/gnome-desktop-40.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-41.2.ebuild
index e42379bab2e0..2c2f814e2db1 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-40.3.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-41.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org gnome2-utils meson xdg
+inherit gnome.org meson xdg
 
 DESCRIPTION="Library with common API for various GNOME modules"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
@@ -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 ~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?]
@@ -21,9 +21,7 @@ COMMON_DEPEND="
 	x11-libs/libxkbcommon
 	app-text/iso-codes
 	systemd? ( sys-apps/systemd:= )
-	udev? (
-		sys-apps/hwids
-		virtual/libudev:= )
+	udev? ( virtual/libudev:= )
 	seccomp? ( sys-libs/libseccomp )
 
 	x11-libs/cairo:=
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index a1b7ac75467f..c0d616e8607b 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -4,5 +4,7 @@ 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 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
-EBUILD gnome-settings-daemon-40.0.1-r1.ebuild 3956 BLAKE2B b5188e3785dd244f88d447e02e52e3a47cadba85c2164c029bdbc7c020552cf6c7f2518fd7c5343f6bd37533f91ba6344f1905d78752f5b4e9fb08b3c149b707 SHA512 1d481cb5563b69939c99d6f5f54ba9803c6fee5766846cd7db73b54c03913dbae477b2286bb34d24daea8ed4e980b3ef8acc76bf737fb00dfe194432b8cffa90
+DIST gnome-settings-daemon-41.0.tar.xz 1477876 BLAKE2B f17005b03cbee142434f0805e8f590d6d9edad0f09b3226bb40ab7e312ee13bcd46c211efb140303d4a351d8818238a28bd9aa3fe760fb617fb006e97eebde61 SHA512 2c6848a749f84fd0c3a9ade6f4a83ae3ff7464da429b2d73030c9dcbd278b070c40475c678c819e31464941f2bd38d81f11b96f24d0d1fb05271267c3a1ecc2a
+EBUILD gnome-settings-daemon-40.0.1-r1.ebuild 3962 BLAKE2B 63026baa76a890c73f70118ab5b512e80741ffd5176b5a35e4dc3dd89b5e4b3ace64aafd54224a6f067e72a820e757b9c2783727fe92f82015528c5d3f9592c7 SHA512 8ed8580fcc318c467be4e4636901ec506647b45ec77d47bf49ae12079a9fa2d53340bb6933cd9e5485dc7a0d184155acf3b57b222241a34aa907ad77168219fa
+EBUILD gnome-settings-daemon-41.0.ebuild 3913 BLAKE2B 72a0b3244fa4b216ed7f922efb7751ebc4d24fde42df68f0450a0e804387f6fe95024b7c2bd75b01db68ee7e364917f4f2dfb8f8fe8b42429ee0a2d828356c8f SHA512 0e77ce12c6ac9edab6f5e1192bc441297d7e202c1b64b0bbac466af127546c64df8159101af5c47c6a07e1e02c35a6ffcc45141f76ff5be983cd42c2509070ff
 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
index 623e5208e250..5ad49d3f30c6 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1-r1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1-r1.ebuild
@@ -34,7 +34,7 @@ DEPEND="
 	media-libs/libcanberra[gtk3]
 	>=app-misc/geoclue-2.3.1:2.0
 	>=x11-libs/libnotify-0.7.3
-	>=media-sound/pulseaudio-2[glib]
+	>=media-sound/pulseaudio-12.99.3[glib]
 	>=sys-auth/polkit-0.114
 	>=sys-power/upower-0.99.8:=
 	x11-libs/libX11
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
new file mode 100644
index 000000000000..2ffa475d7538
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild
@@ -0,0 +1,147 @@
+# 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 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.58: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
+	>=x11-libs/libXfixes-6.0.0
+	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
+)
+
+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-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 315a4e5d6c25..a648f7103c4c 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,14 +1,11 @@
 AUX 40.0-defaults.patch 1412 BLAKE2B e36f7215cf756586479b8bdc71339beb3bbde53ca9745ddc4ef1c3feb59c720e4920e8aa4aadd7912874c386e7495a4b5d554e0d0616db17a81c4ec52a2baa6b SHA512 d82cf1e329d5974755738e29e6366bb10452620021a5db6c2ec63c4ee38e87a65dada34d57026e9510dbffa78c7060ae6f2ccec1739e3026bb0c67dab95f94a9
 AUX 40.0-optional-bluetooth.patch 2034 BLAKE2B 9df252dbef229d372bae87ab017d49086090a4194644fc0f7f3dc78226f78fa58cb99d67d4aac2b156894721658c6094aa6609c0da8c707cf0a8dac5a9a404ee SHA512 ec82f1ef7a9123134af2617526c22fa4258413edb6d68acdcd074911b98ed27d2e761904ccd88a364d9064d79bdefd402988bc53e1139f0e54f993c84242f19f
-DIST gnome-shell-40.3.tar.xz 1869724 BLAKE2B b6a663c97f5ad9239e608e16805074f9695f90b110514d202cc799818321d258417ce4e7841fa3256ae664e2bcba12201ac035737720a37f4eb3e84a26418ad9 SHA512 05d47e1b0f8ec27f0ae7564476012f21dcb2ec8e6da61a589b7fe17df1a23035cb6e261805250a410737502b9bdbb25f56432a618de88881d7e15b6432e52770
 DIST gnome-shell-40.4.tar.xz 1870468 BLAKE2B 78b0a749850e5df18beabd25cc35214b2d1f9a254dd095b9e783b2acdc9bac30edd7ffae3e6b15dd14d5b0877e8453c17548298e29b57642353e80ed505e556d SHA512 305d12cc7273f23e4a0c294f532cbf951816fd2de81959bef769048f4d5717e9e1886b64fe17b2f5ef6ee216ea67a6b913293a8903ec5dc5214bd29fbb1d3b32
 DIST gnome-shell-40.5.tar.xz 1871284 BLAKE2B 39c7392541af8a043627fb7aa19b723ee3b36e3d8001a64f34b14a6f23d68d3b160a0abe0f90659c55b99bf898cfdf30d88f62b8e113fc47814a55ef37c58725 SHA512 98bb0321aa9bc9da10ff6262cac802f575e2958600f429d446f3f87ec1ea40c837dd6e2fecae9dab0c2e224d2bf8b434a188ade84d4f480260102dcc80fdc5c9
-DIST gnome-shell-41.0-r1-patchset.tar.xz 46860 BLAKE2B 7c2204855ceb41a455cf4e92af81cb7f8d1eff027c1f70b5171218a6ec880332902f34bc96fcdaefba48daf4dc2e9f8a2486abfefba574aba408dc45ff73d228 SHA512 72c91ba7913f0e64f9babcbea7f438260ae3795b5f82ef9a5158de50d3c54d31d47492df8539663d611dfa3dc4ead640164f5f26d671a18b3946472688926920
-DIST gnome-shell-41.0.tar.xz 1893676 BLAKE2B 500c22a2eafb86a5717794f8da9de49c633c568e917b7116a8ecae0e62a3769a21e0b591d1147d6bed59b8350394e8ff157c184486c4f97e59e0f9dc202492b8 SHA512 2d2a2dd4ecf315776c10949b00f10dbbd77f495542bb7ca8cdb95047998942433c5c4cad818fe729681f888f74038d51c3d5903f1a0861a66147dbf668231824
 DIST gnome-shell-41.1.tar.xz 1897144 BLAKE2B b129fc9d7082956c3d0b0521126f569753f9137d1d61a42ce148bf94a8ec154a24a3bcf48807f6b0568a90763eba9c6166d7eac7c5495f3f72ffd318b38d3d0b SHA512 b9a5064c6d66d34c86b2fcd1ac2748072b094eb149e5ba3deb5b271e6ada2b6793c5422c4a80ce407f5a6cf52160d2d76fcf0ab752ee7cb27d9f246e8e024827
-EBUILD gnome-shell-40.3.ebuild 6359 BLAKE2B d4f2d72dacd2c4a67eb6ce37ff199ac890e097e807f3a2c921b664f8d76c22c55ae4dc73b9b7461ac38ae818fe034941de3e208fac15a95210b0254dcde95aff SHA512 aba29d2394572b63f55c9e9e694483de3c8a413114ee8d6bd2c1080e9086fea4297f268e572bbccf84c07896ec242397520414c58a67175cd73c0517d8379dc1
-EBUILD gnome-shell-40.4.ebuild 7082 BLAKE2B 826537818dfcc45ff5f7a1014edeb87ff6802abc1394140200094862f07c9f07db143b0e63d9404e037d5c8003126d252ee2ace0b05cad41370ccf64813ad391 SHA512 948d9e179d2a68d872449c47cb4442a1cc4f929a38d1e9980d4c9ee0a6d59471cb6f54e3ac9c04f1c33ff6415a23ce87534d09a383a9d7296c279c75e56e47f5
-EBUILD gnome-shell-40.5.ebuild 7085 BLAKE2B a6fabc3b6a1e5c97342faf2127c59ca3a9e0bd0c9bfe1f40532caae186ec7db1470b95b92b55340ac15b45a48da244f720a5224e87fb981582c564d21db5bbd8 SHA512 b3176278331c66b1f076c3654ebad9696dad03b2ecd21293aa993840b9beb1bb471c9bd6562658aad4ed0d4989ce2e9aea7fe719f14a5a1882d7096a3e99743f
-EBUILD gnome-shell-41.0-r1.ebuild 7403 BLAKE2B 8c878baddb8d6d3205182a86f1216c961d2d73fb0aafcb1d94a9709fc3c72e649a76f6c7e9b48f5a58d72c466d9dc0ef521abbe051b1a70e0b5ee9c206123ccc SHA512 9ce135c81b4b804a967a5fff54a7d90cd5d04c818196a1b4582bc544b322fc093a3ae6e5e50572679e9a404a110a878f967f4dedc714e5fc90bddb39c146427a
-EBUILD gnome-shell-41.1.ebuild 7307 BLAKE2B d02f84fcae29a9f26d9d31de7cf7d5aff407316293aef2a1de7352d5fccfc07a8d63f7b9124f083117c227b2e193962709083a0e4771ce22557b6a25aef7d44d SHA512 99b6d987e71bd5a1838f1fc637040664888b6f7db68d50157c339284076e7ab3645eb4ea9d6921f2a014a91333aba175143c427ae7af053d8ba372cc1b27e7ce
+DIST gnome-shell-41.2.tar.xz 1896672 BLAKE2B 634cc8e4b77a94899af123fa9ce2a11271b913467007084bde90cfe2f4dbddd65bb1ed115c42ba21a697cb591e48387a19c5b0c3764e13950b9034c9fbc493d9 SHA512 4ec29881030933f8c15ea1d11a431ca07ea84566cd7c1ab69afbf25c1b588b2d75ade17b623b5bf644b42bf5b82e375b67a833169b5b0b6c7c0dd8dbd3e56835
+EBUILD gnome-shell-40.4-r1.ebuild 7078 BLAKE2B 0e2c32170f0cd386b9ac6585545082360c5907a55eb547367a8cbe7a698d10a9ef290d8b1199b5d8c24eaa74f264100501ebfd2e34aa252762eed9460bd8a351 SHA512 9a88e9178458f7503bc28184161b87fe78a8cbc6c940eb718f2573ae5e846929b72f1a179107145bbce4ab7981d101f37e7c73579b892a90250194d17f9d9da9
+EBUILD gnome-shell-40.5-r1.ebuild 7081 BLAKE2B 0c727a7c25e2be75a02634078b7841a523540f37b3a56c2f5d40b311ac2b4b2320db600935eee9583d45e94b471069cfa170a734d5487259f90c4a48451dc0d8 SHA512 34ad2fa9f44135c6ef6e0c78667b930c33c2fd7dba77a26b7d71a53f8e02c66cf7629e7aa85d770d8e8111975eff4db3c59302c143512ccbe568601a68a8d8af
+EBUILD gnome-shell-41.1-r1.ebuild 7303 BLAKE2B b97b21fd5669ad6cb3da3d106f252010a1579a395d4e8284a4252bab333e28efbfab2f30240a0c76f11f7c31967cc59e10dcf75afb4fa97d5832c6ee01328f3f SHA512 1c0bfb9268ec20d59245a5e7ad6f796e548d54ba3d33f129c70659102618091e17680e0dd49bcc7558f946be90c7327076dacf1f1b6fa4d8cda97a5f1a4a654d
+EBUILD gnome-shell-41.2-r1.ebuild 7303 BLAKE2B b97b21fd5669ad6cb3da3d106f252010a1579a395d4e8284a4252bab333e28efbfab2f30240a0c76f11f7c31967cc59e10dcf75afb4fa97d5832c6ee01328f3f SHA512 1c0bfb9268ec20d59245a5e7ad6f796e548d54ba3d33f129c70659102618091e17680e0dd49bcc7558f946be90c7327076dacf1f1b6fa4d8cda97a5f1a4a654d
 MISC metadata.xml 1051 BLAKE2B 86f9156deb6546719e6bcd09ad609b2837901743dd390f430521226df6b9e8f54387d2c93411d63d0099261ee0463428fb8854ce2c47463b999827b377807d84 SHA512 f6a3efe242c1726508a56506a7817c3beea3cb17fbe37d2d38403bc6f4f1d11fd366b68b5c9c6ce44f200a21d48da6ccfcf07c9758369481376b5882ea872129
diff --git a/gnome-base/gnome-shell/gnome-shell-40.3.ebuild b/gnome-base/gnome-shell/gnome-shell-40.3.ebuild
deleted file mode 100644
index dfb141f86a4f..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-40.3.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2021 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-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 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.57.2: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
-	>=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:0/0.3
-	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 using:
-#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Introspection stuff needed via imports.gi.*
-# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
-# 3. Control shell settings
-# 4. logind interface needed for suspending support
-# 5. xdg-utils needed for xdg-open, used by extension tool
-# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
-# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
-# 8. IBus is needed for nls integration
-# 9. Optional telepathy chat integration
-# 10. 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)
-# 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]
-	>=dev-libs/libgweather-3.26:2[introspection]
-	>=sys-power/upower-0.99:=[introspection]
-	x11-libs/pango[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-lang/sassc
-	dev-libs/libxslt
-	app-text/asciidoc
-	>=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.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	"${FILESDIR}"/40.0-optional-bluetooth.patch
-	# Change favorites defaults, bug #479918
-	"${FILESDIR}"/40.0-defaults.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	# Hack in correct python shebang
-	sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth)
-		-Dextensions_tool=true
-		-Dextensions_app=true
-		$(meson_use gtk-doc gtk_doc)
-		-Dman=true
-		$(meson_use networkmanager)
-		$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
-		# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
-		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa if you do not have hardware 3D setup."
-	fi
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=563084
-	# TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
-	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
-		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
-		ewarn "otherwise Gnome will fail to start"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-40.4.ebuild b/gnome-base/gnome-shell/gnome-shell-40.4-r1.ebuild
index f873b46053e3..b1f920349a61 100644
--- a/gnome-base/gnome-shell/gnome-shell-40.4.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-40.4-r1.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	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:0/0.3
+	>=media-video/pipewire-0.3.0:=
 	networkmanager? (
 		>=net-misc/networkmanager-1.10.4:=[introspection]
 		net-libs/libnma[introspection]
diff --git a/gnome-base/gnome-shell/gnome-shell-40.5.ebuild b/gnome-base/gnome-shell/gnome-shell-40.5-r1.ebuild
index 9273794623bc..308122265769 100644
--- a/gnome-base/gnome-shell/gnome-shell-40.5.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-40.5-r1.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	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:0/0.3
+	>=media-video/pipewire-0.3.0:=
 	networkmanager? (
 		>=net-misc/networkmanager-1.10.4:=[introspection]
 		net-libs/libnma[introspection]
diff --git a/gnome-base/gnome-shell/gnome-shell-41.1.ebuild b/gnome-base/gnome-shell/gnome-shell-41.1-r1.ebuild
index 535631da257e..950ce4355d5c 100644
--- a/gnome-base/gnome-shell/gnome-shell-41.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-41.1-r1.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	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:0/0.3
+	>=media-video/pipewire-0.3.0:=
 	networkmanager? (
 		>=net-misc/networkmanager-1.10.4:=[introspection]
 		net-libs/libnma[introspection]
diff --git a/gnome-base/gnome-shell/gnome-shell-41.0-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-41.2-r1.ebuild
index 23f7b697c685..950ce4355d5c 100644
--- a/gnome-base/gnome-shell/gnome-shell-41.0-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-41.2-r1.ebuild
@@ -8,7 +8,6 @@ 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"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
@@ -37,7 +36,7 @@ DEPEND="
 	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:0/0.3
+	>=media-video/pipewire-0.3.0:=
 	networkmanager? (
 		>=net-misc/networkmanager-1.10.4:=[introspection]
 		net-libs/libnma[introspection]
@@ -136,7 +135,6 @@ BDEPEND="
 # app-text/asciidoc
 
 PATCHES=(
-	"${WORKDIR}"/patches/
 	# Fix automagic gnome-bluetooth dep, bug #398145
 	"${FILESDIR}"/40.0-optional-bluetooth.patch
 	# Change favorites defaults, bug #479918
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 397e81419760..5f8f2bcf4405 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,6 +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
 EBUILD librsvg-2.40.21.ebuild 2535 BLAKE2B fb7707a26b24f05ef9afe464f036d205e72243fe0b411ddc17b42a3f73bfd35e4a92b9236c12218d4bffb8edc825813f3b08cf164faf6cd1f96e689b76ac2970 SHA512 0ae92c01878ed45cd2da511bca6bcb86465723d3f71752168d5764b56d366544bc6bce1fce2d93ad497c901af8758db11bf3a53ad79389bcf54b16210bb18da2
 EBUILD librsvg-2.50.7.ebuild 2589 BLAKE2B 5df1b41820385453d3ab8e578eeace69cd369d452bc6ac2d980e28bfb65ec7002550b0f14b16560d4ec03dd7ada688b9c60175db2d1d39d62161adeba7871b2d SHA512 456bb04cfcb59aeb924f425afd4a595c4a6b25b74264bfc6978a5c8f66cb97321a2d7beef8fedbe51ddb313caae2613620e08d53e08e3710b719ba26b3911bb8
+EBUILD librsvg-2.52.5.ebuild 2469 BLAKE2B 73895b9247e7b5db429469237f582f933f8405bbcb611418a726d2cedc9fedd724285b0b5ef2e581434dcf5534c71a561fa24cd7b7e07a381e8698d5b2fc9431 SHA512 5f9413b2362bf2d12893e9aefec96724ac48a9f35b11c3b734a666c30f3bb95dc1a78f620dcc6bf46d531efe5de66947d32e786f95ea6f9fb680b894e29e3aa9
 MISC metadata.xml 312 BLAKE2B 9a8c74fbf88673a6fee588b6c7368d4d40287b3dbb46d591878f5744ce3eaf5fc6b4e711cd50d2ff830e9c0139cd99f629cb378039376dded59373216ec19038 SHA512 0715a267ceda6ecb4d9499951b0d3343b5ccedbfc85441f3001d9293dfdd2d31b214f907c5466676cce899c67f4249cf4b643a46b4d16e1ab6b89ccaac763e26
diff --git a/gnome-base/librsvg/librsvg-2.52.5.ebuild b/gnome-base/librsvg/librsvg-2.52.5.ebuild
new file mode 100644
index 000000000000..26830cf01f9e
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.52.5.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION=0.46
+
+inherit gnome2 multilib-minimal rust-toolchain vala
+
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="+introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[glib,${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.46.0[${MULTILIB_USEDEP}]
+
+	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+"
+DEPEND="${RDEPEND}
+	>=virtual/rust-1.52[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
+
+RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc.
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-static
+		--disable-debug
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable vala)
+		--enable-pixbuf-loader
+	)
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# Set the rust target, which can differ from CHOST
+			RUST_TARGET="$(rust_abi)"
+			# RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as
+			# far as C parts and configure auto-detection are concerned as CHOST equals CBUILD
+			cross_compiling=yes
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure "${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+multilib_src_compile() {
+	# causes segfault if set, see bug #411765
+	unset __GL_NO_DSO_FINALIZER
+	gnome2_src_compile
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_pkg_postrm
+}
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index b868a496484b..db3fbe2e01d8 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,5 +1,8 @@
 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.1.tar.xz 3246356 BLAKE2B 558cac6bacd4d4238e8ceb792baa4d85a6aa981e78ae380b6c1256d079cac8e78b3d9b850a01180e4952630eb7898b987f79c12844adca82ab3702b0213d3150 SHA512 1eb2f2a0187f8b6581fe64285f347e8522b971eeb4d1f575387f3767e177f0195e758da9187090155216807b8f49ebed0fbcc29dd3cce6f3e408d7a955ae5286
 EBUILD nautilus-40.2.ebuild 3065 BLAKE2B 9e69ced68e66e213977e927dc86865eb71211388aed72f190377c0af5c45fc7e3993ae53e98f5123305b42bf6d3167749fb0593e9df7307832f2169be520994a SHA512 66a918c5ae9fbf231684fc76d19b817dbbfaf4e887f52eb7870cdf9a0ad1bd6ed075d31db5b7b678dcd5217986708542d7c84781506ed2b5b4a79375a7a0fe85
+EBUILD nautilus-41.1.ebuild 3066 BLAKE2B 7cbc982c235187cd1c5c094c101317106417e4fe0a3b0d7d1c43f99261004dba2f9a4838337c1225f75b6cbe99b1fd2b88ef45c6dae073bac4074685a25dd92f SHA512 ed493ad48cb5d5a5e425bdd71987b4b87328de68a016f3ec7ae110932f429f61e016620188fe08e85a50962e580d75c17133ca7f6af26c99547e1153b1bfeec8
 MISC metadata.xml 554 BLAKE2B 80d4d6da040c47ddd01a278a0ca8af3d371f9e88b7c1583a606701bc85331d853d41bcc3a6be73772ce5574a1c50e601b31fa125a5f4c8a6dc39b1308d78af5b SHA512 ad97897d6f8c9be9271c0204fafd3540ac0d798fc8d4a1de1e66503dbb714dfacf0fd4ce23e059044ab7a3a3b687228811aa9adfba16391e6a5dfe2fda11801c
diff --git a/gnome-base/nautilus/files/41.1-optional-gstreamer.patch b/gnome-base/nautilus/files/41.1-optional-gstreamer.patch
new file mode 100644
index 000000000000..cb4023cd0d2e
--- /dev/null
+++ b/gnome-base/nautilus/files/41.1-optional-gstreamer.patch
@@ -0,0 +1,57 @@
+From 1b908b6cf0422ecb496a5aaf7da25ede9ad12d60 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 19 Sep 2019 22:26:08 +0300
+Subject: [PATCH] build: Optional gstreamer
+
+---
+ extensions/meson.build | 4 +++-
+ meson.build            | 2 ++
+ meson_options.txt      | 6 ++++++
+ 3 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/extensions/meson.build b/extensions/meson.build
+index 5c6f64cef..bd8c41d3e 100644
+--- a/extensions/meson.build
++++ b/extensions/meson.build
+@@ -1,3 +1,5 @@
+ subdir('image-properties')
+-subdir('audio-video-properties')
++if get_option('gstreamer')
++  subdir('audio-video-properties')
++endif
+ subdir('sendto')
+diff --git a/meson.build b/meson.build
+index 66e56bda6..d71d597a6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -110,8 +110,10 @@ libm = cc.find_library('m')
+ 
+ if get_option('extensions')
+   gexiv = dependency('gexiv2', version: '>= 0.12.2')
++ if get_option('gstreamer')
+   gst_tag_dep = dependency('gstreamer-tag-1.0')
+   gst_pbutils_dep = dependency('gstreamer-pbutils-1.0')
++ endif
+ endif
+ gio = dependency('gio-2.0', version: glib_ver)
+ gio_unix = dependency('gio-unix-2.0', version: glib_ver)
+diff --git a/meson_options.txt b/meson_options.txt
+index 6e781c4ef..9ad8d8196 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -13,6 +13,12 @@ option(
+   value: true,
+   description: 'Build stock extensions',
+ )
++option(
++  'gstreamer',
++  type: 'boolean',
++  value: true,
++  description: 'Build audio-video properties extension (requires "extensions")',
++)
+ option(
+   'introspection',
+   type: 'boolean',
+-- 
+2.32.0
+
diff --git a/gnome-base/nautilus/nautilus-41.1.ebuild b/gnome-base/nautilus/nautilus-41.1.ebuild
new file mode 100644
index 000000000000..da337e10b426
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-41.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="Default file manager for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/glib-2.67.1:2
+	>=media-libs/gexiv2-0.10.0
+	gstreamer? ( media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	>=app-arch/gnome-autoar-0.3.0
+	>=gnome-base/gnome-desktop-3.0.0:3=
+	>=x11-libs/gtk+-3.22.27:3[X,introspection?]
+	>=gui-libs/libhandy-1.1.90:1
+	>=x11-libs/pango-1.28.3
+	selinux? ( >=sys-libs/libselinux-2.0 )
+	>=app-misc/tracker-3.0:3=
+	x11-libs/libX11
+	>=dev-libs/libxml2-2.7.8:2
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
+	>=app-misc/tracker-miners-3.0:3=
+" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
+BDEPEND="
+	>=dev-util/gdbus-codegen-2.51.2
+	>=dev-util/meson-0.57.2
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.10
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PDEPEND="
+	gnome? ( x11-themes/adwaita-icon-theme )
+	previewer? ( >=gnome-extra/sushi-0.1.9 )
+	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+	>=gnome-base/gvfs-1.14[gtk(+)]
+" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
+
+PATCHES=(
+	"${FILESDIR}"/3.30.5-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
+	"${FILESDIR}"/41.1-optional-gstreamer.patch # Allow controlling audio-video-properties build
+)
+
+src_prepare() {
+	if use previewer; then
+		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
+			To activate the previewer, select a file and press space; to
+			close the previewer, press space again."
+	fi
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
+		$(meson_use gstreamer) # gstreamer audio-video-properties extension
+		$(meson_use introspection)
+		-Dlibportal=false # As of 40.2, all libportal usages are flatpak-specific
+		-Dpackagekit=false
+		$(meson_use selinux)
+		-Dprofiling=false
+		-Dtests=$(usex test all none)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	use previewer && readme.gentoo_create_doc
+	meson_src_install
+}
+
+src_test() {
+	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use previewer; then
+		readme.gentoo_print_elog
+	else
+		elog "To preview media files, emerge nautilus with USE=previewer"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}