gentoo resync : 22.05.2021

35 files changed, 271 insertions, 415 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index e7fedf008bfb..f5dcee642740 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index f4b7bcdcf249..ee37602e4a15 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-calendar-3.38.2.tar.xz 547228 BLAKE2B ef7ba6dce47d9ee664d1dc648da81738cfd20108799e0c262b16152ce7b590613b711fbcf9ddbff4fb9ba597b1067b558697874744abd3f32ac08d7dcbe5550d SHA512 2744c91e37c8966f2deee1588fe439ccd520344c24f1b74422f7ba95f592c9691a2530984499a00af3065447932195879bc1b5b9e8ae6731487ac047e5d75267
 DIST gnome-calendar-40.0.tar.xz 552888 BLAKE2B 27480d15ab8c88cc28367468895247aa51bd96c955aef052e71c180c334d0034cd26406237ccf8dbece743b16a6c4b08809576882eb9a5d1018d5e2df12993c3 SHA512 8c1f7ecad90e8cefc2560795a0045ff243e4647d717b66d433b11deb10a01d07d2ab03978da8cb4d0e9227e91338213a8142ebae5044c0a8cf26e7c0f64f4b7e
+DIST gnome-calendar-40.1.tar.xz 553592 BLAKE2B 83517f9fc23d3b61f4b9ee824e7a95d0b002b61a6e8afc68805dd28b947347b9d68751e4ad9ce5a92287e3973f19a99e5daa3ad6829eae961988b56d9349f6b7 SHA512 f04db5da5ceb5518766d57ddf14eb0c3de19c499ba00a0f426f4059cf53b064529c2e317198d92f45f400d6f4ae2d34d0fde4dc60293a480584a199d2d3a3a5a
 EBUILD gnome-calendar-3.38.2.ebuild 1161 BLAKE2B b412b7ca1f052b5bd44a20be13f5c73c2e1396d059214c525988316ff7b71363d8c9e2b40cf50afabada283660f2a40dabb2cdecf3cc75e1ef068c7896ca3355 SHA512 caf494d9cfd5a908aa42da499fbef53adb71592fcf327b83fae29caeabbb1b0f67c3c0fccb0a67ff1d5d5cb69f08306a1a721cf36fa1e3aa9751e638712f5254
 EBUILD gnome-calendar-40.0.ebuild 1153 BLAKE2B f0d2893921ceb284a599c7f681bbc5bb7a34f72bd343b15dacece81537463bd2155f7fb90cf47785a5842d4a9dbb28593ec520ad73c7b50740a09f0dd7b71c4b SHA512 01d68497d5fbea653fe9d7343f733fa2dc60451d0155267a0a17b2ce91e2901ef77d7b0af8987e946e6165ca98d0895d1bf74dc739130cc96f498bea6a9b824a
+EBUILD gnome-calendar-40.1.ebuild 1153 BLAKE2B f0d2893921ceb284a599c7f681bbc5bb7a34f72bd343b15dacece81537463bd2155f7fb90cf47785a5842d4a9dbb28593ec520ad73c7b50740a09f0dd7b71c4b SHA512 01d68497d5fbea653fe9d7343f733fa2dc60451d0155267a0a17b2ce91e2901ef77d7b0af8987e946e6165ca98d0895d1bf74dc739130cc96f498bea6a9b824a
 MISC metadata.xml 522 BLAKE2B 24cb41757041daedf83e72cd8620bef49d2bced678ede42c1a071c3cf99f2f157b086acc393953b42a612dd5c4d622b0a869934f89661c28be742370cd4688c2 SHA512 f595d013522df745a86b01e6696ea5fe6dafa55d55e3fe22adf469fef56507846194f24c2ec5cd13382c69a494ca530438d12c69a6bec41247da1783fc78eef8
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-40.1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-40.1.ebuild
new file mode 100644
index 000000000000..f79c40d6c495
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-40.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 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"
+
+# >=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
+	>=gui-libs/libhandy-1.0.0:1=
+	>=dev-libs/glib-2.67.5: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-shell-extension-appindicator/Manifest b/gnome-extra/gnome-shell-extension-appindicator/Manifest
index a3e629d2dc27..453d0ac86b03 100644
--- a/gnome-extra/gnome-shell-extension-appindicator/Manifest
+++ b/gnome-extra/gnome-shell-extension-appindicator/Manifest
@@ -1,5 +1,5 @@
-DIST gnome-shell-extension-appindicator-33.tar.gz 32600 BLAKE2B d24e18dc3697baf5f6a5466da6ba6bc4e699bb20cabde80dcfb007b339246cfb940af4407bc99d22632a1dfa1fe255a60fcf608ec50af88e3edbb2dcbceddf69 SHA512 ceb79a1fa22440210477e53e1ebca3db3ea81eb8a45613c46d37f44ebb3e063b626a073df519af978becf1c6a83d68c02a26f22bf0a9ed43e2299bbab7acb599
 DIST gnome-shell-extension-appindicator-34.tar.gz 34764 BLAKE2B 3a619f810d9ddf7984fc3b0c96735eb0f9233f36ff3cbddc5b28a8243f55d57cbc9c58b49516e99b30f35b12b6e747b7fa288fdc36f99cf7e61b7ad8cc2e84de SHA512 1f02a7cc3cfb90af8ee1a0bb39135fb3203bcc87d13cda0cf7f110db4b838a7c082eba30246a913306ef0e4b2fdb7c9f52f24f62525013ff8f1de9d054d45425
-EBUILD gnome-shell-extension-appindicator-33.ebuild 899 BLAKE2B b21b9cc8e0ff4caba11eaa8a37d0388c850c8da5feec13b6313158d8c1cff079f8f07ff9fbc4c2121bb7024b5f66e4ec23c49437c62da7d3949bb7f3315e47d3 SHA512 231365e25199991cc36994cd6d43524636baca5b97ee826f495ba23f3c69d0b474a8dcad9f9c2fcf3158fea7f25cff517f76999487087492a6476f69cd30bd99
+DIST gnome-shell-extension-appindicator-37.tar.gz 39830 BLAKE2B 6e8af3acf6c9a4478fd663aa5814fae5a59e5ed01a759d7aa37d056794c3ea6c595203b622087f02170d9f05e6fa1c47138da9962ae33d9f398a7659a645be57 SHA512 2aeb93ca015936577f314e0313dd963d3712edf27a5e9721813b6d72b5050de9427d7aa3a296ced40352a421251ecae7022fb58c1da02947bc0a6205e2d41d1b
 EBUILD gnome-shell-extension-appindicator-34.ebuild 899 BLAKE2B 3827e3dff875e238cf07e61be9caabccd2d04f1b515cf2c3697595f163da0e5865bcf2eb9f88bb1d239f04b84b7846b2382761976c7e16df069ed45e95846671 SHA512 49f7bba575fbf669f12595328349958aee645d1e7ef3572f1ffebcb8c5fa6b8896afa7c6fcab4f12391fe3834002e15b2e081db4b2e470dad3ae9808103015ee
+EBUILD gnome-shell-extension-appindicator-37.ebuild 939 BLAKE2B a7925769590ff0489dfa677d6fa276bd918f46b040738e8651347cb2a9ed1b566e406b85509cb183770416f334369ce5ce5802e972e0c082d4f21d6ee501a26f SHA512 3b7f2736755aaea5a57732052421871a8dea56b8af82c601a155db054cf812bde40c8805d192ddc6e7564104d72797072c01c9a394b01071732f01fc1fe63047
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
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-37.ebuild
index 710cb6b5ffbf..f06b56b39696 100644
--- a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-33.ebuild
+++ b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v$
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -20,6 +20,8 @@ RDEPEND="
 DEPEND=""
 BDEPEND=""
 
