gentoo Easter resync : 12.04.2020

100 files changed, 3404 insertions, 191 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index f30965a5e161..bbc9c5131c21 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 54ab72632059..b88a805e1c9b 100644
--- a/gnome-base/dconf-editor/Manifest
+++ b/gnome-base/dconf-editor/Manifest
@@ -1,3 +1,5 @@
 DIST dconf-editor-3.34.2.tar.xz 560308 BLAKE2B 9172a4dd77765d067228c6652b004bd6811c71a83bb4191a71ef70181a5e0aa1c3bca6d655c76eb032793eb5c39364ece23337fa86d1a6e31e59391a3554933e SHA512 6c2d89d2d62a768b669ca49e0298bddf4f4151358f0fc0314431c7f926df2323ac3b61540f2a3c95c7b5a88e4e2f08dae4d00f601506c9610a0edee4b00ba499
-EBUILD dconf-editor-3.34.2.ebuild 817 BLAKE2B 098901e2cfe74c2ac41d84b3e33c476bb14c7f79df824b05caa1b7499892ec0a012f2389001909501a5ad7621c75dc554b2fd32f7006f5f94c21a74597586663 SHA512 6dcc2a9aa8bbd35e309c1ae5ddc3fc747a92937b8b2a3539c6eb2e6ee5a2daaee79d42a12bf766c9990dbe5333a227ff331d3a01282082b0222ec183871f2744
+DIST dconf-editor-3.34.4.tar.xz 568388 BLAKE2B 9b67ab82e01b551b898e7fd19a8990bf7f2acbf4dd9f80ad58226f82743fe96e856c0a0647be854141f25a3339d062da8eaba3c6b2fcdc6fe99718d25ce6b6b7 SHA512 8ac9be21838d66b57bcf8bcf14b7835398ebe2478bd851f8299c43427ccc7953f545dc0fa8f10dc2c5e837b9dcec4f503bc25ffd8c633066f5326873e3c4ef3f
+EBUILD dconf-editor-3.34.2.ebuild 813 BLAKE2B e65391c443fecf58357d0a5e4af977e1dc6f62112bb19304613a6c34f41277962c1141053dfbb2fb5f9f0911e119c1238a1a0d8249763164f058e5334de161e9 SHA512 ac96d459b704a45e856a9a1cab563a00996079cf004f197b4b5aad65d3e64f1587918844ea87a8f0642322d8566838b686eab6af309aabf84160ba313be96a22
+EBUILD dconf-editor-3.34.4.ebuild 815 BLAKE2B d1cca311a344ba79f7a4f74a65e01ddc31fb5d6116e2d30459dd42d702b3fc769aa77f94f34fccf06d8fc18c52994b662e6e5d2472066acd9e7308456c00c972 SHA512 828b65a4d05469af3b279638fe0d0b1d48b8d4eecb45e311a69cb5fd5f795255a432349d7f0e8d009087888cf44ad30224f1215b7356f316ea19a4cb39226ee7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf-editor/dconf-editor-3.34.2.ebuild b/gnome-base/dconf-editor/dconf-editor-3.34.2.ebuild
index 4eecd4fb57d9..6e9c891bb893 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.34.2.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.34.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/dconf-editor"
 LICENSE="GPL-3+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 
 RDEPEND="
 	>=gnome-base/dconf-0.26.1
diff --git a/gnome-base/dconf-editor/dconf-editor-3.34.4.ebuild b/gnome-base/dconf-editor/dconf-editor-3.34.4.ebuild
new file mode 100644
index 000000000000..21fa99568f71
--- /dev/null
+++ b/gnome-base/dconf-editor/dconf-editor-3.34.4.ebuild
@@ -0,0 +1,43 @@
+# 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 44a87abb9207..de352555c866 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -2,5 +2,7 @@ AUX 0.30.1-bash-completion-dir.patch 3222 BLAKE2B 977be3dd9cbee50bc976fbae125b05
 AUX 0.32.0-drop-vapigen-dep.patch 1123 BLAKE2B 921e0bfebf9dfa67e55cda7c410c790e07d5d55d9c24d897fd43bacf524bde2de4fce07905a8c2298130af5c94a309a8bd82d0d549f2e344d653f9c9e1335965 SHA512 c26e44fd38e46f1df60d2a13cc40415af9298629ad3c0d12a203bf483a0577c24af2bedfb8c1e8e35855eefa317a0afced78b74f217a13a2429bb8ae73d8413f
 AUX 0.32.0-meson-0.52-compat.patch 1148 BLAKE2B d33127e2e765f3f19282b33852b00b8a08f4977c856a94321b616e5135b3618477a44812a7429148018c915d716f35c6296e3c72c247970adedc9331af7bfdc6 SHA512 a4b9a1c6b6f16a4f5ea7a250d0a2949c1906813cefc985706575865abc03dc715f6d283887b081bc906a7a439fff0ef4fac57b3de3a4ea40ba2dc19e51db4664
 DIST dconf-0.32.0.tar.xz 111700 BLAKE2B 51ac54deafc44a56aa6af1bdc8a89e1002772969881870b196a12f85d5b1a090a334b3088b051e07e085b7fe736e2e51479c17ffcc38a18e682b8238d51671ee SHA512 09ae65ad365947aed24228b94978b290060264e55b443d18a743e943627703c92e16e3a5ca8a0aaf3549f7a1d5aad77bdc285d4c8519db705d3104ec22b111a0
