gentoo resync : 22.12.2021

4 files changed, 8 insertions, 89 deletions

diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 22950c4cb306..4f758d76d451 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,9 +1,7 @@
-AUX 40.3-drive-menu-hide-items.patch 1756 BLAKE2B 9eba68c0d09b066ea3f06a59a15df2ea310ce0f4168b6851e0bfd51784e124bdaac40078ba0d7be24f7515dcb09a1ca93eb994fb8f668382e5b27c63d094c0b8 SHA512 39694a61045baf0c1675db62cd2cfa4900c45a6fae483353e519c4b1098d5f9f8292ee1cadcaf9db5d884c42d939b5971bfcb32bc1feed3c5bc9ef40bcf3b1a4
-AUX 40.3-drive-menu-indicator-visibility.patch 1132 BLAKE2B 2b8580182ace34e99fece58e20fc4b01bf08b988592743c7e4c844cc4713cee3df7dfafe8d6ab2bd318d453b039dfeec04511ad81ab1533cd4c8cdae8c6581ec SHA512 fb74eb7796a06e5bbd103d7c0806845364fc35da6b933af287b68efeaec1e5f73699d98f38fca764aab9f44eb23e7e4365dc0f1e1e8514d9d5bbb709a110c478
-DIST gnome-shell-extensions-40.3.tar.xz 218108 BLAKE2B 33174ef4c80caf375d48f11b7678ec78bfbe60a9d4456e21856b09a0a83e99ee7b68598c719a6913a29d9686317015fbc8d8bfae856e433414889e59e82e5ca3 SHA512 3773b0a5ec81b6663a3b2c5f5d1f8e7619fdba49ce67b25ee0f5555d17ea7c9740c3698b7a4e4f7fa78241c8738663c602cb5ed1ff9874b8ad2321fec0dbc737
 DIST gnome-shell-extensions-40.4.tar.xz 218088 BLAKE2B f992c98fa5ceec84c774881468e0c9736d24f1834b9d6976f7cddc2dce455393fad0ad055c1e02b308135914029874c4d87d3a09733a7b4686308e9052cef21a SHA512 79f087c9fbc7764241751441190819b3e768530257ffe3a7b39b1004f8997de9c8ea381338ec0544a39b8cc6866137d315e56f3f058c9b66a9ed566ec40712ef
 DIST gnome-shell-extensions-41.0.tar.xz 219664 BLAKE2B 1d73d9f1255f93740d2effad48420b2992872b89df12e0baaf99c3344c356de5f92f76300c30cac32230c7a97a4a9ce6bb74308078fb6844fa3051f24594eaf7 SHA512 4332821044029020404c0ed5d040b7d5e5548a67447517424a54ed4c586bad3461ab1e25f0dcb37c24ea2a1496d1cbf2b95f24de0eda79f0c6921b6b1f085f83
-EBUILD gnome-shell-extensions-40.3-r1.ebuild 1868 BLAKE2B d2b5894c719e76dcc05fef97ef9115058ee80924c2c35125f97614897658f6b11729721c2f7e0e460f26019791b182b6dea8b702774921ab2b91f39a22e28c94 SHA512 adada7db70e8ef7b36d45c257a1b04ef427f63723d64e3788aa0fa907fbb794a1898b9215ba752c37188a780bbc0bf5b4e21d778be80cd0ea08cf1cbced4eb0c
+DIST gnome-shell-extensions-41.1.tar.xz 219848 BLAKE2B 31da29fa8f804b1568677a9a875ac6efcb1906588f239a34c360d5dcc1947d4c99200dc1b63ca6d17b257ccc5c22d6eed9401fba625eda1bded57aac0d83c22f SHA512 2cbcd1ff384254545645cf4cd6a6f887e4fb42088bcff3fbb4179fd3400f1eb62ebeb87ccb25cd327bdb01060d1994c5dec1c26103bc968366ac521f7eaa8cde
 EBUILD gnome-shell-extensions-40.4-r1.ebuild 1745 BLAKE2B 6a307a1b0c01e33df542b3f6261faf7c3c4157429629f8a182c74a50cef451087b6092fbb023ae438547f3c7c34757b6f8591c753aa58a5b2cf591557197b507 SHA512 63329ec042c5fee18948bc8ab6cf00963ba71c046bc030ab074608f71d78321033b6a50ce2c68a9f82403b46cf51acd1b3717002f816a87750478c16b1515c10
 EBUILD gnome-shell-extensions-41.0.ebuild 1763 BLAKE2B 28cf1f4d8fa43e655954d5e32a72ef7d546b1e1645e8c026430380e0c0553bc2aa439076bf6602b3df0878c005b8c8b3cd2613e7fa49d16a5223baffec443740 SHA512 88dfc426ac303d7fc2da7e4db185219b006a55db9978d4da81403e6425ae1ca11ce206998b6305b3c35bcc7efafbf5b3fb959bc72720aba5cb849801e9561da1
