gentoo resync : 02.02.2022

3 files changed, 51 insertions, 2 deletions

diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 0acbd89d727d..9227bb8a1ca9 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1,4 +1,5 @@
 AUX 3.38.0-optional-vapi.patch 2278 BLAKE2B 7011aec6831b9488ba19efd41b6f3772af101dac4e2e9759f354a59a7243c45eae4a03583f7a717099fe5b08c813c898228ceeed8afac7b28d4bdb77fe9ac4e0 SHA512 95a9109217cf255e921bbf2504918345d1e32e454a8c44c726cb1df522cca73de785db31e9e71a88d3bfa802c49ae89caaa9c64edc3834c5b491ef15f853313e
+AUX gcr-3.40.0-meson-0.61-build.patch 1634 BLAKE2B 99593b9614831a4a2a47ff4890d1f3a92ceb3fe861bdcd3fa748b51b19645196392e6482dea8bb4330bd39484ecddb74dd8d6dea17beb26f87bb05727b506ee3 SHA512 343c02730611ac4792e572dbfbd14bee5525c9ac00f739b12ce1711b059f00a3c9869e60db33e0dd7010b78dd4bb5309c1cecb29052d97fe68429d0118b98ecc
 DIST gcr-3.40.0.tar.xz 1011044 BLAKE2B 6b1016f74e5fd3ace32a534a59575db9c39b5deefd2f4f3a747ef7e87a43c7c00b33500d8151009347af9fe6b073c390895bb6e17c577c6e150c780c487b997e SHA512 7118608e7bef7d0cf2eea33cb3286b7f9c3622a38892ce88cf33ed453d343cc33e070831e7b4d0c5cdb43c2e57b3f0b91c7cbd6aa8463982d3af8844b59bcb81
-EBUILD gcr-3.40.0.ebuild 1799 BLAKE2B 56efb130d5d57bc6b3203374812947b141a990fe241bb33137e4c64da15a77f234f57649307447162fb39e356627b43c9d0a457066770467fba3fef092a803ef SHA512 72d3d67bbb5dc820cee6d240febaa401a3bc4e0ef066f551cdb9aac3acf0473d095ab897e2c6cd8fbe8c4efb462dd39c9ca950ac8ddc61531448510998d70ba4
+EBUILD gcr-3.40.0.ebuild 1842 BLAKE2B b9d91ce7515920993d3fd2f6adb2d3ac0c91411786f06bd0e5bbe4f1f9a672c03f65066ac2a7422d988f2c1f1848168ec69f1e9df81620754e2e083595e6b3ff SHA512 dbb13ce757a0ea6fce9af7c9949c63948694b609b5cccf4d458a9e9d95205d090bb84feaaf7e1b8f055b5ebcb7e1056d0f3efa8a5b3f496e593aec96fbe9b377
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-crypt/gcr/files/gcr-3.40.0-meson-0.61-build.patch b/app-crypt/gcr/files/gcr-3.40.0-meson-0.61-build.patch
new file mode 100644
index 000000000000..4bf8efbb1d73
--- /dev/null
+++ b/app-crypt/gcr/files/gcr-3.40.0-meson-0.61-build.patch
@@ -0,0 +1,47 @@
+https://gitlab.gnome.org/GNOME/gcr/-/commit/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
+https://bugs.gentoo.org/831428
+
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Wed, 12 Jan 2022 00:24:20 +0100
+Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir
+
+This argument has been removed in Meson 0.61.0:
+
+    gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages"
+
+https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de:
+
+> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it.
+
+Fixes #89
+--- a/gck/meson.build
++++ b/gck/meson.build
+@@ -131,7 +131,6 @@ if get_option('introspection')
+     sources: gck_gir_sources,
+     namespace: 'Gck',
+     nsversion: '@0@'.format(gck_major_version),
+-    packages: gck_deps,
+     export_packages: 'gck-@0@'.format(gck_major_version),
+     includes: [ 'GObject-2.0', 'Gio-2.0' ],
+     header: 'gck/gck.h',
+--- a/gcr/meson.build
++++ b/gcr/meson.build
+@@ -190,7 +190,6 @@ if get_option('introspection')
+     sources: [ gcr_base_public_sources, gcr_base_headers ],
+     namespace: 'Gcr',
+     nsversion: '@0@'.format(gcr_major_version),
+-    packages: gcr_base_deps,
+     export_packages: 'gcr-base-@0@'.format(gcr_major_version),
+     includes: [
+       'GObject-2.0',
+--- a/ui/meson.build
++++ b/ui/meson.build
+@@ -152,7 +152,6 @@ if get_option('introspection')
+     export_packages: 'gcr-ui-@0@'.format(gcr_major_version),
+     identifier_prefix: 'Gcr',
+     symbol_prefix: 'gcr',
+-    packages: gcr_ui_deps,
+     includes: [
+       'GObject-2.0',
+       'Gio-2.0',
+GitLab
diff --git a/app-crypt/gcr/gcr-3.40.0.ebuild b/app-crypt/gcr/gcr-3.40.0.ebuild
index 44c233571e9d..3a367dc36429 100644
--- a/app-crypt/gcr/gcr-3.40.0.ebuild
+++ b/app-crypt/gcr/gcr-3.40.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
@@ -46,6 +46,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/3.38.0-optional-vapi.patch
+	"${FILESDIR}"/${P}-meson-0.61-build.patch
 )
 
 pkg_setup() {