gentoo resync : 31.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
commit: e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree: 23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /gnome-base
parent: 908778078736bd36f7a60a2d576d415cb8e000fa (diff)
67 files changed, 41 insertions, 3119 deletions
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index e23cebc7ffe6..c99c1e337156 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 cdf0ca5be2e1..3c458dbfb028 100644
--- a/gnome-base/dconf-editor/Manifest
+++ b/gnome-base/dconf-editor/Manifest
@@ -1,5 +1,3 @@
-DIST dconf-editor-3.36.4.tar.xz 583084 BLAKE2B 7d7f5164a4917d13372a2bcf7f9fe7b82d630693601bba33da1c4f3afffa58e4589ff90c3e5ca3039351a681eac6584b335171f4dce9d0bfedaed52cc25d505c SHA512 a24fa44830fb0e83834cf912267de6597c1d6bf02e063af4255409d3c9a135fae409116d91751d00ee8d2319e7130606f007af76d3ec9f1380cda98ab2329eff
 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.3.ebuild 815 BLAKE2B fbf3b2d7bb3ff10b97694dba3e70462f74e317809838b5bda6531b6fd272e21171f56b543f2066120f159ca7f49483cd8e5718da611315c866968525b8087a4e SHA512 2ff25d1dff9ff62fe2d25f2cf93c6b68d561fbfe8ca635f73061671b10f03e0e9e776c6af90238763f236e6cdffda0add928f83e0aa04b818b7d85c45ac97e04
+EBUILD dconf-editor-3.38.3.ebuild 813 BLAKE2B e9c8f6cc651d3afbc5cbb0a70bca9337fd48806ee1974ab54e07e03d35ceabf3433582db1d9291b3da568f9795aaf314d478e9db410c80c83a973831c44fa8ae SHA512 64a3de273ff80e28374779334030bf729231001ffd404ef709691a49d95795139df9c6414b21b2a3380d09922ac3b84ce1f0e1c822c9a96a6f02cd380a89fd69
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf-editor/dconf-editor-3.36.4.ebuild b/gnome-base/dconf-editor/dconf-editor-3.36.4.ebuild
deleted file mode 100644
index 6e9c891bb893..000000000000
--- a/gnome-base/dconf-editor/dconf-editor-3.36.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Graphical tool for editing the dconf configuration database"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/dconf-editor"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-linux"
-
-RDEPEND="
-	>=gnome-base/dconf-0.26.1
-	>=dev-libs/glib-2.55.1:2
-	>=x11-libs/gtk+-3.22.27:3
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(vala_depend)
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild b/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild
index a1530c400860..5c60da6b466c 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/dconf-editor"
 LICENSE="GPL-3+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 
 RDEPEND="
 	>=gnome-base/dconf-0.26.1
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index 322aac94e0cb..0ec660381c92 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -1,8 +1,6 @@
 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.40.0-bash-completion-dir.patch 3029 BLAKE2B 6695d75088c96060b0b0a34f928d8db9b06528d97ff3fe44b5911ef1c04b1a68aa807eea507213e316283db8b1d73218255e12c378aafb3fc920ab39d3f092b4 SHA512 4fead302c92327787f26b0001ced07dcd176abbc5142119a19be0b48893d777f1cfc4559f37a37a5c589221cb2c81f1627626371d8a3ad58bb8c542806ac7b87
-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.36.0.ebuild 2105 BLAKE2B e37e0693baa534e3b680939a0bd7f372ece3aae28b968fd79c8be76716da92768a0877fd99a8f0d9a5e70ab2727d45502aaac3d8fede0cec89721c1a5dec162a SHA512 eabe8cb200cef20d2c481541a7b29a8996f1d4370a8147a5ade2083f0c17e6af76b7777aefa8a5c253231435c0b85632e1c7338cc0e0f73bb8488dad36429a28
-EBUILD dconf-0.40.0.ebuild 2170 BLAKE2B 268f0db3b8cb8124bb2b5c9e9d66a5bf26807b3dd9dcd0221d1a4196049a514b9d53f10af1608bb5628a9ff99bb23a4fb8f009d8ff1393e8104c8acd436b879d SHA512 6798b88f00a2cfcc1b098d1f401a579a32131224663e6f235677a81810750914ec1b1695ee72f5d248681064999b888e1e75590a54bdff6b753145708cbaae84
+EBUILD dconf-0.40.0.ebuild 2163 BLAKE2B 7f95013433f387b6774e6a0b520317e2b60cbc45e3fd44c50dbba55fdfd7cc199c8984c071e079109f181e46cbaaf8250d1f23707d13e561b853ccbc3f7be79e SHA512 d19ccc44411a2c75ecaec1673103e77d441ab12dd32f08766511c477568ddbf8b130cb344b3b3a0d97fbcb9bfc57741a165f93f8b53edeb60958497bcfbd11d8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf/dconf-0.36.0.ebuild b/gnome-base/dconf/dconf-0.36.0.ebuild
deleted file mode 100644
index aa94127feb70..000000000000
--- a/gnome-base/dconf/dconf-0.36.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 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 ~riscv ~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
-)
-
-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.40.0.ebuild b/gnome-base/dconf/dconf-0.40.0.ebuild
index d0515385aa74..ceacf61216f5 100644
--- a/gnome-base/dconf/dconf-0.40.0.ebuild
+++ b/gnome-base/dconf/dconf-0.40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-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/gdm/Manifest b/gnome-base/gdm/Manifest
index 42f04394678c..5ec58f18cb1a 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,16 +1,12 @@
 AUX 49-keychain-r1 193 BLAKE2B e4653256b9a0a23be84286d25278d2addf464cc541d43f57a33ed0390b562d03acf7f9d8510ad1b09d4a3736d2bb2a323f5fcc473014b6f351abb5bee71a419b SHA512 32a6d72de9b6b7bfbac0a563fc8710576419e6d989fe48da294b92b197722059ee0e46672d5df2833cd1a7dacf5ae4ebc31b12b605416fd25a0924c35e505d21
 AUX 50-ssh-agent-r1 255 BLAKE2B d197daa7db7da3fc667e5bd561d2edf46b484365130a2d72259c4a2f316ec3af957599cd2c755f7e517ff32ed59e068d1dbcd47da6961534668786403590ff20 SHA512 85c8eca948646508ecc52a30a15b94c626196037ab65b4d797df472df34c714aacf800261902febda5b7bc051bff29efc9fff474a0c029838881b7f8704b13ba
 AUX default.pa 328 BLAKE2B 558dbedcb5a0f31e0bdc01ce21deaeacb4740dee998f8b2f947361745ea6680acf8662e426adf1d3f777af714c2fb7cf5ec74b2807187c37e2d8d896e863fa0d SHA512 4f0e9c38ae0c17b8f4ee6e37b87259676c4ff4e62fd315989c9e20012a8070c5b5571f835379639f76f157530495928cdc79265473478b1d9fe6d8ad0d64785d
-AUX gdm-2.32.0-xinitrc-ssh-agent.patch 842 BLAKE2B 98233eaf06fbe0950aa36bbc8bee2ac7ffa3cdebe75e32b8ef9a5035c383135bfc77e201d2ee07e7ec6b53770bef20484a3fba93b1cd7f434253704b70563e38 SHA512 40630ec2e7bee66102e141a0ba4d02e4202d052bb829606f684b6c23c9f3dbc2d43cea71d7eba163398251af2d7c7b34d0abafee76ccd6400521551de1c385bd
 AUX gdm-3.30.3-logo.patch 846 BLAKE2B e99b6621191c509545bc36fe838bc467c3762f2726e247aea1b3cad2a86c0b0e95c5f9953b680a072d244140615c38becbc605998a2be0ed3332d7b5ef802f55 SHA512 63428d4605d9f4f35445f364657c1d92818125a737add7bc5e5acab424beaf8ae5895368111cd2d1c03c75f5fd8b9538d8750ea732a0990b5b82507735850e4c
 AUX gdm-3.8.4-fingerprint-auth.patch 923 BLAKE2B e681da8518ed1d002c1205658bb35e472e9d130df5d70dfd9eef55f5361cffeee716ebe0eea23f4c19f9f6ec2f4118729616f7f4e2c758990cf7cde3271cc8b2 SHA512 3cf5f9c0eabdae3f767d9b9db6052d760e879c14b9304753cdda56a4f643a9ed97f3ea83f642bfe96d220c8e9e4f99fbbd47c6e99ddfebeb6322a3a033c296d5
 AUX gdm-40.0-meson-Fix-libwrap-detection.patch 772 BLAKE2B 7910f76af46d7541da9547182fe14202f3bff0e771fcb248a7f16718b675532d2b24fa109aa8ad68936c008e680717efe9ed1b785e46a520132d745ce3c85fae SHA512 cb690b9c07d61b610705454d676d5b0f9c544d299d2b890c7ae7c4b9b7cb061c02be1805d61e845d2415677333040f2ffd10f48a60725fdb149dacf8ea36dc92
 AUX gdm-40.0-meson-allow-building-with-elogind.patch 8801 BLAKE2B 358abc6b4a81523f53f6551af3c976916492c6c80fcacf8ec7c6fd90683558f1e7d898b749bdb458b2379e8a96f08293bbbebee3b8fc9126ebf249a95c514b41 SHA512 6116047fe51f0daf99de7e369028629fff88890c9627407648f2bec312df9b8b94f1ccb9b7015347258444f8193da16c6209a41de9441c848097670a13b4a7ef
-AUX gdm-CanGraphical-wait.patch 5534 BLAKE2B 3be217b156ab6d486d7df98885934c5d1bedd6219a25a83cba687aa1ed59f6d0f2a16694a47050313e601355696095ccc738ac639f5958d9619db81d34efe068 SHA512 2152e800051473b8fd230c4b325d72229cfe91dce3e90ad6d8ace8e3278483ab05ce683e61c183f7c83e293873f69715740b1eccfdb34d6775140c635c73b5dd
 AUX pam-elogind.patch 835 BLAKE2B 1db26b690d631c152ae7fd84149c7ff3222e8bd258bff78e09cd6f00fe34a8bfdb2499b252a1f15e17d9e4ed315e02260357b57cd31cf8ada5a2705ba1ef4ee0 SHA512 4d2d65741a5bfd1dc686dc986708526161d15ace2d5396bef281a2192d95458a072764483e1422ed1f6eb594fc0caa6baa381371618f907a97f75566209fab7b
-DIST gdm-3.36.4.tar.xz 1235796 BLAKE2B eeac6c3c95993d7a75eecd03b51f0519b2f899eaecce8767dbab01eead68bddde21edc999eaf6b7ce747084ac9f88ab71cd7bf602e3bdc5bfe09038e3b01ad3a SHA512 ee8a4ae4a1c4846e4d52fda0b115dfc79ef76b78a2349977767e4212910b5ad331b908601f252292a8a944973372d1dce3124d9ccb8a2519a98d0e4813a6ec61
 DIST gdm-40.0.tar.xz 800296 BLAKE2B 9c2038758cec09f13c18bd79d431e82a29fb1a2b8ab099498a0b8d920cb93896abceab9157edae8cc15312e03d21eb36b649c2cc8761f9af5fec387c5f28a261 SHA512 b20d02f8a80f6aff8909a69c6c621c20c5aa1b25cfedd68bf95faaaa56d5f7cd5d607d1a7388b97aa06510684f1e9e474248042a00203f496c39930e001bb64c
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gdm-3.36.4-r1.ebuild 7221 BLAKE2B f7f2be3915981750964e0152c486be3bf327aea4d6cbc0ecab787f2f8bc4e9237d75397af7dfee8ab599d14e07edb50a67fc3127bd4f93291e18e55acb1372f8 SHA512 1263adc59538cea24da345c80ea3e3caf90c7840a7ec0ae85d665b9d0018570578845967e16793f2ca28792669ef57a19c62bcadf4611c2fe95f8a4803149244
-EBUILD gdm-40.0.ebuild 5893 BLAKE2B 5c9ffc89742c04e29c9e08fb18a291172a1d1ed93e4ccf5bea5572a48df974d194625c8f74e04aa88f4cc92db613e05987224235c4e895e23a0791dcb1d61ff6 SHA512 730634dff1cbe52e693aa6dfc9216418fe8edf2b8bda90a160fef141c13ea63a52ad98ae0abe1e2648ec1dca1b439db93d651fb11e701be3fb384728f4c3d4f7
+EBUILD gdm-40.0.ebuild 5890 BLAKE2B 73e44b3e931b81c11c955d21fa4d3412e749d2ffebbbd982cf85e132b5dbed79107050b96f362630f46094a2a89ec4a36a881db006a77ed9d3639ff560d0fc3c SHA512 3e72f56a5073b205f488a5692429508f73375d370021ce7b3bc5b0ef384f17c3dddf70977b6c97c58b3d1817c969ac0a4e60e0d2253d76289465616a3c8891da
 MISC metadata.xml 759 BLAKE2B 13de28afc8fe81580a2aa28c5fdc17c77266595ffe95218cfbb5cbee4cbd6edab21e8cd06698e4a5feeb696fd9530ef8bf14209ecf3d03039b4e0562bb757375 SHA512 68cec6972bcabcb873fb314babbf9bdfacc7eaae40d662d11662fccd6cbf6630cd93b7322baa271081244c77fd1458c89ad785a0eb2a58b448ddff663381d98d
