gentoo resync : 29.12.2022

5 files changed, 9 insertions, 94 deletions

diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 110b7a40b03f..3e1d82ba893f 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,8 +1,5 @@
-AUX gnome-shell-extensions-41.1-meson-0.61.patch 383 BLAKE2B f40a994294b3a6fe1aafa92d87774aabe5e1ec75913f1902c746227198db4baf928c2f96c63eda8531668dd998eee0484ab6a506785491bad1bfe5a3721b3547 SHA512 beed6cece8b0bce2e8fe5f210b7ebb36f75192ef91e7cd407ae83216516f6bacbcbb76c2591b601cf7fe1866ac30c220026b349066aa95f06bbbf2393cf32b65
-DIST gnome-shell-extensions-41.2.tar.xz 222528 BLAKE2B 132fdbc1e1c81a886dc250dabd44721aeeaefed5939f30274e2484ec6a8dfff25fd0c481a04edf47f732ccb34b9c8d132d106a45d862db07fc9fb8d835fee6de SHA512 3b581dbc289f630bb85b0285a2f5956142a412e124d15e085770a578a9304211b1868f4eb940b79637b9cfa78b0da5973a717ee5866d75e9d15f38e91d4f414f
-DIST gnome-shell-extensions-42.0.tar.xz 226240 BLAKE2B c0c13ef58f632e3a8449580af52c40677b979c9f81fa037d936d31ebb693bc070bea5f0ec7a4715ff3f19480cc12d4ec471efa1d6b684e2924a5fbdd943e381c SHA512 d413f8a7c12c9e4c71a51b4f5c3cc8e0145b57eec24648e928f02ccdeb4a02b44ad3adf9668f3ba65870d772490f2389582f4f5e8f4037da3ab88a0bb5958f5d
 DIST gnome-shell-extensions-42.1.tar.xz 225068 BLAKE2B 9041259a480be745476278f638be20ae6ac0b86019d01609cf6b0ba3fa129dac74d56851d0301a6e1b8a0b172b6d375aeeb2f2df389f3c0dfe0e01384248b5d8 SHA512 b139400d239be2dbc7685afc666d0b17ab187b68fa2631b586b0e04bf05de3d59ac70d2f692ade8e0003fea99f207b05871deab3898ba34586521dda747970c3
-EBUILD gnome-shell-extensions-41.2.ebuild 1830 BLAKE2B 5035f1592b076b4246143c32a6cd2364cfc61c7d20152dd05aed60950e8da92802820e9f841200cba0d431f449fb45f406589339b1e56469ff7e0ca526c15629 SHA512 6d00475aab927daaff770203eeb9e719440c47013f98644cb0a44f95e1b6315242dfa3f560ca6a9b3bf1ba6d73fc96fac612abcbb3fac2684e9541333fc07eaa
-EBUILD gnome-shell-extensions-42.0.ebuild 1777 BLAKE2B 08a538766888b93b71bcae8055851d218d66b4a3664e9e561cc5dd13e5178b84de178a1c8b253f41141c86fd7a8d06e9781d68c79f6dd357694e1c2d549922fb SHA512 7beda3a2f8db19ebe4231f74ebc81e6526776e30b1ed86e0a735b346a86445d0305987eb8c927c8180ae1bdf4268b1a60ecc44d5c2280c30ccb4bddf2c1f01cc
-EBUILD gnome-shell-extensions-42.1.ebuild 1796 BLAKE2B 05aa950938c17dc8d784c40e27592c3af938d229933cbc73a62c69f96b898621ecfc5f0da95a30ae70a4d041b42ab0bf984eb771fe58ad0b073ff0a08022b597 SHA512 4693587edd6aebebbf3920828f521e013b26655aedca454c476a4488bea82244b2079b897645a2b3650d7f76b2c3a767c84fcb0ebcf97602559d22f542705244
+DIST gnome-shell-extensions-42.2.tar.xz 225040 BLAKE2B 992207185af12ee8f41e888891d3b60536ce0f70359abce58c57ca372823925d948d23372fea7dc8d09e2734549044cd89e7a644e3815e985c75ee64eaf34992 SHA512 175cf5dd7cdd29ee30857e4960355ce164f2ae8c038473409b26e0f201f0b19782924ffc532a05d58cf76ade332ab87afffa52512cb9b8ff69fa36b78da293c9
+EBUILD gnome-shell-extensions-42.1.ebuild 1793 BLAKE2B 154b897688f44ce9666a2ed25b5d79e4e98020f4147532ddd0325ad18a161712f724e5391a8fbf4bd1d78a66590395c2bbb81e568335a5940139879c6272e10d SHA512 dc2527a2ea9e53682c0057712c1bc183e9365f262c5838e5bfab8895a7c887583ec794a91440ff69cba0cc559ed8f03f5e6750433585ca4840cbfc4ed3f9a774
+EBUILD gnome-shell-extensions-42.2.ebuild 1796 BLAKE2B 05aa950938c17dc8d784c40e27592c3af938d229933cbc73a62c69f96b898621ecfc5f0da95a30ae70a4d041b42ab0bf984eb771fe58ad0b073ff0a08022b597 SHA512 4693587edd6aebebbf3920828f521e013b26655aedca454c476a4488bea82244b2079b897645a2b3650d7f76b2c3a767c84fcb0ebcf97602559d22f542705244
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-41.1-meson-0.61.patch b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-41.1-meson-0.61.patch
deleted file mode 100644
index 692f828ecd7f..000000000000
--- a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-41.1-meson-0.61.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Rebased version of https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/commit/cdaa837d48894737ca0b4e7d2dfb365119e53759
-https://bugs.gentoo.org/831938
-
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -1,5 +1,5 @@
- session_desktop = 'gnome-classic.desktop'
--i18n.merge_file('',
-+i18n.merge_file(
-   input:  session_desktop + '.in',
-   output: session_desktop,
-   po_dir: '../po',
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.2.ebuild
deleted file mode 100644
index 9b2f0bc48e2e..000000000000
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 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 arm64 ~ppc64 ~riscv 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)*
-	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 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."
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-41.1-meson-0.61.patch
-)
-
-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-42.1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.1.ebuild
index 763ce0e49faf..c9a61b00860a 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.1.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.26:2
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.0.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.2.ebuild
index aea37b082f55..763ce0e49faf 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.0.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 inherit gnome.org readme.gentoo-r1 meson xdg
 
 DESCRIPTION="JavaScript extensions for GNOME Shell"
@@ -47,9 +47,11 @@ org.gnome.shell enabled-extensions gsettings key from the command
 line or a script."
 
 src_configure() {
-	meson_src_configure \
-		-Dextension_set=all \
+	local emesonargs=(
+		-Dextension_set=all
 		-Dclassic_mode=true
+	)
+	meson_src_configure
 }
 
 src_install() {