+extension_uuid="appindicatorsupport@rgcjonas.gmail.com"
+
 src_compile () { :; }
 
 src_install() {
@@ -27,7 +29,7 @@ src_install() {
 	dodoc AUTHORS.md
 	rm -f AUTHORS.md LICENSE Makefile README.md || die
 
-	insinto /usr/share/gnome-shell/extensions/appindicatorsupport@rgcjonas.gmail.com
+	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
 	doins -r *
 }
 
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
index 7a23276504c6..fcb67fd936a9 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
@@ -1,8 +1,5 @@
-AUX gnome-shell-extension-applications-overview-tooltip-10-search-tooltip.patch 2262 BLAKE2B 1607c876c2fa81be04337c6bda4b574d421e9d51661309b544aceec770e55dbb3f74c6393a9ddea31f434f11a02e131c2087430a6e69213d8092bb99f12ed8f3 SHA512 e8817cd1ce672bb0e7be4ab64d24a461c0bb381503e4d0b2048d614d8adf2e1aa0067c5f728f30bd8e785a83a26a832efdb6eff75ba79b3b54a7e3b7bbb48221
-DIST gnome-shell-extension-applications-overview-tooltip-10.tar.gz 81397 BLAKE2B a9c838eb66ae49a3a195d8ce6e17fd971fb0dec00f62a2a7380fc973c9ba129611a93b904c658318e0bc80fb26ff9d65100cccd29f7f172dbef0f406bacefd14 SHA512 28bcc52b38d36e0897c949ba0eef11a94fce2e022ca3d398208221476b63b39281db9870d0c26a4bdffc07bb82e9d8942fd98820c78c6a4afe6d52eb5758e1c1
 DIST gnome-shell-extension-applications-overview-tooltip-11.tar.gz 81717 BLAKE2B bbafaa58bd9b7b56c5cc12c953922d40c1901fe78491d5ea344ab6f3dda65e51c02851b2106ef271d662be365722ca35f61a836f509bc1e6a4e6c03ecf1de3eb SHA512 c108b8bbf09793a18eced02e7fc5a68f1d71b9b31f0480b9346bf9b44507fedf85e6c1e640fa7d282ea69b63ad056116acecb494beb5c18b784b00348e485f00
-DIST gnome-shell-extension-applications-overview-tooltip-9.tar.gz 81415 BLAKE2B 518352e80b5a3c6f8a2ff05e692178436625ea533e10a2afde82e73b6216f82dc29119c0e0a204ac8f1619de9409c47105107b94e3c4d1027c852b255eeb27ab SHA512 b8a2879f303a76e68eb5921005453e3fb73d966f1ed3f5978d9d210f447d8f780b5d9fa359aaa411f7ed8cecf72171dfcaa8da8515fd620193676b1b63742636
-EBUILD gnome-shell-extension-applications-overview-tooltip-10-r1.ebuild 1294 BLAKE2B a08acb9b50e7de5074448f3d021e814a309bcd37843c498e84e11280c20bda1705a8e8898d676bf2b9366b2b83c774c4dd7b161d91d6ed809ad84185e6bec318 SHA512 26f992c4e742d0d38acbec14f6cd6ef35f266daa3ae26a4e0c08eb1af8eda7408509e3785fec191167b5c20feda935e1e88ad06886ea7a988c71ef3bc1a32788
+DIST gnome-shell-extension-applications-overview-tooltip-12.tar.gz 27394 BLAKE2B 169460c7063fda0f664688303984c4a5c7fcd8a6b32281c2eb630ebea8143b95e96038f130b09c939371474b5ef27656cf77eec942412fcf3908a5d9fb8ae202 SHA512 4c993256d1f6d7d3a2c72c88f6f88facf7ff8237d489950484f54a68f09741e526f0e0a7c2862251fc2579fd3cdd496c9136bb222374abfacbace1615e263239
 EBUILD gnome-shell-extension-applications-overview-tooltip-11.ebuild 1191 BLAKE2B f094deaf4bb83af29d55dfa6db3164bca4fda8e857b99345de789a634c34def85fa778d854c4dfd0428c87c19b2617f689a59a12366ed19ab3c790a8b8d31319 SHA512 967887e1a33e42059907e9aeb44ea42c876784696457ac1364b8eed85213115ad3d33c6244eed56e56733bd3b88efedf25f204574151ea06e6b44c5d49cec117
-EBUILD gnome-shell-extension-applications-overview-tooltip-9.ebuild 1257 BLAKE2B 56d3fe14b44a58c5d2eb9b59ffc99ebbe0448227e27a68252950d0f676a765a5983e44c554d1e06249653ef74b0655a1f516f15509baa05b3e9310c0beaab737 SHA512 faa26aa51c48098efca83872ac76ad3215d30ebf8c8493df70e32dc719da37378d21b9b87a47d45c89caf5d3958a7205496bfd08f9d4a060e67c8383ef616130
+EBUILD gnome-shell-extension-applications-overview-tooltip-12.ebuild 1228 BLAKE2B ad7642f2f562d5b114e69e4b3d893e490e8e1faf0ec937666beac7998b2ce29c3665d8b68af09f49ccdc27a4a380d8a619e8df7e33e05b950b441bffd4d440c0 SHA512 5467126e43453bc3b11921d940ba8bcba6bd8dd6c0d8d09c615d67f85104cb9e250a193a2e1dd6007a490a7fbab5d2b50b5ee9f367d4b890fa424ab53a8fa26f
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/files/gnome-shell-extension-applications-overview-tooltip-10-search-tooltip.patch b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/files/gnome-shell-extension-applications-overview-tooltip-10-search-tooltip.patch
deleted file mode 100644
index 293a710aa2fb..000000000000
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/files/gnome-shell-extension-applications-overview-tooltip-10-search-tooltip.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From f90ddba2fbd2256e03b4f22f7ca29004bbdbe466 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rapha=C3=ABl=20Rochet?= <raphael@rri.fr>
-Date: Fri, 29 Jan 2021 11:11:58 +0100
-Subject: [PATCH] Brings back tooltips on search results
-
----
- extension.js | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/extension.js b/extension.js
-index 860daf0..1a5b2c0 100644
---- a/extension.js
-+++ b/extension.js
-@@ -24,6 +24,7 @@ let BORDERS			= false;
- 
- // private variables
- let _old_addItem = null;		// used to restore monkey patched function on disable
-+let _old_searchAddItem = null;	// same but for search results
- let _tooltips = null;			// used to disconnect events on disable
- let _labelTimeoutId = 0;		// id of timer waiting for start
- let _resetHoverTimeoutId = 0;	// id of last (cancellable) timer
-@@ -57,7 +58,7 @@ function enable() {
- 	// Enabling tooltips for already loaded icons
- 	_connectAll(Main.overview.viewSelector.appDisplay);
- 
--	// monkeypatching for future icons (includes search results app icons)
-+	// monkeypatching for future app icons
- 	_old_addItem = imports.ui.iconGrid.IconGrid.prototype.addItem;
- 	imports.ui.iconGrid.IconGrid.prototype.addItem = function(item, index){
- 		_connect(item);
-@@ -65,6 +66,13 @@ function enable() {
- 		_old_addItem.apply(this, arguments);
- 	};
- 
-+	// monkeypatching for future app icons in search results
-+	_old_searchAddItem = imports.ui.search.GridSearchResults.prototype._addItem;
-+	imports.ui.search.GridSearchResults.prototype._addItem = function(display){
-+		_connect(display);
-+		_old_searchAddItem.apply(this, arguments);
-+	};
-+
- 	// apply new settings if changed
- 	_settingsConnectionId = _settings.connect('changed', _applySettings);
- 
-@@ -87,8 +95,11 @@ function disable() {
- 	if (_settingsConnectionId > 0) _settings.disconnect(_settingsConnectionId);
- 	_settings = null;
- 
--	// restore the original addItem function
-+	// restore the original addItem functions and remove references to them
- 	imports.ui.iconGrid.IconGrid.prototype.addItem = _old_addItem;
-+	imports.ui.search.GridSearchResults.prototype._addItem = _old_searchAddItem;
-+	_old_addItem = null;
-+	_old_searchAddItem = null;
- 
- 	// disconnects from all loaded icons
- 	for (let i = 0; i < _tooltips.length; i++) {
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-10-r1.ebuild b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-12.ebuild
index ea3a9e02b46a..6189ad2b2b21 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-10-r1.ebuild
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-12.ebuild
@@ -12,29 +12,25 @@ SRC_URI="https://github.com/RaphaelRochet/applications-overview-tooltip/archive/
 # https://github.com/RaphaelRochet/applications-overview-tooltip/issues/7
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
 	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.38
+	>=gnome-base/gnome-shell-40
 "
 DEPEND=""
 BDEPEND=""
 
 S="${WORKDIR}/${P/gnome-shell-extension-}"
-
-PATCHES=(
-	# Fix tooltip in search results, from 'master'
-	"${FILESDIR}/${P}-search-tooltip.patch"
-)
+extension_uuid="applications-overview-tooltip@RaphaelRochet"
 
 src_install() {
 	einstalldocs
 	insinto /usr/share/glib-2.0/schemas
 	doins schemas/*.xml
 	rm -rf README.md schemas || die
-	insinto /usr/share/gnome-shell/extensions/applications-overview-tooltip@RaphaelRochet
+	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
 	doins -r *
 }
 
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-9.ebuild b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-9.ebuild
deleted file mode 100644
index 3e3514c3af9f..000000000000
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-9.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.36
-"
-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-bing-wallpaper/Manifest b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
index 526ac426d64a..7337b43e1804 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-shell-extension-bing-wallpaper-28.tar.gz 7204530 BLAKE2B f52f8e83d203e3c2ca0f5437079d463c9e51a9ff9e594ad26fc291c362c4e340781a362beca316d0164e972b5b52a749a2afaf9ff1af74fb8eff3217deb7dbe9 SHA512 8c292129e539b415f19c732691d833463e437b06e1bca5a42f34885c19f7b8c4ab450a07956c0adcfdf0bf279ca303b1577a9723e3ce535eefa73efded26ae6b
-DIST gnome-shell-extension-bing-wallpaper-31.tar.gz 4188082 BLAKE2B 26f58e043ab6b9afe5c23864ae8ada5a0c02fad1aebeb4df1f6aabf28a77f656b7abbdbca0dc30688e03d1bb2a68dc382527c0755f47a9a750a99ce8655668be SHA512 921fc7992930bf013b4b3192682f27241e9cc162c0c85e4668942fa8de798548e7e5d74895a00317d2db2c47c16d24c4b0641598407ab5f8e509e3162c8195f7
-EBUILD gnome-shell-extension-bing-wallpaper-28.ebuild 1103 BLAKE2B 8192d6f5820fe66d719b41aeea459f4a328e74cc605a01d74df1f34d5ca71c0bf2f5beffce00ff62afba9ef41a387c31e9a8802a039a0010d5174f0e78f6a214 SHA512 970b84e8e80e7c34b23f710164bc9ae00972524b83796f361139b00238cd170f249709c81ae245f3b14a0d003563ab82f47a7a348aa0f6123a1425ac31a73d42
-EBUILD gnome-shell-extension-bing-wallpaper-31.ebuild 1105 BLAKE2B 9d0ed7edea8b098da017ee6d201d59a6353ac8d9ba20c7b2ce7921c62f9e4321976ef016082b7185b4b65be5e149b8d1965df477299c01b957f2ff03afc6165a SHA512 44a4fcc8a00a1a2b4339f2d96ed960b7099b55234f2c6bcf7443042b207324e5b6aace0d6f8fc381f333d14b2de78496e5bac5d6645464be7b937fe5a813db6c
+DIST gnome-shell-extension-bing-wallpaper-32.tar.gz 4186897 BLAKE2B 2d8d119ef61c426be5e1ad3070fa038fe34f1cedf706a748a9943eaa2ef9bb0ce75a8df99abad38d48fd8f25ae532ae9dd425ca00d7165c06b177580cbed89a3 SHA512 c72473df4b5882ee5964c74fa42d270097526337230e538c1fcfc6e7bee5ab492857ca0f48e019ba7cd3ce6808b22c7751333275dd074b057fa4e09030afb609
+EBUILD gnome-shell-extension-bing-wallpaper-32.ebuild 1103 BLAKE2B 8192d6f5820fe66d719b41aeea459f4a328e74cc605a01d74df1f34d5ca71c0bf2f5beffce00ff62afba9ef41a387c31e9a8802a039a0010d5174f0e78f6a214 SHA512 970b84e8e80e7c34b23f710164bc9ae00972524b83796f361139b00238cd170f249709c81ae245f3b14a0d003563ab82f47a7a348aa0f6123a1425ac31a73d42
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-31.ebuild b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-31.ebuild
deleted file mode 100644
index c31bdf512404..000000000000
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-31.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-DESCRIPTION="Changes your wallpaper daily to the bing.com background image"
-HOMEPAGE="https://github.com/neffo/bing-wallpaper-gnome-extension"
-SRC_URI="https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.28
-"
-DEPEND=""
-BDEPEND=""
-
-S="${WORKDIR}/bing-wallpaper-gnome-extension-${PV}"
-extension_uuid="BingWallpaper@ineffable-gmail.com"
-
-src_install() {
-	einstalldocs
-	rm -f README.md LICENSE || die
-	insinto /usr/share/glib-2.0/schemas
-	doins schemas/*.xml
-	rm -rf schemas
-	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
-	doins -r *
-}
-
-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-bing-wallpaper/gnome-shell-extension-bing-wallpaper-28.ebuild b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-32.ebuild
index 015ffb1bd01a..015ffb1bd01a 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-28.ebuild
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-32.ebuild
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
index e3e5724695dd..51eb4c2ae0b3 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
@@ -1,5 +1,5 @@
-DIST gnome-shell-extension-bluetooth-quick-connect-13.tar.gz 19937 BLAKE2B 3b5c70d5302d8508d0a6165b06e41db9d256805c35ab4de095b7d97ce9bb24ee58185b6a7afec15a2fbe22ce9dc7859229670d4e00646c5353825dab1d1b4b5b SHA512 494827fa61e02bb3df0a054c7274fd61bf7d42aa4f8ece8c2b30a29a459b6fceba110b4016bd069f3cf5504561aee06fce3260cf9496b3d41516f077e8f99563
 DIST gnome-shell-extension-bluetooth-quick-connect-16.tar.gz 20053 BLAKE2B 37cf71c319a3715a7c5acb9835f1a480eb8b383e6dca48b3852ab949233137f963ee583d01e16d558bec02a9c7b604883c62e7c1b606624aecc82f7e83bbf297 SHA512 e9052d2199b8339e86b69dc317c26f23086131a6ecd8286d8058dddd185fb5cea4215fa3fb11e8b214f0a07a86cac2c45cdab1d83a529df3ab1991143b6cf53c
-EBUILD gnome-shell-extension-bluetooth-quick-connect-13.ebuild 1139 BLAKE2B 44b974fdb78c81f5215d7124220dcc4109c775af99a55f34b82bda63c736e41041bc639f70ec134bcf971563c06c411470883bb372ce1447d4c0ec5a09641604 SHA512 9e75dfa7a8448960c0c5dcab2e346a5a741332c0d577a51499f85cd0443dd55a69eaf948ca7863ac9fff3a663a6812737e7418af206d79472ac7f570c90179e2
+DIST gnome-shell-extension-bluetooth-quick-connect-20.tar.gz 20334 BLAKE2B 07998362457b4f8ccca56d22891d4998a00ba3eb8698d610778aa094df73f964a2e1bce1a1cf721b7ff037499a10b5356f3ba023fb4a04f898291a3bd7eb72a7 SHA512 947a181de76746a2a2f6d69984427b299f9e9f76c77e7e2afefd0e8c83f33226ff4c0b9a296252a21136feb481b5241d31a57f96360b9e8b1f911b043c7757b8
 EBUILD gnome-shell-extension-bluetooth-quick-connect-16-r1.ebuild 1224 BLAKE2B 602594a2a40010ed36b57ef16b6730c7e09227895742cad659f750fd47c3acc5ca816dbb4c53db0cc04a1b4c482bb092c7cd09794e3bb53e0d0bac33b1487632 SHA512 368db1327655ef669d3e4334950d00ab33d5a968ef405f6ed5cbf79871206082a03ea9d7c5963134fdf007800b854b67af37c8f312ae1096d194a379c5e8a555
+EBUILD gnome-shell-extension-bluetooth-quick-connect-20.ebuild 1238 BLAKE2B 67290fb111fbca8428ae6b3b36d973bf5382d5d2d0818884c6e7fd53582c1748ae54903485171e1ac5c125e2cd660322ef8bec6b6a6e3b42ae7a4912edc56231 SHA512 e1511d19656ee37777c85c7d4d6b049e19f5d963cdc4f9a91ffdc12a4865a75ddbc3d2bd9c7696f2c08bf15e720f9f96f2b0d8c935026c5146561036b2fabc10
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-13.ebuild b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-20.ebuild
index 01c2202fc70c..b112e2e22c4e 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-13.ebuild
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-20.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit gnome2-utils
 
 DESCRIPTION="Allow to connect bluetooth paired devices from gnome control panel"
 HOMEPAGE="https://github.com/bjarosze/gnome-bluetooth-quick-connect"
@@ -9,33 +10,41 @@ SRC_URI="https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v${PV
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+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}
+RDEPEND="
 	net-wireless/bluez
 	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.36
+	>=gnome-base/gnome-shell-40
 "
 DEPEND="${COMMON_DEPEND}"
 BDEPEND=""
 
 S="${WORKDIR}/${P/shell-extension-}"
+extension_uuid="bluetooth-quick-connect@bjarosze.gmail.com"
 
 src_install() {
 	einstalldocs
-	rm -f README.md LICENSE Makefile || die
-	insinto /usr/share/gnome-shell/extensions/bluetooth-quick-connect@bjarosze.gmail.com
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf README.md LICENSE Makefile schemas || die
+	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
 	doins -r *
-	glib-compile-schemas "${ED}"/usr/share/gnome-shell/extensions/bluetooth-quick-connect@bjarosze.gmail.com/schemas || die
+	dosym ../../../../../usr/share/glib-2.0/schemas /usr/share/gnome-shell/extensions/"${extension_uuid}"/schemas
+}
+
+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-control-blur-effect-on-lock-screen/Manifest b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
index ddadac84a419..8a6f3d8f0fa5 100644
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
@@ -1,5 +1,5 @@
-DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20200713.tar.gz 3431 BLAKE2B 6355135f9027d53b10ba1f02f2fdf90dc0acbd090be8905addc78f22f7b136464831985152d8a112febc8891bbd18ea42aedd8009c7db4afc52ba48b6d502511 SHA512 322da0bc511bbb6943713fd3fc3d75d8f32b9872ced9eeb611acc77756392d0b9c9dc1311bdb4e255d131637de6a17a3d0a76f1cebcc71218d67d2ef6078a4d1
+AUX gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-metadata.patch 539 BLAKE2B 0b26d5b929f1f9305912a3dbab1a117a0dd54d2831c7ab9d7054be9b766928243ecf22f2ed4d16ec90e1ca94cb2e19b3054b9a23043cc0bd8f5944380549f784 SHA512 f2cf7681c9629fdd56237f81b9304bca83152764d5201a5d9584ca90466e405aa9b8c1b42ef9833b7c6937fae56e7115cba2fc61948dfafd4303943655a742ec
 DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.tar.gz 15576 BLAKE2B 142cfb895f9adf2163e36a6005e222897c18e5ca347a9e6958664226abe9f4a6dd1a616b917ccee9531d3f1c27a3e8981a1d3335795543b782736a61b115fe67 SHA512 87efd0e222ba5676caabdff5fdb365e4f769ee4ca15a4718739934b40c3616c031283a1c3883d65dfc75ea59fdb63a9eaf3522465740602f987a136de688b19f
-EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20200713.ebuild 1330 BLAKE2B 5fa31ccac489303a350c07a479310b22c18a1cdb18d3946b8f2345b72ac6a6c46ec9d2e6b6d8a41db5a54d8fa0095b181661cde21049a0565dca57e35ed2e716 SHA512 71643acd4848f8432bf80d199ac8e13e560e571d9d60edb608ccd98eaf82059909a74321e90ae39ba3bd25493bfce5437faf34f27badd675ec97bafa10fc67da
+EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-r1.ebuild 1453 BLAKE2B cfb459852e4cdd9be78e9fe1f05b5d1506450cc285fa2b6947944de71b4e807d0bd566731fabe251ac1937e1594a50c449fe6a28a51f9142d9d33a3fb0991d36 SHA512 87aa1da215dae0e9c7215272705ddcffb937dad8a6a18a514d9cab638f629951f3cb422ee9e11fb8eebb6700d9a1277cb547866f269bfe34ea5637d8b9e8de9d
 EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.ebuild 1324 BLAKE2B befe19cb160c2a269b3c4dcf1f9a00d56f4d85540e59b9b4840db04d0cd1e7f1d51bc0406d8e772a1a507aee55d3f001c4739d4004f379cf485f2df6d7cee2b9 SHA512 26fbf34cce123893a05552ce239b025b604f5f64c13cbdaab82a22ccc62901a1679fe70ac07e06f096f678cc995ee59ca1e46ec28c5d7fbc1eee1b34b781a4d0
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/files/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-metadata.patch b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/files/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-metadata.patch
new file mode 100644
index 000000000000..7bafbfeed2fe
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/files/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-metadata.patch
@@ -0,0 +1,13 @@
+--- a/metadata.json~	2020-12-11 08:57:59.000000000 +0100
++++ b/metadata.json	2021-05-20 14:14:26.242002668 +0200
+@@ -2,9 +2,7 @@
+   "_generated": "Generated by SweetTooth, do not edit",
+   "description": "Control the Blur Effect On Lock Screen.",
+   "name": "Control Blur Effect On Lock Screen",
+-  "shell-version": [
+-    "3.36"
+-  ],
++  "shell-version": ["3.36", "3.38", "40"],
+   "url": "https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen",
+   "uuid": "ControlBlurEffectOnLockScreen@pratap.fastmail.fm",
+   "version": 6
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20200713.ebuild b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-r1.ebuild
index 3425f057ff48..2f485afe4679 100644
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20200713.ebuild
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,12 +6,12 @@ inherit gnome2-utils
 
 DESCRIPTION="Control the blur effect on gnome-shell lock screen"
 HOMEPAGE="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen"
-COMMIT="824675a32d47346c89655f89b416e653f60c4d68"
+COMMIT="748b95e931b6b1548b90ceeee7a5883da3e0529f"
 SRC_URI="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2+"
+LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # glib for glib-compile-schemas at build time, needed at runtime anyways
@@ -28,14 +28,18 @@ BDEPEND=""
 S="${WORKDIR}/Control_Blur_Effect_On_Lock_Screen-${COMMIT}"
 extension_uuid="ControlBlurEffectOnLockScreen@pratap.fastmail.fm"
 
+PATCHES=(
+	# https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/issues/3
+	"${FILESDIR}/${P}-metadata.patch"
+)
+
 src_compile() { :; }
 
 src_install() {
 	einstalldocs
-	cd "${extension_uuid}"
 	insinto /usr/share/glib-2.0/schemas
 	doins schemas/*.xml
-	rm -rf schemas
+	rm -rf LICENSE README.md schemas
 	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
 	doins -r *
 }
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index 746d82dbdbd4..a13869b1444c 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -1,7 +1,5 @@
 AUX gnome-shell-extension-dash-to-panel-26-branding.patch 637 BLAKE2B 1e124561143b577413090e16c7ad0c8cbb66911b079ae5844da9cf04e0197aab15fc4f746d3020ab7d4e6756b8a35befa773967c223d29289e13c6b3ffd70234 SHA512 8c176972ff10e87e957cfdda23e86a3e434dc050e8a954e7c2257942301daa5aa7c5b788188768f13c5b009d842fca8b14819a255a6a561dac8fa60e355ec211
-DIST gnome-shell-extension-dash-to-panel-40.tar.gz 21130921 BLAKE2B 3f5b60aaf4bece5d14adab616580e127ec62abfe3a68e3fdebe25a16c1a7e498932e350489863cc002cdb78ffacdc52dcc4eb79532da7aeb17d3cafaaeead8f4 SHA512 b59c0fe518c950b63119535cf53a51024d9575994de8a7603707d28b6503f6824324e44ca09d89f206c7d33888593e46604cb5745be366731160adace6d64e05
 DIST gnome-shell-extension-dash-to-panel-42.tar.gz 21140972 BLAKE2B a4f6dc7a3770753f37cabb6c165f51a455a34456de5fe15cbfde1b3018f4aee32cdc6876286bb6e6671430f18f14f7fb370d2059fe6032d85d93b0adacdb9f48 SHA512 7746098395513cd2b94166358d2315e581248a2ad35dfa0ee685386633a95aed0897cea17335e73c22cdd81a68900de7718ed34e262614358706e560bbdc3bf8
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gnome-shell-extension-dash-to-panel-40.ebuild 1828 BLAKE2B 6180baacf1d2e4dc57afdf92d8c4f205b8459c2ae81b3df6d89fe1276792e7dc8f3d4db3ef795c88388e3814f5962b8092926e45ebc68f38b8792286e9da2ab9 SHA512 a320b154e0b349d1e15ac209d926ba8d3a309ec84db3089a4b7bb5353b7e4623ee0df165929f04a6bbfe3e67748d121d2f045e37a511a9c65d7f85077cd554ad
-EBUILD gnome-shell-extension-dash-to-panel-42.ebuild 1830 BLAKE2B b96882bbe726dd3bd8064b611c996c52440e2733bf2ca2ae185badb54794529e622c37d744999fa46f62b34411ba93b7ba6284ff2c78d9beabd03169695138e9 SHA512 9d2dcec2662d37349359f6a035bd70bd107f118ae7dd1d30d47bea9b3b368147615ab5d5e1bfacb5b0087b21c8e06651d9c192360131e4f279c7a73ec47b6002
+EBUILD gnome-shell-extension-dash-to-panel-42.ebuild 1828 BLAKE2B 09db667d779d1911c1823db8d0fca16f2e9cd7e4830f9ba4a08707783379415444d073924a85f05f391e75d29e6aaa8ebdbd1984c12637e4cbd0164b12a853b1 SHA512 117aec5ea76083a1781013b937029db0434ac92187e0ac05480a35451a83b00b439b636b686b9c005e901a21593fc25d6aacbac3dabef514124ef68837c9ee5d
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-40.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-40.ebuild
deleted file mode 100644
index 307565980ca6..000000000000
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-40.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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}"
-extension_uuid="dash-to-panel@jderose9.github.com"
-
-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
-
-	# Install schemas system-wide
-	dodir /usr/share/glib-2.0/schemas
-	mv "${ED}/usr/share/gnome-shell/extensions/${extension_uuid}"/schemas/ "${ED}/usr/share/glib-2.0" || die
-	rm "${ED}/usr/share/glib-2.0/schemas/gschemas.compiled" || die
-}
-
-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-dash-to-panel/gnome-shell-extension-dash-to-panel-42.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-42.ebuild
index 0aed93bf42f5..4d8aad285b73 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-42.ebuild
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-42.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="branding"
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
new file mode 100644
index 000000000000..bf464ca9bd6c
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
@@ -0,0 +1,3 @@
+DIST ding-0.17.0.tar.xz 71596 BLAKE2B 38770f2935c47242a47b377bc18c2599a6a54b9a13a7085c24a13a4b46c007c297adda1515cec9fc11cdf38ceb8d2ecebaedf6c1e64f27351ad6b923d0b02182 SHA512 425da33c45c908bc907ef2440c6d363fa666f460a997ae14ae53c39c398307aa96150b31fba21b7e7d39326dcff6f23951d4cb80937616003c4883c96e44d635
+EBUILD gnome-shell-extension-desktop-icons-ng-0.17.0.ebuild 984 BLAKE2B 4bdda4c2b49ccf9fc67ea0286fcc3d7397e609c3fabb19139906ee663d3f10ba1c1afc011f986e45ddfbf6729799afbbad983cb0ef1faaecca9036283eb6362c SHA512 32725c54ee3c1bcd2995d6f62efb525579b73ee3b2490803ef54243cf515ebaacdd74cce66e329dbc6d1e009822cd02341ce0b44d5d5fc913a1a6e712f3172ce
+MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-20.04.0-r1.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.17.0.ebuild
index bde033a368fa..5b85f95673bb 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-20.04.0-r1.ebuild
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.17.0.ebuild
@@ -1,34 +1,32 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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_PN="ding"
 MY_P="${MY_PN}-${PV}"
 
-DESCRIPTION="A GNOME Shell extension for providing desktop icons"
-HOMEPAGE="https://gitlab.gnome.org/World/ShellExtensions/desktop-icons"
-
-COMMIT="2df80cf3c27bad3202ca184ea098c770"
-SRC_URI="https://gitlab.gnome.org/World/ShellExtensions/${MY_PN}/uploads/${COMMIT}/${MY_P}.tar.xz"
+DESCRIPTION="Fork from the desktop-icons project, with several enhancements like Drag'n'Drop"
+HOMEPAGE="https://gitlab.com/rastersoft/desktop-icons-ng"
+SRC_URI="https://gitlab.com/rastersoft/desktop-icons-ng/uploads/a434978b57ec46ad0e35352b27d525c6/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+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
+	>=gnome-base/gnome-shell-3.38
+	>=gnome-base/nautilus-3.38
 "
 DEPEND="${COMMON_DEPEND}"
 BDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
+extension_uuid="ding@rastersoft.com"
 
 pkg_preinst() {
 	gnome2_schemas_savelist
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/metadata.xml b/gnome-extra/gnome-shell-extension-desktop-icons-ng/metadata.xml
new file mode 100644
index 000000000000..5b5fad3a835f
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/metadata.xml
@@ -0,0 +1,8 @@
+<?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>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
index 8e7a391f5a8f..4b811418b122 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
@@ -1,5 +1,3 @@
-DIST desktop-icons-20.04.0.tar.xz 50448 BLAKE2B a93baf7cb37a3f78deb8780dcf4ec65bd20e42ecd9255924c61f457d3f6fe4cafd4865b80e414105f9e72fe835caaf034474f7e587a30b91c233edfc2851ad00 SHA512 6c411e4983901a0646d49ffa58bc9d711c33222b787795f5c237370168fb4bc7ff186cc071675decdcfaae846c1696d718b659b75120ad7777cb04dfd26dbc84
 DIST desktop-icons-20.10.0.tar.xz 58484 BLAKE2B fd41f524803df7e96394c0ef66a70bef7e2522d2dacc7f384101c8524f2193ebd0126334474c27fb2e348fc329e36cae941590ae3875a2ce966ba6d9d8079dda SHA512 b9dbeb22522f02e3fc9388a18e36f11e13932e265e70661152c7dbe2a762e820564484fdf1d16591882ae9f675f1071319d238b6190a406295f07e8675bb9e36
-EBUILD gnome-shell-extension-desktop-icons-20.04.0-r1.ebuild 1016 BLAKE2B cebf2c21fc354e65ab3efce5315be2ef41d8467e2f7468973cd3214aaac553bcb39dfd0df08fcb4a11ab4f70f5c6781aa7fe19a8999144f4d2afab1d7a641271 SHA512 858121d02dd47c198e25c599833aafd6c893a27a9035d423e18581a750f931c10a1f7bd10f6d1be94851b292104ab4115b2eeac40586f5b8f2f6ef3daa91e68b
 EBUILD gnome-shell-extension-desktop-icons-20.10.0.ebuild 1154 BLAKE2B 727b13a63992be23ab0a07ecc8f26e3fbec1b299670fd09ef48548f3dc8537c601399a81e0d8aa2bc0d32ff72268eb1378ef54f095023026d8d037563fafe83f SHA512 066ba014c144caf5b92d0772dc39f4d15f166219e2e9e860a23165bf719b927c100f870c19a183ad59dec0f22842d1fea4a99e259ae00f87d383af194f5ffb8c
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 996ff992a90d..a5d592a443bc 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,7 +1,5 @@
-DIST gnome-shell-extension-gsconnect-42.tar.gz 729438 BLAKE2B 19aea0008487c5c316a6883da176ccba4bf31334abe1ce273cdba91d4fbacfa8a3e003909488e957486ea371043174eefd1ca990470f99ac4ff36ff73cd498cc SHA512 27965435ef9524021e3ce3825af73d9a8b7f602d8c73b524bcf247b6af47ad14b16e83815b1a30e148b109531fbe230e531e1a0b456f5f51c9c96a4c5a3b19a5
-DIST gnome-shell-extension-gsconnect-44.tar.gz 731896 BLAKE2B f4d51ca366bf6a3fe65713da516331a5e3beba19ed6fa22b7224be3c05433bdc125d80e04ac3a1da966ed4f671c6771a53b0cd3f94f7c81eea51f8a30415a5d6 SHA512 92ca5750772c64300c4b8760d4202a1e27d5e7f0fedc5672fd54b48e17de095b29fe0ce18df76619a2e3e3802bb4b77ffdc98b9b4987db3e9550251a61f8b832
 DIST gnome-shell-extension-gsconnect-45.tar.gz 735089 BLAKE2B 44704b0a32d68c123581818f0e8e6bc429fc9be462c98addb98980ef19eefbfce0618c718e640a8bed1c60500f796dc31c4d74c8394a940bf6ecfa7644eccf45 SHA512 59b81316ff02116bf92525acf21a99152b15417459d42be4c710a25d879a326cc3f03a9c0595fa9879e2abd613d4acb067d340bc60c8a80bf88909ea7269903e
-EBUILD gnome-shell-extension-gsconnect-42.ebuild 1617 BLAKE2B df9cfa8cf83c338b36041ab932e582af2fc30578b9887173dbcbc28cd26b78f7374ff5ed3f5f8f74415f338cc5f4f0a2aaa33160564c763f26876a178a8448b8 SHA512 48e0991a87fc962686e5fc235981b9fa3ffaba7e82b19daec86f203c4d2735739465759bd55d2b1e7b06737b84ef0c4d539095a87c421bb2ecb5860690ce0732
-EBUILD gnome-shell-extension-gsconnect-44.ebuild 1617 BLAKE2B 3a65514198733f4dfa0765dd81b193e9c1b27f98813b2933119ca19a598006c604990d4196393211ff6866c91fe465acad0ede4f42ec0e699eff6aceecd9f853 SHA512 a06534a64e6708b1ee031638e550544869ab9c07b64847a929150f0ec1616a2165d9717b5d3e9b1c2d64b1326ef3fc204def4da911415b128552e3f3f6096e9a
-EBUILD gnome-shell-extension-gsconnect-45.ebuild 1619 BLAKE2B b12610f7c145d282da919befcc4dbde76dbd564e665962042bef54cabe212a25af4770319b3b19549c7223a4355f4af703ec23e65b82b5209dbee7d8f7b85509 SHA512 a511e889114a79d9aa75bcd1958d70c7989bc53788a9a22c32b620aa914cd29ee2951928081f915bc4608e0a9c3835be5635c22d67bd4fae5806445705313bd4
+DIST gnome-shell-extension-gsconnect-46.tar.gz 735155 BLAKE2B 86a7288953fe6001cfa15277dcc38feac3dd63fc60b8cca86dd95632b4d022587654393c3e6386a7e2cf7ad3af409efbae2e5ffe49eb36a9093887d0848cb080 SHA512 584348407a0f41f4317f52cddc1cc7e1e622fdd765e3eaa0b8012cc4bf46c09adedc97f9701a8c94aaa63dcd46d20fae35f49bfabe8c0d4abb4b407d8ac2c199
+EBUILD gnome-shell-extension-gsconnect-45.ebuild 1617 BLAKE2B 3a65514198733f4dfa0765dd81b193e9c1b27f98813b2933119ca19a598006c604990d4196393211ff6866c91fe465acad0ede4f42ec0e699eff6aceecd9f853 SHA512 a06534a64e6708b1ee031638e550544869ab9c07b64847a929150f0ec1616a2165d9717b5d3e9b1c2d64b1326ef3fc204def4da911415b128552e3f3f6096e9a
+EBUILD gnome-shell-extension-gsconnect-46.ebuild 1615 BLAKE2B 6d38053202c37bfe4014a553b5164b7dd629a67ae061e369d28ef0a47021c58d03af3c57585772aa261d2cd0c466c9ec281e957c239faede5e4b8dc410ee8b2e SHA512 bbf3115839b28690301fdad033d0e004ab4691bbe011032f592f96b85f1800997b9710c64f6b09aefd8ef75c8ef425585f18111f2c4d57143b2c48bbe082b703
 MISC metadata.xml 345 BLAKE2B 77e44add98d26f7ad351ad6ba3a11852499b76435ee6e49b6c37f30aabd406fbbf65498463bf668fc5971ff03dcd7226e5f263e2e87fab7c208048f6ce6210e6 SHA512 5402440fca2d10c50ad20eac8225d99df4a0e6f13c3758f4b08a692d11e8b8bfa35a89909777b60a3675f229d2122a19861cc5832510122474be99f5c1addfa1
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-42.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-42.ebuild
deleted file mode 100644
index 8179bcdda6ef..000000000000
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-42.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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 xdg
-
-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.36*
-	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 \
-		-Dinstalled_tests=false \
-		-Dnemo=false \
-		$(meson_use nautilus)
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_pkg_postinst
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_pkg_postrm
-}
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-45.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-45.ebuild
index b82245ebb2cb..052fefa61c6b 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-45.ebuild
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-45.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nautilus"
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-44.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-46.ebuild
index 052fefa61c6b..c046c64ae00b 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-44.ebuild
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-46.ebuild
@@ -5,19 +5,19 @@ EAPI=7
 inherit gnome2-utils meson readme.gentoo-r1 xdg
 
 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"
+HOMEPAGE="https://github.com/GSConnect/gnome-shell-extension-gsconnect"
+SRC_URI="https://github.com/GSConnect/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+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.38*
+	>=dev-libs/gjs-1.68
+	=gnome-base/gnome-shell-40*
 	gnome-base/gvfs
 	gnome-extra/evolution-data-server
 	|| ( media-libs/libcanberra media-libs/gsound )
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 4d2920d7057e..a631d03b3c8d 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,6 +1,8 @@
 AUX 40.0-windowsNavigator-Adjust-to-gnome-shell-change.patch 1889 BLAKE2B 830a11b7e76f1dae2308fecd30e0a1d9411ec21a95d1fbf3a71348a4b202c52c95b59dcab3223f7fbd8d5c75a2feadfe005463261f055f57d47f84463671aa23 SHA512 bbd470bf7f08728324ac997286df5f036b6ee8beaaafceb17483a2468fa24d366ccfb5ee1a26b8139242a3600634937aee23832a38bfa9ac39f98b384e258135
 DIST gnome-shell-extensions-3.38.2.tar.xz 209904 BLAKE2B b9a32e9c20046cb480dae3ed27791958799f534dc19026631290d2d0bcfac04955e77b2779f9a18e32d7ee56f837e8e17167bd40b575ff531b8cc328a9c0cc35 SHA512 5106946c10ea34b339ef413d5cf6bc3e1cd7f54f73b0ca773ae4076c1280e2b235327c9209e8269c5aca787035b489f73a76c7163380f191cb246c8591bc838c
 DIST gnome-shell-extensions-40.0.tar.xz 217772 BLAKE2B de2f88dd37a0b9bbbbcbd7373e18b8589d4a35a9497404a4e46a0e4aad7058890c6b596edd553cbb68dd6ab9db6bc81d8ae5457be02a4af2b2cc4b8fd2d8691d SHA512 9f4b4a5d91201c11246c2df880b568d69264ad875bfdc2b69d217aca0e4354223aeed51007396a339fb9a693eab9849362641fa9a064a5efdda7fad5b886af85
+DIST gnome-shell-extensions-40.1.tar.xz 218084 BLAKE2B 0f54dc53ce279af424658d540961bda698c4d6c2968bf778e626a91c7da47b8f56bd4b1dd874956dce9fbb0d1719bd64b8cf8883788d625049aa14dcc02ff313 SHA512 e537312c0790b6e54b3eebb0df189f65f093e81ec7cf1cde886df747188765775fc4616e98bff0157b543bac26c51a5c7006f1505f4554fea00972f790e781f1
 EBUILD gnome-shell-extensions-3.38.2.ebuild 1756 BLAKE2B 253307671aa10bfb66558f553c6ca3535f434f610ff74b4ad739523896df76ee7ea680dc3e2376ce3f3a69586f2b25f5987e3a6bdb2de0a3d3c808750fc4c06f SHA512 77d33546cceb52dc441ccffd769f6c26de76df4d8483eba73d6595febdadc034617d434ea842c32ecdf8def2ece8a33249bab4623175439df7f7d81ce31d5800
 EBUILD gnome-shell-extensions-40.0-r1.ebuild 1828 BLAKE2B bc3d843608850c029dac84b49e0e69a348f84ed8eb56e649c3525727be1f35e84883ed2a2129f18b77b5d2da33ff84df6731f9557d597d582e5ba4d94f13829b SHA512 2dd7d5ef357b7f914d07ebd78f5d4d3f0cf391c134ddd3a346de926ab07e3741bf31cff4cbcb8b8671277740076ec1be87a7d3bc5a610a6409ac4791feaf801f
+EBUILD gnome-shell-extensions-40.1.ebuild 1749 BLAKE2B b390d4f85164e8329c4f1693747df7ec0e0fb052dfc594e37332019f139f952a82ea7024e7004568ddf9821c1f8ea9ff9c604e024255c93c77ba1b37f5524924 SHA512 e5539db5696a3caf24a980eaf1141a402f2e19d45ab186e47e45083ee195c135779c072de3f4ed0f0165f5b732e330c20e138ae98b67dd9fc20cd2fc23765662
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.1.ebuild
new file mode 100644
index 000000000000..f5bc021adcaa
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.26:2
+	>=gnome-base/libgtop-2.28.3[introspection]
+	>=app-eselect/eselect-gnome-shell-extensions-20111211
+"
+RDEPEND="${DEPEND}
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	dev-libs/atk[introspection]
+	gnome-base/gnome-menus:3[introspection]
+	=gnome-base/gnome-shell-$(ver_cut 1-2)*
+	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]
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+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/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index b3a21122e11b..754adc740d16 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,3 +1,5 @@
 DIST network-manager-applet-1.20.0.tar.xz 1953772 BLAKE2B 1fb480887e61d7ef3a76ac5ded7ffe6723e99b2ae53d2a53990d3c2617eac45bc99b00b10b43929e8696488abc1b0be2194e800b931732f229d7d4bd17e1951e SHA512 3b7ffd61e4f810fedee5aaf64725fcc2a8ee3c6b776f2d0b93f337c207516392b4720acea35c56c80755842c600edb971a67813c1583c112a91496d3d8db2c67
+DIST network-manager-applet-1.22.0.tar.xz 1901680 BLAKE2B e1597d5ee332000082e2939745af10f5f5d5e9177b388f67fdb9822636226502a4c96f4f97187f01ae8de5bd1b4d853670e94dc9058e9b31cf9cadf11fe6a64b SHA512 80c9a8df750f1253a66aea254f30278a934ed4e11fecff03cfa50a31da9efcff5c8892caef672a4d62d8c5c473770358c35344b49a9f3d7956ad76063b794cac
 EBUILD nm-applet-1.20.0.ebuild 1214 BLAKE2B 1bf70341eec3f8414aed9d123f5b814f3f94dcb87f9eca83b6c096c709a0084820979f451e270c917abc072c7d4f6cb6c4ea7bc5083947a8a2c9d2dc6587f40f SHA512 6546b90d3aeeb373033395c7e456238fb4c5575655454b2d941f9d2ce20f14913751b8fd5934847b4dd5e2b74db1eb460010b69d23b0380f7ccd0f32c91b3d19
+EBUILD nm-applet-1.22.0.ebuild 1219 BLAKE2B 5db1c88c3b923a054eb4325386083e38af26eeda97193d9df9d92386a2da72e0f2996ce34b8f8de85396ad9c6a8fc47c2ead5d8dfc7c3eb0e5ab6608c4e0383e SHA512 c726308c390bb0cdfdecf4b44904d58b0d9f0f8fda637c9b5edffea87d1c8eb3ce284629ce46daa21046e141b3f5286b6a912962ab8cc503a0999d7f6c511af8
 MISC metadata.xml 451 BLAKE2B 82878f455c7c0c79fc88fd65ffb9dc801a0d009427b104bd02a5ee5440b9b8487d386b39c1bcd7276ac276c00d94150c86c14cea5f310567c3375435b5a485bc SHA512 fd77b7a80454c27435ff3867634f987ca44d3789bb10f2fa6097e00f43cdfbe01a187c217e8f23a6d8c2a330917adfb8f9e6d8ad3408815f8b83ef05e1718cc8
diff --git a/gnome-extra/nm-applet/nm-applet-1.22.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.22.0.ebuild
new file mode 100644
index 000000000000..9a0c4cf3048d
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-1.22.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="network-manager-applet"
+
+inherit gnome.org meson xdg
+
+DESCRIPTION="NetworkManager connection editor and applet"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="appindicator modemmanager selinux teamd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=app-crypt/libsecret-0.18
+	>=net-libs/libnma-1.8.27
+	>=x11-libs/gtk+-3.10:3
+	>=dev-libs/libgudev-147:=
+	>=x11-libs/libnotify-0.7.0
+	>=net-misc/networkmanager-1.16:=[modemmanager?,teamd?]
+	appindicator? (
+		dev-libs/libappindicator:3
+		>=dev-libs/libdbusmenu-16.04.0
+	)
+	modemmanager? ( net-misc/modemmanager )
+	selinux? ( sys-libs/libselinux )
+	teamd? ( >=dev-libs/jansson-2.7 )
+
+	virtual/freedesktop-icon-theme
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dappindicator=$(usex appindicator ubuntu no)
+		$(meson_use modemmanager wwan)
+		$(meson_use selinux)
+		$(meson_use teamd team)
+		-Dmore_asserts=0
+		-Dld_gc=false
+	)
+	meson_src_configure
+}
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index 8f9fcd9228ae..a31f3ead6dee 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -1,5 +1,3 @@
-DIST pch-session-3.36.3.tar.bz2 9575 BLAKE2B 1f7001c50247821b2c9771b8d16bd2b962712c033fde7af225a9aac152abb2a0505b73f5baf5913ce12e05bc7a89abcf0411b2ffa64dc0aa38b2bea0f3f41796 SHA512 b784421b27a446d460191da5a2eb6fbaf53aa4cffbfe8f113bc8c3ef308741ccfd6a208d6f6b1a50839b3a0925b22e6573604fd315496a5c59ae969fc8e6f7a6
-DIST pch-session-3.38.3.tar.bz2 3610468 BLAKE2B 832eacf774c46c4c714a3e12ebd024f4a2fa62ef385697e7d18144c917bc6c11a12da77db604e2f3eaa1f4aa50ccf3578a9c1fcc81332d6b5db06a98cb1f75ef SHA512 11d4474a757787cc6d65ca81a9e3e592c347c4267c816346d7455f6abae267d0f331a19ec2b8f0c216adcfe5db9af0c37b489ec7abbbd581a7c5b4bb3a77854f
-EBUILD pch-session-3.36.3.ebuild 1284 BLAKE2B afa6c9ea764c95d17425fdcf30ca1a4c870c57333c31de2d69be68d5cb98d88991dc5509546bc288657233a88299ca8ba09ebec54840af2218a4e1acd5697792 SHA512 d3c8c23ac76a2b141518d6d604ba4c8ee40f378d88cd66b6f967b5a4699dbde4b7b21317c0c7a0430a1fc2f61742eae03a2c3e9fa92fc90628c8f41b8761a14d
-EBUILD pch-session-3.38.3.ebuild 1283 BLAKE2B 3e7bd310206f47130864e736d6165d265382af550f6222fa4b4a02e19de5bd7315693a89f876363310bf65e84548df9658636fc035f5802a79a0122254e98725 SHA512 c5861379df9b4d304dc8382ec66d1b8fabe65508db6f94c61e50e5124fcfa6ad97d5bc8178257268b7f6309c3cb3c956f850e787b284d623bc753e27c32acc91
+DIST pch-session-3.38.4.tar.bz2 3610553 BLAKE2B 68585f7e0ebcd04312bf5f7a60de04a9b5b7412fa3b3aee43409c0c10f074c2f3efd95ecf5e2bcea4ccc5765c556ec6ef6a43737be5bb0e2b470994810f87c40 SHA512 42364f44656be8652e1be0beb592068b727660f17ba573fb35836bf39dc225c19783deb4b488ae450143457ac8236601334150665162294285aadfe7cb9758d0
+EBUILD pch-session-3.38.4.ebuild 1283 BLAKE2B 3e7bd310206f47130864e736d6165d265382af550f6222fa4b4a02e19de5bd7315693a89f876363310bf65e84548df9658636fc035f5802a79a0122254e98725 SHA512 c5861379df9b4d304dc8382ec66d1b8fabe65508db6f94c61e50e5124fcfa6ad97d5bc8178257268b7f6309c3cb3c956f850e787b284d623bc753e27c32acc91
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/pch-session/pch-session-3.36.3.ebuild b/gnome-extra/pch-session/pch-session-3.36.3.ebuild
deleted file mode 100644
index e72ccd6232b4..000000000000
--- a/gnome-extra/pch-session/pch-session-3.36.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-DESCRIPTION="Unofficial gnome based session with different default settings and extensions"
-HOMEPAGE="https://gitlab.com/pachoramos/pch-session"
-SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# gnome-extra/gnome-tweaks to configure extensions easily
-RDEPEND="
-	>=gnome-base/gnome-shell-3.36
-	>=gnome-extra/gnome-shell-extensions-3.36
-	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-8
-	>=gnome-extra/gnome-shell-extension-bing-wallpaper-27
-	>=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-12
-	>=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200713
-	>=gnome-extra/gnome-shell-extension-dash-to-panel-38
-	>=gnome-extra/gnome-shell-extension-desktop-icons-20.04.0
-	>=gnome-extra/gnome-shell-extension-gsconnect-34
-	>=gnome-extra/gnome-shell-extensions-topicons-plus-27
-	>=gnome-extra/gnome-tweaks-3.34
-"
-BDEPEND=""
-DEPEND=""
-
-pkg_preinst() {
-	gnome2_schemas_update
-}
-
-src_install() {
-	insinto /usr
-	doins -r usr/.
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/pch-session/pch-session-3.38.3.ebuild b/gnome-extra/pch-session/pch-session-3.38.4.ebuild
index e8d289c1e9d9..e8d289c1e9d9 100644
--- a/gnome-extra/pch-session/pch-session-3.38.3.ebuild
+++ b/gnome-extra/pch-session/pch-session-3.38.4.ebuild