diff --git a/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch b/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch
deleted file mode 100644
index bfd8398af2b3..000000000000
--- a/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c0581264d5e2b412aa27dc30623512b461024e4f Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 2 Nov 2010 23:19:31 +0100
-Subject: [PATCH 2/4] ssh-agent handling must be done at xinitrc.d
-
-Gentoo bug: #220603
----
- data/Xsession.in | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/data/Xsession.in b/data/Xsession.in
-index 201be92..88f1fd9 100755
---- a/data/Xsession.in
-+++ b/data/Xsession.in
-@@ -191,14 +191,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
-     done
- fi
- 
--# add ssh-agent if found
--sshagent="`gdmwhich ssh-agent`"
--if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
--    command="$sshagent -- $command"
--elif [ -z "$sshagent" ] ; then
--    echo "$0: ssh-agent not found!"
--fi
--
- echo "$0: Setup done, will execute: $command"
- 
- eval exec $command
--- 
-1.8.5.1
-
diff --git a/gnome-base/gdm/files/gdm-CanGraphical-wait.patch b/gnome-base/gdm/files/gdm-CanGraphical-wait.patch
deleted file mode 100644
index 206219d8e059..000000000000
--- a/gnome-base/gdm/files/gdm-CanGraphical-wait.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From 198d6392ff595f330430d92d5c380cd993be73d7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
-Date: Tue, 16 Oct 2018 20:59:23 +0200
-Subject: [PATCH] gdm3.service: wait for drm device before trying to start it
-
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdm3/+bug/1794280
-Forwarded: not-needed
----
- configure.ac             |   1 +
- data/Makefile.am         |   1 +
- data/gdm.service.in      |   1 +
- utils/Makefile.am        |   9 ++++
- utils/gdm-wait-for-drm.c | 101 +++++++++++++++++++++++++++++++++++++++
- 5 files changed, 113 insertions(+)
- create mode 100644 utils/gdm-wait-for-drm.c
-
-diff --git a/configure.ac b/configure.ac
-index a8dcfbef..2755c100 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,6 +76,7 @@ PKG_CHECK_MODULES(COMMON,
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-unix-2.0 >= $GLIB_REQUIRED_VERSION
-+        gudev-1.0
- )
- AC_SUBST(COMMON_CFLAGS)
- AC_SUBST(COMMON_LIBS)
-diff --git a/data/Makefile.am b/data/Makefile.am
-index 162074f1..5f426fea 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -204,6 +204,7 @@ systemdsystemunit =
- gdm.service: $(srcdir)/gdm.service.in
- 	$(AM_V_GEN)sed \
- 		-e 's,[@]sbindir[@],$(sbindir),g' \
-+		-e 's,[@]libexecdir[@],$(libexecdir),g' \
- 		-e 's,[@]GDM_INITIAL_VT[@],$(GDM_INITIAL_VT),g' \
- 		-e 's,[@]LANG_CONFIG_FILE[@],$(LANG_CONFIG_FILE),g' \
- 		-e 's,[@]PLYMOUTH_QUIT_SERVICE[@],$(PLYMOUTH_QUIT_SERVICE),g' \
-diff --git a/data/gdm.service.in b/data/gdm.service.in
-index 57d60ada..f7630ec4 100644
---- a/data/gdm.service.in
-+++ b/data/gdm.service.in
-@@ -30,6 +30,7 @@ StandardError=inherit
- EnvironmentFile=-@LANG_CONFIG_FILE@
- ExecReload=/bin/kill -SIGHUP $MAINPID
- KeyringMode=shared
-+ExecStartPre=@libexecdir@/gdm-wait-for-drm
- 
- [Install]
- Alias=display-manager.service
-diff --git a/utils/Makefile.am b/utils/Makefile.am
-index babe890b..3eb43c30 100644
---- a/utils/Makefile.am
-+++ b/utils/Makefile.am
-@@ -35,6 +35,7 @@ bin_PROGRAMS = \
- 
- libexec_PROGRAMS = \
- 	gdm-disable-wayland	\
-+	gdm-wait-for-drm	\
- 	$(NULL)
- 
- gdmflexiserver_LDADD =		\
-@@ -63,6 +64,14 @@ gdm_disable_wayland_SOURCES =	\
- 	gdm-disable-wayland.c	\
- 	$(NULL)
- 
-+gdm_wait_for_drm_LDADD =	\
-+	$(COMMON_LIBS)		\
-+	$(NULL)
-+
-+gdm_wait_for_drm_SOURCES =	\
-+	gdm-wait-for-drm.c	\
-+	$(NULL)
-+
- CLEANFILES = 			\
- 	$(NULL)
- 
-diff --git a/utils/gdm-wait-for-drm.c b/utils/gdm-wait-for-drm.c
-new file mode 100644
-index 00000000..aeffb3c0
---- /dev/null
-+++ b/utils/gdm-wait-for-drm.c
-@@ -0,0 +1,101 @@
-+#include <glib.h>
-+#include <gudev/gudev.h>
-+
-+/*
-+ * Workaround for LP: #1794280.
-+ *
-+ * That bug is because the DRM device isn't ready by the time GDM tries to
-+ * start wayland/X.
-+ * This is a script to add to ExecStartPre of gdm.service. It does the
-+ * following:
-+ *
-+ * 1. Enumerate drm devices from udev, looking for a DRM master. If found,
-+ *    exit.
-+ * 2. Connect to the 'uevent' signal of gudev, watching for the same to be
-+ *    added. Again exit if any are found.
-+ * 3. If, after 10 seconds, we haven't seen anything, try to proceed anyway as
-+ *    a failsafe.
-+ */
-+
-+static gboolean
-+handle_device (GUdevDevice *device)
-+{
-+        const gchar * const * tags;
-+        tags = g_udev_device_get_tags (device);
-+        g_debug ("%s\n", g_udev_device_get_name (device));
-+        if (g_strv_contains (tags, "master-of-seat"))
-+        {
-+                g_debug ("    is seat master\n");
-+                return TRUE;
-+        }
-+
-+        return FALSE;
-+}
-+
-+static void
-+uevent_cb (GUdevClient *client G_GNUC_UNUSED,
-+           gchar       *action,
-+           GUdevDevice *device,
-+           gpointer     user_data)
-+{
-+        GMainLoop *loop;
-+
-+        g_debug ("uevent action: %s\n", action);
-+
-+        loop = (GMainLoop *) user_data;
-+
-+        if (g_strcmp0 (action, "add") == 0)
-+        {
-+                if (handle_device (device))
-+                {
-+                        g_debug ("        this is good\n");
-+                        g_main_loop_quit (loop);
-+                }
-+                else
-+                {
-+                        g_debug ("        this is bad\n");
-+                }
-+        }
-+}
-+
-+int
-+main()
-+{
-+        const gchar * const subsystems[] = { "drm", NULL };
-+
-+        g_autoptr(GList) devices = NULL;
-+        g_autoptr(GMainLoop) loop = NULL;
-+        g_autoptr(GUdevClient) udev_client = NULL;
-+        g_autoptr(GUdevEnumerator) enumerator = NULL;
-+
-+        loop = g_main_loop_new (NULL, FALSE);
-+
-+        udev_client = g_udev_client_new (subsystems);
-+        enumerator = g_udev_enumerator_new (udev_client);
-+        g_udev_enumerator_add_match_is_initialized (enumerator);
-+        g_udev_enumerator_add_match_subsystem (enumerator, "drm");
-+
-+        devices = g_udev_enumerator_execute (enumerator);
-+
-+        g_debug ("enumerating devices...\n");
-+
-+        for (GList *l = devices; l != NULL; l = l->next)
-+        {
-+                g_autoptr(GUdevDevice) device = G_UDEV_DEVICE (l->data);
-+
-+                if (handle_device (device))
-+                {
-+                        g_debug ("        good enough for gdm\n");
-+                        return EXIT_SUCCESS;
-+                }
-+        }
-+
-+        g_signal_connect (udev_client, "uevent", G_CALLBACK (uevent_cb), loop);
-+
-+        /* after 10 seconds we try anyway */
-+        g_timeout_add_seconds (10, (GSourceFunc) g_main_loop_quit, loop);
-+
-+        g_main_loop_run (loop);
-+
-+        return EXIT_SUCCESS;
-+}
--- 
-2.17.0
-
diff --git a/gnome-base/gdm/gdm-3.36.4-r1.ebuild b/gnome-base/gdm/gdm-3.36.4-r1.ebuild
deleted file mode 100644
index 26581e5d1fa3..000000000000
--- a/gnome-base/gdm/gdm-3.36.4-r1.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF="yes"
-
-inherit desktop gnome2 pam readme.gentoo-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
-HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
-
-SRC_URI="${SRC_URI}
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="
-	GPL-2+
-	branding? ( CC-BY-SA-4.0 )
-"
-
-SLOT="0"
-
-IUSE="accessibility audit bluetooth-sound branding elogind fprint +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}
-	acct-group/gdm
-	acct-user/gdm
-	>=gnome-base/gnome-session-3.6
-	>=gnome-base/gnome-shell-3.1.90
-	x11-apps/xhost
-
-	accessibility? (
-		>=app-accessibility/orca-3.10
-		gnome-extra/mousetweaks )
-	fprint? ( sys-auth/fprintd[pam] )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=gnome-base/dconf-0.20
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( >=dev-libs/check-0.9.4 )
-	app-text/yelp-tools
-" # 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
-"
-
-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
-
-	if ! use bluetooth-sound ; then
-		# Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10
-		# bug #679526
-		insinto /var/lib/gdm/.config/pulse
-		doins "${FILESDIR}"/default.pa
-	fi
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm
-
-	use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	local d ret
-
-	# bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm
-	ret=0
-	ebegin "Fixing "${EROOT}"/var/lib/gdm ownership"
-	chown --no-dereference gdm:gdm "${EROOT}/var/lib/gdm" || ret=1
-	for d in "${EROOT}/var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do
-		[[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1
-	done
-	eend ${ret}
-
-	systemd_reenable gdm.service
-	readme.gentoo_print_elog
-}
diff --git a/gnome-base/gdm/gdm-40.0.ebuild b/gnome-base/gdm/gdm-40.0.ebuild
index 9d7deda12a19..d183a083441c 100644
--- a/gnome-base/gdm/gdm-40.0.ebuild
+++ b/gnome-base/gdm/gdm-40.0.ebuild
@@ -23,7 +23,7 @@ IUSE="accessibility audit bluetooth-sound branding elogind fprint ipv6 plymouth
 RESTRICT="!test? ( test )"
 REQUIRED_USE="^^ ( elogind systemd )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 
 # dconf, dbus and g-s-d are needed at install time for dconf update
 # keyutils is automagic dep that makes autologin unlock login keyring when all the passwords match (disk encryption, user pw and login keyring)
diff --git a/gnome-base/gnome-common/Manifest b/gnome-base/gnome-common/Manifest
index c9ea72aadbee..d85094d8447f 100644
--- a/gnome-base/gnome-common/Manifest
+++ b/gnome-base/gnome-common/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-common-3.18.0.tar.xz 155804 BLAKE2B 5e5dbccf1851f45e2890e2fcced1be5630dd378bb22448e38ff7988a18145bfa90dee03a64a4ba4ff9d22ea6fd812e9f02a1ee1f9656b4d47201afc174d69229 SHA512 b931c9a6668d996560549738bb2d95f86f56fa68ce930c077275bdc8fddbc2d28d215c1190099db1df851417902fca87ec81f1c0e644c5b9630a175e1cde0719
-EBUILD gnome-common-3.18.0-r1.ebuild 591 BLAKE2B b0ec6783a08e59ed102ae38255f0522c1ee29dcdc087f1d23fcbe59e8c82aa3cc8455ddd314628b1ae2176b25c2eaf296df0249c58af01609a232d30421d2846 SHA512 164518ea98278e26bb39f7716ab8aab264ae7274ade597c401e58a499db6504eda5e5c84986f4268b558c71ecef1830cde56361d13d511a43606037ef6ac954a
+EBUILD gnome-common-3.18.0-r1.ebuild 598 BLAKE2B 665b54f72b6df4a888b8758c74de05ac7d7d65a4d4623365450f66add984432388102a5e5cb5e99fc1d9e814bae7f8b8ade7cf4de265687cc6874a1060e421f7 SHA512 dbd4dfb63e88f9f91b00a5255478260ae81d1773c37542e917081bfc205496e11e8e0a973ad375ec1b1444d8ca9ae41b098e623824f198d143a90d7a6a06825d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild b/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
index b42aa6fad3be..3b97fbda242f 100644
--- a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
+++ b/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-common"
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=""
 DEPEND=""
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index c1b64042fbac..67a3a32b3385 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,7 +1,4 @@
-DIST gnome-control-center-3.38.3-patchset.tar.xz 7308 BLAKE2B 72acdb825d48c7077d15f7273765db2ccbef89a839466a4482d9f6ae9eae3a2144556a048f2a6e146ea4e3435c13f0a72bf499c44d34bcbed505d6186d8bf008 SHA512 2498abd83e0100efa4c83886ce3e7f7d4468e41aab12c5338987832cb305c215abe75b4fff65217511bbe174b6b1b601af988c5588523e0346855aba7842092b
-DIST gnome-control-center-3.38.5.tar.xz 6435648 BLAKE2B 6bcb91433540278850008b1a015caa157fede8533fc5fdf22b58a9f7511fe39a9c3dc195ed9aa1fcf729b6eaa2cf18cf67781300d43ed23ea63c3c6fc5cfb64f SHA512 d173dc863bb62010577a99c3f6705fd92c7e1b9fba124c7ab7fb32b22e01b23b75dea976b45e8d65e7329edca50fb892fe298e8ca2861c7e1185318b7be6cb67
 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 6233 BLAKE2B 7d06f6d961e8367715ec6d4beefd5d8dd9f897284622f0b1b9f6b72513b2b88de3718e83a90e7b1d39be614d888eada6733fc696da102351445bfeb5f1ca801d SHA512 84c08843d2c9bd4132ebe09251133b85d3a94058cc0411bd2d716007ca1ff88a7f7ac20f217a7bd4370c2d9dcf7b8396a2616e07603f3bf4933d0563cf697b6f
-EBUILD gnome-control-center-40.0.ebuild 6227 BLAKE2B 875bb965acf17a64c15f946cea57c60d4042a16144a06a34ed93e1ca33469ff5055fb3093b01f37935ad63777acb105772c19ef5049bcbc326854977993996d7 SHA512 b1a9159697da2e35fea3b4497ff27d6047facc8cb128851a2a4c5c5b948cf0157616b77376b92d5c781423ad9d9a6b89d44029cb97b5fa58f91afa85c1fe85d6
+EBUILD gnome-control-center-40.0.ebuild 6224 BLAKE2B 65f353674dfa9c3c3f44733fee69182ac27de6c98bd12ef3b3858e86e8eafc4922d696ae629b42edb3f256ac17849d123faa93b4d4f4b8e5820d17283359e9b1 SHA512 0b57e5852eaf2abaa183904a1b613295b91b190d124c4be2b69cf7b7700dd53889a6dc45e469c052ecda5dd46ac2d59233d8f45c55d7c5100349008e38b85b01
 MISC metadata.xml 588 BLAKE2B 6fb4fefc43b162c8ac2a671ed7a6878ebe19edeaf018bb37f32a0c0aa6208b8cb68392b24fde56e1aaf5227756b157fbfa10470c350bb472c270ac7436827ff3 SHA512 d2891d89abf4a64e97ab84ed45e45b4115ebb1990b2ef8a91f069433a61aea4d97d060376e088aec5e9aec7475c0263ac072f081cb5f0c3d67206ed077051e1d
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
deleted file mode 100644
index ec38c3aa368b..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.38.5.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://gitlab.gnome.org/GNOME/gnome-control-center"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.38.3-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-40.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild
index ec98dee7de56..72edc90cc8d2 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-40.0.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-core-apps/Manifest b/gnome-base/gnome-core-apps/Manifest
index 55313ff8fd53..ada17d80ed23 100644
--- a/gnome-base/gnome-core-apps/Manifest
+++ b/gnome-base/gnome-core-apps/Manifest
@@ -1,3 +1,2 @@
-EBUILD gnome-core-apps-3.36.5.ebuild 1584 BLAKE2B 1b8d8373462487462edfbaa58f762223680662c2a2a442096a0fca951dee1beeaa26c50563051cc1b26d023c79c32d949927c2f2bf25cd2f0493766e852e4ca0 SHA512 7e9040f1b9e3afc6984b718b33b5362ab0286a14b770cc4b285e7baab681d3e0e48d20944b6b14c18a8db7a947cef7b6bbf7feb9a6823f67651262463479669d
-EBUILD gnome-core-apps-40.0.ebuild 1562 BLAKE2B 341268f162d6f0b765e0072fed79ab80bda8a3301d9f02a5f0071dbd01ad12ce5174e2a6af214c833bdee2a109895e4c60c7f6c03db219bf1e40002fee5f971e SHA512 fff02ae543560e7ba569ca3ae5b341e428b5b1d02a57a96bf7dc68d61862289f16d3596c109994d122ad289f09d840e00a49702c0992d5bb5eea993e4c8a5417
+EBUILD gnome-core-apps-40.0.ebuild 1560 BLAKE2B 3d9c0fe21a3dbc03efcdf66480c8fb2d82322232f0168307a247a7df70521b5250018083c383dd7a93ec17cbfbe40712773174f47dc8b3ff091ec977704e1ae7 SHA512 8f3ae5d58822269a8f114c3d4e7d9ecb687299f1850da87587bb8702d8d04b6ecc5c5197f82508221a7251035b6ab43a3c972b1cf4bf63e77d89d8683fa24d1b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.36.5.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.36.5.ebuild
deleted file mode 100644
index 50b9c89a208b..000000000000
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.36.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Sub-meta package for the core applications integrated with GNOME 3"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="+bluetooth cups"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-# gnome-color-manager min version enforced here due to control-center pulling it in
-# tepl min version for gedit deptree
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-
-	>=gnome-base/gnome-session-3.36.0
-	>=gnome-base/gnome-settings-daemon-3.36.1[cups?]
-	>=gnome-base/gnome-control-center-3.36.4[cups?]
-	>=gnome-extra/gnome-color-manager-3.36.0
-
-	>=app-crypt/gcr-3.36.0
-	>=gnome-base/nautilus-3.36.3
-	>=gnome-base/gnome-keyring-3.36.0
-	>=gnome-extra/evolution-data-server-${PV}
-
-	>=app-crypt/seahorse-3.36.2
-	>=gui-libs/tepl-4.4.0
-	>=app-editors/gedit-3.36.2
-	>=app-text/evince-3.36.7
-	>=gnome-extra/gnome-contacts-3.36.2
-	>=media-gfx/eog-3.36.3
-	>=media-video/totem-3.34.1
-	>=x11-terms/gnome-terminal-3.36.2
-
-	>=gnome-extra/gnome-user-docs-3.36.2
-	>=gnome-extra/yelp-3.36.0
-
-	>=x11-themes/adwaita-icon-theme-3.36.1
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.34.1 )
-"
-DEPEND=""
-BDEPEND=""
-
-# cdr? ( >=app-cdr/brasero-3.12.2 ) # not part of gnome releng release anymore
-# >=gnome-base/gnome-menus-3.13.3:3  # not used by core gnome anymore, just gnome-classic extensions
-# >=net-im/empathy-3.12.12 # not part of gnome releng core or apps suite anymore
-
-S="${WORKDIR}"
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-40.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-40.0.ebuild
index 355bf69f66cd..57bdf7fdf126 100644
--- a/gnome-base/gnome-core-apps/gnome-core-apps-40.0.ebuild
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-40.0.ebuild
@@ -11,7 +11,7 @@ IUSE="+bluetooth cups"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 # gnome-color-manager min version enforced here due to control-center pulling it in
 # tepl min version for gedit deptree
