gentoo resync : 29.12.2022

4 files changed, 3 insertions, 99 deletions

diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
index 2b125bd663a1..f885e956a871 100644
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
@@ -1,8 +1,5 @@
-AUX gnome-shell-extension-alphabetical-grid-22.0-redisplay.patch 1164 BLAKE2B e25d1101d5bc70f61404de17762bbb17638b9c9f9ad5d921498fd7292df3858c5aff7c44c8b281aedc87c9d2bdae36908aa2f78a949e91a11e0d8a39d0417309 SHA512 16a5794abf382ed9a5c63b35b100d654a1790a5bf4aecd33f65b6b21475cf881444bd8ea6d18e2b86dd68d8373fc42932d5544095df876e8c77f3c490a4f3c2b
-DIST gnome-shell-extension-alphabetical-grid-19.0.tar.gz 288661 BLAKE2B b3df5594422f7d5ba249ec5a3eebf178e845fc2f36f838f61c86c0aa1918f9ca7e942a6af358e3f1744ce7f25a507f3e97bac71848cf6c0bac6339139ffd0d3d SHA512 139f1d06ebeef3b76ac84f71190cf77ebc77571ff3b489bb86f578cfa01ce7de47e53798fece93cb6c45bd82cb6b2a425ba255c1485d5b8739da28bd9959fce8
-DIST gnome-shell-extension-alphabetical-grid-22.0.tar.gz 208959 BLAKE2B 08ab108c0e51249531950ecdec18cdf9b205c0727aeb3e359fd8fb0a1ca9c0d4afec7c3a54b4ee130bc9b63ad58d6619e2d15d17622ccf68172aed38fcc5b97f SHA512 ae8cc174d5c003debe7e78ff415fbde66b495d93ea7130b2aef459ce42b6e7970c4c14221ec7f5febb3f6d2ff05365b738c92e7bc2357867495185e05a82ffea
 DIST gnome-shell-extension-alphabetical-grid-23.0.tar.gz 209076 BLAKE2B 82fd5fdd4d10cb134bd47221d0ecdf651f86e7c77872373a27489aec526df715eedd3d7e4407fc4c53617d14984d2690ff0fe6db5ba3c92dabf13d175f0d7a21 SHA512 6c932216956f421838c608fc8e6426039761e6233305dfb1ea0a0bf6c8afc65632983fed12d3f5a3605ff1ef73f8ebc11715ff47ac7570960ff2361e436760f8
-EBUILD gnome-shell-extension-alphabetical-grid-19.0.ebuild 1422 BLAKE2B 71bca6a4078f41a08c2a2b3291acad0440c60262b9a6b5c05ffea13485dfa3958aa665395f72b996568fdff222f68d28b36ee715949e9fb2a24434393250d271 SHA512 00ebf81e517bcafb935f061cb11162d3dd99dc13398a9d44eec08f951f22e42402b7f72ae0885d99d72524cf101fffb53db3959756520b2c1bdf43f3f728608e
-EBUILD gnome-shell-extension-alphabetical-grid-22.0.ebuild 1434 BLAKE2B 1deaa43cfe9d041f62783e1f9daebd0293061aac412469539f8feffa80221c113728ed84971db83607a0f17652179704ffc7551241d682dc6f5c6febf8eb8dfc SHA512 bdc37596751fbce2d96cac831291bb7f0d80485eef816971ef44fd6dfdd6a5d09437cde3a1e6e30d442afca932a97898ab7759d34ed6061f7ee66da226510e1f
+DIST gnome-shell-extension-alphabetical-grid-24.0.tar.gz 210398 BLAKE2B 6b782085328ca9d61f9aa7406db1f586d35abe50b20e8c2fd06e534166985b1be688b930d4b4f19cd460a69fc4fd5004cf49600fde9a435c7c592d101191f2f6 SHA512 b54ac0b00b4c538ab4064c6bcc197fa65c730e732a80c23e23ed78915e53a8211634f68b842b2f00935b3d48669a19e66ac0eb1d43bcd34955967108a570ebaa
 EBUILD gnome-shell-extension-alphabetical-grid-23.0.ebuild 1385 BLAKE2B efb9b1538244fd377e7f352cc17c68c668d4baecafc8c0ca90d52c9e22653876aabc2aad98aee489a1d6152a4fd2d04b9056dc3b3c5b91b04050966f9e41e0eb SHA512 2b7a39796b6ba90f538d6ef6225fd7d327240f63828f1d40ff65ebd80f754784a58154431a65a5fdeb6fdb46e514ec13dc9343f739ed3b4eb655075407c7602c
