gentoo resync : 22.05.2021

23 files changed, 519 insertions, 9 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 7c0f4c4917a2..e23cebc7ffe6 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index a96a9f1dda42..42f04394678c 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -4,6 +4,7 @@ AUX default.pa 328 BLAKE2B 558dbedcb5a0f31e0bdc01ce21deaeacb4740dee998f8b2f94736
 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
@@ -11,5 +12,5 @@ DIST gdm-3.36.4.tar.xz 1235796 BLAKE2B eeac6c3c95993d7a75eecd03b51f0519b2f899eae
 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 5838 BLAKE2B c5efed804182cc6ca15e829313871c5381336cb64b2ad7e59ad1a8035af1b242ea3fea241a7f627e1ee737d1109c7a37ac91832a06b82c9f41439d0f1cf2bf47 SHA512 0c50832e8f385987e52e6c8b710529976a4dc86c52bf2c0ce52d405048f0f36c6e7eb19e9aa78dfa5172b1ad00baf67a2493008107dda43cfd747983f848ba9a
+EBUILD gdm-40.0.ebuild 5893 BLAKE2B 5c9ffc89742c04e29c9e08fb18a291172a1d1ed93e4ccf5bea5572a48df974d194625c8f74e04aa88f4cc92db613e05987224235c4e895e23a0791dcb1d61ff6 SHA512 730634dff1cbe52e693aa6dfc9216418fe8edf2b8bda90a160fef141c13ea63a52ad98ae0abe1e2648ec1dca1b439db93d651fb11e701be3fb384728f4c3d4f7
 MISC metadata.xml 759 BLAKE2B 13de28afc8fe81580a2aa28c5fdc17c77266595ffe95218cfbb5cbee4cbd6edab21e8cd06698e4a5feeb696fd9530ef8bf14209ecf3d03039b4e0562bb757375 SHA512 68cec6972bcabcb873fb314babbf9bdfacc7eaae40d662d11662fccd6cbf6630cd93b7322baa271081244c77fd1458c89ad785a0eb2a58b448ddff663381d98d
