gentoo resync : 28.04.2021

61 files changed, 896 insertions, 1409 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index fd88939c91c1..d7703ea51602 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 b96dd657a011..cdf0ca5be2e1 100644
--- a/gnome-base/dconf-editor/Manifest
+++ b/gnome-base/dconf-editor/Manifest
@@ -1,5 +1,5 @@
 DIST dconf-editor-3.36.4.tar.xz 583084 BLAKE2B 7d7f5164a4917d13372a2bcf7f9fe7b82d630693601bba33da1c4f3afffa58e4589ff90c3e5ca3039351a681eac6584b335171f4dce9d0bfedaed52cc25d505c SHA512 a24fa44830fb0e83834cf912267de6597c1d6bf02e063af4255409d3c9a135fae409116d91751d00ee8d2319e7130606f007af76d3ec9f1380cda98ab2329eff
-DIST dconf-editor-3.38.2.tar.xz 593428 BLAKE2B 6adb53cf2326d25b31d483645df9c2883658d525a32d1eb0ea13d410724911fbeb2ba17a948e4cca5e6a19e187d3cabf0a5722f7aae4dc70bc6699c13be9adc0 SHA512 64bcf7c5cea2c70f2c4ee08832490495c8c2dfee805d6fc27583e1369444f81ef9818f83de7c71228c88322f32c258c4550cc908263f1bb3032ab67e514efb2b
+DIST dconf-editor-3.38.3.tar.xz 594544 BLAKE2B 0455fc01be96bccec9a9799c5bf23e9fe58cb34d32899a119753f58f5bc2f03acb96ff0eeba131cd8c0ea130e3afad16e4fadb23601510b618bf7a3d5a1664a3 SHA512 cf00705c1e11eab980777b9696fbaaa0f5f8a8118276f2add4f4fcefe5aab46844a539539418ce61f285e65623179a9d63cc18a91339b70b5e7c9408c697e9d1
 EBUILD dconf-editor-3.36.4.ebuild 813 BLAKE2B e65391c443fecf58357d0a5e4af977e1dc6f62112bb19304613a6c34f41277962c1141053dfbb2fb5f9f0911e119c1238a1a0d8249763164f058e5334de161e9 SHA512 ac96d459b704a45e856a9a1cab563a00996079cf004f197b4b5aad65d3e64f1587918844ea87a8f0642322d8566838b686eab6af309aabf84160ba313be96a22
-EBUILD dconf-editor-3.38.2.ebuild 815 BLAKE2B d1cca311a344ba79f7a4f74a65e01ddc31fb5d6116e2d30459dd42d702b3fc769aa77f94f34fccf06d8fc18c52994b662e6e5d2472066acd9e7308456c00c972 SHA512 828b65a4d05469af3b279638fe0d0b1d48b8d4eecb45e311a69cb5fd5f795255a432349d7f0e8d009087888cf44ad30224f1215b7356f316ea19a4cb39226ee7
+EBUILD dconf-editor-3.38.3.ebuild 815 BLAKE2B fbf3b2d7bb3ff10b97694dba3e70462f74e317809838b5bda6531b6fd272e21171f56b543f2066120f159ca7f49483cd8e5718da611315c866968525b8087a4e SHA512 2ff25d1dff9ff62fe2d25f2cf93c6b68d561fbfe8ca635f73061671b10f03e0e9e776c6af90238763f236e6cdffda0add928f83e0aa04b818b7d85c45ac97e04
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf-editor/dconf-editor-3.38.2.ebuild b/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild
index 21fa99568f71..a1530c400860 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.38.2.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index e1b3bd03da75..322aac94e0cb 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -1,11 +1,8 @@
 AUX 0.30.1-bash-completion-dir.patch 3222 BLAKE2B 977be3dd9cbee50bc976fbae125b058579587dcf55918b07b4bc9708dc9cc19192acddfb225c540806b4866a2e431acc42d461f91fdd935626af366341617595 SHA512 aeaba2126d4e87caf7c467118f2e2d42330fbf5c1d0786c52a2782550c64f41e482034c08e4624cc231e49ec9f39e824d29796b4078090613cfe54adbd420eaa
 AUX 0.32.0-drop-vapigen-dep.patch 1123 BLAKE2B 921e0bfebf9dfa67e55cda7c410c790e07d5d55d9c24d897fd43bacf524bde2de4fce07905a8c2298130af5c94a309a8bd82d0d549f2e344d653f9c9e1335965 SHA512 c26e44fd38e46f1df60d2a13cc40415af9298629ad3c0d12a203bf483a0577c24af2bedfb8c1e8e35855eefa317a0afced78b74f217a13a2429bb8ae73d8413f
-AUX 0.32.0-meson-0.52-compat.patch 1148 BLAKE2B d33127e2e765f3f19282b33852b00b8a08f4977c856a94321b616e5135b3618477a44812a7429148018c915d716f35c6296e3c72c247970adedc9331af7bfdc6 SHA512 a4b9a1c6b6f16a4f5ea7a250d0a2949c1906813cefc985706575865abc03dc715f6d283887b081bc906a7a439fff0ef4fac57b3de3a4ea40ba2dc19e51db4664
 AUX 0.40.0-bash-completion-dir.patch 3029 BLAKE2B 6695d75088c96060b0b0a34f928d8db9b06528d97ff3fe44b5911ef1c04b1a68aa807eea507213e316283db8b1d73218255e12c378aafb3fc920ab39d3f092b4 SHA512 4fead302c92327787f26b0001ced07dcd176abbc5142119a19be0b48893d777f1cfc4559f37a37a5c589221cb2c81f1627626371d8a3ad58bb8c542806ac7b87
-DIST dconf-0.34.0.tar.xz 112876 BLAKE2B 6890cd82a3ba81eac8c72dda93ebf1b82f3002b735bf2e059ba07a2f0f3817978a9e4f5dd37a9efab728fc2a4e20c34c519f9eeb3915d705ff8a3c4a65f9ab41 SHA512 8b28373f31fe36ba3f21f56fca84563681c3648ff595709880cd9ac49fc6b130ac375fb89fd585f1dd62b5a2f728127292ea57d18feca1147b709a93e8c4c743
 DIST dconf-0.36.0.tar.xz 114828 BLAKE2B 033cb2e095d9dac72bd07c5fa8280a3e1012aac6c1b0657d5455c2a519617be9112acca702ec4078554a814f36d12ee8e25201cc5b8aed2d33a32ef14e2f6fa5 SHA512 fed0b4ac13dfeff3bbe428a5c25408a0f13610219e561841a3af75cf18f9c630c385989b700c081b79ab53c00bdecf43c7c94979312c047faefbda4b2653d40d
 DIST dconf-0.40.0.tar.xz 117764 BLAKE2B bdbc48b71e46fdc4353358cd08fb96933d07af587300a6f91bc45826aeafb3f34f482fe6e09041dd839e507b863a8e33d09bad88a91c1c868983f8afb52c5c85 SHA512 71396d71f24f47653181482b052fdfc63795c50c373de34e2fb93e16101745daa7e81192b79a102d5389911cea34138eedf3ac32bc80562018e8a7f31963559a
