gentoo resync : 04.05.2021

31 files changed, 1195 insertions, 141 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index d7703ea51602..827eff15d2b9 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index c01714b940a9..a96a9f1dda42 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -4,9 +4,12 @@ AUX default.pa 328 BLAKE2B 558dbedcb5a0f31e0bdc01ce21deaeacb4740dee998f8b2f94736
 AUX gdm-2.32.0-xinitrc-ssh-agent.patch 842 BLAKE2B 98233eaf06fbe0950aa36bbc8bee2ac7ffa3cdebe75e32b8ef9a5035c383135bfc77e201d2ee07e7ec6b53770bef20484a3fba93b1cd7f434253704b70563e38 SHA512 40630ec2e7bee66102e141a0ba4d02e4202d052bb829606f684b6c23c9f3dbc2d43cea71d7eba163398251af2d7c7b34d0abafee76ccd6400521551de1c385bd
 AUX gdm-3.30.3-logo.patch 846 BLAKE2B e99b6621191c509545bc36fe838bc467c3762f2726e247aea1b3cad2a86c0b0e95c5f9953b680a072d244140615c38becbc605998a2be0ed3332d7b5ef802f55 SHA512 63428d4605d9f4f35445f364657c1d92818125a737add7bc5e5acab424beaf8ae5895368111cd2d1c03c75f5fd8b9538d8750ea732a0990b5b82507735850e4c
 AUX gdm-3.8.4-fingerprint-auth.patch 923 BLAKE2B e681da8518ed1d002c1205658bb35e472e9d130df5d70dfd9eef55f5361cffeee716ebe0eea23f4c19f9f6ec2f4118729616f7f4e2c758990cf7cde3271cc8b2 SHA512 3cf5f9c0eabdae3f767d9b9db6052d760e879c14b9304753cdda56a4f643a9ed97f3ea83f642bfe96d220c8e9e4f99fbbd47c6e99ddfebeb6322a3a033c296d5
+AUX gdm-40.0-meson-allow-building-with-elogind.patch 8801 BLAKE2B 358abc6b4a81523f53f6551af3c976916492c6c80fcacf8ec7c6fd90683558f1e7d898b749bdb458b2379e8a96f08293bbbebee3b8fc9126ebf249a95c514b41 SHA512 6116047fe51f0daf99de7e369028629fff88890c9627407648f2bec312df9b8b94f1ccb9b7015347258444f8193da16c6209a41de9441c848097670a13b4a7ef
 AUX gdm-CanGraphical-wait.patch 5534 BLAKE2B 3be217b156ab6d486d7df98885934c5d1bedd6219a25a83cba687aa1ed59f6d0f2a16694a47050313e601355696095ccc738ac639f5958d9619db81d34efe068 SHA512 2152e800051473b8fd230c4b325d72229cfe91dce3e90ad6d8ace8e3278483ab05ce683e61c183f7c83e293873f69715740b1eccfdb34d6775140c635c73b5dd
 AUX pam-elogind.patch 835 BLAKE2B 1db26b690d631c152ae7fd84149c7ff3222e8bd258bff78e09cd6f00fe34a8bfdb2499b252a1f15e17d9e4ed315e02260357b57cd31cf8ada5a2705ba1ef4ee0 SHA512 4d2d65741a5bfd1dc686dc986708526161d15ace2d5396bef281a2192d95458a072764483e1422ed1f6eb594fc0caa6baa381371618f907a97f75566209fab7b
 DIST gdm-3.36.4.tar.xz 1235796 BLAKE2B eeac6c3c95993d7a75eecd03b51f0519b2f899eaecce8767dbab01eead68bddde21edc999eaf6b7ce747084ac9f88ab71cd7bf602e3bdc5bfe09038e3b01ad3a SHA512 ee8a4ae4a1c4846e4d52fda0b115dfc79ef76b78a2349977767e4212910b5ad331b908601f252292a8a944973372d1dce3124d9ccb8a2519a98d0e4813a6ec61
+DIST gdm-40.0.tar.xz 800296 BLAKE2B 9c2038758cec09f13c18bd79d431e82a29fb1a2b8ab099498a0b8d920cb93896abceab9157edae8cc15312e03d21eb36b649c2cc8761f9af5fec387c5f28a261 SHA512 b20d02f8a80f6aff8909a69c6c621c20c5aa1b25cfedd68bf95faaaa56d5f7cd5d607d1a7388b97aa06510684f1e9e474248042a00203f496c39930e001bb64c
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD gdm-3.36.4-r1.ebuild 7221 BLAKE2B f7f2be3915981750964e0152c486be3bf327aea4d6cbc0ecab787f2f8bc4e9237d75397af7dfee8ab599d14e07edb50a67fc3127bd4f93291e18e55acb1372f8 SHA512 1263adc59538cea24da345c80ea3e3caf90c7840a7ec0ae85d665b9d0018570578845967e16793f2ca28792669ef57a19c62bcadf4611c2fe95f8a4803149244
+EBUILD gdm-40.0.ebuild 5838 BLAKE2B c5efed804182cc6ca15e829313871c5381336cb64b2ad7e59ad1a8035af1b242ea3fea241a7f627e1ee737d1109c7a37ac91832a06b82c9f41439d0f1cf2bf47 SHA512 0c50832e8f385987e52e6c8b710529976a4dc86c52bf2c0ce52d405048f0f36c6e7eb19e9aa78dfa5172b1ad00baf67a2493008107dda43cfd747983f848ba9a
 MISC metadata.xml 759 BLAKE2B 13de28afc8fe81580a2aa28c5fdc17c77266595ffe95218cfbb5cbee4cbd6edab21e8cd06698e4a5feeb696fd9530ef8bf14209ecf3d03039b4e0562bb757375 SHA512 68cec6972bcabcb873fb314babbf9bdfacc7eaae40d662d11662fccd6cbf6630cd93b7322baa271081244c77fd1458c89ad785a0eb2a58b448ddff663381d98d