diff --git a/gnome-base/gnome-core-libs/Manifest b/gnome-base/gnome-core-libs/Manifest
index 110f406176a6..7e3f6d77c50f 100644
--- a/gnome-base/gnome-core-libs/Manifest
+++ b/gnome-base/gnome-core-libs/Manifest
@@ -1,4 +1,2 @@
-EBUILD gnome-core-libs-3.36.4.ebuild 1200 BLAKE2B 253e0eb8d7b0423cb355782c60aaa290aa705c9967e36fa56eae2b7efee18347fb55e2940e2e3c9e2382c9fd283d28f6b23aa15d5f1cb1b0673bbe993c7ed6d5 SHA512 853ec992b8dd413136b9df8f771d396a004616f1697a306f2f1576f9d41798999ebeb120cc68ffcf0a222f619ed72b1b7cdfda4a6fa2dac41a48c8651b80deaa
-EBUILD gnome-core-libs-3.36.5.ebuild 1079 BLAKE2B 1bed6dc604cda0c81981d74436c9534b4b0c73c4c77998520b9d3f91e3a513c735bfcb18cd5724ad63da6afcbb6200cac70032fb729594b8d363301c2232d8ee SHA512 1d0b8a22a4791bd36bb41df685f18b608197623ab93109126d01555188b044b8fc2035838b7a1c9e82a8e50ff77317616909307ad54405f98d8c2d29605b47bf
-EBUILD gnome-core-libs-40.0.ebuild 943 BLAKE2B b208b4e038f0f538dd69e48dcbc2fab1593bde09b486c323410be9cc1584ad83a0d18bd82052574efbde3521567aca720f527aad31dcdfe08fbeab18949bbabf SHA512 736dcfced7e5ad245f345b830fc7ca5829f718c2fa8c9e64939e857bd5828440f58f295865c3d45f0fa54efcf0934cffe4659fdda428001147d28732e5b62c48
+EBUILD gnome-core-libs-40.0.ebuild 941 BLAKE2B 6e341bc7876cc793fdf26f4408aa5620d75dc38b681a2446eb0a7ad80517a22047e8a2bfaeb6ca64040645daa5c478b6da82bbdd0ffd934b42d9fd7d12c88775 SHA512 01f03ac05af152f4e09c413987932c0b57187ca5f7370141310f03491874ffd62da6fca3a6a37e2f9ad22ec78297653ccb9a47793cd3e59bd0bdeb0d248d7069
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.36.4.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.36.4.ebuild
deleted file mode 100644
index 670bb8c4194c..000000000000
--- a/gnome-base/gnome-core-libs/gnome-core-libs-3.36.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Sub-meta package for the core libraries of GNOME 3"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="cups python"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# Note to developers:
-# This is a wrapper for the core libraries used by GNOME 3
-RDEPEND="
-	>=dev-libs/glib-2.64.4:2
-	>=x11-libs/gdk-pixbuf-2.40.0:2
-	>=x11-libs/pango-1.42.4
-	>=x11-libs/gtk+-3.24.21:3[cups?]
-	>=dev-libs/atk-2.34.1
-	>=gnome-base/librsvg-2.40.21
-	>=gnome-base/gnome-desktop-${PV}:3
-
-	>=gnome-base/gvfs-1.44.1
-	>=gnome-base/dconf-0.36.0
-
-	>=media-libs/gstreamer-1.16.2:1.0
-	>=media-libs/gst-plugins-base-1.16.2:1.0
-	>=media-libs/gst-plugins-good-1.16.2:1.0
-
-	python? ( >=dev-python/pygobject-3.36.1:3 )
-"
-DEPEND=""
-BDEPEND=""
-
-# >=x11-libs/libwnck-3.24.1:3 - not used by core packages anymore
-# librsvg kept back on non-rust version; should move on at some point for non-exotic arches.
-# pango kept at 1.42 for now due to bitmap fonts and incompatibilities
-
-S="${WORKDIR}"
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.36.5.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.36.5.ebuild
deleted file mode 100644
index c124ce3f35a7..000000000000
--- a/gnome-base/gnome-core-libs/gnome-core-libs-3.36.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Sub-meta package for the core libraries of GNOME 3"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="cups python"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-# Note to developers:
-# This is a wrapper for the core libraries used by GNOME 3
-RDEPEND="
-	>=dev-libs/glib-2.64.4:2
-	>=x11-libs/gdk-pixbuf-2.40.0:2
-	>=x11-libs/pango-1.42.4
-	>=x11-libs/gtk+-3.24.22:3[cups?]
-	>=dev-libs/atk-2.34.1
-	>=gnome-base/librsvg-2.48.8
-	>=gnome-base/gnome-desktop-${PV}:3
-
-	>=gnome-base/gvfs-1.44.1
-	>=gnome-base/dconf-0.36.0
-
-	>=media-libs/gstreamer-1.16.2:1.0
-	>=media-libs/gst-plugins-base-1.16.2:1.0
-	>=media-libs/gst-plugins-good-1.16.2:1.0
-
-	python? ( >=dev-python/pygobject-3.36.1:3 )
-"
-DEPEND=""
-BDEPEND=""
-
-# >=x11-libs/libwnck-3.24.1:3 - not used by core packages anymore
-# pango kept at 1.42 for now due to bitmap fonts and incompatibilities
-
-S="${WORKDIR}"
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-40.0.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-40.0.ebuild
index 19884503d8c2..c7fe9bc465d9 100644
--- a/gnome-base/gnome-core-libs/gnome-core-libs-40.0.ebuild
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-40.0.ebuild
@@ -11,7 +11,7 @@ IUSE="cups python"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 # Note to developers:
 # This is a wrapper for the core libraries used by GNOME 3
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 9a4cf71937a1..ad570948e477 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,8 +1,4 @@
 AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c0265f34d5d0fd555ae60a519273512021cf4f065db1e22ab72ce9004a914a47d077551b5a12ffbd5e81a9b8cf098a4762a0e461d SHA512 ea76e41aff067281497b98c86b66d8c382124ceead5b18e729342615a50b6aa3401f4d7c5553023b5d78ca0ea02823c7d6026ba9acca862804351269e4107d18
