gentoo resync : 29.12.2022

4 files changed, 2 insertions, 98 deletions

diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
index e42efbc876e7..4fbbbae77290 100644
--- a/games-puzzle/gnome-sudoku/Manifest
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -1,6 +1,3 @@
-AUX 40.2-fix-build-with-meson-0.61.1.patch 1315 BLAKE2B 2541cf70b42a9a5672f229c42ac4e26cf7108041245fa5a30046894132aa9ed9da4801666ecbe3c86d4d10cbfb1ae8f1bc6e9535863d20eefb92bab6bad470dd SHA512 d1aa9053327aeac398e75d0e02772d7d5c51349d62bc52361e00c35f111d81a986907ee95464e42150571fa9786edd51098ba08439e7cfa5746188d8eb000419
-DIST gnome-sudoku-40.2.tar.xz 358260 BLAKE2B cf48bedee61ee808820a6e7ac3a368f215d6f0370edc83f06d62a3a28c79fb6c024411f9acace3db547a246f721e47c8c8c4ef63c7b07517c587f2b3b1de114b SHA512 5baaba3bba714eb90c9d1597f83c310c9ef59693d5372b3871afd34b2f1c48a3257cb61f220d3cdf624cb29ad80015e0f5ec88485020b7e351540c69374131fa
 DIST gnome-sudoku-42.0.tar.xz 380836 BLAKE2B d496724ab20699e4cd372db02f3a71147d58e77ec8121576f889648cf084e5d87b34c639d0db6c623c9fd04c1111f421b8c350ee227f836eb657be1f99fa5734 SHA512 01f6dfdfe99a4acb4b664fd3573c64b154eea2b8b9964dd08448aa994d1ed6dbe7060157a496c3f895a049a4f267b9b5f9cfdf30b28656b6b2e63b7655d5a7b9
-EBUILD gnome-sudoku-40.2.ebuild 1048 BLAKE2B 6a529fd68a2a041283e9a0aaeae84d151a6a88639d9551f13ddd4e6fa5f32dc58dedf052ce86493bd67162d45cc03a32dc3ec97916849e5dc9cfedd3df7b3be1 SHA512 7e4fe7993ef6b735f88be82808c2461a2eb1cc0a5dcdba54f8f298b667a3bb0a12f77485220d47a7da05bb97346773f495a0e807124f353cdc8aa40251bb6079
-EBUILD gnome-sudoku-42.0.ebuild 992 BLAKE2B 1c942e610afcaf813f66adca1ffdc490a4cd60a00633fa725b4c7d73227e5e27b3898683e66f37771a69a11c50f4f6acf357935350a7d76d56f451c422115b63 SHA512 659b00fa369d663389ed890e19944c9351b3a105c906966681eaf99fca88f1cf8a065aee4edd28b483673c17071b8826234e8c5b6468326dc040da5189e072f3
+EBUILD gnome-sudoku-42.0.ebuild 989 BLAKE2B e6b15c7c18a17728948b0e505b57de6a4ce45f257678f4f48ce096d6c7be22320387c038f7588bc474f6d81d22a9512d8aae98b97df5075c4396dda8bfef67d7 SHA512 b9dcb5c8bd0db13137dd19bb7e9fbf42dc1203032c28994849d9b1052bb170e651d40b4a01b7f7d3c657b17104c305efe60283f9c13a1fbe0b38a9480f138754
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-puzzle/gnome-sudoku/files/40.2-fix-build-with-meson-0.61.1.patch b/games-puzzle/gnome-sudoku/files/40.2-fix-build-with-meson-0.61.1.patch
deleted file mode 100644
index 02d125685ac1..000000000000
--- a/games-puzzle/gnome-sudoku/files/40.2-fix-build-with-meson-0.61.1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-sudoku/-/commit/7c9935a02b48f332f67bad3e4ee020b75591084a
-https://bugs.gentoo.org/831556
-
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 24 Jan 2022 11:44:06 +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:5:0: ERROR: Function does not take positional arguments.
-data/meson.build:24:0: ERROR: Function does not take positional arguments.
----
- data/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index f18f247..9c95e02 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -2,7 +2,7 @@ resource_files = files('gnome-sudoku.gresource.xml')
- 
- resources = gnome.compile_resources('gnome-sudoku', resource_files)
- 
--desktop_file = i18n.merge_file('desktop',
-+desktop_file = i18n.merge_file(
-   input: '@0@.desktop.in'.format(application_id),
-   output: '@0@.desktop'.format(application_id),
-   install: true,
-@@ -21,7 +21,7 @@ if desktop_file_validate.found()
-   )
- endif
- 
--appdata_file = i18n.merge_file('appdata',
-+appdata_file = i18n.merge_file(
-   input: '@0@.appdata.xml.in'.format(application_id),
-   output: '@0@.appdata.xml'.format(application_id),
-   install: true,
--- 
-GitLab
-
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild
deleted file mode 100644
index c9ad1c849ef5..000000000000
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Test your logic skills in this number grid puzzle"
-HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	dev-libs/libgee:0.8=[introspection]
-	>=x11-libs/gtk+-3.24.0:3[introspection]
-	dev-libs/json-glib
-	>=dev-libs/qqwing-1.3.4
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-42.0.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-42.0.ebuild
index f81c261a52f9..bf28d369fd3f 100644
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-42.0.ebuild
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-42.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
 
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.40:2