+EBUILD gnome-shell-extension-alphabetical-grid-24.0.ebuild 1387 BLAKE2B 66acfb635b5537f8ee83127cf7dbad393c655409748899053872010b341f2b035106f39666acddd424e50661fc391236df89306a14bfbdd69f569d7138416979 SHA512 f011b5ad3f59ce6ef68bc548682e2cd60e47eca862022b95f84c597fc0c60d0d573db35f0e892ba29fc0df44e5e27714dfe1baedce8b0873b7b9f474fb243615
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/files/gnome-shell-extension-alphabetical-grid-22.0-redisplay.patch b/gnome-extra/gnome-shell-extension-alphabetical-grid/files/gnome-shell-extension-alphabetical-grid-22.0-redisplay.patch
deleted file mode 100644
index 7010a11735ef..000000000000
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/files/gnome-shell-extension-alphabetical-grid-22.0-redisplay.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ae8d9c55ede615c244729e1dd0bd20de3f09e386 Mon Sep 17 00:00:00 2001
-From: stuarthayhurst <stuart.a.hayhurst@gmail.com>
-Date: Fri, 8 Apr 2022 16:06:10 +0100
-Subject: [PATCH] Call original _redisplay() once to setup, respect internal
- pages updating lock
-
----
- extension/extension.js | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/extension/extension.js b/extension/extension.js
-index 2c8cc71..7f6b4db 100644
---- a/extension/extension.js
-+++ b/extension/extension.js
-@@ -23,6 +23,7 @@ function enable() {
-   ExtensionHelper.loggingEnabled = Me.metadata.debug || gridReorder.extensionSettings.get_boolean('logging-enabled');
- 
-   //Patch shell, reorder and trigger listeners
-+  AppDisplay._redisplay();
-   gridReorder.patchShell();
-   gridReorder.startListeners();
-   gridReorder.reorderGrid('Reordering app grid');
-@@ -93,7 +94,7 @@ class Extension {
- 
-   reorderGrid(logMessage) {
-     //Detect lock to avoid multiple changes at once
--    if (!this._currentlyUpdating) {
-+    if (!this._currentlyUpdating && !AppDisplay._pageManager._updatingPages) {
-       this._currentlyUpdating = true;
-       ExtensionHelper.logMessage(logMessage);
- 
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-19.0.ebuild b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-19.0.ebuild
deleted file mode 100644
index 6a8af9a70239..000000000000
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-19.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2-utils
-
-# Useful specially to prevent
-# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4684
-# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3180
-DESCRIPTION="Restore the alphabetical ordering of the app grid"
-HOMEPAGE="https://github.com/stuarthayhurst/alphabetical-grid-extension"
-SRC_URI="https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.38
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/alphabetical-grid-extension-${PV}"
-extension_uuid="AlphabeticalAppGrid@stuarthayhurst"
-
-# Tests are only useful for upstream
-RESTRICT="test"
-
-# Not useful for us
-src_compile() { :; }
-
-src_install() {
-	einstalldocs
-	insinto /usr/share/glib-2.0/schemas
-	doins schemas/*.xml
-	rm -rf README.md LICENSE.txt Makefile schemas || die
-	mv -v ui/* . || die # Searches for these files in parent dir
-	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-alphabetical-grid/gnome-shell-extension-alphabetical-grid-22.0.ebuild b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-24.0.ebuild
index 75bba270503a..435d2222d99b 100644
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-22.0.ebuild
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-24.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/r
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -29,10 +29,6 @@ extension_uuid="AlphabeticalAppGrid@stuarthayhurst"
 # Tests are only useful for upstream
 RESTRICT="test"
 
-PATCHES=(
-	"${FILESDIR}/${P}-redisplay.patch"
-)
-
 # Not useful for us
 src_compile() { :; }