diff --git a/gnome-base/gdm/files/gdm-40.0-meson-allow-building-with-elogind.patch b/gnome-base/gdm/files/gdm-40.0-meson-allow-building-with-elogind.patch
new file mode 100644
index 000000000000..39cd12dd227f
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-40.0-meson-allow-building-with-elogind.patch
@@ -0,0 +1,211 @@
+https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/113
+
+From 462cc0f5346f5913cf7151044f1c232c5d21c1c3 Mon Sep 17 00:00:00 2001
+From: Dudemanguy <random342@airmail.cc>
+Date: Mon, 5 Oct 2020 18:41:55 -0500
+Subject: [PATCH] meson: allow building with elogind
+
+Currently, the GDM meson build has a hard dependency on systemd.
+However, GDM can function just fine if one is using elogind. This allows
+a user to build GDM against libelogind and also disable the systemd
+system and user units.
+---
+ common/meson.build                       |  2 +-
+ data/meson.build                         | 62 ++++++++++++++----------
+ data/pam-arch/gdm-launch-environment.pam |  1 +
+ libgdm/meson.build                       |  2 +-
+ meson.build                              | 36 +++++++++-----
+ meson_options.txt                        |  5 +-
+ 6 files changed, 66 insertions(+), 42 deletions(-)
+
+diff --git a/common/meson.build b/common/meson.build
+index 074dd92e1..bca58f7c4 100644
+--- a/common/meson.build
++++ b/common/meson.build
+@@ -11,7 +11,7 @@ libgdmcommon_src = files(
+ )
+ 
+ libgdmcommon_deps = [
+-  libsystemd_dep,
++  logind_dep,
+   gobject_dep,
+   gio_dep,
+   gio_unix_dep,
+diff --git a/data/meson.build b/data/meson.build
+index 7c5222eaf..403336c31 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -168,41 +168,53 @@ else
+   service_config.set('PLYMOUTH_QUIT_SERVICE', '')
+ endif
+ 
+-if get_option('systemdsystemunitdir') != ''
+-  systemd_systemunitdir = get_option('systemdsystemunitdir')
+-else
+-  systemd_systemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
++systemdsystemunitdir = get_option('systemdsystemunitdir')
++if systemdsystemunitdir != 'no'
++  assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd system unit dir or disable it')
++  if get_option('systemdsystemunitdir') != ''
++    systemd_systemunitdir = get_option('systemdsystemunitdir')
++  else
++    systemd_systemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
++  endif
+ endif
+ 
+-if get_option('systemduserunitdir') != ''
+-  systemd_userunitdir = get_option('systemduserunitdir')
+-else
+-  systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
+-                                                           define_variable: ['prefix', get_option('prefix')])
++systemduserunitdir = get_option('systemduserunitdir')
++if systemduserunitdir != 'no'
++  assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
++  if get_option('systemduserunitdir') != ''
++    systemd_userunitdir = get_option('systemduserunitdir')
++  else
++    systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
++                                                             define_variable: ['prefix', get_option('prefix')])
++  endif
+ endif
+ 
+-configure_file(
+-  input: 'gdm.service.in',
+-  output: '@BASENAME@',
+-  configuration: service_config,
+-  install_dir: systemd_systemunitdir,
+-  format: 'cmake'
+-)
++if systemdsystemunitdir != 'no'
++  configure_file(
++    input: 'gdm.service.in',
++    output: '@BASENAME@',
++    configuration: service_config,
++    install_dir: systemd_systemunitdir,
++    format: 'cmake'
++  )
++endif
+ 
+ gdm_gnome_session_wanted_targets = []
+ foreach component: gdm_gnome_user_session_wanted_components
+   gdm_gnome_session_wanted_targets += 'Wants=@0@.target'.format(component)
+ endforeach
+ 
+-configure_file(
+-  input: 'session.conf.in',
+-  output: 'session.conf',
+-  configuration: {
+-    'requires_component': gdm_gnome_shell_component,
+-    'wants_required_components': '\n'.join(gdm_gnome_session_wanted_targets),
+-  },
+-  install_dir: systemd_userunitdir / 'gnome-session@gnome-login.target.d',
+-)
++if systemduserunitdir != 'no'
++  configure_file(
++    input: 'session.conf.in',
++    output: 'session.conf',
++    configuration: {
++      'requires_component': gdm_gnome_shell_component,
++      'wants_required_components': '\n'.join(gdm_gnome_session_wanted_targets),
++    },
++    install_dir: systemd_userunitdir / 'gnome-session@gnome-login.target.d',
++  )
++endif
+ 
+ # XSession
+ if get_option('gdm-xsession')
+diff --git a/libgdm/meson.build b/libgdm/meson.build
+index 3f8cafbb7..83e95151b 100644
+--- a/libgdm/meson.build
++++ b/libgdm/meson.build
+@@ -56,7 +56,7 @@ libgdm_deps = [
+   glib_dep,
+   gio_dep,
+   gio_unix_dep,
+-  libsystemd_dep,
++  logind_dep,
+   libgdmcommon_dep,
+ ]
+ 
+diff --git a/meson.build b/meson.build
+index e6fcf4b8b..a86a486b7 100644
+--- a/meson.build
++++ b/meson.build
+@@ -92,21 +92,30 @@ xdmcp_dep = cc.find_library('Xdmcp', required: get_option('xdmcp'))
+ if xdmcp_dep.found() and get_option('tcp-wrappers')
+   libwrap_dep = cc.find_library('libwrap')
+ endif
+-# systemd
+-systemd_dep = dependency('systemd')
+-libsystemd_dep = dependency('libsystemd')
+-if meson.version().version_compare('>= 0.53')
+-  systemd_multiseat_x = find_program('systemd-multi-seat-x',
+-    required: false,
+-    dirs: [
+-      systemd_dep.get_pkgconfig_variable('systemdutildir'),
+-      '/lib/systemd',
+-      '/usr/lib/systemd',
+-    ])
++
++logind_provider = get_option('logind-provider')
++systemd_dep = dependency('systemd', required: false)
++if logind_provider == 'systemd'
++  libsystemd_dep = dependency('libsystemd')
++  logind_dep = libsystemd_dep
++  if meson.version().version_compare('>= 0.53')
++    systemd_multiseat_x = find_program('systemd-multi-seat-x',
++      required: false,
++      dirs: [
++        systemd_dep.get_pkgconfig_variable('systemdutildir'),
++        '/lib/systemd',
++        '/usr/lib/systemd',
++      ])
++  else
++    systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
++  endif
++  systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
+ else
+-  systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
++  elogind_dep = dependency('libelogind')
++  logind_dep = elogind_dep
++  systemd_x_server = 'disabled'
+ endif
+-systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
++
+ # Plymouth
+ plymouth_dep = dependency('ply-boot-client', required: get_option('plymouth'))
+ # Check for Solaris auditing API (ADT)
+@@ -313,6 +322,7 @@ summary({
+     'PAM Syslog': have_pam_syslog,
+     'Supports PAM Extensions': pam_extensions_supported,
+     'SeLinux': libselinux_dep.found(),
++    'Logind Provider': get_option('logind-provider'),
+     'Use GDM Xsession': get_option('gdm-xsession'),
+     'Use UserDisplayServer': get_option('user-display-server'),
+     'Use SystemdJournal': get_option('systemd-journal'),
+diff --git a/meson_options.txt b/meson_options.txt
+index 14e0b908b..5135d7d66 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -12,6 +12,7 @@ option('initial-vt', type: 'integer', value: 1, description: 'Initial virtual te
+ option('ipv6', type: 'boolean', value: false, description: 'Enables compilation of IPv6 code.')
+ option('lang-file', type: 'string', value: '', description: 'File containing default language settings.')
+ option('libaudit', type: 'feature', value: 'auto', description: 'Add Linux audit support.')
++option('logind-provider', type: 'combo', choices: ['systemd', 'elogind'], value: 'systemd', description: 'Which logind library to use.')
+ option('log-dir', type: 'string', value: '/var/log/gdm', description: 'Log directory.')
+ option('pam-mod-dir', type: 'string', value: '', description: 'Directory to install PAM modules in.')
+ option('pam-prefix', type: 'string', value: '', description: 'Specify where PAM files go.')
+@@ -27,8 +28,8 @@ option('solaris', type: 'boolean', value: false, description: 'Build for Solaris
+ option('split-authentication', type: 'boolean', value: true, description: 'Enable multiple simultaneous PAM conversations during login.')
+ option('sysconfsubdir', type: 'string', value: 'gdm', description: 'Directory name used under sysconfdir.')
+ option('systemd-journal', type: 'boolean', value: true, description: 'Use journald support.')
+-option('systemdsystemunitdir', type: 'string', value: '', description: 'Directory for systemd service files.')
+-option('systemduserunitdir', type: 'string', value: '', description: 'Directory for systemd user service files.')
++option('systemdsystemunitdir', type: 'string', value: '', description: 'Directory for systemd service files, or \'no\' to disable.')
++option('systemduserunitdir', type: 'string', value: '', description: 'Directory for systemd user service files, or \'no\' to disable.')
+ option('tcp-wrappers', type: 'boolean', value: false, description: 'Use TCP wrappers.')
+ option('udev-dir', type: 'string', value: '', description: 'Directory for udev rules file.')
+ option('user', type: 'string', value: 'gdm', description: 'GDM\'s username.')
+-- 
+GitLab
+
diff --git a/gnome-base/gdm/gdm-40.0.ebuild b/gnome-base/gdm/gdm-40.0.ebuild
new file mode 100644
index 000000000000..7be1ee83162e
--- /dev/null
+++ b/gnome-base/gdm/gdm-40.0.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop gnome2 meson pam readme.gentoo-r1 systemd toolchain-funcs udev
+
+DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
+HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
+
+SRC_URI="${SRC_URI}
+	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+"
+
+LICENSE="
+	GPL-2+
+	branding? ( CC-BY-SA-4.0 )
+"
+
+SLOT="0"
+
+IUSE="accessibility audit bluetooth-sound branding elogind fprint ipv6 plymouth selinux systemd tcpd test wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="^^ ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# dconf, dbus and g-s-d are needed at install time for dconf update
+# keyutils is automagic dep that makes autologin unlock login keyring when all the passwords match (disk encryption, user pw and login keyring)
+# dbus-run-session used at runtime
+COMMON_DEPEND="
+	virtual/udev
+	>=dev-libs/glib-2.56:2
+	>=x11-libs/gtk+-2.91.1:3
+	>=media-libs/libcanberra-0.4[gtk3]
+	>=sys-apps/accountsservice-0.6.35
+	x11-libs/libxcb
+	sys-apps/keyutils:=
+	selinux? ( sys-libs/libselinux )
+
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-base/xorg-server[-minimal]
+	x11-libs/libXdmcp
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+
+	systemd? ( >=sys-apps/systemd-186:0=[pam] )
+	elogind? ( >=sys-auth/elogind-239.3[pam] )
+
+	plymouth? ( sys-boot/plymouth )
+	audit? ( sys-process/audit )
+
+	sys-libs/pam
+	sys-auth/pambase[elogind?,systemd?]
+
+	>=gnome-base/dconf-0.20
+	>=gnome-base/gnome-settings-daemon-3.1.4
+	gnome-base/gsettings-desktop-schemas
+	sys-apps/dbus
+
+	>=x11-misc/xdg-utils-1.0.2-r3
+
+	>=dev-libs/gobject-introspection-0.9.12:=
+"
+# XXX: These deps are from session and desktop files in data/ directory
+# fprintd is used via dbus by gdm-fingerprint-extension
+RDEPEND="${COMMON_DEPEND}
+	acct-group/gdm
+	acct-user/gdm
+	>=gnome-base/gnome-session-3.6
+	>=gnome-base/gnome-shell-3.1.90
+	x11-apps/xhost
+
+	accessibility? (
+		>=app-accessibility/orca-3.10
+		gnome-extra/mousetweaks
+	)
+	fprint? ( sys-auth/fprintd[pam] )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=gnome-base/dconf-0.20
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( >=dev-libs/check-0.9.4 )
+	app-text/yelp-tools
+"
+
+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
+"
+
+PATCHES=(
+	# Gentoo does not have a fingerprint-auth pam stack
+	"${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
+
+	# Add elogind support
+	"${FILESDIR}/${P}-meson-allow-building-with-elogind.patch"
+
+	# Support pam_elogind.so in gdm-launch-environment.pam
+	"${FILESDIR}/pam-elogind.patch"
+)
+
+src_prepare() {
+	default
+
+	# Show logo when branding is enabled
+	use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch"
+}
+
+src_configure() {
+	# --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.
+	local emesonargs=(
+		--localstatedir /var
+
+		-Ddefault-pam-config=exherbo
+		-Dgdm-xsession=true
+		-Dgroup=gdm
+		$(meson_use ipv6)
+		$(meson_feature audit libaudit)
+		-Dlogind-provider=$(usex systemd systemd elogind)
+		-Dpam-mod-dir=$(getpam_mod_dir)
+		$(meson_feature plymouth)
+		-Drun-dir=/run/gdm
+		$(meson_feature selinux)
+		$(meson_use systemd systemd-journal)
+		$(meson_use tcpd tcp-wrappers)
+		-Dudev-dir=$(get_udevdir)
+		-Duser=gdm
+		-Duser-display-server=true
+		$(meson_use wayland wayland-support)
+		-Dxdmcp=enabled
+	)
+
+	if use elogind; then
+		emesonargs+=(
+			-Dinitial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility
+			-Dsystemdsystemunitdir=no
+			-Dsystemduserunitdir=no
+		)
+	else
+		emesonargs+=(
+			-Dinitial-vt=1
+			-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+			-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use accessibility ; then
+		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
+	fi
+
+	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/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index 94bbfa0d40df..202094f38b26 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-applets-3.36.4.tar.xz 8638044 BLAKE2B 1ccf045c568ca2d4280eeeebbaec67b63f9c2f1edd3248ef89ff93ef7d468e6a581f3c678e93ff45662368b9ecd189aa38da2ca91a7b14ed3e7b2bd6aac8971f SHA512 6fd8f891358f02f40c8d6548b1680139f18cbbcd20d773798a998246b6431692ce8550e8652eaff09bde3651a4e5449779a0dc85b897345a22c17be2e386d2c7
+DIST gnome-applets-3.40.0.tar.xz 9390340 BLAKE2B 0d8e76086e444789b7a327623db9b21ef0a51f071b67aa5d99dc3e7988be40ec353ced795aaa1acbbe8d1b303d3878e2a0589214dac10f35ab2e40381ee64978 SHA512 909a1e9ecbe6904537b7408239a17aad265890cf179c4b8929968fa4d8ba6f1ac1f6e98612eb9c54266d3abacaaa7ed0e218f41b081b7539532527a3234fc037
 EBUILD gnome-applets-3.36.4.ebuild 1441 BLAKE2B 67e91aee32ed9150486f1752191491ceb569807cc111a953c88e87af7b6875e64906a1a1e033839422ce2ec033d8673863dc6c01d7d0499f68e41b3d50a7d6a9 SHA512 19f95d6aa983f7ed091ae0715a5198919a3630fef2400b3adb52e8be8fc85096a8a277b6e6265e4b4ac42ce437a898ea0444110ee1e3abd60ea9413cee28b784
+EBUILD gnome-applets-3.40.0.ebuild 1303 BLAKE2B 2edfb5561e7cf8ab3b493b86f13ce210900e22f56e85177690e7afa79202448a500aabaf4b0e0dc4d8a91213c5e4afbe1aa560430249cd96e2fa69045ac8bcf8 SHA512 d34397b78d5f6fbb53221714e8953436d3f8bb832d6e2aaf473b235b473f7b2f2bb1d4a4ca9034aefcfcdfc477aa8250545ab6e4711f315825c1038570882e0d
 MISC metadata.xml 327 BLAKE2B 3067a9007002523f34c1a64a1ac7c54c974c814adcc951d35cc3d9f6940b1feecbaf458603e0fadd7c812c94958feff3a7835ac93746270496f68ffaab2df222 SHA512 614f3b213955d128a1e6b7424477a2bf4b01b5ed1272d2493d97b17ef806dd39a6f3326112736785cab07d206a01a3121bf5902154b5c1016b7ca254a75910a9
diff --git a/gnome-base/gnome-applets/gnome-applets-3.40.0.ebuild b/gnome-base/gnome-applets/gnome-applets-3.40.0.ebuild
new file mode 100644
index 000000000000..52182b3d367b
--- /dev/null
+++ b/gnome-base/gnome-applets/gnome-applets-3.40.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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="tracker"
+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.37.0
+	>=gnome-base/libgtop-2.11.92:=
+	>=x11-libs/libwnck-3.14.1:3
+	>=x11-libs/libnotify-0.7
+	>=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 )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+# app-text/docbook-sgml-utils for jw binary
+BDEPEND="
+	app-text/docbook-sgml-utils
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+" # yelp-tools and autoconf-archive for eautoreconf
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--disable-cpufreq \
+		$(use_enable tracker tracker-search-bar)
+}
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 4eb0e913625a..9a4cf71937a1 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,6 +1,8 @@
 AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c0265f34d5d0fd555ae60a519273512021cf4f065db1e22ab72ce9004a914a47d077551b5a12ffbd5e81a9b8cf098a4762a0e461d SHA512 ea76e41aff067281497b98c86b66d8c382124ceead5b18e729342615a50b6aa3401f4d7c5553023b5d78ca0ea02823c7d6026ba9acca862804351269e4107d18
 DIST gnome-desktop-3.38.4.tar.xz 745168 BLAKE2B 1d85b176acb6721fb21bc56eef552629a06b059117cc53a5dde9c2c74ae23f624701efed3849e8e7daf21c1fd7622b747b394b6c63ab974371daec14bfb8d9ce SHA512 546fd2bd25d7582ae6cc6aa2beab4221fd246d16640e7d3f0cf9b700732f67a95c4bcb3211b5cb131f151b25923d59aa1ffa114183b6fcb683ad88cb94790e1e
 DIST gnome-desktop-40.0.tar.xz 721628 BLAKE2B ff89b8f4a284f63ee4c8b87f5b26542dabec13a4dcd75424f91acb21877699a5077d27bf4c618ea5e2c4cbd97570003c048296e24a8684021fb589238c09dfdf SHA512 faf6fd2a0c5db47a49319c03ca9a348d77092050cdd8d79a74979b2878d0e35ffa85bbe5e87449f9285ceb28a884439de6eb73d6b9fcaa02236eb48f4a7ac49c
+DIST gnome-desktop-40.1.tar.xz 721416 BLAKE2B de1432a9ee61fa0545ce09c1228a133555d732ea58b9550a1f218726342d4c4e1c9d30f402b62a6a370cd281302c47f820f8bccbd69f8b8651f77e4b0e8d4f66 SHA512 ff9da5d0c805a7d42339a9174b907dd0cc4845c8eeb5a004a13f001dbe449f28a6360ed9dc1951376be4a48271908990052ca0e8d6e4339214cafcb80d204b57
 EBUILD gnome-desktop-3.38.4.ebuild 1924 BLAKE2B 126f3efd5c9f0b87e60ddfbd1e13667c38411e29ac17895a0ced69b16ddaf57de2a3bb995992b493e3e668806dc3f462e7277f0326246db88c2bdbfaa5b9dd3a SHA512 6d220eed8b4061734bb2ca1bf2470b8669368fe45071a05c8103d33d5dbfb6636b4337694b18993bac77e149458c237f39d8e84e8f3a46e1a03e55f31b13b73c
 EBUILD gnome-desktop-40.0.ebuild 1950 BLAKE2B 8fe295cc9783c308c77d371d374cce48596c6582d64afe5a49a98c19fbb342fde1d9110b472c02ade8126334684be1029d0ac2e913a65d5a2bab70b1a41c1e99 SHA512 961cbd1337b0b36f881f5500ccb03712ebcf70d284b11ceeba3fafbb6a6d0737f9514a4017fe06c31623e4a40aa101f5990c60f7f4188d911ba0b43325957dd3
+EBUILD gnome-desktop-40.1.ebuild 1950 BLAKE2B 8fe295cc9783c308c77d371d374cce48596c6582d64afe5a49a98c19fbb342fde1d9110b472c02ade8126334684be1029d0ac2e913a65d5a2bab70b1a41c1e99 SHA512 961cbd1337b0b36f881f5500ccb03712ebcf70d284b11ceeba3fafbb6a6d0737f9514a4017fe06c31623e4a40aa101f5990c60f7f4188d911ba0b43325957dd3
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-base/gnome-desktop/gnome-desktop-40.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-40.1.ebuild
new file mode 100644
index 000000000000..b42b6b81c1b1
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-40.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Library with common API for various GNOME modules"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
+SLOT="3/19" # subslot = libgnome-desktop-3 soname version
+IUSE="debug gtk-doc +introspection seccomp systemd udev"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+COMMON_DEPEND="
+	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
+	>=dev-libs/glib-2.53.0:2
+	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
+	x11-misc/xkeyboard-config
+	x11-libs/libxkbcommon
+	app-text/iso-codes
+	systemd? ( sys-apps/systemd:= )
+	udev? (
+		sys-apps/hwids
+		virtual/libudev:= )
+	seccomp? ( sys-libs/libseccomp )
+
+	x11-libs/cairo:=
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${COMMON_DEPEND}
+	media-libs/fontconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	seccomp? ( sys-apps/bubblewrap )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	x11-base/xorg-proto
+	virtual/pkgconfig
+"
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
+
+PATCHES=(
+	"${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
+)
+
+src_prepare() {
+	# Don't build manual test programs that will never get run
+	sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dgnome_distributor=Gentoo
+		-Ddate_in_gnome_version=true
+		-Ddesktop_docs=true
+		$(meson_use debug debug_tools)
+		$(meson_use introspection)
+		$(meson_feature udev)
+		$(meson_feature systemd)
+		$(meson_use gtk-doc gtk_doc)
+		-Dinstalled_tests=false
+	)
+	meson_src_configure
+}
diff --git a/gnome-base/gnome-flashback/Manifest b/gnome-base/gnome-flashback/Manifest
index f2afc27b5053..cfb230eeab61 100644
--- a/gnome-base/gnome-flashback/Manifest
+++ b/gnome-base/gnome-flashback/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-flashback-3.36.4.tar.xz 826568 BLAKE2B 6625b3a2d90649b9476d6340295b3cf8960f76908c23d75fe7b2a886d1a5c6a587bc8cb31ab866a40f2250b67d154a080f27534aaa11e822d901fc1cac0687af SHA512 6c1b910872530a86d6fb477ad55c8c44cbe5ef958073e2c675d95b9b4dbf9aab0d0a3b3cdae2daebbe3dad8a83c53ffe0604e12282864bfdee33402e119eff32
+DIST gnome-flashback-3.40.0.tar.xz 857104 BLAKE2B 41711edc4687682dd48134e452297bef7d0c4db93532bfd4bd49f19f2f01eab7c887b584f412384057e8a2b65a937446a108df0c4cfd811085c161a212e19355 SHA512 b938d12c437926e64567388b1a97350b76883cf91c009c1f57d4963321497ebdf69b094c7d88a86e5bf805930b88ff2637e522ac4f9981a391206a03d23a521e
 EBUILD gnome-flashback-3.36.4.ebuild 2567 BLAKE2B 3d848b1a5e6891450d5768248bdfa4672361fa7a9433445436022ca1e53329c915f5be492bfd319114c7d2ca625beae40de572169a7247bf8ce380ae6974c9f2 SHA512 0f1bd9f57c01938119ee76ff449405b9bdc9ed03432ceb304ddec45ff81cba8deb06d35d86ac5d8e59e749c3415d772b3da96c5f01ca1c15783ff4cffa4c46cb
+EBUILD gnome-flashback-3.40.0.ebuild 2579 BLAKE2B 681757a0a505e44cfe6086c8beb31a816fa2226a6cd7eb39345e7c7ebcaf40749f9fcd5e1763f49cfa7565f3a6b7f7a3a07836a8c72610bb8aca06c8a98f35c8 SHA512 5829c12033c3cdc6af0996cbca083dbe9b12ee8a6be75be6b79bdabf9fbeef6aaae388a30b2af6951ddf97357b2c5ab3c129aaf7b761dd41c679809b9bd33e47
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.40.0.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.40.0.ebuild
new file mode 100644
index 000000000000..e7af2b142290
--- /dev/null
+++ b/gnome-base/gnome-flashback/gnome-flashback-3.40.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2 toolchain-funcs
+
+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.67.3: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}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	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.40.0; then
+		die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
+	fi
+
+	if use elogind; then
+		local pkgconfig="$(tc-getPKG_CONFIG)"
+		myconf+=(
+			DESKTOP_CFLAGS="$(${pkgconfig} --cflags glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11)"
+			DESKTOP_LIBS="$(${pkgconfig} --libs glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11)"
+			SCREENSAVER_CFLAGS="$(${pkgconfig} --cflags gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm)"
+			SCREENSAVER_LIBS="$(${pkgconfig} --libs gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm)"
+		)
+	fi
+
+	gnome2_src_configure "${myconf[@]}"
+}
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 7f2352ed1d84..037d631f94e2 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-panel-3.36.2.tar.xz 3033016 BLAKE2B faf5b81c07eccca9d78ed56be9e124e8f909bb577739810a059135cd6afc9cd293b5a023a129063c48168029a1f9a2dd6fd9c714f80e0c566f820291dd15217f SHA512 cbd7eaf1778dd3f6751c020540c243b02787feb5781195fd5db008fc66683ea5330d89ab0f2c740020695c4da7856b5678491ec3e711d6ce41e884a0374e937b
+DIST gnome-panel-3.40.0.tar.xz 2924776 BLAKE2B fb7d3b85c0eb7509810b1c3730f27479516b104ded31127c9fb2d2852277e62270b300d238b0e2de944d571c68db9ac2b35ed323ddd709e6a4b669089f09bae2 SHA512 49d8fde009ccf139dcc1412863432e642c11e3c149c6f39ab8f51d8027880654625a997f58efe03234ea2716ad0316f7d5f60fb493e7e6cea366611b975effe6
 EBUILD gnome-panel-3.36.2.ebuild 2053 BLAKE2B bc14c03bd53b0ff8a3c9ffb14795838c9f784797118fb173d86dff3572fbd199050ecd5c4d9f00da867255f057d288e26714f193463ebe8192d7d3b3171760c8 SHA512 8db0499f87613f019eaddea531f90c29ceb6e983ae327d6f120ec9aea8b197efd186943a0192de84c8bde6c7ce3b22c7c3da8a48b21316a1128b7074ec7aeb62
+EBUILD gnome-panel-3.40.0.ebuild 2052 BLAKE2B 702debc8809c746c868ae41d187b648a38227cd3f641c29b3c8cd1e062e86941b761501d7df78cf3d28b95e94468e3d04a8f9b35718f9a76d409d26b2229e5d6 SHA512 a56ce1bf16ad9b70df00ac1626ea4603f7f87c00a9fffbf576ec42ff4bbac3287fcd5ba5150008f40801f2e5c7afda89d42fbb360300c65447bbd8f14c28658e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-panel/gnome-panel-3.40.0.ebuild b/gnome-base/gnome-panel/gnome-panel-3.40.0.ebuild
new file mode 100644
index 000000000000..6b723efd785c
--- /dev/null
+++ b/gnome-base/gnome-panel/gnome-panel-3.40.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2 toolchain-funcs
+
+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.67.1: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-40.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}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	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
+" # 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.40.0; then
+		die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
+	fi
+
+	if use elogind; then
+		local pkgconfig="$(tc-getPKG_CONFIG)"
+		myconf+=(
+			MENU_CFLAGS="$(${pkgconfig} --cflags gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
+			MENU_LIBS="$(${pkgconfig} --libs gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
+		)
+	fi
+
+	gnome2_src_configure "${myconf[@]}"
+}
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 377ffc547b91..536310fdd78c 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -6,9 +6,7 @@ AUX defaults.list-r5 19379 BLAKE2B 9299c535bcb3ce6f291ba66dfe655f7e793d554f5fd7a
 AUX gnome-session-3.38.0-exit-conflict-systemd247.patch 2229 BLAKE2B aeac31dd5d50d2e8eac6fe2bdcbabe82eb90f0a16f396da5ec45466f519fe3b565bebbcb818a0b41607df9ce6ecb46bd637c8ee9e72ba9d28fd315189820f31e SHA512 36e9640be8c04e9442609da36696895efec57a073792622eac7ded8c463e622b932d8693130f19491b4649cdc333d7d269c8732ebb12702ab2b574bc0dc6cc43
 AUX gnome-session-3.38.0-meson-Support-elogind.patch 2808 BLAKE2B da7ad139fe118edc4c53570acc5e56d59e3073caae7941c54b11c59208675eaa148eb03d437d0edfa0f0d024880b77bc60ba65140422f25319ac132299dfe972 SHA512 2a57894b95662ca4488f95110943076a82ecbe7f3bb8ed4d95e2c8082276839f4b1a7ecc20915557378e73e1947df856e4ff57d9d5b9ae32a9673f2cc3b2fbc2
 DIST gnome-session-3.38.0.tar.xz 481300 BLAKE2B 1adb6377f66ab64c39aa5e9ca73ebcb7fcfbfa33b5adcd4fe5900624a89a248a4255c507ec0e88baa57b20105a50d6b7e8eb6bea0be6de49295977e4aacbb662 SHA512 f49a7337b64722bc502ff3d952d8e249d2435be662c3bdfb7c7740338585c2e0b292869902be4c10faebde00998d7ead8deb82fe719a38575c6ebec2b94aa19b
