gentoo Easter resync : 12.04.2020

101 files changed, 2346 insertions, 147 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 3c3ea3ee66a1..10f7b2ad60cf 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 01f83ef5d023..228289a35600 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -2,5 +2,7 @@ AUX 3.32.4-gtk-doc-fix1.patch 4057 BLAKE2B 7ca0773467fa13e540e18b18f7c5ee883c1d1
 AUX 3.32.4-gtk-doc-fix2.patch 1051 BLAKE2B c93cda6a5e60dd89beae2ee2d710ef1392c3c99265fe59a4b99dd873875aa93933fac513d4ed2717665a53d747578d94f475b58bb7f61351f637515d9e86249b SHA512 c77607534d7b262044658ccaf88a6281c294561ec9e84a78c6dc79385bd14fb7beda33a175fadb8804be3eadf3ddb3e72055728b6e978f68a5e6ce05643379bd
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.32.5.tar.xz 4588900 BLAKE2B f14d0782c00e9cead10e9e5dd6c5686d4c8a292d70027a08dbac027ba92b998bcea1b219447847284d225096480e373c89369e12198fdf2516ca5b622f81cbb2 SHA512 a1bc350a7223dc2e3d369f0ac8fb3ab210b6b1cc25311daf1ddae6926168f7bd1c3fab69ab261e442e3c30f9b43754e2f8e38ac2a5c32a714223d9741045a1b6
+DIST evolution-data-server-3.34.4.tar.xz 4627704 BLAKE2B d1b93f17eec1dc71b31c9a842af369646c7412c63461a63a0c42026795d97f8b282c498ca56e14b258e7764ce333fad159d4fae534891cd02b99be6166bfbc23 SHA512 e353724591216f472faabaab468d6a8555e05cafda4a8b2c55fa3113226475f0ec9edad65d8acbf95c92844d33f36cf32d49ddc14fe934a2b8c127c32cc7b74f
 EBUILD evolution-data-server-3.32.5.ebuild 4343 BLAKE2B 659f0a4f4d816830884fef39f3f2a546aa20c06b0019d703c2d5bb670112829d7abc0529a631b87decdfe904677c0b02e9c4a3f0b0fc86930a0419c3450acaac SHA512 7822ea9a2984d795a03f28039d2d3580f9b72d5ee3c1ed0afd79f714ae996e97e8ac55ba3da3682d4ad50ec74c1ce4dd972d75b5aa32dea608a47f907af544e0
+EBUILD evolution-data-server-3.34.4.ebuild 4431 BLAKE2B fc478b7ea7a49ba5e0dfddd0d6a7006317b7c2b1fb1c9776a4630053d2a09a792c8bf47500f6e15b635dcc1dddbc5a26ef89567256e46b4939c866c390514609 SHA512 acac520c1326abdc43eb76d79b22efbd37758f0acfd7176f2b35996271cb843907f723ed6aca01cc38c756007714c1f615693bc2ca0791d755430e378623b3ec
 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.34.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.34.4.ebuild
new file mode 100644
index 000000000000..d8d6502f2ae4
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.34.4.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_6 )
+VALA_USE_DEPEND="vapigen"
+
+inherit cmake-utils db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/62-24-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so soname version
+
+IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
+# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
+# libical-glib currently (2020-02-29) oddly behind USE=introspection; but introspection also needed if USE=introspection for eds
+gdata_depend=">=dev-libs/libgdata-0.17.7:="
+RDEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-crypt/libsecret-0.5[crypt]
+	>=dev-db/sqlite-3.7.17:=
+	>=dev-libs/glib-2.46:2
+	>=dev-libs/libical-3.0.5:=[introspection(-)]
+	>=dev-libs/libxml2-2
+	>=dev-libs/nspr-4.4:=
+	>=dev-libs/nss-3.9:=
+	>=net-libs/libsoup-2.42:2.4
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	berkdb? ( >=sys-libs/db-4:= )
+	gtk? (
+		>=app-crypt/gcr-3.4[gtk]
+		>=x11-libs/gtk+-3.10:3
+		>=media-libs/libcanberra-0.25[gtk3]
+	)
+	oauth? (
+		>=dev-libs/json-glib-1.0.4
+		>=net-libs/webkit-gtk-2.11.91:4
+		${gdata_depend}
+	)
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.8:=
+		${gdata_depend} )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gperf
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	vala? ( $(vala_depend)
+		net-libs/libsoup:2.4[vala]
+		dev-libs/libical[vala(-)]
+	)
+"
+
+# Some tests fail due to missing locales.
+# Also, dbus tests are flaky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test !test? ( test )"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
+src_prepare() {
+	use vala && vala_src_prepare
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+
+	# Make CMakeLists versioned vala enabled
+	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
+		-e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
+		-i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	use berkdb && append-cppflags "-I$(db_includedir)"
+
+	local google_enable
+	if use oauth || use gnome-online-accounts; then
+		google_enable="ON"
+	else
+		google_enable="OFF"
+	fi
+
+	# phonenumber does not exist in tree
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DWITH_KRB5=$(usex kerberos)
+		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
+		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PHONENUMBER=OFF
+		-DENABLE_SMIME=ON
+		-DENABLE_GTK=$(usex gtk)
+		-DENABLE_CANBERRA=$(usex gtk)
+		-DENABLE_OAUTH2=$(usex oauth)
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_GOA=$(usex gnome-online-accounts)
+		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
+		# ENABLE_BACKTRACES requires libdwarf ?
+		-DENABLE_IPV6=$(usex ipv6)
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_GOOGLE=${google_enable}
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_VALA_BINDINGS=$(usex vala)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	virtx cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 9a74699d3680..c6e457334dae 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,3 +1,5 @@
 DIST evolution-ews-3.32.2.tar.xz 534056 BLAKE2B 2f935910cba44d69b2d8bcc3021709502c1a129ef29d18a847bccd14837d0c18c9700a97f978decb36f9c28242df81a9021dfc536e31f3d8f7793a0dc4c6b680 SHA512 5696ea660d0b52c0083664ad203eaed372fb9653399152ccbca0f6360a3e0c4503b5dacf4f9bf5650b1b64696c0fe06e2383bb408bed604ea0312660b4639388
-EBUILD evolution-ews-3.32.2.ebuild 1316 BLAKE2B e1837daf5fbfd3c1ba4f292501c98de34203a0556f01595dc5f762105da5bd67628b336e8fea0f03697ced436628fd9f2eb4c053175144c7fd73a93798747e83 SHA512 83f59bca21904024ff9c1032f8c5703ead325262ccfcd177453fedf9d9ed01fe246359df124f0dd0d0378f741f1bf2578f2889d64981db85ebf47de4f2967a1f
+DIST evolution-ews-3.34.4.tar.xz 538964 BLAKE2B 3b23dee72b13bd7da0efdacc13bf16052b52287dfbdeb913100244cfbdc726fdd6dc526fa38eb3da849ea5e9c95e9bb59fedadbe0238c37698cedefdda05f82d SHA512 397dd89c81c986501aaf5c0460735577ebe2aa0bfe549359073e211e912e3622c7ba61eb90898ec00a06bb1c4d02a565446a3b0620ff8515088d706d5c246c91
+EBUILD evolution-ews-3.32.2.ebuild 1357 BLAKE2B f5204d942c734f70d5007d42896d26f46fed7c2ad6a7dea793772310cbccd617bc8b807589d38b0038066f586b1920c4d1d36d08231c6ae22c98988ece9b3c6c SHA512 920b971eb865c4d333344a87298c5c6d8a2b611db41d9fbafbee171d231db5bb1f6a7bb4f3b5be95e1540980d507db6d024f1d494042fceb6c8e2487f150ebf1
+EBUILD evolution-ews-3.34.4.ebuild 1410 BLAKE2B 0d8b0f84ad75a021656eb7dac6207d129ed4e8fdf4af60f31bbee26a0692d570a113bc04647f03d03f6a3567152fcc2d515d02dc4890afe9198b82916985f93e SHA512 76193cf66e8908e03cad8da4d315939ebc5daf657483b53119ec50e0d2a38655fb218767f31ff44157d7af1f9ea4f0063dbb4adcacaf9dc470903d4366329afd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.32.2.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.32.2.ebuild
index ca6e53c82a1d..a8b4c908a341 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.32.2.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-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=6
@@ -20,6 +20,7 @@ RDEPEND="
 	>=dev-libs/libmspack-0.4
 	dev-libs/libxml2:2
 	>=gnome-extra/evolution-data-server-${PV}-r1:0=
+	<gnome-extra/evolution-data-server-3.33
 	>=mail-client/evolution-${PV}:2.0
 	>=net-libs/libsoup-2.58:2.4
 	>=x11-libs/gtk+-3.10:3
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.34.4.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.34.4.ebuild
new file mode 100644
index 000000000000..b3b87637eb31
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.34.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# libical-glib currently (2020-02-29) oddly behind USE=introspection
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.46:2
+	>=dev-libs/libical-3.0.5:0=[introspection(-)]
+	>=dev-libs/libmspack-0.4
+	dev-libs/libxml2:2
+	>=gnome-extra/evolution-data-server-${PV}:0=
+	>=mail-client/evolution-${PV}:2.0
+	>=net-libs/libsoup-2.58:2.4
+	>=x11-libs/gtk+-3.10:3
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	test? ( net-libs/uhttpmock )
+"
+
+# Unittests fail to find libevolution-ews.so
+RESTRICT="test !test? ( test )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake-utils_src_prepare call, if that works
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_MSPACK=ON
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/gnome-extra/gconf-editor/Manifest b/gnome-extra/gconf-editor/Manifest
index 5d5d4eb86b3c..1ca4b5d01730 100644
--- a/gnome-extra/gconf-editor/Manifest
+++ b/gnome-extra/gconf-editor/Manifest
@@ -1,5 +1,5 @@
 AUX gconf-editor-3.0.1-assertion-crash.patch 1194 BLAKE2B 6ce0c5d96e329a32b0632829a812cdd6fae4418f6039cddcffe17fec91c58af8cb5d749eaa2a096496580d0e8ac3daa62ce427ebb6510c626a6e7908bf9dad3d SHA512 5fbe8a51d4f678f7444cfd8683ce171280031c8870a18efea709a5f0667f7701893f6d0d65df72cc6267b01f7a34c925529c5b814ab47a9a270568b3391b6bfc
 AUX gconf-editor-3.0.1-drop-accel.patch 1383 BLAKE2B 16e3e1816c8bb7da13827dfd6579e0cbbbdf73a2b368038e347f444569abec184cc9bc48caf8e6a16925c855b3ba8c5b370c7ab6f3f0cd9840061366b3e9a91d SHA512 c50c4fbbd25170ca7a7261f590862927e5f68eb5d1529ac5252175caa28ea916484d284e307580297f23e2ee8df7822f12e75c2912f8ab808946997d032fedff
 DIST gconf-editor-3.0.1.tar.xz 1452468 BLAKE2B 775072c69f3350b009c07553d178e83885379292159ea9025831bab0f6b91f2e95e341d4f654a0fd8896c560ba99e635b68f3ff825e337ec5b7d558a366fce52 SHA512 faaf237233d94730902d7c8e231545841862451f5998ef06bc3d51f6cdf0bc16bd1cecfc6b6a9e0ccc5197a06bb4f89068bfb478f900f3272ba03a2d94ec2f49
-EBUILD gconf-editor-3.0.1-r1.ebuild 791 BLAKE2B 9cb907e2c859a2082300e3741aa6de48964a76b60ab78fdad8915f0eb10c572b7120bee63944c182d912bca7681f35c22a8a9dfb6505be426b6fa8730c5da785 SHA512 1b9cfc46781ffb71320d4df61ee8e182656ed263ca9761bb1819b08902c9f682074fd7a52fd9ef981ae2a62d6ce98adbbfe65febbdcf39a1badaa04023b8f24d
+EBUILD gconf-editor-3.0.1-r1.ebuild 784 BLAKE2B e4eed912785496058d30b19c33f41cf2165f3402969b76ecb33e52027b66877eb21d693e7648290bd400030b93130e6790749eb01ec751ee80f29a83f9c34bdd SHA512 3b9596366ee9e0c28db8d7cdbd4faf1753ecaf5100b47af4172c320b036304462eacdb173fcf4f45e05e79943cc42d78d9c37334e5ab2f6636b42b74b60e6e29
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild b/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
index ca80e0a0dfe9..cd83dece139d 100644
--- a/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
+++ b/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/gconf-editor"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 037bb339f2a3..0a3f6c4f520a 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,6 +1,8 @@
 AUX 3.32.2-vala-compat.patch 1011 BLAKE2B 99861d3c6c7ae2c35c118676d6805c09ce6475256eea2a90770e0681d01f2cb33351b24854de341752f3e2e4986c1e43dfb7685dbf081ccf2d06193eb03ee7f2 SHA512 c4ebcfdc838ca088fbab980f745c404264927d274f50d4d135d170ebeedcd4c2dc8eb2345d0ba140e4e474a87083dd283e0734c672cc43a70cbe03292b1dc7e9
 DIST gnome-boxes-3.30.3.tar.xz 1198224 BLAKE2B 1c65d3f051d32dc85284da4d392e3ec418edf028b61f1166173ac6ced3e6cba687b297ea135a4e54058c561eb5fe69d767e9ee698fb6b16f6bd4cd09b00d5c3a SHA512 fc8a06bb8c71356d50002468f7722aee14abe8432ccce319ada3032746b53eb2f679a93f991c04ae34832a315fc95d561ffc169c4560a23573c046705b5446b4
 DIST gnome-boxes-3.32.2.tar.xz 1178340 BLAKE2B 9c345e69cc53b3b06b609c3ddfb0f3e1cb54aaffb9ebad4deafd0414913e6d5bc4faecce6e9714a448da7c6094b27d97f039bb8db512973ffd665a5190ff6561 SHA512 f3208f5185ad65750b2f745e8170aaff6a097aa9d706e5abc74259c0940da8fafb046b55dfcc144e8c64782942dfebb711622b552f6daa2dc45ad863d480855f
+DIST gnome-boxes-3.34.4.tar.xz 1191668 BLAKE2B 98a206abdd8a181979b6d40f176b0a1518b51ebd312929c8eab549e6de83b1d299f4c3177d6b2b07873c2e620a744b627adce6bc1c0ef5ae2aac55189377de4f SHA512 025bfe6fe583cedd80b376b96e87a8ecbbb8f4d723490cf18cc2ca73cb959d9e2bae1b784cc1018866c594962d1e508e5a3b9c9562763eb76e7291c5f6189463
 EBUILD gnome-boxes-3.30.3.ebuild 3919 BLAKE2B 40592b490c835d18da742e89ac44941f1f13beefe01cfec8e4b7727208122a8b6cb5d8be8a90fe49280c75ac76b057d3cf3767f8c37b5c982d7c7a7f43dded6b SHA512 e4d3cf2519a0f542a97786154fa802a7aca0cdb5f35f30f04d98293128f625a3cdb13e68f7971668ce23aa18db8a5e55f6505dd0b00c7ec2af000a4fceca61b2
 EBUILD gnome-boxes-3.32.2.ebuild 4057 BLAKE2B c9bd3b0df53c691eecce0fbe2e504ff23382c00af0d4b6b14b1fdd9b9599e5e707c8c8a78bb22deeb0f335b62086da3fa7b6b24709c2de8e1a241168522c4f85 SHA512 dbc8a3818fd736413f722affe7216b7df540288a606b2e84b2ed479a2fcbad5b565b89a56cfaec8aa2db3bd477a7e61783a3fec03c66befab49bd83bc5f6de99
+EBUILD gnome-boxes-3.34.4.ebuild 3846 BLAKE2B 213a62dc5b30aa8b2946217647e051fbd4d5f996cbc64192a635fa4b5f8d13a1c3db857430bfd92a3ffae382fbd780944d33720c86719723fca88ca2cd05b516 SHA512 252bc7c687cf8d472e1984c7846a0324e00269b3b1288a676dabeada1d2f2df40045bd495e427d066a2816c77fbe492ea74eac1df038fb0da18fe9ad0b6ad9e7
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.34.4.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.34.4.ebuild
new file mode 100644
index 000000000000..bdb2c2fdda4f
--- /dev/null
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.34.4.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
+
+DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
+HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
+
+LICENSE="LGPL-2+ CC-BY-2.0"
+SLOT="0"
+
+IUSE="rdp"
+KEYWORDS="~amd64"
+
+# FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
+# FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
+# Technically vala itself still ships a libsoup vapi, but that may change, and it should be better to use the .vapi from the same libsoup version
+# gtk-vnc raised due to missing vala bindings in earlier ebuilds
+DEPEND="
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/glib-2.52:2
+	>=x11-libs/gtk+-3.22.20:3
+	>=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)]
+	>=sys-libs/libosinfo-1.4.0
+	app-crypt/libsecret
+	>=net-libs/libsoup-2.44:2.4
+	virtual/libusb:1
+	>=app-emulation/libvirt-glib-2.0.0
+	>=dev-libs/libxml2-2.7.8:2
+	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
+	app-misc/tracker:0/2.0
+	>=x11-libs/vte-0.40.2:2.91
+	net-libs/webkit-gtk:4
+
+	>=dev-libs/gobject-introspection-1.56:=
+	>=dev-libs/libgudev-165:=
+	rdp? ( net-misc/freerdp:= )
+" # gobject-introspection needed for libovf subproject (and gtk-frdp subproject with USE=rdp)
+# These are called via exec():
+# sys-fs/mtools mcopy for unattended file copying for files that libarchive doesn't support
+# virtual/cdrtools mkisofs is needed for unattended installer secondary disk image creation
+# app-emulation/libguestfs virt-sysprep is used for VM cloing, if not there, it logs debug and doesn't function
+# sys-apps/policycoreutils restorecon is used for checking selinux context
+# app-emulation/libvirt virsh used for various checks (and we need the library anyways)
+# sys-auth/polkit used for making all libvirt system disks readable via "pkexec chmod a+r" that aren't already readable to the user (libvirt system importer)
+# app-emulation/qemu qemu-img used to convert image to QCOW2 format during copy
+RDEPEND="${DEPEND}
+	>=app-misc/tracker-miners-2[iso]
+	app-emulation/spice[smartcard]
+	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
+	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
+	sys-fs/mtools
+	virtual/cdrtools
+	sys-auth/polkit
+"
+# gtk-frdp generates gir and needs gtk+ introspection for it
+# This is only needed for creating the .vapi file, but gnome-boxes needs it
+BDEPEND="
+	$(vala_depend)
+	net-libs/gtk-vnc[vala]
+	sys-libs/libosinfo[vala]
+	app-crypt/libsecret[vala]
+	net-libs/libsoup:2.4[vala]
+	app-emulation/libvirt-glib[vala]
+	net-misc/spice-gtk[vala]
+	x11-libs/vte:2.91[vala]
+	dev-libs/appstream-glib
+	rdp? ( x11-libs/gtk+:3[introspection] )
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
+If you have an Intel Processor, run:
+# modprobe kvm-intel
+
+If you have an AMD Processor, run:
+# modprobe kvm-amd"
+
+pkg_pretend() {
+	linux-info_get_any_version
+
+	if linux_config_exists; then
+		if ! { linux_chkconfig_present KVM_AMD || \
+			linux_chkconfig_present KVM_INTEL; }; then
+			ewarn "You need KVM support in your kernel to use GNOME Boxes local VM support!"
+		fi
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddistributor_name=Gentoo
+		-Ddistributor_version=${PVR}
+		$(meson_use rdp)
+		-Dinstalled_tests=false
+		-Dflatpak=false
+		-Dprofile=default
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index 4bd466d07841..e01c4dc482ae 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-calculator-3.32.2.tar.xz 947096 BLAKE2B 7c511e4d22971b008587aaa9ee7a44bfa663b663ebaddd6b5d4426f673e0f8975506c3b6aaba2781e3ccbe9ab7b9eb9b9d876c1b8acae9e14b195bfbeb207c42 SHA512 ef30ddad8b68367f71c2b894f041affe2b88c8aa90ad40d6128d03e0dc4871fd57d632809a365b14bac0b53dad37a73df564d237b8f45d4c42c38e118cb26de1
-EBUILD gnome-calculator-3.32.2.ebuild 1129 BLAKE2B 5d2a5e5682fb3242a7d63b30d0f32d412932e69feaca81872bc8e79f0d81efc060afe0252e46b436c4622b51a2547bc6e7ff0a1e2fd4e943e0bf3863e734d959 SHA512 a8dea111b7603c252ddf9e9c0b0b1d15bda57c532907e6adaae001099a3c4323d098e09d8ac97cbe10f7dedee5bf5a8446eb9970ab7118b21985e0d2bb8224ef
+DIST gnome-calculator-3.34.1.tar.xz 965520 BLAKE2B 7dd7af4d2065aee9a8962983ebf723aa06e4b2e3ef98213a89044d70e47057a747a88fdd58185abb272589433f84a6fcd3a3c5fd7dc0281d13f34ccaba690b50 SHA512 43900cebc6b479292a45619f1e4f6afc5264e2dceda5d0049b59f27ebe2a32b5f4b2465a22f33b33b882ab0e737f7048fbe9395b18f9b5d2023da2941b6783f6
+EBUILD gnome-calculator-3.32.2.ebuild 1125 BLAKE2B b30623db22ff60d6a090e9cd5178fabdadd81a4bc87dd154f051ce68ff5717492103827aeeb6959a671aa1c84bb2d9022cf069da6ea537c27240cd25620bc181 SHA512 02c5b2fffb9cf022c20d5385dcda7f31a6130f2f9432bc669f98879f8de73b8e6d197e11dfa24a5688e4025477e4c399278d145dda2ccbbfa799ec3f3e017d0c
+EBUILD gnome-calculator-3.34.1.ebuild 1417 BLAKE2B ba2a9a20dcaeb66c79c361c60d0f0d26a2acb8130c63ae7825acd08e0e807d8f21f56ed415ea7cef82ef13d43c3983065d3037ba276c1ac6639e49169fec2363 SHA512 566d7c7a32a49841f3c42d72d64baae88281ccc6a5c64e551e00fe6f08c6c265de427a7411d51d87b8c9c93125e658ea47d00faaf0c77989e3fe5df2aab12755
 MISC metadata.xml 435 BLAKE2B f9ee442cf41d13599b2ac8bbe73a3f69961b5bce68e82544e8d1e5f886c97301b92675ccd38607d5bad961c910ec8ed9ae30a12ca9028e3d9cd92a2ac3bd8681 SHA512 4af60d7bd9142bc3293176d47ff239dbbc10d86493801244e9766bddd556a9c3b34b188f76d250074b3f337e88dc3d97c803ce244e15503c7380015772a9228c
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.32.2.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.32.2.ebuild
index c9031578e5f4..df6f5053dbbe 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.32.2.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-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 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
 # altogether, thus we need them installed by gtksourceview[vala]
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.34.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.34.1.ebuild
new file mode 100644
index 000000000000..088b89520529
--- /dev/null
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.34.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MAX_API_VERSION="0.44"
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="A calculator application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
+# altogether, thus we need them installed by gtksourceview[vala]
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	dev-libs/libxml2:2
+	>=net-libs/libsoup-2.42:2.4
+	>=dev-libs/libgee-0.20.0:0.8
+	dev-libs/mpc:=
+	dev-libs/mpfr:0=
+	>=x11-libs/gtk+-3.19.3:3
+	>=x11-libs/gtksourceview-4.0.2:4
+	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+	net-libs/libsoup:2.4[vala]
+	x11-libs/gtksourceview:4[vala]
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddisable-ui=false
+		#-Dvala-version # doesn't do anything in 3.34
+		$(meson_use !introspection disable-introspection)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index a0a9c8f9d880..6363e3b16896 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-calendar-3.32.2.tar.xz 695416 BLAKE2B bf5b2b5bd8ea5934075d00614a3888208a06926b8587fc39724850c0fccb7e34920bb650f45a241074f5ea383acb80edf91884936c7b432e0a7f9e672e457b8a SHA512 6a1ee1b41080d7814e9a49b3a95689fb01325c9ac5eb1314b11e7097c3b8b120c7ca45b05c806c3dbac284a70474beaf419773ab185a7cdde96303fcc7cd3915
-EBUILD gnome-calendar-3.32.2.ebuild 1307 BLAKE2B dc319dd983394c939e6a70034960c2dd937f81a84be595ac3eba132b388b9e1354b87f3611e1233ead4c20529f7bbe61ad121287942da885120bd33a2ddee056 SHA512 eab7fe0d541b3b758f70e3ded47c81d2fa121c86cc61765e9fdacaf831ec5c2d1e215fbd57fd2c255950096882cebf56ac027f7d4ccb1f1911fb27483d813266
+DIST gnome-calendar-3.34.2.tar.xz 588996 BLAKE2B 114ea7a7ee2a8d7cbaa1d47bcb782d16891ef1bdd87838b62ac51f6c20d2f5711cbddc12a35278c7710ee660b18538211c9eafb64a1efa3df57f721aa7b1937a SHA512 6c69a1ee46a5ccfb4d6d1b7a60932412b486ad4576a4c78c89e03270147e30828ecaca6b5f0e27a741eb9d5ed74ca474ba0ddfb6d044748877b6c9ab7ae023a5
+EBUILD gnome-calendar-3.32.2.ebuild 1348 BLAKE2B d8334267a432b2d94a1c1fb4b9cf8baf3088bb4e9aad9b9e07369d63519f7a77162943f5775018bef7427c5fcc3f1cc561917877847748dacd5f7a0d9ac60edd SHA512 7163d1f66e96a2fd553a9b1de7f24ae8cf7545c4e13fabd0b51b8a789cd15f3da1959bced7f684e8b0f7095bd9611d9111d86ce4ae061e0130d2636b22c801ac
+EBUILD gnome-calendar-3.34.2.ebuild 1131 BLAKE2B ba1e4d0fe38e8bf876bb978f4db95ba7fc20b970412cc96a229b0397b849277b0c0395d39d24129c3e3080ca3983b90e1840dc77d6d791e81a07b2cbbc79a64e SHA512 4e44a7ac55dc7d97b5c342aa3cf4b1149e56b43f052f0591a9bcd3d23e98609371b263a136e5828dff721cab21aa30a5f2a90b5b23cb30687673dc2feaf6af54
 MISC metadata.xml 522 BLAKE2B 24cb41757041daedf83e72cd8620bef49d2bced678ede42c1a071c3cf99f2f157b086acc393953b42a612dd5c4d622b0a869934f89661c28be742370cd4688c2 SHA512 f595d013522df745a86b01e6696ea5fe6dafa55d55e3fe22adf469fef56507846194f24c2ec5cd13382c69a494ca530438d12c69a6bec41247da1783fc78eef8
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.32.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.32.2.ebuild
index 609ef28cfc8e..f080c9354f47 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.32.2.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-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
@@ -17,6 +17,7 @@ DEPEND="
 	>=dev-libs/libical-1.0.1:0=
 	>=gnome-base/gsettings-desktop-schemas-3.21.2
 	>=gnome-extra/evolution-data-server-3.17.1:=[gtk]
+	<gnome-extra/evolution-data-server-3.33
 	net-libs/libsoup:2.4
 	>=dev-libs/libdazzle-3.26.1
 	>=dev-libs/glib-2.58.0:2
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.34.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.34.2.ebuild
new file mode 100644
index 000000000000..f5261fb6c163
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.34.2.ebuild
@@ -0,0 +1,51 @@
+# 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="Manage your online calendars with simple and modern interface"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
+DEPEND="
+	>=dev-libs/libical-1.0.1:0=
+	>=gnome-base/gsettings-desktop-schemas-3.21.2
+	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
+	net-libs/libsoup:2.4
+	>=dev-libs/libdazzle-3.33.1
+	>=dev-libs/glib-2.58.0:2
+	>=x11-libs/gtk+-3.22.0:3
+	>=net-libs/gnome-online-accounts-3.2.0:=
+	>=dev-libs/libgweather-3.27.2:=
+	>=app-misc/geoclue-2.4:2.0
+	>=sci-geosciences/geocode-glib-3.23
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+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-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index cc277e66d0f8..35c6a3b24260 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-clocks-3.32.0.tar.xz 505368 BLAKE2B 54952a9c0340d30e042ac4b947e6a0a8dac9823d8df2c7cb5871a6dca1e259d18a9e212d37d46901b41f1f1e41ce09fa86fb02d9ea90f23bc23bc8d9f159e994 SHA512 061d867cffd3d8fcd09e125f8d053b847f2b197a4354f330e8b6c43d7aa5e0cf2bb51b342545c79c352f9dfbddd1667f3e64a40c1e117e6fc63f54289cf7cd2f
+DIST gnome-clocks-3.34.0.tar.xz 506772 BLAKE2B 04844fa95ac58915694f3bac3fafb78f2117be259fda0b799403563bf5e52a0921d5b7d7fbaa85fd9dd8438b9dcbc2f7aef97f61bd812d62bfd188b81cbe0c35 SHA512 9e59534c5c8257ecab97876fc2742d37fd5dd1aad770ac31dd1c7dbafa9843f992c7cc39e3f5025f5091baf852538eb9d62bb07dd0a5c3c7a6cd69befa61ab52
 EBUILD gnome-clocks-3.32.0.ebuild 942 BLAKE2B e6776b51df2deb0833be9211eb5323998151796c8425751cf27ac94674faa7b6377206b2f49a1d336a59777921f8f118f2a947ffa1712ad06c60d295f399ff9b SHA512 0c4e73a50dbeb5d002dffe0c1dc689823e811ea81b4bdfce6971557859e509ea9827e96d8946315826ae1ec2eca420683b7b4aeff2bfca183c57f4d5bd24717d
+EBUILD gnome-clocks-3.34.0.ebuild 944 BLAKE2B 51c29ef223261e86c18933f06180ec0512eb1e772b409bd429251e387d9e071a62afc136b2303cc498f7112836cc314b941b18d011a13588cf8b74a967977a7d SHA512 efe930f42ac0c6cb51ee94913f20f526cf16b5f237238c6163f9552d0e38ebf6e48e52818434220140e3efb78ab878dca1a84c0f352f44c897eb7d04525ab822
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.34.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.34.0.ebuild
new file mode 100644
index 000000000000..ca0efa59611e
--- /dev/null
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.34.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Clocks application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/libgweather-3.27.2:2=
+	>=gnome-base/gnome-desktop-3.8:3=
+	>=media-libs/gsound-0.98
+	>=sci-geosciences/geocode-glib-1
+	>=app-misc/geoclue-2.4:2.0
+	>=x11-libs/gtk+-3.20:3
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+	dev-libs/libgweather:2[vala]
+	media-libs/gsound[vala]
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	meson_src_configure -Dprofile=default
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 554647cd56e9..53f98e090d85 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,6 +1,8 @@
 AUX 3.32.1-libhandy-0.0.10-compat.patch 918 BLAKE2B 53fceb62485c109623815a4087743a4e56c7ebba53ca780a67e8bd2d7e645efe7ec42cf45a38dd32fc042fa463d033bed796ca96d0a246d4eb8c4f5d9a88a6a4 SHA512 4f77e953b7ccd818f0347d470690a92906b045c4de129428db6a4fa211882d7e9f6e8956ec65a7ae66e9190551fe36ceb64476e62ab91e6755b93cca1b88f02d
 DIST gnome-contacts-3.30.2.tar.xz 368476 BLAKE2B 502170e327eb63a6d026af94a09949f6b973dba0c59079a23c7f37dfde2a391ffa13d905452741c403ada8e6f1101f7a5620ad9b59eb4c5341e96d357d8fe99b SHA512 cf6ab33ef6147bceb5a4681b83830828fd4caa47d83fa9f71e01db3caf710f7f09fe60d2956565a2b9bd124356e100b31d6372ac4d4d231718230915a135e79d
 DIST gnome-contacts-3.32.1.tar.xz 358800 BLAKE2B a3cdc58948b994868a18e74dd2ab1a1ffea04b84da95347f19b79b49a7eb9363589e08e11e8fa2f588c5833592be3149ea435b6036a376d4c9e1477d0d308e96 SHA512 25fc4835c61bd5f195512fd304955058e1178cbafaff09a6bbfffc58840876f514ebc3119247925266a9c10f8fc452511a055d84aa1e815571188aba7212fe71
+DIST gnome-contacts-3.34.1.tar.xz 365384 BLAKE2B 3563ce0784c19b2cf61e3cad60afaeaa310c53c68f11da459a3053df6be769fe0bdfea84f106e11fd2921c3f6bf8ef6a03b8cd90a680dc5b46d9a0486fd0c737 SHA512 6dad3fd9d199ad87c642e9f36102a142958cd3f577eba36fa3ed2800af5acb44752fa1f8b7eb8991974c514245af51015e6b5e08636274b9048813c37abcc478
 EBUILD gnome-contacts-3.30.2.ebuild 1535 BLAKE2B 83ec57595fce94b72e7b27698b1b61741fe7d4d146d1d1e0b46db1d135f495c82f4bb42d19a35889e8cbf2a155f1c27415b860eb9598d8e6f4c4695d257ccdac SHA512 361f2b124cff1fab69565045246465c69191003911bae74e33ddf46b362c9eb8e9d108a35d9e13fed41f149fdac9b4964792e2814ccccd13eba44aaff2821582
 EBUILD gnome-contacts-3.32.1.ebuild 1702 BLAKE2B d1d4e18d423dbec2f53acb4979a612ba6a8cce1c312b2710755374fc11a8daf913992f97ab3db1a72f4f5065c10149f48017cf5c196d6a17ca77381925310585 SHA512 4a975af07b04be2321bc694b0d8bada6c57cc0721388234fe9904599e01df2d8bfc9c3a57a11a8feb345c87e71e378f21df552beaef117e551fd4caea01d9c95
+EBUILD gnome-contacts-3.34.1.ebuild 1614 BLAKE2B a09962eb4daeb9cb6ef44f220ec19afb77d38f23813e90b35406e5b95145c9ada9aab2b11dac8a3288418fad388fc2739083a68e8fb1604bc0860e9957329f14 SHA512 562f5cd2aea4a69b1c9e015b9bb96bb60835c514843540ba5a7e8bdf302e17e68f857b744cf1b39c7cc67766c07ec0c2e81eb35880e4c268af4f7d72cd56740c
 MISC metadata.xml 325 BLAKE2B f00835a4dbd2fafbc578f1d36cd3101da6ccbd9236b6a874c862f6e584fe856c7fc1585e0d9da7c3c6a243cc1ea271fc281a127c2f330ba91495873baea0ac6b SHA512 5c6da9fcb4666a80a2fcdaeaa0263feee21140932084683dec7257bbb9e686a08d7d2b476684800216c13f3c851a92416267d5415c25643200250edd8d6041f5
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.34.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.34.1.ebuild
new file mode 100644
index 000000000000..ae3a1368f985
--- /dev/null
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.34.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="GNOME contact management application"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="telepathy v4l"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+VALA_DEPEND="
+	$(vala_depend)
+	>=dev-libs/gobject-introspection-1.54
+	dev-libs/folks[vala(+)]
+	net-libs/gnome-online-accounts[vala]
+	gnome-extra/evolution-data-server[gtk,vala]
+	telepathy? ( net-libs/telepathy-glib[vala] )
+	gui-libs/libhandy:0.0[vala]
+"
+# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
+RDEPEND="
+	>=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts]
+	>=dev-libs/folks-0.11.4:=[eds,telepathy?]
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/libgee-0.10:0.8
+	>=gnome-base/gnome-desktop-3.0:3=
+	net-libs/gnome-online-accounts:=
+	>=x11-libs/gtk+-3.23.1:3
+	v4l? ( >=media-video/cheese-3.5.91:= )
+	telepathy? ( >=net-libs/telepathy-glib-0.22 )
+	>=gui-libs/libhandy-0.0.9:0.0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${VALA_DEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use v4l cheese)
+		$(meson_use telepathy)
+		-Dmanpage=true
+		-Ddocs=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-documents/Manifest b/gnome-extra/gnome-documents/Manifest
index 89f6d15fe69f..046560941801 100644
--- a/gnome-extra/gnome-documents/Manifest
+++ b/gnome-extra/gnome-documents/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-documents-3.30.1.tar.xz 4777500 BLAKE2B 889a089e4968e233185a6018559487e0cede40bbe789bee3e1eaab3283bf66f797dbcf7281361432d0b3a41b68b1914efbfb5be4875fa1986cbe3241a40cbcb5 SHA512 89966d49ececa11ab49eb0e192c6a1d398ef13f2f809a02cca2d13f7ffa4cef45a29801971edec22d2f471ab4291a058c702842e323cb2a1ddd7fcc37d51b6cb
+DIST gnome-documents-3.34.0.tar.xz 914100 BLAKE2B 5b59931d488a5b3d3b2940852b64b0af3cff71c685d62e07bee5d0e981e9a78bb913db853c0c3f138ea1728d2ff7495b689f1f5509064131ee2a4649e65d527f SHA512 5867b148aaffd02089e4f1148cf0fbce37ba0ed40c7d255f9261cd225757f56b68293d59476ab7c11ebbe310cc7935081b2770e7bc24bdbddb5934da5ea0cf87
 EBUILD gnome-documents-3.30.1.ebuild 1671 BLAKE2B 1f79ceabf9acc8ae0909908236cd2beadcc01473411728202eba56550ae4814e1d2a2c2c00278d8062080be58ac9e1d6804f2224128a3b8f879c380a6f09a3e4 SHA512 0cbd3fc7fc0f57e3515b1a22c80111d634eaebae76e60c2972da30ad444e14fda5eebf7353f12b3b6b5b158c9c91eee3e169aee0e5594ba87dfa7f8f39a91e1d
