gentoo resync : 29.12.2022

18 files changed, 35 insertions, 227 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index b59f2e70e549..34395d2e7ecd 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/einstein/Manifest b/games-puzzle/einstein/Manifest
index 1f0a8ad036e8..5b89c98f7eea 100644
--- a/games-puzzle/einstein/Manifest
+++ b/games-puzzle/einstein/Manifest
@@ -2,4 +2,4 @@ AUX einstein-2.0-as-needed.patch 314 BLAKE2B a76c5d93cf391eed152c151618c47db2029
 DIST einstein-2.1.1.tar.gz 1317979 BLAKE2B 7924774c2d540ecd7cbecb344907d20ab9514219407a02852bbd80bbb9d1d27bac14654a1553dbe30e8f0fd79e08f12338a4e43dfc3c06bfb433fb3a46330a64 SHA512 e34e8e0ef47c311d7417c42ba306b9e9cf94d1fd1829b3948d791543d1fb5f8f1d8d975154bab2559691cf3b94574d5485f8541882d59dd0b6284ff76e435cf3
 DIST einstein.png 932 BLAKE2B 13ecf24e5600bf39bbaec662afda5b4fdba2c5adf4560e8f08996b2e6c475002857187be2dac2d2c898cdb63854cc7ea1748b6b1d34a67adcc2f4789aafd5c25 SHA512 9e19d351e915509a11d7275ef0ea7e246d0d334933ec4b48ea0f56aa552ac69041a5c2a64075b02ec3601b1c2b8307cef314c9427ab7615b16e689faaa074283
 EBUILD einstein-2.1.1.ebuild 909 BLAKE2B d01a1d5614203f3da997ce819cab6a1660187c615ea4f987ebb55a797348fba072ae57e06b8853fb6fe27d253e38038b88439cb94c5bad6a504c79cf0d0b9d65 SHA512 cf7c474f025a4e0d9a8eef09d5e50047ece42e9c33682a9c84453ee0aff03753be660d310d8abbb71e15854e5f54906b55cfeea04a8a0f70da097eb323ad536a
-MISC metadata.xml 335 BLAKE2B e8d670bc64d90c352d35550cfd99790405f9258a5115f98a2ca0d82e6e6f772dc166ca861f5a798c3c8a78098de29c89177a5c7da25974079b4868f2a52fe62d SHA512 526293641ca2b95c0da572dff18c65668f22ce5862ee0106461eeb87f7d69d0767240a081ec1e067129afa991bd7422662151a2cfe06246f3fa81175cc9578a6
+MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/games-puzzle/einstein/metadata.xml b/games-puzzle/einstein/metadata.xml
index ee427295410e..7c730d47817a 100644
--- a/games-puzzle/einstein/metadata.xml
+++ b/games-puzzle/einstein/metadata.xml
@@ -5,7 +5,4 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freecode">einsteinpuzzle</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/games-puzzle/five-or-more/Manifest b/games-puzzle/five-or-more/Manifest
index ef80b7c37d5f..90873a653d90 100644
--- a/games-puzzle/five-or-more/Manifest
+++ b/games-puzzle/five-or-more/Manifest
@@ -1,5 +1,3 @@
-DIST five-or-more-3.32.2.tar.xz 1238468 BLAKE2B 8d223df7933cc84751c173617540a3b725342e84669be22a865a6751be19671fbe269ddc00e4c3a32d78ce3313c71d3c7e1930beae7d1561f6b90a6f9cdc73b8 SHA512 bbca7ebca45eb0975a57accbd6d3648f3fa5ab6abfaaede04e038b7ea793b44a2e125dbfe65d3f53863e62fed36eb28bbd9180e8975c4988e0fc919a8708e4c3
 DIST five-or-more-3.32.3.tar.xz 1245012 BLAKE2B 8891c32fd00840ed8b27e013d38f1e2da12f3735b9e4ec3eecbb7931d4b5c54d28aa86ce0217830d71797e6ef2a8ab3198e2887dd3a69f7f8d6cf9bdac58b4ce SHA512 7fee18955e25fc2f679689ad4df208e5d4fb7250db4fd3c9d0c8f3b62ef8edf4ed402f45871a45a312637e02eb856854ecc9af33454ed9ffcba54bf742f94fb5