-DIST gnome-session-40.0.tar.xz 481996 BLAKE2B b59e08c5b49321a44b1dd012051ec4bfdcecbbdc9c84b65c703131fb01634d69b303b26c29517afcb516eb60cbd2c4e9c3715a1a584c904463150ed428b4d600 SHA512 121fdf5dcc2b5a9e87b8119f6e217dea9db53fdaee1144f74dbdf2ef8856114e983cac32871214ecde08bbfc8212b3535ffd584c07a24cc648bc4db142b60de4
-DIST gnome-session-40.1.tar.xz 482424 BLAKE2B 7ce5b5d50900a23880e92d3a0d24fbc80532b9894e03c613137526da6bd0f7f3c86a0d66484177279612782a97f3ead5f10709d9625cff6c04bdfb12fe6725a2 SHA512 2f39eea8e1cc41c543ac5c068dca1c8b7b0add244c6c223ed1205b186c785d353d3cc9d380fc4061893531413017755907050f660de17ea1f9289d6c3ed9df2f
-EBUILD gnome-session-3.38.0-r1.ebuild 3573 BLAKE2B be9446b680df5882d9ebea8b4bac48c004a71a06548abfd9bb8d837d61851c7d47196d9d3d9e4cb6fd8f9c86e1f736617f3fc9916d447df12b7cea95337c3d26 SHA512 e711397b4230b3b03125d521362e63e067433ba15ef2e0b240fa781a2e7924d2241cb9e7762f77369fe5eae0d8960337cad44017a6609d19f9d39e27dbf3dd1b
-EBUILD gnome-session-40.0.ebuild 3453 BLAKE2B b0f35aa307fa0517d87bf001e2d61c8cdde78ebd779310e3cb0ff138f3707106860d240c93541fc62041717e5e7f833a198da1a6e6563ea116c4169c674c0581 SHA512 be5ca9beaa306b62e624982a067f8a57448090473acb825b1026b360ac89cf831b20a55283a331730b086807bddb82c5bf4febd5e61aa9a8c1455e78caa8034f
-EBUILD gnome-session-40.1.ebuild 3453 BLAKE2B b0f35aa307fa0517d87bf001e2d61c8cdde78ebd779310e3cb0ff138f3707106860d240c93541fc62041717e5e7f833a198da1a6e6563ea116c4169c674c0581 SHA512 be5ca9beaa306b62e624982a067f8a57448090473acb825b1026b360ac89cf831b20a55283a331730b086807bddb82c5bf4febd5e61aa9a8c1455e78caa8034f
+DIST gnome-session-40.1.1.tar.xz 482304 BLAKE2B 9a96f230dc793cc0b810bdaad6ce0103f923fbd2b22ee567316508c79bd6e7afe3961b593d094d0a4766a76f45ba6710f96e03a299f43d08a04aca776a172955 SHA512 91609915366839806729e066e5ca0d42daff0591732cda08c3da7d4951f7e27964d72988c4e61a64045443969b9fb0a9697c7ace82bdd8843310cb4d7e9dfd8c
+EBUILD gnome-session-3.38.0-r1.ebuild 3575 BLAKE2B 79815a8eccb23615560340496c234c1e25c21100d66086dbd1ad0a69276a6cb0d182f7caf8aeeb8afcab32f690714130c74f4a5c44018a3b0ac35c300615587c SHA512 d1d76233c952b2ae39ae758a4b522f48b90cc48216f576a2cc25bf9847726d28177b7e14be36ebf33d1ef73189c3ede290272fdbb9e14756cc972240d340873d
+EBUILD gnome-session-40.1.1.ebuild 3455 BLAKE2B dba36285b78f7a581565cec8ca458219141edf1ca4aa8ab9f19153bbd92ab83b7054ae5bce38769a45538a40c991ffbc284d392ee6d9cde4bb4a12c28c1fae4b SHA512 061acb1c9d0ea5425bbf1c872878f4e914bf46e7c567314130efd8767e4226548f546a56471968a7de0275592389c7baa65202631608ed47fab06c7a7249a661
 MISC metadata.xml 348 BLAKE2B e83b29910d01f4a5cc1ddf7587189534a557805ccbc7611230526266ed88202a2ce9e612f8d78f4fb9c9a11217a2eb16e1ce9304d2038c3d2dce65364b5c67b9 SHA512 6bf5331d6f4a8c27e1d17709bb11cad46fd926fc84925c99f7e89eaa236d5b22c95702e6522f868f285b0c9f74a670a839e91b03e3126ace0449b5a5f49fdf8f
