gentoo resync : 25.11.2020

80 files changed, 509 insertions, 3163 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 0ad23fc9e8da..fc608297bfb6 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 101d06c8fe6f..1999166c058e 100644
--- a/gnome-base/dconf-editor/Manifest
+++ b/gnome-base/dconf-editor/Manifest
@@ -1,5 +1,3 @@
-DIST dconf-editor-3.34.4.tar.xz 568388 BLAKE2B 9b67ab82e01b551b898e7fd19a8990bf7f2acbf4dd9f80ad58226f82743fe96e856c0a0647be854141f25a3339d062da8eaba3c6b2fcdc6fe99718d25ce6b6b7 SHA512 8ac9be21838d66b57bcf8bcf14b7835398ebe2478bd851f8299c43427ccc7953f545dc0fa8f10dc2c5e837b9dcec4f503bc25ffd8c633066f5326873e3c4ef3f
 DIST dconf-editor-3.36.4.tar.xz 583084 BLAKE2B 7d7f5164a4917d13372a2bcf7f9fe7b82d630693601bba33da1c4f3afffa58e4589ff90c3e5ca3039351a681eac6584b335171f4dce9d0bfedaed52cc25d505c SHA512 a24fa44830fb0e83834cf912267de6597c1d6bf02e063af4255409d3c9a135fae409116d91751d00ee8d2319e7130606f007af76d3ec9f1380cda98ab2329eff
-EBUILD dconf-editor-3.34.4.ebuild 813 BLAKE2B e65391c443fecf58357d0a5e4af977e1dc6f62112bb19304613a6c34f41277962c1141053dfbb2fb5f9f0911e119c1238a1a0d8249763164f058e5334de161e9 SHA512 ac96d459b704a45e856a9a1cab563a00996079cf004f197b4b5aad65d3e64f1587918844ea87a8f0642322d8566838b686eab6af309aabf84160ba313be96a22
 EBUILD dconf-editor-3.36.4.ebuild 813 BLAKE2B e65391c443fecf58357d0a5e4af977e1dc6f62112bb19304613a6c34f41277962c1141053dfbb2fb5f9f0911e119c1238a1a0d8249763164f058e5334de161e9 SHA512 ac96d459b704a45e856a9a1cab563a00996079cf004f197b4b5aad65d3e64f1587918844ea87a8f0642322d8566838b686eab6af309aabf84160ba313be96a22
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf-editor/dconf-editor-3.34.4.ebuild b/gnome-base/dconf-editor/dconf-editor-3.34.4.ebuild
deleted file mode 100644
index 6e9c891bb893..000000000000
--- a/gnome-base/dconf-editor/dconf-editor-3.34.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/Manifest b/gnome-base/dconf/Manifest
index fdc6a2c35c7a..fd52070d66b2 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -4,5 +4,5 @@ AUX 0.32.0-meson-0.52-compat.patch 1148 BLAKE2B d33127e2e765f3f19282b33852b00b8a
 DIST dconf-0.34.0.tar.xz 112876 BLAKE2B 6890cd82a3ba81eac8c72dda93ebf1b82f3002b735bf2e059ba07a2f0f3817978a9e4f5dd37a9efab728fc2a4e20c34c519f9eeb3915d705ff8a3c4a65f9ab41 SHA512 8b28373f31fe36ba3f21f56fca84563681c3648ff595709880cd9ac49fc6b130ac375fb89fd585f1dd62b5a2f728127292ea57d18feca1147b709a93e8c4c743
 DIST dconf-0.36.0.tar.xz 114828 BLAKE2B 033cb2e095d9dac72bd07c5fa8280a3e1012aac6c1b0657d5455c2a519617be9112acca702ec4078554a814f36d12ee8e25201cc5b8aed2d33a32ef14e2f6fa5 SHA512 fed0b4ac13dfeff3bbe428a5c25408a0f13610219e561841a3af75cf18f9c630c385989b700c081b79ab53c00bdecf43c7c94979312c047faefbda4b2653d40d
 EBUILD dconf-0.34.0.ebuild 2192 BLAKE2B 74e61c5af928ef2effa2d23593105fa50e0487b3d842b39a66c210a1b06b194d34b95d03cfa536764971b29e5cc139776641f77accb85f8f3be5ccad478c59a1 SHA512 d474a1b2ec9f6d30579c853bdf9a7e53ee19913553a4c0d62adf586de5633552966e9567439f2769f7c671b87286c5eef613241d64d0d4caff624344b19d9902
-EBUILD dconf-0.36.0.ebuild 2101 BLAKE2B 11afe2abc5b561605376ca8198a84240fcd5f80430625b5abae8060885da42807ebe8bab94c628f86b260bb71ac4af1b88a2aad3c21e7de57a106343a54a440b SHA512 7b36d871164e4b6465d310492676d73e47705480c3968e248d74ca3e95eb181a393d2988e8ab89b6c1801fb40d7974b8c572dc65b24158f38e186a4e5e599f27
+EBUILD dconf-0.36.0.ebuild 2097 BLAKE2B 7e71fa2b313e71cbe2b370610ab7d6639d2929a01b774150a5bacb97ac18e4235524f1c4454ebf6610ab901fb089ac0f0ea785893c2ceafe1cf004fe58bb362a SHA512 0c1073bd85224b86db54e9ebdeddc82347ad668d9594a849ff74f34d2d3457fd942fbc060ffd632e9764df107d3141721cb33588ad32aa3d1090913305234d23
 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
index 2b12d651292e..837fd6a3656e 100644
--- a/gnome-base/dconf/dconf-0.36.0.ebuild
+++ b/gnome-base/dconf/dconf-0.36.0.ebuild
@@ -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 ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
 IUSE="gtk-doc"
 RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
 
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 4d3f8b2b2b60..58f4e17db7dc 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -6,11 +6,9 @@ AUX gdm-3.30.3-logo.patch 846 BLAKE2B e99b6621191c509545bc36fe838bc467c3762f2726
 AUX gdm-3.8.4-fingerprint-auth.patch 923 BLAKE2B e681da8518ed1d002c1205658bb35e472e9d130df5d70dfd9eef55f5361cffeee716ebe0eea23f4c19f9f6ec2f4118729616f7f4e2c758990cf7cde3271cc8b2 SHA512 3cf5f9c0eabdae3f767d9b9db6052d760e879c14b9304753cdda56a4f643a9ed97f3ea83f642bfe96d220c8e9e4f99fbbd47c6e99ddfebeb6322a3a033c296d5
 AUX gdm-CanGraphical-wait.patch 5534 BLAKE2B 3be217b156ab6d486d7df98885934c5d1bedd6219a25a83cba687aa1ed59f6d0f2a16694a47050313e601355696095ccc738ac639f5958d9619db81d34efe068 SHA512 2152e800051473b8fd230c4b325d72229cfe91dce3e90ad6d8ace8e3278483ab05ce683e61c183f7c83e293873f69715740b1eccfdb34d6775140c635c73b5dd
 AUX pam-elogind.patch 835 BLAKE2B 1db26b690d631c152ae7fd84149c7ff3222e8bd258bff78e09cd6f00fe34a8bfdb2499b252a1f15e17d9e4ed315e02260357b57cd31cf8ada5a2705ba1ef4ee0 SHA512 4d2d65741a5bfd1dc686dc986708526161d15ace2d5396bef281a2192d95458a072764483e1422ed1f6eb594fc0caa6baa381371618f907a97f75566209fab7b
-DIST gdm-3.34.1.tar.xz 1244960 BLAKE2B c6e53b37baa75f202725b21b58e22cc84d44d241cc3fa10dd466e1a766ce4081bf436e965dcd38f0c009b5145813c95d77c76ca31ef837e8d0251c6d65d06ca9 SHA512 71b71699e8e31643080d2af5dc54381592c0c6a2f7adbb0434a9957c8e59c67a20afaf48dce57139453157572c5bae617134420f36e8da68fbc74e95746d26fb
-DIST gdm-3.36.2.tar.xz 1214564 BLAKE2B e456ac171dcd2918d5c93a556741e62c29ce1611c318c2220093b3359649e1cd9d18bdc592e994b0f50f0b99892658f970eba939aeaf281f6f6eb773d4a97944 SHA512 5c02f00ce20a5b7b426043ab26640dd0a54a57bbff7eb2e449195bc3d6e36ad464487424fdc5be72fc542265bff6877317e693f6221c95a987f86c7a5dc6893e
 DIST gdm-3.36.3.tar.xz 1218972 BLAKE2B 8e4d3dcd1dc84de276a6426feae206d43cfcbd8c8ffa24325f0dcc1bc2b180d9dbee20849b8e3157d299017ad91b433be54a78eafc7319171806ec6c6348bb1f SHA512 21c3bba0ce5142362e3c86ccb05fc234d9356db295ed63f3c383bd7cc2b7a464bdcec08e472d31a339b5ffbfeaed4db72ebbdeae2e7a71effdeef8c52b53830b
+DIST gdm-3.36.4.tar.xz 1235796 BLAKE2B eeac6c3c95993d7a75eecd03b51f0519b2f899eaecce8767dbab01eead68bddde21edc999eaf6b7ce747084ac9f88ab71cd7bf602e3bdc5bfe09038e3b01ad3a SHA512 ee8a4ae4a1c4846e4d52fda0b115dfc79ef76b78a2349977767e4212910b5ad331b908601f252292a8a944973372d1dce3124d9ccb8a2519a98d0e4813a6ec61
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gdm-3.34.1.ebuild 7687 BLAKE2B 184f7e6088b72f974c07f82ea049a6d8c91d2312dafe67753694e1b9e1fee08162396d7aeb12691eee345bafe32aaecedaef1bf5350d6e20fc88628cfcfedfaa SHA512 507d1b05567c0ec34dc51c2f65cab1e4bdf63f8d33a79433c298e3aa33dd08e6daeff024777d311a31ea6283aa8ea737a06a9e0467dafe8574a46cea8ac051a9
-EBUILD gdm-3.36.2.ebuild 7889 BLAKE2B 4d5c40a3ce81d61ac6afbf5d62a8f3f149247d6ed1297bac01bd6bcbb0d9ef019452499a0fe7a580494263408c962bc1cf75088043710f1719ff6854f780a81c SHA512 33db551ec84c33a93bd1ea1a320d76b288be4c1c5299463bc0083f00e9ab23cc0089a377770f1bf6337a0445e5b8a1b27ae0ad28acad085528a2e5d1f6c5fe6d
 EBUILD gdm-3.36.3.ebuild 7848 BLAKE2B d3cc0f474d8cbcc85bfb29be59eafc0eacb309a2af1a325912175f09dbde532e067678c571a6551177d267ca5f512f32f013d84f18f85758b636fd10aa4560d7 SHA512 637ac2d69615a106f621c85e0d5148c04f11cb84ff588dbdf12dd5ca3e3f6f5f93d1e627e290360695b74e8c21d511f36fbfd2afbbaa4aaf2e9d45938995cc93
+EBUILD gdm-3.36.4.ebuild 7850 BLAKE2B d65984956fff82c3b507e434ca7a872db14fa50e1cc0520f062e20f303232137a43c47e29c39a8b6016d1175fe1a59d7e17c0bbcae582d4ec0a736e4a1534712 SHA512 6f4d21bf90e972864e65db12775d1c20931ecd7bfaa592392cc46dc5d301697a4b36a06699332976748d916c8b5259c060fe60762e508f98de49f0aba3a9776e
 MISC metadata.xml 759 BLAKE2B 13de28afc8fe81580a2aa28c5fdc17c77266595ffe95218cfbb5cbee4cbd6edab21e8cd06698e4a5feeb696fd9530ef8bf14209ecf3d03039b4e0562bb757375 SHA512 68cec6972bcabcb873fb314babbf9bdfacc7eaae40d662d11662fccd6cbf6630cd93b7322baa271081244c77fd1458c89ad785a0eb2a58b448ddff663381d98d
diff --git a/gnome-base/gdm/gdm-3.34.1.ebuild b/gnome-base/gdm/gdm-3.34.1.ebuild
deleted file mode 100644
index 8f95ce48a07e..000000000000
--- a/gnome-base/gdm/gdm-3.34.1.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit eutils gnome2 pam readme.gentoo-r1 systemd udev user
-
-DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
-HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
-
-SRC_URI="${SRC_URI}
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="
-	GPL-2+
-	branding? ( CC-BY-SA-4.0 )
-"
-
-SLOT="0"
-
-IUSE="accessibility audit bluetooth-sound branding elogind fprint +introspection ipv6 plymouth selinux smartcard systemd tcpd test wayland xinerama"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="^^ ( elogind systemd )"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
-
-# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
-# nspr used by smartcard extension
-# dconf, dbus and g-s-d are needed at install time for dconf update
-# 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
-	elogind? ( >=sys-auth/elogind-239.3[pam] )
-	systemd? ( >=sys-apps/systemd-186:0=[pam] )
-
-	sys-auth/pambase[elogind?,systemd?]
-
-	audit? ( sys-process/audit )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	plymouth? ( sys-boot/plymouth )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xinerama? ( x11-libs/libXinerama )
-"
-# XXX: These deps are from session and desktop files in data/ directory
-# fprintd is used via dbus by gdm-fingerprint-extension
-# gnome-session-3.6 needed to avoid freezing with orca
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-session-3.6
-	>=gnome-base/gnome-shell-3.1.90
-	x11-apps/xhost
-
-	accessibility? (
-		>=app-accessibility/orca-3.10
-		gnome-extra/mousetweaks )
-	fprint? (
-		sys-auth/fprintd
-		sys-auth/pam_fprint )
-
-	!gnome-extra/fast-user-switch-applet
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( >=dev-libs/check-0.9.4 )
-	app-text/yelp-tools
-" # yelp-tools needed for eautoreconf to not lose help docs (m4_ifdeffed YELP_HELP_INIT call and setup)
-
-DOC_CONTENTS="
-	To make GDM start at boot with systemd, run:\n
-	# systemctl enable gdm.service\n
-	\n
-	To make GDM start at boot with OpenRC, edit /etc/conf.d to have
-	DISPLAYMANAGER=\"gdm\" and enable the xdm service:\n
-	# rc-update add xdm
-	\n
-	For passwordless login to unlock your keyring, you need to install
-	sys-auth/pambase with USE=gnome-keyring and set an empty password
-	on your keyring. Use app-crypt/seahorse for that.\n
-	\n
-	You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
-	for smartcard support
-"
-
-pkg_setup() {
-	enewgroup gdm
-	enewgroup video # Just in case it hasn't been created yet
-	enewuser gdm -1 -1 /var/lib/gdm gdm,video
-
-	# For compatibility with certain versions of nvidia-drivers, etc., need to
-	# ensure that gdm user is in the video group
-	if ! egetent group video | grep -q gdm; then
-		# FIXME XXX: is this at all portable, ldap-safe, etc.?
-		# XXX: egetent does not have a 1-argument form, so we can't use it to
-		# get the list of gdm's groups
-		local g=$(groups gdm)
-		elog "Adding user gdm to video group"
-		usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
-	fi
-}
-
-src_prepare() {
-	# ssh-agent handling must be done at xinitrc.d, bug #220603
-	eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
-
-	# Gentoo does not have a fingerprint-auth pam stack
-	eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
-
-	# Support pam_elogind.so in gdm-launch-environment.pam
-	eapply "${FILESDIR}/pam-elogind.patch"
-
-	# Wait 10 seconds for a DRM master with systemd. Workaround for gdm not waiting for CanGraphical=yes property on the seat. Bug #613222
-	eapply "${FILESDIR}/gdm-CanGraphical-wait.patch" # needs eautoreconf
-
-	# Show logo when branding is enabled
-	use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# PAM is the only auth scheme supported
-	# even though configure lists shadow and crypt
-	# they don't have any corresponding code.
-	# --with-at-spi-registryd-directory= needs to be passed explicitly because
-	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
-	# Xevie is obsolete, bug #482304
-
-	# --with-initial-vt=7 conflicts with plymouth, bug #453392
-	# gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which
-	# saves on memory. However this means if we don't start on VT1, gdm doesn't start up
-	# before user manually goes to VT7. Thus as-is we can not keep gdm away from VT1,
-	# so lets try always having it in VT1 and see if that is an issue for people before
-	# hacking up workarounds for the initial start case.
-	# ! use plymouth && myconf="${myconf} --with-initial-vt=7"
-	local myconf=(
-		--enable-gdm-xsession
-		--enable-user-display-server
-		--with-run-dir=/run/gdm
-		--localstatedir="${EPREFIX}"/var
-		--disable-static
-		--with-xdmcp=yes
-		--enable-authentication-scheme=pam
-		--with-default-pam-config=exherbo
-		--with-pam-mod-dir=$(getpam_mod_dir)
-		--with-udevdir=$(get_udevdir)
-		--with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec
-		--without-xevie
-		$(use_enable systemd systemd-journal)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		$(use_with audit libaudit)
-		$(use_enable ipv6)
-		$(use_with plymouth)
-		$(use_with selinux)
-		$(use_with tcpd tcp-wrappers)
-		$(use_enable wayland wayland-support)
-		$(use_with xinerama)
-	)
-
-	if use elogind; then
-		myconf+=(
-			--with-initial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility
-			SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
-			SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
-		)
-	fi
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_install() {
-	gnome2_src_install
-
-	if ! use accessibility ; then
-		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
-	fi
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}/49-keychain-r1" 49-keychain
-	newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
-
-	# gdm user's home directory
-	keepdir /var/lib/gdm
-	fowners gdm:gdm /var/lib/gdm
-
-	if ! use bluetooth-sound ; then
-		# Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10
-		# bug #679526
-		insinto /var/lib/gdm/.config/pulse
-		doins "${FILESDIR}"/default.pa
-	fi
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm
-
-	use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	local d ret
-
-	# bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm
-	ret=0
-	ebegin "Fixing "${EROOT}"var/lib/gdm ownership"
-	chown --no-dereference gdm:gdm "${EROOT}var/lib/gdm" || ret=1
-	for d in "${EROOT}var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do
-		[[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1
-	done
-	eend ${ret}
-
-	systemd_reenable gdm.service
-	readme.gentoo_print_elog
-}
diff --git a/gnome-base/gdm/gdm-3.36.2.ebuild b/gnome-base/gdm/gdm-3.36.4.ebuild
index 1b9c4a9aea48..12a42230f315 100644
--- a/gnome-base/gdm/gdm-3.36.2.ebuild
+++ b/gnome-base/gdm/gdm-3.36.4.ebuild
@@ -82,8 +82,6 @@ RDEPEND="${COMMON_DEPEND}
 	fprint? (
 		sys-auth/fprintd
 		sys-auth/pam_fprint )
-
-	!gnome-extra/fast-user-switch-applet
 "
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index 1d0470f2242b..94bbfa0d40df 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-applets-3.34.0.tar.xz 8626548 BLAKE2B 0591269015570da4e7ab9a7a4568a032faa6209378736de57dc54cb395b545bd029a52f7ba6de39aee8f23c255ae3c24fa6defc33e971d270e6fc0e301add12f SHA512 5d16ca9d1f6c65fa59246a860f0d5723e77bf800c9362a254a8435750e52c4beb0e65aa8994e5578cfa1db7130dc92eaf4cb477ab401da402d31ea7f5aac1b51
 DIST gnome-applets-3.36.4.tar.xz 8638044 BLAKE2B 1ccf045c568ca2d4280eeeebbaec67b63f9c2f1edd3248ef89ff93ef7d468e6a581f3c678e93ff45662368b9ecd189aa38da2ca91a7b14ed3e7b2bd6aac8971f SHA512 6fd8f891358f02f40c8d6548b1680139f18cbbcd20d773798a998246b6431692ce8550e8652eaff09bde3651a4e5449779a0dc85b897345a22c17be2e386d2c7
-EBUILD gnome-applets-3.34.0.ebuild 1466 BLAKE2B 86174b0142926612639bf20646cb2f3b15c6a7a93b2cdaa528cbd64610e86af16b41d01d207bbb1a22ad69a3da91ef42b54c40b7121e1aefd0f9bfec496da839 SHA512 4c13bb75f266191821a4cc4af76f231d8cb910ce9f9ad999746c5e0f9ce77373724c8fdc79f63becf5b74fd07a588f84db24081c0cbfc4d189c4c34f19751f21
 EBUILD gnome-applets-3.36.4.ebuild 1441 BLAKE2B 67e91aee32ed9150486f1752191491ceb569807cc111a953c88e87af7b6875e64906a1a1e033839422ce2ec033d8673863dc6c01d7d0499f68e41b3d50a7d6a9 SHA512 19f95d6aa983f7ed091ae0715a5198919a3630fef2400b3adb52e8be8fc85096a8a277b6e6265e4b4ac42ce437a898ea0444110ee1e3abd60ea9413cee28b784
 MISC metadata.xml 327 BLAKE2B 3067a9007002523f34c1a64a1ac7c54c974c814adcc951d35cc3d9f6940b1feecbaf458603e0fadd7c812c94958feff3a7835ac93746270496f68ffaab2df222 SHA512 614f3b213955d128a1e6b7424477a2bf4b01b5ed1272d2493d97b17ef806dd39a6f3326112736785cab07d206a01a3121bf5902154b5c1016b7ca254a75910a9
diff --git a/gnome-base/gnome-applets/gnome-applets-3.34.0.ebuild b/gnome-base/gnome-applets/gnome-applets-3.34.0.ebuild
deleted file mode 100644
index 6bac6f49e357..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-3.34.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Applets for the GNOME Flashback Panel"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-applets/"
-
-LICENSE="GPL-2+ FDL-1.1"
-SLOT="0"
-IUSE="ipv6 tracker upower"
-KEYWORDS="~amd64"
-
-# FIXME: automagic wireless-tools
-# TODO: gucharmap could be optional, but no knob
-# TODO: libgweather could be optional, but no knob
-RDEPEND="
-	>=x11-libs/gtk+-3.20.0:3[X]
-	>=dev-libs/glib-2.44.0:2
-	>=gnome-base/gnome-panel-3.24.1
-	>=gnome-base/libgtop-2.11.92:=
-	>=x11-libs/libwnck-3.14.1:3
-	>=x11-libs/libnotify-0.7
-	upower? ( >=sys-power/upower-0.9.4:= )
-	>=sys-apps/dbus-1.1.2
-	>=dev-libs/dbus-glib-0.74
-	>=x11-themes/adwaita-icon-theme-3.14.0
-	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/libgweather-3.28.0:2=
-	>=gnome-extra/gucharmap-2.33.0:2.90
-	>=sys-auth/polkit-0.97
-	x11-libs/libX11
-	tracker? ( app-misc/tracker:0/2.0 )
-"
-# app-text/docbook-sgml-utils for jw binary
-DEPEND="${RDEPEND}
-	app-text/docbook-sgml-utils
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-util/glib-utils
-	>=dev-util/intltool-0.35.0
-	dev-util/itstool
-	sys-devel/gettext
-	x11-base/xorg-proto
-	virtual/pkgconfig
-" # yelp-tools and autoconf-archive for eautoreconf
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_with upower) \
-		--disable-battstat \
-		--disable-cpufreq \
-		$(use_enable tracker tracker-search-bar) \
-		$(use_enable ipv6)
-}
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 374e47a2ba26..90f78ceb19e5 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,8 +1,4 @@
-AUX gnome-control-center-3.32.2-fix-gcc10-fno-common.patch 706 BLAKE2B c53a8ba8e45682fb6af8114154724453bdaae589184b6b1eab85b8db33e8169e69b5cf1055c53857a20682e177a212640d60050351fd267346fa797eff0c2c13 SHA512 76c01a7f72230b7aad7b21dba9f58063a0ce93a945ac5a3c19a5a7c9af6dcb8225d3143b099e9ee6938b11107a511b1b1b580558ec57aa9c973e7cad0b26f1d0
-DIST gnome-control-center-3.34.5-patchset.tar.xz 7500 BLAKE2B 6ec377725fa81a2d49eb0496b31adf7a303505b4478781dd3d4f2c0b204996ae94e3bb5b9b43c324d8e317d66646ee28fa2e471ff884b709c03419fd0243f342 SHA512 c658f0515a7b72c78c3ec6c78a1586169d21f01a40211e14d9e70fade3d5a18e29639c2aa5ef37dc6c741df9f9b7478cb221c83e3f1b4e4876e6b854e38ff524
-DIST gnome-control-center-3.34.5.tar.xz 6234916 BLAKE2B 9c41ee8f24a66ff66173587f0f75bb743434f21315281db11577bed2c4770c9da5606df37020d4951b7e542171298abceef65ba02e66519737aeb30bb6bd3861 SHA512 564cf514345c45c39003e309d9d93a862cfe801e84968412f6c69031745df0683716423de2d85cde166fc9eb256a45be713e7eb62c8ac3e8e4a59e91ab160156
 DIST gnome-control-center-3.36.4-patchset.tar.xz 12320 BLAKE2B a387d793186c898a14d54060214fbd075389afe402b1ad937a00295eed339a529863752324ba26f691ad468f214acda60be5bc23167d95fdf842f26a24442e55 SHA512 6f11425f13590e7850114613efa82e8762bd62687839c9374d2618ab81a08f1abb871d2a8f452811e46fa53af7007167f7b9ca68e0822daee22e9de33e0be94b
 DIST gnome-control-center-3.36.4.tar.xz 6304992 BLAKE2B 7c52faf2a9a0f642f24f59e2035ae57e7816d69c8ee639cde76db7d69f8063c9eff2e068b95710d13316c267b5cf6c6647cb1359ac592968b1c5021730081130 SHA512 e6c398256215a139042e5bb0db7c83fc0e39f99ab893760e37ba303ec4c932a37da352b92487ed1bdc61f2e8f61352c752b48ab549269e3f84e21a71cdf32abf