diff --git a/gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch b/gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch
new file mode 100644
index 000000000000..2742cf276413
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch
@@ -0,0 +1,28 @@
+https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/142
+
+From c713ace4c71a6804734ba5b1bca4abde11ab90d1 Mon Sep 17 00:00:00 2001
+From: Bernd Feige <Bernd.Feige@gmx.net>
+Date: Wed, 19 May 2021 11:28:07 -0700
+Subject: [PATCH] meson: Fix libwrap detection
+
+Bug: https://bugs.gentoo.org/790671
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 0266a938..a490a725 100644
+--- a/meson.build
++++ b/meson.build
+@@ -90,7 +90,7 @@ else
+ endif
+ xdmcp_dep = cc.find_library('Xdmcp', required: get_option('xdmcp'))
+ if xdmcp_dep.found() and get_option('tcp-wrappers')
+-  libwrap_dep = cc.find_library('libwrap')
++  libwrap_dep = cc.find_library('wrap')
+ endif
+ # systemd
+ systemd_dep = dependency('systemd')
+-- 
+2.26.3
+
diff --git a/gnome-base/gdm/gdm-40.0.ebuild b/gnome-base/gdm/gdm-40.0.ebuild
index 7be1ee83162e..9d7deda12a19 100644
--- a/gnome-base/gdm/gdm-40.0.ebuild
+++ b/gnome-base/gdm/gdm-40.0.ebuild
@@ -117,6 +117,8 @@ PATCHES=(
 
 	# Support pam_elogind.so in gdm-launch-environment.pam
 	"${FILESDIR}/pam-elogind.patch"
+
+	"${FILESDIR}"/${P}-meson-Fix-libwrap-detection.patch
 )
 
 src_prepare() {
diff --git a/gnome-base/gnome-core-apps/Manifest b/gnome-base/gnome-core-apps/Manifest
index 6cb9ab2d6634..55313ff8fd53 100644
--- a/gnome-base/gnome-core-apps/Manifest
+++ b/gnome-base/gnome-core-apps/Manifest
@@ -1,2 +1,3 @@
 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
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
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
new file mode 100644
index 000000000000..355bf69f66cd
--- /dev/null
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-40.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Sub-meta package for the core applications integrated with GNOME 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-40.0
+	>=gnome-base/gnome-settings-daemon-40.0[cups?]
+	>=gnome-base/gnome-control-center-40.0[cups?]
+	>=gnome-extra/gnome-color-manager-3.36.0
+
+	>=app-crypt/gcr-3.38.1
+	>=gnome-base/nautilus-40.0
+	>=gnome-base/gnome-keyring-40.0
+	>=gnome-extra/evolution-data-server-3.${PV}
+
+	>=app-crypt/seahorse-40.0
+	>=gui-libs/tepl-6.0.0
+	>=app-editors/gedit-40.0
+	>=app-text/evince-40.0
+	>=gnome-extra/gnome-contacts-40.0
+	>=media-gfx/eog-40.0
+	>=media-video/totem-3.38.0
+	>=x11-terms/gnome-terminal-3.40.0
+
+	>=gnome-extra/gnome-user-docs-40.0
+	>=gnome-extra/yelp-40.0
+
+	>=x11-themes/adwaita-icon-theme-40.0
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.34.5 )
+"
+DEPEND=""
+BDEPEND=""
+
+# cdr? ( >=app-cdr/brasero-3.12.2 ) # not part of gnome releng release anymore
+# >=gnome-base/gnome-menus-3.13.3:3  # not used by core gnome anymore, just gnome-classic extensions
+# >=net-im/empathy-3.12.12 # not part of gnome releng core or apps suite anymore
+
+S="${WORKDIR}"
diff --git a/gnome-base/gnome-core-libs/Manifest b/gnome-base/gnome-core-libs/Manifest
index 0463431f792d..110f406176a6 100644
--- a/gnome-base/gnome-core-libs/Manifest
+++ b/gnome-base/gnome-core-libs/Manifest
@@ -1,3 +1,4 @@
 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
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
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
new file mode 100644
index 000000000000..19884503d8c2
--- /dev/null
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-40.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Sub-meta package for the core libraries of GNOME 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.68.0:2
+	>=x11-libs/gdk-pixbuf-2.42.4:2
+	>=x11-libs/pango-1.48.3
+	>=x11-libs/gtk+-3.24.27:3[cups?]
+	>=dev-libs/atk-2.36.0
+	>=gnome-base/librsvg-2.50.3
+	>=gnome-base/gnome-desktop-${PV}:3
+
+	>=gnome-base/gvfs-1.48.0
+	>=gnome-base/dconf-0.40.0
+
+	>=media-libs/gstreamer-1.16.2:1.0
+	>=media-libs/gst-plugins-base-1.16.2:1.0
+	>=media-libs/gst-plugins-good-1.16.2:1.0
+
+	python? ( >=dev-python/pygobject-3.40.0:3 )
+"
+DEPEND=""
+BDEPEND=""
+
+S="${WORKDIR}"
diff --git a/gnome-base/gnome-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest
index 93e7bdf688ca..082e6423d171 100644
--- a/gnome-base/gnome-extra-apps/Manifest
+++ b/gnome-base/gnome-extra-apps/Manifest
@@ -1,2 +1,3 @@
 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
 MISC metadata.xml 617 BLAKE2B ee89ac320ee9fa2c6a29d3d8b86df05a734781bfb5e538f9f84a85c9467672901713d94347acbef958c8c5733f9a0a07f0b008bf84f2daa2df5390bf8225eb66 SHA512 d91641939c20487a6ba4cfc0c55b6bdf7ba6315b63b8a045976bb9367c6001f9feea9c206ac522cf47efbd5267205e45c29b3ad5ce6189fd1a02f4d993a036be
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
new file mode 100644
index 000000000000..4c3b07cd0a2f
--- /dev/null
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 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-40.0
+	>=media-video/cheese-3.38.0
+	>=www-client/epiphany-40.0
+	>=app-arch/file-roller-3.38.0
+	>=gnome-extra/gnome-calculator-40.0
+	>=gnome-extra/gnome-calendar-40.0
+	>=gnome-extra/gnome-characters-40.0
+	>=sys-apps/gnome-disk-utility-40.0
+	>=media-gfx/gnome-font-viewer-40.0
+	>=media-gfx/gnome-screenshot-40.0
+	>=gnome-extra/gnome-system-monitor-40.0
+	>=gnome-extra/gnome-weather-40.0
+	>=gnome-extra/gucharmap-13.0.7:2.90
+	>=gnome-extra/sushi-3.38.0
+	>=media-sound/sound-juicer-3.38.0
+
+	>=gnome-base/dconf-editor-3.38.3
+	>=app-dicts/gnome-dictionary-40.0
+	>=mail-client/evolution-3.${PV}
+	>=gnome-extra/gnome-tweaks-40.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.38.1
+		>=games-board/gnome-chess-40.0
+		>=games-puzzle/gnome-klotski-3.38.2
+		>=games-board/gnome-mahjongg-3.38.3
+		>=games-board/gnome-mines-40.0
+		>=games-arcade/gnome-nibbles-3.38.2
+		>=games-arcade/gnome-robots-40.0
+		>=games-puzzle/gnome-sudoku-40.0
+		>=games-puzzle/gnome-taquin-3.38.1
+		>=games-puzzle/gnome-tetravex-3.38.2
+		>=games-puzzle/hitori-3.36.0
+		>=games-board/iagno-3.38.1
+		>=games-puzzle/lightsoff-40.0
+		>=games-puzzle/quadrapassel-3.38.1
+		>=games-puzzle/swell-foop-40.0
+		>=games-board/tali-40.0
+	)
+	share? ( >=gnome-extra/gnome-user-share-3.34.0 )
+	shotwell? ( >=media-gfx/shotwell-0.30.11 )
+	tracker? (
+		>=app-misc/tracker-3
+		>=app-misc/tracker-miners-3
+		>=media-gfx/gnome-photos-40.0
+		>=media-sound/gnome-music-40.0
+	)
+"
+DEPEND=""
+BDEPEND=""
+S=${WORKDIR}
diff --git a/gnome-base/gnome-light/Manifest b/gnome-base/gnome-light/Manifest
index 0c18286bfbd3..759e56eddd2f 100644
--- a/gnome-base/gnome-light/Manifest
+++ b/gnome-base/gnome-light/Manifest
@@ -1,3 +1,4 @@
 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
 MISC metadata.xml 406 BLAKE2B 562a281deb064ec0aa74ffebe4e38c864746809724acc4522df8c9cc0590d80937836923a029e521c5a0eec83adda11f169fa554e9760128408b78e87d916f26 SHA512 04875558c048cf102d8e5ffb17cb363808ca84c350f9b03958536cc5185cfd109b4653bbb4de202f47d092f8fc6d15173d3453a3bc62aa431b0c83cbb699a047