-EBUILD dconf-0.32.0-r2.ebuild 2193 BLAKE2B efcf10a06cd228012b3431f44989914483003d001cd19f5f21d7c4f4b6a1979da6852e85943d4ba4cd1ddb7b694b1d3711a1852a163e77aa33fe39c2971a79b2 SHA512 9ff59d29ab26458301dff735c4467f38cf0c8b90d4610f6617e2fdfca944cb8f33e5fd9d4b438be78f7543cefad01e0e0e110ce3bed27d21c112ff2aa926f7f3
+DIST dconf-0.34.0.tar.xz 112876 BLAKE2B 6890cd82a3ba81eac8c72dda93ebf1b82f3002b735bf2e059ba07a2f0f3817978a9e4f5dd37a9efab728fc2a4e20c34c519f9eeb3915d705ff8a3c4a65f9ab41 SHA512 8b28373f31fe36ba3f21f56fca84563681c3648ff595709880cd9ac49fc6b130ac375fb89fd585f1dd62b5a2f728127292ea57d18feca1147b709a93e8c4c743
+EBUILD dconf-0.32.0-r2.ebuild 2190 BLAKE2B 0986b0dd27d8b5ba3e52e294fa9e7e790ce808b3596f024d62112e89270c55bf6dc22585115cd3d58a9d4459a3cd006c1cc38371100b866d92771733d5d89bc7 SHA512 3d089f03f7cff19d6bd49fefbac7238f23852dd5286fe41056df9df66e600b8aa0808572721fc92eab2e9152187634beba9bfbb91bbdcad5f5d3e2368e495754
+EBUILD dconf-0.34.0.ebuild 2200 BLAKE2B 99499d34542facab7cbf7b90f01b5e92534dda11e7ea244b93594474cb7a065dec3d374a78a6c6181a7076f8a2ca92f45728b36d72b94e87df3f8038de757e25 SHA512 21a1fcf8fcfa182fc8e583f4a0d001ef8736396aa06caab67c41a6fb06ad5081074b9cb617608277f12de7ced6b69921bd299ee063d495616d76948440bd3754
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf/dconf-0.32.0-r2.ebuild b/gnome-base/dconf/dconf-0.32.0-r2.ebuild
index af0c7f04f573..6d8ce55d9a8d 100644
--- a/gnome-base/dconf/dconf-0.32.0-r2.ebuild
+++ b/gnome-base/dconf/dconf-0.32.0-r2.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 ~sh 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/dconf/dconf-0.34.0.ebuild b/gnome-base/dconf/dconf-0.34.0.ebuild
new file mode 100644
index 000000000000..c40041616f51
--- /dev/null
+++ b/gnome-base/dconf/dconf-0.34.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Simple low-level configuration system"
+HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="gtk-doc"
+RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2
+	sys-apps/dbus
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	gtk-doc? ( >=dev-util/gtk-doc-1.15 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/0.30.1-bash-completion-dir.patch
+	"${FILESDIR}"/0.32.0-drop-vapigen-dep.patch # .vapi/.deps are pregenerated, just install them without a vala dep
+	"${FILESDIR}"/0.32.0-meson-0.52-compat.patch # https://gitlab.gnome.org/GNOME/dconf/issues/59
+)
+
+src_configure() {
+	local emesonargs=(
+		-Dbash_completion_dir="$(get_bashcompdir)"
+		-Dman=true
+		$(meson_use gtk-doc gtk_doc)
+		-Dvapi=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# GSettings backend may be one of: memory, gconf, dconf
+	# Only dconf is really considered functional by upstream
+	# must have it enabled over gconf if both are installed
+	# This snippet can't be removed until gconf package is
+	# ensured to not install a /etc/env.d/50gconf and then
+	# still consider the CONFIG_PROTECT_MASK bit.
+	echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
+	echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
+	doenvd 51dconf
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_giomodule_cache_update
+
+	# Kill existing dconf-service processes as recommended by upstream due to
+	# possible changes in the dconf private dbus API.
+	# dconf-service will be dbus-activated on next use.
+	pids=$(pgrep -x dconf-service)
+	if [[ $? == 0 ]]; then
+		ebegin "Stopping dconf-service; it will automatically restart on demand"
+		kill ${pids}
+		eend $?
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_giomodule_cache_update
+}
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index de7f70554a91..6b9e4e8b8a48 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -4,5 +4,5 @@ AUX gconf-3.2.6-gsettings-data-convert-paths.patch 1370 BLAKE2B 9fdb3c665c8515ca
 AUX gconf-3.2.6-mconvert-crasher.patch 1514 BLAKE2B 3e48d07777268faa3a1c98f168d33baded66df06185e8e1c77ae8f66f0c689c5a358018d1d3c060e5a4796c3f692acf346141db87f3cb6784ddabbe461432a69 SHA512 8b6885098b63077610b929c3b958efc04599a1f891a0d7b5f042f2638dbae7b3c67b97e7f4e34c439e55ff8c5df3bcc7c6edc56f11cd6506a4b28c2338c8511b
 AUX gconf-3.2.6-spew-console-error.patch 2594 BLAKE2B 6a6f27024289b1c578f6718c184e7604f0f1dc285ea58a8095fac06f5fa38273329c8b2535b4de8c17c8359f09f82aa474fa5ebcef739b0e2dd6e7d6fb7726d7 SHA512 abdddbcab24d80870691a45cdf8d4baa7021f363efa26ba140221afef0bd96756b7234fb1d61ea46c4d137854f59d2589f2e1f1d125fdcb1fad3acf9215a8602
 DIST GConf-3.2.6.tar.xz 1559904 BLAKE2B dc71bfc6e334b0a3545b6009fc1a592f3ba6adb1471aacc98aaa1ded9e89676f97415c26a3d17e297a846a7efca7ee695107c136ea28b2431f90dc966a3d64cc SHA512 35f5f659f9d03f7531a7102adacbda0eb310d8a55a831c768c91a82e07dae21247726e00e0e411f63b1de9ade0f042ded572a3ea4a4b2ad3135231f344540b58
-EBUILD gconf-3.2.6-r4.ebuild 3647 BLAKE2B 0dec4697696092b9cac9ff5017332618763597622c80167e439723878892722d317f5e24ebdf668d1455584b16e6b4416d52b357afe18d72a34df7d180bccfdf SHA512 230acf31b673818cf57e276c5d0ce5b0770e22e8c57c2356b556d7ffa8c31fc3726192469beaa8e72047278fcb065ba809682f2949d81f1bcf05af71c2d80c01
+EBUILD gconf-3.2.6-r4.ebuild 3644 BLAKE2B 4ac16d864d9098701583a1fed4911a8038f39db663e640eab8350fa25d197345b3eb50433ce43e93926792eb5dc93b7a870e052e3a1e10ac44cb92afd85c7d8a SHA512 ea8156912de5e0bac97bb7a95c01f73448f1111a370f20e72cc3965a8ec2f498322472d2192e5d12f482faf15ff7dd9dcd0bd5d91be72e740f95ce1c5d808d8f
 MISC metadata.xml 430 BLAKE2B e2fce04aae8a1df05cb55972ab86e903186e034c0c48115f29d754f215e0be20a9b204aa2be12ed045b3dfc2010eea78be83252a3b86aa7cbbb8cde9b7433923 SHA512 820c350a185014ad888ba9cb43afb5ae7f21a0000a224d68461abbee4efefcbd972db79d7086b8f7f023de0828fa6f01a32502cbf74439160003fad146d33ca4
diff --git a/gnome-base/gconf/gconf-3.2.6-r4.ebuild b/gnome-base/gconf/gconf-3.2.6-r4.ebuild
index 93a85bd5a17a..ebaac26eb04b 100644
--- a/gnome-base/gconf/gconf-3.2.6-r4.ebuild
+++ b/gnome-base/gconf/gconf-3.2.6-r4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://projects.gnome.org/gconf/"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~x86-linux"
 IUSE="debug +introspection ldap policykit"
 
 RDEPEND="
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index cbe0c67b40e2..eae248093a67 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -7,6 +7,8 @@ AUX gdm-3.8.4-fingerprint-auth.patch 923 BLAKE2B e681da8518ed1d002c1205658bb35e4
 AUX gdm-CanGraphical-wait.patch 5534 BLAKE2B 3be217b156ab6d486d7df98885934c5d1bedd6219a25a83cba687aa1ed59f6d0f2a16694a47050313e601355696095ccc738ac639f5958d9619db81d34efe068 SHA512 2152e800051473b8fd230c4b325d72229cfe91dce3e90ad6d8ace8e3278483ab05ce683e61c183f7c83e293873f69715740b1eccfdb34d6775140c635c73b5dd
 AUX pam-elogind.patch 835 BLAKE2B 1db26b690d631c152ae7fd84149c7ff3222e8bd258bff78e09cd6f00fe34a8bfdb2499b252a1f15e17d9e4ed315e02260357b57cd31cf8ada5a2705ba1ef4ee0 SHA512 4d2d65741a5bfd1dc686dc986708526161d15ace2d5396bef281a2192d95458a072764483e1422ed1f6eb594fc0caa6baa381371618f907a97f75566209fab7b
 DIST gdm-3.32.0.tar.xz 1262344 BLAKE2B bbc580f788fe2ce8783f044eb8109ce0086b1bb078bafaeb6efd833689848ef6570bb0fd0e6e260a388e7c1a6d3cdccb36264a640151e9b6e5d81ca9c35f3be3 SHA512 88016d0f800030a561e0360c63fdcb8499a605126f99a5a9f89606e086d7a934afc091843b2acd9091c1c643e7468ee31ae9a5b6264ae38064618ad577ef7ac0
+DIST gdm-3.34.1.tar.xz 1244960 BLAKE2B c6e53b37baa75f202725b21b58e22cc84d44d241cc3fa10dd466e1a766ce4081bf436e965dcd38f0c009b5145813c95d77c76ca31ef837e8d0251c6d65d06ca9 SHA512 71b71699e8e31643080d2af5dc54381592c0c6a2f7adbb0434a9957c8e59c67a20afaf48dce57139453157572c5bae617134420f36e8da68fbc74e95746d26fb
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gdm-3.32.0.ebuild 7698 BLAKE2B b765057dca3b0f0d883ff0fc14f5367cf6f19e2f9dadcc4bb3beae99b34293173cefd9f53e38ea421910085b57e01e63e3bdab9656d7b69876d00504a77c8917 SHA512 a41b16c81cefbc62b2afa5e6971c90872472bce3187352efb5fd1f3a01cda074ba2abc763a68f0fee47c85160d7ceb2c89e58037f561b72b61bf7586f688886c
+EBUILD gdm-3.32.0.ebuild 7694 BLAKE2B d278e953d3d87f209f6f20bb9ac9b88cee77c13acb5e98d87eb51c69baac31cd90a546640a2ca53c170377dba569cff1615998d3e11f593c2802f2358067e6d5 SHA512 fd3b252fba9832f2b306e1cf017b9529c9c3ddcf0fd2fb5ed51de2eb8e46609256b8b2bd1c9eff711746cd3332da1568b1c6b31b2c017372168dfe6a43698843
+EBUILD gdm-3.34.1.ebuild 7696 BLAKE2B d1df068f408d3c342610e7520647528154f46fa2d5618049b4d4a07b46bbc4667fcac58602664c5f978cf8e19b5131d55d7d2fa1f876ffc03e55d205a9b02d8b SHA512 374695765fda70580bba42f211dd2c77092bf6f0f8159a69db3ef755d5960415e71a009729f404a450e1a501b0d8cdfa22e065b83107f82e55cc30790ad18d9c
 MISC metadata.xml 759 BLAKE2B 13de28afc8fe81580a2aa28c5fdc17c77266595ffe95218cfbb5cbee4cbd6edab21e8cd06698e4a5feeb696fd9530ef8bf14209ecf3d03039b4e0562bb757375 SHA512 68cec6972bcabcb873fb314babbf9bdfacc7eaae40d662d11662fccd6cbf6630cd93b7322baa271081244c77fd1458c89ad785a0eb2a58b448ddff663381d98d
diff --git a/gnome-base/gdm/gdm-3.32.0.ebuild b/gnome-base/gdm/gdm-3.32.0.ebuild
index 9512c3a85340..82b7e1698808 100644
--- a/gnome-base/gdm/gdm-3.32.0.ebuild
+++ b/gnome-base/gdm/gdm-3.32.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ IUSE="accessibility audit bluetooth-sound branding elogind fprint +introspection
 RESTRICT="!test? ( test )"
 REQUIRED_USE="^^ ( elogind systemd )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 
 # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
 # nspr used by smartcard extension
diff --git a/gnome-base/gdm/gdm-3.34.1.ebuild b/gnome-base/gdm/gdm-3.34.1.ebuild
new file mode 100644
index 000000000000..cd0b9154afae
--- /dev/null
+++ b/gnome-base/gdm/gdm-3.34.1.ebuild
@@ -0,0 +1,245 @@
+# 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="~alpha ~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/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index ab9b580c2546..7d678fda4827 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-applets-3.32.0.tar.xz 8626692 BLAKE2B a93ac7ae9ced828c710e7761ee0483018cf10b265f48ed64ce1c117a349583d0e980759e9529ef2a47f2c8873672c2c7a323fdcc7a7af543af851156ef59e1d2 SHA512 11c8ab3b2561ef13b268a5711adebe754626cd0bfe6865cfaebf59602e6da917023172a36d253522b4bc4f250c3db34c621ba3fabfe8c628c744905581783e01
+DIST gnome-applets-3.34.0.tar.xz 8626548 BLAKE2B 0591269015570da4e7ab9a7a4568a032faa6209378736de57dc54cb395b545bd029a52f7ba6de39aee8f23c255ae3c24fa6defc33e971d270e6fc0e301add12f SHA512 5d16ca9d1f6c65fa59246a860f0d5723e77bf800c9362a254a8435750e52c4beb0e65aa8994e5578cfa1db7130dc92eaf4cb477ab401da402d31ea7f5aac1b51
 EBUILD gnome-applets-3.32.0.ebuild 1466 BLAKE2B 188964a20c3751c6b2c9e910c5e3e0c06ea39e8afe3e62c4bcaefa78f7c9a127832a4afaa7a0ce09716306dc47de8ac5cf97efd2ff0ac294a4b2f54ebb732cef SHA512 0c9d12f05090b31eba361e7c8168e46a5d0fb388c91ce9d67c958a29c6338d4c1439b4dd6611227fc3794f66d0bec23e0d14a9eb9e661d65016561464f573356
+EBUILD gnome-applets-3.34.0.ebuild 1466 BLAKE2B 86174b0142926612639bf20646cb2f3b15c6a7a93b2cdaa528cbd64610e86af16b41d01d207bbb1a22ad69a3da91ef42b54c40b7121e1aefd0f9bfec496da839 SHA512 4c13bb75f266191821a4cc4af76f231d8cb910ce9f9ad999746c5e0f9ce77373724c8fdc79f63becf5b74fd07a588f84db24081c0cbfc4d189c4c34f19751f21
 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
new file mode 100644
index 000000000000..6bac6f49e357
--- /dev/null
+++ b/gnome-base/gnome-applets/gnome-applets-3.34.0.ebuild
@@ -0,0 +1,57 @@
+# 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-common/Manifest b/gnome-base/gnome-common/Manifest
index 42f67c0a9c35..b4a76c40a27b 100644
--- a/gnome-base/gnome-common/Manifest
+++ b/gnome-base/gnome-common/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-common-3.18.0.tar.xz 155804 BLAKE2B 5e5dbccf1851f45e2890e2fcced1be5630dd378bb22448e38ff7988a18145bfa90dee03a64a4ba4ff9d22ea6fd812e9f02a1ee1f9656b4d47201afc174d69229 SHA512 b931c9a6668d996560549738bb2d95f86f56fa68ce930c077275bdc8fddbc2d28d215c1190099db1df851417902fca87ec81f1c0e644c5b9630a175e1cde0719
-EBUILD gnome-common-3.18.0-r1.ebuild 602 BLAKE2B 25652989f81f6b1937632b61c177fce30d1469f3963b9cdd01c07306585145b8d01e45b9b858d53725202e773fc7b96d86542a4e3753b3e4e3fb08ba10093aa3 SHA512 d277401be9ad9a14bb7dbeaf35c13a67ee2d9f4f1dda9420b2a8b2a8ddeaaa933b072746417b4207956ecf45840a5be202a87ab0b56aad21a94c51d256ae8b35
+EBUILD gnome-common-3.18.0-r1.ebuild 599 BLAKE2B b631aadad3c33339457c143063b61fd1865b169d648f1e4adf4a5c07c261c1b7e01d8084391f5db1bd76b0ae1bb5d114fc10a85fde6c6a39cd687c28cad59b14 SHA512 80589e1c4c351facfec3466946f823a047c90baf90d8319c8c3ef99bd15c08529a3f61e3f48fa40538adc476e78199c0374d862e0867257f76fc63f636225735
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild b/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
index 02e76664a967..76697f22f2d2 100644
--- a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
+++ b/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-common"
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=""
 DEPEND=""
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index f6c2d6726a41..a8ae53691a5c 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -4,6 +4,12 @@ DIST gnome-control-center-3.30.3-patchset.tar.xz 65244 BLAKE2B d210f94e0058e6284
 DIST gnome-control-center-3.30.3.tar.xz 5889900 BLAKE2B a03153cb689edc3c8c96a0f184f8831a8df218691fefd035842170871eebb6f17e34405e7c4c18da6a191b92c7b58fcd40b252cdb67154becdf7e7ac6a63aa8f SHA512 85c7b51d6bc32f73d7f4ad6df8d4cc14c59e19da88d7a17b7337f995483f41008213ca829247a3c9db43c4b31eae0be321ed6804570660fbe0356da3dd0948dc
 DIST gnome-control-center-3.32.2-patchset.tar.xz 62920 BLAKE2B 0268c048317c0ef267b1606b5eb85a40bff4f59a0baa8876cf1c893b96513c51708edeeb965933d54fe345bbce3e255e889c45eef98147b32d3d1208bf049fc9 SHA512 458ea50c1e95e2e005a1dbeb3c1d1a82d3399909a1367ad827ee3c5cef14cd3ecdfe27bc17bf24d6b037e1eae00df3235a75d0154178203b177b05b8d0688e6c
 DIST gnome-control-center-3.32.2.tar.xz 5953072 BLAKE2B 98206c6c7fd8fdca8bb6ba7c1178eacaa6e3364380c6faf7b1e98c0819c440e16d35f4299d323c27db8271a161be84e4e7520a4b8b03c4d654d195b25c93cdc6 SHA512 6f69f72e15d901935bd2fba90e0a598e6c6463d4b0f914d2a9c330c77378a461c8da86f198408045c07de370d3c1558046323a4c23a97ceed96602597e167c78
-EBUILD gnome-control-center-3.30.3-r1.ebuild 5835 BLAKE2B ec578aab0ddd1222a17109cde630aa2232c8f2ec549ada32423fec8bff8e75fe1c5f316816e6054b334e08f2df54e91233924eaddb5937b7a6d602a2ea60cb83 SHA512 15f9f0bf0dbc5cdd94a7fd3be253f404b35754d49d4112421a76f2d79d03592c3103a385a07e0cbbec864c78e1712e02db73b5439ea4d340f25ea3388f28f991
-EBUILD gnome-control-center-3.32.2.ebuild 5610 BLAKE2B e391e97ccbd730b900d0aee9991092f7eec2255f250896596cc9b77ba8a64a6e3f22d05c2d9f9af30f18d4975a214e908a5ce2b63241bdf3c6d84d7f6608fb0e SHA512 5d1b7cf4b3f53637009074baf3b6ef64d1ae4b2b10f185319a51d668fc3f7078365cb053e3c09cdfada9058065e6152783076399553b73568ea5bcf0d631eadf
+DIST gnome-control-center-3.34.4-patchset.tar.xz 76008 BLAKE2B e66888fc0813508a8bd93677610d5c0d6abc474276dc4b37d7743fc5983e7c5ecacbd47078a81bef8d67b9ad0a32e452ee0f74a2e83c1b2998f5bf910ba21c43 SHA512 75b963c8fa3ce353efbfeb9ffa0d08c09febde01d548973e5d3c4fdc56dd156c091b645c07e9d56020cfbba9f9ab3752081f01bef4fb2527bb0f933bd9d659fb
+DIST gnome-control-center-3.34.4.tar.xz 6202616 BLAKE2B 41ab7ca34f930233f8b7bff06215df551765381accf16239d6515cabec8f106477e8895592278773d5b741f608c6cb3a2a70daf15bc4598dadd5ab967796ee8a SHA512 51c78766e6cfb02258f5e92dfe3b97c8a712e82290e7403c43b7abeb18af8d22addbabb7f2035782e4a90e45b464c8f3e7e65a4a610f27b79c2bedca8c822158
+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
+EBUILD gnome-control-center-3.30.3-r1.ebuild 5831 BLAKE2B e85143228012bc7b3070aab7c7b5ec9f09046735c8a1b3cf0543a761d7da658958d25d86452e293dbe88e2641ef91b55e4032ca2aae94390d4b24c09e3e1e6c6 SHA512 45912674a92f646f603e67e465b1e63c25e91598124f9a818b4f11403c69da3452108fb0b3fc558358e769783c178e420c744b5821e24e14209b940add00fbee
+EBUILD gnome-control-center-3.32.2.ebuild 6234 BLAKE2B 61a5f53f67446fc57bab77eb68c2717e542dc29f4c62471c6338882639d6f6d9fe69e3ca8853d4a397defc3c93a528eaabb50e838ef7b2448e381020b627d0fb SHA512 0a390b2a67f19a10959510aa10a9c7ea0d898430dd99767ff3b9632a55a3f99d70d2ef07090e6099c08ab4a303716bf6160542ab839b36c760f6396323c51469
+EBUILD gnome-control-center-3.34.4.ebuild 6269 BLAKE2B 984490cf11f0d2077f0f265dc7154450f6aa103b7b36761c72985fb4f7fe660a686ce7759d10c18a7afcb2dfdba40e524d1845688c998b338a04a9d67707fc57 SHA512 7614f72524841f79a57ae65bf8816d7b84101bb5ab6f9319472447f8d3d7c602672605911f589d3c6377653473b2776837c637df91020a7016ba7faccc66850e
+EBUILD gnome-control-center-3.34.5.ebuild 6269 BLAKE2B 984490cf11f0d2077f0f265dc7154450f6aa103b7b36761c72985fb4f7fe660a686ce7759d10c18a7afcb2dfdba40e524d1845688c998b338a04a9d67707fc57 SHA512 7614f72524841f79a57ae65bf8816d7b84101bb5ab6f9319472447f8d3d7c602672605911f589d3c6377653473b2776837c637df91020a7016ba7faccc66850e
 MISC metadata.xml 588 BLAKE2B 6fb4fefc43b162c8ac2a671ed7a6878ebe19edeaf018bb37f32a0c0aa6208b8cb68392b24fde56e1aaf5227756b157fbfa10470c350bb472c270ac7436827ff3 SHA512 d2891d89abf4a64e97ab84ed45e45b4115ebb1990b2ef8a91f069433a61aea4d97d060376e088aec5e9aec7475c0263ac072f081cb5f0c3d67206ed077051e1d
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.30.3-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.30.3-r1.ebuild
index f1a2f590badd..028c5ddf0616 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.30.3-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.30.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ REQUIRED_USE="
 	flickr? ( gnome-online-accounts )
 	^^ ( elogind systemd )
 " # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 # kerberos unfortunately means mit-krb5; build fails with heimdal
 # display panel requires colord and gnome-settings-daemon[colord]
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild
index 70a11f092400..9441fe8260da 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit gnome.org gnome2-utils meson xdg
+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/"
@@ -11,7 +12,8 @@ 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 v4l wayland"
+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 )
@@ -115,6 +117,9 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/glib-utils
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
+	test? ( $(python_gen_any_dep '
+		dev-python/dbusmock[${PYTHON_USEDEP}]
+	') )
 "
 
 PATCHES=(
@@ -127,6 +132,22 @@ 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)
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.34.4.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.34.4.ebuild
new file mode 100644
index 000000000000..127c385c6ef9
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.34.4.ebuild
@@ -0,0 +1,178 @@
+# 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 ~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-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? (
+		>=gnome-extra/nm-applet-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"
+
+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-control-center/gnome-control-center-3.34.5.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.34.5.ebuild
new file mode 100644
index 000000000000..127c385c6ef9
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.34.5.ebuild
@@ -0,0 +1,178 @@
+# 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 ~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-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? (
+		>=gnome-extra/nm-applet-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"
+
+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 ef0d2f61617b..9385e29e8fe8 100644
--- a/gnome-base/gnome-core-apps/Manifest
+++ b/gnome-base/gnome-core-apps/Manifest
@@ -1,3 +1,4 @@
 EBUILD gnome-core-apps-3.30.2.ebuild 1523 BLAKE2B cd87224b828663c02dcf7689c0379e15d8de30b7dd4a9fac7a44ded840eab6fa032b9c59bc3225a490243f456f9050a97dff88ff04621b6fd58e82a403dcebf5 SHA512 8e80a3a07929e94863d8e4a69cdaa707b839a6b7f52e03ba0765cca51689f1eda492078bbecaa956fe55a5124ffc2e059f38ac829f9f2df6981215419865dd2f
 EBUILD gnome-core-apps-3.32.2.ebuild 1529 BLAKE2B f4d382bc7a1978b71d4660a97799bfe292c91f373d0381754fccb9836b0ba33642a1fd4c4171e5e8afea615421dddff1b5d9aa8e865d430ea05c59f3ba7d5a95 SHA512 d0f2808686914813b27a43ac91d504ae35f991f970c3e66e2217bdd9b5fb5f983956507be41d6c678de7e0fda2156442516800f10344b06cb5296905c76583c9
+EBUILD gnome-core-apps-3.34.4.ebuild 1661 BLAKE2B 7a9aad315ba53e619a19ffb41d48b641772715a9b3d2e590e8fbcc650ee6e9732d0c5df3c2d1f17672b6f872b9794b8c6cfe84f703bee86e49de0240486c0fd7 SHA512 05b956d842abd8c38f6406ee9ec32c69e37eb1a3551283b09a1e5d75d4e42c2e94e04f5fe4c6a7039626e8e111e5097260775a32f6613076146d923b06ba9cb7
 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
new file mode 100644
index 000000000000..a68b26cb2554
--- /dev/null
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.34.4.ebuild
@@ -0,0 +1,54 @@
+# 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 ~arm64 ~ia64 ~ppc ~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 b3cd9d5283a4..455319ec4ffc 100644
--- a/gnome-base/gnome-core-libs/Manifest
+++ b/gnome-base/gnome-core-libs/Manifest
@@ -1,2 +1,3 @@
 EBUILD gnome-core-libs-3.32.2.ebuild 1164 BLAKE2B d5e1183c0833343da129516cf03526e106799a6c3635fd6f380b119c76ee6257c7aa22a58f2747e5ef4ec1289dbc72f95b4b6d47b15a0bb1a0139e519c1f3d8a SHA512 4c6b60fef6903517ee674ea1353473a433651235d0ccb91a194e5d7f0737298149ff13d18f0c97cfb78556a334bdbb96eea02220a504b3ac6e877765d034beaa
+EBUILD gnome-core-libs-3.34.4.ebuild 1238 BLAKE2B 9c7f3b832b1f190b15b5b6b8dec6de6807f46ae33291b57f06167535eed23777119d317f092ef0d35c63c0d306a34048048425fb1f5bd8a7dde10694c8f0ec76 SHA512 99853b09f09474c3ec69b0b80e9520803b2ec318b772a709225537e654a64e918130d7a028485f26c0d356d87d6a1432c48bbb3c81cb62f62f1684a7140cf1b2
 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
new file mode 100644
index 000000000000..fdbb4ad9ea8a
--- /dev/null
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.34.4.ebuild
@@ -0,0 +1,44 @@
+# 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 c4f9da908ae2..1c8b12550c10 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -5,6 +5,10 @@ AUX gnome-desktop-2.32.1-thumbnails.patch 3530 BLAKE2B 5ebed12840808f13e8116ff6e
 DIST gnome-desktop-2.32.1.tar.bz2 1633847 BLAKE2B 9c69504b0f904fe04bdaa2e2fd3c6fbdd0cdd67033bae6e21377cce2deb68f05ed85bc735547c036923978ebdb8952c262676a01a33f8d7acffb0b964f97366a SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28
 DIST gnome-desktop-3.32.2-patchset.tar.xz 7404 BLAKE2B ecc821d3338957d0a123d625607d727019d9500915a76ff6d10d3000e1fc1e51fc7c0382374752582aef641d005cd73d39148466b08c53dc1ce9872e73a21215 SHA512 0471f0a6d9213ea60e867bd4f381575f6a94fa0fde57cc1a360e2d4ef98c11f2f973d3d95347db8f24aacb2249ba84ffc4e35e05bb595d9d3b6debe561ed88da
 DIST gnome-desktop-3.32.2.tar.xz 709128 BLAKE2B f0335d1ad583f0b000c47826cd4b6eb24624862b22b00e9d42759ed1cfcf3dba6f091dd85504c9c8da8b9789bf78cf53d284942ba6e2d3c630db028b4a0a69c6 SHA512 7dfa5c3e4b77637cc40e6244eb8ce8cb314cf92d865b64e36c5dffa8a699e91c81bd359f0a89a725c064eafec965d2b9d119aa05f1de103cd836a4bff9119a99
-EBUILD gnome-desktop-2.32.1-r2.ebuild 2278 BLAKE2B df301608b81b4f5b9f8900741bf2671975d523e341908ddbb5759acf74fe61469a0a57d479a9dda89d3eaf9b8c17ecfc414cba7365b2239505c6c7334773a89d SHA512 908c5b1ba8980f4cfbcdfe6a2bfcab77a2bda99a4c50f830f37a4d934f5f9a853201319aba8a908247fef43fd22922bc92a67446e34915ed62c02671f99a0dc0
-EBUILD gnome-desktop-3.32.2.ebuild 2261 BLAKE2B 5c6b7386f6c18eb1b84da612019de9130dc2bc1e6f3bfbd74a210638f8a681bea72166c5076d6b02b36d39da58f9829e46980a9042cd90b6ff6dfc06224eac48 SHA512 9b2dd6a07c468d6402976a70da0605f2694f73f65b904605783027d2ce21bef6f417554f080f3a954a0915260837e584273a1baf3c68c70b924ab4d97807cd2d
+DIST gnome-desktop-3.34.4.tar.xz 715280 BLAKE2B 34ee3d4a36e7b8212d5285f766b030ae9369ec99be90dbf86a10f6b6727f221770c43db012c9e4634b8c95c7ffb97d435fb3555b1bc184ec4127538ba6ab261b SHA512 de3ac71725f4cc55b22af4f6f04516d9a5cbdd27876f302fc78c864c1461e444967de3dae3a6944124b33335c9e6f4f96b9de63053c582917509b90844acbe3f
+DIST gnome-desktop-3.34.5.tar.xz 718008 BLAKE2B a09daf4f575b26774beeef8e9edb4ed757ead7c0155aab4d7c132bf503d29096c40b06d52aa261594c6db367ac7a638c33de4445748ab3d94a095c23f8ddd705 SHA512 bc59b420d5698b15697404efcf452e830933efa23b6dba9011eade1c7521dbd4fb6f6e6e2be822d231611b2133e36f2ec42ed49ecabd175127366e0e7d59955c
+EBUILD gnome-desktop-2.32.1-r2.ebuild 2275 BLAKE2B f8281ce2857d4908ab19bb131973c86eda9bf0f1fab550ef9bcfcb2d81a36938eb33abdfe2d3b36f301cef108aa18b785859397ea081a9b1a364cf2cdd822ab3 SHA512 a0786d20f581970dcc480ea0942d8064c13c5c489a0cddf2e30c11e97ab08a0c9783ecca443824e1b08102a4eff71fdd8d473bf522ab91bde0ecf92b8121a72f
+EBUILD gnome-desktop-3.32.2.ebuild 2251 BLAKE2B 4db77f0b8ee01c122943d3e9f3cfff22d1d2a626066588308b9750bde7ffdc6854f93af56f5de9b6ab9d2e8e6f7b9eb2d82aa573a9ec1901722efbd6667bc2c7 SHA512 c39916311e8b2b49dce90c9d122a4cd92732f1b0f2d41212a8ad1f4ea4b406d24480d93b9cc80999369324dd48310d11ebb3f51b41de4f7e55aac3597a2ee75f
+EBUILD gnome-desktop-3.34.4.ebuild 2025 BLAKE2B d6d578b59bc7154ca8d5e5c452c4fb96c187f4e9c5cb8d33de6a443d83f410a9b027aec5352a70ce46aeb681495f414ce51fe03b95b837c4487fb57f8012a493 SHA512 14d7eac731b31f23346dadbcc00eb7f3a99da34a085a278fd3c1ce7f46bae40d75ce5eb9c7567fe603c31b15520fa873806d7777e5f5fd6376c26f60b86a082e
+EBUILD gnome-desktop-3.34.5.ebuild 2025 BLAKE2B d6d578b59bc7154ca8d5e5c452c4fb96c187f4e9c5cb8d33de6a443d83f410a9b027aec5352a70ce46aeb681495f414ce51fe03b95b837c4487fb57f8012a493 SHA512 14d7eac731b31f23346dadbcc00eb7f3a99da34a085a278fd3c1ce7f46bae40d75ce5eb9c7567fe603c31b15520fa873806d7777e5f5fd6376c26f60b86a082e
 MISC metadata.xml 354 BLAKE2B f3504e89fa723ab0e4856f88e088fe1a3eff2bfee9635ffaae7404eff28b0090a636a9d9441e27dea8a3a62e980537636cf696097c946908554730ba12f1c358 SHA512 bfd7555f171ffd08174b134d34475d1dd40e6d325d188dd0a631d82d85836d92900a3ac641c6b200654ecdcd76371d7bbb4c3e34c4ee8b8410e8c6d8503a5bea
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
index 19918dc9adb0..c0b20f78db31 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="license-docs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
index f678ef39697c..cee93712f2cc 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="3/17" # subslot = libgnome-desktop-3 soname version
 IUSE="debug gtk-doc +introspection seccomp udev"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~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="
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.34.4.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.34.4.ebuild
new file mode 100644
index 000000000000..5018ba92f323
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.34.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Library with common API for various GNOME modules"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
+SLOT="3/18" # subslot = libgnome-desktop-3 soname version
+IUSE="debug gtk-doc +introspection seccomp systemd udev"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+# cairo[X] needed for gnome-bg
+COMMON_DEPEND="
+	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
+	>=dev-libs/glib-2.53.0:2
+	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
+	x11-misc/xkeyboard-config
+	app-text/iso-codes
+	x11-libs/libX11
+	systemd? ( sys-apps/systemd:= )
+	udev? (
+		sys-apps/hwids
+		virtual/libudev:= )
+	seccomp? ( sys-libs/libseccomp )
+
+	x11-libs/cairo:=[X]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${COMMON_DEPEND}
+	media-libs/fontconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	seccomp? ( sys-apps/bubblewrap )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	x11-base/xorg-proto
+	virtual/pkgconfig
+"
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
+
+PATCHES=(
+	"${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
+)
+
+src_prepare() {
+	# Don't build manual test programs that will never get run
+	sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dgnome_distributor=Gentoo
+		-Ddate_in_gnome_version=true
+		-Ddesktop_docs=true
+		$(meson_use debug debug_tools)
+		$(meson_use introspection)
+		$(meson_feature udev)
+		$(meson_feature systemd)
+		$(meson_use gtk-doc gtk_doc)
+		-Dinstalled_tests=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.34.5.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.34.5.ebuild
new file mode 100644
index 000000000000..5018ba92f323
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.34.5.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Library with common API for various GNOME modules"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
+SLOT="3/18" # subslot = libgnome-desktop-3 soname version
+IUSE="debug gtk-doc +introspection seccomp systemd udev"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+# cairo[X] needed for gnome-bg
+COMMON_DEPEND="
+	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
+	>=dev-libs/glib-2.53.0:2
+	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
+	x11-misc/xkeyboard-config
+	app-text/iso-codes
+	x11-libs/libX11
+	systemd? ( sys-apps/systemd:= )
+	udev? (
+		sys-apps/hwids
+		virtual/libudev:= )
+	seccomp? ( sys-libs/libseccomp )
+
+	x11-libs/cairo:=[X]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${COMMON_DEPEND}
+	media-libs/fontconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	seccomp? ( sys-apps/bubblewrap )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	x11-base/xorg-proto
+	virtual/pkgconfig
+"
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
+
+PATCHES=(
+	"${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
+)
+
+src_prepare() {
+	# Don't build manual test programs that will never get run
+	sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dgnome_distributor=Gentoo
+		-Ddate_in_gnome_version=true
+		-Ddesktop_docs=true
+		$(meson_use debug debug_tools)
+		$(meson_use introspection)
+		$(meson_feature udev)
+		$(meson_feature systemd)
+		$(meson_use gtk-doc gtk_doc)
+		-Dinstalled_tests=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/gnome-base/gnome-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest
index a393a84d8244..344c14fd4119 100644
--- a/gnome-base/gnome-extra-apps/Manifest
+++ b/gnome-base/gnome-extra-apps/Manifest
@@ -1,2 +1,3 @@
 EBUILD gnome-extra-apps-3.32.2.ebuild 2487 BLAKE2B a8feb735675c94dd442b7a241e48d246f5f4f955e53fd092ac5f5df93ab8fac004ffbbb695a2c6dc833b8926628de9523888a974b6acfae0002c2f73d28c47ce SHA512 b4f3168d5a54cd4bbfb858a742d1ec818e0fac127a64acfb771db05f20b5f75c32b4301a47012e1a3b7533d061afc6060d6f828bdbfcdfacec105dc7805be59e
+EBUILD gnome-extra-apps-3.34.4.ebuild 2487 BLAKE2B c34b4a6ef44a23707551fd66fc4d817720dfb557995c31874de526623b5f3e81083ebff6c637affc5d1533053b9b41a58c2dd5d738b3a85c91a1e427caa5e7a1 SHA512 45c57f59fabc0a7b23e6d1891fc081f346f1233ec3ace53781a9a8b309d534d96bcb4280dc5aff2c4ad768c7357ae018c5644fb0d8869cb836ff3b7d03f2d923
 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
new file mode 100644
index 000000000000..1c885fb05339
--- /dev/null
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.34.4.ebuild
@@ -0,0 +1,75 @@
+# 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 06a8f1970a26..f6c2b9bce442 100644
--- a/gnome-base/gnome-flashback/Manifest
+++ b/gnome-base/gnome-flashback/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-flashback-3.32.0.tar.xz 708624 BLAKE2B 5075daa59b48d9c101a4649ebd89822f4fd4539c30899b152c54d4bb98d48e2174c2c8756f350a76e7576d2430c8609a5c3df7a39f9da80467eb98b9d8b65910 SHA512 ffc89eadf98e269a9d2781d2bac2d551410f3965ab2bf0a60cb904cd1edbaa264d21be1c577381bda1a55f44b919e62ad2735241dc824a901ded6b057d0f2ea0
+DIST gnome-flashback-3.34.2.tar.xz 727812 BLAKE2B dd5fd4ff9f612d464f750343c17f0216366dfc6b9c7d892724e3b78ebf96b492a6192e32edb6c5f7c92c997a1d3325fea2b7e06874a3f03f1e5ea0965c63eba8 SHA512 9c2cfdcd0f896b56c6aff529c372b697fdd52db2660ba658aaef5ff7110a71b756ec708eebd260718ddd1c77df858bd00100070a1a32e282808bac519abb867d
 EBUILD gnome-flashback-3.32.0.ebuild 1154 BLAKE2B 342f3b987b6f3e810b236cd457acd005082590898420917c405b8f8ac1705444c1446d98187e7ab58e19126e9f8c07f5bc5edc8bce430ed801d54100f3e9042b SHA512 8b5a880e4d7a7ae053f9dd3756a84186ca5653851a5430c89abcd4178e529b8059f6a410dcdca37196c5607e5b89ec740ed66c81156b85b550b64e48cc8d11a6
+EBUILD gnome-flashback-3.34.2.ebuild 1203 BLAKE2B 0e8fbf5c86770c4de7ec38a9d3a30115674410e26dfe8132b6c51eea3f64a2e4faeeaf34e268e45cc5a33876d8fb8a5f42810dc64a672a928914cb8bcb149026 SHA512 df60e2bfc5120ff7166bddc36485a9bace1b2a99b6de02df37f88d01482113ae74c26883b7da89e55f1b11ae081fddf9476e8630f53445970ecb05705bb9365a
 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
new file mode 100644
index 000000000000..88af27a5a768
--- /dev/null
+++ b/gnome-base/gnome-flashback/gnome-flashback-3.34.2.ebuild
@@ -0,0 +1,54 @@
+# 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=
+	>=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-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index aaf45bfba402..ccdc523d25cc 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -3,5 +3,7 @@ AUX 3.31.91-race-fix1.patch 1503 BLAKE2B cd90c630835f5e5c85ec6fc432ea10cc17aeec6
 AUX 3.31.91-race-fix2.patch 3510 BLAKE2B 706a88941bb9beb46209e45cbfbf72e4f8b7a5fb0abaffe55b213dd7d86584d03c50bf317fd5e266e540a9fcf454c44468ab4c03808e15702a301ba9388083e0 SHA512 8e90901cfae13793972eb4be903995ff11bde6d78a0c72db4ecde0dcf76b44496d398cd14c60f689d7720d0356abd85b4ccc523a5b57cede3e97cba394d223d8
 AUX 3.31.91-ssh-tests-fix.patch 3854 BLAKE2B 2cf3f6fc133960f0b4e7d07b0358a3075dd8289b1960164f613ec6aef4d6807302a7424fd770b2f399add63a1d1a32539264ee8625f271f00f557c17c09626fb SHA512 29b50f3530c29b158d65dadfdbac8a45fdf06e22b0f6e8de0596aca78e4e410ca99cadf0aeb7a6b23b6d7c1df1e40ae179fe380c5a3a9d89f7425a222d1ca444
 DIST gnome-keyring-3.31.91.tar.xz 1365052 BLAKE2B fed6ac7bb5a509e268180d047cd5df1564d5a90672f5240fa98773f43d9ca7eb63c598d81c4a9de8e988ee5886679bceeb4be1c43acce876680aeb3df4385856 SHA512 c66ad13fd84764f01e75de2d6142ecb42954d6111f86738c27e7b5b94e702be2af5af7f83ba4e4b9aae58cfa04f3973e272c8177179d1f8a54f63c037aea0210
-EBUILD gnome-keyring-3.31.91-r1.ebuild 2386 BLAKE2B b0918e68e9cc45d7286b4bda2ebe07f593259829b5f35cf2a570d7c7265dc03d32d167637ad83294bb0e416eed37e95c295971b28efb7dd00febcd15becc6cee SHA512 f472747aa7f226e8e5c318734f529cda8035a96396383d3a2bec78669c0b718a95cd6f7020efa689b7f48b0efabf4005bd956f124b595cb6f98e77dbfefeee9c
+DIST gnome-keyring-3.34.0.tar.xz 1333768 BLAKE2B 0237eb7ac0b7146d096c58cac4c788a92680f1a6dd321949f295935bde206263e5ee1762c9d393dfbc10322d018e835333c823d11e8af5dc01434555886626dd SHA512 09f84bdf5ea415a55baf6a57dba2889cdf592005d273335029107ea3f83152447b3263cd190810930aae41af22dd508e765e649da3c8a9afa127db1d298bb72a
+EBUILD gnome-keyring-3.31.91-r1.ebuild 2383 BLAKE2B f2ddee230bedd954e6a10cadc22a385de8997f0f5d06083fce839587b315fd22192431dc9d0615d91b0a489bcd1f0ec59ffd5ddf0bbae5d149f6af3b3ca8b7bf SHA512 bfd026302224beba75a9147d9ecf2024ea7c6d59247e9719f936d0c86381b70775a1380cf3dc6b65844d6e440d32473cc6d553742b8cb0596e7a8ca632dcc46d
+EBUILD gnome-keyring-3.34.0.ebuild 2162 BLAKE2B 0d2e6f13aa3da3e8be1216ff94a8b755e733e41012076994d7c4e93f2d848c9eab15bf8e0d20b00119d302bbb11fc0e57086e7b24059531447c19888a57e2e5e SHA512 b6451f6d8890cf877f7ab6bcef31b04400d5f40b58a15fc763c73b315b8e52bbc4d101347fc40f68fe18149b7cb79e0a189a7b79e9d148a1d81eae53475d84d1
 MISC metadata.xml 883 BLAKE2B 6d253b088319b1f442d91e0372751ce3ddd0516bbd3e72242e4541837c6c6bfe83371a5c47a7be73fad6046be5f053aa6c6fb41d884111ac53cd4de3cb0d1381 SHA512 31d506051c1353e1e4dd987e5ccd39281d19f6ae08974a09bd8145218c7209588629a79c6baad9ff1b83358a699f46fddb8c4ec51da73efe26be2d5e7f0a905a
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild
index 707441b984ac..32f17ef73c92 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.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 ~sh 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-keyring/gnome-keyring-3.34.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.34.0.ebuild
new file mode 100644
index 000000000000..6cc05b7b3b51
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.34.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+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-light/Manifest b/gnome-base/gnome-light/Manifest
index 45215478bb82..8ae1d76e6bbb 100644
--- a/gnome-base/gnome-light/Manifest
+++ b/gnome-base/gnome-light/Manifest
@@ -1,5 +1,5 @@
-EBUILD gnome-light-3.22.0.ebuild 1762 BLAKE2B 7aece5726a0453567f9a0191f42fbe888cb567aad79b5066d19e3fc5f190d451f926cd1298868d137b996fde0111c30c6214ec52c72da04c20a0a889586d8a3c SHA512 6d835eee81128178793ce60d96687f0cf7a5d7e2c6d8329a7df0d1bc54f1fd1fd746a3151c8e1510b66598488a35647c65c01dc06cdc14ff6ae3cad864dec3b5
-EBUILD gnome-light-3.26.2.ebuild 1692 BLAKE2B 559111105e792c0f3af9dc66ba6ed8560845e9d8c4dd41af29b39fea2f38c3dd5b0f6552f46ecc9ca6f6c8b0262ecea07620101b2a7bd0426a5de9679244445f SHA512 f9bb9fc468fe5c73a508286c69468888897d449958bc06cd8e4a46730a362cc5f738d7212c0fa7ea9e81aadfef245b71271eba0587119809068876d217bb3e16
+EBUILD gnome-light-3.26.2.ebuild 1699 BLAKE2B 5524fb6b994de1d5fe9421b8a455f846723c04a84894ef7308b976190917579c0726da8863ad616e678297bde6a86dc5291c4475a6605b008eb7dc74d88bab94 SHA512 0a5dfecdcbe0012580f2f892b688d697e64a6371814999da87f11c7a3ad089232bf5f5af78b8f8b901de1a0fafe12cb51f8f70ab6de35ddf7caab47d7dbb5289
 EBUILD gnome-light-3.30.2.ebuild 1805 BLAKE2B 4c1838ffb4e0d820328d74699fd38bdd63341d29df9f2d163aa268dec57c6027a518a1a79e1e5e29440b15e2eb90b6f1a325039b60a3f330e7a5a085c08c4bea SHA512 d02216e925d09e40bb04d9eb3007a3d64377e0496aec4ecaea3f0e2d768f2170705a79058b7ec2286034ca46113a22919ed41acc158e39f5d8428c0ee4f407cd
 EBUILD gnome-light-3.32.2.ebuild 1807 BLAKE2B 7dc337abb97898a74c633c0abd0031a8531650533ff1b3f726bddf4b7edae168025f74f7b165bced43929664b25d31161b160dec183ec5b34eb892c0cd391c7f SHA512 afafedc5973de843d62e0b4421a60d2b2cedf4c9984968ce1fbcfde5b8a202cafbcf027bad199458e49bbdb0debb9c59a0341f9fb2ea160debbf5d453ad77546
+EBUILD gnome-light-3.34.4.ebuild 2051 BLAKE2B 0436692ab8975a9ea8a7a1305f6af16afe2d64beb37086806c6d89e7989820482544bf32d87b08fbf023978b1b71ddddb2627469c1567bca252958235fa8c551 SHA512 c22b2ab33d0460c23a10d2231093eacabc7578984a6cf6122e4cd18b0a430fdd9f8cf7e7f5b3788e93d9152419a26ecad1a18927bcb44e9960748f41d56e4d48
 MISC metadata.xml 406 BLAKE2B 562a281deb064ec0aa74ffebe4e38c864746809724acc4522df8c9cc0590d80937836923a029e521c5a0eec83adda11f169fa554e9760128408b78e87d916f26 SHA512 04875558c048cf102d8e5ffb17cb363808ca84c350f9b03958536cc5185cfd109b4653bbb4de202f47d092f8fc6d15173d3453a3bc62aa431b0c83cbb699a047
diff --git a/gnome-base/gnome-light/gnome-light-3.26.2.ebuild b/gnome-base/gnome-light/gnome-light-3.26.2.ebuild
index 6bc63a15e87b..a76055ff37ca 100644
--- a/gnome-base/gnome-light/gnome-light-3.26.2.ebuild
+++ b/gnome-base/gnome-light/gnome-light-3.26.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ IUSE="cups +gnome-shell"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 
 # XXX: Note to developers:
 # This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
diff --git a/gnome-base/gnome-light/gnome-light-3.22.0.ebuild b/gnome-base/gnome-light/gnome-light-3.34.4.ebuild
index ad70f051b6c9..ccfad03686ee 100644
--- a/gnome-base/gnome-light/gnome-light-3.22.0.ebuild
+++ b/gnome-base/gnome-light/gnome-light-3.34.4.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit versionator
-
-P_RELEASE="$(get_version_components 2)"
+P_RELEASE="$(ver_cut 1-2)"
 
 DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
 HOMEPAGE="https://www.gnome.org/"
@@ -15,40 +13,46 @@ IUSE="cups +gnome-shell"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 # XXX: Note to developers:
 # This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
 # the bare minimum of libs/apps needed. It is basically gnome-base/gnome without
 # any apps, but shouldn't be used by users unless they know what they are doing.
-RDEPEND="!gnome-base/gnome
+# cantarell minimum version is ensured here as gnome-shell depends on it.
+RDEPEND="
 	>=gnome-base/gnome-core-libs-${PV}[cups?]
 
-	>=gnome-base/gnome-session-${PV}
-	>=gnome-base/gnome-menus-3.10.1:3
-	>=gnome-base/gnome-settings-daemon-${PV}[cups?]
+	>=gnome-base/gnome-session-3.34.2
+	>=gnome-base/gnome-settings-daemon-3.34.2[cups?]
 	>=gnome-base/gnome-control-center-${PV}[cups?]
 
-	>=gnome-base/nautilus-3.20.0
+	>=gnome-base/nautilus-3.34.2
 
 	gnome-shell? (
 		>=x11-wm/mutter-${PV}
-		>=gnome-base/gnome-shell-${PV} )
+		>=dev-libs/gjs-1.58.5
+		>=gnome-base/gnome-shell-${PV}
+		>=media-fonts/cantarell-0.111 )
 
-	>=x11-themes/adwaita-icon-theme-${P_RELEASE}
-	>=x11-themes/gnome-themes-standard-${PV}
+	>=x11-themes/adwaita-icon-theme-3.32.0
+	>=x11-themes/gnome-themes-standard-3.28
 	>=x11-themes/gnome-backgrounds-${P_RELEASE}
 
-	>=x11-terms/gnome-terminal-${PV}
+	>=x11-terms/gnome-terminal-3.34.2
 "
+# adwaita-icon-theme kept back on purpose due to brokenness without rust librsvg,
+# in the hope that the old icon package version is good enough for everything too
+# until librsvg gets updated. This dep should be raised to 3.34 with 3.34.5 meta.
 DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.28.0"
+PDEPEND=">=gnome-base/gvfs-1.42.2"
+BDEPEND=""
 S="${WORKDIR}"
 
 pkg_pretend() {
 	if ! use gnome-shell; then
-		# Users probably want to use e16, sawfish, etc
-		ewarn "You're installing neither GNOME Shell"
+		# Users probably want to use gnome-flashback, e16, sawfish, etc
+		ewarn "You're not installing GNOME Shell"
 		ewarn "You will have to install and manage a window manager by yourself"
 	fi
 }
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index 6d27ed65aadd..a6a4252d1a96 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-menus-3.32.0.tar.xz 499680 BLAKE2B ee43c2be29f6d3f5eaf5369c3b3809fc2728564321853a6dd23df1d81138868f9be2f57d0bcd0eb69a509e224f77dc357a8c71afe569bfb1bbdb13ce3b80636f SHA512 8a429e092b1e4a1a794473d7cae611684321e797792e1063911ddcbb496140033838b348bc209b4c0566a13233cfa1144cae7a188a483abf34c5af6feb44a884
-EBUILD gnome-menus-3.32.0.ebuild 918 BLAKE2B 5f2562536257a3f8eb6c082dcdcf75b753539ac8e108414e7ef50b309371c0016100a47d680b9cfe535b91222144874b52ff10b4334856ff71c9303b3e19826e SHA512 65af5c1750b21b3bc4ff144f1e4d519b24ec2b609fd32967bd2d61880555c08b318856774743ac0648527a2323b00ff2f4c8d1dd8922e80ac1396011535a877f
+EBUILD gnome-menus-3.32.0.ebuild 914 BLAKE2B 99e48b0fd083fe6ae66e88a13065fed889595c08aedcbb3282e7c7cc4d4ae038186381755f17152e5e6389b8b12eac925274ba15aa5f0bb2c4379e87d6def0d5 SHA512 7b4e35a489dd31878e00c57b74eff5cc27ac62aed511c1b700b3a57e22730d5b5efaf91c06e1a7e74799c6c9f365a8e28cb0b298179f636a113851119418317b
 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
index 802b3eff00cf..133815f866ba 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.32.0.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.32.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 ~sh ~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-mime-data/Manifest b/gnome-base/gnome-mime-data/Manifest
index 561defc4e9ee..65d2c680f564 100644
--- a/gnome-base/gnome-mime-data/Manifest
+++ b/gnome-base/gnome-mime-data/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-mime-data-2.18.0.tar.bz2 607012 BLAKE2B 6653e11f04f94035e7bf7d12413870b6e425bb32c50cd0776fae93be05eaea6eb4116f8d068e86c39fca9a3f86148934357d5a1c538a7deaae117151b8f1e466 SHA512 132996786254799341eeaa7894749cf4a95e391e31d985b1527b2f3dfeeeb01e7cc000753fc21d559db07fcc92018f4839f170eb149cb457fe06058ad3d986d5
-EBUILD gnome-mime-data-2.18.0.ebuild 594 BLAKE2B aacadc9081f5cb7a41e0e065055d7d71a0c583dfbc0093a6d6c7badf379363e7ac15c6b4a284838f8416be1da757455334192eb56a13e8fd76ed027667aa8f83 SHA512 d0423e8d86cb566a1f5b413ed8dc67d7612b9f2d1f49c36b3f3db65d74060b0f5b4476034d13141d01965ef37e6b77891106dedbaa0f44215f1882022322d18f
+EBUILD gnome-mime-data-2.18.0.ebuild 592 BLAKE2B 3a7ac6ad601f9e24bf33292eec74512c5189d70bbeaae8da6da44b680a01fbe0abe82b6e26bd799c02f030be9182364bc7c5ff5aca1fb6375407858a49694e7c SHA512 905e47b4006a8ce41fe993234afbe665e201b461bf03caf7b6a5c8a566d9509e70a704cba87943fd0691b84714cbb666248783ab02641b234e55a3b2deaca8f1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild b/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild
index eac655533fd1..756fee3d0937 100644
--- a/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild
+++ b/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 04dbfbca9b7d..8628a5001196 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-panel-3.32.0.tar.xz 3073664 BLAKE2B 90960646bb6a7d455e295203b0ae9af8fb2313d3f69c54907f5b975bcf2102667aac693c0e32912538015a48d784bfad45335df6df060dcebfeb04486955d850 SHA512 afbb5d61d024250bc6532ddcb2817067bb4e5f243a0d0f27efcaa9b1c2da8ab6c98e014e3a852ccb93d64aba8da51254d0e811f5eecc927cfc18c72e7c324e42
-EBUILD gnome-panel-3.32.0.ebuild 2021 BLAKE2B a5eb1850aa10715f7ab17d508586721a11f94ed56fab1c02b888dd87da8626f57fd4d7eb63870abdf2332f19a30d29576190b48cc232932252a088c606371200 SHA512 4e6b8fdd0e01c9f24d374b4b6231d94dba91fda074541540f0e859dd6b7a9b9b3034ade391942ac1c88b966f09ccd5ce3f75103d7374030f680224798bf5e151
+DIST gnome-panel-3.34.1.tar.xz 3072196 BLAKE2B 23fdfc0b78e13169ec6af92ee386ae3997536199c6f13406523e2deb6b696b90828ce614fc06115a83fdb6ec76fc14e0518f4eb839eabfbf29507d6fd4b2ab3d SHA512 6d43285cda00b2e9415cf11f47a51a00941ed294edefb411f7b40003ece814ac08da9d2ccfb167a0a91c7abb9eb17a7f70970ac4eb585ce665cca5fcfbddcf03
+EBUILD gnome-panel-3.32.0.ebuild 2064 BLAKE2B 6f9e3eac811eb03904bc4cff28dd78de3ac4111174eb2dbdfbdc387a704cc684df3a1934780e5b2c56c3c14c9fcf02b05c74021e7fc6122c4ee9b3aa92f541fc SHA512 a96f4f663e1c6066f35a70de90f9ea0681232bcb3ef2d4d0a314ad1a872d6be8a5a7619d0325f9fc148c99f023763b35a6d48d9cb779353ab685003616c3ec5e
+EBUILD gnome-panel-3.34.1.ebuild 2039 BLAKE2B 5bf63597da3c5e9f14bcfc399527c8f4b7a920f8aa5334cab00e9c893685bf152a6a47d5b4342181f7d695b9caec35d209da9a48cb0027e0f93013a49bcfab3f SHA512 a317f14f4559c6e99a6a691958f6753dd78bfe8a3c42313e678ef9ea51868f548aecde0b398b5491e5b8e320988bc8d30af2994cf9022c3176d65fcbe4231fa0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-panel/gnome-panel-3.32.0.ebuild b/gnome-base/gnome-panel/gnome-panel-3.32.0.ebuild
index 5f1bb00fd17f..565591dd17d6 100644
--- a/gnome-base/gnome-panel/gnome-panel-3.32.0.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-3.32.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,9 @@ RDEPEND="
 	>=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.5.3:= )
+	eds? ( >=gnome-extra/evolution-data-server-3.5.3:=
+		<gnome-extra/evolution-data-server-3.33
+	)
 	elogind? ( >=sys-auth/elogind-230 )
 	systemd? ( >=sys-apps/systemd-230:= )
 	>=x11-libs/cairo-1.0.0[X,glib]
diff --git a/gnome-base/gnome-panel/gnome-panel-3.34.1.ebuild b/gnome-base/gnome-panel/gnome-panel-3.34.1.ebuild
new file mode 100644
index 000000000000..fb34a9ab0034
--- /dev/null
+++ b/gnome-base/gnome-panel/gnome-panel-3.34.1.ebuild
@@ -0,0 +1,72 @@
+# 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 a45320abfec9..ad14bba4fbd2 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -5,5 +5,8 @@ AUX 90-xcursor-theme-gnome 384 BLAKE2B 985ea5b7de4d51b46625c21b803c5d225ac598b81
 AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc52fe128b35eb3f9e8f0bf3884f0c444ab2da88eb6ba12d9a852e8a058f4abdcf050dc68c SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6
 AUX defaults.list-r4 18853 BLAKE2B abf7b422bf6e0e7dc04e26416d54018f3fb04ff6b4bfe8aed122e3b918cf840e5b8df8bb68c5ebb5ffed9d95b530581e10c03f7b4454ffe23fd8993253ce2898 SHA512 1d282ab6a139f6e0f0309263ca736dc2eeca0490f25a740583a24cd4f84a21531aaa0bd916d0809844e928029a434acdb3922305ce1253241ff62938c13c4eae
 DIST gnome-session-3.32.0.tar.xz 485916 BLAKE2B f9c36fbc56adb5c18b674be31ebfc0236f4a0e125d82fb1ddf8277d599eada2b57bbb06d9e538dc3b101d942472628fe80e10f57be1cbf326ff7acc24cd445f2 SHA512 53d5f84ba8ddbac5cfe0e4e3115c76008a3571779cad62a5fe064a409a507497a9ab93a46d6ba7ee4238ac0efb2f2c1379647855ac8058a945350c88400daf34
+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
 EBUILD gnome-session-3.32.0.ebuild 3875 BLAKE2B b354a2541dbcd4d888688f0a32273e897e3aa76e0285a40b91c26b741388ed857078c66bdb85fa6bc2c964d846f02db4810545a0987a2ec1714cc49beb964d25 SHA512 70a125ca433deb7af966136c792cec3e0b72bb18a9138fcf5867d41a1a42ba6881803495e22ae9674c8a2769f73496be4232faa32a2c3bf983ae98608427ec2b
+EBUILD gnome-session-3.34.2.ebuild 3994 BLAKE2B 709eeba255715fc3c39d5024284ba740dcd72af3a57732b952eb14006d7a3e55fa647a87db6d51c50a0c5fac08aab6185290231d534a89983c61b11d650f04e1 SHA512 89bf43485b86983818ad3a39b9618980093720288ad01656d8bea831408e329701237d35bde42434054c8a1ccf8316de38c1d4fc7b0c488d6d3001539aeb3880
 MISC metadata.xml 440 BLAKE2B 83fb0d37323db0c6105b3c231b6ecb7c4344bcd40577f23581af437fb4c4c330a77d2b8b19c9c69a5b586fd4638e55a9153014c32214547bf2437da7c3a161e6 SHA512 93f57253eccec50c77ad84960af623482bb34ad7d1f00463b29ccb54c3f034b95aa1a489acbf5075aa97e37e9303c2973e126cb201c15b2785416d882810378b
diff --git a/gnome-base/gnome-session/gnome-session-3.34.2.ebuild b/gnome-base/gnome-session/gnome-session-3.34.2.ebuild
new file mode 100644
index 000000000000..b977b8be0ba3
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.34.2.ebuild
@@ -0,0 +1,131 @@
+# 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-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index a1d0d8fab514..fbc4af5f20d7 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -2,6 +2,9 @@ AUX 3.32.1-fix-wacom-no-wayland.patch 811 BLAKE2B c817a6080438468d72c3633b878ba8
 AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb15e998de9f5fddc956dab862552ecc3734083391f124ef577dd2efb70e29efd230511cca83536dcd8c32118ecebcfe52b2927d6f0094540ec73a6ae23 SHA512 9c4b1e1b63b1a6d97eed962969704accca2fc53763a4b7806e2a3e4ff49ecc7d4a0d7f8253ff2e33d83e766908d852721ffa33f363aed7d04c20002bfdee173b
 DIST gnome-settings-daemon-3.32.1-patchset.tar.xz 9840 BLAKE2B 0b0249b6335fc64c111cfd4c221b408460105bd544527ca29a32b2ceb82d39c1ca8c9813916cde9afdac1cf146c1286ed937dadb07eb0263b5ab3ada2a95e0aa SHA512 175f4d0200b88b696b73fc7e7b10065b3e6f046e48955408cc438499fdc6464483420b4801dbb77b5ae819cb52a131e2594a628b9731eaa167b802b5b2cbe855
 DIST gnome-settings-daemon-3.32.1.tar.xz 1372968 BLAKE2B ba0596d9f2019f2ecff32b70c03d962dd7966c282d1fb0ea94c38fc895b7ef788d9dd179a037b74a319ca520811e985465578a725bf14d1eff92846f188445ea SHA512 8d6aca1041cbd50d7dda67dc711269a51c4a5148d55dc63969f47c21bf309126f5d5cb13c1e6fa9e6498fbb30dc70fa7a049fead7d32c6a20d550da0ce8828c3
+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
 EBUILD gnome-settings-daemon-3.32.1-r1.ebuild 4018 BLAKE2B 10afa9b5cb92b5fdef7d72741af5e64ca5e7e7a68d6d07a0b0524e4cbaca22421b45cf55d130df5c460167a4310a70160396e674eb8d7685f2438f229d2993bf SHA512 4ee4cd2f31279d371fc0b164338c56f5f979947250964c15ad5d1a369f9d8b0adfe849305a7675b612eb42d179aa950b754cc23221d8fb586acbaabfc43e4738
 EBUILD gnome-settings-daemon-3.32.1.ebuild 3834 BLAKE2B ac651b86c70636b0e182ec7d611e89e3f7e264ebac267f9027b3e14ca1781318cc584177b7b21ae8028f9198837974ba78ca25ef3202f834032af089646508a0 SHA512 620470bff1ddfa0360d7e7111e69583c32fa6e3d28ed7cfc5306d2aed99cf6fc7bb5be8da57a2d248878413e2a25dd7af6d6294ac028392105bb1c574c4a7e70
-MISC metadata.xml 454 BLAKE2B 271588e1f1a6a9799ba121f1da6f69ea1b5ba4c006f11c3a997833eac097143ba19bfe445759f17b7269414892af5efeb04eaaa752c0c330e1238c66004f30ed SHA512 ada9cf6a61a63bd96807bd1c4840a19ed2e59b7889d54af7796ec07af6b8250ce03953d907545c92aa75c59d2bee3ecb4120c571f1830a5c2b06e4ebf7005eee
+EBUILD gnome-settings-daemon-3.34.2.ebuild 3949 BLAKE2B b34e7d43dfe53b4a440332b390272758fd0f8428444b53b3adf81bcaf37074c3df6bed9e5a1e832f2a919dc541253131c4b2ea6d539657c96497f300028446e6 SHA512 e56f340b6713bc2258ba258f460fea1208c3b6982226ffcc0fe2cbdc3c61a2269314a1904fd2d7706ab07fc63c218b76695c389920dec0edb9cd6e3cecd60507
+MISC metadata.xml 546 BLAKE2B 8b82608d88d30a327a48d46992c0c19cefd594682191bfe4649a0e090ff13c0a9b88adf4c4aa4b42f9393c21153130afbf2d5090d774b348cff3003b41e3cef3 SHA512 c1a8e1a648564c52fb00d68a67bcfea6b2f6369186ede54a7278f258ef9f6b0cc6f399fa5f9c8ee7846d97a6163729c8da970a0f2e93e23bfa2f84ebf2466cba
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.34.2.ebuild
new file mode 100644
index 000000000000..8a714c6cdb70
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.34.2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+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"
+IUSE="+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test +udev wayland"
+REQUIRED_USE="
+	^^ ( elogind systemd )
+	input_devices_wacom? ( udev )
+	wayland? ( udev )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+DEPEND="
+	>=sci-geosciences/geocode-glib-3.10
+	>=dev-libs/glib-2.56:2
+	>=gnome-base/gnome-desktop-3.34.2:3=
+	>=gnome-base/gsettings-desktop-schemas-3.33.0
+	>=x11-libs/gtk+-3.15.3:3[X,wayland?]
+	>=dev-libs/libgweather-3.9.5:2=
+	colord? (
+		>=x11-misc/colord-1.3.5:=
+		>=media-libs/lcms-2.2:2 )
+	media-libs/libcanberra[gtk3]
+	>=app-misc/geoclue-2.3.1:2.0
+	>=x11-libs/libnotify-0.7.3
+	>=media-sound/pulseaudio-2[glib]
+	>=sys-auth/polkit-0.114
+	>=sys-power/upower-0.99.8:=
+	x11-libs/libX11
+	udev? ( dev-libs/libgudev:= )
+	wayland? ( dev-libs/wayland )
+	input_devices_wacom? ( >=dev-libs/libwacom-0.7
+		>=x11-libs/pango-1.20.0
+		x11-libs/gdk-pixbuf:2 )
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	modemmanager? ( >=app-crypt/gcr-3.7.5:=
+		>=net-misc/modemmanager-1.0:= )
+	networkmanager? ( >=net-misc/networkmanager-1.0 )
+	media-libs/alsa-lib
+	x11-libs/libXi
+	x11-libs/libXext
+	media-libs/fontconfig
+	systemd? ( sys-apps/systemd
+		sys-apps/dbus[user-session] )
+"
+# logind needed for power and session management, bug #464944
+# gnome-session-3.33.90/gdm-3.33.90/gnome-shell-extensions-3.34.1/gnome-flashback-3.33.1 adapt to Clipboard and Mouse component removals (moved to mutter)
+RDEPEND="${DEPEND}
+	gnome-base/dconf
+	elogind? ( sys-auth/elogind )
+	!<gnome-base/gnome-session-3.33.90
+	!<gnome-base/gdm-3.33.90
+	!<gnome-extra/gnome-shell-extensions-3.34.1
+	!<gnome-base/gnome-flashback-3.33.1
+"
+# rfkill requires linux/rfkill.h (and USE=udev), thus linux-headers dep, not os-headers. If this package wants to work on other kernels, we need to make rfkill conditional instead
+BDEPEND="
+	sys-kernel/linux-headers
+	dev-util/glib-utils
+	dev-util/gdbus-codegen
+	x11-base/xorg-proto
+	${PYTHON_DEPS}
+	test? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		$(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]')
+		gnome-base/gnome-session )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# 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
+)
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		#-Dnssdb_dir # TODO: Is the default /etc/pki/nssdb path correct for our nss?
+		-Dudev_dir="$(get_udevdir)"
+		$(meson_use systemd)
+		-Dalsa=true
+		$(meson_use udev gudev)
+		$(meson_use colord)
+		$(meson_use cups)
+		$(meson_use networkmanager network_manager)
+		$(meson_use udev rfkill)
+		$(meson_use smartcard)
+		$(meson_use input_devices_wacom wacom)
+		$(meson_use wayland)
+		$(meson_use modemmanager wwan)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	# Don't auto-suspend by default on AC power
+	insinto /usr/share/glib-2.0/schemas
+	doins "${FILESDIR}"/org.gnome.settings-daemon.plugins.power.gschema.override
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml
index b5c446621532..56e10206e072 100644
--- a/gnome-base/gnome-settings-daemon/metadata.xml
+++ b/gnome-base/gnome-settings-daemon/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as runtime logind provider</flag>
+		<flag name="modemmanager">Enable WWAN support via <pkg>net-misc/modemmanager</pkg></flag>
 		<flag name="systemd">Rely on <pkg>sys-apps/systemd</pkg> as runtime logind provider</flag>
 	</use>
 </pkgmetadata>
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 24319e7c66e5..ddd5a7075adc 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,11 +1,19 @@
 AUX 3.26-optional-bluetooth.patch 2406 BLAKE2B b747c9d5cdbefbec8c045e24502bcb57b45b14151264cbad31e9ce96ff8320ed140c327e10fb72878da8638af93f63871d523176b18979756937ff5219eb52c6 SHA512 d1f4ce36c705be4669b336f736172f29b4b8f373b146fff4a27bb84cfdde3ec989253b92cb0eaa881e98d7f3267db4954ea9413b75c01c65bcc6e54ce32c14c7
 AUX 3.28.3-defaults.patch 1385 BLAKE2B d7e0495aadec7fa042086b5219cc34906f9333a446484e63d90932551d09f469e66cc5da43040a2bf955ecdb3d2beca0e1dba435dd7c309bbc78a1b7aba7f43b SHA512 190a9a61b164373e1f2528b96eca0312a7884651ee44212f686e5752430197b2644b67550dc41ed10684cccd0e8a0d870cfdeddf8582d57de637f7dad11d0124
 AUX 3.32-optional-bluetooth.patch 1935 BLAKE2B b1f21039e4567a82c83d3a8886703e0094e63be1a1a9af61f6ba28a4db106a2ebf8ea93dd89212fc68e9b20d9979724997d10272ba49de7c7760d1b22788f45d SHA512 edb3d948b67c3210b5e1cd4065a41552e64d63da3c43d52b397c925321445fe67cb23e4f58ab8a7168f5d47fc543da6bf8dc5772e6d3c7f3320e8637397830c3