-DIST gnome-desktop-3.38.4.tar.xz 745168 BLAKE2B 1d85b176acb6721fb21bc56eef552629a06b059117cc53a5dde9c2c74ae23f624701efed3849e8e7daf21c1fd7622b747b394b6c63ab974371daec14bfb8d9ce SHA512 546fd2bd25d7582ae6cc6aa2beab4221fd246d16640e7d3f0cf9b700732f67a95c4bcb3211b5cb131f151b25923d59aa1ffa114183b6fcb683ad88cb94790e1e
-DIST gnome-desktop-40.0.tar.xz 721628 BLAKE2B ff89b8f4a284f63ee4c8b87f5b26542dabec13a4dcd75424f91acb21877699a5077d27bf4c618ea5e2c4cbd97570003c048296e24a8684021fb589238c09dfdf SHA512 faf6fd2a0c5db47a49319c03ca9a348d77092050cdd8d79a74979b2878d0e35ffa85bbe5e87449f9285ceb28a884439de6eb73d6b9fcaa02236eb48f4a7ac49c
 DIST gnome-desktop-40.1.tar.xz 721416 BLAKE2B de1432a9ee61fa0545ce09c1228a133555d732ea58b9550a1f218726342d4c4e1c9d30f402b62a6a370cd281302c47f820f8bccbd69f8b8651f77e4b0e8d4f66 SHA512 ff9da5d0c805a7d42339a9174b907dd0cc4845c8eeb5a004a13f001dbe449f28a6360ed9dc1951376be4a48271908990052ca0e8d6e4339214cafcb80d204b57
-EBUILD gnome-desktop-3.38.4.ebuild 1924 BLAKE2B 126f3efd5c9f0b87e60ddfbd1e13667c38411e29ac17895a0ced69b16ddaf57de2a3bb995992b493e3e668806dc3f462e7277f0326246db88c2bdbfaa5b9dd3a SHA512 6d220eed8b4061734bb2ca1bf2470b8669368fe45071a05c8103d33d5dbfb6636b4337694b18993bac77e149458c237f39d8e84e8f3a46e1a03e55f31b13b73c
-EBUILD gnome-desktop-40.0.ebuild 1950 BLAKE2B 8fe295cc9783c308c77d371d374cce48596c6582d64afe5a49a98c19fbb342fde1d9110b472c02ade8126334684be1029d0ac2e913a65d5a2bab70b1a41c1e99 SHA512 961cbd1337b0b36f881f5500ccb03712ebcf70d284b11ceeba3fafbb6a6d0737f9514a4017fe06c31623e4a40aa101f5990c60f7f4188d911ba0b43325957dd3
-EBUILD gnome-desktop-40.1.ebuild 1950 BLAKE2B 8fe295cc9783c308c77d371d374cce48596c6582d64afe5a49a98c19fbb342fde1d9110b472c02ade8126334684be1029d0ac2e913a65d5a2bab70b1a41c1e99 SHA512 961cbd1337b0b36f881f5500ccb03712ebcf70d284b11ceeba3fafbb6a6d0737f9514a4017fe06c31623e4a40aa101f5990c60f7f4188d911ba0b43325957dd3
+EBUILD gnome-desktop-40.1.ebuild 1947 BLAKE2B 8b2233b157b3b50cb779149e18d46a14b5f2d4c6492f10d55767e4bc444bbc9bbf0b2eadbb10b8333b02675ffa2931ead810343f99b1ae5efa7adf71f45f89e6 SHA512 fe87b2876286c3d550bc9d353c5b347dc99d5a8f261e09514885798cb796ce2ec8917dd9652cd65631bd00e34d67da42a5bdd4c0c58ddfd2a0bdc6e1fc49b5b2
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.38.4.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.38.4.ebuild
deleted file mode 100644
index 706a013f6ea9..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.38.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Library with common API for various GNOME modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
-SLOT="3/19" # subslot = libgnome-desktop-3 soname version
-IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
-	>=dev-libs/glib-2.53.0:2
-	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
-	x11-misc/xkeyboard-config
-	app-text/iso-codes
-	systemd? ( sys-apps/systemd:= )
-	udev? (
-		sys-apps/hwids
-		virtual/libudev:= )
-	seccomp? ( sys-libs/libseccomp )
-
-	x11-libs/cairo:=
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${COMMON_DEPEND}
-	media-libs/fontconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	seccomp? ( sys-apps/bubblewrap )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
-
-PATCHES=(
-	"${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
-)
-
-src_prepare() {
-	# Don't build manual test programs that will never get run
-	sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgnome_distributor=Gentoo
-		-Ddate_in_gnome_version=true
-		-Ddesktop_docs=true
-		$(meson_use debug debug_tools)
-		$(meson_use introspection)
-		$(meson_feature udev)
-		$(meson_feature systemd)
-		$(meson_use gtk-doc gtk_doc)
-		-Dinstalled_tests=false
-	)
-	meson_src_configure
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-40.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-40.0.ebuild
deleted file mode 100644
index b42b6b81c1b1..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-40.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Library with common API for various GNOME modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
-SLOT="3/19" # subslot = libgnome-desktop-3 soname version
-IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
-	>=dev-libs/glib-2.53.0:2
-	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
-	x11-misc/xkeyboard-config
-	x11-libs/libxkbcommon
-	app-text/iso-codes
-	systemd? ( sys-apps/systemd:= )
-	udev? (
-		sys-apps/hwids
-		virtual/libudev:= )
-	seccomp? ( sys-libs/libseccomp )
-
-	x11-libs/cairo:=
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${COMMON_DEPEND}
-	media-libs/fontconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	seccomp? ( sys-apps/bubblewrap )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
-
-PATCHES=(
-	"${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
-)
-
-src_prepare() {
-	# Don't build manual test programs that will never get run
-	sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgnome_distributor=Gentoo
-		-Ddate_in_gnome_version=true
-		-Ddesktop_docs=true
-		$(meson_use debug debug_tools)
-		$(meson_use introspection)
-		$(meson_feature udev)
-		$(meson_feature systemd)
-		$(meson_use gtk-doc gtk_doc)
-		-Dinstalled_tests=false
-	)
-	meson_src_configure
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-40.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-40.1.ebuild
index b42b6b81c1b1..e42379bab2e0 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-40.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-40.1.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-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest
index 082e6423d171..5046e2ee83b1 100644
--- a/gnome-base/gnome-extra-apps/Manifest
+++ b/gnome-base/gnome-extra-apps/Manifest
@@ -1,3 +1,2 @@
-EBUILD gnome-extra-apps-3.36.5.ebuild 2553 BLAKE2B 183df2f88696323dcd316fac7e2cfffff1fa84349eba83a454865c777ae0b64effe01fcde98f07a450d378a57c079d60223c555f702a90a3a9534565a2d06dd7 SHA512 e69151df382331a3cee869ee72477d8767aa43a0896e4badaf999162593bda82f8d7677191ec0bdfdf854f48888198c5ae4b272380818e05d574981547320af8
-EBUILD gnome-extra-apps-40.0.ebuild 2505 BLAKE2B 5a84851ecd0a6805e7e7d6666aa176aeef74a42560102dd7b4383187d400d7b0de213168bfac3542359d8938841248239d1e7c2ae07aa758420a33de242480c1 SHA512 6c72898f23042db0bea1cddb254ae7a6bb9fe0a2a62f170f764a0242a2f95fd50a017b2b3b6c01f7a7bde612fdde2259ca520f57f76b254fe0bbb1efc8d29bb4
+EBUILD gnome-extra-apps-40.0.ebuild 2503 BLAKE2B 6109b188c736226dd89eb0aa90e013edba3685b35d7f1b0b1480415c3008b605061ab1b518dc0fdae41008751fe89bed76d2c0a8d8ece31ed65ecee278d6aa85 SHA512 b4c823d0c81c3de925ba1f2b5fd1a6ecf55c08077b5da9688ef8b8aaea63dc8b22b81eea7f6311d2da1f10b1c6a61481be77db451deb48c1e74a876f778d7624
 MISC metadata.xml 617 BLAKE2B ee89ac320ee9fa2c6a29d3d8b86df05a734781bfb5e538f9f84a85c9467672901713d94347acbef958c8c5733f9a0a07f0b008bf84f2daa2df5390bf8225eb66 SHA512 d91641939c20487a6ba4cfc0c55b6bdf7ba6315b63b8a045976bb9367c6001f9feea9c206ac522cf47efbd5267205e45c29b3ad5ce6189fd1a02f4d993a036be
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.36.5.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.36.5.ebuild
deleted file mode 100644
index ce080dd492df..000000000000
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.36.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Sub-meta package for the applications of GNOME 3"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="+games share +shotwell +tracker"
-
-KEYWORDS="amd64 ~arm64 x86"
-
-# Note to developers:
-# This is a wrapper for the extra apps integrated with GNOME 3
-# Keep pkg order within a USE flag as upstream releng versions file
-# TODO: Should we keep these here: gnome-dictionary, gucharmap, sound-juicer, vinagre; replace gucharmap with gnome-characters?
-# TODO: Add gnome-remote-desktop as replacement for vino that was removed from meta in 3.36?
-# gnome-documents removed for now, as it didn't find a good place upstream and is getting dropped from default sets for distros for 3.30 (and for 3.26 it required newer tracker than we had at the time)
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}
-
-	>=sys-apps/baobab-3.34.1
-	>=media-video/cheese-3.34.0
-	>=www-client/epiphany-3.36.4
-	>=app-arch/file-roller-3.36.3
-	>=gnome-extra/gnome-calculator-3.36.0
-	>=gnome-extra/gnome-calendar-3.36.2
-	>=gnome-extra/gnome-characters-3.34.0
-	>=sys-apps/gnome-disk-utility-3.36.3
-	>=media-gfx/gnome-font-viewer-3.34.0
-	>=media-gfx/gnome-screenshot-3.36.0
-	>=gnome-extra/gnome-system-monitor-3.36.1
-	>=gnome-extra/gnome-weather-3.36.1
-	>=gnome-extra/gucharmap-12.0.1:2.90
-	>=gnome-extra/sushi-3.34.0
-	>=media-sound/sound-juicer-3.24.0
-
-	>=gnome-base/dconf-editor-3.34.4
-	>=app-dicts/gnome-dictionary-3.26.1
-	>=mail-client/evolution-${PV}
-	>=gnome-extra/gnome-tweaks-3.34.0
-	>=gnome-extra/nautilus-sendto-3.8.6
-	>=net-misc/vinagre-3.22.0
-
-	games? (
-		>=games-puzzle/five-or-more-3.32.2
-		>=games-board/four-in-a-row-3.36.4
-		>=games-board/gnome-chess-3.36.1
-		>=games-puzzle/gnome-klotski-3.36.3
-		>=games-board/gnome-mahjongg-3.36.2
-		>=games-board/gnome-mines-3.36.1
-		>=games-arcade/gnome-nibbles-3.36.1
-		>=games-arcade/gnome-robots-3.36.1
-		>=games-puzzle/gnome-sudoku-3.36.0
-		>=games-puzzle/gnome-taquin-3.36.4
-		>=games-puzzle/gnome-tetravex-3.36.4
-		>=games-puzzle/hitori-3.36.0
-		>=games-board/iagno-3.36.4
-		>=games-puzzle/lightsoff-3.36.0
-		>=games-puzzle/quadrapassel-3.36.05
-		>=games-puzzle/swell-foop-3.34.1
-		>=games-board/tali-3.36.4
-	)
-	share? ( >=gnome-extra/gnome-user-share-3.34.0 )
-	shotwell? ( >=media-gfx/shotwell-0.30.10 )
-	tracker? (
-		>=app-misc/tracker-2.3.4
-		>=app-misc/tracker-miners-2.3.3
-		>=media-gfx/gnome-photos-3.34.2
-		>=media-sound/gnome-music-3.36.4.1 )
-"
-DEPEND=""
-BDEPEND=""
-S=${WORKDIR}
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild
index 4c3b07cd0a2f..080f0126dc1c 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild
@@ -9,7 +9,7 @@ LICENSE="metapackage"
 SLOT="3.0"
 IUSE="+games share +shotwell +tracker"
 
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # Note to developers:
 # This is a wrapper for the extra apps integrated with GNOME 3
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index a706d51e1e6a..34f2c9c6e283 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,5 +1,3 @@
-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
+EBUILD gnome-keyring-40.0.ebuild 2240 BLAKE2B c79a2de4457666987941707a1fe784b504d2fe820661650039e22cf420597d239f8f6939233d7fb2198e5e537d7eb79cf298fb2448439acd6d4375271c9177e9 SHA512 3994d2754c8738f0630a88dad84a7ac62d0ded284c098173324361bb7224f387c1973e9f724b86875bb3cb6fcc1dab1379f228553d58f5256c6af0d3ef896d43
 MISC metadata.xml 883 BLAKE2B 6d253b088319b1f442d91e0372751ce3ddd0516bbd3e72242e4541837c6c6bfe83371a5c47a7be73fad6046be5f053aa6c6fb41d884111ac53cd4de3cb0d1381 SHA512 31d506051c1353e1e4dd987e5ccd39281d19f6ae08974a09bd8145218c7209588629a79c6baad9ff1b83358a699f46fddb8c4ec51da73efe26be2d5e7f0a905a
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
deleted file mode 100644
index 2b8bab601a2d..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 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} )
-"
-PDEPEND="app-crypt/pinentry[gnome-keyring]" #570512
-
-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
-	 "${EROOT}${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-keyring/gnome-keyring-40.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild
index 000f89b856a6..3f1a2d876e2b 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 # Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
 RDEPEND="