-EBUILD gnome-control-center-3.34.5-r1.ebuild 6397 BLAKE2B 6fd09e823aeb0cf1a4885cc65d4b1a95faa52cb39713aa93bae1581328866d4dc3a107d5dd88068dfe2b22f485bd430746187e5f5d08aa7dde3c5cbe1535d8ad SHA512 82832674dd8f9db8fe838b41f09c1912586fc23d957ac7a60454cd7e2f32da45972b1d6f50b4038b60044061d42039e87aee44229e74fb69b1e48fb69c4034dc
 EBUILD gnome-control-center-3.36.4.ebuild 6336 BLAKE2B 1c77dcaf7ce58bad205e7c8c4f95c8fe364d7a7372131861395004cfa3c9b5a8419bf6b33ade7b289e702f2c3b75129c4d5c7ae402cb7ae0b69247f4994fe719 SHA512 48687fa14af525b41da88b39b4d2b67d6129e03feaccba629c19a7c8a8851af117c03d160a4114bcc433702777c899a6836d93790d6799675f53e4eba6360dc2
 MISC metadata.xml 588 BLAKE2B 6fb4fefc43b162c8ac2a671ed7a6878ebe19edeaf018bb37f32a0c0aa6208b8cb68392b24fde56e1aaf5227756b157fbfa10470c350bb472c270ac7436827ff3 SHA512 d2891d89abf4a64e97ab84ed45e45b4115ebb1990b2ef8a91f069433a61aea4d97d060376e088aec5e9aec7475c0263ac072f081cb5f0c3d67206ed077051e1d
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.32.2-fix-gcc10-fno-common.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.32.2-fix-gcc10-fno-common.patch
deleted file mode 100644
index b0a7a7026548..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.32.2-fix-gcc10-fno-common.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 901ef8b0ff2b05692cbaa119097f70615ea77ed4 Mon Sep 17 00:00:00 2001
-From: Mike Gorse <mgorse@suse.com>
-Date: Thu, 9 Jan 2020 21:34:12 +0000
-Subject: [PATCH] Thunderbolt: make BoltError enum a typedef
-
-Fixes error when compiled with -fno-common
----
- panels/thunderbolt/bolt-error.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/panels/thunderbolt/bolt-error.h b/panels/thunderbolt/bolt-error.h
-index 39b3eee98..7d3823d35 100644
---- a/panels/thunderbolt/bolt-error.h
-+++ b/panels/thunderbolt/bolt-error.h
-@@ -31,7 +31,7 @@ G_BEGIN_DECLS
-  *
-  * Error codes used inside Bolt.
-  */
--enum {
-+typedef enum {
-   BOLT_ERROR_FAILED = 0,
-   BOLT_ERROR_UDEV,
-   BOLT_ERROR_NOKEY,
--- 
-2.24.1
-
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.34.5-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.34.5-r1.ebuild
deleted file mode 100644
index 531f4008a06e..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.34.5-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +cups debug elogind flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test v4l wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	flickr? ( gnome-online-accounts )
-	^^ ( elogind systemd )
-" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
-
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# display panel requires colord and gnome-settings-daemon[colord]
-# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
-# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
-# >=polkit-0.114 for .policy files gettext ITS
-# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
-DEPEND="
-	>=gui-libs/libhandy-0.0.9:0.0=
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= )
-	>=media-sound/pulseaudio-2.0[glib]
-	>=sys-apps/accountsservice-0.6.39
-	>=x11-misc/colord-0.1.34:0=
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=dev-libs/glib-2.53.0:2
-	>=gnome-base/gnome-desktop-3.27.90:3=
-	<gnome-base/gnome-desktop-3.35.4
-	>=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?]
-	>=gnome-base/gsettings-desktop-schemas-3.31.0
-	dev-libs/libxml2:2
-	>=sys-auth/polkit-0.114
-	>=sys-power/upower-0.99.8:=
-	dev-libs/libgudev
-	x11-libs/libX11
-	>=x11-libs/libXi-1.2
-	flickr? ( >=media-libs/grilo-0.3.0:0.3= )
-	>=x11-libs/gtk+-3.22.0:3[X,wayland=]
-	cups? (
-		>=net-print/cups-1.7[dbus]
-		>=net-fs/samba-4.0.0[client]
-	)
-	v4l? (
-		>=media-video/cheese-3.28.0 )
-	ibus? ( >=app-i18n/ibus-1.5.2 )
-	networkmanager? (
-		>=net-libs/libnma-1.8.0
-		>=net-misc/networkmanager-1.12.0:=[modemmanager]
-		>=net-misc/modemmanager-0.7.990 )
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
-	input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
-	kerberos? ( app-crypt/mit-krb5 )
-
-	x11-libs/cairo[glib]
-	>=x11-libs/colord-gtk-0.1.24
-	net-libs/libsoup:2.4
-	media-libs/fontconfig
-	gnome-base/libgtop:2=
-	>=sys-fs/udisks-2.1.8:2
-	app-crypt/libsecret
-	media-libs/gsound
-	>=dev-libs/libpwquality-1.2.2
-"
-# systemd/elogind USE flagged because package manager will potentially try to satisfy a
-# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
-# libgnomekbd needed only for gkbd-keyboard-display tool
-# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${DEPEND}
-	systemd? ( >=sys-apps/systemd-31 )
-	elogind? ( app-admin/openrc-settingsd
-		sys-auth/elogind )
-	x11-themes/adwaita-icon-theme
-	>=gnome-extra/gnome-color-manager-3.1.2
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	>=gnome-base/libgnomekbd-3
-	wayland? ( dev-libs/libinput )
-	!wayland? (
-		>=x11-drivers/xf86-input-libinput-0.19.0
-		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
-	flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] )
-
-	!<gnome-base/gdm-2.91.94
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
-# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
-	networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
-
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.2
-	x11-base/xorg-proto
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep '
-		dev-python/dbusmock[${PYTHON_USEDEP}]
-	') )
-"
-
-PATCHES=(
-	# Patches from gnome-3-32 branch on top of 3.32.2
-	# Makes some panels and dependencies optional
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	# Fix some absolute paths to be appropriate for Gentoo
-	"${WORKDIR}"/patches/
-
-	"${FILESDIR}"/${PN}-3.32.2-fix-gcc10-fno-common.patch # fixed in 3.35.90
-)
-
-python_check_deps() {
-	use test && \
-		has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	# Mark python tests with shebang executable, so that meson will launch them directly, instead
-	# of via its own python-single-r1 version, which might not match what we get from python_check_deps
-	chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth)
-		$(meson_use v4l cheese)
-		-Dcups=$(usex cups enabled disabled)
-		-Ddocumentation=true # manpage
-		-Dgoa=$(usex gnome-online-accounts enabled disabled)
-		-Dgrilo=$(usex flickr enabled disabled)
-		$(meson_use ibus)
-		-Dkerberos=$(usex kerberos enabled disabled)
-		$(meson_use networkmanager network_manager)
-		$(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-core-apps/Manifest b/gnome-base/gnome-core-apps/Manifest
index ad53f78dcf4d..6cb9ab2d6634 100644
--- a/gnome-base/gnome-core-apps/Manifest
+++ b/gnome-base/gnome-core-apps/Manifest
@@ -1,3 +1,2 @@
-EBUILD gnome-core-apps-3.34.4.ebuild 1653 BLAKE2B 6b8c22a53bfedc16e329549ae6fbc30a8b31ad6fcea7173e4f433d1b2be4d18b6fc2058b0d39384cb6e85c657acb441616121a6ebe0749f5f9946e6220286529 SHA512 bfb58731a1d5d3742738accf92db638a527f66c51ac20d5fc5cb3e1a99a924cafe661a52ef0689a3627873c690350e96875ff580b87ff1a20dd944f8edc15b28
 EBUILD gnome-core-apps-3.36.5.ebuild 1584 BLAKE2B 1b8d8373462487462edfbaa58f762223680662c2a2a442096a0fca951dee1beeaa26c50563051cc1b26d023c79c32d949927c2f2bf25cd2f0493766e852e4ca0 SHA512 7e9040f1b9e3afc6984b718b33b5362ab0286a14b770cc4b285e7baab681d3e0e48d20944b6b14c18a8db7a947cef7b6bbf7feb9a6823f67651262463479669d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.34.4.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.34.4.ebuild
deleted file mode 100644
index 62443e787a84..000000000000
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.34.4.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
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-
-	>=gnome-base/gnome-session-3.32.0
-	>=gnome-base/gnome-settings-daemon-3.34.2[cups?]
-	>=gnome-base/gnome-control-center-3.34.4[cups?]
-	>=gnome-extra/gnome-color-manager-3.32.0
-
-	>=app-crypt/gcr-3.34.0
-	>=gnome-base/nautilus-3.34.2
-	>=gnome-base/gnome-keyring-3.34.0
-	>=gnome-extra/evolution-data-server-${PV}
-
-	>=app-crypt/seahorse-3.32.2
-	>=app-editors/gedit-3.34.1
-	>=app-text/evince-3.34.2
-	>=gnome-extra/gnome-contacts-3.34.1
-	>=media-gfx/eog-3.32.1
-	>=media-video/totem-3.34.1
-	>=x11-terms/gnome-terminal-3.34.2
-
-	>=gnome-extra/gnome-user-docs-3.34.1
-	>=gnome-extra/yelp-3.34.0
-
-	>=x11-themes/adwaita-icon-theme-3.32.0
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.34.0 )
-"
-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
-# eog kept back due to rust librsvg req
-# adwaita-icon-theme kept back due to visual corruption when build with non-rust librsvg
-
-S="${WORKDIR}"
diff --git a/gnome-base/gnome-core-libs/Manifest b/gnome-base/gnome-core-libs/Manifest
index 673dbd66cb5d..0463431f792d 100644
--- a/gnome-base/gnome-core-libs/Manifest
+++ b/gnome-base/gnome-core-libs/Manifest
@@ -1,4 +1,3 @@
-EBUILD gnome-core-libs-3.34.4.ebuild 1236 BLAKE2B 0490f724def9c59fabb7cca7b607c76c592525cee6b292c54940843df8512ff4d79c9735dc725e8ab13bbbbc9c0aae1ceb43eebb561f3dc593730fff7c7044f9 SHA512 4fa521a55bff944fbfb4c4794906c1c9ec17f1627422337ef8b39ab8fa450e72c8d86c953c37552920343ca93f701a03ee0ced8095d0b672de2ec9c8ba4116dc
 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
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.34.4.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.34.4.ebuild
deleted file mode 100644
index 7aaae9baf73c..000000000000
--- a/gnome-base/gnome-core-libs/gnome-core-libs-3.34.4.ebuild
+++ /dev/null
@@ -1,44 +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.62.5:2
-	>=x11-libs/gdk-pixbuf-2.40.0:2
-	>=x11-libs/pango-1.42.4
-	>=x11-libs/gtk+-3.24.14:3[cups?]
-	>=dev-libs/atk-2.34.1
-	>=gnome-base/librsvg-2.40.21
-	>=gnome-base/gnome-desktop-${PV}:3
-	>=x11-libs/startup-notification-0.12
-
-	>=gnome-base/gvfs-1.42.2
-	>=gnome-base/dconf-0.34.0
-
-	>=media-libs/gstreamer-1.14.4:1.0
-	>=media-libs/gst-plugins-base-1.14.4:1.0
-	>=media-libs/gst-plugins-good-1.14.4:1.0
-
-	python? ( >=dev-python/pygobject-3.34.0: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-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index e6b084d3e45b..8ca745c9b6fa 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,8 +1,8 @@
 AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c0265f34d5d0fd555ae60a519273512021cf4f065db1e22ab72ce9004a914a47d077551b5a12ffbd5e81a9b8cf098a4762a0e461d SHA512 ea76e41aff067281497b98c86b66d8c382124ceead5b18e729342615a50b6aa3401f4d7c5553023b5d78ca0ea02823c7d6026ba9acca862804351269e4107d18
-DIST gnome-desktop-3.34.7.tar.xz 718220 BLAKE2B 89bfd00a356cd47d865aa4df1079b37b08c6a85f4380b5424181ce247248c7f11f0ca135858afb0c00fc4ff47175ff2acbb0b67cebe75e0b0a9f27263f0a9d69 SHA512 efc466d2a7a8a142e76a07c8cb75bad51aafbb2e70432e339713965890e6a83554a5f77ef6cdb6aa9e3ebace4883fb6d3d06004d7a2446d6960319cacbec7639
-DIST gnome-desktop-3.36.4.tar.xz 736324 BLAKE2B 68abef71e1732f72eabc6cac83b513af30d8cd39f92baaa57757bb818f8309a82a1ed8dcecef6015d6b8fb08f24e2ab041ccb796955c599a4cf43c412dd0c147 SHA512 06683df9a774487f386cf5aece586fb9666fdebfe5c9ea247e6ab91f6f281ca0241b13e9eb4e0eda1fb856b9cf1109fea859964998df2e2b06c8861efc76316f
 DIST gnome-desktop-3.36.5.tar.xz 738956 BLAKE2B 6c419df487e908f57a1dc8798a8dfe8b574d8c5c9aa5d83e45aed233ba856ba398367a990aa83fb1b8966aad02c868cd0e41805908863ea8fef24cc3ade3687c SHA512 0b5ad42c0832d58552270e9e24dabf56668c4fbb84d07812e4a2a34cff0a67344a7c8ee963a53a703b2e4bb28c67035bf2ce854ea271194511dc66e051481b1b
-EBUILD gnome-desktop-3.34.7.ebuild 2022 BLAKE2B 67eb2266a63db598d5fa7fe26a7f8ca9206335685c310d821da32c5bd47319aafd703e4f12353310776098734eb5496e3842c20ed3dff55213843ed3eb1037b1 SHA512 0a32a031cb21a1b977997aa498edae51979674b01f15cf79f8876e3dca0e6498280eab2242a0fd948b1a7443239fc87d69113ca6b3b8b103f32dab5bba889301
-EBUILD gnome-desktop-3.36.4.ebuild 2025 BLAKE2B 5ea77d5672464d313a241a3d74f047935d40857c95a90eea21c1f4005f28a90e58000d0448ccef3c5718551f339138ba456bcb4e25804e21cdc7acba66da2ec5 SHA512 a37c5dde9f212becf1661b65364a97b9ed4bfe194cc651e208bd152addf7eee42b6ddc5d83bf7c4cfefdd205e5fb7723b03047e14e13a44a1f50e22b77ba1a52
+DIST gnome-desktop-3.36.7.tar.xz 739284 BLAKE2B fb64db72883ca6b5001b519f6ce3b5b26605e081530ff27728bc565e5d3ce832281adf3d10107e74028d14d9d1e5fa64f8e5d447c13690ff67aa3d2c2816c2e8 SHA512 20e3566ce1c36399a7fa359dd218f0357e1deef54ad613ce825d19f9266d98ed03c5ae59843100b36dcc6b3cdee8479ea9403514eb39e1f32d9b1fd4e53a7679
+DIST gnome-desktop-3.38.1.tar.xz 745400 BLAKE2B 872b0cdd993ed8f8865ec02e8f4e818657f526caebb3cd1b772c1182a6655d1502f454b94acb0a1dc9e3a1b8f8b8308c5dcee7933a63600d7f8d93fa3876a1d2 SHA512 b3927f0b8571d2ecb528dbe3e096e816e4e90333ce4f1ab8682c8682bbaaf5fc3484dc0944a9437aca40036d29b0feace8ed3954fb17c0bfd7ce503c99af830b
 EBUILD gnome-desktop-3.36.5.ebuild 2022 BLAKE2B f3dd6dca7559c79967f73859b72c5ec3f9edcd8ab4d527e8d9503fd93ff2e117637223261a59e3937d5d074ebb064c36d7294adb62b5686435cce88fcbb0c7f5 SHA512 7280f4ae4748c982826f10248a3b6edf8e963a982facc182c98895ad1e6c695d076a62d4f56830c6fbf96dc0a9cdb3c9d533f1ceb16757f4f3475c8942579fcf
+EBUILD gnome-desktop-3.36.7.ebuild 2025 BLAKE2B 5ea77d5672464d313a241a3d74f047935d40857c95a90eea21c1f4005f28a90e58000d0448ccef3c5718551f339138ba456bcb4e25804e21cdc7acba66da2ec5 SHA512 a37c5dde9f212becf1661b65364a97b9ed4bfe194cc651e208bd152addf7eee42b6ddc5d83bf7c4cfefdd205e5fb7723b03047e14e13a44a1f50e22b77ba1a52
+EBUILD gnome-desktop-3.38.1.ebuild 1927 BLAKE2B befbd291e5a488f81c53ad4da33ed3ddf05ccd51525018bbab13b020be432c0c47cbdf7823b6330bd4e58a6930994558ab977afdb9cb04520bad203ce7a47466 SHA512 8639565b2cfaa893a1b692f7a39b4a269c1a9b4ae8b1586487b8e0779f79e9a07c30bd3680b8675e060c6a8d60826f2f0f00b8f7ab1f84dfe2167c245b9c51f1
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.36.4.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.36.7.ebuild
index e7951e7ba9c2..e7951e7ba9c2 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.36.4.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.36.7.ebuild
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.34.7.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.38.1.ebuild
index 665870f47137..f2127cb11f3b 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.34.7.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.38.1.ebuild
@@ -2,17 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org gnome2-utils meson virtualx xdg
+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/18" # subslot = libgnome-desktop-3 soname version
+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"
 
-# cairo[X] needed for gnome-bg
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
 	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
@@ -20,14 +19,13 @@ COMMON_DEPEND="
 	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
 	x11-misc/xkeyboard-config
 	app-text/iso-codes
-	x11-libs/libX11
 	systemd? ( sys-apps/systemd:= )
 	udev? (
 		sys-apps/hwids
 		virtual/libudev:= )
 	seccomp? ( sys-libs/libseccomp )
 
-	x11-libs/cairo:=[X]
+	x11-libs/cairo:=
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
 DEPEND="${COMMON_DEPEND}
@@ -71,7 +69,3 @@ src_configure() {
 	)
 	meson_src_configure
 }
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/gnome-base/gnome-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest
index 3829c629a062..93e7bdf688ca 100644
--- a/gnome-base/gnome-extra-apps/Manifest
+++ b/gnome-base/gnome-extra-apps/Manifest
@@ -1,3 +1,2 @@
-EBUILD gnome-extra-apps-3.34.4.ebuild 2485 BLAKE2B d02b57fb3bdc7cfa997b06ab050a64d5b0ba1218da687239f20ca866886ac6198edb9ae80cb0cd3d636a1d2fda1e0c8437750f5115c4010011826a28cea99b6c SHA512 19eb1293c7de6ab282b6342d74f6b7886ed394795debe18e4984480523aff899f702044281241a84e0e840ca37df8cd7c704f0f22438353d0c2ab6dc59ae456e
 EBUILD gnome-extra-apps-3.36.5.ebuild 2553 BLAKE2B 183df2f88696323dcd316fac7e2cfffff1fa84349eba83a454865c777ae0b64effe01fcde98f07a450d378a57c079d60223c555f702a90a3a9534565a2d06dd7 SHA512 e69151df382331a3cee869ee72477d8767aa43a0896e4badaf999162593bda82f8d7677191ec0bdfdf854f48888198c5ae4b272380818e05d574981547320af8
 MISC metadata.xml 617 BLAKE2B ee89ac320ee9fa2c6a29d3d8b86df05a734781bfb5e538f9f84a85c9467672901713d94347acbef958c8c5733f9a0a07f0b008bf84f2daa2df5390bf8225eb66 SHA512 d91641939c20487a6ba4cfc0c55b6bdf7ba6315b63b8a045976bb9367c6001f9feea9c206ac522cf47efbd5267205e45c29b3ad5ce6189fd1a02f4d993a036be
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.34.4.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.34.4.ebuild
deleted file mode 100644
index 94292a99c584..000000000000
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.34.4.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, vino; replace gucharmap with gnome-characters?
-# 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.0
-	>=media-video/cheese-3.34.0
-	>=www-client/epiphany-${PV}
-	>=app-arch/file-roller-3.32.4
-	>=gnome-extra/gnome-calculator-3.34.1
-	>=gnome-extra/gnome-calendar-3.34.2
-	>=gnome-extra/gnome-characters-3.32.1
-	>=sys-apps/gnome-disk-utility-3.34.4
-	>=media-gfx/gnome-font-viewer-3.34.0
-	>=media-gfx/gnome-screenshot-3.34.0
-	>=gnome-extra/gnome-system-monitor-3.32.1
-	>=gnome-extra/gnome-weather-3.34.0
-	>=gnome-extra/gucharmap-12.0.1:2.90
-	>=gnome-extra/sushi-3.34.0
-	>=media-sound/sound-juicer-3.24.0
-	>=net-misc/vino-3.22.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.1
-		>=games-board/four-in-a-row-3.34.4
-		>=games-board/gnome-chess-3.34.0
-		>=games-puzzle/gnome-klotski-3.34.4
-		>=games-board/gnome-mahjongg-3.34.0
-		>=games-board/gnome-mines-3.34.0
-		>=games-arcade/gnome-nibbles-3.34.2
-		>=games-arcade/gnome-robots-3.34.1
-		>=games-puzzle/gnome-sudoku-3.34.1
-		>=games-puzzle/gnome-taquin-3.34.4
-		>=games-puzzle/gnome-tetravex-3.34.4
-		>=games-puzzle/hitori-3.34.0
-		>=games-board/iagno-3.34.5
-		>=games-puzzle/lightsoff-3.34.0
-		>=games-puzzle/quadrapassel-3.34.1
-		>=games-puzzle/swell-foop-3.34.1
-		>=games-board/tali-3.32.1
-	)
-	share? ( >=gnome-extra/gnome-user-share-3.34.0 )
-	shotwell? ( >=media-gfx/shotwell-0.30.8 )
-	tracker? (
-		>=app-misc/tracker-2.3.1
-		>=app-misc/tracker-miners-2.3.1
-		>=media-gfx/gnome-photos-3.34.1
-		>=media-sound/gnome-music-3.34.4 )
-"
-DEPEND=""
-BDEPEND=""
-S=${WORKDIR}
diff --git a/gnome-base/gnome-flashback/Manifest b/gnome-base/gnome-flashback/Manifest
index 4df286c72e6e..20c1d529cd44 100644
--- a/gnome-base/gnome-flashback/Manifest
+++ b/gnome-base/gnome-flashback/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-flashback-3.34.2.tar.xz 727812 BLAKE2B dd5fd4ff9f612d464f750343c17f0216366dfc6b9c7d892724e3b78ebf96b492a6192e32edb6c5f7c92c997a1d3325fea2b7e06874a3f03f1e5ea0965c63eba8 SHA512 9c2cfdcd0f896b56c6aff529c372b697fdd52db2660ba658aaef5ff7110a71b756ec708eebd260718ddd1c77df858bd00100070a1a32e282808bac519abb867d
-DIST gnome-flashback-3.36.3.tar.xz 825812 BLAKE2B f758e719e06572ebf008eea7eda6965f6572c3a666dc70b39fcaa4e59e814297fa671449c1aa8617fca799e51407e9acc637644c8fbe50f571fb75f250d0a7fb SHA512 b0217ab72538983150f37c12ba0e78da0d9aa7a74075af0bd71390be9cc0686480dc831696f3febf4fed0bb1332547a494e5efb33c86b6879c46bc0443c53138
 DIST gnome-flashback-3.36.4.tar.xz 826568 BLAKE2B 6625b3a2d90649b9476d6340295b3cf8960f76908c23d75fe7b2a886d1a5c6a587bc8cb31ab866a40f2250b67d154a080f27534aaa11e822d901fc1cac0687af SHA512 6c1b910872530a86d6fb477ad55c8c44cbe5ef958073e2c675d95b9b4dbf9aab0d0a3b3cdae2daebbe3dad8a83c53ffe0604e12282864bfdee33402e119eff32
