gentoo resync : 02.02.2022

12 files changed, 120 insertions, 52 deletions

diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 0d1586a73f90..eed67fe1fe52 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/gnome-mahjongg/Manifest b/games-board/gnome-mahjongg/Manifest
index e83fff12d556..0ae9906565d9 100644
--- a/games-board/gnome-mahjongg/Manifest
+++ b/games-board/gnome-mahjongg/Manifest
@@ -1,3 +1,4 @@
+AUX gnome-mahjongg-3.38.3-meson-0.61.patch 1242 BLAKE2B f9ec2ddda9529ee9c3fc304f136a9751e87e4515006717c0a94b5b679d4b18c306bea891985fed2f004a10bfcf041f1cc4ee13514a00c2036bf75f7ab8f5d80e SHA512 a36ef5d53cd005f5ec613a3b50a6bf00de256bc48cb9195ad35a2a670099928d03bf405d876a5259ee0f92615042c731c4e046d40546a2a46bfba5b320299140
 DIST gnome-mahjongg-3.38.3.tar.xz 3061860 BLAKE2B c4ba84d2b5ebece56fc2de605c9572f10103323f0af9174538cb9124b617a3268c1c0fa27a5634c54b64188b7f1589ae6f14b02370de5edb44742c1b30553456 SHA512 883ed8e2cc6e5efa87adce2dab0843f8b76e4772174cdbe8a535dede714f486d8493058d822a7b8cccff50995d11f3b6cff25d5f77406e931aee5fd479f23bb5