diff --git a/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild
index 9d0bc54583fa..1c215ccd7e5c 100644
--- a/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild
@@ -63,7 +63,7 @@ PATCHES=(
 
 src_prepare() {
 	xdg_src_prepare
-	# Install USE=doc in $PF if enabled
+	# Install USE=doc in ${PF} if enabled
 	sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
 }
 
diff --git a/gnome-base/gnome-session/gnome-session-40.0.ebuild b/gnome-base/gnome-session/gnome-session-40.1.1.ebuild
index 6a5333b3fb7e..13e3613d59ef 100644
--- a/gnome-base/gnome-session/gnome-session-40.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-40.1.1.ebuild
@@ -61,7 +61,7 @@ PATCHES=(
 
 src_prepare() {
 	xdg_src_prepare
-	# Install USE=doc in $PF if enabled
+	# Install USE=doc in ${PF} if enabled
 	sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
 }
 
diff --git a/gnome-base/gnome-session/gnome-session-40.1.ebuild b/gnome-base/gnome-session/gnome-session-40.1.ebuild
deleted file mode 100644
index 6a5333b3fb7e..000000000000
--- a/gnome-base/gnome-session/gnome-session-40.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc elogind systemd"
-# There is a null backend available, thus ?? not ^^
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	>=dev-libs/glib-2.46.0:2
-	>=x11-libs/gtk+-3.22.0:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=gnome-base/gnome-desktop-3.34.2:3=
-	>=dev-libs/json-glib-0.10
-	media-libs/mesa[egl,gles2,X(+)]
-	media-libs/libepoxy
-	x11-libs/libXcomposite
-
-	systemd? ( >=sys-apps/systemd-242:0= )
-	elogind? ( >=sys-auth/elogind-239.4 )
-"
-
-# Pure-runtime deps from the session files should *NOT* be added here.
-# >=gnome-settings-daemon-3.35.91 for UsbProtection required component.
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# sys-apps/dbus[X] is needed for session management.
-# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
-RDEPEND="${DEPEND}
-	>=gnome-base/gnome-settings-daemon-3.35.91
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	sys-apps/dbus[X]
-
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-"
-BDEPEND="
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	x11-libs/xtrans
-	virtual/pkgconfig
-	doc? ( app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.38.0-meson-Support-elogind.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	# Install USE=doc in $PF if enabled
-	sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddeprecation_flags=false
-		$(meson_use elogind)
-		-Dsession_selector=true # gnome-custom-session
-		$(meson_use systemd)
-		-Dsystemd_session=$(usex systemd default disable)
-		$(meson_use systemd systemd_journal)
-		$(meson_use doc docbook)
-		-Dconsolekit=false
-		-Dman=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome"
-
-	newmenu "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
-	# This should be done here as discussed in bug #270852
-	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-
-	# Set XCURSOR_THEME from current dconf setting instead of installing
-	# default cursor symlink globally and affecting other DEs (bug #543488)
-	# https://bugzilla.gnome.org/show_bug.cgi?id=711703
-	newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
-		ewarn "If you use a custom .xinitrc for your X session,"
-		ewarn "make sure that the commands in the xinitrc.d scripts are run."
-	fi
-
-	if ! use systemd && ! use elogind; then
-		ewarn "You are building without systemd or elogind support."
-		ewarn "gnome-session won't be able to correctly track and manage your session."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index ebe683f76eda..5ea41f341141 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -7,8 +7,8 @@ DIST gnome-shell-3.36.7.tar.xz 1777236 BLAKE2B 4dd3b98e8a2ffa711bffe0b3b78708c85
 DIST gnome-shell-3.38.4-r1-patchset.tar.xz 12744 BLAKE2B ad620ca7916370f7085541461ecd825d7703c291a849da1adf17cccf54afb7a73a6d493f4fa4a18244811d4e8fa55c92e1c7465ba8bdc8b1d1fb2f6734c2ed50 SHA512 bad6bcc8ef1c41c5ae92b265b6824d76e39c2af3aa6974866fe95834589ca4b957181527ce9092b628f000d61c70fd356ddc3ef1eadbe19a299a2d44986fc27b
 DIST gnome-shell-3.38.4.tar.xz 1815880 BLAKE2B 888786ca1c7ac4a84c4b4b9ccc1035de80021efe0bf54521494eb90008ad11d5ef693158fd2c30a44532ef30911e6940b81c9c2eb426465aeae5ce3f1d9dbf5d SHA512 f59d7347587ecbde7790d466ee7c81d1e0ce0ff9f92bfe9cb3efc4049231bc164c0f61b761f42dfab1eb35619736d9a55fdae2b808e12f7671900d89e529fea8
 DIST gnome-shell-40.0.tar.xz 1863432 BLAKE2B 698995328575e7e879eb0459e4f0087d0e11624952ac2786fec6c431da83eff25351d909b05a7d347f10b4eaf0d384c065e1f5255c1230433c839bed515ecf40 SHA512 fc4ca3fbd3dafd4a81f97a765e53b74fa4902018721e25a767c0d353d127b0cdc69c64171188272e3f5b48f11d6ad52064cc237e35210f5e09dfcd763ceb00c4
-EBUILD gnome-shell-3.36.7.ebuild 6664 BLAKE2B 9789fbfb64bb7aa7dca1bd367301b974e711c07b06290ceef579c40d58bed72fa53fa88b539c127c7c720a0d835716089093e1f49144b948e2ed9c3dae737ad4 SHA512 f85ecfaf2d656a5017cd21a7e28d74966cb71f3e969d8e37395357cf18f24a04133802c86df71285e9f803ee10e193fd63f5671c50b44894e0cef53901201a7f
-EBUILD gnome-shell-3.38.4-r1.ebuild 6433 BLAKE2B 687d57be8c9cebc27560ed3f022a02d93759fb8578ebe150a819ced11fe7215a88d55b2c169e8b2ff1849041787ed77e032b9f663c371dbd3f367437ff912608 SHA512 576efd756cbc698e6e517425fb881176faf2ff630915161332c00a033159fa3956c89269c5eaac8d0e58d51109cc2a4cff3dbf553b1c4a1bef709f03cfa13c00
-EBUILD gnome-shell-3.38.4.ebuild 6301 BLAKE2B 7eb2c535ac0a40fe1d352bae7fa657c426ef507c82248dc4e65127577fba09601b4c0b27958afc8cf08172c592b2d7f3e05078bc09ed1b50982f45697221de48 SHA512 5091ba9d9d0d6195fa579d2fb6f5b8f201c4e0117c325a78cb1317c13e64f9cc8220a0258fd4e4b837fe05d353d1d5f132a8c0e4e88cce5e4389a4e3a344201b
-EBUILD gnome-shell-40.0.ebuild 6345 BLAKE2B 74d4a98f26ab96be86d56deb83bd83285add0f5277a59e5c6a43365e73bbc7924279e018d02667dca50fda28eae0fa6ac2f9ebe6bcb2bff2d0450d9b9a421298 SHA512 f510adfba6a4648682cca68087051d201b3cec8ad8c17d74437743914d77755693a2727a9fae932334cc08131340155d79ca3deb4f0ee0d2c53fc33ada876969
+EBUILD gnome-shell-3.36.7.ebuild 6667 BLAKE2B 6d2fe47bf102ba967ba1bcd5490f673033882e067ee6fda7ffc1c6482b5e6359f53af3337263c506d0e3e5270abb92306f5391cce713c10abaa0c09099a06899 SHA512 6e613f41d24bd0152ba4582b87afabd6ac17060d7c13462b975ff6ae8d8dab39a8c8e76a8740d0d02568f47b431360814328780f8e10937c2ce3180c446fde12
+EBUILD gnome-shell-3.38.4-r1.ebuild 6436 BLAKE2B 5fa02e8fd1b477bfcbe9ed67d4f812ba5cc332ab816dce30b2bc11c5f339dafa1db2d8970901ac3334edbba474e8720182a03b36e2c91ec18d79bae6b3f46166 SHA512 54689f75e28f8e2140c6793df2a1b3e6369974a8532eb3878c739e7b3aff79f910350a0b92bdc783bf7c43ee3a84734107ddb4d60fe030386eab5f9869af3959
+EBUILD gnome-shell-3.38.4.ebuild 6304 BLAKE2B 438e68b26fe62bc36aad18c597840aa0c25c88b347e04cfd8dd78e113903dbdb8139a2101d4863d5547a19a57c6b0accbe4254fc1c324ff56401d732a503d8ea SHA512 140a2a65f7cb5fd5cbaeae37b7b94e531e9449dfe8cd69c832aeb218ee76179db9b3f2cad1e10ed0aacb833cf17f59a216cc1a88402a5159332eca67cbeae6bd
+EBUILD gnome-shell-40.0.ebuild 6348 BLAKE2B 8855d301eb4ebe0efa089cd72da3312d5e5d1a23783fe7c3cc16d3675a486a8ad75e18334419fcf9e65ddd8b030f56f47d0d4bf57853bf5a1869a48656d278b2 SHA512 014efd4e249a15e1f46d98c16a479070ef1a59db46f512171af7a1806dde550ddf1821ece34dfedbd12f4423af25d2b94d47a9182cc59f7602433e02905c8bb3
 MISC metadata.xml 1050 BLAKE2B cf97e536a47f3b023e118a818bbc34af63500d2ea94bbc71201d2ce18aa6e473673cb28a47245de24b7bad9a174a6dda6b46c300518521c8ea0662e88e95627d SHA512 50c1d4c3eacb89b77bc49b4f236bba9d9041ef047392d5bda19e85b0c935709a095a388b1625a2c77c66145758e9b4ab77a202aa6cdd2b86f262c5b56e428b06
diff --git a/gnome-base/gnome-shell/gnome-shell-3.36.7.ebuild b/gnome-base/gnome-shell/gnome-shell-3.36.7.ebuild
index a229e3212cf9..4ed0027e0380 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.36.7.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.36.7.ebuild
@@ -106,7 +106,7 @@ RDEPEND="${DEPEND}
 "
 # avoid circular dependency, see bug #546134
 PDEPEND="
-	>=gnome-base/gdm-3.5[introspection]
+	>=gnome-base/gdm-3.5[introspection(+)]
 	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
 	browser-extension? ( gnome-extra/chrome-gnome-shell )
 "
diff --git a/gnome-base/gnome-shell/gnome-shell-3.38.4-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.38.4-r1.ebuild
index d7938eb7e143..0e5a2c2dd05a 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.38.4-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.38.4-r1.ebuild
@@ -107,7 +107,7 @@ RDEPEND="${DEPEND}
 "
 # avoid circular dependency, see bug #546134
 PDEPEND="
-	>=gnome-base/gdm-3.5[introspection]
+	>=gnome-base/gdm-3.5[introspection(+)]
 	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
 	browser-extension? ( gnome-extra/chrome-gnome-shell )
 "
diff --git a/gnome-base/gnome-shell/gnome-shell-3.38.4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.38.4.ebuild
index b7a6ba9e7f2b..07857b6f4bdd 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.38.4.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.38.4.ebuild
@@ -106,7 +106,7 @@ RDEPEND="${DEPEND}
 "
 # avoid circular dependency, see bug #546134
 PDEPEND="
-	>=gnome-base/gdm-3.5[introspection]
+	>=gnome-base/gdm-3.5[introspection(+)]
 	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
 	browser-extension? ( gnome-extra/chrome-gnome-shell )
 "
diff --git a/gnome-base/gnome-shell/gnome-shell-40.0.ebuild b/gnome-base/gnome-shell/gnome-shell-40.0.ebuild
index 672d138b0f25..bebb5fea9646 100644
--- a/gnome-base/gnome-shell/gnome-shell-40.0.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-40.0.ebuild
@@ -111,7 +111,7 @@ RDEPEND="${DEPEND}
 "
 # avoid circular dependency, see bug #546134
 PDEPEND="
-	>=gnome-base/gdm-3.5[introspection]
+	>=gnome-base/gdm-3.5[introspection(+)]
 	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
 	browser-extension? ( gnome-extra/chrome-gnome-shell )
 "
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index 271f243d290f..a4bcbdd6b4cd 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -12,5 +12,5 @@ AUX gnome-vfs-2.24.4-gnutls34.patch 1624 BLAKE2B 9b29ee3e95ad79f31a9d4adc494aa6b
 AUX gnome-vfs-2.24.4-home_dir_fakeroot.patch 4996 BLAKE2B 9883ef67221c053df5ad2d3f70e3f7c3f1916660cb35dd82a0dc52008ffd1a780f685a7af82a2dda1ec25aae5d1f024322b3a8c20bd8d48227405d0c1c357b48 SHA512 dcad32f15afaa7677c6d10672c06c6d635a17d2bb686883c94f42bfc4f9fc6c525c4f097c3af718020fd224e06bba0d0a4ec68cde431545e9fe4a2c65320a48f
 AUX gnome-vfs-2.24.4-openssl-1.1.patch 802 BLAKE2B 0bc20796d79df2b720a7ef06139178cbafdd4dc765ed8721d1c0a7ff930b1cd3ecba3bee4b0b074b35b2812ccda0c895824d01296f7aa6212e606bf3af519d13 SHA512 7ec9cdf91d1f9bf51dcf97c47efade87829acd59642bb61c6defc6c7377dfef9e3b0bc8c07a6257e0b55e0184e28e429ff931fcccb48cf6486774916cc8152de
 DIST gnome-vfs-2.24.4.tar.bz2 1890370 BLAKE2B 696c8ce479de5a15660c9cc79eeb1abb6d69716f68558c7f791a3a44a7f1e9d09d9bc9adcca11dabd745f36a70222817b68888f3c56839add737b802aba0e7ac SHA512 db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581
-EBUILD gnome-vfs-2.24.4-r5.ebuild 3962 BLAKE2B 5910dedd3b800ce7d4fe7fb29e8c9035f4cace1913b1e4891ae49d6cc26d96546ec13982842df1e785b877f7de8026163960c24a313c14124adc19931a406a0a SHA512 b8fde3245f45f888dde50ac77afb4ee03d901a2bd365103c001aecc1f90203ec5240318de696f1a36e267edb438a9e0fcddcc14f14f9d51bb670ebf8fd5ade11
+EBUILD gnome-vfs-2.24.4-r5.ebuild 3881 BLAKE2B a2a96bde98ee5432a8625cfcb999b9daa769d121f8c571600b973a05eeedea8168831971a9bc84020a2eb7a860062ce6436a3c7803ff42beb70f5f0a7099f0ed SHA512 06efe02e8835aa3ea08fbb23bb055e3cef33f2e894f3ecf66df0961de5aaadd6566b5e4b8bb0e15e687bbc588d9dc346c3138c10b1ff392cb07397bbe1ef05c1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
index aba99abca80e..896aa98ef1fe 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnome.org/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
 KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf"
+IUSE="acl gnutls ipv6 kerberos samba ssl zeroconf"
 
 RDEPEND="
 	>=gnome-base/gconf-2.32.4-r1[${MULTILIB_USEDEP}]
@@ -33,8 +33,7 @@ RDEPEND="
 			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
 			!gnome-extra/gnome-vfs-sftp )
 		!gnutls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
 			!gnome-extra/gnome-vfs-sftp ) )
 	zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] )
 "
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index ff3228ff3f4a..9312027c7c81 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,6 +1,8 @@
 AUX libplist-2.2.patch 985 BLAKE2B cfb16b82634dfde00af05d96e3b0561b6bcbd246369b3048f807fee14fcfefdf1f2a9a39afaba9237109c051eb60f16a28916ef26e9f63fa0bcfff7e5cdefad4 SHA512 f6a9c6a2744063495ca95bfd47807a0883835504356948797e6d7015783d7f3b2504ac9ea791435301d2b4c063ef5642c53e485192c0008e0242e1754e567085
 DIST gvfs-1.44.1.tar.xz 1222040 BLAKE2B 5a412395cf0edbdb78aea43eabd4fc0ec68f53b9f681cd6181b1c2ee09a01f90e024f75d44302eefdd9d3888512ec4fe672125eec3c79fe691d0f66dacde7bce SHA512 d936e70e6daa6a7494e5cc333a53afe82b601e34e2e54b207d9a4aefdc35dd068997832be750a6857144a48fa37065cb7e6b25378952007b06988ad07dfc6006
 DIST gvfs-1.48.0.tar.xz 1225852 BLAKE2B b1d9554183c1c79a02bd36f04399ee73ad6590b01e8a909c31fd6806f1929132e3146b24cd5caa9e0d703ac54861179c9bc7bb1021ffe263be90e2f833ed2738 SHA512 fe57da85c5e7b6dc8b2ffa69f5f8f1e45e307a05c787c5eee4afdfac82fd796ec9f319eb0615622f72286327cbb5d169abcf35c6d21d4f8293cbf70e2a941e17