-EBUILD five-or-more-3.32.2-r1.ebuild 875 BLAKE2B 9708268e5f360b4f7f64d0d1be95e0152a61d44ef479c6013c632009872016513858172fa0a5e7ebb6124a8ecc1935098ca508cb40cd9b043decf86fcd6df3c1 SHA512 1205ad0cd4362b7ad1971d3b998ac96ce5502d9c63fc1f1fd4d7273038864b2d2f386de926d793815bd9f40bfb004e3a57223f8e2b6681c86cdc0276d71cb23b
-EBUILD five-or-more-3.32.3.ebuild 879 BLAKE2B f7f8dd4b05c90094d7385d097eeef582babba5ffc6ebf6c945c6fb41208afeef9ee1683b2914d763785fa65377c44b5e439b7ce0d4f6c270a2774f3a7a22da7e SHA512 7dbfe305b6db08921a8b4132585126642949be208adf120e341be3a51c85454092d4da567b3b8da86b0ea4d61a571d2807b90f78f8625d215cacf9cf99ccb514
+EBUILD five-or-more-3.32.3.ebuild 876 BLAKE2B a69a30bcdea0222d043444e6367c977bd63fb6110a489d06b6151e67a176991e553c4e1745751bf95ecbe6c3d371cb792acd1e36c1624a0cae4654c8f7c9936c SHA512 98a30108a9be0f00f57123ab82cd92920874476f4e2a0a62719fab291a16425f3e42180e5c4ce84ccd5222b801ea44e7dcf9404f20bb4d42e4471078a5aff532
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-puzzle/five-or-more/five-or-more-3.32.2-r1.ebuild b/games-puzzle/five-or-more/five-or-more-3.32.2-r1.ebuild
deleted file mode 100644
index e918e6934401..000000000000
--- a/games-puzzle/five-or-more/five-or-more-3.32.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Remove colored balls from the board by forming lines"
-HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libgee:0.8=
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.20:3
-	dev-libs/libgnome-games-support:1=
-	>=gnome-base/librsvg-2.32:2
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(vala_depend)
-	gnome-base/librsvg:2[vala]
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-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/five-or-more/five-or-more-3.32.3.ebuild b/games-puzzle/five-or-more/five-or-more-3.32.3.ebuild
index 28d9381e54e6..4bc29c0e31a5 100644
--- a/games-puzzle/five-or-more/five-or-more-3.32.3.ebuild
+++ b/games-puzzle/five-or-more/five-or-more-3.32.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	dev-libs/libgee:0.8=
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
diff --git a/games-puzzle/nudoku/Manifest b/games-puzzle/nudoku/Manifest
index 29ab5f578f1f..44e4c3a7142d 100644
--- a/games-puzzle/nudoku/Manifest
+++ b/games-puzzle/nudoku/Manifest
@@ -1,4 +1,4 @@
-AUX nudoku-2.1.0-ncurses-link.patch 927 BLAKE2B 6a1a5c40a5d3730684eefcc5298eb6ce676c1b5df380d6d9c6453aec9a2066d89ad876a39f95678d27e00281776a3d7e81cb4b9b2719c7f82e1f2f4fd357a3bc SHA512 a93051295845a7abd7a61b74c7f718f8c59f1b7bbb70015ec3db72d1b6bb08370ab63428611ccea1d9396321e54447d8117dedb3c411e4912e801efbc1921746
+AUX nudoku-2.1.0-ncurses-link.patch 1077 BLAKE2B b03e0cd67bb2bdbab2849252802dd792757c099dab7e9b3279f9feb4811b8b129a4c6d99490af325533779d02a2fa5f50e4f1a3e67b8003888e02aa2c47018e6 SHA512 0911ea872374654f43f246ea2208f06b02ec951945038851236b82122eb0a318cf5e9ffe9ad86dbdf84bd431a2907f744c0452aa406d13da807ae2da21f928eb
 DIST nudoku-2.1.0.tar.gz 31592 BLAKE2B 997ae3931fec3b6605858a35cdf6bc88296138c01a9138d229ed43a5262fdd5d15eb8a96dfdcf02e8eb6f7f416b84e4752edbb57319be50bfdae6c952217446b SHA512 dde16d1dccc1cae8d156f57fccf8b112f3fee7d23b912b5cd7ecc092ecbf04a8e85f469e53fa02e6bd2d0b9498e4a65a219e1aad8091f82638dceab32f320670
