gentoo resync : 02.02.2022

3 files changed, 37 insertions, 2 deletions

diff --git a/media-gfx/frogr/Manifest b/media-gfx/frogr/Manifest
index 664fda2f06be..55c2e4bae6a1 100644
--- a/media-gfx/frogr/Manifest
+++ b/media-gfx/frogr/Manifest
@@ -1,6 +1,7 @@
+AUX frogr-1.5-meson-0.61-build.patch 1341 BLAKE2B d1c1cdc5eb3f479ae16cc8e5bc5c164904c63d802e5ae2de5fe29d3209462fc65f2750a80ac95a7a3f83c9edd4ebf9067e80166f3ffa18d8380ae221d1312e11 SHA512 b46c7c8d42a9be4bfd90797d2ac77b7f18c2d7e5c571f3a19830849265915389c9c756199297ba6f8969074064beddeb96e87bb1dbbdcf3f9310240a783a0d30
 AUX frogr-1.5-warning-level.patch 752 BLAKE2B b0fd94da39939daa195bd4da03b6701b6336e49a7f60fdfe703853d27a562b8dd29bc923cecf08f13acb3200935dfdb43ff1bcf16cda78d80e6980654da4bde5 SHA512 3aa0522da679eba07f3f32134a19adaa6ffdb25bec46c4202e8caf2c38c93749c565f315d5265fca56a618a60d01fe11ef04f971a6c5168a33a42f0187182fbd
 DIST frogr-1.3.tar.xz 2552456 BLAKE2B 562f88898fec153c50696dce59b5396b6f9e88bc68cbf264e7954c2d2f402cb44cb2e6bf3c1c786d50285532c66167678f0fde053c317a0d23b6f4b210e69fa1 SHA512 82ca3ff1e97e7ff45bce1915f629809cc9efa6d33735b0e41b17bb8f69a31a2b035dd53045a3e56e7769d379b534a2468e37a684505438cfea70cc141103d1cb
 DIST frogr-1.5.tar.xz 2233600 BLAKE2B aeb04db0d5d57f470d377986f2e857ee63b47df85e9c3251cdfac8585efa19491650ecede0bfa95c157c2584298dc02173afec624bc439dcd8b52d101c465d54 SHA512 f4af5ec82ad1771e71387c40467fc697c7e3edff9f76ecd0f762e446d136a293477867cb7b6bc6d10bc0fdd95210b25f515eb56bf2d456f79009884019c44dd4
 EBUILD frogr-1.3.ebuild 626 BLAKE2B 9e17e2f7206f357020256d796ffc92b2f3bb63d3b5f8b52209289628d8ee76cf6ac18e84d5982ddd4828437275f2cefd039025d9104ce0d0f3ab958b9bf2cb96 SHA512 8b2eaa44c95a0266e1568becdc8fccca0dec6de3e31d9cd71a228fa068a361ea223efdc39b318459abb68c285efb9ef688cf5b44eed79f1d79e4db76b6d7427d
-EBUILD frogr-1.5.ebuild 984 BLAKE2B 716e96ad03a810f1f7356d6498fa06a1ec7c2751c10e4181cd9685022a07a8f9c2b7241f29fd3300241cd0cb04a171673e8416f3fbf9c0ea1a95d4f4fa9eaf9d SHA512 17e7fdf4ce73c2310b4568107b15da36006501a00c690908ef4fce99cf53b14e1bfc7f475a2ca9a98384a7b1e0eb9e4f32e0248db7b5595971ecaca2fafc9d40
+EBUILD frogr-1.5.ebuild 1032 BLAKE2B c869110134432232342eac8241cf02899a416161e785a44a85effb66d079a35c083e8b27813bf2b01121614142e8a253eb7d7be363668126655554b5a03f74ce SHA512 92c67f30df546b8f45875b33c662452b547c678794b6f792bd61aac7a48aed66aeb6ac5de9f6369e23bb757d189c1948f58f81610009a06ae2a1eb06f63a8cd4
 MISC metadata.xml 387 BLAKE2B b08b71b2565331e07ca5b0c99cd8fcb57f6d0f584eb70798ddf20b6e74bc58f1e3d79f354c4bd0b72d26a85dffda4ca87e44a18345ce497020406ce0958bb092 SHA512 cb8c90665280861d2310256c59783f68126d8a24f994bb011487a3509d3ca418605b5e5c89da520204eb646fb4d920c6e8bc8c868b0faffc764832ff2fcc3d92
diff --git a/media-gfx/frogr/files/frogr-1.5-meson-0.61-build.patch b/media-gfx/frogr/files/frogr-1.5-meson-0.61-build.patch
new file mode 100644
index 000000000000..cb72250ae72f
--- /dev/null
+++ b/media-gfx/frogr/files/frogr-1.5-meson-0.61-build.patch
@@ -0,0 +1,33 @@
+https://gitlab.gnome.org/GNOME/frogr/-/merge_requests/5
+https://bugs.gentoo.org/831497
+
+From 1eeb32b94b9e14e7ea2b9267e3378bae9e3e852d Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 12:22:25 +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:32:0: ERROR: Function does not take positional arguments.
+data/meson.build:42:0: ERROR: Function does not take positional arguments.
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -29,7 +29,7 @@ data_conf.set('BINDIR', join_paths(prefix, bindir))
+ generated_desktop = configure_file(input: 'org.gnome.frogr.desktop.in.in',
+                                    output: 'org.gnome.frogr.desktop.in',
+                                    configuration: data_conf)
+-i18n.merge_file('desktop',
++i18n.merge_file(
+                 input: generated_desktop,
+                 output: 'org.gnome.frogr.desktop',
+                 install: true,
+@@ -39,7 +39,7 @@ i18n.merge_file('desktop',
+ 
+ # Appdata XML file
+ appdatadir = join_paths(datadir, 'metainfo')
+-i18n.merge_file('appdata',
++i18n.merge_file(
+                 input: 'org.gnome.frogr.appdata.xml.in',
+                 output: 'org.gnome.frogr.appdata.xml',
+                 install: true,
+GitLab
diff --git a/media-gfx/frogr/frogr-1.5.ebuild b/media-gfx/frogr/frogr-1.5.ebuild
index 011ea5c4f2b7..7d0577497123 100644
--- a/media-gfx/frogr/frogr-1.5.ebuild
+++ b/media-gfx/frogr/frogr-1.5.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="6"
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/frogr-1.5-warning-level.patch"
+	"${FILESDIR}/frogr-1.5-meson-0.61-build.patch"
 )
 
 src_configure() {