+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 gnome-shell-3.22.0-defaults.patch 1228 BLAKE2B 9bb49d830c2bbc36123ca8fdddc02d4b750a5ffd174fa653ead26a75dc9478be4b5a39c31a004a3897655aae097c23f511d6bb494b0aede51fea74294be3fcf6 SHA512 f350324af68de8f7ae9dab609fdb81e272f9d545a125f3da85d9f06e4a0de09f857517d6c7a585ff1ea3b56f4d51b049cbeb62c39472d61d45026331104c5af5
 DIST gnome-shell-3.26.2-patchset.tar.xz 55492 BLAKE2B 745b8549f7480b004f4df9b81508c94c9224f77a5a503f45dfda20105e9c305f8cae6ae5e420e597cea9f98899933bb19efd8cf0e9811dc35d0844a3c2920143 SHA512 93a730082e84807c23f4b7e390c2d0fb02d3666fc32241de02b3534cc271b160bd9a6a6a2e908ed5bdde91cef383c1e400b0f7cbf04ac104f7f9758218e635ed
 DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B ccbb8ad374931335fdc6e752a7feedcba4fe2b61112404b62bc9711b1736216d46fd6e85c6f06439cae50af86a174359d7df0e111e8db6ffed567e91b4292b14 SHA512 0e13bc7abff2367d24ea748cd69a1879ff14a6755ef27d17cf20cef61bc6d15bf6e9d18362142a2d6462689f64eada833f9bba21ebaac3a33765a5be0ae48d3a
 DIST gnome-shell-3.32.2-patchset.tar.xz 23540 BLAKE2B 363989a630faa7538ccbf9765a1ccc5995fb4584b00a603ef11e48fee970a6d9791ed1fa92e2344e56cd8c282c9a22779cb8e50e7ec6637e0efda1ccc36579a4 SHA512 e854ba9fd864101009528d94cb310be10495db225380c353b76cd61b082a88f1f89035a0708cd386d1738001cf9949b4a8b8b8d7b1d2675068e01fecb35738c7
 DIST gnome-shell-3.32.2.tar.xz 1454372 BLAKE2B 9da7e17d4e47e187fa2285c6cf942cc8dc955e388179d2ad1fe8036c2908e217fc47d8b1515fc3cf6973e2083de8c350b55912782b9adbcf1b6cc37c7a3a9ae2 SHA512 7d8b25aa75149f096033a8b44d7f6f8d17ddadfcd8f5bb1915652423fe9d9db14902e674508f16fe5c6e7cbe956cde8349ec779c24c46f32b0a346755876bc46