-EBUILD nudoku-2.1.0.ebuild 655 BLAKE2B d774320d88895741c67dfaa1440f8f62d0068d712f34b287ae346d9e9e5067d1cb31cccfdc31fc184216064c4892f972589b92daab45944b7c9daf8f5d23b389 SHA512 f8981d38845de5ab71abfd730372362624ea406297fefeaf3ec50d2540541f0fd443543af998ff25dd83082fc343d3f4531db88b6bd9ec098d03f67ef46372b4
+EBUILD nudoku-2.1.0.ebuild 655 BLAKE2B acba6e03ef4550908645e602cef6800ab9401f01b50384abe0de27fcd8a3bf588ace499a7251cd77fdfc60aa2fdc0db0cbdae2abc1465ce1ed6f3e35cf5d2ef4 SHA512 4b1204f009d730a995dd56ac67d66ae671015774a621d22e9d90ef2ae7e59c33f74e4187813e83474e6611662206a7a68c49d76306d2003c145054449f829414
 MISC metadata.xml 246 BLAKE2B 13476e9638cd0b163431a008d3b268808c2b76cb238a19eadd499e04596da9ff8b094b1a76df40573d521a15932ae38b0fb47981d56185c4f4c0fee0144f3070 SHA512 de8d47c8ac61355ec681aa700c724f6613be1a234189c2c9979a9fa23f387f30875eb667ffd373e22187846c4861df2b46ac0e0d47ea2b3d779da514b49093a5
diff --git a/games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch b/games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch
index 396dbccddccf..0a4b2a13a0c4 100644
--- a/games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch
+++ b/games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch
@@ -2,36 +2,40 @@ Ensure we link against the correct ncurses libraries.
 https://bugs.gentoo.org/764470
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -1,11 +1,7 @@
- #AM_CFLAGS = --pedantic -Wall
+@@ -2,9 +2,9 @@
  #-DDEBUG
  
--if HAVE_WIDE_NCURSES
+ if HAVE_WIDE_NCURSES
 -nudoku_LDADD = -lncursesw
--else
++nudoku_LDADD = ${ncursesw_LIBS}
+ else
 -nudoku_LDADD = -lncurses
--endif
 +nudoku_LDADD = ${ncurses_LIBS}
+ endif
  bin_PROGRAMS = nudoku
  nudoku_SOURCES = main.c sudoku.c sudoku.h
- 
+
 --- a/configure.ac
 +++ b/configure.ac
-@@ -34,15 +34,7 @@ the cairo development libraries, or compile without support (--disable-cairo)
+@@ -6,6 +6,9 @@ AC_INIT([nudoku], [2.1.0], [jubalh@iodoru.org])
+ AC_CONFIG_SRCDIR([src/main.c])
+ AM_INIT_AUTOMAKE([foreign])
  
++# Check for pkg-config
++PKG_PROG_PKG_CONFIG()
++
+ # Checks for programs.
+ AC_PROG_CC
+ # Use C99.
+@@ -35,9 +38,9 @@ the cairo development libraries, or compile without support (--disable-cairo)
  fi
  
--have_wide_ncurses=no
+ have_wide_ncurses=no
 -AC_CHECK_LIB(ncursesw, initscr, [have_wide_ncurses=yes])