+DIST gvfs-1.48.1.tar.xz 1225916 BLAKE2B f2c46d94ba68065fcaef93cfaf25d5d6cc2fbbf4c1842452d30a9fec2ac5259b440fe569411cf3a874d3464f8d001ef2d04a705230a21b381ff1c3abe9c0f16e SHA512 19a642bcfce37eaa0d2d9f509fed6c67abfea0f79f5be9a17074d20e9ba71252a13583a2e08de88718cb141c5e79e34c84c765c87160351fe21291a8f88abe8c
 EBUILD gvfs-1.44.1.ebuild 3791 BLAKE2B 56e3b7e7446028a5a4a0b199841ac3ade5d503fcd3ff2f9a2685c050e1a6b58f833cbe4f9bad1c591a6f51ef085b8d4a5ed908c20d0fb3f90d72b786afe2533a SHA512 ce1a9b0fe6db91236466fbadfc70bb5d3d2278b4068e61881c9d3400ce25ba9b579e64adda07fd743544a83f48a6bbac3b7f9b11fa23b76d9d33eb83e610bb2f
 EBUILD gvfs-1.48.0.ebuild 3753 BLAKE2B 1351164a17e63d1a9985749734075eae87639d04d8df9dc7a2f52508c9d16ae62e70a9a530bd6279195ed4efea398ac4cff9f9bc9253e1a61c0112ea27ded5c5 SHA512 46a2c9afd17f51cb5bc813e43dce1d477dc2748f9e5b9dd3cff46ab7616b9495bca0e7f1f29b6d2243543c924c9f3de86f40159729682dea0b83d20e3d9b9dab