-EBUILD gnome-mahjongg-3.38.3.ebuild 953 BLAKE2B 307f93897b1b3abe4108201d17fb09eba70bf4cf7f4ad2e3d60a24e4793bad792efea1bee1ad3d1b5108267c62943a37713cee3037c4f0184f391cbe0616cc03 SHA512 95d1a46adf88e65f9f89764d373cfe0e01eb1f2f084fc80dcd195ef7f49bb90677743efbfaa120f02e1083734c412808a842e42e503eb6df31450a17ee40ee94
+EBUILD gnome-mahjongg-3.38.3.ebuild 1011 BLAKE2B 589f42df331b6c014401f7f2515f9ffb7ad246d22006caa9f7c2d335cdb928c82fb8c01ea9a2c112e28c1fc34ef09b24a1f6a0c5688908a42ce2092b6e8b4aad SHA512 6564d3b5c91dd2e72da7ae1dedc45fe0f4ccabdf8347385b913a369ff489fdbebe1b8ab2fbff5b7523f5205fdfe864298b017811318d8f4ee661cdc934aa5ab9
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-board/gnome-mahjongg/files/gnome-mahjongg-3.38.3-meson-0.61.patch b/games-board/gnome-mahjongg/files/gnome-mahjongg-3.38.3-meson-0.61.patch
new file mode 100644
index 000000000000..9b9f26d09f95
--- /dev/null
+++ b/games-board/gnome-mahjongg/files/gnome-mahjongg-3.38.3-meson-0.61.patch
@@ -0,0 +1,32 @@
+https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/merge_requests/26
+https://bugs.gentoo.org/831466
+
+From 7604f8c8311f1088293596e639fefafdbeb73235 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:22:48 +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:24:0: ERROR: Function does not take positional arguments.
+data/meson.build:45:0: ERROR: Function does not take positional arguments.
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -22,7 +22,6 @@ install_data ('smooth.png', install_dir: join_paths (pkgdatadir, 'themes'))
+ install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes'))
+ 
+ desktop_file = i18n.merge_file (
+-  'desktop-file',
+   input:       'org.gnome.Mahjongg.desktop.in',
+   output:      'org.gnome.Mahjongg.desktop',
+   install:     true,
+@@ -42,7 +41,7 @@ if desktop_file_validate.found()
+   )
+ endif
+ 
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+                  input: 'org.gnome.Mahjongg.appdata.xml.in',
+                  output: 'org.gnome.Mahjongg.appdata.xml',
+                  install: true,
+GitLab
diff --git a/games-board/gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild
index b6a00c10a6e5..d7c2f9a1096b 100644
--- a/games-board/gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild
+++ b/games-board/gnome-mahjongg/gnome-mahjongg-3.38.3.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
@@ -30,6 +30,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.38.3-meson-0.61.patch
+)
+
 src_prepare() {
 	xdg_src_prepare
 	vala_src_prepare
diff --git a/games-board/gnome-mines/Manifest b/games-board/gnome-mines/Manifest
index 70473e3daa01..42bf4e368065 100644
--- a/games-board/gnome-mines/Manifest
+++ b/games-board/gnome-mines/Manifest
@@ -1,3 +1,4 @@
+AUX gnome-mines-40.0-meson-0.61.patch 1224 BLAKE2B edb524d3039f03e81daaf925b98580bca85fd29b9e381ae3b62247d595a47130fefa136938ca6e38ad34d6b3d109ce3f6940cdd86c94fdb36ac859f6b804cf7b SHA512 cd21abd8e41400106df24dd9547945ec564e268095f6a727b3dc0cf7fd5811e75125af0fbeb4d8b0325c563bff80fdd79ad5c5ef88e64d9ab09f04e4bcdb0273
 DIST gnome-mines-40.0.tar.xz 283016 BLAKE2B b764fbcdd709b3f212137c849a2e174d4e3f8d37f6dd9fd38fa4d5a0ed170695a8954bb17252e50cb643a5dc33e7b2da2b03c8eeb4c3ae4a441f685e1d5c60b0 SHA512 e429d1fc2d535bb9a9b1aba4199217bcc46ec4b9b4c8e7fff2394de508a498f142945f62086a862760cc4e31f368e3d123400c6502f67b8482dbf4d044ca619c
-EBUILD gnome-mines-40.0.ebuild 913 BLAKE2B 2b0038f4f86e123e88658e4db6b378f7a59dc5b5175f6c1c5f392573f4d001ba7b89eec336e117a11ff46a4c40fccc2ed182cf3aabeacf1c8d3338453669394d SHA512 fa79e876fb6c5733c29be0d6bc6c77d4eecbe7e9be6cfd11327843312fbc41c6504e21602233199b724876bf94ea6ea2d69b071e309cc1c11fe0d28fa3c99ae4
+EBUILD gnome-mines-40.0.ebuild 969 BLAKE2B 94ca317cca7ab213f8d79f829e3171b6fa9d56583aacdb9fc013fee06aefc9cd33ce9808d4f3e38cb03dbcc2b8301b8f82296d378bed6cd19367c31ceb4ba63d SHA512 29e5ade091c1d8cf5e5b81fd014e34160d652714afdd5b601256b4cd59ab459ba96638fd64729284c1fbe77b01c85533ae1272fa5ead56a436207a8bd484cd49
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-board/gnome-mines/files/gnome-mines-40.0-meson-0.61.patch b/games-board/gnome-mines/files/gnome-mines-40.0-meson-0.61.patch
new file mode 100644
index 000000000000..291fc0b403e5
--- /dev/null
+++ b/games-board/gnome-mines/files/gnome-mines-40.0-meson-0.61.patch
@@ -0,0 +1,33 @@
+https://gitlab.gnome.org/GNOME/gnome-mines/-/merge_requests/31.patch
+https://bugs.gentoo.org/831454
+
+From 0a10c3a8ae4395c8059875bcea74be5c17ef9a21 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 13:28:56 +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:18:0: ERROR: Function does not take positional arguments.
+data/meson.build:38:0: ERROR: Function does not take positional arguments.
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -15,7 +15,7 @@ foreach theme: [ 'default', 'bgcolors', 'classic' ]
+     endforeach
+ endforeach
+ 
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+                  input: '@0@.desktop.in'.format(app_id),
+                  output: '@0@.desktop'.format(app_id),
+                  install: true,
+@@ -35,7 +35,7 @@ if desktop_file_validate.found()
+ endif
+ 
+ 
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+                  input: '@0@.appdata.xml.in'.format(app_id),
+                  output: '@0@.appdata.xml'.format(app_id),
+                  install: true,
+GitLab
diff --git a/games-board/gnome-mines/gnome-mines-40.0.ebuild b/games-board/gnome-mines/gnome-mines-40.0.ebuild
index aba0d63de94b..39154792afb5 100644
--- a/games-board/gnome-mines/gnome-mines-40.0.ebuild
+++ b/games-board/gnome-mines/gnome-mines-40.0.ebuild
@@ -31,6 +31,10 @@ BDEPEND="
 	gnome-base/librsvg:2[vala]
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-40.0-meson-0.61.patch
+)
+
 src_prepare() {
 	xdg_src_prepare
 	vala_src_prepare
diff --git a/games-board/tali/Manifest b/games-board/tali/Manifest
index fce30f7b481b..39f3ff530eb5 100644
--- a/games-board/tali/Manifest
+++ b/games-board/tali/Manifest
@@ -1,7 +1,6 @@
-DIST tali-40.1.tar.xz 1608352 BLAKE2B 73d5c7ac17c6290ab4d253efe93f31fe3de94f5a45b9a4e10a8477da35e7104f861865d083aa2213bb3a88b261d690b74963243adc7f39fffba103b2ced26120 SHA512 75312999f918234a95021fa31999d57b3df5a59f8d1ce227a7570aeea0490c8428ba396c519e8e210a77d65479681ccdefdfb0a9f74de3b2c2eefbd4b3cbdc3c
-DIST tali-40.3.tar.xz 1610424 BLAKE2B 5c5ef12e1e9e6139b1fad7a0c578e4308cd5945d71b2dc3ceae1edf8d591611cb33554a82799be9502dc468d5a11989ac4d5dc5a6f1f521dde9c1c6afc81669f SHA512 12fc2a73665504d08fd7528296215411d11e538167dd24b0474797712534b5d7290986a2704248126da8ef3ec158417c9c1a479a541729760df55768ad9bd317
+AUX tali-40.4-meson-0.61-build.patch 1030 BLAKE2B f990a620af5853a1fd514f78e2a532526899cffb4a76943f783d7b4cfb9374f6153e8aa92c08ba9364e1b31b87cd15cff7be65d0b473b349b5268c9d620e6c08 SHA512 b26a33d36c974987e861244aae37761496af750307162596cb783cb30bf0c58ca0a8a23d4427ad16c01ffb97e8d6e6dbfd3a113e800bc182deda27ddbbb33021
 DIST tali-40.4.tar.xz 1610864 BLAKE2B 4299eff82fb97dc2c7f36e2c8b25861dae801156da921c5eaeab0d3e0ea9bc2f6ea17f672845b3303876e887d3f77d2a335692a0f347d314a9efe2868f67a476 SHA512 c80f03eabee6d71ad175369a9fe701e49e1fbd20ce729ed85b8337b975255e77d387119bcdf5a2618d94384dbac0c753ef09a6fa6975bf8649a804cf5bf14e91
-EBUILD tali-40.1.ebuild 744 BLAKE2B 8e9ea5084d57a42072f9477645aa20824454409ccfae83c1efaf0dd3873646c6eae1e331ec1b8270b2d13691433c7dad8bf137f9b0b070038347e1cb489306d9 SHA512 cfae10676b948bbb4ab73e9e2b8bc4f16e9a7188882963777c00e288468d8682eb25444cb88c643a5998f9c0c952b951c2751587d8cf1b7442373262e561ca92
-EBUILD tali-40.3.ebuild 745 BLAKE2B cd21b163526ed87566e7740a4763a57703c47fbf57cf9fa1339df26aca5004af931706784a796b980bc41b3429e9c7c506720cc320574d7151bc29c1e9bffe28 SHA512 12495eeccb187b2f90790a0ffe9a25c851fd529dca2ded4aa99e9113f7d827633b5ab38012469b0caa6322606f70eb1ebe6a35ecfa70caf03a7a78a4829cad44
-EBUILD tali-40.4.ebuild 754 BLAKE2B 17480e7c8f60a0a46e532cea95c5b2be13f36db6fdd2094e3116a4eca29aa44a9bed53fb781eaf1017e97dbe8c8eccec2824d7dae7e3905a9885f80dd90e017f SHA512 0235ea872a748bf49de7df5626735ffa88287cd2775b5b5ddf61457b757d2766ab5ced40d949a0e26afd504b6f93fe324f03d773b7e5102887d24a254e2634bf
+DIST tali-40.5.tar.xz 1613536 BLAKE2B 6ab8ffb737fb9d435cceff401c2d911d381d43fc5c4696c7cb9d22e4e89490329f13bce6e6c81b8bb9628264f723bfa020d7dd393aebc00836a416da60f70fe2 SHA512 c9fc1c6fd489d11116e8624955c15874fbe5f1dab0be16022d1e7f9193768ff5a2e4687246dcb35061c70eddbc5523b1031906190fe05dea6ba6544ec5cc6a45
+EBUILD tali-40.4.ebuild 808 BLAKE2B 9e860b3d1daad03e2a4ced69b3c707d4bcf92377216d85debf2dd7968a3be4b03f3f7e534d3aec9a8a4418e203e8d9392e4a3b47d3562c77343a7b7dd1975a6e SHA512 d135a84e819e51b16e9fbf686a20790f667c8f2c5e9d290ac55c18c547a45011c36d672489839c18c6fb6d7bef6d33ec30381007e5a532722c6debabd5721c60
+EBUILD tali-40.5.ebuild 754 BLAKE2B 9f632125b153ade03d362ae0e856d0c3022f6914a767cde01494e76a24a8192bd4c3e34cce8c563c7921f721340214553e1d7ddc85bee77fb393a08b0fdd308e SHA512 467fbaa6dfb25a4308fc1fc0df364bf2da20813d0bf8774a9beb51907719351f80d7b97daea52a0db28de6859232c237aafa05a4e128abfa25dc6e4cbd2a7cbe
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-board/tali/files/tali-40.4-meson-0.61-build.patch b/games-board/tali/files/tali-40.4-meson-0.61-build.patch
new file mode 100644
index 000000000000..e5cfa34c3560
--- /dev/null
+++ b/games-board/tali/files/tali-40.4-meson-0.61-build.patch
@@ -0,0 +1,29 @@
+https://gitlab.gnome.org/GNOME/tali/-/merge_requests/14.patch
+https://bugs.gentoo.org/831461
+
+From 79509bf3e9456f52d6ac87538700e3ac89db4006 Mon Sep 17 00:00:00 2001
+From: rvalue <i@rvalue.moe>
+Date: Tue, 16 Nov 2021 05:56:26 +0000
+Subject: [PATCH] Remove incorrect i18n.merge_file argument
+
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -22,7 +22,7 @@ install_data ([ 'gnome-dice-1.svg',
+ install_data (project_id + '.gschema.xml',
+               install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
+ 
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+                  input: project_id + '.desktop.in',
+                  output: project_id + '.desktop',
+                  install: true,
+@@ -41,7 +41,7 @@ if desktop_file_validate.found()
+   )
+ endif
+ 
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+                  input: project_id + '.appdata.xml.in',
+                  output: project_id + '.appdata.xml',
+                  install: true,
+GitLab
diff --git a/games-board/tali/tali-40.3.ebuild b/games-board/tali/tali-40.3.ebuild
deleted file mode 100644
index bb0e06a8cf2f..000000000000
--- a/games-board/tali/tali-40.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-inherit gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="Beat the odds in a poker-style dice game"
-HOMEPAGE="https://wiki.gnome.org/Apps/Tali"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-DEPEND="
-	dev-libs/glib:2
-	>=x11-libs/gtk+-3.16:3
-	dev-libs/libgnome-games-support:1=
-"
-RDEPEND="${DEPEND}
-	>=gnome-base/librsvg-2.32:2
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-board/tali/tali-40.4.ebuild b/games-board/tali/tali-40.4.ebuild
index e944d0be9fd3..0b575f5fe8a4 100644
--- a/games-board/tali/tali-40.4.ebuild
+++ b/games-board/tali/tali-40.4.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
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Tali"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 DEPEND="
 	dev-libs/glib:2
@@ -28,6 +28,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-0.61-build.patch
+)
+
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update
diff --git a/games-board/tali/tali-40.1.ebuild b/games-board/tali/tali-40.5.ebuild
index a38ab43112b6..b65b4a642578 100644
--- a/games-board/tali/tali-40.1.ebuild
+++ b/games-board/tali/tali-40.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit gnome.org gnome2-utils meson python-any-r1 xdg
 
 DESCRIPTION="Beat the odds in a poker-style dice game"
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Tali"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 DEPEND="
 	dev-libs/glib:2