-EBUILD gnome-shell-3.26.2-r4.ebuild 6651 BLAKE2B 5054b063b21e7387efed3f78e25fbfe915f09fbe87827a1f840974ee6ad7b7f448d074a44dd5179f5fd8d6fbd90c5190b74369ba1ea2ba9d70b5da65a20fa29a SHA512 d096f22f0160c1757641bbeb11fd6bc1a0c2c6a06d97a943cab77472d0b60c8eed94c081e04c91ecc0f5d590cbadc9e5bcdc656e002215e51534b4cb7fa913a2
-EBUILD gnome-shell-3.32.2-r1.ebuild 6391 BLAKE2B 48f857ad425a2a651f0ab0191cc629a1e203a44be154d01d2d29f7af3d88fbb35488287cb3936282aab3a27eaa6b4dce3df5253da7b7375b6e88cbb8f3b831c6 SHA512 6dbbf3fb482f5a7511368338991c5caff2180d33b1dc0e3edd0c13488c61baa280c21c1324da236dfe62a2374482c56d140d0f5531d97e593d88c839a3b985ab
+DIST gnome-shell-3.34.4-patchset.tar.xz 3284 BLAKE2B c161f4422c8964b61ec0d5bc3267c1c9c69e632767ab5f0fde232c6055e34d1f1c8e4d1f92e3a636f67d08452061512ebc9cfec003a9e4e250f7f213203df0a1 SHA512 d8147d59a379eea5d90c441dd4ed8599243477e6325a579c5c10e825d68c21bf92b95c6f1b414d66bea8c2a7c3b181cf848fb6a79f9f06c713471c75543bae55
+DIST gnome-shell-3.34.4.tar.xz 1545568 BLAKE2B a197235ece72e047d2c22b38aa20a4935c78d88b88fc66f881e788ee3659d89318632d2bbb2fc61448d13633d2a3c0b63e9ce5d1f8060aa5f4d63c2a986fce79 SHA512 17832780bcd91f9aedfd642881f4b17f52fe6844e7cc144a6ecac4e3e13ff889779ef24cf52e7f58e61bffc3fa3a3ef75d23c92ed3833ad42d00c49382284b89
+DIST gnome-shell-3.34.5.tar.xz 1558672 BLAKE2B 7b786a35b6b79a4532d9bbb761ee0629cfb18b8c4c151f5958bb9169cae01ddb489a31c9d1a0cfef3ab6dd1f29c449600c1ad9bb11adbae284e86035bec15234 SHA512 ef6a70b0b3bb14fedb07c465742fe0d78c96ddd24352fd0babf871336ee404f9823cadea5bd522e388f5b714d33b219c8ff2badaed379b7135dd90de9fca9bc4
+EBUILD gnome-shell-3.26.2-r4.ebuild 6692 BLAKE2B 9b0be8f340798f888824b383c71366c2b8bb5833c3939b84363ca619fd927bf050a5cd59e20193968e9c814cd0d5246d6efcbc352564aa69401615e1bbf9b272 SHA512 a63be996a4a9c19e7f5102db12571aa140a4207bacbab4a8a41ce5a48c7d35b3445e35f997e29e1818a202915bf83a25fd520c50ceac92a4001aedde561df94e
+EBUILD gnome-shell-3.32.2-r1.ebuild 6432 BLAKE2B 74c9100e4a0510abcf624c842bcc70000e8db328671d82898358deb72da65c2288fbb11cd93302500369ee780e881b6a8f76c63ecac01becb879bed6201eb549 SHA512 06baea1dbddb7042aad9ea1f450f6459f701e27fbb8a0ca52b56f49ebf32192ad8ecf8003ffc1be52c148717efe0be36dd6248c932130b7365e2420437b39f7d
+EBUILD gnome-shell-3.34.4-r1.ebuild 6876 BLAKE2B 6f17b63536b6764f6876dc5b9e7ad860f834a9e687dabf4df0c5d65665c070306eaee6d194310cd7f1535e739316924710aeefa09af9dbbe4c4174ce850c06d5 SHA512 f5c48f39930b3e6923dec1b0fe2e377a811d7c788a3282b7438cb5af710aeb33e8e4388068c98f1b99a7c901606a792e11dee0c869414c47d345fabe70f0b21a
+EBUILD gnome-shell-3.34.4.ebuild 6579 BLAKE2B f42cd00dde0fb55a2f92d3e2d444baca2d57e8337949f6194c481de0c6ca3ae69be07ef7baf0a3190e88df1618dc7af436fea8ce69157750bf1d8710263e40c2 SHA512 1fee74eb5aa775270584057e8fe70e64260d002f9505a37ed2e37e04f2cca171b9c6d8720c05771a56cc815e1cf24705f962bbff42de578572ac39776c6ca173
+EBUILD gnome-shell-3.34.5.ebuild 6731 BLAKE2B edd2d2be8d77aa8406ba29d976823b15edaa7b55c00c0b5c8f57bc862bee23ce2b098454dc1aee45e629bc5cfed2c337a719ce8e4b74c26eba7ad17845c12d7b SHA512 ae39bc3996228662ef973f907b5c18c630bd16fe5143ca3c31de5509fb3022a75cbaecfce30c7d4e95a4f34997a2a7a403f4c03e88b803b657be8c5af8921150
 MISC metadata.xml 1050 BLAKE2B cf97e536a47f3b023e118a818bbc34af63500d2ea94bbc71201d2ce18aa6e473673cb28a47245de24b7bad9a174a6dda6b46c300518521c8ea0662e88e95627d SHA512 50c1d4c3eacb89b77bc49b4f236bba9d9041ef047392d5bda19e85b0c935709a095a388b1625a2c77c66145758e9b4ab77a202aa6cdd2b86f262c5b56e428b06
