gentoo resync : 20.03.2022

38 files changed, 207 insertions, 131 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 292a4e232b93..f2be5507fecd 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/braid-gog/Manifest b/games-puzzle/braid-gog/Manifest
new file mode 100644
index 000000000000..baec12bcade4
--- /dev/null
+++ b/games-puzzle/braid-gog/Manifest
@@ -0,0 +1,3 @@
+DIST gog_braid_2.0.0.3.sh 122931560 BLAKE2B a15dde4a56510613d7104126c1f275ff17f07a246fc3f09cd2df26b870488c4b4e81a32f7505fc3b720f503f252ac00259aa7225b25c804af64bcced24c81bec SHA512 a7cccb0135e359e5bd7e0499fa449ff1e57c00a648aba37a5df7a12ec5a2a6d3b1758af7a168aec562c83bde864fa6cbbe2504b8a334bab01f6b209a8e4aadc6
+EBUILD braid-gog-2.0.0.3.ebuild 1204 BLAKE2B 9634e85ec51f87ad55bf734194c07c6434d693c4239f3ec339a3a38ee4186ba1a5e244b5f4f2cd2474bd018dd5d9b579a739d1cf8817629ffe00e1c3a3236c8f SHA512 8b28e7ff01e83e37421d95c1c3cfe4d33cf3312cde8ec8ffb863d9da7164c69796b17ade9891643cc8c93dd6fd73ecc1a0a1b07fa1baa3298bdad1d8226b305f
+MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/games-puzzle/braid-gog/braid-gog-2.0.0.3.ebuild b/games-puzzle/braid-gog/braid-gog-2.0.0.3.ebuild
new file mode 100644
index 000000000000..487d6adc7a25
--- /dev/null
+++ b/games-puzzle/braid-gog/braid-gog-2.0.0.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop unpacker wrapper xdg
+
+MY_PN="braid"
+DESCRIPTION="Platform game where you manipulate flow of time"
+HOMEPAGE="https://www.gog.com/en/game/braid"
+SRC_URI="gog_${MY_PN}_${PV}.sh"
+
+LICENSE="GOG-EULA Arphic CC-BY-NC-SA-1.0"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist fetch splitdebug"
+
+BDEPEND="
+	app-arch/unzip
+"
+
+RDEPEND="
+	media-gfx/nvidia-cg-toolkit[abi_x86_32]
+	media-libs/libsdl2[joystick,opengl,sound,video,abi_x86_32]
+	virtual/opengl[abi_x86_32]
+	x11-libs/fltk:1[abi_x86_32]
+	x11-libs/libX11[abi_x86_32]
+	!${CATEGORY}/${MY_PN}-hb
+"
+
+S="${WORKDIR}/data/noarch/game"
+DIR="/opt/${MY_PN}"
+QA_PREBUILT="${DIR#/}/*"
+
+pkg_nofetch() {
+	einfo "Please buy and download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to your distfiles directory."
+}
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_install() {
+	exeinto "${DIR}"
+	insinto "${DIR}"
+
+	doexe {Braid,launcher}.bin.x86
+	doins -r data Icon.*
+	dodoc READ_ME.txt
+
+	make_wrapper ${MY_PN} ./launcher.bin.x86 "${DIR}" /usr/$(ABI=x86 get_libdir)/fltk
+	make_desktop_entry ${MY_PN} Braid "${EPREFIX}${DIR}"/Icon.png
+}
diff --git a/games-puzzle/braid-gog/metadata.xml b/games-puzzle/braid-gog/metadata.xml
new file mode 100644
index 000000000000..7c730d47817a
--- /dev/null
+++ b/games-puzzle/braid-gog/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/braid-hb/Manifest b/games-puzzle/braid-hb/Manifest
new file mode 100644
index 000000000000..93af217638c3
--- /dev/null
+++ b/games-puzzle/braid-hb/Manifest
@@ -0,0 +1,3 @@
+DIST BraidSetup-2015-06-11.sh 121622129 BLAKE2B 9cb255621c6e2461dff0ca0dc779d62aef09a16d413e1909c505e41be1db5475be5ced8e16ce8d989faa70f3f7a614e3ac7af99a28feccf1859182dca762b042 SHA512 8f27efd0e6514f92c177663d5cb342b026017e66abe2a46df6b08880a28c8220a7cfcb5607eaf01ace3a39c7c8af5e5f9f62c661d4018cdadc102f4caf677a93
+EBUILD braid-hb-20150611.ebuild 1253 BLAKE2B 86c4202b66b8dcf8ab49e92dc6f6ce6900a8b0c17c2e2befe8d83d1628bc8a1a39441524119f7ccdd2b535993b73941d3c4621e86b29afae46518675420125c2 SHA512 7194d7f9c23bdbce0dffab101ec06008d04561fc76f51043f7b8fe6f8fc8a612de9a68129eb0d41cd3310a52498bbb36fbdfab8d026252e61882e4479017a9fd
+MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/games-puzzle/braid-hb/braid-hb-20150611.ebuild b/games-puzzle/braid-hb/braid-hb-20150611.ebuild
new file mode 100644
index 000000000000..e289db38e3e0
--- /dev/null
+++ b/games-puzzle/braid-hb/braid-hb-20150611.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop unpacker wrapper xdg
+
+MY_PN="braid"
+DESCRIPTION="Platform game where you manipulate flow of time"
+HOMEPAGE="https://www.humblebundle.com/store/braid"
+SRC_URI="BraidSetup-${PV:0:4}-${PV:4:2}-${PV:6:2}.sh"
+
+LICENSE="all-rights-reserved Arphic CC-BY-NC-SA-1.0"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist fetch splitdebug"
+
+BDEPEND="
+	app-arch/unzip
+"
+
+RDEPEND="
+	media-gfx/nvidia-cg-toolkit[abi_x86_32]
+	media-libs/libsdl2[joystick,opengl,sound,video,abi_x86_32]
+	virtual/opengl[abi_x86_32]
+	x11-libs/fltk:1[abi_x86_32]
+	x11-libs/libX11[abi_x86_32]
+	!${CATEGORY}/${MY_PN}-gog
+"
+
+S="${WORKDIR}/data"
+DIR="/opt/${MY_PN}"
+QA_PREBUILT="${DIR#/}/*"
+
+pkg_nofetch() {
+	einfo "Please buy and download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to your distfiles directory."
+}
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_install() {
+	exeinto "${DIR}"
+	insinto "${DIR}"
+
+	doexe x86/{Braid,launcher}.bin.x86
+	doins -r noarch/{data,Icon.*}
+	dodoc noarch/READ_ME.txt
+
+	make_wrapper ${MY_PN} ./launcher.bin.x86 "${DIR}" /usr/$(ABI=x86 get_libdir)/fltk
+	make_desktop_entry ${MY_PN} Braid "${EPREFIX}${DIR}"/Icon.png
+}
diff --git a/games-puzzle/braid-hb/metadata.xml b/games-puzzle/braid-hb/metadata.xml
new file mode 100644
index 000000000000..7c730d47817a
--- /dev/null
+++ b/games-puzzle/braid-hb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/braincurses/Manifest b/games-puzzle/braincurses/Manifest
index cdf9484f56fc..3474a1604463 100644
--- a/games-puzzle/braincurses/Manifest
+++ b/games-puzzle/braincurses/Manifest
@@ -1,3 +1,3 @@
 DIST braincurses-1.1.0.tar.gz 12996 BLAKE2B 3f0c5edabd65175e581280413f7fea841d4d4b7ff9f4b39c4c3a0084e0e4c0a159605fe9ed320769a9bc85d671845af115456df33305e20f1eef6c53626c01a4 SHA512 7f27512c321ca2f2c3b38a891fc4e1ab0e2371412ada827f69dc262e27abbf750861b7ab859d0d8407ba25e4814ea6c33bc36a2c8ccdeda4977fa4bebb5457cd
