gentoo resync : 02.02.2022

4 files changed, 49 insertions, 4 deletions

diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index d503e2479ff6..32244e629bb8 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,5 +1,6 @@
+AUX meson-0.61.patch 998 BLAKE2B e97d3460c28892df096d50a815826560eba89f050e36166c39e816e6a65d855635ea881edf07fd393ce1cbd0100c3fb2579982a00a71b089fbf765fe266c8879 SHA512 7103e31effe841f4d8af0d002c586f06ea199c024b0757a84617ce42a4aaff6b59350cd8cd90f3d4bfacb53333f2a806dab04c7ad40b3be568687df2afa40814
 DIST network-manager-applet-1.22.0.tar.xz 1901680 BLAKE2B e1597d5ee332000082e2939745af10f5f5d5e9177b388f67fdb9822636226502a4c96f4f97187f01ae8de5bd1b4d853670e94dc9058e9b31cf9cadf11fe6a64b SHA512 80c9a8df750f1253a66aea254f30278a934ed4e11fecff03cfa50a31da9efcff5c8892caef672a4d62d8c5c473770358c35344b49a9f3d7956ad76063b794cac
 DIST network-manager-applet-1.24.0.tar.xz 1903280 BLAKE2B a969ab18e2d2d85d378d9964e635281cfcd4bc46e0542ec94e187cbe7e740c5fad8e10b3d7d3ae3b85352ba5368787650f933b89740d05ee06d78057e1c31712 SHA512 7b91bd54d53b1b485bc5e401f83c683804175900557a7a4bc40a3f759fa9d4ca1c42b193bcd56a39a8cb79ec5b0c6f7cbeccfc08200099c08d933650c92faecb
-EBUILD nm-applet-1.22.0-r1.ebuild 1223 BLAKE2B 0dff6055d849a1c8dbd45ed5d6f65881f8204e25daa8463ba7ca5b6b6cf6d70147b3c913f709cce638c621a3ce4577975f1452148a6517d11b8d3f71707a852f SHA512 53725fca8fecf6df0975ead5fb686454659d06f8602c309d42f0ec659766e11840bfdcd34f6431edc379d98dbcab8e939f7a4cba02a529cdfcd0f3a5cb4565c1
-EBUILD nm-applet-1.24.0.ebuild 1228 BLAKE2B 0d216d8f8323b3a2c76083ad697381c665a1b12361cbe2f9b34b19ffba2b248bd1942a128ceca129170b01fba0efb81d87d9e685adcd196170ed95f18f560b63 SHA512 863bca4a333fc007412f82e673ed07cd01056d825078fc15e9a5dbc6b994d9a12e2f362e7d461e2840663949370bbb39d81c95fb70dddb28c5a131e7a5bcc4b2
+EBUILD nm-applet-1.22.0-r1.ebuild 1268 BLAKE2B 54412fc36e950cab4cf3eed2640164a9386260ffbf47143eef1cd0e115de11e304212307b6d8633d9579bc9d4e1f481e3a678ab00f74afe0a590b7d223b9129a SHA512 72be709f6ee2709d855982a00dcc26bb2b26a766ae98f498a9bdccc6f91104a0d1ff1d471ada91fbf65f43546782d16e7ffbaef3b514cbc216e96652fa2b457c
+EBUILD nm-applet-1.24.0.ebuild 1273 BLAKE2B 967345056fd32e0cc72a90d9f50b3b1d0a3db33542b28d4e6ee879fb5842a0bd5395026c787353f8aa18036f91cfd7d219ff0e5109b57192d2da09c12bf2d090 SHA512 a16f17d70ac3701e3cc51d8f4939526e9e1c6842929d3864c1d3b7b5204f3dc4acae048f7a6c4536ee926cb668bd5d724ccf67cc2b9750957ceb6590e8d66368
 MISC metadata.xml 452 BLAKE2B b17e0338356cd0b24f3de4e1e4d8c13ab7b551707f0309c7a233c28b92cf7b27ef66b36f58717228a11cb76dba2892f23455f50f9dcc6fe7905f312b848f1695 SHA512 2e4fd5feb6f4b6fb8a503b26ac5ef1c388ea699a873ff70ec5144b796b2ff75b7e572a5de5efab60a7844a9bc2d639f6296db97260a0c38f9b37d46c33543d40
diff --git a/gnome-extra/nm-applet/files/meson-0.61.patch b/gnome-extra/nm-applet/files/meson-0.61.patch
new file mode 100644
index 000000000000..e2366c0f64e1
--- /dev/null
+++ b/gnome-extra/nm-applet/files/meson-0.61.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/831829
+https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107
+
+From b92fa5ba6d65aaa9e2d1494beaf340a33d9ba07f Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 22:34:09 +0100
+Subject: [PATCH] meson.build: address meson 0.61 failures
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 33adb632..6178c0eb 100644
+--- a/meson.build
++++ b/meson.build
+@@ -254,7 +254,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false)
+ 
+ foreach desktop: desktop_files
+   i18n.merge_file(
+-    desktop + '-desktop',
+     input: desktop + '.desktop.in',
+     output: desktop + '.desktop',
+     install: true,
+@@ -275,7 +274,6 @@ endforeach
+ appdata = 'nm-connection-editor.appdata.xml'
+ 
+ i18n.merge_file(
+-  'desktop',
+   input: appdata + '.in',
+   output: appdata,
+   install: true,
+-- 
+GitLab
+
diff --git a/gnome-extra/nm-applet/nm-applet-1.22.0-r1.ebuild b/gnome-extra/nm-applet/nm-applet-1.22.0-r1.ebuild
index 57ab47600412..6498d20d7f96 100644
--- a/gnome-extra/nm-applet/nm-applet-1.22.0-r1.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.22.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,6 +39,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/meson-0.61.patch"
+)
+
 src_configure() {
 	local emesonargs=(
 		-Dappindicator=$(usex appindicator ubuntu no)
diff --git a/gnome-extra/nm-applet/nm-applet-1.24.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.24.0.ebuild
index 769fc0bab392..0d966ed53377 100644
--- a/gnome-extra/nm-applet/nm-applet-1.24.0.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,6 +39,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/meson-0.61.patch"
+)
+
 src_configure() {
 	local emesonargs=(
 		-Dappindicator=$(usex appindicator ubuntu no)