diff --git a/gnome-base/gnome-shell/files/3.34-optional-bluetooth.patch b/gnome-base/gnome-shell/files/3.34-optional-bluetooth.patch
new file mode 100644
index 000000000000..01e28192d363
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.34-optional-bluetooth.patch
@@ -0,0 +1,59 @@
+From 23b1b1184a3a882febb104652f5ac2e6ffd3fed0 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 28 Feb 2019 00:50:19 +0200
+Subject: [PATCH] build: Make bluetooth support optional
+
+---
+ js/misc/meson.build | 2 +-
+ meson.build         | 7 ++++++-
+ meson_options.txt   | 6 ++++++
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/js/misc/meson.build b/js/misc/meson.build
+index 5a4871762..3c5e02368 100644
+--- a/js/misc/meson.build
++++ b/js/misc/meson.build
+@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
+ jsconf.set('PACKAGE_VERSION', meson.project_version())
+ jsconf.set('GETTEXT_PACKAGE', meson.project_name())
+ jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
+-jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
++jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
+ jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
+ jsconf.set('datadir', datadir)
+ jsconf.set('libexecdir', libexecdir)
+diff --git a/meson.build b/meson.build
+index 97de19758..77646793f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -100,7 +100,12 @@ x11_dep = dependency('x11')
+ schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
+ gnome_desktop_dep = dependency('gnome-desktop-3.0', version: gnome_desktop_req)
+ 
+-bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: false)
++if get_option('bluetooth')
++  bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req)
++  have_bluetooth = true
++else
++  have_bluetooth = false
++endif
+ gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
+ gst_base_dep = dependency('gstreamer-base-1.0', required: false)
+ 
+diff --git a/meson_options.txt b/meson_options.txt
+index 2c5539012..8e8d9eee6 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,9 @@
++option('bluetooth',
++  type: 'boolean',
++  value: true,
++  description: 'Enable bluetooth support'
++)
++
+ option('extensions_tool',
+   type: 'boolean',
+   value: true,
+-- 
+2.20.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
new file mode 100644
index 000000000000..186939b91477
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.34.4-custom_stylesheet_crash.patch
@@ -0,0 +1,524 @@
+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/gnome-shell-3.26.2-r4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild
index 6daa3d58709a..31536117ad67 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild
@@ -24,6 +24,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 COMMON_DEPEND="
 	>=dev-libs/libcroco-0.6.8:0.6
 	>=gnome-extra/evolution-data-server-3.17.2:=
+	<gnome-extra/evolution-data-server-3.33
 	>=app-crypt/gcr-3.7.5[introspection]
 	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
 	>=dev-libs/glib-2.53.0:2
diff --git a/gnome-base/gnome-shell/gnome-shell-3.32.2-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.32.2-r1.ebuild
index 3b1c0f71c323..4e6c8468dd1f 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.32.2-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.32.2-r1.ebuild
@@ -24,6 +24,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 DEPEND="
 	>=dev-libs/libcroco-0.6.8:0.6
 	>=gnome-extra/evolution-data-server-3.17.2:=
+	<gnome-extra/evolution-data-server-3.33
 	>=app-crypt/gcr-3.7.5[introspection]
 	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
 	>=dev-libs/glib-2.57.2:2
diff --git a/gnome-base/gnome-shell/gnome-shell-3.34.4-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.34.4-r1.ebuild
new file mode 100644
index 000000000000..2e737d33e727
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.34.4-r1.ebuild
@@ -0,0 +1,198 @@
+# 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"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~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]
+		>=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=(
+	# Patches from gnome-3-34 branch on top of 3.34.4
+	"${WORKDIR}"/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}"/${PV}-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
+)
+
+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.34.4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.34.4.ebuild
new file mode 100644
index 000000000000..556c9a167ede
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.34.4.ebuild
@@ -0,0 +1,194 @@
+# 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"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~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]
+		>=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=(
+	# Patches from gnome-3-34 branch on top of 3.34.4
+	"${WORKDIR}"/patches/
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	"${FILESDIR}"/3.34-optional-bluetooth.patch
+	# Change favorites defaults, bug #479918
+	"${FILESDIR}"/3.28.3-defaults.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	# Hack in correct python shebang
+	sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth)
+		-Dextensions_tool=true
+		$(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.34.5.ebuild b/gnome-base/gnome-shell/gnome-shell-3.34.5.ebuild
new file mode 100644
index 000000000000..31bff815d4a8
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.34.5.ebuild
@@ -0,0 +1,195 @@
+# 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 ~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]
+		>=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
+)
+
+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-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index 9a0077759efa..302689ef8d82 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 839 BLAKE2B ebb91d34946354c2995a04b6c784be9cce1c93429d9ece7ac93c93795411d3c85ee8cf5ccfdfd53f15775df496ea83dfcd75d443d524442071e5412ca85aa307 SHA512 77c00b421f7026cf2ad3a05866ab9afb8cef78da3497604823c3eab1830475ad1a0d460b80f9599f579e7e789b9ef2b3a00887f6313148698a4ec4e4c98d3345
 DIST gnome-vfs-2.24.4.tar.bz2 1890370 BLAKE2B 696c8ce479de5a15660c9cc79eeb1abb6d69716f68558c7f791a3a44a7f1e9d09d9bc9adcca11dabd745f36a70222817b68888f3c56839add737b802aba0e7ac SHA512 db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581