-EBUILD gnome-flashback-3.34.2.ebuild 1237 BLAKE2B 60396f8b0ce608f9a47d8cf1b2deca3ec38969de165fdb3ece914fe8824049e82cad7076d2f38f83c770373c02cbef9206a457f030757a5f5ca88961072c1b58 SHA512 d101581f4aa180c26295546f6b280205493ac9d70a46544f03a955bbe211e37062af695e854c9421b56be365eac6257affacb14c5d63e17f0e52d420ceace92c
-EBUILD gnome-flashback-3.36.3.ebuild 2539 BLAKE2B 9d4ea6cf2ca7510059d849323715f429d1a0c48b1d080957f2dc61bff9e6ef51f704bc8a2d5a4e61e71f184d6802bbe75ed1d63b5b4308612435f1cde957e6f2 SHA512 7228f42e85045fbe7a2d554c6eac86cdcf742d00fc4eae8a566b8e109f5c6a5fe4cc493900c53abcfd94bea68eb9b675ffee8f3f27f5a72f6ff75c6957de473f
 EBUILD gnome-flashback-3.36.4.ebuild 2539 BLAKE2B 57690d6422bb9d398886c307c17444abf86341afacc59d9b2de3f5ae9fa4d5ef08a05ca2740aaf2ae3b707671370ca75cf4f832229022c26caefa304fca9a790 SHA512 f088673b962c860eff0371f9c5a7f5e59989ae39d1808f39c4284eeee036728678136e7671108ca473314226dfdef0b9074ec059d013e4e63c46962495b0e96c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.34.2.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.34.2.ebuild
deleted file mode 100644
index f287574ee194..000000000000
--- a/gnome-base/gnome-flashback/gnome-flashback-3.34.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="GNOME Flashback session"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-flashback/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="systemd"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=x11-libs/gdk-pixbuf-2.32.2:2
-	>=x11-libs/gtk+-3.22.0:3[X]
-	>=gnome-base/gnome-desktop-3.12.0:3=
-	<gnome-base/gnome-desktop-3.35.4
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=dev-libs/glib-2.44.0:2
-	>=gnome-base/gsettings-desktop-schemas-3.31.0
-	>=sys-auth/polkit-0.97
-	>=app-i18n/ibus-1.5.2
-	>=sys-power/upower-0.99.0:=
-	>=x11-libs/libXrandr-1.5.0
-	x11-libs/libxcb
-	x11-libs/libX11
-	net-wireless/gnome-bluetooth
-	x11-libs/libXext
-	>=x11-libs/libXi-1.6.0
-	x11-libs/pango
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	x11-libs/libXfixes
-	media-sound/pulseaudio[glib]
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	x11-base/xorg-proto
-	virtual/pkgconfig
-" # autoconf-archive for eautoreconf
-RDEPEND="${RDEPEND}
-	x11-wm/metacity
-	gnome-base/gnome-panel
-	gnome-base/gnome-settings-daemon
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable systemd systemd-session)
-}
diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.36.3.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.36.3.ebuild
deleted file mode 100644
index f9f6fc5247ce..000000000000
--- a/gnome-base/gnome-flashback/gnome-flashback-3.36.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="GNOME Flashback session"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-flashback/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="elogind systemd"
-REQUIRED_USE="^^ ( elogind systemd )"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=x11-libs/gdk-pixbuf-2.32.2:2
-	>=x11-libs/gtk+-3.22.0:3[X]
-	>=gnome-base/gnome-desktop-3.12.0:3=
-	>=gnome-base/gnome-panel-3.35.2
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=dev-libs/glib-2.44.0:2
-	>=gnome-base/gsettings-desktop-schemas-3.31.0
-	>=sys-auth/polkit-0.97
-	>=app-i18n/ibus-1.5.2
-	>=sys-power/upower-0.99.0:=
-	>=x11-libs/libXrandr-1.5.0
-	>=x11-libs/libXxf86vm-1.1.4
-	x11-libs/libxcb
-	x11-libs/libX11
-	gnome-base/gdm
-	elogind? ( >=sys-auth/elogind-230 )
-	systemd? ( >=sys-apps/systemd-230:= )
-	net-wireless/gnome-bluetooth
-	x11-libs/libXext
-	>=x11-libs/libXi-1.6.0
-	x11-libs/pango
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	x11-libs/libXfixes
-	media-sound/pulseaudio[glib]
-	sys-libs/pam
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	x11-base/xorg-proto
-	virtual/pkgconfig
-" # autoconf-archive for eautoreconf
-RDEPEND="${RDEPEND}
-	x11-wm/metacity
-	gnome-base/gnome-panel
-	gnome-base/gnome-settings-daemon
-"
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		--without-compiz-session
-		$(use_enable systemd systemd-session)
-	)
-
-	# Below elogind DESKTOP_* and SCREENSAVER_* pkg-config calls need to match up with
-	# what upstream has each version (libsystemd replaced with libelogind). Explicit
-	# per-version die to force a manual recheck. Only update the explicit version if the
-	# "PKG_CHECK_MODULES([MENU/SCREENSAVER], ...)" blocks did not change; otherwise adjust
-	# elogind conditional block below accordingly first.
-	if ver_test ${PV} -ne 3.36.3; then
-		die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
-	fi
-
-	if use elogind; then
-		myconf+=(
-			DESKTOP_CFLAGS=`pkg-config --cflags glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11 2>/dev/null`
-			DESKTOP_LIBS=`pkg-config --libs glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11 2>/dev/null`
-			SCREENSAVER_CFLAGS=`pkg-config --cflags gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm 2>/dev/null`
-			SCREENSAVER_LIBS=`pkg-config --libs gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm 2>/dev/null`
-		)
-	fi
-
-	gnome2_src_configure "${myconf[@]}"
-}
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 06029621fbf3..a8abe06f6c41 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-keyring-3.34.0.tar.xz 1333768 BLAKE2B 0237eb7ac0b7146d096c58cac4c788a92680f1a6dd321949f295935bde206263e5ee1762c9d393dfbc10322d018e835333c823d11e8af5dc01434555886626dd SHA512 09f84bdf5ea415a55baf6a57dba2889cdf592005d273335029107ea3f83152447b3263cd190810930aae41af22dd508e765e649da3c8a9afa127db1d298bb72a
 DIST gnome-keyring-3.36.0.tar.xz 1345360 BLAKE2B f37454e0e42dcc1fe7e29e95dcb8ca7bc2db10e6b262b796421b4fd38b87fe9128a4c2f129d28d14716a2f9a7d60061d4b345e9564e73a0587faf24a7d2b1194 SHA512 e5aed36ad109cbd2dcb534843f8565829366acc955cadc6e9bbe87ebbb6a8a907211aa3a42f7f26148ac69726af2f9238965707d1259319435bd20aa8c4859ed
-EBUILD gnome-keyring-3.34.0.ebuild 2160 BLAKE2B 80a51431743d8dd3f81a0c63f3e4b15050ff4617f9fff822408d397a02bbe31cfe815949f2a02506d95023066011b3be98dda8818ffb34b8a0f24b81a5c18706 SHA512 274e62f0f8efd11dad00b8d9e16338e7e342b865ed14aae22548364487f2856e0ab388d00d7e20660825633457e5b5542014db5dfef7a5c884803daee5604035
-EBUILD gnome-keyring-3.36.0.ebuild 2264 BLAKE2B f23d07e44e3a84a4b085eccaf68c4fc6f5988888f00036a4737b97c830d1c1e885af3ba49027801b653ee3e4bf91e124370244164eb95113cc2973e89208d14e SHA512 5572f037695fea0e843268e9cf638daffcf6f55ec770c31a61741859e5067bb0efc9f2623252e617fb38b8171e58a4d7ed68de03589b76ff00d6ed9c773ab6be
+EBUILD gnome-keyring-3.36.0.ebuild 2261 BLAKE2B af850ab3e1f8cf880a68432638eb2d8839a8058a6a5919d554a125f0e0451040962eb6a3a648fa7735d973b386681f7ce857606dcfbb9326c5b27a82b92871af SHA512 d4c54487c420115db2c4c4b21de3236a3ec1086f10dc7cc91124f6c0ad743ba2426b4bdbe632f6542fe46b7091cad14d1c9a7f9fc394481abf9911664ad1e61b
 MISC metadata.xml 883 BLAKE2B 6d253b088319b1f442d91e0372751ce3ddd0516bbd3e72242e4541837c6c6bfe83371a5c47a7be73fad6046be5f053aa6c6fb41d884111ac53cd4de3cb0d1381 SHA512 31d506051c1353e1e4dd987e5ccd39281d19f6ae08974a09bd8145218c7209588629a79c6baad9ff1b83358a699f46fddb8c4ec51da73efe26be2d5e7f0a905a
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.34.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.34.0.ebuild
deleted file mode 100644
index a06051ceaf8e..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.34.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{6..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]
-	>=dev-libs/glib-2.44:2
-	app-misc/ca-certificates
-	>=dev-libs/libgcrypt-1.2.2:0=
-	caps? ( sys-libs/libcap-ng )
-	pam? ( sys-libs/pam )
-	selinux? ( sec-policy/selinux-gnome )
-	>=app-crypt/gnupg-2.0.28:=
-	ssh-agent? ( net-misc/openssh )
-"
-DEPEND="${RDEPEND}
-	>=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() {
-	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
-	 GSETTINGS_SCHEMA_DIR="${S}/schema" virtx 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-3.36.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
index 1f7e6cfbd500..c28cbcaedec6 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
@@ -14,7 +14,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 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-menus/Manifest b/gnome-base/gnome-menus/Manifest
index 7662d2ff9cbe..59d6607f2ac7 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-menus-3.32.0.tar.xz 499680 BLAKE2B ee43c2be29f6d3f5eaf5369c3b3809fc2728564321853a6dd23df1d81138868f9be2f57d0bcd0eb69a509e224f77dc357a8c71afe569bfb1bbdb13ce3b80636f SHA512 8a429e092b1e4a1a794473d7cae611684321e797792e1063911ddcbb496140033838b348bc209b4c0566a13233cfa1144cae7a188a483abf34c5af6feb44a884
 DIST gnome-menus-3.36.0.tar.xz 502324 BLAKE2B 8bf1b0d4ac30a1e7f4c4e1b14ad3e2f718e974ec58fe8e8ab3c0d030c1cd1841a9cceb86d8909c0d0dcf128f19aecdd64350840f0cb25ed7cacdc2c95786f118 SHA512 e830e66639c2b6aebecf572188208d33b1515270e69af3f2c6f7a640d305a7b9c2bce10e5f520b3da1dea681b194fd14c551468ea5747aa333e649b5c46774e4
-EBUILD gnome-menus-3.32.0.ebuild 914 BLAKE2B 99e48b0fd083fe6ae66e88a13065fed889595c08aedcbb3282e7c7cc4d4ae038186381755f17152e5e6389b8b12eac925274ba15aa5f0bb2c4379e87d6def0d5 SHA512 7b4e35a489dd31878e00c57b74eff5cc27ac62aed511c1b700b3a57e22730d5b5efaf91c06e1a7e74799c6c9f365a8e28cb0b298179f636a113851119418317b
-EBUILD gnome-menus-3.36.0.ebuild 903 BLAKE2B adcfb375e3a6663833a9f40328ed325a5f2aa48a5118db575fc843110af597576966e95869fa4f41eafb190971e47e9840563a43374cda2d98928465e140b3f1 SHA512 082caed7f64d829688e3341b3b6cf3c01391b74fef6405dd856c8e924884d28d4f56861f899fc2c3d07cd927aadd667c9b75d9a706d7651c421f0cc712b73bac
+EBUILD gnome-menus-3.36.0.ebuild 902 BLAKE2B 0312e513690b7fdfe3fbad50a4792a5d2006c58c6267fef1ab38493ccc74f2d8262425fee220107601ad141dd779bd838378e4f558d8b73b0601e0c858d04819 SHA512 563fe7ca9db1ec4cfc07e2531e32b72e15393c0a2843d2f83f255cd9845091fed043db6fb582dcb1061d26f9ceb694d1e32fa88fc20819e3da952c82c0f5d750
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-menus/gnome-menus-3.32.0.ebuild b/gnome-base/gnome-menus/gnome-menus-3.32.0.ebuild
deleted file mode 100644
index 133815f866ba..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-3.32.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit gnome2
-
-DESCRIPTION="Library and layout configuration for the Desktop Menu fd.o specification"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-menus"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="+introspection test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.29.15:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-	test? ( dev-libs/gjs )
-"
-
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
-
-src_configure() {
-	# Do NOT compile with --disable-debug/--enable-debug=no
-	# It disables api usage checks
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--disable-static
-}
diff --git a/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild b/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild
index fb8bba98dd05..5c517450894a 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-menus"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="+introspection test"
 RESTRICT="!test? ( test )"
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 6ce705430b83..0162c85900c3 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-panel-3.34.1.tar.xz 3072196 BLAKE2B 23fdfc0b78e13169ec6af92ee386ae3997536199c6f13406523e2deb6b696b90828ce614fc06115a83fdb6ec76fc14e0518f4eb839eabfbf29507d6fd4b2ab3d SHA512 6d43285cda00b2e9415cf11f47a51a00941ed294edefb411f7b40003ece814ac08da9d2ccfb167a0a91c7abb9eb17a7f70970ac4eb585ce665cca5fcfbddcf03
 DIST gnome-panel-3.36.2.tar.xz 3033016 BLAKE2B faf5b81c07eccca9d78ed56be9e124e8f909bb577739810a059135cd6afc9cd293b5a023a129063c48168029a1f9a2dd6fd9c714f80e0c566f820291dd15217f SHA512 cbd7eaf1778dd3f6751c020540c243b02787feb5781195fd5db008fc66683ea5330d89ab0f2c740020695c4da7856b5678491ec3e711d6ce41e884a0374e937b
-EBUILD gnome-panel-3.34.1.ebuild 2039 BLAKE2B 5bf63597da3c5e9f14bcfc399527c8f4b7a920f8aa5334cab00e9c893685bf152a6a47d5b4342181f7d695b9caec35d209da9a48cb0027e0f93013a49bcfab3f SHA512 a317f14f4559c6e99a6a691958f6753dd78bfe8a3c42313e678ef9ea51868f548aecde0b398b5491e5b8e320988bc8d30af2994cf9022c3176d65fcbe4231fa0
 EBUILD gnome-panel-3.36.2.ebuild 2011 BLAKE2B b6f82a356aa2255d88bfd1c439ae050fef9808f5b5e9688cb576f233e7cef483f23ff5de8bb5c8dd7a6186379ba6a242da71d0e7aa16485226ab284c08f6acd0 SHA512 7f0f79524bd02cb31cd1409e87102d0eb68b347c9e901c8039bbd98220a91eb11ec4ad6f2ab14cdedd6415f61a29408724b1bda94d045979fcde82f8fcc1b362
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-panel/gnome-panel-3.34.1.ebuild b/gnome-base/gnome-panel/gnome-panel-3.34.1.ebuild
deleted file mode 100644
index fb34a9ab0034..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-3.34.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eapi7-ver gnome2
-
-DESCRIPTION="The GNOME Flashback Panel"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-panel/"
-
-LICENSE="GPL-2+ FDL-1.1 LGPL-2.1+"
-SLOT="0"
-IUSE="eds elogind systemd"
-REQUIRED_USE="^^ ( elogind systemd )"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=gnome-base/gnome-desktop-2.91.0:3=
-	>=x11-libs/gdk-pixbuf-2.26.0:2
-	>=x11-libs/pango-1.15.4
-	>=dev-libs/glib-2.45.3:2
-	>=x11-libs/gtk+-3.22.0:3[X]
-	>=x11-libs/libwnck-3.4.6:3
-	>=gnome-base/gnome-menus-3.7.90:3
-	eds? ( >=gnome-extra/evolution-data-server-3.33.2:=
-	)
-	elogind? ( >=sys-auth/elogind-230 )
-	systemd? ( >=sys-apps/systemd-230:= )
-	>=x11-libs/cairo-1.0.0[X,glib]
-	>=dev-libs/libgweather-3.28.0:2=
-	>=gnome-base/dconf-0.13.4
-	>=x11-libs/libXrandr-1.3.0
-	gnome-base/gdm
-	x11-libs/libX11
-	x11-libs/libXi
-	sys-auth/polkit
-	x11-libs/libXi
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.25
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-" # yelp-tools and autoconf-archive for eautoreconf
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		$(use_enable eds)
-	)
-
-	# Below elogind MENU_* pkg-config calls need to match up with what upstream has
-	# each version (libsystemd replaced with libelogind). Explicit per-version die
-	# to force a manual recheck. Only update the explicit version if the
-	# "PKG_CHECK_MODULES([MENU], ...)" block did not change; otherwise adjust
-	# elogind conditional block below accordingly first.
-	if ver_test ${PV} -ne 3.34.1; then
-		die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
-	fi
-
-	if use elogind; then
-		myconf+=(
-			MENU_CFLAGS=`pkg-config --cflags gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind 2>/dev/null`
-			MENU_LIBS=`pkg-config --libs gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind 2>/dev/null`
-		)
-	fi
-
-	gnome2_src_configure "${myconf[@]}"
-}
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 90e6492f78a2..e7a6a626f92b 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -2,13 +2,11 @@ AUX 10-user-dirs-update-gnome-r1 299 BLAKE2B ba1537eb23474b47f69937d38cb5b9f0de5
 AUX 15-xdg-data-gnome-r1 262 BLAKE2B 8ea3192680b1cda2076ebceafd7cd4f340f6f4c5f5bbb309f3dfe5af1d50283ca024a508d0d4dc92a6c5fa65de1489cad55451df3016eae3f5cc4070d16e4c78 SHA512 aecdebbaaad1bd3032d687975017f040b58520fe8d5848dc5fd9b726aba8904dda314a315d3ee33e76bb11eddf8785a939a0a83634d99ba74a0342683840fcbc
 AUX 90-xcursor-theme-gnome 384 BLAKE2B 985ea5b7de4d51b46625c21b803c5d225ac598b81813bb0bf00620a8b825a90f2b54717ed24ca8c9554c3ae6f8dbd75424f2b4ae8c6f38fcb789e655aa35aad6 SHA512 3d692715a744303f31a78ddf7aaefdbece8c50ebc5dfaac84cdfb6430155db465ab0140340eea4b5caf6d4dff030736eca9d028f24ed1d41ebc345fa309a4a4b
 AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc52fe128b35eb3f9e8f0bf3884f0c444ab2da88eb6ba12d9a852e8a058f4abdcf050dc68c SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6
-AUX defaults.list-r4 18853 BLAKE2B abf7b422bf6e0e7dc04e26416d54018f3fb04ff6b4bfe8aed122e3b918cf840e5b8df8bb68c5ebb5ffed9d95b530581e10c03f7b4454ffe23fd8993253ce2898 SHA512 1d282ab6a139f6e0f0309263ca736dc2eeca0490f25a740583a24cd4f84a21531aaa0bd916d0809844e928029a434acdb3922305ce1253241ff62938c13c4eae
 AUX defaults.list-r5 19379 BLAKE2B 9299c535bcb3ce6f291ba66dfe655f7e793d554f5fd7a5df5e8db665e43372f8c08a5ea8480e63e318befc5b2e56e4b027ca873947972aa2b19d14ba85f0ec3e SHA512 edee1126e11c3b49ebcea1e1a6929d55a28d09b6c382666d6d6a32271a4cf22af23927f7a5e15ecbd4a4cdaa41ac2f1ffc09350f4e48257e2e5e29ade08635ac
-DIST gnome-session-3.34.2-patchset.tar.xz 10196 BLAKE2B f79331c554b3004dc92d6b9d78ecb9575ad9ff071ef443ba4dca47e358e1c9bc2ecad3a43298bec7ad9e33aa85cb3fbc400f0a8739e6b1b1ebcfe3b8fd590ee5 SHA512 50d0d99bc594abdd05b2351c00db7f170282459360aaac0148a224d7e30e99283588596e84ff82bffab647cfd6a01a306a5c951da77d68e50ad8e146d3aae62a
-DIST gnome-session-3.34.2.tar.xz 474692 BLAKE2B 5b928a4632966bc12ff94ae76079cd39352dc7008e9a1044ccc63e1ba588d26a6a5812a69a995f86cef6f9f2f18ae2865793dd28335218308ada85969966fb75 SHA512 23388420ee117596b73ac057d2376857db726fb727fdeff4e4f420e7742622e81baef439adb04d8659a6979e5b7043c72ea334c1179974950476489a8c397182
+AUX gnome-session-3.38.0-meson-Support-elogind.patch 2808 BLAKE2B da7ad139fe118edc4c53570acc5e56d59e3073caae7941c54b11c59208675eaa148eb03d437d0edfa0f0d024880b77bc60ba65140422f25319ac132299dfe972 SHA512 2a57894b95662ca4488f95110943076a82ecbe7f3bb8ed4d95e2c8082276839f4b1a7ecc20915557378e73e1947df856e4ff57d9d5b9ae32a9673f2cc3b2fbc2
 DIST gnome-session-3.36.0-patchset.tar.xz 22624 BLAKE2B 33518973a5e7c810b9aef165bcd62d41641908fa329dcefc784073966514aad5aa8919037722043c6cb0ddca86b4c2444b614d773aa777d737d49fdb3acad8e5 SHA512 c80ae41bcaa876ebb2c2d2a47d7bbcb58a3fe417ce0727e1aa3f384c4ae848bd3f1e27bd706af478f8e93c921efef578085d2c999efd06fd8d7c8704e170a56a
 DIST gnome-session-3.36.0.tar.xz 475492 BLAKE2B b539c4646b746198aceba65708f758fc875614d342b66f8b12643a7235dcc043b78d7e2502ca9f45159f5b4080528ff8b92c98b67acb77fe7f71386ec282b773 SHA512 234456e8617524a3b95afb505246823ced4eca3ca009d48fc0bde70f8c620814495b04509c134bfb72760619990cc7cb7363ba13f0d90d9f038e8a43eadb6e9d