--if test $have_wide_ncurses = no; then
++PKG_CHECK_MODULES([ncursesw], [ncursesw], [have_wide_ncurses=yes], [])
+ if test $have_wide_ncurses = no; then
 -   AC_CHECK_LIB(ncurses, initscr, [], [
--   echo "nudoku requires ncurses"
--   exit 1
--   ])
--fi
--AM_CONDITIONAL([HAVE_WIDE_NCURSES], [test $have_wide_ncurses = yes])
-+PKG_CHECK_MODULES([ncurses], [ncurses])
- 
- # Checks for header files.
- AC_CHECK_HEADERS([stdlib.h string.h unistd.h])
-
++   PKG_CHECK_MODULES([ncurses], [ncurses], [], [ 
+    echo "nudoku requires ncurses"
+    exit 1
+    ])
diff --git a/games-puzzle/nudoku/nudoku-2.1.0.ebuild b/games-puzzle/nudoku/nudoku-2.1.0.ebuild
index 4ba0f1598188..9bd564dfc76a 100644
--- a/games-puzzle/nudoku/nudoku-2.1.0.ebuild
+++ b/games-puzzle/nudoku/nudoku-2.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
index e712766e9e78..5db4447812b9 100644
--- a/games-puzzle/swell-foop/Manifest
+++ b/games-puzzle/swell-foop/Manifest
@@ -1,5 +1,3 @@
-DIST swell-foop-41.0.1.tar.xz 758800 BLAKE2B 5df8870f5be52a4dfec9c012a2496e9b727eb93d01480bedb1c836b8b399f9b42ff36b18c78dad7ca26dd9da6b143229064167423fba3d7630a86d5108e4f3d2 SHA512 b579616cddb77fb3e6d6a8b382fe4b9692a884d62b0907fd551048dbfe28d3f031ac9c8e43e2888ee408a51bccb026109cd9e9ac371b475eaffebb1d9c237c11
 DIST swell-foop-41.1.tar.xz 832672 BLAKE2B 97908acab3bc565f084d97b02f8a6200dc170bd1bdb87ebc4e027881aa75a5111e3ecd24594395266fdfdab586a328df9d15fa8d25105529ec571b36f4fa0e5f SHA512 811638d9b09d7aaa584e56def47900bc866b56ac59120a1df91130f7a6b9555befd18907647874fd69dfa0992cee1c6320dc2bc684b3e5f05f6a25a791ac0a60