diff --git a/gnome-base/gnome-light/gnome-light-40.0.ebuild b/gnome-base/gnome-light/gnome-light-40.0.ebuild
new file mode 100644
index 000000000000..62b434ecb70d
--- /dev/null
+++ b/gnome-base/gnome-light/gnome-light-40.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 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-40.0
+	>=gnome-base/gnome-settings-daemon-40.0[cups?]
+	>=gnome-base/gnome-control-center-40.0[cups?]
+
+	>=gnome-base/nautilus-40.0
+
+	gnome-shell? (
+		>=x11-wm/mutter-${PV}
+		>=dev-libs/gjs-1.68.0
+		>=gnome-base/gnome-shell-${PV}
+		>=media-fonts/cantarell-0.301
+	)
+
+	>=x11-themes/adwaita-icon-theme-40.0
+	>=x11-themes/gnome-themes-standard-3.28
+	>=x11-themes/gnome-backgrounds-${P_RELEASE}
+
+	>=x11-terms/gnome-terminal-3.40.0
+"
+DEPEND=""
+PDEPEND=">=gnome-base/gvfs-1.48.0"
+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-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 8ab69eb737ec..048af322124b 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -7,8 +7,10 @@ DIST gnome-shell-3.36.7.tar.xz 1777236 BLAKE2B 4dd3b98e8a2ffa711bffe0b3b78708c85
 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 6365 BLAKE2B 0889ac406f7ca08fb99f317a94da6e8fe3ef5333016f9ed049451057686a44b8c26e2b0f7ae1b4a03797413750c3c70e94e5d71abdb180e06bcb5f05fd19b6c6 SHA512 4374eb6b68f1ac7a8d57d7109f19225a9a6c3446ad08e8b93833d1ad0e0ec83d8c5fc69af8ab3d59fbacf94dddd076341f5d2050dc92c5398db3fb7aca4b4ffa