-EBUILD gnome-session-3.34.2.ebuild 3992 BLAKE2B 0c65c6a8ec8e14cc03a78ead0e84a676e024d42bddb23911847e84de81d9234a1b3b8110ba054f3d6889f13f0932c8b553bf18584b0a7dd6bc49b386fe108a9a SHA512 809e0a482a8149151393f7ece8b544505f4d14a00e703831173eaa6182ae8baf9092acb7232f05dbf9b3e7f7753a6d97594f3d8787c1e2436452962f89e5caa1
-EBUILD gnome-session-3.36.0-r1.ebuild 3883 BLAKE2B e6b213b12f2ad801d4837b60e05fe1bce0bd5fb25f32971259339de3aecfa6b10e39869f69075483cbaafec30634a2274fbe8935e5241cbf1c8f9b179b0176f9 SHA512 142033b406086a178f60bf2155c27356cae5ac68b29f466fa2d684e5f7dd29cce94342139c6b2d8268c8040bdbc3d7339de0299b4f269928ddb36600d5ce87b8
-EBUILD gnome-session-3.36.0.ebuild 3885 BLAKE2B 4e1160342b21bd78bc65b47780e9f62053b28e1628e7cf5a737b3147a4a5aad5eebc69a90104e73f0f95f3e00aefac3273810dfa5340aae0d94cd33830201758 SHA512 0770a77d8ec4abe3b615c68fb4a02074a6ef77900e063cfba4a6cd9eaaecf3888752fe1764dc90a035a7c563e1865d19b82815d134f14a217b5870818d956331
-MISC metadata.xml 440 BLAKE2B 83fb0d37323db0c6105b3c231b6ecb7c4344bcd40577f23581af437fb4c4c330a77d2b8b19c9c69a5b586fd4638e55a9153014c32214547bf2437da7c3a161e6 SHA512 93f57253eccec50c77ad84960af623482bb34ad7d1f00463b29ccb54c3f034b95aa1a489acbf5075aa97e37e9303c2973e126cb201c15b2785416d882810378b
+DIST gnome-session-3.38.0.tar.xz 481300 BLAKE2B 1adb6377f66ab64c39aa5e9ca73ebcb7fcfbfa33b5adcd4fe5900624a89a248a4255c507ec0e88baa57b20105a50d6b7e8eb6bea0be6de49295977e4aacbb662 SHA512 f49a7337b64722bc502ff3d952d8e249d2435be662c3bdfb7c7740338585c2e0b292869902be4c10faebde00998d7ead8deb82fe719a38575c6ebec2b94aa19b
+EBUILD gnome-session-3.36.0-r1.ebuild 3642 BLAKE2B c52cd83b7462c1230c2363faf7fc698351f5efb07cf092d1196fcb481e389ef7d83dd4e3ce69850064cd9051edc215ab67c14f40fd42c92a04910ffe4dd2b342 SHA512 f3b016e3938d02278c24d3c39907f745867f8178f3b0e97c371ca503666f977267a3ae758318c39581f42ad6ff4bc263873ca0248e6d37750e34a3a84e43de97
+EBUILD gnome-session-3.38.0.ebuild 3445 BLAKE2B 52382419142873b4234452eb8ffd23dc6ecfae34886232953b99e7a009633605ba6ce0df3cb399708685eac17b09c0f7c29f3b14f519b8e98235c24260b5f928 SHA512 04884bcb7fe5648df55a2099a38ea46a75c69dbdc8ca9b039076482f66022f0968d63088b44b2ca186bd249a7e28047108d0eb5b1f86dfb8ae13f75363a4f7f9
+MISC metadata.xml 348 BLAKE2B e83b29910d01f4a5cc1ddf7587189534a557805ccbc7611230526266ed88202a2ce9e612f8d78f4fb9c9a11217a2eb16e1ce9304d2038c3d2dce65364b5c67b9 SHA512 6bf5331d6f4a8c27e1d17709bb11cad46fd926fc84925c99f7e89eaa236d5b22c95702e6522f868f285b0c9f74a670a839e91b03e3126ace0449b5a5f49fdf8f
diff --git a/gnome-base/gnome-session/files/defaults.list-r4 b/gnome-base/gnome-session/files/defaults.list-r4
deleted file mode 100644
index 0f70884acb3c..000000000000
--- a/gnome-base/gnome-session/files/defaults.list-r4
+++ /dev/null
@@ -1,335 +0,0 @@
-[Default Applications]
-application/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/x-abiword=abiword.desktop;
-text/abiword=abiword.desktop;
-text/richtext=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-text/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-text/x-abiword=abiword.desktop;
-text/x-xml-abiword=abiword.desktop;
-x-content/blank-bd=brasero.desktop;org.gnome.Nautilus.desktop;
-x-content/blank-dvd=brasero.desktop;org.gnome.Nautilus.desktop;
-x-content/blank-cd=brasero.desktop;org.gnome.Nautilus.desktop;
-x-content/blank-hddvd=brasero.desktop;org.gnome.Nautilus.desktop;
-application/x-dia-diagram=dia.desktop;
-image/bmp=eog.desktop;
-image/gif=eog.desktop;
-image/jpeg=eog.desktop;
-image/jpg=eog.desktop;
-image/pjpeg=eog.desktop;
-image/png=eog.desktop;
-image/svg+xml=eog.desktop;
-image/svg+xml-compressed=eog.desktop;
-image/x-bmp=eog.desktop;
-image/x-gray=eog.desktop;
-image/x-icb=eog.desktop;
-image/x-ico=eog.desktop;
-image/x-pcx=eog.desktop;
-image/x-png=eog.desktop;
-image/x-portable-anymap=eog.desktop;
-image/x-portable-bitmap=eog.desktop;
-image/x-portable-graymap=eog.desktop;
-image/x-portable-pixmap=eog.desktop;
-image/x-xbitmap=eog.desktop;
-image/x-xpixmap=eog.desktop;
-image/vnd.wap.wbmp=eog.desktop;
-image/g3fax=gimp.desktop;zzz-gimp.desktop;
-image/x-compressed-xcf=gimp.desktop;zzz-gimp.desktop;
-image/x-fits=gimp.desktop;zzz-gimp.desktop;
-image/x-icon=gimp.desktop;zzz-gimp.desktop;
-image/x-psd=gimp.desktop;zzz-gimp.desktop;
-image/x-sgi=gimp.desktop;zzz-gimp.desktop;
-image/x-sun-raster=gimp.desktop;zzz-gimp.desktop;
-image/x-tga=gimp.desktop;zzz-gimp.desktop;
-image/x-xcf=gimp.desktop;zzz-gimp.desktop;
-image/x-xwindowdump=gimp.desktop;zzz-gimp.desktop;
-application/xhtml+xml=firefox.desktop;chromium-browser-chromium.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
-text/html=firefox.desktop;chromium-browser-chromium.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
-application/pdf=org.gnome.Evince.desktop;evince.desktop;
-application/x-bzpdf=org.gnome.Evince.desktop;evince.desktop;
-application/x-gzpdf=org.gnome.Evince.desktop;evince.desktop;
-application/postscript=org.gnome.Evince.desktop;evince.desktop;
-application/x-bzpostscript=org.gnome.Evince.desktop;evince.desktop;
-application/x-gzpostscript=org.gnome.Evince.desktop;evince.desktop;
-image/x-eps=org.gnome.Evince.desktop;evince.desktop;
-image/x-bzeps=org.gnome.Evince.desktop;evince.desktop;
-image/x-gzeps=org.gnome.Evince.desktop;evince.desktop;
-application/x-dvi=org.gnome.Evince.desktop;evince.desktop;
-application/x-bzdvi=org.gnome.Evince.desktop;evince.desktop;
-application/x-gzdvi=org.gnome.Evince.desktop;evince.desktop;
-image/vnd.djvu=org.gnome.Evince.desktop;evince.desktop;
-image/tiff=org.gnome.Evince.desktop;evince.desktop;
-application/x-cbr=org.gnome.Evince.desktop;evince.desktop;
-application/x-cbz=org.gnome.Evince.desktop;evince.desktop;
-application/x-cb7=org.gnome.Evince.desktop;evince.desktop;
-application/x-7z-compressed=org.gnome.FileRoller.desktop;
-application/x-7z-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-ace=org.gnome.FileRoller.desktop;
-application/x-alz=org.gnome.FileRoller.desktop;
-application/x-ar=org.gnome.FileRoller.desktop;
-application/x-arj=org.gnome.FileRoller.desktop;
-application/x-bzip=org.gnome.FileRoller.desktop;
-application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-bzip1=org.gnome.FileRoller.desktop;
-application/x-bzip1-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-cabinet=org.gnome.FileRoller.desktop;
-application/x-cd-image=org.gnome.FileRoller.desktop;
-application/x-compress=org.gnome.FileRoller.desktop;
-application/x-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-cpio=org.gnome.FileRoller.desktop;
-application/x-deb=org.gnome.FileRoller.desktop;
-application/x-ear=org.gnome.FileRoller.desktop;
-application/x-gtar=org.gnome.FileRoller.desktop;
-application/x-gzip=org.gnome.FileRoller.desktop;
-application/x-java-archive=org.gnome.FileRoller.desktop;
-application/x-lha=org.gnome.FileRoller.desktop;
-application/x-lhz=org.gnome.FileRoller.desktop;
-application/x-lzip=org.gnome.FileRoller.desktop;
-application/x-lzip-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-lzma=org.gnome.FileRoller.desktop;
-application/x-lzma-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-lzop=org.gnome.FileRoller.desktop;
-application/x-lzop-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-rar=org.gnome.FileRoller.desktop;
-application/x-rar-compressed=org.gnome.FileRoller.desktop;
-application/x-rpm=org.gnome.FileRoller.desktop;
-application/x-rzip=org.gnome.FileRoller.desktop;
-application/x-tar=org.gnome.FileRoller.desktop;
-application/x-tarz=org.gnome.FileRoller.desktop;
-application/x-stuffit=org.gnome.FileRoller.desktop;
-application/x-war=org.gnome.FileRoller.desktop;
-application/x-xz=org.gnome.FileRoller.desktop;
-application/x-xz-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-zip=org.gnome.FileRoller.desktop;
-application/x-zip-compressed=org.gnome.FileRoller.desktop;
-application/x-zoo=org.gnome.FileRoller.desktop;
-application/zip=org.gnome.FileRoller.desktop;
-multipart/x-zip=org.gnome.FileRoller.desktop;
-text/plain=org.gnome.gedit.desktop;
-text/css=org.gnome.gedit.desktop;
-text/javascript=org.gnome.gedit.desktop;
-text/markdown=org.gnome.gedit.desktop;
-text/mathml=org.gnome.gedit.desktop;
-text/x-csrc=org.gnome.gedit.desktop;
-text/x-chdr=org.gnome.gedit.desktop;
-text/x-dtd=org.gnome.gedit.desktop;
-text/x-java=org.gnome.gedit.desktop;
-text/x-javascript=org.gnome.gedit.desktop;
-text/x-patch=org.gnome.gedit.desktop;
-text/x-perl=org.gnome.gedit.destkop
-text/x-php=org.gnome.gedit.destkop
-text/x-python=org.gnome.gedit.destkop
-text/x-sql=org.gnome.gedit.desktop;
-text/xml=org.gnome.gedit.desktop;
-application/javascript=org.gnome.gedit.destkop
-application/x-cgi=org.gnome.gedit.desktop;
-application/x-javascript=org.gnome.gedit.desktop;
-application/x-perl=org.gnome.gedit.desktop;
-application/x-php=org.gnome.gedit.desktop;
-application/x-python=org.gnome.gedit.desktop;
-application/xml=org.gnome.gedit.desktop;
-application/xml-dtd=org.gnome.gedit.desktop;
-application/x-font-ttf=org.gnome.font-viewer.desktop;
-application/x-font-pcf=org.gnome.font-viewer.desktop;
-application/x-font-type1=org.gnome.font-viewer.desktop;
-application/x-font-otf=org.gnome.font-viewer.desktop;
-application/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.lotus-1-2-3=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-123=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-applix-spreadsheet=gnumeric.desktop;
-application/x-dbase=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-dbf=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-dos_ms_excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-gnumeric=gnumeric.desktop;
-application/x-mps=gnumeric.desktop;
-application/x-ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-oleo=gnumeric.desktop;
-application/x-planperfect=gnumeric.desktop;
-application/x-quattropro=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-sc=gnumeric.desktop;
-application/x-sylk=gnumeric.desktop;
-application/x-xbase=gnumeric.desktop;
-application/x-xls=gnumeric.desktop;
-application/xls=gnumeric.desktop;
-text/comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/spreadsheet=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/x-comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/x-csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-zz-application/zz-winassoc-xls=gnumeric.desktop;
-x-content/software=nautilus-autorun-software.desktop;
-x-content/unix-software=nautilus-autorun-software.desktop;
-x-directory/gnome-default-handler=org.gnome.Nautilus.desktop;
-x-directory/normal=org.gnome.Nautilus.desktop;
-inode/directory=org.gnome.Nautilus.desktop;
-application/x-gnome-saved-search=org.gnome.Nautilus.desktop;
-application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-x-content/audio-player=rhythmbox.desktop;
-x-content/audio-cdda=sound-juicer.desktop;
-application/x-shockwave-flash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;
-application/futuresplash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;
-application/mxf=org.gnome.Totem.desktop;
-application/ogg=org.gnome.Totem.desktop;
-application/ram=org.gnome.Totem.desktop;
-application/sdp=org.gnome.Totem.desktop;
-application/smil=org.gnome.Totem.desktop;
-application/smil+xml=org.gnome.Totem.desktop;
-application/vnd.ms-wpl=org.gnome.Totem.desktop;
-application/vnd.rn-realmedia=org.gnome.Totem.desktop;
-application/x-extension-m4a=org.gnome.Totem.desktop;
-application/x-extension-mp4=org.gnome.Totem.desktop;
-application/x-flac=org.gnome.Totem.desktop;
-application/x-flash-video=org.gnome.Totem.desktop;
-application/x-matroska=org.gnome.Totem.desktop;
-application/x-netshow-channel=org.gnome.Totem.desktop;
-application/x-ogg=org.gnome.Totem.desktop;
-application/x-quicktime-media-link=org.gnome.Totem.desktop;
-application/x-quicktimeplayer=org.gnome.Totem.desktop;
-application/x-shorten=org.gnome.Totem.desktop;
-application/x-smil=org.gnome.Totem.desktop;
-application/xspf+xml=org.gnome.Totem.desktop;
-audio/3gpp=org.gnome.Totem.desktop;
-audio/ac3=org.gnome.Totem.desktop;
-audio/AMR=org.gnome.Totem.desktop;
-audio/AMR-WB=org.gnome.Totem.desktop;
-audio/basic=org.gnome.Totem.desktop;
-audio/midi=org.gnome.Totem.desktop;
-audio/mp4=org.gnome.Totem.desktop;
-audio/mpeg=org.gnome.Totem.desktop;
-audio/mpegurl=org.gnome.Totem.desktop;
-audio/ogg=org.gnome.Totem.desktop;
-audio/prs.sid=org.gnome.Totem.desktop;
-audio/vnd.rn-realaudio=org.gnome.Totem.desktop;
-audio/x-ape=org.gnome.Totem.desktop;
-audio/x-flac=org.gnome.Totem.desktop;
-audio/x-gsm=org.gnome.Totem.desktop;
-audio/x-it=org.gnome.Totem.desktop;
-audio/x-m4a=org.gnome.Totem.desktop;
-audio/x-matroska=org.gnome.Totem.desktop;
-audio/x-mod=org.gnome.Totem.desktop;
-audio/x-mp3=org.gnome.Totem.desktop;
-audio/x-mpeg=org.gnome.Totem.desktop;
-audio/x-mpegurl=org.gnome.Totem.desktop;
-audio/x-ms-asf=org.gnome.Totem.desktop;
-audio/x-ms-asx=org.gnome.Totem.desktop;
-audio/x-ms-wax=org.gnome.Totem.desktop;
-audio/x-ms-wma=org.gnome.Totem.desktop;
-audio/x-musepack=org.gnome.Totem.desktop;
-audio/x-pn-aiff=org.gnome.Totem.desktop;
-audio/x-pn-au=org.gnome.Totem.desktop;
-audio/x-pn-realaudio=org.gnome.Totem.desktop;
-audio/x-pn-realaudio-plugin=org.gnome.Totem.desktop;
-audio/x-pn-wav=org.gnome.Totem.desktop;
-audio/x-pn-windows-acm=org.gnome.Totem.desktop;
-audio/x-realaudio=org.gnome.Totem.desktop;
-audio/x-real-audio=org.gnome.Totem.desktop;
-audio/x-sbc=org.gnome.Totem.desktop;
-audio/x-scpls=org.gnome.Totem.desktop;
-audio/x-speex=org.gnome.Totem.desktop;
-audio/x-tta=org.gnome.Totem.desktop;
-audio/x-vorbis=org.gnome.Totem.desktop;
-audio/x-vorbis+ogg=org.gnome.Totem.desktop;
-audio/x-wav=org.gnome.Totem.desktop;
-audio/x-wavpack=org.gnome.Totem.desktop;
-audio/x-xm=org.gnome.Totem.desktop;
-image/vnd.rn-realpix=org.gnome.Totem.desktop;
-image/x-pict=org.gnome.Totem.desktop;
-misc/ultravox=org.gnome.Totem.desktop;
-text/google-video-pointer=org.gnome.Totem.desktop;
-text/x-google-video-pointer=org.gnome.Totem.desktop;
-video/3gpp=org.gnome.Totem.desktop;
-video/dv=org.gnome.Totem.desktop;
-video/fli=org.gnome.Totem.desktop;
-video/flv=org.gnome.Totem.desktop;
-video/mp2t=org.gnome.Totem.desktop;
-video/mp4=org.gnome.Totem.desktop;
-video/mp4v-es=org.gnome.Totem.desktop;
-video/mpeg=org.gnome.Totem.desktop;
-video/msvideo=org.gnome.Totem.desktop;
-video/ogg=org.gnome.Totem.desktop;
-video/quicktime=org.gnome.Totem.desktop;
-video/vivo=org.gnome.Totem.desktop;
-video/vnd.divx=org.gnome.Totem.desktop;
-video/vnd.rn-realvideo=org.gnome.Totem.desktop;
-video/vnd.vivo=org.gnome.Totem.desktop;
-video/webm=org.gnome.Totem.desktop;
-video/x-anim=org.gnome.Totem.desktop;
-video/x-avi=org.gnome.Totem.desktop;
-video/x-flc=org.gnome.Totem.desktop;
-video/x-fli=org.gnome.Totem.desktop;
-video/x-flic=org.gnome.Totem.desktop;
-video/x-flv=org.gnome.Totem.desktop;
-video/x-m4v=org.gnome.Totem.desktop;
-video/x-matroska=org.gnome.Totem.desktop;
-video/x-mpeg=org.gnome.Totem.desktop;
-video/x-ms-asf=org.gnome.Totem.desktop;
-video/x-ms-asx=org.gnome.Totem.desktop;
-video/x-msvideo=org.gnome.Totem.desktop;
-video/x-ms-wm=org.gnome.Totem.desktop;
-video/x-ms-wmv=org.gnome.Totem.desktop;
-video/x-ms-wmx=org.gnome.Totem.desktop;
-video/x-ms-wvx=org.gnome.Totem.desktop;
-video/x-nsv=org.gnome.Totem.desktop;
-video/x-ogm+ogg=org.gnome.Totem.desktop;
-video/x-theora+ogg=org.gnome.Totem.desktop;
-video/x-totem-stream=org.gnome.Totem.desktop;
-x-content/video-dvd=org.gnome.Totem.desktop;
-x-content/video-vcd=org.gnome.Totem.desktop;
-x-content/video-svcd=org.gnome.Totem.desktop;
-x-scheme-handler/ghelp=yelp.desktop;
-x-scheme-handler/help=yelp.desktop;
-x-scheme-handler/http=firefox.desktop;chromium-browser-chromium.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
-x-scheme-handler/https=firefox.desktop;chromium-browser-chromium.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
-x-scheme-handler/mailto=org.gnome.Evolution.desktop;evolution.desktop;
diff --git a/gnome-base/gnome-session/files/gnome-session-3.38.0-meson-Support-elogind.patch b/gnome-base/gnome-session/files/gnome-session-3.38.0-meson-Support-elogind.patch
new file mode 100644
index 000000000000..37bb6921ed34
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-3.38.0-meson-Support-elogind.patch
@@ -0,0 +1,68 @@
+From 4454f2a63394b69fba2c900151165ad8b5742f31 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 15 Mar 2020 14:34:39 +0200
+Subject: [PATCH] meson: Support elogind
+
+---
+ meson.build       | 12 +++++++++---
+ meson_options.txt |  1 +
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index ef5132c6..7f68aaae 100644
+--- a/meson.build
++++ b/meson.build
+@@ -124,8 +124,10 @@ enable_systemd = get_option('systemd')
+ enable_systemd_session = get_option('systemd_session') != 'disable'
+ use_systemd_session = get_option('systemd_session') == 'default'
+ enable_systemd_journal = get_option('systemd_journal')
++enable_elogind = get_option('elogind')
+ enable_consolekit = get_option('consolekit')
+-if enable_systemd or enable_consolekit
++assert(not (enable_systemd and enable_elogind), 'Can not support systemd and elogind at once')
++if enable_systemd or enable_elogind or enable_consolekit
+   session_bin_deps += dependency('gio-unix-2.0', version: glib_req_version)
+ 
+   # Check for systemd
+@@ -152,6 +154,10 @@ if enable_systemd or enable_consolekit
+     endif
+ 
+     session_tracking = 'systemd'
++  elif enable_elogind
++    libelogind_dep = dependency('libelogind', version: '>= 239.4')
++    session_bin_deps += libelogind_dep
++    session_tracking = 'elogind'
+   endif
+ 
+   # Check for ConsoleKit
+@@ -161,7 +167,7 @@ if enable_systemd or enable_consolekit
+ 
+     session_bin_deps += dbus_glib_dep
+ 
+-    if enable_systemd
++    if enable_systemd or enable_elogind
+       session_tracking += ' (with fallback to ConsoleKit)'
+     else
+       session_tracking = 'ConsoleKit'
+@@ -171,7 +177,7 @@ endif
+ if enable_systemd_session
+   assert(enable_systemd, 'Systemd support must be enabled when using systemd session management')
+ endif
+-config_h.set('HAVE_SYSTEMD', enable_systemd)
++config_h.set('HAVE_SYSTEMD', enable_systemd or enable_elogind)
+ config_h.set('ENABLE_SYSTEMD_SESSION', enable_systemd_session)
+ config_h.set('ENABLE_SYSTEMD_JOURNAL', enable_systemd_journal)
+ config_h.set('HAVE_CONSOLEKIT', enable_consolekit)
+diff --git a/meson_options.txt b/meson_options.txt
+index 4c05dc6e..512d1528 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,4 +1,5 @@
+ option('deprecation_flags', type: 'boolean', value: false, description: 'use *_DISABLE_DEPRECATED flags')
++option('elogind', type: 'boolean', value: true, description: 'Use elogind')
+ option('session_selector', type: 'boolean', value: false, description: 'enable building a custom session selector dialog')
+ option('systemd', type: 'boolean', value: true, description: 'Use systemd')
+ option('systemd_session', type: 'combo', choices: ['disable', 'enable', 'default'], value: 'default', description: 'Whether to include systemd session support and use it by default')
+-- 
+2.26.2
+
diff --git a/gnome-base/gnome-session/gnome-session-3.34.2.ebuild b/gnome-base/gnome-session/gnome-session-3.34.2.ebuild
deleted file mode 100644
index 98e279b11004..000000000000
--- a/gnome-base/gnome-session/gnome-session-3.34.2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="consolekit doc elogind systemd"
-# There is a null backend available, thus ?? not ^^
-# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	>=dev-libs/glib-2.46.0:2
-	>=x11-libs/gtk+-3.18.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-183:0= )
-	elogind? ( >=sys-auth/elogind-239.4 )
-	consolekit? ( >=dev-libs/dbus-glib-0.76 )
-"
-
-# Pure-runtime deps from the session files should *NOT* be added here.
-# gnome-settings-daemon is assumed to be >=3.33.90, but this is about
-# removed components, so no need to strictly require it (older just
-# won't have those daemons loaded by gnome-session).
-# 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.23.2
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	sys-apps/dbus[X]
-	consolekit? ( sys-auth/consolekit )
-
-	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=(
-	# Various patches from other downstreams + elogind support
-	"${WORKDIR}"/patches/
-)
-
-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 consolekit)
-		$(meson_use doc docbook)
-		-Dman=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	dodir /etc/X11/Sessions
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome"
-
-	insinto /usr/share/applications
-	newins "${FILESDIR}/defaults.list-r4" gnome-mimeapps.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
-	# 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 && ! use consolekit; then
-		ewarn "You are building without systemd, elogind and/or consolekit 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-3.36.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild
index 44a8e800324b..0feb7789d569 100644
--- a/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild
@@ -11,9 +11,8 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="consolekit doc elogind systemd"
+IUSE="doc elogind systemd"
 # There is a null backend available, thus ?? not ^^
-# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
@@ -30,7 +29,6 @@ DEPEND="
 
 	systemd? ( >=sys-apps/systemd-183:0= )
 	elogind? ( >=sys-auth/elogind-239.4 )
-	consolekit? ( >=dev-libs/dbus-glib-0.76 )
 "
 
 # Pure-runtime deps from the session files should *NOT* be added here.
@@ -44,7 +42,6 @@ RDEPEND="${DEPEND}
 	>=gnome-base/gnome-settings-daemon-3.35.91
 	>=gnome-base/gsettings-desktop-schemas-0.1.7
 	sys-apps/dbus[X]
