gentoo resync : 22.05.2021

4 files changed, 6 insertions, 112 deletions

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 $?
-}