-EBUILD gnome-vfs-2.24.4-r5.ebuild 4201 BLAKE2B 4ee362b6742949cbb910093617bcdf911414dd7090f895aae5a55cd2acc51a1f615b91501733a9962775e41d1bab28de21048c13c1c122663ca413a48e5c6309 SHA512 bd7b68998c9e8ab449b8a4029409bb3fad259a24232ee533480b3afd4b366be390e103589eddf5e9f7b85836b0307dbc0e521b07069805d57327d352901cba18
+EBUILD gnome-vfs-2.24.4-r5.ebuild 4198 BLAKE2B 1ef10b615d1a605f3b4bea569445187deaf62f50ecc850bf01a225c5d01f2661ec00f6d96132fdd6f951fa5e2f63099254bb2d09a567d6f4b871ff832c80b1f5 SHA512 0a90ce6a193e2726d4925384e9d5439b9201ee641fe96b32e4217f9a9d0099dd4dc4fdc2110f9fd9c82abc3c9055b297bfce7e9c513230ed7ce7e0075195f773
 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 6d5440e373f3..8aab040241a5 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf"
 
 RDEPEND="
diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest
index a318df7ba7a4..38e55bded3a3 100644
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -1,2 +1,3 @@
 EBUILD gnome-3.32.2.ebuild 1402 BLAKE2B d2075e97c2e340536238d68362b2182b1cfd8a3c88dfae8640531a283e54e5b9ee9c1b3c2c1cc64965fc0511acc2626f43f884a4e18faab1b9af0b2e8a5304ff SHA512 a2901d72cda5f0ec73ca7879423d04bef5c7dec200702316f6a167b010a3110a0fc53a60b7b3af6ec5f06f2e46800c4c54b69649635c034d10b770e7e88d8d5f
+EBUILD gnome-3.34.4.ebuild 1404 BLAKE2B fdd9d7955a0c9d2f4bb2301cc886235ff014598ca8d1ed64837447f427821cb3a9d60223d97b382a714da14258e353fc01f3ffe8e50a2a9fd08ab1a32ae749fc SHA512 61ef3e4871234fa4ed9b014668db2fb829cc086962c53a5762773fe7a33d17996ef8e4bae1500220c9c26ceea93c372cafeb4f4e8760d1307efc9a086a8d2a20
 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
new file mode 100644
index 000000000000..7a2778a32f4f
--- /dev/null
+++ b/gnome-base/gnome/gnome-3.34.4.ebuild
@@ -0,0 +1,51 @@
+# 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 ~ppc ~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 be71e00c43dd..18bb5f96b4a3 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -2,7 +2,7 @@ AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec
 DIST gsettings-desktop-schemas-3.24.1.tar.xz 638780 BLAKE2B c1857636e18c69658458aa9dfd65a7c3983791000f16eba08f706c243a0b804ed20dfde58f9cbe879f41348dc8257ecab86d5111c89bc1aacca1d8b62f2c0332 SHA512 c3970d61cc1c29bf97a39c439b3e0ba5c5d5c0f811e17b8884f106f095b159dd0c43cb90e02561edcc26e15b2b887e960d38de1c0e7498413db0c63102f15833
 DIST gsettings-desktop-schemas-3.32.0.tar.xz 628888 BLAKE2B 7d675597d861ee8ee8258f037d06d6f728e9705c7e121508a811bbad000b1ef10a7e2ef23066cec01c34865648f4f0a204716306643db1a4cbd505801ce939c1 SHA512 cf1d78a8f9f1697e20c995286b50d556c2ecc83bf4b28be19b3258a724494a2827fb9567cabf29cda1c590488fd2645e905072e08321766c8bdddd22ac3710dc
 DIST gsettings-desktop-schemas-3.34.0.tar.xz 650468 BLAKE2B a275cd011c255531b293ccb875159ea4465c79852a3d1be2a03faafa8dbb6ba7137d72c7a59bce93b6ce5f187ebf92aca334dc3c51c8de5ee3af3092fc250fe5 SHA512 6cbe59facf77566ed93faabafc6b00ad03fb398a9a4686ba94a08b1c2d0df1d44bd673fb4d51340209a66ebc0aa32095615e7e63b78f4cc4c10d240a7b0a8fa1
-EBUILD gsettings-desktop-schemas-3.24.1.ebuild 752 BLAKE2B 8f7d95be28af86bda41b82519ff086770d757cd032b69e0b7b5ef23b9079a06a8a0d5ca23f9585d6cdfbff8adc364104f278ef011da33aafe9033c6037cee1d4 SHA512 88d5dea3a3c30c9ce4a2e8729407166c6bfbb8ded28b0409983a863c7a66cd2c5b88fc0a7f2c1bf7d5e713a91e024c921c41c9f9a8b688145e2b59859d1cb93e
-EBUILD gsettings-desktop-schemas-3.32.0.ebuild 1019 BLAKE2B 10353a53c681042b3e3e887200c1996467ab691faa3f49fd48ce0bb5df7efc8b2e367f77a86b4d66b4809f936fb7415350e4e4855b3398f62cced86fb2bd211c SHA512 d2c2e119b408f3fc0b8ef9a04a1e02fac2b560169b70b8020a2c4c8dfa7a98d5ffa8b373588dda47b0eacad302094a8a2023522390f98f1fc9c978bd250bf67e
-EBUILD gsettings-desktop-schemas-3.34.0.ebuild 1030 BLAKE2B e44f96af2952ee9c01bb890d15c9badef80659e3acfe80aaea85073498f7e6003640ba991b0990824338c4485fd9984f9e2dee0ffedeb1368575d3c654e74d9f SHA512 be94479a8200cc1b3fc6a0657aba3e5651d092d4a3f7bf93873945c0e51fd4b271f5169ab34ac3db14d80d6005fec46432949399107d50346ef124ff7ded739d
+EBUILD gsettings-desktop-schemas-3.24.1.ebuild 749 BLAKE2B b86903a99e95db3797fde2cecc39c63165d66c7a51ddcf088da5461c2a6f78293f469b4ad39f4adfe3db522fc22ac2bdab82deee2f97b4158ed1e774861ea025 SHA512 366c39be0f2999e85308f86a730416b82c32a9aa5a6fd65c445150497211e6cc23f8a9ae20e7ce099421ad5bea47e8d7065ae4e8315e4b4ab6ab6aafb0993d58
+EBUILD gsettings-desktop-schemas-3.32.0.ebuild 1016 BLAKE2B 7f58297cfc383e02cac7ab3f0ac945c4f72ff0d7b488f6087f03a91976d66d0f34a2815a78bd96b5487ec525e650b212a3d02a6d63dbe25d91c424e21dfee5ae SHA512 a4dc5205066a8dc4a359846fab989ce5c92f2f4b8f83085f7d714396ed5820a9c3f0fd5e1b5529bebc0a60cf9213b236a52f007d58d5b1f1a345fa115c3991b9
+EBUILD gsettings-desktop-schemas-3.34.0.ebuild 1026 BLAKE2B caebcba0e4428b2b18a43f52ec0de4771da1e750119c7b313990c8bbc8318e4f7709a89c19ba11178dae5af4f75d188004b695ee2b60c188992f5e9440235dd8 SHA512 2659ab9df0101d585d4eb9b776474c5f66981a52d3d9f61db706c1e3b9861f396495cfb888301f7894a7bc890120704a0b3d0103b26effee7b1ec778a1ce5227
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
index 43186aa1c5f5..3377a656eb7d 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.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 ~sh 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"
 
 RDEPEND="
 	>=dev-libs/glib-2.31:2
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild
index b659a75bc170..05bb635dd560 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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"
 
 DEPEND="!<gnome-base/gdm-3.8"
 RDEPEND="${DEPEND}"
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild
index bd590c71c0ef..02a1aa53e9ce 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild
@@ -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 ~sh ~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"
 
 DEPEND="!<gnome-base/gdm-3.8"
 RDEPEND="${DEPEND}"
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index bcd8e85b70af..5e021a04a9c3 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,4 +1,7 @@
 AUX 1.40.2-gvfsdaemon-rpath.patch 1076 BLAKE2B eb268a3500c06aaefa0365b525d530a94c1332c393ebce3047b42ec250b7ac59d6a0c7a573ffc0616617a32e1163ad424042389af055a84803b3830ec5ad8e36 SHA512 b3c1e33e87e033efc3c23524494857858f70ef7b76b88a13bf595006cd1b1f8fdcca875cf8ebe8cba7ce536fe92fed460a957a9136f5b56b393420124fd3e013
 DIST gvfs-1.40.2.tar.xz 1204824 BLAKE2B beaf9ba603d035a81ab21dc3fe438dfe77cc0cb1d38d0457d079be80b7ec93ab6adbe9992dd0030510fb816ce14da5ef03c3f865e32bdd69956bc0181da09af2 SHA512 aec525091553e793e10ad9747e29080c92401b9d2a0b8dff98994c071d67057796628dc2a53c0ede46c53f2b149abb55e57c3ddd75e11a93c2f168713e5fb61c
-EBUILD gvfs-1.40.2.ebuild 3815 BLAKE2B 6adf551100fd62928f57cb3f50ffa0a3de7993d6bf007948412e8e792651ecae6e975c94dc2aed63d93a810a20fdc16d67115576816263a80edf3ed2a441ee56 SHA512 275ebe819e2c70006d0262d3846f7644469265a0c3fba7e2bd0ba464f882adb784c07357130a36c57142207ed1164af1281fbe94e3a64e331c4197a817673c4e
+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
+EBUILD gvfs-1.40.2.ebuild 3812 BLAKE2B ca7a091366e5c9672a1ef26e77ae1a52e77e8dd56ec4b5583173c93f438c60242cfd3df5765f1cc08f06927f0a2548a6585dab7f652da816511b555647fabdd4 SHA512 86723b0572972a468824f3363321724f4fcaf4fc3a03d48a81b0938a5b3df0ac212a8744d101719f94c7e54ff68a3faaf6f41c69b8e068e45577a3fdc8b60e8b
+EBUILD gvfs-1.42.2.ebuild 3858 BLAKE2B f64d0dd6b6625871cda898903002b3be86368002b75938cbb45b05397f1262082b00e249bfd75cea551a54a733b6b7665d29d590ce1a975d6a38ecdbb68394df SHA512 5fcfd5be74d053828b7a8416b6a540e1cbf2bee2d813b2a5ce0ea33e7c3a7de26871ae798073f68d42141dee880e17c82b42a634c3eac8013f344d58715995bd
 MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7
diff --git a/gnome-base/gvfs/gvfs-1.40.2.ebuild b/gnome-base/gvfs/gvfs-1.40.2.ebuild
index c7f770eb9c3d..faf79aa4527d 100644
--- a/gnome-base/gvfs/gvfs-1.40.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.40.2.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="
 	mtp? ( udev )
 	udisks? ( udev )
 "
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh 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/gvfs/gvfs-1.42.2.ebuild b/gnome-base/gvfs/gvfs-1.42.2.ebuild
new file mode 100644
index 000000000000..1139a7ece0bb
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.42.2.ebuild
@@ -0,0 +1,140 @@
+# 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
+)
+
+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/libbonobo/Manifest b/gnome-base/libbonobo/Manifest
index 224ccd8e7cad..729addaa2c2c 100644
--- a/gnome-base/libbonobo/Manifest
+++ b/gnome-base/libbonobo/Manifest
@@ -1,3 +1,3 @@
 DIST libbonobo-2.24.3.tar.bz2 1354929 BLAKE2B 44f8d7bf4530363dd680fb277dbacabb85a3871fd3645ef7aa4a2a4dbd112a31329c8295637f73e37853035ac0e2cd7b918b2966f58fbcccd5abc943c02a2cc5 SHA512 c97224ba2d4afc07e520399aa04849487a4ec4dd1b80b56e0472b4c3ebbddd0ce0105ba63ca2f823590788754791127dbe86b49cb39239db0019f8104db25716