-	consolekit? ( sys-auth/consolekit )
 
 	x11-misc/xdg-user-dirs
 	x11-misc/xdg-user-dirs-gtk
@@ -78,8 +75,8 @@ src_configure() {
 		$(meson_use systemd)
 		-Dsystemd_session=$(usex systemd default disable)
 		$(meson_use systemd systemd_journal)
-		$(meson_use consolekit)
 		$(meson_use doc docbook)
+		-Dconsolekit=false
 		-Dman=true
 	)
 	meson_src_configure
@@ -117,8 +114,8 @@ pkg_postinst() {
 		ewarn "make sure that the commands in the xinitrc.d scripts are run."
 	fi
 
-	if ! use systemd && ! use elogind && ! use consolekit; then
-		ewarn "You are building without systemd, elogind and/or consolekit support."
+	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
 }
diff --git a/gnome-base/gnome-session/gnome-session-3.36.0.ebuild b/gnome-base/gnome-session/gnome-session-3.38.0.ebuild
index 4f42ede4e067..8d4354bec096 100644
--- a/gnome-base/gnome-session/gnome-session-3.36.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.38.0.ebuild
@@ -2,23 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org gnome2-utils meson xdg
+inherit desktop gnome.org gnome2-utils meson xdg
 
 DESCRIPTION="Gnome session manager"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="consolekit doc elogind systemd"
+IUSE="doc elogind systemd"
 # There is a null backend available, thus ?? not ^^
-# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
 	>=dev-libs/glib-2.46.0:2
-	>=x11-libs/gtk+-3.18.0:3
+	>=x11-libs/gtk+-3.22.0:3
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
@@ -28,9 +26,8 @@ DEPEND="
 	media-libs/libepoxy
 	x11-libs/libXcomposite
 
-	systemd? ( >=sys-apps/systemd-183:0= )
+	systemd? ( >=sys-apps/systemd-242:0= )
 	elogind? ( >=sys-auth/elogind-239.4 )
-	consolekit? ( >=dev-libs/dbus-glib-0.76 )
 "
 
 # Pure-runtime deps from the session files should *NOT* be added here.
@@ -44,7 +41,6 @@ RDEPEND="${DEPEND}
 	>=gnome-base/gnome-settings-daemon-3.35.91
 	>=gnome-base/gsettings-desktop-schemas-0.1.7
 	sys-apps/dbus[X]
-	consolekit? ( sys-auth/consolekit )
 
 	x11-misc/xdg-user-dirs
 	x11-misc/xdg-user-dirs-gtk