-EBUILD dconf-0.34.0.ebuild 2192 BLAKE2B 74e61c5af928ef2effa2d23593105fa50e0487b3d842b39a66c210a1b06b194d34b95d03cfa536764971b29e5cc139776641f77accb85f8f3be5ccad478c59a1 SHA512 d474a1b2ec9f6d30579c853bdf9a7e53ee19913553a4c0d62adf586de5633552966e9567439f2769f7c671b87286c5eef613241d64d0d4caff624344b19d9902
-EBUILD dconf-0.36.0.ebuild 2104 BLAKE2B 6989287b32971b02a72e5c14da091555707dc3b3e35d87eef39a7be6981e4d90b221b8f73d029f4624815a40532a12c11ea381d69ca4f79c56303e05d2c02f2d SHA512 3d192e4cbf500f42e51d0c938581a3cded0aa883eac39b98c058c6573552a1aac0e8b0c4b7a1f92842b69e77407447352c8a204168e7b7d2bbc8765a3c7d006f
+EBUILD dconf-0.36.0.ebuild 2105 BLAKE2B e37e0693baa534e3b680939a0bd7f372ece3aae28b968fd79c8be76716da92768a0877fd99a8f0d9a5e70ab2727d45502aaac3d8fede0cec89721c1a5dec162a SHA512 eabe8cb200cef20d2c481541a7b29a8996f1d4370a8147a5ade2083f0c17e6af76b7777aefa8a5c253231435c0b85632e1c7338cc0e0f73bb8488dad36429a28
 EBUILD dconf-0.40.0.ebuild 2170 BLAKE2B 268f0db3b8cb8124bb2b5c9e9d66a5bf26807b3dd9dcd0221d1a4196049a514b9d53f10af1608bb5628a9ff99bb23a4fb8f009d8ff1393e8104c8acd436b879d SHA512 6798b88f00a2cfcc1b098d1f401a579a32131224663e6f235677a81810750914ec1b1695ee72f5d248681064999b888e1e75590a54bdff6b753145708cbaae84
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf/dconf-0.34.0.ebuild b/gnome-base/dconf/dconf-0.34.0.ebuild
deleted file mode 100644
index f8c053be7442..000000000000
--- a/gnome-base/dconf/dconf-0.34.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Simple low-level configuration system"
-HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
-IUSE="gtk-doc"
-RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	sys-apps/dbus
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	gtk-doc? ( >=dev-util/gtk-doc-1.15 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/0.30.1-bash-completion-dir.patch
-	"${FILESDIR}"/0.32.0-drop-vapigen-dep.patch # .vapi/.deps are pregenerated, just install them without a vala dep
-	"${FILESDIR}"/0.32.0-meson-0.52-compat.patch # https://gitlab.gnome.org/GNOME/dconf/issues/59
-)
-
-src_configure() {
-	local emesonargs=(
-		-Dbash_completion_dir="$(get_bashcompdir)"
-		-Dman=true
-		$(meson_use gtk-doc gtk_doc)
-		-Dvapi=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# GSettings backend may be one of: memory, gconf, dconf
-	# Only dconf is really considered functional by upstream
-	# must have it enabled over gconf if both are installed
-	# This snippet can't be removed until gconf package is
-	# ensured to not install a /etc/env.d/50gconf and then
-	# still consider the CONFIG_PROTECT_MASK bit.
-	echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
-	echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
-	doenvd 51dconf
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_giomodule_cache_update
-
-	# Kill existing dconf-service processes as recommended by upstream due to
-	# possible changes in the dconf private dbus API.
-	# dconf-service will be dbus-activated on next use.
-	pids=$(pgrep -x dconf-service)
-	if [[ $? == 0 ]]; then
-		ebegin "Stopping dconf-service; it will automatically restart on demand"
-		kill ${pids}
-		eend $?
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_giomodule_cache_update
-}
diff --git a/gnome-base/dconf/dconf-0.36.0.ebuild b/gnome-base/dconf/dconf-0.36.0.ebuild
index c861d09ab81b..aa94127feb70 100644
--- a/gnome-base/dconf/dconf-0.36.0.ebuild
+++ b/gnome-base/dconf/dconf-0.36.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="gtk-doc"
 RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
 
diff --git a/gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch b/gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch
deleted file mode 100644
index 7b5d8c5aefc0..000000000000
--- a/gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From cc32667c5d7d9ff95e65cc21f59905d8f9218394 Mon Sep 17 00:00:00 2001
-From: Diego Escalante Urrelo <diegoe@gnome.org>
-Date: Thu, 31 Oct 2019 05:51:22 -0500
-Subject: [PATCH] build: Update use of link_whole for meson-0.52
-
-A regression in meson-0.52 caused uses of link_whole to expose scenarios
-where duplicate symbols issues could appear. In particular
-libdconf_client_dep was being link_whole'd to itself, which recursively
-already included libdconf_common which was also a link_whole.
-
-This change does not modify the available symbols in libdconf.so, and is
-compatible with meson-0.52 and 0.51.
-
-See: https://github.com/mesonbuild/meson/pull/6030
-Fixes: https://gitlab.gnome.org/GNOME/dconf/issues/59
----
- client/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/client/meson.build b/client/meson.build
-index f3b7122..de6387e 100644
---- a/client/meson.build
-+++ b/client/meson.build
-@@ -28,7 +28,7 @@ libdconf_client = static_library(
- 
- libdconf_client_dep = declare_dependency(
-   dependencies: gio_dep,
--  link_whole: libdconf_client,
-+  link_with: libdconf_client,
- )
- 
- libdconf = shared_library(
--- 
-2.20.1
-
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 0b71eaa3c3bb..c01714b940a9 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -6,9 +6,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-CanGraphical-wait.patch 5534 BLAKE2B 3be217b156ab6d486d7df98885934c5d1bedd6219a25a83cba687aa1ed59f6d0f2a16694a47050313e601355696095ccc738ac639f5958d9619db81d34efe068 SHA512 2152e800051473b8fd230c4b325d72229cfe91dce3e90ad6d8ace8e3278483ab05ce683e61c183f7c83e293873f69715740b1eccfdb34d6775140c635c73b5dd
 AUX pam-elogind.patch 835 BLAKE2B 1db26b690d631c152ae7fd84149c7ff3222e8bd258bff78e09cd6f00fe34a8bfdb2499b252a1f15e17d9e4ed315e02260357b57cd31cf8ada5a2705ba1ef4ee0 SHA512 4d2d65741a5bfd1dc686dc986708526161d15ace2d5396bef281a2192d95458a072764483e1422ed1f6eb594fc0caa6baa381371618f907a97f75566209fab7b
-DIST gdm-3.36.3.tar.xz 1218972 BLAKE2B 8e4d3dcd1dc84de276a6426feae206d43cfcbd8c8ffa24325f0dcc1bc2b180d9dbee20849b8e3157d299017ad91b433be54a78eafc7319171806ec6c6348bb1f SHA512 21c3bba0ce5142362e3c86ccb05fc234d9356db295ed63f3c383bd7cc2b7a464bdcec08e472d31a339b5ffbfeaed4db72ebbdeae2e7a71effdeef8c52b53830b
 DIST gdm-3.36.4.tar.xz 1235796 BLAKE2B eeac6c3c95993d7a75eecd03b51f0519b2f899eaecce8767dbab01eead68bddde21edc999eaf6b7ce747084ac9f88ab71cd7bf602e3bdc5bfe09038e3b01ad3a SHA512 ee8a4ae4a1c4846e4d52fda0b115dfc79ef76b78a2349977767e4212910b5ad331b908601f252292a8a944973372d1dce3124d9ccb8a2519a98d0e4813a6ec61
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gdm-3.36.3.ebuild 7889 BLAKE2B f560f8094e9462980913548a6e04f493af4bafcdfb1e887b48744f40fedaf0fe32d3ba44846f10c07d24ae2f5b1e15761aa6b3de8160c02beda28eb602f9d49f SHA512 be7d28d713be7a348052a03584ede48ff38b7f859d674a0c0f16007ca7b26965bb3973e04111c10c6507641588661e5585d92f9ecde9928a9209d40e094a0e84
-EBUILD gdm-3.36.4-r1.ebuild 7223 BLAKE2B 38d6063f787081f2f5f9234ac43265c286768d107806a2068c8346b46fb48941bf131d7e88f4f084f500ff4659361cef69399b0f550956ecb98879901f3ead61 SHA512 8d301d469d2934c004e7e1c8d4df80c41c259c82b8d21dc875fc2b6c1344088f27d7fdb81c1b0747d51f8cb6fb2b508232bb9a08ae3d2ab0c08b46d33c2b22d4
+EBUILD gdm-3.36.4-r1.ebuild 7221 BLAKE2B f7f2be3915981750964e0152c486be3bf327aea4d6cbc0ecab787f2f8bc4e9237d75397af7dfee8ab599d14e07edb50a67fc3127bd4f93291e18e55acb1372f8 SHA512 1263adc59538cea24da345c80ea3e3caf90c7840a7ec0ae85d665b9d0018570578845967e16793f2ca28792669ef57a19c62bcadf4611c2fe95f8a4803149244
 MISC metadata.xml 759 BLAKE2B 13de28afc8fe81580a2aa28c5fdc17c77266595ffe95218cfbb5cbee4cbd6edab21e8cd06698e4a5feeb696fd9530ef8bf14209ecf3d03039b4e0562bb757375 SHA512 68cec6972bcabcb873fb314babbf9bdfacc7eaae40d662d11662fccd6cbf6630cd93b7322baa271081244c77fd1458c89ad785a0eb2a58b448ddff663381d98d
diff --git a/gnome-base/gdm/gdm-3.36.3.ebuild b/gnome-base/gdm/gdm-3.36.3.ebuild
deleted file mode 100644
index e2c371054910..000000000000
--- a/gnome-base/gdm/gdm-3.36.3.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit eutils gnome2 pam readme.gentoo-r1 systemd toolchain-funcs udev user
-
-DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
-HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
-
-SRC_URI="${SRC_URI}
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="
-	GPL-2+
-	branding? ( CC-BY-SA-4.0 )
-"
-
-SLOT="0"
-
-IUSE="accessibility audit bluetooth-sound branding elogind fprint +introspection ipv6 plymouth selinux smartcard systemd tcpd test wayland xinerama"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="^^ ( elogind systemd )"
-
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
-
-# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
-# nspr used by smartcard extension
-# 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
-# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.44:2
-	dev-libs/libgudev
-	>=x11-libs/gtk+-2.91.1:3
-	>=gnome-base/dconf-0.20
-	>=gnome-base/gnome-settings-daemon-3.1.4
-	gnome-base/gsettings-desktop-schemas
-	>=media-libs/fontconfig-2.5.0:1.0
-	>=media-libs/libcanberra-0.4[gtk3]
-	sys-apps/dbus
-	>=sys-apps/accountsservice-0.6.35
-
-	x11-base/xorg-server
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libxcb
-	>=x11-misc/xdg-utils-1.0.2-r3
-
-	sys-libs/pam
-	sys-apps/keyutils:=
-	elogind? ( >=sys-auth/elogind-239.3[pam] )
-	systemd? ( >=sys-apps/systemd-186:0=[pam] )
-
-	sys-auth/pambase[elogind?,systemd?]
-
-	audit? ( sys-process/audit )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	plymouth? ( sys-boot/plymouth )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xinerama? ( x11-libs/libXinerama )
-"
-# XXX: These deps are from session and desktop files in data/ directory
-# fprintd is used via dbus by gdm-fingerprint-extension
-# gnome-session-3.6 needed to avoid freezing with orca
-RDEPEND="${COMMON_DEPEND}
-	>=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
-		sys-auth/pam_fprint )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( >=dev-libs/check-0.9.4 )
-	app-text/yelp-tools
-" # yelp-tools needed for eautoreconf to not lose help docs (m4_ifdeffed YELP_HELP_INIT call and setup)
-
-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
-"
-
-pkg_setup() {
-	enewgroup gdm
-	enewgroup video # Just in case it hasn't been created yet
-	enewuser gdm -1 -1 /var/lib/gdm gdm,video
-
-	# For compatibility with certain versions of nvidia-drivers, etc., need to
-	# ensure that gdm user is in the video group
-	if ! egetent group video | grep -q gdm; then
-		# FIXME XXX: is this at all portable, ldap-safe, etc.?
-		# XXX: egetent does not have a 1-argument form, so we can't use it to
-		# get the list of gdm's groups
-		local g=$(groups gdm)
-		elog "Adding user gdm to video group"
-		usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
-	fi
-}
-
-src_prepare() {
-	# ssh-agent handling must be done at xinitrc.d, bug #220603
-	eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
-
-	# Gentoo does not have a fingerprint-auth pam stack
-	eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
-
-	# Support pam_elogind.so in gdm-launch-environment.pam
-	eapply "${FILESDIR}/pam-elogind.patch"
-
-	# Wait 10 seconds for a DRM master with systemd. Workaround for gdm not waiting for CanGraphical=yes property on the seat. Bug #613222
-	eapply "${FILESDIR}/gdm-CanGraphical-wait.patch" # needs eautoreconf
-
-	# Show logo when branding is enabled
-	use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# PAM is the only auth scheme supported
-	# even though configure lists shadow and crypt
-	# they don't have any corresponding code.
-	# --with-at-spi-registryd-directory= needs to be passed explicitly because
-	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
-	# Xevie is obsolete, bug #482304
-
-	# --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.
-	# ! use plymouth && myconf="${myconf} --with-initial-vt=7"
-	local myconf=(
-		--enable-gdm-xsession
-		--enable-user-display-server
-		--with-run-dir=/run/gdm
-		--localstatedir="${EPREFIX}"/var
-		--disable-static
-		--with-xdmcp=yes
-		--enable-authentication-scheme=pam
-		--with-default-pam-config=exherbo
-		--with-pam-mod-dir=$(getpam_mod_dir)
-		--with-udevdir=$(get_udevdir)
-		--with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec
-		--without-xevie
-		$(use_enable systemd systemd-journal)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		$(use_with audit libaudit)
-		$(use_enable ipv6)
-		$(use_with plymouth)
-		$(use_with selinux)
-		$(use_with tcpd tcp-wrappers)
-		$(use_enable wayland wayland-support)
-		$(use_with xinerama)
-	)
-
-	if use elogind; then
-		local pkgconfig="$(tc-getPKG_CONFIG)"
-		myconf+=(
-			--with-initial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility
-			SYSTEMD_CFLAGS="$(${pkgconfig} --cflags "libelogind")"
-			SYSTEMD_LIBS="$(${pkgconfig} --libs "libelogind")"
-		)
-	fi
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_install() {
-	gnome2_src_install
-
-	if ! use accessibility ; then
-		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
-	fi
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}/49-keychain-r1" 49-keychain
-	newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
-
-	# gdm user's home directory
-	keepdir /var/lib/gdm
-	fowners gdm:gdm /var/lib/gdm
-
-	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-3.36.4-r1.ebuild b/gnome-base/gdm/gdm-3.36.4-r1.ebuild
index 6f040d66361b..26581e5d1fa3 100644
--- a/gnome-base/gdm/gdm-3.36.4-r1.ebuild
+++ b/gnome-base/gdm/gdm-3.36.4-r1.ebuild
@@ -24,7 +24,7 @@ IUSE="accessibility audit bluetooth-sound branding elogind fprint +introspection
 RESTRICT="!test? ( test )"
 REQUIRED_USE="^^ ( elogind systemd )"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 
 # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
 # nspr used by smartcard extension
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 43cb4fba93ea..ebd1a956614a 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,14 +1,7 @@
-DIST gnome-control-center-3.36.4-patchset.tar.xz 12320 BLAKE2B a387d793186c898a14d54060214fbd075389afe402b1ad937a00295eed339a529863752324ba26f691ad468f214acda60be5bc23167d95fdf842f26a24442e55 SHA512 6f11425f13590e7850114613efa82e8762bd62687839c9374d2618ab81a08f1abb871d2a8f452811e46fa53af7007167f7b9ca68e0822daee22e9de33e0be94b
-DIST gnome-control-center-3.36.4.tar.xz 6304992 BLAKE2B 7c52faf2a9a0f642f24f59e2035ae57e7816d69c8ee639cde76db7d69f8063c9eff2e068b95710d13316c267b5cf6c6647cb1359ac592968b1c5021730081130 SHA512 e6c398256215a139042e5bb0db7c83fc0e39f99ab893760e37ba303ec4c932a37da352b92487ed1bdc61f2e8f61352c752b48ab549269e3f84e21a71cdf32abf
-DIST gnome-control-center-3.36.5-patchset.tar.xz 7288 BLAKE2B 56f71bc1a8c9f5a62e10d8484b085a5a6024fc3c98f76980adb390806f8daeaf1deefc7d843e702a1813e46196963f3342c99fde8441127e95b5db1215270fdf SHA512 77162ff6ad5b52ab9a90c09d6bd8ec35ea0e7f8f00a7507c793e7955fabd37e7c732b302a6ec835e54fc9612c7aca5262c30e2f0de53cb2c22475ef965aebfd0
-DIST gnome-control-center-3.36.5.tar.xz 6304804 BLAKE2B c4e95784ff1877e716f23ea421d0d4997691e2aa15ce24eae35d9ecac167c48443e8f5180ff3359be75914512c240e4ef2ef8a2fdc51f1c6b15275eadef2c3bb SHA512 4a5470dc18366172198a68f8e0598647c0cae1fbcc00eec26dccf7320f0e3aca4a7326fbf0e616fd7e44ab1faacefaa9342322efcf79039122216c644c490b52
 DIST gnome-control-center-3.38.3-patchset.tar.xz 7308 BLAKE2B 72acdb825d48c7077d15f7273765db2ccbef89a839466a4482d9f6ae9eae3a2144556a048f2a6e146ea4e3435c13f0a72bf499c44d34bcbed505d6186d8bf008 SHA512 2498abd83e0100efa4c83886ce3e7f7d4468e41aab12c5338987832cb305c215abe75b4fff65217511bbe174b6b1b601af988c5588523e0346855aba7842092b
-DIST gnome-control-center-3.38.3.tar.xz 6434672 BLAKE2B e95a9a1c487e1a3d6a0e64c61fd9502d1983827ff0a26ed03a0e48339917ae49855016ac3699c3940764185041659d865db51fd95e19bbb588c62277218c609d SHA512 25b8ff6e44be5e679666ae44e12deedf5dbef9317089381cd2075efc2321abca91ac1ad268242fb16a0b7f411ad98d9ab50073f745060d6525e0648585333e3e
-DIST gnome-control-center-3.38.4.tar.xz 6434656 BLAKE2B 6201344c3ce4a1e85c8becde5df24d0aaa294ba0f135220fa1bd1ca079fb99ea30a4bb9f6403f17584bb1299b7d3edf1300fa94fca44a75bd947c84cc257be35 SHA512 9fa90b33af09fe5458c2db8782079d992f18bc36cdd6623239b48d6c8f242fa9b56275ee7c6920f313efcd2f8f1c65a43a8f3f1c100489a0bcade26d045eb3c7
 DIST gnome-control-center-3.38.5.tar.xz 6435648 BLAKE2B 6bcb91433540278850008b1a015caa157fede8533fc5fdf22b58a9f7511fe39a9c3dc195ed9aa1fcf729b6eaa2cf18cf67781300d43ed23ea63c3c6fc5cfb64f SHA512 d173dc863bb62010577a99c3f6705fd92c7e1b9fba124c7ab7fb32b22e01b23b75dea976b45e8d65e7329edca50fb892fe298e8ca2861c7e1185318b7be6cb67
-EBUILD gnome-control-center-3.36.4.ebuild 6333 BLAKE2B e2710b49f78faedc5066a8c0c62d3a712c1eaae8118673d132f418ecdf0083d3051d1150cec64101da212e6f7b02f9119c9e62d491b70169d1fb3c27e482d3e2 SHA512 1c27bd276acf3f80caea1a67487eb885752726850127bc39ee4edb4b74f7f4e0b69034f2954b29d71a4f0efa097b7d09cc983263d3269465d92ec9b61b8a6316
-EBUILD gnome-control-center-3.36.5.ebuild 6341 BLAKE2B 6e8255b594daef3763ec65ef68ec32b6e09c8087abb0c6e42003737000ea5687b40b4d52a3a066d4c3590a3a211c03fc9e60d3fea107c9ccdf5831dd9d0af911 SHA512 306f9e56bff6c11b0e2b364391894633aa18614d7a632100e333fcab7e00a64806da39f7005191403c08241d90cac28bbaba524778a2b7babc3818894858dcac
-EBUILD gnome-control-center-3.38.3.ebuild 6226 BLAKE2B d3f722ecacaa770962b4f859bafe4e9427934c04205d421b9824c1a5381314631f9065bbb5207912a7887d8bcfbc7613d572cb27bda1ccaac06d1e282f94d634 SHA512 b142a2399ac3c5d5b5316a87b10722b2af9ca40d1e88c706e6b4fd34e2c5310f3393ef3fc56575357c4f720976288c3a34efa812833af5309c8b1158b741d5be
-EBUILD gnome-control-center-3.38.4.ebuild 6235 BLAKE2B 1691b82677c5ab8ee1afd37a121fd20383be5e69c347ca870aa0a58362c2865ac04c6d247a328a4b753249947de2fe55e42c3d6bff8592b85dee98e66eafc990 SHA512 46b694410f5755a5c360e027668d6b5ed4130cb650259ef3497d8191e6b2976b61f8c7b0490b4c29517bce4472b7e6c6191b6fa06d74096d3edaedf3fc09271e
-EBUILD gnome-control-center-3.38.5.ebuild 6235 BLAKE2B 1691b82677c5ab8ee1afd37a121fd20383be5e69c347ca870aa0a58362c2865ac04c6d247a328a4b753249947de2fe55e42c3d6bff8592b85dee98e66eafc990 SHA512 46b694410f5755a5c360e027668d6b5ed4130cb650259ef3497d8191e6b2976b61f8c7b0490b4c29517bce4472b7e6c6191b6fa06d74096d3edaedf3fc09271e
+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
+EBUILD gnome-control-center-3.38.5.ebuild 6232 BLAKE2B 865c1b617db05afcc0106051e65d0d18972ee8303fd591ed2c6184868fa63a52a9a329a088f7f0258359c4895db066835241bd04168a640d7eef8856a9a596f6 SHA512 082c2932be4304dbe110e873413b3802055df356577d0c293b57a68776245002894809ba79411a181f24f40eb07bc89043a1c7ba0481229a1efb6135cc25c0fa
+EBUILD gnome-control-center-40.0.ebuild 6226 BLAKE2B 1f0edbd5ade2e3e6776a22a7745fb155da0349a186a975d82a6c0a1a3fd1b9b0420c75dad049b870fc432c42843290c93e1cd2dd8e7eea02dc404573adbf74e1 SHA512 7a1c4ec192e8013e60decbf7dd6791d969f35b41a2078e57bf45848fb10335ed244ff51e6a1d56b103a4b2e98bfef527e841b61f3741fb8ab0d328dd12c24458
 MISC metadata.xml 588 BLAKE2B 6fb4fefc43b162c8ac2a671ed7a6878ebe19edeaf018bb37f32a0c0aa6208b8cb68392b24fde56e1aaf5227756b157fbfa10470c350bb472c270ac7436827ff3 SHA512 d2891d89abf4a64e97ab84ed45e45b4115ebb1990b2ef8a91f069433a61aea4d97d060376e088aec5e9aec7475c0263ac072f081cb5f0c3d67206ed077051e1d
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.36.4.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.36.4.ebuild
deleted file mode 100644
index a0f077088574..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.36.4.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-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 x86"
-
-# 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-0.0.9:0.0=
-	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.27.90:3=
-	>=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?]
-	>=gnome-base/gsettings-desktop-schemas-3.31.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.12.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] )
-
-	!<gnome-base/gdm-2.91.94
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# 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/dbusmock[${PYTHON_USEDEP}]
-	') )
-"
-
-PATCHES=(
-	# Patches from gnome-3-36 branch on top of 3.36.4
-	# 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 && \
-		has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && 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)
-	)
-	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-3.36.5.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.36.5.ebuild
deleted file mode 100644
index 3452770f5c7e..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.36.5.ebuild
+++ /dev/null
@@ -1,180 +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://git.gnome.org/browse/gnome-control-center/"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${P}-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 ~x86"
-
-# 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-0.0.9:0.0=
-	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.27.90:3=
-	>=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?]
-	>=gnome-base/gsettings-desktop-schemas-3.31.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.12.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] )
-
-	!<gnome-base/gdm-2.91.94
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# 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/dbusmock[${PYTHON_USEDEP}]
-	') )
-"
-
-PATCHES=(
-	# Patches from gnome-3-36 branch on top of 3.36.4
-	# 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 && \
-		has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && 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)
-	)
-	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-3.38.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.38.3.ebuild
deleted file mode 100644
index ff89e2e1c520..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.38.3.ebuild
+++ /dev/null
@@ -1,176 +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://git.gnome.org/browse/gnome-control-center/"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${P}-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 ~x86"
-
-# 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.27.90: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.20.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/dbusmock[${PYTHON_USEDEP}]
-	') )
-"
-
-PATCHES=(
-	# Patches from gnome-3-38 branch on top of 3.38.3
-	# 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 && \
-		has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && 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-3.38.5.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.38.5.ebuild
index ac894c3d8ce2..164c4de68f62 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.38.5.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.38.5.ebuild
@@ -18,7 +18,7 @@ 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 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 
 # kerberos unfortunately means mit-krb5; build fails with heimdal
 # display panel requires colord and gnome-settings-daemon[colord]
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.38.4.ebuild b/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild
index ac894c3d8ce2..04001bc83850 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.38.4.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild
@@ -8,7 +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://git.gnome.org/browse/gnome-control-center/"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.38.3-patchset.tar.xz"
+SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-40.0-patchset-2.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="2"
@@ -33,7 +33,7 @@ DEPEND="
 	>=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.27.90:3=
+	>=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
@@ -54,7 +54,7 @@ DEPEND="
 	ibus? ( >=app-i18n/ibus-1.5.2 )
 	networkmanager? (
 		>=net-libs/libnma-1.8.0
-		>=net-misc/networkmanager-1.20.0:=[modemmanager]
+		>=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 )
@@ -119,7 +119,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	# Patches from gnome-3-38 branch on top of 3.38.3
+	# 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
@@ -127,8 +127,7 @@ PATCHES=(
 )
 
 python_check_deps() {
-	use test && \
-		has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
+	use test && has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 13c53dab1bec..4eb0e913625a 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,8 +1,6 @@
 AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c0265f34d5d0fd555ae60a519273512021cf4f065db1e22ab72ce9004a914a47d077551b5a12ffbd5e81a9b8cf098a4762a0e461d SHA512 ea76e41aff067281497b98c86b66d8c382124ceead5b18e729342615a50b6aa3401f4d7c5553023b5d78ca0ea02823c7d6026ba9acca862804351269e4107d18
-DIST gnome-desktop-3.36.8.tar.xz 739236 BLAKE2B 378cf551787863543e30b0e69dd7447a5a9fd1026c3c85f32f140874658f803e6e8d2a82c79a1a9c4aadd08043905f1b0486e900596e855c2650248ac9478d01 SHA512 d9a447ec1c34e98d19ed6f5ef7e48f19d89009bd20368e2d731ff0cea30adc2dea6c0293df9b07f39e4573035edd25815ccd7d740f09ba421ebee74b7c8c90a2
-DIST gnome-desktop-3.38.3.tar.xz 745372 BLAKE2B d5df6d8bead6f65f655c7fbb65ea07937250318ee1fdc3e15c7d74a6e5933389640a06d162079dfce0137db11ceb67b4d86dcff787ecee9dbbbdf750e7aaa252 SHA512 023121316d308d8d69a26bd595657f2d7471da82395c7208cdd642a5e58927d2af05b27b6a0e52eaa10f9fa5a27c1146d5496c042ae3a9cf7e134875d3b2c84f
 DIST gnome-desktop-3.38.4.tar.xz 745168 BLAKE2B 1d85b176acb6721fb21bc56eef552629a06b059117cc53a5dde9c2c74ae23f624701efed3849e8e7daf21c1fd7622b747b394b6c63ab974371daec14bfb8d9ce SHA512 546fd2bd25d7582ae6cc6aa2beab4221fd246d16640e7d3f0cf9b700732f67a95c4bcb3211b5cb131f151b25923d59aa1ffa114183b6fcb683ad88cb94790e1e
-EBUILD gnome-desktop-3.36.8.ebuild 2022 BLAKE2B f3dd6dca7559c79967f73859b72c5ec3f9edcd8ab4d527e8d9503fd93ff2e117637223261a59e3937d5d074ebb064c36d7294adb62b5686435cce88fcbb0c7f5 SHA512 7280f4ae4748c982826f10248a3b6edf8e963a982facc182c98895ad1e6c695d076a62d4f56830c6fbf96dc0a9cdb3c9d533f1ceb16757f4f3475c8942579fcf
-EBUILD gnome-desktop-3.38.3.ebuild 1926 BLAKE2B 4cceae3627dff7279fa09bc258e484e5548d2b4f92d91215d89333602c2506c6fec5d0f3a43149881c9d01413e5777433217ba0548fb9c7abeee75fa87a9bcde SHA512 acdb1be15fa0b82f037c96bf502b92c144bf7f3cfad579f833a23512b20fe48450418797706d65400dce9dfb9beb35a88d8080fd51b36421e625e1e3a84b8e5a
-EBUILD gnome-desktop-3.38.4.ebuild 1927 BLAKE2B 4df2c7f4106735ba0b75111cb9573db0849c6e34e910e17eed037eb6ee3e79e62a783c1890ed5ffe86a6a5d7407fa1e5613aa55ef43a99ebca3f9bedf9f51a6e SHA512 ce16a220725338c8ede87ed48b29dbc06482b7f25073838721853d999e93e8d858d4fed4b90876544a4f26dedc9557b3497065aba0bb4272b56ba3d4a176fe19
+DIST gnome-desktop-40.0.tar.xz 721628 BLAKE2B ff89b8f4a284f63ee4c8b87f5b26542dabec13a4dcd75424f91acb21877699a5077d27bf4c618ea5e2c4cbd97570003c048296e24a8684021fb589238c09dfdf SHA512 faf6fd2a0c5db47a49319c03ca9a348d77092050cdd8d79a74979b2878d0e35ffa85bbe5e87449f9285ceb28a884439de6eb73d6b9fcaa02236eb48f4a7ac49c
+EBUILD gnome-desktop-3.38.4.ebuild 1924 BLAKE2B 126f3efd5c9f0b87e60ddfbd1e13667c38411e29ac17895a0ced69b16ddaf57de2a3bb995992b493e3e668806dc3f462e7277f0326246db88c2bdbfaa5b9dd3a SHA512 6d220eed8b4061734bb2ca1bf2470b8669368fe45071a05c8103d33d5dbfb6636b4337694b18993bac77e149458c237f39d8e84e8f3a46e1a03e55f31b13b73c
+EBUILD gnome-desktop-40.0.ebuild 1950 BLAKE2B 8fe295cc9783c308c77d371d374cce48596c6582d64afe5a49a98c19fbb342fde1d9110b472c02ade8126334684be1029d0ac2e913a65d5a2bab70b1a41c1e99 SHA512 961cbd1337b0b36f881f5500ccb03712ebcf70d284b11ceeba3fafbb6a6d0737f9514a4017fe06c31623e4a40aa101f5990c60f7f4188d911ba0b43325957dd3
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.36.8.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.36.8.ebuild
deleted file mode 100644
index bcd26befee5f..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.36.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson virtualx 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 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-# cairo[X] needed for gnome-bg
-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
-	app-text/iso-codes
-	x11-libs/libX11
-	systemd? ( sys-apps/systemd:= )
-	udev? (
-		sys-apps/hwids
-		virtual/libudev:= )
-	seccomp? ( sys-libs/libseccomp )
-
-	x11-libs/cairo:=[X]
-	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
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.38.4.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.38.4.ebuild
index 6ec27d919253..706a013f6ea9 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.38.4.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.38.4.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 ~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-3.38.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-40.0.ebuild
index df14c0b77b34..b42b6b81c1b1 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.38.3.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-40.0.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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
@@ -18,6 +18,7 @@ COMMON_DEPEND="
 	>=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? (
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 6bd93038a2a4..a706d51e1e6a 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-keyring-3.36.0.tar.xz 1345360 BLAKE2B f37454e0e42dcc1fe7e29e95dcb8ca7bc2db10e6b262b796421b4fd38b87fe9128a4c2f129d28d14716a2f9a7d60061d4b345e9564e73a0587faf24a7d2b1194 SHA512 e5aed36ad109cbd2dcb534843f8565829366acc955cadc6e9bbe87ebbb6a8a907211aa3a42f7f26148ac69726af2f9238965707d1259319435bd20aa8c4859ed
+DIST gnome-keyring-40.0.tar.xz 1333440 BLAKE2B 4ef74d982d85766e8d7f28b97ddf295ca546f48b980518be7e586bda607344bdb72c124f92b5c34310aeb2f3903cb39092ae7ca6e1b3baf34ab6a9c58d26aeef SHA512 c9cb0dca8c46ee712200c96c20663a8d5cd39f07801a04e1afca26550a04af6cb369b53a1f29638bf4c8a29f418a69f565befcf4d08df5b0d30fb31894ecf95e
 EBUILD gnome-keyring-3.36.0.ebuild 2287 BLAKE2B 41f33ec6545ae965f233e726c1f59844aa64830e955d91a628e5f8a7ca346603d71e5f880131a55cd0a2ba74521eeed32161f916cb73be2844ba75956f053ec5 SHA512 3e47f3d1efea84dd29bcfbe1718861c109cca51b6956dccf29a571561e1ddf40e471d178d9ef36c77f793fa885af304ac95ae9fc3c16c6793dcbf620c1640de2
+EBUILD gnome-keyring-40.0.ebuild 2240 BLAKE2B 2def59534efd90e5407acfb35f7b2d836242aab4972d1744b587045873954bd91b5d56ba0dbd08a12d8379d34c6598dc6f46545c5d14227750d987d8ac6de75d SHA512 f5313d3cd67802be9175b20f12ea0ba62af5683a4d686356884f244fd94a21006d32d513be443afda38121e3d3c4405574b52eef4da7ac29dd4b6508f5f3225c
 MISC metadata.xml 883 BLAKE2B 6d253b088319b1f442d91e0372751ce3ddd0516bbd3e72242e4541837c6c6bfe83371a5c47a7be73fad6046be5f053aa6c6fb41d884111ac53cd4de3cb0d1381 SHA512 31d506051c1353e1e4dd987e5ccd39281d19f6ae08974a09bd8145218c7209588629a79c6baad9ff1b83358a699f46fddb8c4ec51da73efe26be2d5e7f0a905a
diff --git a/gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild
new file mode 100644
index 000000000000..000f89b856a6
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit fcaps gnome2 pam python-any-r1 virtualx
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+caps pam selinux +ssh-agent test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
+RDEPEND="
+	>=app-crypt/gcr-3.27.90:=[gtk]
+	>=app-crypt/gnupg-2.0.28:=
+	>=app-eselect/eselect-pinentry-0.5
+	app-misc/ca-certificates
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/libgcrypt-1.2.2:0=
+	caps? ( sys-libs/libcap-ng )
+	pam? ( sys-libs/pam )
+	selinux? ( sec-policy/selinux-gnome )
+	ssh-agent? ( net-misc/openssh )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=app-eselect/eselect-pinentry-0.5
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Disable stupid CFLAGS with debug enabled
+	sed -e 's/CFLAGS="$CFLAGS -g"//' \
+		-e 's/CFLAGS="$CFLAGS -O0"//' \
+		-i configure.ac configure || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with caps libcap-ng) \
+		$(use_enable pam) \
+		$(use_with pam pam-dir $(getpam_mod_dir)) \
+		$(use_enable selinux) \
+		$(use_enable ssh-agent) \
+		--enable-doc
+}
+
+src_test() {
+	# Needs dbus-run-session to not get:
+	# ERROR: test-dbus-search process failed: -6
+	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
+	GSETTINGS_SCHEMA_DIR="${S}/schema" virtx dbus-run-session emake check
+}
+
+pkg_postinst() {
+	# cap_ipc_lock only needed if building --with-libcap-ng
+	# Never install as suid root, this breaks dbus activation, see bug #513870
+	use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon
+	gnome2_pkg_postinst
+
+	if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then
+		ewarn "Please select pinentry-gnome3 as default pinentry provider:"
+		ewarn " # eselect pinentry set pinentry-gnome3"
+	fi
+}
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index a3de66aed9ea..377ffc547b91 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -3,10 +3,12 @@ AUX 15-xdg-data-gnome-r1 262 BLAKE2B 8ea3192680b1cda2076ebceafd7cd4f340f6f4c5f5b
 AUX 90-xcursor-theme-gnome 384 BLAKE2B 985ea5b7de4d51b46625c21b803c5d225ac598b81813bb0bf00620a8b825a90f2b54717ed24ca8c9554c3ae6f8dbd75424f2b4ae8c6f38fcb789e655aa35aad6 SHA512 3d692715a744303f31a78ddf7aaefdbece8c50ebc5dfaac84cdfb6430155db465ab0140340eea4b5caf6d4dff030736eca9d028f24ed1d41ebc345fa309a4a4b
 AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc52fe128b35eb3f9e8f0bf3884f0c444ab2da88eb6ba12d9a852e8a058f4abdcf050dc68c SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6
 AUX defaults.list-r5 19379 BLAKE2B 9299c535bcb3ce6f291ba66dfe655f7e793d554f5fd7a5df5e8db665e43372f8c08a5ea8480e63e318befc5b2e56e4b027ca873947972aa2b19d14ba85f0ec3e SHA512 edee1126e11c3b49ebcea1e1a6929d55a28d09b6c382666d6d6a32271a4cf22af23927f7a5e15ecbd4a4cdaa41ac2f1ffc09350f4e48257e2e5e29ade08635ac
+AUX gnome-session-3.38.0-exit-conflict-systemd247.patch 2229 BLAKE2B aeac31dd5d50d2e8eac6fe2bdcbabe82eb90f0a16f396da5ec45466f519fe3b565bebbcb818a0b41607df9ce6ecb46bd637c8ee9e72ba9d28fd315189820f31e SHA512 36e9640be8c04e9442609da36696895efec57a073792622eac7ded8c463e622b932d8693130f19491b4649cdc333d7d269c8732ebb12702ab2b574bc0dc6cc43
 AUX gnome-session-3.38.0-meson-Support-elogind.patch 2808 BLAKE2B da7ad139fe118edc4c53570acc5e56d59e3073caae7941c54b11c59208675eaa148eb03d437d0edfa0f0d024880b77bc60ba65140422f25319ac132299dfe972 SHA512 2a57894b95662ca4488f95110943076a82ecbe7f3bb8ed4d95e2c8082276839f4b1a7ecc20915557378e73e1947df856e4ff57d9d5b9ae32a9673f2cc3b2fbc2
-DIST gnome-session-3.36.0-patchset.tar.xz 22624 BLAKE2B 33518973a5e7c810b9aef165bcd62d41641908fa329dcefc784073966514aad5aa8919037722043c6cb0ddca86b4c2444b614d773aa777d737d49fdb3acad8e5 SHA512 c80ae41bcaa876ebb2c2d2a47d7bbcb58a3fe417ce0727e1aa3f384c4ae848bd3f1e27bd706af478f8e93c921efef578085d2c999efd06fd8d7c8704e170a56a
-DIST gnome-session-3.36.0.tar.xz 475492 BLAKE2B b539c4646b746198aceba65708f758fc875614d342b66f8b12643a7235dcc043b78d7e2502ca9f45159f5b4080528ff8b92c98b67acb77fe7f71386ec282b773 SHA512 234456e8617524a3b95afb505246823ced4eca3ca009d48fc0bde70f8c620814495b04509c134bfb72760619990cc7cb7363ba13f0d90d9f038e8a43eadb6e9d
 DIST gnome-session-3.38.0.tar.xz 481300 BLAKE2B 1adb6377f66ab64c39aa5e9ca73ebcb7fcfbfa33b5adcd4fe5900624a89a248a4255c507ec0e88baa57b20105a50d6b7e8eb6bea0be6de49295977e4aacbb662 SHA512 f49a7337b64722bc502ff3d952d8e249d2435be662c3bdfb7c7740338585c2e0b292869902be4c10faebde00998d7ead8deb82fe719a38575c6ebec2b94aa19b
-EBUILD gnome-session-3.36.0-r1.ebuild 3641 BLAKE2B 71a516e956cf90e844d5d2c110c228c5354cee59738e0971e3a141e9c17433a7f4d43fcc7fe697b1a62e3106fa40e350e0a2e7bd546f5bef535f200bfeafb071 SHA512 776ecba1621b824625a2644ca757b844bfbb49c744c757906d33e9c160fb2cbd379d8c9c0b6c3a387fc1cdd0e76ec14637fe182996e97b87133f838ba5364d3e
-EBUILD gnome-session-3.38.0.ebuild 3444 BLAKE2B be1626829a5a8273a0aef4f1bd0b6b5582aec37519e6ca34976e6ae43627ef44bd5c1e4637516b69e86ae54d2089a53d990d2e892c99a44a660dadde4bf69333 SHA512 73e084d047f0f46f1207431e4e2fda9ab2d082f1e73de555e640be34df488d7176ef26c44541d6f3dfa2b89b00bf8fb73b6553689a502ad8ee002b6412016492
+DIST gnome-session-40.0.tar.xz 481996 BLAKE2B b59e08c5b49321a44b1dd012051ec4bfdcecbbdc9c84b65c703131fb01634d69b303b26c29517afcb516eb60cbd2c4e9c3715a1a584c904463150ed428b4d600 SHA512 121fdf5dcc2b5a9e87b8119f6e217dea9db53fdaee1144f74dbdf2ef8856114e983cac32871214ecde08bbfc8212b3535ffd584c07a24cc648bc4db142b60de4
+DIST gnome-session-40.1.tar.xz 482424 BLAKE2B 7ce5b5d50900a23880e92d3a0d24fbc80532b9894e03c613137526da6bd0f7f3c86a0d66484177279612782a97f3ead5f10709d9625cff6c04bdfb12fe6725a2 SHA512 2f39eea8e1cc41c543ac5c068dca1c8b7b0add244c6c223ed1205b186c785d353d3cc9d380fc4061893531413017755907050f660de17ea1f9289d6c3ed9df2f
+EBUILD gnome-session-3.38.0-r1.ebuild 3573 BLAKE2B be9446b680df5882d9ebea8b4bac48c004a71a06548abfd9bb8d837d61851c7d47196d9d3d9e4cb6fd8f9c86e1f736617f3fc9916d447df12b7cea95337c3d26 SHA512 e711397b4230b3b03125d521362e63e067433ba15ef2e0b240fa781a2e7924d2241cb9e7762f77369fe5eae0d8960337cad44017a6609d19f9d39e27dbf3dd1b
+EBUILD gnome-session-40.0.ebuild 3453 BLAKE2B b0f35aa307fa0517d87bf001e2d61c8cdde78ebd779310e3cb0ff138f3707106860d240c93541fc62041717e5e7f833a198da1a6e6563ea116c4169c674c0581 SHA512 be5ca9beaa306b62e624982a067f8a57448090473acb825b1026b360ac89cf831b20a55283a331730b086807bddb82c5bf4febd5e61aa9a8c1455e78caa8034f
+EBUILD gnome-session-40.1.ebuild 3453 BLAKE2B b0f35aa307fa0517d87bf001e2d61c8cdde78ebd779310e3cb0ff138f3707106860d240c93541fc62041717e5e7f833a198da1a6e6563ea116c4169c674c0581 SHA512 be5ca9beaa306b62e624982a067f8a57448090473acb825b1026b360ac89cf831b20a55283a331730b086807bddb82c5bf4febd5e61aa9a8c1455e78caa8034f
 MISC metadata.xml 348 BLAKE2B e83b29910d01f4a5cc1ddf7587189534a557805ccbc7611230526266ed88202a2ce9e612f8d78f4fb9c9a11217a2eb16e1ce9304d2038c3d2dce65364b5c67b9 SHA512 6bf5331d6f4a8c27e1d17709bb11cad46fd926fc84925c99f7e89eaa236d5b22c95702e6522f868f285b0c9f74a670a839e91b03e3126ace0449b5a5f49fdf8f
diff --git a/gnome-base/gnome-session/files/gnome-session-3.38.0-exit-conflict-systemd247.patch b/gnome-base/gnome-session/files/gnome-session-3.38.0-exit-conflict-systemd247.patch
new file mode 100644
index 000000000000..a4a99640f374
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-3.38.0-exit-conflict-systemd247.patch
@@ -0,0 +1,56 @@
+From 9de6e40f12e8878f524f8d429d85724c156a0517 Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Thu, 3 Dec 2020 13:45:36 +0100
+Subject: [PATCH] data: Fix indirect conflict with exit.target via app.slice
+
+systemd v247 now puts services into app.slice by default. But app.slice
+will have a conflict with exit.target, which in turn means that we still
+get a conflict with exit.target indirectly.
+
+Fix it by adding the appropriate Slice=-.slice into
+gnome-session-restart-dbus.service. Also update the note in
+gnome-session-shutdown.service to point out the requirements.
+
+Closes: #74
+---
+ data/gnome-session-restart-dbus.service.in | 5 +++--
+ data/gnome-session-shutdown.target         | 5 +++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/data/gnome-session-restart-dbus.service.in b/data/gnome-session-restart-dbus.service.in
+index e90f6bc8..6389c321 100644
+--- a/data/gnome-session-restart-dbus.service.in
++++ b/data/gnome-session-restart-dbus.service.in
+@@ -1,10 +1,11 @@
+ [Unit]
+ Description=Restart DBus after GNOME Session shutdown
+ 
+-# Allow exit.target to start even if this unit is started with replace-irreversibly
+-# Also put it into a slice that doesn't have such implicit dependencies
++# Allow exit.target to start even if this unit is started with replace-irreversibly.
++# For this to work, we also need to be in the root slice.
+ DefaultDependencies=no
+ 
+ [Service]
+ Type=notify
+ ExecStart=@libexecdir@/gnome-session-ctl --restart-dbus
++Slice=-.slice
+diff --git a/data/gnome-session-shutdown.target b/data/gnome-session-shutdown.target
+index 607dc6e7..2c3d1963 100644
+--- a/data/gnome-session-shutdown.target
++++ b/data/gnome-session-shutdown.target
+@@ -1,8 +1,9 @@
+ [Unit]
+ Description=Shutdown running GNOME Session
+ 
+-# Allow exit.target to start even if this unit is started with replace-irreversibly
+-# The same is needed for all (weak) dependencies
++# Allow exit.target to start even if this unit is started with replace-irreversibly.
++# All (weak) dependencies need to do the same. Services also need to ensure they
++# are in the root slice by setting Slice=-.slice.
+ DefaultDependencies=no
+ 
+ Conflicts=graphical-session.target graphical-session-pre.target
+-- 
+GitLab
+
diff --git a/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild
index 65e9940099b1..9d0bc54583fa 100644
--- a/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild
@@ -2,11 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org gnome2-utils meson xdg
+inherit desktop gnome.org gnome2-utils meson xdg
 
 DESCRIPTION="Gnome session manager"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -17,7 +16,7 @@ REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
 	>=dev-libs/glib-2.46.0:2
-	>=x11-libs/gtk+-3.18.0:3
+	>=x11-libs/gtk+-3.22.0:3
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
@@ -27,7 +26,7 @@ DEPEND="
 	media-libs/libepoxy
 	x11-libs/libXcomposite
 
-	systemd? ( >=sys-apps/systemd-183:0= )
+	systemd? ( >=sys-apps/systemd-242:0= )
 	elogind? ( >=sys-auth/elogind-239.4 )
 "
 
@@ -57,8 +56,9 @@ BDEPEND="
 "
 
 PATCHES=(
-	# Various patches from master (no 3-36 branch yet) + elogind support
-	"${WORKDIR}"/patches/
+	"${FILESDIR}"/${P}-meson-Support-elogind.patch
+	# Fix indirect conflict with exit.target via app.slice (from 'master')
+	"${FILESDIR}"/${PN}-3.38.0-exit-conflict-systemd247.patch
 )
 
 src_prepare() {
@@ -85,14 +85,11 @@ src_configure() {
 src_install() {
 	meson_src_install
 
-	dodir /etc/X11/Sessions
 	exeinto /etc/X11/Sessions
 	doexe "${FILESDIR}/Gnome"
 
-	insinto /usr/share/applications
-	newins "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
+	newmenu "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
 
-	dodir /etc/X11/xinit/xinitrc.d/
 	exeinto /etc/X11/xinit/xinitrc.d/
 	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
 
diff --git a/gnome-base/gnome-session/gnome-session-3.38.0.ebuild b/gnome-base/gnome-session/gnome-session-40.0.ebuild
index 451436341742..6a5333b3fb7e 100644
--- a/gnome-base/gnome-session/gnome-session-3.38.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-40.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc elogind systemd"
 # There is a null backend available, thus ?? not ^^
 REQUIRED_USE="?? ( elogind systemd )"
@@ -56,7 +56,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${P}-meson-Support-elogind.patch
+	"${FILESDIR}"/${PN}-3.38.0-meson-Support-elogind.patch
 )
 
 src_prepare() {
diff --git a/gnome-base/gnome-session/gnome-session-40.1.ebuild b/gnome-base/gnome-session/gnome-session-40.1.ebuild
new file mode 100644
index 000000000000..6a5333b3fb7e
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-40.1.ebuild
@@ -0,0 +1,121 @@
+# 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 ~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-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 0b684fab46ab..6e71966d2072 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -2,9 +2,10 @@ AUX gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch 4505 BLAKE2B
 AUX gnome-settings-daemon-3.38.1-build-Allow-NM-optional-on-Linux.patch 694 BLAKE2B e4f32a376c2b1c55a396504e98c8a69d512bb9161a854482aa877023a2761e59d3fc682d724398ffb53bc138b010c33276071359d42ac19bcac2d9af87d42eef SHA512 618ad312b54709d0f95e5d881c2896c156246ae41eee1925f76b0a398b7ce6815a7466f8587f2291b07f7a34d1a3e1afb7df33823d9b52ebe8ad46a3f5f1e84d
 AUX gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch 3096 BLAKE2B 44587b5a73c5c1a622a8e5a422f03da414856e79edce30056f56fe93a7dcea0ca5a84be737de7fe723f023bb65714d589f60819667432109a212fc03ec4c7b68 SHA512 5ebfd528f7c446c02bf2c4160b91600e7dc27a3f6c17fec071ab9a72c6e4fffc3ba81427bdf7ba10d19cb5059238ec798ab136711018bd3269bbd658ed1c0632
 AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb15e998de9f5fddc956dab862552ecc3734083391f124ef577dd2efb70e29efd230511cca83536dcd8c32118ecebcfe52b2927d6f0094540ec73a6ae23 SHA512 9c4b1e1b63b1a6d97eed962969704accca2fc53763a4b7806e2a3e4ff49ecc7d4a0d7f8253ff2e33d83e766908d852721ffa33f363aed7d04c20002bfdee173b
-DIST gnome-settings-daemon-3.36.1-patchset.tar.xz 79352 BLAKE2B 6daf9528f5aa4c6597a017f25da41039dd2c09b4a1c29dca2d72f20195bb93c9003de39df89a669996e13050538553fbf6ed4f738b1c6fae29e8825ba252d26a SHA512 fea4ecaadac102b0024c365ae2ba9e632ffeebab138bfc09b3f5bb0a7794c6efc779180023a73c6c884c7b64f7e8ac1ec40f1478231a5528c03829cd9273a58e
-DIST gnome-settings-daemon-3.36.1.tar.xz 1415080 BLAKE2B 4026f3443b8dcab872ef54563b5fe8e89d6932373da0513d7d8c614616d396315f1e6a8d0be022aec82351b5cfe5868cbac5caeaa782d609885029fbbd1d91e3 SHA512 f2f43d9b772589b6b4212ee2b0afe8be79d50a2e0473a960c7a7b9d379222bbe84ca548114d0a247810a094b4b3bf41e40ca91173c6cf552517dc63eb3750c88
 DIST gnome-settings-daemon-3.38.1.tar.xz 1437096 BLAKE2B dddc4672585c23f1d0f1824303b503ec30d6fc4a2a88b9633e0256d34ca2badd067fa54a404de032f8b2e8dd5b7bfa3915464bc826d8bbea5d57431b7a2ac7fe SHA512 b32c0897d1a5680747bf68e9009ea44cf1a05ef807b772ca6514a278002754d520def7bced929b9004d3aec82a6e82b52637bd2eadd3f6cd54f3d0ac5c8e8cbd
-EBUILD gnome-settings-daemon-3.36.1.ebuild 3933 BLAKE2B 7c4adbd3828e8046fa9bf288b34942f841c96e078436a1c785402c71bddf1ba942e4ebc2630e3b7f1f18b876aeec4d3fd626708152ef3798736b9403e44ac4cd SHA512 49ceda2bb5751d1b4c0e2a30e3ca6cd60850b64e1466588cb44a66e427a4c2dd640b7b41eae65ec122ea365d18dba9d7abc32e7514ced48b89cf745d7c4f6869
-EBUILD gnome-settings-daemon-3.38.1.ebuild 3877 BLAKE2B ecdb3fdf8894a8939f7b3f80a4e7f7eb0d5a10d4b1e7b390cfe9eef72c38c6857c8cda06c5e8944407d24e7db4baccf20385f9c39bb4216dc00086f7e269d962 SHA512 592b981dca3922c8b57113c3841023dfb74d7c0650371e18d649c50f79189945b7b3944acf7adc538fb01a34e3fd7fe5c4ababd50e678625a193407f517b6d28
+DIST gnome-settings-daemon-40.0.1.tar.xz 1443100 BLAKE2B 2615165e4b33b3ae4f9ceac73fdd298ad5288b5de03424ade70a0dfd64b7349ae759138c0c930ba4c78ff70ed52389b2f0a996333234755f793dc114870d2460 SHA512 d5b7235e097baded66cbbc2c4f05effcac722daa09413f495368555ad97830746415c4c8f1ecfe54dac262f3b75ab1a83863dc4b736b9854dcf86c94c14edd79
+DIST gnome-settings-daemon-40.0.tar.xz 1442648 BLAKE2B 9f4c3923f7cc80ac469719b2a297f4bfc5fb2bf0b5f349d8882481d96a90850f9a062a36447c7bfbff789366efbbd57d77863f63934aadba00918c94c00e8d98 SHA512 59429f8bc01bd84bb50bc297f80ad65e48fef3f0c965ae41571a528b7829e5a3a197e2ded06e1286629a411e5683dfd154267ee99c0dcabbf2d21f389e1f276e
+EBUILD gnome-settings-daemon-3.38.1.ebuild 3875 BLAKE2B d0b123b8f02a1489fbf19e0de7c9626030f8327569619c3e208ea24a0c130e63df848b7af851d443c4012670703c0c4d30f06068974c2f13b6e61d1cc13bb15d SHA512 f0ef38200f1d83100aae6cbd580099ecc7a67d7d67eb9de1a8d24e5deb6c2cd3a52722772755df858db88f58c6e8a836b206e9688cccee331c5b304f867fb007
+EBUILD gnome-settings-daemon-40.0.1.ebuild 3888 BLAKE2B 8e2cd4494b084eb002fef681615b3a82779554c6fd0fa7a17d5dee8130703752d3006ab516ea35f5e3f5fdb0fa48699c1558c997271302f2efab216f95ef912c SHA512 e1f6bae8b360a122f71749bc4a905a0f2aeff519c812ea9ddd23dabcd69652057f420be76aacd5d8f563aa449f0b66f7bc6afea950b82ff18fe842bb7d15f77f
+EBUILD gnome-settings-daemon-40.0.ebuild 3888 BLAKE2B 8e2cd4494b084eb002fef681615b3a82779554c6fd0fa7a17d5dee8130703752d3006ab516ea35f5e3f5fdb0fa48699c1558c997271302f2efab216f95ef912c SHA512 e1f6bae8b360a122f71749bc4a905a0f2aeff519c812ea9ddd23dabcd69652057f420be76aacd5d8f563aa449f0b66f7bc6afea950b82ff18fe842bb7d15f77f
 MISC metadata.xml 546 BLAKE2B 8b82608d88d30a327a48d46992c0c19cefd594682191bfe4649a0e090ff13c0a9b88adf4c4aa4b42f9393c21153130afbf2d5090d774b348cff3003b41e3cef3 SHA512 c1a8e1a648564c52fb00d68a67bcfea6b2f6369186ede54a7278f258ef9f6b0cc6f399fa5f9c8ee7846d97a6163729c8da970a0f2e93e23bfa2f84ebf2466cba
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.38.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.38.1.ebuild
index 42c90ec1ab7d..480b0b8e634b 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.38.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.38.1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	input_devices_wacom? ( udev )
 	wayland? ( 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 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 DEPEND="
 	>=sci-geosciences/geocode-glib-3.10
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.36.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild
index c4e3bd48c049..e777c2de3e47 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.36.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild
@@ -2,13 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+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"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
@@ -19,18 +18,19 @@ REQUIRED_USE="
 	input_devices_wacom? ( udev )
 	wayland? ( 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 ~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.34.2:3=
-	>=gnome-base/gsettings-desktop-schemas-3.35.91
+	>=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-3.9.5:2=
+	>=dev-libs/libgweather-40:2=
 	colord? (
-		>=x11-misc/colord-1.3.5:=
-		>=media-libs/lcms-2.2:2 )
+		>=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
@@ -40,20 +40,26 @@ DEPEND="
 	x11-libs/libX11
 	udev? ( dev-libs/libgudev:= )
 	wayland? ( dev-libs/wayland )
-	input_devices_wacom? ( >=dev-libs/libwacom-0.7
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
 		>=x11-libs/pango-1.20.0
-		x11-libs/gdk-pixbuf:2 )
+		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:= )
+	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
-		sys-apps/dbus[user-session] )
+	systemd? (
+		>=sys-apps/systemd-243
+		sys-apps/dbus[user-session]
+	)
 "
 # 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)
@@ -73,18 +79,20 @@ BDEPEND="
 	x11-base/xorg-proto
 	${PYTHON_DEPS}
 	test? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		$(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]')
-		gnome-base/gnome-session )
+		$(python_gen_any_dep '
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			dev-python/dbusmock[${PYTHON_USEDEP}]
+		')
+		gnome-base/gnome-session
+	)
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
 
 PATCHES=(
-	# Updates from master branch after 3.36.1 (gnome-3-36 wasn't branched yet)
-	# Allow disabling udev and networkmanager on Linux
-	# Make colord and wacom optional
-	"${WORKDIR}"/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() {
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.ebuild
new file mode 100644
index 000000000000..e777c2de3e47
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.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 ~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-2[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
+		sys-apps/dbus[user-session]
+	)
+"
+# 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/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/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 d996cbe4d15b..ebe683f76eda 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,12 +1,14 @@
 AUX 3.34-optional-bluetooth.patch 1971 BLAKE2B bac967362e46cbd8b76368377c607573e34489b41b70441488086953f56581c8c77b013f848c079bb189188b5ac62de935fc55dd03f2bce725547079b344a27e SHA512 f3c8479090656f5655766a6fd790729e5c16c1b09f61f7b41485bdeee53e6e2ada7ecf7e641b8c8a9cb520a5db8a1bb4f5d0d005226bc5c08c1c553541e3e049
 AUX 3.36-defaults.patch 1463 BLAKE2B c529ac85d19699d0837f4060011b8b7dd03773af4425ea27f4b87841ee6a77f222ee242e34550ca3807dc7330e0c411576f3e4e8dbbaacf684b7ca706133cc81 SHA512 f6656b0baaf53d919ee8ad54550909aed9b86280de3f6ac3667d6a3506834476024cf42087860a4ee431d74dbcfa1c066e37d6d012450d76dbfd498fe0f1fb46
+AUX 40.0-defaults.patch 1412 BLAKE2B e36f7215cf756586479b8bdc71339beb3bbde53ca9745ddc4ef1c3feb59c720e4920e8aa4aadd7912874c386e7495a4b5d554e0d0616db17a81c4ec52a2baa6b SHA512 d82cf1e329d5974755738e29e6366bb10452620021a5db6c2ec63c4ee38e87a65dada34d57026e9510dbffa78c7060ae6f2ccec1739e3026bb0c67dab95f94a9
+AUX 40.0-optional-bluetooth.patch 2034 BLAKE2B 9df252dbef229d372bae87ab017d49086090a4194644fc0f7f3dc78226f78fa58cb99d67d4aac2b156894721658c6094aa6609c0da8c707cf0a8dac5a9a404ee SHA512 ec82f1ef7a9123134af2617526c22fa4258413edb6d68acdcd074911b98ed27d2e761904ccd88a364d9064d79bdefd402988bc53e1139f0e54f993c84242f19f
 DIST gnome-shell-3.36.7-patchset.tar.xz 6364 BLAKE2B 80a2e2a03e4cc3b15db6af872a2330c0921a63bcd03db78a970190fee93c982296b381d08ac4bd1cb5dbe5b14d9732e447445f5dcc06d607826a9026395f10bb SHA512 6f9145fd00117e6b4170e7457c83a8c3bbbbfc6086ce3bcd07813b5a4f05e58f42e889cc90799d6988af05fce9791a792e4d8d60ffe58818563c852f9923930d
 DIST gnome-shell-3.36.7.tar.xz 1777236 BLAKE2B 4dd3b98e8a2ffa711bffe0b3b78708c85c1979122ee71e7e0d7c55626a608ba4598071bf8659338c960ba4b0349e5b621b97f294a4961cf021b9047753136af5 SHA512 7275d1e2d2629abd2fbfae910a77c25485464e39f8317ba1b0e8e1ae3368e69af4eb85c2611e82ea04270bfd8185e24f13002df9b13335adbdff144847790656
-DIST gnome-shell-3.38.2.tar.xz 1814152 BLAKE2B 765f584ad8f71ac185e9dc6683f1866308c126d8ce8ba9330068e324ea9586b57315cf7feade62eb4142bb3a4effd80c7e6e0d7b36b6c5fb7d547e3bff9c2ab2 SHA512 ac37549039a11f4f1b2cdd8b0f8cab72093efca74a5909ad187121565cce737c6a6f296c7241ac5f2174fdfcf11070f7584e713e244fafc911fe039d8fd05f04
-DIST gnome-shell-3.38.3.tar.xz 1815204 BLAKE2B 1df05f0a3709d851d9bb01c8d8f82b3e36aa1da68256198afe7f5663bbf3dc3b88148220b4f90a1ab3eb3d2a14e370dc038e9afd73c57133f9535423b074ac27 SHA512 695446a934b3e5f8512084cb4eaba3e27aec0e03041890fb2a7a9eb4d91d3a9f2f5ca94a8616ce4e7303a2073fda7878425ba31bf590c448132f379fa7138d47
+DIST gnome-shell-3.38.4-r1-patchset.tar.xz 12744 BLAKE2B ad620ca7916370f7085541461ecd825d7703c291a849da1adf17cccf54afb7a73a6d493f4fa4a18244811d4e8fa55c92e1c7465ba8bdc8b1d1fb2f6734c2ed50 SHA512 bad6bcc8ef1c41c5ae92b265b6824d76e39c2af3aa6974866fe95834589ca4b957181527ce9092b628f000d61c70fd356ddc3ef1eadbe19a299a2d44986fc27b
 DIST gnome-shell-3.38.4.tar.xz 1815880 BLAKE2B 888786ca1c7ac4a84c4b4b9ccc1035de80021efe0bf54521494eb90008ad11d5ef693158fd2c30a44532ef30911e6940b81c9c2eb426465aeae5ce3f1d9dbf5d SHA512 f59d7347587ecbde7790d466ee7c81d1e0ce0ff9f92bfe9cb3efc4049231bc164c0f61b761f42dfab1eb35619736d9a55fdae2b808e12f7671900d89e529fea8
+DIST gnome-shell-40.0.tar.xz 1863432 BLAKE2B 698995328575e7e879eb0459e4f0087d0e11624952ac2786fec6c431da83eff25351d909b05a7d347f10b4eaf0d384c065e1f5255c1230433c839bed515ecf40 SHA512 fc4ca3fbd3dafd4a81f97a765e53b74fa4902018721e25a767c0d353d127b0cdc69c64171188272e3f5b48f11d6ad52064cc237e35210f5e09dfcd763ceb00c4
 EBUILD gnome-shell-3.36.7.ebuild 6664 BLAKE2B 9789fbfb64bb7aa7dca1bd367301b974e711c07b06290ceef579c40d58bed72fa53fa88b539c127c7c720a0d835716089093e1f49144b948e2ed9c3dae737ad4 SHA512 f85ecfaf2d656a5017cd21a7e28d74966cb71f3e969d8e37395357cf18f24a04133802c86df71285e9f803ee10e193fd63f5671c50b44894e0cef53901201a7f
-EBUILD gnome-shell-3.38.2.ebuild 6302 BLAKE2B 6e7185a8e495505b8c0c62ad5fd8cd875efd14ed953a8d0a20001f46839d4053922124ebaa7bc1f7182fbd804b909623b976ecc4e22b4fba2a4e72c891e26688 SHA512 a673a5eff8eba8eacdc7e8513260c3f79f4318ed8f413de2d42e8809fa9c35194e5309a8c8c9a54b2ca7c12d6aaec966bf0bc8f56184ca677f3ec06ddbc63977
-EBUILD gnome-shell-3.38.3.ebuild 6303 BLAKE2B 4da383a430e01de0b108e5e9f64da8295deaeeb4fb0be5470b929f927d7cd188ebcc12e6b3364fb5a597d4d81418badf4c62dac122528f20b317619c9aa6c1f2 SHA512 0ac79fada1c92970e586b49ba6af32cf94c26f827eaa09d649d740b4ea07895f6eba3216a78b1b71904d5be19a634dac4eebfbd1f205c7fa17b1ef2177ccbcfd
-EBUILD gnome-shell-3.38.4.ebuild 6304 BLAKE2B 6f1f935f40afff6fd10ac8d64e965b0994ba3ad3388f71d332894d2be5bbd2c2d596a8f989b5fd9c9989f9696eb48911b4410fafa986dd223b9b7abbd01b1b00 SHA512 221e8565d5751324d1649d909838011608fc1aa1b2402c9b530469eb994671a6496a1110008ce8ed5c4e0c3be85dbaab21e97da64624c8f646363132fc9ab40e
+EBUILD gnome-shell-3.38.4-r1.ebuild 6433 BLAKE2B 687d57be8c9cebc27560ed3f022a02d93759fb8578ebe150a819ced11fe7215a88d55b2c169e8b2ff1849041787ed77e032b9f663c371dbd3f367437ff912608 SHA512 576efd756cbc698e6e517425fb881176faf2ff630915161332c00a033159fa3956c89269c5eaac8d0e58d51109cc2a4cff3dbf553b1c4a1bef709f03cfa13c00
+EBUILD gnome-shell-3.38.4.ebuild 6301 BLAKE2B 7eb2c535ac0a40fe1d352bae7fa657c426ef507c82248dc4e65127577fba09601b4c0b27958afc8cf08172c592b2d7f3e05078bc09ed1b50982f45697221de48 SHA512 5091ba9d9d0d6195fa579d2fb6f5b8f201c4e0117c325a78cb1317c13e64f9cc8220a0258fd4e4b837fe05d353d1d5f132a8c0e4e88cce5e4389a4e3a344201b
+EBUILD gnome-shell-40.0.ebuild 6345 BLAKE2B 74d4a98f26ab96be86d56deb83bd83285add0f5277a59e5c6a43365e73bbc7924279e018d02667dca50fda28eae0fa6ac2f9ebe6bcb2bff2d0450d9b9a421298 SHA512 f510adfba6a4648682cca68087051d201b3cec8ad8c17d74437743914d77755693a2727a9fae932334cc08131340155d79ca3deb4f0ee0d2c53fc33ada876969
 MISC metadata.xml 1050 BLAKE2B cf97e536a47f3b023e118a818bbc34af63500d2ea94bbc71201d2ce18aa6e473673cb28a47245de24b7bad9a174a6dda6b46c300518521c8ea0662e88e95627d SHA512 50c1d4c3eacb89b77bc49b4f236bba9d9041ef047392d5bda19e85b0c935709a095a388b1625a2c77c66145758e9b4ab77a202aa6cdd2b86f262c5b56e428b06
diff --git a/gnome-base/gnome-shell/files/40.0-defaults.patch b/gnome-base/gnome-shell/files/40.0-defaults.patch
new file mode 100644
index 000000000000..012514100e09
--- /dev/null
+++ b/gnome-base/gnome-shell/files/40.0-defaults.patch
@@ -0,0 +1,28 @@
+From 1179f970e4b165ac6daf22d0e3b61df4879f3438 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/2] Alter list of default applications
+
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+[Updated to include desktop file renames to reverse DNS and 3.36 changes]
+Signed-off-by: Mart Raudsepp <leio@gentoo.org>
+---
+ data/org.gnome.shell.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in
+index cd6a2356d..6200df11c 100644
+--- a/data/org.gnome.shell.gschema.xml.in
++++ b/data/org.gnome.shell.gschema.xml.in
+@@ -50,7 +50,7 @@
+       </description>
+     </key>
+     <key name="favorite-apps" type="as">
+-      <default>[ 'org.gnome.Epiphany.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
++      <default>[ 'chromium-browser-chromium.desktop', 'firefox.desktop', 'firefox-bin.desktop', 'org.gnome.Evolution.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
+       <summary>List of desktop file IDs for favorite applications</summary>
+       <description>
+         The applications corresponding to these identifiers
+-- 
+2.26.2
+
diff --git a/gnome-base/gnome-shell/files/40.0-optional-bluetooth.patch b/gnome-base/gnome-shell/files/40.0-optional-bluetooth.patch
new file mode 100644
index 000000000000..dba20fe8c093
--- /dev/null
+++ b/gnome-base/gnome-shell/files/40.0-optional-bluetooth.patch
@@ -0,0 +1,59 @@
+From 1ef0033f8148466256b403c9d8c79b9fed1dd343 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 28 Feb 2019 00:50:19 +0200
+Subject: [PATCH 2/2] build: Make bluetooth support optional
+
+---
+ js/misc/meson.build | 2 +-
+ meson.build         | 7 ++++++-
+ meson_options.txt   | 6 ++++++
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/js/misc/meson.build b/js/misc/meson.build
+index 2702c3dbc..7a6c831b9 100644
+--- a/js/misc/meson.build
++++ b/js/misc/meson.build
+@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
+ jsconf.set('PACKAGE_VERSION', meson.project_version())
+ jsconf.set('GETTEXT_PACKAGE', meson.project_name())
+ jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
+-jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
++jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
+ jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
+ jsconf.set('datadir', datadir)
+ jsconf.set('libexecdir', libexecdir)
+diff --git a/meson.build b/meson.build
+index 14b75c1c9..8b1c7a380 100644
+--- a/meson.build
++++ b/meson.build
+@@ -94,7 +94,12 @@ x11_dep = dependency('x11')
+ schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
+ gnome_desktop_dep = dependency('gnome-desktop-3.0', version: gnome_desktop_req)
+ 
+-bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: false)
++if get_option('bluetooth')
++  bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req)
++  have_bluetooth = true
++else
++  have_bluetooth = false
++endif
+ gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
+ gst_base_dep = dependency('gstreamer-base-1.0', required: false)
+ pipewire_dep = dependency('libpipewire-0.3', required: false)
+diff --git a/meson_options.txt b/meson_options.txt
+index ef76b73c3..41cc0ff9d 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,9 @@
++option('bluetooth',
++  type: 'boolean',
++  value: true,
++  description: 'Enable bluetooth support'
++)
++
+ option('extensions_tool',
+   type: 'boolean',
+   value: true,
+-- 
+2.26.2
+
diff --git a/gnome-base/gnome-shell/gnome-shell-3.38.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.38.4-r1.ebuild
index d30d55c34904..d7938eb7e143 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.38.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.38.4-r1.ebuild
@@ -8,6 +8,7 @@ inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
 
 DESCRIPTION="Provides core UI functions for the GNOME 3 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"
@@ -15,7 +16,7 @@ IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager system
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	?? ( elogind systemd )"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
 # FIXME:
@@ -123,6 +124,8 @@ BDEPEND="
 "
 
 PATCHES=(
+	# origin/gnome-3-38@cf9d73ed5d31
+	"${WORKDIR}"/patches
 	# Fix automagic gnome-bluetooth dep, bug #398145
 	"${FILESDIR}"/3.34-optional-bluetooth.patch
 	# Change favorites defaults, bug #479918
diff --git a/gnome-base/gnome-shell/gnome-shell-3.38.4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.38.4.ebuild
index c34921539525..b7a6ba9e7f2b 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.38.4.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.38.4.ebuild
@@ -15,7 +15,7 @@ IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager system
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	?? ( elogind systemd )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 # libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
 # FIXME:
diff --git a/gnome-base/gnome-shell/gnome-shell-3.38.2.ebuild b/gnome-base/gnome-shell/gnome-shell-40.0.ebuild
index 4a02aca91be1..672d138b0f25 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.38.2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-40.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
 
@@ -15,7 +15,7 @@ IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager system
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	?? ( elogind systemd )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64"
 
 # libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
 # FIXME:
@@ -27,7 +27,7 @@ DEPEND="
 	>=dev-libs/gobject-introspection-1.49.1:=
 	>=dev-libs/gjs-1.65.1
 	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=x11-wm/mutter-3.38.0:0/7[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
@@ -45,6 +45,7 @@ DEPEND="
 	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
 
@@ -58,6 +59,8 @@ DEPEND="
 	dev-libs/libical:=
 	>=x11-libs/libXfixes-5.0
 
+	gui-libs/gtk:4[introspection]
+
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
@@ -103,6 +106,8 @@ RDEPEND="${DEPEND}
 		>=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="
@@ -124,9 +129,9 @@ BDEPEND="
 
 PATCHES=(
 	# Fix automagic gnome-bluetooth dep, bug #398145
-	"${FILESDIR}"/3.34-optional-bluetooth.patch
+	"${FILESDIR}"/40.0-optional-bluetooth.patch
 	# Change favorites defaults, bug #479918
-	"${FILESDIR}"/3.36-defaults.patch
+	"${FILESDIR}"/40.0-defaults.patch
 )
 
 src_prepare() {
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index ba6cbf1d1fdd..271f243d290f 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,8 +1,8 @@
 AUX gnome-vfs-2.12.0-afs.patch 663 BLAKE2B 790fc4d85bebee9d3be52a0d6704030c71458477142169879e37c999f31c22866194080956f9fcca33165671df9a5277ccea2209eb9044e6f3bad96e6fcff1ec SHA512 38b1268e774ba2e7726295ee019f939b9dfc5d1a67f8e45d9bc30a2ae20f647acd9570740ad06cb17d83d9299f863aa14dd77a2ca2f9f4910b9c328111ae5ca1
-AUX gnome-vfs-2.15.2-headers-define.patch 569 BLAKE2B eb8b7b640e97e19a157f701d1cd721f39fefb2d2a39727a75bae145c5c0d0fd05419abec4aae0bc62ec3ae42361ebbe13d78dc3d932e4eca58c06bd2db45a523 SHA512 fc4c512ffe74368e83026b24d32c2c77a41f0430d24e782586938dde6061cbc023adcbe2bc21a19d2b584b6c22078ae6d3df7c839576270055aa6832337df60a
+AUX gnome-vfs-2.15.2-headers-define.patch 501 BLAKE2B fed25b67bd1aee253994ec3e16a8dd0f8d5424b7200e73dd3fcc9d2911a57d9e8547bb967557cc3d5b295349bf164767e99cbcdbc041872ff2075650e515569e SHA512 34a66f9467a1ecf77cbf725fc732d9b62baddf68b017a65a2e4ee06f1fca92cbde4c94249fb44eb66c23e338f56fc2b5f314cc75d6e91349a3207c3bd5d74f26
 AUX gnome-vfs-2.16.0-no-dbus-crash.patch 710 BLAKE2B f73c2ffc1480ad1e0b94bc476965a1da989635bdcc34aeb65670e6548403bd32abc644b8eed1da0e8d5498484c855b10efe721b04f08b188198002fc49997434 SHA512 527c24b8902c9a1049b08f6479d32674c8f382a9ae4d7c6f3de772c09347555fda680a3dbfe70fcc312db8aa939ccbc4a42d1a84fd6a9f4a51180943766f5261
-AUX gnome-vfs-2.20.0-automagic-deps.patch 2008 BLAKE2B ff25a966da246a795cab5f76db474041eacd245ae17496ef1328f9d7c2db10708cead3feaf45ff6da52c69752cf20596f7411f4261ea98e68ce45c0a3ba21b64 SHA512 32cd2438a7b8d08a827ad8fc6118f67f14e4a67a176adfe3d6e5cc5a97934733c337d6bee41f06ab47920032fed0fd4cd5e761f9ad4ddc0617a2005f21bbf2ec
-AUX gnome-vfs-2.20.1-automagic-deps.patch 643 BLAKE2B 7f9c6d06be805ecc325a235b6705945bb488a6565e93a1b8939faf09c754f463e4f23568644ed1b6956d2f8130a493a560783c88c2877697bd426b98c73f4cb0 SHA512 95ffa05d5212fd6156611e021a2dcd9ec940b6aa74c85d3c8a3ba01d840578af1f1af459ab724559b5a6331a757a74f1fa284455fce2c311c39e1855556bd745
+AUX gnome-vfs-2.20.0-automagic-deps.patch 1976 BLAKE2B cbe4cf70fc52feedacdb2f422c1048b4eb196861040de066d8b16274c826bf369d63068020389f460e1d5631169ac0e2a83e736ea547339feecf5f53c6551786 SHA512 7ef30df523aabe316be0064a82857bd2dafb783857137912ee8d3153dac540cc314920e3f2c7fe49f32c485685cb62a3876ee386b30409600a318ea91c8d24eb
+AUX gnome-vfs-2.20.1-automagic-deps.patch 574 BLAKE2B eeb9a69590a59259a780af60a6b3000be33240a37ea20955ab50c36cf31e02214193da056b1e601f9dc546298a9a13bc17ad0b2dd9b3cb19a266ae65eca1c98b SHA512 d1adfd585d3564c61ac19b98ac57bf387ad938c4197d65971bbe6528fe3246e3260b424e9fa6760eed933a58e9cf2e5df9b8458835d420660735ac43dd54b4d5
 AUX gnome-vfs-2.24.0-uuid-mount.patch 2452 BLAKE2B 9607e8f7641799dbb46e29bfd7623815fa4066685b10d2cb232e556998f76970097d1bda65554c8c85961e729c269b8a7a6210f2532605cbf7cd16c501444574 SHA512 f66dbba17937b2b1b00aed3804d0b927cd65a2f462853069e62d7973d3f3d88c2a0a2d153e1c95c27ecdf363ff0530f0e8d9849e7b168815ca3f1ad0baf98b96
 AUX gnome-vfs-2.24.4-automake-1.13.patch 840 BLAKE2B fcdd3d1728f95b5b30246fa7471819d00ac2f689d957b665dbd16f2c84ec2e4afb4e2bfac9ca3d3eda4cd42be84c58402aacab1a7e2a503cf9802b5fce5001d7 SHA512 88e9ef1ff7cb513d576fa8d6441ff10c5072f277aef65f107c4f742690db9a4ebee0c986c3773d2055538c771672de84c3d08435cb1f8329dae633db395ae639
 AUX gnome-vfs-2.24.4-build-tests-asneeded.patch 632 BLAKE2B 21ff1b1b0d077f43e15989944c337f94b0ddaf5d69cc966d248404fd19afe2dd3a24eb589fff040a4993ed9f4da3692fda81851c0da4342ba89cee0bded387a3 SHA512 e9afd45ccbe6552daedc20403a0ea892a3dbf039439acc1bcabbecdcac57e808828a83076a6a29492ac74fa81b3f47a02b9d9d2a2387e445b03c8bf4f96e3bab
@@ -10,7 +10,7 @@ AUX gnome-vfs-2.24.4-disable-test-async-cancel.patch 689 BLAKE2B e09b96510144b96
 AUX gnome-vfs-2.24.4-gnutls27.patch 3235 BLAKE2B f6874c9edf48200bcfb7028ef64235fd902a94490995638add7118c1e34b88e197daeca96083cbb21725bb265f62612622b1f24039028baf61ab2dc0158d3ec4 SHA512 a17ea282f22e22c2390c3a53efab2c99a3fbb2ee370c0c1a19a477ff76bdeae483bf1886f09680681b824254c14a8a411470c95319c4f3d5a7775f4369935b25
 AUX gnome-vfs-2.24.4-gnutls34.patch 1624 BLAKE2B 9b29ee3e95ad79f31a9d4adc494aa6b0587a85c308769238607be5a7284a2dfdf13cf33ae14a35624596414af1383a5fa9c647076c016fc6e86942ed8352bc8e SHA512 adbbe966be3f7193c838794fc8a8949433377c6730c55ed152c345858b4da3f97f5c372d6b4555814ea10f5c65b52cb8a625563a0329604a9d61ce57b08de620
 AUX gnome-vfs-2.24.4-home_dir_fakeroot.patch 4996 BLAKE2B 9883ef67221c053df5ad2d3f70e3f7c3f1916660cb35dd82a0dc52008ffd1a780f685a7af82a2dda1ec25aae5d1f024322b3a8c20bd8d48227405d0c1c357b48 SHA512 dcad32f15afaa7677c6d10672c06c6d635a17d2bb686883c94f42bfc4f9fc6c525c4f097c3af718020fd224e06bba0d0a4ec68cde431545e9fe4a2c65320a48f
-AUX gnome-vfs-2.24.4-openssl-1.1.patch 839 BLAKE2B ebb91d34946354c2995a04b6c784be9cce1c93429d9ece7ac93c93795411d3c85ee8cf5ccfdfd53f15775df496ea83dfcd75d443d524442071e5412ca85aa307 SHA512 77c00b421f7026cf2ad3a05866ab9afb8cef78da3497604823c3eab1830475ad1a0d460b80f9599f579e7e789b9ef2b3a00887f6313148698a4ec4e4c98d3345
+AUX gnome-vfs-2.24.4-openssl-1.1.patch 802 BLAKE2B 0bc20796d79df2b720a7ef06139178cbafdd4dc765ed8721d1c0a7ff930b1cd3ecba3bee4b0b074b35b2812ccda0c895824d01296f7aa6212e606bf3af519d13 SHA512 7ec9cdf91d1f9bf51dcf97c47efade87829acd59642bb61c6defc6c7377dfef9e3b0bc8c07a6257e0b55e0184e28e429ff931fcccb48cf6486774916cc8152de
 DIST gnome-vfs-2.24.4.tar.bz2 1890370 BLAKE2B 696c8ce479de5a15660c9cc79eeb1abb6d69716f68558c7f791a3a44a7f1e9d09d9bc9adcca11dabd745f36a70222817b68888f3c56839add737b802aba0e7ac SHA512 db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581
-EBUILD gnome-vfs-2.24.4-r5.ebuild 4160 BLAKE2B dd177d40d9153c230fc2e5b8cb1a13189bab2e91b9871fd5275098fc6fc255d5693b3ad04135c198e7724063d3e037765192458a2284446cec224bc7d1ba6e20 SHA512 405c673b31bb04ad8f8a22ee733b73b138edeae60f338d8d5aa39baccdac74a147bc97444732442b04b0156e7a9545a6d6269bf61c23b7defa90e77bca6c1255
+EBUILD gnome-vfs-2.24.4-r5.ebuild 3962 BLAKE2B 5910dedd3b800ce7d4fe7fb29e8c9035f4cace1913b1e4891ae49d6cc26d96546ec13982842df1e785b877f7de8026163960c24a313c14124adc19931a406a0a SHA512 b8fde3245f45f888dde50ac77afb4ee03d901a2bd365103c001aecc1f90203ec5240318de696f1a36e267edb438a9e0fcddcc14f14f9d51bb670ebf8fd5ade11
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
index f74db8edb1cd..9d6e9978242f 100644
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
@@ -1,5 +1,5 @@
---- configure.in	2006-06-13 00:36:14.000000000 -0500
-+++ configure.in	2006-06-13 00:54:15.000000000 -0500
+--- a/configure.in
++++ b/configure.in
 @@ -191,6 +191,16 @@
  
  AC_CHECK_HEADERS(sys/param.h sys/resource.h sys/vfs.h sys/mount.h sys/statfs.h sys/statvfs.h sys/param.h wctype.h sys/poll.h poll.h)
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
index 876148b891f4..18d900ac12cd 100644
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
@@ -1,7 +1,7 @@
 Index: configure.in
 ===================================================================
---- configure.in	(révision 5413)
-+++ configure.in	(copie de travail)
+--- a/configure.in
++++ b/configure.in
 @@ -448,9 +448,13 @@
  dnl GSSAPI
  dnl Check for Kerberos installation
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
index 11ac34c07214..63be9f95b9dc 100644
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
@@ -1,5 +1,5 @@
---- configure.in.	2007-11-30 04:15:01.000000000 +0100
-+++ configure.in	2007-11-30 04:16:21.000000000 +0100
+--- a/configure.in
++++ b/configure.in
 @@ -1102,6 +1102,7 @@
  	    AS_HELP_STRING([--disable-acl],[Don't use libacl support]),
  	    [],[enable_acl=yes])
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
index 14207f28d19b..cb1886ef4a29 100644
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
@@ -4,8 +4,8 @@ struct SSL is opaque in openssl-1.1; and the SSL_free() man page
 says that one should not free members of it manually (in both
 the openssl-1.0 and openssl-1.1 man pages).
 
---- libgnomevfs/gnome-vfs-ssl.c.orig	2010-02-09 12:16:14.000000000 +0000
-+++ libgnomevfs/gnome-vfs-ssl.c
+--- a/libgnomevfs/gnome-vfs-ssl.c
++++ b/libgnomevfs/gnome-vfs-ssl.c
 @@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
  			}
  		}
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
index ace27c50d468..aba99abca80e 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_LA_PUNT="yes"
+EAPI=7
 
-inherit autotools eutils gnome2 multilib-minimal virtualx
+GNOME_TARBALL_SUFFIX="bz2"
+GNOME2_EAUTORECONF="yes"
+inherit gnome2 multilib-minimal virtualx
 
 DESCRIPTION="Gnome Virtual Filesystem"
 HOMEPAGE="https://www.gnome.org/"
@@ -39,7 +38,8 @@ RDEPEND="
 			!gnome-extra/gnome-vfs-sftp ) )
 	zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	sys-devel/gettext
 	gnome-base/gnome-common
@@ -48,6 +48,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.13
 "
 
+DOCS=( "${S}"/{AUTHORS,ChangeLog,HACKING,NEWS,README,TODO} )
+
 PATCHES=(
 	# Allow the Trash on afs filesystems (#106118)
 	"${FILESDIR}"/${PN}-2.12.0-afs.patch
@@ -90,15 +92,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.24.4-openssl-1.1.patch
 )
 
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
 multilib_src_configure() {
 	local myconf=(
 		--disable-schemas-install
@@ -141,14 +134,9 @@ multilib_src_test() {
 	unset DISPLAY
 	# Fix bug #285706
 	unset XAUTHORITY
-	Xemake check
+	virtx emake check
 }
 
 multilib_src_install() {
 	gnome2_src_install
 }
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-	einstalldocs
-}
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 9cb270df5fab..f3aaa98ab5f5 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,10 +1,6 @@
 AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec9844843793dc568e3012d3cd80c7a5f7a921e8dcc42406c6e15010fa472edf9cb10b7c86d1f8f69da2f6a3a034b7 SHA512 190129064554a36b56ba308f8dd75a9b8ee5ccfadffc0b5d528b5ba70324bcb3436acab116ad7768f59d316c3c2bd85dad9e8147050cb475b21fce439cb92705
-DIST gsettings-desktop-schemas-3.34.0.tar.xz 650468 BLAKE2B a275cd011c255531b293ccb875159ea4465c79852a3d1be2a03faafa8dbb6ba7137d72c7a59bce93b6ce5f187ebf92aca334dc3c51c8de5ee3af3092fc250fe5 SHA512 6cbe59facf77566ed93faabafc6b00ad03fb398a9a4686ba94a08b1c2d0df1d44bd673fb4d51340209a66ebc0aa32095615e7e63b78f4cc4c10d240a7b0a8fa1
-DIST gsettings-desktop-schemas-3.36.1.tar.xz 679788 BLAKE2B f49f98274f48cdb2eab0d3d94147cc0994245156999d5ed71adbbe4c949bb4da1ba230fe185938542b9854c77b6e0d7084d1919c26bf9939cd58baf4fcc8f129 SHA512 623a3759fe84cc5ea897043cc7c337a4f83302ebe5cfb9d214210a48e460e22b180518f5d768382ec18396bb2e86f22649dbc9b367a858e56b1ee8d2cab58fa8
 DIST gsettings-desktop-schemas-3.38.0.tar.xz 685868 BLAKE2B a5fe8baf6d7178cfba74c82974dfb854fbc2accfb9c98db2edbf46271b54626150a570fb3b578cdd86acfd1b21b432da0947e273c3ab94ec3f416c4a51b44e4a SHA512 5af7da90b8e7eec1c98e9e44653955f2882961dd9b5e2bf00e4eeb9f4f1149ae5171c600d457c6ab9c7482471c1a0e98f92f645a7ee7298e1b843c608f660756
 DIST gsettings-desktop-schemas-40.0.tar.xz 700672 BLAKE2B 5cc19d23e31a8ca7bd2344fa9392f11588b84c2641a6c0c2f184e733248d22c5603978408ccb13e58efac241beac8780c4a4f8c527b59fa3646cc18a18b09b90 SHA512 6b7f9b3095706b287254bd21d54311d6048e87340462e75848f05f7d7ded09da766cec7159fb6d889405ecfb4fdfe2243197989afeb21678fe4048783ae16424
-EBUILD gsettings-desktop-schemas-3.34.0.ebuild 1018 BLAKE2B 4a4cf4ac885691a18cd84cd6eb1914bee7c298559b8159256b6de4cc9ba89a6fbdaa9441724284c59eb07d63fc75a18db328c748b7df90aca75d4ab53d966f8a SHA512 ba32747ee607c3ee8cfb4ba431fd3f9e2ed16c591ce8e48304a55a79b0c6689ded833af4fd6b2851271c2f71cb0c0bb3c9d66d4b3aeed904fac9068c77af4332
-EBUILD gsettings-desktop-schemas-3.36.1.ebuild 968 BLAKE2B d539da134dd9ff1d8bd9ba4b014da693e481f1dfbce6ed4ce7e2ceb07d43b1370fc5866dc568b6d9485e419c65e12b41a0152286630f9e4a976a006fb33f3d5d SHA512 fb8c518b6c021ee7a56201f2d56119cde972fed10ef70ac1646fe021057c9e1ab795d33b1e8a0b0efc19b8fd3a6483c47101184b33a284131fd249dfc50f0a07
-EBUILD gsettings-desktop-schemas-3.38.0.ebuild 974 BLAKE2B 050adacd85722f42ce0a99efa3b85056f2073d8e2057ddf328878e685d55de45cac8f274aadb13f3be74eda179c09901d86de54210c87571a5a121447b44e8d3 SHA512 58e524868a4d936b965f54702c2d91f62197dcd2c0fd17b2f44e5d10145c9ce9087068fb6fdd7abc1a02d66501c62f4eb12bc224ef9dbfa6e5bd1b71f86574ee
-EBUILD gsettings-desktop-schemas-40.0.ebuild 976 BLAKE2B 312e511c06709ec8723e2598f504c508aef8b68c1ff4a2aa5f4677cfcc4d4d20e267d8cebd2522559d34bdca0d7fb8cdbeb2e963ff4d575c1a5345302e293851 SHA512 f76e88bcc0ba55707f58fa4dcb1376cfc730a6f3d28a8e5042e63584eb3618734e2e030114f3dbb8376eedffdbe3e6ead18e9c9efe1f53dd097d2220a68f9af6
+EBUILD gsettings-desktop-schemas-3.38.0.ebuild 969 BLAKE2B 22d630440c101cfa0543b986facb762b7e58614e730221a965b3a45b278eed7279db33f94d0384091be3c329498f8c6032a98198e99f6b96a1ff1a48b57331b7 SHA512 bff5d31a630148166c56c1841a8113c094f1d1dbd5123d90b98b82390c80c261757df80d583e9e4c3351a63ea1e49d9c7f49928fc03061868a97e88d953c2241
+EBUILD gsettings-desktop-schemas-40.0.ebuild 1119 BLAKE2B 356bdb14a0f74842625c52e8c7c7633ab6acab3ffbc437dfd1b52e38cdf0d3b03b941e3069bf848d2d15d821db2e6eba1df598892f6e5bcb52520f12dda27017 SHA512 70279584675b6664f89ef31c4d631fcf28c3744154b00af4cd446e69274c8638bfaad5f367bbd6067cf26c957721045f881ed5c4484b3bf11948c2b4c3114639
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild
deleted file mode 100644
index f096ec15dd5a..000000000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+introspection"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
-
-DEPEND="!<gnome-base/gdm-3.8"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Revert change to 'Source Code Pro 10' and 'Cantarell 11' fonts back to generic sans and monospace aliases
-	"${FILESDIR}"/3.32.0-default-fonts.patch
-)
-
-src_configure() {
-	meson_src_configure $(meson_use introspection)
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.36.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.36.1.ebuild
deleted file mode 100644
index a0350d3fe224..000000000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.36.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+introspection"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
-
-BDEPEND="
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Revert change to 'Source Code Pro 10' and 'Cantarell 11' fonts back to generic sans and monospace aliases
-	"${FILESDIR}"/3.32.0-default-fonts.patch
-)
-
-src_configure() {
-	meson_src_configure $(meson_use introspection)
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.38.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.38.0.ebuild
index 2e820a1526ca..26d730e77fa7 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.38.0.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.38.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
 BDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-40.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-40.0.ebuild
index 02aa7efa2db7..32ded1713c2d 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-40.0.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-40.0.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org gnome2-utils meson xdg
+
+PYTHON_COMPAT=(python3_{6..9})
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
 
 DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
 HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
@@ -17,6 +19,7 @@ BDEPEND="
 	dev-util/glib-utils
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
+	${PYTHON_DEPS}
 "
 
 PATCHES=(
@@ -24,6 +27,12 @@ PATCHES=(
 	"${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)
 }
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 4079da050f6c..ff3228ff3f4a 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,4 +1,6 @@
 AUX libplist-2.2.patch 985 BLAKE2B cfb16b82634dfde00af05d96e3b0561b6bcbd246369b3048f807fee14fcfefdf1f2a9a39afaba9237109c051eb60f16a28916ef26e9f63fa0bcfff7e5cdefad4 SHA512 f6a9c6a2744063495ca95bfd47807a0883835504356948797e6d7015783d7f3b2504ac9ea791435301d2b4c063ef5642c53e485192c0008e0242e1754e567085
 DIST gvfs-1.44.1.tar.xz 1222040 BLAKE2B 5a412395cf0edbdb78aea43eabd4fc0ec68f53b9f681cd6181b1c2ee09a01f90e024f75d44302eefdd9d3888512ec4fe672125eec3c79fe691d0f66dacde7bce SHA512 d936e70e6daa6a7494e5cc333a53afe82b601e34e2e54b207d9a4aefdc35dd068997832be750a6857144a48fa37065cb7e6b25378952007b06988ad07dfc6006
+DIST gvfs-1.48.0.tar.xz 1225852 BLAKE2B b1d9554183c1c79a02bd36f04399ee73ad6590b01e8a909c31fd6806f1929132e3146b24cd5caa9e0d703ac54861179c9bc7bb1021ffe263be90e2f833ed2738 SHA512 fe57da85c5e7b6dc8b2ffa69f5f8f1e45e307a05c787c5eee4afdfac82fd796ec9f319eb0615622f72286327cbb5d169abcf35c6d21d4f8293cbf70e2a941e17
 EBUILD gvfs-1.44.1.ebuild 3791 BLAKE2B 56e3b7e7446028a5a4a0b199841ac3ade5d503fcd3ff2f9a2685c050e1a6b58f833cbe4f9bad1c591a6f51ef085b8d4a5ed908c20d0fb3f90d72b786afe2533a SHA512 ce1a9b0fe6db91236466fbadfc70bb5d3d2278b4068e61881c9d3400ce25ba9b579e64adda07fd743544a83f48a6bbac3b7f9b11fa23b76d9d33eb83e610bb2f
+EBUILD gvfs-1.48.0.ebuild 3753 BLAKE2B 1351164a17e63d1a9985749734075eae87639d04d8df9dc7a2f52508c9d16ae62e70a9a530bd6279195ed4efea398ac4cff9f9bc9253e1a61c0112ea27ded5c5 SHA512 46a2c9afd17f51cb5bc813e43dce1d477dc2748f9e5b9dd3cff46ab7616b9495bca0e7f1f29b6d2243543c924c9f3de86f40159729682dea0b83d20e3d9b9dab
 MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7
diff --git a/gnome-base/gvfs/gvfs-1.48.0.ebuild b/gnome-base/gvfs/gvfs-1.48.0.ebuild
new file mode 100644
index 000000000000..11d31cbf7698
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.48.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Virtual filesystem implementation for GIO"
+HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
+RESTRICT="!test? ( test )"
+# elogind/systemd only relevant to udisks (in v1.38.1)
+REQUIRED_USE="
+	?? ( elogind systemd )
+	cdda? ( udev )
+	google? ( gnome-online-accounts )
+	gphoto2? ( udev )
+	mtp? ( udev )
+	udisks? ( udev )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.65.1:2
+	>=gnome-base/gsettings-desktop-schemas-3.33.0
+	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	sys-apps/dbus
+	app-crypt/gcr:=
+	policykit? (
+		>=sys-auth/polkit-0.114
+		sys-libs/libcap
+	)
+	http? (
+		dev-libs/libxml2:2
+		>=net-libs/libsoup-2.58.0:2.4
+	)
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+	udev? ( >=dev-libs/libgudev-147:= )
+	fuse? ( >=sys-fs/fuse-3.0.0:3 )
+	udisks? ( >=sys-fs/udisks-1.97:2 )
+	systemd? ( >=sys-apps/systemd-206:0= )
+	elogind? ( >=sys-auth/elogind-229:0= )
+	ios? (
+		>=app-pda/libimobiledevice-1.2:=
+		>=app-pda/libplist-1:=
+	)
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= )
+	gnome-keyring? ( app-crypt/libsecret )
+	bluray? ( media-libs/libbluray:= )
+	mtp? (
+		virtual/libusb:1
+		>=media-libs/libmtp-1.1.15
+	)
+	samba? ( >=net-fs/samba-4[client] )
+	archive? ( app-arch/libarchive:= )
+	cdda? (
+		dev-libs/libcdio:0=
+		>=dev-libs/libcdio-paranoia-0.78.2
+	)
+	google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] )
+	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
+	nfs? ( >=net-fs/libnfs-1.9.8 )
+	net-misc/openssh
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	test? ( dev-libs/libgdata )
+"
+
+src_configure() {
+	local enable_logind="false"
+	if use systemd || use elogind; then
+		enable_logind="true"
+	fi
+
+	local enable_gcrypt="false"
+	if use afp; then # currently HAVE_GCRYPT and linkage only used with afp; check it on big bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes
+		enable_gcrypt="true"
+	fi
+
+	local enable_libusb="false"
+	if use mtp; then # currently HAVE_LIBUSB and linkage only used with mtp; check it on big bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes
+		enable_libusb="true"
+	fi
+
+	local emesonargs=(
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+		-Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
+		$(meson_use policykit admin)
+		$(meson_use ios afc)
+		$(meson_use afp)
+		$(meson_use archive)
+		$(meson_use cdda)
+		$(meson_use zeroconf dnssd)
+		$(meson_use gnome-online-accounts goa)
+		$(meson_use google)
+		$(meson_use gphoto2)
+		$(meson_use http)
+		$(meson_use mtp)
+		$(meson_use nfs)
+		-Dsftp=true
+		$(meson_use samba smb)
+		$(meson_use udisks udisks2)
+		$(meson_use bluray)
+		$(meson_use fuse)
+		-Dgcr=true
+		-Dgcrypt=${enable_gcrypt}
+		$(meson_use udev gudev)
+		$(meson_use gnome-keyring keyring)
+		-Dlogind=${enable_logind}
+		-Dlibusb=${enable_libusb}
+		-Ddevel_utils=false # wouldn't install any of it as of 1.38.1; some tests need it, but they aren't automated tests in v1.38.1
+		-Dinstalled_tests=false
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	gnome2_giomodule_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+	gnome2_giomodule_cache_update
+}
diff --git a/gnome-base/libgnomecanvas/Manifest b/gnome-base/libgnomecanvas/Manifest
index 8b60bae3047b..7ee6c8e8666d 100644
--- a/gnome-base/libgnomecanvas/Manifest
+++ b/gnome-base/libgnomecanvas/Manifest
@@ -1,3 +1,3 @@
 DIST libgnomecanvas-2.30.3.tar.bz2 574139 BLAKE2B 25f42bdb24899aaf6b2daf19242ba67a4bdae9a51bffaddc413b65a48843ccea1de11e18a82cc40ddec566ab25bf133811f00a8e7667a66b228ad8c855a8773d SHA512 b5bfa2133f5172abd5228d467db4d980dd4ac125cdbf55dcc1d5055dc3330861320c12cccb52ea63ba7f69824504c9d25781cd78001dc7a92b11c6f7e0c550de
-EBUILD libgnomecanvas-2.30.3-r1.ebuild 1642 BLAKE2B e9d1e2e8cd9feabf9201430d3da48b016cd10f9349f7e9d0daae9ebcd45fdf1a9796bef5eb6d12d80bc8ebbd470fa023995f09085f93b3ec6f525eaaccb024ab SHA512 9e5f8b29ef99cbb8393592326a2e50238a762ef508f9b5a0b043f7dca09241ef418556389c1a904bc808c7dab06837582254c84439c13d024305905ee30aabae
+EBUILD libgnomecanvas-2.30.3-r1.ebuild 1491 BLAKE2B 2f64ad01de936e6a98bb990cde2b8876427197b6c864847d31d03ce8989a2d7fd50b509ed0926bf5227e105ff09dfb24ceedf6e4b5828c9b84d6cb5122b7b915 SHA512 724499943ad3077e31c376e4ed65ca5479c28ce42c60bf6d0681fb6880c55f10d646671b9acff78f32c4020567fabf2ad118038eaef0106886292e5b88b560cb
 MISC metadata.xml 310 BLAKE2B bd322cd2300711715469acaec5e2930542ea48dde8e3444d465c9dfc13dbaddbd49885ddf04a643c07d67d75316f080ca587083001a0dc33cfb15b38b9bf7c19 SHA512 15504f6f0f8ba8e905677b293df85f64ec929c96b22a81a57803c47657a0f054039a1257086c02af49ab89a57b16d31d32619ccdf1f53ac2de93ce8fc2f99c12
diff --git a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
index 0d55b4313bcf..5a262441623f 100644
--- a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
+++ b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_LA_PUNT="yes"
+EAPI=7
 
-inherit eutils gnome2 multilib multilib-minimal virtualx
+GNOME_TARBALL_SUFFIX="bz2"
+inherit gnome2 multilib-minimal virtualx
 
 DESCRIPTION="The Gnome 2 Canvas library"
 HOMEPAGE="https://library.gnome.org/devel/libgnomecanvas/stable/"
@@ -22,7 +20,8 @@ RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
 	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
 	glade? ( >=gnome-base/libglade-2.6.4-r1:2.0[${MULTILIB_USEDEP}] )"
 
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=dev-lang/perl-5
 	sys-devel/gettext
 	dev-util/glib-utils
@@ -54,11 +53,6 @@ multilib_src_install() {
 	gnome2_src_install
 }
 
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	einstalldocs
-}
-
 multilib_src_test() {
-	Xemake check || die "Test phase failed"
+	virtx emake check
 }
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 21b96af4d255..786a121b2af7 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,12 +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.48.8.tar.xz 15302184 BLAKE2B 7d44b58d894afbeff0cb4606ed64191c028e7ac9d987dd3248b90df4ae0c000ee47b02484116bf7ee6e7aad567b91df7a2aae6880514f5ddee3ef4826c2e828e SHA512 7b35afbbad17927168acb3a308bff59ea66e8e1ac18c2ab5626a7d494e90d87d2dc552959ad72974d3ed8ba4c2f919335cf9110a0d0a09148e606222e4fcee43
-DIST librsvg-2.48.9.tar.xz 15309204 BLAKE2B 2547f9eb2bb81c7c879356df0df674ba27a09e3b1f0eb8df99df7a9a9c5e6838e94e143f50a00a742a4fd7043c01b4f484cfa78c84c4d5e6ec281bde35fd98b2 SHA512 91fc480a9e9ff3755ed2685170a1fadea9232ab9a727a66da5085df09cd1a160cb8f443de7dec950799de5f4cb88b1ee33384107e316f573940147346c155a40
-DIST librsvg-2.50.2.tar.xz 16354004 BLAKE2B 485c14bf898fdcf2ad55cd6191eb5d315de73d02a34f15b528e36e64549f0eb2597b90d277c28d7d8d584b59c69f8eaa9f90820dcbaeb4a457d4ce1e2e2adf30 SHA512 f7e4990e1d74750246ec5816327c606607bb864ea7c44bce3ba9254a90b71692ed397e90343473d266f71eae3df7085c00e5a9a90b02d27ed6648e717d69fb45
 DIST librsvg-2.50.3.tar.xz 18868408 BLAKE2B 8b245a233ddd56137880e43f4da2df623237bb1ce2e143cee09da3fadc1edd9b3e4f4753fe48cf814d2372e532775573a34982a6cc88ace9be336e16ae473c20 SHA512 21710b6b5810b959679b7908aa371b8af02c85549efbc64f5fda01cfc3881539b5afc6bc304ce2289719dee48f583b1eb9867546e09f36941f81af968434e389
-EBUILD librsvg-2.40.21.ebuild 2534 BLAKE2B 6e6e0198086c44d870e7ee5201be265392ab1535004c38937aadcd0ceb463fad5df5a76800dea59c410e33f010fd7a2fd9f3a45e19b054aa2e65e3ab141a1e7a SHA512 28809d0b720ecba8f0d42fc81872387069efdd6a371beffbedf7b7363627d88dd7429bb12686d8321c786fe7f2780ed73498f273de8a394bc1bac839e06769ac
-EBUILD librsvg-2.48.8.ebuild 2498 BLAKE2B 770f88c182406f93348d4b3f0335440c10efc741c7da7ffb107ca6dc008861eb302845d25e9eca3755e2e141edd9aeadcb8663ae259e6486b2f25052cd8306cc SHA512 e4666afcdf0e26e1e26cb4f8c8580027acb6b2c1b349f9b37f02ebd7ed0da8d10b7ab7274a7b633975212938ec3c5311acbaf27c35b450d703a4fe175b78d015
-EBUILD librsvg-2.48.9.ebuild 2503 BLAKE2B 7a6c02b1c7d0b3e958a31704ba7b4b4f41edd3bc9984d40ddcd38bbd475d1942f6bd066d3358e2932aadf593016a74cd347ee64d555b98d105c862fe2221c8bd SHA512 d36c97083efd6971111221d8043cdc9072b0e3f838c5d438b410b612301b06abaa0bce9990b2eae6494734125bcb2e3065ab7467cce0f610e5cac7ac94a3bd53
-EBUILD librsvg-2.50.2.ebuild 2482 BLAKE2B 2f214798db1c31e71c73a8e9d7f6879518c779e176ea6d12d195ba9a06a3dbd7c8ecee89e4793ee09e1939daa26b95a0f1808f77e48cb3411027fe856bf9375d SHA512 4e93116a70a48892c81cfe5ad9a34f0f21d4819cb49d2825239c3fb390ca7140110f3eabcb2da505677faf5edcae0bed3fabb0ec20a9ad27b3c72dae0043afc4
-EBUILD librsvg-2.50.3.ebuild 2481 BLAKE2B 0bcc0783a9f13fa9fb3a11a91e2a04c8c23c0ef763500bb8d3f18ea6a28ddc507096c3b2a5ca4d4bf15ca67200eb63ee3912823914eb381e4da59a5934e53e38 SHA512 7e98d1c9d1ba7711e38991c08e2389ca7430c2a9134463d0d45bf13246541bd1812826d79852e39a4a516b54f96e13f92abe035166c03866c54e082e2d5915ca
+DIST librsvg-2.50.4.tar.xz 18954216 BLAKE2B 88467cf7b3a7382182f3a37887e9d05dbcb723464607707271491ca20cf7bedb890ec64e1a8c34ab136a23dbfe93dfd19fccbd194c4bd65868b07874c5070067 SHA512 5f476a663e1fa3297d699b1057622e72dbefdf9126ade97762288b7bc4e8a294936d008c889bcaf8e35f46d3b818f5317c63883df0043ec0f8aad18fa5feb4f3
+EBUILD librsvg-2.40.21.ebuild 2535 BLAKE2B fb7707a26b24f05ef9afe464f036d205e72243fe0b411ddc17b42a3f73bfd35e4a92b9236c12218d4bffb8edc825813f3b08cf164faf6cd1f96e689b76ac2970 SHA512 0ae92c01878ed45cd2da511bca6bcb86465723d3f71752168d5764b56d366544bc6bce1fce2d93ad497c901af8758db11bf3a53ad79389bcf54b16210bb18da2
+EBUILD librsvg-2.50.3.ebuild 2477 BLAKE2B d71d2e17becdfd6488d3b2554da7b4d9dc20b51bbc06f5966060e7830e1d7fe1a7b9504eaa0fccc6febdfa393d0fe5544cb78ac71ae70149ad8eda579c55ef1c SHA512 f218160d2fe021e25db50cf331a0949029b4e7150c3921911220d0be46e069344fbdbabea1a0aeb3e4caab87f608d5f6b7aa0637d6433e5cdc2294ec2afe8ff0
+EBUILD librsvg-2.50.4.ebuild 2556 BLAKE2B 88d30f78558fa54bfb8714d141b8c220188c5d04f39105f5c6ef8a76e5f64de473abeefcb24368142c974a05a7511da37675fda6261554f853b8bcc853ebec37 SHA512 49d98d235b48a2dd434557ae0a5c2f2042c0abb5ffe45888b65d71668e90b89ee546da2e284694eef69978be442fbe3d882ea66755af5238bdb80fbcceeabf26
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/librsvg-2.40.21.ebuild b/gnome-base/librsvg/librsvg-2.40.21.ebuild
index f16fab8717d7..8c57841ec7c8 100644
--- a/gnome-base/librsvg/librsvg-2.40.21.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.21.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha arm hppa ~ia64 ~mips ppc s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha arm hppa ~ia64 ~mips ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection tools +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gnome-base/librsvg/librsvg-2.48.8.ebuild b/gnome-base/librsvg/librsvg-2.48.8.ebuild
deleted file mode 100644
index bf7a18546644..000000000000
--- a/gnome-base/librsvg/librsvg-2.48.8.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-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 ppc64 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.38.0[${MULTILIB_USEDEP}]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
-"
-DEPEND="${RDEPEND}
-	>=virtual/rust-1.39[${MULTILIB_USEDEP}]
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	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
-		--disable-tools # the tools/ subdirectory is useful only for librsvg devs
-		$(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
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	multilib_foreach_abi gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	multilib_foreach_abi gnome2_pkg_postrm
-}
diff --git a/gnome-base/librsvg/librsvg-2.48.9.ebuild b/gnome-base/librsvg/librsvg-2.48.9.ebuild
deleted file mode 100644
index 44a8879352b7..000000000000
--- a/gnome-base/librsvg/librsvg-2.48.9.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-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 ~ppc64 ~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.38.0[${MULTILIB_USEDEP}]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
-"
-DEPEND="${RDEPEND}
-	>=virtual/rust-1.39[${MULTILIB_USEDEP}]
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	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
-		--disable-tools # the tools/ subdirectory is useful only for librsvg devs
-		$(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
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	multilib_foreach_abi gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	multilib_foreach_abi gnome2_pkg_postrm
-}
diff --git a/gnome-base/librsvg/librsvg-2.50.3.ebuild b/gnome-base/librsvg/librsvg-2.50.3.ebuild
index c61a81468086..16df4997c2e0 100644
--- a/gnome-base/librsvg/librsvg-2.50.3.ebuild
+++ b/gnome-base/librsvg/librsvg-2.50.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 
 IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gnome-base/librsvg/librsvg-2.50.2.ebuild b/gnome-base/librsvg/librsvg-2.50.4.ebuild
index 04ae4816f37a..4834d74bd38f 100644
--- a/gnome-base/librsvg/librsvg-2.50.2.ebuild
+++ b/gnome-base/librsvg/librsvg-2.50.4.ebuild
@@ -81,6 +81,10 @@ 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
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 172a263df3b3..8768bb50fc3c 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,5 +1,7 @@
 AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e894049df2dfdebf75f0f519eb715aba5bd590f4b57a718f78238ee50242215ef2b648fd3e3e8e8dddebc2ff1b45be2 SHA512 3a0925262643eb84d4c1731cad6b3c2c427def000503a3a680b06b68828f53492b4367d02ac6de36c35b6460e3d0967e3ce26203f8257271b222883990047459
 AUX 3.32.3-optional-gstreamer.patch 1592 BLAKE2B 5c0326638ed4c2714fe72e460256bd01cfad547c6455e1ec3e0273550d5f16e7ddf2e32e4928b7d45e1ea877625fce5a8ea3171d67f5c87359a9ddc2944fe9cc SHA512 40bcbbad8ad7d831e7af0659a710af0f378e8aaafff89f764528f577dcb78d96d38af475112bcd4c615d5c78249955c31ce196bcbebd590bdeb6f52127ce3a3a
 DIST nautilus-3.36.3.tar.xz 3201908 BLAKE2B ec7be7ad523e29c853a1a16dd6381257bd7f7af0004d4b84a9ef13539f5c8ea431c61f819eee6c0d396037846d390ae112b3fe2771276cde6128e7fad95eb4f4 SHA512 4dce01c20a34ed9bbff53a9886775af431754d02a4300e4647d87830502103e7436e53127b2e503af8e3a90785aa864514dbde22508ffb3e06eb43d4633fddde
-EBUILD nautilus-3.36.3.ebuild 2858 BLAKE2B e6336c2c17144faa3823282c48a43af4fd8788b6ff343e1c7985d01640e12b0d4d25cd66de66ec6dd1125bb841be3d5a9d28ef60dae0afd63158fdbedfe8c12d SHA512 04b09cfad516cbc709883467cfee1ffec1f1e63596b3e62c3628c2a4b9613fef7f534862055b8e4cf3570f4840381966b9822fe6397a7b180f981e32fde80e0c
+DIST nautilus-40.0.tar.xz 3250800 BLAKE2B e57381d7f9b9e6884e4f22f3c3d78c931d197b78f0f139457bf141ffdfebe646ddeb2d280a1d2b38124b8d8199323983ea48631d98843a49d125b7be49eb5989 SHA512 700a18b27da28608d247c046dcaddb3114cd0648e077ef0a0be3eba6f1e3623720224610aa92c1513a84a0ef91bae7b18e3624de9c2c1495544d260635688e5f
+EBUILD nautilus-3.36.3-r1.ebuild 2860 BLAKE2B 17c13ce67218c0a10f794b623da816fde335cac0e93ee1b94491914c1781dc994611d6647501538a088cb4958dc42c746c67761a1dde9dfbd77968c06ddbaad2 SHA512 d239ab9e46bc153d5c78893c8518f8aa16866e33997d692edf49eb466419bacd08604b13086af1c147b1a1091d8a6459c21c87ca2e5ebcd1944b3e9562d580fc
+EBUILD nautilus-40.0.ebuild 2864 BLAKE2B 2b81ebced534fef40fe73aaf5128179ba6bc5688ae6ba20d15b96b5b5b4dd6ccdf22a36da3232aa53f65f6c903d737faf91165fb00e98e452ec31139b672575b SHA512 9dddb6eb1d267d8bd27f15fc8d1d4c60340b5c7749a75483ac44d353d362be5ce8c6af0c38803f6b0bc82f2c8e7ad8a752cdce63a54c293fae81f9109d4d16df
 MISC metadata.xml 553 BLAKE2B 51c14fbccc3b060cb5fac644a8213672250edb2c2092076bb4e0c390bfc8562a950fd362ae4294ac1215e774fcd4dd4de6c709b126c04fa705cf10be0e6e836f SHA512 77102dd05a5180dffca7ef03d66e3d0dc113f272e583da442027a94cb4e9fc67f0c267d9f2d5d0a4ef895d58604aed78fbe01c19b3f018972ff675d392786b7c
diff --git a/gnome-base/nautilus/nautilus-3.36.3.ebuild b/gnome-base/nautilus/nautilus-3.36.3-r1.ebuild
index b5a2eac88414..a3243bd2afb7 100644
--- a/gnome-base/nautilus/nautilus-3.36.3.ebuild
+++ b/gnome-base/nautilus/nautilus-3.36.3-r1.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 	>=x11-libs/gtk+-3.22.27:3[X,introspection?]
 	>=x11-libs/pango-1.28.3
 	selinux? ( >=sys-libs/libselinux-2.0 )
-	>=app-misc/tracker-2.0:=
+	>=app-misc/tracker-2.0:0=
 	x11-libs/libX11
 	>=dev-libs/libxml2-2.7.8:2
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
@@ -32,7 +32,7 @@ DEPEND="
 RDEPEND="${DEPEND}
 	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
 	gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
-	>=app-misc/tracker-miners-2.0:=
+	>=app-misc/tracker-miners-2.0:0=
 " # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
 BDEPEND="
 	>=dev-util/gdbus-codegen-2.51.2
diff --git a/gnome-base/nautilus/nautilus-40.0.ebuild b/gnome-base/nautilus/nautilus-40.0.ebuild
new file mode 100644
index 000000000000..e98afa90e786
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-40.0.ebuild
@@ -0,0 +1,106 @@
+# 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 ~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/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
+		-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() {
+	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
+}