-EBUILD libbonobo-2.24.3-r1.ebuild 1533 BLAKE2B 4e78de0b8e32f6595727512c60305eb663f547c9611edfa57d0da54be36c960438eb2ace36ebb1644514baaf5657b06d9dc675b6912ca829f4a9917da45165ac SHA512 d971f77974a36697c6a1e732c5882d8d6af9b699895cca9385cb2efef801294e60ff71d9924cd9d1ae468dee275777476bfea7e300cc0abc13cbee8c59c5d2cd
+EBUILD libbonobo-2.24.3-r1.ebuild 1530 BLAKE2B 58997090a07fcefa0459a6220c71ed784e669ce92844c6d61b06f729876edd88ac885ee1b2b2a378d99de69d5492d1e21dc35b43114aef334e8717853da6249a SHA512 dc32354c1a34f40174137ca72bc852b29d65cb4dd23a8c387b38768268d38df9eeb2839f9de04182072ba1cd85aa063e5ffbf66362595aa7f2f7a8bbe94ac3e1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild b/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild
index 88c445076b3d..58672cf1a28d 100644
--- a/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild
+++ b/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://developer.gnome.org/libbonobo/stable/"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh 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"
 IUSE="debug examples test"
 
 RDEPEND="
diff --git a/gnome-base/libbonoboui/Manifest b/gnome-base/libbonoboui/Manifest
index 94f4c8396de1..b8495a4c6c7c 100644
--- a/gnome-base/libbonoboui/Manifest
+++ b/gnome-base/libbonoboui/Manifest
@@ -1,3 +1,3 @@
 DIST libbonoboui-2.24.5.tar.bz2 976250 BLAKE2B b8847b23479ba1c13ee41ebc67031c94572f9f9e5ae88b067da78bac2c78d6c52c6a5bd408246328fb71fa2d1722ce69acaa517c90520cd9fe5e81828988d6ea SHA512 163a8f39d9dad7fc3f1afc55b1a779961d285abe2988ff74bfcad4376e9dbfb91bb3e8212f96f48f91c54a6aff749ba6e00ea2d9add10c76b650f3072b875100
-EBUILD libbonoboui-2.24.5-r1.ebuild 1356 BLAKE2B 6652ae96659deea330b8e5b48b1a81ee382e1085e5e006026653e7e1092ee53d361487131bb0a0604a4705db5ebb354eb302c63b3cf598ff7fb7a1b15c5daf17 SHA512 d2278d2429bcc04a7934e04e880e7b0b2405ed2ffce3c48bdda4eb6d53aba6615475a385c88de0f7311734de533f93e0f326cb0a55ba4405df96407d1262071a
+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
index 7ffdc1730de1..4f9fbea282dd 100644
--- a/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild
+++ b/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://developer.gnome.org/libbonoboui/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest
index 9003cdacc446..42505f88cc88 100644
--- a/gnome-base/libglade/Manifest
+++ b/gnome-base/libglade/Manifest
@@ -3,5 +3,5 @@ AUX libglade-2.6.3-fix_tests-page_size.patch 369 BLAKE2B 0994633712e71d4d1919dbf
 AUX libglade-2.6.4-enable-extensions.patch 225 BLAKE2B 668fb60395b401e3acc9f93ab049a13621e404b7e3e9a7ee265bac6850eae20db0957064726fe9b4a8f9403ec60398585dec2c7762c65daef824eb8f444b295a SHA512 e9cf514612790984110f9c5dc8fe12f5e2b4707ea469a803f0db24dc1ff7561411e6e47faafa71037e23daa1a21b1bc8ac7fc6e699508c76e9cb5b4cf8c10fde
 AUX libglade-2.6.4-gold-glib-2.32.patch 544 BLAKE2B 0a7b0c89eab5e17788528743aa894f485e19bcc84f2175e1a4c64363ef3c0924e9fd7fdd7b20ff01a899cfbdb549ac00fc375e4b47cef98bc118a288ca332621 SHA512 d2d77d6e4d2bfe426222231dbca29b6003d33e3964ea6ab25f2f2c11d3b52ed9d1379c5f5d727980ad16b6db8d7bab2dc540830e169b70ce24e9afd8c170a1d8
 DIST libglade-2.6.4.tar.bz2 356119 BLAKE2B 7132a12affc4b6954eb9565236ca64a0f13f369dba630c14fdbb66a35d2273e8dd371baaad80ce97fd4480a6795629dd7f3bbee90a34b09c85041907a054f5c3 SHA512 b725842febaf4c1f0d305a629ae1c61ea2de24dd6f41937e806c078fada2cea483195ef40f5238ce2045e47130c92559e984f677de667b840dd7fff0f8559735
-EBUILD libglade-2.6.4-r2.ebuild 2863 BLAKE2B da0344acec107d39ba4c7864a8a6550eacea7f9a7ac51de72b6cd81bfcf7d28b17a559b6fe7891b960c65c472c147b0c2bf0cf35c86e158bed085f8ee1680a6e SHA512 33f972a875ddc3a36119c81607b3e6356b81193f4396445b1152837b013d14d22a14d4e36451b748dba497237e54a60dd1458a094aff8a1ac847e54a2f5d2de3
+EBUILD libglade-2.6.4-r2.ebuild 2860 BLAKE2B a28727a80b7950f03f3c506cde788ffc334baa7c5b79040e2e60ab239025627a2ece75225186317b11c0f46a3df2f2470716e7525b8467329f5384cbd7f9a273 SHA512 87c8b53859648625a5cdec2e7dcc1984826aa963556b57db6c7a79f766b3df0beb5080cb21d3944740f8cfc10c260369f7076896084befe5cb8f02789eeeb267
 MISC metadata.xml 336 BLAKE2B c8f534b3eb5adf1f4e4b71a95b4dd7ecb6ddcf954d617eaf960a08d6ee43818c948c9ed72cbe252159a4185feaddef8a294e41277416618237a271ec84e90e5e SHA512 20b4ab7e8cf4ef4f714003fb96a18e249ab4a0fb5956e7f1475e827ff9dcbca0901abfeaab2b3d52e58745f21e0d09cfd20f58668d5074db8bc6d0a34438a5e3
diff --git a/gnome-base/libglade/libglade-2.6.4-r2.ebuild b/gnome-base/libglade/libglade-2.6.4-r2.ebuild
index cd1c4f1d9d56..3ce81eeb82c7 100644
--- a/gnome-base/libglade/libglade-2.6.4-r2.ebuild
+++ b/gnome-base/libglade/libglade-2.6.4-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://library.gnome.org/devel/libglade/stable/"
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs test tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index a0d700f6267f..d18fc185fd6f 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -1,4 +1,4 @@
 AUX 3.12.0-vala-0.42-compat.patch 811 BLAKE2B 1f50e441d0483d3748db1ed7d18e581df2887160a16afe7bb8a47890e162349cd5611070ea11ceef1273c8d4865b7f5ead6bfad14a171ca5d21d32d7a8811468 SHA512 12e16ca43044ca96a4f5abdd3d982bfd705e17df2630505154ad1592dbb8ce1bad66c4624a992084a1533d58fd96c178a5d4c147c79a5074183ceaaf54dde998
 DIST libgnome-keyring-3.12.0.tar.xz 435092 BLAKE2B 16e02ce3509b98e325658fc64e5731a872a050a9bf1b39dc81347a53aaee2fd4726ab9b0a41c7451249954a01144488e720f8356e77dda5bc9da5f78416d30e1 SHA512 dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd
-EBUILD libgnome-keyring-3.12.0-r1.ebuild 1870 BLAKE2B 11ef4b59bb4b8a36dafdb229d232cf303496b9ea9250309487f032638e50dd81600e8386bb8e653e0a051ce3243b1ad9b91685587f68cfa975d8ded21c1bf0f7 SHA512 ec902a82a70c58fb66c578c5af53c71d20c8eac79222d9b0f043fa3e89dddc58b05d2b4a156b841d26b902d02448ae223020360ae270e06f4be87136db07fb7c
+EBUILD libgnome-keyring-3.12.0-r1.ebuild 1867 BLAKE2B 427dc2fb358aa322a83c39cf4ee8239008b4ce1ec4f597f8d85ee3966d3e41846d1642dd9127ddfe172cbad400ba4af2937efb2e1668a4e55d07b3bf747c5c1a SHA512 7e963302238c9573b2dd18b6cac8577d04179a11f2c517a1122a947dc74a776d5e33595c837fe18d27d10b8b7b4fac77cbb11955a95303e3b3737e1c46fbf79b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
index f8d067b1771d..f8384173ee0b 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 IUSE="debug +introspection test vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.16.0:2[${MULTILIB_USEDEP}]
diff --git a/gnome-base/libgnome/Manifest b/gnome-base/libgnome/Manifest
index 55c0cbacb85d..386125cb9b84 100644
--- a/gnome-base/libgnome/Manifest
+++ b/gnome-base/libgnome/Manifest
@@ -3,5 +3,5 @@ AUX libgnome-2.28.0-menus-have-icons.patch 538 BLAKE2B e4bca7e5ae5c7fe38d88e1334
 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 1765 BLAKE2B 79599a4c5bb171811078c814b49f50146412cc5a30afaac99ce7466c27e4496e2b9677bacd7b99e1cbf0cabeb55ee1f7bafa761310a8109d2d8e1b32e947338b SHA512 b6de358830eebb4c81a25af9900680439884ff18f470ddc516e5241a34fcadecdb665aa2fb87ea52046dd731abbf47d7f2ca4ef06dfd5306eb14d3c8cfc62c1e
+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/libgnome-2.32.1-r1.ebuild b/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild
index b32f0d3e959f..906503da428f 100644
--- a/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild
+++ b/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://library.gnome.org/devel/libgnome/stable/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sh 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"
 IUSE="branding"
 
 SRC_URI="${SRC_URI}
diff --git a/gnome-base/libgnomecanvas/Manifest b/gnome-base/libgnomecanvas/Manifest
index 2d6616bc5984..7f81fd82f87a 100644
--- a/gnome-base/libgnomecanvas/Manifest
+++ b/gnome-base/libgnomecanvas/Manifest
@@ -1,3 +1,3 @@
 DIST libgnomecanvas-2.30.3.tar.bz2 574139 BLAKE2B 25f42bdb24899aaf6b2daf19242ba67a4bdae9a51bffaddc413b65a48843ccea1de11e18a82cc40ddec566ab25bf133811f00a8e7667a66b228ad8c855a8773d SHA512 b5bfa2133f5172abd5228d467db4d980dd4ac125cdbf55dcc1d5055dc3330861320c12cccb52ea63ba7f69824504c9d25781cd78001dc7a92b11c6f7e0c550de
-EBUILD libgnomecanvas-2.30.3-r1.ebuild 1684 BLAKE2B 23c0de6f502e1f4be80d5f7fd6b8ac6817843ee3a5a2f683bd34f81f3a03f22d5df403d6b9698a8da6da74fe1924967a7484632d8683e4643f65ccded4f159e9 SHA512 16f05c65139dfaf850c16dc226b4d7eeecd8c716e92aa36b812b3b99f75c9940f479023fa16cc095b6db5c94aeef9311adda8fb80c38e7ec2ef9f069650461ef
+EBUILD libgnomecanvas-2.30.3-r1.ebuild 1681 BLAKE2B c3a6e6a4c67188fb5a66025417a66ad6a803b9c500009eef6cd97ed0a2b3828925c3c6acd9ca9c233fd7b0ec83e332625e0eb1983e6b42f0389bcbfdab894238 SHA512 94430b5e2719f41047054b12ef25c4c95a674b0e389bdee269c4200ff357b7d857060c252616366c3c172172dd15d472ae727206215ed95d63efa4ed7cb25397
 MISC metadata.xml 310 BLAKE2B bd322cd2300711715469acaec5e2930542ea48dde8e3444d465c9dfc13dbaddbd49885ddf04a643c07d67d75316f080ca587083001a0dc33cfb15b38b9bf7c19 SHA512 15504f6f0f8ba8e905677b293df85f64ec929c96b22a81a57803c47657a0f054039a1257086c02af49ab89a57b16d31d32619ccdf1f53ac2de93ce8fc2f99c12
diff --git a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
index 031614fa0af9..381c53c0dc07 100644
--- a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
+++ b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://library.gnome.org/devel/libgnomecanvas/stable/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="glade"
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest
index a628d0385e3b..39bbafbbbff3 100644
--- a/gnome-base/libgnomekbd/Manifest
+++ b/gnome-base/libgnomekbd/Manifest
@@ -1,3 +1,3 @@
 DIST libgnomekbd-3.26.1.tar.xz 450636 BLAKE2B 241f2f9af95696600f82ab3a1f53f80c6e76f6e81636419407957f172a2758ee16f5c6d419ab1c1c37d2e054c42b65404062471eceabc0fba45099481eb7b214 SHA512 8e83522f4d96001f9635278a001e0208d6d37e74b19a8c1702ec6de651036ad37a03385e66adbd3bae01d845a9a6181bb76f45bffec31eac98d600b49ab4360c
-EBUILD libgnomekbd-3.26.1.ebuild 804 BLAKE2B dd9622f8f0e64df4140957ddd5105a58860bd322d78322ef23729dcc8d09812aff0e0413b370b87adeb7b1e1445596dfbc6b94996582fa9dc395ae7ec31eca10 SHA512 3d74cc4309dca2696f499b5f9db3f1c5dccae0022bc6fdef8fe9b6b065785f99ca21f78a6010d493b915e4b4b3e78ec6934dc4e7cc156ed9520af1cd6b9f78b7
+EBUILD libgnomekbd-3.26.1.ebuild 800 BLAKE2B dcd8aaa43244bc4323987db630ce52d8f9aac63f2c9070ebe383a92bd987ccac9328c658d1f05881e507e16cd47bf6fa3c70801faf4db270cdfdc0f242a7356e SHA512 0b2a0e1e29ecde0ac275ad9bc68a61a92ccd497f9d277d338f00f494811e4e5f0ef46de62e997ca07aa9c28d5c3686d8626bf1da4736a102b85cf8b91ae6847f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
index 0fb48653b8da..8ba0aec7a5c2 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnome.org"
 
 LICENSE="LGPL-2+"
 SLOT="0/8"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/gnome-base/libgnomeui/Manifest b/gnome-base/libgnomeui/Manifest
index f2d230b83d8b..d688e77398fa 100644
--- a/gnome-base/libgnomeui/Manifest
+++ b/gnome-base/libgnomeui/Manifest
@@ -1,3 +1,3 @@
 DIST libgnomeui-2.24.5.tar.bz2 1440172 BLAKE2B 3ffe1942b993fbd112029637cfe7eca031b500dac526c88cf1b28ed6d9f17232fd6e6d4220d455c852f73cd1ff6b074c47d30fd926b677ec426f1351def525b4 SHA512 e78fbe909179161acb6f7a1d31b8a247c9007af55c7f9c36422791be8d2681d42edfa582c19db88459d36309a18c03cb859997fe6b5918f602884607a8b6d5d5
-EBUILD libgnomeui-2.24.5-r1.ebuild 1333 BLAKE2B e56349b2b95c75cb613115c517ac0cb4cff9a07e8e3cda598033274188665f0cf852388217a4a21990ab63d21ca8ca94393a7767cb4f48b4cb4da801ad824bc8 SHA512 0b6a85199560f75ee0dcf6cdd1165d02c184cf87ae52b0e986f00b27a4dac61d3e4e2a3f57362152c24966fab6c7a437abb216536a0cb7776f5efeea0d61ccce
+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
index 61863b7c0ee0..19b4340f70cd 100644
--- a/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild
+++ b/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://library.gnome.org/devel/libgnomeui/stable/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest
index cb92db337f3f..0687effdc6c6 100644
--- a/gnome-base/libgtop/Manifest
+++ b/gnome-base/libgtop/Manifest
@@ -1,5 +1,8 @@
+AUX 2.40.0-sandbox-workaround.patch 890 BLAKE2B b231acfa4f15b04d5148864da0ef32f08c65fd4ddcda940cd39d832bc30d46edb8f48633e08974521abee126251e5e80693bb224f0630f17065e7c5580ba9439 SHA512 ec5b1f9e9b8174dee576370ccfeb2d758ad5369c1ffacc7d8840f9936046fbedfd0d3e1e2b024606d33a32da59c65cdf204ba98fb108a92dcff660b0769d71b6
 DIST libgtop-2.38.0.tar.xz 729700 BLAKE2B 2296741d6c6bd1c9eb17be10e480dabd732e956826c859c176cbc6f8f03259a3b2f2f04d6c55d1c562b082f7e880bb4b7a3f07a66d7f24660085387dce078879 SHA512 96586b7f12a2b63c5ec7f69c51b6e28361a7458f24f20270fc589213bfae43ae99d1e39efb6101d189741bba084c887554f745131e99d8ed90b7db6d53c36e1d
+DIST libgtop-2.40.0-patchset.tar.xz 9700 BLAKE2B 0d7e42b12fe0989df8e5abd1d45578acb97981c05c43aeeea57ba38f526e61aaa9507cd9520a20634f4559b4dfe60efd368d343f2d1ac6803e33bc5dc4832522 SHA512 15b5a81f4ec7a3e921a2c114e8f57dcca194e38849e09080c55a3a16078a8ec706f8efef6d4b22931927e7ab7789596e85054ccd85f37d6dd3206c962734960b
 DIST libgtop-2.40.0.tar.xz 744316 BLAKE2B 3ffd11937e29aacc4b0d5569429ec92835a3743d7cb65336c5c36165b1bb0d817629e73db88c29eff4baf4965791497a8676a897d0de9b394f583fb2cab15b3a SHA512 a9b2135796d7e41c63a6621f672c385d1baeb74d4af3e55c9164aaaae18c66a8a76b09a6ae8b37f89f120092123c38830e0da840c6613a09035ea62339117861
