gentoo resync : 02.02.2022

3 files changed, 38 insertions, 2 deletions

diff --git a/games-puzzle/gnome2048/Manifest b/games-puzzle/gnome2048/Manifest
index 214dd052b239..3be208f476d9 100644
--- a/games-puzzle/gnome2048/Manifest
+++ b/games-puzzle/gnome2048/Manifest
@@ -1,3 +1,4 @@
+AUX gnome2048-3.38.2-meson-0.61.patch 1033 BLAKE2B ea70e85a8d6f9b24c7a05625b327bf62a236ee2a97145f5d5defaaae4c539ef5d7ad4978383b574eeead8cb50c29a33acf53feef32179eed662b8152f938d72c SHA512 b927bf2342f81910dc3f00c922b51242d4fd2e090a60c686986b922a1cdc482b9f22107f54838d2311c5354484a9de30711e77777b4aa06ea79db6284d4954cb
 DIST gnome-2048-3.38.2.tar.xz 126780 BLAKE2B 8d6eeb63927b49db6ff4cd4f0cf4da73233aa4b916bfb94b994e17417814c004bdbeaa913eee43dbb965e0723d0ef20682df62655138620cd0ba0ce42ad8be1c SHA512 9063c31ef2a1126b92b6f52950237ac3878a8cbe4b1304e2c56e4bc7f8b99320f45ad27b3d7be3fb4cd2a1856bd11a171facc98bc917076118b83380668e4df8
-EBUILD gnome2048-3.38.2.ebuild 859 BLAKE2B 5f4c77c0b8db7ded8d1d2bcdac57763d3f887c9063d4761c19ce9c623857435382aae039dc693d099e16851da84716aaac360acad3f880c2ec5d271d13f75610 SHA512 2cbe66543137691558626db6322bf39d52a2d6f552f418f1c29f72161571a9bdc864f4e487d7bf5a39bae49fc466a60b95efaae989ae1b06c40bfe9b759a9e51
+EBUILD gnome2048-3.38.2.ebuild 917 BLAKE2B 1c9e5056c5cd45c518d105e479424b180e5de01add4f86996c001bd52ee0fdaf4dbbd55b86893245c8a3d533708aa63999281beb7dd550208f6f3b5d659525e3 SHA512 b0a6bc371b2375de61b250b2ef5b5b646655ce7bee434a7bff361bc6f8a21123d461202053f50a54404ced89f1b113950104214a0d8531a68d7ad609d7e08428
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-puzzle/gnome2048/files/gnome2048-3.38.2-meson-0.61.patch b/games-puzzle/gnome2048/files/gnome2048-3.38.2-meson-0.61.patch
new file mode 100644
index 000000000000..749b8e04d674
--- /dev/null
+++ b/games-puzzle/gnome2048/files/gnome2048-3.38.2-meson-0.61.patch
@@ -0,0 +1,31 @@
+https://gitlab.gnome.org/GNOME/gnome-2048/-/merge_requests/21.patch
+https://bugs.gentoo.org/831748
+
+From 194e22699f7166a016cd39ba26dd719aeecfc868 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Sun, 23 Jan 2022 10:49:07 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:19:0: ERROR: Function does not take positional arguments.
+data/meson.build:39:0: ERROR: Function does not take positional arguments.
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -17,7 +17,6 @@ install_data(
+ 
+ # Desktop file
+ desktop_file = i18n.merge_file(
+-  'desktop-file',
+   input: 'org.gnome.TwentyFortyEight.desktop.in',
+   output: 'org.gnome.TwentyFortyEight.desktop',
+   install: true,
+@@ -37,7 +36,6 @@ endif
+ 
+ # AppData file
+ appdata_file = i18n.merge_file(
+-  'appdata-file',
+   input: 'org.gnome.TwentyFortyEight.appdata.xml.in',
+   output: 'org.gnome.TwentyFortyEight.appdata.xml',
+   install: true,
+GitLab
diff --git a/games-puzzle/gnome2048/gnome2048-3.38.2.ebuild b/games-puzzle/gnome2048/gnome2048-3.38.2.ebuild
index 7b0f85ac85ae..8e058dd8bbf0 100644
--- a/games-puzzle/gnome2048/gnome2048-3.38.2.ebuild
+++ b/games-puzzle/gnome2048/gnome2048-3.38.2.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
@@ -31,6 +31,10 @@ BDEPEND="
 	$(vala_depend)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.38.2-meson-0.61.patch
+)
+
 src_prepare() {
 	xdg_src_prepare
 	vala_src_prepare