gentoo resync : 20.03.2022

4 files changed, 20 insertions, 72 deletions

diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 4e8eb241464b..b4c1147fdd3b 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,5 +1,4 @@
-DIST gnome-shell-extensions-40.4.tar.xz 218088 BLAKE2B f992c98fa5ceec84c774881468e0c9736d24f1834b9d6976f7cddc2dce455393fad0ad055c1e02b308135914029874c4d87d3a09733a7b4686308e9052cef21a SHA512 79f087c9fbc7764241751441190819b3e768530257ffe3a7b39b1004f8997de9c8ea381338ec0544a39b8cc6866137d315e56f3f058c9b66a9ed566ec40712ef
-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.1.ebuild 1777 BLAKE2B 08a538766888b93b71bcae8055851d218d66b4a3664e9e561cc5dd13e5178b84de178a1c8b253f41141c86fd7a8d06e9781d68c79f6dd357694e1c2d549922fb SHA512 7beda3a2f8db19ebe4231f74ebc81e6526776e30b1ed86e0a735b346a86445d0305987eb8c927c8180ae1bdf4268b1a60ecc44d5c2280c30ccb4bddf2c1f01cc
+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
+EBUILD gnome-shell-extensions-41.2.ebuild 1830 BLAKE2B 5035f1592b076b4246143c32a6cd2364cfc61c7d20152dd05aed60950e8da92802820e9f841200cba0d431f449fb45f406589339b1e56469ff7e0ca526c15629 SHA512 6d00475aab927daaff770203eeb9e719440c47013f98644cb0a44f95e1b6315242dfa3f560ca6a9b3bf1ba6d73fc96fac612abcbb3fac2684e9541333fc07eaa
 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
new file mode 100644
index 000000000000..692f828ecd7f
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-41.1-meson-0.61.patch
@@ -0,0 +1,12 @@
+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-40.4-r1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.4-r1.ebuild
deleted file mode 100644
index 95dea1595032..000000000000
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.4-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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)*
-	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/gnome-shell-extensions/gnome-shell-extensions-41.1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.2.ebuild
index aea37b082f55..9b2f0bc48e2e 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.1.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.2.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
@@ -46,6 +46,10 @@ 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 \