-EBUILD braincurses-1.1.0.ebuild 606 BLAKE2B 90987817255b907f1122f715406200f1a0409c6bae245eaf1cbff0929782bba0b4b6cd0f47610e58f9437e13de7ffc8edeec7b3b22f05e5f1c7a1162a88b2aca SHA512 6e967e3945475a756c8455e01c2e286ea5930c986f81b2e750c4846540f57286fb60973f8a1ee302dcd7f91fdf4d7e1723f566281100ec13bace619651b4dd64
+EBUILD braincurses-1.1.0.ebuild 608 BLAKE2B 88133e2f21e2d46f0e57211f29f5a7ef2fdb1188ec39d3d371f8b051a16d6973357a3ba21130826aa548f03139a8d909702a13724b5e577351f51687f04c3e68 SHA512 457f142c8c5996811b4b7f13af2031eb3e29586a170f9aa32003673019791c605bee63624d84ea23b903ae07545a621bb1f43ec8f9b6a697acf0d0affdd7c4f1
 MISC metadata.xml 338 BLAKE2B f0f835c1fb31d2d2fcc7e8aae675cb38752488481beea31b38108cdf10f30ec0d2fac17cd1b9cad433056f7923e301ac610f03a6eeda3ddfba86bb4a6fb7cca9 SHA512 961c697e1c6672946ff251c3d3543852a619ad09fef66a789ca414f5fff4010ecc13de3c92010dbae9c164a8ab979c27896e1cab35513de4253cd6abd58547d8