diff --git a/gnome-base/gnome-light/Manifest b/gnome-base/gnome-light/Manifest
index 759e56eddd2f..21cf1e427fd0 100644
--- a/gnome-base/gnome-light/Manifest
+++ b/gnome-base/gnome-light/Manifest
@@ -1,4 +1,2 @@
-EBUILD gnome-light-3.34.4.ebuild 2060 BLAKE2B 1b60f2198f285e4c5bf9682aec0cf2bffcd95e349c0e24cc82b1b3f16be506c4322c1acf1d5d63c53b6256f5f4bb256da67133f53ce0affbb49ed30b97b2cbbb SHA512 5593d45f556ad1761cc8039c0b2a412485f1bd5eeec4df6bbd69afe11e3215a7d6adc52aad0757f4c6fdab49568ebf1a7d882f48cf4191f7dbe2f46b443bf7fa
-EBUILD gnome-light-3.36.5.ebuild 1970 BLAKE2B 3628cecef747f82e43c8ff4c2628713b805fcaa7f6ce25c6550cadb77cbd67536e3007e5bf5ddf40144a6d762601c3bceb34c857f8a57e84d7399ff3ddc00cb3 SHA512 6b5480767373b839c74d4374f3c421e00fc6c01195b81bdf0e6ab4cbd6bfc8ac89118f09f7b01c11836abed9ba7baf9b9f7c99ac4767d701f108d981923cef51
-EBUILD gnome-light-40.0.ebuild 1717 BLAKE2B d4d0fab84f0a956b6e5b40cdb1ae985ecf1932dd817d872316ef1e795a5994d1cb541ae80f829791a29ba8f16a8712d057e1d224df36ce10da21cee91ef984df SHA512 b9e0eb6d3b53b93fc40bb9f457e78e8100fdec06d98ad12cd491a3a7957fdd08d0e80ede64337060ce144c44cac9bf3e41f3a47f4111c8e00ef591d147d7ec58
+EBUILD gnome-light-40.0.ebuild 1715 BLAKE2B af4325be2540b4967315522dd75e0269404d62643d4fa855562d741544c2439399a4160c82cf0156d20051035a4370f17f439a8cac6be0966056ba9c392df5c7 SHA512 2b10405f256fcbb8d7e62056396ae3466d5fd9f47a067234b167277ac84388da0cb41ac61f88380be91de1fee0f554f7b131715395cd85cbfc119d1b7e72d85d
 MISC metadata.xml 406 BLAKE2B 562a281deb064ec0aa74ffebe4e38c864746809724acc4522df8c9cc0590d80937836923a029e521c5a0eec83adda11f169fa554e9760128408b78e87d916f26 SHA512 04875558c048cf102d8e5ffb17cb363808ca84c350f9b03958536cc5185cfd109b4653bbb4de202f47d092f8fc6d15173d3453a3bc62aa431b0c83cbb699a047
diff --git a/gnome-base/gnome-light/gnome-light-3.34.4.ebuild b/gnome-base/gnome-light/gnome-light-3.34.4.ebuild
deleted file mode 100644
index 71ed235e22cd..000000000000
--- a/gnome-base/gnome-light/gnome-light-3.34.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-P_RELEASE="$(ver_cut 1-2)"
-
-DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="2.0"
-IUSE="cups +gnome-shell"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
-
-# XXX: Note to developers:
-# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
-# the bare minimum of libs/apps needed. It is basically gnome-base/gnome without
-# any apps, but shouldn't be used by users unless they know what they are doing.
-# cantarell minimum version is ensured here as gnome-shell depends on it.
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-
-	>=gnome-base/gnome-session-3.34.2
-	>=gnome-base/gnome-settings-daemon-3.34.2[cups?]
-	>=gnome-base/gnome-control-center-${PV}[cups?]
-
-	>=gnome-base/nautilus-3.34.2
-
-	gnome-shell? (
-		>=x11-wm/mutter-${PV}
-		>=dev-libs/gjs-1.58.5
-		>=gnome-base/gnome-shell-${PV}
-		>=media-fonts/cantarell-0.111 )
-
-	>=x11-themes/adwaita-icon-theme-3.32.0
-	>=x11-themes/gnome-themes-standard-3.28
-	>=x11-themes/gnome-backgrounds-${P_RELEASE}
-
-	>=x11-terms/gnome-terminal-3.34.2
-"
-# adwaita-icon-theme kept back on purpose due to brokenness without rust librsvg,
-# in the hope that the old icon package version is good enough for everything too
-# until librsvg gets updated. This dep should be raised to 3.34 with 3.34.5 meta.
-DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.42.2"
-BDEPEND=""
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if ! use gnome-shell; then
-		# Users probably want to use gnome-flashback, e16, sawfish, etc
-		ewarn "You're not installing GNOME Shell"
-		ewarn "You will have to install and manage a window manager by yourself"
-	fi
-}
-
-pkg_postinst() {
-	# Remember people where to find our project information
-	elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
-	elog "for information about the project and documentation."
-}
diff --git a/gnome-base/gnome-light/gnome-light-3.36.5.ebuild b/gnome-base/gnome-light/gnome-light-3.36.5.ebuild
deleted file mode 100644
index 8b7b24d21611..000000000000
--- a/gnome-base/gnome-light/gnome-light-3.36.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-P_RELEASE="$(ver_cut 1-2)"
-
-DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="2.0"
-IUSE="cups +gnome-shell"
-
-KEYWORDS="amd64 ~arm ~ppc64 x86"
-
-# XXX: Note to developers:
-# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
-# the bare minimum of libs/apps needed. It is basically gnome-base/gnome without
-# any apps, but shouldn't be used by users unless they know what they are doing.
-# cantarell minimum version is ensured here as gnome-shell depends on it.
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-
-	>=gnome-base/gnome-session-3.36.0
-	>=gnome-base/gnome-settings-daemon-3.36.1[cups?]
-	>=gnome-base/gnome-control-center-3.36.4[cups?]
-
-	>=gnome-base/nautilus-3.36.3
-
-	gnome-shell? (
-		>=x11-wm/mutter-${PV}
-		>=dev-libs/gjs-1.64.4
-		>=gnome-base/gnome-shell-${PV}
-		>=media-fonts/cantarell-0.201 )
-
-	>=x11-themes/adwaita-icon-theme-3.36.1
-	>=x11-themes/gnome-themes-standard-3.28
-	>=x11-themes/gnome-backgrounds-${P_RELEASE}
-
-	>=x11-terms/gnome-terminal-3.36.2
-"
-# adwaita-icon-theme kept back on purpose due to brokenness without rust librsvg,
-# in the hope that the old icon package version is good enough for everything too
-# until librsvg gets updated. This dep should be raised to 3.34 with 3.34.5 meta.
-DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.44.1"
-BDEPEND=""
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if ! use gnome-shell; then
-		# Users probably want to use gnome-flashback, e16, sawfish, etc
-		ewarn "You're not installing GNOME Shell"
-		ewarn "You will have to install and manage a window manager by yourself"
-	fi
-}
-
-pkg_postinst() {
-	# Remember people where to find our project information
-	elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
-	elog "for information about the project and documentation."
-}
diff --git a/gnome-base/gnome-light/gnome-light-40.0.ebuild b/gnome-base/gnome-light/gnome-light-40.0.ebuild
index 62b434ecb70d..80b1472485d0 100644
--- a/gnome-base/gnome-light/gnome-light-40.0.ebuild
+++ b/gnome-base/gnome-light/gnome-light-40.0.ebuild
@@ -11,7 +11,7 @@ LICENSE="metapackage"
 SLOT="2.0"
 IUSE="cups +gnome-shell"
 
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 
 # XXX: Note to developers:
 # This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 536310fdd78c..299b2ab0910a 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -5,8 +5,6 @@ AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc5
 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.38.0.tar.xz 481300 BLAKE2B 1adb6377f66ab64c39aa5e9ca73ebcb7fcfbfa33b5adcd4fe5900624a89a248a4255c507ec0e88baa57b20105a50d6b7e8eb6bea0be6de49295977e4aacbb662 SHA512 f49a7337b64722bc502ff3d952d8e249d2435be662c3bdfb7c7740338585c2e0b292869902be4c10faebde00998d7ead8deb82fe719a38575c6ebec2b94aa19b
 DIST gnome-session-40.1.1.tar.xz 482304 BLAKE2B 9a96f230dc793cc0b810bdaad6ce0103f923fbd2b22ee567316508c79bd6e7afe3961b593d094d0a4766a76f45ba6710f96e03a299f43d08a04aca776a172955 SHA512 91609915366839806729e066e5ca0d42daff0591732cda08c3da7d4951f7e27964d72988c4e61a64045443969b9fb0a9697c7ace82bdd8843310cb4d7e9dfd8c
-EBUILD gnome-session-3.38.0-r1.ebuild 3575 BLAKE2B 79815a8eccb23615560340496c234c1e25c21100d66086dbd1ad0a69276a6cb0d182f7caf8aeeb8afcab32f690714130c74f4a5c44018a3b0ac35c300615587c SHA512 d1d76233c952b2ae39ae758a4b522f48b90cc48216f576a2cc25bf9847726d28177b7e14be36ebf33d1ef73189c3ede290272fdbb9e14756cc972240d340873d
-EBUILD gnome-session-40.1.1.ebuild 3455 BLAKE2B dba36285b78f7a581565cec8ca458219141edf1ca4aa8ab9f19153bbd92ab83b7054ae5bce38769a45538a40c991ffbc284d392ee6d9cde4bb4a12c28c1fae4b SHA512 061acb1c9d0ea5425bbf1c872878f4e914bf46e7c567314130efd8767e4226548f546a56471968a7de0275592389c7baa65202631608ed47fab06c7a7249a661
+EBUILD gnome-session-40.1.1.ebuild 3452 BLAKE2B 38f77900a0d24c45b000dff3c7e2e4d5a687e0a60d14f877af6468cd906cc4ccb3b3d81b1b319a0fbd7a41804436d8be4daf88d3d525cadf9b70459e80a197fb SHA512 227b08745fb043d5ee96c0cbcd06f834b55f1a63871fb93173785ddac9f99708431b4af59c05ffb970b3497747289da68f64770d4b155bf9b1d83aa831fca5b7
 MISC metadata.xml 348 BLAKE2B e83b29910d01f4a5cc1ddf7587189534a557805ccbc7611230526266ed88202a2ce9e612f8d78f4fb9c9a11217a2eb16e1ce9304d2038c3d2dce65364b5c67b9 SHA512 6bf5331d6f4a8c27e1d17709bb11cad46fd926fc84925c99f7e89eaa236d5b22c95702e6522f868f285b0c9f74a670a839e91b03e3126ace0449b5a5f49fdf8f
diff --git a/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild
deleted file mode 100644
index 1c215ccd7e5c..000000000000
--- a/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~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}"/${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() {
-	xdg_src_prepare
-	# Install USE=doc in ${PF} if enabled
-	sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddeprecation_flags=false
-		$(meson_use elogind)
-		-Dsession_selector=true # gnome-custom-session
-		$(meson_use systemd)
-		-Dsystemd_session=$(usex systemd default disable)
-		$(meson_use systemd systemd_journal)
-		$(meson_use doc docbook)
-		-Dconsolekit=false
-		-Dman=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome"
-
-	newmenu "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
-	# This should be done here as discussed in bug #270852
-	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-
-	# Set XCURSOR_THEME from current dconf setting instead of installing
-	# default cursor symlink globally and affecting other DEs (bug #543488)
-	# https://bugzilla.gnome.org/show_bug.cgi?id=711703
-	newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
-		ewarn "If you use a custom .xinitrc for your X session,"
-		ewarn "make sure that the commands in the xinitrc.d scripts are run."
-	fi
-
-	if ! use systemd && ! use elogind; then
-		ewarn "You are building without systemd or elogind support."
-		ewarn "gnome-session won't be able to correctly track and manage your session."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-session/gnome-session-40.1.1.ebuild b/gnome-base/gnome-session/gnome-session-40.1.1.ebuild
index 13e3613d59ef..8f1bda21c005 100644
--- a/gnome-base/gnome-session/gnome-session-40.1.1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-40.1.1.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 )"
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 6e71966d2072..6fabd1c5bef9 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -2,10 +2,6 @@ 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.38.1.tar.xz 1437096 BLAKE2B dddc4672585c23f1d0f1824303b503ec30d6fc4a2a88b9633e0256d34ca2badd067fa54a404de032f8b2e8dd5b7bfa3915464bc826d8bbea5d57431b7a2ac7fe SHA512 b32c0897d1a5680747bf68e9009ea44cf1a05ef807b772ca6514a278002754d520def7bced929b9004d3aec82a6e82b52637bd2eadd3f6cd54f3d0ac5c8e8cbd
 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
+EBUILD gnome-settings-daemon-40.0.1.ebuild 3885 BLAKE2B 49d9579a482d612e31959a6bd9de6ab713a21a832d533e1200125e4631fec2d777a1083ef38f483add05d42c8b1b1df98cc844c24b5d2649ea60a34f163bd21f SHA512 26ef12652db3bc9811275a9c71c0aec593a8fb204b024c45ae6616365f1944bfbc802bbb09bc2978c02cd349defa37dca2e3acbe9f6d92b9b35b4b71e7e92575
 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