+EBUILD gvfs-1.48.1.ebuild 3753 BLAKE2B 1351164a17e63d1a9985749734075eae87639d04d8df9dc7a2f52508c9d16ae62e70a9a530bd6279195ed4efea398ac4cff9f9bc9253e1a61c0112ea27ded5c5 SHA512 46a2c9afd17f51cb5bc813e43dce1d477dc2748f9e5b9dd3cff46ab7616b9495bca0e7f1f29b6d2243543c924c9f3de86f40159729682dea0b83d20e3d9b9dab
 MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7
diff --git a/gnome-base/gvfs/gvfs-1.48.1.ebuild b/gnome-base/gvfs/gvfs-1.48.1.ebuild
new file mode 100644
index 000000000000..11d31cbf7698
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.48.1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Virtual filesystem implementation for GIO"
+HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
+RESTRICT="!test? ( test )"
+# elogind/systemd only relevant to udisks (in v1.38.1)
+REQUIRED_USE="
+	?? ( elogind systemd )
+	cdda? ( udev )
+	google? ( gnome-online-accounts )
+	gphoto2? ( udev )
+	mtp? ( udev )
+	udisks? ( udev )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.65.1:2
+	>=gnome-base/gsettings-desktop-schemas-3.33.0
+	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	sys-apps/dbus
+	app-crypt/gcr:=
+	policykit? (
+		>=sys-auth/polkit-0.114
+		sys-libs/libcap
+	)
+	http? (
+		dev-libs/libxml2:2
+		>=net-libs/libsoup-2.58.0:2.4
+	)
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+	udev? ( >=dev-libs/libgudev-147:= )
+	fuse? ( >=sys-fs/fuse-3.0.0:3 )
+	udisks? ( >=sys-fs/udisks-1.97:2 )
+	systemd? ( >=sys-apps/systemd-206:0= )
+	elogind? ( >=sys-auth/elogind-229:0= )
+	ios? (
+		>=app-pda/libimobiledevice-1.2:=
+		>=app-pda/libplist-1:=
+	)
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= )
+	gnome-keyring? ( app-crypt/libsecret )
+	bluray? ( media-libs/libbluray:= )
+	mtp? (
+		virtual/libusb:1
+		>=media-libs/libmtp-1.1.15
+	)
+	samba? ( >=net-fs/samba-4[client] )
+	archive? ( app-arch/libarchive:= )
+	cdda? (
+		dev-libs/libcdio:0=
+		>=dev-libs/libcdio-paranoia-0.78.2
+	)
+	google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] )
+	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
+	nfs? ( >=net-fs/libnfs-1.9.8 )
+	net-misc/openssh
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	test? ( dev-libs/libgdata )
+"
+
+src_configure() {
+	local enable_logind="false"
+	if use systemd || use elogind; then
+		enable_logind="true"
+	fi
+
+	local enable_gcrypt="false"
+	if use afp; then # currently HAVE_GCRYPT and linkage only used with afp; check it on big bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes
+		enable_gcrypt="true"
+	fi
+
+	local enable_libusb="false"
+	if use mtp; then # currently HAVE_LIBUSB and linkage only used with mtp; check it on big bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes
+		enable_libusb="true"
+	fi
+
+	local emesonargs=(
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+		-Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
+		$(meson_use policykit admin)
+		$(meson_use ios afc)
+		$(meson_use afp)
+		$(meson_use archive)
+		$(meson_use cdda)
+		$(meson_use zeroconf dnssd)
+		$(meson_use gnome-online-accounts goa)
+		$(meson_use google)
+		$(meson_use gphoto2)
+		$(meson_use http)
+		$(meson_use mtp)
+		$(meson_use nfs)
+		-Dsftp=true
+		$(meson_use samba smb)
+		$(meson_use udisks udisks2)
+		$(meson_use bluray)
+		$(meson_use fuse)
+		-Dgcr=true
+		-Dgcrypt=${enable_gcrypt}
+		$(meson_use udev gudev)
+		$(meson_use gnome-keyring keyring)
+		-Dlogind=${enable_logind}
+		-Dlibusb=${enable_libusb}
+		-Ddevel_utils=false # wouldn't install any of it as of 1.38.1; some tests need it, but they aren't automated tests in v1.38.1
+		-Dinstalled_tests=false
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	gnome2_giomodule_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+	gnome2_giomodule_cache_update
+}
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 786a121b2af7..f843abcbc9ec 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -2,7 +2,9 @@ AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f
 DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
 DIST librsvg-2.50.3.tar.xz 18868408 BLAKE2B 8b245a233ddd56137880e43f4da2df623237bb1ce2e143cee09da3fadc1edd9b3e4f4753fe48cf814d2372e532775573a34982a6cc88ace9be336e16ae473c20 SHA512 21710b6b5810b959679b7908aa371b8af02c85549efbc64f5fda01cfc3881539b5afc6bc304ce2289719dee48f583b1eb9867546e09f36941f81af968434e389
 DIST librsvg-2.50.4.tar.xz 18954216 BLAKE2B 88467cf7b3a7382182f3a37887e9d05dbcb723464607707271491ca20cf7bedb890ec64e1a8c34ab136a23dbfe93dfd19fccbd194c4bd65868b07874c5070067 SHA512 5f476a663e1fa3297d699b1057622e72dbefdf9126ade97762288b7bc4e8a294936d008c889bcaf8e35f46d3b818f5317c63883df0043ec0f8aad18fa5feb4f3
+DIST librsvg-2.50.5.tar.xz 18958716 BLAKE2B 36ca7b9316f0384dfa0063035fe3b57adc9c0a94757b81662e0e80ff19c2388d872353ba2047c8402fd586e4d3614a88e2ba29502bd16c55d8a336238954aaaa SHA512 d1d653031f20a393ba7ae56e3187244cb8e96bfa14f888b07338b80c8d947112c421a88bc57f62eaa6c8b705dde1277a7b56c7cdf602b46c1516309dd4011b56
 EBUILD librsvg-2.40.21.ebuild 2535 BLAKE2B fb7707a26b24f05ef9afe464f036d205e72243fe0b411ddc17b42a3f73bfd35e4a92b9236c12218d4bffb8edc825813f3b08cf164faf6cd1f96e689b76ac2970 SHA512 0ae92c01878ed45cd2da511bca6bcb86465723d3f71752168d5764b56d366544bc6bce1fce2d93ad497c901af8758db11bf3a53ad79389bcf54b16210bb18da2
 EBUILD librsvg-2.50.3.ebuild 2477 BLAKE2B d71d2e17becdfd6488d3b2554da7b4d9dc20b51bbc06f5966060e7830e1d7fe1a7b9504eaa0fccc6febdfa393d0fe5544cb78ac71ae70149ad8eda579c55ef1c SHA512 f218160d2fe021e25db50cf331a0949029b4e7150c3921911220d0be46e069344fbdbabea1a0aeb3e4caab87f608d5f6b7aa0637d6433e5cdc2294ec2afe8ff0
 EBUILD librsvg-2.50.4.ebuild 2556 BLAKE2B 88d30f78558fa54bfb8714d141b8c220188c5d04f39105f5c6ef8a76e5f64de473abeefcb24368142c974a05a7511da37675fda6261554f853b8bcc853ebec37 SHA512 49d98d235b48a2dd434557ae0a5c2f2042c0abb5ffe45888b65d71668e90b89ee546da2e284694eef69978be442fbe3d882ea66755af5238bdb80fbcceeabf26
+EBUILD librsvg-2.50.5.ebuild 2556 BLAKE2B 88d30f78558fa54bfb8714d141b8c220188c5d04f39105f5c6ef8a76e5f64de473abeefcb24368142c974a05a7511da37675fda6261554f853b8bcc853ebec37 SHA512 49d98d235b48a2dd434557ae0a5c2f2042c0abb5ffe45888b65d71668e90b89ee546da2e284694eef69978be442fbe3d882ea66755af5238bdb80fbcceeabf26
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/librsvg-2.50.5.ebuild b/gnome-base/librsvg/librsvg-2.50.5.ebuild
new file mode 100644
index 000000000000..4834d74bd38f
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.50.5.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 multilib-minimal rust-toolchain vala
+
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="+introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[glib,${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.38.0[${MULTILIB_USEDEP}]
+
+	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+"
+DEPEND="${RDEPEND}
+	>=virtual/rust-1.40[${MULTILIB_USEDEP}]
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
+
+RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc.
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-static
+		--disable-debug
+		--disable-tools # the tools/ subdirectory is useful only for librsvg devs
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable vala)
+		--enable-pixbuf-loader
+	)
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# Set the rust target, which can differ from CHOST
+			RUST_TARGET="$(rust_abi)"
+			# RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as
+			# far as C parts and configure auto-detection are concerned as CHOST equals CBUILD
+			cross_compiling=yes
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure "${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+multilib_src_compile() {
+	# causes segfault if set, see bug #411765
+	unset __GL_NO_DSO_FINALIZER
+	gnome2_src_compile
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_pkg_postrm
+}
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 8768bb50fc3c..6c7f48c31b68 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,7 +1,11 @@
 AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e894049df2dfdebf75f0f519eb715aba5bd590f4b57a718f78238ee50242215ef2b648fd3e3e8e8dddebc2ff1b45be2 SHA512 3a0925262643eb84d4c1731cad6b3c2c427def000503a3a680b06b68828f53492b4367d02ac6de36c35b6460e3d0967e3ce26203f8257271b222883990047459
 AUX 3.32.3-optional-gstreamer.patch 1592 BLAKE2B 5c0326638ed4c2714fe72e460256bd01cfad547c6455e1ec3e0273550d5f16e7ddf2e32e4928b7d45e1ea877625fce5a8ea3171d67f5c87359a9ddc2944fe9cc SHA512 40bcbbad8ad7d831e7af0659a710af0f378e8aaafff89f764528f577dcb78d96d38af475112bcd4c615d5c78249955c31ce196bcbebd590bdeb6f52127ce3a3a
 DIST nautilus-3.36.3.tar.xz 3201908 BLAKE2B ec7be7ad523e29c853a1a16dd6381257bd7f7af0004d4b84a9ef13539f5c8ea431c61f819eee6c0d396037846d390ae112b3fe2771276cde6128e7fad95eb4f4 SHA512 4dce01c20a34ed9bbff53a9886775af431754d02a4300e4647d87830502103e7436e53127b2e503af8e3a90785aa864514dbde22508ffb3e06eb43d4633fddde