+EBUILD gnome-shell-40.0.ebuild 6372 BLAKE2B 920776ac1bc7c2e2aa5ab725b9117838d55aa354bebfeeb80860ffe42fb0ffee97a80ad8e77bec4703a322b79d538891932ddb8b59ed8d9963449781e83945ef SHA512 b141c7be05241867b970a42e5ce35630772927a8a0b322317e32775959381991c0fea8dbcc3f9552468254f2a234bad75ce885fcd5a0a3fac867591d3cad72c9
+EBUILD gnome-shell-40.1.ebuild 6372 BLAKE2B 920776ac1bc7c2e2aa5ab725b9117838d55aa354bebfeeb80860ffe42fb0ffee97a80ad8e77bec4703a322b79d538891932ddb8b59ed8d9963449781e83945ef SHA512 b141c7be05241867b970a42e5ce35630772927a8a0b322317e32775959381991c0fea8dbcc3f9552468254f2a234bad75ce885fcd5a0a3fac867591d3cad72c9
 MISC metadata.xml 1050 BLAKE2B cf97e536a47f3b023e118a818bbc34af63500d2ea94bbc71201d2ce18aa6e473673cb28a47245de24b7bad9a174a6dda6b46c300518521c8ea0662e88e95627d SHA512 50c1d4c3eacb89b77bc49b4f236bba9d9041ef047392d5bda19e85b0c935709a095a388b1625a2c77c66145758e9b4ab77a202aa6cdd2b86f262c5b56e428b06
diff --git a/gnome-base/gnome-shell/gnome-shell-40.0.ebuild b/gnome-base/gnome-shell/gnome-shell-40.0.ebuild
index de692c181599..1fc9453b4820 100644
--- a/gnome-base/gnome-shell/gnome-shell-40.0.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-40.0.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 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
 # FIXME:
diff --git a/gnome-base/gnome-shell/gnome-shell-40.1.ebuild b/gnome-base/gnome-shell/gnome-shell-40.1.ebuild
new file mode 100644
index 000000000000..1fc9453b4820
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-40.1.ebuild
@@ -0,0 +1,191 @@
+# 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/Manifest b/gnome-base/gnome/Manifest
index 33d38e84ec0b..6b6fe72be3eb 100644
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -1,2 +1,3 @@
 EBUILD gnome-3.36.5.ebuild 1397 BLAKE2B c5f4dcad2f22798ad5b4714064577ceb332a6f7f45a0ab57e45972e33a7648a60be90ef2dadaa66e301236d10001b3e4b1c11bac4eb178e890533d22a724ae75 SHA512 d3ca311bd1161f2346425d1c6699863a50a177168f8f2e1725d3d84e24960ed5023a4f11ee15bbb94d3b4730e3553281597b4e1df08e4eb7568c7ae172aaa66d