-EBUILD swell-foop-41.0.1.ebuild 879 BLAKE2B 6ac74e2cf572fc2686f3e87158aad05f6cd629aaba056ee04358d4d5b5cf671323eab2e7e41ecc268be2678346ba2266d1d23677125bae87fca2b4e1135ad145 SHA512 988d03c5505fa6afd877c2082d2c4d6192adf6571e53c2f76fecb6642b01eed60a870a95f869e264fb393319c5812f771a0995b05d52d56be2783763d3dce129
-EBUILD swell-foop-41.1.ebuild 891 BLAKE2B e3c750771f97003af31d028a3b1ddd00c95efb918e341d073fe7c843dc0825b119a7706eec6f9d1419714db688b423b70a8df16a918996e27b3802aa471f3d3a SHA512 670fd3df3cd02a2fe5c0fad8e203709c553621c13c2b8f21bc628251717fe9f711f4b9788c5362eec07d0897d49ccd33badabe28b08a7407f4024953b624e4a6
+EBUILD swell-foop-41.1.ebuild 888 BLAKE2B 4d1c2fed71074896d7db5c0cf9e143b59f6d571668cb22c2ac1152c661c8777ba2cf9b6e5bffe6385e1c9fb69c3cc567ef6bef0b65cb114dc1ff6be0e681e659 SHA512 1407aa203786b9c95ff52f9dc59b5cc3010f095780cf1594f3fa3fb24c457aefcd017fa97c1a43fed5f0abe4376a9a50b7c45a643ee96166004f41b351e70445
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-puzzle/swell-foop/swell-foop-41.0.1.ebuild b/games-puzzle/swell-foop/swell-foop-41.0.1.ebuild
deleted file mode 100644
index e8a464ff50f7..000000000000
--- a/games-puzzle/swell-foop/swell-foop-41.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Clear the screen by removing groups of colored and shaped tiles"
-HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/gtk+-3.24:3
-	>=media-libs/clutter-1.14.0:1.0
-	>=media-libs/clutter-gtk-1.5.0:1.0
-	>=dev-libs/libgnome-games-support-1.7.1:1=
-	>=dev-libs/libgee-0.14.0:0.8=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-"
-
-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/swell-foop/swell-foop-41.1.ebuild b/games-puzzle/swell-foop/swell-foop-41.1.ebuild
index dbf29c588e84..fc8f99fa3be5 100644
--- a/games-puzzle/swell-foop/swell-foop-41.1.ebuild
+++ b/games-puzzle/swell-foop/swell-foop-41.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.36:2
diff --git a/games-puzzle/wmpuzzle/Manifest b/games-puzzle/wmpuzzle/Manifest
index 38a9d10915dd..23c3cd942196 100644
--- a/games-puzzle/wmpuzzle/Manifest
+++ b/games-puzzle/wmpuzzle/Manifest
@@ -1,4 +1,4 @@
 AUX wmpuzzle-0.5.2-gcc-10.patch 665 BLAKE2B ddc74e6467bd3803b34e322c9eb464be708b54b912ebd797b17c258e798bff8899cc2d36eb9ed45e8bf629d1554e33cab939dc1f31ab37e42d3cc952069506d2 SHA512 a18407df8416a95930323b51ef5d3e8977154136cbdcd2aa346acf6566b93db72ffeb445b12513be1f99c6154d47286e3f743a817c6e071ce0130afc875b7ac2
 DIST wmpuzzle-0.5.2.tar.gz 87373 BLAKE2B c2187fce6fbfe4f68b969da605755f379d14d47a478c6ca43da25dcb607939cf63552e108073d7031ef0dfc2d5455aade5d2f8617cbadad62587ffcaef95ed1f SHA512 7d171d307e3829005dff4d718161655785e87129b07917d494bb498eff904adafc7c6f83e71f996759ee9e365fe70c67858a5ec9d2647fe573e0a1505126f6c0
 EBUILD wmpuzzle-0.5.2-r1.ebuild 642 BLAKE2B 026fce9fca519718edf1e5d701a80e24c2e2ee23c3a09cb448dd1eddc1b4f7ef3d72b41a8295e2b6d8a77e0d175d0ed66f7b83b66e1dcc05efa00199dae0dea7 SHA512 f76b3f84a8b24e360d576ca6c93f1ecdea65c22080eeea91539d6292efde62c26d436aa9191b3ad412cd9e23f6b2486f628106b15e0d2ce4b42d26433ed246cf
-MISC metadata.xml 442 BLAKE2B fedaadaff82b3fb2516c61e511df979fb6295e34a25d1bd74200d9a4d782e85cabea9ebf7a2a6255fba1a26e66b106777df2a692b87864f56e7825f904481234 SHA512 5277735ba90a6859627a7baa9a91969c45b434ed6e1f6a320b1e2919105c306c27ca9e90d1a3b4d66abbc3e47049674bcaa3ce5b3e183bfa54fff6fdbe78f874
+MISC metadata.xml 367 BLAKE2B 60804597c77817fa5e34fb66d6d45c5ed6a3f561ecded8bd0ad9b75f86cf9f0c6bbff284ed24cfb9a01505e4951d3bb2b6b00db1dc12ae719c332e2f5d59d973 SHA512 0985633408d441da0fcbde794a264527c9dec71e861719cbc7555dfe81667aa491cae61d71696ebc4973f41d5c94650467bc317201593c5ca194b8132a3fb97d
diff --git a/games-puzzle/wmpuzzle/metadata.xml b/games-puzzle/wmpuzzle/metadata.xml
index 652bdb753ecc..bad30ff48c80 100644
--- a/games-puzzle/wmpuzzle/metadata.xml
+++ b/games-puzzle/wmpuzzle/metadata.xml
@@ -9,7 +9,4 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freecode">wmpuzzle</remote-id>
-	</upstream>
 </pkgmetadata>