+DIST nautilus-3.38.2.tar.xz 3221128 BLAKE2B c5d67072cefcd8dbbb0454ff6e867045a0edc72f0b4b1e01c910d4bdb1b755a56c3609f6e5d5f8ca8624a667d105a0962b6de701ceafa2108c1c94807c92e8c7 SHA512 b716140363e6c3ec30ef450958a4d6d812502e96569a9ce2567f56297fd0b3a7e779df6628d447b19dd20b8128a371a523aa5a6e34da40e9466d0b94341ca12c
 DIST nautilus-40.0.tar.xz 3250800 BLAKE2B e57381d7f9b9e6884e4f22f3c3d78c931d197b78f0f139457bf141ffdfebe646ddeb2d280a1d2b38124b8d8199323983ea48631d98843a49d125b7be49eb5989 SHA512 700a18b27da28608d247c046dcaddb3114cd0648e077ef0a0be3eba6f1e3623720224610aa92c1513a84a0ef91bae7b18e3624de9c2c1495544d260635688e5f
+DIST nautilus-40.1.tar.xz 3252276 BLAKE2B 6123fcc933f94ca405f7590ef446af0472f4ec10f5188ae3aaf9cb38a0cb1905a7cfbd69c47c5f1b3258bf915006184caeafa2e10035f0068e758a615c328609 SHA512 6421ce0c30c6f3a406a9c100b4a62e01276b10b6cdf05c9aa862a0ece89c7d231e8d3630aecfb8a1e6b40d62849c80c6c91b3f6b6663251466aa8865e60dbfc1
 EBUILD nautilus-3.36.3-r1.ebuild 2860 BLAKE2B 17c13ce67218c0a10f794b623da816fde335cac0e93ee1b94491914c1781dc994611d6647501538a088cb4958dc42c746c67761a1dde9dfbd77968c06ddbaad2 SHA512 d239ab9e46bc153d5c78893c8518f8aa16866e33997d692edf49eb466419bacd08604b13086af1c147b1a1091d8a6459c21c87ca2e5ebcd1944b3e9562d580fc