deleted file mode 100644
index 480b0b8e634b..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.38.1.ebuild
+++ /dev/null
@@ -1,137 +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,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.34.2:3=
-	>=gnome-base/gsettings-desktop-schemas-3.35.91
-	>=x11-libs/gtk+-3.15.3:3[X,wayland?]
-	>=dev-libs/libgweather-3.9.5:2=
-	colord? (
-		>=x11-misc/colord-1.3.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}]')
-		$(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]')
-		gnome-base/gnome-session )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build-Make-colord-and-wacom-optional-and-controllabl.patch
-	"${FILESDIR}"/${P}-build-Allow-NM-optional-on-Linux.patch
-	"${FILESDIR}"/${P}-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-settings-daemon/gnome-settings-daemon-40.0.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild
index e777c2de3e47..950cb29a9cf4 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.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-40.0.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.ebuild
deleted file mode 100644
index e777c2de3e47..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.ebuild
+++ /dev/null
@@ -1,147 +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 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 048af322124b..633b1e03608d 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -4,13 +4,7 @@ AUX 40.0-defaults.patch 1412 BLAKE2B e36f7215cf756586479b8bdc71339beb3bbde53ca97
 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.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
 DIST gnome-shell-40.1.tar.xz 1876776 BLAKE2B 9facbf60759faf4d598cf423147d6385e50a324e75b0ce4e540b4b0c6e51c2ad611f70ac8e0f19d25f47d0ee250504fe7fb430d6f50aacb9ef758648ca7a2e78 SHA512 48b2800ef500b5a5102c974d8ab718946406653803942b063100c813bd4bda9ae3e1b3492872fd8158c0e44c95f6582174101fb852613ff047602efed83b6d37
 EBUILD gnome-shell-3.36.7.ebuild 6667 BLAKE2B 6d2fe47bf102ba967ba1bcd5490f673033882e067ee6fda7ffc1c6482b5e6359f53af3337263c506d0e3e5270abb92306f5391cce713c10abaa0c09099a06899 SHA512 6e613f41d24bd0152ba4582b87afabd6ac17060d7c13462b975ff6ae8d8dab39a8c8e76a8740d0d02568f47b431360814328780f8e10937c2ce3180c446fde12
-EBUILD gnome-shell-3.38.4-r1.ebuild 6436 BLAKE2B 5fa02e8fd1b477bfcbe9ed67d4f812ba5cc332ab816dce30b2bc11c5f339dafa1db2d8970901ac3334edbba474e8720182a03b36e2c91ec18d79bae6b3f46166 SHA512 54689f75e28f8e2140c6793df2a1b3e6369974a8532eb3878c739e7b3aff79f910350a0b92bdc783bf7c43ee3a84734107ddb4d60fe030386eab5f9869af3959
-EBUILD gnome-shell-3.38.4.ebuild 6304 BLAKE2B 438e68b26fe62bc36aad18c597840aa0c25c88b347e04cfd8dd78e113903dbdb8139a2101d4863d5547a19a57c6b0accbe4254fc1c324ff56401d732a503d8ea SHA512 140a2a65f7cb5fd5cbaeae37b7b94e531e9449dfe8cd69c832aeb218ee76179db9b3f2cad1e10ed0aacb833cf17f59a216cc1a88402a5159332eca67cbeae6bd
-EBUILD gnome-shell-40.0.ebuild 6372 BLAKE2B 920776ac1bc7c2e2aa5ab725b9117838d55aa354bebfeeb80860ffe42fb0ffee97a80ad8e77bec4703a322b79d538891932ddb8b59ed8d9963449781e83945ef SHA512 b141c7be05241867b970a42e5ce35630772927a8a0b322317e32775959381991c0fea8dbcc3f9552468254f2a234bad75ce885fcd5a0a3fac867591d3cad72c9
-EBUILD gnome-shell-40.1.ebuild 6372 BLAKE2B 920776ac1bc7c2e2aa5ab725b9117838d55aa354bebfeeb80860ffe42fb0ffee97a80ad8e77bec4703a322b79d538891932ddb8b59ed8d9963449781e83945ef SHA512 b141c7be05241867b970a42e5ce35630772927a8a0b322317e32775959381991c0fea8dbcc3f9552468254f2a234bad75ce885fcd5a0a3fac867591d3cad72c9
+EBUILD gnome-shell-40.1.ebuild 6369 BLAKE2B c781a12a575b15d3aaf293e1629e40331cd259b256c486270bfc1d4e246b4d778c8c3a1f47858a02c2e49ddd2a4818a17c32f035254b81160fc54c97858fa71c SHA512 d998c3799050fdb4d33b37d4428a34a457405d5aff8da2b36d68012bb14b3e2f41437e9212b6a1e9a991221e04bad9e8dea67ffb4e83e2f5f48702f5e6dc9ef5
 MISC metadata.xml 1050 BLAKE2B cf97e536a47f3b023e118a818bbc34af63500d2ea94bbc71201d2ce18aa6e473673cb28a47245de24b7bad9a174a6dda6b46c300518521c8ea0662e88e95627d SHA512 50c1d4c3eacb89b77bc49b4f236bba9d9041ef047392d5bda19e85b0c935709a095a388b1625a2c77c66145758e9b4ab77a202aa6cdd2b86f262c5b56e428b06