+EBUILD gnome-40.0.ebuild 1392 BLAKE2B 4bb2b68c0a6160e8363ab14fc95af158f1414289b8c8ae3f682f6fe743069eb43a74ce68dbd4bda60f591b1cb2a0016d44f71bab62cac43350e8c1cd8c3465a2 SHA512 17d98fa9d380584cc2e34d12d59c81c3b68405d83e00633af23ff4be79f218b1ecdd326c007346822629d6cb4d76c3501f3d6d7ef8d5b23f042fcb9d9e7f7a3f
 MISC metadata.xml 452 BLAKE2B 94890a098fcc359b62b9176f57baa243301ab562c549395f6307789987a668c095a1d571be9b7a5325ffdcbd51efaff100c1098ae0e2c337be11c54b3b703529 SHA512 459b43467672d33807e28cfa40ad930a083a026de9cc1dba2e5b795c1d766ca8f42591153164dbdedaeb7785d22a431eb5d1b36e618314ce792bb1c7da383d9a
diff --git a/gnome-base/gnome/gnome-40.0.ebuild b/gnome-base/gnome/gnome-40.0.ebuild
new file mode 100644
index 000000000000..8f2ee6a0416d
--- /dev/null
+++ b/gnome-base/gnome/gnome-40.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 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-40.0
+
+	>=x11-wm/mutter-${PV}
+	>=gnome-base/gnome-shell-${PV}[bluetooth?]
+	>=media-fonts/cantarell-0.301
+
+	>=x11-themes/gnome-backgrounds-40.0
+	x11-themes/sound-theme-freedesktop
+
+	accessibility? (
+		>=app-accessibility/at-spi2-atk-2.38.0
+		>=app-accessibility/at-spi2-core-2.40.0
+		>=app-accessibility/orca-40.0
+		>=gnome-extra/mousetweaks-3.32.0
+	)
+	classic? ( >=gnome-extra/gnome-shell-extensions-40.0 )
+	extras? ( >=gnome-base/gnome-extra-apps-${PV} )
+"
+PDEPEND=">=gnome-base/gvfs-1.48.0[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/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index b4c978ea2099..07dd1c70c3bb 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 1121 BLAKE2B 7f667c913003cba1f7a805d7a3db8f72a4d93506409a5901088bf3aeb0d27515f62a68aa89c2a03ddc1e93ed7d5989bab2ef5ba71150781110b78665fcecf8bf SHA512 ccb053d682416ee450aa54a23e69b13d780e0732604a3ba9a3233ba37af67675e89d9a39c9de5d2eae3bcff73143921fb69dacea6c894bbe9a0f568d9dbf2890
+EBUILD gsettings-desktop-schemas-40.0.ebuild 1128 BLAKE2B 731fa20624c8a488cc5bee85c255d5874b2c21962db01e17498fbfd1854562724dc0dbc186680c5a135d72ed2d7dcbe56e2f84065eccdd22245f68208d22a0e4 SHA512 9bda7ba55f31b9940c0da19809583671cce7b58ab094b0541c00bfdd6359a2dd49b8fa0aed71c1ea662a85ee81d29973722f74cb8f3b790011032d8441bd4332
 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 db3b3eb47c15..a5545f400e75 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 ~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/libgtop/Manifest b/gnome-base/libgtop/Manifest