-EBUILD nautilus-40.0.ebuild 2864 BLAKE2B 2b81ebced534fef40fe73aaf5128179ba6bc5688ae6ba20d15b96b5b5b4dd6ccdf22a36da3232aa53f65f6c903d737faf91165fb00e98e452ec31139b672575b SHA512 9dddb6eb1d267d8bd27f15fc8d1d4c60340b5c7749a75483ac44d353d362be5ce8c6af0c38803f6b0bc82f2c8e7ad8a752cdce63a54c293fae81f9109d4d16df
+EBUILD nautilus-3.38.2.ebuild 2863 BLAKE2B e75e1f938f935b114c5f70266ac6d950b35951bbfe2a1906e7b784aae033446bed5fb57dcd41f5922a192a4632b27c6029afc0f21df5ba6718cdc3f0bf704bd0 SHA512 416798bf40a9c7c8a8360a2bf3a392439d46895771a95f05e14e9bdaf699ab9b96974a886f5620a0f734f65711611b3c678a8dbe33c404fb2e45651f771eecf6
+EBUILD nautilus-40.0.ebuild 2889 BLAKE2B 0edeffffb617513572020afbc9c7f30621c9ef9652a494730d60f8b8f92b04d38c65bb539ba3db3fc809ab34a75ab8cc2d63a04745dff4a736942ed8440a11b1 SHA512 7e9df161c2ae2ec26bbd836b13f1045b516ebc228084ccbfdd6170cef84f45181cd7ac413dba029a374edce0b7983ce4c972391a32dff59c2cfc97c696e99167
+EBUILD nautilus-40.1.ebuild 2889 BLAKE2B 0edeffffb617513572020afbc9c7f30621c9ef9652a494730d60f8b8f92b04d38c65bb539ba3db3fc809ab34a75ab8cc2d63a04745dff4a736942ed8440a11b1 SHA512 7e9df161c2ae2ec26bbd836b13f1045b516ebc228084ccbfdd6170cef84f45181cd7ac413dba029a374edce0b7983ce4c972391a32dff59c2cfc97c696e99167
 MISC metadata.xml 553 BLAKE2B 51c14fbccc3b060cb5fac644a8213672250edb2c2092076bb4e0c390bfc8562a950fd362ae4294ac1215e774fcd4dd4de6c709b126c04fa705cf10be0e6e836f SHA512 77102dd05a5180dffca7ef03d66e3d0dc113f272e583da442027a94cb4e9fc67f0c267d9f2d5d0a4ef895d58604aed78fbe01c19b3f018972ff675d392786b7c
diff --git a/gnome-base/nautilus/nautilus-3.38.2.ebuild b/gnome-base/nautilus/nautilus-3.38.2.ebuild
new file mode 100644
index 000000000000..d6b36da0625d
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.38.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="Default file manager for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/glib-2.62.0:2
+	>=media-libs/gexiv2-0.10.0
+	gstreamer? ( media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	>=app-arch/gnome-autoar-0.2.1
+	>=gnome-base/gnome-desktop-3.0.0:3=
+	>=x11-libs/gtk+-3.22.27:3[X,introspection?]
+	>=x11-libs/pango-1.28.3
+	selinux? ( >=sys-libs/libselinux-2.0 )
+	>=app-misc/tracker-3.0:3=
+	x11-libs/libX11
+	>=dev-libs/libxml2-2.7.8:2
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
+	gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
+	>=app-misc/tracker-miners-3.0:3=
+" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
+BDEPEND="
+	>=dev-util/gdbus-codegen-2.51.2
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.10
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PDEPEND="
+	gnome? ( x11-themes/adwaita-icon-theme )
+	previewer? ( >=gnome-extra/sushi-0.1.9 )
+	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+	>=gnome-base/gvfs-1.14[gtk(+)]
+" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
+
+PATCHES=(
+	"${FILESDIR}"/3.30.5-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
+	"${FILESDIR}"/3.32.3-optional-gstreamer.patch # Allow controlling audio-video-properties build
+)
+
+src_prepare() {
+	if use previewer; then
+		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
+			To activate the previewer, select a file and press space; to
+			close the previewer, press space again."
+	fi
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
+		$(meson_use gstreamer) # gstreamer audio-video-properties extension
+		$(meson_use introspection)
+		-Dpackagekit=false
+		$(meson_use selinux)
+		-Dprofiling=false
+		-Dtests=$(usex test all none)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	use previewer && readme.gentoo_create_doc
+	meson_src_install
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use previewer; then
+		readme.gentoo_print_elog
+	else
+		elog "To preview media files, emerge nautilus with USE=previewer"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-base/nautilus/nautilus-40.0.ebuild b/gnome-base/nautilus/nautilus-40.0.ebuild
index e98afa90e786..aacf13686936 100644
--- a/gnome-base/nautilus/nautilus-40.0.ebuild
+++ b/gnome-base/nautilus/nautilus-40.0.ebuild
@@ -36,6 +36,7 @@ RDEPEND="${DEPEND}
 " # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
 BDEPEND="
 	>=dev-util/gdbus-codegen-2.51.2
+	>=dev-util/meson-0.57.2
 	dev-util/glib-utils
 	gtk-doc? (
 		>=dev-util/gtk-doc-1.10
diff --git a/gnome-base/nautilus/nautilus-40.1.ebuild b/gnome-base/nautilus/nautilus-40.1.ebuild
new file mode 100644
index 000000000000..aacf13686936
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-40.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="Default file manager for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/glib-2.67.1:2
+	>=media-libs/gexiv2-0.10.0
+	gstreamer? ( media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	>=app-arch/gnome-autoar-0.3.0
+	>=gnome-base/gnome-desktop-3.0.0:3=
+	>=x11-libs/gtk+-3.22.27:3[X,introspection?]
+	>=gui-libs/libhandy-1.1.90:1
+	>=x11-libs/pango-1.28.3
+	selinux? ( >=sys-libs/libselinux-2.0 )
+	>=app-misc/tracker-3.0:3=
+	x11-libs/libX11
+	>=dev-libs/libxml2-2.7.8:2
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
+	>=app-misc/tracker-miners-3.0:3=
+" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
+BDEPEND="
+	>=dev-util/gdbus-codegen-2.51.2
+	>=dev-util/meson-0.57.2
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.10
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PDEPEND="
+	gnome? ( x11-themes/adwaita-icon-theme )
+	previewer? ( >=gnome-extra/sushi-0.1.9 )
+	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+	>=gnome-base/gvfs-1.14[gtk(+)]
+" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
+
+PATCHES=(
+	"${FILESDIR}"/3.30.5-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
+	"${FILESDIR}"/3.32.3-optional-gstreamer.patch # Allow controlling audio-video-properties build
+)
+
+src_prepare() {
+	if use previewer; then
+		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
+			To activate the previewer, select a file and press space; to
+			close the previewer, press space again."
+	fi
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
+		$(meson_use gstreamer) # gstreamer audio-video-properties extension
+		$(meson_use introspection)
+		-Dlibportal=false
+		-Dpackagekit=false
+		$(meson_use selinux)
+		-Dprofiling=false
+		-Dtests=$(usex test all none)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	use previewer && readme.gentoo_create_doc
+	meson_src_install
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use previewer; then
+		readme.gentoo_print_elog
+	else
+		elog "To preview media files, emerge nautilus with USE=previewer"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}