diff --git a/gnome-base/gnome-shell/gnome-shell-3.38.4-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.38.4-r1.ebuild
deleted file mode 100644
index 0e5a2c2dd05a..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-3.38.4-r1.ebuild
+++ /dev/null
@@ -1,189 +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,9} )
-
-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"
-IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( elogind systemd )"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
-# FIXME:
-#  * gstreamer/pipewire support is currently automagic
-DEPEND="
-	>=gnome-extra/evolution-data-server-3.33.1:=
-	>=app-crypt/gcr-3.7.5[introspection]
-	>=dev-libs/glib-2.57.2:2
-	>=dev-libs/gobject-introspection-1.49.1:=
-	>=dev-libs/gjs-1.65.1
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=x11-wm/mutter-3.38.0:0/7[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=gnome-base/gsettings-desktop-schemas-3.33.1
-	>=x11-libs/startup-notification-0.11
-	>=app-i18n/ibus-1.5.2
-	>=gnome-base/gnome-desktop-3.35.90:3=[introspection]
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
-	>=media-libs/gstreamer-0.11.92:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-video/pipewire-0.3.0:0/0.3
-	networkmanager? (
-		>=net-misc/networkmanager-1.10.4:=[introspection]
-		net-libs/libnma[introspection]
-		>=app-crypt/libsecret-0.18
-		dev-libs/dbus-glib )
-	systemd? ( >=sys-apps/systemd-242
-		>=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
-	elogind? ( >=sys-auth/elogind-237 )
-	app-arch/gnome-autoar
-	dev-libs/json-glib
-
-	>=app-accessibility/at-spi2-atk-2.5.3
-	x11-libs/gdk-pixbuf:2[introspection]
-	dev-libs/libxml2:2
-	x11-libs/libX11
-
-	>=media-sound/pulseaudio-2[glib]
-	>=dev-libs/atk-2[introspection]
-	dev-libs/libical:=
-	>=x11-libs/libXfixes-5.0
-
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	media-libs/mesa[X(+)]
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated using:
-#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Introspection stuff needed via imports.gi.*
-# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
-# 3. Control shell settings
-# 4. logind interface needed for suspending support
-# 5. xdg-utils needed for xdg-open, used by extension tool
-# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
-# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
-# 8. IBus is needed for nls integration
-# 9. Optional telepathy chat integration
-# 10. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
-# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
-RDEPEND="${DEPEND}
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	app-accessibility/at-spi2-core:2[introspection]
-	app-misc/geoclue[introspection]
-	>=dev-libs/libgweather-3.26:2[introspection]
-	>=sys-power/upower-0.99:=[introspection]
-	x11-libs/pango[introspection]
-	gnome-base/librsvg:2[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	x11-misc/xdg-utils
-
-	>=x11-themes/adwaita-icon-theme-3.26
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
-	telepathy? (
-		>=net-im/telepathy-logger-0.2.4[introspection]
-		>=net-libs/telepathy-glib-0.19[introspection] )
-	media-fonts/cantarell
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection(+)]
-	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
-	browser-extension? ( gnome-extra/chrome-gnome-shell )
-"
-BDEPEND="
-	dev-lang/sassc
-	dev-libs/libxslt
-	app-text/asciidoc
-	>=dev-util/gdbus-codegen-2.45.3
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.17
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# 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
-	"${FILESDIR}"/3.36-defaults.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	# Hack in correct python shebang
-	sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth)
-		-Dextensions_tool=true
-		-Dextensions_app=true
-		$(meson_use gtk-doc gtk_doc)
-		-Dman=true
-		$(meson_use networkmanager)
-		$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
-		# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
-		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa if you do not have hardware 3D setup."
-	fi
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=563084
-	# TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
-	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
-		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
-		ewarn "otherwise Gnome will fail to start"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-3.38.4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.38.4.ebuild
deleted file mode 100644
index 07857b6f4bdd..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-3.38.4.ebuild
+++ /dev/null
@@ -1,186 +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,9} )
-
-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"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( elogind systemd )"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
-# FIXME:
-#  * gstreamer/pipewire support is currently automagic
-DEPEND="
-	>=gnome-extra/evolution-data-server-3.33.1:=
-	>=app-crypt/gcr-3.7.5[introspection]
-	>=dev-libs/glib-2.57.2:2
-	>=dev-libs/gobject-introspection-1.49.1:=
-	>=dev-libs/gjs-1.65.1
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=x11-wm/mutter-3.38.0:0/7[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=gnome-base/gsettings-desktop-schemas-3.33.1
-	>=x11-libs/startup-notification-0.11
-	>=app-i18n/ibus-1.5.2
-	>=gnome-base/gnome-desktop-3.35.90:3=[introspection]
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
-	>=media-libs/gstreamer-0.11.92:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-video/pipewire-0.3.0:0/0.3
-	networkmanager? (
-		>=net-misc/networkmanager-1.10.4:=[introspection]
-		net-libs/libnma[introspection]
-		>=app-crypt/libsecret-0.18
-		dev-libs/dbus-glib )
-	systemd? ( >=sys-apps/systemd-242
-		>=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
-	elogind? ( >=sys-auth/elogind-237 )
-	app-arch/gnome-autoar
-	dev-libs/json-glib
-
-	>=app-accessibility/at-spi2-atk-2.5.3
-	x11-libs/gdk-pixbuf:2[introspection]
-	dev-libs/libxml2:2
-	x11-libs/libX11
-
-	>=media-sound/pulseaudio-2[glib]
-	>=dev-libs/atk-2[introspection]
-	dev-libs/libical:=
-	>=x11-libs/libXfixes-5.0
-
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	media-libs/mesa[X(+)]
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated using:
-#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Introspection stuff needed via imports.gi.*
-# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
-# 3. Control shell settings
-# 4. logind interface needed for suspending support
-# 5. xdg-utils needed for xdg-open, used by extension tool
-# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
-# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
-# 8. IBus is needed for nls integration
-# 9. Optional telepathy chat integration
-# 10. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
-# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
-RDEPEND="${DEPEND}
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	app-accessibility/at-spi2-core:2[introspection]
-	app-misc/geoclue[introspection]
-	>=dev-libs/libgweather-3.26:2[introspection]
-	>=sys-power/upower-0.99:=[introspection]
-	x11-libs/pango[introspection]
-	gnome-base/librsvg:2[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	x11-misc/xdg-utils
-
-	>=x11-themes/adwaita-icon-theme-3.26
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
-	telepathy? (
-		>=net-im/telepathy-logger-0.2.4[introspection]
-		>=net-libs/telepathy-glib-0.19[introspection] )
-	media-fonts/cantarell
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection(+)]
-	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
-	browser-extension? ( gnome-extra/chrome-gnome-shell )
-"
-BDEPEND="
-	dev-lang/sassc
-	dev-libs/libxslt
-	app-text/asciidoc
-	>=dev-util/gdbus-codegen-2.45.3
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.17
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	"${FILESDIR}"/3.34-optional-bluetooth.patch
-	# Change favorites defaults, bug #479918
-	"${FILESDIR}"/3.36-defaults.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	# Hack in correct python shebang
-	sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth)
-		-Dextensions_tool=true
-		-Dextensions_app=true
-		$(meson_use gtk-doc gtk_doc)
-		-Dman=true
-		$(meson_use networkmanager)
-		$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
-		# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
-		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa if you do not have hardware 3D setup."
-	fi
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=563084
-	# TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
-	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
-		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
-		ewarn "otherwise Gnome will fail to start"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-40.0.ebuild b/gnome-base/gnome-shell/gnome-shell-40.0.ebuild
deleted file mode 100644
index 1fc9453b4820..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-40.0.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-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"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( elogind systemd )"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
-# FIXME:
-#  * gstreamer/pipewire support is currently automagic
-DEPEND="
-	>=gnome-extra/evolution-data-server-3.33.1:=
-	>=app-crypt/gcr-3.7.5[introspection]
-	>=dev-libs/glib-2.57.2:2
-	>=dev-libs/gobject-introspection-1.49.1:=
-	>=dev-libs/gjs-1.65.1
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=x11-wm/mutter-40.0:0/8[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=gnome-base/gsettings-desktop-schemas-3.33.1
-	>=x11-libs/startup-notification-0.11
-	>=app-i18n/ibus-1.5.2
-	>=gnome-base/gnome-desktop-3.35.90:3=[introspection]
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
-	>=media-libs/gstreamer-0.11.92:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-video/pipewire-0.3.0:0/0.3
-	networkmanager? (
-		>=net-misc/networkmanager-1.10.4:=[introspection]
-		net-libs/libnma[introspection]
-		>=app-crypt/libsecret-0.18
-		dev-libs/dbus-glib )
-	systemd? ( >=sys-apps/systemd-242
-		>=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
-	elogind? ( >=sys-auth/elogind-237 )
-
-	app-arch/gnome-autoar
-	dev-libs/json-glib
-
-	>=app-accessibility/at-spi2-atk-2.5.3
-	x11-libs/gdk-pixbuf:2[introspection]
-	dev-libs/libxml2:2
-	x11-libs/libX11
-
-	>=media-sound/pulseaudio-2[glib]
-	>=dev-libs/atk-2[introspection]
-	dev-libs/libical:=
-	>=x11-libs/libXfixes-5.0
-
-	gui-libs/gtk:4[introspection]
-
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	media-libs/mesa[X(+)]
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated using:
-#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Introspection stuff needed via imports.gi.*
-# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
-# 3. Control shell settings
-# 4. logind interface needed for suspending support
-# 5. xdg-utils needed for xdg-open, used by extension tool
-# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
-# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
-# 8. IBus is needed for nls integration
-# 9. Optional telepathy chat integration
-# 10. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
-# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
-RDEPEND="${DEPEND}
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	app-accessibility/at-spi2-core:2[introspection]
-	app-misc/geoclue[introspection]
-	>=dev-libs/libgweather-3.26:2[introspection]
-	>=sys-power/upower-0.99:=[introspection]
-	x11-libs/pango[introspection]
-	gnome-base/librsvg:2[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	x11-misc/xdg-utils
-
-	>=x11-themes/adwaita-icon-theme-3.26
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
-	telepathy? (
-		>=net-im/telepathy-logger-0.2.4[introspection]
-		>=net-libs/telepathy-glib-0.19[introspection] )
-	media-fonts/cantarell
-
-	sys-apps/xdg-desktop-portal-gtk
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection(+)]
-	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
-	browser-extension? ( gnome-extra/chrome-gnome-shell )
-"
-BDEPEND="
-	dev-lang/sassc
-	dev-libs/libxslt
-	app-text/asciidoc
-	>=dev-util/gdbus-codegen-2.45.3
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.17
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	"${FILESDIR}"/40.0-optional-bluetooth.patch
-	# Change favorites defaults, bug #479918
-	"${FILESDIR}"/40.0-defaults.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	# Hack in correct python shebang
-	sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth)
-		-Dextensions_tool=true
-		-Dextensions_app=true
-		$(meson_use gtk-doc gtk_doc)
-		-Dman=true
-		$(meson_use networkmanager)
-		$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
-		# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
-		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa if you do not have hardware 3D setup."
-	fi
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=563084
-	# TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
-	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
-		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
-		ewarn "otherwise Gnome will fail to start"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-40.1.ebuild b/gnome-base/gnome-shell/gnome-shell-40.1.ebuild
index 1fc9453b4820..59a68de0b270 100644
--- a/gnome-base/gnome-shell/gnome-shell-40.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-40.1.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/Manifest b/gnome-base/gnome/Manifest
index 6b6fe72be3eb..eeb9266f2f7c 100644
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -1,3 +1,2 @@
-EBUILD gnome-3.36.5.ebuild 1397 BLAKE2B c5f4dcad2f22798ad5b4714064577ceb332a6f7f45a0ab57e45972e33a7648a60be90ef2dadaa66e301236d10001b3e4b1c11bac4eb178e890533d22a724ae75 SHA512 d3ca311bd1161f2346425d1c6699863a50a177168f8f2e1725d3d84e24960ed5023a4f11ee15bbb94d3b4730e3553281597b4e1df08e4eb7568c7ae172aaa66d
-EBUILD gnome-40.0.ebuild 1392 BLAKE2B 4bb2b68c0a6160e8363ab14fc95af158f1414289b8c8ae3f682f6fe743069eb43a74ce68dbd4bda60f591b1cb2a0016d44f71bab62cac43350e8c1cd8c3465a2 SHA512 17d98fa9d380584cc2e34d12d59c81c3b68405d83e00633af23ff4be79f218b1ecdd326c007346822629d6cb4d76c3501f3d6d7ef8d5b23f042fcb9d9e7f7a3f
+EBUILD gnome-40.0.ebuild 1390 BLAKE2B ecdc3b016168e0eaaadc1d906337d72d9cab4b1470d53aa7216b1e86a54707fa2d4ba2416e5131b64459519cc5402fc5ef669bbb9b0292d40a3bf2035a83f3a9 SHA512 e690cf9b3abc062c167c3b2f3bd93f793e16ba9bfc0c11ffffccd226643de54f28bee23d0c0c5df97a09fbf0a5bc40e026cdaa0748cbf01f8550e3b83bbeaee1
 MISC metadata.xml 452 BLAKE2B 94890a098fcc359b62b9176f57baa243301ab562c549395f6307789987a668c095a1d571be9b7a5325ffdcbd51efaff100c1098ae0e2c337be11c54b3b703529 SHA512 459b43467672d33807e28cfa40ad930a083a026de9cc1dba2e5b795c1d766ca8f42591153164dbdedaeb7785d22a431eb5d1b36e618314ce792bb1c7da383d9a
diff --git a/gnome-base/gnome/gnome-3.36.5.ebuild b/gnome-base/gnome/gnome-3.36.5.ebuild
deleted file mode 100644
index ed66315b499c..000000000000
--- a/gnome-base/gnome/gnome-3.36.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Meta package for GNOME 3, merge this package to install"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="metapackage"
-SLOT="2.0" # Cannot be installed at the same time as gnome-2
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-IUSE="accessibility +bluetooth +classic cups +extras"
-
-S=${WORKDIR}
-
-# TODO: check accessibility completeness
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-	>=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?]
-
-	>=gnome-base/gdm-3.36.3
-
-	>=x11-wm/mutter-${PV}
-	>=gnome-base/gnome-shell-${PV}[bluetooth?]
-	>=media-fonts/cantarell-0.201
-
-	>=x11-themes/gnome-backgrounds-3.36.0
-	x11-themes/sound-theme-freedesktop
-
-	accessibility? (
-		>=app-accessibility/at-spi2-atk-2.34.2
-		>=app-accessibility/at-spi2-core-2.36.0
-		>=app-accessibility/orca-3.36.4
-		>=gnome-extra/mousetweaks-3.32.0 )
-	classic? ( >=gnome-extra/gnome-shell-extensions-3.36.2 )
-	extras? ( >=gnome-base/gnome-extra-apps-${PV} )
-"
-PDEPEND=">=gnome-base/gvfs-1.44.1[udisks]"
-
-DEPEND=""
-BDEPEND=""
-
-pkg_postinst() {
-	# Remind people where to find our project information
-	elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
-	elog "for information about the project and documentation."
-}
diff --git a/gnome-base/gnome/gnome-40.0.ebuild b/gnome-base/gnome/gnome-40.0.ebuild
index 8f2ee6a0416d..dc90a56b5c56 100644
--- a/gnome-base/gnome/gnome-40.0.ebuild
+++ b/gnome-base/gnome/gnome-40.0.ebuild
@@ -11,7 +11,7 @@ SLOT="2.0" # Cannot be installed at the same time as gnome-2
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 IUSE="accessibility +bluetooth +classic cups +extras"
 
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 07dd1c70c3bb..474e2f242417 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -2,5 +2,5 @@ AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec
 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.38.0.ebuild 971 BLAKE2B 6e54977b6256f9972a4cbe8e32bd2bf89e3a4b0e1efa8f9481fa8efc05d8a3acdc95118069b3bacb5c405e0c8caa3556c552e2eefad28bd491d3b6667f8d9e3a SHA512 3bb0df1caabe286e4d568288e72a0bfc3d73900ec4a1e50a815e8a174affa0c5fed003905bceabff6500ac5e844c878fe6fed34b5a34bcf0d21a632070e6f294
-EBUILD gsettings-desktop-schemas-40.0.ebuild 1128 BLAKE2B 731fa20624c8a488cc5bee85c255d5874b2c21962db01e17498fbfd1854562724dc0dbc186680c5a135d72ed2d7dcbe56e2f84065eccdd22245f68208d22a0e4 SHA512 9bda7ba55f31b9940c0da19809583671cce7b58ab094b0541c00bfdd6359a2dd49b8fa0aed71c1ea662a85ee81d29973722f74cb8f3b790011032d8441bd4332
+EBUILD gsettings-desktop-schemas-40.0.ebuild 1121 BLAKE2B 24f96c7803adb937027c34502db58081fdd0edcca38f6a64efc64c77c7d3d43d106621ba7efaf7e86baf4b8608f28d9848b26c01da4ad6329c0b1e5601359da5 SHA512 d6a51c91e2bbc5a8504776bcc2cf4619cb8ece2fccf32c0b7efdc9fc0e2954f4c39aca41fb01eec50c308fde6bd29ed99cc20480df980157bf400d67357017a9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
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 a5545f400e75..052a81d34d50 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
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
 BDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 9312027c7c81..336bb281e9a2 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,8 +1,4 @@
 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
 DIST gvfs-1.48.1.tar.xz 1225916 BLAKE2B f2c46d94ba68065fcaef93cfaf25d5d6cc2fbbf4c1842452d30a9fec2ac5259b440fe569411cf3a874d3464f8d001ef2d04a705230a21b381ff1c3abe9c0f16e SHA512 19a642bcfce37eaa0d2d9f509fed6c67abfea0f79f5be9a17074d20e9ba71252a13583a2e08de88718cb141c5e79e34c84c765c87160351fe21291a8f88abe8c
-EBUILD gvfs-1.44.1.ebuild 3791 BLAKE2B 56e3b7e7446028a5a4a0b199841ac3ade5d503fcd3ff2f9a2685c050e1a6b58f833cbe4f9bad1c591a6f51ef085b8d4a5ed908c20d0fb3f90d72b786afe2533a SHA512 ce1a9b0fe6db91236466fbadfc70bb5d3d2278b4068e61881c9d3400ce25ba9b579e64adda07fd743544a83f48a6bbac3b7f9b11fa23b76d9d33eb83e610bb2f
-EBUILD gvfs-1.48.0.ebuild 3753 BLAKE2B 1351164a17e63d1a9985749734075eae87639d04d8df9dc7a2f52508c9d16ae62e70a9a530bd6279195ed4efea398ac4cff9f9bc9253e1a61c0112ea27ded5c5 SHA512 46a2c9afd17f51cb5bc813e43dce1d477dc2748f9e5b9dd3cff46ab7616b9495bca0e7f1f29b6d2243543c924c9f3de86f40159729682dea0b83d20e3d9b9dab
-EBUILD gvfs-1.48.1.ebuild 3753 BLAKE2B 1351164a17e63d1a9985749734075eae87639d04d8df9dc7a2f52508c9d16ae62e70a9a530bd6279195ed4efea398ac4cff9f9bc9253e1a61c0112ea27ded5c5 SHA512 46a2c9afd17f51cb5bc813e43dce1d477dc2748f9e5b9dd3cff46ab7616b9495bca0e7f1f29b6d2243543c924c9f3de86f40159729682dea0b83d20e3d9b9dab
+EBUILD gvfs-1.48.1.ebuild 3753 BLAKE2B eba6aac344d0926f20cc2ef42ac1b721f793cf3fb0bfd63f12d324c243a2bd22418242d62b489b332948f0cd77f5bdd6057507391dad47b3e92b3c447ef7bcca SHA512 feda5c7bf5807f95e57200788bcb8b92b6c573bd247ef9dbd4ff7f51e83f15b801a1f9971afaa4ac05f203b6c042718182e8e84b6f2643a847a79ed5851c3a1a
 MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7
diff --git a/gnome-base/gvfs/gvfs-1.44.1.ebuild b/gnome-base/gvfs/gvfs-1.44.1.ebuild
deleted file mode 100644
index 57fd8f50812f..000000000000
--- a/gnome-base/gvfs/gvfs-1.44.1.ebuild
+++ /dev/null
@@ -1,139 +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 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.57.2: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? (
-		>=dev-libs/libusb-1.0.21
-		>=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.17.11:=[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/meson-0.49
-	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
-"
-
-PATCHES=(
-	"${FILESDIR}"/libplist-2.2.patch
-)
-
-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/gvfs/gvfs-1.48.0.ebuild b/gnome-base/gvfs/gvfs-1.48.0.ebuild
deleted file mode 100644
index 11d31cbf7698..000000000000
--- a/gnome-base/gvfs/gvfs-1.48.0.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson 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/gvfs/gvfs-1.48.1.ebuild b/gnome-base/gvfs/gvfs-1.48.1.ebuild
index 11d31cbf7698..be6dd089674b 100644
--- a/gnome-base/gvfs/gvfs-1.48.1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.48.1.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="
 	mtp? ( udev )
 	udisks? ( udev )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.65.1:2
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 6aedc26002d7..ecd892befbbd 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,10 +1,8 @@
 AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f05006094106a17fdb61b1bf2e6210f42fe91716e7fd21cf40ad5adecfee45b9e1d488249d1befdb48399c5952829c3d01e07 SHA512 bea056ac4d3d19719129dd7379d783a8eb34efbf57186f6ab7113ff97fdd809b0802d60add646ea50c776eb7bc07f5a0f4c0911569a2b1b24dbb1683f111d7c0
 DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
-DIST librsvg-2.50.3.tar.xz 18868408 BLAKE2B 8b245a233ddd56137880e43f4da2df623237bb1ce2e143cee09da3fadc1edd9b3e4f4753fe48cf814d2372e532775573a34982a6cc88ace9be336e16ae473c20 SHA512 21710b6b5810b959679b7908aa371b8af02c85549efbc64f5fda01cfc3881539b5afc6bc304ce2289719dee48f583b1eb9867546e09f36941f81af968434e389
-DIST librsvg-2.50.4.tar.xz 18954216 BLAKE2B 88467cf7b3a7382182f3a37887e9d05dbcb723464607707271491ca20cf7bedb890ec64e1a8c34ab136a23dbfe93dfd19fccbd194c4bd65868b07874c5070067 SHA512 5f476a663e1fa3297d699b1057622e72dbefdf9126ade97762288b7bc4e8a294936d008c889bcaf8e35f46d3b818f5317c63883df0043ec0f8aad18fa5feb4f3
 DIST librsvg-2.50.5.tar.xz 18958716 BLAKE2B 36ca7b9316f0384dfa0063035fe3b57adc9c0a94757b81662e0e80ff19c2388d872353ba2047c8402fd586e4d3614a88e2ba29502bd16c55d8a336238954aaaa SHA512 d1d653031f20a393ba7ae56e3187244cb8e96bfa14f888b07338b80c8d947112c421a88bc57f62eaa6c8b705dde1277a7b56c7cdf602b46c1516309dd4011b56
+DIST librsvg-2.50.6.tar.xz 22225624 BLAKE2B d2822758456758ee818717db60b9136c31efa675f4c6ac94202e90a503b63aee736f995e8d23a72f50fe3b941953591d690cf99a65ddf7295e50b244186d242b SHA512 67f771c6aeaf70bc63f053ee6821e6eae545581c5381fbd3c3cd70c9f06fb2b14b584e9933108d0698abbca59c88fb0dd05d7a09925a727dfa58960b7d4f3396
 EBUILD librsvg-2.40.21.ebuild 2535 BLAKE2B fb7707a26b24f05ef9afe464f036d205e72243fe0b411ddc17b42a3f73bfd35e4a92b9236c12218d4bffb8edc825813f3b08cf164faf6cd1f96e689b76ac2970 SHA512 0ae92c01878ed45cd2da511bca6bcb86465723d3f71752168d5764b56d366544bc6bce1fce2d93ad497c901af8758db11bf3a53ad79389bcf54b16210bb18da2
-EBUILD librsvg-2.50.3.ebuild 2503 BLAKE2B 16130a1bb29f4f6f86fc3cfb02b4ddd3f1bf9dddf7149ef3edefbeb3f78995259e76b6c33be8fac2896d2985ff1310ec10ef62d2f73a61101f914fbbdd762418 SHA512 884181f1b55d61d4b9fa73e96392086bda8ebb1d0c672901a140f8ad22f37c755e8b8fdeb0ef5821849f36f01e48bc081afd23c31cf1e5bbe52e821097ee5b73
-EBUILD librsvg-2.50.4.ebuild 2582 BLAKE2B 4d106ba7d0be3acd56af91cf045aae2010bc7d6adc125a1676e93a862fb989fdc1cea04d953518d10f246f594533a7562826311b03c59e5943bc978fae7507e7 SHA512 d7040b77c374f84aa22de634220f77e97c390c79ffb729ff186a08c60dd258d4a45037466713ef1bdf653de866b4b210e689a11a9561c73d59d98a982e852028
 EBUILD librsvg-2.50.5.ebuild 2589 BLAKE2B 4b332cd6a04c97908a61a30d18591eb3e1b7e6901637abf9aea07b93b6da06f7f6df33bcc3e3a0663a48355271779643382d9065784a3356d2ea535bb5e87cb3 SHA512 bebb2c340fa684c2d0f86d140e919423a89a787ddc3256e28ef49a5a150f1836534348bb9d1da4521760b8532e537f50f4107dc6b509063fe00787c2a1586fc5
+EBUILD librsvg-2.50.6.ebuild 2577 BLAKE2B d1f7f58b9d597ec468632c9317dd98d049f25828f701322a97ff7da5d48b29010543291c95b69d28cbbbf5dd5abf74faef01ed99cbcf7b038806e6db358be7ab SHA512 a2f73a752c007ee1e29f75b8dff78c0526ed3a724cb6be025dccf72d4dadb65680e7c8fca97f496c9676e2e03719529bacb37a0580412804ed77d0618e6103c6
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/librsvg-2.50.3.ebuild b/gnome-base/librsvg/librsvg-2.50.3.ebuild
deleted file mode 100644
index b9143da05f5e..000000000000
--- a/gnome-base/librsvg/librsvg-2.50.3.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
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION=0.46
-
-inherit gnome2 multilib-minimal rust-toolchain vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="amd64 arm arm64 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.40[${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.4.ebuild b/gnome-base/librsvg/librsvg-2.50.6.ebuild
index 7079e46b7a43..ef1c37205812 100644
--- a/gnome-base/librsvg/librsvg-2.50.4.ebuild
+++ b/gnome-base/librsvg/librsvg-2.50.6.ebuild
@@ -12,7 +12,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 )"
@@ -24,7 +24,7 @@ RDEPEND="
 	>=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}]