+EBUILD gnome-documents-3.34.0.ebuild 1609 BLAKE2B 4f8be96a3eb3a4518dc760239418dc6066ff9eebb4d1591dab97bc6c0e85287332b47f8d3d242462e694c96ecd61004acfba7a73f14c729b762fa0f7ac681249 SHA512 4e4f1750dc1a5559ed00e1f72af2ef3da0cb0c6ec08f172d27e24966f5c144caf83baf17317b86343aa62cbe1a24bbd4870ef115bc8e36d35666704f45c895f5
 MISC metadata.xml 545 BLAKE2B 8439ff865c4f511b16c015eb14f037331dd31cb8430bbd2fe3dc3ddaddc8eafef6f25b9284288e9bd7606ae02170466bc5635629f7bba13dd06a35ca8b121f86 SHA512 ce74bded73ae951c37b8bf2d4d703dcf0e546b786da7e1874a9bc3078d9bb455e17abb2380fabca0b9cb00425117db7782dbc18c9f16d056cc489b2bd1ad53e7
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.34.0.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.34.0.ebuild
new file mode 100644
index 000000000000..6e5ef81238e5
--- /dev/null
+++ b/gnome-extra/gnome-documents/gnome-documents-3.34.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="A document manager application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+# cairo-1.14 for cairo_surface_set_device_scale check and usage
+COMMON_DEPEND="
+	>=app-text/evince-3.13.3[introspection]
+	app-misc/tracker:0/2.0
+	>=dev-libs/gjs-1.48.0
+	>=dev-libs/glib-2.39.3:2
+	gnome-base/gnome-desktop:3=[introspection]
+	>=dev-libs/gobject-introspection-1.54:=
+	>=x11-libs/gtk+-3.22.15:3[introspection]
+	>=net-libs/libsoup-2.41.3:2.4
+	>=net-libs/webkit-gtk-2.6:4[introspection]
+
+	>=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection]
+	>=net-libs/gnome-online-accounts-3.2.0[introspection]
+	>=net-libs/libzapojit-0.0.2[introspection]
+
+	>=x11-libs/cairo-1.14
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/pango[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	>=app-misc/tracker-miners-2
+	net-misc/gnome-online-miners
+	sys-apps/dbus
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Ddocumentation=true #manpage
+		-Dgetting_started=false #inkscape and pdfunite build deps
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-getting-started-docs/Manifest b/gnome-extra/gnome-getting-started-docs/Manifest
index 755ceaf4ea9b..974d10cb3732 100644
--- a/gnome-extra/gnome-getting-started-docs/Manifest
+++ b/gnome-extra/gnome-getting-started-docs/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-getting-started-docs-3.32.2.tar.xz 110300936 BLAKE2B 214e9896c0b3c3a4886cf24cbd5448d27a47cc14f0729e7c790eedd8a1edb3bd11dacae76b16f7b940bed81b74168927a0d708f6ab9e74ceab1c22dc22a7c651 SHA512 19b9c8fa9f03799287989c7cffb74bdb17b12d7045a61dd9d3d2921e8f06071f5f01b2d9ec956cede159208fd7ca4f367e11ef9820224e9a5f611100962c21fc
+DIST gnome-getting-started-docs-3.34.1.tar.xz 91398724 BLAKE2B fc208c7f88ee2ea00af74362540d22ff70cef14aad246021e416ef1b36c3cd33ca783c9947c0a60c8d83f65c7cf289c3c2e284d84efe61d6ec24f7a6d1843673 SHA512 a4e7088cf1eeb11ae8f863ce0496ca312d527b678df3867a5995d51b620a1db56e57afeb7623edbfbb6184aaf792864f4759d237a255a2fd51d0dda64aeff356
 EBUILD gnome-getting-started-docs-3.32.2.ebuild 418 BLAKE2B 1ea6ff77e0e9975a9da971bf844cbf67cd2d395ad1f0010966990b20570fffd94ea84446873390445e701163b6f25467e93895534f7708af6531989e43567924 SHA512 76e9dfb8cae83455ce77f4c62603d99543010c3e2bf91649de5a9fedab74f3b6536848869f7af30e2b01d922dc55fb7b80a3b9d39a277c405822def4d9562ecb
+EBUILD gnome-getting-started-docs-3.34.1.ebuild 420 BLAKE2B c538a7321e2b358c714d90c017d76e6a8802de11b7f3ed293b8d826c007b3838d828235f8130d6ea84b1b2d18073f53eefffb54385f82628b33828c0e8ccb9dc SHA512 4c2f07f20e0915386a005900534b626443edfa3e15c67ebbd749bdfe4899d2e989cc527492dcfe7a474ada7c60cb2901e0fd178382f9f173aaedc9a069c5719f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.34.1.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.34.1.ebuild
new file mode 100644
index 000000000000..643475314c66
--- /dev/null
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.34.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Help a new user get started in GNOME"
+HOMEPAGE="https://help.gnome.org/"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="gnome-extra/gnome-user-docs"
+DEPEND="dev-util/itstool"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
diff --git a/gnome-extra/gnome-logs/Manifest b/gnome-extra/gnome-logs/Manifest
index 651eb8f73fbd..9c15b662f2f7 100644
--- a/gnome-extra/gnome-logs/Manifest
+++ b/gnome-extra/gnome-logs/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-logs-3.30.0.tar.xz 1289980 BLAKE2B 51c99c335b72039eab96feae8acff55f17c65b44959ce7b0f6a310a71dc4d372fd7e225a73650896a7177650ca77df6cf340a91cdbbff0cd18dfc1b2fd658d1b SHA512 940aa6883538aad28ce86e313425e28f2633d68f55dc3b17260bd81f6232799b29234d9a26dfd0cd26af0d0debf0cb832e76b5b8743d95b8e32514ac5fe6ece0
 DIST gnome-logs-3.32.1.tar.xz 459524 BLAKE2B c3330257df4e6baddb7cfe6053787d2084ea50ca36b2d792c940be997a07b198a3b1277ab5e0d9ccaa272ffead8df05d27cf7f9cd637f882ba0fd23b0b199a91 SHA512 bb2bec86c68ed9850bae99420d5ca7855ae557acb5712ec17c67c071faf98b84e8562d27acf09c7feb08a62eb1570d0c72d28a1415924304b2ade36692428da7
+DIST gnome-logs-3.34.0.tar.xz 755704 BLAKE2B 2f9c494f062adce6f325baf5eb29bd6b9ad8144bf1e5ca5ee5672922ed6086f3ddf5be9dcd0d33c74b9c8ffacd1f2de060b2d62f3ae4b9d2206c1f74d7e88260 SHA512 4c93f85539c0cf51de9fb27212800466ee36bc1e105906456db3854b663bee68024eb10b288327893ba27bf1f5c10feeaf0101baba6a34cf18171a3ba5c8c48a
 EBUILD gnome-logs-3.30.0.ebuild 898 BLAKE2B fee69afffd4975c489be85e502aead7e803c98a5288d485e9e86b7bf67bd91671a0a53d0474fbae8de14f462f207b5bae401575ab857b5ad3946f624cd706ede SHA512 5a9752c433b7a8f7a13f59e75a441bded180b8c43d641a5f4384604a2376cce58cbaff272aa88652858119622c0857c5fdcd3aac671554f3543546031c182dc4
 EBUILD gnome-logs-3.32.1.ebuild 899 BLAKE2B 1ef591cf196c29bb4969e844df740b49b88a3bee02de8cbc0d8b991c8f3ecbd4e3cbaaf5d8c8f11e39e77ae01c546d2b581ab1078f8db00f7c3bd9221c027f78 SHA512 3a7fb30629439f9f6586ab3648cec06db687fa5900c86b0bbf3c53e4c92da256d037c7eb1d32207d515656fc7998b8a8b56c89027d419c03b9301bb297e4f9f3
+EBUILD gnome-logs-3.34.0.ebuild 777 BLAKE2B 513715e8472ab902fea643c44cf760af4aee46935fb33b5e64aff8ba9d4131f9263eb56a569d0ac3309bbe5753f23d68e6f8ce0bd14f44a4f96d589bbf531399 SHA512 bd297025332da2b1c8fbcbe9e4fc0f5cf4624e49df7cbfea8e0386d27220a4bb7a874193194ea143ab058b66a5d73cdf77deaf6bd340804dc24cbfc5cb286ed6
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.34.0.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.34.0.ebuild
new file mode 100644
index 000000000000..0b0cd46dfb9f
--- /dev/null
+++ b/gnome-extra/gnome-logs/gnome-logs-3.34.0.ebuild
@@ -0,0 +1,44 @@
+# 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="Log viewer for the systemd journal"
+HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	gnome-base/gsettings-desktop-schemas
+	>=dev-libs/glib-2.43.90:2
+	>=x11-libs/gtk+-3.22:3
+	sys-apps/systemd:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	meson_src_configure -Dman=true
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-search-tool/Manifest b/gnome-extra/gnome-search-tool/Manifest
index 37a0f71d5957..ad5e8ea3adc6 100644
--- a/gnome-extra/gnome-search-tool/Manifest
+++ b/gnome-extra/gnome-search-tool/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-search-tool-3.6.0.tar.xz 685172 BLAKE2B dab076a7f03d8d2cf7ebc884f65b737d627e27c67665b44147113aa898667aa84dda4fd5bb1196264e2cc3221c3bb166fc01bad36c5363f0400744d779330387 SHA512 55126e1d49b32015e5bc6db70a7094b3ea72ed447d66f530f72fa057af982faa1dbeae5f179cc3c0ed71fea58f756f47c40809e9d11c68239fa2232352e579a5
-EBUILD gnome-search-tool-3.6.0.ebuild 901 BLAKE2B 3d452430ae906a3b4e0ce33943b2dbbcd5123415b28857d3bf7579281a8bcd8b2c73c5265b6d0c1aa2b7b4e1dc89f24b1912d3ce368d165634868fabda7edcfd SHA512 203a022bc211ff28a33397f877405ab61a50f11350c2dcd08467fd756c3f0704e206388614b19f6a639d4251b130d9fbfc52b117153a4fa657661cd125f70211
+EBUILD gnome-search-tool-3.6.0.ebuild 894 BLAKE2B b68343b1e5ab1c0df6c62418ca5d65fdde4193a5ba33f89f578e01352588e0611192dd27acacf21b6c3f764b88e0b4fc3f3055c3b06201cf9395c5045a1b7844 SHA512 2ae7bebd182ce960c2192e87e6e46b675014bc6799f99077dd9bd82025ae6078304d5e1c76f5a210a7286173e7884a85db58cae6eb73e9484fb97d9722f69293
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild b/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
index 52387683b7bc..6a896b793d89 100644
--- a/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
+++ b/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Attic/GnomeUtils"
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	dev-libs/atk
diff --git a/gnome-extra/gnome-shell-extension-appindicator/Manifest b/gnome-extra/gnome-shell-extension-appindicator/Manifest
new file mode 100644
index 000000000000..6008376c1701
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-appindicator/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-shell-extension-appindicator-33.tar.gz 32600 BLAKE2B d24e18dc3697baf5f6a5466da6ba6bc4e699bb20cabde80dcfb007b339246cfb940af4407bc99d22632a1dfa1fe255a60fcf608ec50af88e3edbb2dcbceddf69 SHA512 ceb79a1fa22440210477e53e1ebca3db3ea81eb8a45613c46d37f44ebb3e063b626a073df519af978becf1c6a83d68c02a26f22bf0a9ed43e2299bbab7acb599
+EBUILD gnome-shell-extension-appindicator-33.ebuild 901 BLAKE2B b896325223cadabc32b8dbe698dedb15a2f54eb34dfd6deedb2dc7abaf951eed167e57905676c69509c5690b6fcd5529a8e54040cb53a1e23f552500dcffa46c SHA512 51d87864fbfc517edf2824f76fbb492ef1fcca2ad39442479989978fd4056bb8ad9e19f280a6778518b68f745409002ca22b63557d4f449c2588dfc708bc50f4
+MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-33.ebuild b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-33.ebuild
new file mode 100644
index 000000000000..933325eeb279
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-33.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Support Ubuntu AppIndicators and KStatusNotifierItems in Gnome"
+HOMEPAGE="https://github.com/ubuntu/gnome-shell-extension-appindicator"
+SRC_URI="https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	dev-libs/libappindicator:3
+	>=gnome-base/gnome-shell-3.34
+"
+DEPEND=""
+BDEPEND=""
+
+src_compile () { :; }
+
+src_install() {
+	einstalldocs
+	dodoc AUTHORS.md
+	rm -f AUTHORS.md LICENSE Makefile README.md || die
+
+	insinto /usr/share/gnome-shell/extensions/appindicatorsupport@rgcjonas.gmail.com
+	doins -r *
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
diff --git a/gnome-extra/gnome-shell-extension-appindicator/metadata.xml b/gnome-extra/gnome-shell-extension-appindicator/metadata.xml
new file mode 100644
index 000000000000..020b40648ee8
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-appindicator/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
index 2fa59ce00aad..7d0be0a40663 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-shell-extension-applications-overview-tooltip-6.tar.gz 79354 BLAKE2B f9e6aee73c742a080ad82434c3741087a2db1d9ad91ed377d380267edaadc4754a7e2621f228ebcac7c3eed1fcdd83960bbc949f38b07e38dfffeac4452f3a9e SHA512 1c12434944e8803dfd6e5e95fd932386345c4632214059070c56d1640a7c13a88240f225fdf6efe2fd1deb0c8d0a07009e01dedd4f56f029303fbd5e33faa116
+DIST gnome-shell-extension-applications-overview-tooltip-7.tar.gz 79965 BLAKE2B f7698bdad46837f1ae736bbb2d9b376a28946df5f8a00d2e9b19d48bc4c2f4e742030f952d14bf5816ca1aae9b172a2639e2170d6bd87f373ff23c7ce9bd8912 SHA512 1cfaf23fefe5a940ae448658e176c69da9bb319f6200983b4ac14f65e76f5e449b9a235e6c1ccaf9b6d6db0fda9576e963fa1273b776dbfb5a72c608961e2d48
 EBUILD gnome-shell-extension-applications-overview-tooltip-6.ebuild 1257 BLAKE2B 10d0f9276023a390dcf219620e7047fcf5439dd3b2c0dc7495303578c78eab7a5bfc6e2ec1909de96eabb9c3258593aea4e0e21955f9ec190ff23779deb4efcd SHA512 ac19312f3e552bd867eab9dd192a9140c891016423a1f40d14b35935961348959c1fb60ad278ede23c38b3afcc95e7a4a8e7a6f9c533cdf8ef7ac04e390d85a4
+EBUILD gnome-shell-extension-applications-overview-tooltip-7.ebuild 1259 BLAKE2B f67489ce0d5bb6ab6f01fec03f30d6b9b50fc48b220e910c7f93055bd945629cd7d2345d1d9c7b491965d59a1b30e728ac1faf33b05b708e74d9dce1fb01a110 SHA512 49caa780b4898dc9849617fdfc17edd4c6aaa164b749dd9b4833a27c7749bd823d9cd3e1cd783c2078a54d7c2515275771cf78941b99e1e1f31399994d5c5629
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-7.ebuild b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-7.ebuild
new file mode 100644
index 000000000000..8d4ffa583955
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Workaround until https://bugzilla.gnome.org/show_bug.cgi?id=663725 is fixed
+DESCRIPTION="Show tooltip with full name and description"
+HOMEPAGE="https://github.com/RaphaelRochet/applications-overview-tooltip"
+SRC_URI="https://github.com/RaphaelRochet/applications-overview-tooltip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# https://github.com/RaphaelRochet/applications-overview-tooltip/issues/7
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# glib for glib-compile-schemas at build time, needed at runtime anyways
+COMMON_DEPEND="
+	dev-libs/glib:2
+"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.20
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${P/gnome-shell-extension-}"
+
+src_install() {
+	einstalldocs
+	rm -f README.md || die
+	insinto /usr/share/gnome-shell/extensions/applications-overview-tooltip@RaphaelRochet
+	doins -r *
+	glib-compile-schemas "${ED}"/usr/share/gnome-shell/extensions/applications-overview-tooltip@RaphaelRochet/schemas || die
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
new file mode 100644
index 000000000000..e30233b25e4f
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
@@ -0,0 +1,4 @@
+AUX gnome-shell-extension-bluetooth-quick-connect-10-3.34.patch 218 BLAKE2B d44cf86a76c0a5a0596db9b49f96b1105a05493b2d39b13c6934c4410c8f1c997053b7d36ac20f1e7815ddbd0e536715da7e8be794ee941dc3333e4c08dc7986 SHA512 cb72680ab9ee09d1cf47b104dcb98749633ebeda2e8aaf2d7757387600287ed0846dd3cc4851df65d0aa61c5c434fccdf3ee9a41356da5287ae11f9ffd22afa0
+DIST gnome-shell-extension-bluetooth-quick-connect-10.tar.gz 18214 BLAKE2B 6ca20071041605c5b0a34198562b0d913d4527b2521a0f219e7533730fece41607b2270f0349f0511a6270a9f5b4f5d936247be740a6813aa9901adf3cc0fdba SHA512 5d2dab53b5377cba00743de6501259691c519dd404922bab0e500ca54bcf8942731795aff122c1669471fd3d6a51521ecea966cd2df843777ef1aa871a548772
+EBUILD gnome-shell-extension-bluetooth-quick-connect-10.ebuild 1187 BLAKE2B e847f4312ebddc3a2c0c309201990fbdf122f31bec592c90ed4c2b43979d9b47ff0a34c6d312e11eb04a183c199b354ab15c475f0abd69cfe020170631649fe2 SHA512 b353d379b8d582ce6af377b265969d20cac22b804354da381f8569ab54e9dcb53466bd042d6a0fea52c51f0f37dd9fa447c51b09f9767b4ac6a34a06c145d5e5
+MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/files/gnome-shell-extension-bluetooth-quick-connect-10-3.34.patch b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/files/gnome-shell-extension-bluetooth-quick-connect-10-3.34.patch
new file mode 100644
index 000000000000..abde8a8ccba5
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/files/gnome-shell-extension-bluetooth-quick-connect-10-3.34.patch
@@ -0,0 +1,11 @@
+--- a/metadata.json.old	2020-03-15 18:17:50.474579697 +0100
++++ b/metadata.json	2020-03-15 18:17:57.704750038 +0100
+@@ -9,6 +9,7 @@
+     "3.26.2",
+     "3.28",
+     "3.30",
+-    "3.32"
++    "3.32",
++    "3.24"
+   ]
+ }
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-10.ebuild b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-10.ebuild
new file mode 100644
index 000000000000..c0f1c95db975
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-10.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Allow to connect bluetooth paired devices from gnome control panel"
+HOMEPAGE="https://github.com/bjarosze/gnome-bluetooth-quick-connect"
+SRC_URI="https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# glib for glib-compile-schemas at build time, needed at runtime anyways
+COMMON_DEPEND="
+	dev-libs/glib:2
+"
+RDEPEND="${COMMON_DEPEND}
+	net-wireless/bluez
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.26.2
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${P/shell-extension-}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-3.34.patch
+)
+
+src_install() {
+	einstalldocs
+	rm -f README.md LICENSE Makefile || die
+	insinto /usr/share/gnome-shell/extensions/bluetooth-quick-connect@bjarosze.gmail.com
+	doins -r *
+	glib-compile-schemas "${ED}"/usr/share/gnome-shell/extensions/bluetooth-quick-connect@bjarosze.gmail.com/schemas || die
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/metadata.xml b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/metadata.xml
new file mode 100644
index 000000000000..020b40648ee8
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index 21a787dc26ee..ddfac98931b1 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -1,6 +1,8 @@
 AUX gnome-shell-extension-dash-to-panel-26-branding.patch 637 BLAKE2B 1e124561143b577413090e16c7ad0c8cbb66911b079ae5844da9cf04e0197aab15fc4f746d3020ab7d4e6756b8a35befa773967c223d29289e13c6b3ffd70234 SHA512 8c176972ff10e87e957cfdda23e86a3e434dc050e8a954e7c2257942301daa5aa7c5b788188768f13c5b009d842fca8b14819a255a6a561dac8fa60e355ec211
 AUX gnome-shell-extension-dash-to-panel-26-opacity.patch 578 BLAKE2B 64feaf9d1acba25d991d52e10c78741dbe9f948639c951e9b11dfbc1ebb7e83c854ffcb4ac2b3661b5482868bf9de8d91b661775f3eb1f6a762ff36e9b737a0b SHA512 0c09afaabcbbe6c10c930dfc9acb72fabf2c458486bc9f62661aab41bbb2b3fd2fbb430e31c36915dd2233c28486597aba5ccd9fb25c9e7945c10cd856b6e26d
 DIST gnome-shell-extension-dash-to-panel-26.tar.gz 21100594 BLAKE2B da90d4f496e10c14c554edb74065c95bf211f6778c097e3b81d863a46d0d3477f281cebac72f334b461f28b998284a861363b27d6c17ef5b1d47947a1f44bf01 SHA512 45bc148d2419db5943d0c2170ea3739a36c5a928c39d070501c5dfbec3910ba08058af1926c42f75d6b3e5918d8c30aef4f38db0af14115c11027520fa582a2f
+DIST gnome-shell-extension-dash-to-panel-34.tar.gz 21115843 BLAKE2B b1bb021b324fb69d65341aa83c528ef4029a282ea951361bc81860b8941a804b48b3713d095d5f160f8673e6de93855d2d34b63c7a04102f1d8995333cdbcbca SHA512 05acc8607175b99dd501e07624b242994ecdcc8d722081a37d254852de5b23de45ee9846d27ce9440c9a3c5ae4b279e6816c2c8a6fcc048fc5b01c9b72b005f2
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD gnome-shell-extension-dash-to-panel-26.ebuild 1700 BLAKE2B a205c07d88a99441a2f2d21c94746bdb555bd9892e15e0d7ec4d2ef1e7676915b54bb01fbd253a9e040c820c4fd952326d23c6be71c46fd21f234dc6d8b7e870 SHA512 121b9e2446e6484876c1412e7f3032d31fe1a2c1e507c8b4156faea89ca8a73607a79999933e47a3fe3139023b55ec866392604b54cfd37b28d9e0dc2042ee83
+EBUILD gnome-shell-extension-dash-to-panel-34.ebuild 1702 BLAKE2B 9514ce8cc1dd5ea768fbb20ea2b9c803144f22345d431d66ad560c1d74be07c98be15497cac65d28e2ea7f969b4eb1c9cb3d9529be60989bb29a7b216a0fb384 SHA512 36ba1fd0008239e33017b58fd9ada13b41669cf3fb9c0d21b3d8fa54aa39ccb240d0e14662ad0042af81a52d82235a1fd0035422361d098e119284c30ef764d3
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-34.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-34.ebuild
new file mode 100644
index 000000000000..c5470a35cce9
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-34.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils
+
+MY_PN="${PN/gnome-shell-extension-/}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="An icon taskbar for the Gnome Shell"
+HOMEPAGE="https://github.com/home-sweet-gnome/dash-to-panel"
+SRC_URI="
+	https://github.com/home-sweet-gnome/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="branding"
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.18.0
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# Enable by default custom opacity to get panel slightly transparent
+	# as was done in older Gnome versions
+	"${FILESDIR}"/${PN}-26-opacity.patch
+)
+
+src_prepare() {
+	default
+
+	# Set correct version
+	export VERSION="${PV}"
+
+	# Don't install README and COPYING in unwanted locations
+	sed -i -e 's/COPYING//g' -e 's/README.md//g' Makefile || die
+
+	# Provide fancy Gentoo icon when requested
+	use branding && eapply "${FILESDIR}"/${PN}-26-branding.patch
+}
+
+src_install() {
+	default
+	if use branding; then
+		insinto /usr/share/gnome-shell/extensions/dash-to-panel@jderose9.github.com/img
+		doins "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg"
+	fi
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
index 4c7fabcfca2b..b82c15ba8789 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
@@ -1,3 +1,5 @@
 DIST desktop-icons-19.01.4.tar.xz 46712 BLAKE2B 6991d45bf7e8e0373fa42985d5e6a416a3cdbe90abe539dcfc474bbae58763843ec73fb379f4ed69637c31916b1a11ee3e08f4166b691e76691a03d77be33d08 SHA512 db840b2a5a5848c1bf151b59c3c35dba163f23026cc0d0a859cab5746ed15569153c70357dcc9d38637ef1af27a2df0d2e942a97521e4f750265ae4bc6bc1666
+DIST desktop-icons-19.10.2.tar.xz 47920 BLAKE2B ac53da69fd76985b134fcff50d3340ad804e0a466ddf179cf06a7dd14ceaa1841a99341471a8dc2fb09e0e4794d1fee718ce516750381f71bf5e70b5ffe4a32a SHA512 c6af4ffdb6dcc2c163dcf4dcac69911746fdc1dc89b1f590b82e962b8c400327ae459d648157d784c154c45488bea5961e01fc64c04ab72b5da3ca07229f80f8
 EBUILD gnome-shell-extension-desktop-icons-19.01.4.ebuild 997 BLAKE2B 753f98ee73a40efd6aa3b89768956612c93900d335a792801e3900c8f3d75735d1cd5e6ea70ead1e592b0aed1ed8e9c4ac4405158d58735df7eb60de36b4a144 SHA512 029ba176191379c71287152d43bc29a6df9f3b01bfdbd88828c6a69598d08300966c6615abcc375fd7ffe360480b956271686666e67b254ccbccfd739a924d63
+EBUILD gnome-shell-extension-desktop-icons-19.10.2.ebuild 1018 BLAKE2B f72555cab3f18ea0dfa4280a21a840d8c51275df3ae980e45635a3f4981b35d52dc9b11c1e6b87a9bfa7ded6894e6dc89f4e012ce2f66f889f937dbe52994193 SHA512 f239f0cdb9e14b8047eb7cf9994f1ce478ecd649be03bd88c1fd0666114a1041e008a9cdc759ec89364dd20a8b49b825c262770315cae8b45cd2a3f8e225855d
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-19.10.2.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-19.10.2.ebuild
new file mode 100644
index 000000000000..7996c7b33dd8
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-19.10.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils meson
+
+MY_PN="${PN/gnome-shell-extension-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A GNOME Shell extension for providing desktop icons"
+HOMEPAGE="https://gitlab.gnome.org/World/ShellExtensions/desktop-icons"
+
+COMMIT="c2dfe4403c8b3bad25a2b41daa3c485e"
+SRC_URI="https://gitlab.gnome.org/World/ShellExtensions/${MY_PN}/uploads/${COMMIT}/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	=gnome-base/gnome-shell-3.34*
+	>=gnome-base/nautilus-3.30.4
+	sys-apps/xdg-desktop-portal
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 10f5bfac1bd0..80b4a6babe55 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,4 +1,8 @@
 AUX gnome-shell-extension-gsconnect-28-silent-flag.patch 1637 BLAKE2B 9f02424b134f0cd77c00cc9dd9fae774826bcc40750a8fb053edef6b2a75d3dc92c7ef53a89abb3d2db3e6787066c7971198e909cf2d52fccb7388fae4341c2e SHA512 05a23e0aab06108e778a07ab8ed780115a157496c5c08a4676ec4d6a58bb4ecc6860682e3cae37f1b5734a8757f1e7bd3148d246518357ed85295e00a5c0c4d8
+AUX gnome-shell-extension-gsconnect-33-notifications-limit.patch 1506 BLAKE2B 12054a8465dfdef3fdc52f4b20b66e1607c9df0f429636e4e296a7fe473f761abd717c6f7a0be6ea0f29df1a3c66bf4f24b7b0840f1097f2b7ba3885b46559e8 SHA512 d55a3a389da36f65b435287b0571f3ab3ee661ef892c45b27f3f9d30aeec69b01f9fb2c182e8272d62a1db7df5dea46650d3cf2e094d2df0f5f9b480e0ca93ba
 DIST gnome-shell-extension-gsconnect-28.tar.gz 312814 BLAKE2B 217e32e799c6300764f23245c0d474b025918f78808c026175fd3262b4c463b913969290156782151828cdcb15647002e7c7b8bff926337960a78d6d98a16c77 SHA512 a806f6532e68544832dac47da1fdf23edb7625c6cac4ad7f1c1a1b0a5d69af159397bc6f2bb63a74907669db5ea192343b7d2fc8eb2992bcc6a1834cffe1fbba
+DIST gnome-shell-extension-gsconnect-33.tar.gz 314704 BLAKE2B fa4f2eb6325356a058b24b92b683ca7331af30112d27060e8ee191c21a3269639da58992d53434c7121ea511ee9e07869b082f908b59e19fc2434f3c07e09624 SHA512 26ef929b9b128db0cb29fba22203a3afd500c5b1c3bac6917926a60350d271e67bb0985866f84877355c079fe4a5656b8ac5e8dae976d17d9a068cc825293bce
 EBUILD gnome-shell-extension-gsconnect-28-r1.ebuild 1755 BLAKE2B ccb6adf109422ac08ad98687c0cd2be59867c71da65bd8fced4108183427704ccdcc8f385eb99effd93185a43c9c2bde67f3c7a7793779b6d1ffa73c28e879e5 SHA512 177bc30496d31b870394d8de33ed59dc60944f580ca3060538be71411817cdff6fe873aea396d833b27c36dd40af20203e2f7030252663ff4000cf8e42affce0
+EBUILD gnome-shell-extension-gsconnect-33-r1.ebuild 1666 BLAKE2B 09ba266222d604588dd06c10e4f8e15d5dde7b043f5961ad50b6b5be3ddbf028ab6cdbc3c35180dc1ba2fa83ce7a174c9ee406feb5f569fb59ae5b7510366226 SHA512 7c534f61f68bd5a42a093cfd7b8891b4988797a58410bcb8594ba5eeb456279229bcbad15827c161ba281fa60da2cd3a7edeb9006da13f46c8167ce5fa6718b7
+EBUILD gnome-shell-extension-gsconnect-33.ebuild 1536 BLAKE2B c00fffeed8cd0ac7444cc1dcb4629742da2327b058c6be3d4c9183793abeccbce7e2a6ea5aeb82053fe65b828ccd32084eb544cc496f723c9145d3c91240391c SHA512 4d9ae97e9949ea93a2fddb48184a3c5d015b3e39076ad2241c196f7f662c2b05de5017ccf761d4fbeb13ebec1b953fb540f35187e874e520cdd44e3970d38376
 MISC metadata.xml 321 BLAKE2B daf09efc56bcbf90c8a190e25127a11d12fa7935ee49fbbb5881f1aa3e552485e63ffd9dd8e4099260b504ebdf2a7342a868328cd591b8f4ea1dde173292a882 SHA512 f8b184239c05241cac2b86acfab2f265297cee49a7fe254633181208ec7d29b875582091f34ccc0d8fed2fa41bc4488509a913d96efc9ca8155cbed5f362683f
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-notifications-limit.patch b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-notifications-limit.patch
new file mode 100644
index 000000000000..8c2846c5ecbd
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-notifications-limit.patch
@@ -0,0 +1,39 @@
+From 641ccb70724f8967439495e2356b2d7a654053cf Mon Sep 17 00:00:00 2001
+From: Andy Holmes <andrew.g.r.holmes@gmail.com>
+Date: Sat, 4 Apr 2020 17:37:41 -0700
+Subject: [PATCH] Shell Notifications: set a limit of 10 notifications from
+ GSConnect
+
+Re-apply the notification limit from GSConnect, set to 10. This should
+stop notifications from growing indefinitely, with the consequence that
+the notifications that end up in the message tray is non-deterministic.
+
+cc #364
+
+Backported to v33 <pacho@gentoo.org>
+---
+ src/shell/notification.js | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/shell/notification.js b/src/shell/notification.js
+index dc93de955..f345cdde9 100644
+--- a/src/shell/notification.js
++++ b/src/shell/notification.js
+@@ -246,13 +246,16 @@
+     }
+ 
+     /**
+-     * Override to lift the usual notification limit (3)
++     * Override to raise the usual notification limit (3)
+      * See: https://gitlab.gnome.org/GNOME/gnome-shell/blob/master/js/ui/messageTray.js#L773-L786
+      */
+     pushNotification(notification) {
+         if (this.notifications.includes(notification))
+             return;
+ 
++        while (this.notifications.length >= 10)
++            this.notifications.shift().destroy(MessageTray.NotificationDestroyedReason.EXPIRED);
++
+         notification.connect('destroy', this._onNotificationDestroy.bind(this));
+         notification.connect('acknowledged-changed', this.countUpdated.bind(this));
+         this.notifications.push(notification);
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r1.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r1.ebuild
new file mode 100644
index 000000000000..680156b1810b
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils meson readme.gentoo-r1
+
+DESCRIPTION="KDE Connect implementation for Gnome Shell"
+HOMEPAGE="https://github.com/andyholmes/gnome-shell-extension-gsconnect"
+SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nautilus"
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=dev-libs/gjs-1.48
+	=gnome-base/gnome-shell-3.34*
+	gnome-base/gvfs
+	gnome-extra/evolution-data-server
+	|| ( media-libs/libcanberra media-libs/gsound )
+	nautilus? (
+		dev-python/nautilus-python
+		gnome-base/nautilus[introspection] )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="For knowing more about how to do the setup, please visit:
+https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
+
+PATCHES=(
+	# Shell Notifications: set a limit of 10 notifications from GSConnect
+	"${FILESDIR}/${P}-notifications-limit.patch"
+)
+
+src_configure() {
+	# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
+	# https://bugs.gentoo.org/694388
+	meson_src_configure \
+		-Dnemo=false \
+		$(meson_use nautilus)
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33.ebuild
new file mode 100644
index 000000000000..9407d5ae4189
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils meson readme.gentoo-r1
+
+DESCRIPTION="KDE Connect implementation for Gnome Shell"
+HOMEPAGE="https://github.com/andyholmes/gnome-shell-extension-gsconnect"
+SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nautilus"
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=dev-libs/gjs-1.48
+	=gnome-base/gnome-shell-3.34*
+	gnome-base/gvfs
+	gnome-extra/evolution-data-server
+	|| ( media-libs/libcanberra media-libs/gsound )
+	nautilus? (
+		dev-python/nautilus-python
+		gnome-base/nautilus[introspection] )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="For knowing more about how to do the setup, please visit:
+https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
+
+src_configure() {
+	# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
+	# https://bugs.gentoo.org/694388
+	meson_src_configure \
+		-Dnemo=false \
+		$(meson_use nautilus)
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
index db87b85a30d3..bd4b68cb6f2c 100644
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
@@ -1,4 +1,7 @@
 AUX gnome-shell-extensions-topicons-plus-22-exit-stacktrace.patch 2645 BLAKE2B 3a24202c8bcb07b3ae6c6b6dccbd734d729da2f81d26bf08d5d4b5b20f7c77be0b4e958bc2e4be5b374e4f22479af85d16560c039b54328fd08138246ac58889 SHA512 4e6557e9afabedfd9ecad7383478a00dda38cd043c69023900080b194ffe7f47a0b8d64c6edda74b12339cd3f2f54d549df088493d94fa68da20f1e89e65ab5d
+AUX restore-3.22-compat.patch 1800 BLAKE2B 0289a7849eb57f614945b19872427d56a087378c760630277c37df194c07fbb00c3348fff8b076ff1c88fb62b71168649f3d94d531d8cd5f63a97a90d3322d91 SHA512 b78647b692bf8bef9a5e8c9efad253b23a3d52e4a9abc8b2d53dfc0f6de4c6a76b8223df2c43bba109ab490de244e1ca6be0aeb8804ad28458c072a399e8f5bf
 DIST gnome-shell-extensions-topicons-plus-22.tar.gz 2757811 BLAKE2B 8bfe719d4a0e4d58db9b21d354e841ea69b88d82c69ba6aa4ebc8db65acde9330553487d0a0d3b623d5a6a2a18ff67e6ad4e45133c6e7b8a77e07bd90c589e63 SHA512 f0589bd8ed6697d616772ab374e9aa80779512d38c50f82c375820c02c06ef26a50b2a8c78c4e5fab5dc8588ed5fdcf0b7e73e7868af0855545528e741aa280d
+DIST gnome-shell-extensions-topicons-plus-22_p20190929.tar.gz 2759460 BLAKE2B 2eb001f472395ade58503a860d3ea8248bb8aeb36b4d6f13f65e1074694aecc02f814d18d449206e1055984177896ac787fd925b4cf2680f226ffaace042cc5d SHA512 47cb156f7a61780a53311855d716c4e4f539832080fc011db634b472b5a8aa0e9fad5b6f44bf2da30665cd97b850725822ee9fb9ed9da014388cf4adeee60fbe
 EBUILD gnome-shell-extensions-topicons-plus-22-r1.ebuild 1471 BLAKE2B ae60e6e306d0f3762181305f7f49e8bdc6552b7402cc73348008916ee42b9675ff53c199346aff51b7ab43a08013c1b53a5ba7a2d9f2b3b16cab853f1e8c2f07 SHA512 9720ce22068caa723a892b9e82604ee093c01f2848149e3d701d234dc76e20385b3b54ee0a68e05413a5f548a8ae54767abaed51f860fc8c237085251b309b2c
+EBUILD gnome-shell-extensions-topicons-plus-22_p20190929.ebuild 1490 BLAKE2B 304e24e037375396e39c8389bf1ce421b5343cb89ddbf6734aa4d4b3f6438e0708acfe15ef265d19246a6afd934075c0b7f9d431c9711faea0d5bdfea5581c3c SHA512 2d971db6415fadbb92484f11de572da2fcc630ced470bc7e0dd41bdba43a6bed53e22cb6f011f92c556bfa1fadd446d269ae83c6ba954f4b0874f6df1778ef64
 MISC metadata.xml 339 BLAKE2B 0fff96ce59c258cfb52c0616844df2bad11bf14fa283831d608ab862d2ac4fc26af0c4445d906d174290f0abee98149f12b24c85de79adfe2b959c17f14c3b42 SHA512 6bd54fe410561f215eba59872c742b9a11016cede62ddaf0aa8f899bf2c2abffde29cb63c9b819486a750be66b3dadd72257f6e26dcd87798aece31e0a752b40
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/files/restore-3.22-compat.patch b/gnome-extra/gnome-shell-extensions-topicons-plus/files/restore-3.22-compat.patch
new file mode 100644
index 000000000000..9d3104a7da5a
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/files/restore-3.22-compat.patch
@@ -0,0 +1,42 @@
+From 0a357137c27d3e1f2f236a1e76e7b38f6e39d846 Mon Sep 17 00:00:00 2001
+From: "Robin A. Meade" <robin.a.meade@gmail.com>
+Date: Thu, 31 Oct 2019 16:08:24 -1000
+Subject: [PATCH] Fix TopIcons no longer working with gnome-shell < 3.33.90
+
+This fixes the following error:
+gnome-shell: JS ERROR: TypeError: Main.extensionManager is undefined
+onTrayIconAdded@/usr/share/gnome-shell/extensions/TopIcons@phocean.net/extension.js:85:1
+
+Related:
+https://github.com/phocean/TopIcons-plus/commit/43f991d1533e8d4002bd25ae6afd8a1568c39b36#diff-06f1274e40de25abda72d812b1cce86a
+https://bugzilla.redhat.com/show_bug.cgi?id=1767544
+---
+ extension.js | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/extension.js b/extension.js
+index 191fa5c..116a60b 100644
+--- a/extension.js
++++ b/extension.js
+@@ -82,9 +82,18 @@ function onTrayIconAdded(o, icon, role, delay=1000) {
+     // loop through the array and hide the extension if extension X is enabled and corresponding application is running
+     let iconWmClass = icon.wm_class ? icon.wm_class.toLowerCase() : '';
+     for (let [wmClass, uuid] of blacklist) {
+-        if (Main.extensionManager.lookup(uuid) &&
+-            iconWmClass === wmClass)
+-            return;
++        if (Main.extensionManager === undefined) {
++            // For gnome-shell < 3.33.90
++            if (ExtensionUtils.extensions[uuid] !== undefined &&
++                ExtensionUtils.extensions[uuid].state === 1 &&
++                iconWmClass === wmClass)
++                return;
++        } else {
++            // For gnome-shell >= 3.33.90
++            if (Main.extensionManager.lookup(uuid) &&
++                iconWmClass === wmClass)
++                return;
++        }
+     }
+ 
+     let iconContainer = new St.Button({child: icon, visible: false});
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22_p20190929.ebuild b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22_p20190929.ebuild
new file mode 100644
index 000000000000..31bf7980e4fe
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22_p20190929.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT_HASH="ad2dd1ad48ad9a5899e14a9e0873244a3e15b82e"
+DESCRIPTION="Moves legacy tray icons to top panel"
+HOMEPAGE="https://extensions.gnome.org/extension/1031/topicons/"
+SRC_URI="https://github.com/phocean/TopIcons-plus/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/TopIcons-plus-${COMMIT_HASH}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# glib for glib-compile-schemas at build time, needed at runtime anyways
+DEPEND="
+	dev-libs/glib:2
+"
+RDEPEND="${DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.16
+"
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/restore-3.22-compat.patch # https://github.com/phocean/TopIcons-plus/pull/136
+)
+
+#src_compile() {
+	# It redoes this with "make install" later due to a dumb Makefile, so don't bother
+	#make build
+#}
+
+src_install() {
+	# TODO: Figure out if we can get the schemas to standard location, in a way that works properly runtime too
+	make install INSTALL_PATH="${ED}/usr/share/gnome-shell/extensions/"
+	rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/README.md" || die
+	# Assuming it needs only compiled gettext catalogs at runtime
+	rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/locale"/*/LC_MESSAGES/*.po || die
+	dodoc README.md
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 000601b53ca7..7f94959d3bea 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,4 +1,8 @@
 AUX 3.32.1-leak-fix.patch 1262 BLAKE2B f50fa74524b820416135f9037046006aadb262edc3b13e3a1c48b1e3bbca385046a44e1a4449d85c8f9af6a7bf66e739f26c95391f8504cd6db703850bc9945e SHA512 ca04b666548233c879cfb992e45f62a97916a12a9959aa240b5c53415839ce1c972f0b56f528419891889049cb365e91311ae762241e333c3d3d78e2def57250
 DIST gnome-shell-extensions-3.32.1.tar.xz 198320 BLAKE2B 416f77ea37431f8b806b8373f9a18091374f4b40b734375edfff2f673af50c073c3e3091e2b9b4be4241ebfa647b7f44b0f0f6e69460876feb7f90901e499a29 SHA512 e587a17eace87e05211bd4a0b8101a731054c99ba708051f6549c5e19974ccfeff75b0802d190d327f5ee8b4595c20e747d492f82c86aa76e0fc1cf3d20f0e4e
-EBUILD gnome-shell-extensions-3.32.1.ebuild 1960 BLAKE2B c189c89c27c37f439f7df7980c4ffeb87aa9d9ce21a8fa00d9752bfc8deca8e2ba91f1abc97eca9ae8b6af56b05618d00d61e6cf2cb50f2f5fc7ac739e967d5e SHA512 ced19c5f346bf6e75d81b2ce5441b6fd76e46b42addd5388b0430bfe39332ea3377778e17b346853b42893b15a6ac35a26c96acaa5a88eb192d32724ab10a0e6
+DIST gnome-shell-extensions-3.34.0.tar.xz 204624 BLAKE2B 6d502927df71cc8bb25ea24b7431224518eb236cffc2cae329427e7dc76a9cbff2e3cea91108168b0cf82e2ba9784a2db21f38d5ca1ab18124219fe0786dab64 SHA512 ab2658acaff8e255575f36706d8d02754e58686546b609a72526fcc80ee02292fd6c0a078b89c34fdea9c2b1868e16d48f903741cff89e918f6fd2ed3d9ad193
+DIST gnome-shell-extensions-3.34.2.tar.xz 204860 BLAKE2B 8abd569a18f693f4f7ffd4a20c65453a33bf17cabcc2e77a037085d75936a7fb4a7ee83829c71056830b825e4a9c694ad346e5fb3a844ad41140b6bba8226e68 SHA512 1611115fbedc2f8708b5596b5c44092e5df6666d43596d7a87ec32ee5f83e9e39d2453cffef0e3445f63e811d21ce20f5587a5a27e0fde280d9715d5cc7dc290
+EBUILD gnome-shell-extensions-3.32.1.ebuild 1990 BLAKE2B 04bcd97ca920d55f7dfb0f22976e38b536513f11dcc9a33f0d332e56269925c5910a1e6e0d30a796c4378ab38652b575132a34eccb1b61b6f705f44913e7454a SHA512 f72ac6469afa26399c1f5ab6411ab495e255ffbf6374b700ecc319cf0f1ae9d2bd419ee26cf1601afecc2bdfc42ce61f15d144932989ba64daf9d825a426916b
+EBUILD gnome-shell-extensions-3.34.0.ebuild 1883 BLAKE2B aa5b04cd36b8a5b8207cd093ab041e055480dc583604233722c92c313315f591f0aef889816a21a1ecd65bb803180d8539b6506297657f7d69e42c299b8c4490 SHA512 225e08d11ea03f15454fa40eaa76106527e4d7c6eee7c486fc65f96fc6c5145e748bcccfc95c5f3407cc9d969877b9387965fefc7d68449402eff9de1edfbb67
+EBUILD gnome-shell-extensions-3.34.2.ebuild 1883 BLAKE2B aa5b04cd36b8a5b8207cd093ab041e055480dc583604233722c92c313315f591f0aef889816a21a1ecd65bb803180d8539b6506297657f7d69e42c299b8c4490 SHA512 225e08d11ea03f15454fa40eaa76106527e4d7c6eee7c486fc65f96fc6c5145e748bcccfc95c5f3407cc9d969877b9387965fefc7d68449402eff9de1edfbb67
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.32.1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.32.1.ebuild
index 8a1b1285470b..492cc13e4edc 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.32.1.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.32.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
@@ -23,6 +23,7 @@ RDEPEND="${COMMON_DEPEND}
 	dev-libs/atk[introspection]
 	gnome-base/gnome-menus:3[introspection]
 	>=gnome-base/gnome-shell-3.32
+	<gnome-base/gnome-shell-3.33
 	media-libs/clutter:1.0[introspection]
 	net-libs/telepathy-glib[introspection]
 	x11-libs/gdk-pixbuf:2[introspection]
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.34.0.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.34.0.ebuild
new file mode 100644
index 000000000000..8697411fea58
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.34.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org readme.gentoo-r1 meson xdg
+
+DESCRIPTION="JavaScript extensions for GNOME Shell"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="test"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	>=gnome-base/libgtop-2.28.3[introspection]
+	>=app-eselect/eselect-gnome-shell-extensions-20111211
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	dev-libs/atk[introspection]
+	gnome-base/gnome-menus:3[introspection]
+	>=gnome-base/gnome-shell-3.34
+	<gnome-base/gnome-shell-3.35
+	media-libs/clutter:1.0[introspection]
+	net-libs/telepathy-glib[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-themes/adwaita-icon-theme
+	>=x11-wm/mutter-3.32[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-lang/sassc
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( dev-lang/spidermonkey:60 )
+"
+
+RESTRICT="!test? ( test )"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Installed extensions installed are initially disabled by default.
+To change the system default and enable some extensions, you can use
+# eselect gnome-shell-extensions
+
+Alternatively, to enable/disable extensions on a per-user basis,
+you can use the https://extensions.gnome.org/ web interface, the
+gnome-extra/gnome-tweaks GUI, or modify the org.gnome.shell
+enabled-extensions gsettings key from the command line or a script."
+
+src_configure() {
+	meson_src_configure \
+		-Dextension_set=all \
+		-Dclassic_mode=true
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+
+	readme.gentoo_print_elog
+}
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.34.2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.34.2.ebuild
new file mode 100644
index 000000000000..8697411fea58
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.34.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org readme.gentoo-r1 meson xdg
+
+DESCRIPTION="JavaScript extensions for GNOME Shell"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="test"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	>=gnome-base/libgtop-2.28.3[introspection]
+	>=app-eselect/eselect-gnome-shell-extensions-20111211
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	dev-libs/atk[introspection]
+	gnome-base/gnome-menus:3[introspection]
+	>=gnome-base/gnome-shell-3.34
+	<gnome-base/gnome-shell-3.35
+	media-libs/clutter:1.0[introspection]
+	net-libs/telepathy-glib[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-themes/adwaita-icon-theme
+	>=x11-wm/mutter-3.32[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-lang/sassc
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( dev-lang/spidermonkey:60 )
+"
+
+RESTRICT="!test? ( test )"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Installed extensions installed are initially disabled by default.
+To change the system default and enable some extensions, you can use
+# eselect gnome-shell-extensions
+
+Alternatively, to enable/disable extensions on a per-user basis,
+you can use the https://extensions.gnome.org/ web interface, the
+gnome-extra/gnome-tweaks GUI, or modify the org.gnome.shell
+enabled-extensions gsettings key from the command line or a script."
+
+src_configure() {
+	meson_src_configure \
+		-Dextension_set=all \
+		-Dclassic_mode=true
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+
+	readme.gentoo_print_elog
+}
diff --git a/gnome-extra/gnome-shell-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest
index 998f0e0caa38..2ffcc0fa8a2c 100644
--- a/gnome-extra/gnome-shell-frippery/Manifest
+++ b/gnome-extra/gnome-shell-frippery/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-shell-frippery-3.32.1.tgz 87307 BLAKE2B 06226a084be2587db1114d69d5f5c04a28682d3bb98e72c4d6d9ab34e8c4173c0e57c8cfc6a8b204b6d53a8ba3b5dccc9ff2db8681012176364eb20f2c6851fa SHA512 56604c7b47778454e61839e4c81445232357c5f6243974643cfc5f0524eecf8109dfba7af425ec0430aeb4c2845f58bcc9c0710087e6032b0b438e7db8be87aa
+DIST gnome-shell-frippery-3.34.2.tgz 81928 BLAKE2B ae95379333037e4d53638bbdbef2059d36f3dd1007e2d791a3b5eb6544d006823bc62cf671dc772672e07397b20a9f3e25bd803eb143685f05413a23887d3601 SHA512 3fab0778a2076f8c52d8aeb63d8d8b8f6ae2d12a381072fe39c6c318e744b56749776a4aee894e4f1c64bf90ecc3d1bd87ede6357edac9656cd6516866e42484
 EBUILD gnome-shell-frippery-3.32.1.ebuild 911 BLAKE2B 518cdda9c7364f603a1df07142206664fca30d4d7cf0ba5d8427396c70acaf27ec61e689fb721cb88d37e35d73b85199af28330639cc3b1756b37526dd0edbf4 SHA512 77181aea64f07696764dc3216fbdbcfb6cbb31214b5a9acc801b994e63aa59feabf4a90dd12f2e6ba00a3d5359c283478141e6757db568de85b95ac9eca92897
+EBUILD gnome-shell-frippery-3.34.2.ebuild 913 BLAKE2B 2cfa26f6ba4f293a5c173ffc66c93ce3dc1909e7e318665f4da68e0610789e95a413f78dadef68f1022a51f03548693d2a231c727899aea4ee5517b6691d6e67 SHA512 581b1d308f26fe7da465de0b9c16eed9237c0c15482509ce14671af4857317bbae963634a76085f55ae9d09c5bc9fe1b3b8950f60c1cae1216d2c4459324025c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.34.2.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.34.2.ebuild
new file mode 100644
index 000000000000..5e3bd7107e8f
--- /dev/null
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.34.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Unofficial extension pack providing GNOME 2-like features for GNOME 3"
+HOMEPAGE="http://frippery.org/extensions/index.html"
+SRC_URI="http://frippery.org/extensions/${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	gnome-base/gnome-menus:3[introspection]
+	>=gnome-base/gnome-shell-3.34
+	media-libs/clutter:1.0[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND=""
+
+S="${WORKDIR}/.local/share/gnome-shell"
+
+src_install() {
+	insinto /usr/share/gnome-shell/extensions
+	doins -r extensions/*@*
+	dodoc gnome-shell-frippery/{CHANGELOG,README}
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
index caad0b7f4859..5b3686184fd7 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-software-3.30.6.tar.xz 5217384 BLAKE2B 6a9478aa7752ea62c391545b5f84191a22c839802bd1ac2118696b9dd954a19003477a688d9f36868a617dbf3dd186fc36a054ce0eac8ba8c7a5eee834732ce4 SHA512 dd98e9e61469fc5566ab569f09bdc06ccb5812a236e305185b911c70364e2983f257e939aed0bb61778163084fb5628d63ff6bd5f056d4a7626a2e771ad6426a
 DIST gnome-software-3.32.4.tar.xz 4852860 BLAKE2B 334eaeccbcd897720e11f0b7b9d4cd9f88c848e536c11e74217074044cfc40ea41fe452b68b6c45787a8369b49268dd704a2efeaf6378e35d3a878ec24f6907e SHA512 81a32477fe755f57465cfbc3d1c88a2f460d6a21222fd73aced06c92b409023a1ace002c338e713135658896c2c14a7ff8508eeefbc5f648e66d8c8777dee881
+DIST gnome-software-3.34.2.tar.xz 5945736 BLAKE2B 89e7e0a606a832aedbfa32024f201e71b3edb3c8df527efea1be72236b4bfb86901f3af689b10bf706f9c4f16e6badc00080a1244ce30eb09dfd1dad5833e8cf SHA512 4deb09530fbeeadd54e69d03ef4cecaef47c6766bce0ec5230bb090d27e54664577a227416933b6ec4780249f4565e51202a25517fba5dd040fd895bd3a26397
 EBUILD gnome-software-3.30.6.ebuild 2531 BLAKE2B dbbf3176ecaed83bb3310531ed437afe91793c1ccbd1b788ac9ff05af8fb5342d0c147b0eeca9e94cd3e8637df8aac12324ced104c2c5416680bd8960cb6ca3b SHA512 53a36a9d2dcf7f75d73f56eeb75d6a6fe785984f3dbbc0df87ea965f53ba30c04b1a8839a77ab455649930834507dd04ef31d63f92d0963dfa91f50c8b797855
 EBUILD gnome-software-3.32.4.ebuild 2511 BLAKE2B 287cc883208934666ec0f2205d9152a76483cce475b622ed5f705aa654e230c3c8ae74c792e0d568d0a07397b8c7964da35c4ad54ef93498e34188e27c0555ed SHA512 b473dde75bb656b29e97874e9d6704505d6149e689aaf260b4af295fd931f9060871645c5fda38d396870355b50c15b343d255b0ca4a7eeae5175389cfe1bde8
+EBUILD gnome-software-3.34.2.ebuild 2573 BLAKE2B 42962cce1d59f2bd34f7240953e81ab0efe7764b8d8e0a2a23d7df67434649fb36e4be83616e75ac6b61c0d3188b18b89534f96e5c8450e746f4b1e22717e95e SHA512 93d58befc3d225c99656b6e13267e0a99b06c54550125151a786fdbc6f67f6add53725dc327adbae745f7a726382fddfc54bfe9964b503182b7510f3a5b46642
 MISC metadata.xml 443 BLAKE2B 5f060a298a752150f4b06545c328985c5e55a6e32afb45382b419e33beb27c7ac965d59465dc02e23e4214fd9b995b44894a666b2b4ff55bbca469d3992d12f8 SHA512 aff64504d9b2df32113844e86e05c393314ba247ae0742bbd140b2212771d8a3c76856c79426aca11908a8a8f5e881f6ad8a9a4d298d11fc4f9990bd1fe454f7
diff --git a/gnome-extra/gnome-software/gnome-software-3.34.2.ebuild b/gnome-extra/gnome-software/gnome-software-3.34.2.ebuild
new file mode 100644
index 000000000000..67e40c10e9e1
--- /dev/null
+++ b/gnome-extra/gnome-software/gnome-software-3.34.2.ebuild
@@ -0,0 +1,95 @@
+# 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 install & update software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Software"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+firmware gnome gtk-doc packagekit spell udev"
+RESTRICT="test" # writes to and deletes files in /var/tmp/self-test/
+
+RDEPEND="
+	>=dev-libs/appstream-glib-0.7.14:0
+	>=x11-libs/gdk-pixbuf-2.32.0:2
+	>=dev-libs/libxmlb-0.1.7
+	net-libs/gnome-online-accounts:=
+	>=x11-libs/gtk+-3.22.4:3
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/json-glib-1.2.0
+	>=net-libs/libsoup-2.52.0:2.4
+	gnome? ( >=gnome-base/gnome-desktop-3.18.0:3= )
+	spell? ( app-text/gspell:= )
+	sys-auth/polkit
+	packagekit? ( >=app-admin/packagekit-base-1.1.0 )
+	firmware? ( >=sys-apps/fwupd-1.0.3 )
+	udev? ( dev-libs/libgudev )
+	>=gnome-base/gsettings-desktop-schemas-3.11.5
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+"
+# test? ( dev-util/valgrind )
+
+src_prepare() {
+	xdg_src_prepare
+	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
+	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
+	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
+	# Trouble talking to spawned gnome-keyring socket for some reason, even if wrapped in dbus-run-session
+	# TODO: Investigate; seems to work outside ebuild .. test/emerge
+	sed -i -e '/g_test_add_func.*gs_auth_secret_func/d' lib/gs-self-test.c || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dtests=false #$(meson_use test tests)
+		$(meson_use spell gspell)
+		$(meson_use gnome gnome_desktop) # Investigate purpose, in relation to shell_extensions too (is it ok to be same USE?)
+		-Dman=true
+		$(meson_use packagekit)
+		# -Dpackagekit_autoremove
+		-Dpolkit=true
+		-Deos_updater=false # Endless OS updater
+		$(meson_use firmware fwupd)
+		-Dflatpak=false
+		-Drpm_ostree=false
+		$(meson_use gnome shell_extensions) # Maybe gnome-shell USE?
+		-Dodrs=false
+		-Dwebapps=true
+		$(meson_use udev gudev)
+		-Dsnap=false
+		-Dexternal_appstream=false
+		-Dvalgrind=false
+		$(meson_use gtk-doc gtk_doc)
+		-Dhardcoded_popular=true
+		-Dmogwai=false #TODO?
+	)
+	meson_src_configure
+}
+
+#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-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index 5a200f14b741..48a48f8660c6 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,4 +1,7 @@
 AUX 3.28.1-gentoo-cursor-themes.patch 1019 BLAKE2B 1dc92c4f8e53c1303f884f6acc332a7a0f1bd11b463e91ddd4ae731938e678f75499692044b5c13021f24dd9bf61264c4454fab734fe65609b3b4c009cb2eee2 SHA512 e502e1ae5945517e7a69cd15436bc07e34fe0db739350e0617d02c9b7a45264f585229f80352a93595e1246d5f9c6e987242772dfb7293de06b400fbaf676971
+AUX 3.34.0-fix-python.patch 2967 BLAKE2B a1a2859dcd5ecd1028b1b08d266960bb0366d0a940c81a2e9e338af02b72a01939a835dca37ab05b8a5b0ca8e118e2e0b5178479aa90b61a59b3f426f83e95be SHA512 097abd98bd2124c5e2536ed7bc8f337f836da4a4dda4e2566d533c16e771d91690f43f47e7d61a9a238e2c9cf6e687a057b6857265ef3892eacfa7f2079a00b0
 DIST gnome-tweaks-3.32.0.tar.xz 241492 BLAKE2B f3c0a25b39726600fc5d53d8d3c343dbcde594642a87fc56dd3fff9b88a3498e0f283568a944fc37445c138201db1f280222eb1161f5b8351c566537404cde5e SHA512 8107e9d2b33ac6c46e8d0076b27a1c3a84e1721e49a6b80da28fe854f6f4f6693bc7f7e836c54d39bafec79dcee8a6e2b2962580a77d7d01bfc06c6d11206d8f
+DIST gnome-tweaks-3.34.0.tar.xz 246592 BLAKE2B 8701b03f64bf6b779f6f96de25684602447b4da8f2714cb38f866e5016532aad3283f3dc217b29161534958c03e72aed33c0803e60681a3616818d037c23e5e8 SHA512 1d2b21a31550d4b48afd02a9fcfb9844eacac7aa726ef624abcb40225af31da29b34e9032b3bb2943e5cb5f7553a6f931467d04bfbc2b026732e6bdcb86eb840
 EBUILD gnome-tweaks-3.32.0-r1.ebuild 1233 BLAKE2B 9241987e7079112f706e7de2153153502efa9ec9a187666e2792d797932c03744e1032be24679407fa99ee499b2da205c35335ff3b98a166c2fcebaff1d16967 SHA512 773dcef7bd2f9747dfecdad0d405331a394eb3dfe2a715d14ca828cee634c8e3f92fe76a768f3d1ed368ac8cc771c08a7600ef43fd746ea7ba1eb8592cbf9fc2
+EBUILD gnome-tweaks-3.34.0.ebuild 1277 BLAKE2B b9e1a689c5c3ae687454990d2750187ddc37f7516b9f10e423c7b795ee6a67aee89d8443ca854cfceed2a4a260b3511412dc8570d5ad972e511d5a02f968c7c3 SHA512 a1af14cfa406fdd41e68ffddf415500429bacf0c678a7736960e6bfe3e0d23ba2d3457e98d8efc87a223a4a916ec63ce2183afbc9c9ca2c770eb4d45141e2b00
 MISC metadata.xml 556 BLAKE2B 0964398067f54577410c361418ce6f70d1afc4e1f064e3f67a1b3b6a7d37489124b7405f75c1bda57f0f25f74bc0b6ae144a4d5e04fd29bf1d180b5b4245a1a6 SHA512 1e6abce7e7e566d0c382956311c35ce9d70d044c8ee672103dc443eddcd7492e7bb4940b889213dfd7b49accce41269d820bb0b39d32e81857e3c6775609f67d
diff --git a/gnome-extra/gnome-tweaks/files/3.34.0-fix-python.patch b/gnome-extra/gnome-tweaks/files/3.34.0-fix-python.patch
new file mode 100644
index 000000000000..2501bc7c4d12
--- /dev/null
+++ b/gnome-extra/gnome-tweaks/files/3.34.0-fix-python.patch
@@ -0,0 +1,85 @@
+From 0ec042734f63a3a870920b1e71f07851d335ea45 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 29 Mar 2020 16:05:36 +0300
+Subject: [PATCH] build: Fix python files installation handling
+
+The deprecated meson python3 module tends to end up installing only
+to a python version that meson is installed for too, possibly
+breaking some expectations downstream that want it installed to
+a specific python3 version, that might not match what the build
+machine uses for meson.
+Fix it by using the non-deprecated python module and methods from it.
+
+The python module exists since 0.46, which should be safe to require
+by now. There were meson 0.50 features used already, but unnecessarily,
+as the configure_file install parameter was added then, but all versions
+default to `true` anyhow. However in practice this only emitted a
+warning with newer meson versions and was able to build fine with older
+versions too. However fix it too, so that we are now warning-free for
+meson features after raising of the meson version dep.
+---
+ gtweak/meson.build |  5 ++---
+ meson.build        | 12 ++++++++----
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/gtweak/meson.build b/gtweak/meson.build
+index 3d9a743..4e558b4 100644
+--- a/gtweak/meson.build
++++ b/gtweak/meson.build
+@@ -11,7 +11,6 @@ configure_file(
+   input: 'defs.py.in',
+   output: 'defs.py',
+   configuration: defs_conf,
+-  install: true,
+   install_dir: gtweakdir
+ )
+ 
+@@ -46,5 +45,5 @@ tweak_sources = [
+   'tweaks/tweak_wacom.py',
+ ]
+ 
+-install_data(shell_sources, install_dir: gtweakdir)
+-install_data(tweak_sources, install_dir: gtweakdir + '/tweaks')
++python3.install_sources(shell_sources, subdir: 'gtweak')
++python3.install_sources(tweak_sources, subdir: join_paths('gtweak', 'tweaks'))
+diff --git a/meson.build b/meson.build
+index b7da518..df49ae3 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,11 +1,16 @@
+ project('gnome-tweaks',
+   version: '3.34.0',
+-  meson_version: '>= 0.40.0'
++  meson_version: '>= 0.46.0'
+ )
+ 
+ gnome = import('gnome')
+ i18n = import('i18n')
+-python3 = import('python3')
++pymod = import('python')
++python3 = pymod.find_installation('python3')
++
++if not python3.found()
++    error('No valid python3 installation found')
++endif
+ 
+ prefix = get_option('prefix')
+ 
+@@ -13,13 +18,12 @@ bindir = join_paths(prefix, get_option('bindir'))
+ datadir = join_paths(prefix, get_option('datadir'))
+ libexecdir = join_paths(prefix, get_option('libexecdir'))
+ localedir = join_paths(prefix, get_option('localedir'))
+-pythondir = join_paths(prefix, python3.sysconfig_path('purelib'))
+ 
+ pkgdatadir = join_paths(datadir, meson.project_name())
+ 
+ appdatadir = join_paths(datadir, 'metainfo')
+ desktopdir = join_paths(datadir, 'applications')
+-gtweakdir = join_paths(pythondir, 'gtweak')
++gtweakdir = python3.get_install_dir(subdir: 'gtweak')
+ icondir = join_paths(datadir, 'icons', 'hicolor')
+ schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
+ 
+-- 
+2.20.1
+
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild
new file mode 100644
index 000000000000..7a5ad14a25b8
--- /dev/null
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild
@@ -0,0 +1,51 @@
+# 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 meson python-single-r1 xdg
+
+DESCRIPTION="Customize advanced GNOME 3 options"
+HOMEPAGE="https://wiki.gnome.org/Apps/Tweaks"
+
+LICENSE="GPL-3+ CC0-1.0"
+SLOT="0"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+DEPEND="${PYTHON_DEPS}"
+# See README.md for list of deps
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.10.2:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=gnome-base/gnome-settings-daemon-3
+	x11-themes/sound-theme-freedesktop
+
+	>=dev-libs/glib-2.58:2
+	>=x11-libs/gtk+-3.12:3[introspection]
+	>=gnome-base/gnome-desktop-3.30:3[introspection]
+	gui-libs/libhandy:0.0[introspection]
+	net-libs/libsoup:2.4[introspection]
+	x11-libs/libnotify[introspection]
+
+	>=gnome-base/gsettings-desktop-schemas-3.33.0
+	>=gnome-base/gnome-shell-3.24
+	x11-wm/mutter
+"
+BDEPEND=">=sys-devel/gettext-0.19.8"
+
+PATCHES=(
+	"${FILESDIR}"/3.28.1-gentoo-cursor-themes.patch # Add contents of Gentoo's cursor theme directory to cursor theme list
+	"${FILESDIR}"/${PV}-fix-python.patch
+)
+
+src_install() {
+	meson_src_install
+	python_optimize
+	python_fix_shebang "${ED}"/usr/bin/
+}
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index aefb81a18f28..38d06744a95b 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-user-docs-3.32.3.tar.xz 15861776 BLAKE2B cc4a73319ced02d7e087d2e9e1a70db22fbac3f9bebc34deb029c913573b34b58977007fe274841c6b61d05c3e169f959425c28846f1c741944f61c1c01b53a2 SHA512 4b62be1812ae67283281ec9d5dfd7e694dd01c04ede949cef76ab42dde72b74f90a67bc359e86700f515ddff920fb81a40e91acef56c85b40b49ce0505c1f7ed
+DIST gnome-user-docs-3.34.1.tar.xz 15983924 BLAKE2B 5e9c07cb1e5d33b4fc220a00e679e26d804963fa7ee8d42d4e805e8abaa1e8717028c03815ff3bd82f81d3a61fcf38b258940ec88ef2e9b1fbdf4df6d94bb8d0 SHA512 f9e65f4d0770ce97493f2eaa6b7743575e3bca3d816d0cd06ee35af99016722631086502450db5900693527a71bec9d65c97829c1486b6aff4a137a7f6016baf
 EBUILD gnome-user-docs-3.32.3.ebuild 947 BLAKE2B 8d88a8466d0e57c214d2606592fd5489c6fbf7a5afb00954ae6af8c6514a0a6c2f6c05e9ea154665390c330676051c283328a6ae56d71917c37ac542e6a99889 SHA512 b9367999d5ab3aca4a6084f99147ad0bbdb9c755de27e9ee22563bba83f0799c24dc233fb4972368f1d3ff0586f6a9034c8532f902335a8df5bcd73405854916
+EBUILD gnome-user-docs-3.34.1.ebuild 949 BLAKE2B 4e576f3a233baa42375a2086e5a18db47ee0d0316063faff9f6bfcf6e4cf766ccf64e12f93d2d300907ac06ff085cd21544782e5d81abc76fa69883b92b2e8fe SHA512 b0cf4e019833cda7ab1e35eef0855fc82fe9e648d4cc3f9f56fbdb2f6290023430645f59540fecd1fdbb316e6e42f68c744118d5f1026590bf17e2c677123888
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.34.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.34.1.ebuild
new file mode 100644
index 000000000000..1c83d246f5a8
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.34.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="GNOME end user documentation"
+HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
+
+LICENSE="CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	test? ( dev-libs/libxml2 )
+"
+# eautoreconf requires:
+#	app-text/yelp-tools
+# rebuilding translations requires:
+#	app-text/yelp-tools
+#	dev-util/gettext
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip
+	!test? ( test )"
+
+src_configure() {
+	# itstool is only needed for rebuilding translations
+	# xmllint is only needed for tests
+	gnome2_src_configure \
+		$(usex test "" XMLLINT=$(type -P true)) \
+		ITSTOOL=$(type -P true)
+}
+
+src_compile() {
+	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
+	# which can take > 2 hours on a Core i7.
+	return
+}
diff --git a/gnome-extra/gnome-user-share/Manifest b/gnome-extra/gnome-user-share/Manifest
index d8f032614a46..72b8f095313d 100644
--- a/gnome-extra/gnome-user-share/Manifest
+++ b/gnome-extra/gnome-user-share/Manifest
@@ -1,4 +1,6 @@
 AUX gnome-user-share-3.18.1-no-prefork.patch 553 BLAKE2B 201db9747d9bf68ac9421a6bd0341d2c4ab42b2eb5ca331deac58f669a02bdf559fc29e01cd028bcfd3494733e76bf649d4ca77836307e219c7060554b251583 SHA512 f1a8156d09e0f7dad2422b79000f34843567a7e0b66838774e03576a81cc243a52e0bf52d88bf7be98f2454e3119b3080a6c72c1320faf6ab5e4494d7be4fe0b
 DIST gnome-user-share-3.32.0.1.tar.xz 439696 BLAKE2B 278e46adfdb2a24a2b9d8d76e38bb9a6cb1b5ee85c820fbc38aa1ebbed2481537dc8686dccef3d213c0c83bb236f1431a9706b3d6cceace78172d93798534d76 SHA512 d644aaf0c0b593188936505391b1927d883234ffa5acd6d04675575fc68409512b416d87ca6d0a7960187b433a874f2da6ec2d304eccbab8846446f89df8297e
+DIST gnome-user-share-3.34.0.tar.xz 109560 BLAKE2B 02d0788ff6b4b1a87ebd1d5dee2a853ce0418a553aa2be262227f0b8984ed8bcf84bec774b43952425e96d8b14f4100fd42e0dbec02cc91e67e0881f9155005d SHA512 7aa5f0cad4b96af41b5e4b4a125cb7a9d7a7c27ba10cdf7c4acd2aaffe5bfb3494c9319b997e547c996017827383f7653905c3e0af67c65922635b7ac49803f5
 EBUILD gnome-user-share-3.32.0.1.ebuild 1302 BLAKE2B 47f30955ce9feb450b618ebdd019283627d038dee881551d29fef3c8a62a5ec454d136747d3cf39e16aacdc1af959c9fd5a8e3c0329c6688b96c06d660307f63 SHA512 ffe2f8a27ed53c321d68ed04c17e1d47bff42cc51322429268bd557c4980c9714bca3c850495805dea27ab7ebe4a491be5f981af915dc949ea456f0fce8ff241
+EBUILD gnome-user-share-3.34.0.ebuild 1313 BLAKE2B eadaab492536bf8730085ff5a6e1381ec3427bcfc4bc58d3b41fe320407dd2ab27526466ed699da24e4d26e93958695374e84a6f217b9e83315780d80ca1f23f SHA512 d9cea0ecfbc9f47d13edd38ca251df757e966314c0dff9fbe27093a04d0e4cb53597a494cac1e6f1c3591923b4b1a168bbe7af7ecc1fb80e31d8436b976df0d5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild
new file mode 100644
index 000000000000..fac4406caa6b
--- /dev/null
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson multilib systemd xdg
+
+DESCRIPTION="Personal file sharing for the GNOME desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# FIXME: could libnotify be made optional ?
+# FIXME: selinux automagic support
+RDEPEND="
+	>=dev-libs/glib-2.58:2
+	>=x11-libs/gtk+-3:3
+	>=gnome-base/nautilus-3.27.90
+	>=www-apache/mod_dnssd-0.6
+	>=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Upstream forces to use prefork because of Fedora defaults, but
+	# that is problematic for us (bug #551012)
+	# https://bugzilla.gnome.org/show_bug.cgi?id=750525#c2
+	"${FILESDIR}"/${PN}-3.18.1-no-prefork.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+		-Dhttpd=apache2
+		-Dmodules_path=/usr/$(get_libdir)/apache2/modules/
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest
index 4c327eae7d16..48da920ebb27 100644
--- a/gnome-extra/gnome-utils/Manifest
+++ b/gnome-extra/gnome-utils/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnome-utils-3.8.0.ebuild 595 BLAKE2B 9759c192d9bfe33e3a1ba02b34db911a708b1cac763edd4eb7a4456734731830570d2223818aeb6e6b960c13ee133dce29151c942ec221367467eb8d6bf1d088 SHA512 edfd9d29ea530705acf998cb2f3a0899d78fdecbd3504eb8373c7764fa55ce6d7efc65c14f9a9adf744481315295abe1d2634bf62d3d1be650013919743f32b8
+EBUILD gnome-utils-3.8.0.ebuild 588 BLAKE2B beb04b0af7422f3c34dd16b3d372c5f79cab1a3488b6bb6133e172ed8361ffe95b766b35a9712c826a490f2c6d8cda8a1f598b7e6f7349de457ed304697688a0 SHA512 af95ec9edea6fd3bd351e711009144cb1f7d60592af116d6b69b7507d71db902628c3a7b9ef26013f1470fb4bc0178ac055d00a7ce45b11e97a7ac721bf52028
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
index 54151cb08916..f2bf05a95df4 100644
--- a/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Attic/GnomeUtils"
 LICENSE="metapackage"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND=""
 RDEPEND="
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index 1add67ac3ad1..25a336f8640f 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -1,3 +1,9 @@
 DIST gnome-weather-3.32.2.tar.xz 5952300 BLAKE2B 536cac87066eb714bba15db0e662d9e9a0260caf67f3b9d7f2c8677deb3dc514d50768754bab46db1df9dc11367d1cf07690888b93031804d7a37a3898a1a689 SHA512 22f2de0f6d4355a44fef332d47a49b995d647d3d8d10c06a77c182d0efd6ea33f62e055f047a665710024ba02c90912ffefe67c8b299da6bb47d899d1d7a3825
+DIST gnome-weather-3.34.0.tar.xz 5954936 BLAKE2B 66d96af1a9e6c38bddf93ff56855bdaa2a260d0fe354ba2da4ce9377ede78dd4bf8ddf227249414a011734414dddaefa48bf0d7f7a5532303686679f788c792f SHA512 f8fd91deef1516b4a18a599415d54a04413a5771916a5c7105e22876e239fe22c325f2e3196f7bff23293893c85fe886fa3a8b4b380aecab62b5b02de58c7185
+DIST gnome-weather-3.34.1.tar.xz 5957784 BLAKE2B c36543c6235156e92f96d509fee2a3229cde1a2a6e0b7e6b27a33dbe6f19f336b754e4ccc2f5c5f9720b106eae47f0e763b0697b8817178a3e341ea815264381 SHA512 01fba7c79c2ebfebfc33f7d6f7d7b9b17ed3a55aacdf96d3dfddc9c446ab6ca125602ccf9b896c949d46291fb3688165fab4272d41092f303ca604068e817ca7
+DIST gnome-weather-3.34.2.tar.xz 5957924 BLAKE2B d6257fb7654862f5fbd308bc202ce8b8f98a0b6baa5a150a1729962fa05812a93cd19f9462d83fec3d076b896be1d8166e360811c84bc3ab4f13b212b48884e5 SHA512 9e9ebbdf795b175f7640ad684da7642a3e6a07da4d95c520a8673f0001aac119c5ebe22737d254a75b878f503910265fa0fdf05b1c219063f6b4dfc6bc8d1633
 EBUILD gnome-weather-3.32.2.ebuild 1245 BLAKE2B b8568a1990fd9f366784171f02b555c75a51ec9127fb0571d5aa60a67d9242c0081fb9dc2de57857daa3c415e24fe2ec59d795c86669dd5f3d9d1c7b768d8b56 SHA512 5fa1e70740f4d33d27db6e063df07b2c8fb691e5acc98247ad91e6e748271fe3ae48b554b4548512eb0c1a5a1ad531cbde99c1582ed8c9fc072b40a0f4c1369c
+EBUILD gnome-weather-3.34.0.ebuild 1335 BLAKE2B f2213bda169d47563c1998d28c107229aaffdfedbe3126a34c181db83f40a06f0ecb30ad3184ce4df3dcf4f1326116ceefca14d0565138bcc81f180c02f6c788 SHA512 beb6cdc6253ce24bfe9a479cfd47ecc277ed011e8ce98ca0c0aedfa1f89db672eeb2167ac0ba114ea74bca5fc18654957fdb113ef4254f2ae3795dbfd107cd90
+EBUILD gnome-weather-3.34.1.ebuild 1335 BLAKE2B f2213bda169d47563c1998d28c107229aaffdfedbe3126a34c181db83f40a06f0ecb30ad3184ce4df3dcf4f1326116ceefca14d0565138bcc81f180c02f6c788 SHA512 beb6cdc6253ce24bfe9a479cfd47ecc277ed011e8ce98ca0c0aedfa1f89db672eeb2167ac0ba114ea74bca5fc18654957fdb113ef4254f2ae3795dbfd107cd90
+EBUILD gnome-weather-3.34.2.ebuild 1335 BLAKE2B f2213bda169d47563c1998d28c107229aaffdfedbe3126a34c181db83f40a06f0ecb30ad3184ce4df3dcf4f1326116ceefca14d0565138bcc81f180c02f6c788 SHA512 beb6cdc6253ce24bfe9a479cfd47ecc277ed011e8ce98ca0c0aedfa1f89db672eeb2167ac0ba114ea74bca5fc18654957fdb113ef4254f2ae3795dbfd107cd90
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.34.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.34.0.ebuild
new file mode 100644
index 000000000000..fa585992b10f
--- /dev/null
+++ b/gnome-extra/gnome-weather/gnome-weather-3.34.0.ebuild
@@ -0,0 +1,51 @@
+# 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="A weather application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
+
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-1.56:=
+	>=x11-libs/gtk+-3.20:3
+	>=dev-libs/gjs-1.50
+	>=app-misc/geoclue-2.3.1:2.0
+	>=dev-libs/libgweather-3.28:=
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+# libxml2 required for glib-compile-resources
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+# Tests have a lot of issues, starting with reliance on a system installation,
+# accessing the network and other intermittent failures with network-sandbox disabled
+# https://gitlab.gnome.org/GNOME/gnome-weather/issues/67 (and rest not filed)
+# test dep: $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]')
+# With 3.34, this is now behind a dogtail option we can pass (and have data validation)
+
+src_configure() {
+	meson_src_configure -Dprofile=default -Ddogtail=false
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.34.1.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.34.1.ebuild
new file mode 100644
index 000000000000..fa585992b10f
--- /dev/null
+++ b/gnome-extra/gnome-weather/gnome-weather-3.34.1.ebuild
@@ -0,0 +1,51 @@
+# 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="A weather application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
+
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-1.56:=
+	>=x11-libs/gtk+-3.20:3
+	>=dev-libs/gjs-1.50
+	>=app-misc/geoclue-2.3.1:2.0
+	>=dev-libs/libgweather-3.28:=
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+# libxml2 required for glib-compile-resources
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+# Tests have a lot of issues, starting with reliance on a system installation,
+# accessing the network and other intermittent failures with network-sandbox disabled
+# https://gitlab.gnome.org/GNOME/gnome-weather/issues/67 (and rest not filed)
+# test dep: $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]')
+# With 3.34, this is now behind a dogtail option we can pass (and have data validation)
+
+src_configure() {
+	meson_src_configure -Dprofile=default -Ddogtail=false
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.34.2.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.34.2.ebuild
new file mode 100644
index 000000000000..fa585992b10f
--- /dev/null
+++ b/gnome-extra/gnome-weather/gnome-weather-3.34.2.ebuild
@@ -0,0 +1,51 @@
+# 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="A weather application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
+
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-1.56:=
+	>=x11-libs/gtk+-3.20:3
+	>=dev-libs/gjs-1.50
+	>=app-misc/geoclue-2.3.1:2.0
+	>=dev-libs/libgweather-3.28:=
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+# libxml2 required for glib-compile-resources
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+# Tests have a lot of issues, starting with reliance on a system installation,
+# accessing the network and other intermittent failures with network-sandbox disabled
+# https://gitlab.gnome.org/GNOME/gnome-weather/issues/67 (and rest not filed)
+# test dep: $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]')
+# With 3.34, this is now behind a dogtail option we can pass (and have data validation)
+
+src_configure() {
+	meson_src_configure -Dprofile=default -Ddogtail=false
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index c9c4611f39f1..2f280e3a5984 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,5 +1,5 @@
 AUX enchant-2.patch 1480 BLAKE2B ba37c6d8370b3cb1d8fea4a36de966a2f2ee3202f4228d4e3d2bfad580a5478ade92b510895c8662213a845ccf4a6652796ac2851493ede1c0a03dbc51f2f5dc SHA512 2517bcf65d7ab7c328e38a2d34543630877fef5f14caa64a11d514e39171417d8075180b6f3bd747d8b9b60c49973510983413c25cc3e9e52ea82c78aa4e060d
 DIST gtkhtml-4.10.0.tar.xz 1050628 BLAKE2B 563eab2e81fea2f0d457cd4506f9b91e9ce497f4f8ca8281b3f609fcb8ae3a666b5815133f6590334af31adf5fbeba1d401b8d328ed04439f0f88051c52d5e7c SHA512 efb159f902a910abd259cf38a86894a363dfd6b632aaad5ca88baf278780e653a2efc783ae48d9e4239f9fbfcbab15a5f343b60c910166d04e6663d4e34843e0
-EBUILD gtkhtml-4.10.0-r2.ebuild 1029 BLAKE2B d8d283f0a2483354c07a44a4aac57b8da9dfba8df4e46c68ee4fbdb642205986ae087877a8f7bd12c99b3d602042e5ce3930172cd8a7ba112134c12d85a712bd SHA512 6d3b628469ba4115779e94a3fc52d126a96a99addbec44591eabcd604fd1ea89eafeb224e3d146bd983e6082c16197c443174be574844bfba494b22a6bc562a8
-EBUILD gtkhtml-4.10.0.ebuild 982 BLAKE2B ddb0c500bfbbae067c2e09a7dce6838090772c0c4e16933206a7f53cbc1c641d752eb766eec9af41db347378f60d8254e0bc048d03a6a4c8fd4123679c753c39 SHA512 d77032c7b9513da9e04b7021c9525dd5a1dcdfc3c3ab7e4bc6ec5a3bdd2b1b12894237b9fc66bb5727549d1e21fe566fef6d737d983176151178f12c30d7b465
+EBUILD gtkhtml-4.10.0-r2.ebuild 1025 BLAKE2B f53539269fa4f4eceeb3c4a2c32ac356e0a705642d57ca1c1672f38c5f20df48105b386d96ca09d77fa5437aa65f556b7c2846e3110c7ac9201183491ba3d2d0 SHA512 7846bc309a48102b4307a4dad27860e26541cc4e855fcd5eb3678c30dd31cb65b32bea4650b8b17139065cad3049ff51faab562c9681de43c8b1b5ee492915f1
+EBUILD gtkhtml-4.10.0.ebuild 978 BLAKE2B 525230be17cb4bda227415152e83c22ee462dd7748ba5030522355994f7d357c6c942ebf92f0787317346d42496a6ddce497e9a82bbeed0b8792ecd151611a73 SHA512 cab7c98ee05f11b864441e976ad47f8af21cc6ab5a33c245b8da79474b6bf943d1212a0302ecc51fb323361305ccb9ce43145a28c997777fbf9787b6c0576cc8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild
index aefd78f80c09..57d3fb7bf343 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/Archive/gtkhtml"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # orbit is referenced in configure, but is not used anywhere else
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
index 0d1d152fbef0..e83b54fcb0e7 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/Archive/gtkhtml"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="4.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # orbit is referenced in configure, but is not used anywhere else
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 9aab17b0af3e..8c882f467c16 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -2,7 +2,7 @@ AUX gucharmap-3.4.1.1-fix-doc.patch 348 BLAKE2B c6bf73a5e9940557fa43da04b8212ca5
 AUX gucharmap-update_to_unicode_12.1.patch 1498 BLAKE2B 5ed3c8a254862074fb923ceac25a03478c88ff3fdd33af9aab98f49830045e04a13cf6ea8551d16aee112a5c62ccc71a167926ce5205297a1552f2819193d99a SHA512 aac3a9b95985b1fd2122f1a759a0c571116a94cc429c4e9736a4f2a36e257241e7bdc4e6ba7badaeebca79bd8cca275ff66b6e9f933c707342b8872ab78dbe7f
 DIST gucharmap-12.0.1.tar.xz 1678524 BLAKE2B 90923dcb85f132f607007b272f56d091cd51f14d6818fc01fdedc594d736cc1047e4d3165f4ba3cede96ee2c0db4973890e1fde60c294fb848ffb3918988178f SHA512 989034350c73c3f1857167f434aa4a5c140ef7574cb799b874e421a8d0c2bf520dfcee85bc0cf8e52f439fb7d30e0db5172a25c107c80b38ce6da4e703a3ffc2
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
-EBUILD gucharmap-12.0.1-r1.ebuild 1940 BLAKE2B 2bd867926e4962eb58cef1caa7064eea63f2818b9d69b5da44719a3c7ac67999c15509a5b20050dbff2e6be5f51835a4105ac12e8408fbedd362456d8f109706 SHA512 2df603872f7a085b155ce2940bfcdf39e71a5632dfad3f0f1adba5c00bfbc0f08801cc3304d1d6058b5a0675e71cc2c54ac994668a389e2138fe0de334286664
-EBUILD gucharmap-12.0.1.ebuild 1744 BLAKE2B 780ae2f9bb7aa7257cf61bc48aae0f25d1eedefe9ceb8d67a18cb06b1c3b7b2ee299e0d40967871e535b237b6f101fd4ffaca188d0596062f96ef26cbebd51fa SHA512 9159685f1eb5cf505b642e5613bf5e4b751fe66219ba36d5592a0eeab89d5280b88bb0c051347c8fa72b90f04a149c8a4da1d451ab25adb1bf4362addf953045
-EBUILD gucharmap-3.0.1-r200.ebuild 1479 BLAKE2B 8476e272733a70d18e77bcdeef38f7cc3adfa4bc11ee39329855a751b5359daf28cf576d28644d823f5d677c8c640f0018c1afbe5a229de515ba31e9a64775c2 SHA512 4c7c055e10e7eedaf0ec94bee14cbb9091a23c4838baa7df3f7fba36fa221a0425417a56856ae6260434f816a6e0f3f41389b8cd725b8af7af7d6b808b9622ba
+EBUILD gucharmap-12.0.1-r1.ebuild 1936 BLAKE2B a3686c5c86744f975a8e112c4098ffc82f80e1c1def8545b57a26b76c97856fc899afb028fb406fac91e06f69a0fe049847352a09d0620fa13bf1a37d888cafa SHA512 91aa6a98a48bfc3ab55ad150e3ddb3950ccccdae66219b836f54260aabaf5905a8ace69913a7c7478b40e7983becb4e82ae330cf4865d6087a70409abb610ec6
+EBUILD gucharmap-12.0.1.ebuild 1741 BLAKE2B dea36eb5c3be56088a803f974509d12075f488c823c5943d1915ea0cc9ab1328ae09ef1964b939c4b64771bda8bbb44fcc351a5cad86ff7a636f09c3f46c247d SHA512 a30f6df8594982e305da2092af3a26cdb8d014101af5f1b8d0d75b35dbabf68aa34bbc058c279d896907953cbbe6fa52e2ddf2035384ae6e007f77370031deba
+EBUILD gucharmap-3.0.1-r200.ebuild 1477 BLAKE2B 4ffe6feb86be5711b4850d4c1233bd79e2cb9cbca765977ac15b7a335c3b3f80beffe2119835a73024d38a22e4623037755c8672f77edb6016b818047b8c2256 SHA512 b0313be9418955ebfde4547603d66c8121cb36b7cf390e23ee9b536ea9ff21b4760bb9d9e0d843bd49fcb63db28b173d8536a6d5a5b72de1eef76a87bed769dd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gucharmap/gucharmap-12.0.1-r1.ebuild b/gnome-extra/gucharmap/gucharmap-12.0.1-r1.ebuild
index 96e97ba7eec2..16aafd985d66 100644
--- a/gnome-extra/gucharmap/gucharmap-12.0.1-r1.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-12.0.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
 
 LICENSE="GPL-3+"
 SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="debug +introspection test vala"
 RESTRICT="!test? ( test )"
diff --git a/gnome-extra/gucharmap/gucharmap-12.0.1.ebuild b/gnome-extra/gucharmap/gucharmap-12.0.1.ebuild
index 2e2613a91d1a..17ae326da87b 100644
--- a/gnome-extra/gucharmap/gucharmap-12.0.1.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-12.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
 
 LICENSE="GPL-3+"
 SLOT="2.90"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 
 IUSE="debug +introspection test vala"
 RESTRICT="!test? ( test )"
diff --git a/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild b/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
index a65a899e9eda..7a638becab81 100644
--- a/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="cjk debug doc +introspection"
 
 RDEPEND="
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index f3c55fa9fbbc..5e941f066795 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -1,5 +1,5 @@
 DIST libgsf-1.14.45.tar.xz 618476 BLAKE2B f577859578de6ca359a7377dcced424e95779d3fd155cdbeb1c2874f7a0d0c7a09a2322d2538452b48798ea979e8260be77215140f298dc58ee32a0b9ead0e47 SHA512 2e993150b6fec336a14fd85d5c631e4a3b43187039dab0cba3b8badf62873f39814392db92bb737b92aa9a6d8b4ba41f1fb248c1fe07b88cddd28ded5e4d9ebd
 DIST libgsf-1.14.46.tar.xz 689360 BLAKE2B d5d66e96dc74fa68111781ce9bcbfaed2b8a99f9d2bcb16e32a650e103716633b5def7c93f133538449a3b6d9299e4709ba29bc6a520d5c7fe144bcbf78d3ae1 SHA512 130331f63d48455cc2ce60756e2ac703f8a7f5fa8f1243d9d9321fb87e01bf1d616d085d100a3e5d1cf34fb851ffb77bc642aff6c674ace167b9aa117f4fb1b0
-EBUILD libgsf-1.14.45.ebuild 991 BLAKE2B 73e9a12b55dfb7b3050c39ea42a4fc438dc043ef3239164b9918ccc62359ce2f8197ef89611702e994efa7c9557a9edcc3602b24bf0ec512b32126d69bd37558 SHA512 1b6caed34cb41e3525800c282da88dc2d969e4eae7072471c22f11eb7b52bc965f01ecd097960a082d17c41c37c9170a2b97c34b8b2e85d5ce9b04d326adb6e6
-EBUILD libgsf-1.14.46.ebuild 993 BLAKE2B 463b6ae243391b3bd5584926cd4898562d9aee72e16ebabc6ea9e8bd03e9198fbc1f0c612a8de881507507d48ae41d672530d7794957cfcbd1990d68e47f3f65 SHA512 7a00c0fd2463816b8c0037d243b06271d3fa481a501d106cd281d2d91aafa76b6536d37f55b850d9b7986ae990863d40fa4059a3e230f81525814736838abd1c
+EBUILD libgsf-1.14.45.ebuild 988 BLAKE2B 1e99126a497b30b51db98758a7a8dd83ad53523d56d77a251db6d6dc7e2334b960c47dd81862fe62bfb6e8bba558fa13067a4e25d961c84473a02b31422a9a39 SHA512 70c8f860a6fcbda9ac93c7d39f4e5bccc76cc2ab203a4382b6de7b68bca6c32415638b16ce44158c736d030395d7d3cee2971f6277eb5a7c8cdaa7d2698b52f3
+EBUILD libgsf-1.14.46.ebuild 990 BLAKE2B 6b6d67aa95ca260b0b1fb25191b4f81c3ac70fbad9496b959b23695b396afe224fa2e2d22db3ee01ef205b75b98b7f57b791b334cabd50c416c8cab6cd89baec SHA512 e16802dbb1a61eefc3f0187a8dc3a92e7fcf4f5f2a2a0654898961ec36b3db42af15daf7fb4d753e14819d542490c562e7a12e14e6b1487453f6b2d385c675aa
 MISC metadata.xml 320 BLAKE2B 0724d11438ccaab9b8665d8bc0c9787fce2fc77c1d7b45b8400a66bfcf82c904c73dda016327ab27c81eb2c1574a0f568bcc04ed579c5cc0f8f15dc6d52762a7 SHA512 605b3ee95fa1f26d46a52ad9e9e6f14b4ee193bd2427336afa2a2f6379287bbb121cb98629afbc146bc46fb721871143c73dd9af805b27a1d1ac0d912dd7a4f0
diff --git a/gnome-extra/libgsf/libgsf-1.14.45.ebuild b/gnome-extra/libgsf/libgsf-1.14.45.ebuild
index b290c926426b..631fc707179a 100644
--- a/gnome-extra/libgsf/libgsf-1.14.45.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.45.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-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="bzip2 gtk +introspection"
 
 RDEPEND="
diff --git a/gnome-extra/libgsf/libgsf-1.14.46.ebuild b/gnome-extra/libgsf/libgsf-1.14.46.ebuild
index 28d78cc1a6d1..7440be2afc14 100644
--- a/gnome-extra/libgsf/libgsf-1.14.46.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.46.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-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="bzip2 gtk +introspection"
 
 RDEPEND="
diff --git a/gnome-extra/nautilus-dropbox/Manifest b/gnome-extra/nautilus-dropbox/Manifest
index f92fa476959b..4ef00dcb8707 100644
--- a/gnome-extra/nautilus-dropbox/Manifest
+++ b/gnome-extra/nautilus-dropbox/Manifest
@@ -1,4 +1,4 @@
-AUX nautilus-dropbox-0.7.0-system-rst2man.patch 463 BLAKE2B fdb1996d7144cd9c6943111cf1a4abd9a55f9a594131985c1f0c40eec7c203b2d2839fdf2e673480bb329735dce27e31cbcdee8bdd2c019df678620d374095aa SHA512 5a34c3e6ff51a1a14eac11e0619a81afeec05979944d128ed37076cadb9a79edd839918ee289c409c537be73a913ee3bc58f19cc2227cda8762328e2f0fbd7eb
-DIST nautilus-dropbox-1.6.2.tar.bz2 354408 BLAKE2B 7a3d1cee88dc595fc43f92d84328cf112755d2aa98a99e84e24d132b6167fb5378cc4e9914c31510d38deadc952caed1debdea7ae07dcd0a7b58e72790af428a SHA512 696808a7e5a1d8bbe06903b5ab075e0aa32d0b35c44363d7874fcdd48d339650bdf80190e37cba5782b31565ca9b233573a3d2ee74866add169ff5ea1d0b62d3
-EBUILD nautilus-dropbox-1.6.2.ebuild 2139 BLAKE2B 7b061bb4b6fa19284064f1a6bd2f18744ab54456fb2a744d3ca30e941dbe38c466af17ea1d70f259d9c661a289179995911c433df711b6ccf1c09ce886736882 SHA512 11fe5db76463c33572a66fc3755863c21fd44da7726b51775b3e2bbc64e6791f6a67876af31ff41fe5952462e205453cd77a1d123f2af6d10645afa9fa7a07fa
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
+AUX nautilus-dropbox-2019-system-rst2man.patch 464 BLAKE2B c0f25a56ee504a6070efdae70670e1a925a1718cfb5e1345d3acfdb0face02d1278d10f2f7172e172056834f99f309d50bbf5899f37fa6023e743042f6ffd7b8 SHA512 98c9e85a491991fd2afee3a12c8be4ab708ee47a42d08d4a11daefc1e964cb3031ffb94a27ab7758b3f1c71f7343dd4b0a49d24cb8aa2848baf65f83879a6cfb
+DIST nautilus-dropbox-2019.02.14.tar.bz2 381416 BLAKE2B 0765196974d88caa477d962311efe05941cd2d25e35fa028720c8abed5120fea5abede74f39e00cb2ac9eb08d6d4bbdf1d1fe6db8d604c1803570209e654d55a SHA512 c5758d97fa40af1b27388c23289e5d1d98ef1c6db04ed7fb5cfee387723f72c34f3583fb6e0158a39f30d5ff649cb2de6d92fc4ad6e976e301dc239bda9d554b
+EBUILD nautilus-dropbox-2019.02.14.ebuild 1350 BLAKE2B b291d6448e63efa89255fe1301cef00ff3aa8026c7876971f59e1b81ba517c1a8f5253e00690c64c5924c15ea179799e03e5cf91c214577d08d82e894e26af3d SHA512 4d228a24ffeed366e40224c29356f169180ff50480e8c72dbe07aa87c78283a3f3e4ea753f7bdda39f1620dc13064c5b52ee4bb89dd1dd291b4a3b26f78ab297
+MISC metadata.xml 552 BLAKE2B e6c9aca580f306553603321af76571b8c386646d110c73bfae250ab6d6efed3a16a67fbcb70cf051c13c143d15215f9402820328fe9113b2b304d506cb0ec2ff SHA512 300bebe2d4755eb54dc33fde5b7fa0c3b2b6116625356de05675b892125fa7ee23acc0bffa849eaf4f9b908d22cd093f54df898c7a12cd849ee5235e7a7049a5
diff --git a/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-0.7.0-system-rst2man.patch b/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-2019-system-rst2man.patch
index ea0053b4bbb6..06e592291641 100644
--- a/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-0.7.0-system-rst2man.patch
+++ b/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-2019-system-rst2man.patch
@@ -1,12 +1,12 @@
-Index: nautilus-dropbox-0.7.0/configure.in
+Index: nautilus-dropbox-0.7.0/configure.ac
 ===================================================================
---- nautilus-dropbox-0.7.0.orig/configure.in
-+++ nautilus-dropbox-0.7.0/configure.in
+--- nautilus-dropbox-0.7.0.orig/configure.ac
++++ nautilus-dropbox-0.7.0/configure.ac
 @@ -31,7 +31,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLI
  
  AC_PATH_PROG([PYTHON], [python])
  
--AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
+-AC_PATH_PROG([RST2MAN], [rst2man], [python3 rst2man.py])
 +AC_PATH_PROG([RST2MAN], [rst2man.py], [python rst2man.py])
  AC_SUBST(RST2MAN)
  
diff --git a/gnome-extra/nautilus-dropbox/metadata.xml b/gnome-extra/nautilus-dropbox/metadata.xml
index 1b2becffa26c..55dbd3b953f8 100644
--- a/gnome-extra/nautilus-dropbox/metadata.xml
+++ b/gnome-extra/nautilus-dropbox/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+	<maintainer type="person">
+		<name>Jonas Licht</name>
+		<email>jonas.licht@gmail.com</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		A extension of nautilus to display the sync state of an Dropbox folder and add a right click menu to mange files in the Dropbox folder.
+	</longdescription>
 </pkgmetadata>
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
deleted file mode 100644
index 049f64ac504d..000000000000
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-r1 linux-info gnome2 readme.gentoo user
-
-DESCRIPTION="Store, Sync and Share Files Online"
-HOMEPAGE="https://www.dropbox.com"
-SRC_URI="https://www.dropbox.com/download?dl=packages/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	gnome-base/nautilus
-	dev-libs/glib:2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	net-misc/dropbox
-	x11-libs/gtk+:2
-	x11-libs/libnotify
-	x11-libs/libXinerama"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-python/docutils[${PYTHON_USEDEP}]"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup() {
-	check_extra_config
-	enewgroup dropbox
-
-	DOC_CONTENTS="Add any users who wish to have access to the dropbox nautilus
-		plugin to the group 'dropbox'. You need to setup a drobox account
-		before using this plugin. Visit ${HOMEPAGE} for more information."
-
-	python_setup
-}
-
-src_prepare() {
-	G2CONF="${G2CONF} $(use_enable debug) --disable-static"
-
-	gnome2_src_prepare
-
-	# use sysem dropbox
-	sed \
-		-e "s|~/[.]dropbox-dist|${EPREFIX}/opt/dropbox|" \
-		-e "s|\(DROPBOXD_PATH = \).*|\1\"${EPREFIX}/opt/dropbox/dropboxd\"|" \
-		-i dropbox.in || die
-	# us system rst2man
-	epatch "${FILESDIR}"/${PN}-0.7.0-system-rst2man.patch
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
-	AT_NOELIBTOOLIZE=yes eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-
-	local extensiondir="$(pkg-config --variable=extensiondir libnautilus-extension)"
-	[ -z ${extensiondir} ] && die "pkg-config unable to get nautilus extensions dir"
-
-	# Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D
-	extensiondir="${extensiondir#${EPREFIX}}"
-
-	use prefix || fowners root:dropbox "${extensiondir}"/libnautilus-dropbox.so
-	fperms o-rwx "${extensiondir}"/libnautilus-dropbox.so
-
-	readme.gentoo_create_doc
-
-	python_replicate_script "${ED}"/usr/bin/dropbox
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild
new file mode 100644
index 000000000000..f19bab7fb147
--- /dev/null
+++ b/gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild
@@ -0,0 +1,67 @@
+# 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 autotools python-single-r1 xdg-utils
+
+DESCRIPTION="Dropbox Nautilus Extension"
+HOMEPAGE="https://github.com/dropbox/nautilus-dropbox"
+SRC_URI="https://linux.dropboxstatic.com/packages/${P}.tar.bz2"
+
+LICENSE="GPL-3 CC-BY-ND-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	gnome-base/nautilus
+	net-misc/dropbox
+	>=dev-libs/glib-2.14
+	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-python/docutils
+	virtual/pkgconfig"
+
+# use system rst2man
+PATCHES=( "${FILESDIR}/nautilus-dropbox-2019-system-rst2man.patch" )
+
+src_prepare() {
+	default
+
+	# use system dropbox
+	sed \
+		-e "s|~/[.]dropbox-dist|${EPREFIX}/opt/dropbox|" \
+		-e "s|\(DROPBOXD_PATH = \).*|\1\"${EPREFIX}/opt/dropbox/dropboxd\"|" \
+		-i dropbox.in || die
+	AT_NOELIBTOOLIZE=yes eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		--disable-static
+}
+
+src_install() {
+	default
+
+	# removes files which conflicts with system dropbox
+	rm -r "${D}/usr/share/applications" || die
+	rm -r "${D}/usr/bin" || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update;
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update;
+}
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index e67a59c7a250..808c4d381c58 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,3 +1,5 @@
 DIST network-manager-applet-1.8.24.tar.xz 2062132 BLAKE2B fed75ab78e05b59a4f20c7570b84ac6fe3dd2cf6f8ad060f6c65bc9e2a32e29d295fc919de1037ba30c2609d35079dccb3f625ffc019150c9c69cfa94388e2c8 SHA512 76e914ec4f2e6eadd21ccc3e1f613fb97cb72d9551730a1dc09454177365dcaa2cdeea4b855c53732ad6a22cfa5e62e03f09fc8b04a277ce213dcf8c3beaf77c
-EBUILD nm-applet-1.8.24.ebuild 1673 BLAKE2B 656fa34ddeb1598b2823527b585135be9f1fc5534093083ca2c0404ff60f4392ebdf4668f0442e654d134a81da5af78d9bcbe91456386ae391f848d4e976e434 SHA512 33b98c51b7b43d1c2d9c0080b76ccf0ae84013277274a2f0f4a3fdfcfb375e040bacd170a7ea243ec9028ce37384f7d50028e5bad5b0ff10b22c38517fc3eab9
-MISC metadata.xml 548 BLAKE2B 2b7a8b83983ab5c3477f2fbd75b35176f875dd6c9dccd28d8cb010168b10df3ca13307ee525db41c4309f9caab8e7c8e96b0822d3bb8480479a5cec8a25650c1 SHA512 3a163bc5738f3ee35fe00273788f2a3bd943db38832096c9e8a8d7c3676e0b90ba891ed0cc4903109e11c2dbbda950c100b66a79ddfb09b4a5fcb160b6a55067
+DIST network-manager-applet-1.8.25-dev.tar.bz2 1795238 BLAKE2B 2cdf81b1395dc69fa35ed19d5410dc94b8a7ea5cf99a3a8b81e7d4f0b0852f883d8a0c4fbe42e0088ba79e5473c6c01e332feb6f78a3526bb21237f6fe17719e SHA512 3441b8c3c195c0ff9528d219d5769bcc56d7fac92030af75ae2d16e3c91accb2350286c18c2c46cc12a20e87099d05183f0510398519c6fcd8520d0ab56850a2
+EBUILD nm-applet-1.8.24.ebuild 1728 BLAKE2B 40fd22bbf9026619a4cbb38760e03b7fb498e3e9e13baf93df8b369e4cb22c9cc0677cb96122d14d621af443f6ddef4496910a88320e84129923774b5281f3e6 SHA512 196335486adbb889e21b4abb5332a7aaa664f0515b7090473a9b369a03614232304e9d7507c7e86c0eef340f018377f35284cd42bbc4bc6f2a19bd9fca2ea5fe
+EBUILD nm-applet-1.8.25.ebuild 1774 BLAKE2B cc259671e2b77a821e533e27eee8f0b17f2738d841dee25b126787e598dfc74f86c3ad5bbbc3167b3df23ef8f4847c7f4451a61e0a30886f40b94fbb50418832 SHA512 dd32925a9aeed3637d5ea88f02d292cb446da2d3ceace191b0d23dee6794439e9694aeb186072154ef5c8322daf934b33644016ff7cc5baeffbcaff60fbb415a
+MISC metadata.xml 709 BLAKE2B c5ee0c7c876b849c7f640a64d5d6ae3325b693be9b7733e9757ccb0418f6d6b4ad2f85afe033ebfd6f3f4cfd6f907160095141998ce5c01e2faa87456ab58856 SHA512 0449bc9810e4b7b85307bcd8bde24746697641cf82e34790d7a8c280951c5814646c2a6bc7a3e8e0245d1deb24f9b8a0890d1d5d8227dbaf6c92dd966e5ea1c8
diff --git a/gnome-extra/nm-applet/metadata.xml b/gnome-extra/nm-applet/metadata.xml
index 7cb30b744ca5..7bbb6fe7064c 100644
--- a/gnome-extra/nm-applet/metadata.xml
+++ b/gnome-extra/nm-applet/metadata.xml
@@ -7,8 +7,11 @@
 	</maintainer>
 	<use>
 		<flag name="gcr">Enable advanced certificate chooser, requires <pkg>app-crypt/gcr</pkg></flag>
+		<flag name="gtk">Enable legacy library libnm-gtk</flag>
+		<flag name="lto">Enable link time optimization</flag>
 		<flag name="modemmanager">Enable support for mobile broadband devices
 			using <pkg>net-misc/modemmanager</pkg></flag>
 		<flag name="teamd">Enable teamd configuration editor</flag>
+		<flag name="wwan">Enable WWAN support</flag>
 	</use>
 </pkgmetadata>
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild
index 771cfea9634b..f8af43807f49 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="ayatana +introspection +gcr +modemmanager selinux teamd"
+IUSE="ayatana gtk +introspection +gcr +modemmanager selinux teamd"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 RDEPEND="
@@ -32,6 +32,7 @@ RDEPEND="
 	ayatana? (
 		dev-libs/libappindicator:3
 		>=dev-libs/libdbusmenu-16.04.0 )
+	gtk? ( ~net-misc/networkmanager-1.18.4 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
 	virtual/freedesktop-icon-theme
 	gcr? ( >=app-crypt/gcr-3.14:=[gtk] )
@@ -50,7 +51,7 @@ PDEPEND="virtual/notification-daemon" #546134
 src_configure() {
 	local myconf=(
 		--with-appindicator=$(usex ayatana ubuntu no)
-		--with-libnm-gtk
+		$(use_with gtk libnm-gtk)
 		--without-libnma-gtk4
 		--disable-lto
 		--disable-ld-gc
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild
new file mode 100644
index 000000000000..18462f2d74e3
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson xdg-utils
+
+DESCRIPTION="GNOME applet for NetworkManager"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager https://gitlab.gnome.org/GNOME/network-manager-applet"
+SRC_URI="https://gitlab.gnome.org/GNOME/network-manager-applet/-/archive/${PV}-dev/network-manager-applet-${PV}-dev.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana doc gtk introspection lto modemmanager selinux teamd test wwan"
+
+DEPEND="
+	app-crypt/libsecret
+	app-text/iso-codes
+	dev-libs/glib:2[dbus]
+	dev-libs/libgudev:=
+	net-misc/networkmanager
+	x11-libs/gtk+:3[introspection?]
+	x11-libs/libnotify
+	ayatana? (
+		dev-libs/libappindicator:3
+		dev-libs/libdbusmenu
+	)
+	gtk? ( ~net-misc/networkmanager-1.18.4 )
+	introspection? ( dev-libs/gobject-introspection:= )
+	modemmanager? ( net-misc/modemmanager )
+	selinux? ( sys-libs/libselinux )
+	teamd? ( dev-libs/jansson )
+	wwan? ( ~net-misc/networkmanager-1.18.4 )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( dev-util/gtk-doc )"
+
+# TODO
+RESTRICT="test"
+
+S="${WORKDIR}"/network-manager-applet-${PV}-dev
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk libnm_gtk)
+		-Dlibnma_gtk4=false
+		-Dappindicator=$(usex ayatana yes no)
+		$(meson_use wwan)
+		$(meson_use selinux)
+		$(meson_use teamd team)
+		$(meson_use test gcr)
+		-Dmore_asserts=$(usex test 1 0)
+		-Diso_codes=true
+		$(meson_use modemmanager mobile_broadband_provider_info)
+		$(meson_use test ld_gc)
+		$(meson_use doc gtk_doc)
+		$(meson_use introspection)
+		$(meson_use lto b_lto)
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index 46b502c1d74a..856c56c965a0 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -1,5 +1,5 @@
-DIST pch-session-3.30.0.2.tar.bz2 8925 BLAKE2B 0dc3440d42f7507a0f73ad24cbcd94d106a836b2c9abb74e3d85272ed1dd0660ff85c60b7a3e824687916817f513aed321e92b4d2406e1d5f1ace3aad5bc8456 SHA512 3e8ae7db254c0489c57fb1aadffbd3dfff6ba992c5ce51f993ac5f8a2704b59aab39e65bd36768ffd3fc47eec24bfa9c34046fbd01819976bbb9eedcf84d4e89
 DIST pch-session-3.32.0.tar.bz2 8940 BLAKE2B f7b96486fda4b38e0c548b950d60cafc7f150dc8c3f1e671f04d070b937e6f9ae753db6bfc5a81061c107483dbec752ebc85515133f8a62235b3c68c51091474 SHA512 32d6393ef74cea1a7eff3e5361732f3ac47ef1ae993c33bd17a3629f1491c129ea043688dbce11dfa331d4cbe89395966b98f58c1806502a9ffcdaa62c303e91
-EBUILD pch-session-3.30.0.2.ebuild 995 BLAKE2B e07cc151c9446081f89891021c411ec215fb467b188aae96dbcb6bce35cb4542e909fd091647db4f8c81cf638fc58d91f4fed9ae3ae40b58527be5a2c84669f3 SHA512 f5c3dddca83c868451bb11b4784b689ebf417ee302f9c10d6185f54c1ff5e73b56427c481a67e6ab3b924ae7a8f736ce6fd18b92862f13d5654f8a1d903ea9b6
+DIST pch-session-3.34.3.tar.bz2 9189 BLAKE2B 82c8f346ef8b627c4756f6781e0ccc9274c5152cd723ddcf00e23411efdf3ff633ca0078cd0a4b3ebc24e1f2ef79e7d736fdc6f9b46b750f7f88177c7977a408 SHA512 dcada2ac88fec4fe2d893bd0fd76e63fb574452612b3c9286fe42f3c51fba3b2f3992ff3015b11867c01c1d328fcd8f007f9dc1e1e3030c1e722d3b4df4740b5
 EBUILD pch-session-3.32.0.ebuild 1018 BLAKE2B 82975d0d263a93903ef9cdfcb05b9d104539f7dc03bd70ddf05f7e23e1b22df412d2ef0ef2707bbde4d193ade09eaca422cb725ba76a9b0c65d63ff87f15169a SHA512 47468c1b2931034e968c37e757aaedaba5d0401ef7c94114ba6af53eb80569f75052d5ddd571f48b7022dc9b79fe169c621ff028dc73f5f0aa27e3098bf8c7bb
+EBUILD pch-session-3.34.3.ebuild 1118 BLAKE2B 360d60ce86f12daba00536f21b713aaa28ac68d43025a1f809ea1098bff2f8b07858782d464ab68ddc1264b3a5b240ceef66e1e63e14e0f7c27b5e57fe3c41d3 SHA512 e90ac0c9c4a42529b5ca766e1c8260b84a0673f62940e73a001584d0f0e67e6596238bcc4c95436d13f74170345dd2cd65056e94ca7edcd46c3725b4c3f3bd43
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/pch-session/pch-session-3.30.0.2.ebuild b/gnome-extra/pch-session/pch-session-3.34.3.ebuild
index 13a17c3af2e0..2092efd09a72 100644
--- a/gnome-extra/pch-session/pch-session-3.30.0.2.ebuild
+++ b/gnome-extra/pch-session/pch-session-3.34.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,19 +10,20 @@ SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # gnome-extra/gnome-tweaks to configure extensions easily
 RDEPEND="
-	>=gnome-base/gnome-shell-3.30
-	gnome-extra/gnome-shell-extensions
-	gnome-extra/gnome-shell-extension-applications-overview-tooltip
-	gnome-extra/gnome-shell-extension-dash-to-panel
-	gnome-extra/gnome-shell-extension-desktop-icons
-	gnome-extra/gnome-shell-extension-gsconnect
-	gnome-extra/gnome-shell-extensions-topicons-plus
-	gnome-extra/gnome-tweaks
+	>=gnome-base/gnome-shell-3.34
+	>=gnome-extra/gnome-shell-extensions-3.34
+	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-6
+	>=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-10
+	>=gnome-extra/gnome-shell-extension-dash-to-panel-26
+	>=gnome-extra/gnome-shell-extension-desktop-icons-19.10.2
+	>=gnome-extra/gnome-shell-extension-gsconnect-33
+	>=gnome-extra/gnome-shell-extensions-topicons-plus-22_p20190929
+	>=gnome-extra/gnome-tweaks-3.32
 "
 BDEPEND=""
 DEPEND=""
diff --git a/gnome-extra/polkit-gnome/Manifest b/gnome-extra/polkit-gnome/Manifest
index dcad17e4ee1d..c31e04346662 100644
--- a/gnome-extra/polkit-gnome/Manifest
+++ b/gnome-extra/polkit-gnome/Manifest
@@ -1,3 +1,3 @@
 DIST polkit-gnome-0.105.tar.xz 310876 BLAKE2B c4b44d8d667ecf043516468fea061c668c94f670aeb0649ecfe1cecdd466d46156b6fffbf642020bd575f4e40f84e6155d3752ebfef57ef0491019616a4f0c21 SHA512 eae2504959bca6f2b53dbad1b743fc0414b82897e62623af80ee74c4080a10d6b07a4c90151ee1264891f27373321b8697ac8a747cba5254c765b4cd9161bd42
-EBUILD polkit-gnome-0.105-r2.ebuild 1062 BLAKE2B 01b6cd68244f9deea4210d7e901150249c9898f42fbd97e9d53801e9c7f90e186b81f25090b6ad22be8c82e927e487d58399a91f4b82b3c846d9d9e8ea92008e SHA512 95fe34859651c045a6da9e48ed66e30ab366da49b988faa9c12570d576d0bcf248eb4b9dc94057a9e95ae1937ef8d5c5e2ec6432122dd53a1c8ea07f0a0d84aa
+EBUILD polkit-gnome-0.105-r2.ebuild 1059 BLAKE2B 8a8a9f303da9f5ae15a994ab7de3f9c7f1f87298ede15f9fce5d3f5aa8b188ad4fa2f600f755d74614626ad57757772fc1a7cee7b1cb6aca3fb27a2d80d54097 SHA512 00a189ea5eba2474dc580635e4ba0eddb62db0a01d19dcbc0aed9125d634c91e99ee702e354ae119bce38e6537dbb4234f1e7414da4870b4d1fd88fa270ed129
 MISC metadata.xml 266 BLAKE2B 9c01787259e2c33e012f96ae52558f21518e2dc4e2bae1e528e8d53b897a698d9d205226aaf5c3796002ac10335d09b57de0d7a0ec079ea9982c7e05d1f67091 SHA512 c4dde7027a929519d75bf240bdf01edee88b6ab874e56c9e524f783b801eb26b5e86a9378cf23b21f7fd2f0f9ee45764daa7deef9173a05e0fedd997e648313b
diff --git a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
index cc57d0d56cd4..76d00541ad3a 100644
--- a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
+++ b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/polkit/polkit/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=">=dev-libs/glib-2.30
diff --git a/gnome-extra/sushi/Manifest b/gnome-extra/sushi/Manifest
index d8df2f520f61..684e0a8e6e95 100644
--- a/gnome-extra/sushi/Manifest
+++ b/gnome-extra/sushi/Manifest
@@ -1,3 +1,6 @@
 DIST sushi-3.32.1.tar.xz 65172 BLAKE2B ad6d085e3c67527c988695195408e2dd8f82effeb0dacccb63eec9d3896c82fb1abf8d0fb92aeb6934146e67e8e203e438a900d4164d673b19cbe6af9d9a27b7 SHA512 db38b690591f7c7a5e55b7ad7a37022cd0624f48af6fe1c56ae05aa74598d767b61a1636d01ba207c399739c0cee6d266a52207a74f65f3e27216c5dfdd17909
+DIST sushi-3.34.0-patchset.tar.xz 8744 BLAKE2B 45077c7e78ebea5900ff8a1e8749f88677a6990d41cf44505437c5cbd05ce09b2ddef11de8e9078d419b1130f14d8ef4cbe7c6f15c80cee02dd72b17c4e84cfe SHA512 7c3d8e044179202a37c09436192436102a1ca223e358de1bc3857b0900c9921c72b1ab588fb08cfebe6ae440669a68786c3c1e83c1f6a3c489d4a5ce665217b3
+DIST sushi-3.34.0.tar.xz 74240 BLAKE2B 8b194be7ec831ce4f13549d465d6f1e6ba09ae4dc7ff86b1c214b79baac226654b75401d326d5d7d8fc0cc9fff28d8125aa4f5a9d3cdf54e472e5565815af75d SHA512 bde009b30106bf31199c8c3b040743de5f5c782fd540612a34055bef9a22f9a08c4ed0ae7c5fc3cbfdc67a5d12f28bc70ca5135ba227403e8d127295a1253d18
 EBUILD sushi-3.32.1.ebuild 1349 BLAKE2B 318a284fe3895586ddb9ff4a2069704f2b8d5060926cb288b5065a7bd192cf3a26965dd943a493beeda75c02b23f46cf6c42db7616979ee6d13c6467518815d6 SHA512 69c401e1fad00f18d7d5396e0d217b7be7f35db0e303944e7ac4545c68d0422c7be5d4bc78744f9a9bcf18ac82a506e6a069c9b13dff9a5d7a993215c39e87db
+EBUILD sushi-3.34.0.ebuild 1542 BLAKE2B d7a6417a0ae6e443a5fd4fb7f4a3bbe10bbd5b52d0b2e9b0b498da8a80f9d7d135b3ac57daee607fdd58787ff782d8b741a0db6e90d8d407599f4b694a451f21 SHA512 ae12dcea5ca61514a6f68e24ad90dbc4d99bb0b4e967a3d9c155dc797e6b177e6f676ab85938c628ee17f077fbf11f00a425bab04d3a6ef2943dd0ca272e83cd
 MISC metadata.xml 384 BLAKE2B 9d8094a09a87c46785605cae4b610f59fb6e8bdfef8e58c19dbd0725c8a11ba03cf3c25eeb77d553281934deeb64e91af780a44b43a630b5293f112f678115b4 SHA512 c6d8a451147839eb220b0e7b6759efdb59f1929da7f1d66d7c7a956a2626f04035f1b007da0e06fcf6d958bb8102df9c8c3dbc0634d89ad3937d40e21fe24651
diff --git a/gnome-extra/sushi/sushi-3.34.0.ebuild b/gnome-extra/sushi/sushi-3.34.0.ebuild
new file mode 100644
index 000000000000..80116931e29a
--- /dev/null
+++ b/gnome-extra/sushi/sushi-3.34.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson xdg
+
+DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
+HOMEPAGE="https://git.gnome.org/browse/sushi"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="office wayland +X"
+REQUIRED_USE="|| ( wayland X )"
+
+# Optional app-office/libreoffice support (OOo to pdf and then preview)
+COMMON_DEPEND="
+	media-libs/libepoxy
+	>=app-text/evince-3.0[introspection]
+	media-libs/freetype:2
+	>=x11-libs/gdk-pixbuf-2.23.0[introspection]
+	>=dev-libs/glib-2.29.14:2
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	>=x11-libs/gtk+-3.13.2:3[introspection,wayland?,X?]
+	>=x11-libs/gtksourceview-4.0.3:4[introspection]
+	>=media-libs/harfbuzz-0.9.9:=
+	>=dev-libs/gobject-introspection-1.54:=
+	media-libs/musicbrainz:5=
+	net-libs/webkit-gtk:4[introspection]
+	>=dev-libs/gjs-1.40
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/nautilus-3.1.90
+	office? ( app-office/libreoffice )
+"
+
+PATCHES=(
+	# origin/master updates up to 2020-03-10, primarily for gtk[-wayland] fixes
+	"${WORKDIR}"/patches
+)
+
+src_configure() {
+	meson_src_configure \
+		$(meson_feature wayland) \
+		$(meson_feature X X11)
+}
+
+src_compile() {
+	local -x GST_PLUGIN_SYSTEM_PATH_1_0=
+	meson_src_compile
+}
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index 3a57e73ce253..bc229464cb7a 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,3 +1,5 @@
 DIST yelp-xsl-3.32.1.tar.xz 528412 BLAKE2B 0e35757b8bd4139ebf436f69c6254cb26ba92f13d6ce345093b023151d3127f70a866572e6d42c9c93d2faf85abd6dc0ef2720955f5defab3c3415605eaf9152 SHA512 05a03e045c8278faaf39604d6cbccb449130d2c85e3231c8c9737e344fc249cd2949011fb1a0e4fb6085dc21374e7804fc7fa4161f51607d93b301cbcf5453be
-EBUILD yelp-xsl-3.32.1.ebuild 577 BLAKE2B 275c350b26ecf6507c620e496fce37843dd0e3cb303c5e453f355a7869755514b0eb465d3c7f7d2050a06b8a18df928f23d4717c77dcb394957b352252addbe4 SHA512 c9c41c9ac017b18292afaa887ce50dcb729071bce4f922a3bdf56c5de44505add9c3cfd0eea1df76deed8645d526b2d5fd1a1792a931b7566e5a69029f6ac405
+DIST yelp-xsl-3.34.2.tar.xz 640968 BLAKE2B 108d3fb52eb0548a9592442287513d3deea4ef595a252d3a46f6936243404bcdb31bb3adc234ba69e28a4de03ae35b1a5cac5ea2b2ffd4c6e4d4245c00b457b6 SHA512 ec31a46c8ee2f751f84fb309bf9a1ee3af090856b313375afb8db0ba17e9758b1616cddda4945de7c65f163893bb89a94a7372f90040b37a836f5d6173c80472
+EBUILD yelp-xsl-3.32.1.ebuild 574 BLAKE2B 0c51d2be30a2bedf87ce1fb8b4d88e4e6b7b00a2962fe6c31b4d94e1a6d0476f1dbb8552196714407c5dc4ada3d02a704c68b9148557c24b9753e9f7977130bb SHA512 4aab22ce9fd16d45da239a51f1c09c87a4d2f0af3b4b7f43c7684f85232b11731a392f0d347d70abb7359b9a311453814f8e7d27b5d20c05fafe09252d0eff83
+EBUILD yelp-xsl-3.34.2.ebuild 566 BLAKE2B 2f9c5b6e1a35587611956ed392c563f41406a40f03db3881c8feb74b885bd904427d7d1df5d3a6634f85df15ed0fbc87264885a9d57b541f4041c3f390b9c3e1 SHA512 18f003fc43fc925eb3b05c27787001dc4be392403e35039efba3fe00b75aed96fb6525d6b8939eaeb90a88a843bc562e8888b012d3844d91d20c7582a4f43bcf
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild
index 655b353a3847..8b8dfbd2609c 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
 LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6.12:=
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.34.2.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.34.2.ebuild
new file mode 100644
index 000000000000..28f7695035cc
--- /dev/null
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.34.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="XSL stylesheets for yelp"
+HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-libs/libxml2-2.6.12:=
+	>=dev-libs/libxslt-1.1.8:=
+"
+DEPEND="${RDEPEND}
+	>=dev-util/itstool-1.2.0
+	>=sys-devel/gettext-0.19.8
+	virtual/awk
+	virtual/pkgconfig
+"
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index b7f6022d6d5e..599c8a7edd4f 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,4 +1,6 @@
 AUX yelp-3.20.0-man-compatibility.patch 4229 BLAKE2B 1ebe101f4a0031ca46d6801e8dc19eb4225c0bd0d5789d379f3192fdc71afabf6a940156463bc60be414e4f607abcaa998f5e8ff81a74c107a5853490402f163 SHA512 427ee66fa1c156991254fd10511bead4fbed6b05a930da157cec61bd7fafcd83f0dd447ce8aa62d0dc76e2231cf5f34fbeccc8103de4ee9062b6d79955b9cc1d
 DIST yelp-3.32.2.tar.xz 1538964 BLAKE2B f4d7947f29b40bc033e2d3e010c39f8ff43de765bc4a2c446f02beab4888ded287681db2c140951f19aa9075aceff6f08658d0f434b5cd9d39e7e53e6cc00c31 SHA512 be0e2a7919ba8aef8eeb13e4d195e745afcd113350b32bad5ccf204f544107bebcadee364508402ad7906dd5484b9f21288ae13edcaab47a02b54e31f3379cfd
+DIST yelp-3.34.0.tar.xz 1538980 BLAKE2B 5b9af7a0f1b334555d6a4af2aff658a20e1b703f67663437fe4a967d5501382b23b2c8247908a232c79ec93fd6c7e1634816b3ce34eb11e609f4a6734ab06f4c SHA512 799a55df98bf176ee19e9b48ef321734b5df9d8c83bdb5c8c910b3def214039c8730a079d032b88dcc886c70418abb968c85c5c998b8ac340fc5ce27e6228eaf
 EBUILD yelp-3.32.2.ebuild 1241 BLAKE2B dc6aababbafbf7451396d75235317cb82578e015c7c40d4da7ddd265f6e1ea94bf5b2e459c855b433c2231673aa0cd8758d6ea23fc20e6ca3fa17a4a24305816 SHA512 052135b016b3ad439c9b653b50a42123383ef7183c7200cb77540c4c02fd4bfdffeea4f79ed13da2bc00afdac4cb1ea980592fae84ff839f199e7e27f414f492
+EBUILD yelp-3.34.0.ebuild 1256 BLAKE2B c4df054beb0bcac56e6cea585c31cbc26dd1c548fbd96276109e78320feab56c4b11842dba6b844cc17fda34d942cacd8c7e7a4ab5607a3e35170d129046c709 SHA512 3b6b3355bde1056daefea8cdae986156f08cdea9bb33914cb15a5d6fab573485125d02b1e4c068553243662dde84be0ec089a98b41e9b749f37ffd86ac33ec72
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp/yelp-3.34.0.ebuild b/gnome-extra/yelp/yelp-3.34.0.ebuild
new file mode 100644
index 000000000000..49c176d1e2a4
--- /dev/null
+++ b/gnome-extra/yelp/yelp-3.34.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	app-arch/bzip2:=
+	>=app-arch/xz-utils-4.9:=
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libxml2-2.6.5:2
+	>=dev-libs/libxslt-1.1.4
+	>=gnome-extra/yelp-xsl-3.27.1
+	>=net-libs/webkit-gtk-2.19.2:4
+	>=x11-libs/gtk+-3.13.3:3
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1.13
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Fix compatibility with Gentoo's sys-apps/man
+	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
+	eapply "${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-bz2 \
+		--enable-lzma \
+		APPSTREAM_UTIL=$(type -P true)
+}
+
+src_install() {
+	gnome2_src_install
+	exeinto /usr/libexec/
+	doexe "${S}"/libyelp/yelp-groff
+}
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index 9a12ee1dbfcd..4fa9d1251b4c 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,3 +1,3 @@
 DIST zenity-3.32.0.tar.xz 4753752 BLAKE2B 220fbd374f2564b345f4668c0583f2678a296bbb0d344af55b849b4e7e718f29856bd43f7ae2b0fa492e3d1d8180ca160236fcc806cd483716f680d03aa019d0 SHA512 d057df25dbb2d780c6be184ec167b0f569eadf0ac1c460d63509843157f14dfdcebe46bb6f93b17c6069ef0208902ce9ecbb4025933f7dc7572323032ec34fda
-EBUILD zenity-3.32.0.ebuild 1067 BLAKE2B cda33c26858da9b6a54f7ee33c9c51b562ee7451ec8e084bf3442197b68a32643580e2044bddbcabaa361689cde785c1e442e3cdb748061329f345ef0bbcea14 SHA512 7714848f17f7300ab915c26eb71d04b5e08c69b6b5ee44fa62ee7014e5ed67d189a937609f4d0b43c8f2b1bbf077bfa35b96ce23e4bce23ba1f623186cd15191
+EBUILD zenity-3.32.0.ebuild 1063 BLAKE2B bde976cb06e8963480d109ee619e745187284f0342feec8ec24f7a68501a7d4443c97ce86b28c4aa0a2f260c3e289919b27ba8ee38178af5af7023b615f4fe30 SHA512 27561f4aa7ad6a320fe4bc6d80dafa783fce6f13205af25c2e5af1eb47011d6b35db584f78c60c28bbe42dda9ed9e0ffe95d73fc5f34700260349574357682a8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/zenity/zenity-3.32.0.ebuild b/gnome-extra/zenity/zenity-3.32.0.ebuild
index 915aa6749dda..64bf0a289f70 100644
--- a/gnome-extra/zenity/zenity-3.32.0.ebuild
+++ b/gnome-extra/zenity/zenity-3.32.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug libnotify webkit"
 
 # TODO: X11 dependency is automagically enabled