@@ -60,8 +56,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	# Various patches from master (no 3-36 branch yet) + elogind support
-	"${WORKDIR}"/patches/
+	"${FILESDIR}"/${P}-meson-Support-elogind.patch
 )
 
 src_prepare() {
@@ -78,8 +73,8 @@ src_configure() {
 		$(meson_use systemd)
 		-Dsystemd_session=$(usex systemd default disable)
 		$(meson_use systemd systemd_journal)
-		$(meson_use consolekit)
 		$(meson_use doc docbook)
+		-Dconsolekit=false
 		-Dman=true
 	)
 	meson_src_configure
@@ -88,14 +83,11 @@ src_configure() {
 src_install() {
 	meson_src_install
 
-	dodir /etc/X11/Sessions
 	exeinto /etc/X11/Sessions
 	doexe "${FILESDIR}/Gnome"
 
-	insinto /usr/share/applications
-	newins "${FILESDIR}/defaults.list-r4" gnome-mimeapps.list
+	newmenu "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
 
-	dodir /etc/X11/xinit/xinitrc.d/
 	exeinto /etc/X11/xinit/xinitrc.d/
 	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
 
@@ -117,8 +109,8 @@ pkg_postinst() {
 		ewarn "make sure that the commands in the xinitrc.d scripts are run."
 	fi
 
-	if ! use systemd && ! use elogind && ! use consolekit; then
-		ewarn "You are building without systemd, elogind and/or consolekit support."
+	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
 }
diff --git a/gnome-base/gnome-session/metadata.xml b/gnome-base/gnome-session/metadata.xml
index 0a5d0e69d176..7b4ca44a6603 100644
--- a/gnome-base/gnome-session/metadata.xml
+++ b/gnome-base/gnome-session/metadata.xml
@@ -6,7 +6,6 @@
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
 <use>
-	<flag name="consolekit">Support <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
 	<flag name="elogind">Support <pkg>sys-auth/elogind</pkg> for session tracking</flag>
 </use>
 </pkgmetadata>
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index db874a1e65ae..607fdd6cdda0 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,9 +1,10 @@
-AUX 3.32.1-fix-wacom-no-wayland.patch 811 BLAKE2B c817a6080438468d72c3633b878ba886c80aa1b4ffbb7890f661c517cd7a705648c38e4a6ad092b965654bb5d17c71417ec64c995fa65471efc06730d471db70 SHA512 d53df8ca76e272815fd077d902cef24ccb6b5d20aa3b515d2e06476003b43b4109b55dee6c1004e5a60b3bb35bf197f3bb76c2bbe7730e0f2361e2935301fd9d
+AUX gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch 4505 BLAKE2B a61199b8da339dbe9bbe7e8941a56958f5a69fafeb95c6f7027c483e35b193854560ad12f2df45dd8374db1abcefd9bfb8dae5b5381be3215755f907a73726ec SHA512 468a73b69f441886d1ce5e0e5f263ea695170a3610f6124100e3eaed1d8dd62c3439193461620d6f8b18c81d2066163ff2c1839194ebcfeec424868163f46997
+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.34.2-patchset.tar.xz 23824 BLAKE2B ce2b0720f340353ce9a27f81ac5b7a17ae44234596d80a183fe9dc69a6dd49c6b750a816b75c43df357436b32a74f48358602615c9b134cd12cd1d0d960ea2d1 SHA512 ba10afe2cd28592501c47b2eba8473a4a08d927a1fd292f738a2ae16df73e64a97e4520a680ace93c81755a60d9c378792d47b4028d1dbd3b0ff6514d5210f3d
-DIST gnome-settings-daemon-3.34.2.tar.xz 1397504 BLAKE2B a96728068a395892b67aa4b5f3223aa96d2f0d431d1836136483a5344ee2a490d2ad5a1978c265bc6d652ec3863b71f055405681fe0b2466b1a3bfd146712c4a SHA512 c5fab3af6d37dfb4dd9deff0656965699bb6c07f010c5040bb15b2fe5f7810b4815007975ad7a9841899ae1735273e394bb9539f32ab0464875cbb3648234f37
 DIST gnome-settings-daemon-3.36.1-patchset.tar.xz 79352 BLAKE2B 6daf9528f5aa4c6597a017f25da41039dd2c09b4a1c29dca2d72f20195bb93c9003de39df89a669996e13050538553fbf6ed4f738b1c6fae29e8825ba252d26a SHA512 fea4ecaadac102b0024c365ae2ba9e632ffeebab138bfc09b3f5bb0a7794c6efc779180023a73c6c884c7b64f7e8ac1ec40f1478231a5528c03829cd9273a58e
 DIST gnome-settings-daemon-3.36.1.tar.xz 1415080 BLAKE2B 4026f3443b8dcab872ef54563b5fe8e89d6932373da0513d7d8c614616d396315f1e6a8d0be022aec82351b5cfe5868cbac5caeaa782d609885029fbbd1d91e3 SHA512 f2f43d9b772589b6b4212ee2b0afe8be79d50a2e0473a960c7a7b9d379222bbe84ca548114d0a247810a094b4b3bf41e40ca91173c6cf552517dc63eb3750c88
-EBUILD gnome-settings-daemon-3.34.2.ebuild 3947 BLAKE2B aa788329a8496ea9acb029d1ee20b88c1d8e9dde8bc1a7d33f38b8471071074ba573b6f8d570eea2a6d70be5b6918a8c777a92a8e87ba8278b15a2a8ab2fed43 SHA512 83614be5327ee6d8eda65cf8d45925067a2629cb6cd06dd74a5bf64e2cdccd50ac476da2474d1581a2ead779e5fd7ee3a7d53b99decb59425b13fef5fca302b6
+DIST gnome-settings-daemon-3.38.1.tar.xz 1437096 BLAKE2B dddc4672585c23f1d0f1824303b503ec30d6fc4a2a88b9633e0256d34ca2badd067fa54a404de032f8b2e8dd5b7bfa3915464bc826d8bbea5d57431b7a2ac7fe SHA512 b32c0897d1a5680747bf68e9009ea44cf1a05ef807b772ca6514a278002754d520def7bced929b9004d3aec82a6e82b52637bd2eadd3f6cd54f3d0ac5c8e8cbd
 EBUILD gnome-settings-daemon-3.36.1.ebuild 3907 BLAKE2B 1ad1f505534b636f4157f3bfe70afc2dfc97b3007f2aa35d76a76e4f043318009784a824444baa61b3ab6fe60324a383db663fa85a680ffc9ee5f74ab0316f2c SHA512 fb60dfcca7171cd8a040d5e0a98b6861dffdac19e40efcd707fa648fe4e91baca83c5090c23adaea6eebab4de2c74cae720285aacf8f78642ee3a72a719e6ec7
+EBUILD gnome-settings-daemon-3.38.1.ebuild 3853 BLAKE2B e28fe376c288cd80b5224d2395d21896ac9de45510e566549715d88b80e29fea2dfb20b271a58c6a8343ead9b65df380c5a2dc6e3bf91f3c0c05223794e1fd74 SHA512 687482050a72f82f17b92ed7a0ee63aa8b620718b90b09e5b0de1b8781b75f34c964a3f92b3943209c9f5b4014acad043aa519bafeee673bdf71bc76e2c918f7
 MISC metadata.xml 546 BLAKE2B 8b82608d88d30a327a48d46992c0c19cefd594682191bfe4649a0e090ff13c0a9b88adf4c4aa4b42f9393c21153130afbf2d5090d774b348cff3003b41e3cef3 SHA512 c1a8e1a648564c52fb00d68a67bcfea6b2f6369186ede54a7278f258ef9f6b0cc6f399fa5f9c8ee7846d97a6163729c8da970a0f2e93e23bfa2f84ebf2466cba
diff --git a/gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch b/gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch
deleted file mode 100644
index ea343c44b6f7..000000000000
--- a/gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ec6982cc8b3fccc35dbd5df3c4e22ab94709c66d Mon Sep 17 00:00:00 2001
-From: Vlad Banea <vlb@xiphos.ca>
-Date: Tue, 31 Dec 2019 15:35:41 -0500
-Subject: [PATCH] plugins/wacom: Fix build without WAYLAND
-
----
- plugins/wacom/gsd-wacom-manager.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/wacom/gsd-wacom-manager.c b/plugins/wacom/gsd-wacom-manager.c
-index e1c8eaa7..92fd96c3 100644
---- a/plugins/wacom/gsd-wacom-manager.c
-+++ b/plugins/wacom/gsd-wacom-manager.c
-@@ -190,7 +190,7 @@ gsd_wacom_manager_class_init (GsdWacomManagerClass *klass)
- static gchar *
- get_device_path (GdkDevice *device)
- {
--#ifdef HAVE_WAYLAND
-+#if HAVE_WAYLAND
-         if (gnome_settings_is_wayland ())
-                 return g_strdup (gdk_wayland_device_get_node_path (device));
-         else
--- 
-2.20.1
-
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch
new file mode 100644
index 000000000000..658f4a3f48ee
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch
@@ -0,0 +1,134 @@
+From 6a44d3a6741da48d769353023c8801d41c969663 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 12 Jul 2020 16:30:59 +0300
+Subject: [PATCH 3/3] Allow udev optional on Linux
+
+---
+ meson.build                   |  4 ----
+ plugins/power/gsd-backlight.c | 14 +++++++-------
+ plugins/power/meson.build     |  6 +++---
+ 3 files changed, 10 insertions(+), 14 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 21d9341d..0a527513 100644
+--- a/meson.build
++++ b/meson.build
+@@ -138,9 +138,6 @@ if enable_gudev
+   gudev_dep = dependency('gudev-1.0')
+ endif
+ config_h.set10('HAVE_GUDEV', enable_gudev)
+-if host_is_linux
+-  assert(enable_gudev, 'GUdev is not optional on Linux platforms')
+-endif
+ 
+ # Check for colord
+ enable_colord = get_option('colord')
+@@ -203,7 +200,6 @@ endif
+ 
+ # Rfkill
+ enable_rfkill = get_option('rfkill')
+-assert(enable_rfkill or not host_is_linux, 'rfkill is not optional on Linux platforms')
+ if enable_rfkill
+   assert(cc.has_header('linux/rfkill.h'), 'rfkill support requested but RFKill headers not found')
+   assert(enable_gudev, 'GUdev is required for rfkill support')
+diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c
+index ca5f2723..f58f5343 100644
+--- a/plugins/power/gsd-backlight.c
++++ b/plugins/power/gsd-backlight.c
+@@ -25,7 +25,7 @@
+ #include "gsd-power-constants.h"
+ #include "gsd-power-manager.h"
+ 
+-#ifdef __linux__
++#if defined(__linux__) && defined(HAVE_GUDEV)
+ #include <gudev/gudev.h>
+ #endif /* __linux__ */
+ 
+@@ -39,7 +39,7 @@ struct _GsdBacklight
+         gint brightness_target;
+         gint brightness_step;
+ 
+-#ifdef __linux__
++#if defined(__linux__) && defined(HAVE_GUDEV)
+         GDBusProxy *logind_proxy;
+ 
+         GUdevClient *udev;
+@@ -77,7 +77,7 @@ G_DEFINE_TYPE_EXTENDED (GsdBacklight, gsd_backlight, G_TYPE_OBJECT, 0,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
+                                                gsd_backlight_initable_iface_init);)
+ 
+-#ifdef __linux__
++#if defined(__linux__) && defined(HAVE_GUDEV)
+ static GUdevDevice*
+ gsd_backlight_udev_get_type (GList *devices, const gchar *type)
+ {
+@@ -478,7 +478,7 @@ gsd_backlight_set_brightness_val_async (GsdBacklight *backlight,
+ 
+         task = g_task_new (backlight, cancellable, callback, user_data);
+ 
+-#ifdef __linux__
++#if defined(__linux__) && defined(HAVE_GUDEV)
+         if (backlight->udev_device != NULL) {
+                 BacklightHelperData *task_data;
+ 
+@@ -831,7 +831,7 @@ gsd_backlight_initable_init (GInitable       *initable,
+                 return FALSE;
+         }
+ 
+-#ifdef __linux__
++#if defined(__linux__) && defined(HAVE_GUDEV)
+         backlight->logind_proxy =
+                 g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+                                                0,
+@@ -908,7 +908,7 @@ gsd_backlight_finalize (GObject *object)
+ {
+         GsdBacklight *backlight = GSD_BACKLIGHT (object);
+ 
+-#ifdef __linux__
++#if defined(__linux__) && defined(HAVE_GUDEV)
+         g_assert (backlight->active_task == NULL);
+         g_assert (g_queue_is_empty (&backlight->tasks));
+         g_clear_object (&backlight->logind_proxy);
+@@ -961,7 +961,7 @@ gsd_backlight_init (GsdBacklight *backlight)
+         backlight->brightness_val = -1;
+         backlight->brightness_step = 1;
+ 
+-#ifdef __linux__
++#if defined(__linux__) && defined(HAVE_GUDEV)
+         backlight->active_task = NULL;
+         g_queue_init (&backlight->tasks);
+ #endif /* __linux__ */
+diff --git a/plugins/power/meson.build b/plugins/power/meson.build
+index 69e619f2..6c6ea939 100644
+--- a/plugins/power/meson.build
++++ b/plugins/power/meson.build
+@@ -24,7 +24,7 @@ native_deps = [
+   dependency('gio-2.0', native:true)
+ ]
+ 
+-if host_is_linux
++if host_is_linux and enable_gudev
+   deps += gudev_dep
+ endif
+ 
+@@ -66,7 +66,7 @@ gsd_power_enums_update = executable(
+   native: true
+ )
+ 
+-if host_is_linux
++if host_is_linux and enable_gudev
+   policy = 'org.gnome.settings-daemon.plugins.power.policy'
+ 
+   policy_in = configure_file(
+@@ -130,7 +130,7 @@ envs.set('BUILDDIR', meson.current_build_dir())
+ envs.set('TOP_BUILDDIR', meson.build_root())
+ envs.set('LD_PRELOAD', 'libumockdev-preload.so.0')
+ envs.set('NO_AT_BRIDGE', '1')
+-envs.set('HAVE_SYSFS_BACKLIGHT', host_is_linux ? '1' : '0')
++envs.set('HAVE_SYSFS_BACKLIGHT', (host_is_linux and enable_gudev) ? '1' : '0')
+ 
+ if get_option('b_sanitize').split(',').contains('address')
+   # libasan needs to be loaded first; so we need to explicitly preload it
+-- 
+2.26.2
+
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Allow-NM-optional-on-Linux.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Allow-NM-optional-on-Linux.patch
new file mode 100644
index 000000000000..e6b22b301a0d
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Allow-NM-optional-on-Linux.patch
@@ -0,0 +1,24 @@
+From b5b933cf83fc79cc9dd382ddb0ec2567330e24e8 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 8 Sep 2019 18:07:12 +0300
+Subject: [PATCH 2/3] build: Allow NM optional on Linux
+
+---
+ meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index dce9bfa1..21d9341d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -223,7 +223,6 @@ endif
+ 
+ # Sharing plugin
+ enable_network_manager = get_option('network_manager')
+-assert(enable_network_manager or not host_is_linux, 'NetworkManager support is not optional on Linux platforms')
+ if enable_network_manager
+   # network manager
+   libnm_dep = dependency('libnm', version: '>= 1.0')
+-- 
+2.26.2
+
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch
new file mode 100644
index 000000000000..b48007d29848
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch
@@ -0,0 +1,76 @@
+From 0cc1c2f5f5d12169acbb965a21b5d9f6fb4a0767 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 14 Mar 2019 09:43:00 +0200
+Subject: [PATCH 1/3] build: Make colord and wacom optional and controllable
+ via meson_options
+
+---
+ meson.build         | 10 ++++++++--
+ meson_options.txt   |  2 ++
+ plugins/meson.build |  4 ++++
+ 3 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 7dbee64b..dce9bfa1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -142,6 +142,12 @@ if host_is_linux
+   assert(enable_gudev, 'GUdev is not optional on Linux platforms')
+ endif
+ 
++# Check for colord
++enable_colord = get_option('colord')
++if enable_colord
++  colord_dep = dependency('colord', version: '>= 1.3.5')
++endif
++
+ has_timerfd_create = cc.has_function('timerfd_create')
+ config_h.set10('HAVE_TIMERFD', has_timerfd_create)
+ 
+@@ -154,8 +160,8 @@ if enable_wayland
+ endif
+ config_h.set10('HAVE_WAYLAND', enable_wayland)
+ 
+-# wacom (disabled for s390/s390x and non Linux platforms)
+-enable_wacom = host_is_linux_not_s390
++# wacom
++enable_wacom = get_option('wacom')
+ if enable_wacom
+   assert(enable_gudev, 'GUDev support is required for wacom support.')
+   libwacom_dep = dependency('libwacom', version: '>= 0.7')
+diff --git a/meson_options.txt b/meson_options.txt
+index 3e04cf64..6f6eb2fc 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -4,11 +4,13 @@ option('systemd', type: 'boolean', value: true, description: 'Enable systemd int
+ 
+ option('alsa', type: 'boolean', value: true, description: 'build with ALSA support (not optional on Linux platforms)')
+ option('gudev', type: 'boolean', value: true, description: 'build with gudev device support (not optional on Linux platforms)')
++option('colord', type: 'boolean', value: true, description: 'build with colord support')
+ option('cups', type: 'boolean', value: true, description: 'build with CUPS support')
+ option('network_manager', type: 'boolean', value: true, description: 'build with NetworkManager support (not optional on Linux platforms)')
+ option('rfkill', type: 'boolean', value: true, description: 'build with rfkill support (not optional on Linux platforms)')
+ option('smartcard', type: 'boolean', value: true, description: 'build with smartcard support')
+ option('usb-protection', type: 'boolean', value: true, description: 'build with usb-protection support')
++option('wacom', type: 'boolean', value: true, description: 'build with Wacom devices support')
+ option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
+ option('wwan', type: 'boolean', value: true, description: 'build with WWAN support')
+ option('colord', type: 'boolean', value: true, description: 'build with colord support')
+diff --git a/plugins/meson.build b/plugins/meson.build
+index 83e01885..20ccb26d 100644
+--- a/plugins/meson.build
++++ b/plugins/meson.build
+@@ -20,6 +20,10 @@ all_plugins = [
+ 
+ disabled_plugins = []
+ 
++if not enable_colord
++    disabled_plugins += ['color']
++endif
++
+ if not enable_smartcard
+     disabled_plugins += ['smartcard']
+ endif
+-- 
+2.26.2
+
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.34.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.38.1.ebuild
index 51b917c1e437..ce585ea54bab 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.34.2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.38.1.ebuild
@@ -2,13 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,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"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
@@ -18,13 +17,13 @@ REQUIRED_USE="
 	input_devices_wacom? ( udev )
 	wayland? ( udev )
 "
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 DEPEND="
 	>=sci-geosciences/geocode-glib-3.10
 	>=dev-libs/glib-2.56:2
 	>=gnome-base/gnome-desktop-3.34.2:3=
-	>=gnome-base/gsettings-desktop-schemas-3.33.0
+	>=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? (
@@ -51,7 +50,7 @@ DEPEND="
 	x11-libs/libXi
 	x11-libs/libXext
 	media-libs/fontconfig
-	systemd? ( sys-apps/systemd
+	systemd? ( >=sys-apps/systemd-243
 		sys-apps/dbus[user-session] )
 "
 # logind needed for power and session management, bug #464944
@@ -80,11 +79,9 @@ BDEPEND="
 "
 
 PATCHES=(
-	# Translation update from gnome-3-34 branch
-	# Allow disabling udev and networkmanager on Linux
-	# Make colord and wacom optional
-	"${WORKDIR}"/patches/
-	"${FILESDIR}"/3.32.1-fix-wacom-no-wayland.patch #677494, fixed in 3.36
+	"${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() {
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 3e2bee48f507..0237d6106b10 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,12 +1,8 @@
-AUX 3.28.3-defaults.patch 1385 BLAKE2B d7e0495aadec7fa042086b5219cc34906f9333a446484e63d90932551d09f469e66cc5da43040a2bf955ecdb3d2beca0e1dba435dd7c309bbc78a1b7aba7f43b SHA512 190a9a61b164373e1f2528b96eca0312a7884651ee44212f686e5752430197b2644b67550dc41ed10684cccd0e8a0d870cfdeddf8582d57de637f7dad11d0124
 AUX 3.34-optional-bluetooth.patch 1971 BLAKE2B bac967362e46cbd8b76368377c607573e34489b41b70441488086953f56581c8c77b013f848c079bb189188b5ac62de935fc55dd03f2bce725547079b344a27e SHA512 f3c8479090656f5655766a6fd790729e5c16c1b09f61f7b41485bdeee53e6e2ada7ecf7e641b8c8a9cb520a5db8a1bb4f5d0d005226bc5c08c1c553541e3e049
-AUX 3.34.4-custom_stylesheet_crash.patch 17904 BLAKE2B cff95bf20f9b2e35daa885cbfb2e7490c968daefbcaac0a11287833d4cc23ca6c7e4e4ca52a523555da69e40ef0efd85cdeea8ad25f0943c887cabef22935bd4 SHA512 c0200c7759aa502b6d3ba4cbff789ab52d1510a0a0d7213c64e26e4773a58f1c7767b9fa2531a2c032943f08101b268453a462e7013d12cec96a32bfd3642c7e
-AUX 3.34.5-CVE-2020-17489.patch 1717 BLAKE2B d92185c01f755b8aa1c54aa4c8ff57efa474a92ffe297b351f791266b1ad9f18bfddb17e19e241a0017149db5d5bb2da4b4472b853ca7e26ed34e1bda5c306af SHA512 ce9593eedae069156521e6836625d68abcfe30f65d993f7b0ec5a3f9accf8fef7aa74aa71ae289b5a1b10e7ac3de1bd28a8b61c2cf1038bdce304904da14eb65
 AUX 3.36-defaults.patch 1463 BLAKE2B c529ac85d19699d0837f4060011b8b7dd03773af4425ea27f4b87841ee6a77f222ee242e34550ca3807dc7330e0c411576f3e4e8dbbaacf684b7ca706133cc81 SHA512 f6656b0baaf53d919ee8ad54550909aed9b86280de3f6ac3667d6a3506834476024cf42087860a4ee431d74dbcfa1c066e37d6d012450d76dbfd498fe0f1fb46
-DIST gnome-shell-3.34.5.tar.xz 1558672 BLAKE2B 7b786a35b6b79a4532d9bbb761ee0629cfb18b8c4c151f5958bb9169cae01ddb489a31c9d1a0cfef3ab6dd1f29c449600c1ad9bb11adbae284e86035bec15234 SHA512 ef6a70b0b3bb14fedb07c465742fe0d78c96ddd24352fd0babf871336ee404f9823cadea5bd522e388f5b714d33b219c8ff2badaed379b7135dd90de9fca9bc4
-DIST gnome-shell-3.36.5-patchset.tar.xz 5296 BLAKE2B 6b353bd7714e2439590b74d25c964f06c8792337b22504b17cf37f4113bb0712d642fa1ab4fab9e1944544b3c57d6624c1758c97ef3b2f2a5ba2596305d4831e SHA512 669f8c2d5fe73c8f99f60ec38ac4b4fbf43e2d3667c1710f4f6179d77848f3f9d4245e22c128f41c1e594b44ba317b2430edbefa67c6886054d39726cdddd165
-DIST gnome-shell-3.36.5.tar.xz 1776080 BLAKE2B 82a53777a9fa56c3bd1c6914c1aefe85256d3cd640e95c9804b37c711360e09e758f536e9caee79c88d1686ffb3bc672f215cc454237922942edcec93f6bafd3 SHA512 e8cbcd9ee9643083870415fa3ea8ed0f1b6f2a138054f92e23479514c57b22afc38e3e082a89051f2be4e91e2dea3a68951a06eb0589f507825da9137d92e545
-EBUILD gnome-shell-3.34.5-r1.ebuild 6901 BLAKE2B 6ef96d1c1b2f7a4e4bdd3957b0549a6d309313fb2b8de12cd4777e4ecb9ae0a701659d6394e66ac86f554aec536b7f48e9a60e1ce6477bdf99b26568a2c58a58 SHA512 caea4066b69dee39cdb37e5f5e626a41eaf97c5136c11cc72fadee4f2d538316f4225e109e726bae5e5d701820b56c61a114b7869b77166a4bd746ecd7c52a12
-EBUILD gnome-shell-3.34.5.ebuild 6768 BLAKE2B 72b4934d79160c38f7868b4afddd6490cc936a0dbe73af07fcecd9f7c1434d4b96afcc036d53ac2b4d746429c9bd910c9333a97a994f64f757a1760136928302 SHA512 3a2cb1659aabe6995d27646fb5c1d5576335a96cc9b62f00e488b39694c4470f3f16185e92c71ea105449f2af6667511fff3fabfeb7d3a7b2a370412872d7357
-EBUILD gnome-shell-3.36.5.ebuild 6661 BLAKE2B ee50a9b8b7a9464b80a3d86925555f9b6f02c49b29b6174c1afe98de4969188bcde606e2ee11fd2281142c1d290d66a7ef1d0f0d4550e44f1703279d4df7b44a SHA512 7ddcf72cc154e7096902490d06bc2f1c3dcae02b9ede0beb608a8c4e59cf69abd600b0709cee43243881f21d71b1971cb0c649714afd8be0b100848d35668569
+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.1.tar.xz 1812860 BLAKE2B d58dd9f5962d953f4bfa8aede62e24007185e0b4b82781c54cce87d8505657e01b0f76a9119b60634e6c723b7dd9320f5c56b984b59cc8fce61ad4a897291b44 SHA512 7ab580f892c4b4dac2fc8625343dfab1bf7a11e148dc01e6e805a5b1ac1d4cb17943b9a3058ec69fc086c270d76ef8073dca494991a5da1dcfa52b42dcc03f01
+EBUILD gnome-shell-3.36.7.ebuild 6667 BLAKE2B 5fbfd1bf5a20ad8a7262a4bdc8c8b797ac3e5d34652fa2e50ad875778eb84f1a0f5be7c23ce7ed57d3d1e293c439a0dfad7bd7840d23e58ae1c83be31e1c6736 SHA512 bf5b0add1c462998859e3f32e8bae687ec53f9cd1911110a1246bd39361d1f219c326ccb2cf12e12b56e8673311fd7e5895cfdceb8a800f3d114b8cfee5f79ac
+EBUILD gnome-shell-3.38.1.ebuild 6303 BLAKE2B e248640eb2dbf2ed68dd569be20546334bd89353d87f364aa07d6b162fe02f939b7b51b23ed7a348b91dcab14e1050d2c9870d34e45a5b17a1a795d38233362a SHA512 1a03aa8066fd5acdc81d2dc649b6474bc4f731593d0dabae075530cee7ee12055d37570aa8450acfcb2f6cbfc8ed44fb266f6ee4f243468b45aa71ed0d03ab53
 MISC metadata.xml 1050 BLAKE2B cf97e536a47f3b023e118a818bbc34af63500d2ea94bbc71201d2ce18aa6e473673cb28a47245de24b7bad9a174a6dda6b46c300518521c8ea0662e88e95627d SHA512 50c1d4c3eacb89b77bc49b4f236bba9d9041ef047392d5bda19e85b0c935709a095a388b1625a2c77c66145758e9b4ab77a202aa6cdd2b86f262c5b56e428b06
diff --git a/gnome-base/gnome-shell/files/3.28.3-defaults.patch b/gnome-base/gnome-shell/files/3.28.3-defaults.patch
deleted file mode 100644
index a6f583144fcf..000000000000
--- a/gnome-base/gnome-shell/files/3.28.3-defaults.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 10 Dec 2013 23:33:51 +0100
-Subject: [PATCH 1/2] Alter list of default applications
-
-Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
-[Updated to include desktop file renames to reverse DNS]
-Signed-off-by: Mart Raudsepp <leio@gentoo.org>
----
- data/org.gnome.shell.gschema.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in
-index c1e6b21..368c654 100644
---- a/data/org.gnome.shell.gschema.xml.in
-+++ b/data/org.gnome.shell.gschema.xml.in
-@@ -31,7 +31,7 @@
-       </description>
-     </key>
-     <key name="favorite-apps" type="as">
--      <default>[ 'epiphany.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
-+      <default>[ 'chromium-browser-chromium.desktop', 'firefox.desktop', 'firefox-bin.desktop', 'org.gnome.Evolution.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'org.gnome.Shotwell', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
-       <summary>List of desktop file IDs for favorite applications</summary>
-       <description>
-         The applications corresponding to these identifiers
--- 
-2.10.1
-
diff --git a/gnome-base/gnome-shell/files/3.34.4-custom_stylesheet_crash.patch b/gnome-base/gnome-shell/files/3.34.4-custom_stylesheet_crash.patch
deleted file mode 100644
index 186939b91477..000000000000
--- a/gnome-base/gnome-shell/files/3.34.4-custom_stylesheet_crash.patch
+++ /dev/null
@@ -1,524 +0,0 @@
-From 87afb02e50c7a636a508cf619beb68a46168e54b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
-Date: Mon, 6 May 2019 18:28:40 -0500
-Subject: [PATCH 1/5] st-theme: Use CRStyleSheet app_data instead of hash map
-
-Use the CRStyleSheet field to save stylesheet details instead of using an extra
-hash table. In this way we can access to the stylesheet file faster without
-having to lookup it. Define a destroy function so that we can automatically
-remove the data when the container hash table is destroyed.
-
-Fixes https://gitlab.gnome.org/GNOME/gnome-shell/issues/1265
-
-https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/536
----
- src/st/st-theme.c | 91 +++++++++++++++++++++++++++++++----------------
- 1 file changed, 60 insertions(+), 31 deletions(-)
-
-diff --git a/src/st/st-theme.c b/src/st/st-theme.c
-index b567f7e5e3..208f536c5b 100644
---- a/src/st/st-theme.c
-+++ b/src/st/st-theme.c
-@@ -66,11 +66,16 @@ struct _StTheme
-   GSList *custom_stylesheets;
- 
-   GHashTable *stylesheets_by_file;
--  GHashTable *files_by_stylesheet;
- 
-   CRCascade *cascade;
- };
- 
-+typedef struct _StyleSheetData
-+{
-+  GFile *file;
-+  gboolean extension_stylesheet;
-+} StyleSheetData;
-+
- enum
- {
-   PROP_0,
-@@ -106,12 +111,25 @@ file_equal0 (GFile *file1,
-   return g_file_equal (file1, file2);
- }
- 
-+static void
-+stylesheet_destroy (CRStyleSheet *stylesheet)
-+{
-+  if (stylesheet->app_data)
-+    {
-+      g_slice_free (StyleSheetData, stylesheet->app_data);
-+      stylesheet->app_data = NULL;
-+    }
-+
-+  cr_stylesheet_unref (stylesheet);
-+}
-+
- static void
- st_theme_init (StTheme *theme)
- {
--  theme->stylesheets_by_file = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal,
--                                                      (GDestroyNotify)g_object_unref, (GDestroyNotify)cr_stylesheet_unref);
--  theme->files_by_stylesheet = g_hash_table_new (g_direct_hash, g_direct_equal);
-+  theme->stylesheets_by_file =
-+    g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal,
-+                           (GDestroyNotify) g_object_unref,
-+                           (GDestroyNotify) stylesheet_destroy);
- }
- 
- static void
-@@ -205,9 +223,6 @@ parse_stylesheet (GFile   *file,
-       return NULL;
-     }
- 
--  /* Extension stylesheet */
--  stylesheet->app_data = GUINT_TO_POINTER (FALSE);
--
-   return stylesheet;
- }
- 
-@@ -234,19 +249,30 @@ parse_stylesheet_nofail (GFile *file)
-   return result;
- }
- 
--static void
-+static gboolean
- insert_stylesheet (StTheme      *theme,
-                    GFile        *file,
-                    CRStyleSheet *stylesheet)
- {
-+  StyleSheetData *stylesheet_data;
-+
-   if (stylesheet == NULL)
--    return;
-+    return FALSE;
- 
--  g_object_ref (file);
--  cr_stylesheet_ref (stylesheet);
-+  if (g_hash_table_contains (theme->stylesheets_by_file, file))
-+    {
-+      cr_stylesheet_unref (stylesheet);
-+      return FALSE;
-+    }
- 
--  g_hash_table_insert (theme->stylesheets_by_file, file, stylesheet);
--  g_hash_table_insert (theme->files_by_stylesheet, stylesheet, file);
-+  stylesheet_data = g_slice_new0 (StyleSheetData);
-+  stylesheet_data->file = file;
-+  stylesheet->app_data = stylesheet_data;
-+
-+  cr_stylesheet_ref (stylesheet);
-+  g_hash_table_insert (theme->stylesheets_by_file,
-+                       g_object_ref (file), stylesheet);
-+  return TRUE;
- }
- 
- gboolean
-@@ -255,14 +281,15 @@ st_theme_load_stylesheet (StTheme    *theme,
-                           GError    **error)
- {
-   CRStyleSheet *stylesheet;
-+  StyleSheetData *stylesheet_data;
- 
-   stylesheet = parse_stylesheet (file, error);
--  if (!stylesheet)
-+  if (!insert_stylesheet (theme, file, stylesheet))
-     return FALSE;
- 
--  stylesheet->app_data = GUINT_TO_POINTER (TRUE);
-+  stylesheet_data = stylesheet->app_data;
-+  stylesheet_data->extension_stylesheet = TRUE;
- 
--  insert_stylesheet (theme, file, stylesheet);
-   cr_stylesheet_ref (stylesheet);
-   theme->custom_stylesheets = g_slist_prepend (theme->custom_stylesheets, stylesheet);
-   g_signal_emit (theme, signals[STYLESHEETS_CHANGED], 0);
-@@ -283,9 +310,8 @@ st_theme_unload_stylesheet (StTheme    *theme,
-   if (!g_slist_find (theme->custom_stylesheets, stylesheet))
-     return;
- 
--  theme->custom_stylesheets = g_slist_remove (theme->custom_stylesheets, stylesheet);
-   g_hash_table_remove (theme->stylesheets_by_file, file);
--  g_hash_table_remove (theme->files_by_stylesheet, stylesheet);
-+  theme->custom_stylesheets = g_slist_remove (theme->custom_stylesheets, stylesheet);
-   cr_stylesheet_unref (stylesheet);
-   g_signal_emit (theme, signals[STYLESHEETS_CHANGED], 0);
- }
-@@ -306,9 +332,10 @@ st_theme_get_custom_stylesheets (StTheme *theme)
-   for (iter = theme->custom_stylesheets; iter; iter = iter->next)
-     {
-       CRStyleSheet *stylesheet = iter->data;
--      GFile *file = g_hash_table_lookup (theme->files_by_stylesheet, stylesheet);
-+      StyleSheetData *stylesheet_data = stylesheet->app_data;
- 
--      result = g_slist_prepend (result, g_object_ref (file));
-+      if (stylesheet_data && stylesheet_data->file)
-+        result = g_slist_prepend (result, g_object_ref (stylesheet_data->file));
-     }
- 
-   return result;
-@@ -350,7 +377,6 @@ st_theme_finalize (GObject * object)
-   theme->custom_stylesheets = NULL;
- 
-   g_hash_table_destroy (theme->stylesheets_by_file);
--  g_hash_table_destroy (theme->files_by_stylesheet);
- 
-   g_clear_object (&theme->application_stylesheet);
-   g_clear_object (&theme->theme_stylesheet);
-@@ -877,18 +903,20 @@ add_matched_properties (StTheme      *a_this,
- 
-                 if (import_rule->url->stryng && import_rule->url->stryng->str)
-                   {
-+                    CRStyleSheet *sheet;
-                     file = _st_theme_resolve_url (a_this,
-                                                   a_nodesheet,
-                                                   import_rule->url->stryng->str);
--                    import_rule->sheet = parse_stylesheet (file, NULL);
--                  }
-+                    sheet = parse_stylesheet (file, NULL);
- 
--                if (import_rule->sheet)
--                  {
--                    insert_stylesheet (a_this, file, import_rule->sheet);
--                    /* refcount of stylesheets starts off at zero, so we don't need to unref! */
-+                    if (insert_stylesheet (a_this, file, sheet))
-+                      import_rule->sheet = sheet;
-+
-+                    /* refcount of stylesheets starts off at zero, so we don't
-+                     * need to unref! */
-                   }
--                else
-+
-+                if (!import_rule->sheet)
-                   {
-                     /* Set a marker to avoid repeatedly trying to parse a non-existent or
-                      * broken stylesheet
-@@ -962,12 +990,12 @@ static inline int
- get_origin (const CRDeclaration * decl)
- {
-   enum CRStyleOrigin origin = decl->parent_statement->parent_sheet->origin;
--  gboolean is_extension_sheet = GPOINTER_TO_UINT (decl->parent_statement->parent_sheet->app_data);
-+  StyleSheetData *sheet_data = decl->parent_statement->parent_sheet->app_data;
- 
-   if (decl->important)
-     origin += ORIGIN_OFFSET_IMPORTANT;
- 
--  if (is_extension_sheet)
-+  if (sheet_data && sheet_data->extension_stylesheet)
-     origin += ORIGIN_OFFSET_EXTENSION;
- 
-   return origin;
-@@ -1046,8 +1074,9 @@ _st_theme_resolve_url (StTheme      *theme,
-   else if (base_stylesheet != NULL)
-     {
-       GFile *base_file = NULL, *parent;
-+      StyleSheetData *stylesheet_data = base_stylesheet->app_data;
- 
--      base_file = g_hash_table_lookup (theme->files_by_stylesheet, base_stylesheet);
-+      base_file = stylesheet_data->file;
- 
-       /* This is an internal function, if we get here with
-          a bad @base_stylesheet we have a problem. */
--- 
-2.24.1
-
-
-From 0974a3290aa2951ada3c9f2adceb2c65c2321849 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
-Date: Mon, 6 May 2019 18:33:36 -0500
-Subject: [PATCH 2/5] st-theme: Use newer functions to finalize objects
-
-Use g_slist_free_full on custom stylesheets list and clear the hashtable and
-its pointer using g_clear_pointer and g_hash_table_destroy.
-
-https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/536
----
- src/st/st-theme.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/st/st-theme.c b/src/st/st-theme.c
-index 208f536c5b..2d51420a20 100644
---- a/src/st/st-theme.c
-+++ b/src/st/st-theme.c
-@@ -372,11 +372,11 @@ st_theme_finalize (GObject * object)
- {
-   StTheme *theme = ST_THEME (object);
- 
--  g_slist_foreach (theme->custom_stylesheets, (GFunc) cr_stylesheet_unref, NULL);
--  g_slist_free (theme->custom_stylesheets);
--  theme->custom_stylesheets = NULL;
-+  g_clear_pointer (&theme->stylesheets_by_file, g_hash_table_destroy);
- 
--  g_hash_table_destroy (theme->stylesheets_by_file);
-+  g_slist_free_full (theme->custom_stylesheets,
-+                     (GDestroyNotify) cr_stylesheet_unref);
-+  theme->custom_stylesheets = NULL;
- 
-   g_clear_object (&theme->application_stylesheet);
-   g_clear_object (&theme->theme_stylesheet);
--- 
-2.24.1
-
-
-From 801fd1884af2011ec6981e4d7844aac6f8dbecf0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
-Date: Tue, 7 May 2019 01:59:11 -0500
-Subject: [PATCH 3/5] st-theme: Remove custom stylesheets list
-
-Since we already mark the stylesheet laded by extensions in the data, we don't
-need to use another list to go trough these as we can just iterate over the
-hash table with a minimum overhead, as this will normally contain just one
-default stylesheet and all the extension stylesheets anyways.
-
-https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/536
----
- src/st/st-theme.c | 37 +++++++++++++++++++------------------
- 1 file changed, 19 insertions(+), 18 deletions(-)
-
-diff --git a/src/st/st-theme.c b/src/st/st-theme.c
-index 2d51420a20..9f6b2f6e35 100644
---- a/src/st/st-theme.c
-+++ b/src/st/st-theme.c
-@@ -63,7 +63,6 @@ struct _StTheme
-   GFile *application_stylesheet;
-   GFile *default_stylesheet;
-   GFile *theme_stylesheet;
--  GSList *custom_stylesheets;
- 
-   GHashTable *stylesheets_by_file;
- 
-@@ -290,8 +289,6 @@ st_theme_load_stylesheet (StTheme    *theme,
-   stylesheet_data = stylesheet->app_data;
-   stylesheet_data->extension_stylesheet = TRUE;
- 
--  cr_stylesheet_ref (stylesheet);
--  theme->custom_stylesheets = g_slist_prepend (theme->custom_stylesheets, stylesheet);
-   g_signal_emit (theme, signals[STYLESHEETS_CHANGED], 0);
- 
-   return TRUE;
-@@ -302,17 +299,17 @@ st_theme_unload_stylesheet (StTheme    *theme,
-                             GFile      *file)
- {
-   CRStyleSheet *stylesheet;
-+  StyleSheetData *stylesheet_data;
- 
-   stylesheet = g_hash_table_lookup (theme->stylesheets_by_file, file);
--  if (!stylesheet)
-+  if (!stylesheet || !stylesheet->app_data)
-     return;
- 
--  if (!g_slist_find (theme->custom_stylesheets, stylesheet))
-+  stylesheet_data = stylesheet->app_data;
-+  if (!stylesheet_data->extension_stylesheet)
-     return;
- 
-   g_hash_table_remove (theme->stylesheets_by_file, file);
--  theme->custom_stylesheets = g_slist_remove (theme->custom_stylesheets, stylesheet);
--  cr_stylesheet_unref (stylesheet);
-   g_signal_emit (theme, signals[STYLESHEETS_CHANGED], 0);
- }
- 
-@@ -327,14 +324,17 @@ GSList*
- st_theme_get_custom_stylesheets (StTheme *theme)
- {
-   GSList *result = NULL;
--  GSList *iter;
-+  GHashTableIter iter;
-+  gpointer value;
- 
--  for (iter = theme->custom_stylesheets; iter; iter = iter->next)
-+  g_hash_table_iter_init (&iter, theme->stylesheets_by_file);
-+
-+  while (g_hash_table_iter_next (&iter, NULL, &value))
-     {
--      CRStyleSheet *stylesheet = iter->data;
-+      CRStyleSheet *stylesheet = value;
-       StyleSheetData *stylesheet_data = stylesheet->app_data;
- 
--      if (stylesheet_data && stylesheet_data->file)
-+      if (stylesheet_data && stylesheet_data->extension_stylesheet)
-         result = g_slist_prepend (result, g_object_ref (stylesheet_data->file));
-     }
- 
-@@ -374,10 +374,6 @@ st_theme_finalize (GObject * object)
- 
-   g_clear_pointer (&theme->stylesheets_by_file, g_hash_table_destroy);
- 
--  g_slist_free_full (theme->custom_stylesheets,
--                     (GDestroyNotify) cr_stylesheet_unref);
--  theme->custom_stylesheets = NULL;
--
-   g_clear_object (&theme->application_stylesheet);
-   g_clear_object (&theme->theme_stylesheet);
-   g_clear_object (&theme->default_stylesheet);
-@@ -1030,7 +1026,7 @@ _st_theme_get_matched_properties (StTheme        *theme,
-   enum CRStyleOrigin origin = 0;
-   CRStyleSheet *sheet = NULL;
-   GPtrArray *props = g_ptr_array_new ();
--  GSList *iter;
-+  GHashTableIter iter;
- 
-   g_return_val_if_fail (ST_IS_THEME (theme), NULL);
-   g_return_val_if_fail (ST_IS_THEME_NODE (node), NULL);
-@@ -1044,8 +1040,13 @@ _st_theme_get_matched_properties (StTheme        *theme,
-       add_matched_properties (theme, sheet, node, props);
-     }
- 
--  for (iter = theme->custom_stylesheets; iter; iter = iter->next)
--    add_matched_properties (theme, iter->data, node, props);
-+  g_hash_table_iter_init (&iter, theme->stylesheets_by_file);
-+  while (g_hash_table_iter_next (&iter, NULL, (gpointer) &sheet))
-+    {
-+      if (sheet->app_data &&
-+          ((StyleSheetData *) sheet->app_data)->extension_stylesheet)
-+        add_matched_properties (theme, sheet, node, props);
-+    }
- 
-   /* We count on a stable sort here so that later declarations come
-    * after earlier declarations */
--- 
-2.24.1
-
-
-From 5b66ecb1019f3ba32aa05562a8b58ebd95702669 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
-Date: Mon, 6 May 2019 18:56:49 -0500
-Subject: [PATCH 4/5] st-theme: Ref stylesheet using facility function
-
-Define stylesheet_ref as a wrapper of cr_stylesheet_ref that returns the
-ref'ed instance so that we can use this on the caller function to make clear
-what we're passing.
-
-https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/536
----
- src/st/st-theme.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/st/st-theme.c b/src/st/st-theme.c
-index 9f6b2f6e35..30733b6fd5 100644
---- a/src/st/st-theme.c
-+++ b/src/st/st-theme.c
-@@ -110,6 +110,13 @@ file_equal0 (GFile *file1,
-   return g_file_equal (file1, file2);
- }
- 
-+static inline CRStyleSheet *
-+stylesheet_ref (CRStyleSheet *stylesheet)
-+{
-+  cr_stylesheet_ref (stylesheet);
-+  return stylesheet;
-+}
-+
- static void
- stylesheet_destroy (CRStyleSheet *stylesheet)
- {
-@@ -268,9 +275,8 @@ insert_stylesheet (StTheme      *theme,
-   stylesheet_data->file = file;
-   stylesheet->app_data = stylesheet_data;
- 
--  cr_stylesheet_ref (stylesheet);
-   g_hash_table_insert (theme->stylesheets_by_file,
--                       g_object_ref (file), stylesheet);
-+                       g_object_ref (file), stylesheet_ref (stylesheet));
-   return TRUE;
- }
- 
--- 
-2.24.1
-
-
-From bf5ea4dc4fbcf09c77a830ae9a227660e1c72d7d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
-Date: Mon, 6 May 2019 18:40:13 -0500
-Subject: [PATCH 5/5] st-theme: Use glib auto free/ptr features
-
-Use g_autofree and g_autoptr for managing memory in a smarter way.
-
-https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/536
----
- src/st/st-theme.c | 21 ++++++---------------
- 1 file changed, 6 insertions(+), 15 deletions(-)
-
-diff --git a/src/st/st-theme.c b/src/st/st-theme.c
-index 30733b6fd5..4c8730a4ce 100644
---- a/src/st/st-theme.c
-+++ b/src/st/st-theme.c
-@@ -205,7 +205,7 @@ parse_stylesheet (GFile   *file,
- {
-   enum CRStatus status;
-   CRStyleSheet *stylesheet;
--  char *contents;
-+  g_autofree char *contents = NULL;
-   gsize length;
- 
-   if (file == NULL)
-@@ -218,14 +218,11 @@ parse_stylesheet (GFile   *file,
-                                           length,
-                                           CR_UTF_8,
-                                           &stylesheet);
--  g_free (contents);
--
-   if (status != CR_OK)
-     {
--      char *uri = g_file_get_uri (file);
-+      g_autofree char *uri = g_file_get_uri (file);
-       g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                    "Error parsing stylesheet '%s'; errcode:%d", uri, status);
--      g_free (uri);
-       return NULL;
-     }
- 
-@@ -901,7 +898,7 @@ add_matched_properties (StTheme      *a_this,
- 
-             if (import_rule->sheet == NULL)
-               {
--                GFile *file = NULL;
-+                g_autoptr (GFile) file = NULL;
- 
-                 if (import_rule->url->stryng && import_rule->url->stryng->str)
-                   {
-@@ -925,9 +922,6 @@ add_matched_properties (StTheme      *a_this,
-                      */
-                     import_rule->sheet = (CRStyleSheet *) - 1;
-                   }
--
--                if (file)
--                  g_object_unref (file);
-               }
- 
-             if (import_rule->sheet != (CRStyleSheet *) - 1)
-@@ -1070,20 +1064,19 @@ _st_theme_resolve_url (StTheme      *theme,
-                        CRStyleSheet *base_stylesheet,
-                        const char   *url)
- {
--  char *scheme;
-+  g_autofree char *scheme = NULL;
-   GFile *resource;
- 
-   if ((scheme = g_uri_parse_scheme (url)))
-     {
--      g_free (scheme);
-       resource = g_file_new_for_uri (url);
-     }
-   else if (base_stylesheet != NULL)
-     {
--      GFile *base_file = NULL, *parent;
-       StyleSheetData *stylesheet_data = base_stylesheet->app_data;
-+      GFile *base_file = stylesheet_data->file;
-+      g_autoptr (GFile) parent = NULL;
- 
--      base_file = stylesheet_data->file;
- 
-       /* This is an internal function, if we get here with
-          a bad @base_stylesheet we have a problem. */
-@@ -1091,8 +1084,6 @@ _st_theme_resolve_url (StTheme      *theme,
- 
-       parent = g_file_get_parent (base_file);
-       resource = g_file_resolve_relative_path (parent, url);
--
--      g_object_unref (parent);
-     }
-   else
-     {
--- 
-2.24.1
-
diff --git a/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch b/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch
deleted file mode 100644
index c6ed147c5a25..000000000000
--- a/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From e7f7da78d4d5a9abae780589810bd012300442e9 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Mon, 27 Jul 2020 10:58:49 -0400
-Subject: [PATCH] loginDialog: Reset auth prompt on vt switch before fade in
-
-At the moment, if a user switches to the login screen vt,
-the login screen fades in whatever was on screen prior, and
-then does a reset.
-
-It makes more sense to reset first, so we fade in what the
-user is going to interact with instead of what they interacted
-with before.
-
-Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2997
-(cherry picked from commit 13137aad9db52223e8b62cecbd3456f4a7f66f04)
----
- js/gdm/loginDialog.js | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
-index c3f90dc58..6b35ebb16 100644
---- a/js/gdm/loginDialog.js
-+++ b/js/gdm/loginDialog.js
-@@ -920,16 +920,15 @@ var LoginDialog = GObject.registerClass({
-         if (this.opacity == 255 && this._authPrompt.verificationStatus == AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
-             return;
- 
-+        if (this._authPrompt.verificationStatus !== AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
-+            this._authPrompt.reset();
-+
-         this._bindOpacity();
-         this.ease({
-             opacity: 255,
-             duration: _FADE_ANIMATION_TIME,
-             mode: Clutter.AnimationMode.EASE_OUT_QUAD,
--            onComplete: () => {
--                if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
--                    this._authPrompt.reset();
--                this._unbindOpacity();
--            }
-+            onComplete: () => this._unbindOpacity()
-         });
-     }
- 
--- 
-2.20.1
-
diff --git a/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
deleted file mode 100644
index 23bc33b40f0b..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit gnome.org gnome2-utils meson pax-utils 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 ~ia64 ~ppc ~ppc64 x86"
-
-# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
-# FIXME:
-#  * gstreamer support is currently automagic
-DEPEND="
-	>=dev-libs/libcroco-0.6.8:0.6
-	>=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.57.3
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=x11-wm/mutter-3.34.0:0/5[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.32: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
-	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-31
-		>=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=(
-	# Try to fix crashes related to custom stylesheet; triggered often by package installs (probably desktop database update)
-	# https://gitlab.gnome.org/GNOME/gnome-shell/issues/1265
-	# https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/536
-	"${FILESDIR}"/3.34.4-custom_stylesheet_crash.patch
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	"${FILESDIR}"/3.34-optional-bluetooth.patch
-	# Change favorites defaults, bug #479918
-	"${FILESDIR}"/3.28.3-defaults.patch
-	# https://bugs.gentoo.org/736802 https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2997
-	"${FILESDIR}"/${PV}-CVE-2020-17489.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
-		$(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_install() {
-	meson_src_install
-
-	# Required for gnome-shell on hardened/PaX, bug #398941; FIXME: Is this still relevant?
-	pax-mark m "${ED}/usr/bin/gnome-shell"{,-extension-prefs}
-}
-
-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.36.5.ebuild b/gnome-base/gnome-shell/gnome-shell-3.36.7.ebuild
index 95c35c773e37..b50d1082d087 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.36.5.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.36.7.ebuild
@@ -53,7 +53,7 @@ DEPEND="
 	dev-libs/libxml2:2
 	x11-libs/libX11
 
-	>=media-sound/pulseaudio-2[glib]
+	>=media-sound/pulseaudio-12.99.3[glib]
 	>=dev-libs/atk-2[introspection]
 	dev-libs/libical:=
 	>=x11-libs/libXfixes-5.0
diff --git a/gnome-base/gnome-shell/gnome-shell-3.34.5.ebuild b/gnome-base/gnome-shell/gnome-shell-3.38.1.ebuild
index d1c2b7848cff..e512f2ed4767 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.34.5.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.38.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg
+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"
@@ -15,28 +15,28 @@ IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager system
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	?? ( elogind systemd )"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
 # FIXME:
-#  * gstreamer support is currently automagic
+#  * gstreamer/pipewire support is currently automagic
 DEPEND="
-	>=dev-libs/libcroco-0.6.8:0.6
 	>=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.57.3
+	>=dev-libs/gjs-1.65.1
 	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=x11-wm/mutter-3.34.0:0/5[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.32:3=[introspection]
+	>=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]
@@ -123,14 +123,10 @@ BDEPEND="
 "
 
 PATCHES=(
-	# Try to fix crashes related to custom stylesheet; triggered often by package installs (probably desktop database update)
-	# https://gitlab.gnome.org/GNOME/gnome-shell/issues/1265
-	# https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/536
-	"${FILESDIR}"/3.34.4-custom_stylesheet_crash.patch
 	# Fix automagic gnome-bluetooth dep, bug #398145
 	"${FILESDIR}"/3.34-optional-bluetooth.patch
 	# Change favorites defaults, bug #479918
-	"${FILESDIR}"/3.28.3-defaults.patch
+	"${FILESDIR}"/3.36-defaults.patch
 )
 
 src_prepare() {
@@ -143,6 +139,7 @@ src_configure() {
 	local emesonargs=(
 		$(meson_use bluetooth)
 		-Dextensions_tool=true
+		-Dextensions_app=true
 		$(meson_use gtk-doc gtk_doc)
 		-Dman=true
 		$(meson_use networkmanager)
@@ -153,13 +150,6 @@ src_configure() {
 	meson_src_configure
 }
 
-src_install() {
-	meson_src_install
-
-	# Required for gnome-shell on hardened/PaX, bug #398941; FIXME: Is this still relevant?
-	pax-mark m "${ED}/usr/bin/gnome-shell"{,-extension-prefs}
-}
-
 src_test() {
 	virtx meson_src_test
 }
diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest
index 53f9752b3067..33d38e84ec0b 100644
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -1,3 +1,2 @@
-EBUILD gnome-3.34.4.ebuild 1397 BLAKE2B 1d225a941f9363bb73b46f08248bc7041cea51245cbc3fd72021606e048f743df0c5498523632c43f115069b76ab80865e6a8805957d91f28bab6cbbf07dc563 SHA512 61670731c906df15096b2c407558f6af249fd1135019527395392b71f5971c37b457063cb03345726045c18dd05ed805d497f54344e2d26907ee77eaee060635
 EBUILD gnome-3.36.5.ebuild 1397 BLAKE2B c5f4dcad2f22798ad5b4714064577ceb332a6f7f45a0ab57e45972e33a7648a60be90ef2dadaa66e301236d10001b3e4b1c11bac4eb178e890533d22a724ae75 SHA512 d3ca311bd1161f2346425d1c6699863a50a177168f8f2e1725d3d84e24960ed5023a4f11ee15bbb94d3b4730e3553281597b4e1df08e4eb7568c7ae172aaa66d
 MISC metadata.xml 452 BLAKE2B 94890a098fcc359b62b9176f57baa243301ab562c549395f6307789987a668c095a1d571be9b7a5325ffdcbd51efaff100c1098ae0e2c337be11c54b3b703529 SHA512 459b43467672d33807e28cfa40ad930a083a026de9cc1dba2e5b795c1d766ca8f42591153164dbdedaeb7785d22a431eb5d1b36e618314ce792bb1c7da383d9a
diff --git a/gnome-base/gnome/gnome-3.34.4.ebuild b/gnome-base/gnome/gnome-3.34.4.ebuild
deleted file mode 100644
index 4a5107192cc8..000000000000
--- a/gnome-base/gnome/gnome-3.34.4.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.34.1
-
-	>=x11-wm/mutter-${PV}
-	>=gnome-base/gnome-shell-${PV}[bluetooth?]
-	>=media-fonts/cantarell-0.111
-
-	>=x11-themes/gnome-backgrounds-3.34.0
-	x11-themes/sound-theme-freedesktop
-
-	accessibility? (
-		>=app-accessibility/at-spi2-atk-2.34.1
-		>=app-accessibility/at-spi2-core-2.34.0
-		>=app-accessibility/orca-3.34.2
-		>=gnome-extra/mousetweaks-3.32.0 )
-	classic? ( >=gnome-extra/gnome-shell-extensions-3.34.2 )
-	extras? ( >=gnome-base/gnome-extra-apps-${PV} )
-"
-PDEPEND=">=gnome-base/gvfs-1.42.2[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 d4dec67d288e..c6839693dc19 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,6 +1,8 @@
 AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec9844843793dc568e3012d3cd80c7a5f7a921e8dcc42406c6e15010fa472edf9cb10b7c86d1f8f69da2f6a3a034b7 SHA512 190129064554a36b56ba308f8dd75a9b8ee5ccfadffc0b5d528b5ba70324bcb3436acab116ad7768f59d316c3c2bd85dad9e8147050cb475b21fce439cb92705
 DIST gsettings-desktop-schemas-3.34.0.tar.xz 650468 BLAKE2B a275cd011c255531b293ccb875159ea4465c79852a3d1be2a03faafa8dbb6ba7137d72c7a59bce93b6ce5f187ebf92aca334dc3c51c8de5ee3af3092fc250fe5 SHA512 6cbe59facf77566ed93faabafc6b00ad03fb398a9a4686ba94a08b1c2d0df1d44bd673fb4d51340209a66ebc0aa32095615e7e63b78f4cc4c10d240a7b0a8fa1
 DIST gsettings-desktop-schemas-3.36.1.tar.xz 679788 BLAKE2B f49f98274f48cdb2eab0d3d94147cc0994245156999d5ed71adbbe4c949bb4da1ba230fe185938542b9854c77b6e0d7084d1919c26bf9939cd58baf4fcc8f129 SHA512 623a3759fe84cc5ea897043cc7c337a4f83302ebe5cfb9d214210a48e460e22b180518f5d768382ec18396bb2e86f22649dbc9b367a858e56b1ee8d2cab58fa8
+DIST gsettings-desktop-schemas-3.38.0.tar.xz 685868 BLAKE2B a5fe8baf6d7178cfba74c82974dfb854fbc2accfb9c98db2edbf46271b54626150a570fb3b578cdd86acfd1b21b432da0947e273c3ab94ec3f416c4a51b44e4a SHA512 5af7da90b8e7eec1c98e9e44653955f2882961dd9b5e2bf00e4eeb9f4f1149ae5171c600d457c6ab9c7482471c1a0e98f92f645a7ee7298e1b843c608f660756
 EBUILD gsettings-desktop-schemas-3.34.0.ebuild 1017 BLAKE2B a548ba8e5a3828d64e3ce0d73e84e0703c1499ae3ac7854cd61dcd6ba99735d022f3cc090a0975b482ca35ac278420a231e1432e8500bdc1b39f5d48c8e0a6df SHA512 25be3c53bc476396887f6b1f45d7443d46182e2a571ec2d1b294d695533bd8837db346cb33b43b60f9b25ebf0cba826ee8e9cd85db56951dc745f5460c621dfd
-EBUILD gsettings-desktop-schemas-3.36.1.ebuild 971 BLAKE2B 4a2de7fbe06f9c33811ab7ef2c22798d0b8e6c5c25653e216caff654e86587aab6be2e912252cbf7bf4f2b8b96398e942df3499fbe61bb1b54fb328908b23b04 SHA512 6a1e65aa2ddda907f588bfb54437e2e23245a31857f06d02134b3f3aea36a41a0fac2139d748644a4efa85364c422bbb69b46566e98b275c737009d9fad2347b
+EBUILD gsettings-desktop-schemas-3.36.1.ebuild 967 BLAKE2B 1c55565141b90d619efba00cafc305eff1b4794976de19878511451050336421424618035e0d9e35fa6a0682cd258ab9cb595864ec867fd00c0ac696e4d75c94 SHA512 da17c3707358a2c51e1c8842f7824054b51b872c3a7fc9f4ea04faec2929374a8a4229cea9121944ccd5188166edaac0765ace6f476bb947243919ea0fbf61b2
+EBUILD gsettings-desktop-schemas-3.38.0.ebuild 976 BLAKE2B 0b18b599e5d63e28e95023243a2dbf3392369efabc2a9a6ea96fdd5ec191f69f6183e3b1b2c2dcd9cd2e5d11ea28c2097d9489a7854bb06b06ed3b8fd16c127d SHA512 008f7713a4410188ef96a7eb3c45c19dae426af3b042e6a87576874328380c377bbbbbe9c53969f116b55e81f59121624f804df19836342d9873babead4f6912
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.36.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.36.1.ebuild
index 1172ea294c8b..7d8eb077cbb8 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.36.1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.36.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
 BDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.38.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.38.0.ebuild
new file mode 100644
index 000000000000..34729655bb54
--- /dev/null
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.38.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
+HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="+introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+
+BDEPEND="
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Revert change to 'Source Code Pro 10' and 'Cantarell 11' fonts back to generic sans and monospace aliases
+	"${FILESDIR}"/3.32.0-default-fonts.patch
+)
+
+src_configure() {
+	meson_src_configure $(meson_use introspection)
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 7bd42b663582..4079da050f6c 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,7 +1,4 @@
 AUX libplist-2.2.patch 985 BLAKE2B cfb16b82634dfde00af05d96e3b0561b6bcbd246369b3048f807fee14fcfefdf1f2a9a39afaba9237109c051eb60f16a28916ef26e9f63fa0bcfff7e5cdefad4 SHA512 f6a9c6a2744063495ca95bfd47807a0883835504356948797e6d7015783d7f3b2504ac9ea791435301d2b4c063ef5642c53e485192c0008e0242e1754e567085
-DIST gvfs-1.42.2-patchset.tar.xz 23932 BLAKE2B 6957c5a8a200ecff9c3294a7fb7304ae1be147e45dae1838121690a3a20b1d2557681b4efe5f722811d5302b8270d0058eedac7f8a95029cd872df3db14cc541 SHA512 0494fb36e093d06bb278a75ecbf3bc17460d5d20302a9c1d2c5b74a0b65c2a259141b515b3e80c57c3e1125df74b3cf6d2a91ae70c8e2e0af3bbca285417b9f0
-DIST gvfs-1.42.2.tar.xz 1204972 BLAKE2B ebc1c4a4ae69a809ee7c556e65f87f968806ef057cfb7f7a7d2f18614443197c1feaad79099fd5b04640035e7ab306683018676ce109a7d718e3c8d35676be7c SHA512 b786ae2e493099a0a1ab2756efba3690f0e241a53995013e2632b2d7e01628d52d72b47298c7a2b913c8d50f135c191b2963a7ffc0e768fc5c96a89f93401e3c
 DIST gvfs-1.44.1.tar.xz 1222040 BLAKE2B 5a412395cf0edbdb78aea43eabd4fc0ec68f53b9f681cd6181b1c2ee09a01f90e024f75d44302eefdd9d3888512ec4fe672125eec3c79fe691d0f66dacde7bce SHA512 d936e70e6daa6a7494e5cc333a53afe82b601e34e2e54b207d9a4aefdc35dd068997832be750a6857144a48fa37065cb7e6b25378952007b06988ad07dfc6006
-EBUILD gvfs-1.42.2.ebuild 3885 BLAKE2B ee95e9a9667b1bc767bfabb200d566d8f8a31082c26b08c9a305b9677602223efc7ade9f18e7b7a3ae65799735fa4194ee48ba651b6cf1a5fa187494e74aa335 SHA512 93439634631eb7cb3bb0c8685abe4833790e4447f28443566c1aabd3339edfe3a68af8c0d84f74d818887a23488dc6b14cd1b09c73580eb3e564c3ba3a56a959
-EBUILD gvfs-1.44.1.ebuild 3793 BLAKE2B 7da0b2256b966bfcab2a4a20a3dbcdc19a81bd85f56bf39bb7686ba4e248d26c696e60956c2a34c048ccd9fcd0c788819747cf88dcb4a9360accdc44c26a26ba SHA512 362358d1349c895b954f73ca187e4d92955db5d2c1cb5666a474cb2e6b44ce4c1d04b8fb5a2c8438c48d6e49675bf7b5259f34901f69c5e904aee4eded9b05aa
+EBUILD gvfs-1.44.1.ebuild 3791 BLAKE2B 56e3b7e7446028a5a4a0b199841ac3ade5d503fcd3ff2f9a2685c050e1a6b58f833cbe4f9bad1c591a6f51ef085b8d4a5ed908c20d0fb3f90d72b786afe2533a SHA512 ce1a9b0fe6db91236466fbadfc70bb5d3d2278b4068e61881c9d3400ce25ba9b579e64adda07fd743544a83f48a6bbac3b7f9b11fa23b76d9d33eb83e610bb2f
 MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7
diff --git a/gnome-base/gvfs/gvfs-1.42.2.ebuild b/gnome-base/gvfs/gvfs-1.42.2.ebuild
deleted file mode 100644
index 799db1bc3d99..000000000000
--- a/gnome-base/gvfs/gvfs-1.42.2.ebuild
+++ /dev/null
@@ -1,141 +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"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
-
-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.9:=[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=(
-	"${WORKDIR}"/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.44.1.ebuild b/gnome-base/gvfs/gvfs-1.44.1.ebuild
index f9b9490239ae..57fd8f50812f 100644
--- a/gnome-base/gvfs/gvfs-1.44.1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.44.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 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.57.2:2
diff --git a/gnome-base/libbonoboui/Manifest b/gnome-base/libbonoboui/Manifest
deleted file mode 100644
index b8495a4c6c7c..000000000000
--- a/gnome-base/libbonoboui/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libbonoboui-2.24.5.tar.bz2 976250 BLAKE2B b8847b23479ba1c13ee41ebc67031c94572f9f9e5ae88b067da78bac2c78d6c52c6a5bd408246328fb71fa2d1722ce69acaa517c90520cd9fe5e81828988d6ea SHA512 163a8f39d9dad7fc3f1afc55b1a779961d285abe2988ff74bfcad4376e9dbfb91bb3e8212f96f48f91c54a6aff749ba6e00ea2d9add10c76b650f3072b875100
-EBUILD libbonoboui-2.24.5-r1.ebuild 1353 BLAKE2B 9036282e66376be9d572430fb6d43686ef1c1822449ee69d5b6bcf8347f859fa9da07af6cb7d06c58309162dedb0cf33ddf5fc2a71a6a62d5161325c04df30e8 SHA512 36c5d014d765f6b61bb6d964372498ac61b2d79a4b7e431cf47258c76f7ba2e520b18e684be6f04d901d13b10d152c6a17806329713f1fc62845d87f99b8b961
-MISC metadata.xml 744 BLAKE2B 9b0f0bd7470f3486c1e2dc90ef701db7a4d55afd42092904326842651f6b29b02e35a136c69b7e252d6bd458f5f2b4eea384a27bcc69067ef6b9deeeb3e6dd2e SHA512 0f23ea97d68a4c46220dd395343aa63ed8351222f0c8aeeeefe9d9410a397522d7866f4600023653ac683513754480d92c7fffcd551d5f7987b2100ca2b5c370
diff --git a/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild b/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild
deleted file mode 100644
index 4f9fbea282dd..000000000000
--- a/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="User Interface part of libbonobo"
-HOMEPAGE="https://developer.gnome.org/libbonoboui/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-# GTK+ dep due to bug #126565
-RDEPEND="
-	>=gnome-base/libgnomecanvas-1.116
-	>=gnome-base/libbonobo-2.22
-	>=gnome-base/libgnome-2.13.7
-	>=dev-libs/libxml2-2.4.20:2
-	>=gnome-base/gconf-2:2
-	>=x11-libs/gtk+-2.8.12:2
-	>=dev-libs/glib-2.6.0:2
-	>=gnome-base/libglade-1.99.11:2.0
-	>=dev-libs/popt-1.5
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	x11-apps/xrdb
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-"
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/tests//' -i Makefile.am Makefile.in || die "sed 1 failed"
-	fi
-
-	if ! use examples; then
-		sed 's/samples//' -i Makefile.am Makefile.in || die "sed 2 failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	addpredict "/root/.gnome2_private"
-	gnome2_src_configure --disable-static
-}
-
-src_test() {
-	addpredict "/root/.gnome2_private"
-	Xemake check
-}
diff --git a/gnome-base/libbonoboui/metadata.xml b/gnome-base/libbonoboui/metadata.xml
deleted file mode 100644
index 561f51608528..000000000000
--- a/gnome-base/libbonoboui/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<longdescription>
-	computer. It will however make a snappier openoffice than the binary  version.
-	The Bonobo UI library provides a number of user interface controls using the 
-	Bonobo component framework.	This module is heading towards planned deprecation.
-	It will continue to be supported and API/ABI stable	throughout the GNOME 2.x 
-	series, but we do not recommend using it in new applications unless you require
-	functionality that has not already been moved elsewhere.
-</longdescription>
-</pkgmetadata>
diff --git a/gnome-base/libgnome/Manifest b/gnome-base/libgnome/Manifest
deleted file mode 100644
index 386125cb9b84..000000000000
--- a/gnome-base/libgnome/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX libgnome-2.26.0-branding.patch 839 BLAKE2B b7f994739db6c2119bca6abfcc8c53221979a148f972470b0c9c2d2d126baee145e32de074a63c2aac5fda1a35dd9201904e13150876994bca42a9f60a7a9714 SHA512 de12f680f875ade002c752ea6595969b2948196299d3807592bb014ade59c51093e1d19f56d2f69fe381fece037a48c7dcb44c632ddc19128959db1dec54f473
-AUX libgnome-2.28.0-menus-have-icons.patch 538 BLAKE2B e4bca7e5ae5c7fe38d88e13347896a2d636db82584d0cbda015d617b14bc0ecbb434bc0f9ebc946765a3ec2c8e6f55ab1c7d2f780d955dedcaa0d007399544df SHA512 4897bd5497fd9cfbf778ab7c815028e5b819d1c1f69d2ad9bedb0f5895e8c7b7b40a918436026e494c83238c694145670046a0d0beeda31c5820bed5867eb1d2
-AUX libgnome-2.32.1-utf8-header.patch 930 BLAKE2B 32065fbe8e6d931f6c79209eb8acf11a4eda339832172822c6997a2ed03146d81d38d3ebb8b8238f3da9d62c0d8ad2c0937bb6e787f4889d68145adfbbcee290 SHA512 b72f124358ad66d00d00435cb5087163077361d33082e2b1dd9c06b9dd97203d515943d21214e834d2d0fbeedde7a85414b1a9ce39e734d6e1bf1bdab1664ad3
-DIST gentoo-gdm-theme-r3.tar.bz2 411703 BLAKE2B a4373d291f6813d2d07b78b23f5b5d1e288cb4a979a7b5cbe1351e6432cae2b24c07fa467b08c590a100e22807b3aa77ff085e0b8a9268e5542e81495013928a SHA512 47485899c698a2f6c3dee540806c0bbdedeab77a31b1f2b191f7f98d0d88a580aeb8dddf16fc33226db0519c21d185112421b5c6e233883ea4f67c844028281a
-DIST libgnome-2.32.1.tar.bz2 1776006 BLAKE2B 3e9fa78bf1b9a550588374809c90f7cabd7fc3fe17f18d6e1ce0ea463bfb6999279d1e0cfb4d8df1c64571e6d8c6a9c90bbe558ba7cd8c99f2a100bf9fbf83d9 SHA512 f94e603255a93e73249e0fd9ed5604d732b44ad46f3cc3065afb46fc6162f6cf29304f49440b5c06303b8e68608b6fd16236076813febb5f1cbdcde4bfc3b3e3
-EBUILD libgnome-2.32.1-r1.ebuild 1763 BLAKE2B fecbfc8e593ce71c741337e1ed22b1a43fdc6f2ceb1d6ea7cc64bfeaa1a75288d8132b4ba95ee5d70c739d6c9ca5d3e7e8bf2360a8ebe448826b79a1ee7967b1 SHA512 118f2b380dd3d7c6a628063c865cb3c883ef3301415ef93760422a2329b1378d22532f3f565b0bea78cf8c9bc21f8a0b1084d6ff49958b1666369540c213e65d
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnome/files/libgnome-2.26.0-branding.patch b/gnome-base/libgnome/files/libgnome-2.26.0-branding.patch
deleted file mode 100644
index 2cab351e6b23..000000000000
--- a/gnome-base/libgnome/files/libgnome-2.26.0-branding.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libgnome-2.26.0.orig/schemas/desktop_gnome_background.schemas.in.in libgnome-2.26.0/schemas/desktop_gnome_background.schemas.in.in
---- libgnome-2.26.0.orig/schemas/desktop_gnome_background.schemas.in.in	2009-03-17 10:42:05.000000000 -0400
-+++ libgnome-2.26.0/schemas/desktop_gnome_background.schemas.in.in	2009-04-24 14:57:59.000000000 -0400
-@@ -29,7 +29,7 @@
-         <applyto>/desktop/gnome/background/picture_filename</applyto>
-         <owner>gnome</owner>
-         <type>string</type>
--	<default>@datadir@/pixmaps/backgrounds/gnome/background-default.jpg</default>
-+	<default>@datadir@/pixmaps/backgrounds/gnome/gentoo/gentoo-emergence.png</default>
-         <locale name="C">
-         <short>Picture Filename</short>
-         <long>File to use for the background image.</long>
diff --git a/gnome-base/libgnome/files/libgnome-2.28.0-menus-have-icons.patch b/gnome-base/libgnome/files/libgnome-2.28.0-menus-have-icons.patch
deleted file mode 100644
index 7249696a7301..000000000000
--- a/gnome-base/libgnome/files/libgnome-2.28.0-menus-have-icons.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream changed default to no icons for menus. We don't want that. No one wants
-that.
-
----
---- schemas/desktop_gnome_interface.schemas.in.in
-+++ schemas/desktop_gnome_interface.schemas.in.in
-@@ -65,7 +65,7 @@
-       <applyto>/desktop/gnome/interface/menus_have_icons</applyto>
-       <owner>gnome</owner>
-       <type>bool</type>
--      <default>false</default>
-+      <default>true</default>
-       <locale name="C">
-         <short>Menus Have Icons</short>
-         <long>Whether menus may display an icon next to a menu entry.</long>
diff --git a/gnome-base/libgnome/files/libgnome-2.32.1-utf8-header.patch b/gnome-base/libgnome/files/libgnome-2.32.1-utf8-header.patch
deleted file mode 100644
index a70dccc97e75..000000000000
--- a/gnome-base/libgnome/files/libgnome-2.32.1-utf8-header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 33313713c4f5c1de500859ff128d6fd7e3af5722 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Mon, 7 Aug 2017 12:57:43 -0400
-Subject: gnome-config.h: Fix invalid UTF-8 in header
-
-This breaks the new Python `glib-mkenums`.
----
- libgnome/gnome-config.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgnome/gnome-config.h b/libgnome/gnome-config.h
-index 0c3dfe6..b9d659d 100644
---- a/libgnome/gnome-config.h
-+++ b/libgnome/gnome-config.h
-@@ -270,7 +270,7 @@ void gnome_config_clean_key_ (const char *path, gboolean priv);
- #define gnome_config_private_clean_key(path) \
- 	(gnome_config_clean_key_((path),TRUE))
- 
--/* returns the true filename of the config file */
-+/* returns the true filename of the config file */
- #define gnome_config_get_real_path(path) \
- 	(g_build_filename (gnome_user_dir_get(),(path),NULL))
- #define gnome_config_private_get_real_path(path) \
--- 
-cgit v0.12
-
diff --git a/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild b/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild
deleted file mode 100644
index 906503da428f..000000000000
--- a/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Essential Gnome Libraries"
-HOMEPAGE="https://library.gnome.org/devel/libgnome/stable/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="branding"
-
-SRC_URI="${SRC_URI}
-	branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
-
-RDEPEND="
-	>=gnome-base/gconf-2
-	>=dev-libs/glib-2.16:2
-	>=gnome-base/gnome-vfs-2.5.3
-	>=gnome-base/libbonobo-2.13
-	>=dev-libs/popt-1.7
-	media-libs/libcanberra
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-
-PDEPEND="gnome-base/gvfs"
-
-src_prepare() {
-	# Make sure menus have icons. People don't like change
-	epatch "${FILESDIR}/${PN}-2.28.0-menus-have-icons.patch"
-
-	# Remove UTF-8 character from headers
-	# https://bugs.gentoo.org/639336
-	epatch "${FILESDIR}"/${PN}-2.32.1-utf8-header.patch
-
-	use branding && epatch "${FILESDIR}"/${PN}-2.26.0-branding.patch
-
-	# Default to Adwaita theme over Clearlooks to proper gtk3 support
-	sed -i -e 's/Clearlooks/Adwaita/' schemas/desktop_gnome_interface.schemas.in.in || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-canberra \
-		--disable-esd
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use branding; then
-		# Add gentoo backgrounds
-		dodir /usr/share/pixmaps/backgrounds/gnome/gentoo
-		insinto /usr/share/pixmaps/backgrounds/gnome/gentoo
-		doins "${WORKDIR}"/gentoo-emergence/gentoo-emergence.png
-		doins "${WORKDIR}"/gentoo-cow/gentoo-cow-alpha.png
-	fi
-}
diff --git a/gnome-base/libgnome/metadata.xml b/gnome-base/libgnome/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/libgnome/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/libgnomeui/Manifest b/gnome-base/libgnomeui/Manifest
deleted file mode 100644
index d688e77398fa..000000000000
--- a/gnome-base/libgnomeui/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libgnomeui-2.24.5.tar.bz2 1440172 BLAKE2B 3ffe1942b993fbd112029637cfe7eca031b500dac526c88cf1b28ed6d9f17232fd6e6d4220d455c852f73cd1ff6b074c47d30fd926b677ec426f1351def525b4 SHA512 e78fbe909179161acb6f7a1d31b8a247c9007af55c7f9c36422791be8d2681d42edfa582c19db88459d36309a18c03cb859997fe6b5918f602884607a8b6d5d5
-EBUILD libgnomeui-2.24.5-r1.ebuild 1330 BLAKE2B 79c4dd7877afabb842667785c77a76862af90fe118a62bcee4bf75289080bd3c693f858e7938e5c1245ccaf56c89b67eeaf3f6a9f7831d035a887577d498c9b9 SHA512 0cfc2586648b1a4652eb8679a4b72947dbf19123ece4fe5c0b74003c749c243487ba068cb8e4a56f1ffde7de9dd4fb1e34e4bf0cb85330554012b4601e75a5a8
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild b/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild
deleted file mode 100644
index 19b4340f70cd..000000000000
--- a/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2
-
-DESCRIPTION="User Interface routines for Gnome"
-HOMEPAGE="https://library.gnome.org/devel/libgnomeui/stable/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# gtk+-2.14 dep instead of 2.12 ensures system doesn't loose VFS capabilities in GtkFilechooser
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.16:2
-	>=dev-libs/libxml2-2.4.20:2
-	>=dev-libs/popt-1.5
-	>=gnome-base/gconf-2:2
-	>=gnome-base/gnome-keyring-0.4
-	>=gnome-base/gnome-vfs-2.7.3:2
-	>=gnome-base/libgnome-2.13.7
-	>=gnome-base/libgnomecanvas-2
-	gnome-base/libgnome-keyring
-	>=gnome-base/libbonoboui-2.13.1
-	>=gnome-base/libglade-2:2.0
-	media-libs/libart_lgpl
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.14:2
-	>=x11-libs/pango-1.1.2
-	x11-libs/libICE
-	x11-libs/libSM
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-"
-PDEPEND="x11-themes/adwaita-icon-theme"
-
-src_prepare() {
-	if ! use test; then
-		sed 's/ test-gnome//' -i Makefile.am Makefile.in || die "sed failed"
-	fi
-	gnome2_src_prepare
-}
diff --git a/gnome-base/libgnomeui/metadata.xml b/gnome-base/libgnomeui/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/libgnomeui/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index cecb125148ba..c5410cef58f3 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,6 +1,8 @@
 AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f05006094106a17fdb61b1bf2e6210f42fe91716e7fd21cf40ad5adecfee45b9e1d488249d1befdb48399c5952829c3d01e07 SHA512 bea056ac4d3d19719129dd7379d783a8eb34efbf57186f6ab7113ff97fdd809b0802d60add646ea50c776eb7bc07f5a0f4c0911569a2b1b24dbb1683f111d7c0
 DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
 DIST librsvg-2.48.8.tar.xz 15302184 BLAKE2B 7d44b58d894afbeff0cb4606ed64191c028e7ac9d987dd3248b90df4ae0c000ee47b02484116bf7ee6e7aad567b91df7a2aae6880514f5ddee3ef4826c2e828e SHA512 7b35afbbad17927168acb3a308bff59ea66e8e1ac18c2ab5626a7d494e90d87d2dc552959ad72974d3ed8ba4c2f919335cf9110a0d0a09148e606222e4fcee43
-EBUILD librsvg-2.40.21.ebuild 2639 BLAKE2B 90b8112288349552ac764ea1e148ab03df464a7f7d3c50e1da99c73116c4c6b5bab15e808e08862944ab5d18da54e2938334490ea29edf1715f043ec941adf10 SHA512 03779cf7a6f14b55e8a38c2e28e07ebbc425dce3bb59eea3542643fd6e84fb9ee51b0610bb9d73ff929ff0b7f5efdaf8b19b4696d535158d2c2b8ed7381ff34a
-EBUILD librsvg-2.48.8.ebuild 2494 BLAKE2B 313b90760853957a85c9adaa6b6b4dae881ba692ef51944655fa9844ba037d60194870d161f2953c22a4e45be6c194eaecef1d5547cab33b9ef8b53e13872b68 SHA512 cc169626671bab12209efada2b3958ae005f7a5903775d809a0c51250b585400c5902c878c57569ef9c59305009e0eff8e69788baec91f90562a7eb4f40d5bfa
+DIST librsvg-2.48.9.tar.xz 15309204 BLAKE2B 2547f9eb2bb81c7c879356df0df674ba27a09e3b1f0eb8df99df7a9a9c5e6838e94e143f50a00a742a4fd7043c01b4f484cfa78c84c4d5e6ec281bde35fd98b2 SHA512 91fc480a9e9ff3755ed2685170a1fadea9232ab9a727a66da5085df09cd1a160cb8f443de7dec950799de5f4cb88b1ee33384107e316f573940147346c155a40
+EBUILD librsvg-2.40.21.ebuild 2621 BLAKE2B 50fdea0a81bba894e643f143459798398ed4404bb48f5068df79ff6877aba8ae1eca4f9d9f46e25d34db6a06e00b2cb5c1a7b0b2c5518da968c74bf427dbd828 SHA512 bb345f47471b2685f2cf3499f8e4bac8fa6ab652c7de60aabef402aa6a8c22d442c376662f7adda4a4d470ae6eec8a8c34a75fb71c3d19b07ff5689b5e06cab5
+EBUILD librsvg-2.48.8.ebuild 2493 BLAKE2B 0dcdd0e0604652803e354397a61a6da127f59ac4f73c84355ae1ed473d9de28443ac96c144b06eab7d24da7c9f46d8f31580ce2cfbca734b8407f034c10c9d65 SHA512 9c05dee8de012eff413ac0444e0dbb1dc0fab8f50bad7d0c4179bfb2dc4a264d1110a26b2a5f808f0169a6e11922c220d27ff651835dcee4e80f5bc0c372d1f4
+EBUILD librsvg-2.48.9.ebuild 2498 BLAKE2B 77ad625306c3e87b085268d1b4f659f083ac58026d23f7285a866babeada7a43a3e28a5666043e5154af6573ac39325eba7e852fcb6052ae7ad59ccba5e1a84b SHA512 9e4445991fadcc1d29cb640248ffa0c8a3837afd3df750bbc1472ae2c66017c746335af351e4fc59652a3f0680470a0d81d1ec0586876bf606f590f5a633fc8a
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/librsvg-2.40.21.ebuild b/gnome-base/librsvg/librsvg-2.40.21.ebuild
index 972d7b6e6d2e..44a6e1505746 100644
--- a/gnome-base/librsvg/librsvg-2.40.21.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.21.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha arm hppa ~ia64 ~mips ppc s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection tools +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gnome-base/librsvg/librsvg-2.48.8.ebuild b/gnome-base/librsvg/librsvg-2.48.8.ebuild
index 067c01c0b1c6..5c9ac17f786f 100644
--- a/gnome-base/librsvg/librsvg-2.48.8.ebuild
+++ b/gnome-base/librsvg/librsvg-2.48.8.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 )"
diff --git a/gnome-base/librsvg/librsvg-2.48.9.ebuild b/gnome-base/librsvg/librsvg-2.48.9.ebuild
new file mode 100644
index 000000000000..c5ec2752fa96
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.48.9.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 multilib-minimal rust-toolchain vala
+
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="+introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.38.0[${MULTILIB_USEDEP}]
+
+	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+"
+DEPEND="${RDEPEND}
+	>=virtual/rust-1.39[${MULTILIB_USEDEP}]
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
+
+RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc.
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-static
+		--disable-debug
+		--disable-tools # the tools/ subdirectory is useful only for librsvg devs
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable vala)
+		--enable-pixbuf-loader
+	)
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# Set the rust target, which can differ from CHOST
+			RUST_TARGET="$(rust_abi)"
+			# RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as
+			# far as C parts and configure auto-detection are concerned as CHOST equals CBUILD
+			cross_compiling=yes
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure "${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+multilib_src_compile() {
+	# causes segfault if set, see bug #411765
+	unset __GL_NO_DSO_FINALIZER
+	gnome2_src_compile
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_pkg_postrm
+}
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 29c186fa3b21..172a263df3b3 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,8 +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
-AUX 3.34.2-pango-1.42-compat.patch 3896 BLAKE2B 022cc2667db62a9956684f3b16f466a6dbb3112caabd80629775be0e50677fbe657e2fe9c3202f3d7c54c0c1fc7e80fe189583f30cf98d03196c131331e3fc2b SHA512 ee293078db3e17ca0f0e5cee560142f272855515f3f59b59c0743a544a3149bed5d904a2022deb210ce61c09673de903c82e288803545d30f068985f0db0f03d
-DIST nautilus-3.34.3.tar.xz 3213260 BLAKE2B a417ee5d5e032befed704b71b9ffd29cc9a2a6fae0612f96601756b876b0990625cc78eb2c7679bdce914f3dd30208b60243f403a508cf87a6761ea56251140d SHA512 f8ef86b5b67ef2b8eced492ee6b8d77155a9d6ec5ba6bb18132d678e6f12870963da9bcf4ff0bfbb8f4791bf068314557f9551febc23234c48d722e529c6ed9d
 DIST nautilus-3.36.3.tar.xz 3201908 BLAKE2B ec7be7ad523e29c853a1a16dd6381257bd7f7af0004d4b84a9ef13539f5c8ea431c61f819eee6c0d396037846d390ae112b3fe2771276cde6128e7fad95eb4f4 SHA512 4dce01c20a34ed9bbff53a9886775af431754d02a4300e4647d87830502103e7436e53127b2e503af8e3a90785aa864514dbde22508ffb3e06eb43d4633fddde
-EBUILD nautilus-3.34.3.ebuild 2904 BLAKE2B 22da3640ed42c7f9f2b965ca0ded92c5add51f7134420a1b49351fd47fd4432d98cce7b571cf12296320ef0d55a2690636293bd4d1786478f2399ff902b16b9c SHA512 8c180ed68480d9cf5a341a6f49f7ac9295e9166da963f865686c7dc60c9010f5dabaa7c9813d88011d819b512304f9f173f94014065e0de0bc675c0e64f90ac9
 EBUILD nautilus-3.36.3.ebuild 2858 BLAKE2B e6336c2c17144faa3823282c48a43af4fd8788b6ff343e1c7985d01640e12b0d4d25cd66de66ec6dd1125bb841be3d5a9d28ef60dae0afd63158fdbedfe8c12d SHA512 04b09cfad516cbc709883467cfee1ffec1f1e63596b3e62c3628c2a4b9613fef7f534862055b8e4cf3570f4840381966b9822fe6397a7b180f981e32fde80e0c
 MISC metadata.xml 553 BLAKE2B 51c14fbccc3b060cb5fac644a8213672250edb2c2092076bb4e0c390bfc8562a950fd362ae4294ac1215e774fcd4dd4de6c709b126c04fa705cf10be0e6e836f SHA512 77102dd05a5180dffca7ef03d66e3d0dc113f272e583da442027a94cb4e9fc67f0c267d9f2d5d0a4ef895d58604aed78fbe01c19b3f018972ff675d392786b7c
diff --git a/gnome-base/nautilus/files/3.34.2-pango-1.42-compat.patch b/gnome-base/nautilus/files/3.34.2-pango-1.42-compat.patch
deleted file mode 100644
index 76ab1fb1c2e2..000000000000
--- a/gnome-base/nautilus/files/3.34.2-pango-1.42-compat.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From a9cd85a7bc045ae4b4661f0e6f9ece362a26c0c3 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Wed, 27 Nov 2019 14:08:27 +0000
-Subject: [PATCH] Conditionally depend on Pango 1.44.4
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We're using newly introduced Pango API, but we're not doing a version
-check on it. One option is to force a Pango ≥ 1.44.4 dependency; another
-is to do a compile time check and only use the new API if we're building
-against a new enough Pango.
----
- src/nautilus-canvas-item.c       | 14 +++++++++-----
- src/nautilus-view-icon-item-ui.c | 16 ++++++++++------
- 2 files changed, 19 insertions(+), 11 deletions(-)
-
-diff --git a/src/nautilus-canvas-item.c b/src/nautilus-canvas-item.c
-index 4d33d119b..5b5d3312f 100644
---- a/src/nautilus-canvas-item.c
-+++ b/src/nautilus-canvas-item.c
-@@ -1381,14 +1381,12 @@ create_label_layout (NautilusCanvasItem *item,
-     GString *str;
-     char *zeroified_text;
-     const char *p;
--    PangoAttrList *attr_list;
- 
-     canvas_item = EEL_CANVAS_ITEM (item);
- 
-     container = NAUTILUS_CANVAS_CONTAINER (canvas_item->canvas);
-     context = gtk_widget_get_pango_context (GTK_WIDGET (canvas_item->canvas));
-     layout = pango_layout_new (context);
--    attr_list = pango_attr_list_new ();
- 
-     zeroified_text = NULL;
- 
-@@ -1417,8 +1415,15 @@ create_label_layout (NautilusCanvasItem *item,
-     pango_layout_set_spacing (layout, LABEL_LINE_SPACING);
-     pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR);
- 
--    pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE));
--    pango_layout_set_attributes (layout, attr_list);
-+#if PANGO_VERSION_CHECK (1, 44, 4)
-+    {
-+        PangoAttrList *attr_list = pango_attr_list_new ();
-+
-+        pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE));
-+        pango_layout_set_attributes (layout, attr_list);
-+        pango_attr_list_unref (attr_list);
-+    }
-+#endif
- 
-     /* Create a font description */
-     if (container->details->font)
-@@ -1432,7 +1437,6 @@ create_label_layout (NautilusCanvasItem *item,
-     pango_layout_set_font_description (layout, desc);
-     pango_font_description_free (desc);
-     g_free (zeroified_text);
--    pango_attr_list_unref (attr_list);
- 
-     return layout;
- }
-diff --git a/src/nautilus-view-icon-item-ui.c b/src/nautilus-view-icon-item-ui.c
-index d192e28fa..837dc54a9 100644
---- a/src/nautilus-view-icon-item-ui.c
-+++ b/src/nautilus-view-icon-item-ui.c
-@@ -128,7 +128,6 @@ constructed (GObject *object)
-     GtkBox *container;
-     GtkBox *item_selection_background;
-     GtkLabel *label;
--    PangoAttrList *attr_list;
-     GtkStyleContext *style_context;
-     NautilusFile *file;
-     guint icon_size;
-@@ -150,9 +149,16 @@ constructed (GObject *object)
- 
-     label = GTK_LABEL (gtk_label_new (nautilus_file_get_display_name (file)));
-     gtk_widget_show (GTK_WIDGET (label));
--    attr_list = pango_attr_list_new ();
--    pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE));
--    gtk_label_set_attributes (label, attr_list);
-+
-+#if PANGO_VERSION_CHECK (1, 44, 4)
-+    {
-+        PangoAttrList *attr_list = pango_attr_list_new ();
-+        pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE));
-+        gtk_label_set_attributes (label, attr_list);
-+        pango_attr_list_unref (attr_list);
-+    }
-+#endif
-+
-     gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_MIDDLE);
-     gtk_label_set_line_wrap (label, TRUE);
-     gtk_label_set_line_wrap_mode (label, PANGO_WRAP_WORD_CHAR);
-@@ -182,8 +188,6 @@ constructed (GObject *object)
-                       (GCallback) on_view_item_size_changed, self);
-     g_signal_connect (self->model, "notify::file",
-                       (GCallback) on_view_item_file_changed, self);
--
--    pango_attr_list_unref (attr_list);
- }
- 
- static void
--- 
-2.20.1
-
diff --git a/gnome-base/nautilus/nautilus-3.34.3.ebuild b/gnome-base/nautilus/nautilus-3.34.3.ebuild
deleted file mode 100644
index 6a35a0d8f4eb..000000000000
--- a/gnome-base/nautilus/nautilus-3.34.3.ebuild
+++ /dev/null
@@ -1,106 +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:=
-	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:=
-" # 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
-	"${FILESDIR}"/3.34.2-pango-1.42-compat.patch
-)
-
-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
-}