+EBUILD gnome-shell-extensions-41.1.ebuild 1763 BLAKE2B 28cf1f4d8fa43e655954d5e32a72ef7d546b1e1645e8c026430380e0c0553bc2aa439076bf6602b3df0878c005b8c8b3cd2613e7fa49d16a5223baffec443740 SHA512 88dfc426ac303d7fc2da7e4db185219b006a55db9978d4da81403e6425ae1ca11ce206998b6305b3c35bcc7efafbf5b3fb959bc72720aba5cb849801e9561da1
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-hide-items.patch b/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-hide-items.patch
deleted file mode 100644
index c69dd5fd3577..000000000000
--- a/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-hide-items.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From d421bbfa609426032f07f27934eefb214d59012f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Tue, 13 Jul 2021 11:54:21 +0200
-Subject: [PATCH] drive-menu: Hide items initially
-
-Now that the check for network mounts is non-blocking, the initial
-sync doesn't take effect immediately. We don't want hidden items
-to briefly flash the indicator, so create them initially hidden.
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/176>
----
- extensions/drive-menu/extension.js | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js
-index 6c6fd76..f60dab7 100644
---- a/extensions/drive-menu/extension.js
-+++ b/extensions/drive-menu/extension.js
-@@ -41,6 +41,8 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
-         ejectButton.connect('clicked', this._eject.bind(this));
-         this.add(ejectButton);
- 
-+        this.hide();
-+
-         this._changedId = mount.connect('changed', this._syncVisibility.bind(this));
-         this._syncVisibility();
-     }
-@@ -155,10 +157,8 @@ class DriveMenu extends PanelMenu.Button {
-         this.add_child(icon);
- 
-         this._monitor = Gio.VolumeMonitor.get();
--        this._addedId = this._monitor.connect('mount-added', (monitor, mount) => {
--            this._addMount(mount);
--            this._updateMenuVisibility();
--        });
-+        this._addedId = this._monitor.connect('mount-added',
-+            (monitor, mount) => this._addMount(mount));
-         this._removedId = this._monitor.connect('mount-removed', (monitor, mount) => {
-             this._removeMount(mount);
-             this._updateMenuVisibility();
--- 
-GitLab
-
diff --git a/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-indicator-visibility.patch b/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-indicator-visibility.patch
deleted file mode 100644
index f76335d4596e..000000000000
--- a/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-indicator-visibility.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3539ce113907ffda813e1a990891b0911c9702ef Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Tue, 13 Jul 2021 11:40:31 +0200
-Subject: [PATCH] drive-menu: Fix indicator visibility
-
-Commit 519269be9d made the check for network mounts non-blocking, and
-we now update the indicator's visibility before a newly-added network
-mount is hidden.
-
-Address this by monitoring the item itself for visibility changes.
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/176>
----
- extensions/drive-menu/extension.js | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js
-index 3fac236..6c6fd76 100644
---- a/extensions/drive-menu/extension.js
-+++ b/extensions/drive-menu/extension.js
-@@ -189,6 +189,8 @@ class DriveMenu extends PanelMenu.Button {
-         let item = new MountMenuItem(mount);
-         this._mounts.unshift(item);
-         this.menu.addMenuItem(item, 0);
-+
-+        item.connect('notify::visible', () => this._updateMenuVisibility());
-     }
- 
-     _removeMount(mount) {
--- 
-GitLab
-
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.3-r1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.1.ebuild
index 114c39cad749..d9aef6246858 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.3-r1.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 DEPEND="
 	>=dev-libs/glib-2.26:2
@@ -21,7 +21,7 @@ RDEPEND="${DEPEND}
 	dev-libs/gobject-introspection:=
 	dev-libs/atk[introspection]
 	gnome-base/gnome-menus:3[introspection]
-	=gnome-base/gnome-shell-$(ver_cut 1-2)*
+	=gnome-base/gnome-shell-$(ver_cut 1)*
 	media-libs/clutter:1.0[introspection]
 	net-libs/telepathy-glib[introspection]
 	x11-libs/gdk-pixbuf:2[introspection]
@@ -41,14 +41,10 @@ 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."
-
-PATCHES=(
-	"${FILESDIR}/${PV}-drive-menu-indicator-visibility.patch"
-	"${FILESDIR}/${PV}-drive-menu-hide-items.patch"
-)
+you can use the gnome-extensions-app (included with gnome-shell),
+https://extensions.gnome.org/ web interface, or modify the
+org.gnome.shell enabled-extensions gsettings key from the command
+line or a script."
 
 src_configure() {
 	meson_src_configure \