gentoo resync : 02.02.2022

5 files changed, 42 insertions, 49 deletions

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