-EBUILD libgtop-2.38.0.ebuild 758 BLAKE2B 1f34cb208a28312fbe4fcadd1c2b82d97f173b8a3d0fe6f9fbc1e39332193e404b74cdd477187395362d99bfef8669557fd4382cc2f4666f172d1f7def31e46d SHA512 cb863280bcd41cb4ee196971b9ae57f6ee5e44211f882a618c40210033744ea0250a173b7aa4517a1c83b0906797654ae17ec1e7aee06c20c40a8fc63cc7e249
-EBUILD libgtop-2.40.0.ebuild 765 BLAKE2B 063797e84c04aaf42e1a9ae8430128e8aac6fb8e7ba7ae867fc5ed7597fc8ce3566c2c64982c18eb3b952aa2db07083e196c54d39dd0b43cc3d2ab9e78271d1a SHA512 be1e76881efb0e6ee66b70c4bfffdca56235a041bf51130be68ee716d0bfec005f9d8562a05f7cf6df90380d382b9433ac402538d174f19f3808422ab77347e6
+EBUILD libgtop-2.38.0.ebuild 761 BLAKE2B 1c15a9838e4be517757bed073fe6b196b862047cd6ab2595a5611601bc810c416870090caf0a0f94752115dfc2cf229857d9f61d7f1b96e9fa628b3e55622c40 SHA512 6fdbf12fb10459af5e96b82caf0cac4d6927e3ec6669742c453d2b7f127e272cfbae68b87b71125563bce4ecbf2354d201a3076435ed728462aedf401e17e53e
+EBUILD libgtop-2.40.0-r1.ebuild 1217 BLAKE2B 558ede544a5e1a0e07dc94f8e27b0aaabb408e6dce876e415fb02e2a9b912fc5b3ed60071e1da47872955f882c6bb4610c661442c72b11636c03490853a76b73 SHA512 bb7eb055f726d20e61c2cd584bed56c496e2ad748ed1d387d198969fc7d4db9945c46c87f2d96b6e7f958f8925b68ecfe9a3dcb1351d3dbfa63daee307221c30
+EBUILD libgtop-2.40.0.ebuild 761 BLAKE2B 63576898daf4d2182c963c49160f78e21329edf2b79d23b9c733178e352b74040515c06453164088c87c40597841061edd1b381bebc44f5409b1733a0d0c58e6 SHA512 f0d7d73ac5d1d579fdef4ffdfbff6ef3e7a3dfaa522b8bb5c8429bb29586d2870f9b35ec0eae1d06fd09e1e3e8b79428753c0b8a2616b0a20c61fa118e9435d3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgtop/files/2.40.0-sandbox-workaround.patch b/gnome-base/libgtop/files/2.40.0-sandbox-workaround.patch
new file mode 100644
index 000000000000..86184f9d0a9b
--- /dev/null
+++ b/gnome-base/libgtop/files/2.40.0-sandbox-workaround.patch
@@ -0,0 +1,27 @@
+From 9a0067e0fa4636efa37212d7d56376f8ec02a802 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 21 Mar 2020 18:40:09 +0200
+Subject: [PATCH] build: Workaround chmod on root filesystem sandbox issue
+
+Just delete this again, but keep the server enabling from
+commit ec662d01dac16b81; the suid part has to be handled at
+package level instead.
+---
+ libgtop-sysdeps.m4 | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libgtop-sysdeps.m4 b/libgtop-sysdeps.m4
+index b363dae0..81aa5350 100644
+--- a/libgtop-sysdeps.m4
++++ b/libgtop-sysdeps.m4
+@@ -36,7 +36,6 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
+ 	  libgtop_need_server=yes
+ 	  libgtop_sysdeps_private_mountlist=yes
+ 	  libgtop_sysdeps_private_fsusage=yes
+-	  libgtop_postinstall='chown root $(bindir)/libgtop_server2 && chmod 4755 $(bindir)/libgtop_server2'
+ 	  ;;
+ 	netbsd*|bsdi*)
+ 	  libgtop_sysdeps_dir=bsd
+-- 
+2.20.1
+
diff --git a/gnome-base/libgtop/libgtop-2.38.0.ebuild b/gnome-base/libgtop/libgtop-2.38.0.ebuild
index f472a1c51181..8c03243348ea 100644
--- a/gnome-base/libgtop/libgtop-2.38.0.ebuild
+++ b/gnome-base/libgtop/libgtop-2.38.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgtop"
 
 LICENSE="GPL-2+"
 SLOT="2/11" # libgtop soname version
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild b/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
new file mode 100644
index 000000000000..2dfe607887a5
--- /dev/null
+++ b/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+inherit flag-o-matic gnome2
+
+DESCRIPTION="A library that provides top functionality to applications"
+HOMEPAGE="https://git.gnome.org/browse/libgtop"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="2/11" # libgtop soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.26:2
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.4
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${WORKDIR}"/patches # patches from master (not stable branch) that seem safe and fix potential eautoreconf problems
+	"${FILESDIR}"/${PV}-sandbox-workaround.patch # requires suid handling in ebuild - https://gitlab.gnome.org/GNOME/libgtop/issues/48
+)
+
+src_configure() {
+	# Add explicit stdc, bug #628256
+	append-cflags "-std=c99"
+
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection)
+}
+
+src_install() {
+	gnome2_src_install
+	chmod 4755 "${ED}"/usr/bin/libgtop_server2 || die
+}
diff --git a/gnome-base/libgtop/libgtop-2.40.0.ebuild b/gnome-base/libgtop/libgtop-2.40.0.ebuild
index 5413e13da05b..4950f22ebfce 100644
--- a/gnome-base/libgtop/libgtop-2.40.0.ebuild
+++ b/gnome-base/libgtop/libgtop-2.40.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgtop"
 
 LICENSE="GPL-2+"
 SLOT="2/11" # libgtop soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index d5362b532383..af69f2886ef9 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,6 +1,4 @@
 AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f05006094106a17fdb61b1bf2e6210f42fe91716e7fd21cf40ad5adecfee45b9e1d488249d1befdb48399c5952829c3d01e07 SHA512 bea056ac4d3d19719129dd7379d783a8eb34efbf57186f6ab7113ff97fdd809b0802d60add646ea50c776eb7bc07f5a0f4c0911569a2b1b24dbb1683f111d7c0
-DIST librsvg-2.40.20.tar.xz 1796376 BLAKE2B ec8e7308a0255aa22038262d69019e810bb78b92e3de62662b53ab375110c8186e565e1eb7f5825c61c6d10bed1876ff3f7a06d1073e9676a3d2bb5dfb6b791e SHA512 cdd8224deb4c3786e29f48ed02c32ed9dff5cb15aba574a5ef845801ad3669cfcc3eedb9d359c22213dc7a29de24c363248825adad5877c40abf73b3688ff12f
 DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
-EBUILD librsvg-2.40.20.ebuild 2669 BLAKE2B 957a510ca87985882c595fbff7f8dc466922fe97636cf049939ea260b63e27c8a947305a8853ae71f26b1574818654cc2ab6d22136878e2e4ac95eb0be3a21cb SHA512 0ed53a0019845e8f007b16e65267217e654814a870fc04f43a8de7047bcb95e5185b3eb4ad0554656c5c6429b43b0ea62a4e75a155989d3243807fd4ebbe77d6
-EBUILD librsvg-2.40.21.ebuild 2676 BLAKE2B 1321f02104a8ea6eb3f25801bd2cfdcc0c5a2e46a4fb33290ead8a51b2fc95d543d55fa93bc7af80735d203b9561f4e789c2d4a05428cd9694675f98e218dc0a SHA512 621747dfa8fc91791f347884711dc3fc9d7dc65af58da72473cf4c300efe328e2e87c29c7d9b5a05108af6109ef1598ed7cda9aeece67eddafdacdff454a3ad5
+EBUILD librsvg-2.40.21.ebuild 2666 BLAKE2B 07c4c9279acfc9c2bd13343929ad14fbd44fee06441cff4ade89c51b0eb8e5c1c9b87b4a5dd3ceb64514683d6e1e0ebfe3d446d3023504c941d4b0d2aeff3724 SHA512 bc5001b12723877973d9364b52c0cbadbc371541362aa4ae71730c594eb572432865594a03731f17024513b9e3b941656c0cec1b6e7595ae64b395a4f4560042
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/librsvg-2.40.20.ebuild b/gnome-base/librsvg/librsvg-2.40.20.ebuild
deleted file mode 100644
index a5298fa36963..000000000000
--- a/gnome-base/librsvg/librsvg-2.40.20.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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 autotools eutils gnome2 multilib-minimal vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="+introspection tools +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.38.0[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
-	tools? ( >=x11-libs/gtk+-3.10.0:3 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/gobject-introspection-common
-	dev-libs/vala-common
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.13
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	vala? ( $(vala_depend) )
-"
-# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
-
-RESTRICT="test" # Lots of issues due to freetype changes and more; ever since newer tests got backported into 2.40.19
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=653323
-	eapply "${FILESDIR}/${PN}-2.40.12-gtk-optional.patch"
-
-	eautoreconf
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	# -Bsymbolic is not supported by the Darwin toolchain
-	if [[ ${CHOST} == *-darwin* ]]; then
-		myconf+=( --disable-Bsymbolic )
-	fi
-
-	# --disable-tools even when USE=tools; the tools/ subdirectory is useful
-	# only for librsvg developers
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tools \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_with tools gtk3) \
-		$(multilib_native_use_enable vala) \
-		--enable-pixbuf-loader \
-		"${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_compile() {
-	# causes segfault if set, see bug #411765
-	unset __GL_NO_DSO_FINALIZER
-	gnome2_src_compile
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	multilib_foreach_abi gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	multilib_foreach_abi gnome2_pkg_postrm
-}
diff --git a/gnome-base/librsvg/librsvg-2.40.21.ebuild b/gnome-base/librsvg/librsvg-2.40.21.ebuild
index 6999b67e098f..b5655355df53 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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"
 
 IUSE="+introspection tools +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index f7ba8ff73c76..0632a73b7fae 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,5 +1,8 @@
 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.32.3.tar.xz 3197820 BLAKE2B 28140210a855fe62faba4f0833067a81c4d8f71c0cc870ba4fdcc016754b01df003e45f636836f67cced8515aba8c8fb7922de788a14bfe0f0cc4518010aed5f SHA512 f19710f02bd91edb2d2f6cb8f46be6bebea3edfed14a07612444d5990533bafd032b604d65533727eb377b574d6bd4c82dbe11894d85ad254ee1473b683c4392
+DIST nautilus-3.34.2.tar.xz 3196976 BLAKE2B 38424061cb5591fc1df5824dd80e282637345bde148955c81632d4894153e10f3840389bb4e43dffe8c28f10eb6e64c1cc89f1bffdcf80fa581a5d47b7724dee SHA512 1a4e24fea3201f68b0316b95425bbc90078baa1ae7dccef2d2e48beda4007ecf2986254cde243d310c548e47a4693d84d1255654199649ce08429a99fb3a3a51
 EBUILD nautilus-3.32.3.ebuild 3065 BLAKE2B 3ddac42a49839e562e6b6f19a7f2c89a3cb3b89f63dde602eb8ea77eb246d8195544d7d3ac9237292b2274dcc5ec09736ad631a8b4a427369efb30c78c43c498 SHA512 21cf025cd1c3be04bbf2c4875926c160d8ca99e54d15fab41bab9d6f59ae8162ed2a19ed3230dea7afae19443e1ae29b6c9baabe28f16bbf0c234325617ee987
+EBUILD nautilus-3.34.2.ebuild 2965 BLAKE2B b1521717a209a13c75c84810306a73c25b040c715b3efdc764732307297ba37637da0678667412a3a881000cf517983818099bd6c959e44ebbaaba865c2e3847 SHA512 c731c8a558892b1d10effc0cbf8840778d503c0a3a0c32e4a0ffb4597e98dd2caddd247758862818048dec5a0d61b92d33571ace902efc4b91fbe5c580d48bfb
 MISC metadata.xml 652 BLAKE2B e4161f58861954981a6837a9b6c7f6dd0b76dc84378ce2d9caea1375973d490751ce966753829b7b972a6c75d04519820f4cde8b6d4edc3b9a9abb7477c68a90 SHA512 a1906e74bd47437d2226ffb977f3f3d8c981a32f8d54d0f9e0156932b001b6e205b0e5b78ed5badb0b89c1ed1ff107f67e026bf5c4b088cfe95e2b69de8c6981
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
new file mode 100644
index 000000000000..76ab1fb1c2e2
--- /dev/null
+++ b/gnome-base/nautilus/files/3.34.2-pango-1.42-compat.patch
@@ -0,0 +1,106 @@
+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.2.ebuild b/gnome-base/nautilus/nautilus-3.34.2.ebuild
new file mode 100644
index 000000000000..5678b21d8251
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.34.2.ebuild
@@ -0,0 +1,107 @@
+# 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 packagekit +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}
+	packagekit? ( app-admin/packagekit-base )
+	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}"/${PV}-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)
+		$(meson_use packagekit)
+		$(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/orbit/Manifest b/gnome-base/orbit/Manifest
index 0618f73fb478..20d2b2ab6cf7 100644
--- a/gnome-base/orbit/Manifest
+++ b/gnome-base/orbit/Manifest
@@ -4,5 +4,5 @@ AUX orbit-2.14.19-fPIC.patch 1650 BLAKE2B a6a28a41ef14e633d472142183722d881061ec
 AUX orbit-2.14.19-link_protocol_is_local.patch 1006 BLAKE2B 927492b912c5f8e557a3d4bb922b8250206c7359907cd330d0f55ac30d9955dc93c110018b55f0d093191396b694c46553c8b5a0d227a3bb805c03c8e09d38f3 SHA512 f765686448db2d190bebb85c165b5e32bb3e29a30f5407b5f3236dfcc0b0c94f77715d136678ec9021a9e450b22fbd7c0dfed3e30d070f795d708244594de2a8
 AUX orbit-2.14.19-parallel-build.patch 963 BLAKE2B 578f51e904cbaaa40d27b9c1a512958b34edb63ae0936edf1abaf25e29142c92250bb9b56d22583a28a6aad8266947f788b430bb869a57a82e4a1349a0fa312f SHA512 f38605716bc0c72ba87be108ad7dd3f86779fd548183abe847b74a74ad009778b42ebfc8bee0d97033f698ad28b6e383708c6033725568f37226a6de1221c187
 DIST ORBit2-2.14.19.tar.bz2 764820 BLAKE2B 8b1180da6c5ae90e83edd330387da2974fd57d60fe79fa99b9f6f87fe7c4b9a816504c76fa055fef0c63cc72d3cccce3be410eb6945549ff30703ca26c8df631 SHA512 313e125234e8d1195be277ad125af169f12ce312cb541a4641c5d57d3c905bbdc6a46672a86a012409cf4d7af58b5122f0e5db250730b65e8d95b2d5f4c4657e
-EBUILD orbit-2.14.19-r5.ebuild 3071 BLAKE2B cddd34f6120cef6379ba5c989092ac9ffc6e160b40cdcf9aa5cddbbf22daa482f477f5278bb659c19b68efd45de941d4b3d0dd68f27ce009f981e3a6d0944e41 SHA512 c9e83bd0e8af004a88af1b2ef37176f894f3d1d3d299b6cb90948a0567c8b8c5079891da194693a764c57c308a4cc9c51c3af47246445ecc816d77adfc4c120d
+EBUILD orbit-2.14.19-r5.ebuild 3068 BLAKE2B f432f7fe66432b9ee8a6e1289663bf3d3ade314acb0a14012e42cdbf33c4822e9388f8bb39ad9b42a33ec152d01c0af7f8a7a88e3517e2b9a7a23be44f8c9908 SHA512 0c3a84f276706058e00a04b81029568c13f0c6b560c94985b91e1f13a664c4bf572a74c7da684241953c9a0df61dd9bb28617c53586239a4e99a679dd11e70ed
 MISC metadata.xml 359 BLAKE2B e60465ce144792058da10587759ba4c1ca3d754b29aa0be28b12efe72eb0616f5b25969f1102612ff37cbe296e0093e0fab0417800ee1efaef6fdf6941800f1f SHA512 07fe8b368b9f16c31d09701b1b1f6714ea3a305f9578705681b212d442e2e216a2d5649e9c76195f004f782a6e32e1eb94a8d9742e6593ce1bd76a7a8af6f385
diff --git a/gnome-base/orbit/orbit-2.14.19-r5.ebuild b/gnome-base/orbit/orbit-2.14.19-r5.ebuild
index 3a4c42c9db38..989d5d6b26e2 100644
--- a/gnome-base/orbit/orbit-2.14.19-r5.ebuild
+++ b/gnome-base/orbit/orbit-2.14.19-r5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://projects.gnome.org/ORBit2/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="pic static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( debug )"