gentoo resync : 02.02.2022

3 files changed, 45 insertions, 2 deletions

diff --git a/dev-vcs/gitg/Manifest b/dev-vcs/gitg/Manifest
index a99ad33fc41f..1e48707d1f9d 100644
--- a/dev-vcs/gitg/Manifest
+++ b/dev-vcs/gitg/Manifest
@@ -1,5 +1,6 @@
+AUX 41-fix-build-with-meson-0.61.1.patch 1182 BLAKE2B d835f58c4514103f1a09cb5ddc14f98a1d3559045cc747c228b88970b8323f77537a6bd51b30e93f0ac2b572e544d16ffff6656dc0e9a11feace2896ef641515 SHA512 1bb4a7d79694fc10cabf39234eea7e78ad96a484c183333469a1907402ea2b8da8c497f8b4da85e021defeaed4587fba5a7319b169b8ab8819b0d238d4040898
 DIST gitg-3.32.1.tar.xz 10613836 BLAKE2B 43c2c37f5c06cb6155906d5988f0787334af7a9091e537fa7b0fc1a9de3138f261a3e3c578afc663c7b57a33f39c19318a53daf7896c465922138197c3bbb778 SHA512 243e630b3e5bb1919dc307e6b3fed1b1b0e3884d2a2507e4526b4af61e86f1cd7004a3dbb96001ffb0280cefe7cdb9b109c39996718913c7410224830c0145a4
 DIST gitg-41.tar.xz 10604696 BLAKE2B bc8a07565338f77a0a4706d6ff145ed09096acb0230fb160218a6374b87968ffde6615b6e2970ca9162ef542f877c3c8ab2023396c13e023cc47dd5bf466f22c SHA512 4e8fe0b1ab5302f975f58277e5ae42300a96d20bb1c41426d8c0e058a53420fcca73f75566f593f5aa2882b3a0e1608cdd542bc4f68c731153ba9185972d6f51
 EBUILD gitg-3.32.1-r1.ebuild 1952 BLAKE2B 1f5b072583bd1777ab7b54bed220921ea94880b46d94ac06bddcdbc5b9828cbb386152b381fcc6d5a106dc9b0abe00911fa235ac46abb486bcf6f5b045ecc3ef SHA512 be9308fd5438f6867b275ae7afa01cc12bcb1bd36213b0456614571604f386d9ec358d2e7039322ad8901deced33688e44529a5fb10cbd77ec28a536c2a37ecc
-EBUILD gitg-41.ebuild 2067 BLAKE2B d8d44516f97e4179d1d6d9c1073cbbfe226f6c7f9bbaddba57769f2e343a2a4702b7db77cfd31903441bca23c202af0c70b7e07adad5261f0083723134b8aff7 SHA512 4c1bc859a401d9b165a322856411a773b7f848ae706bffd5bc594209eca38a8519f8f05fa7474cf2fe52dba12f919b82e6d93ef0e02cfe89072bd023a951ce56
+EBUILD gitg-41.ebuild 2135 BLAKE2B 703b1b8357abdbe8ad4f29f55f9a034bf6f7f7cc0a3397573479630836eda19725eb81776cd55507ebcb03330d92f4497bed1839451b5ecb8cd471039461e3bd SHA512 6e9bc9be3ab904ec644f7ae53f10fc9d30641ca17841867a008235f703e1544ca1b0a177fd4da2275e6790a32fd18fc50f5f1caf9047c29485bf0e47afd2e446
 MISC metadata.xml 825 BLAKE2B 80afe83910f10e46ef7367897965440086ac6d0af1d88d24501f83ee79e3f1e0f6616bb8b76e89822a496ed5101fefe9ac927a773543b8f84bc9f7ad08bfdec2 SHA512 397f02a9fe2d282a12e1128210c5818e86cc123729aaabcdbdc038a319132d9c16e9b8a30ecc54ef1c03da0bc35892a9b1093eaa02aba60789ba43de9969fcb8
diff --git a/dev-vcs/gitg/files/41-fix-build-with-meson-0.61.1.patch b/dev-vcs/gitg/files/41-fix-build-with-meson-0.61.1.patch
new file mode 100644
index 000000000000..0467f7d1ad89
--- /dev/null
+++ b/dev-vcs/gitg/files/41-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,38 @@
+https://gitlab.gnome.org/GNOME/gitg/-/commit/1978973b12848741b08695ec2020bac98584d636
+https://bugs.gentoo.org/831666
+
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 12:17:52 +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:8:0: ERROR: Function does not take positional arguments.
+data/meson.build:44:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index a8b90fd1..2413531d 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -6,7 +6,6 @@ desktop_config = configuration_data()
+ desktop_config.set('icon', application_id)
+ desktop_config.set('binary', gitg_name)
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: configure_file(
+     input: desktop + '.in.in',
+@@ -42,7 +41,6 @@ appdata_config = configuration_data()
+ appdata_config.set('app-id', application_id)
+ appdata_config.set('gettext', gitg_name)
+ i18n.merge_file(
+-  appdata,
+   type: 'xml',
+   input: configure_file(
+     input: appdata + '.in.in',
+-- 
+GitLab
+
diff --git a/dev-vcs/gitg/gitg-41.ebuild b/dev-vcs/gitg/gitg-41.ebuild
index 37bca5db740d..01bf024b29a0 100644
--- a/dev-vcs/gitg/gitg-41.ebuild
+++ b/dev-vcs/gitg/gitg-41.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
@@ -48,6 +48,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
+)
+
 src_prepare() {
 	default
 	vala_src_prepare