diff --git a/games-puzzle/braincurses/braincurses-1.1.0.ebuild b/games-puzzle/braincurses/braincurses-1.1.0.ebuild
index 4a313b35b8a0..1a6496bc5aeb 100644
--- a/games-puzzle/braincurses/braincurses-1.1.0.ebuild
+++ b/games-puzzle/braincurses/braincurses-1.1.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
@@ -18,7 +18,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 src_compile() {
-	emake CXX=$(tc-getCXX) LDLIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
+	emake CXX="$(tc-getCXX)" LDLIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
 }
 
 src_install() {
diff --git a/games-puzzle/brainworkshop/Manifest b/games-puzzle/brainworkshop/Manifest
index 2020db33a51a..61704e333320 100644
--- a/games-puzzle/brainworkshop/Manifest
+++ b/games-puzzle/brainworkshop/Manifest
@@ -1,4 +1,4 @@
 AUX brainworkshop-5.0.2-datadir.patch 193 BLAKE2B e2c69f8eb23bab1e3d04ffbe0ed3d687f2a250c51dbc96ce97f1d14860453462d0cf35ca7f76cdd85c7a9f86680794f7b6ae5db8100d9c81ce5c04cfeeeb0764 SHA512 c326abbe4894839a0db1935a83242f35ab9e708835bfabe3fdbd437da02eff8cfb57cc0337cbc131693ebedf951830be7770cc4e7ed85b1c583139bc91e98465
 DIST brainworkshop-5.0.2.tar.gz 7998711 BLAKE2B d2662d2e565b576b441a41ec9177c3bd17f30d0f671d67ee7497bc2a983ba193e977a0d4cb4bfcd684cc46fe918159ffa5181a141e591adf819b28e744437222 SHA512 07ab0b30cef92b3c5ac0476a1baa5afb8f57afb557b266169a7f72fe4cbe8c0afbf0db491a23106da6c61f055c24c5f0c4268ead41d92101e5a8284a7dc80265
-EBUILD brainworkshop-5.0.2.ebuild 1052 BLAKE2B d532051b73adbd8735fa5a2f0bf21d809e19529ebb27556cb1d4dacc25b165503783c2a1251c33de947a6f86c1bfcb2de48576719475898fc104afdfe0000115 SHA512 2467458e7870f7c58955654dffa56e0ce9cbcd02073469d4c0685bbb93eaa102ec67ae9b378508c28a3a62bd358c1e154d57fda088648fb011539752c04605ab
+EBUILD brainworkshop-5.0.2.ebuild 1054 BLAKE2B 6563b8a8fa0ad0f6a19c4bcdddeacbec87fe2b922ddad52f94d2b57ebe92d477a6741471c9cf9f288599829eed3503f39a2eb85c500c1160946f36e678d42e19 SHA512 025b6e3423f5e1f0406223b92fcedc2be93fe1cc771af7cfccba0a9829a7f660395828fa02b771fc17aef0530a0fcec9818be02f8771eef5cc2c1dd2d691e2aa
 MISC metadata.xml 405 BLAKE2B 45d08878ce8b923215becdffec99068c1a0b193391f7080a4936c8c352f0fb4287cb61da9c97aa54329156fa1dcabe1faaee423c30d4abf977bd5b537d460788 SHA512 b488871f7b6edef9564b0c33a31271a0f0c8b68e96fb13e8e7defdc1aeed27d3bb041b09a30c407c2e0600605d1c207bc558555ec2ddaf38fdc2711a73c9d5c0
diff --git a/games-puzzle/brainworkshop/brainworkshop-5.0.2.ebuild b/games-puzzle/brainworkshop/brainworkshop-5.0.2.ebuild
index aeddd40b56cd..9088017775a4 100644
--- a/games-puzzle/brainworkshop/brainworkshop-5.0.2.ebuild
+++ b/games-puzzle/brainworkshop/brainworkshop-5.0.2.ebuild
@@ -1,9 +1,9 @@
-# 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_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit desktop python-single-r1
 
diff --git a/games-puzzle/construo/Manifest b/games-puzzle/construo/Manifest
index 46f1c9526ee8..c6b50fa0b7f0 100644
--- a/games-puzzle/construo/Manifest
+++ b/games-puzzle/construo/Manifest
@@ -1,4 +1,4 @@
 AUX construo-0.2.3-clang.patch 1944 BLAKE2B 670f9f5c7607872b303ab756cf04ea91020c8a7f8adbf1ae0026330c08fb62571d8ace6f4beca631a23564cfcb4f1959c23eba887d58ccc0b115af907679ae7a SHA512 ce9213ef6526e453bfa4a37bd095520ef821e02a22c963ec0af0bf8b1821c7134ecf7f30a7de568f03c60f6bb82c4a19649567838a2cbf8be8dbff33d403ca71
 DIST construo-0.2.3.tar.gz 585891 BLAKE2B 6970d9ce30553a72d59784d0e356705913fceaf8a7cf39873054f8122b29ffcda6757af8ce494fe989253e0e00de54d1d0c543d71403b65580ece6c1e8483be2 SHA512 b3b723e914fa3c08763b73cbd6ec340f70efefd28e2ff79e738cc5d71109304a90d2d0ddbd0277e587e4e134c5bd497dde15aebea2b318e5d3c07f339b769bf3
-EBUILD construo-0.2.3.ebuild 869 BLAKE2B 37f25cf2d0f5b46bed1c9bec7b657d63d99af0f5e587f7dd72cd403eec56d9a67f99321bec50faedfff0ba30d9f03436d0a78afc52c3e8601c25b3b552e426f4 SHA512 a3bd669066930866e34852b7f5badaecc0294782fc81905a0f198a51679f4bbc6203316c9e6a3d2f42cd95af150d74e8e800861c47dd4db921a159a08798c453
+EBUILD construo-0.2.3.ebuild 862 BLAKE2B d99c2733a3615452a83e9c77c941a218ae10b6498992dd30f3189d16bb3c0375ae63446278718b76c44a517a976d28ae59371e004f9a44699e0b6d6dab0185ce SHA512 bc8286f03e33c50de7ca9255f58db18724a7d530aad64102fd827d875371e874f26dcf8822d8be42af16ee005a2a7ff7a1565e0db45394d5e79d2accde7ff961
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-puzzle/construo/construo-0.2.3.ebuild b/games-puzzle/construo/construo-0.2.3.ebuild
index 89c4de46b053..740a6c5787db 100644
--- a/games-puzzle/construo/construo-0.2.3.ebuild
+++ b/games-puzzle/construo/construo-0.2.3.ebuild
@@ -1,7 +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
+EAPI=8
+
 inherit autotools desktop toolchain-funcs
 
 DESCRIPTION="2d construction toy with objects that react on physical forces"
@@ -12,12 +13,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="
-	media-libs/freeglut
+RDEPEND="media-libs/freeglut
 	virtual/glu
 	virtual/opengl
-	x11-libs/libXxf86vm
-"
+	x11-libs/libXxf86vm"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
@@ -32,11 +31,12 @@ src_prepare() {
 }
 
 src_compile() {
-	emake AR=$(tc-getAR)
+	emake AR="$(tc-getAR)"
 }
 
 src_install() {
 	default
-	make_desktop_entry "${PN}.glut" "${PN}.glut"
-	make_desktop_entry "${PN}.x11" "${PN}.x11"
+
+	make_desktop_entry ${PN}.glut ${PN}.glut
+	make_desktop_entry ${PN}.x11 ${PN}.x11
 }
diff --git a/games-puzzle/five-or-more/Manifest b/games-puzzle/five-or-more/Manifest
index c11988765294..ff089f8c1946 100644
--- a/games-puzzle/five-or-more/Manifest
+++ b/games-puzzle/five-or-more/Manifest
@@ -1,3 +1,3 @@
 DIST five-or-more-3.32.2.tar.xz 1238468 BLAKE2B 8d223df7933cc84751c173617540a3b725342e84669be22a865a6751be19671fbe269ddc00e4c3a32d78ce3313c71d3c7e1930beae7d1561f6b90a6f9cdc73b8 SHA512 bbca7ebca45eb0975a57accbd6d3648f3fa5ab6abfaaede04e038b7ea793b44a2e125dbfe65d3f53863e62fed36eb28bbd9180e8975c4988e0fc919a8708e4c3
-EBUILD five-or-more-3.32.2.ebuild 875 BLAKE2B e4539754f19bd7a552d236ca5454fea4e7c05ed4be72fce7c2969f1212b4f04b2fbcbf99e5c9c3f476d81986b1d698ea67f4c2349a8639666b194aee4535fb8d SHA512 c42e967aaaf175533ec72fa511e78bfcc0e68994b9969aaa35d2ce592cf28934ee08e4d97f70243c3db4bde3aa5df3881938d968e9822ab57f3d035c85bc6841
+EBUILD five-or-more-3.32.2.ebuild 874 BLAKE2B 1af6fe394bfea9073752bc9bf729e363f7ec6e4ce2a758e37c2f805c9a7c8ec114f32fda03ec7f22ac52b5e3646156570ea8a68cd02e7a35f86e9d6a68711934 SHA512 271ad2dd64a329316069eb5bc0f68ee478434ed8cc8bca5fceb0acd264a5b69e2e9de31ea2a78c999379ad9c4241766bde513d10f6b70735430ceba071021153
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-puzzle/five-or-more/five-or-more-3.32.2.ebuild b/games-puzzle/five-or-more/five-or-more-3.32.2.ebuild
index a3c32bb79319..82bba1223ee4 100644
--- a/games-puzzle/five-or-more/five-or-more-3.32.2.ebuild
+++ b/games-puzzle/five-or-more/five-or-more-3.32.2.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
@@ -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"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/gnome-klotski/Manifest b/games-puzzle/gnome-klotski/Manifest
index 65f6325e84ac..972e7136420e 100644
--- a/games-puzzle/gnome-klotski/Manifest
+++ b/games-puzzle/gnome-klotski/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-klotski-3.38.2.tar.xz 1030904 BLAKE2B 06af4115dab0fc63fd867633209c2590ad88331f9e7945ed1efec555a78dce9b6f41772e804170cb4a11a8463daf423e68e697abaf3ffba7fbc075dec78201a9 SHA512 dc2c33b4b555d77f04a8146741f9a4f5a6694ec046d457d50255fac306894c5b3306082c91adbfbc7d73d43ea3b109b36d992ecd9183db803c20e22f17c5e274
-EBUILD gnome-klotski-3.38.2.ebuild 862 BLAKE2B b585638518c31c10950df26e34a47f081637b787f025d1f3c3a39bd61aa5e8d4a4c7d747a3ae86386ecd7a86baa00640fcd38e2436494c123d4137b07498a0b5 SHA512 9f6c3cc48734040b1b5aa2dba630596d6d63ae5466dd14fea4efec859cf79301dc074fc167ca1a8db5929e338d0a7a1bca367f08185355c2a497d7e92b56ac49
+EBUILD gnome-klotski-3.38.2.ebuild 861 BLAKE2B a96e4ae605341a570b6b3bd001212cd2aee14094ce7e90976c9cd12909805ba81b4e5f003e7e81ba73aae0237deacfbe572d3fac900c50d9e9868bf4530ae965 SHA512 caf9ebb0b9db370271467afd14d83d12789182fb3d2a122e180b9e788311b18ac2c7dfa0b222ef6a744a18c593a9a2b3773cfcd29153047f290995d947775ca8
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.38.2.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.38.2.ebuild
index ea37c7c0cdcf..f68e7574e456 100644
--- a/games-puzzle/gnome-klotski/gnome-klotski-3.38.2.ebuild
+++ b/games-puzzle/gnome-klotski/gnome-klotski-3.38.2.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Klotski"
 
 LICENSE="GPL-3+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
index 433b0a14956d..dd9e8ccb430f 100644
--- a/games-puzzle/gnome-sudoku/Manifest
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -1,4 +1,4 @@
 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
-EBUILD gnome-sudoku-40.2.ebuild 1049 BLAKE2B 575d36a3849d08d35b2786a1b48d97676a784e026be752b7fab2848c0a4a39b05dbd99d629dace339a4e959423cb371b96e972873dab8631d0097c40a1a88b3c SHA512 77c844e790984311f475d26178e25fccb12affbc12795992721265be3d14cd1ac009d1299297ddbce867aa9d029a193d3bc4a883e1053b413211540046ddc6a6
+EBUILD gnome-sudoku-40.2.ebuild 1048 BLAKE2B 6a529fd68a2a041283e9a0aaeae84d151a6a88639d9551f13ddd4e6fa5f32dc58dedf052ce86493bd67162d45cc03a32dc3ec97916849e5dc9cfedd3df7b3be1 SHA512 7e4fe7993ef6b735f88be82808c2461a2eb1cc0a5dcdba54f8f298b667a3bb0a12f77485220d47a7da05bb97346773f495a0e807124f353cdc8aa40251bb6079
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild
index 99ff396e96c1..c9ad1c849ef5 100644
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.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/gnome-taquin/Manifest b/games-puzzle/gnome-taquin/Manifest
index f48f712bb130..57d30db9f74b 100644
--- a/games-puzzle/gnome-taquin/Manifest
+++ b/games-puzzle/gnome-taquin/Manifest
@@ -1,5 +1,5 @@
 AUX gnome-taquin-3.38.1-vala-0.50.4-GtkChild-1.patch 6122 BLAKE2B 5146cfd27fa3254187eeed6c529839597ff84b55cf3228e1777aaf40f20831467aaa04854f4a1215670ed1fcae2943bfc8eebfc865edd56cfb4d7818381c48f7 SHA512 11bd1424ad4f1102136c8a966befd66b0cb62d0b2f87e727c12910d0cc26ba391c049383e5b535fed27cdf09cafc89ce1a05b6f41e7f61d3969c3e2aaf17a3b2
 AUX gnome-taquin-3.38.1-vala-0.50.4-GtkChild-2.patch 9566 BLAKE2B 7f6dde7993122cbcb96ca3e4a493e965758e3d8a52e98734e9d0bd199dcd7ad8a74d5f16b9c24d5b0e7229f9749ba03a12847ceb5f88f9d1a7b8a788c785f767 SHA512 e726c24b6526b9d137cfe4acc0ae3c9caa36b1605f8ff6acd8a5dd0aea6339fafe8ec39d09cc55533055a25a1a9c6b2874c2a6e7dd5a2ce49aa72bd9004102c5
 DIST gnome-taquin-3.38.1.tar.xz 5265440 BLAKE2B f37397a4f3d0e71cfe39b8bce00fa7a04679467b402251aae155395740b655aa67031d2cdcc8d46fa45b9a69b1e829e0da883f17f9ec9a48d763098cf44e7f95 SHA512 c92244049bb24ab1585375ca6337965891bcaf46e642e009e3f670a818554d842c1f55c78735229198dfd6d96e95ee56e106a7eb238052e1382118287d9e28d6
-EBUILD gnome-taquin-3.38.1.ebuild 1193 BLAKE2B de90c2834bc0a5cef4e894ae1c92ea818430e74a755ef47c26131cee766058c5222c26c807476072a52e103ee52555d007d1476a34f4daed1e17d023316b9f93 SHA512 102279d460b2fe5eb385930acbc3077bbfbcb596a175fb423c5dea5c7d223223d37fa9125eee650d355916f8a1fa98904c443832d87821a6d131214cb0408955
+EBUILD gnome-taquin-3.38.1.ebuild 1192 BLAKE2B 1dd97bc9cd25c6a977bf966351da817e13ffb283504e7f3e371e708c279a3cb5788d5b79101b8f63be36ec30d0da0739d42eb1de89aa9a7f91f042fe9e544f42 SHA512 58c02269c82e00921734f92e8e44fec8986af812cbba407cb9d8dec5e7f31c6cb2bff5398a36bef90b65b38210de25677eeafd3e113ef53bbe10a6e5c66d3e81
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.38.1.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.38.1.ebuild
index fc3fbdca13d9..0407088c3fb8 100644
--- a/games-puzzle/gnome-taquin/gnome-taquin-3.38.1.ebuild
+++ b/games-puzzle/gnome-taquin/gnome-taquin-3.38.1.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
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Taquin"
 
 LICENSE="GPL-3+ CC-BY-SA-3.0 CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/gnome-tetravex/Manifest b/games-puzzle/gnome-tetravex/Manifest
index bd18a21853d8..bad77320843d 100644
--- a/games-puzzle/gnome-tetravex/Manifest
+++ b/games-puzzle/gnome-tetravex/Manifest
@@ -1,4 +1,4 @@
 AUX gnome-tetravex-3.38.2-meson-0.61.patch 1247 BLAKE2B d2275d6d5851216e99bd6d0ccb7265305a51c205ad1d280a210da4f0fac477ae85f1a708e56748eb3553ae6452655ef8af13c8a0c240dc675aaa8f35a318af2c SHA512 419b20a2f323fc95e443cccaa2513f4a6ea138a0c4bed4cb4b86ac1c683afef680c8fc15dacea252d033af1c26ba81d4ca014bcde739bebf15809c8b4ec187de
 DIST gnome-tetravex-3.38.2.tar.xz 1004632 BLAKE2B 5e16420e9e05668e3c697a275e748e75d65531fbe7bca61baffa5846b76781403a3014e1f85a6f9ec69965c256cbacbe3a756e36c9725eeccfd6abd0c568dabc SHA512 ad67dfcbec5cf33f5361c6f5746d78158726a4bf5c85f29ea084a324e2ec493ca41bb61e47228ad4deb30985fd750e8703e11fd02051af5ac7c9c256513644b8
-EBUILD gnome-tetravex-3.38.2.ebuild 1037 BLAKE2B 043bab25e225c5c56271c29b64a8efb7d44aab1b23f51cc79c970b234546359eb02c7d88fd29b061b2ae841c51f094292862ec8362439e07c23aa681f080933b SHA512 8567864e44c7c042e58b7db9954d9dec55a43aa4bd072b50cbef6b0f0e20d2004f31c67144bcf8cc3be828aa1133214adb33a59fd1b6c9bb2f2326c19aec3f25
+EBUILD gnome-tetravex-3.38.2.ebuild 1036 BLAKE2B 07e48337e47c9749366490ce8076508fb10f0aa6ae7c5b93b1fbcb38f2547bc89505527ea6ded87cd6743273f40529a2957df1a5563070b35f252ddf32b48636 SHA512 f3cfbbf74cb6832143814cbdd7cb098cea2a9d6e0beb4903c536112acf285d0057ab771d4ca2a892744eb63e5677a5f26e939950d000a8c816fbf241f0b919e8
 MISC metadata.xml 419 BLAKE2B 690f82e9b4d41bdc02df30f899278d6dc51d3bac6b30b6b6fe97e32649a6c9adfd7ce8d2436263f9653e3160bcfaa163be9e29505eff65411667b646dad0898a SHA512 a2c42c86a901ccee97020d141c321ee2f2da44b82d4f3f97cbef85b0f086121d8f30400cb6b2a7ec51e81896009693daef52369884fa3b6e84f052262d499144
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
index 254fde622d9d..816eab503149 100644
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Tetravex"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 IUSE="cli +gui"
 REQUIRED_USE="|| ( cli gui )"
 
diff --git a/games-puzzle/hitori/Manifest b/games-puzzle/hitori/Manifest
index 33073660de55..0e9ba93272ef 100644
--- a/games-puzzle/hitori/Manifest
+++ b/games-puzzle/hitori/Manifest
@@ -1,6 +1,4 @@
 AUX hitori-3.38.3-meson-0.61-build.patch 1189 BLAKE2B 29ad38778c71eb03ecab47aa2f77a60b1eeaf7336e727cf75686aa92989d49ea34fa490cf68333b3547feb8f2552fc1426d91737d6fd0e756f807674acc37895 SHA512 a777e446457381e482000775b627b3929336c1167b8a51ce93f61ed209d71e6da6519c984fc24c19f99a22339824294b4a91f128948e883ef45f273e65d33fde
-DIST hitori-3.38.2.tar.xz 204992 BLAKE2B 271e7c7c09a0a9cf496783bf19cfc9bfb60a7a94b1addce704e0ee57b9a9d730e6fc96750dc2eb0e14cae2b0d5d8abc7474fe28029b94f0c7d195cdcbf7155da SHA512 6a094e7bf9b528b965819a28b64db0f7b6c474dbd1a54c3063ad2f20b726193a46b4b058566baea7dee889c3d692bd36bdf775a177e430b5772b16762bdc2785
 DIST hitori-3.38.3.tar.xz 205100 BLAKE2B 8b3e477f8a62911c8fa0b366f578adb7bc362445cf3982a131677988e6f7471a0f56a06fcd356ff19692debf27126e98d4f8c52524af3e6e7e22c3b43bb3276c SHA512 1ba966c22304a2538026234fbb9e0ae34a433643af02ecc26a6e5cd240efa89524ee0e98334d01728f25ec987865a8ff724036e37859503d2517e7480d2dc744
-EBUILD hitori-3.38.2.ebuild 702 BLAKE2B d364d02c8b4620dca37add6e275b21ba7a034ecc5fcac28708f4fb5b1d84c1c0223610e7dd5d0426b24165af774bae2b3c11d4eb45c4705f8918c45e5b52c4ce SHA512 3bbcb53f1e89a95ba4c7d19c8c3e2f2b5c3cef4dbf914e014c932dd2cc43b1cf4ffcf0ff9d59c68f3e6948b01249f15d108a2cef2e6e778ccfd38f463d57458d
-EBUILD hitori-3.38.3.ebuild 767 BLAKE2B 3f9bb1023ebeb5882a1cf3f1ec1942c622dd6d8e82ee29af7d5dee36d9ec199fe22453469462750cca920cd927c4c45adf62e1d44c8ee5075ac519693ed49908 SHA512 e9d393e2700c926738276fe0e1393ca831428bcc7c5a86a1453af0c00370ca079f1ff9973de20960cb2c37d98e6175c9c7e8035b9add8ba7f21ebbf3363abc2f
+EBUILD hitori-3.38.3.ebuild 764 BLAKE2B 4259a65df487d23d0961fd3d311ca04c4655d39a95e4d385bed1340037696bb2fe47b862198da921754218711cb4e3b219fe3b788ee66ae9610d2a22f910a258 SHA512 c730cb35587af63fde31fd1e3327dae32bf9ae8d895c4a4b39807ee685b9668162988c1c98788014a80a574d18fa63e126b2b28cfaa612e6d5fc27eeff274387
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-puzzle/hitori/hitori-3.38.2.ebuild b/games-puzzle/hitori/hitori-3.38.2.ebuild
deleted file mode 100644
index 91ff27bc841e..000000000000
--- a/games-puzzle/hitori/hitori-3.38.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Logic puzzle game for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Hitori"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-# gtk+-3.22 for build-time optional gtk_show_uri_on_window usage
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.22.0:3
-	>=x11-libs/cairo-1.4
-"
-DEPEND="${RDEPEND}
-	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-puzzle/hitori/hitori-3.38.3.ebuild b/games-puzzle/hitori/hitori-3.38.3.ebuild
index e6f87c980f0f..225ba85d0a91 100644
--- a/games-puzzle/hitori/hitori-3.38.3.ebuild
+++ b/games-puzzle/hitori/hitori-3.38.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Hitori"
 
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 IUSE=""
 
 # gtk+-3.22 for build-time optional gtk_show_uri_on_window usage
diff --git a/games-puzzle/lightsoff/Manifest b/games-puzzle/lightsoff/Manifest
index 5ddaff602bcc..bde63097c1d9 100644
--- a/games-puzzle/lightsoff/Manifest
+++ b/games-puzzle/lightsoff/Manifest
@@ -1,3 +1,3 @@
 DIST lightsoff-40.0.1.tar.xz 562340 BLAKE2B c80aa328e56a1cb8da723c187c6a223d0bf93353f36ed651b10c38ac129c6d62970dcf72308cbbf4fd0f911113b5c53ed490824b488bdc92e84c7bd9e9ae1015 SHA512 ac1f812c3297a42f1e5aa8b8cdda2884b5c2aea2ea0190047ba5a0f47254b191d2105d7d1b548f0233fdee1b0e6033a97265a1cb28503daf403ee4e2c53a1aca
-EBUILD lightsoff-40.0.1.ebuild 1113 BLAKE2B 6b21bba3f43b8211b558a3cf57a12d0701e449d22fb7014b84b5091a4f5a54c52872fbfa6428d15b92ecde7f46715e8c07cb9bfe3411b540b5df492b3cd41e65 SHA512 94dbbd7f2007a2ebc35eea87529e2f5dc8ec0aee7e24da528969848283cf3e732321014d319497ae075bc3729117d320169cef37d0671764f9cdc9d38d3876e8
+EBUILD lightsoff-40.0.1.ebuild 1112 BLAKE2B b6b5175c42e71f5f63b5d320d22417ed1ff40ce88af72509c1728ca270d8f268cf1cd16e5f6c295515fa5e9d85d898ee01277bf9a3dc9014db43f9bd3f76a1d3 SHA512 7b86ff94d4e4c541dccaae9feea7970f840ff0a7c93a54a1236ebaaff1f5f190c9975b3aaadeedc76ad3eae0c3a4ccd68ef006186c3fc5117a5788b98bed7466
 MISC metadata.xml 502 BLAKE2B 146f6e970362d9052f88141a18b84dded91294e70d3695059d2b9408ae7971852f1e1abea879fc50fe6e4814d3621bf81239d157f092b5f5bd7fcb98bf3abf8c SHA512 f189063797b3eff1da609a7571361ecd3eba4b904110bfc809caa669e7c4339e1e1d2051a91d86bfb29e866fbd4716ee1b01d4288bc80e05d94a4c0f78520bef
diff --git a/games-puzzle/lightsoff/lightsoff-40.0.1.ebuild b/games-puzzle/lightsoff/lightsoff-40.0.1.ebuild
index 741a544358b9..faa0bce145d3 100644
--- a/games-puzzle/lightsoff/lightsoff-40.0.1.ebuild
+++ b/games-puzzle/lightsoff/lightsoff-40.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/pingus/Manifest b/games-puzzle/pingus/Manifest
index 5d8a0197ca09..d75a095c528d 100644
--- a/games-puzzle/pingus/Manifest
+++ b/games-puzzle/pingus/Manifest
@@ -5,6 +5,6 @@ AUX pingus-0.7.6-gcc7.patch 675 BLAKE2B 76172b7151e30e800ab2210684a02605810b0f15
 AUX pingus-0.7.6-noopengl.patch 315 BLAKE2B 49d2f078506c38d7da57847c6189bf0f9fd0b8a87e80b16fb848f52e37a466111be753f68dc9bf889c66d4ad9a4fea8495fe73b860001d644f2dbb0091b319fe SHA512 f375591892ddecea0659f94ab3d4fc6744625b546fdbc6d80524c25d8ee494163a9b4a90671eed9e7fa2724a1fd91ccde2e80b8ba097c21aa76e0e9fb7e6f4a0
 AUX pingus-0.7.6-python3.patch 553 BLAKE2B aa15a12e8e4d578a91ff1b96aceb51a529595eae59d4f78e80a1b7bd2427a8658fdb9d91e32602d7ab1125b9c3c59538cf47d17ae4eb23bfe23d38b401ef0890 SHA512 5be04a07beddefe33681c6e0cf043e46e514a10665732015ff0ca01be933752f67d5a6161729c72d277ba5a56eb9bd38ab80da3bf0755895d0784196ad349a1c
 DIST pingus-0.7.6.tar.bz2 12622268 BLAKE2B 5ea1bbea7191919897bdedcda06f956d9b6cc0cda2ab11e475ef497ef8ba0c0de5a739ac334e2a5c9a0c138e6bfc44a23363dc59d3e4cfaea2b5388bbe57cc85 SHA512 6c8c2ace1a9229b4e3b506aee76aa94c0dd906a64fa2c817902c2cd3854df390cf675c8c6ddd3ba1926a467348b2103818bd44bc095378cc7bf3f2ff7af27188
-EBUILD pingus-0.7.6-r3.ebuild 1283 BLAKE2B 00c962037144ae945a566f7c0f7f9beee6b17c3b05740aa0415c404700e8c0ae9a34226c9c870a24c437b9d1203d5b95019373919db1f08788a57fc27b9453d7 SHA512 80926aeb99b05783497a2e1db5f30a7e4302eddcf53e8072ee55da144694146df47c2c683e7067d2b9a66c8860f368e07ed2975f953246fb654364fa25493a7b
+EBUILD pingus-0.7.6-r3.ebuild 1294 BLAKE2B 8498a39aaa5bbed4bf390c7343f266048b450a5ae52f10288de0b699e0a609a513902cb4a7caf42ab25b66e9a5496bb6b53aa9b2b1e5ce3358e518466fc13e33 SHA512 cbf911c62eec5de3834b5664afa4a5a2b2f8738f2bb50316e3955d46901827cd9bdda5e0cdf1f8b59a9dc0c3de9b5d18539184a334309c5f179f46950f00a8bf
 EBUILD pingus-9999.ebuild 635 BLAKE2B a5741a018b2111cc3acd1fb9cc2de193c8e6e5b4454a537b22a212b8b57dbb334dcc711165874f0dbc8a797f8d65593ec4f1274e8ecad2ea43a93b00c1ab6518 SHA512 24a4bc4bbc79636e5baf580de0d224a289ed446b45c0f57d0e7b1a6fadd8fe0606b5b53498eed77bb0ac0eb1875a4a34da837e9340e816b8a8325d184c537e75
 MISC metadata.xml 1284 BLAKE2B b257a0f0fb609be11d197fd7c3837019b961514a13187a983c84f6bfb8ec00cc97ef77dd180cc54394076c19c35afb3712980cef7e8b563fd76d6aaaaa00aa85 SHA512 2be7245d0f08747eab1fbcfa33ca4c7c458b7b4ba0166e2186fde9c3b0864b3256fd5972dca390d6878d50593da59f0bf035fdaf488e19f0f05468bd7145cf67
diff --git a/games-puzzle/pingus/pingus-0.7.6-r3.ebuild b/games-puzzle/pingus/pingus-0.7.6-r3.ebuild
index 1b6acb9e7d83..1318ebeae323 100644
--- a/games-puzzle/pingus/pingus-0.7.6-r3.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.6-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 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 desktop flag-o-matic python-any-r1 scons-utils toolchain-funcs xdg
 
 DESCRIPTION="Free Lemmings clone"
@@ -52,7 +52,7 @@ src_compile() {
 src_install() {
 	emake install-exec install-data \
 		DESTDIR="${D}" \
-		PREFIX="/usr"
+		PREFIX="${EPREFIX}"/usr
 	doman doc/man/pingus.6
 	doicon data/images/icons/pingus.svg
 	make_desktop_entry ${PN} Pingus
diff --git a/games-puzzle/quadrapassel/Manifest b/games-puzzle/quadrapassel/Manifest
index 1a497d51d3a3..ab0849f2a564 100644
--- a/games-puzzle/quadrapassel/Manifest
+++ b/games-puzzle/quadrapassel/Manifest
@@ -1,3 +1,3 @@
 DIST quadrapassel-40.2.tar.xz 336896 BLAKE2B 66e32182508f91b67495fbb5aebc47ca40a4386cd8c9aaea9ffc94dca77c4fa7ce5c153b354f14507636bd53b2a27357c7e6ab76287d09310d5ac1ce52434699 SHA512 58a1a2c26b9c667da2ebd75a653b5dc534295109a9040bc3ce3cb33b4cae9a263e95701e0b3283696fddda1e8b47593bd3dbb64f4fdff90f20b0713b2a13ef4d
-EBUILD quadrapassel-40.2.ebuild 996 BLAKE2B 7a4f134f08d143b89195fe1c38efd4ec7363fc69f930351385acdf8f99d665bdd833fe69ec8811acd3ec0a7ec9dfd6e80eb418deffa3ec3b38d5201c81bd2aee SHA512 2567f24de1ffd71e3be6a4a53bcd4486cda9ee07637afec1c53fd9de95d128e0a6ae74a8429176c039ac7607759df973f3124a6dd74e51a05111621c1a38b745
+EBUILD quadrapassel-40.2.ebuild 995 BLAKE2B dc3e3c66131c7bb7633b2cd2f16cd1359fb73a97a118c27530fe390f74df2a51bf5596b911a34d9b263e7b81fe67876dca262f1663f033a52c4827bcb725eed3 SHA512 52d11b20d9c27e96705b7ce34bfaac544fd5d0264bfc2ce58d3d931053a5c078831bb6be0ba20075f61fa06b203650b5595cedfb42536b4fd7836f4c48a01ce8
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-puzzle/quadrapassel/quadrapassel-40.2.ebuild b/games-puzzle/quadrapassel/quadrapassel-40.2.ebuild
index 4ec18a9329b3..6f27999b6b4a 100644
--- a/games-puzzle/quadrapassel/quadrapassel-40.2.ebuild
+++ b/games-puzzle/quadrapassel/quadrapassel-40.2.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
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel https://gitlab.gnome.org/GNOM
 
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=media-libs/clutter-1:1.0
diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
index 60f1c3e64392..ecb0cd8efd91 100644
--- a/games-puzzle/swell-foop/Manifest
+++ b/games-puzzle/swell-foop/Manifest
@@ -1,5 +1,3 @@
-DIST swell-foop-40.1.tar.xz 821744 BLAKE2B 598af5d5bdeab2b6c3aca849e8c0a1f0c9690d14bc859c4c89bdf0577868efd7450f88e0039925e3cb83c60cd9943965382592962dc49fca31dac933099b7321 SHA512 99a90030eec32163f84e238458fca74b8ba19c7b804dc3f65d7f8f50f3d7f45dfd1cf45d383e332cad6c18fdf5d4eb79bf3c7b9f406a02431ed787b23a1c8cb7
 DIST swell-foop-41.0.1.tar.xz 758800 BLAKE2B 5df8870f5be52a4dfec9c012a2496e9b727eb93d01480bedb1c836b8b399f9b42ff36b18c78dad7ca26dd9da6b143229064167423fba3d7630a86d5108e4f3d2 SHA512 b579616cddb77fb3e6d6a8b382fe4b9692a884d62b0907fd551048dbfe28d3f031ac9c8e43e2888ee408a51bccb026109cd9e9ac371b475eaffebb1d9c237c11
-EBUILD swell-foop-40.1.ebuild 873 BLAKE2B afb45ae03f89af2386f6bb030152574908ab204d97143c47878fd495abc011767f41cd34f977cf8e6158cff9fc30b774d2581e8074f76c56b5824043cca7a85f SHA512 61ccbf3ca403820c6cad19c2f2efbb4d46a278a2bc00821a8e077d899eabb32c7fcc0c7174e189d2e31aff086f13e8f312df48d20e03b130f0db1c0d04617f06
-EBUILD swell-foop-41.0.1.ebuild 882 BLAKE2B ae33493670b0641713ab722e4fe259ad3fbf9ec2f8b9dc05aa389f10b01560b721fa5b970798800feb3b9ceb80bf76cc21f84134a12f44620cca4315757f557d SHA512 b65f3aa9d29d37aa12487cdb65fef59ef922fde4a23ddcedff06de672ed9660540adaf3ebf73e6ce37b4907fe82e56e195f84bf7c0281e2f6378469b473b6915
+EBUILD swell-foop-41.0.1.ebuild 879 BLAKE2B 6ac74e2cf572fc2686f3e87158aad05f6cd629aaba056ee04358d4d5b5cf671323eab2e7e41ecc268be2678346ba2266d1d23677125bae87fca2b4e1135ad145 SHA512 988d03c5505fa6afd877c2082d2c4d6192adf6571e53c2f76fecb6642b01eed60a870a95f869e264fb393319c5812f771a0995b05d52d56be2783763d3dce129
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-puzzle/swell-foop/swell-foop-40.1.ebuild b/games-puzzle/swell-foop/swell-foop-40.1.ebuild
deleted file mode 100644
index fc264a49ff74..000000000000
--- a/games-puzzle/swell-foop/swell-foop-40.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 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 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.0.1.ebuild b/games-puzzle/swell-foop/swell-foop-41.0.1.ebuild
index 4c9dbd816437..e8a464ff50f7 100644
--- a/games-puzzle/swell-foop/swell-foop-41.0.1.ebuild
+++ b/games-puzzle/swell-foop/swell-foop-41.0.1.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
@@ -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/xtris/Manifest b/games-puzzle/xtris/Manifest
index 08f9fe00b5fc..e80965148a7f 100644
--- a/games-puzzle/xtris/Manifest
+++ b/games-puzzle/xtris/Manifest
@@ -1,4 +1,5 @@
+AUX xtris-1.15-implicit-function-decl-time.patch 667 BLAKE2B b0ac62d384cd4cebe428f9b0ea84c8e9b3567b0b7ec8f59f36cace949cc5ffa054f485b44f18a4e2d46f21bb1c3282c314ebbeb1604fc314bd68ce8318e2166d SHA512 435c06d7a78fd0fddcc557c1f20f44e0146be43cfd755d0105aad3e5b7a5bc94638b22add39d1984d575b109c041b7695405f4bc30ebc498dff8e1b69393a88e
 AUX xtris.xpm 1403 BLAKE2B dc765e15dfc0cc49837cfbadfa3fe0ad33aef0e88921e906e89f9af8f778c700508b5a451d835d77bca64094d5a0b6e7f1bce941f6a42b6bf00e089fea7167b7 SHA512 1956a02d844b517df41a5cc82e236a04ec9609849c4d7b097af5bbb4b03c1e16bc8d6f0491c6cb1c8920bec578beab07381b15cee468079c5e474c80c07d30a3
 DIST xtris-1.15.tar.gz 52130 BLAKE2B 3f39f4208b678be85064fd08cbaabc7a170f559e115d59a8ba50524520b106b6fba5b7a4af7424154032d6b83365bfbb932a3424b6ac03ab32aac49c7afbdb67 SHA512 a5d5c32a7e1650561464f0fda08c7040ca0061e59b374359894e7f181a2e9dfece7f6bee6ed82295779f3e4ac8e7a607c668c31eeb017d6b641c1fe09dea4791
-EBUILD xtris-1.15-r1.ebuild 742 BLAKE2B a810aa7415b4801b0100700fba756971f3af926d16b3d5f8f90d5d7eec5b807fe524421791797dc49bcb14453f813bf06430bd71cb1e74b6812f917643bdd2ee SHA512 45ecda98390d0dee9fb2bad2b40cfddb6cc7326ed95fd0b0e9294d2de899fabd7135ebe76d6ce9246e5c7961f0aa1ad55077cb5ef9ead1daac27c29565d9255e
+EBUILD xtris-1.15-r1.ebuild 817 BLAKE2B f5047af3f0c27f74bdfc1d90495ce0628f42067947a48d13245b013daefc9de395aeaa903c92e255bd05462dda9b17c28b9b7eedfaad046d991130c856f03236 SHA512 50dce431da947cf160b81907dcaf7f1e29adcb3efb9db3d8b9be5650bd1ebeacddb4386a29d24d7bc9b728aa62bd2e9bf25b43fc9906771ae25459579bb7d45e
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-puzzle/xtris/files/xtris-1.15-implicit-function-decl-time.patch b/games-puzzle/xtris/files/xtris-1.15-implicit-function-decl-time.patch
new file mode 100644
index 000000000000..bd1d694235ca
--- /dev/null
+++ b/games-puzzle/xtris/files/xtris-1.15-implicit-function-decl-time.patch
@@ -0,0 +1,23 @@
+Fixes:
+xtbot.c:211:23: warning: implicit declaration of function ‘time’; did you mean ‘utimes’? [-Wimplicit-function-declaration]
+xtserv.c:386:23: warning: implicit declaration of function ‘time’; did you mean ‘utimes’? [-Wimplicit-function-declaration]
+--- a/xtbot.c
++++ b/xtbot.c
+@@ -23,6 +23,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
++#include <time.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/socket.h>
+--- a/xtserv.c
++++ b/xtserv.c
+@@ -15,6 +15,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <time.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <signal.h>
diff --git a/games-puzzle/xtris/xtris-1.15-r1.ebuild b/games-puzzle/xtris/xtris-1.15-r1.ebuild
index 93ef346fe67e..b41708fe9214 100644
--- a/games-puzzle/xtris/xtris-1.15-r1.ebuild
+++ b/games-puzzle/xtris/xtris-1.15-r1.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 desktop toolchain-funcs
 
@@ -17,9 +17,13 @@ KEYWORDS="~amd64 ~x86"
 DEPEND="x11-libs/libX11"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.15-implicit-function-decl-time.patch
+)
+
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
+		CC="$(tc-getCC)" \
 		BINDIR=/usr/bin \
 		MANDIR=/usr/share/man \
 		CFLAGS="${CFLAGS}" \