index c75ec77b07dd..f9f3ddd5ea7a 100644
--- a/gnome-base/libgtop/Manifest
+++ b/gnome-base/libgtop/Manifest
@@ -1,5 +1,5 @@
 AUX 2.40.0-sandbox-workaround.patch 890 BLAKE2B b231acfa4f15b04d5148864da0ef32f08c65fd4ddcda940cd39d832bc30d46edb8f48633e08974521abee126251e5e80693bb224f0630f17065e7c5580ba9439 SHA512 ec5b1f9e9b8174dee576370ccfeb2d758ad5369c1ffacc7d8840f9936046fbedfd0d3e1e2b024606d33a32da59c65cdf204ba98fb108a92dcff660b0769d71b6
 DIST libgtop-2.40.0-patchset.tar.xz 9700 BLAKE2B 0d7e42b12fe0989df8e5abd1d45578acb97981c05c43aeeea57ba38f526e61aaa9507cd9520a20634f4559b4dfe60efd368d343f2d1ac6803e33bc5dc4832522 SHA512 15b5a81f4ec7a3e921a2c114e8f57dcca194e38849e09080c55a3a16078a8ec706f8efef6d4b22931927e7ab7789596e85054ccd85f37d6dd3206c962734960b
 DIST libgtop-2.40.0.tar.xz 744316 BLAKE2B 3ffd11937e29aacc4b0d5569429ec92835a3743d7cb65336c5c36165b1bb0d817629e73db88c29eff4baf4965791497a8676a897d0de9b394f583fb2cab15b3a SHA512 a9b2135796d7e41c63a6621f672c385d1baeb74d4af3e55c9164aaaae18c66a8a76b09a6ae8b37f89f120092123c38830e0da840c6613a09035ea62339117861
-EBUILD libgtop-2.40.0-r1.ebuild 1223 BLAKE2B 8902e9554f02e8570058446ae643772e21d5afc8c7e3abad8028848fb39ba8132c961ba573772c7009ba1b4ac59497f14875083bfeda31f99576bc46d80ea453 SHA512 bc9d3847aa408035e9e6f61ea788ba725c0e54512f6f88e8916126facf5326aa3fc2b74b988542e0a4e1ba23a6bda842f8faf0d9f7bdef6c7d939260f61101fa
+EBUILD libgtop-2.40.0-r1.ebuild 1230 BLAKE2B 979edc6d29be4cf1600ede999f2cf44b892238bb1d72fc5e346e620622e60972aa5f2f4a20a757a4771d14f16772fa301f76018f9182db8f85b7d40a21b4b335 SHA512 5284ead796d224541fe3cb601a77d394754a4829e444974d8608aac52a088b95cec13a9e824e55c5804de47a3690f5d7c56ab7d53a87e5dcc66a07bfcfde78c1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild b/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
index d9ce2f0f18fe..dc57dc6714f5 100644
--- a/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
+++ b/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="2/11" # libgtop soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 6a15bfebdd8d..6aedc26002d7 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -6,5 +6,5 @@ DIST librsvg-2.50.5.tar.xz 18958716 BLAKE2B 36ca7b9316f0384dfa0063035fe3b57adc9c
 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 2582 BLAKE2B 4d106ba7d0be3acd56af91cf045aae2010bc7d6adc125a1676e93a862fb989fdc1cea04d953518d10f246f594533a7562826311b03c59e5943bc978fae7507e7 SHA512 d7040b77c374f84aa22de634220f77e97c390c79ffb729ff186a08c60dd258d4a45037466713ef1bdf653de866b4b210e689a11a9561c73d59d98a982e852028
+EBUILD librsvg-2.50.5.ebuild 2589 BLAKE2B 4b332cd6a04c97908a61a30d18591eb3e1b7e6901637abf9aea07b93b6da06f7f6df33bcc3e3a0663a48355271779643382d9065784a3356d2ea535bb5e87cb3 SHA512 bebb2c340fa684c2d0f86d140e919423a89a787ddc3256e28ef49a5a150f1836534348bb9d1da4521760b8532e537f50f4107dc6b509063fe00787c2a1586fc5
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/librsvg-2.50.5.ebuild b/gnome-base/librsvg/librsvg-2.50.5.ebuild
index 7079e46b7a43..a1ef8939bee0 100644
--- a/gnome-base/librsvg/librsvg-2.50.5.ebuild
+++ b/gnome-base/librsvg/librsvg-2.50.5.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 ~riscv ~x86"
 
 IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"