+	>=x11-libs/pango-1.44.0[${MULTILIB_USEDEP}]
 
 	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
 "
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 6c7f48c31b68..0d691d800db0 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,11 +1,5 @@
 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
-DIST nautilus-3.38.2.tar.xz 3221128 BLAKE2B c5d67072cefcd8dbbb0454ff6e867045a0edc72f0b4b1e01c910d4bdb1b755a56c3609f6e5d5f8ca8624a667d105a0962b6de701ceafa2108c1c94807c92e8c7 SHA512 b716140363e6c3ec30ef450958a4d6d812502e96569a9ce2567f56297fd0b3a7e779df6628d447b19dd20b8128a371a523aa5a6e34da40e9466d0b94341ca12c
-DIST nautilus-40.0.tar.xz 3250800 BLAKE2B e57381d7f9b9e6884e4f22f3c3d78c931d197b78f0f139457bf141ffdfebe646ddeb2d280a1d2b38124b8d8199323983ea48631d98843a49d125b7be49eb5989 SHA512 700a18b27da28608d247c046dcaddb3114cd0648e077ef0a0be3eba6f1e3623720224610aa92c1513a84a0ef91bae7b18e3624de9c2c1495544d260635688e5f
 DIST nautilus-40.1.tar.xz 3252276 BLAKE2B 6123fcc933f94ca405f7590ef446af0472f4ec10f5188ae3aaf9cb38a0cb1905a7cfbd69c47c5f1b3258bf915006184caeafa2e10035f0068e758a615c328609 SHA512 6421ce0c30c6f3a406a9c100b4a62e01276b10b6cdf05c9aa862a0ece89c7d231e8d3630aecfb8a1e6b40d62849c80c6c91b3f6b6663251466aa8865e60dbfc1
-EBUILD nautilus-3.36.3-r1.ebuild 2860 BLAKE2B 17c13ce67218c0a10f794b623da816fde335cac0e93ee1b94491914c1781dc994611d6647501538a088cb4958dc42c746c67761a1dde9dfbd77968c06ddbaad2 SHA512 d239ab9e46bc153d5c78893c8518f8aa16866e33997d692edf49eb466419bacd08604b13086af1c147b1a1091d8a6459c21c87ca2e5ebcd1944b3e9562d580fc
-EBUILD nautilus-3.38.2.ebuild 2863 BLAKE2B e75e1f938f935b114c5f70266ac6d950b35951bbfe2a1906e7b784aae033446bed5fb57dcd41f5922a192a4632b27c6029afc0f21df5ba6718cdc3f0bf704bd0 SHA512 416798bf40a9c7c8a8360a2bf3a392439d46895771a95f05e14e9bdaf699ab9b96974a886f5620a0f734f65711611b3c678a8dbe33c404fb2e45651f771eecf6
-EBUILD nautilus-40.0.ebuild 2889 BLAKE2B 0edeffffb617513572020afbc9c7f30621c9ef9652a494730d60f8b8f92b04d38c65bb539ba3db3fc809ab34a75ab8cc2d63a04745dff4a736942ed8440a11b1 SHA512 7e9df161c2ae2ec26bbd836b13f1045b516ebc228084ccbfdd6170cef84f45181cd7ac413dba029a374edce0b7983ce4c972391a32dff59c2cfc97c696e99167
-EBUILD nautilus-40.1.ebuild 2889 BLAKE2B 0edeffffb617513572020afbc9c7f30621c9ef9652a494730d60f8b8f92b04d38c65bb539ba3db3fc809ab34a75ab8cc2d63a04745dff4a736942ed8440a11b1 SHA512 7e9df161c2ae2ec26bbd836b13f1045b516ebc228084ccbfdd6170cef84f45181cd7ac413dba029a374edce0b7983ce4c972391a32dff59c2cfc97c696e99167
+EBUILD nautilus-40.1.ebuild 2886 BLAKE2B 2f4ecda4e5bfa58ba383b15baae3541d72712b8d8dd88b7f45938ea25b44d139201f7bc3879399d7b9b848c3d4bee2665df8c1b4976bdcfc719fed126ae2a62b SHA512 80c2f534d7e1382ee5c769e1f26c70655259f193384793a981a90328b6f7638ad5127e47d7fffc0c5a5571e51999eee9bf478d6befd771dce285c5a321c7fda3
 MISC metadata.xml 553 BLAKE2B 51c14fbccc3b060cb5fac644a8213672250edb2c2092076bb4e0c390bfc8562a950fd362ae4294ac1215e774fcd4dd4de6c709b126c04fa705cf10be0e6e836f SHA512 77102dd05a5180dffca7ef03d66e3d0dc113f272e583da442027a94cb4e9fc67f0c267d9f2d5d0a4ef895d58604aed78fbe01c19b3f018972ff675d392786b7c
diff --git a/gnome-base/nautilus/nautilus-3.36.3-r1.ebuild b/gnome-base/nautilus/nautilus-3.36.3-r1.ebuild
deleted file mode 100644
index a3243bd2afb7..000000000000
--- a/gnome-base/nautilus/nautilus-3.36.3-r1.ebuild
+++ /dev/null
@@ -1,105 +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 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.58.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.2.1
-	>=gnome-base/gnome-desktop-3.0.0:3=
-	>=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:0=
-	x11-libs/libX11
-	>=dev-libs/libxml2-2.7.8:2
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-	gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
-	>=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
-	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)
-		-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
-}
diff --git a/gnome-base/nautilus/nautilus-3.38.2.ebuild b/gnome-base/nautilus/nautilus-3.38.2.ebuild
deleted file mode 100644
index d6b36da0625d..000000000000
--- a/gnome-base/nautilus/nautilus-3.38.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="Default file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-libs/glib-2.62.0: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.2.1
-	>=gnome-base/gnome-desktop-3.0.0:3=
-	>=x11-libs/gtk+-3.22.27:3[X,introspection?]
-	>=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}
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-	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)
-		-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
-}
diff --git a/gnome-base/nautilus/nautilus-40.0.ebuild b/gnome-base/nautilus/nautilus-40.0.ebuild
deleted file mode 100644
index aacf13686936..000000000000
--- a/gnome-base/nautilus/nautilus-40.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="Default file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-libs/glib-2.67.1:2
-	>=media-libs/gexiv2-0.10.0
-	gstreamer? ( media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	>=app-arch/gnome-autoar-0.3.0
-	>=gnome-base/gnome-desktop-3.0.0:3=
-	>=x11-libs/gtk+-3.22.27:3[X,introspection?]
-	>=gui-libs/libhandy-1.1.90:1
-	>=x11-libs/pango-1.28.3
-	selinux? ( >=sys-libs/libselinux-2.0 )
-	>=app-misc/tracker-3.0:3=
-	x11-libs/libX11
-	>=dev-libs/libxml2-2.7.8:2
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
-	>=app-misc/tracker-miners-3.0:3=
-" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
-BDEPEND="
-	>=dev-util/gdbus-codegen-2.51.2
-	>=dev-util/meson-0.57.2
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.10
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-PDEPEND="
-	gnome? ( x11-themes/adwaita-icon-theme )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-1.14[gtk(+)]
-" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
-
-PATCHES=(
-	"${FILESDIR}"/3.30.5-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
-	"${FILESDIR}"/3.32.3-optional-gstreamer.patch # Allow controlling audio-video-properties build
-)
-
-src_prepare() {
-	if use previewer; then
-		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
-			To activate the previewer, select a file and press space; to
-			close the previewer, press space again."
-	fi
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		-Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
-		$(meson_use gstreamer) # gstreamer audio-video-properties extension
-		$(meson_use introspection)
-		-Dlibportal=false
-		-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
-}
diff --git a/gnome-base/nautilus/nautilus-40.1.ebuild b/gnome-base/nautilus/nautilus-40.1.ebuild
index aacf13686936..2bcff26c1aaf 100644
--- a/gnome-base/nautilus/nautilus-40.1.ebuild
+++ b/gnome-base/nautilus/nautilus-40.1.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.67.1:2
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
commit	e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree	23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /gnome-base
parent	908778078736bd36f7a60a2d576d415cb8e000fa (diff)